Merge branch 'main' into Login/Signup-Frontend

maingockien01 · Feb 27, 2024 · a997727 · a997727
2 parents 7e47af2 + 05b7a97
commit a997727
Show file tree

Hide file tree

Showing 8 changed files with 81 additions and 29 deletions.
diff --git a/apps/SQL queries/user_sections_section.sql b/apps/SQL queries/user_sections_section.sql
@@ -0,0 +1,36 @@
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8mb4 */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+
+INSERT INTO `user_sections_section` (`userUid`, `sectionSid`) VALUES
+(1, 3);
+INSERT INTO `user_sections_section` (`userUid`, `sectionSid`) VALUES
+(1, 10);
+INSERT INTO `user_sections_section` (`userUid`, `sectionSid`) VALUES
+(1, 20);
+INSERT INTO `user_sections_section` (`userUid`, `sectionSid`) VALUES
+(2, 1),
+(2, 2),
+(2, 3),
+(3, 4),
+(3, 5),
+(3, 6),
+(4, 7),
+(4, 8),
+(4, 9),
+(5, 10),
+(5, 11),
+(5, 12);
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
diff --git a/apps/backend/src/auth/auth.controller.ts b/apps/backend/src/auth/auth.controller.ts
@@ -1,7 +1,15 @@
-import { Body, Controller, Post, HttpCode, HttpStatus } from '@nestjs/common';
+import {
+	Body,
+	Controller,
+	Post,
+	HttpCode,
+	HttpStatus,
+	Res,
+} from '@nestjs/common';
 import { AuthService } from './auth.service';
 import { LogInDto } from '@team8/types/dtos/auth/login.dto';
 import { SignUpDto } from '@team8/types/dtos/auth/signup.dto';
+import { Response } from 'express';
 
 @Controller()
 export class AuthController {
@@ -14,7 +22,15 @@ export class AuthController {
 
 	@HttpCode(HttpStatus.OK)
 	@Post('login')
-	logIn(@Body() logInDto: LogInDto) {
-		return this.authService.logIn(logInDto);
+	async logIn(
+		@Body() logInDto: LogInDto,
+		@Res({ passthrough: true }) response: Response,
+	) {
+		const user = await this.authService.logIn(logInDto);
+		response.cookie('uid', user.uid);
+		response.cookie('username', user.username);
+		return {
+			message: 'success',
+		};
 	}
 }
diff --git a/apps/backend/src/auth/auth.service.ts b/apps/backend/src/auth/auth.service.ts
@@ -8,6 +8,7 @@ import {
 } from '@team8/types/dtos/auth';
 import * as bcrypt from 'bcrypt';
 import { CreateUserDto } from './createUser.dto';
+import { User } from '../entities/user.entity';
 
 @Injectable()
 export class AuthService {
@@ -23,16 +24,16 @@ export class AuthService {
 		return result;
 	}
 
-	async logIn(dto: LogInDto): Promise<LogInRetDto> {
+	async logIn(dto: LogInDto): Promise<User> {
 		//TODO: Return message according to error
 		const user = await this.usersService.findOneByUsername(dto.username);
 		if (!(await bcrypt.compare(dto.password, user.hashPassword))) {
 			throw new UnauthorizedException();
 		}
-		const result = new LogInRetDto();
-		result.username = user.username;
+		// const result = new LogInRetDto();
+		// result.username = user.username;
 		// TODO: Generate a JWT and return it here
 		// instead of the user object
-		return result;
+		return user;
 	}
 }
diff --git a/apps/frontend/src/App.tsx b/apps/frontend/src/App.tsx
@@ -4,11 +4,11 @@ import { APPS_NAME } from '@team8/constants/apps';
 import MainScreen from './Screens/MainScreen';
 import Calendar from './Screens/Calendar';
 import AddDropCourses from './Screens/AddDropCourses';
-import CoursesLookUp from './Screens/CoursesLookUp';
 import Roadmap from './Screens/Roadmap';
-import { BrowserRouter as Router, Routes, Route } from 'react-router-dom';
+import { Routes, Route } from 'react-router-dom';
 import LookUpScreen from './Screens/LookUpScreen';
 import CoursesScreen from './Screens/CoursesScreen';
+import Navbar from "./Components/Navbar";
 import LoginScreen from './Screens/LoginScreen';
 
 const App = () => {
@@ -19,9 +19,12 @@ const App = () => {
 			<Router>
 				{isLoggedIn ? (
 					<Routes>
-						<Route index={true} path="/" element={<MainScreen />} />
-						<Route path="/lookup" element={<LookUpScreen />} />
-						<Route path="/courses" element={<CoursesScreen />} />
+						<Route index={true} path="/" element={<MainScreen/>} />
+            <Route path="/lookup" element={<LookUpScreen/>}/>
+            <Route path='/courses' element={<CoursesScreen/>}/>
+            <Route path="/add-drop" element={<AddDropCourses/>}/>
+            <Route path="/calendar" element={<Calendar/>}/>
+            <Route path="/roadmap" element={<Roadmap/>}/>
 					</Routes>
 				) : (
 					<Routes>
@@ -37,6 +40,7 @@ const App = () => {
 	};
 
 	return (
+    <Navbar/>
 		<div className="App">
 			<Index />
 		</div>

diff --git a/apps/frontend/src/Components/Navbar.tsx b/apps/frontend/src/Components/Navbar.tsx
@@ -114,13 +114,21 @@ const Navbar = () => {
                 </Toolbar>
                 <Divider sx={{bgcolor:"black"}}></Divider>
                 <Toolbar sx={{justifyContent:"space-between"}}>
-                    <ColorButton variant="contained">Home</ColorButton>
+                    <Link to="/">
+                      <ColorButton variant="contained">Home</ColorButton>
+                    </Link>
                     <Link to='/lookup'>
                       <ColorButton variant="contained">Courses Look Up</ColorButton>
                     </Link>
-                    <ColorButton variant="contained">Add/Drop Courses</ColorButton>
-                    <ColorButton variant="contained">Calendar</ColorButton>
-                    <ColorButton variant="contained">Roadmap</ColorButton>
+                    <Link to="/add-drop">
+                      <ColorButton variant="contained">Add/Drop Courses</ColorButton>
+                    </Link>
+                    <Link to="/calendar">
+                      <ColorButton variant="contained">Calendar</ColorButton>
+                    </Link>
+                    <Link to="/roadmap">
+                      <ColorButton variant="contained">Roadmap</ColorButton>
+                    </Link>
                 </Toolbar>
             </Stack>
         </Container>

diff --git a/apps/frontend/src/Screens/CoursesLookUp.tsx b/apps/frontend/src/Screens/CoursesLookUp.tsx
diff --git a/apps/frontend/src/Screens/CoursesScreen.tsx b/apps/frontend/src/Screens/CoursesScreen.tsx
@@ -10,7 +10,6 @@ const CoursesScreen = () => {
 
     return (
         <>
-        <Navbar/>
         <Container maxWidth="lg" sx={{mt: 2}}>
             <div>
                 {courses.map((course) => (

diff --git a/apps/frontend/src/Screens/LookUpScreen.tsx b/apps/frontend/src/Screens/LookUpScreen.tsx
@@ -44,7 +44,6 @@ const LookUpScreen = () => {
 
   return (
     <>
-    <Navbar/>
     <Container maxWidth="lg" sx={{mt: 2}}>
       <Grid container sx={{border: '1px solid black'}}>
         <Grid item xs={6}>