Skip to content

updated the homepage path #33

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
SupuniJayasinghe merged 1 commit into from
Sep 5, 2025
Merged

updated the homepage path #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import ForgotPW from "./Pages/forgot-pw.jsx";
import Menu from "./Pages/Menu.jsx";
import Cart from "./Pages/Cart.jsx";
import Orders from "./Pages/Order.jsx";
import About from "./Pages/About.jsx";
import About from "./Pages/About.jsx";
import { AuthContext } from "./context/AuthContext.jsx";
import ResetPW from "./Pages/reset-pw.jsx";

Expand All @@ -17,8 +17,8 @@ export default function App() {

return (
<Routes>
<Route path="/" element={<Navigate to="/home" replace />} />
<Route path="/home" element={<HomePage />} />
{/* <Route path="/" element={<Navigate to="/home" replace />} /> */}
<Route path="/" element={<HomePage />} />
<Route path="/sign-in" element={<SignIn />} />
<Route path="/register" element={<Register />} />
<Route path="/forgot-pw" element={<ForgotPW />} />
Expand All @@ -33,7 +33,7 @@ export default function App() {
<Route path="*" element={<div>Not Found</div>} />
</>
) : (
<Route path="*" element={<Navigate to="/home" />} />
<Route path="*" element={<Navigate to="/" />} />
)}
</Routes>
);
Expand Down
11 changes: 5 additions & 6 deletions src/Component/N-SearchBar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export default function NavBar({ search = "", onSearchChange }) {
try {
openNotification("success", "Logged out successfully");
localStorage.clear();
navigate("/home");
navigate("/");
} catch (error) {
console.error("Logout error:", error);
openNotification("warning", "Logout failed. Please try again.");
Expand All @@ -34,7 +34,7 @@ export default function NavBar({ search = "", onSearchChange }) {
<nav className="mx-auto max-w-7xl px-4 sm:px-6 lg:px-8">
<div className="mt-4 flex items-center justify-between rounded-3xl border border-white/30 bg-white/40 px-5 py-3 backdrop-blur-md shadow-sm">
{/* Logo -> Home */}
<Link to="/home" className="flex items-center gap-2">
<Link to="/" className="flex items-center gap-2">
<span className="inline-grid place-items-center h-9 w-9 rounded-xl bg-emerald-500 text-white font-black">
bR
</span>
Expand All @@ -47,7 +47,7 @@ export default function NavBar({ search = "", onSearchChange }) {

{/* Center links */}
<div className="hidden md:flex items-center gap-6">
<NavLink to="/home" className={navLink}>
<NavLink to="/" className={navLink}>
<svg
className="h-4 w-4 text-emerald-600"
viewBox="0 0 24 24"
Expand Down Expand Up @@ -110,9 +110,8 @@ export default function NavBar({ search = "", onSearchChange }) {
<Link
to="/cart"
className="relative grid place-items-center rounded-xl border border-white/30 bg-white/60 p-2 hover:bg-white/80 transition"
aria-label={`Cart${
count ? `, ${count} item${count > 1 ? "s" : ""}` : ""
}`}
aria-label={`Cart${count ? `, ${count} item${count > 1 ? "s" : ""}` : ""
}`}
>
<svg
xmlns="http://www.w3.org/2000/svg"
Expand Down
4 changes: 2 additions & 2 deletions src/Component/NavBar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export default function NavBar() {
<nav className="mx-auto max-w-7xl px-4 sm:px-6 lg:px-8">
<div className="mt-4 flex items-center justify-between rounded-3xl border border-white/30 bg-white/40 px-5 py-3 backdrop-blur-md shadow-sm">
{/* Logo */}
<NavLink to="/home" className="flex items-center gap-2">
<NavLink to="/" className="flex items-center gap-2">
<span className="inline-grid place-items-center h-9 w-9 rounded-xl bg-emerald-500 text-white font-black">
bR
</span>
Expand All @@ -43,7 +43,7 @@ export default function NavBar() {
{/* Links with icons */}
<div className="hidden md:flex items-center gap-6">
<NavLink
to="/home"
to="/"
className={({ isActive }) => `${base} ${isActive ? active : inactive}`}
>
<HomeIcon className="text-emerald-600" />
Expand Down
2 changes: 1 addition & 1 deletion src/Pages/About.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ export default function About() {
</div>

<nav className="text-sm text-slate-700 flex flex-wrap gap-4">
<Link className="hover:text-slate-900" to="/home">
<Link className="hover:text-slate-900" to="">
Home
</Link>
<Link className="hover:text-slate-900" to="/menu">
Expand Down
2 changes: 1 addition & 1 deletion src/Pages/Register.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ export default function Register() {
<Button
type="link"
className="!text-white !font-semibold"
onClick={() => navigate("/home")}
onClick={() => navigate("/")}
>
<span className="inline-grid place-items-center h-9 w-9 rounded-xl bg-emerald-500 text-white font-black">
bR
Expand Down
2 changes: 1 addition & 1 deletion src/Pages/SignIn.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ export default function SignIn() {
<Button
type="link"
className="!text-white !font-semibold"
onClick={() => navigate("/home")}
onClick={() => navigate("/")}
>
<span className="inline-grid place-items-center h-9 w-9 rounded-xl bg-emerald-500 text-white font-black">
bR
Expand Down
Loading