@@ -202,8 +128,10 @@ export default Vue.extend({
],
otherProductsItems: [
{
- label: this.$t('Gift Cards'),
- url: '/giftcards/'
+ label: this.$t('Home'),
+ url: {
+ name: 'home'
+ }
},
{
label: this.$t('Gift Boxes'),
@@ -214,39 +142,6 @@ export default Vue.extend({
return this.$route.name === 'configurable-product' &&
this.$route.params?.parentSku === 'gift_box';
}
- },
- {
- label: this.$t('Budsies Pals'),
- url: '/budsiespals/'
- },
- {
- label: this.$t('Bulk Orders'),
- url: '/plush-production/'
- }
- ],
- usefulLinksItems: [
- {
- label: this.$t('Pricing'),
- url: '/pricing/'
- },
- {
- label: this.$t('About'),
- url: '/about/'
- },
- {
- label: this.$t('FAQ\'s'),
- url: '//support.budsies.com/',
- target: '_blank'
- },
-
- {
- label: this.$t('Blog'),
- url: '/blog/',
- target: '_blank'
- },
- {
- label: this.$t('Reviews'),
- url: '/reviews/'
}
]
}
diff --git a/components/organisms/CreativityKitProduct/o-creativity-kit-product-order-form.vue b/components/organisms/CreativityKitProduct/o-creativity-kit-product-order-form.vue
index 88cbd1650..be4eb2f39 100644
--- a/components/organisms/CreativityKitProduct/o-creativity-kit-product-order-form.vue
+++ b/components/organisms/CreativityKitProduct/o-creativity-kit-product-order-form.vue
@@ -216,7 +216,9 @@ export default Vue.extend({
Logger.error(error, 'budsies')();
}
- this.goToCrossSells();
+ this.$router.push({
+ name: 'detailed-cart'
+ });
} catch (error) {
Logger.error(error, 'budsies')();
diff --git a/components/organisms/o-header.vue b/components/organisms/o-header.vue
index 892b12038..f837b21e5 100644
--- a/components/organisms/o-header.vue
+++ b/components/organisms/o-header.vue
@@ -18,40 +18,23 @@
-
-
-
-
-
-
- Gift Cards
-
-
-
-
- Gallery
-
-
-
-
- Pricing
-
-
+
+
+
+ {{ $t('Home') }}
+
+
+
+
+
+ {{ $t('Gift Boxes') }}
+
+
+
@@ -74,7 +57,6 @@ import ALogo from 'theme/components/atoms/a-logo';
import AAccountIcon from 'theme/components/atoms/a-account-icon';
import ADetailedCartIcon from 'theme/components/atoms/a-detailed-cart-icon';
import { mapState, mapGetters } from 'vuex';
-import MMenu from 'theme/components/molecules/m-menu';
import MCtaButton from 'theme/components/molecules/m-cta-button.vue';
export default {
@@ -84,7 +66,6 @@ export default {
ALogo,
AAccountIcon,
ADetailedCartIcon,
- MMenu,
SfOverlay,
MCtaButton
},
@@ -165,7 +146,15 @@ export default {
}
}
+ ._links {
+ display: flex;
+ justify-content: flex-start;
+ column-gap: var(--spacer-lg);
+ }
+
.sf-header-navigation-item {
+ flex: unset;
+
&::after {
bottom: 0;
width: 0;
@@ -200,7 +189,7 @@ export default {
&__navigation {
--header-navigation-margin: 0 var(--spacer-base);
- justify-content: space-evenly;
+ justify-content: space-between;
flex-grow: 2;
}
diff --git a/config/modules.ts b/config/modules.ts
index d6b3975fc..e98be5478 100644
--- a/config/modules.ts
+++ b/config/modules.ts
@@ -1,25 +1,47 @@
import { VueStorefrontModule } from '@vue-storefront/core/lib/module'
+import { CatalogModule } from '@vue-storefront/core/modules/catalog'
import { CatalogNextModule } from '@vue-storefront/core/modules/catalog-next'
+import { CartModule } from '@vue-storefront/core/modules/cart'
+import { CheckoutModule } from '@vue-storefront/core/modules/checkout'
import { NotificationModule } from '@vue-storefront/core/modules/notification'
import { UrlModule } from '@vue-storefront/core/modules/url'
+import { GoogleTagManagerModule } from 'src/modules/google-tag-manager';
+import { UserModule } from '@vue-storefront/core/modules/user'
import { StoryblokModule } from 'src/modules/vsf-storyblok-module'
import { registerModule } from '@vue-storefront/core/lib/modules'
+import { BudsiesModule } from 'src/modules/budsies'
+import { GiftCardModule } from 'src/modules/gift-card'
+import { PaymentBackendMethodsModule } from 'src/modules/payment-backend-methods'
+import { PaymentAffirm } from 'src/modules/payment-affirm';
import { BackendSettings } from 'src/modules/backend-settings';
import { ErrorLoggingModule } from 'src/modules/error-logging';
import { PageLoadingIndicatorModule } from 'src/modules/page-loading-indicator';
+import { PersistedCustomerDataModule } from 'src/modules/persisted-customer-data'
+import { TrueVaultModule } from 'src/modules/true-vault';
import registerStoryblokComponents from 'theme/components/storyblok'
// TODO:distributed across proper pages BEFORE 1.11
export function registerClientModules () {
registerStoryblokComponents()
+ registerModule(TrueVaultModule)
registerModule(PageLoadingIndicatorModule)
registerModule(UrlModule)
+ registerModule(CatalogModule)
+ registerModule(CheckoutModule) // To Checkout
+ registerModule(CartModule)
registerModule(NotificationModule)
+ registerModule(UserModule) // Trigger on user icon click
registerModule(CatalogNextModule)
registerModule(StoryblokModule)
+ registerModule(BudsiesModule)
+ registerModule(GoogleTagManagerModule)
+ registerModule(GiftCardModule)
+ registerModule(PaymentBackendMethodsModule)
+ registerModule(PaymentAffirm)
registerModule(BackendSettings)
registerModule(ErrorLoggingModule)
+ registerModule(PersistedCustomerDataModule)
}
// Deprecated API, will be removed in 2.0
diff --git a/pages/DetailedCart.vue b/pages/DetailedCart.vue
index f1adc5779..26120e7a1 100644
--- a/pages/DetailedCart.vue
+++ b/pages/DetailedCart.vue
@@ -85,36 +85,6 @@
-
-
- Order More
-
-
-
-
-
-
- {{ action.label }}
-
-
-
-
-
import(/* webpackChunkName: "vsf-error" */ 'theme/pages/Error');
const StoryblokPage = () => import(/* webpackChunkName: "vsf-storyblok" */ 'src/modules/vsf-storyblok-module/pages/StoryblokPage.vue')
+const Checkout = () =>
+ import(/* webpackChunkName: "vsf-checkout" */ 'theme/pages/Checkout');
+const DetailedCart = () =>
+ import(/* webpackChunkName: "vsf-detailed-cart" */ 'theme/pages/DetailedCart');
+const MyAccount = () =>
+ import(/* webpackChunkName: "vsf-my-account" */ 'theme/pages/MyAccount');
+const CreativityKitProduct = () =>
+ import(/* webpackChunkName: "vsf-creativity-kit-product" */ 'theme/pages/CreativityKitProduct');
function makeRoutesStrict (routes) {
return routes.map((route) => {
@@ -13,6 +21,18 @@ function makeRoutesStrict (routes) {
}
let routes = [
+ { name: 'detailed-cart', path: '/checkout/cart/', component: DetailedCart },
+ {
+ name: 'checkout',
+ path: '/checkout/onepage/:success?/',
+ component: Checkout,
+ props: true
+ },
+ {
+ name: 'giftbox',
+ path: '/gift-box/',
+ component: CreativityKitProduct
+ },
{
name: 'home',
path: '/',
@@ -30,6 +50,22 @@ let routes = [
}
})
},
+ {
+ name: 'terms-of-service',
+ path: '/terms-of-service/',
+ redirect: {
+ name: 'terms-of-service-alias',
+ params: {
+ slug: 'terms-of-service'
+ }
+ }
+ },
+ {
+ name: 'terms-of-service-alias',
+ component: StoryblokPage,
+ path: '/terms-of-service/'
+ },
+ { name: 'my-account', path: '/my-account/', component: MyAccount },
{ name: 'page-not-found', path: '*', component: ErrorPage },
{ name: 'error', path: '/error/', component: ErrorPage }
];