Installation issue solved..

Godor · Nov 22, 2019 · 9b86b70 · 9b86b70
1 parent 1b0d680
commit 9b86b70
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 11 deletions.
diff --git a/resources/assets/js/install.js b/resources/assets/js/install.js
@@ -17,15 +17,16 @@ import Language from './views/install/Language';
 import Database from './views/install/Database';
 import Settings from './views/install/Settings';
 
-var base_path = url.replace(window.location.origin, '');
+var global_path = new URL(url).protocol + '//' + window.location.host;
+var base_path = url.replace(global_path, '');
 
 const router = new VueRouter({
     mode: 'history',
     base: base_path,
     routes: [
         {
             path:  '/',
-            name: 'requirements',
+            name: 'home',
             component: Requirements
         },
         {

diff --git a/resources/assets/js/mixins/global.js b/resources/assets/js/mixins/global.js
@@ -17,7 +17,6 @@ import NProgressAxios from './../plugins/nprogress-axios';
 
 import {VMoney} from 'v-money';
 import { Select, Option } from 'element-ui';
-import { isThisSecond } from 'date-fns';
 
 // plugin setup
 Vue.use(DashboardPlugin);

diff --git a/resources/assets/js/views/install/Database.vue b/resources/assets/js/views/install/Database.vue
@@ -21,7 +21,6 @@
                     <p class="mt-2 after-step-text">Database</p>
                 </div>
 
-
                 <div class="col-md-4 text-center">
                     <button type="button" class="btn btn-secondary btn-lg wizard-steps rounded-circle steps">
                         <span class="btn-inner--icon wizard-steps-inner wizard-steps-color">3</span>

diff --git a/resources/assets/js/views/install/Language.vue b/resources/assets/js/views/install/Language.vue
@@ -24,13 +24,10 @@
                     <p class="mt-2 text-muted step-text">Admin</p>
                 </div>
 
-
                 <div class="col-md-12">
                     <div class="form-group mb-0">
                         <select v-model="form.lang" name="lang" id="lang" size="13" class="col-xl-12 form-control-label">
-                            <option
-                                v-for="(name, code) in languages"
-                                v-bind:value="code">
+                            <option v-for="(name, code) in languages" :value="code">
                                 {{ name }}
                             </option>
                         </select>

diff --git a/resources/views/layouts/install.blade.php b/resources/views/layouts/install.blade.php
@@ -23,7 +23,6 @@
                         <div class="card">
                             {!! Form::open([
                                 'url' => url()->current(),
-                                '@submit.prevent' => 'onSubmit',
                                 'role' => 'form',
                                 'id' => 'form-install'
                             ]) !!}

diff --git a/resources/views/partials/install/head.blade.php b/resources/views/partials/install/head.blade.php
@@ -33,13 +33,13 @@
 
         @stack('js')
 
-        <script>
+        <script type="text/javascript"><!--
             window.Laravel = <?php echo json_encode([
                 'csrfToken' => csrf_token(),
             ]); ?>
 
             var flash_notification = {!! (session()->has('flash_notification')) ? json_encode(session()->get('flash_notification')) : 'false' !!};
-        </script>
+        //--></script>
         {{ session()->forget('flash_notification') }}
 
         @stack('scripts')