Skip to content

Commit 6eecdb3

Browse files
authored
Merge branch 'master' into crmUser
2 parents 3d56bee + 93f99bf commit 6eecdb3

Some content is hidden

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

57 files changed

+3373
-4013
lines changed

package.json

Lines changed: 31 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,39 @@
22
"name": "bottlecrm",
33
"version": "0.1.0",
44
"private": true,
5+
"homepage": "https://bottlecrm.com/app",
56
"dependencies": {
7+
"@sentry/react": "^6.0.2",
8+
"@sentry/tracing": "^6.0.2",
69
"@testing-library/jest-dom": "^4.2.4",
710
"@testing-library/react": "^9.3.2",
811
"@testing-library/user-event": "^7.1.2",
912
"axios": "^0.21.0",
1013
"formik": "^2.2.5",
14+
"mini-css-extract-plugin": "^1.3.4",
1115
"moment": "^2.29.1",
16+
"npm": "^6.14.11",
1217
"react": "^16.13.1",
1318
"react-dom": "^16.13.1",
1419
"react-phone-input-2": "^2.13.9",
1520
"react-router-dom": "^5.2.0",
1621
"react-scripts": "3.4.1",
17-
"react-select": "^3.1.0"
22+
"react-select": "^3.1.0",
23+
"start": "^5.1.0"
1824
},
1925
"scripts": {
20-
"start": "react-scripts start",
21-
"build": "react-scripts build",
2226
"test": "react-scripts test",
2327
"eject": "react-scripts eject",
24-
"eslint": "eslint src/**/*.js"
28+
"start": "react-scripts start",
29+
"serve": "webpack serve --config webpack.config.js --progress --profile --watch --content-base src/",
30+
"build": "react-scripts build",
31+
"eslint": "eslint src/**/*.js",
32+
"webpack-serve": "webpack-dev-server --mode development",
33+
"webpack-server": "npm run serve && node dist/server.js",
34+
"format": "prettier --write \"src/**/*.js\"",
35+
"eslint-fix": "eslint --fix \"src/**/*.js\"",
36+
"webpack-start": "webpack serve --mode development --color --watch -open notepad.exe",
37+
"webpack-build": "webpack --mode production"
2538
},
2639
"eslintConfig": {
2740
"extends": "react-app"
@@ -39,13 +52,24 @@
3952
]
4053
},
4154
"devDependencies": {
42-
"eslint": "^7.5.0",
55+
"babel-core": "^6.26.3",
56+
"babel-loader": "8.1.0",
57+
"babel-plugin-transform-runtime": "^6.23.0",
58+
"babel-polyfill": "^6.26.0",
59+
"babel-preset-env": "^1.7.0",
60+
"babel-preset-react": "^6.24.1",
61+
"css-loader": "^5.0.1",
62+
"eslint": "^6.6.0",
4363
"eslint-config-standard": "^14.1.1",
4464
"eslint-plugin-import": "^2.22.0",
45-
"eslint-plugin-jsx-a11y": "^6.3.1",
4665
"eslint-plugin-node": "^11.1.0",
4766
"eslint-plugin-promise": "^4.2.1",
4867
"eslint-plugin-react": "^7.20.5",
49-
"eslint-plugin-standard": "^4.0.1"
68+
"eslint-plugin-standard": "^4.0.1",
69+
"html-webpack-plugin": "^4.5.1",
70+
"style-loader": "^2.0.0",
71+
"webpack": "4.42.0",
72+
"webpack-cli": "^4.4.0",
73+
"webpack-dev-server": "3.10.3"
5074
}
5175
}

public/index.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@
22
<html lang="en">
33
<head>
44
<meta charset="utf-8" />
5-
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
5+
<!-- <link rel="icon" href="%PUBLIC_URL%/favicon.ico" /> -->
66
<meta name="viewport" content="width=device-width, initial-scale=1" />
77
<meta name="theme-color" content="#000000" />
88
<meta
99
name="description"
1010
content="Web site created using create-react-app"
1111
/>
1212
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
13-
14-
<!-- <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.4.1/semantic.min.css"> -->
13+
14+
<link href="https://fonts.googleapis.com/css?family=Quicksand:300,400,500,700" rel="stylesheet">
1515
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/css/bootstrap.min.css">
1616
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/4.17.47/css/bootstrap-datetimepicker.min.css" />
17-
<link rel="stylesheet" href="https://pro.fontawesome.com/releases/v5.10.0/css/all.css" integrity="sha384-AYmEC3Yw5cVb3ZcuHtOA93w35dYTsvhLPVnYs9eStHfGJvOvKxVfELGroGkvsg+p" crossorigin="anonymous"/>
18-
<link rel="stylesheet" href="/main.css" />
17+
<link rel="stylesheet" href="/app/main.css" />
18+
<base href="/">
1919

2020
<!--
2121
manifest.json provides metadata used when your web app is installed on a

0 commit comments

Comments
 (0)