diff --git a/client/src/components/Auth/AuthForm.tsx b/client/src/components/Auth/AuthForm.tsx index 303ae1c..31f36eb 100644 --- a/client/src/components/Auth/AuthForm.tsx +++ b/client/src/components/Auth/AuthForm.tsx @@ -6,6 +6,7 @@ import { loginHTML, registerHTML } from "./authExtraText"; import { useState } from "react"; import Button from "../_ui/Button/Button"; import Page from "../_ui/Page/Page"; +import Card from "../_ui/Card/Card"; const AuthForm: AuthFormType = ({ format }) => { const [input, setInput] = useState({ email: "", password: "" }); @@ -15,20 +16,23 @@ const AuthForm: AuthFormType = ({ format }) => { const formHTML = format == "login" ? loginHTML : registerHTML; return ( - -

{formText}

- {formHTML} + + + {formHTML} + -
-
- - setInput({...input, email: e.target.value})} /> -
-
- - setInput({...input, password: e.target.value})} /> -
-
+ +
+
+ + setInput({...input, email: e.target.value})} /> +
+
+ + setInput({...input, password: e.target.value})} /> +
+
+
diff --git a/client/src/components/Auth/authExtraText.tsx b/client/src/components/Auth/authExtraText.tsx index beee7b0..9f8a6ef 100644 --- a/client/src/components/Auth/authExtraText.tsx +++ b/client/src/components/Auth/authExtraText.tsx @@ -1,6 +1,6 @@ export const loginHTML = ( <> -

Welcome back!

+

Welcome back!

It's great to see you again.

Please enter your credentials below to login:

@@ -8,8 +8,8 @@ export const loginHTML = ( export const registerHTML = ( <> -

Hi there!

+

Hi there!

Thank you so much for your interest in the site!

-

Please use the form below to register.

+

Please use the form below to register:

) \ No newline at end of file diff --git a/client/src/components/Content/Philosophy.tsx b/client/src/components/Content/Philosophy.tsx index 0ce4e5c..feb8d94 100644 --- a/client/src/components/Content/Philosophy.tsx +++ b/client/src/components/Content/Philosophy.tsx @@ -10,7 +10,7 @@ export default function Philosophy() { Furthermore, things and stuff and things and stuff and things and stuff and things and stuff and things and stuff and things.

- +

We care a lot about things and stuff at Express Spice Market. If you're ever concerned about our things and stuff we will do what we can to alleviate your concerns. diff --git a/client/src/sass/components/_Page.scss b/client/src/sass/components/_Page.scss index 5f73601..b6793b5 100644 --- a/client/src/sass/components/_Page.scss +++ b/client/src/sass/components/_Page.scss @@ -1,9 +1,13 @@ @import "../helpers/variables"; +@import "../helpers/placeholders"; .ui-page-component { display: flex; flex-flow: column nowrap; align-items: center; + background-color: $darkred; + + @extend %background-colors; &.homepage { height: 100vh; diff --git a/client/src/sass/helpers/_placeholders.scss b/client/src/sass/helpers/_placeholders.scss index e8bbd77..0a8c120 100644 --- a/client/src/sass/helpers/_placeholders.scss +++ b/client/src/sass/helpers/_placeholders.scss @@ -21,6 +21,16 @@ background-color: $papyrus; color: black; } + + &.lavender { + background-color: $lavender; + color: black; + } + + &.turmeric { + background-color: $turmeric; + color: black; + } } %text-colors { @@ -43,4 +53,12 @@ &.papyrus { color: $papyrus; } + + &.lavender { + color: $lavender; + } + + &.turmeric { + color: $turmeric; + } } \ No newline at end of file diff --git a/client/src/sass/helpers/_variables.scss b/client/src/sass/helpers/_variables.scss index f27774a..c965edc 100644 --- a/client/src/sass/helpers/_variables.scss +++ b/client/src/sass/helpers/_variables.scss @@ -2,4 +2,6 @@ $coffee: rgb(58, 21, 21); $darkred: rgb(100, 31, 31); $nutmeg: rgb(144, 113, 90); $thyme: rgb(63, 82, 53); -$papyrus: rgb(236, 231, 221); \ No newline at end of file +$papyrus: rgb(236, 231, 221); +$lavender: rgb(194, 182, 224); +$turmeric: rgb(207, 174, 39); \ No newline at end of file