Skip to content

Commit 7e8999e

Browse files
committed
feat(auth): sync UI styles across reset pages and resolve merge conflicts
1 parent c00251a commit 7e8999e

3 files changed

Lines changed: 16 additions & 16 deletions

File tree

LocalMind-Frontend/src/app/routes/AppRoutes.tsx

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@ import React from 'react'
22
import { Route, Routes } from 'react-router-dom'
33
import HomePage from '../../features/Dashboard/V1/Component/Pages/HomePage'
44
import SignUp from '../../features/Auth/SignUp'
5-
<<<<<<< HEAD
65
import LoginPage from '../../shared/component/v1/LoginPage'
7-
=======
8-
>>>>>>> 04466fa (feat: implement password reset system with mock email for development)
96
import ForgotPassword from '../../features/Auth/ForgotPassword'
107
import ResetPassword from '../../features/Auth/ResetPassword'
118

@@ -17,10 +14,7 @@ const AppRoutes: React.FC = () => {
1714

1815
{/* Auth Pages */}
1916
<Route path="/signup" element={<SignUp />} />
20-
<<<<<<< HEAD
2117
<Route path="/login" element={<LoginPage />} />
22-
=======
23-
>>>>>>> 04466fa (feat: implement password reset system with mock email for development)
2418
<Route path="/forgot-password" element={<ForgotPassword />} />
2519
<Route path="/reset-password/:token" element={<ResetPassword />} />
2620

LocalMind-Frontend/src/features/Auth/ForgotPassword.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ export default function ForgotPassword() {
4646
`
4747

4848
return (
49-
<div className="min-h-screen bg-[#292828] flex flex-col items-center justify-center p-3 sm:p-4 md:p-6">
49+
<div className="min-h-screen bg-[#292828] flex flex-col items-center justify-center p-3 sm:p-4 md:p-6 pt-14 sm:pt-16 md:pt-20">
5050
<style>{glowStyles}</style>
5151

5252
{/* Card Container */}
@@ -73,7 +73,7 @@ export default function ForgotPassword() {
7373
)}
7474

7575
<form onSubmit={handleSubmit} className="space-y-4">
76-
<div className="flex flex-col gap-1.5">
76+
<div className="flex flex-col gap-1.5 relative mb-6">
7777
<label className="text-gray-200 text-xs sm:text-sm font-semibold">
7878
Email Address
7979
</label>
@@ -90,7 +90,7 @@ export default function ForgotPassword() {
9090
<button
9191
type="submit"
9292
disabled={loading}
93-
className="w-full bg-gray-400 hover:bg-gray-500 text-black font-bold py-2.5 text-sm sm:text-base rounded-lg transition-colors duration-200 mt-6 sm:mt-7 md:mt-8 flex items-center justify-center gap-2"
93+
className="w-full bg-white hover:bg-gray-200 text-black font-bold py-2.5 text-sm sm:text-base rounded-lg transition-colors duration-200 mt-2 flex items-center justify-center gap-2"
9494
>
9595
{loading && (
9696
<svg className="animate-spin h-5 w-5" fill="none" viewBox="0 0 24 24">

LocalMind-Frontend/src/features/Auth/ResetPassword.tsx

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ export default function ResetPassword() {
130130
}
131131

132132
return (
133-
<div className="min-h-screen bg-[#292828] flex flex-col items-center justify-center p-3 sm:p-4 md:p-6">
133+
<div className="min-h-screen bg-[#292828] flex flex-col items-center justify-center p-3 sm:p-4 md:p-6 pt-14 sm:pt-16 md:pt-20">
134134
<style>{glowStyles}</style>
135135

136136
{/* Card Container */}
@@ -151,8 +151,8 @@ export default function ResetPassword() {
151151
</div>
152152
)}
153153

154-
<form onSubmit={handleSubmit} className="space-y-4">
155-
<div className="flex flex-col gap-1.5">
154+
<form onSubmit={handleSubmit} className="space-y-6">
155+
<div className="flex flex-col gap-1.5 relative">
156156
<label className="text-gray-200 text-xs sm:text-sm font-semibold">New Password</label>
157157
<div className="relative">
158158
<input
@@ -209,10 +209,14 @@ export default function ResetPassword() {
209209
)}
210210
</button>
211211
</div>
212-
{errors.password && <span className="text-xs text-red-400">{errors.password}</span>}
212+
{errors.password && (
213+
<span className="text-xs text-red-400 absolute -bottom-5 left-0">
214+
{errors.password}
215+
</span>
216+
)}
213217
</div>
214218

215-
<div className="flex flex-col gap-1.5">
219+
<div className="flex flex-col gap-1.5 relative">
216220
<label className="text-gray-200 text-xs sm:text-sm font-semibold">
217221
Confirm Password
218222
</label>
@@ -272,14 +276,16 @@ export default function ResetPassword() {
272276
</button>
273277
</div>
274278
{errors.confirmPassword && (
275-
<span className="text-xs text-red-400">{errors.confirmPassword}</span>
279+
<span className="text-xs text-red-400 absolute -bottom-5 left-0">
280+
{errors.confirmPassword}
281+
</span>
276282
)}
277283
</div>
278284

279285
<button
280286
type="submit"
281287
disabled={loading}
282-
className="w-full bg-gray-400 hover:bg-gray-500 text-black font-bold py-2.5 text-sm sm:text-base rounded-lg transition-colors duration-200 mt-6 sm:mt-7 md:mt-8 flex items-center justify-center gap-2"
288+
className="w-full bg-white hover:bg-gray-200 text-black font-bold py-2.5 text-sm sm:text-base rounded-lg transition-colors duration-200 mt-6 sm:mt-7 md:mt-8 flex items-center justify-center gap-2"
283289
>
284290
{loading && (
285291
<svg className="animate-spin h-5 w-5" fill="none" viewBox="0 0 24 24">

0 commit comments

Comments
 (0)