new release

.gitignore

@@ -11,9 +11,6 @@
 # production
 /build
 
-# Cache
-.eslintcache
-
 # misc
 .DS_Store
 .env.local
@@ -24,11 +21,5 @@
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
-yarn.lock
-package-lock.json
-
-# env
 .env
-
-# cypress
-/cypress
+package-lock.json

ENV.md

@@ -0,0 +1,3 @@
+# List of env variables
+
+API_BASE_URL= "https://api.bottle-dev.com/"

README.md

@@ -1,70 +1,5 @@
-# Getting Started with Create React App
+# React CRM (bottlecrm.com)
 
-This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
-
-## Available Scripts
-
-In the project directory, you can run:
-
-### `yarn start`
-
-Runs the app in the development mode.\
-Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
-
-The page will reload if you make edits.\
-You will also see any lint errors in the console.
-
-### `yarn test`
-
-Launches the test runner in the interactive watch mode.\
-See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
-
-### `yarn build`
-
-Builds the app for production to the `build` folder.\
-It correctly bundles React in production mode and optimizes the build for the best performance.
-
-The build is minified and the filenames include the hashes.\
-Your app is ready to be deployed!
-
-See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
-
-### `yarn eject`
-
-**Note: this is a one-way operation. Once you `eject`, you can’t go back!**
-
-If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
-
-Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
-
-You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.
-
-## Learn More
-
-You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
-
-To learn React, check out the [React documentation](https://reactjs.org/).
-
-### Code Splitting
-
-This section has moved here: [https://facebook.github.io/create-react-app/docs/code-splitting](https://facebook.github.io/create-react-app/docs/code-splitting)
-
-### Analyzing the Bundle Size
-
-This section has moved here: [https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size](https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size)
-
-### Making a Progressive Web App
-
-This section has moved here: [https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app](https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app)
-
-### Advanced Configuration
-
-This section has moved here: [https://facebook.github.io/create-react-app/docs/advanced-configuration](https://facebook.github.io/create-react-app/docs/advanced-configuration)
-
-### Deployment
-
-This section has moved here: [https://facebook.github.io/create-react-app/docs/deployment](https://facebook.github.io/create-react-app/docs/deployment)
-
-### `yarn build` fails to minify
-
-This section has moved here: [https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify](https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify)
+### standards to follow
+* two space indentation
+* images should have img_ prefix

package.json

@@ -1,54 +1,30 @@
 {
- "homepage": "/",
- "name": "bottlecrm",
+ "name": "workspace",
  "version": "0.1.0",
  "private": true,
  "dependencies": {
- "@babel/core": "^7.15.8",
- "@babel/preset-react": "^7.14.5",
- "@ckeditor/ckeditor5-build-classic": "^31.0.0",
- "@ckeditor/ckeditor5-react": "^3.0.3",
- "@sentry/react": "^6.13.3",
- "@sentry/tracing": "^6.13.3",
- "@testing-library/jest-dom": "^5.14.1",
- "@testing-library/react": "^12.1.2",
- "@testing-library/user-event": "^13.5.0",
- "antd": "^4.16.13",
- "axios": "^0.24.0",
- "babel-polyfill": "^6.26.0",
- "framer-motion": "^4.1.17",
- "html-react-parser": "^1.4.0",
- "html-webpack-plugin": "^4.5.2",
- "jodit-react": "^1.1.10",
- "moment": "^2.29.1",
- "react": "^17.0.2",
- "react-beautiful-dnd": "^13.1.0",
- "react-custom-scrollbars-2": "^4.4.0",
- "react-dom": "^17.0.2",
- "react-quill": "^2.0.0-beta.2",
- "react-redux": "^7.2.6",
- "react-router-dom": "^5.3.0",
- "react-scripts": "4.0.3",
- "redux": "^4.1.2",
- "redux-saga": "^1.1.3",
- "web-vitals": "^1.1.1",
- "webpack": "4.44.2",
- "webpack-cli": "^4.6.0",
- "webpack-dev-server": "3.11.1"
+ "@emotion/react": "^11.10.0",
+ "@emotion/styled": "^11.10.0",
+ "@mui/icons-material": "^5.8.4",
+ "@mui/material": "^5.10.0",
+ "@mui/styles": "^5.9.3",
+ "@testing-library/jest-dom": "^5.16.5",
+ "@testing-library/react": "^13.3.0",
+ "@testing-library/user-event": "^14.4.3",
+ "mui-quill": "0.1.0-alpha.3",
+ "react": "^18.2.0",
+ "react-dom": "^18.2.0",
+ "react-phone-number-input": "^3.2.7",
+ "react-router-dom": "^6.3.0",
+ "react-scripts": "5.0.0",
+ "validator": "^13.7.0",
+ "web-vitals": "^2.1.0"
  },
  "scripts": {
- "test": "react-scripts test",
- "eject": "react-scripts eject",
  "start": "react-scripts start",
- "serve": "webpack serve --config webpack.config.js --progress --profile --watch --content-base src/",
  "build": "react-scripts build",
- "eslint": "eslint src/**/*.js",
- "webpack-serve": "webpack-dev-server --mode development",
- "webpack-server": "npm run serve && node dist/server.js",
- "format": "prettier --write \"src/**/*.js\"",
- "eslint-fix": "eslint --fix \"src/**/*.js\"",
- "webpack-start": "webpack serve --mode development",
- "webpack-build": "webpack --mode production"
+ "test": "react-scripts test",
+ "eject": "react-scripts eject"
  },
  "eslintConfig": {
  "extends": [
@@ -67,8 +43,5 @@
  "last 1 firefox version",
  "last 1 safari version"
  ]
- },
- "devDependencies": {
- "cypress": "^8.7.0"
  }
 }

public/index.html

@@ -3,20 +3,19 @@
  <head>
  <meta charset="utf-8" />
  <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
+ <!-- <link rel="icon" href="/public/img_logo.png" /> -->
  <meta name="viewport" content="width=device-width, initial-scale=1" />
  <meta name="theme-color" content="#000000" />
  <meta
  name="description"
  content="Web site created using create-react-app"
  />
- <!-- <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" /> -->
+ <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
  <!--
  manifest.json provides metadata used when your web app is installed on a
  user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
  -->
  <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
- <link href="https://fonts.googleapis.com/css2?family=Roboto:wght@100;300;400;500;700;900&display=swap" rel="stylesheet">
-
  <!--
  Notice the use of %PUBLIC_URL% in the tags above.
  It will be replaced with the URL of the `public` folder during the build.
@@ -26,7 +25,7 @@
  work correctly both with client-side routing and a non-root public URL.
  Learn how to configure a non-root public URL by running `npm run build`.
  -->
- <title>BottleCRM - Free CRM for startups and enterprises</title> 
+ <title>Bottle CRM </title>
  </head>
  <body>
  <noscript>You need to enable JavaScript to run this app.</noscript>

src/App.js

@@ -1,43 +1,24 @@
-import React, { useEffect } from "react";
-import {
- Provider
-} from "react-redux";
-import store from "./redux/store";
-import {
- BrowserRouter as Router,
- Route,
- Switch,
- Redirect
-} from "react-router-dom";
-import 'antd/dist/antd.css'
-import "./assets/css/light-theme.css"
-import Login from './app/auth/Login'
-import Registration from './app/auth/Registration'
-import ForgotPassword from './app/auth/ForgotPassword'
-import ForgotPasswordDone from './app/auth/components/ForgotPasswordDone';
-import AppIndex from './app/Layout'
-import Companies from './app/Companies'
-// import './assets/css/index.css'
+import React from "react";
+import { BrowserRouter as Router, Routes, Route } from "react-router-dom";
+import { Registration } from "./containers/auth/Register";
+import { LogIn } from "./containers/auth/Login";
+import { ForgotPassword } from "./containers/auth/ForgotPassword";
+import { Home } from "./containers/Home/Home";
 
-function App() { 
-
- return ( 
- <div className="App">
- <Provider store={store}>
+function App() {
+ return (
+ <div>
  <Router>
- <Switch>
- <Route exact path="/register" component={Registration}/>
- <Route exact path="/login" component={Login} /> 
- <Route exact path="/reset-password-done" component={ForgotPasswordDone} />
- <Route exact path="/forgot-password" component={ForgotPassword} /> 
- <Route exact path="/companies-list" component={Companies}/> 
- <Route path="/home" component={AppIndex}/>
- {(window.location.pathname === '/') ? <Redirect to="/login" />: '' }
- </Switch>
+ <Routes>
+ <Route path="*" element={<Home />} />
+ <Route path="/register" element={<Registration />} />
+ <Route path="/login" element={<LogIn />} />
+ <Route path="/forgotpassword" element={<ForgotPassword />} />
+
+ </Routes>
  </Router>
- </Provider>
- </div> 
-);
+ </div>
+ );
 }
 
-export default App;
+export default App;