diff --git a/frontend/src/components/CompletedQuests.jsx b/frontend/src/components/CompletedQuests.jsx index f5d40a3145..ce935c2d7b 100644 --- a/frontend/src/components/CompletedQuests.jsx +++ b/frontend/src/components/CompletedQuests.jsx @@ -87,4 +87,12 @@ const Button = styled.button` /* Small shadow */ box-shadow: 0 1px 1px 0 #dbdbdb; + + &:hover { + background: var(--light-purple) + } + + &:active { + background: var(--accent-purple) + } `; diff --git a/frontend/src/components/CreateQuest.jsx b/frontend/src/components/CreateQuest.jsx index 0c067f2be6..9a2a471776 100644 --- a/frontend/src/components/CreateQuest.jsx +++ b/frontend/src/components/CreateQuest.jsx @@ -117,10 +117,19 @@ 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; + font-size: 20px; + + &:hover { + background: var(--dark-purple); + } + + &:active { + background: var(--accent-purple) + } ` // TODO: Add authentication check - redirect to login if no accessToken \ No newline at end of file diff --git a/frontend/src/components/LoginForm.jsx b/frontend/src/components/LoginForm.jsx index aef7258cf3..70371e82e6 100644 --- a/frontend/src/components/LoginForm.jsx +++ b/frontend/src/components/LoginForm.jsx @@ -88,7 +88,7 @@ export const LoginForm = () => { } return ( - <> +

Welcome Back! Log in now:

{/*
) } @@ -145,11 +145,21 @@ 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; - font-size: 16px; + font-size: 20px; + font-weight: 500; + cursor: pointer; + + &:hover { + background: var(--dark-purple); + } + + &:active { + background: var(--accent-purple); + } ` const StyledLink = styled(Link)` diff --git a/frontend/src/components/QuestLibrary.jsx b/frontend/src/components/QuestLibrary.jsx index c02ff417ac..48988745b3 100644 --- a/frontend/src/components/QuestLibrary.jsx +++ b/frontend/src/components/QuestLibrary.jsx @@ -90,4 +90,12 @@ const Button = styled.button` /* Small shadow */ box-shadow: 0 1px 1px 0 #dbdbdb; + + &:hover { + background: var(--light-purple) + } + + &:active { + background: var(--accent-purple) + } `; diff --git a/frontend/src/components/QuestList.jsx b/frontend/src/components/QuestList.jsx index 123ecd6787..74ac2724e5 100644 --- a/frontend/src/components/QuestList.jsx +++ b/frontend/src/components/QuestList.jsx @@ -99,6 +99,14 @@ const Button = styled.button` /* Small shadow */ box-shadow: 0 1px 1px 0 #dbdbdb; + + &:hover { + background: var(--light-purple) + } + + &:active { + background: var(--accent-purple) + } `; // const Div = styled.div` diff --git a/frontend/src/components/SignupForm.jsx b/frontend/src/components/SignupForm.jsx index f53cfaea31..985f86b790 100644 --- a/frontend/src/components/SignupForm.jsx +++ b/frontend/src/components/SignupForm.jsx @@ -103,24 +103,26 @@ export const SignupForm = () => { } return ( -
-

Sign up here

- - - - {error &&

{error}

} - - I already have an account -
+
+
+

Sign up here

+ + + + {error &&

{error}

} + + I already have an account +
+
) } @@ -158,11 +160,19 @@ 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; - font-size: 16px; + font-size: 20px; + + &:hover { + background: var(--dark-purple); + } + + &:active { + background: var(--accent-purple); + } ` const StyledLink = styled(Link)` diff --git a/frontend/src/components/cards/FriendQuestCard.jsx b/frontend/src/components/cards/FriendQuestCard.jsx index 53f7424575..45c75def2f 100644 --- a/frontend/src/components/cards/FriendQuestCard.jsx +++ b/frontend/src/components/cards/FriendQuestCard.jsx @@ -177,6 +177,14 @@ const Button = styled.button` /* Small shadow */ box-shadow: 0 1px 1px 0 #dbdbdb; + + &:hover { + background: var(--secondary-button-color); + } + + &:active { + background: #E48187; + } `; const TopInfo = styled.div` diff --git a/frontend/src/components/cards/InfoCard.jsx b/frontend/src/components/cards/InfoCard.jsx index 8b3a344a26..034d750206 100644 --- a/frontend/src/components/cards/InfoCard.jsx +++ b/frontend/src/components/cards/InfoCard.jsx @@ -5,8 +5,8 @@ export const InfoCard = ({ title, description, icon }) => {
{icon}
-

{title}

-

{description}

+

{title}

+

{description}

) @@ -26,15 +26,11 @@ const Div = styled.div` // TODO add #FFFFFF to root colors in globalstyles -const H3 = styled.h3` +const H2 = styled.h2` font-family: "Pixelify Sans", sans-serif; - font-size: 15px; + font-size: 18px; font-style: normal; - font-weight: 400; + font-weight: 500; line-height: normal; margin: 0; ` - -const P = styled.p` - color: #8C737B; -` \ No newline at end of file diff --git a/frontend/src/components/cards/LibraryQuestCard.jsx b/frontend/src/components/cards/LibraryQuestCard.jsx index b780166b71..9c11e0cd21 100644 --- a/frontend/src/components/cards/LibraryQuestCard.jsx +++ b/frontend/src/components/cards/LibraryQuestCard.jsx @@ -91,6 +91,14 @@ const ButtonAdd = styled.button` /* Small shadow */ box-shadow: 0 2px 2px 0 #dbdbdb; + + &:hover { + background: var(--accent-color) + } + + &:active { + background: #E48187; + } `; const Div = styled.div` diff --git a/frontend/src/components/cards/QuestCard.jsx b/frontend/src/components/cards/QuestCard.jsx index eb933d8f37..be11ff82c0 100644 --- a/frontend/src/components/cards/QuestCard.jsx +++ b/frontend/src/components/cards/QuestCard.jsx @@ -106,6 +106,14 @@ const ButtonDelete = styled.button` /* Small shadow */ box-shadow: 0 1px 1px 0 #dbdbdb; + + &:hover { + background: var(--light-purple) + } + + &:active { + background: var(--accent-purple) + } `; // TODO hide/show list of tasks diff --git a/frontend/src/pages/FriendFeedPage.jsx b/frontend/src/pages/FriendFeedPage.jsx index 8535c28634..910152e680 100644 --- a/frontend/src/pages/FriendFeedPage.jsx +++ b/frontend/src/pages/FriendFeedPage.jsx @@ -86,7 +86,7 @@ export const FriendFeed = () => { //Styles -const PageWrapper = styled.div` +const PageWrapper = styled.main` display: flex; flex-direction: column; justify-content: center; @@ -99,6 +99,7 @@ const H1 = styled.h1` ` + // //add error handling // setLoading(true); // fetch(apiUrl + "/friends", { diff --git a/frontend/src/pages/HomePage.jsx b/frontend/src/pages/HomePage.jsx index 53f4daa9b1..e4a970de57 100644 --- a/frontend/src/pages/HomePage.jsx +++ b/frontend/src/pages/HomePage.jsx @@ -11,9 +11,9 @@ import { Link } from 'react-router-dom' export const Home = () => { return ( -
+
-

Welcome to AppName

+

Welcome to APPNAME

Your to-do list shouldn't feel like a boss battle before you even start. Let us do your mental labour! We'll pick the quest. You just win it.

@@ -23,33 +23,27 @@ export const Home = () => {

How it works

- } - title="1. Let us do your mental labour" - description="Stop overthinking your to-do. We organize and choose your quests so you can just… do." - /> - } - title="2. Add your own quests" + title="1. Add your own quests" description="Got something specific in mind? Add your own custom quests and how long they take to complete." /> } - title="3. Don't know what to add?" + title="2. Don't know what to add?" description="Browse our quest library! Plenty of ideas for self-care, fitness, creativity, and productivity." /> } - title="4. Get a random daily quest from your list" + title="3. Get a random daily quest from your list" description="Every day we pick a quest from your list. All you have to do is tell us how much time you have. And we'll roll the dice!" /> } - title="5. Keep keep streaks & share" + title="4. Keep keep streaks & share" description="Keep your avatar happy with daily streaks. Challenge friends and share your progress!" /> @@ -77,7 +71,7 @@ export const Home = () => { -
+ ); }; @@ -91,15 +85,19 @@ export const Button = styled.button` flex-shrink: 0; align-self: stretch; border-radius: 12px; - border: 2px solid #E9628C; - background: #F497B4; + border: 2px solid var(--secondary-button-color); + background: var(--accent-color); box-shadow: 2px 4px 4px 0 rgba(139, 139, 139, 0.30); margin: 20px 0; cursor: pointer; font-family: "Pixelify Sans", sans-serif; &:hover { - transform: scale(1.1); + background: var(--secondary-button-color); + } + + &:active { + background: #E48187; } ` @@ -108,7 +106,7 @@ const ButtonDiv = styled.div` gap: 10px; ` -const Section = styled.section` +const Main = styled.main` display: flex; flex-direction: column; align-items: center; @@ -141,6 +139,7 @@ const H3 = styled.h3` const StyledLink = styled(Link)` text-decoration: none; + display: contents; ` diff --git a/frontend/src/pages/UserProfilePage.jsx b/frontend/src/pages/UserProfilePage.jsx index c7b7e0c7c0..75ef4886d2 100644 --- a/frontend/src/pages/UserProfilePage.jsx +++ b/frontend/src/pages/UserProfilePage.jsx @@ -36,7 +36,7 @@ export const UserProfile = () => { ); }; -const PageWrapper = styled.div` +const PageWrapper = styled.main` display: flex; flex-direction: column; justify-content: center; diff --git a/frontend/src/styles/GlobalStyles.jsx b/frontend/src/styles/GlobalStyles.jsx index fd5ada2aa7..9a8b1b55e0 100644 --- a/frontend/src/styles/GlobalStyles.jsx +++ b/frontend/src/styles/GlobalStyles.jsx @@ -21,7 +21,7 @@ export const GlobalStyle = createGlobalStyle` --accent-purple: #B594FF; --medium-pink: #FFD2EC; - --medium-purple: #7C58FD; + --medium-purple: #7954fd; --light-yellow: #FFF4CA; --light-pink: #FFE2F3; --light-purple: #E5DEF8; @@ -56,6 +56,7 @@ export const GlobalStyle = createGlobalStyle` font-style: normal; font-weight: 500; line-height: normal; + margin: 10px 0; } h3 { @@ -75,4 +76,5 @@ export const GlobalStyle = createGlobalStyle` text-wrap: pretty; } + `;