Merge master to bootstrap #7

Merged
tokslaw merged 2 commits from master-bootstrap into master 2024-12-06 18:33:30 +00:00
16 changed files with 379 additions and 222 deletions
+17 -5
View File
@@ -1,14 +1,20 @@
import { Routes, Route } from 'react-router-dom';
// import './App.css';
import LoginPage from './views/LoginPage';
import siteLinks from './links/siteLinks';
import HomePage from './views/HomePage';
import SignupPage from './views/SignupPage';
import ForgetpwdPage from './views/ForgetpwdPage';
import UserExist from './component/authorization/UserExist';
import AuthLayout from './component/auth/AuthLayout';
import LoginPage from './views/LoginPage';
import siteLinks from './links/siteLinks';
import SignupPage from './views/SignupPage';
import ForgetpwdPage from './views/ForgetpwdPage';
import HomePage from './views/HomePage';
import ReportsPage from './views/ReportsPage'
import CommentsPage from './views/CommentsPage'
import ContactsPage from './views/ContactsPage'
import UserPage from './views/UserPage'
import CalendarPage from './views/CalendarPage'
import SettingsPage from './views/SettingsPage'
function App() {
@@ -27,6 +33,12 @@ function App() {
{/* protected routes */}
<Route element={<UserExist />}>
<Route path={siteLinks.dash} element={<HomePage />} />
<Route path={siteLinks.reports} element={<ReportsPage />} />
<Route path={siteLinks.comments} element={<CommentsPage />} />
<Route path={siteLinks.contacts} element={<ContactsPage />} />
<Route path={siteLinks.user} element={<UserPage />} />
<Route path={siteLinks.calendar} element={<CalendarPage />} />
<Route path={siteLinks.settings} element={<SettingsPage />} />
</Route>
</Routes>
</div>
+15
View File
@@ -0,0 +1,15 @@
import React from "react";
import BreadcrumbComBS from "../breadcrumb/BreadcrumbComBS";
export default function Calendar(){
return(
<>
<BreadcrumbComBS title='Calendar' paths={['Dashboard', 'Calendar']} />
<div className="row">
<div className="vh-100 col-12 flex align-items-center">Coming Soon</div>
</div>
</>
)
}
+15
View File
@@ -0,0 +1,15 @@
import React from "react";
import BreadcrumbComBS from "../breadcrumb/BreadcrumbComBS";
export default function Comments(){
return(
<>
<BreadcrumbComBS title='Comments' paths={['Dashboard', 'Comments']} />
<div className="row">
<div className="vh-100 col-12 flex align-items-center">Coming Soon</div>
</div>
</>
)
}
+15
View File
@@ -0,0 +1,15 @@
import React from "react";
import BreadcrumbComBS from "../breadcrumb/BreadcrumbComBS";
export default function Contacts(){
return(
<>
<BreadcrumbComBS title='Contacts' paths={['Dashboard', 'Contacts']} />
<div className="row">
<div className="vh-100 col-12 flex align-items-center">Coming Soon</div>
</div>
</>
)
}
+211 -209
View File
@@ -33,107 +33,109 @@ export default function UserHeader(){
</a>
</li>
</ul>
{/* ul className="navbar-nav nav-right ml-auto dropdown" */}
<ul className="navbar-nav nav-right ml-auto">
<li className="nav-item dropdown">
<a className="nav-link dropdown-toggle" href="javascript:void(0)" id="navbarDropdown2" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
{/* <li className="nav-item dropdown">
<a className="nav-link dropdown-toggle" href="#" id="navbarDropdown2" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i className="ti ti-email"></i>
</a>
{/* <div className="dropdown-menu extended animated fadeIn" aria-labelledby="navbarDropdown">*/}
{/* <ul>*/}
{/* <li className="dropdown-header bg-gradient p-4 text-white text-left">Messages*/}
{/* <label className="label label-info label-round">6</label>*/}
{/* <a href="#" className="float-right btn btn-square btn-inverse-light btn-xs m-0">*/}
{/* <span className="font-13"> Mark all as read</span></a>*/}
{/* </li>*/}
{/* <li className="dropdown-body">*/}
{/* <ul className="scrollbar scroll_dark max-h-240">*/}
{/* <li>*/}
{/* <a href="javascript:void(0)">*/}
{/* <div className="notification d-flex flex-row align-items-center">*/}
{/* <div className="notify-icon bg-img align-self-center">*/}
{/* <img className="img-fluid" src="assets/img/avtar/03.jpg" alt="user3" />*/}
{/* </div>*/}
{/* <div className="notify-message">*/}
{/* <p className="font-weight-bold">Brianing Leyon</p>*/}
{/* <small>You will sail along until you...</small>*/}
{/* </div>*/}
{/* </div>*/}
{/* </a>*/}
{/* </li>*/}
{/* <li>*/}
{/* <a href="javascript:void(0)">*/}
{/* <div className="notification d-flex flex-row align-items-center">*/}
{/* <div className="notify-icon bg-img align-self-center">*/}
{/* <img className="img-fluid" src="assets/img/avtar/01.jpg" alt="user" />*/}
{/* </div>*/}
{/* <div className="notify-message">*/}
{/* <p className="font-weight-bold">Jimmyimg Leyon</p>*/}
{/* <small>Okay</small>*/}
{/* </div>*/}
{/* </div>*/}
{/* </a>*/}
{/* </li>*/}
{/* <li>*/}
{/* <a href="javascript:void(0)">*/}
{/* <div className="notification d-flex flex-row align-items-center">*/}
{/* <div className="notify-icon bg-img align-self-center">*/}
{/* <img className="img-fluid" src="assets/img/avtar/02.jpg" alt="user2" />*/}
{/* </div>*/}
{/* <div className="notify-message">*/}
{/* <p className="font-weight-bold">Brainjon Leyon</p>*/}
{/* <small>So, make the decision...</small>*/}
{/* </div>*/}
{/* </div>*/}
{/* </a>*/}
{/* </li>*/}
{/* <li>*/}
{/* <a href="javascript:void(0)">*/}
{/* <div className="notification d-flex flex-row align-items-center">*/}
{/* <div className="notify-icon bg-img align-self-center">*/}
{/* <img className="img-fluid" src="assets/img/avtar/04.jpg" alt="user4" />*/}
{/* </div>*/}
{/* <div className="notify-message">*/}
{/* <p className="font-weight-bold">Smithmin Leyon</p>*/}
{/* <small>Thanks</small>*/}
{/* </div>*/}
{/* </div>*/}
{/* </a>*/}
{/* </li>*/}
{/* <li>*/}
{/* <a href="javascript:void(0)">*/}
{/* <div className="notification d-flex flex-row align-items-center">*/}
{/* <div className="notify-icon bg-img align-self-center">*/}
{/* <img className="img-fluid" src="assets/img/avtar/05.jpg" alt="user5" />*/}
{/* </div>*/}
{/* <div className="notify-message">*/}
{/* <p className="font-weight-bold">Jennyns Leyon</p>*/}
{/* <small>How are you</small>*/}
{/* </div>*/}
{/* </div>*/}
{/* </a>*/}
{/* </li>*/}
{/* <li>*/}
{/* <a href="javascript:void(0)">*/}
{/* <div className="notification d-flex flex-row align-items-center">*/}
{/* <div className="notify-icon bg-img align-self-center">*/}
{/* <img className="img-fluid" src="assets/img/avtar/06.jpg" alt="user6" />*/}
{/* </div>*/}
{/* <div className="notify-message">*/}
{/* <p className="font-weight-bold">Demian Leyon</p>*/}
{/* <small>I like your themes</small>*/}
{/* </div>*/}
{/* </div>*/}
{/* </a>*/}
{/* </li>*/}
{/* </ul>*/}
{/* </li>*/}
{/* <li className="dropdown-footer">*/}
{/* <a className="font-13" href="javascript:void(0)"> View All messages </a>*/}
{/* </li>*/}
{/* </ul>*/}
{/* </div>*/}
<div className="dropdown-menu extended animated fadeIn" aria-labelledby="navbarDropdown">
<ul>
<li className="dropdown-header bg-gradient p-4 text-white text-left">Messages
<label className="label label-info label-round">6</label>
<a href="#" className="float-right btn btn-square btn-inverse-light btn-xs m-0">
<span className="font-13"> Mark all as read</span></a>
</li>
<li className="dropdown-body">
<ul className="scrollbar scroll_dark max-h-240">
<li>
<a href="#">
<div className="notification d-flex flex-row align-items-center">
<div className="notify-icon bg-img align-self-center">
<img className="img-fluid" src="assets/img/avtar/03.jpg" alt="user3" />
</div>
<div className="notify-message">
<p className="font-weight-bold">Brianing Leyon</p>
<small>You will sail along until you...</small>
</div>
</div>
</a>
</li>
<li>
<a href="#">
<div className="notification d-flex flex-row align-items-center">
<div className="notify-icon bg-img align-self-center">
<img className="img-fluid" src="assets/img/avtar/01.jpg" alt="user" />
</div>
<div className="notify-message">
<p className="font-weight-bold">Jimmyimg Leyon</p>
<small>Okay</small>
</div>
</div>
</a>
</li>
<li>
<a href="#">
<div className="notification d-flex flex-row align-items-center">
<div className="notify-icon bg-img align-self-center">
<img className="img-fluid" src="assets/img/avtar/02.jpg" alt="user2" />
</div>
<div className="notify-message">
<p className="font-weight-bold">Brainjon Leyon</p>
<small>So, make the decision...</small>
</div>
</div>
</a>
</li>
<li>
<a href="#">
<div className="notification d-flex flex-row align-items-center">
<div className="notify-icon bg-img align-self-center">
<img className="img-fluid" src="assets/img/avtar/04.jpg" alt="user4" />
</div>
<div className="notify-message">
<p className="font-weight-bold">Smithmin Leyon</p>
<small>Thanks</small>
</div>
</div>
</a>
</li>
<li>
<a href="#">
<div className="notification d-flex flex-row align-items-center">
<div className="notify-icon bg-img align-self-center">
<img className="img-fluid" src="assets/img/avtar/05.jpg" alt="user5" />
</div>
<div className="notify-message">
<p className="font-weight-bold">Jennyns Leyon</p>
<small>How are you</small>
</div>
</div>
</a>
</li>
<li>
<a href="#">
<div className="notification d-flex flex-row align-items-center">
<div className="notify-icon bg-img align-self-center">
<img className="img-fluid" src="assets/img/avtar/06.jpg" alt="user6" />
</div>
<div className="notify-message">
<p className="font-weight-bold">Demian Leyon</p>
<small>I like your themes</small>
</div>
</div>
</a>
</li>
</ul>
</li>
<li className="dropdown-footer">
<a className="font-13" href="#"> View All messages </a>
</li>
</ul>
</div>
</li>
<li className="nav-item dropdown">
<li className="nav-item dropdown">
<a className="nav-link dropdown-toggle" href="#" id="navbarDropdown3" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i className="fe fe-bell"></i>
<span className="notify">
@@ -141,124 +143,124 @@ export default function UserHeader(){
<span className="dot"></span>
</span>
</a>
{/* <div className="dropdown-menu extended animated fadeIn" aria-labelledby="navbarDropdown">*/}
{/* <ul>*/}
{/* <li className="dropdown-header bg-gradient p-4 text-white text-left">Notifications*/}
{/* <a href="#" className="float-right btn btn-square btn-inverse-light btn-xs m-0">*/}
{/* <span className="font-13"> Clear all</span></a>*/}
{/* </li>*/}
{/* <li className="dropdown-body min-h-240 nicescroll">*/}
{/* <ul className="scrollbar scroll_dark max-h-240">*/}
{/* <li>*/}
{/* <a href="javascript:void(0)">*/}
{/* <div className="notification d-flex flex-row align-items-center">*/}
{/* <div className="notify-icon bg-img align-self-center">*/}
{/* <div className="bg-type bg-type-md">*/}
{/* <span>HY</span>*/}
{/* </div>*/}
{/* </div>*/}
{/* <div className="notify-message">*/}
{/* <p className="font-weight-bold">New registered user</p>*/}
{/* <small>Just now</small>*/}
{/* </div>*/}
{/* </div>*/}
{/* </a>*/}
{/* </li>*/}
{/* <li>*/}
{/* <a href="javascript:void(0)">*/}
{/* <div className="notification d-flex flex-row align-items-center">*/}
{/* <div className="notify-icon bg-img align-self-center">*/}
{/* <div className="bg-type bg-type-md bg-success">*/}
{/* <span>GM</span>*/}
{/* </div>*/}
{/* </div>*/}
{/* <div className="notify-message">*/}
{/* <p className="font-weight-bold">New invoice received</p>*/}
{/* <small>22 min</small>*/}
{/* </div>*/}
{/* </div>*/}
{/* </a>*/}
{/* </li>*/}
{/* <li>*/}
{/* <a href="javascript:void(0)">*/}
{/* <div className="notification d-flex flex-row align-items-center">*/}
{/* <div className="notify-icon bg-img align-self-center">*/}
{/* <div className="bg-type bg-type-md bg-danger">*/}
{/* <span>FR</span>*/}
{/* </div>*/}
{/* </div>*/}
{/* <div className="notify-message">*/}
{/* <p className="font-weight-bold">Server error report</p>*/}
{/* <small>7 min</small>*/}
{/* </div>*/}
{/* </div>*/}
{/* </a>*/}
{/* </li>*/}
{/* <li>*/}
{/* <a href="javascript:void(0)">*/}
{/* <div className="notification d-flex flex-row align-items-center">*/}
{/* <div className="notify-icon bg-img align-self-center">*/}
{/* <div className="bg-type bg-type-md bg-info">*/}
{/* <span>HT</span>*/}
{/* </div>*/}
{/* </div>*/}
{/* <div className="notify-message">*/}
{/* <p className="font-weight-bold">Database report</p>*/}
{/* <small>1 day</small>*/}
{/* </div>*/}
{/* </div>*/}
{/* </a>*/}
{/* </li>*/}
{/* <li>*/}
{/* <a href="javascript:void(0)">*/}
{/* <div className="notification d-flex flex-row align-items-center">*/}
{/* <div className="notify-icon bg-img align-self-center">*/}
{/* <div className="bg-type bg-type-md">*/}
{/* <span>DE</span>*/}
{/* </div>*/}
{/* </div>*/}
{/* <div className="notify-message">*/}
{/* <p className="font-weight-bold">Order confirmation</p>*/}
{/* <small>2 day</small>*/}
{/* </div>*/}
{/* </div>*/}
{/* </a>*/}
{/* </li>*/}
{/* </ul>*/}
{/* </li>*/}
{/* <li className="dropdown-footer">*/}
{/* <a className="font-13" href="javascript:void(0)"> View All Notifications*/}
{/* </a>*/}
{/* </li>*/}
{/* </ul>*/}
{/* </div>*/}
</li>
<li className="nav-item">
<div className="dropdown-menu extended animated fadeIn" aria-labelledby="navbarDropdown">
<ul>
<li className="dropdown-header bg-gradient p-4 text-white text-left">Notifications
<a href="#" className="float-right btn btn-square btn-inverse-light btn-xs m-0">
<span className="font-13"> Clear all</span></a>
</li>
<li className="dropdown-body min-h-240 nicescroll">
<ul className="scrollbar scroll_dark max-h-240">
<li>
<a href="#">
<div className="notification d-flex flex-row align-items-center">
<div className="notify-icon bg-img align-self-center">
<div className="bg-type bg-type-md">
<span>HY</span>
</div>
</div>
<div className="notify-message">
<p className="font-weight-bold">New registered user</p>
<small>Just now</small>
</div>
</div>
</a>
</li>
<li>
<a href="#">
<div className="notification d-flex flex-row align-items-center">
<div className="notify-icon bg-img align-self-center">
<div className="bg-type bg-type-md bg-success">
<span>GM</span>
</div>
</div>
<div className="notify-message">
<p className="font-weight-bold">New invoice received</p>
<small>22 min</small>
</div>
</div>
</a>
</li>
<li>
<a href="#">
<div className="notification d-flex flex-row align-items-center">
<div className="notify-icon bg-img align-self-center">
<div className="bg-type bg-type-md bg-danger">
<span>FR</span>
</div>
</div>
<div className="notify-message">
<p className="font-weight-bold">Server error report</p>
<small>7 min</small>
</div>
</div>
</a>
</li>
<li>
<a href="#">
<div className="notification d-flex flex-row align-items-center">
<div className="notify-icon bg-img align-self-center">
<div className="bg-type bg-type-md bg-info">
<span>HT</span>
</div>
</div>
<div className="notify-message">
<p className="font-weight-bold">Database report</p>
<small>1 day</small>
</div>
</div>
</a>
</li>
<li>
<a href="#">
<div className="notification d-flex flex-row align-items-center">
<div className="notify-icon bg-img align-self-center">
<div className="bg-type bg-type-md">
<span>DE</span>
</div>
</div>
<div className="notify-message">
<p className="font-weight-bold">Order confirmation</p>
<small>2 day</small>
</div>
</div>
</a>
</li>
</ul>
</li>
<li className="dropdown-footer">
<a className="font-13" href="#"> View All Notifications
</a>
</li>
</ul>
</div>
</li>
<li className="nav-item">
<a className="nav-link search" href="#">
<i className="ti ti-search"></i>
</a>
{/* <div className="search-wrapper">*/}
{/* <div className="close-btn">*/}
{/* <i className="ti ti-close"></i>*/}
{/* </div>*/}
{/* <div className="search-content">*/}
{/* <form>*/}
{/* <div className="form-group">*/}
{/* <i className="ti ti-search magnifier"></i>*/}
{/* <input type="text" className="form-control autocomplete" placeholder="Search Here"*/}
{/* id="autocomplete-ajax" autoFocus="autofocus" />*/}
{/* </div>*/}
{/* </form>*/}
{/* </div>*/}
{/* </div>*/}
</li>
<li className="nav-item dropdown user-profile">
<a href="#" className="nav-link dropdown-toggle " id="navbarDropdown4"
role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<div className="search-wrapper">
<div className="close-btn">
<i className="ti ti-close"></i>
</div>
<div className="search-content">
<form>
<div className="form-group">
<i className="ti ti-search magnifier"></i>
<input type="text" className="form-control autocomplete" placeholder="Search Here"
id="autocomplete-ajax" autoFocus="autofocus" />
</div>
</form>
</div>
</div>
</li> */}
<li className="nav-item user-profile dropdown">
<a href="#" className="nav-link dropdown-toggle" role="button" id="dropdownMenuLink" data-bs-toggle="dropdown" aria-expanded="false">
<img src={getImage('avtar/02.jpg')} alt="avtar-img" />
<span className="bg-success user-status"></span>
</a>
<div className="dropdown-menu animated fadeIn" aria-labelledby="navbarDropdown">
<div className="dropdown-menu animated fadeIn" aria-labelledby="dropdownMenuLink">
<div className="bg-gradient px-4 py-3">
<div className="d-flex align-items-center justify-content-between">
<div className="mr-1">
+7 -8
View File
@@ -21,14 +21,13 @@ export default function UserMenu() {
</Link>
<ul id="collapseOne" className="collapse show" aria-labelledby="headingOne" data-bs-parent="#sidebarNav">
<li className={`${pathname == siteLinks.dash ? 'active' : ''}`}><Link to={siteLinks.dash}>Home</Link></li>
<li className={`${pathname == siteLinks.error ? 'active' : ''}`}><Link to='#'>Calendar</Link></li>
<li className={`${pathname == siteLinks.error ? 'active' : ''}`}><Link to='#'>Contacts</Link></li>
<li className={`${pathname == siteLinks.error ? 'active' : ''}`}><Link to='#'>Comments</Link></li>
<li className={`${pathname == siteLinks.calendar ? 'active' : ''}`}><Link to={siteLinks.calendar}>Calendar</Link></li>
<li className={`${pathname == siteLinks.contacts ? 'active' : ''}`}><Link to={siteLinks.contacts}>Contacts</Link></li>
<li className={`${pathname == siteLinks.comments ? 'active' : ''}`}><Link to={siteLinks.comments}>Comments</Link></li>
</ul>
</li>
<li className={`${pathname == siteLinks.error ? 'active' : ''}`}>
<Link href="/dash" aria-expanded="false"><i className="nav-icon ti ti-comment">
<li className={`${pathname == siteLinks.reports ? 'active' : ''}`}>
<Link to={siteLinks.reports} aria-expanded="false"><i className="nav-icon ti ti-comment">
</i><span className="nav-title">Reports</span>
</Link>
</li>
@@ -41,8 +40,8 @@ export default function UserMenu() {
</div>
</Link>
<ul id="collapseTwo" className="collapse" aria-labelledby="headingTwo" data-bs-parent="#sidebarNav">
<li className={`${pathname == siteLinks.error ? 'active' : ''}`}><Link to={siteLinks.dash}>Users</Link></li>
<li className={`${pathname == siteLinks.error ? 'active' : ''}`}><Link to={siteLinks.dash}>Settings</Link></li>
<li className={`${pathname == siteLinks.user ? 'active' : ''}`}><Link to={siteLinks.user}>Users</Link></li>
<li className={`${pathname == siteLinks.settings ? 'active' : ''}`}><Link to={siteLinks.settings}>Settings</Link></li>
</ul>
</li>
+15
View File
@@ -0,0 +1,15 @@
import React from "react";
import BreadcrumbComBS from "../breadcrumb/BreadcrumbComBS";
export default function Reports(){
return(
<>
<BreadcrumbComBS title='Reports' paths={['Dashboard', 'Reports']} />
<div className="row">
<div className="vh-100 col-12 flex align-items-center">Coming Soon</div>
</div>
</>
)
}
+15
View File
@@ -0,0 +1,15 @@
import React from "react";
import BreadcrumbComBS from "../breadcrumb/BreadcrumbComBS";
export default function Settings(){
return(
<>
<BreadcrumbComBS title='Settings' paths={['Dashboard', 'Settings']} />
<div className="row">
<div className="vh-100 col-12 flex align-items-center">Coming Soon</div>
</div>
</>
)
}
+15
View File
@@ -0,0 +1,15 @@
import React from "react";
import BreadcrumbComBS from "../breadcrumb/BreadcrumbComBS";
export default function Users(){
return(
<>
<BreadcrumbComBS title='Users' paths={['Dashboard', 'Users']} />
<div className="row">
<div className="vh-100 col-12 flex align-items-center">Coming Soon</div>
</div>
</>
)
}
+6
View File
@@ -2,6 +2,12 @@ const siteLinks = {
error: '*',
home: '/',
dash: '/dash',
contacts: '/contacts',
comments: '/comments',
reports: '/reports',
user: '/user',
calendar: '/calendar',
settings: '/settings',
login: '/auth/login',
signup: '/auth/signup',
forgetpwd: '/auth/forgetpwd'
+8
View File
@@ -0,0 +1,8 @@
import React from 'react'
import Calendar from '../component/calendar/Calendar'
export default function CalendarPage() {
return (
<Calendar />
)
}
+8
View File
@@ -0,0 +1,8 @@
import React from 'react'
import Comments from '../component/comments/Comments'
export default function CommentsPage() {
return (
<Comments />
)
}
+8
View File
@@ -0,0 +1,8 @@
import React from 'react'
import Contacts from '../component/contacts/Contacts'
export default function ContactsPage() {
return (
<Contacts />
)
}
+8
View File
@@ -0,0 +1,8 @@
import React from 'react'
import Reports from '../component/reports/Reports'
export default function ReportsPage() {
return (
<Reports />
)
}
+8
View File
@@ -0,0 +1,8 @@
import React from 'react'
import Settings from '../component/settings/Settings'
export default function SettingsPage() {
return (
<Settings />
)
}
+8
View File
@@ -0,0 +1,8 @@
import React from 'react'
import Users from '../component/users/Users'
export default function UserPage() {
return (
<Users />
)
}