Merge branch 'master' into card-designer

package-lock.json

@@ -11951,6 +11951,11 @@
         }
       }
     },
+    "vue-google-adsense": {
+      "version": "1.10.1",
+      "resolved": "https://registry.npmjs.org/vue-google-adsense/-/vue-google-adsense-1.10.1.tgz",
+      "integrity": "sha512-F8S6TGK4kyDDvBy7plnWkclz/2bnJNLM2GgPn2K0bzxZi5p5/Nul+NHAkUkXpwdI/eoy+M7ibnkOMhvgd7T9rw=="
+    },
     "vue-hot-reload-api": {
       "version": "2.3.4",
       "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz",
@@ -12059,6 +12064,11 @@
         }
       }
     },
+    "vue-script2": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/vue-script2/-/vue-script2-2.1.0.tgz",
+      "integrity": "sha512-EDUOjQBFvhkJXwmWuUR9ijlF7/4JtmvjXSKaHSa/LNTMy9ltjgKgYB68aqlxgq8ORdSxowd5eo24P1syjZJnBA=="
+    },
     "vue-style-loader": {
       "version": "4.1.3",
       "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.3.tgz",

package.json

@@ -12,6 +12,8 @@
     "file-saver": "^2.0.5",
     "vue": "^2.6.11",
     "vue-advanced-cropper": "^1.10.1",
+    "vue-google-adsense": "^1.10.1",
+    "vue-script2": "^2.1.0",
     "vuetify": "^2.4.0"
   },
   "devDependencies": {

src/components/Commands.vue

@@ -13,6 +13,15 @@
           <input type="hidden" id="panel" :value="'/editprofile theme ' + panelColor.substring(1,7)">
           <v-btn @click.stop.prevent="copyColor('panel')">Copy</v-btn>
         </div>
+        <div class="ad-container flex-item" style="">
+        <Adsense
+          data-ad-client="ca-pub-4611357578399674"
+          data-ad-slot="9274429601"
+          data-ad-format="auto"
+          data-full-width-responsive="true"
+        >
+        </Adsense>
+      </div>
     </div>
 </template>
 

src/main.js

@@ -2,8 +2,11 @@ import Vue from 'vue'
 import App from './App.vue'
 import vuetify from './plugins/vuetify'
 import './gtm.js'
+import Ads from 'vue-google-adsense'
 
 Vue.config.productionTip = false
+Vue.use(require('vue-script2'))
+Vue.use(Ads.Adsense)
 
 new Vue({
   vuetify,

vue.config.js

@@ -1,5 +1,8 @@
 module.exports = {
   transpileDependencies: [
     'vuetify'
-  ]
+  ],
+  devServer: {
+    disableHostCheck: true
+  }
 }