From 04915cc65a43401e5c2065d1e8dbd7e2194446e0 Mon Sep 17 00:00:00 2001
From: Geometrically <18202329+Geometrically@users.noreply.github.com>
Date: Tue, 1 Aug 2023 15:34:29 -0700
Subject: [PATCH] fix issues with auth (#1247)

---
 components/ui/NotificationItem.vue | 2 +-
 helpers/notifications.js           | 5 +++++
 pages/auth.vue                     | 3 +++
 pages/auth/sign-up.vue             | 8 ++++++--
 pages/auth/welcome.vue             | 6 +++++-
 pages/index.vue                    | 2 +-
 pages/settings/account.vue         | 6 +++---
 7 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/components/ui/NotificationItem.vue b/components/ui/NotificationItem.vue
index bb28ff09b..b9b2ab37c 100644
--- a/components/ui/NotificationItem.vue
+++ b/components/ui/NotificationItem.vue
@@ -118,7 +118,7 @@
         >
           <VersionIcon />
           <nuxt-link
-            :to="getVersionLink(notif.extra_data.project, notif.extra_data.version.name)"
+            :to="getVersionLink(notif.extra_data.project, notif.extra_data.version)"
             class="text-link no-underline"
           >
             {{ notif.extra_data.version.name }}
diff --git a/helpers/notifications.js b/helpers/notifications.js
index 66f216808..4cb3bb7d9 100644
--- a/helpers/notifications.js
+++ b/helpers/notifications.js
@@ -126,6 +126,11 @@ export async function fetchNotifications() {
 
 export function groupNotifications(notifications, includeRead = false) {
   const grouped = []
+
+  for (const notification of notifications) {
+    notification.grouped_notifs = []
+  }
+
   for (const notification of notifications.filter((notif) => includeRead || !notif.read)) {
     // Group notifications of the same thread or project id
     if (notification.body) {
diff --git a/pages/auth.vue b/pages/auth.vue
index beb5d8ffb..b0c394309 100644
--- a/pages/auth.vue
+++ b/pages/auth.vue
@@ -142,6 +142,9 @@ const route = useRoute()
   }
 
   @media screen and (max-width: 25.5rem) {
+    width: auto;
+    margin: 1rem;
+
     .third-party .btn {
       grid-column: 1 / 3;
     }
diff --git a/pages/auth/sign-up.vue b/pages/auth/sign-up.vue
index e9b0a404a..2fe77eb7a 100644
--- a/pages/auth/sign-up.vue
+++ b/pages/auth/sign-up.vue
@@ -33,7 +33,11 @@
       type="password"
       placeholder="Confirm password"
     />
-    <Checkbox v-model="subscribe" class="subscribe-btn" label="Subscribe updates about Modrinth" />
+    <Checkbox
+      v-model="subscribe"
+      class="subscribe-btn"
+      label="Subscribe to updates about Modrinth"
+    />
     <p>
       By creating an account, you agree to Modrinth's
       <nuxt-link to="/legal/terms" class="text-link">terms</nuxt-link> and
@@ -43,7 +47,7 @@
       Create account <RightArrowIcon />
     </button>
     <p>
-      Already have an account yet?
+      Already have an account?
       <nuxt-link
         class="text-link"
         :to="`/auth/sign-in${route.query.redirect ? `?redirect=${route.query.redirect}` : ''}`"
diff --git a/pages/auth/welcome.vue b/pages/auth/welcome.vue
index e67c560c1..d6b0ab7a8 100644
--- a/pages/auth/welcome.vue
+++ b/pages/auth/welcome.vue
@@ -5,7 +5,11 @@
       Thank you for creating an account. You can now follow and create projects, receive updates
       about your favorite projects, and more!
     </p>
-    <Checkbox v-model="subscribe" class="subscribe-btn" label="Subscribe updates about Modrinth" />
+    <Checkbox
+      v-model="subscribe"
+      class="subscribe-btn"
+      label="Subscribe to updates about Modrinth"
+    />
     <button class="btn btn-primary continue-btn" @click="continueSignUp">Continue</button>
     <p>
       By creating an account, you agree to Modrinth's
diff --git a/pages/index.vue b/pages/index.vue
index 2f1e023ad..d096c66a3 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -25,7 +25,7 @@
         <nuxt-link to="/mods" class="iconified-button brand-button"> Discover mods </nuxt-link>
         <nuxt-link
           v-if="!auth.user"
-          to="sign-up"
+          to="/auth/sign-up"
           class="iconified-button outline-button"
           rel="noopener nofollow"
         >
diff --git a/pages/settings/account.vue b/pages/settings/account.vue
index 5039f8b7f..0a1d2eb86 100644
--- a/pages/settings/account.vue
+++ b/pages/settings/account.vue
@@ -255,9 +255,9 @@
         </div>
         <p></p>
         <div class="input-group push-right">
-          <button class="iconified-button brand-button" @click="$refs.manageProvidersModal.hide()">
-            <CheckIcon />
-            Finish editing
+          <button class="iconified-button" @click="$refs.manageProvidersModal.hide()">
+            <XIcon />
+            Close
           </button>
         </div>
       </div>