Skip to content

Commit

Permalink
prettier
Browse files Browse the repository at this point in the history
  • Loading branch information
kevinjcai committed Apr 21, 2024
1 parent 884e7b8 commit 0c9b4cf
Show file tree
Hide file tree
Showing 5 changed files with 50 additions and 54 deletions.
79 changes: 40 additions & 39 deletions src/app/delivery/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@ import {
InformationText,
BackButtonDiv,
OutterDiv,
InformationField, Label, Input, Heading4Bold, ForceColumnDiv
InformationField,
Label,
Input,
Heading4Bold,
ForceColumnDiv,
} from './styles';

export default function App() {
Expand All @@ -59,34 +63,35 @@ export default function App() {
fetchProducts();
}, []);



return (
<main>
<NavBar />
<OutterDiv>


<DeliveryContainer>
<ForceColumnDiv>
<BackButtonDiv>
<BackButton destination="/storefront" />
</BackButtonDiv>

<Heading4Bold style={{marginLeft:"41px", marginTop:"20px"}}>Delivery</Heading4Bold>

<InformationContainer>

<Label>Name</Label>
<Input/>{`${Profile?.first_name} ${Profile?.last_name}`}<Input/>
<Label>Address</Label>
<Input/>{UserAddress?.street}, {UserAddress?.city}, {UserAddress?.zipcode}<Input/>
<Label>Phone Number</Label>
<Input/>{Profile?.phone_numbers}<Input/>

</InformationContainer>
</ForceColumnDiv>

<ForceColumnDiv>
<BackButtonDiv>
<BackButton destination="/storefront" />
</BackButtonDiv>

<Heading4Bold style={{ marginLeft: '41px', marginTop: '20px' }}>
Delivery
</Heading4Bold>

<InformationContainer>
<Label>Name</Label>
<Input />
{`${Profile?.first_name} ${Profile?.last_name}`}
<Input />
<Label>Address</Label>
<Input />
{UserAddress?.street}, {UserAddress?.city}, {UserAddress?.zipcode}
<Input />
<Label>Phone Number</Label>
<Input />
{Profile?.phone_numbers}
<Input />
</InformationContainer>
</ForceColumnDiv>

<OrderContainer>
<OrderSummary cart={cart} numberOfItems={numberOfItems} />
Expand All @@ -110,18 +115,14 @@ export default function App() {
);
}





// {/* <InformationContainer>
// <Heading1 style={{ marginBottom: '38px' }}>Shipping</Heading1>
// <Normal700Text>Name</Normal700Text>
// <InformationText>
// {`${Profile?.first_name} ${Profile?.last_name}`}
// </InformationText>
// <Normal700Text>Address</Normal700Text>
// <InformationText>
// {UserAddress?.street}, {UserAddress?.city}, {UserAddress?.zipcode}
// </InformationText>
// </InformationContainer> */}
// {/* <InformationContainer>
// <Heading1 style={{ marginBottom: '38px' }}>Shipping</Heading1>
// <Normal700Text>Name</Normal700Text>
// <InformationText>
// {`${Profile?.first_name} ${Profile?.last_name}`}
// </InformationText>
// <Normal700Text>Address</Normal700Text>
// <InformationText>
// {UserAddress?.street}, {UserAddress?.city}, {UserAddress?.zipcode}
// </InformationText>
// </InformationContainer> */}
17 changes: 6 additions & 11 deletions src/app/delivery/styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,6 @@ export const QuantityText = styled.div`
text-align: right;
`;



export const OrderContainer = styled.div`
margin-top: 50px;
width: 350px;
Expand Down Expand Up @@ -135,7 +133,6 @@ export const OutterDiv = styled.div`
flex-direction: column;
`;


export const InformationContainer = styled.div`
width: 629px;
height: 327px;
Expand All @@ -146,9 +143,8 @@ export const InformationContainer = styled.div`
align-items: left;
background: ${COLORS.white}; /* Assuming white is defined in your COLORS */
border-radius: 8px;
box-shadow: 0 4px 8px rgba(0,0,0,0.1);
box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
padding: 20px 25px;
`;

export const InformationField = styled.div`
Expand All @@ -161,7 +157,7 @@ export const InformationField = styled.div`

export const Label = styled.div`
color: var(--Black, #101010);
font-family: "Public Sans";
font-family: 'Public Sans';
font-size: 25px;
font-style: normal;
font-weight: 700;
Expand All @@ -178,24 +174,23 @@ export const Input = styled.div`
color: var(--Black, #101010);
/* Body 1 - Text */
font-family: "Public Sans";
font-family: 'Public Sans';
font-size: 20px;
font-style: normal;
font-weight: 400;
line-height: normal;
`;
`;

export const Heading4Bold = styled.p`
export const Heading4Bold = styled.p`
font-family: 'Public Sans', sans-serif;
font-size: 25px;
font-style: normal;
font-weight: 700;
line-height: normal;
`;


export const ForceColumnDiv = styled.div`
display: flex;
flex-flow: column;
margin-left: 50px;
`;
`;
2 changes: 1 addition & 1 deletion src/app/pickup/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import {
PickupContent,
PickupContainer,
PickupTimeButton,
InformationContainer
InformationContainer,
} from './styles';

function DateInfoComponent(date: { date: unknown }) {
Expand Down
4 changes: 2 additions & 2 deletions src/app/pickup/styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,6 @@ export const InformationContainer = styled.div`
align-items: left;
background: ${COLORS.white}; /* Assuming white is defined in your COLORS */
border-radius: 8px;
box-shadow: 0 4px 8px rgba(0,0,0,0.1);
box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
padding: 20px 25px;
`;
`;
2 changes: 1 addition & 1 deletion src/app/profileScreen/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ function LogoutSection() {
signOut();
toast("You've been Logged Out! Redirecting...", {
position: toast.POSITION.TOP_CENTER,
});
});
setTimeout(() => {
router.push('/login');
}, 3000);
Expand Down

0 comments on commit 0c9b4cf

Please sign in to comment.