Skip to content

Commit 3ed83e2

Browse files
fPolicfPolic
committed
fix: additional link fixes
1 parent 3ccbfc2 commit 3ed83e2

File tree

3 files changed

+68
-51
lines changed

3 files changed

+68
-51
lines changed

‎src/modules/account/components/account-nav/index.tsx

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,12 @@ const AccountNav = () => {
1515
<Link
1616
href="/account"
1717
className="flex items-center gap-x-2 text-small-regular py-2"
18-
legacyBehavior>
19-
<ChevronDown className="transform rotate-90" />
20-
<span>Account</span>
18+
legacyBehavior
19+
>
20+
<>
21+
<ChevronDown className="transform rotate-90" />
22+
<span>Account</span>
23+
</>
2124
</Link>
2225
)}
2326
</div>
@@ -58,7 +61,7 @@ const AccountNav = () => {
5861
</div>
5962
</div>
6063
</div>
61-
);
64+
)
6265
}
6366

6467
type AccountNavLinkProps = {
@@ -75,10 +78,11 @@ const AccountNavLink = ({ href, route, children }: AccountNavLinkProps) => {
7578
className={clsx("text-gray-700", {
7679
"text-gray-900 font-semibold": active,
7780
})}
78-
legacyBehavior>
79-
{children}
81+
legacyBehavior
82+
>
83+
<>{children}</>
8084
</Link>
81-
);
85+
)
8286
}
8387

8488
export default AccountNav

‎src/modules/account/components/overview/index.tsx

Lines changed: 49 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -24,36 +24,45 @@ const Overview = ({ orders, customer }: OverviewProps) => {
2424
<Link
2525
href="/account/profile"
2626
className="flex items-center justify-between py-4 border-b border-gray-200 px-8"
27-
legacyBehavior>
28-
<div className="flex items-center gap-x-2">
29-
<User size={16} />
30-
<span>Profile</span>
31-
</div>
32-
<ChevronDown className="transform -rotate-90" />
27+
legacyBehavior
28+
>
29+
<>
30+
<div className="flex items-center gap-x-2">
31+
<User size={16} />
32+
<span>Profile</span>
33+
</div>
34+
<ChevronDown className="transform -rotate-90" />
35+
</>
3336
</Link>
3437
</li>
3538
<li>
3639
<Link
3740
href="/account/addresses"
3841
className="flex items-center justify-between py-4 border-b border-gray-200 px-8"
39-
legacyBehavior>
40-
<div className="flex items-center gap-x-2">
41-
<MapPin size={16} />
42-
<span>Addresses</span>
43-
</div>
44-
<ChevronDown className="transform -rotate-90" />
42+
legacyBehavior
43+
>
44+
<>
45+
<div className="flex items-center gap-x-2">
46+
<MapPin size={16} />
47+
<span>Addresses</span>
48+
</div>
49+
<ChevronDown className="transform -rotate-90" />
50+
</>
4551
</Link>
4652
</li>
4753
<li>
4854
<Link
4955
href="/account/orders"
5056
className="flex items-center justify-between py-4 border-b border-gray-200 px-8"
51-
legacyBehavior>
52-
<div className="flex items-center gap-x-2">
53-
<Package size={16} />
54-
<span>Orders</span>
55-
</div>
56-
<ChevronDown className="transform -rotate-90" />
57+
legacyBehavior
58+
>
59+
<>
60+
<div className="flex items-center gap-x-2">
61+
<Package size={16} />
62+
<span>Orders</span>
63+
</div>
64+
<ChevronDown className="transform -rotate-90" />
65+
</>
5766
</Link>
5867
</li>
5968
</ul>
@@ -105,43 +114,44 @@ const Overview = ({ orders, customer }: OverviewProps) => {
105114
orders.slice(0, 5).map((order) => {
106115
return (
107116
<li key={order.id}>
108-
<Link href={`/order/details/${order.id}`} legacyBehavior>
117+
<Link
118+
href={`/order/details/${order.id}`}
119+
legacyBehavior
120+
>
109121
<div className="bg-gray-50 flex justify-between items-center p-4">
110122
<div className="grid grid-cols-3 grid-rows-2 text-small-regular gap-x-4 flex-1">
111-
<span className="font-semibold">
112-
Date placed
113-
</span>
123+
<span className="font-semibold">Date placed</span>
114124
<span className="font-semibold">
115-
Order number
116-
</span>
125+
Order number
126+
</span>
117127
<span className="font-semibold">
118-
Total amount
119-
</span>
128+
Total amount
129+
</span>
120130
<span>
121-
{new Date(order.created_at).toDateString()}
122-
</span>
131+
{new Date(order.created_at).toDateString()}
132+
</span>
123133
<span>#{order.display_id}</span>
124134
<span>
125-
{formatAmount({
126-
amount: order.total,
127-
region: order.region,
128-
includeTaxes: false,
129-
})}
130-
</span>
135+
{formatAmount({
136+
amount: order.total,
137+
region: order.region,
138+
includeTaxes: false,
139+
})}
140+
</span>
131141
</div>
132142
<button
133143
className="flex items-center justify-between"
134144
onClick={close}
135145
>
136-
<span className="sr-only">
137-
Go to order #{order.display_id}
138-
</span>
146+
<span className="sr-only">
147+
Go to order #{order.display_id}
148+
</span>
139149
<ChevronDown className="-rotate-90" />
140150
</button>
141151
</div>
142152
</Link>
143153
</li>
144-
);
154+
)
145155
})
146156
) : (
147157
<span>No recent orders</span>
@@ -152,7 +162,7 @@ const Overview = ({ orders, customer }: OverviewProps) => {
152162
</div>
153163
</div>
154164
</div>
155-
);
165+
)
156166
}
157167

158168
const getProfileCompletion = (customer?: Omit<Customer, "password_hash">) => {

‎src/modules/checkout/templates/index.tsx

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,15 @@ const CheckoutTemplate = () => {
1515
<Link
1616
href="/cart"
1717
className="text-small-semi text-gray-700 flex items-center gap-x-2 uppercase flex-1 basis-0"
18-
legacyBehavior>
19-
<ChevronDown className="rotate-90" size={16} />
20-
<span className="mt-px hidden small:block">
18+
legacyBehavior
19+
>
20+
<>
21+
<ChevronDown className="rotate-90" size={16} />
22+
<span className="mt-px hidden small:block">
2123
Back to shopping cart
2224
</span>
23-
<span className="mt-px block small:hidden">Back</span>
25+
<span className="mt-px block small:hidden">Back</span>
26+
</>
2427
</Link>
2528
<Link href="/" className="text-xl-semi">
2629
ACME
@@ -40,7 +43,7 @@ const CheckoutTemplate = () => {
4043
</div>
4144
</div>
4245
</CheckoutProvider>
43-
);
46+
)
4447
}
4548

4649
export default CheckoutTemplate

0 commit comments

Comments
 (0)