Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
97 changes: 0 additions & 97 deletions frontend/src/Account.tsx

This file was deleted.

8 changes: 4 additions & 4 deletions frontend/src/Login.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ const Login = observer(() => {
</div>
<div className="h-12 items-center">
{failure ? (
<div className="text-[#D33221] mt-4 bg-[#FFA399] h-full rounded-md text-center flex items-center justify-center p-2">
<div className="text-warning mt-4 bg-light-warning h-full rounded-md text-center flex items-center justify-center p-2">
Your password is incorrect or this account doesn't exist.
</div>
) : (
Expand All @@ -93,9 +93,9 @@ const Login = observer(() => {
Login
</button>
<div className="flex items-center justify-between gap-4 mt-8">
<hr className="border-[#757575] w-[45%]" />
<div className="text-[#757575]">or</div>
<hr className="border-[#757575] w-[45%]" />
<hr className="border-dark-gray w-[45%]" />
<div className="text-dark-gray">or</div>
<hr className="border-dark-gray w-[45%]" />
</div>
<div className="flex items-center mt-8 justify-center">
Don't have an account?{" "}
Expand Down
175 changes: 0 additions & 175 deletions frontend/src/Profile.tsx

This file was deleted.

16 changes: 8 additions & 8 deletions frontend/src/Register.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -200,9 +200,9 @@ const Register = observer(() => {
Register
</button>
<div className="flex items-center justify-between gap-4 mt-4">
<hr className="border-[#757575] w-[45%]" />
<div className="text-[#757575]">or</div>
<hr className="border-[#757575] w-[45%]" />
<hr className="border-dark-gray w-[45%]" />
<div className="text-dark-gray">or</div>
<hr className="border-dark-gray w-[45%]" />
</div>
<div className="flex items-center mt-4 justify-center">
Have an account?{" "}
Expand Down Expand Up @@ -246,14 +246,14 @@ const styles: { [key: string]: React.CSSProperties } = {
textAlign: "start",
},
warning: {
color: "#616161",
backgroundColor: "#E7E7E7",
color: "gray",
backgroundColor: "var(--color-light-gray-2)",
},
error: {
color: "#D33221",
backgroundColor: "#FFA399",
color: "var(--color-warning)",
backgroundColor: "var(--color-light-warning)",
},
errorItem: {
borderColor: "#D33221",
borderColor: "var(--color-warning)",
},
};
2 changes: 1 addition & 1 deletion frontend/src/RegisterLanding.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const RegisterLanding = () => {
color: 'black',
borderStyle: 'solid', borderColor: 'black', borderWidth: '1px'
}}
className="py-2 px-4 rounded"
className="py-2 mt-8 px-4 rounded-md"
onClick={() => {
logout()
}}
Expand Down
13 changes: 6 additions & 7 deletions frontend/src/custom/ActionConfirmation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,13 @@ import { IoIosWarning } from "react-icons/io";

<div className="flex mb-6">

<div className="w-3" style={{backgroundColor : "#FA703F"}}/>
<div className="p-3" style={{backgroundColor : "#FFE9D9"}}>
<div className="w-3 bg-medium-orange"/>
<div className="p-3 bg-white-orange">
<div className="flex">
<IoIosWarning size={24} style={{color: "#771505"}}/>
<p className="font-bold px-1 text-lg" style={{color: "#771505"}}> Warning </p>
<IoIosWarning size={24} className="text-burgundy"/>
<p className="font-bold px-1 text-lg text-burgundy"> Warning </p>
</div>
<p className=" text-left text-lg font-semibold" style={{color : "#FA703F"}}>
<p className=" text-left text-lg font-semibold text-dark-orange">
{warningMessage}
</p>

Expand All @@ -70,12 +70,11 @@ import { IoIosWarning } from "react-icons/io";
<div className="flex w-full justify-between ">
<button
style={{
backgroundColor: "#F7A781",
borderStyle: 'solid',
borderColor: 'black',
borderWidth: '2px'
}}
className="rounded-lg hover:bg-gray-200 transition-colors w-32 h-12"
className="rounded-lg hover:bg-gray-200 bg-light-orange transition-colors w-32 h-12"
onClick={onCloseDelete}
>
No, cancel
Expand Down
Loading
Loading