Skip to content

@W-18397004 feat: addresses #2701

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sf-henry-semaganda wants to merge 4 commits into from
Closed

@W-18397004 feat: addresses #2701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3f3cec7
prep uplift if address page to chakra v3
sf-henry-semaganda Jul 1, 2025
0d11b7e
fix errors on page
sf-henry-semaganda Jul 2, 2025
55028ca
revert unncecessary change
sf-henry-semaganda Jul 2, 2025
c89210f
fix error on save address
sf-henry-semaganda Jul 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions packages/extension-chakra-storefront/src/pages/account/addresses.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import PropTypes from 'prop-types'

import {
Alert,
AlertIcon,
Badge,
Box,
Button,
Expand All @@ -27,7 +26,7 @@ import {useForm} from 'react-hook-form'
import useToast from '../../hooks/use-toast'

import LoadingSpinner from '../../components/loading-spinner'
import {LocationIcon, PlusIcon} from '../../components/icons'
import {LocationIcon, PlusIcon, AlertIcon} from '../../components/icons'
import ActionCard from '../../components/action-card'
import AddressFields from '../../components/forms/address-fields'
import AddressDisplay from '../../components/address-display'
Expand Down Expand Up @@ -93,12 +92,14 @@ const ShippingAddressForm = ({form, hasAddresses, selectedAddressId, toggleEdit,
<form onSubmit={form.handleSubmit(submitForm)}>
<Stack spacing={6}>
{form.formState.errors?.global && (
<Alert status="error">
<AlertIcon color="red.600" boxSize={4} />
<Text fontSize="sm" ml={3}>
<Alert.Root status="error">
<Alert.Indicator>
<AlertIcon color="red.600" boxSize={4} />
</Alert.Indicator>
<Alert.Title>
{form.formState.errors.global.message}
</Text>
</Alert>
</Alert.Title>
</Alert.Root>
)}
<AddressFields form={form} />
<FormActionButtons onCancel={toggleEdit} />
Expand Down
141 changes: 30 additions & 111 deletions packages/extension-chakra-storefront/src/pages/account/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,35 +5,25 @@
* For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/BSD-3-Clause
*/

import React, {useEffect, useState} from 'react'
import React, {useState} from 'react'
import PropTypes from 'prop-types'
import {FormattedMessage, useIntl} from 'react-intl'
import {Route, Switch, Redirect, useLocation, useRouteMatch} from 'react-router-dom'
import {Redirect, useLocation, useRouteMatch} from 'react-router-dom'
import {Route, Switch} from 'react-router-dom'
import {
Accordion,
AccordionButton,
AccordionItem,
AccordionPanel,
Box,
Button,
Flex,
Grid,
Heading,
Stack,
Text,
Divider
Text
} from '@chakra-ui/react'
import Seo from '../../components/seo'
import Link from '../../components/link'
import {ChevronDownIcon, ChevronUpIcon, SignoutIcon} from '../../components/icons'
import AccountDetail from '../../pages/account/profile'
import AccountAddresses from '../../pages/account/addresses'
import AccountOrders from '../../pages/account/orders'
import AccountWishlist from '../../pages/account/wishlist/index'

import {messages, navLinks} from '../../pages/account/constant'
import useNavigation from '../../hooks/use-navigation'
import LoadingSpinner from '../../components/loading-spinner'
import useMultiSite from '../../hooks/use-multi-site'
import useEinstein from '../../hooks/use-einstein'
import useDataCloud from '../../hooks/use-datacloud'
Expand Down Expand Up @@ -81,7 +71,8 @@ const Account = () => {
const {formatMessage} = useIntl()
const {data: customer} = useCurrentCustomer()
const {isRegistered, customerType} = customer

const {buildUrl} = useMultiSite()

const logout = useAuthHelper(AuthHelpers.Logout)
const location = useLocation()
const navigate = useNavigation()
Expand All @@ -92,27 +83,23 @@ const Account = () => {
const einstein = useEinstein()
const dataCloud = useDataCloud()

const {buildUrl} = useMultiSite()
/**************** Einstein ****************/
useEffect(() => {
React.useEffect(() => {
einstein.sendViewPage(location.pathname)
dataCloud.sendViewPage(location.pathname)
}, [location])

const onSignoutClick = async () => {
setShowLoading(true)
await logout.mutateAsync()
navigate('/login')
// await logout.mutateAsync()
// navigate('/login')
}

// If we have customer data and they are not registered, push to login page
// Using Redirect allows us to store the directed page to location
// so we can direct users back after they are successfully log in
if (customerType !== null && !isRegistered && onClient) {
const path = buildUrl('/login')
return <Redirect to={{pathname: path, state: {directedFrom: '/account'}}} />
}

return (
<Box
data-testid={isRegistered && isHydrated() ? 'account-page' : 'account-page-skeleton'}
Expand All @@ -121,85 +108,14 @@ const Account = () => {
>
<Seo title="My Account" description="Customer Account Page" />
<Grid templateColumns={{base: '1fr', lg: '320px 1fr'}} gap={{base: 10, lg: 24}}>
{/* small screen nav accordion */}
<Accordion
display={{base: 'block', lg: 'none'}}
allowToggle={true}
reduceMotion={true}
index={mobileNavIndex}
onChange={setMobileNavIndex}
>
<AccordionItem border="none" background="gray.50" borderRadius="base">
{({isExpanded}) => (
<>
<AccordionButton
as={Button}
height={16}
paddingLeft={8}
variant="ghost"
color="black"
_active={{background: 'gray.100'}}
_expanded={{background: 'transparent'}}
>
<Flex align="center" justify="center">
<Heading as="h2" fontSize="16px">
<FormattedMessage
defaultMessage="My Account"
id="account.accordion.button.my_account"
/>
</Heading>
{isExpanded ? <ChevronUpIcon /> : <ChevronDownIcon />}
</Flex>
</AccordionButton>
<AccordionPanel px={4} paddingBottom={4}>
<Flex as="nav" spacing={0} direction="column">
<Stack spacing={0} as="ul" data-testid="account-nav">
{navLinks.map((link) => (
<Box
align="center"
key={link.name}
as="li"
listStyleType="none"
>
<Button
as={Link}
to={`/account${link.path}`}
useNavLink={true}
variant="menu-link-mobile"
justifyContent="center"
fontSize="md"
fontWeight="normal"
width="100%"
onClick={() => setMobileNavIndex(-1)}
>
{formatMessage(messages[link.name])}
</Button>
</Box>
))}

<LogoutButton
justify="center"
onClick={onSignoutClick}
/>
</Stack>
</Flex>
</AccordionPanel>
</>
)}
</AccordionItem>
</Accordion>

{/* large screen nav sidebar */}
{/* Navigation Sidebar */}
<Stack display={{base: 'none', lg: 'flex'}} spacing={4}>
{showLoading && <LoadingSpinner wrapperStyles={{height: '100vh'}} />}

<Heading as="h2" fontSize="18px">
<FormattedMessage
defaultMessage="My Account"
id="account.heading.my_account"
/>
</Heading>

<Flex spacing={0} as="nav" data-testid="account-detail-nav" direction="column">
{navLinks.map((link) => {
const LinkIcon = link.icon
Expand All @@ -216,24 +132,27 @@ const Account = () => {
</Button>
)
})}
<LogoutButton onClick={onSignoutClick} />
</Flex>
<Button onClick={onSignoutClick}>Logout</Button>
</Stack>

<Switch>
<Route exact path={path}>
<AccountDetail />
</Route>
<Route exact path={`${path}/wishlist`}>
<AccountWishlist />
</Route>
<Route exact path={`${path}/addresses`}>
<AccountAddresses />
</Route>
<Route path={`${path}/orders`}>
<AccountOrders />
</Route>
</Switch>
{/* Main Content */}
<Box>
<Heading>Account Page</Heading>
<Text>Path: {path}</Text>
<Text>Registered: {isRegistered ? 'Yes' : 'No'}</Text>
<Text>Customer Type: {customerType}</Text>

<Switch>
<Route path={`${path}/addresses`} component={AccountAddresses} />
<Route exact path={path}>
<Box>
<Heading>Account Profile</Heading>
<Text>This is the account profile page</Text>
</Box>
</Route>
</Switch>
</Box>
</Grid>
</Box>
)
Expand All @@ -245,4 +164,4 @@ Account.propTypes = {
match: PropTypes.object
}

export default Account
export default Account
6 changes: 3 additions & 3 deletions packages/extension-chakra-storefront/src/pages/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {Skeleton} from '@chakra-ui/react'
const fallback = <Skeleton height="75vh" width="100%" />

// Page Loadables
// const Account = loadable(() => import('overridable!./account'), {fallback})
const Account = loadable(() => import('overridable!./account'), {fallback})
const Cart = loadable(() => import('overridable!./cart'), {fallback})
const Checkout = loadable(() => import('overridable!./checkout'), {
fallback
Expand Down Expand Up @@ -49,7 +49,7 @@ const PageNotFound = loadable(() => import('overridable!./page-not-found'), {
// NOTE: Apply "displayName" for easy filtering. This is a widely use pattern to allow filtering without
// triggering the loadable logic. Please note that we want to keep these in aligned with name in the
// component itself.
// Account.displayName = 'Account'
Account.displayName = 'Account'
// Cart.displayName = 'Cart'
Checkout.displayName = 'Checkout'
// CheckoutConfirmation.displayName = 'CheckoutConfirmation'
Expand All @@ -64,7 +64,7 @@ SocialLoginRedirect.displayName = 'SocialLoginRedirect'
PageNotFound.displayName = 'PageNotFound'

export {
// Account,
Account,
Cart,
Checkout,
// CheckoutConfirmation,
Expand Down
8 changes: 4 additions & 4 deletions packages/extension-chakra-storefront/src/setup-app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,10 @@ class ChakraStorefront extends ApplicationExtension<Config> {
// component: Pages.ResetPassword,
// exact: true
// },
// {
// path: config.pages.Account && config.pages.Account.path,
// component: Pages.Account
// },
{
path: config.pages.Account && config.pages.Account.path,
component: Pages.Account
},
{
path: config.pages.Checkout && config.pages.Checkout.path,
component: Pages.Checkout,
Expand Down
11 changes: 11 additions & 0 deletions packages/extension-chakra-storefront/src/theme/components/base/badge.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,17 @@ import {defineRecipe} from '@chakra-ui/react'
export default defineRecipe({
variants: {
variant: {
solid: {
display: 'inline-flex',
alignItems: 'center',
justifyContent: 'center',
borderRadius: 'md',
fontWeight: 'medium',
fontSize: 'xs',
lineHeight: '1.2',
textTransform: 'uppercase',
letterSpacing: 'wider'
},
notification: {
display: 'inline-flex',
justifyContent: 'center',
Expand Down
Loading