From 552e5e02c99dcd03b08f5671d1a07accb9503fd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=8Carodej?= <peterpapp@makingcg.com>
Date: Tue, 19 Apr 2022 19:10:18 +0200
Subject: [PATCH] google button fix

---
 changelog.md                                           |  5 +++++
 composer.json                                          |  2 +-
 config/vuefilemanager.php                              |  2 +-
 public/mix-manifest.json                               |  6 +++---
 .../js/components/UI/Buttons/SocialLoginButtons.vue    |  2 +-
 resources/js/views/SetupWizard/StatusCheck.vue         | 10 +++++++++-
 .../views/vuefilemanager/crawler/og-view.blade.php     |  1 +
 7 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/changelog.md b/changelog.md
index 67df6d37..89614293 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,8 @@
+## Version 2.0.18
+#### Release date: 19. April 2022
+- Fixed issue with Google login button
+- Fixed issue with PayPal subscription
+
 ## Version 2.0.17
 #### Release date: 12. April 2022
 - Added option to use FTP as VueFileManager file storage server
diff --git a/composer.json b/composer.json
index 85d80161..23a3a2db 100644
--- a/composer.json
+++ b/composer.json
@@ -29,7 +29,7 @@
         "laravel/ui": "^3.4.2",
         "league/flysystem-aws-s3-v3": "^3.0.9",
         "league/flysystem-ftp": "^3.0",
-        "makingcg/subscription": "^1.0.4",
+        "makingcg/subscription": "^1.0.5",
         "matthewbdaly/laravel-azure-storage": "^2.0",
         "pusher/pusher-php-server": "^7.0",
         "spatie/data-transfer-object": "^3.7.3",
diff --git a/config/vuefilemanager.php b/config/vuefilemanager.php
index 2ddb595f..219b7b32 100644
--- a/config/vuefilemanager.php
+++ b/config/vuefilemanager.php
@@ -1,7 +1,7 @@
 <?php
 
 return [
-    'version' => '2.0.17',
+    'version' => '2.0.18',
 
     'is_demo' => env('APP_DEMO', false),
 
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index c5fa0fae..7dbc7d7d 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -3,7 +3,7 @@
     "/chunks/request.js": "/chunks/request.js?id=6770484e564115b3",
     "/chunks/request-upload.js": "/chunks/request-upload.js?id=501663f9e43072f8",
     "/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=19a0784e59d768ec",
-    "/chunks/status-check.js": "/chunks/status-check.js?id=f40938d1fb43820f",
+    "/chunks/status-check.js": "/chunks/status-check.js?id=9239a586761b912d",
     "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=ba76b9a8adbfdc0b",
     "/chunks/database.js": "/chunks/database.js?id=5113b0d4284f764f",
     "/chunks/environment.js": "/chunks/environment.js?id=784c2442268b36dc",
@@ -53,8 +53,8 @@
     "/chunks/contact-us.js": "/chunks/contact-us.js?id=ea99d85aa3500595",
     "/chunks/successfully-email-verified.js": "/chunks/successfully-email-verified.js?id=c26cb144101e7c79",
     "/chunks/successfully-email-send.js": "/chunks/successfully-email-send.js?id=170d814982e1c475",
-    "/chunks/sign-in.js": "/chunks/sign-in.js?id=5f7111f8ee7639bf",
-    "/chunks/sign-up.js": "/chunks/sign-up.js?id=80da89f329c514fc",
+    "/chunks/sign-in.js": "/chunks/sign-in.js?id=c648cb698176a993",
+    "/chunks/sign-up.js": "/chunks/sign-up.js?id=3d7559511768cd0e",
     "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=27cda9364b6593d8",
     "/chunks/create-new-password.js": "/chunks/create-new-password.js?id=2f0401ee2fc148c4",
     "/chunks/settings.js": "/chunks/settings.js?id=13f38ad770e862c6",
diff --git a/resources/js/components/UI/Buttons/SocialLoginButtons.vue b/resources/js/components/UI/Buttons/SocialLoginButtons.vue
index 8ee9da1e..6b5fca15 100644
--- a/resources/js/components/UI/Buttons/SocialLoginButtons.vue
+++ b/resources/js/components/UI/Buttons/SocialLoginButtons.vue
@@ -12,7 +12,7 @@
         </div>
 
         <div v-if="config.allowedGoogleLogin" class="mx-5 cursor-pointer">
-			<google-icon @click="socialiteRedirect('google')" class="vue-feather"/>
+			<google-icon @click.native="socialiteRedirect('google')" class="vue-feather"/>
         </div>
     </div>
 </template>
diff --git a/resources/js/views/SetupWizard/StatusCheck.vue b/resources/js/views/SetupWizard/StatusCheck.vue
index fcd531ee..ccdcdbe6 100644
--- a/resources/js/views/SetupWizard/StatusCheck.vue
+++ b/resources/js/views/SetupWizard/StatusCheck.vue
@@ -13,9 +13,15 @@
                 />
             </Headline>
 
+			<a href="https://codecanyon.net/item/vue-file-manager-with-laravel-backend/25815986">
+				<AlertBox color="rose" class="text-left">
+					<p class="text-rose-500">Please make sure you have only legal copy of VueFileManager <b class="text-rose-500 underline">purchased from CodeCanyon</b>. Any illegal copy can contain malicious software, bugs and others security issues which exposes your files to abuse.</p>
+				</AlertBox>
+			</a>
+
             <!--PHP version and ini check-->
             <div class="card shadow-card">
-                <FormLabel> PHP Setup </FormLabel>
+                <FormLabel>PHP Setup</FormLabel>
 
                 <InfoBox class="!mb-2">
                     <p>
@@ -182,10 +188,12 @@ import Headline from '../../components/UI/Labels/LogoHeadline'
 import { mapGetters } from 'vuex'
 import axios from 'axios'
 import { CheckIcon, XIcon, SettingsIcon } from 'vue-feather-icons'
+import AlertBox from "../../components/UI/Others/AlertBox";
 
 export default {
     name: 'StatusCheck',
     components: {
+		AlertBox,
         AuthContentWrapper,
         ValidationProvider,
         ValidationObserver,
diff --git a/resources/views/vuefilemanager/crawler/og-view.blade.php b/resources/views/vuefilemanager/crawler/og-view.blade.php
index 228f2bd9..15edad8b 100644
--- a/resources/views/vuefilemanager/crawler/og-view.blade.php
+++ b/resources/views/vuefilemanager/crawler/og-view.blade.php
@@ -15,6 +15,7 @@
 
     {{--Show protected og metadata--}}
     @if($metadata['is_protected'])
+        <meta name="robots" content="noindex">
         <meta property="og:title" content="{{ __t('protected_file') }} | {{ $settings->app_title ?? 'VueFileManager' }}">
         <title>{{ __t('protected_file') }} | {{ $settings->app_title ?? 'VueFileManager' }}</title>
     @endif