-
Notifications
You must be signed in to change notification settings - Fork 3
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.
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
Celine - Delivery Page #32
Merged
Merged
Changes from 8 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
d14b33a
react native problems
celinechoiii 0b4a958
working on frontend page
celinechoiii 894a70d
finished implementing delivery page
celinechoiii 7f114e5
imported font to global styles
celinechoiii 9d934d0
added texts to styles/fonts.tsx
celinechoiii c96eacc
resolve merge conflicts
celinechoiii ab93be2
Merge branch 'main' of https://github.com/calblueprint/shanti-project…
celinechoiii 6cd83a7
fetching order products
celinechoiii File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
import styled from 'styled-components'; | ||
|
||
const CheckoutButton = styled.button` | ||
width: 100px; | ||
height: 50px; | ||
`; | ||
|
||
export default CheckoutButton; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,67 @@ | ||
'use client'; | ||
|
||
import React from 'react'; | ||
import BackButton from '../../components/BackButton'; | ||
import { GlobalStyle } from '../../styles/components'; | ||
import { | ||
DeliveryContainer, | ||
OrderContainer, | ||
OrderSummary, | ||
OrderSummaryText, | ||
OrderButton, | ||
InformationContainer, | ||
InformationText, | ||
PublicSans700Text, | ||
ItemText, | ||
QtyText, | ||
QuantityText, | ||
ItemQuantityContainer, | ||
ItemQuantityRow, | ||
TotalContainer, | ||
NavBarMovedUP, | ||
} from './styles'; | ||
|
||
export default function App() { | ||
return ( | ||
<main> | ||
<div> Delivery </div> | ||
<GlobalStyle /> | ||
|
||
<NavBarMovedUP /> | ||
<BackButton /> | ||
<DeliveryContainer> | ||
<InformationContainer> | ||
<PublicSans700Text style={{ marginBottom: '38px', fontSize: '40px' }}> | ||
Shipping | ||
</PublicSans700Text> | ||
<PublicSans700Text>Name</PublicSans700Text> | ||
<InformationText>Ethan Auyeung</InformationText> | ||
<PublicSans700Text>Address</PublicSans700Text> | ||
<InformationText>123 Telegraph Ave</InformationText> | ||
</InformationContainer> | ||
<OrderContainer> | ||
<OrderSummary> | ||
<OrderSummaryText>Order Summary</OrderSummaryText> | ||
<QtyText>Qty.</QtyText> | ||
<ItemQuantityContainer> | ||
<ItemQuantityRow> | ||
<ItemText>Plush Toy</ItemText> | ||
<QuantityText>1</QuantityText> | ||
</ItemQuantityRow> | ||
<ItemQuantityRow> | ||
<ItemText>Item C</ItemText> | ||
<QuantityText>2</QuantityText> | ||
</ItemQuantityRow> | ||
</ItemQuantityContainer> | ||
<TotalContainer> | ||
<ItemQuantityRow style={{ marginTop: '23px' }}> | ||
<ItemText>Order Total</ItemText> | ||
<QuantityText>3</QuantityText> | ||
</ItemQuantityRow> | ||
</TotalContainer> | ||
</OrderSummary> | ||
<OrderButton>Place Order</OrderButton> | ||
</OrderContainer> | ||
</DeliveryContainer> | ||
</main> | ||
); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,142 @@ | ||
import styled from 'styled-components'; | ||
import NavBar from '../../components/NavBar'; | ||
import COLORS from '../../styles/colors'; | ||
|
||
export const DeliveryContainer = styled.div` | ||
margin-left: 80px; | ||
margin-right: 80px; | ||
display: flex; | ||
flex-direction: row; | ||
justify-content: space-between; | ||
align-items: center; | ||
`; | ||
|
||
export const PublicSans700Text = styled.div` | ||
font-style: normal; | ||
font-weight: 700; | ||
line-height: normal; | ||
`; | ||
|
||
export const OrderSummaryText = styled.div` | ||
margin-top: 27px; | ||
margin-left: 30px; | ||
text-align: left; | ||
width: 285px; | ||
height: 35px; | ||
font-style: normal; | ||
font-weight: 700; | ||
line-height: normal; | ||
font-size: 30px; | ||
`; | ||
|
||
export const QtyText = styled.div` | ||
margin-top: 30px; | ||
margin-right: 20px; | ||
margin-bottom: 5px; | ||
font-style: normal; | ||
font-weight: 400; | ||
line-height: normal; | ||
text-align: right; | ||
`; | ||
|
||
export const ItemText = styled.div` | ||
font-style: normal; | ||
font-weight: 400; | ||
line-height: normal; | ||
`; | ||
|
||
export const QuantityText = styled.div` | ||
font-style: normal; | ||
font-weight: 400; | ||
line-height: normal; | ||
text-align: right; | ||
`; | ||
|
||
export const InformationContainer = styled.div` | ||
width: 730px; | ||
height: 400px; | ||
`; | ||
|
||
export const InformationText = styled.div` | ||
width: 730px; | ||
height: 50px; | ||
border-radius: 4px; | ||
margin-top: 14px; | ||
margin-bottom: 14px; | ||
border: 1px solid ${COLORS.neutralGrey}; | ||
background: ${COLORS.lightGrey}; | ||
display: flex; /* Use flexbox */ | ||
align-items: center; /* Center vertically */ | ||
font-size: 20px; | ||
font-style: normal; | ||
font-weight: 400; | ||
line-height: normal; | ||
padding-left: 20px; | ||
`; | ||
|
||
export const OrderContainer = styled.div` | ||
margin-top: 50px; | ||
width: 350px; | ||
height: 450px; | ||
display: flex; | ||
flex-direction: column; | ||
align-items: center; | ||
justify-content: center; | ||
`; | ||
|
||
export const OrderSummary = styled.div` | ||
width: 350px; | ||
height: 360px; | ||
border-radius: 8px; | ||
background: ${COLORS.white}; | ||
box-shadow: 0px 1px 4px 1px rgba(0, 0, 0, 0.15); | ||
align-items: center; | ||
`; | ||
|
||
export const ItemQuantityContainer = styled.div` | ||
margin-top: 100px | ||
width: 300px; | ||
height: 152px; | ||
display: flex; | ||
flex-direction: column; | ||
// use overflow-y if we want to implement scroll bar | ||
overflow-y: auto; | ||
align-items: center; | ||
justify-content: center; | ||
`; | ||
|
||
export const ItemQuantityRow = styled.div` | ||
width: 285px; | ||
height: 25px; | ||
display: flex; | ||
justify-content: space-between; | ||
margin-bottom: 30px; | ||
`; | ||
|
||
export const TotalContainer = styled.div` | ||
width: 350px; | ||
height: 75px; | ||
border-top: 1px solid black; | ||
display: flex; | ||
align-items: center; | ||
justify-content: center; | ||
`; | ||
|
||
export const OrderButton = styled.button` | ||
margin-top: 26px; | ||
width: 350px; | ||
height: 50px; | ||
flex-shrink: 0; | ||
align-items: center; | ||
background: ${COLORS.navy}; | ||
border-radius: 8px; | ||
color: ${COLORS.white}; | ||
font-size: 20px; | ||
font-style: normal; | ||
font-weight: 700; | ||
line-height: normal; | ||
`; | ||
|
||
export const NavBarMovedUP = styled(NavBar)` | ||
position: static; | ||
`; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
import Image from 'next/image'; | ||
import Link from 'next/link'; | ||
import { BackDiv } from '../styles/components'; | ||
|
||
export default function BackButton() { | ||
return ( | ||
<Link href="/storefront"> | ||
<BackDiv> | ||
<Image | ||
src="/images/Arrow_Left_MD.png" | ||
alt="Back Arrow" | ||
width={23} | ||
height={23} | ||
/> | ||
<p>Back</p> | ||
</BackDiv> | ||
</Link> | ||
); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you add the all of the texts you used to the styles/fonts.tsx file and import them from there.