diff --git a/frontend/src/components/Auth/AuthModal.tsx b/frontend/src/components/Auth/AuthModal.tsx index e1826d3..8091f6c 100644 --- a/frontend/src/components/Auth/AuthModal.tsx +++ b/frontend/src/components/Auth/AuthModal.tsx @@ -1,6 +1,6 @@ import React, { useState } from "react"; import { ToggleButton } from "../Layout/Button"; -import { LogIn as LogInIcon, User as UserIcon, CircleHelp as ForgotIcon} from "lucide-react"; +import { LogIn as LogInIcon, User as UserIcon, CircleHelp as ForgotIcon } from "lucide-react"; import LoginForm from "./LoginForm"; import RegisterForm from "./RegisterForm"; import ForgotPasswordForm from "./ForgotPasswordForm"; @@ -23,11 +23,11 @@ const AuthModal: React.FC = ({ onClose }) => { }; const authSwitch = () => { - - const formMap: { [key: string]: JSX.Element} = { - Login: setSelectedTab("Forgot")}/>, - Register: , - Forgot: + + const formMap: { [key: string]: JSX.Element } = { + Login: setSelectedTab("Forgot")} />, + Register: , + Forgot: }; return formMap[selectedTab] ||
Please select a valid option
; {/* @@ -57,30 +57,31 @@ const AuthModal: React.FC = ({ onClose }) => { h-[95vh] m-auto min-w-[65vw] w-fit py-[80px] rounded-[5rem] transition-all animate-floating " > {/* Login/Register Buttons Container */} -
+
{/* Login Toggle */} setSelectedTab("Login")} > - + Login {/* Register Toggle */} setSelectedTab("Register")} > - + Register
- +
= ({ onClose }) => {
<> - {authSwitch()} + {authSwitch()} - - - + + +
- + ); }; diff --git a/frontend/src/components/Auth/LoginForm.tsx b/frontend/src/components/Auth/LoginForm.tsx index cdd27a6..a4f8f8d 100644 --- a/frontend/src/components/Auth/LoginForm.tsx +++ b/frontend/src/components/Auth/LoginForm.tsx @@ -101,10 +101,10 @@ const LoginForm: React.FC = ({ onSubmit, onForgotPassword }) => { return ( <> -
+

Login

+ md:max-w-[20em] lg:max-w-[27.5em] min-w-[10em] border border-white/10">
= ({ onSubmit }) => { return ( <>
-
+

Register

-
+
= ({ onSubmit }) => { placeholder="Username" value={formData.username} onChange={handleInputChange} - extraClasses={`w-full mb-[1.5em] p-3 ${errors.username ? "border-red-500" : ""}`} + extraClasses={`w-full mb-[1.5em] p-[0.5rem] ${errors.username ? "border-red-500" : ""}`} />
@@ -147,7 +147,7 @@ const RegisterForm: React.FC = ({ onSubmit }) => { placeholder="Email" value={formData.email} onChange={handleInputChange} - extraClasses={`w-full mb-[1.5em] p-3 ${errors.email ? "border-red-500" : ""}`} + extraClasses={`w-full mb-[1.5em] p-[0.5rem] ${errors.email ? "border-red-500" : ""}`} />
@@ -161,7 +161,7 @@ const RegisterForm: React.FC = ({ onSubmit }) => { placeholder="Password" value={formData.password} onChange={handleInputChange} - extraClasses={`w-full mb-[1.5em] p-3 ${errors.password ? "border-red-500" : ""}`} + extraClasses={`w-full mb-[1.5em] p-[0.5rem] ${errors.password ? "border-red-500" : ""}`} />
@@ -175,7 +175,7 @@ const RegisterForm: React.FC = ({ onSubmit }) => { placeholder="Confirm Password" value={formData.confirmPassword} onChange={handleInputChange} - extraClasses={`w-full mb-[1.5em] p-3 ${errors.confirmPassword ? "border-red-500" : ""}`} + extraClasses={`w-full mb-[1.5em] p-[0.5rem] ${errors.confirmPassword ? "border-red-500" : ""}`} />
diff --git a/frontend/src/components/Layout/ListRow.tsx b/frontend/src/components/Layout/ListRow.tsx index 7e75bec..ec3c94d 100644 --- a/frontend/src/components/Layout/ListRow.tsx +++ b/frontend/src/components/Layout/ListRow.tsx @@ -52,16 +52,17 @@ const ListRow: React.FC = ({

{title}

{description}

- +
+ {items.map((item) => ( = ({ streamCategory, viewers, thumbnail, - onItemClick, + onItemClick, }) => { return ( -
-
+
-
- {thumbnail ? ( - {title} - ) : ( -
- )} + onClick={onItemClick} + > +
+ {thumbnail ? ( + {title} + ) : ( +
+ )} +
+
+

{title}

+ {type === "stream" &&

{streamer}

} + {type === "stream" && ( +

{streamCategory}

+ )} +

{viewers} viewers

+
-
-

{title}

- {type === "stream" &&

{streamer}

} - {type === "stream" && ( -

{streamCategory}

- )} -

{viewers} viewers

-
-
); }; diff --git a/frontend/src/components/Layout/Navbar.tsx b/frontend/src/components/Layout/Navbar.tsx index 509e9d0..537761f 100644 --- a/frontend/src/components/Layout/Navbar.tsx +++ b/frontend/src/components/Layout/Navbar.tsx @@ -73,7 +73,7 @@ const Navbar: React.FC = ({ variant = "default" }) => { <>
diff --git a/frontend/src/components/Layout/Sidebar.tsx b/frontend/src/components/Layout/Sidebar.tsx index 0f8ea28..96ab7a5 100644 --- a/frontend/src/components/Layout/Sidebar.tsx +++ b/frontend/src/components/Layout/Sidebar.tsx @@ -47,7 +47,7 @@ const Sidebar: React.FC = () => { const shownCategory = Object.entries(testCategory).map(([dummyCategory, { dummyLink, dummyImage }]) => { return (
  • + hover:bg-[#800020] hover:shadow-[-1px_1.5px_10px_white] transition-all duration-250 m-[0.25em]"> {dummyCategory} {dummyCategory}
  • @@ -57,13 +57,13 @@ const Sidebar: React.FC = () => { return ( <> -
    +

    Followed

      {shownStreamers}
    -

    Your Categories

    +

    Your Categories

      {shownCategory}