Merge pull request #172 from w3bdesign/development

Major code refactoring and restructuring

Author: w3bdesign

public/js/app.js

@@ -3,19 +3,22 @@ import { createApp } from 'vue';
 import store from './store/index';
 import router from './router/index';
 
-import Layout from './components/Layout/Layout.vue';
-import FooterContent from './components/Layout/Footer/FooterContent.vue';
-import Cart from './components/Layout/Header/Cart.vue';
+import Layout from './layouts/Layout.vue';
 
-import Index from './pages/Home/Index.vue';
-import Products from './pages/Products/Products.vue';
-import SingleProduct from './pages/Products/SingleProduct.vue';
-import Categories from './pages/Categories/Categories.vue';
-import Checkout from './pages/Checkout/Checkout.vue';
-import Summary from './pages/Checkout/Summary.vue';
+import FooterContent from './components/Footer/FooterContent.vue';
+import Cart from './components/Header/Cart.vue';
+import SingleProduct from './components/Products/SingleProduct.vue';
+
+import Index from './pages/Index.vue';
+import Products from './pages/Products.vue';
+import Categories from './pages/Categories.vue';
+import Checkout from './pages/Checkout.vue';
+import Success from './pages/Success.vue';
 
 require('./bootstrap');
 
+const emptyCart = store.state.products.length === 0;
+
 createApp({
   components: {
     FooterContent,
@@ -26,10 +29,10 @@ createApp({
     SingleProduct,
     Categories,
     Checkout,
-    Summary,
+    Success,
   },
   created() {
-    if (store.state.products.length === 0) {
+    if (emptyCart) {
       store.dispatch('getProductsFromApi');
     }
   },

resources/js/app.js

@@ -201,7 +201,7 @@ export default defineComponent({
             if (response.statusText === 'Created') {
               store.dispatch('emptyCart');
               store.commit('UPDATE_ORDER', response.data);
-              router.push('/thankyou');
+              router.push('/success');
             }
           })
           .catch(() => {

…s/pages/Checkout/CustomerDetailsForm.vue …ponents/Checkout/CustomerDetailsForm.vueresources/js/pages/Checkout/CustomerDetailsForm.vue renamed to resources/js/components/Checkout/CustomerDetailsForm.vue resources/js/pages/Checkout/CustomerDetailsForm.vue renamed to resources/js/components/Checkout/CustomerDetailsForm.vue

@@ -10,7 +10,7 @@
             alt="Cart icon"
             class="h-12 ml-4 lg:ml-2"
             aria-label="Cart"
-            src="../../../../img/svg/Cart.svg"
+            src="../../../img/svg/Cart.svg"
           >
         </router-link>
       </span>
@@ -32,7 +32,7 @@
 import { computed } from 'vue';
 import { useStore } from 'vuex';
 
-import { formatPrice } from '../../../utils/functions';
+import { formatPrice } from '../../utils/functions';
 
 export default {
   setup() {

resources/js/pages/Checkout/Checkout.vue …js/components/Checkout/OrderCheckout.vueresources/js/pages/Checkout/Checkout.vue renamed to resources/js/components/Checkout/OrderCheckout.vue resources/js/pages/Checkout/Checkout.vue renamed to resources/js/components/Checkout/OrderCheckout.vue

@@ -10,7 +10,7 @@
             alt="Logo"
             class="h-20 lg:h-24"
             aria-label="Nettbutikk logo"
-            src="../../../../img/svg/Logo.svg"
+            src="../../../img/svg/Logo.svg"
           >
         </div>
       </div>