From d8c11915fa50416d724b54fae8df1aeb88338198 Mon Sep 17 00:00:00 2001
From: Dobromir Popov <dobromir.popov@gateway.one>
Date: Tue, 7 May 2024 11:12:53 +0300
Subject: [PATCH] more merge

---
 components/PwaManager.tsx | 19 ++++++++++++++-----
 next.config.js            |  2 +-
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/components/PwaManager.tsx b/components/PwaManager.tsx
index 19d2857..623fd17 100644
--- a/components/PwaManager.tsx
+++ b/components/PwaManager.tsx
@@ -216,15 +216,24 @@ function PwaManager() {
                 {isPWAInstalled && <p>App is installed!</p>}
                 {isStandAlone && <p>PWA App</p>}
                 <button
-                    onClick={isSubscribed ? unsubscribeFromNotifications : subscribeToNotifications}
-                    disabled={false} // Since the button itself acts as a toggle, the disabled attribute might not be needed
-                    className={`text-xs py-1 px-2 rounded-full focus:outline-none transition duration-150 ease-in-out ${isSubscribed ? 'bg-red-500 hover:bg-red-700 text-white' : 'bg-green-500 hover:bg-green-700 text-white'
+                    onClick={subscribeToNotifications}
+                    disabled={isSubscribed}
+                    className={`text-xs py-1 px-2 rounded-full focus:outline-none transition duration-150 ease-in-out ${isSubscribed ? 'cursor-not-allowed bg-gray-300 text-gray-500' : 'bg-green-500 hover:bg-green-700 text-white'
                         }`}
                 >
-                    {isSubscribed ? 'Unsubscribe from Notifications' : 'Subscribe to Notifications'}
+                    Subscribe to Notifications
+                </button>
+                <button
+                    onClick={unsubscribeFromNotifications}
+                    disabled={!isSubscribed}
+                    className={`text-xs py-1 px-2 rounded-full focus:outline-none transition duration-150 ease-in-out ${!isSubscribed ? 'cursor-not-allowed bg-gray-300 text-gray-500' : 'bg-red-500 hover:bg-red-700 text-white'
+                        }`}
+                >
+                    Unsubscribe from Notifications
                 </button>
 
-            </div >
+
+            </div>
             <div>
                 <button
                     onClick={sendTestNotification}
diff --git a/next.config.js b/next.config.js
index aa0cde9..409dd70 100644
--- a/next.config.js
+++ b/next.config.js
@@ -1,6 +1,6 @@
 const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer');
 //we're currently using next-pwa (which uses GeneraeSW automatically), so we don't need to use workbox-webpack-plugin
-const { InjectManifest, GenerateSW } = require('workbox-webpack-plugin');
+// const { InjectManifest, GenerateSW } = require('workbox-webpack-plugin');
 
 const withPWA = require('next-pwa')({
   dest: 'public',