added accounts page in navbar
This commit is contained in:
@@ -3,7 +3,7 @@ import { BrowserRouter as Router, Route, Routes } from "react-router-dom";
|
|||||||
import CourseForm from "./Pages/CourseForm";
|
import CourseForm from "./Pages/CourseForm";
|
||||||
import './App.css';
|
import './App.css';
|
||||||
import AuthPage from "./Pages/Login";
|
import AuthPage from "./Pages/Login";
|
||||||
import HomePage from "./Pages/HomePage";
|
import Accounts from "./Pages/Accounts";
|
||||||
import ForgetPwPage from "./Pages/ForgetPw";
|
import ForgetPwPage from "./Pages/ForgetPw";
|
||||||
import ResetPwPage from "./Pages/ResetPw";
|
import ResetPwPage from "./Pages/ResetPw";
|
||||||
import FilterPage from "./Pages/FilterPage";
|
import FilterPage from "./Pages/FilterPage";
|
||||||
@@ -20,7 +20,7 @@ function App() {
|
|||||||
<Route path="/" element={<AuthPage />}></Route>
|
<Route path="/" element={<AuthPage />}></Route>
|
||||||
<Route path="/course-form/:id" element={<PrivateRoute element={<CourseForm />} />} />
|
<Route path="/course-form/:id" element={<PrivateRoute element={<CourseForm />} />} />
|
||||||
<Route path="/Welcome" element={<PrivateRoute element={<WelcomeWithFilter />} />} />
|
<Route path="/Welcome" element={<PrivateRoute element={<WelcomeWithFilter />} />} />
|
||||||
<Route path="/Home" element={<HomePage />}></Route>
|
<Route path="/accounts" element={<Accounts />}></Route>
|
||||||
<Route path="/ForgetPw" element={<ForgetPwPage />}></Route>
|
<Route path="/ForgetPw" element={<ForgetPwPage />}></Route>
|
||||||
<Route path="/ResetPw/:token" element={<ResetPwPage />}></Route>
|
<Route path="/ResetPw/:token" element={<ResetPwPage />}></Route>
|
||||||
<Route path="/Filter" element={<PrivateRoute element={<FilterPage />} />} />
|
<Route path="/Filter" element={<PrivateRoute element={<FilterPage />} />} />
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import React, { useState, useEffect } from "react";
|
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 axios from "axios";
|
||||||
import { ToastContainer, toast } from "react-toastify";
|
import { ToastContainer, toast } from "react-toastify";
|
||||||
import "react-toastify/dist/ReactToastify.css";
|
import "react-toastify/dist/ReactToastify.css";
|
||||||
@@ -58,6 +58,7 @@ function HomePage(props) {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
|
<Navbar />
|
||||||
<ToastContainer />
|
<ToastContainer />
|
||||||
<div className="LoginPage">
|
<div className="LoginPage">
|
||||||
<Container className="HomePageContainer ProfileContainer">
|
<Container className="HomePageContainer ProfileContainer">
|
||||||
@@ -7,10 +7,12 @@ const Navbar = () => {
|
|||||||
return (
|
return (
|
||||||
<header className="navbar">
|
<header className="navbar">
|
||||||
<div className="navbar-container">
|
<div className="navbar-container">
|
||||||
<NavLink to="/Welcome">
|
{/* Appointment To Examiner text at the left */}
|
||||||
<FaUserCircle className="user-icon" />
|
<NavLink to="/Welcome" className="navbar-title">
|
||||||
Appointment To Examiner
|
Appointment To Examiner
|
||||||
</NavLink>
|
</NavLink>
|
||||||
|
|
||||||
|
{/* Consolidated buttons in the center */}
|
||||||
<div className="button-container">
|
<div className="button-container">
|
||||||
<NavLink to="/consolidated" className="consolidated-button">
|
<NavLink to="/consolidated" className="consolidated-button">
|
||||||
Faculty Consolidated
|
Faculty Consolidated
|
||||||
@@ -19,7 +21,11 @@ const Navbar = () => {
|
|||||||
Course Consolidated
|
Course Consolidated
|
||||||
</NavLink>
|
</NavLink>
|
||||||
</div>
|
</div>
|
||||||
<div></div>
|
|
||||||
|
{/* User icon at the right */}
|
||||||
|
<NavLink to="/accounts" className="user-icon-link">
|
||||||
|
<FaUserCircle className="user-icon" />
|
||||||
|
</NavLink>
|
||||||
</div>
|
</div>
|
||||||
</header>
|
</header>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -84,7 +84,7 @@ const WelcomeWithFilter = () => {
|
|||||||
// Default welcome content
|
// Default welcome content
|
||||||
<div className="welcome-content">
|
<div className="welcome-content">
|
||||||
<div className="welcome-message">
|
<div className="welcome-message">
|
||||||
<h1>Welcome</h1>
|
<h1>Appointment To Examiner</h1>
|
||||||
<p>You’re signed in</p>
|
<p>You’re signed in</p>
|
||||||
</div>
|
</div>
|
||||||
<div className="image-container">
|
<div className="image-container">
|
||||||
|
|||||||
Reference in New Issue
Block a user