Merge pull request #97 from wang3101/feature

Package.json

Author: ronellecaguioa

app/components/Applications.tsx

@@ -54,7 +54,10 @@ const Applications = () => {
       backgroundColor: 'rgba(33, 34, 41, 0.2)',
       border: '3px ridge #808080',
       boxShadow: '0 10px 10px rgba(0,0,0,0.5)',
-      '&:hover, &.Mui-focusVisible': { color: 'white', background: 'rgba(33, 34, 41, 1.2)' },
+      '&:hover, &.Mui-focusVisible': {
+        color: 'white',
+        background: 'rgba(33, 34, 41, 1.2)',
+      },
     },
     hover: {
       position: 'relative',

app/components/Splash.tsx

@@ -13,7 +13,7 @@ const Splash: React.FC<SplashProps> = ({ setFirstVisit }) => {
 
   return (
     <div id="splash">
-      <img src={'../assets/icons/icon.png'} alt="Chronos Logo" />
+      <img src={'../assets/icon.png'} alt="Chronos Logo" />
       <span>chronos</span>
     </div>
   );

package.json

@@ -32,35 +32,30 @@
     "@fortawesome/fontawesome-svg-core": "^1.2.28",
     "@fortawesome/free-solid-svg-icons": "^5.13.0",
     "@fortawesome/react-fontawesome": "^0.1.9",
-    "@jest-runner/electron": "^2.0.3",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
-    "@types/react-test-renderer": "^16.9.2",
     "chart.js": "^2.8.0",
     "d3": "^5.16.0",
     "electron": "^6.1.11",
-    "electron-devtools-installer": "^3.0.0",
     "express": "^4.17.1",
-    "ify-loader": "^1.1.0",
     "moment": "^2.27.0",
     "mongodb": "^3.5.7",
     "mongoose": "^5.9.13",
     "pg": "^7.18.2",
     "plotly.js": "^1.54.1",
     "plotly.js-dist": "^1.54.1",
     "react": "16.10.1",
-    "react-chartjs-2": "^2.9.0",
     "react-dom": "16.10.1",
     "react-plotly.js": "^2.4.0",
     "react-router-dom": "^5.2.0",
-    "ttf-loader": "^1.0.2",
     "webdriverio": "^6.1.25"
   },
   "devDependencies": {
     "@babel/core": "^7.10.1",
     "@babel/plugin-proposal-class-properties": "^7.8.3",
     "@babel/preset-env": "^7.10.1",
     "@babel/preset-react": "^7.9.4",
+    "@jest-runner/electron": "^2.0.3",
     "@types/chai": "^4.2.11",
     "@types/electron": "^1.6.10",
     "@types/electron-devtools-installer": "^2.2.0",
@@ -74,10 +69,12 @@
     "@types/react-dom": "^16.9.8",
     "@types/react-plotly.js": "^2.2.4",
     "@types/react-router-dom": "^5.1.5",
+    "@types/react-test-renderer": "^16.9.2",
     "awesome-typescript-loader": "^5.2.1",
     "babel-eslint": "^10.1.0",
     "babel-loader": "^8.1.0",
     "css-loader": "^3.5.3",
+    "electron-devtools-installer": "^3.0.0",
     "enzyme": "^3.11.0",
     "enzyme-adapter-react-16": "^1.15.2",
     "eslint": "^6.8.0",
@@ -89,6 +86,7 @@
     "eslint-plugin-react": "^7.19.0",
     "file-loader": "^4.3.0",
     "html-webpack-plugin": "^3.2.0",
+    "ify-loader": "^1.1.0",
     "image-webpack-loader": "^6.0.0",
     "jest": "^26.1.0",
     "jest-config": "^26.1.0",