Skip to content

Commit

Permalink
Merge branch 'develop' into USF-894-adyen-integration
Browse files Browse the repository at this point in the history
  • Loading branch information
@jeff-matthews
jeff-matthews authored Dec 2, 2024
2 parents 115ff41 + 6c490d8 commit deaf79d
Show file tree
Hide file tree
Showing 66 changed files with 4,126 additions and 480 deletions.
6 changes: 5 additions & 1 deletion .vscode/settings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@
"markdown.validate.unusedLinkDefinitions.enabled": "ignore",
"[markdown]": {
"editor.formatOnSave": true,
"editor.formatOnPaste": true
"editor.formatOnPaste": true,
"editor.defaultFormatter": "DavidAnson.vscode-markdownlint"
},
"[xml]": {
"editor.defaultFormatter": "DotJoshJohnson.xml"
Expand All @@ -88,5 +89,8 @@
"mdx": {
"parser": "plain"
}
},
"[mdx]": {
"editor.defaultFormatter": "unifiedjs.vscode-mdx"
}
}
793 changes: 793 additions & 0 deletions _drafts/product-details.js
View file

Large diffs are not rendered by default.

111 changes: 76 additions & 35 deletions astro.config.mjs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ export default defineConfig({
},
trailingSlash: 'ignore',
outDir: './dist',




redirects: {
'/customize/design-tokens': '/developer/commerce/storefront/dropins/all/branding',
'/customize/enrich': '/developer/commerce/storefront/dropins/all/enriching',
Expand All @@ -36,21 +40,29 @@ export default defineConfig({
'/customize': '/developer/commerce/storefront/dropins/all/introduction',
'/dropins': '/developer/commerce/storefront/dropins/all/introduction',
'/dropins/cart/cart-introduction': '/developer/commerce/storefront/dropins/cart',
'/dropins/cart/cart-containers': '/developer/commerce/storefront/dropins/cart/containers/cart',
'/dropins/checkout/checkout-introduction': '/developer/commerce/storefront/dropins/checkout',
'/dropins/user-account/useraccount-introduction': '/developer/commerce/storefront/dropins/user-account',
'/dropins/user-auth/userauth-introduction': '/developer/commerce/storefront/dropins/user-auth',
'/faq': '/developer/commerce/storefront/troublshooting/faq',
'/get-started/launch-checklist': '/developer/commerce/storefront/launch',
'/get-started/requirements': '/developer/commerce/storefront/discovery/architecture',
'/get-started/configurations': '/developer/commerce/storefront/setup/commerce-configuration',
'/product-details/pdp-containers': '/developer/commerce/storefront/dropins/product-details/pdp-containers',
'/product-details/pdp-functions': '/developer/commerce/storefront/dropins/product-details/pdp-functions',
'/product-details/pdp-installation': '/developer/commerce/storefront/dropins/product-details/pdp-installation',
'/product-details/pdp-containers': '/developer/commerce/storefront/dropins/product-details/containers',
'/product-details/pdp-functions': '/developer/commerce/storefront/dropins/product-details/functions',
'/product-details/pdp-installation': '/developer/commerce/storefront/dropins/product-details/installation',
'/product-details/pdp-introduction': '/developer/commerce/storefront/dropins/product-details/',
'/product-details/pdp-slots': '/developer/commerce/storefront/dropins/product-details/pdp-slots',
'/product-details/pdp-styles': '/developer/commerce/storefront/dropins/product-details/pdp-styles',
'/product-details/pdp-slots': '/developer/commerce/storefront/dropins/product-details/slots',
'/product-details/pdp-styles': '/developer/commerce/storefront/dropins/product-details/styles',
'/references/configurations': '/developer/commerce/storefront/setup/commerce-configuration',
'/references/requirements': '/developer/commerce/storefront/discovery/architecture',
'/dropins/cart/cart-installation': '/developer/commerce/storefront/dropins/cart/installation',
'/dropins/cart/cart-styles': '/developer/commerce/storefront/dropins/cart/styles',
'/dropins/cart/cart-containers': '/developer/commerce/storefront/dropins/cart/containers',
'/dropins/cart/cart-slots': '/developer/commerce/storefront/dropins/cart/slots',
'/dropins/cart/cart-functions': '/developer/commerce/storefront/dropins/cart/functions',
'/dropins/cart/cart-dictionary': '/developer/commerce/storefront/dropins/cart/dictionary',
'/dropins/order/order-dictionary': '/developer/commerce/storefront/dropins/order/dictionary',
},
integrations: [
tailwind({
Expand Down Expand Up @@ -154,40 +166,41 @@ export default defineConfig({
// link: '/dropins/all/anatomy/'
// },
{
label: 'Install',
label: 'Installing',
link: '/dropins/all/installing/'
},
{
label: 'Brand',
label: 'Branding',
link: '/dropins/all/branding/'
},
// {
// label: 'Localize',
// link: '/dropins/all/localizing/'
// },
{
label: 'Style',
label: 'Labeling',
link: '/dropins/all/labeling/'
},
{
label: 'Styling',
link: '/dropins/all/styling/'
},
{
label: 'Extend',
label: 'Extending',
link: '/dropins/all/extending/'
},
// {
// label: 'Enrich',
// label: 'Enriching',
// link: '/dropins/all/enriching/'
// },
{
label: 'Product details page',
collapsed: true,
items: [
{ label: 'Overview', link: '/dropins/product-details/' },
{ label: 'Installation', link: '/dropins/product-details/pdp-installation/' },
{ label: 'Initialization', link: '/dropins/product-details/pdp-initialization/' },
{ label: 'Styles', link: '/dropins/product-details/pdp-styles/' },
{ label: 'Containers', link: '/dropins/product-details/pdp-containers/' },
{ label: 'Slots', link: '/dropins/product-details/pdp-slots/' },
{ label: 'Functions', link: '/dropins/product-details/pdp-functions/' }
{ label: 'Installation', link: '/dropins/product-details/installation/' },
{ label: 'Initialization', link: '/dropins/product-details/initialization/' },
{ label: 'Styles', link: '/dropins/product-details/styles/' },
{ label: 'Containers', link: '/dropins/product-details/containers/' },
{ label: 'Slots', link: '/dropins/product-details/slots/' },
{ label: 'Functions', link: '/dropins/product-details/functions/' },
{ label: 'Dictionary', link: '/dropins/product-details/dictionary/' },
]
},
{
Expand All @@ -198,9 +211,23 @@ export default defineConfig({
{ label: 'Installation', link: '/dropins/cart/cart-installation/' },
{ label: 'Initialization', link: '/dropins/cart/initialization/' },
{ label: 'Styles', link: '/dropins/cart/cart-styles/' },
{ label: 'Containers', link: '/dropins/cart/cart-containers/' },
{ label: 'Containers', collapsed: true,
items: [
{ label: 'Cart', link: '/dropins/cart/containers/cart/' },
{ label: 'CartSummaryGrid', link: '/dropins/cart/containers/cart-summary-grid/' },
{ label: 'CartSummaryList', link: '/dropins/cart/containers/cart-summary-list/' },
{ label: 'Coupons', link: '/dropins/cart/containers/coupons/' },
{ label: 'EmptyCart', link: '/dropins/cart/containers/empty-cart/' },
{ label: 'EstimateShipping', link: '/dropins/cart/containers/estimate-shipping/' },
{ label: 'MiniCart', link: '/dropins/cart/containers/minicart/' },
{ label: 'OrderSummary', link: '/dropins/cart/containers/order-summary/' },
{ label: 'OrderSummaryLine', link: '/dropins/cart/containers/order-summary-line/' },

]
},
{ label: 'Slots', link: '/dropins/cart/cart-slots/' },
{ label: 'Functions', link: '/dropins/cart/cart-functions/' },
{ label: 'Dictionary', link: '/dropins/cart/dictionary/' },
{
label: 'Tutorials',
collapsed: true,
Expand All @@ -218,7 +245,8 @@ export default defineConfig({
{ label: 'Installation', link: '/dropins/checkout/installation/' },
{ label: 'Initialization', link: '/dropins/checkout/initialization/' },
{ label: 'Styles', link: '/dropins/checkout/styles/' },
{ label: 'Containers',
{
label: 'Containers',
collapsed: true,
items: [
{ label: 'BillToShippingAddress', link: '/dropins/checkout/containers/bill-to-shipping-address/' },
Expand All @@ -233,22 +261,24 @@ export default defineConfig({
{ label: 'ShippingMethods', link: '/dropins/checkout/containers/shipping-methods/' },
]
},
{ label: 'Slots', link: '/dropins/checkout/slots/' },
{ label: 'Slots', link: '/dropins/checkout/slots/' },
{ label: 'Functions', link: '/dropins/checkout/functions/' },
{ label: 'Dictionary', link: '/dropins/checkout/dictionary/' },
{ label: 'Tutorials',
collapsed: true,
items: [
{ label: 'Add a payment method', link: '/dropins/checkout/tutorials/add-payment-method/' },
{ label: 'Buy online, pickup in store', link: '/dropins/checkout/tutorials/buy-online-pickup-in-store/' },
]
},
]
//{
// label: 'Order',
// collapsed: true,
// items: [
],
},
{
label: 'Order',
collapsed: true,
items: [
// { label: 'Overview', link: '/dropins/order/' },
// { label: 'Initialization', link: '/dropins/order/initialization/' },
{ label: 'Initialization', link: '/dropins/order/initialization/' },
// { label: 'Styles', link: '/dropins/order/styles/' },
// { label: 'Containers',
// collapsed: true,
Expand All @@ -258,23 +288,23 @@ export default defineConfig({
// ]
// },
// { label: 'Slots', link: '/dropins/order/slots/' },
// { label: 'Functions', link: '/dropins/order/functions/' },
{ label: 'Functions', link: '/dropins/order/functions/' },
{ label: 'Dictionary', link: '/dropins/order/dictionary/' },
// { label: 'Tutorial', link: '/dropins/order/tutorials/' },
// collapsed: true,
// items: [
// { label: 'First', link: '/dropins/order/tutorials/first/' },
// { label: 'Second', link: '/dropins/order/tutorials/second/' },
// ],
// ]
// ]
],
},
{
label: 'User auth',
collapsed: true,
items: [
{ label: 'Overview', link: '/dropins/user-auth/' },
{ label: 'reCAPTCHA', link: '/dropins/user-auth/recaptcha/' },
{ label: 'Functions', link: '/dropins/user-auth/auth-functions/' },
{
label: 'Containers',
collapsed: true,
Expand All @@ -287,7 +317,9 @@ export default defineConfig({
{ label: 'UpdatePassword', link: '/dropins/user-auth/containers/update-password/' },
]
},
]
{ label: 'Functions', link: '/dropins/user-auth/auth-functions/' },
{ label: 'Dictionary', link: '/dropins/user-auth/dictionary/' },
],
},
{
label: 'User account',
Expand All @@ -296,7 +328,8 @@ export default defineConfig({
{ label: 'Overview', link: '/dropins/user-account/' },
{ label: 'Initialization', link: '/dropins/user-account/initialization/' },
{ label: 'Styles', link: '/dropins/user-account/styles/' },
{ label: 'Containers',
{
label: 'Containers',
collapsed: true,
items: [
{ label: 'Addresses', link: '/dropins/user-account/containers/addresses/' },
Expand All @@ -307,6 +340,7 @@ export default defineConfig({
},
// { label: 'Slots', link: '/dropins/user-account/slots/' },
{ label: 'Functions', link: '/dropins/user-account/functions/' },
{ label: 'Dictionary', link: '/dropins/user-account/dictionary/' },
{ label: 'Sidebar', link: '/dropins/user-account/sidebar/' },
{ label: 'Tutorial', link: '/dropins/user-account/tutorials/' },
]
Expand All @@ -326,7 +360,14 @@ export default defineConfig({
directory: '/troubleshooting/'
}
},
]
{
label: 'Resources',
collapsed: true,
autogenerate: {
directory: '/resources/'
},
},
],
}), (await import("@playform/compress")).default({
CSS: false,
HTML: true,
Expand Down
Loading

0 comments on commit deaf79d

Please sign in to comment.