Format code with prettier

.github/workflows/docker.yml

@@ -14,30 +14,30 @@ jobs:
       contents: write
 
     steps:
-    - uses: actions/checkout@v3
-      with:
+      - uses: actions/checkout@v3
+        with:
           ref: ${{ github.ref }}
 
-    - uses: isbang/[email protected]
-      with:
-        compose-file: "compose.yml"
-    
-    - name: Wait for containers to start
-      run: |
-        sleep 18
-        docker run \
-          --rm \
-          --network mercury-project_default \
-          alpine/curl -o /dev/null --retry 3 --retry-connrefused backend:5000
-
-    - name: Test the backend
-      run: cd backend; npm i && npm run test run
-
-    - name: Format files
-      run: cd ..; npm i && npm run prettier:fix
-
-    - name: Commit changes
-      uses: stefanzweifel/git-auto-commit-action@v4
-      with:
-        commit_message: Apply formatting changes
-        branch: ${{ github.head_ref }}
+      - uses: isbang/[email protected]
+        with:
+          compose-file: "compose.yml"
+
+      - name: Wait for containers to start
+        run: |
+          sleep 18
+          docker run \
+            --rm \
+            --network mercury-project_default \
+            alpine/curl -o /dev/null --retry 3 --retry-connrefused backend:5000
+
+      - name: Test the backend
+        run: cd backend; npm i && npm run test run
+
+      - name: Format files
+        run: cd ..; npm i && npm run prettier:fix
+
+      - name: Commit changes
+        uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          commit_message: Apply formatting changes
+          branch: ${{ github.head_ref }}

backend/src/data/users.ts

@@ -83,4 +83,4 @@ const userData = [
   },
 ];
 
-export default userData;
+export default userData;

backend/src/dtos/createMeeting.ts

@@ -1,4 +1,4 @@
 export default interface CreateMeetingDto {
-    ownerId: string;
-    guestId: string;
-}
+  ownerId: string;
+  guestId: string;
+}

backend/src/httpServer.ts

@@ -1,5 +1,5 @@
 import { sign, verify } from "jsonwebtoken";
-import {v4} from "uuid";
+import { v4 } from "uuid";
 import dotenv from "dotenv";
 import servers from "./server";
 import driver from "./driver/driver";
@@ -8,7 +8,7 @@ import authRouter from "./routes/authRoute";
 import importInitialData from "./data/importData";
 import CreateMeetingDto from "./dtos/createMeeting";
 
-const {app} = servers;
+const { app } = servers;
 
 dotenv.config();
 const linkSecret = process.env.LINK_SECRET;
@@ -19,52 +19,65 @@ app.use("/users", usersRouter);
 app.use("/auth", authRouter);
 
 app.post("/meeting", async (req, res) => {
-    try {
-        const {ownerId, guestId} = req.body as CreateMeetingDto;
-        const meetingId = v4();
-        const session = driver.session();
-        const newMeetingRequest = await session.run(`
+  try {
+    const { ownerId, guestId } = req.body as CreateMeetingDto;
+    const meetingId = v4();
+    const session = driver.session();
+    const newMeetingRequest = await session.run(
+      `
             MATCH (u1:User) WHERE u1.id=$ownerId
             MATCH (u2:User) WHERE u2.id=$guestId
             MATCH (u1)-[:IS_FRIENDS_WITH]-(u2)
             WHERE NOT (u1)-[:MEETING]-(u2)
             CREATE (u1)-[m:MEETING {meetingId: $meetingId}]->(u2)
             RETURN m
-        `, {ownerId, guestId, meetingId});
-        await session.close();
-        if (newMeetingRequest.records.length === 0) {
-            return res.status(404).json({ status: "error", errors: {message: "Cannot create new meeting"} });
-        }
-        const token = sign({ownerId, guestId, meetingId}, linkSecret!);
-        return res.json({token});      
-    } catch (err) {
-        console.log("Error:", err);
-        return res.status(404).json({ status: "error", errors: err as object });
+        `,
+      { ownerId, guestId, meetingId },
+    );
+    await session.close();
+    if (newMeetingRequest.records.length === 0) {
+      return res
+        .status(404)
+        .json({
+          status: "error",
+          errors: { message: "Cannot create new meeting" },
+        });
     }
+    const token = sign({ ownerId, guestId, meetingId }, linkSecret!);
+    return res.json({ token });
+  } catch (err) {
+    console.log("Error:", err);
+    return res.status(404).json({ status: "error", errors: err as object });
+  }
 });
 
 app.post("/decode", (req, res) => {
-    const {token} = req.body as {token: string};
-    const decodedData = verify(token, linkSecret!);
-    return res.json({decodedData});
+  const { token } = req.body as { token: string };
+  const decodedData = verify(token, linkSecret!);
+  return res.json({ decodedData });
 });
 
 app.get("/guest-token/:guestId", async (req, res) => {
-    try {
-        const guestId = req.params.guestId;
-        const session = driver.session();
-        const guestRequest = await session.run(`
+  try {
+    const guestId = req.params.guestId;
+    const session = driver.session();
+    const guestRequest = await session.run(
+      `
             MATCH (u:User) WHERE u.id=$guestId RETURN u
-        `,{guestId});
-        await session.close();
-        if (guestRequest.records.length === 0) {
-            return res.status(404).json({ status: "error", errors: {message: "User does not exist"} });
-        }
-        const guest = guestRequest.records[0].get(0).properties;
-        const token = sign(guest, linkSecret!);
-        return res.json({token});
-    } catch (err) {
-        console.log("Error:", err);
-        return res.status(404).json({ status: "error", errors: err as object });
+        `,
+      { guestId },
+    );
+    await session.close();
+    if (guestRequest.records.length === 0) {
+      return res
+        .status(404)
+        .json({ status: "error", errors: { message: "User does not exist" } });
     }
-});
+    const guest = guestRequest.records[0].get(0).properties;
+    const token = sign(guest, linkSecret!);
+    return res.json({ token });
+  } catch (err) {
+    console.log("Error:", err);
+    return res.status(404).json({ status: "error", errors: err as object });
+  }
+});

backend/src/index.ts

@@ -1,2 +1,2 @@
 import "./httpServer";
-import "./socketServer";
+import "./socketServer";

backend/src/misc/jwt.ts

@@ -36,11 +36,14 @@ export async function authenticateToken(
   }
 }
 
-export async function decodeSocketData(handshakeData: string, linkSecret:string) {
+export async function decodeSocketData(
+  handshakeData: string,
+  linkSecret: string,
+) {
   try {
     const decodedData = jwt.verify(handshakeData, linkSecret);
     return decodedData;
   } catch (_e) {
     return null;
   }
-}
+}

backend/src/models/User.ts

@@ -9,4 +9,4 @@ export default interface User {
   password: string;
   friend_ids?: number[];
   chats?: Chat[];
-}
+}

backend/src/server.ts

@@ -1,4 +1,4 @@
-import express, {Express} from "express";
+import express, { Express } from "express";
 import dotenv from "dotenv";
 import cors from "cors";
 import { Server as SocketServer } from "socket.io";
@@ -8,25 +8,29 @@ import cookieParser from "cookie-parser";
 dotenv.config();
 
 const corsOptions = {
-    origin: ["http://localhost:5000", "http://localhost:5173"],
-    optionsSuccessStatus: 200,
+  origin: ["http://localhost:5000", "http://localhost:5173"],
+  optionsSuccessStatus: 200,
 };
 
 const app: Express = express();
 const port: number = 5000;
 
 app.use(cors(corsOptions));
 app.use((_req, res, next) => {
-    res.header("Access-Control-Allow-Methods", "GET, PUT, POST, DELETE");
-    res.header("Access-Control-Allow-Headers", "Content-Type");
-    next();
+  res.header("Access-Control-Allow-Methods", "GET, PUT, POST, DELETE");
+  res.header("Access-Control-Allow-Headers", "Content-Type");
+  next();
 });
 app.use(cookieParser());
 app.use(express.json());
 
 const expressServer = createServer(app);
-const io = new SocketServer(expressServer, {cors: {origin: ["http://localhost:5173"]}});
+const io = new SocketServer(expressServer, {
+  cors: { origin: ["http://localhost:5173"] },
+});
 
-expressServer.listen(port, () => console.log(`HTTP server running on port ${port}`));
+expressServer.listen(port, () =>
+  console.log(`HTTP server running on port ${port}`),
+);
 
-export default {expressServer, io, app}
+export default { expressServer, io, app };

backend/src/socketServer.ts

@@ -1,18 +1,17 @@
 import servers from "./server";
 import dotenv from "dotenv";
 import { Socket } from "socket.io";
-import {decodeSocketData} from "./misc/jwt";
-const {io, app} = servers;
+import { decodeSocketData } from "./misc/jwt";
+const { io, app } = servers;
 
 dotenv.config();
 const linkSecret = process.env.LINK_SECRET;
 
 io.on("connection", (socket: Socket) => {
-    const handshakeData = socket.handshake.auth.jwt;
-    const decodedData = decodeSocketData(handshakeData, linkSecret!);
-    if (!decodedData) {
-        socket.disconnect();
-        return;
-    }
-
-});
+  const handshakeData = socket.handshake.auth.jwt;
+  const decodedData = decodeSocketData(handshakeData, linkSecret!);
+  if (!decodedData) {
+    socket.disconnect();
+    return;
+  }
+});

compose.yml

@@ -16,7 +16,7 @@ services:
     build: ./frontend
     ports:
       - 5173:80
-      
+
   backend:
     build: ./backend
     env_file:

frontend/src/components/ProfilePageForm.tsx

@@ -94,10 +94,16 @@ function ProfilePageForm(props: ProfilePageFormProps) {
           </p>
           <ul>
             Friends:{" "}
-            {props.friends.map(f => <li key={f.id}>
-              <h3>{f.first_name} {f.last_name}</h3>
-              <button onClick={() => console.log("meeting")}>launch meeting</button>
-            </li>)}
+            {props.friends.map((f) => (
+              <li key={f.id}>
+                <h3>
+                  {f.first_name} {f.last_name}
+                </h3>
+                <button onClick={() => console.log("meeting")}>
+                  launch meeting
+                </button>
+              </li>
+            ))}
           </ul>
         </div>
         <div className="my-5">

frontend/src/pages/ProfilePage.tsx

@@ -38,9 +38,13 @@ function ProfilePage() {
 
   useEffect(() => {
     const fetchFriends = async () => {
-      const friendsResponse = await dataService.fetchData(`/users/${userId}/friends`,"GET",{});
+      const friendsResponse = await dataService.fetchData(
+        `/users/${userId}/friends`,
+        "GET",
+        {},
+      );
       setFriends(friendsResponse.friends);
-    }
+    };
     fetchFriends();
   }, []);
 

frontend/src/services/data.ts

@@ -1,18 +1,16 @@
 class DataService {
-
   private url: string = "http://localhost:5000";
-  
+
   async fetchData(endpoint: string, method: string, options = {}) {
-      try {
-          const response = await fetch(this.url + endpoint, { ...options, method });
-          const data = await response.json();
-          return data;
-        } catch (error) {
-          console.error("Error ocurred during fetch data:", error);
-          throw error;
-        }
+    try {
+      const response = await fetch(this.url + endpoint, { ...options, method });
+      const data = await response.json();
+      return data;
+    } catch (error) {
+      console.error("Error ocurred during fetch data:", error);
+      throw error;
+    }
   }
-
 }
 
 export default new DataService();