Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@
npm-debug.log*
yarn-debug.log*
yarn-error.log*
.idea
11 changes: 11 additions & 0 deletions .idea/calculator.iml

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

7 changes: 7 additions & 0 deletions .idea/misc.xml

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

8 changes: 8 additions & 0 deletions .idea/modules.xml

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

6 changes: 6 additions & 0 deletions .idea/vcs.xml

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

577 changes: 577 additions & 0 deletions .idea/workspace.xml

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -1863,7 +1863,7 @@ If your production web server does not support HTTPS, then the service worker
registration will fail, but the rest of your web app will remain functional.

1. Service workers are [not currently supported](https://jakearchibald.github.io/isserviceworkerready/)
in all web browsers. Service worker registration [won't be attempted](src/registerServiceWorker.js)
in all web browsers. Service worker registration [won't be attempted](src/js/registerServiceWorker.js)
on browsers that lack support.

1. The service worker is only enabled in the [production environment](#deployment),
Expand Down Expand Up @@ -1897,7 +1897,7 @@ app works offline!" message) and also let them know when the service worker has
fetched the latest updates that will be available the next time they load the
page (showing a "New content is available; please refresh." message). Showing
this messages is currently left as an exercise to the developer, but as a
starting point, you can make use of the logic included in [`src/registerServiceWorker.js`](src/registerServiceWorker.js), which
starting point, you can make use of the logic included in [`src/registerServiceWorker.js`](src/js/registerServiceWorker.js), which
demonstrates which service worker lifecycle events to listen for to detect each
scenario, and which as a default, just logs appropriate messages to the
JavaScript console.
Expand Down
72 changes: 72 additions & 0 deletions package-lock.json

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

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"dependencies": {
"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 +14,4 @@
"test": "react-scripts test --env=jsdom",
"eject": "react-scripts eject"
}
}
}
21 changes: 0 additions & 21 deletions src/App.js

This file was deleted.

File renamed without changes.
31 changes: 31 additions & 0 deletions src/css/Button.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
.square {
background: #fff;
border: 1px solid #999;
float: left;
font-size: 30px;
font-weight: bold;
line-height: 68px;
height: 68px;
margin-right: -1px;
margin-top: -1px;
padding: 0;
text-align: center;
width: 68px;
}

.square:focus {
outline: none;
}

.digit {
color: black;
}

.operation {
color: white;
background-color: salmon;
}

.double {
width: 136px;
}
19 changes: 19 additions & 0 deletions src/css/Screen.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
.screen {
background: #433437;
color: white;
border: 1px solid #999;
float: left;
font-size: 24px;
font-weight: bold;
line-height: 68px;
height: 68px;
margin-right: -1px;
margin-top: -1px;
padding-right: 10px;
text-align: right;
width: 257px;
}

.screen:focus {
outline: none;
}
43 changes: 43 additions & 0 deletions src/css/index.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
body {
font: 14px "Century Gothic", Futura, sans-serif;
margin: 20px;
}

ol, ul {
padding-left: 30px;
}

.board-row:after {
clear: both;
content: "";
display: table;
}

.clear {
background: #fff;
border: 1px solid #999;
float: left;
font-size: 24px;
font-weight: bold;
line-height: 68px;
height: 68px;
margin-right: -1px;
margin-top: -1px;
padding: 0;
text-align: center;
width: 135px;
}

.clear:focus {
outline: none;
}

.kbd-navigation .square:focus {
background: #ddd;
}

.game {
display: flex;
flex-direction: row;
}

5 changes: 0 additions & 5 deletions src/index.css

This file was deleted.

14 changes: 10 additions & 4 deletions src/index.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
import React from 'react';
import ReactDOM from 'react-dom';
import './index.css';
import App from './App';
import registerServiceWorker from './registerServiceWorker';
import './css/index.css';
import App from './js/App';
import { BrowserRouter } from 'react-router-dom'
import registerServiceWorker from './js/registerServiceWorker';

ReactDOM.render((
<BrowserRouter>
<App />
</BrowserRouter>
), document.getElementById('root'));

ReactDOM.render(<App />, document.getElementById('root'));
registerServiceWorker();
Loading