From f6d356c00ca49eb26f5412a11bd59f1fa994af20 Mon Sep 17 00:00:00 2001
From: DiegoEMartinezZ <diermaza.23@gmail.com>
Date: Thu, 24 Apr 2025 08:52:50 -0500
Subject: [PATCH 1/2] adding to new files for the auth and conection with the
 backend

---
 src/services/authService.js | 31 +++++++++++++++++++++++++++++++
 src/services/index.js       |  4 ++++
 2 files changed, 35 insertions(+)
 create mode 100644 src/services/authService.js
 create mode 100644 src/services/index.js

diff --git a/src/services/authService.js b/src/services/authService.js
new file mode 100644
index 0000000..1de585a
--- /dev/null
+++ b/src/services/authService.js
@@ -0,0 +1,31 @@
+import api from "./api";
+
+const authService = {
+  // Register a new client
+  registerClient: async (userData) => {
+    try {
+      const res = await api.post("/auth/register", userData);
+      return res.data;
+    } catch (error) {
+      throw error.res?.data || error.message;
+    }
+  },
+  // Login a client
+  login: async (credentials) => {
+    try {
+      const res = await api.post("/auth/login", credentials);
+      if (res.data.token) {
+        localStorage.setItem("token", res.data.token);
+      }
+      return res.data;
+    } catch (error) {
+      throw error.res?.data || error.message;
+    }
+  },
+  // logout a client
+  logout: () => {
+    localStorage.removeItem("token");
+  },
+};
+
+export default authService;
diff --git a/src/services/index.js b/src/services/index.js
new file mode 100644
index 0000000..0fbf7c8
--- /dev/null
+++ b/src/services/index.js
@@ -0,0 +1,4 @@
+import api from "./api";
+import authService from "./authService";
+
+export { api, authService };

From b496716f3c873bbf9d6dc1c9dbe871fc91167658 Mon Sep 17 00:00:00 2001
From: DiegoEMartinezZ <diermaza.23@gmail.com>
Date: Thu, 24 Apr 2025 08:54:04 -0500
Subject: [PATCH 2/2] fixing some design problems, cretae a client navbar to
 login the user that had an account, delete some menu options and fix some
 buttons events

---
 src/App.jsx                            |  8 ++++----
 src/UI/buttons/MenuButton.jsx          |  8 +++++---
 src/UI/forms/login/LoginForm.jsx       | 14 +++++++-------
 src/UI/navbar/ClientNavBar.jsx         | 22 ++++++++++++++++++++++
 src/UI/navbar/Navbar.jsx               |  2 +-
 src/UI/sections/TitleSection.jsx       | 17 +++++------------
 src/components/menu/MenuAdmin.jsx      | 12 ++++--------
 src/components/menu/MenuClient.jsx     |  8 ++------
 src/context/ClickMeetContext.jsx       | 25 +++++++++++++++++++++++++
 src/pages/Admin.jsx                    |  2 +-
 src/pages/Client.jsx                   |  4 ++--
 src/pages/Landing.jsx                  |  2 +-
 src/pages/{Login.jsx => LoginPage.jsx} |  8 +++++---
 src/routes.jsx                         |  4 ++--
 src/services/api.js                    | 26 +++++++++++++++++++++-----
 15 files changed, 107 insertions(+), 55 deletions(-)
 create mode 100644 src/UI/navbar/ClientNavBar.jsx
 rename src/pages/{Login.jsx => LoginPage.jsx} (74%)

diff --git a/src/App.jsx b/src/App.jsx
index 4c9cfcb..9319ee4 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -4,15 +4,15 @@ import { ClickMeetProvider } from "./context/ClickMeetContext";
 
 const App = () => {
   return (
-    <ClickMeetProvider>
-      <BrowserRouter>
+    <BrowserRouter>
+      <ClickMeetProvider>
         <Routes>
           {routes.map((route) => (
             <Route key={route.path} path={route.path} element={route.element} />
           ))}
         </Routes>
-      </BrowserRouter>
-    </ClickMeetProvider>
+      </ClickMeetProvider>
+    </BrowserRouter>
   );
 };
 
diff --git a/src/UI/buttons/MenuButton.jsx b/src/UI/buttons/MenuButton.jsx
index 8c041cc..136746a 100644
--- a/src/UI/buttons/MenuButton.jsx
+++ b/src/UI/buttons/MenuButton.jsx
@@ -13,13 +13,15 @@ const MenuButton = ({ icon: Icon, text, url }) => {
 
   return (
     <li
-      className="bg-clickmeet-orange text-white flex items-center justify-center p-3 md:py-4 lg:py-5 w-full rounded-xl shadow-md transition-all duration-200 cursor-pointer transform hover:scale-105"
+      className="bg-clickmeet-orange text-clickmeet-black flex items-center justify-center p-3 md:py-4 lg:py-5 w-full rounded-xl shadow-md transition-all duration-200 cursor-pointer transform hover:scale-105"
       onClick={handlerToPage}
     >
-      {Icon && <Icon className="mx-2 md:mx-3 text-lg md:text-xl lg:text-2xl" />}
+      {Icon && (
+        <Icon className="mx-2 md:mx-3 text-base md:text-xl lg:text-xl" />
+      )}
       <h1 className="text-base md:text-lg lg:text-xl font-medium">{text}</h1>
     </li>
   );
 };
 
-export default MenuButton;
\ No newline at end of file
+export default MenuButton;
diff --git a/src/UI/forms/login/LoginForm.jsx b/src/UI/forms/login/LoginForm.jsx
index 1aa8d29..1573111 100644
--- a/src/UI/forms/login/LoginForm.jsx
+++ b/src/UI/forms/login/LoginForm.jsx
@@ -1,14 +1,14 @@
-import React, { useState } from 'react';
+import React, { useState } from "react";
 import { FaUserPlus } from "react-icons/fa";
 import { FaSignInAlt } from "react-icons/fa";
 
 const LoginForm = ({ onSwitchForm }) => {
-  const [email, setEmail] = useState('');
-  const [password, setPassword] = useState('');
+  const [email, setEmail] = useState("");
+  const [password, setPassword] = useState("");
 
   const handleLogin = (e) => {
     e.preventDefault();
-    console.log('Login attempted with:', { email, password });
+    console.log("Login attempted with:", { email, password });
     // TODO: Autentication logic
   };
 
@@ -40,7 +40,7 @@ const LoginForm = ({ onSwitchForm }) => {
           <div className="flex justify-between gap-4 mt-8">
             <button
               type="submit"
-              className="flex items-center justify-center text-sm md:text-base gap-2 w-full py-1 md:py-2 md:px-4 bg-orange-400 hover:bg-clickmeet-orange rounded-full text-clickmeet-black font-bold transition-colors"
+              className="cursor-pointer flex items-center justify-center text-sm md:text-base gap-2 w-full py-1 md:py-2 md:px-4 bg-orange-400 hover:bg-clickmeet-orange rounded-full text-clickmeet-black font-bold transition-colors"
             >
               <FaSignInAlt size={20} />
               Log In
@@ -49,7 +49,7 @@ const LoginForm = ({ onSwitchForm }) => {
             <button
               type="button"
               onClick={onSwitchForm}
-              className="flex items-center justify-center text-sm md:text-base gap-2 w-full py-1 md:py-2 md:px-4 bg-orange-400 hover:bg-clickmeet-orange rounded-full text-clickmeet-black font-bold transition-colors"
+              className="cursor-pointer flex items-center justify-center text-sm md:text-base gap-2 w-full py-1 md:py-2 md:px-4 bg-orange-400 hover:bg-clickmeet-orange rounded-full text-clickmeet-black font-bold transition-colors"
             >
               <FaUserPlus size={20} />
               Sign Up
@@ -61,4 +61,4 @@ const LoginForm = ({ onSwitchForm }) => {
   );
 };
 
-export default LoginForm;
\ No newline at end of file
+export default LoginForm;
diff --git a/src/UI/navbar/ClientNavBar.jsx b/src/UI/navbar/ClientNavBar.jsx
new file mode 100644
index 0000000..1f32f6e
--- /dev/null
+++ b/src/UI/navbar/ClientNavBar.jsx
@@ -0,0 +1,22 @@
+import { BiSolidBellRing } from "react-icons/bi";
+import { CiHome, CiLogin } from "react-icons/ci";
+import { useClickMeet } from "../../context/ClickMeetContext";
+
+const ClientNavBar = () => {
+  const { goHome, goToLogin } = useClickMeet();
+  return (
+    <>
+      <nav className="bg-clickmeet-black w-screen py-3 text-clickmeet-white md:py-5">
+        <section className="flex justify-between px-8">
+          <CiHome onClick={goHome} className="cursor-pointer" />
+          <div className="flex flex-nowrap">
+            <CiLogin onClick={goToLogin} className="cursor-pointer mx-3" />
+            <BiSolidBellRing className="cursor-pointer mx-3" />
+          </div>
+        </section>
+      </nav>
+    </>
+  );
+};
+
+export default ClientNavBar;
diff --git a/src/UI/navbar/Navbar.jsx b/src/UI/navbar/Navbar.jsx
index bdd64b7..f96de03 100644
--- a/src/UI/navbar/Navbar.jsx
+++ b/src/UI/navbar/Navbar.jsx
@@ -13,7 +13,7 @@ const Navbar = () => {
       <nav className="bg-clickmeet-black w-screen py-3 text-clickmeet-white md:py-5">
         <section className="flex justify-between px-8">
           <CiHome onClick={goHome} className="cursor-pointer" />
-          <BiSolidBellRing />
+          <BiSolidBellRing className="cursor-pointer" />
         </section>
       </nav>
     </>
diff --git a/src/UI/sections/TitleSection.jsx b/src/UI/sections/TitleSection.jsx
index 464d7af..d08bfb7 100644
--- a/src/UI/sections/TitleSection.jsx
+++ b/src/UI/sections/TitleSection.jsx
@@ -1,24 +1,17 @@
 import React from "react";
 import { MdArrowLeft } from "react-icons/md";
-import { useNavigate } from "react-router-dom";
-
+import { useClickMeet } from "../../context/ClickMeetContext";
 
 const TitleSection = ({ icon: Icon, text }) => {
-  const navigate = useNavigate();
-
-  const goBack = () => {
-    navigate(-1);
-  };
+  const { goBack } = useClickMeet();
 
   return (
-    <div className="bg-clickmeet-orange flex items-center justify-center py-2 w-fit px-5 rounded-xl m-auto my-4 cursor-pointer" onClick={goBack}>
-      <MdArrowLeft
-        className="text-2xl"
-      />
+    <div className="bg-clickmeet-orange flex items-center justify-center py-2 w-fit px-5 rounded-xl m-auto my-4 ">
+      <MdArrowLeft className="text-2xl cursor-pointer" onClick={goBack} />
       {Icon && <Icon className="mx-2" />}
       <h1>{text}</h1>
     </div>
   );
 };
 
-export default TitleSection;
\ No newline at end of file
+export default TitleSection;
diff --git a/src/components/menu/MenuAdmin.jsx b/src/components/menu/MenuAdmin.jsx
index 578d0f4..a91bbee 100644
--- a/src/components/menu/MenuAdmin.jsx
+++ b/src/components/menu/MenuAdmin.jsx
@@ -1,4 +1,4 @@
-import { FaCalendarCheck, FaUserCircle, FaUserTie } from "react-icons/fa";
+import { FaCalendarCheck, FaUserTie } from "react-icons/fa";
 import MenuButton from "../../UI/buttons/MenuButton";
 
 const MenuAdmin = ({ title }) => {
@@ -6,18 +6,14 @@ const MenuAdmin = ({ title }) => {
     <>
       <section className="grid place-items-center">
         <div className="bg-white p-8 shadow-xl rounded-xl md:w-96">
-          <h1 className="text-center font-bold md:text-2xl mb-6">{title}</h1>
-          <ul className="space-y-6">
+          <h1 className="text-center font-light md:text-xl mb-6">{title}</h1>
+          <ul className="space-y-6 ">
             <MenuButton
               icon={FaCalendarCheck}
               text={"Upcoming Meetings"}
               url={"/admin/upcoming-meetings"}
             />
-            <MenuButton
-              icon={FaUserCircle}
-              text={"Client Metrics"}
-              url={"/admin/client-metrics"}
-            />
+
             <MenuButton
               icon={FaUserTie}
               text={"Professional Overview"}
diff --git a/src/components/menu/MenuClient.jsx b/src/components/menu/MenuClient.jsx
index 7b1f112..50c582a 100644
--- a/src/components/menu/MenuClient.jsx
+++ b/src/components/menu/MenuClient.jsx
@@ -7,7 +7,8 @@ const MenuClient = ({ title }) => {
     <>
       <section className="grid place-items-center">
         <div className="bg-white p-8 shadow-xl rounded-xl md:w-96 ">
-          <h1 className="text-center font-bold md:text-2xl mb-6">{title}</h1>
+          <h1 className="text-center font-light md:text-xl mb-6">{title}</h1>
+
           <ul className="space-y-6">
             <MenuButton
               icon={FaCalendarCheck}
@@ -19,11 +20,6 @@ const MenuClient = ({ title }) => {
               text={"My Appointments"}
               url={"/client/my-appointments"}
             />
-            <MenuButton
-              icon={FaCalendar}
-              text={"Calendar"}
-              url={"/client/calendar"}
-            />
           </ul>
         </div>
       </section>
diff --git a/src/context/ClickMeetContext.jsx b/src/context/ClickMeetContext.jsx
index c58f884..b57d2c3 100644
--- a/src/context/ClickMeetContext.jsx
+++ b/src/context/ClickMeetContext.jsx
@@ -1,8 +1,12 @@
 import { createContext, useContext, useState } from "react";
+import { useNavigate } from "react-router-dom";
 
 const ClickMeetContext = createContext();
 
 export const ClickMeetProvider = ({ children }) => {
+  // Navigation
+  const navigate = useNavigate();
+
   // Form Data State
   const [formData, setFormData] = useState({
     firstName: "",
@@ -110,6 +114,24 @@ export const ClickMeetProvider = ({ children }) => {
     setIsClicked(false);
   };
 
+  // Go back handler
+
+  const goBack = () => {
+    navigate(-1);
+    setFilterBtn(false);
+    resetFilters();
+  };
+
+  //Go to Login view
+  const goToLogin = () => {
+    navigate("/login");
+  };
+
+  //Go to Home view
+  const goHome = () => {
+    navigate("/select-user");
+  };
+
   // Constants
   const months = [
     { value: "1", label: "January" },
@@ -144,6 +166,9 @@ export const ClickMeetProvider = ({ children }) => {
   return (
     <ClickMeetContext.Provider
       value={{
+        goHome,
+        goBack,
+        goToLogin,
         deleteFilterSelection,
         editBtn,
         handleEditBtn,
diff --git a/src/pages/Admin.jsx b/src/pages/Admin.jsx
index d54903b..eae9493 100644
--- a/src/pages/Admin.jsx
+++ b/src/pages/Admin.jsx
@@ -9,7 +9,7 @@ const Admin = () => {
       <Navbar />
       <RolSession rol={"Admin"} />
       <Title />
-      <MenuAdmin title={"Overview and Analytics"} />
+      <MenuAdmin title={"Meetings and Overview"} />
     </>
   );
 };
diff --git a/src/pages/Client.jsx b/src/pages/Client.jsx
index 75ca189..af0b9a1 100644
--- a/src/pages/Client.jsx
+++ b/src/pages/Client.jsx
@@ -1,12 +1,12 @@
 import MenuClient from "../components/menu/MenuClient";
-import Navbar from "../UI/navbar/Navbar";
+import ClientNavBar from "../UI/navbar/ClientNavBar";
 import RolSession from "../UI/txt/RolSession";
 import Title from "../UI/txt/Title";
 
 const Client = () => {
   return (
     <>
-      <Navbar />
+      <ClientNavBar />
       <RolSession rol={"Client"} />
       <Title />
       <MenuClient title={"Welcome, Client :)"} />
diff --git a/src/pages/Landing.jsx b/src/pages/Landing.jsx
index 2c79b2d..638079f 100644
--- a/src/pages/Landing.jsx
+++ b/src/pages/Landing.jsx
@@ -10,7 +10,7 @@ const Landing = () => {
       <div className="flex flex-col items-center text-center">
         <MainTitle />
         <button
-          className="bg-clickmeet-orange text-white py-2 px-6 rounded-full flex items-center transition-transform hover:scale-105"
+          className="bg-clickmeet-orange cursor-pointer text-white py-2 px-6 rounded-full flex items-center transition-transform hover:scale-105"
           onClick={() => navigate("/select-user")}
         >
           <TiPin className="mr-1" size={18} />
diff --git a/src/pages/Login.jsx b/src/pages/LoginPage.jsx
similarity index 74%
rename from src/pages/Login.jsx
rename to src/pages/LoginPage.jsx
index 88859c5..accd182 100644
--- a/src/pages/Login.jsx
+++ b/src/pages/LoginPage.jsx
@@ -1,8 +1,9 @@
 import { useState } from "react";
 import LoginForm from "../UI/forms/login/LoginForm";
 import SignUpForm from "../UI/forms/login/SignUpForm";
-import Navbar from "../UI/navbar/Navbar";
 import Title from "../UI/txt/Title";
+import ClientNavBar from "../UI/navbar/ClientNavBar";
+import RolSession from "../UI/txt/RolSession";
 
 const LoginPage = () => {
   const [showLoginForm, setShowLoginForm] = useState(true);
@@ -13,7 +14,8 @@ const LoginPage = () => {
 
   return (
     <>
-      <Navbar />
+      <ClientNavBar />
+      <RolSession rol={"Client"} />
       <Title />
       {showLoginForm ? (
         <LoginForm onSwitchForm={toggleForm} />
@@ -24,4 +26,4 @@ const LoginPage = () => {
   );
 };
 
-export default LoginPage;
\ No newline at end of file
+export default LoginPage;
diff --git a/src/routes.jsx b/src/routes.jsx
index 09e1a6f..e2488f9 100644
--- a/src/routes.jsx
+++ b/src/routes.jsx
@@ -5,13 +5,13 @@ import ClientMetrics from "./pages/adminViews/ClientMetrics.jsx";
 import Client from "./pages/Client.jsx";
 import Landing from "./pages/Landing.jsx";
 import SelectUser from "./pages/SelectUser.jsx";
-import LoginPage from "./pages/Login.jsx";
+import LoginPage from "./pages/LoginPage.jsx";
 import AppointmentScheduler from "./pages/client/AppointmentScheduler.jsx";
 import AppointmentConfirmationPage from "./pages/client/AppointmentConfirmation.jsx";
 
 const routes = [
   { path: "/", element: <Landing /> },
-  // Login
+  // Client Login
   { path: "/select-user", element: <SelectUser /> },
   { path: "/login", element: <LoginPage /> }, // TODO: Implement authentication.
   // Admin Role
diff --git a/src/services/api.js b/src/services/api.js
index f62069b..ffa105e 100644
--- a/src/services/api.js
+++ b/src/services/api.js
@@ -1,12 +1,28 @@
-import axios from 'axios';
+import axios from "axios";
 
+const API_URL = process.env.NEXT_PUBLIC_API_URL || "http://localhost:8080/api";
 // Axios instance
 const api = axios.create({
   // eslint-disable-next-line no-undef
-  baseURL: process.env.NEXT_PUBLIC_API_URL || 'http://localhost:8080/api',
+  baseURL: API_URL,
   headers: {
-    'Content-Type': 'application/json',
+    "Content-Type": "application/json",
   },
-})
+});
 
-export default api;
\ No newline at end of file
+// Iterceptor to add tokens to headers
+
+api.interceptors.request.use(
+  (config) => {
+    const token = localStorage.getItem("token");
+    if (token) {
+      config.headers["Authorization"] = `Bearer ${token}`;
+    }
+    return config;
+  },
+  (error) => {
+    return Promise.reject(error);
+  }
+);
+
+export default api;