Merge pull request #20 from karintou8710/develop

Fix some bug

client/layouts/default.vue

@@ -21,7 +21,7 @@
 export default {
     data () {
         return {
-            isMaintenanceMode: 0
+            isMaintenanceMode: false
         };
     },
 

client/nuxt.config.js

@@ -32,7 +32,7 @@ export default {
     },
 
     publicRuntimeConfig: {
-        isMaintenanceMode: 0
+        isMaintenanceMode: process.env.MAINTENANCE_MODE === 'yes'
     },
 
     // Global CSS: https://go.nuxtjs.dev/config-css
@@ -58,14 +58,14 @@ export default {
     // https://go.nuxtjs.dev/eslint
         '@nuxtjs/eslint-module',
         '@nuxtjs/vuetify',
-        '@nuxtjs/google-analytics',
         ['@nuxtjs/dotenv', { filename: envFileName }]
     ],
 
     // Modules: https://go.nuxtjs.dev/config-modules
     modules: [
     // https://go.nuxtjs.dev/axios
-        '@nuxtjs/axios'
+        '@nuxtjs/axios',
+        '@nuxtjs/google-gtag'
     ],
 
     // Axios module configuration: https://go.nuxtjs.dev/config-axios
@@ -78,7 +78,7 @@ export default {
 
     },
 
-    googleAnalytics: {
+    'google-gtag': {
         id: 'G-16QBC0CFGJ'
     }
 };

client/package.json

@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "@nuxtjs/axios": "^5.13.6",
-    "@nuxtjs/google-analytics": "^2.4.0",
+    "@nuxtjs/google-gtag": "^1.0.4",
     "chart.js": "2.8",
     "core-js": "^3.15.1",
     "mobile-detect": "^1.4.5",

client/vercel-ignore-build-step.sh

@@ -2,7 +2,7 @@
 
 echo "VERCEL_GIT_COMMIT_REF: $VERCEL_GIT_COMMIT_REF"
 
-if [[ "$VERCEL_GIT_COMMIT_REF" == "develop" ]] ; then
+if [[ "$VERCEL_GIT_COMMIT_REF" == "master" ]] ; then
   # Proceed with the build
   echo "✅ - Build can proceed"
   exit 1;

client/yarn.lock

@@ -1340,12 +1340,10 @@
     consola "^2.15.0"
     eslint-webpack-plugin "^2.4.1"
 
-"@nuxtjs/google-analytics@^2.4.0":
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/@nuxtjs/google-analytics/-/google-analytics-2.4.0.tgz#3bb9f398a05cc23340d1f423f8d8653dc4114f46"
-  integrity sha512-rDQTwHIjyjVrx8GywHPuWykJ3jRFGaHl5Iqji/y8tQWUc0yGEeHxOoR0yimzxnTS1Ph2/PubQYpgnVeEPEdL/A==
-  dependencies:
-    vue-analytics "^5.22.1"
+"@nuxtjs/google-gtag@^1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@nuxtjs/google-gtag/-/google-gtag-1.0.4.tgz#57562d8ec4c7694573e77edf72097da4a34b0d68"
+  integrity sha512-0Xgbx1uQ9pKeV2QdU9xoxJVdgH66qyGQJ0l8pzVxz5X476qvJunj6fbcjWk0gT+MEX/VOAhfT/zw0Z1z9q9oNg==
 
 "@nuxtjs/proxy@^2.1.0":
   version "2.1.0"
@@ -8594,11 +8592,6 @@ vm-browserify@^1.0.1:
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
   integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
 
-vue-analytics@^5.22.1:
-  version "5.22.1"
-  resolved "https://registry.yarnpkg.com/vue-analytics/-/vue-analytics-5.22.1.tgz#9d6b32da56daee1b9dfb23a267b50349a03f710f"
-  integrity sha512-HPKQMN7gfcUqS5SxoO0VxqLRRSPkG1H1FqglsHccz6BatBatNtm/Vyy8brApktZxNCfnAkrSVDpxg3/FNDeOgQ==
-
 vue-chartjs@^3.4.2:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/vue-chartjs/-/vue-chartjs-3.5.1.tgz#d25e845708f7744ae51bed9d23a975f5f8fc6529"