From e56974f4b2fa4d1e80097b1d04bfe5e6de3ba4f8 Mon Sep 17 00:00:00 2001
From: Geometrically <18202329+Geometrically@users.noreply.github.com>
Date: Sat, 15 Apr 2023 18:07:20 -0700
Subject: [PATCH] Navigation fixes (#1095)

* Navigation fixes

* remove console log

* Fix prettier

* Fix legal pages as well
---
 layouts/default.vue                  |   9 +-
 pages/[type]/[id].vue                | 178 ++++++++++++++-------------
 pages/dashboard.vue                  |   4 +-
 pages/legal.vue                      |  15 +--
 pages/search/[searchProjectType].vue |   2 +-
 pages/settings.vue                   |   4 +-
 pages/user/[id].vue                  |   4 +-
 7 files changed, 109 insertions(+), 107 deletions(-)

diff --git a/layouts/default.vue b/layouts/default.vue
index 314a1fd91..970adbc88 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -139,10 +139,15 @@
                 <div>Visit your profile</div>
               </div>
             </NuxtLink>
-            <NuxtLink v-else class="iconified-button brand-button" :to="getAuthUrl()">
+            <a
+              v-else
+              class="iconified-button brand-button"
+              :href="getAuthUrl()"
+              rel="nofollow noopener"
+            >
               <GitHubIcon aria-hidden="true" />
               Sign in with GitHub
-            </NuxtLink>
+            </a>
           </div>
           <div class="links">
             <template v-if="auth.user">
diff --git a/pages/[type]/[id].vue b/pages/[type]/[id].vue
index 3ae706dc5..a5c731230 100644
--- a/pages/[type]/[id].vue
+++ b/pages/[type]/[id].vue
@@ -116,6 +116,7 @@
         :patch-project="patchProject"
         :patch-icon="patchIcon"
         :update-icon="resetProject"
+        :route="route"
       />
     </div>
   </div>
@@ -389,6 +390,95 @@
           </div>
         </div>
       </div>
+      <section class="normal-page__content">
+        <ProjectPublishingChecklist
+          v-if="currentMember"
+          :project="project"
+          :versions="versions"
+          :current-member="currentMember"
+          :is-settings="$route.name.startsWith('type-id-settings')"
+          :route-name="$route.name"
+          :set-processing="setProcessing"
+          :collapsed="collapsedChecklist"
+          :toggle-collapsed="() => (collapsedChecklist = !collapsedChecklist)"
+        />
+        <div v-if="project.status === 'withheld'" class="card warning" aria-label="Warning">
+          {{ project.title }} is not viewable in search because it has been found to be in violation
+          of one of <nuxt-link to="/legal/rules"> Modrinth's content rules </nuxt-link>. Modrinth
+          makes no guarantees as to whether {{ project.title }} is safe for use in a multiplayer
+          context.
+        </div>
+        <div v-if="project.status === 'archived'" class="card warning" aria-label="Warning">
+          {{ project.title }} has been archived. {{ project.title }} will not receive any further
+          updates unless the author decides to unarchive the project.
+        </div>
+        <div
+          v-if="project.project_type === 'modpack'"
+          class="card information"
+          aria-label="Information"
+        >
+          To install {{ project.title }}, visit
+          <a href="https://docs.modrinth.com/docs/modpacks/playing_modpacks/" :target="$external()"
+            >our documentation</a
+          >
+          which provides instructions on using
+          <a href="https://atlauncher.com/about" :target="$external()" rel="noopener"> ATLauncher</a
+          >, <a href="https://multimc.org/" :target="$external()" rel="noopener">MultiMC</a>, and
+          <a href="https://prismlauncher.org" :target="$external()" rel="noopener">
+            Prism Launcher</a
+          >.
+        </div>
+        <Promotion v-if="$tag.approvedStatuses.includes(project.status)" />
+        <div class="navigation-card">
+          <NavRow
+            :links="[
+              {
+                label: 'Description',
+                href: `/${project.project_type}/${project.slug ? project.slug : project.id}`,
+              },
+              {
+                label: 'Gallery',
+                href: `/${project.project_type}/${
+                  project.slug ? project.slug : project.id
+                }/gallery`,
+                shown: project.gallery.length > 0 || !!currentMember,
+              },
+              {
+                label: 'Changelog',
+                href: `/${project.project_type}/${
+                  project.slug ? project.slug : project.id
+                }/changelog`,
+                shown: versions.length > 0,
+              },
+              {
+                label: 'Versions',
+                href: `/${project.project_type}/${
+                  project.slug ? project.slug : project.id
+                }/versions`,
+                shown: versions.length > 0 || !!currentMember,
+              },
+            ]"
+          />
+          <div v-if="$auth.user && currentMember" class="input-group">
+            <nuxt-link
+              :to="`/${project.project_type}/${project.slug ? project.slug : project.id}/settings`"
+              class="iconified-button"
+            >
+              <SettingsIcon /> Settings
+            </nuxt-link>
+          </div>
+        </div>
+        <NuxtPage
+          v-model:project="project"
+          v-model:versions="versions"
+          v-model:featured-versions="featuredVersions"
+          v-model:members="members"
+          v-model:all-members="allMembers"
+          v-model:dependencies="dependencies"
+          :current-member="currentMember"
+          :route="route"
+        />
+      </section>
       <div class="card normal-page__info">
         <template
           v-if="
@@ -603,94 +693,6 @@
           </div>
         </div>
       </div>
-      <section class="normal-page__content">
-        <ProjectPublishingChecklist
-          v-if="currentMember"
-          :project="project"
-          :versions="versions"
-          :current-member="currentMember"
-          :is-settings="$route.name.startsWith('type-id-settings')"
-          :route-name="$route.name"
-          :set-processing="setProcessing"
-          :collapsed="collapsedChecklist"
-          :toggle-collapsed="() => (collapsedChecklist = !collapsedChecklist)"
-        />
-        <div v-if="project.status === 'withheld'" class="card warning" aria-label="Warning">
-          {{ project.title }} is not viewable in search because it has been found to be in violation
-          of one of <nuxt-link to="/legal/rules"> Modrinth's content rules </nuxt-link>. Modrinth
-          makes no guarantees as to whether {{ project.title }} is safe for use in a multiplayer
-          context.
-        </div>
-        <div v-if="project.status === 'archived'" class="card warning" aria-label="Warning">
-          {{ project.title }} has been archived. {{ project.title }} will not receive any further
-          updates unless the author decides to unarchive the project.
-        </div>
-        <div
-          v-if="project.project_type === 'modpack'"
-          class="card information"
-          aria-label="Information"
-        >
-          To install {{ project.title }}, visit
-          <a href="https://docs.modrinth.com/docs/modpacks/playing_modpacks/" :target="$external()"
-            >our documentation</a
-          >
-          which provides instructions on using
-          <a href="https://atlauncher.com/about" :target="$external()" rel="noopener"> ATLauncher</a
-          >, <a href="https://multimc.org/" :target="$external()" rel="noopener">MultiMC</a>, and
-          <a href="https://prismlauncher.org" :target="$external()" rel="noopener">
-            Prism Launcher</a
-          >.
-        </div>
-        <Promotion v-if="$tag.approvedStatuses.includes(project.status)" />
-        <div class="navigation-card">
-          <NavRow
-            :links="[
-              {
-                label: 'Description',
-                href: `/${project.project_type}/${project.slug ? project.slug : project.id}`,
-              },
-              {
-                label: 'Gallery',
-                href: `/${project.project_type}/${
-                  project.slug ? project.slug : project.id
-                }/gallery`,
-                shown: project.gallery.length > 0 || !!currentMember,
-              },
-              {
-                label: 'Changelog',
-                href: `/${project.project_type}/${
-                  project.slug ? project.slug : project.id
-                }/changelog`,
-                shown: versions.length > 0,
-              },
-              {
-                label: 'Versions',
-                href: `/${project.project_type}/${
-                  project.slug ? project.slug : project.id
-                }/versions`,
-                shown: versions.length > 0 || !!currentMember,
-              },
-            ]"
-          />
-          <div v-if="$auth.user && currentMember" class="input-group">
-            <nuxt-link
-              :to="`/${project.project_type}/${project.slug ? project.slug : project.id}/settings`"
-              class="iconified-button"
-            >
-              <SettingsIcon /> Settings
-            </nuxt-link>
-          </div>
-        </div>
-        <NuxtPage
-          v-model:project="project"
-          v-model:versions="versions"
-          v-model:featured-versions="featuredVersions"
-          v-model:members="members"
-          v-model:all-members="allMembers"
-          v-model:dependencies="dependencies"
-          :current-member="currentMember"
-        />
-      </section>
     </div>
   </div>
 </template>
diff --git a/pages/dashboard.vue b/pages/dashboard.vue
index 693ba45f4..364fca17b 100644
--- a/pages/dashboard.vue
+++ b/pages/dashboard.vue
@@ -20,7 +20,7 @@
       </aside>
     </div>
     <div class="normal-page__content">
-      <NuxtPage />
+      <NuxtPage :route="route" />
     </div>
   </div>
 </template>
@@ -35,5 +35,7 @@ import ListIcon from '~/assets/images/utils/list.svg'
 definePageMeta({
   middleware: 'auth',
 })
+
+const route = useRoute()
 </script>
 <style lang="scss" scoped></style>
diff --git a/pages/legal.vue b/pages/legal.vue
index c92ce8857..45a28d608 100644
--- a/pages/legal.vue
+++ b/pages/legal.vue
@@ -20,12 +20,12 @@
       </aside>
     </div>
     <div class="normal-page__content">
-      <NuxtPage class="universal-card" />
+      <NuxtPage class="universal-card" :route="route" />
     </div>
   </div>
 </template>
 
-<script>
+<script setup>
 import NavStack from '~/components/ui/NavStack'
 import NavStackItem from '~/components/ui/NavStackItem'
 
@@ -34,16 +34,7 @@ import PrivacyIcon from '~/assets/images/utils/lock.svg'
 import RulesIcon from '~/assets/images/sidebar/admin.svg'
 import ShieldIcon from '~/assets/images/utils/shield.svg'
 
-export default defineNuxtComponent({
-  components: {
-    NavStack,
-    NavStackItem,
-    TermsIcon,
-    PrivacyIcon,
-    RulesIcon,
-    ShieldIcon,
-  },
-})
+const route = useRoute()
 </script>
 
 <style lang="scss" scoped>
diff --git a/pages/search/[searchProjectType].vue b/pages/search/[searchProjectType].vue
index f156fb8cc..c807f0f39 100644
--- a/pages/search/[searchProjectType].vue
+++ b/pages/search/[searchProjectType].vue
@@ -627,7 +627,7 @@ export default defineNuxtComponent({
       }
       if (offset > 0) {
         queryItems.push(`o=${offset}`)
-        obj.offset = offset
+        obj.o = offset
       }
       if (facets.value.length > 0) {
         queryItems.push(`f=${encodeURIComponent(facets.value)}`)
diff --git a/pages/settings.vue b/pages/settings.vue
index 38955a6b6..fb823c537 100644
--- a/pages/settings.vue
+++ b/pages/settings.vue
@@ -23,7 +23,7 @@
       </aside>
     </div>
     <div class="normal-page__content">
-      <NuxtPage />
+      <NuxtPage :route="route" />
     </div>
   </div>
 </template>
@@ -35,6 +35,8 @@ import PaintbrushIcon from '~/assets/images/utils/paintbrush.svg'
 import UserIcon from '~/assets/images/utils/user.svg'
 import HeartIcon from '~/assets/images/utils/heart.svg'
 import CurrencyIcon from '~/assets/images/utils/currency.svg'
+
+const route = useRoute()
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/pages/user/[id].vue b/pages/user/[id].vue
index d1db4a21c..11cd9a021 100644
--- a/pages/user/[id].vue
+++ b/pages/user/[id].vue
@@ -186,11 +186,11 @@
           :class="'display-mode--' + $cosmetics.searchDisplayMode.user"
         >
           <ProjectCard
-            v-for="project in ($route.params.projectType !== undefined
+            v-for="project in (route.params.projectType !== undefined
               ? projects.filter(
                   (x) =>
                     x.project_type ===
-                    $route.params.projectType.substr(0, $route.params.projectType.length - 1)
+                    route.params.projectType.substr(0, route.params.projectType.length - 1)
                 )
               : projects
             )