Skip to content
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

Fixed Staring Page #87

Merged
merged 6 commits into from
Apr 19, 2024
Merged

Fixed Staring Page #87

merged 6 commits into from
Apr 19, 2024

Conversation

EthanAuyeung
Copy link
Collaborator

What's new in this PR

Description

Fixed so that when a user navigates to the site the first page that they see is the login page and not just a blank screen with the word login on it.

Screenshots

How to review

Next steps

Relevant Links

Online sources

Related PRs

🛍 CC: @EthanAuyeung

Copy link

vercel bot commented Apr 18, 2024

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
shanti-project ✅ Ready (Inspect) Visit Preview 💬 Add feedback Apr 18, 2024 0:59am

onClick={() => checkDelivery()}
disabled={numberOfItems === 0}
>
Check Out
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you change this to make sure that the button has styling on the text?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also the wording changed to place order?

@@ -65,8 +65,9 @@ export const Backtext = styled.p`
export const TrashIcon = styled(Trash2)`
width: 30px;
height: 30px;
color: black;
color: navy;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use the color json!

@@ -62,6 +63,9 @@ export default function OrderConfirmationDelivery() {
<NavBar />
<CenterDiv>
<PageDiv>
<BackButtonDiv>
<BackButton destination="./storefront" />
</BackButtonDiv>
<BottomColumnDiv>
<LeftColumnDiv>
<BackButton destination="./storefront" />
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is there two backbuttons?

<span
style={{
display: 'inline-block',
fontWeight: 'bold',
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

don't do inline styling! I feel like we should keep in consistent

Quantity:
</span>
<span
style={{
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same idea

@@ -116,10 +115,30 @@ export default function OrderConfirmationPickUp() {
<LabelBox1>
<Body1Bold>{cartItem.name}</Body1Bold>
<br />
<Body2Light>Category: {cartItem.category}</Body2Light>
<Body2Light style={{ marginTop: '-10px' }}>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ideally avoid inline

<div>
<span
style={{
display: 'inline-block',
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here

@BuyankhuuTsCAl BuyankhuuTsCAl merged commit eeecb55 into main Apr 19, 2024
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants