diff --git a/client/src/App.js b/client/src/App.js index e772be9..978e0d2 100644 --- a/client/src/App.js +++ b/client/src/App.js @@ -3,7 +3,7 @@ import { BrowserRouter as Router, Route, Routes } from "react-router-dom"; import CourseForm from "./Pages/CourseForm"; import './App.css'; import AuthPage from "./Pages/Login"; -import HomePage from "./Pages/HomePage"; +import Accounts from "./Pages/Accounts"; import ForgetPwPage from "./Pages/ForgetPw"; import ResetPwPage from "./Pages/ResetPw"; import FilterPage from "./Pages/FilterPage"; @@ -20,7 +20,7 @@ function App() { }> } />} /> } />} /> - }> + }> }> }> } />} /> diff --git a/client/src/Pages/HomePage.jsx b/client/src/Pages/Accounts.jsx similarity index 96% rename from client/src/Pages/HomePage.jsx rename to client/src/Pages/Accounts.jsx index 0b846d8..b5e4ae3 100644 --- a/client/src/Pages/HomePage.jsx +++ b/client/src/Pages/Accounts.jsx @@ -1,5 +1,5 @@ import React, { useState, useEffect } from "react"; -import { Container, Col, Row, Button, Spinner } from "react-bootstrap"; +import { Container, Col, Row, Button, Spinner, Navbar } from "react-bootstrap"; import axios from "axios"; import { ToastContainer, toast } from "react-toastify"; import "react-toastify/dist/ReactToastify.css"; @@ -58,6 +58,7 @@ function HomePage(props) { return ( <> +
diff --git a/client/src/Pages/Navbar.jsx b/client/src/Pages/Navbar.jsx index f7712be..24bdb40 100644 --- a/client/src/Pages/Navbar.jsx +++ b/client/src/Pages/Navbar.jsx @@ -7,10 +7,12 @@ const Navbar = () => { return (
- - - Appointment To Examiner + {/* Appointment To Examiner text at the left */} + + Appointment To Examiner + + {/* Consolidated buttons in the center */}
Faculty Consolidated @@ -19,7 +21,11 @@ const Navbar = () => { Course Consolidated
-
+ + {/* User icon at the right */} + + +
); diff --git a/client/src/Pages/WelcomeWithFilter.jsx b/client/src/Pages/WelcomeWithFilter.jsx index 2c9289f..b07e1df 100644 --- a/client/src/Pages/WelcomeWithFilter.jsx +++ b/client/src/Pages/WelcomeWithFilter.jsx @@ -84,7 +84,7 @@ const WelcomeWithFilter = () => { // Default welcome content
-

Welcome

+

Appointment To Examiner

You’re signed in