Merge pull request 'changed logic in service worker.js' (#121) from ranjith-dev into master

Reviewed-on: #121

public/service-worker.js

@@ -1,10 +1,37 @@
 self.addEventListener('push', function (event) {
-    const data = event.data.json();
+    console.log('[SW] Push received');
+
+    let payload = {};
+
+    if (event.data) {
+        try {
+            payload = event.data.json();
+        } catch (e) {
+            payload = { body: event.data.text() };
+        }
+    }
+
+    const title = payload.title || 'Notification';
+
+    const options = {
+        body: payload.body || '',
+        icon: payload.icon || '/pwa-192x192.png',
+        badge: payload.icon || '/pwa-192x192.png',
+        data: payload.data || {},
+    };
+
     event.waitUntil(
-        self.registration.showNotification(data.title, {
+        self.registration.showNotification(title, options)
-            body: data.body,
-            icon: data.icon,
-            data: data.data
-        })
     );
 });
+
+self.addEventListener('notificationclick', function (event) {
+    event.notification.close();
+
+    const url = event.notification.data?.url || '/admin';
+
+    event.waitUntil(
+        clients.openWindow(url)
+    );
+});
+