Skip to content

accessibility get quest, display name instead of email #62

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.

Sign up for GitHub

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

Merged
Nicolinabl merged 1 commit into from
Mar 5, 2026
Merged

accessibility get quest, display name instead of email #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion frontend/src/components/Header.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export const Header = () => {

return (
<HeaderWrapper>
<h1>Welcome {user.email}</h1>
<h1>Welcome {user.email?.split('@')[0]}</h1>
<p>Never spend energy on choosing your chores again</p>
<Streak />
<HeartIcon></HeartIcon>
Expand Down
43 changes: 29 additions & 14 deletions frontend/src/pages/GiveUpPage.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,26 @@ import styled from "styled-components"

export const GiveUp = () => {
return (
<Div>
<h2>please dont, you can at least start! 🥲</h2>
<StyledLink to="/quests"><Button>Ok, fine... take me back</Button></StyledLink>
<Link to="/">Give up</Link>
</Div>
<PageWrapper>
<Div>
<h2>please dont, you can at least start! 🥲</h2>
<StyledLink to="/quests"><Button>Ok, fine... take me back</Button></StyledLink>
<Link to="/">Give up</Link>
</Div>
</PageWrapper>
)
}

const Div = styled.div`
display: flex;
flex-direction: column;
background-color: var(--primary-color);
background-color: var(--main-white);
max-height: 280px;
max-width: 350px;
margin: 10px;
border-radius: 12px;
padding: 10px;
border: 2px solid var(--accent-color);
border: 2px solid #B594FF;
text-align: center;
align-items: center;
`
Expand All @@ -32,20 +34,33 @@ const Button = styled.button`
justify-content: center;
align-items: center;
gap: 10px;
flex-shrink: 0;
align-self: stretch;
border-radius: 12px;
border: 2px solid #E9628C;
background: #F497B4;
border: 1px solid #1D30CE;
background: var(--medium-purple);
box-shadow: 2px 4px 4px 0 rgba(139, 139, 139, 0.30);
margin: 16px 0;
cursor: pointer;
color: white;
font-family: "Pixelify Sans", sans-serif;
margin: 15px 0;
font-size: 20px;

&:hover {
transform: scale(1.1)
background: var(--dark-purple)
}

&:active {
background: var(--accent-purple)
}
`

const StyledLink = styled(Link)`
text-decoration: none;
display: contents;
`

const PageWrapper = styled.main`
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
padding: 0 20px;
`
25 changes: 21 additions & 4 deletions frontend/src/pages/QuestPage.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ const handleComplete = async (id, checked) => {


return (
<>
<PageWrapper>
{!state.randomQuest && (
<Form onSubmit={handleSubmit}>
<h2>Let's do this!!</h2>
Expand All @@ -114,7 +114,7 @@ const handleComplete = async (id, checked) => {
)}
{state.randomQuest &&
<Div>
<h2>Ok {user.email}, here is your quest of the day: </h2>
<h2>Ok {user.email?.split('@')[0]}, here is your quest of the day: </h2>
<QuestDiv>
<CompleteDiv>
<Checkbox
Expand All @@ -133,7 +133,7 @@ const handleComplete = async (id, checked) => {

</Div>
}
</>
</PageWrapper>
)
}

Expand Down Expand Up @@ -190,11 +190,20 @@ const Button = styled.button`
gap: 10px;
border-radius: 12px;
border: 1px solid #1D30CE;
background: #866DEB;
background: var(--medium-purple);
box-shadow: 2px 4px 4px 0 rgba(139, 139, 139, 0.30);
color: white;
font-family: "Pixelify Sans", sans-serif;
margin: 15px 0;
font-size: 20px;

&:hover {
background: var(--dark-purple)
}

&:active {
background: var(--accent-purple)
}
`

const QuestDiv = styled.div`
Expand Down Expand Up @@ -227,4 +236,12 @@ const TextDiv = styled.div`
align-items: flex-start;
text-align: left;
`

const PageWrapper = styled.main`
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
padding: 0 20px;
`;
// user does something → dispatch is called → reducer runs and returns new state → component re-renders with new state.