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.

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

Jump to bottom

create loading screen and halfscreen #131

Merged
merged 4 commits into from
Sep 11, 2024
Merged

create loading screen and halfscreen #131

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
caf08a2
create loading screen
ivanwangg Sep 9, 2024
161c840
implement halfscreen
ivanwangg Sep 9, 2024
5c304e2
make necessary changes for half and loading screens
ivanwangg Sep 9, 2024
e0d68fc
Run lint and prettier
parkerra Sep 11, 2024
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
20 changes: 20 additions & 0 deletions web/components/logos/HalfScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import React from "react"

export default function HalfScreen() {

return (
<div className="flex flex-col bg-custom-background w-full h-[20%] justify-center items-center sm:w-1/2 sm:h-full">
<div className="flex flex-row relative w-full h-[40%] justify-center sm:w-[17%] sm:h-[13%] sm:mb-[5%]">
<img src = '/MBBLogo.png' className="shrink-0 stroke-[2.1px] object-contain sm:stroke-[3px]"></img>
</div>
<div className="hidden sm:flex flex-col w-full h-[10%] justify-center shrink-0">
<p className="text-white text-center font-opensans text-[30px] font-bold leading-normal tracking-[0.9px] uppercase">
ivanwangg marked this conversation as resolved.
Show resolved Hide resolved
Motherhood
</p>
<p className="text-white text-center font-opensans text-[30px] font-bold leading-normal tracking-[0.9px] uppercase">
ivanwangg marked this conversation as resolved.
Show resolved Hide resolved
Beyond bars
</p>
</div>
</div>
)
}
20 changes: 20 additions & 0 deletions web/components/logos/Loading.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import React from "react"
ivanwangg marked this conversation as resolved.
Show resolved Hide resolved

export default function LoadingScreen() {

return (
<div className="flex flex-col bg-custom-background w-full h-screen justify-center items-center">
<div className="flex flex-row relative w-full h-[10%] justify-center mb-[10%] sm:w-[17%] sm:h-[13%] sm:mb-[5%]">
<img src = '/MBBLogo.png' className="shrink-0 stroke-[2.1px] object-contain sm:stroke-[3px]"></img>
</div>
<div className="flex flex-col w-full h-[10%] justify-center shrink-0">
<p className="text-white text-center font-opensans text-[30px] font-bold leading-normal tracking-[0.9px] uppercase">
ivanwangg marked this conversation as resolved.
Show resolved Hide resolved
Motherhood
</p>
<p className="text-white text-center font-opensans text-[30px] font-bold leading-normal tracking-[0.9px] uppercase">
Beyond bars
</p>
</div>
</div>
)
}
38 changes: 0 additions & 38 deletions web/components/mbbLogo.tsx
View file
Open in desktop

This file was deleted.

180 changes: 180 additions & 0 deletions web/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions web/pages/login.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import { AuthFormValues } from "@lib/types/common";
import { UserContext } from "@lib/contexts/userContext";

import ErrorAlert from "@components/errorAlert";
import MBBLogo from "@components/mbbLogo";
import Button from "@components/atoms/Button";
import TextInput from "@components/atoms/TextInput";

Expand All @@ -26,9 +25,9 @@ export default function LoginScreen() {
<div className="flex h-screen">
<div className="w-1/2 place-items-center gradient-bg">
<div className="flex flex-wrap flex-col place-content-center h-full">
<div className="self-center">
{/* <div className="self-center">
<MBBLogo />
</div>
</div> */}
<br />
<div className="text-white text-4xl uppercase text-center font-opensans font-bold">
Motherhood <br /> Beyond Bars
Expand Down
Binary file added web/public/MBBLogo.png
View file
Open in desktop
ivanwangg marked this conversation as resolved.
Show resolved Hide resolved
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions web/tailwind.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ module.exports = {
opensans: ["Open Sans", "sans-serif"],
},
extend: {
backgroundImage: {
'custom-background': 'radial-gradient(115.79% 108.31% at 24.4% 30.17%, #EDB1CB 0.01%, #B14378 92.53%)'
},
fontFamily: {
sans: ["Open Sans", ...defaultTheme.fontFamily.sans],
},
Expand Down
Loading