Fixed several issues and added favicon.ico

Author: JoshKrav

Diff for: app.ts

@@ -3,7 +3,7 @@ import Server from "./src/Server";
 import { HttpResponse, makeHttpRequest } from "./tests/client";
 
 const sql = postgres({
-	database: "TodoDB",
+	database: "MyDB",
 });
 
 const server = new Server({

Diff for: favicon.ico

@@ -7,6 +7,10 @@ import postgres from "postgres";
 import fs from "fs/promises";
 import SessionManager from "./auth/SessionManager";
 import Cookie from "./auth/Cookie";
+import AuthController from "./controllers/AuthController";
+import PokemonController from "./controllers/PokemonController";
+import TeamController from "./controllers/TeamController";
+import UserController from "./controllers/UserController";
 
 /**
  * Options for creating a new Server instance.
@@ -30,8 +34,10 @@ export default class Server {
 	private server: http.Server;
 	private sql: postgres.Sql;
 	private router: Router;
-	private controller: Controller;
-
+	private authController: AuthController;
+	private pokemonController: PokemonController;
+	private teamController:TeamController;
+	private userController:UserController;
 	/**
 	 * Initializes a new Server instance. The server is not started until the `start` method is called.
 	 * @param serverOptions The options for creating a new Server instance.
@@ -43,9 +49,17 @@ export default class Server {
 		this.port = serverOptions.port;
 
 		this.router = new Router();
-		this.controller = new Controller(this.sql);
+		this.authController = new AuthController(this.sql);
+		this.pokemonController = new PokemonController(this.sql);
+		this.teamController = new TeamController(this.sql);
+		this.userController = new UserController(this.sql);
+
+		this.authController.registerRoutes(this.router);
+		this.pokemonController.registerRoutes(this.router);
+		this.teamController.registerRoutes(this.router);
+		this.authController.registerRoutes(this.router);
+		this.userController.registerRoutes(this.router);
 
-		this.controller.registerRoutes(this.router);
 
 		this.router.get("/", (req: Request, res: Response) => {
 			res.send({

Diff for: src/Server.ts

@@ -32,7 +32,7 @@ export default class AuthController {
 				payload:{error: params.get("error")},
 				template:"RegistrationView"
 			});
-		}
+		} 
 		else{
 			await res.send({
 				statusCode: StatusCode.OK,

Diff for: src/controllers/AuthController.ts

@@ -8,7 +8,7 @@ import Router from "../router/Router";
  * Routes are registered in the `registerRoutes` method.
  * Each method should be called when a request is made to the corresponding route.
  */
-export default class Controller {
+export default class PokemonController {
 	private sql: postgres.Sql<any>;
 
 	constructor(sql: postgres.Sql<any>) {

Diff for: src/controllers/PokemonController.ts

@@ -8,7 +8,7 @@ import Router from "../router/Router";
  * Routes are registered in the `registerRoutes` method.
  * Each method should be called when a request is made to the corresponding route.
  */
-export default class Controller {
+export default class TeamController {
 	private sql: postgres.Sql<any>;
 
 	constructor(sql: postgres.Sql<any>) {

Diff for: src/controllers/TeamController.ts

@@ -151,7 +151,7 @@ export default class Request {
 
 		if (!session) {
 			session = SessionManager.getInstance().createSession();
-			this.cookies.push(session.getCookie());
+			this.cookies.push(session.cookie);
 		}
 
 		return session;

Diff for: src/router/Request.ts

@@ -13,6 +13,8 @@
 		<nav>
 			<ul>
 				<li><a href="{{ path '' }}">Home</a></li>
+				<li><a href="{{ path 'login' }}">login</a></li>
+				<li><a href="{{ path 'register' }}">register</a></li>
 			</ul>
 		</nav>
 	</header>

Diff for: src/views/Header.hbs

@@ -1,5 +1,5 @@
 {{> Header }}
 
-<h1></h1>
+<h1>PokePC</h1>
 
 {{> Footer }}

Diff for: src/views/HomeView.hbs

@@ -0,0 +1,25 @@
+{{> Header}}
+
+<h1>Login</h1>
+
+<p id="error">{{error}}</p>
+<form id="login-form" method="POST" action="/login">
+	<div>
+		<label for="email">Email:</label>
+		{{#if hasEmail}}
+		<input type="text" id="email" name="email" value={{email}}/>
+		{{else}}
+		<input type="text" id="email" name="email"/>
+		{{/if}}
+	</div>
+
+	<div>
+		<label for="password">Password:</label>
+		<input type="text" id="password" name="password"/>
+	</div>
+	<label for="remember">Remember me:</label>
+    <input type="checkbox" id="remember" name="remember">
+	<button id="login-form-submit-button">Submit</button>
+</form>
+
+{{> Footer}}

Diff for: src/views/LoginView.hbs

@@ -0,0 +1,24 @@
+{{> Header}}
+
+<h1>Create User</h1>
+
+<p id="error">{{error}}</p>
+<form id="register-form" method="POST" action="/users">
+	<div>
+		<label for="email">Email:</label>
+		<input type="text" id="email" name="email" />
+	</div>
+
+	<div>
+		<label for="password">Password:</label>
+		<input type="text" id="password" name="password"/>
+	</div>
+    <div>
+		<label for="confirmPassword">Confirm Password:</label>
+		<input type="text" id="confirmPassword" name="confirmPassword"/>
+	</div>
+
+	<button id="register-form-submit-button">Submit</button>
+</form>
+
+{{> Footer}}