Skip to content

2021csb1113/sof 168 loginsign up page UI #189

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

Merged
Arker123 merged 6 commits into from
Apr 17, 2024
Merged

2021csb1113/sof 168 loginsign up page UI #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5e9028d
Improve ui of Login/Signup Page
Nandini-96 Apr 8, 2024
f641e19
Improve ui of Login/Signup Page
Nandini-96 Apr 8, 2024
8807f02
Add changes
Nandini-96 Apr 16, 2024
debcd54
Merge branch 'Arker123:main' into 2021csb1113/sof-168-loginsign-up-pa…
Nandini-96 Apr 17, 2024
22c3a29
Tweaks
Arker123 Apr 17, 2024
9af5512
Merge branch 'main' into 2021csb1113/sof-168-loginsign-up-page-ui
Dhananjay-Goel Apr 17, 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
2 changes: 2 additions & 0 deletions client/public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
href="https://fonts.googleapis.com/css2?family=Dosis:wght@200..800&display=swap"
rel="stylesheet"
/>
<link href="https://fonts.googleapis.com/css2?family=Gothic+A1:wght@100;200;300;400;500;600;700;800;900&display=swap" rel="stylesheet">


<title>Condense: Video Analyzer</title>
</head>
Expand Down
78 changes: 40 additions & 38 deletions client/src/pages/SignUp.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,12 +167,12 @@ const SignUp = () => {
return (
<div className="">
<motion.div
className=" flex flex-row bg-gradient-to-b from-red-500 via-red-900 to-black"
className=" flex flex-row bg-gradient-to-b from-black to-[#6f0000]"
initial={{ opacity: 0 }}
animate={{ opacity: 1 }}
transition={{ duration: 1 }}
>
<div className="w-[500px] h-screen bg-gradient-to-b from-red-500 via-red-900 to-black">
<div className="w-[500px] h-screen bg-gradient-to-b from-black to-[#6f0000]">
<motion.h1
initial={{ opacity: 0, y: 20 }}
animate={{ opacity: 1, y: 0 }}
Expand All @@ -186,40 +186,42 @@ const SignUp = () => {
transition={{ duration: 1 }}
>
<img
src={"/images/logo_condense.jpg"}
src={"/images/white-logo.svg"}
alt="Your Image Alt Text"
className="w-full h-full object-cover"
/>
</motion.div>
<motion.div className="mt-[275px] ml-2 ">CONDENSE</motion.div>
<motion.div className="mt-[275px] ml-2 font-sans font-extrabold ">CONDENSE</motion.div>
</motion.h1>
</div>

<div className="flex justify-center items-center flex-1 w-[1000px] border-4 border-blue-100 rounded-l-3xl bg-white">
<div className="flex justify-center items-center flex-1 w-[1000px] rounded-l-3xl bg-slate-100">
<motion.div
initial={{ opacity: 0, y: -20 }}
animate={{ opacity: 1, y: 0 }}
transition={{ duration: 0.5 }}
className="w-[440px] bg-white border items-center rounded-2xl border-black shadow-md px-10 pb-8 pt-6 mb-4 ml-[150px]"
className="w-[440px] bg-slate-50 border items-center rounded-2xl border-black shadow-2xl px-10 pb-8 pt-6 mb-4 ml-[150px]"
>
<div className="flex flex-row mb-5 justify-center items-center text-black text-semibold text-[23px] font-serif font-medium">
<div
className={`px-5 py-1 border ${
toggle ? "border-gray-200" : "border-black"
} cursor-pointer`}
onClick={() => setToggle(false)}
data-testid="Login-header-test"
>
Login
</div>
<div
className={`px-5 py-1 border ${
toggle ? "border-black" : "border-gray-200"
} cursor-pointer`}
onClick={() => setToggle(true)}
data-testid="Register-header-test"
>
Register
<div className="flex flex-row mb-5 justify-center items-center text-black text-semibold text-[23px] font-sans font-medium">
<div className="w-[233px] rounded-xl h-[45px] border border-black flex flex-row">
<div
className={`px-5 py-1 rounded-xl ${
toggle ? "" : "border border-black text-[#6f0000] font-bold"
} cursor-pointer`}
onClick={() => setToggle(false)}
data-testid="Login-header-test"
>
Login
</div>
<div
className={`px-5 py-1 rounded-xl ${
toggle ? "border border-black text-[#6f0000] font-bold" : ""
} cursor-pointer`}
onClick={() => setToggle(true)}
data-testid="Register-header-test"
>
Register
</div>
</div>
</div>

Expand All @@ -233,12 +235,12 @@ const SignUp = () => {
Email ID
</label>
<input
className="shadow appearance-none border border-black rounded w-full py-2 px-3 text-gray-700 mb-3 leading-tight focus:outline-none focus:shadow-outline"
className="shadow bg-slate-200 appearance-none border border-black rounded w-full py-2 px-3 text-gray-700 mb-3 leading-tight focus:outline-none focus:shadow-outline"
id="email"
type="text"
value={email}
onChange={handleEmailChange}
placeholder=""
placeholder="Enter your email ID"
data-testid="email-test"
required
/>
Expand All @@ -251,12 +253,12 @@ const SignUp = () => {
Username
</label>
<input
className="shadow appearance-none border border-black rounded w-full py-2 px-3 text-gray-700 mb-3 leading-tight focus:outline-none focus:shadow-outline"
className="shadow bg-slate-200 appearance-none border border-black rounded w-full py-2 px-3 text-gray-700 mb-3 leading-tight focus:outline-none focus:shadow-outline"
id="username"
type="text"
value={name}
onChange={(e) => setName(e.target.value)}
placeholder=""
placeholder="Enter your username"
data-testid="username-test"
required
/>
Expand All @@ -269,12 +271,12 @@ const SignUp = () => {
Password
</label>
<input
className="shadow appearance-none border border-black rounded w-full py-2 px-3 text-gray-700 mb-3 leading-tight focus:outline-none focus:shadow-outline"
className="shadow bg-slate-200 appearance-none border border-black rounded w-full py-2 px-3 text-gray-700 mb-3 leading-tight focus:outline-none focus:shadow-outline"
id="password"
type="password"
value={password}
onChange={(e) => setPassword(e.target.value)}
placeholder=""
placeholder="Enter your password"
data-testid="password-test"
required
/>
Expand All @@ -287,19 +289,19 @@ const SignUp = () => {
Confirm Password
</label>
<input
className="shadow appearance-none border border-black rounded w-full py-2 px-3 text-gray-700 mb-3 leading-tight focus:outline-none focus:shadow-outline"
className="shadow bg-slate-200 appearance-none border border-black rounded w-full py-2 px-3 text-gray-700 mb-3 leading-tight focus:outline-none focus:shadow-outline"
id="confirmPassword"
type="password"
value={confirmPassword}
onChange={(e) => setConfirmPassword(e.target.value)}
placeholder=""
placeholder="Enter your password again"
data-testid="confirmpassword-test"
required
/>
</div>
<div className="flex items-center justify-center">
<button
className="text-white bg-black text-[15px] font-bold py-4 px-6 rounded-xl focus:outline-none focus:shadow-outline hover:bg-red-700"
className="text-white bg-black text-[20px] font-bold font-sans py-2.5 px-6 rounded-xl focus:outline-none focus:shadow-outline hover:bg-red-700"
type="button"
onClick={handleSignupSubmit}
>
Expand All @@ -318,12 +320,12 @@ const SignUp = () => {
Email ID
</label>
<input
className="shadow appearance-none border border-black rounded w-full py-2 px-3 text-gray-700 mb-3 leading-tight focus:outline-none focus:shadow-outline"
className="shadow bg-slate-200 appearance-none border border-black rounded w-full py-2 px-3 text-gray-700 mb-3 leading-tight focus:outline-none focus:shadow-outline"
id="email"
type="email"
value={email}
onChange={(e) => setEmail(e.target.value)}
placeholder=""
placeholder="Enter your email ID"
data-testid="email-test2"
required
/>
Expand All @@ -336,20 +338,20 @@ const SignUp = () => {
Password
</label>
<input
className="shadow appearance-none border border-black rounded w-full py-2 px-3 text-gray-700 mb-3 leading-tight focus:outline-none focus:shadow-outline"
className="shadow bg-slate-200 appearance-none border border-black rounded w-full py-2 px-3 text-gray-700 mb-3 leading-tight focus:outline-none focus:shadow-outline"
id="password"
type="password"
value={password}
onChange={(e) => setPassword(e.target.value)}
placeholder=""
placeholder="Enter your password"
data-testid="password-test2"
required
/>
</div>
<div className="flex justify-center items-center ">
<button
type="button"
className={`text-white bg-black text-[15px] font-bold py-4 px-6 rounded-xl focus:outline-none focus:shadow-outline transition duration-300 type="button" hover:bg-red-700`}
className={`text-white bg-black text-[20px] font-bold py-2.5 px-6 font-sans rounded-xl focus:outline-none focus:shadow-outline transition duration-300 type="button" hover:bg-red-700`}
onClick={handleLoginSubmit}
>
Login
Expand Down
3 changes: 3 additions & 0 deletions client/tailwind.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
module.exports = {
content: ["./src/**/*.{js,jsx,html}"],
theme: {
fontFamily: {
'sans': ['Gothic A1', 'sans-serif'],
},
extend: {},
},
plugins: [],
Expand Down