Skip to content

Commit

Permalink
Merge pull request #36 from cometchat-pro/fr-v3
Browse files Browse the repository at this point in the history
v3.0.0-beta5-1
  • Loading branch information
priyadarshininadar authored Jun 1, 2021
2 parents 9776347 + 54877a3 commit 1c5bd0c
Show file tree
Hide file tree
Showing 7 changed files with 11,982 additions and 7,294 deletions.
10 changes: 6 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,17 @@ CometChat Kitchen Sink Sample App (built using **CometChat UI Kit**) is a fully

Before you begin, ensure you have met the following requirements:

- React `npm install react@16.13.1`
- React `npm install react@17.0.2`

- React DOM `npm install [email protected]`
- React DOM `npm install [email protected]`

- React scripts `npm install [email protected]`

___

## Installing React Sample App

1. Clone this repository `git clone https://github.com/cometchat-pro/javascript-react-chat-app.git -b master-v3`
1. Clone this repository `git clone https://github.com/cometchat-pro/javascript-react-chat-app.git -b v3`
2. Navigate to the root directory and replace `APP_ID`, `REGION` and `AUTH_KEY` with your CometChat `App ID`, `Region` and `Auth Key` in src/consts.js file.

![alt text](./Screenshots/constants.png "Constants")
Expand All @@ -84,7 +86,7 @@ ___

## Add UI Kit to your project

Learn more about how to integrate [UI Kit](https://github.com/cometchat-pro/cometchat-pro-react-ui-kit/tree/master-v3) inside your app.
Learn more about how to integrate [UI Kit](https://github.com/cometchat-pro/cometchat-pro-react-ui-kit/tree/v3) inside your app.

---

Expand Down
19,150 changes: 11,918 additions & 7,232 deletions package-lock.json

Large diffs are not rendered by default.

102 changes: 51 additions & 51 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,53 +1,53 @@
{
"name": "test",
"version": "3.0.0-beta1-1",
"private": true,
"dependencies": {
"@cometchat-pro/chat": "3.0.0-beta1",
"@emotion/core": "^10.0.35",
"@testing-library/jest-dom": "^4.2.4",
"@testing-library/react": "^9.5.0",
"@testing-library/user-event": "^7.2.1",
"emoji-mart": "^3.0.0",
"extract-zip": "^2.0.1",
"fs-extra": "^9.0.1",
"history": "^4.6.3",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"react-html-parser": "^2.0.2",
"react-redux": "^7.2.0",
"react-router-dom": "^5.2.0",
"react-scripts": "3.4.1",
"redux": "^4.0.5",
"redux-thunk": "^2.3.0",
"rimraf": "^3.0.2",
"twemoji": "^13.0.1",
"dateformat": "^4.0.0"
},
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test",
"eject": "react-scripts eject",
"postinstall": "node ./postinstall.js"
},
"eslintConfig": {
"extends": "react-app"
},
"browserslist": {
"production": [
">0.2%",
"not dead",
"not op_mini all"
],
"development": [
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
]
},
"homepage": ".",
"devDependencies": {
"node-sass": "^4.12.1"
}
"name": "javascript-react-chat-app",
"version": "3.0.0-beta5-1",
"private": true,
"dependencies": {
"@cometchat-pro/chat": "3.0.0-beta5",
"@emotion/core": "^10.0.35",
"@testing-library/jest-dom": "^4.2.4",
"@testing-library/react": "^9.5.0",
"@testing-library/user-event": "^7.2.1",
"emoji-mart": "^3.0.0",
"extract-zip": "^2.0.1",
"fs-extra": "^9.0.1",
"history": "^4.6.3",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-scripts": "^4.0.3",
"react-html-parser": "^2.0.2",
"react-redux": "^7.2.0",
"react-router-dom": "^5.2.0",
"redux": "^4.0.5",
"redux-thunk": "^2.3.0",
"rimraf": "^3.0.2",
"twemoji": "^13.0.1",
"dateformat": "^4.0.0"
},
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test",
"eject": "react-scripts eject",
"postinstall": "node ./postinstall.js"
},
"eslintConfig": {
"extends": "react-app"
},
"browserslist": {
"production": [
">0.2%",
"not dead",
"not op_mini all"
],
"development": [
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
]
},
"homepage": ".",
"devDependencies": {
"node-sass": "^4.12.1"
}
}
8 changes: 4 additions & 4 deletions src/consts.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export const COMETCHAT_CONSTANTS = {
APP_ID: 'APP_ID',
REGION: 'REGION',
AUTH_KEY: 'AUTH_KEY'
}
APP_ID: "APP_ID",
REGION: "REGION",
AUTH_KEY: "AUTH_KEY",
};
2 changes: 1 addition & 1 deletion src/defaultPages/App/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import { Router, Route, Switch } from 'react-router-dom';
import { connect } from 'react-redux';
import { createBrowserHistory } from 'history';

/** @jsxRuntime classic */
/** @jsx jsx */
import { jsx } from '@emotion/core';

Expand Down
2 changes: 1 addition & 1 deletion src/defaultPages/HomePage/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';

/** @jsxRuntime classic */
/** @jsx jsx */
import { jsx } from '@emotion/core';

Expand Down
2 changes: 1 addition & 1 deletion src/defaultPages/KitchenSinkApp/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';

/** @jsxRuntime classic */
/** @jsx jsx */
import { jsx } from '@emotion/core';
import { Global } from "@emotion/core";
Expand Down

0 comments on commit 1c5bd0c

Please sign in to comment.