Skip to content

Commit 60a755b

Browse files
authored
Merge pull request #18 from MicroPyramid/new_release
new release
2 parents b961f94 + 3e54ec0 commit 60a755b

File tree

185 files changed

+28904
-6275
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

185 files changed

+28904
-6275
lines changed

.gitignore

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@
1111
# production
1212
/build
1313

14-
# Cache
15-
.eslintcache
16-
1714
# misc
1815
.DS_Store
1916
.env.local
@@ -24,11 +21,5 @@
2421
npm-debug.log*
2522
yarn-debug.log*
2623
yarn-error.log*
27-
yarn.lock
28-
package-lock.json
29-
30-
# env
3124
.env
32-
33-
# cypress
34-
/cypress
25+
package-lock.json

ENV.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# List of env variables
2+
3+
API_BASE_URL= "https://api.bottle-dev.com/"

README.md

Lines changed: 4 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,5 @@
1-
# Getting Started with Create React App
1+
# React CRM (bottlecrm.com)
22

3-
This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
4-
5-
## Available Scripts
6-
7-
In the project directory, you can run:
8-
9-
### `yarn start`
10-
11-
Runs the app in the development mode.\
12-
Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
13-
14-
The page will reload if you make edits.\
15-
You will also see any lint errors in the console.
16-
17-
### `yarn test`
18-
19-
Launches the test runner in the interactive watch mode.\
20-
See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
21-
22-
### `yarn build`
23-
24-
Builds the app for production to the `build` folder.\
25-
It correctly bundles React in production mode and optimizes the build for the best performance.
26-
27-
The build is minified and the filenames include the hashes.\
28-
Your app is ready to be deployed!
29-
30-
See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
31-
32-
### `yarn eject`
33-
34-
**Note: this is a one-way operation. Once you `eject`, you can’t go back!**
35-
36-
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.
37-
38-
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.
39-
40-
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.
41-
42-
## Learn More
43-
44-
You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
45-
46-
To learn React, check out the [React documentation](https://reactjs.org/).
47-
48-
### Code Splitting
49-
50-
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)
51-
52-
### Analyzing the Bundle Size
53-
54-
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)
55-
56-
### Making a Progressive Web App
57-
58-
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)
59-
60-
### Advanced Configuration
61-
62-
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)
63-
64-
### Deployment
65-
66-
This section has moved here: [https://facebook.github.io/create-react-app/docs/deployment](https://facebook.github.io/create-react-app/docs/deployment)
67-
68-
### `yarn build` fails to minify
69-
70-
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)
3+
### standards to follow
4+
* two space indentation
5+
* images should have img_ prefix

cypress.json

Lines changed: 0 additions & 1 deletion
This file was deleted.

package.json

Lines changed: 19 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,30 @@
11
{
2-
"homepage": "/",
3-
"name": "bottlecrm",
2+
"name": "workspace",
43
"version": "0.1.0",
54
"private": true,
65
"dependencies": {
7-
"@babel/core": "^7.15.8",
8-
"@babel/preset-react": "^7.14.5",
9-
"@ckeditor/ckeditor5-build-classic": "^31.0.0",
10-
"@ckeditor/ckeditor5-react": "^3.0.3",
11-
"@sentry/react": "^6.13.3",
12-
"@sentry/tracing": "^6.13.3",
13-
"@testing-library/jest-dom": "^5.14.1",
14-
"@testing-library/react": "^12.1.2",
15-
"@testing-library/user-event": "^13.5.0",
16-
"antd": "^4.16.13",
17-
"axios": "^0.24.0",
18-
"babel-polyfill": "^6.26.0",
19-
"framer-motion": "^4.1.17",
20-
"html-react-parser": "^1.4.0",
21-
"html-webpack-plugin": "^4.5.2",
22-
"jodit-react": "^1.1.10",
23-
"moment": "^2.29.1",
24-
"react": "^17.0.2",
25-
"react-beautiful-dnd": "^13.1.0",
26-
"react-custom-scrollbars-2": "^4.4.0",
27-
"react-dom": "^17.0.2",
28-
"react-quill": "^2.0.0-beta.2",
29-
"react-redux": "^7.2.6",
30-
"react-router-dom": "^5.3.0",
31-
"react-scripts": "4.0.3",
32-
"redux": "^4.1.2",
33-
"redux-saga": "^1.1.3",
34-
"web-vitals": "^1.1.1",
35-
"webpack": "4.44.2",
36-
"webpack-cli": "^4.6.0",
37-
"webpack-dev-server": "3.11.1"
6+
"@emotion/react": "^11.10.0",
7+
"@emotion/styled": "^11.10.0",
8+
"@mui/icons-material": "^5.8.4",
9+
"@mui/material": "^5.10.0",
10+
"@mui/styles": "^5.9.3",
11+
"@testing-library/jest-dom": "^5.16.5",
12+
"@testing-library/react": "^13.3.0",
13+
"@testing-library/user-event": "^14.4.3",
14+
"mui-quill": "0.1.0-alpha.3",
15+
"react": "^18.2.0",
16+
"react-dom": "^18.2.0",
17+
"react-phone-number-input": "^3.2.7",
18+
"react-router-dom": "^6.3.0",
19+
"react-scripts": "5.0.0",
20+
"validator": "^13.7.0",
21+
"web-vitals": "^2.1.0"
3822
},
3923
"scripts": {
40-
"test": "react-scripts test",
41-
"eject": "react-scripts eject",
4224
"start": "react-scripts start",
43-
"serve": "webpack serve --config webpack.config.js --progress --profile --watch --content-base src/",
4425
"build": "react-scripts build",
45-
"eslint": "eslint src/**/*.js",
46-
"webpack-serve": "webpack-dev-server --mode development",
47-
"webpack-server": "npm run serve && node dist/server.js",
48-
"format": "prettier --write \"src/**/*.js\"",
49-
"eslint-fix": "eslint --fix \"src/**/*.js\"",
50-
"webpack-start": "webpack serve --mode development",
51-
"webpack-build": "webpack --mode production"
26+
"test": "react-scripts test",
27+
"eject": "react-scripts eject"
5228
},
5329
"eslintConfig": {
5430
"extends": [
@@ -67,8 +43,5 @@
6743
"last 1 firefox version",
6844
"last 1 safari version"
6945
]
70-
},
71-
"devDependencies": {
72-
"cypress": "^8.7.0"
7346
}
7447
}

public/css/light-theme.css

Lines changed: 0 additions & 3 deletions
This file was deleted.

public/favicon.ico

16.5 KB
Binary file not shown.
File renamed without changes.

public/index.html

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,19 @@
33
<head>
44
<meta charset="utf-8" />
55
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
6+
<!-- <link rel="icon" href="/public/img_logo.png" /> -->
67
<meta name="viewport" content="width=device-width, initial-scale=1" />
78
<meta name="theme-color" content="#000000" />
89
<meta
910
name="description"
1011
content="Web site created using create-react-app"
1112
/>
12-
<!-- <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" /> -->
13+
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
1314
<!--
1415
manifest.json provides metadata used when your web app is installed on a
1516
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
1617
-->
1718
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
18-
<link href="https://fonts.googleapis.com/css2?family=Roboto:wght@100;300;400;500;700;900&display=swap" rel="stylesheet">
19-
2019
<!--
2120
Notice the use of %PUBLIC_URL% in the tags above.
2221
It will be replaced with the URL of the `public` folder during the build.
@@ -26,7 +25,7 @@
2625
work correctly both with client-side routing and a non-root public URL.
2726
Learn how to configure a non-root public URL by running `npm run build`.
2827
-->
29-
<title>BottleCRM - Free CRM for startups and enterprises</title>
28+
<title>Bottle CRM </title>
3029
</head>
3130
<body>
3231
<noscript>You need to enable JavaScript to run this app.</noscript>

src/App.css

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)