Skip to content

Commit a04b648

Browse files
committed
Merge branch 'new-master'
2 parents 1c542aa + b78b276 commit a04b648

29 files changed

+9613
-6183
lines changed

package-lock.json

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

package.json

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
{
2-
"name": "empty-client",
2+
"name": "notes-client",
33
"version": "0.1.0",
44
"private": true,
55
"dependencies": {
6-
"aws-amplify": "^1.1.40",
7-
"react": "^16.9.0",
8-
"react-bootstrap": "^0.32.4",
9-
"react-dom": "^16.9.0",
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",
1011
"react-router-bootstrap": "^0.25.0",
11-
"react-router-dom": "^5.0.1",
12-
"react-scripts": "3.1.2",
13-
"react-stripe-elements": "^5.0.1"
12+
"react-router-dom": "^5.1.2",
13+
"react-scripts": "3.4.1",
14+
"react-stripe-elements": "^6.1.1"
1415
},
1516
"scripts": {
1617
"start": "react-scripts start",

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: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
<link rel="mask-icon" href="%PUBLIC_URL%/safari-pinned-tab.svg" color="#5bbad5">
1010
<meta name="description" content="A simple note taking app" />
1111
<meta name="theme-color" content="#ffffff">
12-
<link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=PT+Serif|Open+Sans:300,400,600,700,800">
13-
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
1412
<!--
1513
manifest.json provides metadata used when your web app is installed on a
1614
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
1715
-->
1816
<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">
1919
<!--
2020
Notice the use of %PUBLIC_URL% in the tags above.
2121
It will be replaced with the URL of the `public` folder during the build.
@@ -26,7 +26,6 @@
2626
Learn how to configure a non-root public URL by running `npm run build`.
2727
-->
2828
<title>Scratch - A simple note taking app</title>
29-
3029
<script src="https://js.stripe.com/v3/"></script>
3130
</head>
3231
<body>

public/manifest.json

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,20 @@
11
{
2-
"short_name": "React App",
3-
"name": "Create React App Sample",
2+
"short_name": "Scratch",
3+
"name": "Scratch Note Taking App",
44
"icons": [
55
{
6-
"src": "favicon.ico",
7-
"sizes": "64x64 32x32 24x24 16x16",
8-
"type": "image/x-icon"
6+
"src": "android-chrome-192x192.png",
7+
"sizes": "192x192",
8+
"type": "image/png"
99
},
1010
{
11-
"src": "logo192.png",
12-
"type": "image/png",
13-
"sizes": "192x192"
14-
},
15-
{
16-
"src": "logo512.png",
17-
"type": "image/png",
18-
"sizes": "512x512"
11+
"src": "android-chrome-256x256.png",
12+
"sizes": "256x256",
13+
"type": "image/png"
1914
}
2015
],
2116
"start_url": ".",
2217
"display": "standalone",
23-
"theme_color": "#000000",
18+
"theme_color": "#ffffff",
2419
"background_color": "#ffffff"
2520
}

public/mstile-150x150.png

0 Bytes
Loading

0 commit comments

Comments
 (0)