Merge pull request #74 from fevrcoding/feat/push

Push notifications

Author: dwightjack

.eleventy.js

@@ -71,6 +71,8 @@ module.exports = function (eleventyConfig) {
 
   eleventyConfig.addPassthroughCopy({ 'static/*.*': '.' });
 
+  eleventyConfig.addWatchTarget('./src/_js/');
+
   eleventyConfig.addDataExtension('yaml', (contents) =>
     yaml.safeLoad(contents),
   );

.gitignore

@@ -10,3 +10,6 @@ img/uploads
 # TODO: Import ignores from:  https://www.gitignore.io/api/jekyll,node,windows,linux,macos,ruby,webstorm
 
 convert
+
+# Local Netlify folder
+.netlify

netlify_functions/deploy-succeeded/deploy-succeeded.js

@@ -0,0 +1,64 @@
+const axios = require('axios');
+
+const { ONE_SIGNAL_API_KEY, ONE_SIGNAL_APP_ID } = process.env;
+
+exports.handler = async function ({ body = '{}' }) {
+  const { payload = {} } = JSON.parse(body);
+
+  const ret = {
+    statusCode: 200,
+  };
+
+  if (payload.branch !== 'master') {
+    return ret;
+  }
+
+  const { data } = await axios.get(
+    `https://api.github.com/repos/fevrcoding/fevrcoding.github.io/commits/${payload.commit_ref}`,
+  );
+
+  const [, eventPath] =
+    data.commit.message.match(/fevrcoding\/cms\/event\/(.+?)\n/) || [];
+
+  if (!eventPath) {
+    return ret;
+  }
+
+  const eventFile = data.files.find(
+    ({ filename, status }) =>
+      status === 'added' && filename.includes(eventPath),
+  );
+
+  if (!eventFile) {
+    return ret;
+  }
+
+  const { data: eventTxt } = await axios.get(eventFile.raw_url, {
+    responseType: 'text',
+  });
+
+  const [, eventTitle] = eventTxt.match(/title:(.+?)\n/) || [];
+
+  if (!eventTitle) {
+    return ret;
+  }
+
+  axios.post(
+    'https://onesignal.com/api/v1/notifications',
+    {
+      included_segments: ['Active Users'],
+      app_id: ONE_SIGNAL_APP_ID,
+      headings: {
+        en: 'Nuovo evento!',
+      },
+      contents: {
+        en: eventTitle,
+      },
+      web_url: 'https://www.fevr.it/',
+    },
+    {
+      headers: { Authorization: `Basic ${ONE_SIGNAL_API_KEY}` },
+    },
+  );
+  return ret;
+};

package-lock.json

@@ -28,6 +28,7 @@
     "prettier": "^2.2.1"
   },
   "dependencies": {
+    "axios": "^0.21.1",
     "workbox-routing": "^6.0.2",
     "workbox-strategies": "^6.0.2"
   }

package.json

@@ -2,7 +2,11 @@
   "root": true,
   "extends": ["eslint:recommended", "plugin:prettier/recommended"],
   "env": {
-    "browser": true
+    "browser": true,
+    "es6": true
+  },
+  "globals": {
+    "process": true
   },
   "parserOptions": {
     "ecmaVersion": 2020,
@@ -14,5 +18,13 @@
     "block-scoped-var": "error",
     "consistent-return": "error",
     "eqeqeq": "error"
-  }
+  },
+  "overrides": [
+    {
+      "files": ["**/*-worker.js"],
+      "env": {
+        "serviceworker": true
+      }
+    }
+  ]
 }

src/.eslintrc

@@ -0,0 +1,4 @@
+/* eslint-env node */
+module.exports = {
+  PRODUCTION: process.env.ELEVENTY_ENV === 'production',
+};

src/_data/env.js

@@ -66,23 +66,4 @@
       </div>
     </div>
   </div>
-</footer>
-<script type="module">
-  const toggler = document.querySelector('.navbar-toggle');
-  if (toggler) {
-    const target = document.querySelector(toggler.dataset.target)
-    toggler.addEventListener('click', (e) => {
-      e.preventDefault();
-      const opened = !toggler.classList.contains('collapsed')
-      toggler.classList[opened ? 'add' : 'remove']('collapsed')
-      toggler.setAttribute('aria-expanded', String(!opened))
-      target.classList[opened ? 'remove' : 'add']('in')
-      if (opened) {
-      }
-    })
-  }
-
-  if ('serviceWorker' in navigator) {
-    navigator.serviceWorker.register('/service-worker.js');
-  }
-</script>
+</footer>

src/_includes/footer.njk

@@ -103,6 +103,8 @@
 {%- if isHome %}
     <script  defer src="https://identity.netlify.com/v1/netlify-identity-widget.js"></script>
 {%- endif %}
+<script src="https://cdn.onesignal.com/sdks/OneSignalSDK.js" async></script>
+<script type="module" src="/js/main.js"></script>
 <!-- Google Analytics -->
 <script>
     (function (i, s, o, g, r, a, m) {

src/_includes/head.njk

@@ -1,5 +1,10 @@
 <!-- Header Start -->
 <header>
+  <div id="notification-bar" class="alert alert-warning" hidden>
+    <span class='onesignal-customlink-container'></span>
+    <button type="button" class="close" aria-label="Chiudi"><span aria-hidden="true">&times;</span></button>
+  </div>
+  <div id="token"></div>
   <div class="container">
     <div class="row">
       <div class="col-md-12">