Skip to content

Commit 13d87dd

Browse files
committed
Merge branch 'new-master'
2 parents 5ad242b + ad61944 commit 13d87dd

40 files changed

+8462
-7242
lines changed

netlify.toml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,3 @@
2222
# an active Deploy Preview will inherit these settings.
2323
[context.branch-deploy]
2424
command = "REACT_APP_STAGE=dev npm run build"
25-
26-
# Always redirect any request to our index.html
27-
# and return the status code 200.
28-
[[redirects]]
29-
from = "/*"
30-
to = "/index.html"
31-
status = 200

package-lock.json

Lines changed: 8175 additions & 6839 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,22 @@
11
{
2-
"name": "notes-client",
2+
"name": "notes-app-client",
33
"version": "0.1.0",
44
"private": true,
55
"dependencies": {
6-
"@sentry/browser": "^5.15.4",
7-
"aws-amplify": "^3.0.6",
8-
"react": "^16.13.1",
9-
"react-bootstrap": "^0.33.1",
10-
"react-dom": "^16.13.1",
6+
"@sentry/browser": "^5.27.3",
7+
"@testing-library/jest-dom": "^5.11.4",
8+
"@testing-library/react": "^11.1.0",
9+
"@testing-library/user-event": "^12.1.10",
10+
"aws-amplify": "^3.3.7",
11+
"react": "^17.0.1",
12+
"react-bootstrap": "^1.4.0",
13+
"react-dom": "^17.0.1",
14+
"react-icons": "^3.11.0",
1115
"react-router-bootstrap": "^0.25.0",
12-
"react-router-dom": "^5.1.2",
13-
"react-scripts": "3.4.1",
14-
"react-stripe-elements": "^6.1.1"
16+
"react-router-dom": "^5.2.0",
17+
"react-scripts": "4.0.0",
18+
"react-stripe-elements": "^6.1.2",
19+
"web-vitals": "^0.2.4"
1520
},
1621
"scripts": {
1722
"start": "react-scripts start",
@@ -20,7 +25,10 @@
2025
"eject": "react-scripts eject"
2126
},
2227
"eslintConfig": {
23-
"extends": "react-app"
28+
"extends": [
29+
"react-app",
30+
"react-app/jest"
31+
]
2432
},
2533
"browserslist": {
2634
"production": [

public/_redirects

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/* /index.html 200

public/android-chrome-192x192.png

0 Bytes
Loading

public/android-chrome-256x256.png

0 Bytes
Loading

public/apple-touch-icon.png

0 Bytes
Loading

public/favicon-16x16.png

0 Bytes
Loading

public/favicon-32x32.png

0 Bytes
Loading

public/index.html

Lines changed: 34 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,46 @@
33
<head>
44
<meta charset="utf-8" />
55
<meta name="viewport" content="width=device-width, initial-scale=1" />
6-
<link rel="apple-touch-icon" sizes="180x180" href="%PUBLIC_URL%/apple-touch-icon.png">
7-
<link rel="icon" type="image/png" href="%PUBLIC_URL%/favicon-32x32.png" sizes="32x32">
8-
<link rel="icon" type="image/png" href="%PUBLIC_URL%/favicon-16x16.png" sizes="16x16">
9-
<link rel="mask-icon" href="%PUBLIC_URL%/safari-pinned-tab.svg" color="#5bbad5">
6+
<link
7+
rel="apple-touch-icon"
8+
sizes="180x180"
9+
href="%PUBLIC_URL%/apple-touch-icon.png"
10+
/>
11+
<link
12+
rel="icon"
13+
type="image/png"
14+
href="%PUBLIC_URL%/favicon-32x32.png"
15+
sizes="32x32"
16+
/>
17+
<link
18+
rel="icon"
19+
type="image/png"
20+
href="%PUBLIC_URL%/favicon-16x16.png"
21+
sizes="16x16"
22+
/>
23+
<link
24+
rel="mask-icon"
25+
href="%PUBLIC_URL%/safari-pinned-tab.svg"
26+
color="#5bbad5"
27+
/>
1028
<meta name="description" content="A simple note taking app" />
11-
<meta name="theme-color" content="#ffffff">
29+
<meta name="theme-color" content="#ffffff" />
1230
<!--
1331
manifest.json provides metadata used when your web app is installed on a
1432
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
1533
-->
1634
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
17-
<link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=PT+Serif|Open+Sans:300,400,600,700,800">
18-
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
35+
<link
36+
rel="stylesheet"
37+
type="text/css"
38+
href="https://fonts.googleapis.com/css?family=PT+Serif|Open+Sans:300,400,600,700,800"
39+
/>
40+
<link
41+
rel="stylesheet"
42+
href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css"
43+
integrity="sha384-TX8t27EcRE3e/ihU7zmQxVncDAy5uIKz4rEkgIXeMed4M0jlfIDPvg6uqKI2xXr2"
44+
crossorigin="anonymous"
45+
/>
1946
<!--
2047
Notice the use of %PUBLIC_URL% in the tags above.
2148
It will be replaced with the URL of the `public` folder during the build.

0 commit comments

Comments
 (0)