Merge branch 'feature/test'

backend/server.js

@@ -16,7 +16,7 @@ app.use(cookieParser());
 app.use("/api", router);
 
 app.listen(port, () => {
-  console.log(`Express backend server is running at http://45.133.75.67:5002:${port}`);
+  console.log(`Express backend server is running at http://localhost:${port}`);
 });
 
 // error handling code

docker-compose.yml

@@ -1,42 +1,33 @@
 services:
-  admin_react-frontend:
+  #  admin_react-frontend:
-    container_name: bikelane-frontend_react-admin
+  #    container_name: bikelane-frontend_react-admin
-    build: ./frontend_admin
+  #    build: ./frontend_admin
-    ports:
+  #    ports:
-      - "5001:5001"
+  #      - "5001:5001"
-    networks:
+  #    environment:
-      - proxynet
+  #      - CHOKIDAR_USEPOLLING=true
-      - bikelane_network
+  #    volumes:
-    environment:
+  #      - ./frontend_admin:/app
-      - CHOKIDAR_USEPOLLING=true
+  #      - /app/node_modules
-    volumes:
+  #    restart: unless-stopped
-      - ./frontend_admin:/app
-      - /app/node_modules
-    restart: unless-stopped
 
-  user_react-frontend:
+  #  user_react-frontend:
-    container_name: bikelane-frontend_react-user
+  #    container_name: bikelane-frontend_react-user
-    build: ./frontend_user
+  #    build: ./frontend_user
-    networks:
+  #    ports:
-      - proxynet
+  #      - "5003:5003"
-      - bikelane_network
+  #    environment:
-    ports:
+  #      - CHOKIDAR_USEPOLLING=true
-      - "5003:5003"
+  #    volumes:
-    environment:
+  #      - ./frontend_user:/app
-      - CHOKIDAR_USEPOLLING=true
+  #      - /app/node_modules
-    volumes:
+  #    restart: unless-stopped
-      - ./frontend_user:/app
-      - /app/node_modules
-    restart: unless-stopped
 
   bikelane-backend:
     container_name: bikelane-backend_express
     build: ./backend
     ports:
       - "5002:5002"
-    networks:
-      - proxynet
-      - bikelane_network
     environment:
       DB_HOST: mysql
       DB_USER: root
@@ -52,8 +43,6 @@ services:
     container_name: bikelane-mysql
     image: mysql:8.0
     restart: unless-stopped
-    networks:
-      - bikelane_network
     environment:
       MYSQL_ROOT_PASSWORD: D7Ze0lwV9hMrNQHdz1Q8yi0MIQuOO8
       MYSQL_DATABASE: bikelane
@@ -64,9 +53,3 @@ services:
 
 volumes:
   mysql-data:
-
-networks:
-  proxynet:
-    external: true
-  bikelane_network:
-    external: false

frontend_admin/.env

@@ -1 +1 @@
-REACT_APP_SERVER_URL=http://45.133.75.67
+REACT_APP_SERVER_URL=http://localhost:5002

frontend_admin/src/App.tsx

@@ -6,6 +6,8 @@ import { useEffect, useState } from "react";
 import { loadTheme } from "./utils/frontendService";
 import { myToast } from "./utils/frontendService";
 import "react-toastify/dist/ReactToastify.css";
+import Cookies from "js-cookie";
+import { AuthContext } from "./utils/context";
 
 function App() {
   useEffect(() => {

frontend_admin/src/utils/userHandler.ts

@@ -1,37 +1,26 @@
 import Cookies from "js-cookie";
 import { myToast } from "./frontendService";
 
-export const loginUser = (username: string, password: string) => {
+export const loginUser = async (
-  fetch("http://localhost:5002/api/login", {
+  username: string,
-    method: "POST",
+  password: string
-    headers: { "Content-Type": "application/json" },
+): Promise<boolean> => {
-    body: JSON.stringify({ username, password }),
+  try {
-  })
+    const response = await fetch("http://localhost:5002/api/login", {
-    .then(async (response) => {
+      method: "POST",
-      if (response.ok) {
+      headers: { "Content-Type": "application/json" },
-        const data = await response.json();
+      body: JSON.stringify({ username, password }),
-        Cookies.set("token", data.token, { expires: 7 });
-        Cookies.set("name", data.user.first_name, { expires: 7 });
-        await fetch("http://localhost:5002/api/getAllUsers", {
-          method: "GET",
-          headers: {
-            Authorization: `Bearer ${Cookies.get("token")}`,
-          },
-        })
-          .then((res) => res.json())
-          .then((users) => {
-            localStorage.setItem("users", JSON.stringify(users));
-          });
-        myToast("Logged in successfully!", "success");
-      } else if (response.status === 401) {
-        myToast("Invalid username or password!", "error");
-      } else if (response.status === 403) {
-        myToast("You are not an Admin!", "error");
-      }
-    })
-    .catch((error) => {
-      console.log("Login failed: ", error);
     });
+    if (response.ok) {
+      const data = await response.json();
+      Cookies.set("token", data.token); // Set cookie here
+      Cookies.set("username", username); // Set username cookie
+      return true;
+    }
+    return false;
+  } catch {
+    return false;
+  }
 };
 
 export const logout = () => {
@@ -42,7 +31,7 @@ export const logout = () => {
 };
 
 export const deleteUser = (id: number) => {
-  fetch("http://45.133.75.67:5002/api/deleteUser", {
+  fetch("http://localhost:5002/api/deleteUser", {
     method: "POST",
     body: JSON.stringify({ id: id }),
     headers: {
@@ -64,7 +53,7 @@ export const deleteUser = (id: number) => {
 
 export const replaceUsers = async (alertMessage: string) => {
   localStorage.removeItem("users");
-  await fetch("http://45.133.75.67:5002/api/getAllUsers", {
+  await fetch("http://localhost:5002/api/getAllUsers", {
     method: "GET",
     headers: {
       Authorization: `Bearer ${Cookies.get("token")}`,
@@ -115,7 +104,7 @@ export const updateUserFunc = async (userID: number) => {
   console.log("Sending user data:", userData);
 
   try {
-    const response = await fetch("http://45.133.75.67:5002/api/updateUser", {
+    const response = await fetch("http://localhost:5002/api/updateUser", {
       method: "POST",
       body: JSON.stringify(userData),
       headers: {

scheme.sql

@@ -11,51 +11,8 @@ CREATE TABLE users (
 );
 
 -- Mock data for users
-INSERT INTO users (username, first_name, last_name, email, password, role)
-VALUES 
-('t', 'John', 'Doe', 'd@example.com', 'g', 'admin');
-
 INSERT INTO users (username, first_name, last_name, email, password)
 VALUES 
 ('test1', 'John', 'Doe', 'jdoe@example.com', '1test'),
-('test2', 'Alice', 'Smith', 'asmith@example.com', '2test'),
+('t', 'John', 'Doe', 'd@example.com', 'g'),
-('test3', 'Bob', 'Johnson', 'bjohnson@example.com', '3test'),
+('test2', 'Alice', 'Smith', 'asmith@example.com', '2test');
-('test4', 'Carol', 'Williams', 'cwilliams@example.com', '4test'),
-('test5', 'David', 'Brown', 'dbrown@example.com', '5test'),
-('test6', 'Eve', 'Davis', 'edavis@example.com', '6test'),
-('test7', 'Frank', 'Miller', 'fmiller@example.com', '7test'),
-('test8', 'Grace', 'Wilson', 'gwilson@example.com', '8test'),
-('test9', 'Hank', 'Moore', 'hmoore@example.com', '9test'),
-('test10', 'Ivy', 'Taylor', 'itaylor@example.com', '10test'),
-('test11', 'Jack', 'Anderson', 'janderson@example.com', '11test'),
-('test12', 'Kathy', 'Thomas', 'kthomas@example.com', '12test'),
-('test13', 'Leo', 'Jackson', 'ljackson@example.com', '13test'),
-('test14', 'Mona', 'White', 'mwhite@example.com', '14test'),
-('test15', 'Nina', 'Harris', 'nharris@example.com', '15test'),
-('test16', 'Oscar', 'Martin', 'omartin@example.com', '16test'),
-('test17', 'Paul', 'Thompson', 'pthompson@example.com', '17test'),
-('test18', 'Quinn', 'Garcia', 'qgarcia@example.com', '18test'),
-('test19', 'Rita', 'Martinez', 'rmartinez@example.com', '19test'),
-('test20', 'Sam', 'Robinson', 'srobinson@example.com', '20test'),
-('test21', 'Tina', 'Clark', 'tclark@example.com', '21test'),
-('test22', 'Uma', 'Rodriguez', 'urodriguez@example.com', '22test'),
-('test23', 'Vince', 'Lewis', 'vlewis@example.com', '23test'),
-('test24', 'Wendy', 'Lee', 'wlee@example.com', '24test'),
-('test25', 'Xander', 'Walker', 'xwalker@example.com', '25test'),
-('test26', 'Yara', 'Hall', 'yhall@example.com', '26test'),
-('test27', 'Zane', 'Allen', 'zallen@example.com', '27test'),
-('test28', 'Amy', 'Young', 'ayoung@example.com', '28test'),
-('test29', 'Ben', 'King', 'bking@example.com', '29test'),
-('test30', 'Cathy', 'Wright', 'cwright@example.com', '30test'),
-('test31', 'Dan', 'Scott', 'dscott@example.com', '31test'),
-('test32', 'Ella', 'Green', 'egreen@example.com', '32test'),
-('test33', 'Finn', 'Baker', 'fbaker@example.com', '33test'),
-('test34', 'Gina', 'Adams', 'gadams@example.com', '34test'),
-('test35', 'Hugo', 'Nelson', 'hnelson@example.com', '35test'),
-('test36', 'Iris', 'Carter', 'icarter@example.com', '36test'),
-('test37', 'Jake', 'Mitchell', 'jmitchell@example.com', '37test'),
-('test38', 'Kara', 'Perez', 'kperez@example.com', '38test'),
-('test39', 'Liam', 'Roberts', 'lroberts@example.com', '39test'),
-('test40', 'Mia', 'Turner', 'mturner@example.com', '40test'),
-('test41', 'Noah', 'Phillips', 'nphillips@example.com', '41test'),
-('test42', 'Olga', 'Campbell', 'ocampbell@example.com', '42test');