Skip to content

Commit 0db4314

Browse files
authored
Merge pull request #323 from scottyzen/enhancement/checkout-address-flow
Checkout flow
2 parents deeb68c + 4bf7f44 commit 0db4314

34 files changed

+1976
-2906
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ And here is the live demo of the customized WooNuxt site: [My Shop](https://mysh
4040
| Feature | Ongoing Enhancements | In the Pipeline | In Progress | Done | Next |
4141
| --------------------------------------------------------- | -------------------- | --------------- | ----------- | ---- | ---- |
4242
| Performance | 🔷 | | || |
43-
| SEO | 🔷 | || | |
43+
| SEO | 🔷 | || | |
4444
| Cart | | | || |
4545
| Search | | | || |
4646
| Shipping | | | || |
@@ -96,7 +96,7 @@ And here is the live demo of the customized WooNuxt site: [My Shop](https://mysh
9696
| ---------------------------- | ------- |
9797
| WordPress | 6.8.1 |
9898
| WooCommerce | 9.9.5 |
99-
| WPGraphQL | 2.3.3 |
99+
| WPGraphQL | 2.3.6 |
100100
| WooGraphQL | 0.21.2 |
101101
| ~~WPGraphQL CORS~~ | ~~2.1~~ |
102102
| Headless Login for WPGraphQL | 0.4.2 |

package-lock.json

Lines changed: 1384 additions & 2748 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
"dependencies": {
1414
"@stripe/stripe-js": "^7.9.0",
1515
"@vueform/slider": "^2.1.10",
16-
"@vueuse/core": "^13.8.0"
16+
"@vueuse/core": "^13.9.0"
1717
},
1818
"devDependencies": {
1919
"@nuxt/icon": "^2.0.0",
2020
"@nuxt/image": "1.11.0",
2121
"@nuxtjs/i18n": "^9.5.2",
2222
"@nuxtjs/tailwindcss": "^6.14.0",
2323
"@tailwindcss/typography": "^0.5.16",
24-
"nuxt": "^4.0.3",
24+
"nuxt": "^4.1.3",
2525
"nuxt-graphql-client": "^0.2.46",
2626
"prettier": "^3.6.2"
2727
}

woonuxt_base/app/components/AccountMyDetails.vue

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,12 @@
1212
.account-form input[type='tel'],
1313
.account-form input[type='password'],
1414
.account-form textarea,
15-
.account-form .StripeElement,
15+
.account-form .StripeElement {
16+
@apply bg-white border rounded-md outline-none w-full py-2 px-4 block md:bg-gray-50 shadow-inner;
17+
}
18+
1619
.account-form select {
17-
@apply bg-white border rounded-md outline-none w-full py-2 px-4 block md:bg-gray-50;
20+
@apply bg-white border rounded-md outline-none w-full py-2 px-4 block md:bg-gray-50 shadow-sm;
1821
}
1922
2023
.account-form label {

woonuxt_base/app/components/SignInLink.vue

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
<script setup lang="ts">
2-
const { viewer, avatar, logoutUser, isPending, wishlistLink } = useAuth();
2+
const { viewer, avatar, logoutUser, isPending, wishlistLink, navigateToLogin } = useAuth();
3+
const route = useRoute();
4+
35
const linkTitle = computed<string>(() => viewer.value?.username || 'Sign In');
46
</script>
57

68
<template>
7-
<NuxtLink to="/my-account" :title="linkTitle" class="hidden sm:inline-flex aspect-square items-center">
9+
<NuxtLink to="/my-account" :title="linkTitle" @click="navigateToLogin(route.fullPath)" class="hidden sm:inline-flex aspect-square items-center">
810
<Transition name="pop-in" mode="out-in">
911
<span v-if="avatar" class="relative avatar">
1012
<img

woonuxt_base/app/components/cartElements/QuantityInput.vue

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,16 @@ const decrementQuantity = () => quantity.value--;
1414
watch(
1515
quantity,
1616
debounce(() => {
17-
if (quantity.value !== "") {
17+
if (quantity.value !== '') {
1818
updateItemQuantity(item.key, quantity.value);
1919
}
2020
}, 250),
2121
);
2222
2323
const onFocusOut = () => {
24-
if (quantity.value === "") { // If the quantity is empty, set it to the cart item quantity
25-
const cartItem = cart.value?.contents?.nodes?.find(node => node.key === item.key);
24+
if (quantity.value === '') {
25+
// If the quantity is empty, set it to the cart item quantity
26+
const cartItem = cart.value?.contents?.nodes?.find((node) => node.key === item.key);
2627
if (cartItem) {
2728
quantity.value = cartItem.quantity;
2829
}
@@ -48,7 +49,7 @@ const onFocusOut = () => {
4849
:max="productType.stockQuantity"
4950
aria-label="Quantity"
5051
@focusout="onFocusOut"
51-
class="flex items-center justify-center w-8 px-2 text-right text-xs focus:outline-none border-y border-gray-300" />
52+
class="flex items-center justify-center w-8 px-2 text-xs focus:outline-none border-y border-gray-300 text-center" />
5253
<button
5354
title="Increase Quantity"
5455
aria-label="Increase Quantity"

woonuxt_base/app/components/filtering/CategoryFilter.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ const checkboxChanged = () => {
2828

2929
<template>
3030
<div v-if="terms.length">
31-
<div class="cursor-pointer flex font-semibold mt-8 justify-between items-center" @click="isOpen = !isOpen">
31+
<div class="cursor-pointer flex font-semibold mt-8 leading-none justify-between items-center text-gray-900" @click="isOpen = !isOpen">
3232
<span>{{ label || $t('messages.shop.category', 2) }}</span>
3333
<Icon name="ion:chevron-down-outline" class="transform" :class="isOpen ? 'rotate-180' : ''" />
3434
</div>

woonuxt_base/app/components/filtering/ColorFilter.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const checkboxChanged = () => {
2121
</script>
2222

2323
<template>
24-
<div class="cursor-pointer flex font-semibold mt-8 leading-none justify-between items-center" @click="isOpen = !isOpen">
24+
<div class="cursor-pointer flex font-semibold mt-8 leading-none justify-between items-center text-gray-900" @click="isOpen = !isOpen">
2525
<span>{{ filterTitle }}</span>
2626
<Icon name="ion:chevron-down-outline" class="transform" :class="isOpen ? 'rotate-180' : ''" />
2727
</div>

woonuxt_base/app/components/filtering/GlobalFilter.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const checkboxChanged = () => {
2121
</script>
2222

2323
<template>
24-
<div class="cursor-pointer flex font-semibold mt-8 leading-none justify-between items-center" @click="isOpen = !isOpen">
24+
<div class="cursor-pointer flex font-semibold mt-8 leading-none justify-between items-center text-gray-900" @click="isOpen = !isOpen">
2525
<span>{{ filterTitle }}</span>
2626
<Icon name="ion:chevron-down-outline" class="transform" :class="isOpen ? 'rotate-180' : ''" />
2727
</div>

woonuxt_base/app/components/filtering/OnSaleFilter.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const checkboxClicked = (e) => {
2222

2323
<template>
2424
<div>
25-
<div class="cursor-pointer flex font-semibold mt-8 leading-none justify-between items-center" @click="isOpen = !isOpen">
25+
<div class="cursor-pointer flex font-semibold mt-8 leading-none justify-between items-center text-gray-900" @click="isOpen = !isOpen">
2626
<span>Sale Products Only</span>
2727
<Icon name="ion:chevron-down-outline" class="transform" :class="isOpen ? 'rotate-180' : ''" />
2828
</div>

0 commit comments

Comments
 (0)