Skip to content

Commit d5ccf80

Browse files
RamakrushnaBiswalRamakrushnaBiswal
authored
Merge pull request #450 from AE-Hertz/branch4
 Enhancement: login page #446
2 parents 7112e3a + 7439ffc commit d5ccf80

File tree

6 files changed

+81
-83
lines changed

6 files changed

+81
-83
lines changed

‎README.md

Lines changed: 36 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -260,17 +260,17 @@ We extend our heartfelt gratitude to all the amazing contributors who have made
260260
</a>
261261
</td>
262262
<td align="center">
263-
<a href="https://github.com/haseebzaki-07">
264-
<img src="https://avatars.githubusercontent.com/u/147314463?v=4" width="100;" alt="haseebzaki-07"/>
263+
<a href="https://github.com/jainaryan04">
264+
<img src="https://avatars.githubusercontent.com/u/138214350?v=4" width="100;" alt="jainaryan04"/>
265265
<br />
266-
<sub><b>Haseeb Zaki</b></sub>
266+
<sub><b>Aryan Ramesh Jain</b></sub>
267267
</a>
268268
</td>
269269
<td align="center">
270-
<a href="https://github.com/jainaryan04">
271-
<img src="https://avatars.githubusercontent.com/u/138214350?v=4" width="100;" alt="jainaryan04"/>
270+
<a href="https://github.com/haseebzaki-07">
271+
<img src="https://avatars.githubusercontent.com/u/147314463?v=4" width="100;" alt="haseebzaki-07"/>
272272
<br />
273-
<sub><b>Aryan Ramesh Jain</b></sub>
273+
<sub><b>Haseeb Zaki</b></sub>
274274
</a>
275275
</td>
276276
<td align="center">
@@ -290,17 +290,17 @@ We extend our heartfelt gratitude to all the amazing contributors who have made
290290
</a>
291291
</td>
292292
<td align="center">
293-
<a href="https://github.com/tejasbenibagde">
294-
<img src="https://avatars.githubusercontent.com/u/124677750?v=4" width="100;" alt="tejasbenibagde"/>
293+
<a href="https://github.com/itznayan">
294+
<img src="https://avatars.githubusercontent.com/u/136584376?v=4" width="100;" alt="itznayan"/>
295295
<br />
296-
<sub><b>Tejas Benibagde</b></sub>
296+
<sub><b>Mahera Nayan</b></sub>
297297
</a>
298298
</td>
299299
<td align="center">
300-
<a href="https://github.com/itznayan">
301-
<img src="https://avatars.githubusercontent.com/u/136584376?v=4" width="100;" alt="itznayan"/>
300+
<a href="https://github.com/tejasbenibagde">
301+
<img src="https://avatars.githubusercontent.com/u/124677750?v=4" width="100;" alt="tejasbenibagde"/>
302302
<br />
303-
<sub><b>Mahera Nayan</b></sub>
303+
<sub><b>Tejas Benibagde</b></sub>
304304
</a>
305305
</td>
306306
<td align="center">
@@ -362,19 +362,19 @@ We extend our heartfelt gratitude to all the amazing contributors who have made
362362
</a>
363363
</td>
364364
<td align="center">
365-
<a href="https://github.com/CoderFleet">
366-
<img src="https://avatars.githubusercontent.com/u/87255169?v=4" width="100;" alt="CoderFleet"/>
365+
<a href="https://github.com/PavanTeja2005">
366+
<img src="https://avatars.githubusercontent.com/u/98730339?v=4" width="100;" alt="PavanTeja2005"/>
367367
<br />
368-
<sub><b>Rudransh Pratap Singh</b></sub>
368+
<sub><b>PavanTeja2005</b></sub>
369369
</a>
370370
</td>
371371
</tr>
372372
<tr>
373373
<td align="center">
374-
<a href="https://github.com/Jay-1409">
375-
<img src="https://avatars.githubusercontent.com/u/166749819?v=4" width="100;" alt="Jay-1409"/>
374+
<a href="https://github.com/sajalbatra">
375+
<img src="https://avatars.githubusercontent.com/u/125984550?v=4" width="100;" alt="sajalbatra"/>
376376
<br />
377-
<sub><b>Jay shah</b></sub>
377+
<sub><b>Sajal Batra</b></sub>
378378
</a>
379379
</td>
380380
<td align="center">
@@ -385,6 +385,8 @@ We extend our heartfelt gratitude to all the amazing contributors who have made
385385
</a>
386386
</td>
387387
<td align="center">
388+
<a href="https://github.com/Jay-1409">
389+
<img src="https://avatars.githubusercontent.com/u/166749819?v=4" width="100;" alt="Jay-1409"/>
388390
<a href="https://github.com/Sourabh782">
389391
<img src="https://avatars.githubusercontent.com/u/103349890?v=4" width="100;" alt="Sourabh782"/>
390392
<br />
@@ -409,7 +411,7 @@ We extend our heartfelt gratitude to all the amazing contributors who have made
409411
<a href="https://github.com/PavanTeja2005">
410412
<img src="https://avatars.githubusercontent.com/u/98730339?v=4" width="100;" alt="PavanTeja2005"/>
411413
<br />
412-
<sub><b>PavanTeja2005</b></sub>
414+
<sub><b>Jay shah</b></sub>
413415
</a>
414416
</td>
415417
</tr>
@@ -428,27 +430,15 @@ We extend our heartfelt gratitude to all the amazing contributors who have made
428430
<sub><b>Navneet Dadhich</b></sub>
429431
</a>
430432
</td>
431-
<td align="center">
432-
<a href="https://github.com/AE-Hertz">
433-
<img src="https://avatars.githubusercontent.com/u/93651229?v=4" width="100;" alt="AE-Hertz"/>
434-
<br />
435-
<sub><b>Abhinandan</b></sub>
436-
</a>
437-
</td>
438433
<td align="center">
439434
<a href="https://github.com/lade6501">
440435
<img src="https://avatars.githubusercontent.com/u/83055827?v=4" width="100;" alt="lade6501"/>
441436
<br />
442437
<sub><b>Vishal Lade</b></sub>
443438
</a>
444439
</td>
445-
<td align="center">
446-
<a href="https://github.com/AnushkaChouhan25">
447-
<img src="https://avatars.githubusercontent.com/u/157525924?v=4" width="100;" alt="AnushkaChouhan25"/>
448-
<br />
449-
<sub><b>Anushka Chouhan</b></sub>
450-
</a>
451-
</td>
440+
</tr>
441+
<tr>
452442
<td align="center">
453443
<a href="https://github.com/REHAN-18">
454444
<img src="https://avatars.githubusercontent.com/u/143922855?v=4" width="100;" alt="REHAN-18"/>
@@ -492,6 +482,15 @@ We extend our heartfelt gratitude to all the amazing contributors who have made
492482
<br />
493483
<sub><b>Sushree Manaswini Biswal</b></sub>
494484
</a>
485+
</td>
486+
</tr>
487+
<tr>
488+
<td align="center">
489+
<a href="https://github.com/Sourabh782">
490+
<img src="https://avatars.githubusercontent.com/u/103349890?v=4" width="100;" alt="Sourabh782"/>
491+
<br />
492+
<sub><b>Sourabh Singh Rawat</b></sub>
493+
</a>
495494
</td>
496495
<td align="center">
497496
<a href="https://github.com/Shiva-Bajpai">
@@ -537,6 +536,8 @@ We extend our heartfelt gratitude to all the amazing contributors who have made
537536
<sub><b>Ayush Yadav</b></sub>
538537
</a>
539538
</td>
539+
</tr>
540+
<tr>
540541
<td align="center">
541542
<a href="https://github.com/smog-root">
542543
<img src="https://avatars.githubusercontent.com/u/181578777?v=4" width="100;" alt="smog-root"/>
@@ -581,6 +582,8 @@ We extend our heartfelt gratitude to all the amazing contributors who have made
581582
<sub><b>Sapna Kul</b></sub>
582583
</a>
583584
</td>
585+
</tr>
586+
<tr>
584587
<td align="center">
585588
<a href="https://github.com/Nikhil0-3">
586589
<img src="https://avatars.githubusercontent.com/u/149102391?v=4" width="100;" alt="Nikhil0-3"/>
@@ -611,13 +614,6 @@ We extend our heartfelt gratitude to all the amazing contributors who have made
611614
<sub><b>Jai Dhingra</b></sub>
612615
</a>
613616
</td>
614-
<td align="center">
615-
<a href="https://github.com/IkkiOcean">
616-
<img src="https://avatars.githubusercontent.com/u/76002919?v=4" width="100;" alt="IkkiOcean"/>
617-
<br />
618-
<sub><b>Vivek Prakash</b></sub>
619-
</a>
620-
</td>
621617
<td align="center">
622618
<a href="https://github.com/harjasae2001">
623619
<img src="https://avatars.githubusercontent.com/u/83627055?v=4" width="100;" alt="harjasae2001"/>

‎frontend/src/assets/login-opt.png

1.23 MB
Loading

‎frontend/src/components/Pages/EmailVerify.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Link, useNavigate } from 'react-router-dom';
2-
import photo from '../../assets/login.png';
2+
import photo from '../../assets/login-opt.png';
33
import React, { useState } from 'react';
44
import { message } from 'antd';
55

‎frontend/src/components/Pages/Login.jsx

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React, { useState, useEffect } from 'react';
2-
import photo from '../../assets/login.png';
2+
import photo from '../../assets/login-opt.png';
33
import { Link, useNavigate } from 'react-router-dom';
44
import { message } from 'antd';
55
import Cookies from 'js-cookie';
@@ -63,28 +63,29 @@ const Login = () => {
6363
}, []);
6464

6565
return (
66-
<div className="w-screen h-screen dark:bg-black flex items-center justify-center lg:pt-10 px-4">
66+
<div className="w-screen h-screen pt-10 flex flex-col lg:flex-row items-center justify-center lg:space-x-10 px-4 dark:bg-black">
6767
{/* Background Image */}
6868
<img
6969
src={photo}
7070
alt="login"
7171
loading="lazy"
72-
className="absolute w-3/4 lg:w-auto lg:opacity-100 opacity-10 object-cover"
72+
className="w-3/4 max-w-xs lg:max-w-2xl lg:w-1/2 object-contain mb-6 lg:mb-0"
7373
/>
74+
7475
{/* Login Form */}
7576
<form
7677
onSubmit={handleSubmit}
77-
className="z-10 p-8 lg:p-16 bg-[#f1e9dc] dark:bg-amber-800 dark:text-white flex flex-col gap-6 rounded-lg border-2 border-black shadow-[4px_4px_0px_0px_black] w-full max-w-md lg:max-w-xl"
78+
className="z-10 p-8 lg:p-16 bg-[#f1e9dc] dark:bg-amber-800 dark:text-white flex flex-col gap-6 rounded-lg border-2 border-black shadow-[4px_4px_0px_0px_black] w-full max-w-md lg:max-w-lg"
7879
>
79-
<div className="text-[#323232] dark:text-white font-black text-4xl lg:text-7xl mb-2">
80+
<div className="text-[#323232] dark:text-white font-black text-3xl lg:text-5xl mb-2">
8081
Welcome,
8182
<span className="block text-[#666] dark:text-gray-400 font-semibold text-lg lg:text-2xl mt-1">
8283
Log in to continue
8384
</span>
8485
</div>
8586

8687
<input
87-
className="w-full h-12 rounded-md border-2 border-black bg-beige shadow-[4px_4px_0px_0px_black] text-[15px] font-semibold text-[#323232] p-2.5 focus:outline-none focus:border-[#2d8cf0] placeholder-[#666]"
88+
className="w-full h-12 rounded-md border-2 border-black bg-beige shadow-[4px_4px_0px_0px_black] dark:shadow-[4px_4px_0px_0px_grey] text-[15px] font-semibold text-[#323232] p-2.5 focus:outline-none focus:border-[#2d8cf0] placeholder-[#666] dark:bg-slate-800 dark:placeholder-white"
8889
name="email"
8990
placeholder="Email"
9091
type="email"
@@ -93,7 +94,7 @@ const Login = () => {
9394

9495
<div className="relative w-full">
9596
<input
96-
className="w-full h-12 rounded-md border-2 border-black bg-beige shadow-[4px_4px_0px_0px_black] text-[15px] font-semibold text-[#323232] p-2.5 focus:outline-none focus:border-[#2d8cf0] placeholder-[#666]"
97+
className="w-full h-12 rounded-md border-2 border-black bg-beige shadow-[4px_4px_0px_0px_black] dark:shadow-[4px_4px_0px_0px_grey] text-[15px] font-semibold text-[#323232] p-2.5 focus:outline-none focus:border-[#2d8cf0] placeholder-[#666] dark:bg-slate-800 dark:placeholder-white"
9798
name="password"
9899
placeholder="Password"
99100
type={hidden ? 'password' : 'text'}
@@ -142,7 +143,7 @@ const Login = () => {
142143
>
143144
<button
144145
type="button"
145-
className="w-full h-12 rounded-md border-2 dark:text-white border-black bg-beige shadow-[4px_4px_0px_0px_black] text-[17px] font-semibold text-[#323232] transition active:translate-x-[3px] active:translate-y-[3px]"
146+
className="w-full h-12 rounded-md border-2 dark:text-white border-black bg-beige shadow-[4px_4px_0px_0px_black] dark:shadow-[4px_4px_0px_0px_grey] text-[17px] font-semibold text-[#323232] transition active:translate-x-[3px] active:translate-y-[3px]"
146147
>
147148
Sign in with Google
148149
</button>
@@ -152,7 +153,7 @@ const Login = () => {
152153

153154
<button
154155
type="submit"
155-
className="w-full h-12 rounded-md dark:text-white border-2 border-black bg-beige shadow-[4px_4px_0px_0px_black] text-[17px] font-semibold text-[#323232] transition active:translate-x-[3px] active:translate-y-[3px]"
156+
className="w-full h-12 rounded-md dark:text-white border-2 border-black bg-beige shadow-[4px_4px_0px_0px_black] dark:shadow-[4px_4px_0px_0px_grey] text-[17px] font-semibold text-[#323232] transition active:translate-x-[3px] active:translate-y-[3px]"
156157
>
157158
{isLoading ? 'Loading...' : 'Let’s Log you in →'}
158159
</button>

0 commit comments

Comments
 (0)