Compare commits

...

6 Commits

Author SHA1 Message Date
Čarodej
ac9233ce2c ads test tag 2022-08-08 09:53:18 +02:00
Čarodej
1afa5fa48e added new adsense code 2022-08-08 09:51:14 +02:00
Čarodej
6c8a4e2186 adsense edit 2022-08-08 09:35:02 +02:00
Čarodej
b38a8f5450 Merge remote-tracking branch 'origin/master' into ads
# Conflicts:
#	package.json
#	public/9346.js
#	public/chunks/admin.js
#	public/chunks/app-environment.js
#	public/chunks/app-server.js
#	public/chunks/billing.js
#	public/chunks/forgotten-password.js
#	public/chunks/homepage.js
#	public/chunks/plan-create/metered.js
#	public/chunks/plan-settings.js
#	public/chunks/platform.js
#	public/chunks/profile.js
#	public/chunks/recent-uploads.js
#	public/chunks/request.js
#	public/chunks/settings.js
#	public/chunks/shared.js
#	public/chunks/shared/authenticate.js
#	public/chunks/shared/single-file.js
#	public/chunks/sign-in.js
#	public/css/tailwind.css
#	public/js/main.js
#	public/js/main.js.LICENSE.txt
#	public/mix-manifest.json
2022-08-08 08:50:24 +02:00
Čarodej
b8a50bb326 build 2022-05-27 09:31:34 +02:00
Čarodej
4e2f92ee7a adsense vue test 2022-05-24 07:53:13 +02:00
12 changed files with 57 additions and 17 deletions

22
package-lock.json generated
View File

@@ -8433,9 +8433,9 @@
}
},
"postcss": {
"version": "8.4.14",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz",
"integrity": "sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==",
"version": "8.4.16",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.16.tgz",
"integrity": "sha512-ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ==",
"requires": {
"nanoid": "^3.3.4",
"picocolors": "^1.0.0",
@@ -10037,9 +10037,9 @@
"integrity": "sha512-X324n9OtpTmOMqEgDUEA/RgLrNfBF/jwJdctaPZDzB3mppxJk7TLIDmOreEDm1Bq4R9LSPu4Epf8VSdovNU+iA=="
},
"tailwindcss": {
"version": "3.1.7",
"resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.1.7.tgz",
"integrity": "sha512-r7mgumZ3k0InfVPpGWcX8X/Ut4xBfv+1O/+C73ar/m01LxGVzWvPxF/w6xIUPEztrCoz7axfx0SMdh8FH8ZvRQ==",
"version": "3.1.8",
"resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.1.8.tgz",
"integrity": "sha512-YSneUCZSFDYMwk+TGq8qYFdCA3yfBRdBlS7txSq0LUmzyeqRe3a8fBQzbz9M3WS/iFT4BNf/nmw9mEzrnSaC0g==",
"dev": true,
"requires": {
"arg": "^5.0.2",
@@ -10471,6 +10471,11 @@
"babel-helper-vue-jsx-merge-props": "^2.0.2"
}
},
"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",
@@ -10513,6 +10518,11 @@
"resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.5.4.tgz",
"integrity": "sha512-x+/DLAJZv2mcQ7glH2oV9ze8uPwcI+H+GgTgTmb5I55bCgY3+vXWIsqbYUzbBSZnwFHEJku4eoaH/x98veyymQ=="
},
"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",

View File

@@ -15,7 +15,7 @@
"cross-env": "^5.1",
"laravel-echo": "^1.13.1",
"laravel-mix": "^6.0.49",
"postcss": "^8.4.14",
"postcss": "^8.4.16",
"prettier": "^2.7.1",
"prettier-plugin-import-sort": "0.0.7",
"prettier-plugin-tailwindcss": "^0.1.13",
@@ -23,7 +23,7 @@
"resolve-url-loader": "^2.3.1",
"sass": "^1.54.3",
"sass-loader": "^8.0.2",
"tailwindcss": "^3.1.7",
"tailwindcss": "^3.1.8",
"tailwindcss-debug-screens": "^2.2.1",
"vue-loader": "^15.10.0",
"vue-template-compiler": "^2.7.8"
@@ -41,9 +41,11 @@
"vee-validate": "^3.4.14",
"vue": "^2.7.8",
"vue-feather-icons": "^5.1.0",
"vue-i18n": "^8.27.2",
"vue-google-adsense": "^1.10.1",
"vue-i18n": "^8.27.1",
"vue-recaptcha-v3": "^1.9.0",
"vue-router": "^3.5.4",
"vue-router": "^3.5.3",
"vue-script2": "^2.1.0",
"vuex": "^3.6.2"
}
}

2
public/2221.js vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

2
public/js/main.js vendored

File diff suppressed because one or more lines are too long

View File

@@ -1,3 +1,9 @@
/*!
* vue-script2 v2.1.0
* (c) 2016-2019 Greg Slepak
* @license MIT License
*/
/*!
* Pusher JavaScript Library v7.3.0
* https://pusher.com/

View File

@@ -48,7 +48,7 @@
"/chunks/app-adsense.js": "/chunks/app-adsense.js?id=9de9f8ddc4cdeca2",
"/chunks/app-server.js": "/chunks/app-server.js?id=c1ba7809b184cf55",
"/chunks/app-language.js": "/chunks/app-language.js?id=d7f0fbba18444513",
"/chunks/homepage.js": "/chunks/homepage.js?id=74591a549e496117",
"/chunks/homepage.js": "/chunks/homepage.js?id=3cadf62fe885a23f",
"/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=fe7e9aa0bacd555a",
"/chunks/contact-us.js": "/chunks/contact-us.js?id=e28a0cc6bc290c91",
"/chunks/demo.js": "/chunks/demo.js?id=3194d943636a3291",
@@ -63,7 +63,7 @@
"/chunks/settings-password.js": "/chunks/settings-password.js?id=bd5cafee19eb3c2d",
"/chunks/settings-storage.js": "/chunks/settings-storage.js?id=2815b8f0a631832a",
"/chunks/billing.js": "/chunks/billing.js?id=6ecaaefbc9d90d59",
"/chunks/platform.js": "/chunks/platform.js?id=12fb39919a4f7649",
"/chunks/platform.js": "/chunks/platform.js?id=c191e4f787e7e304",
"/chunks/files.js": "/chunks/files.js?id=8baa177afd765ca3",
"/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=c87c76bad16c2931",
"/chunks/my-shared-items.js": "/chunks/my-shared-items.js?id=258109ed03ca7da3",

10
resources/js/main.js vendored
View File

@@ -7,6 +7,16 @@ import App from './App.vue'
import store from './store'
import { events } from './bus'
import Adsense from 'vue-google-adsense/dist/Adsense.min.js'
import InArticleAdsense from 'vue-google-adsense/dist/InArticleAdsense.min.js'
import InFeedAdsense from 'vue-google-adsense/dist/InFeedAdsense.min.js'
Vue.use(require('vue-script2'))
Vue.use(Adsense)
Vue.use(InArticleAdsense)
Vue.use(InFeedAdsense)
import SubscriptionHelpers from './helpers/SubscriptionHelpers'
import ValidatorHelpers from './helpers/ValidatorHelpers'
import functionHelpers from './helpers/functionHelpers'

View File

@@ -10,6 +10,12 @@
<!--VueFileManager ScreenShot-->
<HeroScreenshot />
<InFeedAdsense
data-ad-test
data-ad-client="ca-pub-8058330732865164"
data-ad-slot="2845132832">
</InFeedAdsense>
<!--Google Adsense banner-->
<div v-if="config.allowedAdsense && config.adsenseBanner03" v-html="config.adsenseBanner03" class="mb-5 min-h-[120px]"></div>

View File

@@ -43,6 +43,12 @@
<MobileToolbar />
<!--Google Adsense banner-->
<!--<InFeedAdsense
data-ad-test
data-ad-layout-key="-gw-3+1f-3d+2z"
data-ad-client="ca-pub-8058330732865164"
data-ad-slot="2395328892">
</InFeedAdsense>-->
<div v-if="config.allowedAdsense && config.adsenseBanner01" v-html="config.adsenseBanner01" class="mb-5 min-h-[120px]"></div>
<!--File list & info sidebar-->