Skip to content

Commit a5ee0ca

Browse files
committed
Major code refactoring
1 parent 926579a commit a5ee0ca

File tree

21 files changed

+1794
-1440
lines changed

21 files changed

+1794
-1440
lines changed

public/js/app.js

Lines changed: 1705 additions & 1396 deletions
Large diffs are not rendered by default.

resources/js/app.js

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,22 @@ import { createApp } from 'vue';
33
import store from './store/index';
44
import router from './router/index';
55

6-
import Layout from './components/Layout/Layout.vue';
7-
import FooterContent from './components/Layout/Footer/FooterContent.vue';
8-
import Cart from './components/Layout/Header/Cart.vue';
6+
import Layout from './layouts/Layout.vue';
97

10-
import Index from './pages/Home/Index.vue';
11-
import Products from './pages/Products/Products.vue';
12-
import SingleProduct from './pages/Products/SingleProduct.vue';
13-
import Categories from './pages/Categories/Categories.vue';
14-
import Checkout from './pages/Checkout/Checkout.vue';
15-
import Summary from './pages/Checkout/Summary.vue';
8+
import FooterContent from './components/Footer/FooterContent.vue';
9+
import Cart from './components/Header/Cart.vue';
10+
import SingleProduct from './components/Products/SingleProduct.vue';
11+
12+
import Index from './pages/Index.vue';
13+
import Products from './pages/Products.vue';
14+
import Categories from './pages/Categories.vue';
15+
import Checkout from './pages/Checkout.vue';
16+
import Success from './pages/Success.vue';
1617

1718
require('./bootstrap');
1819

20+
const emptyCart = store.state.products.length === 0;
21+
1922
createApp({
2023
components: {
2124
FooterContent,
@@ -26,10 +29,10 @@ createApp({
2629
SingleProduct,
2730
Categories,
2831
Checkout,
29-
Summary,
32+
Success,
3033
},
3134
created() {
32-
if (store.state.products.length === 0) {
35+
if (emptyCart) {
3336
store.dispatch('getProductsFromApi');
3437
}
3538
},

resources/js/pages/Checkout/CustomerDetailsForm.vue renamed to resources/js/components/Checkout/CustomerDetailsForm.vue

File renamed without changes.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ export default defineComponent({
201201
if (response.statusText === 'Created') {
202202
store.dispatch('emptyCart');
203203
store.commit('UPDATE_ORDER', response.data);
204-
router.push('/thankyou');
204+
router.push('/success');
205205
}
206206
})
207207
.catch(() => {
File renamed without changes.

resources/js/components/Layout/Header/Cart.vue renamed to resources/js/components/Header/Cart.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
alt="Cart icon"
1111
class="h-12 ml-4 lg:ml-2"
1212
aria-label="Cart"
13-
src="../../../../img/svg/Cart.svg"
13+
src="../../../img/svg/Cart.svg"
1414
>
1515
</router-link>
1616
</span>
@@ -32,7 +32,7 @@
3232
import { computed } from 'vue';
3333
import { useStore } from 'vuex';
3434
35-
import { formatPrice } from '../../../utils/functions';
35+
import { formatPrice } from '../../utils/functions';
3636
3737
export default {
3838
setup() {
File renamed without changes.

resources/js/components/Layout/Header/Navbar.vue renamed to resources/js/components/Header/Navbar.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
alt="Logo"
1111
class="h-20 lg:h-24"
1212
aria-label="Nettbutikk logo"
13-
src="../../../../img/svg/Logo.svg"
13+
src="../../../img/svg/Logo.svg"
1414
>
1515
</div>
1616
</div>

0 commit comments

Comments
 (0)