Skip to content

Commit

Permalink
rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
EthanAuyeung committed Apr 22, 2024
1 parent bdf7aea commit c3160b7
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/app/cart/styles.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export const Backtext = styled.p`
export const TrashIcon = styled(Trash2)`
width: 30px;
height: 30px;
color: navy;
color: ${COLORS.navy};
margin-right: 30px;
margin-left: 50px;
margin-top: 28px;
Expand Down
25 changes: 23 additions & 2 deletions src/app/orderConfirmationDelivery/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import {
DeliveryTimes,
fetchDeliveryTimes,
} from '@/api/supabase/queries/delivery_queries';
import { BackButtonDiv } from '../orderConfirmationPickUp/styles';
import BackButton from '../../components/BackButton/BackButton';

import { fetchCartItemsWithQuantityByID } from '../../api/supabase/queries/cart_queries';
Expand Down Expand Up @@ -102,6 +103,9 @@ export default function OrderConfirmationDelivery() {
<NavBar />
<CenterDiv>
<PageDiv>
<BackButtonDiv>
<BackButton destination="./storefront" />
</BackButtonDiv>
<BottomColumnDiv>
<LeftColumnDiv>
<BackButton destination="./storefront" />
Expand All @@ -121,8 +125,25 @@ export default function OrderConfirmationDelivery() {
}}
/>
<LabelBox>
<Body1Bold>{cartItem.name}</Body1Bold>
<Body2Light>Category: {cartItem.category}</Body2Light>
<div>
<span
style={{
display: 'inline-block',
fontWeight: 'bold',
marginRight: '4px',
}}
>
Quantity:
</span>
<span
style={{
display: 'inline-block',
fontSize: '16px',
}}
>
{cartItem.quantity}
</span>
</div>
</LabelBox>
<Quantity>
<Body2>
Expand Down

0 comments on commit c3160b7

Please sign in to comment.