Undo last commit

app/Http/Controllers/Wizard/Data.php

@@ -125,8 +125,8 @@ class Data extends Controller
         $company->api_key = setting('apps.api_key');
         $company->financial_start = setting('localisation.financial_start');
 
-        if ($company->logo) {
+        if ($company->company_logo) {
-            $logo = \Plank\Mediable\Media::find($company->logo);
+            $logo = $company->company_logo;
 
             $logo->path = route('uploads.get', $logo->id);
 
@@ -147,4 +147,4 @@ class Data extends Controller
             ],
         ]);
     }
-}
+}

resources/assets/js/Wizard.vue

@@ -6,13 +6,17 @@
     :modules="modules.data"
     :currency_codes="currency_codes"
     :company="company"
-    :pageLoad="page_loaded"
   ></router-view>
 </template>
 
 <script>
 export default {
   name: "Wizard",
+  data: function () {
+    return {
+      page_loaded: true,
+    };
+  },
   created() {
     let self = this;
 
@@ -32,7 +36,12 @@ export default {
           return data.currency_codes[key];
         });
 
-        self.page_loaded = false;
+        setTimeout(
+          function () {
+            self.page_loaded = false;
+          }.bind(self),
+          800
+        );
       });
   },
 
@@ -49,7 +58,6 @@ export default {
         taxes: {},
         finish: {},
       },
-      page_loaded: true
     };
   },
 };
@@ -61,11 +69,6 @@ export default {
   display: flex;
   align-items: center;
   justify-content: center;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  z-index: 9999;
 }
 
 .document-loading div {
@@ -125,4 +128,4 @@ export default {
     width: 100%;
   }
 }
-</style>
+</style>

resources/assets/js/views/wizard/Company.vue

@@ -14,11 +14,6 @@
       </div>
       <form ref="form" class="w-100">
         <div class="card-body">
-          <div class="document-loading" v-if="pageLoad">
-            <div>
-              <i class="fas fa-spinner fa-pulse fa-7x"></i>
-            </div>
-          </div>
           <div class="row mb-4">
             <div class="col-12 mb-4">
               <base-input
@@ -144,10 +139,6 @@ export default {
             type: String,
             default: "text",
         },
-
-        pageLoad: {
-          type: [Boolean, String]
-        }
     },
 
     data() {

resources/assets/js/views/wizard/Currencies.vue

@@ -15,11 +15,6 @@
       </div>
 
       <div class="card-body">
-        <div class="document-loading" v-if="pageLoad">
-          <div>
-            <i class="fas fa-spinner fa-pulse fa-7x"></i>
-          </div>
-        </div>
         <div class="d-flex justify-content-end mb-3">
           <base-button
             type="success"
@@ -328,10 +323,6 @@ export default {
         translations: {
             type: [Object, Array],
         },
-
-        pageLoad: {
-          type: [Boolean, String]
-        }
     },
 
     data() {
@@ -438,4 +429,4 @@ export default {
         },
     },
 };
-</script>
+</script>

resources/assets/js/views/wizard/Finish.vue

@@ -11,11 +11,6 @@
         </el-steps>
       </div>
       <div class="card-body bg-default">
-        <div class="document-loading" v-if="pageLoad">
-          <div>
-            <i class="fas fa-spinner fa-pulse fa-7x"></i>
-          </div>
-        </div>
         <div class="row">
           <div class="col-sm-12 col-md-12 col-lg-12 col-xl-12">
             <div class="content-header">
@@ -32,10 +27,10 @@
                 <div class="card">
                   <div class="card-header py-2">
                     <h4 class="ml--3 mb-0 float-left">
-                      <a :href="route_url + '/apps/' + item.slug">{{ item.name }}</a>
+                      <a :href="item.slug">{{ item.name }}</a>
                     </h4>
                   </div>
-                  <a :href="route_url + '/apps/' + item.slug"
+                  <a :href="route_url + '/' + item.slug"
                     ><img
                       v-for="(file, indis) in item.files"
                       :key="indis"
@@ -106,10 +101,6 @@ export default {
 
         translations: {
             type: [Object, Array],
-        },
-
-        pageLoad: {
-          type: [Boolean, String]
         }
     },
 
@@ -151,4 +142,4 @@ export default {
         },
     },
 };
-</script>
+</script>

resources/assets/js/views/wizard/Taxes.vue

@@ -11,11 +11,6 @@
         </el-steps>
       </div>
       <div class="card-body">
-        <div class="document-loading" v-if="pageLoad">
-          <div>
-            <i class="fas fa-spinner fa-pulse fa-7x"></i>
-          </div>
-        </div>
         <div class="d-flex justify-content-end mb-3">
           <base-button
             type="success"
@@ -252,10 +247,6 @@ export default {
         translations: {
             type: [Object, Array],
         },
-
-        pageLoad: {
-          type: [Boolean, String]
-        }
     },
 
     data() {
@@ -328,4 +319,4 @@ export default {
 .current-tab-btn {
   padding: 0 80px;
 }
-</style>
+</style>

resources/views/layouts/wizard.blade.php

@@ -8,6 +8,11 @@
 
             <div id="app">
                 <div class="card-body">
+                    <div class="document-loading" v-if="!page_loaded">
+                        <div>
+                            <i class="fas fa-spinner fa-pulse fa-7x"></i>
+                        </div>
+                    </div>
 
                     @include('flash::message')