Upgrade application with newest Create-react-app

Author: janzh

package-lock.json

@@ -1,28 +1,38 @@
 {
-  "name": "taxcalc",
-  "version": "1.0.0",
-  "description": "React tax calculator",
-  "keywords": [],
-  "main": "src/index.js",
+  "name": "tax-calculator",
+  "version": "0.1.0",
+  "private": true,
   "dependencies": {
-    "prettier": "^2.2.1",
-    "react": "16.8.6",
-    "react-dom": "16.8.6",
-    "react-scripts": "2.1.8"
-  },
-  "devDependencies": {
-    "typescript": "3.3.3"
+    "@testing-library/jest-dom": "^5.11.4",
+    "@testing-library/react": "^11.1.0",
+    "@testing-library/user-event": "^12.1.10",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2",
+    "react-scripts": "4.0.3",
+    "web-vitals": "^1.0.1"
   },
   "scripts": {
     "start": "react-scripts start",
     "build": "react-scripts build",
-    "test": "react-scripts test --env=jsdom",
+    "test": "react-scripts test",
     "eject": "react-scripts eject"
   },
-  "browserslist": [
-    ">0.2%",
-    "not dead",
-    "not ie <= 11",
-    "not op_mini all"
-  ]
+  "eslintConfig": {
+    "extends": [
+      "react-app",
+      "react-app/jest"
+    ]
+  },
+  "browserslist": {
+    "production": [
+      ">0.2%",
+      "not dead",
+      "not op_mini all"
+    ],
+    "development": [
+      "last 1 chrome version",
+      "last 1 firefox version",
+      "last 1 safari version"
+    ]
+  }
 }

package.json

@@ -0,0 +1,25 @@
+{
+  "short_name": "React App",
+  "name": "Create React App Sample",
+  "icons": [
+    {
+      "src": "favicon.ico",
+      "sizes": "64x64 32x32 24x24 16x16",
+      "type": "image/x-icon"
+    },
+    {
+      "src": "logo192.png",
+      "type": "image/png",
+      "sizes": "192x192"
+    },
+    {
+      "src": "logo512.png",
+      "type": "image/png",
+      "sizes": "512x512"
+    }
+  ],
+  "start_url": ".",
+  "display": "standalone",
+  "theme_color": "#000000",
+  "background_color": "#ffffff"
+}

public/favicon.ico

@@ -0,0 +1,3 @@
+# https://www.robotstxt.org/robotstxt.html
+User-agent: *
+Disallow:

public/logo192.png

@@ -0,0 +1,13 @@
+.App {
+  text-align: center;
+}
+
+.App-logo {
+  margin-top: 12em;
+  height: 40vmin;
+  pointer-events: none;
+}
+
+.App-link {
+  color: #61dafb;
+}

public/logo512.png

@@ -0,0 +1,17 @@
+import trinnskatt from '../trinnskatt.png';
+import '../App.css';
+
+const App = () => {
+  return (
+    <div className="App">
+        <h1>Kalkulator for trinnskatt</h1>
+        <div>
+
+        </div>
+
+        <img src={trinnskatt} className="App-logo" alt="logo" />
+    </div>
+  );
+}
+
+export default App;

public/manifest.json

@@ -17,6 +17,6 @@ import React from "react";
  *
  */
 
-export const calculateTrinnskatt = (salary) => {
-  return -1;
-}
+export const calculateTrinnskatt = (inntekt) => {
+    return -1;
+}

public/robots.txt

@@ -0,0 +1,20 @@
+import { calculateTrinnskatt } from "./calculator";
+
+describe("CalculatorComponent", () => {
+
+    it("calculateTrinnskatt should return 0 when salary is 100 000 kroner", () => {
+        expect(calculateTrinnskatt(100000)).toBe(0);
+    });
+
+    // it("calculateTrinnskatt should return 494 when salary is 200 000 kroner", () => {
+    //     expect(calculateTrinnskatt(200000)).toBe(494);
+    // });
+
+    // it("calculateTrinnskatt should return 3644 when salary is 300 000 kroner", () => {
+    //     expect(calculateTrinnskatt(300000)).toBe(3644);
+    // });
+
+    // it("calculateTrinnskatt should return 27 869 when salary is 700 000 kroner", () => {
+    //     expect(calculateTrinnskatt(700000)).toBe(27869);
+    // });
+});

src/App.css

@@ -0,0 +1,13 @@
+body {
+  margin: 0;
+  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
+    'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
+    sans-serif;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+code {
+  font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
+    monospace;
+}

src/app/App.js

@@ -1,13 +1,17 @@
-import React from "react";
-import ReactDOM from "react-dom";
+import React from 'react';
+import ReactDOM from 'react-dom';
+import './index.css';
+import App from './app/App';
+import reportWebVitals from './reportWebVitals';
 
-const App = () => {
-  return (
-    <div className="App">
-        <div>Trinnskattskalkulator</div>
-    </div>
-  );
-}
+ReactDOM.render(
+  <React.StrictMode>
+    <App />
+  </React.StrictMode>,
+  document.getElementById('root')
+);
 
-const rootElement = document.getElementById("root");
-ReactDOM.render(<App />, rootElement);
+// If you want to start measuring performance in your app, pass a function
+// to log results (for example: reportWebVitals(console.log))
+// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
+reportWebVitals();

src/calculator.js src/app/calculator.js

@@ -0,0 +1,13 @@
+const reportWebVitals = onPerfEntry => {
+  if (onPerfEntry && onPerfEntry instanceof Function) {
+    import('web-vitals').then(({ getCLS, getFID, getFCP, getLCP, getTTFB }) => {
+      getCLS(onPerfEntry);
+      getFID(onPerfEntry);
+      getFCP(onPerfEntry);
+      getLCP(onPerfEntry);
+      getTTFB(onPerfEntry);
+    });
+  }
+};
+
+export default reportWebVitals;

src/app/calculator.test.js

@@ -0,0 +1,5 @@
+// jest-dom adds custom jest matchers for asserting on DOM nodes.
+// allows you to do things like:
+// expect(element).toHaveTextContent(/react/i)
+// learn more: https://github.com/testing-library/jest-dom
+import '@testing-library/jest-dom';