kronthto · dependabot · Dec 7, 2019 · Dec 7, 2019 · Dec 7, 2019 · Dec 8, 2019
diff --git a/README.md b/README.md
@@ -13,6 +13,8 @@ npm run build
 npm run start:server
 ```
 
+For the Push Notifications we sadly need a manual edit of the webpack config and add `importScripts: ['pushSw.js'],` to `GenerateSW`
+
 ## Technologies
 
 * React

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -3,26 +3,28 @@
   "version": "0.1.0",
   "private": true,
   "devDependencies": {
-    "@babel/core": "^7.6.2",
-    "@babel/register": "^7.6.2",
+    "@babel/core": "^7.7.5",
+    "@babel/register": "^7.7.4",
     "husky": "^0.14.3",
     "lint-staged": "^6.1.1",
     "prettier": "1.7.4",
-    "react-scripts": "3.0.1"
+    "react-scripts": "3.0.1",
+    "webpack-bundle-analyzer": "^3.6.0"
   },
   "dependencies": {
-    "@babel/plugin-proposal-class-properties": "^7.5.5",
-    "@babel/plugin-syntax-dynamic-import": "^7.2.0",
-    "@babel/preset-env": "^7.6.2",
+    "@babel/plugin-proposal-class-properties": "^7.7.4",
+    "@babel/plugin-syntax-dynamic-import": "^7.7.4",
+    "@babel/preset-env": "^7.7.5",
     "aceonline-framebreak": "^1.1.0",
     "aceonline-stats": "^1.2.0",
     "body-parser": "^1.19.0",
-    "bulma": "0.6.0",
-    "chart.js": "^2.8.0",
+    "bulma": "^0.8.0",
+    "chart.js": "^2.9.3",
     "classnames": "^2.2.6",
     "compression": "^1.7.4",
     "cross-env": "^5.2.1",
-    "date-fns": "^1.30.1",
+    "date-fns": "^2.10.0",
+    "date-fns-tz": "^1.0.10",
     "es6-promise": "^4.2.8",
     "express": "^4.17.1",
     "fetch-everywhere": "^1.0.5",
@@ -36,20 +38,20 @@
     "marked": "^0.7.0",
     "morgan": "^1.9.1",
     "prop-types": "^15.7.2",
-    "react": "^16.8.6",
+    "react": "^16.12.0",
     "react-async-bootstrapper": "^2.1.1",
     "react-async-component": "^2.0.0",
     "react-chartjs-2": "^2.8.0",
-    "react-dom": "^16.8.6",
+    "react-dom": "^16.12.0",
     "react-flatpickr": "^3.9.1",
     "react-helmet": "^5.2.1",
-    "react-redux": "^5.1.1",
+    "react-redux": "^5.1.2",
     "react-router-config": "^1.0.0-beta.4",
     "react-router-dom": "^4.3.1",
     "redux": "^3.7.2",
     "redux-persist": "^4.10.2",
     "redux-thunk": "^2.3.0",
-    "serialize-javascript": "^1.9.1",
+    "serialize-javascript": "^2.1.1",
     "serve-favicon": "^2.5.0"
   },
   "lint-staged": {

diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/humans.txt b/public/humans.txt
diff --git a/public/img/icon.png b/public/img/icon.png
diff --git a/public/img/logo.png b/public/img/logo.png
diff --git a/public/index.html b/public/index.html
@@ -4,21 +4,22 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1,shrink-to-fit=no">
-    <meta name="theme-color" content="#4a4cff">
+    <meta name="theme-color" content="#006488">
     <!--
       manifest.json provides metadata used when your web app is added to the
       homescreen on Android. See https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/
     -->
     <link rel="manifest" href="%PUBLIC_URL%/manifest.json">
-    <link rel="icon" href="%PUBLIC_URL%/favicon.ico">
     <meta name="mobile-web-app-capable" content="yes">
     <meta name="language" content="en">
     <link rel="dns-prefetch" href="https://api.vi0lation.de" />
+    <link rel="preconnect" href="https://api.vi0lation.de" />
+    <link rel="dns-prefetch" href="https://cr-api.vi0.de" />
+    <link rel="preconnect" href="https://cr-api.vi0.de" />
     {{HELMET_HEAD}}
     <!--[if IE]>
     <link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet" crossorigin="anonymous">
     <![endif]-->
-    <!-- TODO <link type="text/plain" rel="author" href="https://www.vi0lation.de/humans.txt"> -->
   </head>
   <body>
     <div id="root">{{SSR}}</div>

diff --git a/public/manifest.json b/public/manifest.json
@@ -1,24 +1,16 @@
 {
-  "short_name": "Vi0",
-  "name": "Vi0lation",
+  "short_name": "CRT",
+  "name": "CR Tools",
   "icons": [
     {
-      "src": "https://cdn.vi0lation.de/img/app_icon.png",
-      "sizes": "144x144",
-      "type": "image/png"
-    },
-    {
-      "src": "favicon.ico"
-    },
-    {
-      "src": "https://cdn.vi0lation.de/img/viologo.png",
-      "sizes": "72x36",
+      "src": "img/logo.png",
+      "sizes": "512x512",
       "type": "image/png"
     }
   ],
   "start_url": "./",
   "display": "standalone",
-  "theme_color": "#4a4cff",
+  "theme_color": "#006488",
   "background_color": "#ffffff",
-  "description": "Vi0lation brigade website and AirRivals ranking"
+  "description": "ChromeRivals tools, statistics, tracking"
 }
diff --git a/public/pushSw.js b/public/pushSw.js
@@ -0,0 +1,47 @@
+var notificationPushAllowOverride = [
+  'badge',
+  'body',
+  'icon',
+  'tag',
+  'image',
+  'lang'
+];
+
+self.addEventListener('push', function(event) {
+  if (!(self.Notification && self.Notification.permission === 'granted')) {
+    return;
+  }
+
+  const sendNotification = data => {
+    let title = 'CR Event'; // TODO: Dynamic
+
+    let pushoptions = {
+      body: data.text,
+      icon: 'img/logo.png',
+      badge: 'img/icon.png',
+      data
+    };
+    notificationPushAllowOverride.forEach(function(prop) {
+      if (typeof data[prop] !== 'undefined') {
+        pushoptions[prop] = data[prop];
+      }
+    });
+    if (typeof data.title !== 'undefined') {
+      title = data.title;
+    }
+
+    return self.registration.showNotification(title, pushoptions);
+  };
+
+  if (event.data) {
+    let data;
+    try {
+      data = event.data.json();
+    } catch (e) {
+      data = { text: event.data.text() };
+    }
+    event.waitUntil(sendNotification(data));
+  } else {
+    event.waitUntil(sendNotification({ text: 'no details (weird error)' })); // We always need to show a notif on push, so display something to be safe
+  }
+});
diff --git a/public/robots.txt b/public/robots.txt
@@ -1,5 +1,2 @@
 User-agent: *
 Disallow: 
-
-# TODO
-# SITEMAP: https://www.vi0lation.de/sitemap.xml
diff --git a/public/sitemap.xml b/public/sitemap.xml
diff --git a/server/app.js b/server/app.js
@@ -20,7 +20,7 @@ const { indexhtmlDirect } = require('./indexhtml')
 const app = express()
 
 // Server favicon before to not show up in logs
-app.use(favicon(path.join(__dirname, '../build', 'favicon.ico')))
+//app.use(favicon(path.join(__dirname, '../build', 'icon.png')))
 
 // Setup logger
 app.use(morgan('combined'))

diff --git a/src/actions/cms.js b/src/actions/cms.js
diff --git a/src/actions/highscores.js b/src/actions/highscores.js
diff --git a/src/components/AR/EPList.js b/src/components/AR/EPList.js
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,6 +13,8 @@ npm run build @@
     npm run start:server
     ```
+    For the Push Notifications we sadly need a manual edit of the webpack config and add `importScripts: ['pushSw.js'],` to `GenerateSW`
     ## Technologies
     * React
@@ Expand Down @@