diff --git a/login-frontend/src/App.css b/login-frontend/src/App.css
deleted file mode 100644
index 1a8c21d..0000000
--- a/login-frontend/src/App.css
+++ /dev/null
@@ -1,38 +0,0 @@
-/* .App {
-  text-align: center;
-}
-
-.App-logo {
-  height: 40vmin;
-  pointer-events: none;
-}
-
-@media (prefers-reduced-motion: no-preference) {
-  .App-logo {
-    animation: App-logo-spin infinite 20s linear;
-  }
-}
-
-.App-header {
-  background-color: #282c34;
-  min-height: 100vh;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  font-size: calc(10px + 2vmin);
-  color: white;
-}
-
-.App-link {
-  color: #61dafb;
-}
-
-@keyframes App-logo-spin {
-  from {
-    transform: rotate(0deg);
-  }
-  to {
-    transform: rotate(360deg);
-  }
-} */
diff --git a/login-frontend/src/App.js b/login-frontend/src/App.js
index 5a615c3..0a38997 100644
--- a/login-frontend/src/App.js
+++ b/login-frontend/src/App.js
@@ -1,14 +1,15 @@
 import React, { useState } from 'react';
-import { BrowserRouter as Router, Routes, Route, Link } from 'react-router-dom';
+import { BrowserRouter as Router, Routes, Route} from 'react-router-dom';
 
-import './App.css';
 import '../node_modules/bootstrap/dist/css/bootstrap.min.css';
 
 import FirstPage from './pages/FirstPage';
 import AuthPage from './pages/authPage';
-import StudentDashBoard from './pages/StudentDashboard';
-import Course from './components/coursePage/Course';
-import Course1 from './components/coursePage/Course1';
+import StudentDashBoard from './pages/dashboardPage/StudentDashboard';
+import Course from './pages/coursePage/Course';
+import Course1 from './pages/coursePage/Course1';
+import CourseRegistration from './pages/coursePage/CourseRegistration';
+import TeacherDashBoard from './pages/dashboardPage/TeacherDashBoard';
 
 function App() {
   const [username, setUsername] = useState('');
@@ -27,19 +28,23 @@ function App() {
     const data = await response.text();
     setMessage(data);
   };
-
   return (
     <Router>
       <Routes>
         <Route path='/' element={<FirstPage />} />
-        <Route path='/teacher' element={<AuthPage />} />
-        <Route path='/student' element={<AuthPage />} />
-        <Route path='/admin' element={<AuthPage />} />
-        <Route path='/teacher/dashboard' element={< StudentDashBoard/>} />
+        <Route path='/teacher/login' element={<AuthPage />} />
+        <Route path='/student/login' element={<AuthPage />} />
+        <Route path='/admin/login' element={<AuthPage />} />
+        <Route path='/teacher/changepassword' element={<AuthPage />} />
+        <Route path='/student/changepassword' element={<AuthPage />} />
+        <Route path='/admin/changepassword' element={<AuthPage />} />
+
+        <Route path='/teacher/dashboard' element={< TeacherDashBoard/>} />
         <Route path='/student/dashboard' element={< StudentDashBoard/>} />
         <Route path='/admin/dashboard' element={< StudentDashBoard/>} />
         <Route path='/course' element={<Course />} />
         <Route path='/course1' element={<Course1 />} />
+        <Route path='/courseRegistration' element={<CourseRegistration />} />
       </Routes>
     </Router>
   );
diff --git a/login-frontend/src/components/auth/changePassword.js b/login-frontend/src/components/auth/changePassword.js
new file mode 100644
index 0000000..bab67eb
--- /dev/null
+++ b/login-frontend/src/components/auth/changePassword.js
@@ -0,0 +1,87 @@
+import React, { useState } from 'react';
+import { useAuth } from '../../hooks/useAuth'; // Assuming useAuth hook exists
+import Alert from '@mui/material/Alert'
+import { useNavigate } from 'react-router-dom';
+function ChangePassword(props) {
+  const [email, setEmail] = useState('');
+  const [password, setPassword] = useState('');
+  const [retypepass, setRetypepass] = useState('');
+  const [errorMsg, setErrorMsg] = useState(null);
+  const [successMsg, setSuccessMsg] = useState(null);
+  const auth = useAuth();
+  const navigate = useNavigate();
+  const handleLogin = async (event) => {
+    event.preventDefault();
+    try {
+        const response = await auth.login(email, password);
+        console.log("response data: ", response);
+        if (response.message === "Login successful") {
+          setErrorMsg(null);
+          setSuccessMsg("Login successful!");
+          navigate('/student/dashboard');
+        } else {
+          setErrorMsg(response.message);
+          setSuccessMsg(null);
+        }
+    } catch (error) {
+        setErrorMsg(error?.message || "Error");
+        console.error('Login error:', error.message);
+    }
+};
+  return (
+    <div className='login' style={{marginTop: '5vh'}}>
+    {errorMsg && <Alert severity="error">{errorMsg}</Alert>}
+    {successMsg && <Alert severity="success">{successMsg}</Alert>}
+      <form className='was-validated' onSubmit={handleLogin}>
+        <label htmlFor="email">
+          <input
+            className="form-control"
+            style={{ width: '40vh', height: '6vh'}} 
+            type="email"
+            placeholder="Enter email address"
+            value={email}
+            onChange={(e) => setEmail(e.target.value)}
+            id="email" 
+            required
+          />
+          <div className="valid-feedback">Valid</div>
+          <div className="invalid-feedback">Please fill this field</div>
+        </label>
+        <label htmlFor="password">
+          <input
+            className="form-control"
+            style={{ width: '40vh', height: '6vh'}}
+            type="password"
+            placeholder="New password"
+            value={password}
+            onChange={(e) => setPassword(e.target.value)}
+            id="password" 
+            required
+          />
+          <div className="valid-feedback">Valid</div>
+          <div className="invalid-feedback">Please fill this field</div>
+        </label>
+        <label htmlFor="password">
+          <input
+            className="form-control"
+            style={{ width: '40vh', height: '6vh'}}
+            type="password"
+            placeholder="Re-type new password"
+            value={retypepass}
+            onChange={(e) => setRetypepass(e.target.value)}
+            id="password" 
+            required
+          />
+          <div className="valid-feedback">Valid</div>
+          <div className="invalid-feedback">Please fill this field</div>
+        </label>
+        <button style={{padding: '5%', width: '20vh', fontWeight: 'bold', color: 'bisque', margin: '2vh'}} className="btn btn-block bg-primary" type="submit" id="login">
+          Change Password
+        </button>
+      </form>
+    </div>
+  );
+}
+
+export default ChangePassword;
+
diff --git a/login-frontend/src/components/auth/login.js b/login-frontend/src/components/auth/login.js
index eda0f58..481c708 100644
--- a/login-frontend/src/components/auth/login.js
+++ b/login-frontend/src/components/auth/login.js
@@ -1,7 +1,6 @@
 import React, { useState } from 'react';
 import { useAuth } from '../../hooks/useAuth'; // Assuming useAuth hook exists
 import Alert from '@mui/material/Alert'
-import { BrowserRouter as Router, Routes, Route, Link } from 'react-router-dom';
 import { useNavigate } from 'react-router-dom';
 function Login(props) {
   const [email, setEmail] = useState('');
@@ -31,10 +30,6 @@ function Login(props) {
     }
 };
 
-  const handleClickChange = () => {
-    props.handleViewChange('Register');
-  };
-
   return (
     <div className='login' style={{marginTop: '5vh'}}>
     {errorMsg && <Alert severity="error">{errorMsg}</Alert>}
@@ -43,12 +38,12 @@ function Login(props) {
         <label htmlFor="email">
           <input
             className="form-control"
-            style={{ width: '40vh', height: '6vh'}} // Use object style syntax for consistency
+            style={{ width: '40vh', height: '6vh'}}
             type="email"
             placeholder="Enter email address"
             value={email}
             onChange={(e) => setEmail(e.target.value)}
-            id="email" // Add ID for proper label association
+            id="email" 
             required
           />
           <div className="valid-feedback">Valid</div>
@@ -57,12 +52,12 @@ function Login(props) {
         <label htmlFor="password">
           <input
             className="form-control"
-            style={{ width: '40vh', height: '6vh'}} // Use object style syntax for consistency
+            style={{ width: '40vh', height: '6vh'}} 
             type="password"
             placeholder="Enter password"
             value={password}
             onChange={(e) => setPassword(e.target.value)}
-            id="password" // Add ID for proper label association
+            id="password" 
             required
           />
           <div className="valid-feedback">Valid</div>
@@ -72,12 +67,6 @@ function Login(props) {
           Login
         </button>
       </form>
-      <p>or doesn't have an account?</p>
-      <button
-        className="btn btn-block bg-success" style={{padding: '5%', width: '30vh', fontWeight: 'bold', color: 'bisque', margin: '2vh'}} onClick={handleClickChange}
-      >
-        Register
-      </button>
     </div>
   );
 }
diff --git a/login-frontend/src/components/auth/register.js b/login-frontend/src/components/auth/register.js
deleted file mode 100644
index de9feb8..0000000
--- a/login-frontend/src/components/auth/register.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import React, { useState } from 'react';
-import { useAuth } from '../../hooks/useAuth';
-
-function Register(props) {
-  const [name, setName] = useState('');
-  const [email, setEmail] = useState('');
-  const [password, setPassword] = useState('');
-  const auth = useAuth();
-
-  const handleRegister = async (event) => {
-    event.preventDefault();
-    auth.register(name, email, password);
-  };
-  const handleClickChange = () => {
-    props.handleViewChange('Login');
-  }
-
-  return (
-    <div className='register'>
-      <form onSubmit={handleRegister}>
-        <label>
-          <input type="text" placeholder="Enter Username" value={name} onChange={(e) => setName(e.target.value)} required />
-        </label>
-        <label>
-          <input type="email" placeholder="Enter email address" value={email} onChange={(e) => setEmail(e.target.value)} required />
-        </label>
-        <label>
-          <input type="password" placeholder="Enter password" value={password} onChange={(e) => setPassword(e.target.value)} required />
-        </label>
-        <button type="submit">Register</button>      
-      </form>
-      <p>or already have an ACCOUNT?</p>
-      <button id="change" onClick={handleClickChange}>Sign in</button>
-    </div>
-  );
-}
-
-export default Register;
diff --git a/login-frontend/src/components/dashboard/lessonPlan.js b/login-frontend/src/components/dashboard/lessonPlan.js
new file mode 100644
index 0000000..b15d1ba
--- /dev/null
+++ b/login-frontend/src/components/dashboard/lessonPlan.js
@@ -0,0 +1,18 @@
+import React from 'react'; // Use React for functional components
+import '../../../node_modules/bootstrap/dist/css/bootstrap.min.css';
+function SubjectSchedule(props){
+    return(
+      <>
+        <nav>
+          <div className="navigation long_navigation" style={{width: '100%', borderTop: '3px solid blue'}}>
+            <h3
+            >
+                COURSE REGISTRATION
+            </h3>
+          </div>
+        </nav>
+        <div className='subjectBox' style={{width: '20vh'}}></div>
+      </>
+    )
+}
+export default SubjectSchedule;
\ No newline at end of file
diff --git a/login-frontend/src/components/DashBoard/studentInfo.js b/login-frontend/src/components/dashboard/studentInfo.js
similarity index 97%
rename from login-frontend/src/components/DashBoard/studentInfo.js
rename to login-frontend/src/components/dashboard/studentInfo.js
index 72f57e8..2a2376a 100644
--- a/login-frontend/src/components/DashBoard/studentInfo.js
+++ b/login-frontend/src/components/dashboard/studentInfo.js
@@ -25,7 +25,7 @@ function StudentInfo(props) {
         </div>
         <div className="data-box">
           <p style={{ fontWeight: 'bold' }}>#Class</p>
-          <p>SV000000</p>
+          <p>None</p>
           <p style={{ fontWeight: 'bold' }}>#Major</p>
           <p>None</p>
           <p style={{ fontWeight: 'bold' }}>#Faculty</p>
@@ -33,7 +33,7 @@ function StudentInfo(props) {
         </div>
         <div className="data-box">
           <p style={{ fontWeight: 'bold' }}>#Identity Card Number</p>
-          <p>SV000000</p>
+          <p>None</p>
           <p style={{ fontWeight: 'bold' }}>#Date of issue of identity card</p>
           <p>None</p>
           <p style={{ fontWeight: 'bold' }}>#Place of issue of identity card</p>
diff --git a/login-frontend/src/components/DashBoard/studentTraining.js b/login-frontend/src/components/dashboard/studentTraining.js
similarity index 100%
rename from login-frontend/src/components/DashBoard/studentTraining.js
rename to login-frontend/src/components/dashboard/studentTraining.js
diff --git a/login-frontend/src/components/dashboard/subjectSchedule.js b/login-frontend/src/components/dashboard/subjectSchedule.js
new file mode 100644
index 0000000..a883d87
--- /dev/null
+++ b/login-frontend/src/components/dashboard/subjectSchedule.js
@@ -0,0 +1,18 @@
+import React from 'react'; // Use React for functional components
+import '../../../node_modules/bootstrap/dist/css/bootstrap.min.css';
+function SubjectSchedule(props){
+    return(
+      <>
+        <nav>
+          <div className="navigation long_navigation" style={{width: '100%', borderTop: '3px solid blue'}}>
+            <h3
+            >
+              DASHBOARD
+            </h3>
+          </div>
+        </nav>
+        <div className='subjectBox' style={{width: '20vh'}}></div>
+      </>
+    )
+}
+export default SubjectSchedule;
\ No newline at end of file
diff --git a/login-frontend/src/components/dashboard/teacherInfo.js b/login-frontend/src/components/dashboard/teacherInfo.js
new file mode 100644
index 0000000..75a7885
--- /dev/null
+++ b/login-frontend/src/components/dashboard/teacherInfo.js
@@ -0,0 +1,78 @@
+import React from 'react'; // Use React for functional components
+import '../../../node_modules/bootstrap/dist/css/bootstrap.min.css';
+function StudentInfo(props) {
+  return (
+    <>
+      <nav>
+        <div className="navigation">
+          <a className={'active top_navbar'}>
+            Teacher Information
+          </a>
+        </div>
+      </nav>
+      <div style={{ padding: '2vh' }}>
+        <i style={{ fontWeight: 'bold' }}>Last updated time: dd/mm/yyyy realtime</i>
+      </div>
+      <div className="smallbox">
+        <p>Personal Information</p>
+      </div>
+      <div className="data-container" style={{ display: 'flex' }}> {/* Combined styles */}
+        <div className="data-box" style={{ marginLeft: '4vh' }}>
+          <div style={{ textAlign: 'center' }}>
+            <i class="fa-regular fa-id-badge fa-8x"></i>
+          </div>
+          <p style={{ fontWeight: 'bold' }}>
+            Last profile photo update time: ___
+          </p>
+        </div>
+        <div className="data-box col-3x">
+          <p style={{ fontWeight: 'bold' }}>#Full Name</p>
+          <p>SV000000</p>
+          <p style={{ fontWeight: 'bold' }}>#Teacher ID</p>
+          <p>None</p>
+          <p style={{ fontWeight: 'bold' }}>#Sex</p>
+          <p>None</p>
+        </div>
+        <div className="data-box">
+          <p style={{ fontWeight: 'bold' }}>#Class</p>
+          <p>None</p>
+          <p style={{ fontWeight: 'bold' }}>#Degree</p>
+          <p>None</p>
+          <p style={{ fontWeight: 'bold' }}>#Faculty</p>
+          <p>None</p>
+        </div>
+        <div className="data-box">
+          <p style={{ fontWeight: 'bold' }}>#Identity Card Number</p>
+          <p>None</p>
+          <p style={{ fontWeight: 'bold' }}>#Date of issue of identity card</p>
+          <p>None</p>
+          <p style={{ fontWeight: 'bold' }}>#Place of issue of identity card</p>
+          <p>None</p>
+        </div>
+      </div>
+      <div className="smallbox">
+        <p>Address Information</p>
+      </div>
+      <div className="data-container" style={{ display: 'flex' }}>
+        <div className="data-box" style={{ marginLeft: '4vh' }}>
+          <p style={{ fontWeight: 'bold' }}>#Address</p>
+          <p>None</p>
+        </div>
+        <div className="data-box">
+          <p style={{ fontWeight: 'bold' }}>#Telephone Number</p>
+          <p>None</p>
+        </div>
+        <div className="data-box">
+          <p style={{ fontWeight: 'bold' }}>#University Email</p>
+          <p>None</p>
+        </div>
+        <div className="data-box">
+          <p style={{ fontWeight: 'bold' }}>#Other Email</p>
+          <p>None</p>
+        </div>
+      </div>
+    </>
+  );
+}
+
+export default StudentInfo;
diff --git a/login-frontend/src/components/header_footer/FirstFooter.js b/login-frontend/src/components/header_footer/FirstFooter.js
index aa02d1f..88f9891 100644
--- a/login-frontend/src/components/header_footer/FirstFooter.js
+++ b/login-frontend/src/components/header_footer/FirstFooter.js
@@ -6,7 +6,7 @@ import '../../../node_modules/bootstrap/dist/css/bootstrap.min.css';
 function FirstFooter() {
   return (
     <>
-    <div style={{ marginTop: '0%', height: '100%', backgroundColor: '#0b3942', display: 'flex', textAlign: 'center' }}>
+    <footer style={{ marginTop: '0%', height: '100%', backgroundColor: '#0b3942', display: 'flex', textAlign: 'center' }}>
         <div style={{ marginLeft: '8%', width: '12%' }}>
           <div style={{ marginTop: '30%', marginRight: '30%', marginLeft: '30%', width: '40%', height: '40%', backgroundColor: 'blueviolet', borderRadius: '50%' }}>
             <i class="fas fa-solid fa-phone fa-2x" style={{ marginTop: '25%', color: 'white' }}></i>
@@ -59,7 +59,7 @@ function FirstFooter() {
             Copyright &copy; 2024
           </p>
         </div>
-    </div>
+    </footer>
     </>
   );
 }
diff --git a/login-frontend/src/components/header_footer/FirstHeader.js b/login-frontend/src/components/header_footer/FirstHeader.js
index 334897c..3b570ea 100644
--- a/login-frontend/src/components/header_footer/FirstHeader.js
+++ b/login-frontend/src/components/header_footer/FirstHeader.js
@@ -22,17 +22,17 @@ function FirstHeader() {
     <>
       <Navbar style={{ display: 'flex' }}>
         <img style={{ width: '20vh', marginLeft: '3vh' }} src={'https://i.ibb.co/CMwkBmw/lSgDz8N.png'} alt="logo" />
-        <Link to={'/teacher'} style={{ marginLeft: '5vh', color: 'black', textDecorationLine: 'none' }}>
-          <h4 style={{width:'15vh'}}>GIẢNG VIÊN</h4>
+        <Link to={'/teacher/login'} style={{ marginLeft: '5vh', color: 'black', textDecorationLine: 'none' }}>
+          <h4 style={{marginLeft: '5vh', marginRight: '5vh', width:'15vh', textAlign: 'center' }}>TEACHER</h4>
         </Link>
-        <Link to={'/student'} style={{ color: 'black', textDecorationLine: 'none' }}>
-          <h4 style={{width:'15vh'}}>SINH VIÊN</h4>
+        <Link to={'/student/login'} style={{ color: 'black', textDecorationLine: 'none' }}>
+          <h4 style={{marginLeft: '5vh', marginRight: '5vh', width:'15vh', textAlign: 'center' }}>STUDENT</h4>
         </Link>
-        <Link to={'/admin'} style={{ color: 'black', textDecorationLine: 'none' }}>
-          <h4 style={{width:'15vh'}}>QUẢN LÝ</h4>
+        <Link to={'/admin/login'} style={{ color: 'black', textDecorationLine: 'none' }}>
+          <h4 style={{marginLeft: '5vh', marginRight: '5vh', width:'15vh', textAlign: 'center' }}>ADMIN</h4>
         </Link>
-        <div style={{ marginLeft: '40vh', width: '10%' }}>
-          <Dropdown className="ms-2 me-2">
+        <div style={{ marginLeft: '35%', width: '10%' }}>
+          <Dropdown>
             <Dropdown.Toggle
               variant="light"
               id="dropdown-notifications"
@@ -49,24 +49,19 @@ function FirstHeader() {
                   alignItems: "center"
                 }}
               >
-                <StyledBadge className="me-2" badgeContent={notifications.length} color="primary">
+                <StyledBadge className="me-3" badgeContent={notifications.length} color="primary">
                   <NotificationsIcon color="action" />
                 </StyledBadge>
-                Thông báo
+                Notifications
               </span>
             </Dropdown.Toggle>
             <Dropdown.Menu className="py-0" align="end" style={{ color: 'black', fontSize: 16, fontFamily: 'Inter', fontWeight: '400', wordWrap: 'break-word', right: 'auto' }}>
-              {/* <Dropdown.Header>Notifications</Dropdown.Header> */}
               {notifications.map((notification, index) => (
                 <Dropdown.Item key={index}>{notification}</Dropdown.Item>
               ))}
               {notifications.length === 0 && (
                 <Dropdown.Item disabled>No notifications</Dropdown.Item>
               )}
-              {/* <Dropdown.Divider />
-              <Dropdown.Item onClick={handleClearNotifications}>
-                Clear Notifications
-              </Dropdown.Item> */}
             </Dropdown.Menu>
           </Dropdown>
         </div>
diff --git a/login-frontend/src/components/header_footer/Footer.js b/login-frontend/src/components/header_footer/Footer.js
index e6cb36a..c493842 100644
--- a/login-frontend/src/components/header_footer/Footer.js
+++ b/login-frontend/src/components/header_footer/Footer.js
@@ -5,14 +5,14 @@ import { BrowserRouter as Router, Routes, Route, Link } from 'react-router-dom';
 function Footer() {
   return (
     <>
-      <div className="text-center foot">
+      <footer className="text-center foot">
         <p style={{ paddingTop: '2vh', margin: 0 }}>
           Copyright &copy; 2024 | All rights reserved
         </p>
         <p style={{ padding: '1vh', margin: 0 }}>
           Mọi thắc mắc vui lòng liên hệ email: info@mut.edu.vn
         </p>
-      </div>
+      </footer>
     </>
   );
 }
diff --git a/login-frontend/src/components/header_footer/Header.js b/login-frontend/src/components/header_footer/StudentHeader.js
similarity index 86%
rename from login-frontend/src/components/header_footer/Header.js
rename to login-frontend/src/components/header_footer/StudentHeader.js
index 43df0e1..a54a915 100644
--- a/login-frontend/src/components/header_footer/Header.js
+++ b/login-frontend/src/components/header_footer/StudentHeader.js
@@ -4,10 +4,10 @@ import { BrowserRouter as Router, Routes, Route, Link } from 'react-router-dom';
 import { Navbar, Nav, Form, Button, Row, Col } from "react-bootstrap";
 import NavDropdown from 'react-bootstrap/NavDropdown';
 
-function Header() {
+function StudentHeader() {
   return (
     <>
-      <Navbar expand="lg">
+      <Navbar expand="lg" style={{ borderBlockEnd: '1px solid' }}>
         <img style={{ width: '15%' }} src={'https://i.ibb.co/CMwkBmw/lSgDz8N.png'} alt="logo" />
         {/*<Navbar.Toggle aria-controls="basic-navbar-nav" />*/}
         <Navbar.Collapse id="basic-navbar-nav" style={{ marginLeft: '5%' }}>
@@ -15,7 +15,7 @@ function Header() {
             <NavDropdown title="Các khóa học" id="basic-nav-dropdown" style={{ fontSize: '1.5em' }}>
               <NavDropdown.Item href="/course1">Khóa học của tôi</NavDropdown.Item>
             </NavDropdown>
-            <Nav.Link href="/course3" style={{ fontSize: '1.5em' }}>Đăng ký môn học</Nav.Link>
+            <Nav.Link href="/courseRegistration" style={{ fontSize: '1.5em' }}>Đăng ký môn học</Nav.Link>
           </Nav>
         </Navbar.Collapse>
         <div>
@@ -34,4 +34,4 @@ function Header() {
   );
 }
 
-export default Header;
\ No newline at end of file
+export default StudentHeader;
\ No newline at end of file
diff --git a/login-frontend/src/components/header_footer/TeacherHeader.js b/login-frontend/src/components/header_footer/TeacherHeader.js
new file mode 100644
index 0000000..cae5a62
--- /dev/null
+++ b/login-frontend/src/components/header_footer/TeacherHeader.js
@@ -0,0 +1,28 @@
+import React, { useState, useEffect } from 'react';
+import axios from 'axios';
+import { BrowserRouter as Router, Routes, Route, Link } from 'react-router-dom';
+import { Navbar, Nav, Form, Button, Row, Col } from "react-bootstrap";
+import NavDropdown from 'react-bootstrap/NavDropdown';
+
+function TeacherHeader() {
+  return (
+    <>
+      <Navbar expand="lg" style={{ borderBlockEnd: '1px solid' }}>
+        <img style={{ width: '15%' }} src={'https://i.ibb.co/CMwkBmw/lSgDz8N.png'} alt="logo" />
+        <div style={{ marginLeft: '55%' }}>
+          <h4 style={{ marginTop: '0.5rem' }}>NGUYEN VAN B - MSGV</h4>
+        </div>
+        <Button style={{ marginLeft: '3%', color: 'black', backgroundColor: 'white', border: 'none' }}>
+          <div style={{ marginLeft: '30%', marginRight: '30%', backgroundColor: 'blue', borderRadius: '50%' }}>
+            <svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+              <path d="M14 5L12.59 6.41L14.17 8H6V10H14.17L12.59 11.58L14 13L18 9L14 5ZM2 2H9V0H2C0.9 0 0 0.9 0 2V16C0 17.1 0.9 18 2 18H9V16H2V2Z" fill="white" />
+            </svg>
+          </div>
+          <h6>Đăng xuất</h6>
+        </Button>
+      </Navbar>
+    </>
+  );
+}
+
+export default TeacherHeader;
\ No newline at end of file
diff --git a/login-frontend/src/context/authContext.js b/login-frontend/src/context/authContext.js
index 25aabd1..dad336d 100644
--- a/login-frontend/src/context/authContext.js
+++ b/login-frontend/src/context/authContext.js
@@ -30,7 +30,5 @@ export function AuthProvider({ children }) {
   };
 
   const value = { user, login, register };
-  console.log("value after set ", value)
-
   return <AuthContext.Provider value={value}>{children}</AuthContext.Provider>;
 }
diff --git a/login-frontend/src/pages/authPage.js b/login-frontend/src/pages/authPage.js
index de937ee..141a14b 100644
--- a/login-frontend/src/pages/authPage.js
+++ b/login-frontend/src/pages/authPage.js
@@ -1,18 +1,32 @@
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import { AuthProvider } from '../context/authContext';
 import Login from '../components/auth/login';
-import Register from '../components/auth/register';
+import ChangePassword from './../components/auth/changePassword';
 
 const authBG = "https://i.ibb.co/9YFh3Tn/lhuEjVn.jpg";
 const logo = "https://i.ibb.co/CMwkBmw/lSgDz8N.png";
 
 function App() {
-  const [currentView, setCurrentView] = useState('Login');
-
-  const handleViewChange = (newView) => {
-    setCurrentView(newView);
-  };
+  const [authType, setAuthType] = useState('Login');
 
+  useEffect(() => {
+    const pathname = window.location.pathname;
+    
+    const regex = /\/(login|changepassword)/g;
+    const match = pathname.match(regex);
+    if(match[0] === '/login'){
+      setAuthType('Login');
+    }
+    else if(match[0] === '/changepassword'){
+      setAuthType('ChangePassword');
+    }
+  }, []);
+  const switchToChangePassword = () => {
+    switch (authType){
+      case 'Login': return <Login/>;
+      case 'ChangePassword': return <ChangePassword />;
+    }
+  }
   return (
     <AuthProvider>
       <div
@@ -29,17 +43,12 @@ function App() {
       >
         <div className="row">
           <div
-            className="leftBody"
             style={{ width: '25%', height: '100vh', backgroundColor: 'rgb(62, 161, 168)' }}
           >
-            <div className="App">
+            <div>
               <img className="img-thumbnail no-gutter" id="logo" alt="" src={logo} />
               <h1 style={{marginTop: '5vh'}}>Welcome</h1>
-              {currentView === 'Login' ? (
-                <Login handleViewChange={handleViewChange} /> // Pass prop as function reference
-              ) : (
-                <Register handleViewChange={handleViewChange} /> // Pass prop as function reference
-              )}
+              {switchToChangePassword()}
             </div>
           </div>
         </div>
diff --git a/login-frontend/src/components/coursePage/Course.js b/login-frontend/src/pages/coursePage/Course.js
similarity index 82%
rename from login-frontend/src/components/coursePage/Course.js
rename to login-frontend/src/pages/coursePage/Course.js
index 255b412..0dc39b3 100644
--- a/login-frontend/src/components/coursePage/Course.js
+++ b/login-frontend/src/pages/coursePage/Course.js
@@ -7,16 +7,16 @@ import Navbar from 'react-bootstrap/Navbar';
 import NavDropdown from 'react-bootstrap/NavDropdown';
 import { Button } from 'react-bootstrap';
 
-import Header from './../header_footer/Header';
-import Footer from './../header_footer/Footer';
+import StudentHeader from '../../components/header_footer/StudentHeader';
+import Footer from '../../components/header_footer/Footer';
 
 function Course() {
   const course_bg = 'http://i.ibb.co/GVRnWJC/course-bg.jpg';
   
   return (
     <>
-      <Header />
-      <div style={{ height: '80vh', backgroundImage: `url(${course_bg})`, backgroundSize: 'cover', backgroundPositionX: 'center', backgroundRepeat: 'noRepeat', border: '1px solid' }}>
+      <StudentHeader />
+      <div style={{ height: '80vh', backgroundImage: `url(${course_bg})`, backgroundSize: 'cover', backgroundPositionX: 'center', backgroundRepeat: 'noRepeat' }}>
         <div style={{ marginTop: '0%', marginRight: 'auto', marginBottom: '0%', marginLeft: '15%', width: '50%', paddingTop: '2%', border: 'none' }}>
           <h1>CHĂM CHỈ DỄ DÀNG THÀNH CÔNG</h1>
         </div>
diff --git a/login-frontend/src/components/coursePage/Course1.js b/login-frontend/src/pages/coursePage/Course1.js
similarity index 90%
rename from login-frontend/src/components/coursePage/Course1.js
rename to login-frontend/src/pages/coursePage/Course1.js
index 339cce9..3806fa0 100644
--- a/login-frontend/src/components/coursePage/Course1.js
+++ b/login-frontend/src/pages/coursePage/Course1.js
@@ -10,13 +10,13 @@ import Card from 'react-bootstrap/Card';
 import Col from 'react-bootstrap/Col';
 import Row from 'react-bootstrap/Row';
 
-import Header from './../header_footer/Header';
-import Footer from './../header_footer/Footer';
+import StudentHeader from '../../components/header_footer/StudentHeader';
+import Footer from '../../components/header_footer/Footer';
 
 function Course1() {
   return (
     <>
-      <Header />
+      <StudentHeader />
       <div style={{ margin: '5% 10%' }}>
         <div style={{ marginBottom: '2%' }}>
           <h2 style={{ color: '#eba234' }}>Khóa học của tôi</h2>
diff --git a/login-frontend/src/pages/coursePage/CourseRegistration.js b/login-frontend/src/pages/coursePage/CourseRegistration.js
new file mode 100644
index 0000000..caa6bfa
--- /dev/null
+++ b/login-frontend/src/pages/coursePage/CourseRegistration.js
@@ -0,0 +1,200 @@
+import React, { useState, useEffect } from 'react';
+import axios from 'axios';
+import { BrowserRouter as Router, Routes, Route, Link } from 'react-router-dom';
+import { Table, Button, Modal, Form, Row, Col, Tab, ListGroup } from 'react-bootstrap';
+
+import StudentHeader from '../../components/header_footer/StudentHeader';
+import Footer from '../../components/header_footer/Footer';
+
+const CourseRegistration = () => {
+  const [courses, setCourses] = useState([]);
+  const [showModal, setShowModal] = useState(false);
+  const [selectedCourse, setSelectedCourse] = useState(null);
+  const [teacher, setTeacher] = useState('');
+  const [time, setTime] = useState('');
+
+  useEffect(() => {
+    fetchCourses();
+  }, []);
+
+  const fetchCourses = async () => {
+    try {
+      const response = await fetch('your_api_endpoint_here');
+      const data = await response.json();
+      setCourses(data);
+    } catch (error) {
+      console.error('Error fetching courses:', error);
+    }
+  };
+
+  const handleRegister = async () => {
+    // Your code to post registration data to the server
+    // This could involve sending selectedCourse, teacher, and time
+    // to the server to handle the registration process
+    alert('Đăng ký môn thành công');
+    setTeacher('');
+    setTime('');
+    setShowModal(false);
+  };
+
+  const handleCloseModal = () => {
+    setTeacher('');
+    setTime('');
+    setShowModal(false);
+  };
+
+  const handleShowModal = () => {
+    //setSelectedCourse(course);
+    setShowModal(true);
+  };
+
+  return (
+    <>
+      <StudentHeader />
+      <Tab.Container id="list-group-tabs-example" defaultActiveKey="#1">
+        <Row style={{ marginTop: '2%' }}>
+          <Col sm={3}>
+            <ListGroup>
+              <ListGroup.Item action href="#1">
+                Đăng ký học phần
+              </ListGroup.Item>
+              <ListGroup.Item action href="#2">
+                Chương trình đào tạo
+              </ListGroup.Item>
+            </ListGroup>
+          </Col>
+          <Col sm={9}>
+            <Tab.Content>
+              <Tab.Pane eventKey="#1">
+                <h4>Chọn môn học đăng ký</h4>
+                <Table striped bordered hover>
+                  <thead>
+                    <tr>
+                      <th>Tên môn học</th>
+                      <th>Phòng học</th>
+                      <th>Số lượng</th>
+                      <th>Action</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    {/*courses.map(course => (
+            <tr key={course.id}>
+              <td>{course.name}</td>
+              <td>{course.room}</td>
+              <td>{course.amount}</td>
+              <td>
+                <Button onClick={() => handleShowModal(course)}>Chọn</Button>
+              </td>
+            </tr>
+          ))*/}
+                    <tr>
+                      <td>LTNC</td>
+                      <td>413-H6</td>
+                      <td>40</td>
+                      <td>
+                        <Button onClick={handleShowModal}>Chọn</Button>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td>ABC</td>
+                      <td>101-H1</td>
+                      <td>50</td>
+                      <td>
+                        <Button onClick={handleShowModal}>Chọn</Button>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td>XYZ</td>
+                      <td>202-H2</td>
+                      <td>60</td>
+                      <td>
+                        <Button onClick={handleShowModal}>Chọn</Button>
+                      </td>
+                    </tr>
+                  </tbody>
+                </Table>
+
+                <h4>Phiếu đăng ký</h4>
+                <Table striped bordered hover>
+                  <thead>
+                    <tr>
+                      <th>STT</th>
+                      <th>Mã môn học</th>
+                      <th>Tên môn học</th>
+                      <th>Phòng học</th>
+                      <th>Số lượng</th>
+                      <th>Giảng viên</th>
+                      <th>Giờ học</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    <tr>
+                      <td>1</td>
+                      <td>COxxxx</td>
+                      <td>LTNC</td>
+                      <td>413-H6</td>
+                      <td>40</td>
+                      <td>Mai Đức Trung</td>
+                      <td>13:00-15:00</td>
+                    </tr>
+                    <tr>
+                      <td>2</td>
+                      <td>COxxxx</td>
+                      <td>ABC</td>
+                      <td>101-H1</td>
+                      <td>50</td>
+                      <td>Tên Giảng Viên</td>
+                      <td>hh:mm-hh:mm</td>
+                    </tr>
+                  </tbody>
+                </Table>
+              </Tab.Pane>
+              <Tab.Pane eventKey="#2">
+                <h1>CHƯƠNG TRÌNH ĐÀO TẠO</h1>
+              </Tab.Pane>
+            </Tab.Content>
+          </Col>
+        </Row>
+      </Tab.Container>
+      <Footer />
+
+      <Modal show={showModal} onHide={handleCloseModal}>
+        <Modal.Header closeButton>
+          <Modal.Title>Đăng ký môn ... {/*selectedCourse && selectedCourse.name*/}</Modal.Title>
+        </Modal.Header>
+        <Modal.Body>
+          <Form>
+            <Form.Group controlId="formTeacher">
+              <Form.Label>Giảng viên</Form.Label>
+              <Form.Control
+                type="text"
+                placeholder="Nhập tên giảng viên"
+                value={teacher}
+                onChange={(e) => setTeacher(e.target.value)}
+              />
+            </Form.Group>
+            <Form.Group controlId="formTime">
+              <Form.Label>Giờ học</Form.Label>
+              <Form.Control
+                type="text"
+                placeholder="Nhập giờ học"
+                value={time}
+                onChange={(e) => setTime(e.target.value)}
+              />
+            </Form.Group>
+          </Form>
+        </Modal.Body>
+        <Modal.Footer>
+          <Button variant="secondary" onClick={handleCloseModal}>
+            Hủy
+          </Button>
+          <Button variant="primary" onClick={handleRegister}>
+            Đăng ký
+          </Button>
+        </Modal.Footer>
+      </Modal>
+    </>
+  );
+};
+
+export default CourseRegistration;
\ No newline at end of file
diff --git a/login-frontend/src/pages/StudentDashboard.css b/login-frontend/src/pages/dashboardPage/Dashboard.css
similarity index 73%
rename from login-frontend/src/pages/StudentDashboard.css
rename to login-frontend/src/pages/dashboardPage/Dashboard.css
index 1060c35..9265cff 100644
--- a/login-frontend/src/pages/StudentDashboard.css
+++ b/login-frontend/src/pages/dashboardPage/Dashboard.css
@@ -1,5 +1,6 @@
 .logo{
   width: 40%;
+  padding-left: 10vh;
 }
 .leftBody {
   height: 83vh;
@@ -26,11 +27,23 @@
 .navigation {
   display: flex;
   background-color: wheat;
-  height: 8%;
 }
-a{
+.long_navigation{
+  display: flex;
+  background-color: white;
+  justify-content: center;
+  padding: 1vh;
+  padding-bottom: 3vh;
+  border-bottom: 1px solid gray;
+}
+.top_navbar{
   color: #020202;
   padding: 2vh 10vh;
+  font-weight: bold;
+  text-decoration: none;
+}
+.left_navbar{
+  color: white;
   text-decoration: none;
 }
 .active{
diff --git a/login-frontend/src/pages/StudentDashboard.js b/login-frontend/src/pages/dashboardPage/StudentDashboard.js
similarity index 70%
rename from login-frontend/src/pages/StudentDashboard.js
rename to login-frontend/src/pages/dashboardPage/StudentDashboard.js
index f41d615..98d6edf 100644
--- a/login-frontend/src/pages/StudentDashboard.js
+++ b/login-frontend/src/pages/dashboardPage/StudentDashboard.js
@@ -1,10 +1,10 @@
 import React, { useState } from 'react';
-import StudentInfo from './../components/DashBoard/studentInfo';
-import Training from './../components/DashBoard/studentTraining';
-import Footer from './../components/header_footer/Footer';
-import '../../node_modules/bootstrap/dist/css/bootstrap.min.css';
+import StudentInfo from '../../components/dashboard/studentInfo';
+import Training from '../../components/dashboard/studentTraining';
+import Footer from '../../components/header_footer/Footer';
+import '../../../node_modules/bootstrap/dist/css/bootstrap.min.css';
 import { BrowserRouter as Router, Routes, Route, Link } from 'react-router-dom';
-import './StudentDashboard.css';
+import './Dashboard.css';
 
 function DataTable() {
   const [currentView, setCurrentView] = useState('StudentInfo');
@@ -15,7 +15,7 @@ function DataTable() {
   const [isOpen, setIsOpen] = useState(false);
 
   return (
-    <div className="student-dashboard">
+    <div>
       <nav className="navbar navbar-expand-lg navbar-light bg-light">
         <a className="navbar-brand" href="#">
           <img className="logo" src="https://i.ibb.co/CMwkBmw/lSgDz8N.png" alt="logo" />
@@ -35,23 +35,29 @@ function DataTable() {
         <div className="row">
           <div className="col-md-2 leftBody">
             <ul className="nav flex-column">
-              <li className="nav-item" style={{ paddingTop: '2rem' }}>
-                <i className="fas fa-solid fa-home fa-md fa-2x"></i> Home
+              <li className="nav-item" style={{padding: '0', marginTop: '2rem', cursor: 'pointer' }}>
+                <a href='/' className='left_navbar'>
+                    <i className="fas fa-solid fa-home fa-md fa-2x"></i> Home
+                </a>
               </li>
-              <li className="nav-item" style={{ paddingTop: '2rem' }}>
-                <i className="fas fa-regular fa-id-badge fa-md fa-2x"></i> Student
+              <li className="nav-item" style={{ marginTop: '2rem', cursor: 'pointer'  }}>
+                <i className="fas fa-regular fa-id-badge fa-md fa-2x"></i> Personal
               </li>
-              <li className="nav-item" style={{ paddingTop: '2rem', cursor: 'pointer'}} onClick={() => setIsOpen(!isOpen)}>
+              <li className="nav-item" style={{ marginTop: '2rem', cursor: 'pointer'}} onClick={() => setIsOpen(!isOpen)}>
                 <i className="fa fa-solid fa-book fa-md fa-2x"></i>  Study
                 <i class="fa-solid fa-angles-down"></i>
                 {isOpen && (
                   <ul>                    
-                    <li className="nav-item" style={{ paddingTop: '2rem'}}><Link to={'/course'} style={{color: 'white', padding: '0'}}>Course</Link></li>
-                    <li className="nav-item" style={{ paddingTop: '2rem' }}><Link to={'/course1'} style={{color: 'white', padding: '0'}}>Course registration</Link></li>
+                    <li className="nav-item" style={{ paddingTop: '2rem' }}>
+                      <Link to={'/course'} style={{ color: 'white', padding: '0' }}>Course</Link>
+                    </li>
+                    <li className="nav-item" style={{ paddingTop: '2rem' }}>
+                      <Link to={'/courseRegistration'} style={{ color: 'white', padding: '0' }}>Course registration</Link>
+                    </li>
                   </ul>
                 )}
               </li>
-              <li className="nav-item" style={{ paddingTop: '2rem' }}>
+              <li className="nav-item" style={{ marginTop: '2rem', cursor: 'pointer'  }}>
                 <i className="fa fa-solid fa-question fa-md fa-2x"></i> Assistant
               </li>
             </ul>
@@ -64,7 +70,7 @@ function DataTable() {
                   <a
                     onClick={() => handleNavigation('StudentInfo')}
                     style={{ fontWeight: 'bold'}}
-                    className={currentView === 'StudentInfo' ? 'active' : ''}
+                    className={currentView === 'StudentInfo' ? 'active top_navbar' : ' top_navbar'}
                   >
                     Student Information
                   </a>
@@ -72,7 +78,7 @@ function DataTable() {
                     href="#"
                     onClick={() => handleNavigation('Training')}
                     style={{ fontWeight: 'bold' }}
-                    className={currentView === 'Training' ? 'active' : ''}
+                    className={currentView === 'Training' ? 'active top_navbar' : ' top_navbar'}
                   >
                     Training Information
                   </a>
diff --git a/login-frontend/src/pages/dashboardPage/TeacherDashBoard.js b/login-frontend/src/pages/dashboardPage/TeacherDashBoard.js
new file mode 100644
index 0000000..501c8cd
--- /dev/null
+++ b/login-frontend/src/pages/dashboardPage/TeacherDashBoard.js
@@ -0,0 +1,75 @@
+import React, { useState } from 'react';
+import TeacherInfo from './../../components/dashboard/teacherInfo';
+import Footer from '../../components/header_footer/Footer';
+import SubjectSchedule from './../../components/dashboard/subjectSchedule';
+import LessonPlan from './../../components/dashboard/lessonPlan';
+import '../../../node_modules/bootstrap/dist/css/bootstrap.min.css';
+import { BrowserRouter as Router, Routes, Route, Link } from 'react-router-dom';
+// import './StudentDashboard.css';
+
+function DataTable() {
+  const [currentView, setCurrentView] = useState('TeacherInfo');
+
+  const handleNavigation = (viewName) => {
+    setCurrentView(viewName);
+  };
+  const [isOpen, setIsOpen] = useState(false);
+
+  return (
+    <div>
+      <nav className="navbar navbar-expand-lg navbar-light bg-light">
+        <a className="navbar-brand" href="#">
+          <img className="logo" src="https://i.ibb.co/CMwkBmw/lSgDz8N.png" alt="logo" />
+        </a>
+        <ul className="navbar-nav ms-auto">
+          <li style={{padding: '2vh'}}>
+            <a className="nav-link" href="#">Nguyen Van A - GVxxxxx</a>
+          </li>
+          <li style={{padding: '2vh'}}>
+            <i className="fa fa-solid fa-bell fa-lg fa-3x"></i>
+            Logout
+          </li>
+        </ul>
+      </nav>
+
+      <div className="container-fluid">
+        <div className="row">
+          <div className="col-md-2 leftBody">
+            <ul className="nav flex-column">
+              <li className="nav-item" style={{padding: '0', marginTop: '2rem', cursor: 'pointer' }}>
+                <a href='/' className='left_navbar'>
+                    <i className="fas fa-solid fa-home fa-md fa-2x"></i> Home
+                </a>
+              </li>
+              <li className="nav-item" style={{ marginTop: '2rem', cursor: 'pointer' }}>
+                <a onClick={() => handleNavigation('TeacherInfo')}>
+                    <i class="fa-regular fa-address-book fa-2x"></i> Personal
+                </a>
+              </li>
+              <li className="nav-item" style={{ marginTop: '2rem', cursor: 'pointer'}}>
+                <a onClick={() => handleNavigation('SubjectSchedule')}>
+                    <i class="fa-brands fa-blackberry fa-2x"></i> DashBoard
+                </a>
+              </li>
+              <li className="nav-item" style={{ marginTop: '2rem', cursor: 'pointer' }}>
+                <a onClick={() => handleNavigation('LessonPlan')}>
+                    <i className="fa fa-solid fa-question fa-md fa-2x"></i> Lesson Plan
+                </a>
+              </li>
+            </ul>
+          </div>
+          <div className="col-md-10 rightBody">
+            <div className="dataTable mx-auto">
+              {currentView === 'TeacherInfo' && <TeacherInfo />}
+              {currentView === 'SubjectSchedule' && <SubjectSchedule />}
+              {currentView === 'LessonPlan' && <LessonPlan/>}
+            </div>
+          </div>
+        </div>
+      </div>
+      <Footer />
+    </div>
+  );
+}
+
+export default DataTable;
diff --git a/login-frontend/src/services/authServices.js b/login-frontend/src/services/authServices.js
index 43518d7..f8e859c 100644
--- a/login-frontend/src/services/authServices.js
+++ b/login-frontend/src/services/authServices.js
@@ -1,4 +1,4 @@
-const API_URL = 'http://localhost:5000/admin';
+const API_URL = 'http://localhost:5000/admin/login';
 
 export const login = async (email, password) => {
   const response = await fetch(API_URL, {
@@ -7,6 +7,9 @@ export const login = async (email, password) => {
     body: JSON.stringify({ email, password })
   });
   const data = await response.json();
+  if (response.ok) {
+        sessionStorage.setItem('jwtToken', data.token); // Lưu token
+  }
   return data;
 };
 
diff --git a/qlsv_be/controllers/admin/admin.controller.js b/qlsv_be/controllers/admin/admin.controller.js
index e114592..0934d18 100644
--- a/qlsv_be/controllers/admin/admin.controller.js
+++ b/qlsv_be/controllers/admin/admin.controller.js
@@ -3,17 +3,17 @@ const jwt = require('jsonwebtoken');
 const { validationResult } = require('express-validator');
 const adminModel = require('../../models/admin.model');
 
-exports.login = async (req, res) => {
+const login = async (req, res) => {
     const errors = validationResult(req);
     if (!errors.isEmpty()) {
         return res.status(400).json({ errors: errors.array() });
     }
 
-    const { email, password } = req.body;
+    const { email, password} = req.body;
     try {
         const admin = await adminModel.findOne({ email: email });
-        if (!admin) {
-            return res.status(404).json({ message: "No admin record found" });
+        if (!admin || admin.role !== 'admin') {
+            return res.status(404).json({ message: "Invalid credentials or role" });
         }
         const isMatch = await bcrypt.compare(password, admin.password);
         if (!isMatch) {
@@ -26,18 +26,30 @@ exports.login = async (req, res) => {
     }
 };
 
-exports.register = async (req, res) => {
-    const errors = validationResult(req);
-    if (!errors.isEmpty()) {
-        return res.status(400).json({ errors: errors.array() });
-    }
-
-    const { name, email, password } = req.body;
+const addAdmin = async (req, res) => {
+    const { email, password, role } = req.body;
     try {
-        const hash = await bcrypt.hash(password, 10);
-        const admin = await adminModel.create({ name, email, password: hash });
-        res.status(201).json({ message: "Admin registered successfully", admin: { id: admin._id, name: admin.name, email: admin.email } });
-    } catch (err) {
-        res.status(500).json({ message: "Error registering admin", error: err.message });
+        const admin = await adminModel.findOne({ email: email });
+        if (admin) {
+            return res.status(409).json({ message: "Admin already exists" });
+        }
+        const salt = await bcrypt.genSalt(10);
+        const hashedPassword = await bcrypt.hash(password, salt);
+        const newAdmin = new adminModel({
+            email: email,
+            password: hashedPassword,
+            role: role
+        });
+        await newAdmin.save();
+        res.status(201).json({ message: "Admin created successfully" });
     }
-};
+    catch (err) {
+        res.status(500).json({ message: "Error creating admin", error: err.message });
+    }
+}
+
+module.exports = {
+    login,
+    addAdmin
+}
+
diff --git a/qlsv_be/controllers/admin/student.controller.js b/qlsv_be/controllers/admin/student.controller.js
index b3f5c59..deb099c 100644
--- a/qlsv_be/controllers/admin/student.controller.js
+++ b/qlsv_be/controllers/admin/student.controller.js
@@ -1,4 +1,5 @@
 const Student = require('../../models/student.model');
+const { generateUniqueMssv } = require('../../helpers/generateMssv');
 
 // Get all students
 const getAllStudents = async (req, res) => {
@@ -13,20 +14,32 @@ const getAllStudents = async (req, res) => {
 // Add a new student
 const addStudent = async (req, res) => {
     try {
-      const newStudent = new Student({
-          name: req.body.name,
-          email: req.body.email,
-          password: req.body.password,
-          mssv: req.body.mssv, 
-          private_info: req.body.private_info,
-          training_info: req.body.training_info
-     });
-      await newStudent.save();
-      res.status(201).json(newStudent);
+        const { name, email, password, private_info, training_info } = req.body;
+
+        // Generate new mssv
+        let mssv = await generateUniqueMssv();
+
+        // Check if email is already taken
+        const existingEmail = await Student.findOne({ email: email });
+        if (existingEmail) {
+            return res.status(400).json({ message: "Email is already taken." });
+        }
+
+        const newStudent = new Student({
+            name,
+            email,
+            password,
+            mssv,
+            private_info,
+            training_info
+        });
+
+        await newStudent.save();
+        res.status(201).json({ message: "Add successfully", newStudent });
     } catch (error) {
-      res.status(400).send(error.message);
+        res.status(400).send(error.message);
     }
-  };
+};
 
 // Delete a student
 const deleteStudent = async (req, res) => {
diff --git a/qlsv_be/controllers/admin/teacher.controller.js b/qlsv_be/controllers/admin/teacher.controller.js
index 619c504..5867c43 100644
--- a/qlsv_be/controllers/admin/teacher.controller.js
+++ b/qlsv_be/controllers/admin/teacher.controller.js
@@ -1,4 +1,5 @@
 const Teacher = require('../../models/teacher.model');
+const { generateUniqueMsgv } = require ('../../helpers/generateMsgv');
 
 // Get all teachers
 const getAllTeachers = async (req, res) => {
@@ -12,21 +13,32 @@ const getAllTeachers = async (req, res) => {
 
 const addTeacher = async (req, res) => {
     try {
+        const { name, email, password, private_info, training_info } = req.body;
+
+        // Generate new mssv
+        let mssv = await generateUniqueMsgv();
+
+        // Check if email is already taken
+        const existingEmail = await Teacher.findOne({ email: email });
+        if (existingEmail) {
+            return res.status(400).json({ message: "Email is already taken." });
+        }
+
         const newTeacher = new Teacher({
-            name: req.body.name,
-            email: req.body.email,
-            password: req.body.password,
-            msgv: req.body.msgv,
-            private_info: req.body.private_info,
-            contact_info: req.body.contact_info
+            name,
+            email,
+            password,
+            mssv,
+            private_info,
+            training_info
         });
+
         await newTeacher.save();
-        res.status(201).json(newTeacher);
+        res.status(201).json({ message: "Add successfully", newTeacher });
     } catch (error) {
         res.status(400).send(error.message);
     }
 };
-
 const deleteTeacher = async (req, res) => {
     const { msgv } = req.params;
 
@@ -64,9 +76,25 @@ const updateTeacher = async (req, res) => {
     }
 };
 
+// Find a student by mssv
+const findTeacherByMsgv = async (req, res) => {
+    const { mssv } = req.params;
+
+    try {
+        const teacher = await Teacher.findOne({ mssv: mssv });
+        if (!teacher) {
+            return res.status(404).json({ message: "Teacher not found." });
+        }
+
+        res.status(200).json(teacher);
+    } catch (error) {
+        res.status(500).json({ message: error.message });
+    }
+};
 module.exports = {
     getAllTeachers,
     addTeacher,
     deleteTeacher, 
-    updateTeacher
+    updateTeacher,
+    findTeacherByMsgv
 }
\ No newline at end of file
diff --git a/qlsv_be/controllers/users/student.controller.js b/qlsv_be/controllers/users/student.controller.js
index 3cbdcfa..1fbb0dc 100644
--- a/qlsv_be/controllers/users/student.controller.js
+++ b/qlsv_be/controllers/users/student.controller.js
@@ -3,41 +3,76 @@ const jwt = require('jsonwebtoken');
 const { validationResult } = require('express-validator');
 const teacherModel = require('../../models/teacher.model');
 
-exports.login = async (req, res) => {
+const login = async (req, res) => {
     const errors = validationResult(req);
     if (!errors.isEmpty()) {
         return res.status(400).json({ errors: errors.array() });
     }
 
-    const { email, password } = req.body;
+    const { email, password} = req.body;
     try {
-        const teacher = await teacherModel.findOne({ email: email });
-        if (!teacher) {
-            return res.status(404).json({ message: "No teacher record found" });
+        const student = await studentModel.findOne({ email: email });
+         // Check if the default password is being used and if the password has not been changed yet
+        if (!student || student.role !== 'student') {
+            return res.status(404).json({ message: "Invalid credentials or role"});
         }
-        const isMatch = await bcrypt.compare(password, teacher.password);
+        
+        if (student.password === '123456' && !student.passwordChanged) {
+            // Respond with an instruction to change the password
+            return res.status(200).json({
+            message: "Default password in use. Password change required.",
+            passwordChangeRequired: true // Flag to indicate that password change is required
+            });
+        }
+
+        const isMatch = await bcrypt.compare(password, student.password);
         if (!isMatch) {
             return res.status(401).json({ message: "Incorrect password" });
         }
-        const token = jwt.sign({ email: teacher.email, role: teacher.role }, process.env.JWT_SECRET, { expiresIn: '1d' });
+
+        const token = jwt.sign({ email: student.email, role: student.role }, process.env.JWT_SECRET, { expiresIn: '1d' });
         res.json({ message: "Login successful", token: token });
     } catch (err) {
         res.status(500).json({ message: "Login error", error: err.message });
     }
 };
 
-exports.register = async (req, res) => {
-    const errors = validationResult(req);
-    if (!errors.isEmpty()) {
-        return res.status(400).json({ errors: errors.array() });
-    }
-
-    const { name, email, password } = req.body;
+const changePassword = async (req, res) => {
+    const { email, newPassword } = req.body;
+    let student;
+    
     try {
-        const hash = await bcrypt.hash(password, 10);
-        const teacher = await teacherModel.create({ name, email, password: hash });
-        res.status(201).json({ message: "teacher registered successfully", teacher: { id: teacher._id, name: teacher.name, email: teacher.email } });
-    } catch (err) {
-        res.status(500).json({ message: "Error registering teacher", error: err.message });
+        const student = await studentModel.findOne({ email });
+        if (!student) {
+            return res.status(404).json({ message: "Student not found." });
+        }
+
+        // Check if the password has already been changed
+        if (student.passwordChanged) {
+            return res.status(403).json({ message: "Password has already been changed." });
+        }
+
+        // Check if the new password is the default password
+        if (newPassword === '123456') {
+            return res.status(400).json({ message: "Invalid password. Please choose a different password." });
+        }
+
+        // Hash the new password and update the student record
+        const salt = await bcrypt.genSalt(10);
+        const hashedPassword = await bcrypt.hash(newPassword, salt);
+        
+        student.password = hashedPassword;
+        student.passwordChanged = true;
+        await student.save();
+
+        res.status(200).json({ message: "Password changed successfully." });
+
+    } catch (error) {
+        res.status(500).json({ message: error.message });
     }
-};
\ No newline at end of file
+};
+
+module.exports = {
+    login,
+    changePassword
+};
diff --git a/qlsv_be/controllers/users/teacher.controller.js b/qlsv_be/controllers/users/teacher.controller.js
index 3cbdcfa..5a2ac53 100644
--- a/qlsv_be/controllers/users/teacher.controller.js
+++ b/qlsv_be/controllers/users/teacher.controller.js
@@ -3,22 +3,33 @@ const jwt = require('jsonwebtoken');
 const { validationResult } = require('express-validator');
 const teacherModel = require('../../models/teacher.model');
 
-exports.login = async (req, res) => {
+const login = async (req, res) => {
     const errors = validationResult(req);
     if (!errors.isEmpty()) {
         return res.status(400).json({ errors: errors.array() });
     }
 
-    const { email, password } = req.body;
+    const { email, password} = req.body;
     try {
         const teacher = await teacherModel.findOne({ email: email });
-        if (!teacher) {
-            return res.status(404).json({ message: "No teacher record found" });
+         // Check if the default password is being used and if the password has not been changed yet
+        if (!teacher || teacher.role !== 'teacher') {
+            return res.status(404).json({ message: "Invalid credentials or role"});
+        }
+        
+        if (teacher.password === '123456' && !teacher.passwordChanged) {
+            // Respond with an instruction to change the password
+            return res.status(200).json({
+            message: "Default password in use. Password change required.",
+            passwordChangeRequired: true // Flag to indicate that password change is required
+            });
         }
+
         const isMatch = await bcrypt.compare(password, teacher.password);
         if (!isMatch) {
             return res.status(401).json({ message: "Incorrect password" });
         }
+
         const token = jwt.sign({ email: teacher.email, role: teacher.role }, process.env.JWT_SECRET, { expiresIn: '1d' });
         res.json({ message: "Login successful", token: token });
     } catch (err) {
@@ -26,18 +37,42 @@ exports.login = async (req, res) => {
     }
 };
 
-exports.register = async (req, res) => {
-    const errors = validationResult(req);
-    if (!errors.isEmpty()) {
-        return res.status(400).json({ errors: errors.array() });
-    }
-
-    const { name, email, password } = req.body;
+const changePassword = async (req, res) => {
+    const { email, newPassword } = req.body;
+    let teacher;
+    
     try {
-        const hash = await bcrypt.hash(password, 10);
-        const teacher = await teacherModel.create({ name, email, password: hash });
-        res.status(201).json({ message: "teacher registered successfully", teacher: { id: teacher._id, name: teacher.name, email: teacher.email } });
-    } catch (err) {
-        res.status(500).json({ message: "Error registering teacher", error: err.message });
+        const teacher = await teacherModel.findOne({ email });
+        if (!teacher) {
+            return res.status(404).json({ message: "Teacher not found." });
+        }
+
+        // Check if the password has already been changed
+        if (teacher.passwordChanged) {
+            return res.status(403).json({ message: "Password has already been changed." });
+        }
+
+        // Check if the new password is the default password
+        if (newPassword === '123456') {
+            return res.status(400).json({ message: "Invalid password. Please choose a different password." });
+        }
+
+        // Hash the new password and update the teacher record
+        const salt = await bcrypt.genSalt(10);
+        const hashedPassword = await bcrypt.hash(newPassword, salt);
+        
+        teacher.password = hashedPassword;
+        teacher.passwordChanged = true;
+        await teacher.save();
+
+        res.status(200).json({ message: "Password changed successfully." });
+
+    } catch (error) {
+        res.status(500).json({ message: error.message });
     }
-};
\ No newline at end of file
+};
+
+module.exports = {
+    login,
+    changePassword
+};
diff --git a/qlsv_be/helpers/generateMsgv.js b/qlsv_be/helpers/generateMsgv.js
new file mode 100644
index 0000000..8ad8514
--- /dev/null
+++ b/qlsv_be/helpers/generateMsgv.js
@@ -0,0 +1,31 @@
+const Teacher = require('../models/teacher.model');
+
+// Generate a unique msgv
+const generateUniqueMsgv = async () => {
+    let msgv = "";
+    let isUnique = false;
+
+    while (!isUnique) {
+        msgv = generateRandomMsgv();
+        const existingStudent = await Teacher.findOne({ msgv: msgv });
+
+        if (!existingStudent) {
+            isUnique = true;
+        }
+    }
+
+    return msgv;
+};
+
+// Generate a random msgv
+const generateRandomMsgv = () => {
+    const min = 2210000;
+    const max = 2219999;
+    const randomMsgv = Math.floor(Math.random() * (max - min + 1)) + min;
+
+    return randomMsgv.toString();
+};
+
+module.exports = {
+    generateUniqueMsgv
+};
\ No newline at end of file
diff --git a/qlsv_be/helpers/generateMssv.js b/qlsv_be/helpers/generateMssv.js
new file mode 100644
index 0000000..6148b46
--- /dev/null
+++ b/qlsv_be/helpers/generateMssv.js
@@ -0,0 +1,31 @@
+const Student = require("../models/student.model");
+
+// Generate a unique mssv
+const generateUniqueMssv = async () => {
+    let mssv = "";
+    let isUnique = false;
+
+    while (!isUnique) {
+        mssv = generateRandomMssv();
+        const existingStudent = await Student.findOne({ mssv: mssv });
+
+        if (!existingStudent) {
+            isUnique = true;
+        }
+    }
+
+    return mssv;
+};
+
+// Generate a random mssv
+const generateRandomMssv = () => {
+    const min = 2210000;
+    const max = 2219999;
+    const randomMssv = Math.floor(Math.random() * (max - min + 1)) + min;
+
+    return randomMssv.toString();
+};
+
+module.exports = {
+    generateUniqueMssv
+};
\ No newline at end of file
diff --git a/qlsv_be/middlewares/authenticate.js b/qlsv_be/middlewares/authenticate.js
new file mode 100644
index 0000000..a33e556
--- /dev/null
+++ b/qlsv_be/middlewares/authenticate.js
@@ -0,0 +1,18 @@
+const jwt = require('jsonwebtoken');
+
+const authenticate = (req, res, next) => {
+    const token = req.headers.authorization?.split(' ')[1]; // Bearer token
+    if (!token) {
+        return res.status(401).json({ message: 'No token provided' });
+    }
+
+    try {
+        const decoded = jwt.verify(token, process.env.JWT_SECRET);
+        req.user = decoded; // adding the decoded user to the request
+        next();
+    } catch (error) {
+        return res.status(401).json({ message: 'Invalid token' });
+    }
+};
+
+module.exports = authenticate;
diff --git a/qlsv_be/middlewares/verify.user.js b/qlsv_be/middlewares/verify.user.js
deleted file mode 100644
index 0a209df..0000000
--- a/qlsv_be/middlewares/verify.user.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// middleware/verifyUser.js
-const jwt = require('jsonwebtoken');
-
-const verifyUser = (req, res, next) => {
-    const token = req.cookies.token;
-    if (!token) {
-        return res.json("Token is missing");
-    }
-
-    jwt.verify(token, "jwt-secret-key", (err, decoded) => {
-        if (err) {
-            return res.json("Error with token");
-        }
-
-        req.user = decoded;
-        next();
-    });
-};
-
-module.exports = verifyUser;
\ No newline at end of file
diff --git a/qlsv_be/models/student.model.js b/qlsv_be/models/student.model.js
index 34b1f3a..f834150 100644
--- a/qlsv_be/models/student.model.js
+++ b/qlsv_be/models/student.model.js
@@ -3,14 +3,13 @@ const mongoose = require('mongoose');
 const studentSchema = new mongoose.Schema({
     name: String,
     email: String,
-    password: {
-        type: String, 
+    password: { 
+        type: String,
         default: '123456'
     },
     mssv: { 
         type: String, 
-        require: true, 
-        unique: true
+        require: false
     },
     private_info:{
         ngaySinh: Date,
@@ -24,6 +23,15 @@ const studentSchema = new mongoose.Schema({
         soDienThoai: String,
         emailTruongCap: String,
         emailLienLac: String,
+    },
+    role: {
+        type: String,
+        default: 'student'
+    },
+    
+    passwordChanged: {
+        type: Boolean,
+        default: false
     },
       // Training information
     training_info:{
diff --git a/qlsv_be/models/teacher.model.js b/qlsv_be/models/teacher.model.js
index 7d84989..a48caf5 100644
--- a/qlsv_be/models/teacher.model.js
+++ b/qlsv_be/models/teacher.model.js
@@ -9,9 +9,17 @@ const teacherSchema = new mongoose.Schema({
     },
     msgv: {
         type: String,
-        require: true,
-        unique: true
+        require: false,
     },
+    role: {
+        type: String,
+        default: 'teacher'
+    },
+    passwordChanged: {
+        type: Boolean,
+        default: false
+    },
+
     private_info: {
         ngaySinh: Date, 
         gioiTinh: String,
@@ -25,8 +33,12 @@ const teacherSchema = new mongoose.Schema({
         sodienthoai: Number,
         emailtruongcap: String,
         emaillienlac: String 
+    }},
+    { 
+        timestamps: true // Enable createdAt and updatedAt fields
     }
-});
+
+);
 
 const teacherModel = mongoose.model('teacher', teacherSchema);
 module.exports = teacherModel;
\ No newline at end of file
diff --git a/qlsv_be/routes/admin/admin.route.js b/qlsv_be/routes/admin/admin.route.js
index 27424f7..6af9f9f 100644
--- a/qlsv_be/routes/admin/admin.route.js
+++ b/qlsv_be/routes/admin/admin.route.js
@@ -1,18 +1,14 @@
 const express = require('express');
 const { body } = require('express-validator');
 const adminController = require('../../controllers/admin/admin.controller');
+const authenticate = require('../../middlewares/authenticate');
 
 const router = express.Router();
 
-router.post('/', [
+router.post('/login', [
     body('email').isEmail().withMessage('Invalid email address'),
     body('password').notEmpty().withMessage('Password is required')
 ], adminController.login);
 
-router.post('/register', [
-    body('name').notEmpty().withMessage('Name is required'),
-    body('email').isEmail().withMessage('Invalid email address'),
-    body('password').isLength({ min: 6 }).withMessage('Password must be at least 6 characters long')
-], adminController.register);
-
+router.use('/dashboard', authenticate, require('./dashboard.route'));
 module.exports = router;
diff --git a/qlsv_be/routes/admin/control_panel.route.js b/qlsv_be/routes/admin/control_panel.route.js
index 9f60e2f..fdec694 100644
--- a/qlsv_be/routes/admin/control_panel.route.js
+++ b/qlsv_be/routes/admin/control_panel.route.js
@@ -1,5 +1,6 @@
 const express = require('express');
 const controlPanelController = require('../../controllers/admin/control_panel.controller');
+const authenticate = require('../../middlewares/authenticate');
 
 const router = express.Router();
 
diff --git a/qlsv_be/routes/admin/dashboard.route.js b/qlsv_be/routes/admin/dashboard.route.js
index f409744..c7db099 100644
--- a/qlsv_be/routes/admin/dashboard.route.js
+++ b/qlsv_be/routes/admin/dashboard.route.js
@@ -4,6 +4,8 @@ const router = express.Router();
 const studentRoute = require('./student.route');
 const teacherRoute = require('./teacher.route');
 const control_panelRoute = require('./control_panel.route');
+const adminController = require('../../controllers/admin/admin.controller');
+const authenticate = require('../../middlewares/authenticate');
 // Import routes
 
 // Dashboard route
@@ -13,5 +15,6 @@ router.get('/', (req, res) => {
 router.use('/student', studentRoute); 
 router.use('/teacher', teacherRoute);
 router.use('/controlpanel', control_panelRoute); 
+router.post('/addAdmin', adminController.addAdmin);
 
 module.exports = router;
\ No newline at end of file
diff --git a/qlsv_be/routes/admin/index.route.js b/qlsv_be/routes/admin/index.route.js
index ac50907..d5cc14f 100644
--- a/qlsv_be/routes/admin/index.route.js
+++ b/qlsv_be/routes/admin/index.route.js
@@ -5,5 +5,4 @@ const dashboardRoutes = require('./dashboard.route');
 module.exports = (app) => {
     const PATH_ADMIN = '/admin';
     app.use(PATH_ADMIN + '/', adminRoutes);
-    app.use(PATH_ADMIN + '/dashboard', dashboardRoutes);    
 }
\ No newline at end of file
diff --git a/qlsv_be/routes/admin/teacher.route.js b/qlsv_be/routes/admin/teacher.route.js
index 8b8e532..cf7a596 100644
--- a/qlsv_be/routes/admin/teacher.route.js
+++ b/qlsv_be/routes/admin/teacher.route.js
@@ -8,5 +8,6 @@ router.get('/', teacherController.getAllTeachers);
 router.post('/add', teacherController.addTeacher);
 router.put('/:msgv', teacherController.updateTeacher);
 router.delete('/:msgv', teacherController.deleteTeacher);
+router.get('/:msgv', teacherController.findTeacherByMsgv);
 
 module.exports = router;
\ No newline at end of file
diff --git a/qlsv_be/routes/users/student.route.js b/qlsv_be/routes/users/student.route.js
index 06ae16d..ee3697e 100644
--- a/qlsv_be/routes/users/student.route.js
+++ b/qlsv_be/routes/users/student.route.js
@@ -1,16 +1,15 @@
 const express = require('express');
 const router = express.Router();
+const authenticate = require('../../middlewares/authenticate');
 const studentController = require('../../controllers/users/student.controller');
 const studentDashboard = require('./studentdashboard.route');
 const { body } = require('express-validator');
-const verifyUser = require('../../middlewares/verify.user');
 
 // register route
-router.post('/register', [
-    body('name').notEmpty().withMessage('Name is required'),
+router.post('/changePassword', [
     body('email').isEmail().withMessage('Invalid email address'),
-    body('password').isLength({ min: 6 }).withMessage('Password must be at least 6 characters long'),
-], studentController.register);
+    body('newPassword').isLength({ min: 6 }).withMessage('Password must be at least 6 characters long'),
+], studentController.changePassword);
 
 // login route
 router.post('/login', [
@@ -18,7 +17,7 @@ router.post('/login', [
     body('password').notEmpty().withMessage('Password is required'),
 ], studentController.login);
 
-router.use('/dashboard', studentDashboard);
+router.use('/dashboard', authenticate, studentDashboard);
 
 
 module.exports = router;
\ No newline at end of file
diff --git a/qlsv_be/routes/users/studentdashboard.route.js b/qlsv_be/routes/users/studentdashboard.route.js
index ba6ff33..fa1e370 100644
--- a/qlsv_be/routes/users/studentdashboard.route.js
+++ b/qlsv_be/routes/users/studentdashboard.route.js
@@ -7,8 +7,14 @@ const thongtinDaoTao = require('../../controllers/users/thongtindt.controller');
 const tkb = require('../../controllers/users/tkb.controller');
 const bangdiem = require('../../controllers/users/bangdiem.controller');
 const lichthi = require('../../controllers/users/lichthi.controller');
-router.use('/thongtinsinhvien',thongtinSinhVien.dashboard);
-router.use('/thongtindaotao',thongtinDaoTao.dashboard);
+
+router.use('/thongtinsinhvien', thongtinSinhVien.dashboard);
+router.use('/thongtindaotao', thongtinDaoTao.dashboard);
+router.use('/tkb', tkb.dashboard);
+router.use('/bangdiem', bangdiem.dashboard);
+
+router.get('/lichthi', lichthi.getAllLichThi);
+router.get('/lichthi/:courseCode', lichthi.getLichThi);
 
 router.use('/tkb',tkb.dashboard);
 router.get('/lichthi',lichthi.getAllLichThi);
diff --git a/qlsv_be/routes/users/teacher.route.js b/qlsv_be/routes/users/teacher.route.js
index c5e0b26..8393840 100644
--- a/qlsv_be/routes/users/teacher.route.js
+++ b/qlsv_be/routes/users/teacher.route.js
@@ -1,16 +1,15 @@
 const express = require('express');
 const router = express.Router();
+const authenticate = require('../../middlewares/authenticate');
 const teacherController = require('../../controllers/users/teacher.controller');
 const teacherDashboard = require('./teacherdashboard.route');
 const { body } = require('express-validator');
-const verifyUser = require('../../middlewares/verify.user');
 
 // register route
-router.post('/register', [
-    body('name').notEmpty().withMessage('Name is required'),
+router.post('/changePassword', [
     body('email').isEmail().withMessage('Invalid email address'),
-    body('password').isLength({ min: 6 }).withMessage('Password must be at least 6 characters long'),
-], teacherController.register);
+    body('newPassword').isLength({ min: 6 }).withMessage('Password must be at least 6 characters long'),
+], teacherController.changePassword);
 
 // login route
 router.post('/login', [
@@ -18,7 +17,6 @@ router.post('/login', [
     body('password').notEmpty().withMessage('Password is required'),
 ], teacherController.login);
 
-router.use('/dashboard', teacherDashboard);
-
+router.use('/dashboard', authenticate, teacherDashboard);
 
 module.exports = router;
\ No newline at end of file
diff --git a/qlsv_be/routes/users/teacherdashboard.route.js b/qlsv_be/routes/users/teacherdashboard.route.js
index ecaa31a..4425082 100644
--- a/qlsv_be/routes/users/teacherdashboard.route.js
+++ b/qlsv_be/routes/users/teacherdashboard.route.js
@@ -1,8 +1,10 @@
 const express = require('express');
 const router = express.Router();
+const authenticate = require('../../middlewares/authenticate');
 const thongtinGiangVien = require('../../controllers/users/thongtingv.controller');
 const bangdieukhien = require('../../controllers/users/bangdieukhien.controller');
 
-router.use('/thongtingiangvien',thongtinGiangVien.dashboard);
-router.use('/bangdieukhien',bangdieukhien.dashboard);
+router.use('/thongtingiangvien', authenticate, thongtinGiangVien.dashboard);
+router.use('/bangdieukhien', authenticate, bangdieukhien.dashboard);
+
 module.exports = router;
\ No newline at end of file