Remove analytics (#197)

components/ui/ConfirmPopup.vue

@@ -35,8 +35,13 @@
 </template>
 
 <script>
+import Popup from '~/components/ui/Popup'
+
 export default {
   name: 'ConfirmPopup',
+  components: {
+    Popup,
+  },
   props: {
     confirmationText: {
       type: String,

layouts/default.vue

@@ -138,6 +138,8 @@ import UserIcon from '~/assets/images/utils/user.svg?inline'
 import LogOutIcon from '~/assets/images/utils/log-out.svg?inline'
 import GitHubIcon from '~/assets/images/utils/github.svg?inline'
 
+import CookieConsent from '~/components/ads/CookieConsent'
+
 export default {
   components: {
     ModrinthLogo,
@@ -150,6 +152,7 @@ export default {
     GitHubIcon,
     NotificationIcon,
     HamburgerIcon,
+    CookieConsent,
   },
   directives: {
     ClickOutside,

modules/analytics/lib/constants.js

@@ -1,6 +1,6 @@
 export const DEFAULT_OPTIONS = {
   enabled: false,
-  script_url: 'https://example.com',
-  tracking_code: 'xxx',
+  script_url: 'https://static.cloudflareinsights.com/beacon.min.js',
+  token: 'xxx',
 }
-export const UNAMI_LIB_TAG_ID = 'unami-import'
+export const CF_LIB_TAG_ID = 'cf-import'

modules/analytics/lib/module.js

@@ -1,4 +1,4 @@
-import { DEFAULT_OPTIONS, UNAMI_LIB_TAG_ID } from './constants'
+import { DEFAULT_OPTIONS, CF_LIB_TAG_ID } from './constants'
 
 const { resolve } = require('path')
 
@@ -12,7 +12,7 @@ module.exports = async function module(moduleOptions) {
 
   const templatesOptions = {
     ...options,
-    UNAMI_LIB_TAG_ID,
+    CF_LIB_TAG_ID,
   }
 
   this.addPlugin({

modules/analytics/lib/templates/plugin.js

@@ -3,7 +3,7 @@ export default async function (ctx, inject) {
   const config = (ctx.$config && ctx.$config.analytics) || {}
 
   const url = config.script_url ?? '<%= options.script_url %>'
-  const tag = config.tracking_code ?? '<%= options.tracking_code %>'
+  const tag = config.token ?? '<%= options.token %>'
   // eslint-disable-next-line
   const enabled = config.enabled ?? ('<%= options.enabled  || false %>' === 'true');
   // Check if the parameters are not changed by runtime config:
@@ -27,8 +27,10 @@ export default async function (ctx, inject) {
   const analyticsScript = {
     hid: UNAMI_LIB_TAG_ID,
     src: url,
-    'data-website-id': tag,
-    async: true,
+    'data-cf-beacon': JSON.stringify({
+      token: tag,
+      spa: true,
+    }),
     defer: true,
   }
   injectScript(analyticsScript)

modules/analytics/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@modrinth/analytics",
   "version": "0.1.0",
-  "description": "Unami integration for Nuxtjs",
+  "description": "Cloudflare analytics integration for Nuxtjs",
   "license": "MIT",
   "contributors": [
     {

nuxt.config.js

@@ -178,9 +178,12 @@ export default {
       networkCode: process.env.GAM_ID,
     },
     analytics: {
-      enabled: process.env.ENABLE_ANALYTICS,
-      script_url: process.env.ANALYTICS_URL,
-      tracking_code: process.env.ANALYTICS_ID,
+      // enabled: process.env.ENABLE_ANALYTICS,
+      // script_url: process.env.ANALYTICS_URL,
+      // token: process.env.ANALYTICS_ID,
+      enabled: true,
+      script_url: 'https://static.cloudflareinsights.com/beacon.min.js',
+      token: '1e85158b8a414e7b9e2378e249908e5f',
     },
   },
 }

pages/dashboard.vue

@@ -62,6 +62,8 @@ import FollowIcon from '~/assets/images/utils/heart.svg?inline'
 import UserIcon from '~/assets/images/utils/user.svg?inline'
 import ShieldIcon from '~/assets/images/utils/shield.svg?inline'
 
+import MFooter from '~/components/layout/MFooter'
+
 export default {
   name: 'DashboardPage',
   components: {
@@ -72,6 +74,7 @@ export default {
     FollowIcon,
     UserIcon,
     ShieldIcon,
+    MFooter,
   },
   computed: {
     authUrl() {