Skip to content

Commit 8761c43

Browse files
authored
Merge pull request #170 from w3bdesign/development
Move Vue Router into a separate folder
2 parents 96498f4 + e713351 commit 8761c43

File tree

6 files changed

+129
-87
lines changed

6 files changed

+129
-87
lines changed

public/js/app.js

Lines changed: 95 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -16438,17 +16438,17 @@ module.exports = {
1643816438
"use strict";
1643916439
__webpack_require__.r(__webpack_exports__);
1644016440
/* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! vue */ "./node_modules/vue/dist/vue.esm-bundler.js");
16441-
/* harmony import */ var vue_router__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! vue-router */ "./node_modules/vue-router/dist/vue-router.esm-bundler.js");
1644216441
/* harmony import */ var _store_index__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./store/index */ "./resources/js/store/index.js");
16443-
/* harmony import */ var _components_Layout_Layout_vue__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./components/Layout/Layout.vue */ "./resources/js/components/Layout/Layout.vue");
16444-
/* harmony import */ var _components_Layout_Footer_FooterContent_vue__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./components/Layout/Footer/FooterContent.vue */ "./resources/js/components/Layout/Footer/FooterContent.vue");
16445-
/* harmony import */ var _components_Layout_Header_Cart_vue__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./components/Layout/Header/Cart.vue */ "./resources/js/components/Layout/Header/Cart.vue");
16446-
/* harmony import */ var _pages_Home_Index_vue__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./pages/Home/Index.vue */ "./resources/js/pages/Home/Index.vue");
16447-
/* harmony import */ var _pages_Products_Products_vue__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./pages/Products/Products.vue */ "./resources/js/pages/Products/Products.vue");
16448-
/* harmony import */ var _pages_Products_SingleProduct_vue__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./pages/Products/SingleProduct.vue */ "./resources/js/pages/Products/SingleProduct.vue");
16449-
/* harmony import */ var _pages_Categories_Categories_vue__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./pages/Categories/Categories.vue */ "./resources/js/pages/Categories/Categories.vue");
16450-
/* harmony import */ var _pages_Checkout_Checkout_vue__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./pages/Checkout/Checkout.vue */ "./resources/js/pages/Checkout/Checkout.vue");
16451-
/* harmony import */ var _pages_Checkout_Summary_vue__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./pages/Checkout/Summary.vue */ "./resources/js/pages/Checkout/Summary.vue");
16442+
/* harmony import */ var _router_index__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./router/index */ "./resources/js/router/index.js");
16443+
/* harmony import */ var _components_Layout_Layout_vue__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./components/Layout/Layout.vue */ "./resources/js/components/Layout/Layout.vue");
16444+
/* harmony import */ var _components_Layout_Footer_FooterContent_vue__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./components/Layout/Footer/FooterContent.vue */ "./resources/js/components/Layout/Footer/FooterContent.vue");
16445+
/* harmony import */ var _components_Layout_Header_Cart_vue__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./components/Layout/Header/Cart.vue */ "./resources/js/components/Layout/Header/Cart.vue");
16446+
/* harmony import */ var _pages_Home_Index_vue__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./pages/Home/Index.vue */ "./resources/js/pages/Home/Index.vue");
16447+
/* harmony import */ var _pages_Products_Products_vue__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./pages/Products/Products.vue */ "./resources/js/pages/Products/Products.vue");
16448+
/* harmony import */ var _pages_Products_SingleProduct_vue__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./pages/Products/SingleProduct.vue */ "./resources/js/pages/Products/SingleProduct.vue");
16449+
/* harmony import */ var _pages_Categories_Categories_vue__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./pages/Categories/Categories.vue */ "./resources/js/pages/Categories/Categories.vue");
16450+
/* harmony import */ var _pages_Checkout_Checkout_vue__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./pages/Checkout/Checkout.vue */ "./resources/js/pages/Checkout/Checkout.vue");
16451+
/* harmony import */ var _pages_Checkout_Summary_vue__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./pages/Checkout/Summary.vue */ "./resources/js/pages/Checkout/Summary.vue");
1645216452

1645316453

1645416454

@@ -16464,48 +16464,24 @@ __webpack_require__.r(__webpack_exports__);
1646416464

1646516465
__webpack_require__(/*! ./bootstrap */ "./resources/js/bootstrap.js");
1646616466

16467-
var routes = [{
16468-
path: '/',
16469-
component: _pages_Home_Index_vue__WEBPACK_IMPORTED_MODULE_5__.default
16470-
}, {
16471-
path: '/products',
16472-
component: _pages_Products_Products_vue__WEBPACK_IMPORTED_MODULE_6__.default
16473-
}, {
16474-
name: 'single.product',
16475-
path: '/product/:slug',
16476-
component: _pages_Products_SingleProduct_vue__WEBPACK_IMPORTED_MODULE_7__.default
16477-
}, {
16478-
path: '/categories',
16479-
component: _pages_Categories_Categories_vue__WEBPACK_IMPORTED_MODULE_8__.default
16480-
}, {
16481-
path: '/checkout',
16482-
component: _pages_Checkout_Checkout_vue__WEBPACK_IMPORTED_MODULE_9__.default
16483-
}, {
16484-
path: '/thankyou',
16485-
component: _pages_Checkout_Summary_vue__WEBPACK_IMPORTED_MODULE_10__.default
16486-
}];
16487-
var router = (0,vue_router__WEBPACK_IMPORTED_MODULE_11__.createRouter)({
16488-
history: (0,vue_router__WEBPACK_IMPORTED_MODULE_11__.createWebHashHistory)(),
16489-
routes: routes
16490-
});
1649116467
(0,vue__WEBPACK_IMPORTED_MODULE_0__.createApp)({
1649216468
components: {
16493-
FooterContent: _components_Layout_Footer_FooterContent_vue__WEBPACK_IMPORTED_MODULE_3__.default,
16494-
Cart: _components_Layout_Header_Cart_vue__WEBPACK_IMPORTED_MODULE_4__.default,
16495-
Layout: _components_Layout_Layout_vue__WEBPACK_IMPORTED_MODULE_2__.default,
16496-
Index: _pages_Home_Index_vue__WEBPACK_IMPORTED_MODULE_5__.default,
16497-
Products: _pages_Products_Products_vue__WEBPACK_IMPORTED_MODULE_6__.default,
16498-
SingleProduct: _pages_Products_SingleProduct_vue__WEBPACK_IMPORTED_MODULE_7__.default,
16499-
Categories: _pages_Categories_Categories_vue__WEBPACK_IMPORTED_MODULE_8__.default,
16500-
Checkout: _pages_Checkout_Checkout_vue__WEBPACK_IMPORTED_MODULE_9__.default,
16501-
Summary: _pages_Checkout_Summary_vue__WEBPACK_IMPORTED_MODULE_10__.default
16469+
FooterContent: _components_Layout_Footer_FooterContent_vue__WEBPACK_IMPORTED_MODULE_4__.default,
16470+
Cart: _components_Layout_Header_Cart_vue__WEBPACK_IMPORTED_MODULE_5__.default,
16471+
Layout: _components_Layout_Layout_vue__WEBPACK_IMPORTED_MODULE_3__.default,
16472+
Index: _pages_Home_Index_vue__WEBPACK_IMPORTED_MODULE_6__.default,
16473+
Products: _pages_Products_Products_vue__WEBPACK_IMPORTED_MODULE_7__.default,
16474+
SingleProduct: _pages_Products_SingleProduct_vue__WEBPACK_IMPORTED_MODULE_8__.default,
16475+
Categories: _pages_Categories_Categories_vue__WEBPACK_IMPORTED_MODULE_9__.default,
16476+
Checkout: _pages_Checkout_Checkout_vue__WEBPACK_IMPORTED_MODULE_10__.default,
16477+
Summary: _pages_Checkout_Summary_vue__WEBPACK_IMPORTED_MODULE_11__.default
1650216478
},
1650316479
created: function created() {
1650416480
if (_store_index__WEBPACK_IMPORTED_MODULE_1__.default.state.products.length === 0) {
1650516481
_store_index__WEBPACK_IMPORTED_MODULE_1__.default.dispatch('getProductsFromApi');
1650616482
}
1650716483
}
16508-
}).use(_store_index__WEBPACK_IMPORTED_MODULE_1__.default).use(router).mount('#app');
16484+
}).use(_store_index__WEBPACK_IMPORTED_MODULE_1__.default).use(_router_index__WEBPACK_IMPORTED_MODULE_2__.default).mount('#app');
1650916485

1651016486
/***/ }),
1651116487

@@ -16532,6 +16508,76 @@ window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
1653216508

1653316509
/***/ }),
1653416510

16511+
/***/ "./resources/js/router/index.js":
16512+
/*!**************************************!*\
16513+
!*** ./resources/js/router/index.js ***!
16514+
\**************************************/
16515+
/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
16516+
16517+
"use strict";
16518+
__webpack_require__.r(__webpack_exports__);
16519+
/* harmony export */ __webpack_require__.d(__webpack_exports__, {
16520+
/* harmony export */ "default": () => (__WEBPACK_DEFAULT_EXPORT__)
16521+
/* harmony export */ });
16522+
/* harmony import */ var vue_router__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! vue-router */ "./node_modules/vue-router/dist/vue-router.esm-bundler.js");
16523+
/* harmony import */ var _routes__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./routes */ "./resources/js/router/routes.js");
16524+
16525+
16526+
var router = (0,vue_router__WEBPACK_IMPORTED_MODULE_1__.createRouter)({
16527+
history: (0,vue_router__WEBPACK_IMPORTED_MODULE_1__.createWebHashHistory)(),
16528+
routes: _routes__WEBPACK_IMPORTED_MODULE_0__.default
16529+
});
16530+
/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (router);
16531+
16532+
/***/ }),
16533+
16534+
/***/ "./resources/js/router/routes.js":
16535+
/*!***************************************!*\
16536+
!*** ./resources/js/router/routes.js ***!
16537+
\***************************************/
16538+
/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
16539+
16540+
"use strict";
16541+
__webpack_require__.r(__webpack_exports__);
16542+
/* harmony export */ __webpack_require__.d(__webpack_exports__, {
16543+
/* harmony export */ "default": () => (__WEBPACK_DEFAULT_EXPORT__)
16544+
/* harmony export */ });
16545+
/* harmony import */ var _pages_Home_Index_vue__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../pages/Home/Index.vue */ "./resources/js/pages/Home/Index.vue");
16546+
/* harmony import */ var _pages_Products_Products_vue__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../pages/Products/Products.vue */ "./resources/js/pages/Products/Products.vue");
16547+
/* harmony import */ var _pages_Products_SingleProduct_vue__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../pages/Products/SingleProduct.vue */ "./resources/js/pages/Products/SingleProduct.vue");
16548+
/* harmony import */ var _pages_Categories_Categories_vue__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../pages/Categories/Categories.vue */ "./resources/js/pages/Categories/Categories.vue");
16549+
/* harmony import */ var _pages_Checkout_Checkout_vue__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../pages/Checkout/Checkout.vue */ "./resources/js/pages/Checkout/Checkout.vue");
16550+
/* harmony import */ var _pages_Checkout_Summary_vue__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../pages/Checkout/Summary.vue */ "./resources/js/pages/Checkout/Summary.vue");
16551+
16552+
16553+
16554+
16555+
16556+
16557+
var routes = [{
16558+
path: '/',
16559+
component: _pages_Home_Index_vue__WEBPACK_IMPORTED_MODULE_0__.default
16560+
}, {
16561+
path: '/products',
16562+
component: _pages_Products_Products_vue__WEBPACK_IMPORTED_MODULE_1__.default
16563+
}, {
16564+
name: 'single.product',
16565+
path: '/product/:slug',
16566+
component: _pages_Products_SingleProduct_vue__WEBPACK_IMPORTED_MODULE_2__.default
16567+
}, {
16568+
path: '/categories',
16569+
component: _pages_Categories_Categories_vue__WEBPACK_IMPORTED_MODULE_3__.default
16570+
}, {
16571+
path: '/checkout',
16572+
component: _pages_Checkout_Checkout_vue__WEBPACK_IMPORTED_MODULE_4__.default
16573+
}, {
16574+
path: '/thankyou',
16575+
component: _pages_Checkout_Summary_vue__WEBPACK_IMPORTED_MODULE_5__.default
16576+
}];
16577+
/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (routes);
16578+
16579+
/***/ }),
16580+
1653516581
/***/ "./resources/js/store/index.js":
1653616582
/*!*************************************!*\
1653716583
!*** ./resources/js/store/index.js ***!
@@ -17995,7 +18041,7 @@ var _hoisted_22 = {
1799518041
"class": "flex justify-center w-full align-center"
1799618042
};
1799718043

17998-
var _hoisted_23 = /*#__PURE__*/(0,vue__WEBPACK_IMPORTED_MODULE_0__.createStaticVNode)("<div class=\"flex justify-center w-full align-center\" data-v-67966e56><span class=\"h-10 p-4 text-lg font-bold text-center text-red-500\" data-v-67966e56>Use the following card details for testing: <br data-v-67966e56>4242424242424242 <br data-v-67966e56>CVC any 3 digits <br data-v-67966e56>Any future date <br data-v-67966e56></span></div><h2 class=\"h-10 p-4 mt-32 text-2xl font-bold text-center\" data-v-67966e56> Stripe payment </h2><div class=\"flex justify-center w-full p-4 align-center\" data-v-67966e56><br data-v-67966e56><div id=\"card-element\" class=\"w-full h-16 mt-4 lg:w-5/12 xl:w-5/12\" data-v-67966e56> Stripe </div></div>", 3);
18044+
var _hoisted_23 = /*#__PURE__*/(0,vue__WEBPACK_IMPORTED_MODULE_0__.createStaticVNode)("<div class=\"flex justify-center w-full align-center\" data-v-67966e56><span class=\"h-10 p-4 text-lg font-bold text-center text-red-500\" data-v-67966e56>Use the following card details for testing: <br data-v-67966e56>4242424242424242 <br data-v-67966e56>CVC any 3 digits <br data-v-67966e56>Any future date <br data-v-67966e56>Any zip code </span></div><h2 class=\"h-10 p-4 mt-32 text-2xl font-bold text-center\" data-v-67966e56> Stripe payment </h2><div class=\"flex justify-center w-full p-4 align-center\" data-v-67966e56><br data-v-67966e56><div id=\"card-element\" class=\"w-full h-16 mt-4 lg:w-5/12 xl:w-5/12\" data-v-67966e56> Stripe </div></div>", 3);
1799918045

1800018046
var _hoisted_26 = {
1800118047
"class": "flex justify-center w-full align-center"
@@ -18403,25 +18449,14 @@ __webpack_require__.r(__webpack_exports__);
1840318449
/* harmony export */ });
1840418450
/* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! vue */ "./node_modules/vue/dist/vue.esm-bundler.js");
1840518451

18406-
18407-
var _hoisted_1 = /*#__PURE__*/(0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)("h1", {
18408-
"class": "h-10 p-6 text-4xl font-bold text-center"
18409-
}, " Order summary ", -1
18410-
/* HOISTED */
18411-
);
18412-
18413-
var _hoisted_2 = {
18452+
var _hoisted_1 = {
1841418453
"class": "mt-4"
1841518454
};
18416-
18417-
var _hoisted_3 = /*#__PURE__*/(0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)("h2", {
18455+
var _hoisted_2 = {
1841818456
"class": "h-10 p-6 text-2xl font-bold text-center"
18419-
}, " Thank you for your order with transaction ID # ", -1
18420-
/* HOISTED */
18421-
);
18422-
18457+
};
1842318458
function render(_ctx, _cache, $props, $setup, $data, $options) {
18424-
return (0,vue__WEBPACK_IMPORTED_MODULE_0__.openBlock)(), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createBlock)("div", null, [_hoisted_1, (0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)("div", _hoisted_2, [_hoisted_3, (0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)("pre", null, (0,vue__WEBPACK_IMPORTED_MODULE_0__.toDisplayString)($setup.order), 1
18459+
return (0,vue__WEBPACK_IMPORTED_MODULE_0__.openBlock)(), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createBlock)("div", null, [(0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)("div", _hoisted_1, [(0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)("h2", _hoisted_2, " Thank you for your order with transaction ID " + (0,vue__WEBPACK_IMPORTED_MODULE_0__.toDisplayString)($setup.order.transaction_id), 1
1842518460
/* TEXT */
1842618461
)])]);
1842718462
}

resources/js/app.js

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { createApp } from 'vue';
2-
import { createRouter, createWebHashHistory } from 'vue-router';
32

43
import store from './store/index';
4+
import router from './router/index';
55

66
import Layout from './components/Layout/Layout.vue';
77
import FooterContent from './components/Layout/Footer/FooterContent.vue';
@@ -16,24 +16,6 @@ import Summary from './pages/Checkout/Summary.vue';
1616

1717
require('./bootstrap');
1818

19-
const routes = [
20-
{ path: '/', component: Index },
21-
{ path: '/products', component: Products },
22-
{
23-
name: 'single.product',
24-
path: '/product/:slug',
25-
component: SingleProduct,
26-
},
27-
{ path: '/categories', component: Categories },
28-
{ path: '/checkout', component: Checkout },
29-
{ path: '/thankyou', component: Summary },
30-
];
31-
32-
const router = createRouter({
33-
history: createWebHashHistory(),
34-
routes,
35-
});
36-
3719
createApp({
3820
components: {
3921
FooterContent,

resources/js/pages/Checkout/Checkout.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
>Use the following card details for testing:
8989
<br>4242424242424242 <br>CVC any 3
9090
digits <br>Any future date
91-
<br>
91+
<br>Any zip code
9292
</span>
9393
</div>
9494
<h2 class="h-10 p-4 mt-32 text-2xl font-bold text-center">

resources/js/pages/Checkout/Summary.vue

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
<template>
22
<div>
3-
<h1 class="h-10 p-6 text-4xl font-bold text-center">
4-
Order summary
5-
</h1>
63
<div class="mt-4">
74
<h2 class="h-10 p-6 text-2xl font-bold text-center">
8-
Thank you for your order with transaction ID #
5+
Thank you for your order with transaction ID {{ order.transaction_id }}
96
</h2>
10-
<pre>{{ order }}</pre>
117
</div>
128
</div>
139
</template>
@@ -19,9 +15,7 @@ import { useStore } from 'vuex';
1915
export default {
2016
setup() {
2117
const store = useStore();
22-
2318
const order = computed(() => store.state.order);
24-
2519
return {
2620
order,
2721
};

resources/js/router/index.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import { createRouter, createWebHashHistory } from 'vue-router';
2+
3+
import routes from './routes';
4+
5+
const router = createRouter({
6+
history: createWebHashHistory(),
7+
routes,
8+
});
9+
10+
export default router;

resources/js/router/routes.js

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
import Index from '../pages/Home/Index.vue';
2+
import Products from '../pages/Products/Products.vue';
3+
import SingleProduct from '../pages/Products/SingleProduct.vue';
4+
import Categories from '../pages/Categories/Categories.vue';
5+
import Checkout from '../pages/Checkout/Checkout.vue';
6+
import Summary from '../pages/Checkout/Summary.vue';
7+
8+
const routes = [
9+
{ path: '/', component: Index },
10+
{ path: '/products', component: Products },
11+
{
12+
name: 'single.product',
13+
path: '/product/:slug',
14+
component: SingleProduct,
15+
},
16+
{ path: '/categories', component: Categories },
17+
{ path: '/checkout', component: Checkout },
18+
{ path: '/thankyou', component: Summary },
19+
];
20+
21+
export default routes;

0 commit comments

Comments
 (0)