From bc18f9b198554ae2edb9d56719791a113cbdb47d Mon Sep 17 00:00:00 2001
From: raishvaria <raishvaria1996@gmail.com>
Date: Sat, 23 Nov 2019 12:34:10 +0530
Subject: [PATCH 1/2] add confirm box for folder permission on installation

---
 resources/assets/js/plugins/en.js             |   2 +
 resources/assets/js/plugins/es.js             |   2 +
 resources/assets/js/plugins/fr.js             |   2 +
 .../layouts/partials/TheSiteHeaderBottom.vue  | 459 ------------------
 .../assets/js/views/wizard/Permission.vue     |  19 +-
 5 files changed, 23 insertions(+), 461 deletions(-)
 delete mode 100644 resources/assets/js/views/layouts/partials/TheSiteHeaderBottom.vue

diff --git a/resources/assets/js/plugins/en.js b/resources/assets/js/plugins/en.js
index d45ba227..f35a4155 100644
--- a/resources/assets/js/plugins/en.js
+++ b/resources/assets/js/plugins/en.js
@@ -740,6 +740,8 @@ export default {
     },
     permissions: {
       permissions: 'Permissions',
+      permission_confirm_title: 'Are you sure you want to continue?',
+      permission_confirm_desc: 'Folder\'s permission check failed',
       permission_desc: 'Below is the list of folder permissions which are required in order for the app to work. If the permission check fails, make sure to update your folder permissions.'
     },
     mail: {
diff --git a/resources/assets/js/plugins/es.js b/resources/assets/js/plugins/es.js
index 8b538215..de72accd 100644
--- a/resources/assets/js/plugins/es.js
+++ b/resources/assets/js/plugins/es.js
@@ -735,6 +735,8 @@ export default {
     },
     permissions: {
       permissions: 'Permisos',
+      permission_confirm_title: 'Estás seguro de que quieres continuar?',
+      permission_confirm_desc: 'La verificación de permisos de la carpeta falló',
       permission_desc: 'A continuación se muestra la lista de permisos de carpeta necesarios para que la aplicación funcione. Si la verificación de permisos falla, asegúrese de actualizar los permisos de su carpeta.'
     },
     mail: {
diff --git a/resources/assets/js/plugins/fr.js b/resources/assets/js/plugins/fr.js
index de90546d..3d7aa91a 100644
--- a/resources/assets/js/plugins/fr.js
+++ b/resources/assets/js/plugins/fr.js
@@ -738,6 +738,8 @@ export default {
     },
     permissions: {
       permissions: 'Les permissions',
+      permission_confirm_title: 'Es-tu sur de vouloir continuer?',
+      permission_confirm_desc: 'La vérification de l\'autorisation du dossier a échoué',
       permission_desc: "Vous trouverez ci-dessous la liste des autorisations de dossier requises pour le fonctionnement de l'application. Si la vérification des autorisations échoue, veillez à mettre à jour vos autorisations de dossier."
     },
     mail: {
diff --git a/resources/assets/js/views/layouts/partials/TheSiteHeaderBottom.vue b/resources/assets/js/views/layouts/partials/TheSiteHeaderBottom.vue
deleted file mode 100644
index a1e1e2c5..00000000
--- a/resources/assets/js/views/layouts/partials/TheSiteHeaderBottom.vue
+++ /dev/null
@@ -1,459 +0,0 @@
-<template>
-  <div class="header-bottom">
-    <div class="header-nav vue-dropdown-menu">
-      <v-dropdown active-url="/admin/dashboard">
-        <template slot="title">
-          <a href="#">
-            <i class="icon-fa icon-fa-dashboard"/>{{ $t('navigation.dashboard') }}
-            <span class="icon-fa arrow icon-fa-fw"/>
-          </a>
-        </template>
-        <v-dropdown-item>
-          <template slot="item-title">
-            <router-link to="/admin/dashboard/basic">
-              Basic
-            </router-link>
-          </template>
-        </v-dropdown-item>
-        <v-dropdown-item>
-          <template slot="item-title">
-            <router-link to="/admin/dashboard/ecommerce">
-              Ecommerce
-            </router-link>
-          </template>
-        </v-dropdown-item>
-        <v-dropdown-item>
-          <template slot="item-title">
-            <router-link to="/admin/dashboard/finance">
-              Finance
-            </router-link>
-          </template>
-        </v-dropdown-item>
-      </v-dropdown>
-      <v-dropdown active-url="/admin/layouts">
-        <template slot="title">
-          <a href="#">
-            <i class="icon-fa icon-fa-th-large"/>Layouts
-            <span class="icon-fa arrow icon-fa-fw"/>
-          </a>
-        </template>
-        <v-dropdown-item>
-          <template slot="item-title">
-            <router-link to="/admin/layouts/sidebar">
-              Sidebar
-            </router-link>
-          </template>
-        </v-dropdown-item>
-        <v-dropdown-item>
-          <template slot="item-title">
-            <router-link to="/admin/layouts/horizontal">
-              Horizontal
-            </router-link>
-          </template>
-        </v-dropdown-item>
-        <v-dropdown-item>
-          <template slot="item-title">
-            <router-link to="/admin/layouts/icons-sidebar">
-              Icon Sidebar
-            </router-link>
-          </template>
-        </v-dropdown-item>
-      </v-dropdown>
-      <v-dropdown active-url="/admin/basic-ui">
-        <template slot="title">
-          <a href="#">
-            <i class="icon-fa icon-fa-star"/>Basic UI
-            <span class="icon-fa arrow icon-fa-fw"/>
-          </a>
-        </template>
-        <v-dropdown-item>
-          <template slot="item-title">
-            <router-link to="/admin/basic-ui/buttons">
-              Buttons
-            </router-link>
-          </template>
-        </v-dropdown-item>
-        <v-dropdown-item>
-          <template slot="item-title">
-            <router-link to="/admin/basic-ui/cards">
-              Cards
-            </router-link>
-          </template>
-        </v-dropdown-item>
-        <v-dropdown-item>
-          <template slot="item-title">
-            <router-link to="/admin/basic-ui/tabs">
-              Tabs &amp; Accordians
-            </router-link>
-          </template>
-        </v-dropdown-item>
-        <v-dropdown-item>
-          <template slot="item-title">
-            <router-link to="/admin/basic-ui/typography">
-              Typography
-            </router-link>
-          </template>
-        </v-dropdown-item>
-        <v-dropdown-item>
-          <template slot="item-title">
-            <router-link to="/admin/basic-ui/tables">
-              Tables
-            </router-link>
-          </template>
-        </v-dropdown-item>
-        <v-dropdown-item>
-          <template slot="item-title">
-            <router-link to="/admin/basic-ui/modals">
-              Modals
-            </router-link>
-          </template>
-        </v-dropdown-item>
-        <v-dropdown-item>
-          <template slot="item-title">
-            <router-link to="/admin/basic-ui/progress-bars">
-              Progress Bar
-            </router-link>
-          </template>
-        </v-dropdown-item>
-      </v-dropdown>
-      <v-dropdown active-url="/admin/components">
-        <template slot="title">
-          <a href="#">
-            <i class="icon-fa icon-fa-puzzle-piece"/>Components
-            <span class="icon-fa arrow icon-fa-fw"/>
-          </a>
-        </template>
-        <v-dropdown-item>
-          <template slot="item-title">
-            <router-link to="/admin/components/calendar">
-              Calendar
-            </router-link>
-          </template>
-        </v-dropdown-item>
-        <v-dropdown-item>
-          <template slot="item-title">
-            <router-link to="/admin/components/datatables">
-              Jquery Datatables
-            </router-link>
-          </template>
-        </v-dropdown-item>
-        <v-dropdown-item>
-          <template slot="item-title">
-            <router-link to="/admin/components/mail-box">
-              MailBox
-            </router-link>
-          </template>
-        </v-dropdown-item>
-        <v-dropdown-item>
-          <template slot="item-title">
-            <router-link to="/admin/components/calendar">
-              Calendar
-            </router-link>
-          </template>
-        </v-dropdown-item>
-        <v-dropdown-item>
-          <template slot="item-title">
-            <router-link to="/admin/components/datatables">
-              Jquery Datatables
-            </router-link>
-          </template>
-        </v-dropdown-item>
-        <v-dropdown-item>
-          <template slot="item-title">
-            <router-link to="/admin/components/image-cropper">
-              ImageCropper
-            </router-link>
-          </template>
-        </v-dropdown-item>
-        <v-dropdown-item>
-          <template slot="item-title">
-            <router-link to="/admin/components/image-zoom">
-              ImageZoom
-            </router-link>
-          </template>
-        </v-dropdown-item>
-        <v-dropdown-item>
-          <template slot="item-title">
-            <router-link to="/admin/components/nestable-list">
-              Nestable List
-            </router-link>
-          </template>
-        </v-dropdown-item>
-        <v-dropdown-item>
-          <template slot="item-title">
-            <router-link to="/admin/components/nestable-tree">
-              Nestable Tree
-            </router-link>
-          </template>
-        </v-dropdown-item>
-        <v-dropdown-item>
-          <template slot="item-title">
-            <router-link to="/admin/components/notifications">
-              Notifications
-            </router-link>
-          </template>
-        </v-dropdown-item>
-        <v-dropdown active-url="/admin/layouts">
-          <template slot="title">
-            <a href="#">
-              <i class="icon-fa icon-fa-th-large"/>Layouts
-              <span class="icon-fa arrow icon-fa-fw"/>
-            </a>
-          </template>
-          <v-dropdown-item>
-            <template slot="item-title">
-              <router-link to="/admin/layouts/sidebar">
-                Sidebar
-              </router-link>
-            </template>
-          </v-dropdown-item>
-          <v-dropdown-item>
-            <template slot="item-title">
-              <router-link to="/admin/layouts/horizontal">
-                Horizontal
-              </router-link>
-            </template>
-          </v-dropdown-item>
-        </v-dropdown>
-        <v-dropdown-item>
-          <template slot="item-title">
-            <router-link to="/admin/components/sweet-modals">
-              Sweet Modals
-            </router-link>
-          </template>
-        </v-dropdown-item>
-        <v-dropdown-item>
-          <template slot="item-title">
-            <router-link to="/admin/components/image-zoom">
-              ImageZoom
-            </router-link>
-          </template>
-        </v-dropdown-item>
-        <v-dropdown-item>
-          <template slot="item-title">
-            <router-link to="/admin/components/mail-box">
-              MailBox
-            </router-link>
-          </template>
-        </v-dropdown-item>
-      </v-dropdown>
-      <v-dropdown active-url="/admin/chart">
-        <template slot="title">
-          <a href="#">
-            <i class="icon-fa icon-fa-bar-chart"/>Charts
-            <span class="icon-fa arrow icon-fa-fw"/>
-          </a>
-        </template>
-        <v-dropdown-item>
-          <template slot="item-title">
-            <router-link to="/admin/charts/amchart">
-              AM Charts
-            </router-link>
-          </template>
-        </v-dropdown-item>
-        <v-dropdown-item>
-          <template slot="item-title">
-            <router-link to="/admin/charts/chartjs">
-              Chart JS
-            </router-link>
-          </template>
-        </v-dropdown-item>
-        <v-dropdown-item>
-          <template slot="item-title">
-            <router-link to="/admin/charts/gauge">
-              Gauges
-            </router-link>
-          </template>
-        </v-dropdown-item>
-        <v-dropdown-item>
-          <template slot="item-title">
-            <router-link to="/admin/charts/morris">
-              Morris
-            </router-link>
-          </template>
-        </v-dropdown-item>
-        <v-dropdown-item>
-          <template slot="item-title">
-            <router-link to="/admin/charts/sparkline">
-              Sparkline
-            </router-link>
-          </template>
-        </v-dropdown-item>
-      </v-dropdown>
-      <v-dropdown active-url="/admin/icons">
-        <template slot="title">
-          <a href="#">
-            <i class="icon-fa icon-fa-eye"/>Icons
-            <span class="icon-fa arrow icon-fa-fw"/>
-          </a>
-        </template>
-        <v-dropdown-item>
-          <template slot="item-title">
-            <router-link to="/admin/icons/icomoon">
-              IcoMoon
-            </router-link>
-          </template>
-        </v-dropdown-item>
-        <v-dropdown-item>
-          <template slot="item-title">
-            <router-link to="/admin/icons/fontawesome">
-              Font Awesome
-            </router-link>
-          </template>
-        </v-dropdown-item>
-      </v-dropdown>
-      <v-dropdown active-url="/admin/forms">
-        <template slot="title">
-          <a href="#">
-            <i class="icon-fa icon-fa-rocket"/>Form
-            <span class="icon-fa arrow icon-fa-fw"/>
-          </a>
-        </template>
-        <v-dropdown-item>
-          <template slot="item-title">
-            <router-link to="/admin/forms/general">
-              General Elements
-            </router-link>
-          </template>
-        </v-dropdown-item>
-        <v-dropdown-item>
-          <template slot="item-title">
-            <router-link to="/admin/forms/advanced">
-              Advanced Elements
-            </router-link>
-          </template>
-        </v-dropdown-item><v-dropdown-item>
-          <template slot="item-title">
-            <router-link to="/admin/forms/layouts">
-              Form Layouts
-            </router-link>
-          </template>
-        </v-dropdown-item>
-        <v-dropdown-item>
-          <template slot="item-title">
-            <router-link to="/admin/forms/validation">
-              Form Validation
-            </router-link>
-          </template>
-        </v-dropdown-item>
-        <v-dropdown-item>
-          <template slot="item-title">
-            <router-link to="/admin/forms/wizards">
-              Form Wizard
-            </router-link>
-          </template>
-        </v-dropdown-item>
-        <v-dropdown-item>
-          <template slot="item-title">
-            <router-link to="/admin/forms/wizards-2">
-              Form Wizard 2
-            </router-link>
-          </template>
-        </v-dropdown-item>
-        <v-dropdown-item>
-          <template slot="item-title">
-            <router-link to="/admin/forms/wizards-3">
-              Form Wizard 3
-            </router-link>
-          </template>
-        </v-dropdown-item>
-        <v-dropdown-item>
-          <template slot="item-title">
-            <router-link to="/admin/forms/editors">
-              Editors
-            </router-link>
-          </template>
-        </v-dropdown-item>
-        <v-dropdown-item>
-          <template slot="item-title">
-            <router-link to="/admin/forms/vee">
-              Vee Validate
-            </router-link>
-          </template>
-        </v-dropdown-item>
-        <v-dropdown-item>
-          <template slot="item-title">
-            <router-link to="/admin/forms/vuelidate">
-              Vuelidate
-            </router-link>
-          </template>
-        </v-dropdown-item>
-      </v-dropdown>
-      <v-dropdown active-url="/admin/gallery">
-        <template slot="title">
-          <a href="#">
-            <i class="icon-fa icon-fa-image"/>Gallery
-            <span class="icon-fa arrow icon-fa-fw"/>
-          </a>
-        </template>
-        <v-dropdown-item>
-          <template slot="item-title">
-            <router-link to="/admin/gallery/grid">
-              Grid
-            </router-link>
-          </template>
-        </v-dropdown-item>
-        <v-dropdown-item>
-          <template slot="item-title">
-            <router-link to="/admin/gallery/masonry-grid">
-              Masonry Grid
-            </router-link>
-          </template>
-        </v-dropdown-item>
-      </v-dropdown>
-      <v-dropdown active-url="/admin/users">
-        <template slot="title">
-          <a href="#">
-            <i class="icon-fa icon-fa-user"/>Users
-            <span class="icon-fa arrow icon-fa-fw"/>
-          </a>
-        </template>
-        <v-dropdown-item>
-          <template slot="item-title">
-            <router-link to="/admin/users/profile">
-              Profile
-            </router-link>
-          </template>
-        </v-dropdown-item>
-        <v-dropdown-item>
-          <template slot="item-title">
-            <router-link to="/admin/users">
-              All Users
-            </router-link>
-          </template>
-        </v-dropdown-item>
-      </v-dropdown>
-      <v-dropdown active-url="/admin/todo-item">
-        <template slot="title">
-          <router-link to="/admin/todo-item">
-            <i class="icon-fa icon-fa-check"/>Todos
-          </router-link>
-        </template>
-      </v-dropdown>
-      <v-dropdown active-url="/admin/settings">
-        <template slot="title">
-          <router-link to="/admin/settings">
-            <i class="icon-fa icon-fa-cogs"/>Settings
-          </router-link>
-        </template>
-      </v-dropdown>
-    </div>
-  </div>
-</template>
-
-<script type="text/babel">
-import VDropdown from '../../../components/dropdown/VDropdown'
-import VDropdownItem from '../../../components/dropdown/VDropdownItem'
-
-export default {
-  components: {
-    VDropdown,
-    VDropdownItem
-  },
-  data () {
-    return {
-      sidebar: 'sidebar'
-    }
-  }
-}
-</script>
diff --git a/resources/assets/js/views/wizard/Permission.vue b/resources/assets/js/views/wizard/Permission.vue
index c8981003..3069e521 100644
--- a/resources/assets/js/views/wizard/Permission.vue
+++ b/resources/assets/js/views/wizard/Permission.vue
@@ -22,7 +22,7 @@
       </div>
     </div>
     <base-button
-      v-if="!errors"
+      v-if="isContinue"
       class="pull-right mt-5"
       icon="arrow-right"
       right-icon
@@ -39,7 +39,8 @@ export default {
     return {
       loading: false,
       permissions: [],
-      errors: false
+      errors: false,
+      isContinue: false
     }
   },
   created () {
@@ -54,6 +55,20 @@ export default {
       if (response.data) {
         this.permissions = response.data.permissions.permissions
         this.errors = response.data.permissions.errors
+        let self = this
+
+        swal({
+          title: this.$t('wizard.permissions.permission_confirm_title'),
+          text: this.$t('wizard.permissions.permission_confirm_desc'),
+          icon: 'warning',
+          buttons: true,
+          dangerMode: true
+        }).then(async (willConfirm) => {
+          if (willConfirm) {
+            self.isContinue = true
+          }
+        })
+
         this.loading = false
       }
     },

From 1d56bd9f36d842be690e3317bfccf605c298f3fa Mon Sep 17 00:00:00 2001
From: raishvaria <raishvaria1996@gmail.com>
Date: Sat, 23 Nov 2019 12:41:47 +0530
Subject: [PATCH 2/2] fix permission confirm box title issue

---
 resources/assets/js/plugins/en.js | 2 +-
 resources/assets/js/plugins/es.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/assets/js/plugins/en.js b/resources/assets/js/plugins/en.js
index f35a4155..1fedaff4 100644
--- a/resources/assets/js/plugins/en.js
+++ b/resources/assets/js/plugins/en.js
@@ -741,7 +741,7 @@ export default {
     permissions: {
       permissions: 'Permissions',
       permission_confirm_title: 'Are you sure you want to continue?',
-      permission_confirm_desc: 'Folder\'s permission check failed',
+      permission_confirm_desc: 'Folder permission check failed',
       permission_desc: 'Below is the list of folder permissions which are required in order for the app to work. If the permission check fails, make sure to update your folder permissions.'
     },
     mail: {
diff --git a/resources/assets/js/plugins/es.js b/resources/assets/js/plugins/es.js
index de72accd..17ad6295 100644
--- a/resources/assets/js/plugins/es.js
+++ b/resources/assets/js/plugins/es.js
@@ -736,7 +736,7 @@ export default {
     permissions: {
       permissions: 'Permisos',
       permission_confirm_title: 'Estás seguro de que quieres continuar?',
-      permission_confirm_desc: 'La verificación de permisos de la carpeta falló',
+      permission_confirm_desc: 'Error de verificación de permisos de carpeta',
       permission_desc: 'A continuación se muestra la lista de permisos de carpeta necesarios para que la aplicación funcione. Si la verificación de permisos falla, asegúrese de actualizar los permisos de su carpeta.'
     },
     mail: {