Skip to content

Commit 538640f

Browse files
jayairjayair
committed
Merge branch 'master-new'
2 parents 35f1062 + f27c42e commit 538640f

31 files changed

+6967
-6052
lines changed

‎package-lock.json‎

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

‎package.json‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,14 @@
33
"version": "0.1.0",
44
"private": true,
55
"dependencies": {
6-
"amazon-cognito-identity-js": "^1.16.0",
7-
"aws-sdk": "^2.83.0",
6+
"amazon-cognito-identity-js": "^1.19.0",
7+
"aws-sdk": "^2.100.0",
88
"crypto-js": "^3.1.9-1",
9-
"react": "^15.5.4",
10-
"react-bootstrap": "^0.31.0",
11-
"react-dom": "^15.5.4",
12-
"react-router-dom": "^4.1.1"
13-
},
14-
"devDependencies": {
15-
"react-scripts": "1.0.2"
9+
"react": "^15.6.1",
10+
"react-bootstrap": "^0.31.2",
11+
"react-dom": "^15.6.1",
12+
"react-router-dom": "^4.1.2",
13+
"react-scripts": "1.0.11"
1614
},
1715
"scripts": {
1816
"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: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,34 @@
22
<html lang="en">
33
<head>
44
<meta charset="utf-8">
5-
<meta name="viewport" content="width=device-width, initial-scale=1">
6-
7-
<!-- Favicon -->
5+
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
6+
<!--
7+
manifest.json provides metadata used when your web app is added to the
8+
homescreen on Android. See https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/
9+
-->
10+
<link rel="manifest" href="%PUBLIC_URL%/manifest.json">
811
<link rel="apple-touch-icon" sizes="180x180" href="%PUBLIC_URL%/apple-touch-icon.png">
912
<link rel="icon" type="image/png" href="%PUBLIC_URL%/favicon-32x32.png" sizes="32x32">
1013
<link rel="icon" type="image/png" href="%PUBLIC_URL%/favicon-16x16.png" sizes="16x16">
11-
<link rel="manifest" href="%PUBLIC_URL%/manifest.json">
1214
<link rel="mask-icon" href="%PUBLIC_URL%/safari-pinned-tab.svg" color="#5bbad5">
1315
<meta name="theme-color" content="#ffffff">
14-
15-
<!-- Fonts -->
16-
<link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=PT+Serif|Open+Sans:300,400,600,700,800">
17-
18-
<!-- Bootstrap -->
19-
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/latest/css/bootstrap.min.css">
20-
2116
<!--
22-
Notice the use of %PUBLIC_URL% in the tag above.
17+
Notice the use of %PUBLIC_URL% in the tags above.
2318
It will be replaced with the URL of the `public` folder during the build.
2419
Only files inside the `public` folder can be referenced from the HTML.
2520
2621
Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
2722
work correctly both with client-side routing and a non-root public URL.
2823
Learn how to configure a non-root public URL by running `npm run build`.
2924
-->
25+
<link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=PT+Serif|Open+Sans:300,400,600,700,800">
26+
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/latest/css/bootstrap.min.css">
3027
<title>Scratch - A simple note taking app</title>
3128
</head>
3229
<body>
30+
<noscript>
31+
You need to enable JavaScript to run this app.
32+
</noscript>
3333
<div id="root"></div>
3434
<!--
3535
This HTML file is a template.
@@ -38,8 +38,8 @@
3838
You can add webfonts, meta tags, or analytics to this file.
3939
The build step will place the bundled scripts into the <body> tag.
4040
41-
To begin the development, run `npm start`.
42-
To create a production bundle, use `npm run build`.
41+
To begin the development, run `npm start` or `yarn start`.
42+
To create a production bundle, use `npm run build` or `yarn build`.
4343
-->
4444
</body>
4545
</html>

‎public/manifest.json‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
{
2-
"name": "",
3-
"icons": [
4-
{
5-
"src": "/android-chrome-192x192.png",
6-
"sizes": "192x192",
7-
"type": "image/png"
8-
},
9-
{
10-
"src": "/android-chrome-256x256.png",
11-
"sizes": "256x256",
12-
"type": "image/png"
13-
}
14-
],
15-
"theme_color": "#ffffff",
16-
"background_color": "#ffffff",
17-
"display": "standalone"
18-
}
2+
"short_name": "Scratch",
3+
"name": "Scratch Note Taking App",
4+
"icons": [
5+
{
6+
"src": "android-chrome-192x192.png",
7+
"sizes": "192x192",
8+
"type": "image/png"
9+
},
10+
{
11+
"src": "android-chrome-256x256.png",
12+
"sizes": "256x256",
13+
"type": "image/png"
14+
}
15+
],
16+
"start_url": "./index.html",
17+
"display": "standalone",
18+
"theme_color": "#ffffff",
19+
"background_color": "#ffffff"
20+
}

‎public/mstile-150x150.png‎

0 Bytes
Loading

0 commit comments

Comments
 (0)