diff --git a/package.json b/package.json index 08e1568e..d5b5787a 100644 --- a/package.json +++ b/package.json @@ -49,6 +49,7 @@ "react-dom": "^17.0.2", "react-dropzone": "^10.1.8", "react-firebaseui": "^5.0.2", + "react-helmet": "^6.1.0", "react-hook-form": "^6", "react-image": "^4.0.3", "react-joyride": "^2.3.0", @@ -106,6 +107,7 @@ "@types/react-color": "^3.0.1", "@types/react-div-100vh": "^0.3.0", "@types/react-dom": "^17.0.8", + "@types/react-helmet": "^6.1.2", "@types/react-router-dom": "^5.1.7", "@types/react-router-hash-link": "^2.4.1", "@types/use-persisted-state": "^0.3.0", diff --git a/src/assets/bg-pattern-dark.svg b/src/assets/bg-pattern-dark.svg new file mode 100644 index 00000000..4b8c6f2a --- /dev/null +++ b/src/assets/bg-pattern-dark.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/assets/bg-pattern.svg b/src/assets/bg-pattern.svg index 0fc158ef..c22330b0 100644 --- a/src/assets/bg-pattern.svg +++ b/src/assets/bg-pattern.svg @@ -1,5 +1,5 @@ - + diff --git a/src/components/Auth/AuthLayout.tsx b/src/components/Auth/AuthLayout.tsx index fb2cb371..fa889a0d 100644 --- a/src/components/Auth/AuthLayout.tsx +++ b/src/components/Auth/AuthLayout.tsx @@ -1,9 +1,11 @@ +import Helmet from "react-helmet"; import { use100vh } from "react-div-100vh"; -import { Box, Paper, Typography, LinearProgress } from "@material-ui/core"; +import { useTheme, Paper, Typography, LinearProgress } from "@material-ui/core"; import { alpha } from "@material-ui/core/styles"; import bgPattern from "assets/bg-pattern.svg"; +import bgPatternDark from "assets/bg-pattern-dark.svg"; import Logo from "assets/Logo"; export interface IAuthLayoutProps { @@ -12,43 +14,72 @@ export interface IAuthLayoutProps { } export default function AuthLayout({ children, loading }: IAuthLayoutProps) { + const theme = useTheme(); const fullScreenHeight = use100vh() ?? "100vh"; return ( - ` - linear-gradient(to bottom, ${alpha( - theme.palette.background.default, - 0 - )}, ${theme.palette.background.default} 75%), - linear-gradient(155deg, ${theme.palette.primary.main} 10%, ${ - theme.palette.secondary.main - } 90%), - url('${bgPattern}'), - linear-gradient(161deg, ${alpha( - theme.palette.background.default, - 0.95 - )} -31%, ${alpha(theme.palette.background.default, 0.98)} 160%) - `, + <> + + + - cursor: "default", - }} - > theme.spacing(4), "& > * + *": { marginTop: "var(--spacing-contents)" }, @@ -92,6 +122,6 @@ export default function AuthLayout({ children, loading }: IAuthLayoutProps) { /> )} - + ); } diff --git a/yarn.lock b/yarn.lock index 7468c56b..f582e8ce 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3184,6 +3184,13 @@ dependencies: "@types/react" "*" +"@types/react-helmet@^6.1.2": + version "6.1.2" + resolved "https://registry.yarnpkg.com/@types/react-helmet/-/react-helmet-6.1.2.tgz#e9d7d16b29e4ec5716711c52c35c3cec45819eac" + integrity sha512-dcfAZNlWb5JYFbO9CGfrPWLJAyFcT6UeR3u35eBbv8liY2Rg4K7fM1G5+HnwVgot+C+kVwXAZ8pLEn2jsMfTDg== + dependencies: + "@types/react" "*" + "@types/react-is@^16.7.1 || ^17.0.0": version "17.0.2" resolved "https://registry.yarnpkg.com/@types/react-is/-/react-is-17.0.2.tgz#abc4d910bff5b0bc6b3e1bec57575f6b63fd4e05" @@ -13559,6 +13566,16 @@ react-floater@^0.7.3: react-proptype-conditional-require "^1.0.4" tree-changes "^0.5.1" +react-helmet@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/react-helmet/-/react-helmet-6.1.0.tgz#a750d5165cb13cf213e44747502652e794468726" + integrity sha512-4uMzEY9nlDlgxr61NL3XbKRy1hEkXmKNXhjbAIOVw5vcFrsdYbH2FEwcNyWvWinl103nXgzYNlns9ca+8kFiWw== + dependencies: + object-assign "^4.1.1" + prop-types "^15.7.2" + react-fast-compare "^3.1.1" + react-side-effect "^2.1.0" + react-hook-form@^6: version "6.15.8" resolved "https://registry.yarnpkg.com/react-hook-form/-/react-hook-form-6.15.8.tgz#725c139d308c431c4611e4b9d85a49f01cfc0e7a" @@ -13744,6 +13761,11 @@ react-scroll-sync@^0.8.0: resolved "https://registry.yarnpkg.com/react-scroll-sync/-/react-scroll-sync-0.8.0.tgz#61fabed2afc47d41e6938819d620799da3610548" integrity sha512-Ms9srm41UM+lWexuqdocXjqaqqt6ZRSFxcudgB0sYhC7Or+m12WemTwY8BaQCRf7hA8zHDk55FHvMkqsH7gF+w== +react-side-effect@^2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/react-side-effect/-/react-side-effect-2.1.1.tgz#66c5701c3e7560ab4822a4ee2742dee215d72eb3" + integrity sha512-2FoTQzRNTncBVtnzxFOk2mCpcfxQpenBMbk5kSVBg5UcPqV9fRbgY2zhb7GTWWOlpFmAxhClBDlIq8Rsubz1yQ== + react-textarea-autosize@^8.3.2: version "8.3.3" resolved "https://registry.yarnpkg.com/react-textarea-autosize/-/react-textarea-autosize-8.3.3.tgz#f70913945369da453fd554c168f6baacd1fa04d8"