@vendure-platform/create 0.5.0 → 0.5.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +8 -0
- package/README.md +39 -39
- package/dist/add-to-existing.js +1 -1
- package/dist/assets/demo-data/initial-data.json +663 -663
- package/dist/assets/storefront/components.json +20 -20
- package/dist/assets/storefront/eslint.config.mjs +10 -10
- package/dist/assets/storefront/graphql.config.yml +1 -1
- package/dist/assets/storefront/next.config.ts +5 -4
- package/dist/assets/storefront/package.json +1 -1
- package/dist/assets/storefront/postcss.config.mjs +1 -1
- package/dist/assets/storefront/src/app/[locale]/(catalog)/catalog/page.tsx +17 -21
- package/dist/assets/storefront/src/app/[locale]/(catalog)/collection/[slug]/page.tsx +64 -42
- package/dist/assets/storefront/src/app/[locale]/(catalog)/layout.tsx +1 -5
- package/dist/assets/storefront/src/app/[locale]/(catalog)/product/[slug]/actions.ts +69 -65
- package/dist/assets/storefront/src/app/[locale]/(catalog)/product/[slug]/page.tsx +64 -38
- package/dist/assets/storefront/src/app/[locale]/(catalog)/search/page.tsx +24 -27
- package/dist/assets/storefront/src/app/[locale]/(catalog)/search/search-results.tsx +11 -9
- package/dist/assets/storefront/src/app/[locale]/(catalog)/search/search-term.tsx +4 -4
- package/dist/assets/storefront/src/app/[locale]/(scenario)/[...path]/page.tsx +1 -1
- package/dist/assets/storefront/src/app/[locale]/accept-invitation/[token]/accept-invitation-client.tsx +8 -13
- package/dist/assets/storefront/src/app/[locale]/accept-invitation/[token]/actions.ts +11 -14
- package/dist/assets/storefront/src/app/[locale]/accept-invitation/[token]/page.tsx +30 -33
- package/dist/assets/storefront/src/app/[locale]/accept-invitation/[token]/sign-out-and-retry.tsx +6 -6
- package/dist/assets/storefront/src/app/[locale]/account/addresses/actions.ts +30 -45
- package/dist/assets/storefront/src/app/[locale]/account/addresses/address-form.tsx +166 -159
- package/dist/assets/storefront/src/app/[locale]/account/addresses/addresses-client.tsx +35 -26
- package/dist/assets/storefront/src/app/[locale]/account/addresses/loading.tsx +1 -3
- package/dist/assets/storefront/src/app/[locale]/account/addresses/page.tsx +16 -18
- package/dist/assets/storefront/src/app/[locale]/account/approvals/actions.ts +5 -8
- package/dist/assets/storefront/src/app/[locale]/account/approvals/page.tsx +77 -69
- package/dist/assets/storefront/src/app/[locale]/account/company/actions.ts +10 -11
- package/dist/assets/storefront/src/app/[locale]/account/company/addresses/actions.ts +6 -15
- package/dist/assets/storefront/src/app/[locale]/account/company/addresses/address-form.tsx +57 -49
- package/dist/assets/storefront/src/app/[locale]/account/company/addresses/addresses-client.tsx +23 -25
- package/dist/assets/storefront/src/app/[locale]/account/company/addresses/page.tsx +30 -30
- package/dist/assets/storefront/src/app/[locale]/account/company/business-units/actions.ts +20 -29
- package/dist/assets/storefront/src/app/[locale]/account/company/business-units/business-unit-form.tsx +32 -37
- package/dist/assets/storefront/src/app/[locale]/account/company/business-units/business-units-client.tsx +32 -25
- package/dist/assets/storefront/src/app/[locale]/account/company/business-units/page.tsx +24 -24
- package/dist/assets/storefront/src/app/[locale]/account/company/business-units/types.ts +7 -4
- package/dist/assets/storefront/src/app/[locale]/account/company/edit-company-form.tsx +11 -21
- package/dist/assets/storefront/src/app/[locale]/account/company/page.tsx +23 -28
- package/dist/assets/storefront/src/app/[locale]/account/company/payment-methods/page.tsx +24 -24
- package/dist/assets/storefront/src/app/[locale]/account/company/payment-methods/payment-methods-client.tsx +5 -7
- package/dist/assets/storefront/src/app/[locale]/account/company/roles/page.tsx +22 -25
- package/dist/assets/storefront/src/app/[locale]/account/company/roles/roles-client.tsx +11 -26
- package/dist/assets/storefront/src/app/[locale]/account/company/tax-ids/actions.ts +6 -10
- package/dist/assets/storefront/src/app/[locale]/account/company/tax-ids/page.tsx +18 -16
- package/dist/assets/storefront/src/app/[locale]/account/company/tax-ids/tax-ids-client.tsx +74 -67
- package/dist/assets/storefront/src/app/[locale]/account/company/users/actions.ts +16 -25
- package/dist/assets/storefront/src/app/[locale]/account/company/users/edit-user-form.tsx +27 -25
- package/dist/assets/storefront/src/app/[locale]/account/company/users/invite-user-form.tsx +27 -19
- package/dist/assets/storefront/src/app/[locale]/account/company/users/page.tsx +32 -29
- package/dist/assets/storefront/src/app/[locale]/account/company/users/users-client.tsx +35 -38
- package/dist/assets/storefront/src/app/[locale]/account/error.tsx +1 -3
- package/dist/assets/storefront/src/app/[locale]/account/layout.tsx +16 -22
- package/dist/assets/storefront/src/app/[locale]/account/orders/[code]/page.tsx +151 -103
- package/dist/assets/storefront/src/app/[locale]/account/orders/[code]/reorder-actions.ts +6 -7
- package/dist/assets/storefront/src/app/[locale]/account/orders/[code]/reorder-dialog.tsx +22 -48
- package/dist/assets/storefront/src/app/[locale]/account/orders/loading.tsx +8 -8
- package/dist/assets/storefront/src/app/[locale]/account/orders/page.tsx +101 -61
- package/dist/assets/storefront/src/app/[locale]/account/profile/actions.ts +32 -23
- package/dist/assets/storefront/src/app/[locale]/account/profile/change-password-form.tsx +6 -16
- package/dist/assets/storefront/src/app/[locale]/account/profile/edit-email-form.tsx +7 -17
- package/dist/assets/storefront/src/app/[locale]/account/profile/edit-profile-form.tsx +6 -16
- package/dist/assets/storefront/src/app/[locale]/account/profile/loading.tsx +12 -18
- package/dist/assets/storefront/src/app/[locale]/account/profile/page.tsx +15 -15
- package/dist/assets/storefront/src/app/[locale]/account/quick-order/file-upload-tab.tsx +2 -6
- package/dist/assets/storefront/src/app/[locale]/account/quick-order/manual-entry-tab.tsx +18 -15
- package/dist/assets/storefront/src/app/[locale]/account/quick-order/page.tsx +3 -6
- package/dist/assets/storefront/src/app/[locale]/account/quick-order/preview-table.tsx +10 -2
- package/dist/assets/storefront/src/app/[locale]/account/quick-order/save-to-list-dialog.tsx +24 -26
- package/dist/assets/storefront/src/app/[locale]/account/quick-order/sku-autocomplete.tsx +19 -10
- package/dist/assets/storefront/src/app/[locale]/account/quick-order/text-input-tab.tsx +3 -8
- package/dist/assets/storefront/src/app/[locale]/account/quotes/[id]/page.tsx +86 -59
- package/dist/assets/storefront/src/app/[locale]/account/quotes/actions.ts +38 -45
- package/dist/assets/storefront/src/app/[locale]/account/quotes/new/new-quote-form.tsx +3 -5
- package/dist/assets/storefront/src/app/[locale]/account/quotes/new/page.tsx +6 -6
- package/dist/assets/storefront/src/app/[locale]/account/quotes/page.tsx +92 -59
- package/dist/assets/storefront/src/app/[locale]/account/shared-carts/[id]/add-item-search.tsx +11 -9
- package/dist/assets/storefront/src/app/[locale]/account/shared-carts/[id]/add-member-form.tsx +31 -15
- package/dist/assets/storefront/src/app/[locale]/account/shared-carts/[id]/members-panel.tsx +52 -33
- package/dist/assets/storefront/src/app/[locale]/account/shared-carts/[id]/page.tsx +22 -14
- package/dist/assets/storefront/src/app/[locale]/account/shared-carts/[id]/rename-dialog.tsx +34 -13
- package/dist/assets/storefront/src/app/[locale]/account/shared-carts/actions.ts +117 -72
- package/dist/assets/storefront/src/app/[locale]/account/shared-carts/new/new-shared-cart-form.tsx +21 -14
- package/dist/assets/storefront/src/app/[locale]/account/shared-carts/new/page.tsx +10 -10
- package/dist/assets/storefront/src/app/[locale]/account/shared-carts/page.tsx +54 -41
- package/dist/assets/storefront/src/app/[locale]/account/shopping-lists/[id]/page.tsx +22 -8
- package/dist/assets/storefront/src/app/[locale]/account/shopping-lists/[id]/shopping-list-detail-client.tsx +62 -49
- package/dist/assets/storefront/src/app/[locale]/account/shopping-lists/actions.ts +9 -4
- package/dist/assets/storefront/src/app/[locale]/account/shopping-lists/create-shopping-list-form.tsx +5 -11
- package/dist/assets/storefront/src/app/[locale]/account/shopping-lists/loading.tsx +1 -1
- package/dist/assets/storefront/src/app/[locale]/account/shopping-lists/page.tsx +32 -42
- package/dist/assets/storefront/src/app/[locale]/account/store-credits/actions.ts +8 -8
- package/dist/assets/storefront/src/app/[locale]/account/store-credits/claim-form.tsx +6 -10
- package/dist/assets/storefront/src/app/[locale]/account/store-credits/page.tsx +76 -55
- package/dist/assets/storefront/src/app/[locale]/account/store-credits/reveal-code.tsx +10 -6
- package/dist/assets/storefront/src/app/[locale]/account/verify-email/page.tsx +32 -39
- package/dist/assets/storefront/src/app/[locale]/cart/actions.ts +29 -23
- package/dist/assets/storefront/src/app/[locale]/cart/cart-items.tsx +111 -40
- package/dist/assets/storefront/src/app/[locale]/cart/cart-line-actions.tsx +9 -9
- package/dist/assets/storefront/src/app/[locale]/cart/cart-quantity-control.tsx +61 -48
- package/dist/assets/storefront/src/app/[locale]/cart/cart-remove-button.tsx +15 -9
- package/dist/assets/storefront/src/app/[locale]/cart/cart.tsx +38 -41
- package/dist/assets/storefront/src/app/[locale]/cart/code-input.tsx +8 -8
- package/dist/assets/storefront/src/app/[locale]/cart/order-summary.tsx +50 -32
- package/dist/assets/storefront/src/app/[locale]/cart/page.tsx +11 -11
- package/dist/assets/storefront/src/app/[locale]/cart/promotion-code.tsx +48 -42
- package/dist/assets/storefront/src/app/[locale]/cart/reapproval-confirm.tsx +22 -20
- package/dist/assets/storefront/src/app/[locale]/cart/request-quote-button.tsx +7 -16
- package/dist/assets/storefront/src/app/[locale]/checkout/actions.ts +39 -65
- package/dist/assets/storefront/src/app/[locale]/checkout/cancel-quote-checkout-button.tsx +5 -5
- package/dist/assets/storefront/src/app/[locale]/checkout/checkout-flow.tsx +202 -202
- package/dist/assets/storefront/src/app/[locale]/checkout/checkout-provider.tsx +142 -142
- package/dist/assets/storefront/src/app/[locale]/checkout/order-summary.tsx +158 -139
- package/dist/assets/storefront/src/app/[locale]/checkout/page.tsx +56 -47
- package/dist/assets/storefront/src/app/[locale]/checkout/steps/delivery-step.tsx +86 -88
- package/dist/assets/storefront/src/app/[locale]/checkout/steps/payment-step.tsx +90 -91
- package/dist/assets/storefront/src/app/[locale]/checkout/steps/review-step.tsx +166 -161
- package/dist/assets/storefront/src/app/[locale]/checkout/steps/shipping-address-step.tsx +573 -494
- package/dist/assets/storefront/src/app/[locale]/error.tsx +3 -5
- package/dist/assets/storefront/src/app/[locale]/forgot-password/actions.ts +10 -7
- package/dist/assets/storefront/src/app/[locale]/forgot-password/forgot-password-form.tsx +10 -25
- package/dist/assets/storefront/src/app/[locale]/forgot-password/page.tsx +5 -5
- package/dist/assets/storefront/src/app/[locale]/globals.css +48 -48
- package/dist/assets/storefront/src/app/[locale]/layout.tsx +53 -47
- package/dist/assets/storefront/src/app/[locale]/not-found.tsx +3 -5
- package/dist/assets/storefront/src/app/[locale]/order-confirmation/[code]/order-confirmation.tsx +71 -44
- package/dist/assets/storefront/src/app/[locale]/order-confirmation/[code]/page.tsx +7 -5
- package/dist/assets/storefront/src/app/[locale]/page.tsx +33 -35
- package/dist/assets/storefront/src/app/[locale]/register/actions.ts +7 -7
- package/dist/assets/storefront/src/app/[locale]/register/page.tsx +22 -16
- package/dist/assets/storefront/src/app/[locale]/register/registration-form.tsx +22 -34
- package/dist/assets/storefront/src/app/[locale]/register-company/actions.ts +15 -19
- package/dist/assets/storefront/src/app/[locale]/register-company/page.tsx +17 -15
- package/dist/assets/storefront/src/app/[locale]/register-company/registration-form.tsx +9 -15
- package/dist/assets/storefront/src/app/[locale]/reset-password/actions.ts +7 -8
- package/dist/assets/storefront/src/app/[locale]/reset-password/page.tsx +18 -12
- package/dist/assets/storefront/src/app/[locale]/reset-password/reset-password-form.tsx +8 -16
- package/dist/assets/storefront/src/app/[locale]/shopping-list/[code]/add-to-cart-button.tsx +10 -4
- package/dist/assets/storefront/src/app/[locale]/shopping-list/[code]/page.tsx +62 -30
- package/dist/assets/storefront/src/app/[locale]/sign-in/actions.ts +14 -16
- package/dist/assets/storefront/src/app/[locale]/sign-in/login-form.tsx +17 -30
- package/dist/assets/storefront/src/app/[locale]/sign-in/page.tsx +35 -30
- package/dist/assets/storefront/src/app/[locale]/verify/actions.ts +8 -8
- package/dist/assets/storefront/src/app/[locale]/verify/page.tsx +18 -14
- package/dist/assets/storefront/src/app/[locale]/verify/verify-content.tsx +25 -27
- package/dist/assets/storefront/src/app/[locale]/verify-pending/page.tsx +23 -23
- package/dist/assets/storefront/src/app/api/clear-company-context/route.ts +6 -3
- package/dist/assets/storefront/src/app/api/revalidate/route.ts +19 -28
- package/dist/assets/storefront/src/app/api/search-analytics/route.ts +1 -1
- package/dist/assets/storefront/src/components/commerce/account-nav-items.ts +43 -18
- package/dist/assets/storefront/src/components/commerce/account-sidebar.tsx +30 -22
- package/dist/assets/storefront/src/components/commerce/active-filters.tsx +1 -1
- package/dist/assets/storefront/src/components/commerce/add-to-shared-cart.tsx +49 -27
- package/dist/assets/storefront/src/components/commerce/approval-decision-form.tsx +9 -13
- package/dist/assets/storefront/src/components/commerce/approval-status-badge.tsx +23 -15
- package/dist/assets/storefront/src/components/commerce/business-unit-switcher.tsx +11 -11
- package/dist/assets/storefront/src/components/commerce/catalog-search-bar.tsx +2 -2
- package/dist/assets/storefront/src/components/commerce/category-product-section.tsx +28 -16
- package/dist/assets/storefront/src/components/commerce/category-sidebar.tsx +31 -18
- package/dist/assets/storefront/src/components/commerce/collection-hero-banner.tsx +2 -4
- package/dist/assets/storefront/src/components/commerce/company-state-badge.tsx +10 -16
- package/dist/assets/storefront/src/components/commerce/company-switcher.tsx +12 -12
- package/dist/assets/storefront/src/components/commerce/configurator-form.tsx +188 -79
- package/dist/assets/storefront/src/components/commerce/facet-filters.tsx +29 -49
- package/dist/assets/storefront/src/components/commerce/gift-card-pdp.tsx +4 -4
- package/dist/assets/storefront/src/components/commerce/gift-card-product-info.tsx +20 -30
- package/dist/assets/storefront/src/components/commerce/instant-search-dropdown.tsx +258 -227
- package/dist/assets/storefront/src/components/commerce/order-status-badge.tsx +27 -19
- package/dist/assets/storefront/src/components/commerce/packaging-unit-selector.tsx +27 -26
- package/dist/assets/storefront/src/components/commerce/permission-gate.tsx +4 -4
- package/dist/assets/storefront/src/components/commerce/price-range-filter.tsx +5 -5
- package/dist/assets/storefront/src/components/commerce/price-tiers.tsx +38 -21
- package/dist/assets/storefront/src/components/commerce/price.tsx +3 -3
- package/dist/assets/storefront/src/components/commerce/product-card-list.tsx +35 -14
- package/dist/assets/storefront/src/components/commerce/product-card.tsx +31 -16
- package/dist/assets/storefront/src/components/commerce/product-carousel.tsx +20 -12
- package/dist/assets/storefront/src/components/commerce/product-grid.tsx +14 -13
- package/dist/assets/storefront/src/components/commerce/product-image-carousel.tsx +10 -8
- package/dist/assets/storefront/src/components/commerce/product-info.tsx +118 -74
- package/dist/assets/storefront/src/components/commerce/product-list-expansion.tsx +102 -74
- package/dist/assets/storefront/src/components/commerce/product-list-view.tsx +1 -1
- package/dist/assets/storefront/src/components/commerce/product-sidebar.tsx +36 -11
- package/dist/assets/storefront/src/components/commerce/product-view-switcher.tsx +33 -21
- package/dist/assets/storefront/src/components/commerce/quote-action-buttons.tsx +54 -36
- package/dist/assets/storefront/src/components/commerce/quote-activity-timeline.tsx +126 -50
- package/dist/assets/storefront/src/components/commerce/quote-comment-form.tsx +9 -13
- package/dist/assets/storefront/src/components/commerce/quote-csv-export-button.tsx +6 -6
- package/dist/assets/storefront/src/components/commerce/quote-product-search.tsx +22 -18
- package/dist/assets/storefront/src/components/commerce/quote-request-form.tsx +28 -27
- package/dist/assets/storefront/src/components/commerce/quote-status-badge.tsx +26 -18
- package/dist/assets/storefront/src/components/commerce/quote-validity-indicator.tsx +7 -7
- package/dist/assets/storefront/src/components/commerce/quote-version-comparison.tsx +50 -30
- package/dist/assets/storefront/src/components/commerce/related-products.tsx +37 -28
- package/dist/assets/storefront/src/components/commerce/shared-cart-status-badge.tsx +12 -8
- package/dist/assets/storefront/src/components/commerce/shop-by-category.tsx +8 -7
- package/dist/assets/storefront/src/components/commerce/shopping-list-toggle.tsx +14 -20
- package/dist/assets/storefront/src/components/commerce/sort-dropdown.tsx +9 -16
- package/dist/assets/storefront/src/components/commerce/store-credit-summary.tsx +30 -32
- package/dist/assets/storefront/src/components/commerce/subcollection-tiles.tsx +11 -13
- package/dist/assets/storefront/src/components/layout/auth-page-shell.tsx +2 -2
- package/dist/assets/storefront/src/components/layout/draft-mode-indicator.tsx +2 -7
- package/dist/assets/storefront/src/components/layout/draft-mode-link.tsx +4 -2
- package/dist/assets/storefront/src/components/layout/footer.tsx +70 -28
- package/dist/assets/storefront/src/components/layout/navbar/actions.ts +9 -12
- package/dist/assets/storefront/src/components/layout/navbar/cart-icon.tsx +9 -9
- package/dist/assets/storefront/src/components/layout/navbar/channel-picker-wrapper.tsx +4 -9
- package/dist/assets/storefront/src/components/layout/navbar/channel-picker.tsx +13 -8
- package/dist/assets/storefront/src/components/layout/navbar/currency-picker-wrapper.tsx +4 -4
- package/dist/assets/storefront/src/components/layout/navbar/currency-picker.tsx +11 -6
- package/dist/assets/storefront/src/components/layout/navbar/language-picker.tsx +7 -7
- package/dist/assets/storefront/src/components/layout/navbar/login-button.tsx +24 -21
- package/dist/assets/storefront/src/components/layout/navbar/mobile-nav.tsx +8 -8
- package/dist/assets/storefront/src/components/layout/navbar/nav-menu-items.tsx +4 -6
- package/dist/assets/storefront/src/components/layout/navbar/navbar-cart.tsx +1 -1
- package/dist/assets/storefront/src/components/layout/navbar/navbar-collections.tsx +41 -42
- package/dist/assets/storefront/src/components/layout/navbar/navbar-link.tsx +7 -10
- package/dist/assets/storefront/src/components/layout/navbar/navbar-user.tsx +18 -23
- package/dist/assets/storefront/src/components/layout/navbar/theme-switcher.tsx +9 -9
- package/dist/assets/storefront/src/components/layout/navbar.tsx +36 -31
- package/dist/assets/storefront/src/components/layout/search-input.tsx +35 -32
- package/dist/assets/storefront/src/components/providers/awaiting-approval-banner.tsx +12 -10
- package/dist/assets/storefront/src/components/providers/cart-count-server.tsx +14 -12
- package/dist/assets/storefront/src/components/providers/company-context-guard.tsx +4 -4
- package/dist/assets/storefront/src/components/providers/company-permissions-server.tsx +2 -6
- package/dist/assets/storefront/src/components/providers/theme-provider.tsx +3 -3
- package/dist/assets/storefront/src/components/shared/breadcrumbs.tsx +4 -1
- package/dist/assets/storefront/src/components/shared/country-select.tsx +63 -67
- package/dist/assets/storefront/src/components/shared/pagination.tsx +15 -28
- package/dist/assets/storefront/src/components/shared/prefetch-link.tsx +1 -1
- package/dist/assets/storefront/src/components/shared/skeletons/search-input-skeleton.tsx +1 -3
- package/dist/assets/storefront/src/components/ui/accordion.tsx +46 -51
- package/dist/assets/storefront/src/components/ui/alert-dialog.tsx +94 -121
- package/dist/assets/storefront/src/components/ui/alert.tsx +48 -54
- package/dist/assets/storefront/src/components/ui/aspect-ratio.tsx +5 -7
- package/dist/assets/storefront/src/components/ui/avatar.tsx +29 -44
- package/dist/assets/storefront/src/components/ui/badge.tsx +28 -37
- package/dist/assets/storefront/src/components/ui/breadcrumb.tsx +82 -89
- package/dist/assets/storefront/src/components/ui/button.tsx +43 -49
- package/dist/assets/storefront/src/components/ui/calendar.tsx +157 -198
- package/dist/assets/storefront/src/components/ui/card.tsx +53 -76
- package/dist/assets/storefront/src/components/ui/carousel.tsx +194 -212
- package/dist/assets/storefront/src/components/ui/chart.tsx +274 -317
- package/dist/assets/storefront/src/components/ui/checkbox.tsx +24 -27
- package/dist/assets/storefront/src/components/ui/collapsible.tsx +9 -21
- package/dist/assets/storefront/src/components/ui/command.tsx +114 -159
- package/dist/assets/storefront/src/components/ui/context-menu.tsx +167 -199
- package/dist/assets/storefront/src/components/ui/dialog.tsx +97 -114
- package/dist/assets/storefront/src/components/ui/drawer.tsx +93 -107
- package/dist/assets/storefront/src/components/ui/dropdown-menu.tsx +171 -206
- package/dist/assets/storefront/src/components/ui/empty-state.tsx +5 -5
- package/dist/assets/storefront/src/components/ui/field.tsx +196 -208
- package/dist/assets/storefront/src/components/ui/form.tsx +115 -139
- package/dist/assets/storefront/src/components/ui/hover-card.tsx +27 -33
- package/dist/assets/storefront/src/components/ui/input-otp.tsx +50 -59
- package/dist/assets/storefront/src/components/ui/input.tsx +17 -17
- package/dist/assets/storefront/src/components/ui/kbd-shortcut.tsx +3 -1
- package/dist/assets/storefront/src/components/ui/label.tsx +16 -19
- package/dist/assets/storefront/src/components/ui/menubar.tsx +193 -223
- package/dist/assets/storefront/src/components/ui/navigation-menu.tsx +123 -130
- package/dist/assets/storefront/src/components/ui/pagination.tsx +87 -108
- package/dist/assets/storefront/src/components/ui/popover.tsx +29 -35
- package/dist/assets/storefront/src/components/ui/progress.tsx +19 -26
- package/dist/assets/storefront/src/components/ui/radio-group.tsx +32 -38
- package/dist/assets/storefront/src/components/ui/resizable.tsx +37 -42
- package/dist/assets/storefront/src/components/ui/scroll-area.tsx +41 -47
- package/dist/assets/storefront/src/components/ui/select.tsx +130 -152
- package/dist/assets/storefront/src/components/ui/separator.tsx +21 -21
- package/dist/assets/storefront/src/components/ui/sheet.tsx +90 -111
- package/dist/assets/storefront/src/components/ui/sidebar.tsx +611 -649
- package/dist/assets/storefront/src/components/ui/skeleton.tsx +10 -10
- package/dist/assets/storefront/src/components/ui/slider.tsx +50 -55
- package/dist/assets/storefront/src/components/ui/sonner.tsx +20 -20
- package/dist/assets/storefront/src/components/ui/switch.tsx +23 -26
- package/dist/assets/storefront/src/components/ui/table.tsx +65 -97
- package/dist/assets/storefront/src/components/ui/tabs.tsx +39 -55
- package/dist/assets/storefront/src/components/ui/textarea.tsx +14 -14
- package/dist/assets/storefront/src/components/ui/toggle-group.tsx +56 -62
- package/dist/assets/storefront/src/components/ui/toggle.tsx +37 -38
- package/dist/assets/storefront/src/components/ui/tooltip.tsx +38 -46
- package/dist/assets/storefront/src/config/scenario-meta.ts +2 -2
- package/dist/assets/storefront/src/config/scenario.ts +14 -16
- package/dist/assets/storefront/src/contexts/auth-context.tsx +5 -6
- package/dist/assets/storefront/src/graphql.ts +5 -5
- package/dist/assets/storefront/src/hooks/use-mobile.ts +13 -13
- package/dist/assets/storefront/src/i18n/locale-utils.ts +3 -3
- package/dist/assets/storefront/src/i18n/navigation.ts +4 -4
- package/dist/assets/storefront/src/i18n/request.ts +4 -4
- package/dist/assets/storefront/src/i18n/routing.ts +5 -5
- package/dist/assets/storefront/src/i18n/server.ts +3 -3
- package/dist/assets/storefront/src/lib/actions/switch-channel.ts +9 -9
- package/dist/assets/storefront/src/lib/actions/switch-currency.ts +7 -7
- package/dist/assets/storefront/src/lib/auth.ts +1 -1
- package/dist/assets/storefront/src/lib/backend-health.ts +3 -3
- package/dist/assets/storefront/src/lib/cart-count-context.tsx +10 -4
- package/dist/assets/storefront/src/lib/cart-guard-utils.ts +2 -1
- package/dist/assets/storefront/src/lib/cart-guard.ts +7 -6
- package/dist/assets/storefront/src/lib/channel-server.ts +4 -4
- package/dist/assets/storefront/src/lib/company-context.ts +1 -1
- package/dist/assets/storefront/src/lib/company-permissions-context.tsx +1 -5
- package/dist/assets/storefront/src/lib/currency-server.ts +4 -4
- package/dist/assets/storefront/src/lib/format.ts +16 -7
- package/dist/assets/storefront/src/lib/metadata.ts +39 -44
- package/dist/assets/storefront/src/lib/quantity.ts +2 -4
- package/dist/assets/storefront/src/lib/search-bar-context.tsx +7 -4
- package/dist/assets/storefront/src/lib/use-recent-searches.ts +8 -6
- package/dist/assets/storefront/src/lib/utils.ts +3 -3
- package/dist/assets/storefront/src/lib/vendure/actions.ts +18 -16
- package/dist/assets/storefront/src/lib/vendure/api.ts +36 -23
- package/dist/assets/storefront/src/lib/vendure/approval-utils.ts +9 -8
- package/dist/assets/storefront/src/lib/vendure/cached.ts +20 -15
- package/dist/assets/storefront/src/lib/vendure/queries.ts +15 -5
- package/dist/assets/storefront/src/middleware.ts +1 -1
- package/dist/assets/storefront/src/scenarios/customer/hero.tsx +2 -2
- package/dist/assets/storefront/src/scenarios/customer/meta.ts +1 -1
- package/dist/bin/run.js +1 -1
- package/dist/cli.d.ts +1 -1
- package/dist/index.d.ts +5 -5
- package/dist/index.js +1 -1
- package/dist/scaffold-storefront-only.js +1 -1
- package/dist/scaffolder.js +1 -1
- package/dist/template-renderer.js +1 -1
- package/package.json +2 -2
|
@@ -1,32 +1,32 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {getTopCollections} from '@/lib/vendure/cached';
|
|
3
|
-
import {getActiveChannelToken} from '@/lib/channel-server';
|
|
4
|
-
import {getRouteLocale} from '@/i18n/server';
|
|
1
|
+
import { NavbarLink } from '@/components/layout/navbar/navbar-link';
|
|
5
2
|
import {
|
|
6
3
|
NavigationMenu,
|
|
7
|
-
NavigationMenuList,
|
|
8
|
-
NavigationMenuItem,
|
|
9
|
-
NavigationMenuTrigger,
|
|
10
4
|
NavigationMenuContent,
|
|
5
|
+
NavigationMenuItem,
|
|
11
6
|
NavigationMenuLink,
|
|
7
|
+
NavigationMenuList,
|
|
8
|
+
NavigationMenuTrigger,
|
|
12
9
|
} from '@/components/ui/navigation-menu';
|
|
13
|
-
import {
|
|
14
|
-
import {Link} from '@/i18n/navigation';
|
|
15
|
-
import {
|
|
16
|
-
import {
|
|
17
|
-
import {
|
|
10
|
+
import { ResultOf } from '@/graphql';
|
|
11
|
+
import { Link } from '@/i18n/navigation';
|
|
12
|
+
import { getRouteLocale } from '@/i18n/server';
|
|
13
|
+
import { getActiveChannelToken } from '@/lib/channel-server';
|
|
14
|
+
import { cn } from '@/lib/utils';
|
|
15
|
+
import { getTopCollections } from '@/lib/vendure/cached';
|
|
16
|
+
import { GetTopCollectionsQuery } from '@/lib/vendure/queries';
|
|
17
|
+
import { useTranslations } from 'next-intl';
|
|
18
18
|
|
|
19
19
|
type Collection = ResultOf<typeof GetTopCollectionsQuery>['collections']['items'][number];
|
|
20
20
|
|
|
21
21
|
const MAX_VISIBLE_GRANDCHILDREN = 5;
|
|
22
22
|
|
|
23
|
-
function MegaMenuContent({collection}: { collection: Collection }) {
|
|
23
|
+
function MegaMenuContent({ collection }: { collection: Collection }) {
|
|
24
24
|
const t = useTranslations('Navigation');
|
|
25
25
|
const children = collection.children ?? [];
|
|
26
26
|
|
|
27
27
|
// Group children by whether they have grandchildren
|
|
28
|
-
const categoriesWithSubs = children.filter(c => c.children && c.children.length > 0);
|
|
29
|
-
const simpleCategories = children.filter(c => !c.children || c.children.length === 0);
|
|
28
|
+
const categoriesWithSubs = children.filter((c) => c.children && c.children.length > 0);
|
|
29
|
+
const simpleCategories = children.filter((c) => !c.children || c.children.length === 0);
|
|
30
30
|
|
|
31
31
|
return (
|
|
32
32
|
<NavigationMenuContent>
|
|
@@ -37,16 +37,16 @@ function MegaMenuContent({collection}: { collection: Collection }) {
|
|
|
37
37
|
href={`/collection/${collection.slug}`}
|
|
38
38
|
prefetch={false}
|
|
39
39
|
className={cn(
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
40
|
+
'block select-none rounded-md p-3 leading-none no-underline outline-none transition-colors',
|
|
41
|
+
'hover:bg-accent hover:text-accent-foreground focus:bg-accent focus:text-accent-foreground',
|
|
42
|
+
'col-span-full border-b pb-3 mb-1',
|
|
43
43
|
)}
|
|
44
44
|
>
|
|
45
45
|
<div className="text-sm font-medium leading-none">
|
|
46
|
-
{t('viewAllCollection', {name: collection.name})}
|
|
46
|
+
{t('viewAllCollection', { name: collection.name })}
|
|
47
47
|
</div>
|
|
48
48
|
<p className="text-muted-foreground line-clamp-2 text-sm leading-snug mt-1">
|
|
49
|
-
{t('browseAllCollection', {name: collection.name})}
|
|
49
|
+
{t('browseAllCollection', { name: collection.name })}
|
|
50
50
|
</p>
|
|
51
51
|
</Link>
|
|
52
52
|
</NavigationMenuLink>
|
|
@@ -85,7 +85,9 @@ function MegaMenuContent({collection}: { collection: Collection }) {
|
|
|
85
85
|
prefetch={false}
|
|
86
86
|
className="text-muted-foreground text-sm hover:text-foreground hover:underline"
|
|
87
87
|
>
|
|
88
|
-
{t('moreGrandchildren', {
|
|
88
|
+
{t('moreGrandchildren', {
|
|
89
|
+
count: child.children.length - MAX_VISIBLE_GRANDCHILDREN,
|
|
90
|
+
})}
|
|
89
91
|
</Link>
|
|
90
92
|
</NavigationMenuLink>
|
|
91
93
|
</li>
|
|
@@ -96,10 +98,12 @@ function MegaMenuContent({collection}: { collection: Collection }) {
|
|
|
96
98
|
|
|
97
99
|
{/* Simple categories without subcategories */}
|
|
98
100
|
{simpleCategories.length > 0 && (
|
|
99
|
-
<div
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
101
|
+
<div
|
|
102
|
+
className={cn(
|
|
103
|
+
'space-y-1',
|
|
104
|
+
categoriesWithSubs.length > 0 && 'col-span-full border-t pt-3 mt-2',
|
|
105
|
+
)}
|
|
106
|
+
>
|
|
103
107
|
<div className="flex flex-wrap gap-2">
|
|
104
108
|
{simpleCategories.map((child) => (
|
|
105
109
|
<NavigationMenuLink key={child.id} asChild>
|
|
@@ -107,8 +111,8 @@ function MegaMenuContent({collection}: { collection: Collection }) {
|
|
|
107
111
|
href={`/collection/${child.slug}`}
|
|
108
112
|
prefetch={false}
|
|
109
113
|
className={cn(
|
|
110
|
-
|
|
111
|
-
|
|
114
|
+
'inline-block rounded-md px-3 py-1.5 text-sm',
|
|
115
|
+
'bg-muted hover:bg-accent hover:text-accent-foreground transition-colors',
|
|
112
116
|
)}
|
|
113
117
|
>
|
|
114
118
|
{child.name}
|
|
@@ -123,7 +127,7 @@ function MegaMenuContent({collection}: { collection: Collection }) {
|
|
|
123
127
|
);
|
|
124
128
|
}
|
|
125
129
|
|
|
126
|
-
function CollectionMenuItem({collection, className}: { collection: Collection; className?: string }) {
|
|
130
|
+
function CollectionMenuItem({ collection, className }: { collection: Collection; className?: string }) {
|
|
127
131
|
const hasChildren = collection.children && collection.children.length > 0;
|
|
128
132
|
|
|
129
133
|
if (hasChildren) {
|
|
@@ -139,9 +143,7 @@ function CollectionMenuItem({collection, className}: { collection: Collection; c
|
|
|
139
143
|
|
|
140
144
|
return (
|
|
141
145
|
<NavigationMenuItem className={className}>
|
|
142
|
-
<NavbarLink href={`/collection/${collection.slug}`}>
|
|
143
|
-
{collection.name}
|
|
144
|
-
</NavbarLink>
|
|
146
|
+
<NavbarLink href={`/collection/${collection.slug}`}>{collection.name}</NavbarLink>
|
|
145
147
|
</NavigationMenuItem>
|
|
146
148
|
);
|
|
147
149
|
}
|
|
@@ -162,7 +164,7 @@ export async function NavbarCollections() {
|
|
|
162
164
|
return <NavbarCollectionsView collections={collections} />;
|
|
163
165
|
}
|
|
164
166
|
|
|
165
|
-
function NavbarCollectionsView({collections}: { collections: Collection[] }) {
|
|
167
|
+
function NavbarCollectionsView({ collections }: { collections: Collection[] }) {
|
|
166
168
|
const t = useTranslations('Navigation');
|
|
167
169
|
|
|
168
170
|
// Split collections into responsive groups
|
|
@@ -180,10 +182,7 @@ function NavbarCollectionsView({collections}: { collections: Collection[] }) {
|
|
|
180
182
|
<NavigationMenuList>
|
|
181
183
|
{/* Always visible at lg+ */}
|
|
182
184
|
{alwaysVisible.map((collection) => (
|
|
183
|
-
<CollectionMenuItem
|
|
184
|
-
key={collection.id}
|
|
185
|
-
collection={collection}
|
|
186
|
-
/>
|
|
185
|
+
<CollectionMenuItem key={collection.id} collection={collection} />
|
|
187
186
|
))}
|
|
188
187
|
|
|
189
188
|
{/* Visible at xl+, hidden at lg */}
|
|
@@ -220,8 +219,8 @@ function NavbarCollectionsView({collections}: { collections: Collection[] }) {
|
|
|
220
219
|
href={`/collection/${collection.slug}`}
|
|
221
220
|
prefetch={false}
|
|
222
221
|
className={cn(
|
|
223
|
-
|
|
224
|
-
|
|
222
|
+
'block select-none rounded-md p-2 text-sm leading-none no-underline outline-none transition-colors',
|
|
223
|
+
'hover:bg-accent hover:text-accent-foreground focus:bg-accent focus:text-accent-foreground',
|
|
225
224
|
)}
|
|
226
225
|
>
|
|
227
226
|
{collection.name}
|
|
@@ -245,8 +244,8 @@ function NavbarCollectionsView({collections}: { collections: Collection[] }) {
|
|
|
245
244
|
<Link
|
|
246
245
|
href={`/collection/${collection.slug}`}
|
|
247
246
|
className={cn(
|
|
248
|
-
|
|
249
|
-
|
|
247
|
+
'block select-none rounded-md p-2 text-sm leading-none no-underline outline-none transition-colors',
|
|
248
|
+
'hover:bg-accent hover:text-accent-foreground focus:bg-accent focus:text-accent-foreground',
|
|
250
249
|
)}
|
|
251
250
|
>
|
|
252
251
|
{collection.name}
|
|
@@ -271,8 +270,8 @@ function NavbarCollectionsView({collections}: { collections: Collection[] }) {
|
|
|
271
270
|
<Link
|
|
272
271
|
href={`/collection/${collection.slug}`}
|
|
273
272
|
className={cn(
|
|
274
|
-
|
|
275
|
-
|
|
273
|
+
'block select-none rounded-md p-2 text-sm leading-none no-underline outline-none transition-colors',
|
|
274
|
+
'hover:bg-accent hover:text-accent-foreground focus:bg-accent focus:text-accent-foreground',
|
|
276
275
|
)}
|
|
277
276
|
>
|
|
278
277
|
{collection.name}
|
|
@@ -1,15 +1,12 @@
|
|
|
1
1
|
'use client';
|
|
2
2
|
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
6
|
-
import {
|
|
7
|
-
|
|
8
|
-
navigationMenuTriggerStyle,
|
|
9
|
-
} from '@/components/ui/navigation-menu';
|
|
10
|
-
import {cn} from '@/lib/utils';
|
|
3
|
+
import { NavigationMenuLink, navigationMenuTriggerStyle } from '@/components/ui/navigation-menu';
|
|
4
|
+
import { Link } from '@/i18n/navigation';
|
|
5
|
+
import { cn } from '@/lib/utils';
|
|
6
|
+
import { useSelectedLayoutSegment } from 'next/navigation';
|
|
7
|
+
import { ComponentProps } from 'react';
|
|
11
8
|
|
|
12
|
-
export function NavbarLink({href, ...rest}: ComponentProps<typeof Link>) {
|
|
9
|
+
export function NavbarLink({ href, ...rest }: ComponentProps<typeof Link>) {
|
|
13
10
|
const selectedLayoutSegment = useSelectedLayoutSegment();
|
|
14
11
|
const pathname = selectedLayoutSegment ? `/${selectedLayoutSegment}` : '/';
|
|
15
12
|
const isActive = pathname === href;
|
|
@@ -25,4 +22,4 @@ export function NavbarLink({href, ...rest}: ComponentProps<typeof Link>) {
|
|
|
25
22
|
/>
|
|
26
23
|
</NavigationMenuLink>
|
|
27
24
|
);
|
|
28
|
-
}
|
|
25
|
+
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { BusinessUnitSwitcher } from '@/components/commerce/business-unit-switcher';
|
|
2
2
|
import { CompanySwitcher } from '@/components/commerce/company-switcher';
|
|
3
3
|
import { LoginButton } from '@/components/layout/navbar/login-button';
|
|
4
|
-
import {
|
|
4
|
+
import { CompanyNavMenuItems, PersonalNavMenuItems } from '@/components/layout/navbar/nav-menu-items';
|
|
5
5
|
import { Button, buttonVariants } from '@/components/ui/button';
|
|
6
6
|
import {
|
|
7
7
|
DropdownMenu,
|
|
@@ -12,6 +12,10 @@ import {
|
|
|
12
12
|
DropdownMenuTrigger,
|
|
13
13
|
} from '@/components/ui/dropdown-menu';
|
|
14
14
|
import { readFragment } from '@/graphql';
|
|
15
|
+
import { cn } from '@/lib/utils';
|
|
16
|
+
import { getMyCompanies } from '@/lib/vendure/actions';
|
|
17
|
+
import type { VendureContext } from '@/lib/vendure/api';
|
|
18
|
+
import { client, getVendureContext } from '@/lib/vendure/api';
|
|
15
19
|
import {
|
|
16
20
|
ActiveCustomerFragment,
|
|
17
21
|
CompanyBusinessUnitFragment,
|
|
@@ -20,14 +24,10 @@ import {
|
|
|
20
24
|
CompanyRoleFragment,
|
|
21
25
|
CompanyUserFragment,
|
|
22
26
|
} from '@/lib/vendure/fragments';
|
|
23
|
-
import { client, getVendureContext } from '@/lib/vendure/api';
|
|
24
|
-
import type { VendureContext } from '@/lib/vendure/api';
|
|
25
|
-
import { getMyCompanies } from '@/lib/vendure/actions';
|
|
26
27
|
import { GetActiveCustomerQuery, GetCompanyAccountQuery } from '@/lib/vendure/queries';
|
|
27
|
-
import { cacheLife, cacheTag } from 'next/cache';
|
|
28
|
-
import {getTranslations} from 'next-intl/server';
|
|
29
28
|
import { User } from 'lucide-react';
|
|
30
|
-
import {
|
|
29
|
+
import { getTranslations } from 'next-intl/server';
|
|
30
|
+
import { cacheLife, cacheTag } from 'next/cache';
|
|
31
31
|
|
|
32
32
|
async function getNavbarUserData(ctx: VendureContext) {
|
|
33
33
|
'use cache: private';
|
|
@@ -40,9 +40,7 @@ async function getNavbarUserData(ctx: VendureContext) {
|
|
|
40
40
|
]);
|
|
41
41
|
|
|
42
42
|
const [custRes, custErr] = customerResult;
|
|
43
|
-
const customer = custErr
|
|
44
|
-
? null
|
|
45
|
-
: readFragment(ActiveCustomerFragment, custRes.data.activeCustomer);
|
|
43
|
+
const customer = custErr ? null : readFragment(ActiveCustomerFragment, custRes.data.activeCustomer);
|
|
46
44
|
|
|
47
45
|
if (!customer) return { customer: null, companyAccount: null };
|
|
48
46
|
|
|
@@ -60,14 +58,16 @@ async function getNavbarUserData(ctx: VendureContext) {
|
|
|
60
58
|
company,
|
|
61
59
|
companyUser: {
|
|
62
60
|
...rawUser,
|
|
63
|
-
companyRoles: rawUser.companyRoles.map(r => {
|
|
61
|
+
companyRoles: rawUser.companyRoles.map((r) => {
|
|
64
62
|
const role = readFragment(CompanyRoleFragment, r);
|
|
65
63
|
return {
|
|
66
64
|
...role,
|
|
67
|
-
permissions: role.permissions.map(p => readFragment(CompanyPermissionFragment, p)),
|
|
65
|
+
permissions: role.permissions.map((p) => readFragment(CompanyPermissionFragment, p)),
|
|
68
66
|
};
|
|
69
67
|
}),
|
|
70
|
-
businessUnits: rawUser.businessUnits.map(bu =>
|
|
68
|
+
businessUnits: rawUser.businessUnits.map((bu) =>
|
|
69
|
+
readFragment(CompanyBusinessUnitFragment, bu),
|
|
70
|
+
),
|
|
71
71
|
},
|
|
72
72
|
activeBusinessUnit,
|
|
73
73
|
permissions: [...account.permissions],
|
|
@@ -78,10 +78,7 @@ async function getNavbarUserData(ctx: VendureContext) {
|
|
|
78
78
|
}
|
|
79
79
|
|
|
80
80
|
export async function NavbarUser() {
|
|
81
|
-
const [ctx, t] = await Promise.all([
|
|
82
|
-
getVendureContext(),
|
|
83
|
-
getTranslations('Navigation'),
|
|
84
|
-
]);
|
|
81
|
+
const [ctx, t] = await Promise.all([getVendureContext(), getTranslations('Navigation')]);
|
|
85
82
|
const [{ customer, companyAccount }, companies] = await Promise.all([
|
|
86
83
|
getNavbarUserData(ctx),
|
|
87
84
|
getMyCompanies(),
|
|
@@ -100,9 +97,9 @@ export async function NavbarUser() {
|
|
|
100
97
|
|
|
101
98
|
return (
|
|
102
99
|
<DropdownMenu>
|
|
103
|
-
<DropdownMenuTrigger className={cn(buttonVariants({ variant:
|
|
104
|
-
|
|
105
|
-
|
|
100
|
+
<DropdownMenuTrigger className={cn(buttonVariants({ variant: 'ghost' }))}>
|
|
101
|
+
<User className="h-5 w-5" />
|
|
102
|
+
{t('greeting', { name: customer.firstName })}
|
|
106
103
|
</DropdownMenuTrigger>
|
|
107
104
|
<DropdownMenuContent align="end" className="w-56">
|
|
108
105
|
{companies.length > 1 && companyAccount && (
|
|
@@ -134,9 +131,7 @@ export async function NavbarUser() {
|
|
|
134
131
|
</>
|
|
135
132
|
)}
|
|
136
133
|
<PersonalNavMenuItems />
|
|
137
|
-
{companyAccount &&
|
|
138
|
-
<CompanyNavMenuItems permissions={companyAccount.permissions} />
|
|
139
|
-
)}
|
|
134
|
+
{companyAccount && <CompanyNavMenuItems permissions={companyAccount.permissions} />}
|
|
140
135
|
<DropdownMenuSeparator />
|
|
141
136
|
<DropdownMenuItem asChild>
|
|
142
137
|
<LoginButton isLoggedIn={true} />
|
|
@@ -1,13 +1,13 @@
|
|
|
1
|
-
|
|
1
|
+
'use client';
|
|
2
2
|
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
6
|
-
import {
|
|
3
|
+
import { Button } from '@/components/ui/button';
|
|
4
|
+
import { Moon, Sun } from 'lucide-react';
|
|
5
|
+
import { useTheme } from 'next-themes';
|
|
6
|
+
import { useEffect, useState } from 'react';
|
|
7
7
|
|
|
8
8
|
export function ThemeSwitcher() {
|
|
9
9
|
const [mounted, setMounted] = useState(false);
|
|
10
|
-
const {theme, setTheme} = useTheme();
|
|
10
|
+
const { theme, setTheme } = useTheme();
|
|
11
11
|
|
|
12
12
|
useEffect(() => {
|
|
13
13
|
// eslint-disable-next-line react-hooks/set-state-in-effect -- intentional SSR hydration pattern
|
|
@@ -23,15 +23,15 @@ export function ThemeSwitcher() {
|
|
|
23
23
|
);
|
|
24
24
|
}
|
|
25
25
|
|
|
26
|
-
const isDark = theme ===
|
|
26
|
+
const isDark = theme === 'dark';
|
|
27
27
|
|
|
28
28
|
return (
|
|
29
29
|
<Button
|
|
30
30
|
variant="ghost"
|
|
31
31
|
size="icon"
|
|
32
32
|
className="h-9 w-9"
|
|
33
|
-
onClick={() => setTheme(isDark ?
|
|
34
|
-
aria-label={isDark ?
|
|
33
|
+
onClick={() => setTheme(isDark ? 'light' : 'dark')}
|
|
34
|
+
aria-label={isDark ? 'Switch to light mode' : 'Switch to dark mode'}
|
|
35
35
|
>
|
|
36
36
|
{isDark ? <Sun className="size-4" /> : <Moon className="size-4" />}
|
|
37
37
|
</Button>
|
|
@@ -1,35 +1,32 @@
|
|
|
1
|
-
import
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
6
|
-
import {
|
|
7
|
-
import {
|
|
8
|
-
import {
|
|
9
|
-
import {SearchInput} from '@/components/layout/search-input';
|
|
10
|
-
import {
|
|
11
|
-
import {
|
|
12
|
-
import {
|
|
13
|
-
import {getHasCompany} from '@/lib/vendure/actions';
|
|
14
|
-
import {getTranslations} from 'next-intl/server';
|
|
15
|
-
import
|
|
16
|
-
import {
|
|
1
|
+
import { DraftModeBorderStyle, DraftModeIndicator } from '@/components/layout/draft-mode-indicator';
|
|
2
|
+
import { ChannelPickerWrapper } from '@/components/layout/navbar/channel-picker-wrapper';
|
|
3
|
+
import { CurrencyPickerWrapper } from '@/components/layout/navbar/currency-picker-wrapper';
|
|
4
|
+
import { LanguagePicker } from '@/components/layout/navbar/language-picker';
|
|
5
|
+
import { MobileNav } from '@/components/layout/navbar/mobile-nav';
|
|
6
|
+
import { NavbarCart } from '@/components/layout/navbar/navbar-cart';
|
|
7
|
+
import { NavbarUser } from '@/components/layout/navbar/navbar-user';
|
|
8
|
+
import { ThemeSwitcher } from '@/components/layout/navbar/theme-switcher';
|
|
9
|
+
import { SearchInput } from '@/components/layout/search-input';
|
|
10
|
+
import { AwaitingApprovalBanner } from '@/components/providers/awaiting-approval-banner';
|
|
11
|
+
import { getBranding } from '@/config/branding';
|
|
12
|
+
import { Link } from '@/i18n/navigation';
|
|
13
|
+
import { getHasCompany } from '@/lib/vendure/actions';
|
|
14
|
+
import { getTranslations } from 'next-intl/server';
|
|
15
|
+
import Image from 'next/image';
|
|
16
|
+
import { Suspense } from 'react';
|
|
17
17
|
|
|
18
18
|
// Groups all async navbar children so they stream as a single chunk.
|
|
19
19
|
// Without this, each async component gets its own implicit Suspense
|
|
20
20
|
// boundary, causing staggered rendering and CLS within the fixed header.
|
|
21
21
|
async function AsyncNavbarContent() {
|
|
22
|
-
const [hasCompany, t] = await Promise.all([
|
|
23
|
-
getHasCompany(),
|
|
24
|
-
getTranslations('Navigation'),
|
|
25
|
-
]);
|
|
22
|
+
const [hasCompany, t] = await Promise.all([getHasCompany(), getTranslations('Navigation')]);
|
|
26
23
|
const defaultNavLinks = [
|
|
27
|
-
{href: '/catalog', label: t('catalog')},
|
|
28
|
-
{href: '/account/quick-order', label: t('quickOrder')},
|
|
29
|
-
{href: '/account/orders', label: t('orders')},
|
|
30
|
-
{href: '/account/quotes', label: t('quotes')},
|
|
24
|
+
{ href: '/catalog', label: t('catalog') },
|
|
25
|
+
{ href: '/account/quick-order', label: t('quickOrder') },
|
|
26
|
+
{ href: '/account/orders', label: t('orders') },
|
|
27
|
+
{ href: '/account/quotes', label: t('quotes') },
|
|
31
28
|
];
|
|
32
|
-
const companyNavLink = {href: '/account/company', label: t('company')};
|
|
29
|
+
const companyNavLink = { href: '/account/company', label: t('company') };
|
|
33
30
|
const branding = getBranding();
|
|
34
31
|
const navLinks = branding.navLinks ?? defaultNavLinks;
|
|
35
32
|
const appendCompany = hasCompany && !branding.hideCompanyNavLink;
|
|
@@ -41,7 +38,7 @@ async function AsyncNavbarContent() {
|
|
|
41
38
|
</div>
|
|
42
39
|
<div className="flex items-center justify-between flex-1 ml-4">
|
|
43
40
|
<nav className="hidden lg:flex items-center gap-1">
|
|
44
|
-
{allLinks.map(({href, label}) => (
|
|
41
|
+
{allLinks.map(({ href, label }) => (
|
|
45
42
|
<Link
|
|
46
43
|
key={href}
|
|
47
44
|
href={href}
|
|
@@ -54,14 +51,14 @@ async function AsyncNavbarContent() {
|
|
|
54
51
|
</nav>
|
|
55
52
|
<div className="flex items-center gap-2">
|
|
56
53
|
<div className="hidden lg:flex">
|
|
57
|
-
<SearchInput/>
|
|
54
|
+
<SearchInput />
|
|
58
55
|
</div>
|
|
59
56
|
<ChannelPickerWrapper />
|
|
60
57
|
<CurrencyPickerWrapper />
|
|
61
58
|
{!branding.hideLanguagePicker && <LanguagePicker />}
|
|
62
59
|
<ThemeSwitcher />
|
|
63
|
-
<NavbarCart/>
|
|
64
|
-
<NavbarUser/>
|
|
60
|
+
<NavbarCart />
|
|
61
|
+
<NavbarUser />
|
|
65
62
|
<DraftModeIndicator />
|
|
66
63
|
</div>
|
|
67
64
|
</div>
|
|
@@ -103,8 +100,16 @@ export function Navbar() {
|
|
|
103
100
|
<div className="flex items-center h-14">
|
|
104
101
|
<div className="flex items-center gap-4 flex-shrink-0">
|
|
105
102
|
<Link href="/" prefetch={false} className="flex-shrink-0 flex items-center gap-3">
|
|
106
|
-
<Image
|
|
107
|
-
|
|
103
|
+
<Image
|
|
104
|
+
src={logo.src}
|
|
105
|
+
alt={logo.alt}
|
|
106
|
+
width={logo.width}
|
|
107
|
+
height={logo.height}
|
|
108
|
+
className="h-5 w-auto"
|
|
109
|
+
/>
|
|
110
|
+
<span className="hidden sm:inline text-sm font-bold text-foreground tracking-tight">
|
|
111
|
+
{siteName}
|
|
112
|
+
</span>
|
|
108
113
|
</Link>
|
|
109
114
|
</div>
|
|
110
115
|
<Suspense fallback={<AsyncNavbarSkeleton />}>
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
'use client';
|
|
2
2
|
|
|
3
|
-
import {
|
|
4
|
-
import { useSearchParams } from 'next/navigation';
|
|
5
|
-
import { useTranslations } from 'next-intl';
|
|
6
|
-
import { useRouter } from '@/i18n/navigation';
|
|
7
|
-
import { Search } from 'lucide-react';
|
|
3
|
+
import { InstantSearchDropdown } from '@/components/commerce/instant-search-dropdown';
|
|
8
4
|
import { Input } from '@/components/ui/input';
|
|
9
|
-
import { useSearchBar } from '@/lib/search-bar-context';
|
|
10
5
|
import { KbdShortcut } from '@/components/ui/kbd-shortcut';
|
|
11
|
-
import {
|
|
6
|
+
import { useRouter } from '@/i18n/navigation';
|
|
7
|
+
import { useSearchBar } from '@/lib/search-bar-context';
|
|
8
|
+
import { Search } from 'lucide-react';
|
|
9
|
+
import { useTranslations } from 'next-intl';
|
|
10
|
+
import { useSearchParams } from 'next/navigation';
|
|
11
|
+
import { useCallback, useEffect, useRef, useState } from 'react';
|
|
12
12
|
|
|
13
13
|
export function SearchInput() {
|
|
14
14
|
const t = useTranslations('Navigation');
|
|
@@ -33,10 +33,13 @@ export function SearchInput() {
|
|
|
33
33
|
setSearchValue(searchParams.get('q') || '');
|
|
34
34
|
}, [searchParams]);
|
|
35
35
|
|
|
36
|
-
const handleSubmit = useCallback(
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
36
|
+
const handleSubmit = useCallback(
|
|
37
|
+
(term: string) => {
|
|
38
|
+
if (!term.trim()) return;
|
|
39
|
+
router.push(`/search?q=${encodeURIComponent(term.trim())}`);
|
|
40
|
+
},
|
|
41
|
+
[router],
|
|
42
|
+
);
|
|
40
43
|
|
|
41
44
|
const handleFormSubmit = (e: React.FormEvent) => {
|
|
42
45
|
e.preventDefault();
|
|
@@ -45,27 +48,27 @@ export function SearchInput() {
|
|
|
45
48
|
|
|
46
49
|
return (
|
|
47
50
|
<div className={hasInlineSearch ? 'hidden' : ''}>
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
51
|
+
<InstantSearchDropdown
|
|
52
|
+
inputRef={inputRef}
|
|
53
|
+
searchValue={searchValue}
|
|
54
|
+
onSearchValueChange={setSearchValue}
|
|
55
|
+
onSubmit={handleSubmit}
|
|
56
|
+
dropdownClassName="w-[32rem] right-0 left-auto"
|
|
57
|
+
>
|
|
58
|
+
<form onSubmit={handleFormSubmit} className="relative">
|
|
59
|
+
<Search className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" />
|
|
60
|
+
<Input
|
|
61
|
+
ref={setRef}
|
|
62
|
+
type="search"
|
|
63
|
+
placeholder={t('searchByNameSkuKeyword')}
|
|
64
|
+
className="pl-9 pr-16 w-64"
|
|
65
|
+
value={searchValue}
|
|
66
|
+
onChange={(e) => setSearchValue(e.target.value)}
|
|
67
|
+
autoComplete="off"
|
|
68
|
+
/>
|
|
69
|
+
<KbdShortcut className="absolute right-3 top-1/2 -translate-y-1/2" />
|
|
70
|
+
</form>
|
|
71
|
+
</InstantSearchDropdown>
|
|
69
72
|
</div>
|
|
70
73
|
);
|
|
71
74
|
}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
6
|
-
import
|
|
7
|
-
import {
|
|
1
|
+
import { Link } from '@/i18n/navigation';
|
|
2
|
+
import type { VendureContext } from '@/lib/vendure/api';
|
|
3
|
+
import { client, getVendureContext } from '@/lib/vendure/api';
|
|
4
|
+
import { GetActiveOrderQuery } from '@/lib/vendure/queries';
|
|
5
|
+
import { ArrowRight, ClipboardCheck } from 'lucide-react';
|
|
6
|
+
import { getTranslations } from 'next-intl/server';
|
|
7
|
+
import { cacheLife, cacheTag } from 'next/cache';
|
|
8
8
|
|
|
9
9
|
async function getAwaitingApprovalOrderCode(ctx: VendureContext): Promise<string | null> {
|
|
10
10
|
'use cache: private';
|
|
@@ -37,18 +37,20 @@ export async function AwaitingApprovalBanner() {
|
|
|
37
37
|
>
|
|
38
38
|
<div className="container mx-auto px-4 py-2 flex items-center justify-between gap-4 flex-wrap">
|
|
39
39
|
<div className="flex items-center gap-3 min-w-0">
|
|
40
|
-
<ClipboardCheck className="h-5 w-5 flex-shrink-0 text-amber-600 dark:text-amber-400"/>
|
|
40
|
+
<ClipboardCheck className="h-5 w-5 flex-shrink-0 text-amber-600 dark:text-amber-400" />
|
|
41
41
|
<p className="text-sm">
|
|
42
42
|
<span className="font-semibold">{t('orderPendingApproval')}:</span>{' '}
|
|
43
43
|
<code className="font-mono font-semibold px-1.5 py-0.5 rounded bg-amber-500/20">
|
|
44
44
|
{code}
|
|
45
45
|
</code>{' '}
|
|
46
|
-
<span className="text-muted-foreground">
|
|
46
|
+
<span className="text-muted-foreground">
|
|
47
|
+
{t('awaitingApprovalBannerBody')}
|
|
48
|
+
</span>
|
|
47
49
|
</p>
|
|
48
50
|
</div>
|
|
49
51
|
<span className="text-sm font-semibold inline-flex items-center gap-1.5 flex-shrink-0 text-amber-600 dark:text-amber-400">
|
|
50
52
|
{t('viewRequest')}
|
|
51
|
-
<ArrowRight className="h-4 w-4"/>
|
|
53
|
+
<ArrowRight className="h-4 w-4" />
|
|
52
54
|
</span>
|
|
53
55
|
</div>
|
|
54
56
|
</Link>
|
|
@@ -1,31 +1,33 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import {client, getVendureContext} from '@/lib/vendure/api';
|
|
4
|
-
import
|
|
5
|
-
import {
|
|
1
|
+
import { CartStatusSync } from '@/lib/cart-count-context';
|
|
2
|
+
import type { VendureContext } from '@/lib/vendure/api';
|
|
3
|
+
import { client, getVendureContext } from '@/lib/vendure/api';
|
|
4
|
+
import { GetActiveOrderQuery } from '@/lib/vendure/queries';
|
|
5
|
+
import { cacheLife, cacheTag } from 'next/cache';
|
|
6
6
|
|
|
7
|
-
async function getCartStatus(
|
|
7
|
+
async function getCartStatus(
|
|
8
|
+
ctx: VendureContext,
|
|
9
|
+
): Promise<{ count: number; awaitingApprovalOrderCode: string | null }> {
|
|
8
10
|
'use cache: private';
|
|
9
11
|
cacheLife('minutes');
|
|
10
12
|
cacheTag('cart');
|
|
11
13
|
cacheTag('active-order');
|
|
12
14
|
|
|
13
15
|
const [result, error] = await client.query(GetActiveOrderQuery, undefined, ctx);
|
|
14
|
-
if (error) return {count: 0, awaitingApprovalOrderCode: null};
|
|
16
|
+
if (error) return { count: 0, awaitingApprovalOrderCode: null };
|
|
15
17
|
|
|
16
18
|
const order = result.data.activeOrder;
|
|
17
|
-
if (!order) return {count: 0, awaitingApprovalOrderCode: null};
|
|
19
|
+
if (!order) return { count: 0, awaitingApprovalOrderCode: null };
|
|
18
20
|
if (order.state === 'AwaitingApproval') {
|
|
19
|
-
return {count: 0, awaitingApprovalOrderCode: order.code};
|
|
21
|
+
return { count: 0, awaitingApprovalOrderCode: order.code };
|
|
20
22
|
}
|
|
21
23
|
// Only count lines when the order is in AddingItems (editable cart).
|
|
22
|
-
if (order.state !== 'AddingItems') return {count: 0, awaitingApprovalOrderCode: null};
|
|
24
|
+
if (order.state !== 'AddingItems') return { count: 0, awaitingApprovalOrderCode: null };
|
|
23
25
|
|
|
24
|
-
return {count: order.lines.length, awaitingApprovalOrderCode: null};
|
|
26
|
+
return { count: order.lines.length, awaitingApprovalOrderCode: null };
|
|
25
27
|
}
|
|
26
28
|
|
|
27
29
|
export async function CartCountServer() {
|
|
28
30
|
const ctx = await getVendureContext();
|
|
29
|
-
const {count, awaitingApprovalOrderCode} = await getCartStatus(ctx);
|
|
31
|
+
const { count, awaitingApprovalOrderCode } = await getCartStatus(ctx);
|
|
30
32
|
return <CartStatusSync count={count} awaitingApprovalOrderCode={awaitingApprovalOrderCode} />;
|
|
31
33
|
}
|