src/api/auth/api.js

@@ -1,5 +1,5 @@
-// import { POST, GET } from "./config";
+import { POST, GET } from "./config";
-// import { AUTH_ENDPOINTS, getAuthHeaders } from "./config";
+import { AUTH_ENDPOINTS, getAuthHeaders } from "./config";
 
 // Simulated delay for realistic API behavior
 const simulateDelay = (ms = 800) =>
@@ -10,7 +10,7 @@ const MOCK_USER = {
 	id: 1,
 	username: "demo@craftandharvest.com",
 	email: "demo@craftandharvest.com",
-	// name: 'Taylor', // Unused for now
+	name: "Taylor",
 	role: "admin",
 };
 
@@ -51,7 +51,7 @@ const login = async ({ username, password }) => {
 };
 
 // Logout
-const logout = async () => {
+const logout = async (token) => {
 	await simulateDelay(300);
 
 	return {
@@ -68,8 +68,6 @@ const logout = async () => {
 const register = async ({ email, password }) => {
 	await simulateDelay();
 
-	console.log({ email, password });
-
 	const token = "mock_jwt_token_" + Date.now();
 
 	return {
@@ -112,8 +110,6 @@ const me = async (token) => {
 const refresh = async (refreshToken) => {
 	await simulateDelay(300);
 
-	console.log({ refreshToken });
-
 	return {
 		data: {
 			token: "mock_jwt_token_" + Date.now(),
@@ -173,8 +169,6 @@ const resetPassword = async ({ token, password }) => {
 const changePassword = async ({ currentPassword, newPassword, token }) => {
 	await simulateDelay();
 
-	console.log({ currentPassword, newPassword, token });
-
 	if (currentPassword === "demo123" && newPassword.length >= 6) {
 		return {
 			data: {

src/api/auth/config.js

@@ -7,9 +7,6 @@ export const AUTH_ENDPOINTS = {
 	REGISTER: "/auth/register",
 	REFRESH: "/auth/refresh",
 	ME: "/auth/me",
-	REQUEST_PASSWORD_RESET: "/auth/request-password-reset",
-	RESET_PASSWORD: "/auth/reset-password",
-	CHANGE_PASSWORD: "/auth/change-password",
 };
 
 // Auth-specific headers

src/app/(auth)/login/page.tsx

@@ -24,20 +24,12 @@ export default function LoginPage() {
 
 			if (ok && data) {
 				setSuccess(true);
-				const token =
+				localStorage.setItem("token", (data as any).token);
-					data && typeof data === "object" && "token" in data ? data.token : "";
+				localStorage.setItem("user", JSON.stringify((data as any).user));
-				const user =
-					data && typeof data === "object" && "user" in data ? data.user : {};
-				localStorage.setItem("token", token as string);
-				localStorage.setItem("user", JSON.stringify(user));
 
 				console.log("Login successful:", data);
 			} else {
-				const errorMessage =
+				setError((data as any)?.message || "Login failed. Please try again.");
-					data && typeof data === "object" && "message" in data
-						? (data.message as string)
-						: "Login failed. Please try again.";
-				setError(errorMessage);
 			}
 		},
 		[username, password]
@@ -142,14 +134,14 @@ export default function LoginPage() {
 
 					<div className="mt-6 text-center space-y-3">
 						<a
-							href="/request-password-reset"
+							href="#"
 							className="text-sm hover:underline block"
 							style={{ color: "var(--foreground)" }}
 						>
 							Forgot password?
 						</a>
 						<p className="text-sm" style={{ color: "var(--foreground)" }}>
-							Don&apos;t have an account?{" "}
+							Don't have an account?{" "}
 							<Link
 								href="/sign-up"
 								className="font-medium hover:underline"

src/app/(auth)/request-password-reset/page.tsx

@@ -46,7 +46,7 @@ export default function RequestPasswordResetPage() {
 				setSuccess(true);
 			} else {
 				setError(
-					(data?.message as string) ||
+					(data as any)?.message ||
 						"Failed to send reset email. Please try again."
 				);
 			}
@@ -124,16 +124,15 @@ export default function RequestPasswordResetPage() {
 							<div className="p-4 rounded bg-green-50 border border-green-200 text-green-700">
 								<p className="font-medium mb-1">Email sent!</p>
 								<p className="text-sm">
-									We&apos;ve sent a password reset link to{" "}
+									We've sent a password reset link to <strong>{email}</strong>.
-									<strong>{email}</strong>. Please check your inbox and follow
+									Please check your inbox and follow the instructions.
-									the instructions.
 								</p>
 							</div>
 							<p
 								className="text-sm text-center"
 								style={{ color: "var(--foreground)" }}
 							>
-								Didn&apos;t receive the email? Check your spam folder or{" "}
+								Didn't receive the email? Check your spam folder or{" "}
 								<button
 									onClick={() => {
 										setSuccess(false);

src/app/(auth)/reset-password/page.tsx

@@ -1,11 +1,11 @@
 "use client";
 
-import { useState, useCallback, useEffect, Suspense } from "react";
+import { useState, useCallback, useEffect } from "react";
 import { AUTH } from "@/api/auth/api";
 import Link from "next/link";
 import { useSearchParams } from "next/navigation";
 
-function ResetPasswordForm() {
+export default function ResetPasswordPage() {
 	const searchParams = useSearchParams();
 	const token = searchParams.get("token");
 
@@ -59,11 +59,10 @@ function ResetPasswordForm() {
 			if (ok && data) {
 				setSuccess(true);
 			} else {
-				const errorMessage =
+				setError(
-					data && typeof data === "object" && "message" in data
+					(data as any)?.message ||
-						? (data.message as string)
+						"Failed to reset password. Please try again."
-						: "Failed to reset password. Please try again.";
+				);
-				setError(errorMessage);
 			}
 		},
 		[token, password, passwordError]
@@ -229,19 +228,3 @@ function ResetPasswordForm() {
 		</div>
 	);
 }
-
-export default function ResetPasswordPage() {
-	return (
-		<Suspense
-			fallback={
-				<div className="min-h-screen flex items-center justify-center p-4">
-					<div className="text-center" style={{ color: "var(--foreground)" }}>
-						Loading...
-					</div>
-				</div>
-			}
-		>
-			<ResetPasswordForm />
-		</Suspense>
-	);
-}

src/app/(auth)/sign-up/page.tsx

@@ -4,7 +4,7 @@ import { useState, useCallback, useEffect } from "react";
 import { AUTH } from "@/api/auth/api";
 import Link from "next/link";
 
-export default function SignUpPage() {
+export default function RegisterPage() {
 	const [email, setEmail] = useState("");
 	const [password, setPassword] = useState("");
 	const [confirmPassword, setConfirmPassword] = useState("");
@@ -70,17 +70,15 @@ export default function SignUpPage() {
 			if (ok && data) {
 				setSuccess(true);
 				// Store token in localStorage
-				localStorage.setItem("token", data.token as string);
+				localStorage.setItem("token", (data as any).token);
-				localStorage.setItem("user", JSON.stringify(data.user));
+				localStorage.setItem("user", JSON.stringify((data as any).user));
 
 				// Redirect or update app state here
 				console.log("Registration successful:", data);
 			} else {
-				const errorMessage =
+				setError(
-					data && typeof data === "object" && "message" in data
+					(data as any)?.message || "Registration failed. Please try again."
-						? (data.message as string)
+				);
-						: "Registration failed. Please try again.";
-				setError(errorMessage);
 			}
 		},
 		[email, password, emailError, passwordError]