Removes google ads from codebase, fix analytics (#403)

modrinth · Mar 8, 2022 · e87d85b · e87d85b · vercel · Mar 8, 2022
1 parent 91b79b7
commit e87d85b
Show file tree

Hide file tree

Showing 12 changed files with 10 additions and 607 deletions.
diff --git a/components/ads/Advertisement.vue b/components/ads/Advertisement.vue
@@ -1,16 +1,5 @@
 <template>
-  <div v-if="displayed && !hidden" class="ad-wrapper">
-    <div class="ad">
-      <GptAd
-        :key="format.adUnit"
-        ref="ad_slot"
-        :ad-unit="format.adUnit"
-        :size="format.size"
-        :is-responsive="true"
-      />
-    </div>
-  </div>
-  <div v-else-if="ethical_ads_on">
+  <div v-if="ethical_ads_on">
     <div v-if="ethical_ad_display && ethicalAdType === 'text'">
       <div
         :class="ethical_ad_style"

diff --git a/middleware/analytics.js b/middleware/analytics.js
@@ -1,21 +1,17 @@
-import axios from 'axios'
 export default function (context) {
-  if (context.$config.analytics.base_url == null) {
+  if (process.client && context.from.path === context.route.path) {
     return
   }
-  let domain = ''
-  if (process.server) {
-    domain = context.req.headers.host
-  } else {
-    domain = location.host
+
+  if (context.$config.analytics.base_url == null) {
+    return
   }
-  const url = context.$config.analytics.base_url + '/register/visit'
-  const path = context.route.path.split('?')[0]
+
   setTimeout(() => {
-    axios
-      .post(url, {
-        path,
-        domain,
+    context.$axios
+      .post(`${context.$config.analytics.base_url}/register/visit`, {
+        path: context.route.path,
+        domain: process.server ? context.req.headers.host : location.host,
         consent: false,
       })
       .then(() => {})

diff --git a/modules/analytics/lib/constants.js b/modules/analytics/lib/constants.js
diff --git a/modules/analytics/lib/module.js b/modules/analytics/lib/module.js
diff --git a/modules/analytics/lib/templates/plugin.js b/modules/analytics/lib/templates/plugin.js
diff --git a/modules/analytics/package.json b/modules/analytics/package.json
diff --git a/modules/gpt-ads/lib/constants.js b/modules/gpt-ads/lib/constants.js
diff --git a/modules/gpt-ads/lib/module.js b/modules/gpt-ads/lib/module.js