Use base URL for axios (#241)

* Switch site to use axios base url * Fix team invites * Fix find/replace setting the wrong thing * Fix analytics being blocking, small issues
modrinth · May 28, 2021 · 5017c5a · 5017c5a
1 parent 03cbab5
commit 5017c5a
Show file tree

Hide file tree

Showing 25 changed files with 137 additions and 209 deletions.
diff --git a/app/router.scrollBehavior.js b/app/router.scrollBehavior.js
@@ -0,0 +1,3 @@
+export default function (to, from, savedPosition) {
+  return savedPosition || { x: 0, y: 0 }
+}
diff --git a/layouts/default.vue b/layouts/default.vue
@@ -199,7 +199,7 @@ export default {
   },
   computed: {
     authUrl() {
-      return `https://api.modrinth.com/api/v1/auth/init?url=${process.env.domain}${this.$route.fullPath}`
+      return `${this.$axios.defaults.baseURL}auth/init?url=${process.env.domain}${this.$route.fullPath}`
     },
     userUrl() {
       return `/user/${this.$auth.user.id}`

diff --git a/layouts/error.vue b/layouts/error.vue
@@ -31,9 +31,6 @@ export default {
     },
   },
   layout: 'home',
-  created() {
-    // console.log(this.error)
-  },
 }
 </script>
 

diff --git a/middleware/analytics.js b/middleware/analytics.js
@@ -1,5 +1,8 @@
 import axios from 'axios'
-export default async function (context) {
+export default function (context) {
+  if (context.$config.analytics.base_url == null) {
+    return
+  }
   let domain = ''
   if (process.server) {
     domain = context.req.headers.host
@@ -8,13 +11,16 @@ export default async function (context) {
   }
   const url = context.$config.analytics.base_url + '/register/visit'
   const path = context.route.path.split('?')[0]
-  try {
-    return await axios.post(url, {
-      path,
-      domain,
-      consent: false,
-    })
-  } catch (e) {
-    // Simply silence the issue.
-  }
+  setTimeout(() => {
+    axios
+      .post(url, {
+        path,
+        domain,
+        consent: false,
+      })
+      .then(() => {})
+      .catch((e) => {
+        console.error('An error occurred while registering the visit: ', e)
+      })
+  })
 }
diff --git a/middleware/auth.js b/middleware/auth.js
@@ -37,7 +37,7 @@ export default async function (context) {
 
   if (!context.$auth.user) {
     return context.redirect(
-      `https://api.modrinth.com/api/v1/auth/init?url=${process.env.domain}${context.route.fullPath}`
+      `${context.$axios.defaults.baseURL}auth/init?url=${process.env.domain}${context.route.fullPath}`
     )
   }
 }

diff --git a/nuxt.config.js b/nuxt.config.js
@@ -134,6 +134,7 @@ export default {
    ** See https://axios.nuxtjs.org/options
    */
   axios: {
+    baseURL: 'https://api.modrinth.com/api/v1/',
     headers: {
       common: {
         Accept: 'application/json',

diff --git a/pages/dashboard.vue b/pages/dashboard.vue
@@ -81,7 +81,7 @@ export default {
   },
   computed: {
     authUrl() {
-      return `https://api.modrinth.com/api/v1/auth/init?url=${process.env.domain}${this.$route.fullPath}`
+      return `${this.$axios.defaults.baseURL}auth/init?url=${process.env.domain}${this.$route.fullPath}`
     },
   },
 }

diff --git a/pages/dashboard/follows.vue b/pages/dashboard/follows.vue
@@ -46,8 +46,6 @@
 </template>
 
 <script>
-import axios from 'axios'
-
 import ModCard from '~/components/ui/ProjectCard'
 import FollowIcon from '~/assets/images/utils/heart.svg?inline'
 import FollowIllustration from '~/assets/images/illustrations/follow_illustration.svg?inline'
@@ -59,15 +57,13 @@ export default {
     FollowIllustration,
   },
   async asyncData(data) {
-    const res = await axios.get(
-      `https://api.modrinth.com/api/v1/user/${data.$auth.user.id}/follows`,
+    const res = await data.$axios.get(
+      `user/${data.$auth.user.id}/follows`,
       data.$auth.headers
     )
 
     const mods = (
-      await axios.get(
-        `https://api.modrinth.com/api/v1/mods?ids=${JSON.stringify(res.data)}`
-      )
+      await data.$axios.get(`mods?ids=${JSON.stringify(res.data)}`)
     ).data.sort((a, b) => a.title > b.title)
 
     return {
@@ -76,8 +72,8 @@ export default {
   },
   methods: {
     async unfavMod(index) {
-      await axios.delete(
-        `https://api.modrinth.com/api/v1/mod/${this.mods[index].id}/follow`,
+      await this.$axios.delete(
+        `mod/${this.mods[index].id}/follow`,
         this.$auth.headers
       )
 

diff --git a/pages/dashboard/misc/revoke-token.vue b/pages/dashboard/misc/revoke-token.vue
@@ -54,7 +54,7 @@ export default {
     async logout() {
       this.$cookies.set('auth-token-reset', true)
       await this.$router.replace(
-        `https://api.modrinth.com/api/v1/auth/init?url=${process.env.domain}${this.$route.fullPath}`
+        `auth/init?url=${process.env.domain}${this.$route.fullPath}`
       )
     },
   },

diff --git a/pages/dashboard/moderation.vue b/pages/dashboard/moderation.vue
@@ -87,8 +87,6 @@
 </template>
 
 <script>
-import axios from 'axios'
-
 import ModCard from '~/components/ui/ProjectCard'
 import Security from '~/assets/images/illustrations/security.svg?inline'
 
@@ -98,19 +96,10 @@ export default {
     Security,
   },
   async asyncData(data) {
-    const mods = (
-      await axios.get(
-        `https://api.modrinth.com/api/v1/moderation/mods`,
-        data.$auth.headers
-      )
-    ).data
+    const mods = (await data.$axios.get(`moderation/mods`, data.$auth.headers))
+      .data
 
-    const reports = (
-      await axios.get(
-        `https://api.modrinth.com/api/v1/report`,
-        data.$auth.headers
-      )
-    ).data
+    const reports = (await data.$axios.get(`report`, data.$auth.headers)).data
 
     return {
       mods,
@@ -119,8 +108,8 @@ export default {
   },
   methods: {
     async changeModStatus(id, status, index) {
-      await axios.patch(
-        `https://api.modrinth.com/api/v1/mod/${id}`,
+      await this.$axios.patch(
+        `mod/${id}`,
         {
           status,
         },
@@ -130,8 +119,8 @@ export default {
       this.mods.splice(index, 1)
     },
     async deleteReport(index) {
-      await axios.delete(
-        `https://api.modrinth.com/api/v1/report/${this.reports[index].id}`,
+      await this.$axios.delete(
+        `report/${this.reports[index].id}`,
         this.$auth.headers
       )
 

diff --git a/pages/dashboard/notifications.vue b/pages/dashboard/notifications.vue
@@ -52,7 +52,6 @@
 </template>
 
 <script>
-import axios from 'axios'
 import UpToDate from '~/assets/images/illustrations/up_to_date.svg?inline'
 
 export default {
@@ -61,8 +60,8 @@ export default {
   },
   async asyncData(data) {
     const notifications = (
-      await axios.get(
-        `https://api.modrinth.com/api/v1/user/${data.$auth.user.id}/notifications`,
+      await data.$axios.get(
+        `user/${data.$auth.user.id}/notifications`,
         data.$auth.headers
       )
     ).data.sort((a, b) => new Date(b.created) - new Date(a.created))
@@ -79,17 +78,17 @@ export default {
         if (index) {
           const config = {
             method: notification.actions[index].action_route[0].toLowerCase(),
-            url: `https://api.modrinth.com/api/v1/${notification.actions[index].action_route[1]}`,
+            url: `${notification.actions[index].action_route[1]}`,
             headers: {
               Authorization: this.$auth.token,
             },
           }
 
-          await axios(config)
+          await this.$axios(config)
         }
 
-        await axios.delete(
-          `https://api.modrinth.com/api/v1/notification/${notification.id}`,
+        await this.$axios.delete(
+          `notification/${notification.id}`,
           this.$auth.headers
         )
 

diff --git a/pages/dashboard/projects.vue b/pages/dashboard/projects.vue
@@ -46,7 +46,6 @@
 </template>
 
 <script>
-import axios from 'axios'
 import ModCard from '~/components/ui/ProjectCard'
 import UpToDate from '~/assets/images/illustrations/up_to_date.svg?inline'
 
@@ -56,13 +55,13 @@ export default {
     UpToDate,
   },
   async asyncData(data) {
-    let res = await axios.get(
-      `https://api.modrinth.com/api/v1/user/${data.$auth.user.id}/mods`,
+    let res = await data.$axios.get(
+      `user/${data.$auth.user.id}/mods`,
       data.$auth.headers
     )
 
-    res = await axios.get(
-      `https://api.modrinth.com/api/v1/mods?ids=${JSON.stringify(res.data)}`,
+    res = await data.$axios.get(
+      `mods?ids=${JSON.stringify(res.data)}`,
       data.$auth.headers
     )
 

diff --git a/pages/dashboard/settings.vue b/pages/dashboard/settings.vue
@@ -115,7 +115,6 @@
 </template>
 
 <script>
-import axios from 'axios'
 import ConfirmPopup from '~/components/ui/ConfirmPopup'
 
 export default {
@@ -167,8 +166,8 @@ export default {
           bio: this.bio,
         }
 
-        await axios.patch(
-          `https://api.modrinth.com/api/v1/user/${this.$auth.user.id}`,
+        await this.$axios.patch(
+          `user/${this.$auth.user.id}`,
           data,
           this.$auth.headers
         )
@@ -191,8 +190,8 @@ export default {
       this.$nuxt.$loading.start()
 
       try {
-        await axios.delete(
-          `https://api.modrinth.com/api/v1/user/${this.$auth.user.id}`,
+        await this.$axios.delete(
+          `user/${this.$auth.user.id}`,
           this.$auth.headers
         )
       } catch (err) {

diff --git a/pages/mod/_id.vue b/pages/mod/_id.vue
@@ -137,6 +137,7 @@
             :featured-versions="featuredVersions"
             :members="members"
             :current-member="currentMember"
+            :all-members="allMembers"
             :link-bar.sync="linkBar"
           />
         </div>
@@ -352,7 +353,6 @@
 </template>
 
 <script>
-import axios from 'axios'
 import Categories from '~/components/ui/search/Categories'
 import MFooter from '~/components/layout/MFooter'
 
@@ -398,33 +398,26 @@ export default {
   async asyncData(data) {
     try {
       const mod = (
-        await axios.get(
-          `https://api.modrinth.com/api/v1/mod/${data.params.id}`,
-          data.$auth.headers
-        )
+        await data.$axios.get(`mod/${data.params.id}`, data.$auth.headers)
       ).data
 
       const [members, versions, featuredVersions, userFollows] = (
         await Promise.all([
-          axios.get(`https://api.modrinth.com/api/v1/team/${mod.team}/members`),
-          axios.get(`https://api.modrinth.com/api/v1/mod/${mod.id}/version`),
-          axios.get(
-            `https://api.modrinth.com/api/v1/mod/${mod.id}/version?featured=true`
-          ),
-          axios.get(
+          data.$axios.get(`team/${mod.team}/members`, data.$auth.headers),
+          data.$axios.get(`mod/${mod.id}/version`),
+          data.$axios.get(`mod/${mod.id}/version?featured=true`),
+          data.$axios.get(
             data.$auth.user
-              ? `https://api.modrinth.com/api/v1/user/${data.$auth.user.id}/follows`
+              ? `user/${data.$auth.user.id}/follows`
               : `https://api.modrinth.com`,
             data.$auth.headers
           ),
         ])
       ).map((it) => it.data)
 
       const users = (
-        await axios.get(
-          `https://api.modrinth.com/api/v1/users?ids=${JSON.stringify(
-            members.map((it) => it.user_id)
-          )}`,
+        await data.$axios.get(
+          `users?ids=${JSON.stringify(members.map((it) => it.user_id))}`,
           data.$auth.headers
         )
       ).data
@@ -440,14 +433,15 @@ export default {
         : null
 
       if (mod.body_url && !mod.body) {
-        mod.body = (await axios.get(mod.body_url)).data
+        mod.body = (await data.$axios.get(mod.body_url)).data
       }
 
       return {
         mod,
         versions,
         featuredVersions,
-        members,
+        members: members.filter((x) => x.accepted),
+        allMembers: members,
         currentMember,
         userFollows: userFollows.name ? null : userFollows,
         linkBar: [],
@@ -477,29 +471,24 @@ export default {
       return file
     },
     async downloadFile(hash, url) {
-      await axios.get(
-        `https://api.modrinth.com/api/v1/version_file/${hash}/download`
-      )
+      await this.$axios.get(`version_file/${hash}/download`)
 
       const elem = document.createElement('a')
       elem.download = hash
       elem.href = url
       elem.click()
     },
     async followMod() {
-      await axios.post(
-        `https://api.modrinth.com/api/v1/mod/${this.mod.id}/follow`,
+      await this.$axios.post(
+        `mod/${this.mod.id}/follow`,
         {},
         this.$auth.headers
       )
 
       this.userFollows.push(this.mod.id)
     },
     async unfollowMod() {
-      await axios.delete(
-        `https://api.modrinth.com/api/v1/mod/${this.mod.id}/follow`,
-        this.$auth.headers
-      )
+      await this.$axios.delete(`mod/${this.mod.id}/follow`, this.$auth.headers)
 
       this.userFollows.splice(this.userFollows.indexOf(this.mod.id), 1)
     },