Merge pull request #33 from NCTUCSUnion/dev

Dev

Author: gainsborouo

frontend/index.html

@@ -53,6 +53,13 @@
       src="https://cloud.umami.is/script.js"
       data-website-id="8089a20a-ba6a-4bf5-b629-8a82c03c134e"
     ></script>
+    <script>
+      if ('serviceWorker' in navigator) {
+        navigator.serviceWorker.getRegistrations().then(regs => {
+          for (let r of regs) r.unregister();
+        });
+      }
+    </script>    
     <script>
       function updateFavicon(isDark) {
         const theme = isDark ? 'dark' : 'bright'

frontend/src/components/Navbar.vue

@@ -76,7 +76,7 @@
               outlined
               aria-label="Logout"
             />
-            <Button
+            <!-- <Button
               v-else
               icon="pi pi-sign-in"
               label="登入"
@@ -85,6 +85,16 @@
               size="small"
               outlined
               aria-label="Login"
+            /> -->
+            <Button
+              v-else
+              icon="pi pi-sign-in"
+              label="登入"
+              @click="handleOAuthLogin"
+              severity="secondary"
+              size="small"
+              outlined
+              aria-label="Login"
             />
           </div>
 
@@ -99,7 +109,7 @@
               outlined
               aria-label="Logout"
             />
-            <Button
+            <!-- <Button
               v-else
               icon="pi pi-sign-in"
               label="登入"
@@ -108,6 +118,16 @@
               size="small"
               outlined
               aria-label="Login"
+            /> -->
+            <Button
+              v-else
+              icon="pi pi-sign-in"
+              label="登入"
+              @click="handleOAuthLogin"
+              severity="secondary"
+              size="small"
+              outlined
+              aria-label="Login"
             />
           </div>
 
@@ -418,7 +438,8 @@ export default {
 
     handleOAuthLogin() {
       this.loginVisible = false
-      trackEvent(EVENTS.LOGIN_OAUTH, { provider: 'NYCU' })
+      trackEvent(EVENTS.LOGIN, { type: 'direct-oauth' })
+      // trackEvent(EVENTS.LOGIN_OAUTH, { provider: 'NYCU' })
       authService.login()
     },