Skip to content

Commit

Permalink
Merge branch 'wireframe'
Browse files Browse the repository at this point in the history
  • Loading branch information
jsphkm committed Sep 15, 2018
2 parents 5c16557 + 6fdd001 commit e4e4403
Show file tree
Hide file tree
Showing 16 changed files with 579 additions and 194 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ npm-debug.log*
yarn-debug.log*
yarn-error.log*

/.vscode
/.vscode/
184 changes: 172 additions & 12 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"ajv": "^6.5.3",
"react": "^16.5.0",
"react-dom": "^16.5.0",
"react-router-dom": "^4.3.1",
"react-scripts": "1.1.5"
},
"scripts": {
Expand All @@ -13,4 +15,4 @@
"test": "react-scripts test --env=jsdom",
"eject": "react-scripts eject"
}
}
}
2 changes: 2 additions & 0 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<link rel='stylesheet' href='https://necolas.github.io/normalize.css/latest/normalize.css' />
<link href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900" rel="stylesheet">
<title>React App</title>
</head>
<body>
Expand Down
28 changes: 0 additions & 28 deletions src/App.css

This file was deleted.

21 changes: 0 additions & 21 deletions src/App.js

This file was deleted.

Loading

0 comments on commit e4e4403

Please sign in to comment.