From 4428e0587975c490ac20422d086573da232f94fc Mon Sep 17 00:00:00 2001 From: gf-rog Date: Thu, 16 May 2024 14:38:43 +0000 Subject: [PATCH] Apply formatting --- backend/src/httpServer.ts | 10 ++--- backend/src/importDb.ts | 3 +- backend/src/index.ts | 4 +- backend/src/meetings.ts | 1 + backend/src/misc/fetchData.ts | 4 +- backend/src/misc/formatError.ts | 1 + backend/src/misc/jwt.ts | 11 ++--- backend/src/models/ChangePasswordReq.ts | 1 + backend/src/models/NativeUser.ts | 2 +- backend/src/models/Response.ts | 4 +- backend/src/models/User.ts | 2 +- backend/src/models/routes/Page.ts | 2 +- backend/src/models/routes/Search.ts | 5 ++- backend/src/mongoDB/MessageModel.ts | 1 + backend/src/routes/authRoute.ts | 12 +++--- backend/src/routes/chatRoute.ts | 7 ++-- backend/src/routes/userFriendsRoute.ts | 41 ++++++++++--------- backend/src/routes/usersRoute.ts | 37 +++++++++-------- backend/src/socketServer.ts | 26 ++++++------ backend/src/types/authResponse.ts | 4 +- backend/src/types/userResponse.ts | 12 +++--- backend/src/userFriends.ts | 1 + backend/src/users.ts | 21 +++++----- backend/test/chat.test.ts | 1 + backend/test/unit.test.ts | 19 ++++----- backend/test/userCRUD.test.ts | 1 + backend/test/userFriendRequests.test.ts | 1 + backend/test/userFriendSuggestions.test.ts | 3 +- backend/test/userFriends.test.ts | 1 + backend/test/userSearch.test.ts | 1 + frontend/src/components/Banner.tsx | 2 +- frontend/src/components/ChatBox.tsx | 10 ++--- frontend/src/components/EditDetails.tsx | 9 ++-- frontend/src/components/EditPassword.tsx | 9 ++-- frontend/src/components/EditPhoto.tsx | 3 +- frontend/src/components/FoundUser.tsx | 5 ++- frontend/src/components/Friend.tsx | 7 ++-- frontend/src/components/FriendRequest.tsx | 1 + frontend/src/components/LoginBox.tsx | 4 +- frontend/src/components/Modal.tsx | 2 +- frontend/src/components/Navbar.tsx | 12 +++--- frontend/src/components/PaginatorV2.tsx | 1 + frontend/src/components/Profile.tsx | 3 +- frontend/src/components/RegisterBox.tsx | 13 +++--- frontend/src/components/Search.tsx | 1 + frontend/src/components/Transition.tsx | 2 +- frontend/src/helpers/KeycloakUserProvider.tsx | 13 +++--- frontend/src/helpers/MeetingProvider.tsx | 1 + frontend/src/helpers/Protected.tsx | 3 +- frontend/src/helpers/RestUserProvider.tsx | 13 +++--- frontend/src/helpers/UserContext.tsx | 1 + frontend/src/layout/Reasons.tsx | 6 +-- frontend/src/layout/Technologies.tsx | 1 + frontend/src/layout/WelcomeMessage.tsx | 3 +- frontend/src/main.tsx | 4 +- frontend/src/models/RegisterUserSchema.ts | 3 +- frontend/src/pages/EditDataPage.tsx | 7 ++-- frontend/src/pages/FriendsPage.tsx | 17 ++++---- frontend/src/pages/HomePage.tsx | 4 +- frontend/src/pages/LoginPage.tsx | 5 ++- frontend/src/pages/MessagingPage.tsx | 6 +-- frontend/src/pages/PageNotFound.tsx | 1 + frontend/src/pages/ProfilePage.tsx | 5 ++- frontend/src/pages/RegisterPage.tsx | 5 ++- frontend/src/pages/SearchPage.tsx | 14 +++---- frontend/src/pages/VideoCallPage.tsx | 21 +++++----- frontend/src/redux/store.ts | 1 + frontend/vite.config.ts | 2 +- 68 files changed, 250 insertions(+), 209 deletions(-) diff --git a/backend/src/httpServer.ts b/backend/src/httpServer.ts index c9b69a91..258b25fc 100644 --- a/backend/src/httpServer.ts +++ b/backend/src/httpServer.ts @@ -1,12 +1,12 @@ -import express from "express"; -import cors from "cors"; -import cookieParser from "cookie-parser"; - import { createServer } from "node:http"; -import usersRouter from "./routes/usersRoute.js"; +import cookieParser from "cookie-parser"; +import cors from "cors"; +import express from "express"; + import authRouter from "./routes/authRoute.js"; import chatRouter from "./routes/chatRoute.js"; +import usersRouter from "./routes/usersRoute.js"; const app = express(); const port: number = 5000; diff --git a/backend/src/importDb.ts b/backend/src/importDb.ts index 7f08d6bf..28c09b3b 100644 --- a/backend/src/importDb.ts +++ b/backend/src/importDb.ts @@ -1,8 +1,7 @@ import driver from "./driver.js"; - import userData from "./userData.js"; -import { registerUser, registerUserSchema } from "./users.js"; import { addFriend } from "./userFriends.js"; +import { registerUser, registerUserSchema } from "./users.js"; export async function isDatabaseEmpty() { const session = driver.session(); diff --git a/backend/src/index.ts b/backend/src/index.ts index 92d29828..ef86d879 100644 --- a/backend/src/index.ts +++ b/backend/src/index.ts @@ -1,12 +1,12 @@ import "dotenv/config"; - import "./httpServer.js"; import "./socketServer.js"; import "./kcAdminClient.js"; -import { cleanUpData, importInitialData } from "./importDb.js"; import { connect } from "mongoose"; +import { cleanUpData, importInitialData } from "./importDb.js"; + cleanUpData(); importInitialData().then((res) => console.log(res)); diff --git a/backend/src/meetings.ts b/backend/src/meetings.ts index 317ef34b..ec346ab1 100644 --- a/backend/src/meetings.ts +++ b/backend/src/meetings.ts @@ -1,5 +1,6 @@ import { Session } from "neo4j-driver"; import { v4 as uuidv4 } from "uuid"; + import Meeting from "./models/Meeting.js"; export async function isInMeeting(session: Session, userId: string) { diff --git a/backend/src/misc/fetchData.ts b/backend/src/misc/fetchData.ts index ea2bad3a..4b2d161f 100644 --- a/backend/src/misc/fetchData.ts +++ b/backend/src/misc/fetchData.ts @@ -7,8 +7,8 @@ export const fetchData = async ( if (token) { options.headers = { ...options.headers, - "Authorization": `Bearer ${token}` - } + "Authorization": `Bearer ${token}`, + }; } try { diff --git a/backend/src/misc/formatError.ts b/backend/src/misc/formatError.ts index c00c1c00..3682afc3 100644 --- a/backend/src/misc/formatError.ts +++ b/backend/src/misc/formatError.ts @@ -1,4 +1,5 @@ import { ZodError } from "zod"; + import { Errors } from "../models/Response.js"; export function formatError(error: ZodError): Errors { diff --git a/backend/src/misc/jwt.ts b/backend/src/misc/jwt.ts index 9031f43b..2c388abe 100644 --- a/backend/src/misc/jwt.ts +++ b/backend/src/misc/jwt.ts @@ -1,14 +1,15 @@ -import { Request, Response, NextFunction } from "express"; +import { NextFunction, Request, Response } from "express"; import jwt from "jsonwebtoken"; -import { AuthResponse, CustomResponse } from "../models/Response.js"; -import DecodedData from "../models/DecodedData.js"; -import Issuer from "../models/Issuer.js"; -import TokenPayload from "../models/TokenPayload.js"; + import { keycloakCredentials, keycloakIssuer, keycloakUri, } from "../kcAdminClient.js"; +import DecodedData from "../models/DecodedData.js"; +import Issuer from "../models/Issuer.js"; +import { AuthResponse, CustomResponse } from "../models/Response.js"; +import TokenPayload from "../models/TokenPayload.js"; export interface JWTRequest extends Request { token?: TokenPayload; diff --git a/backend/src/models/ChangePasswordReq.ts b/backend/src/models/ChangePasswordReq.ts index 04665b5c..a55534e6 100644 --- a/backend/src/models/ChangePasswordReq.ts +++ b/backend/src/models/ChangePasswordReq.ts @@ -1,4 +1,5 @@ import { z } from "zod"; + import { userPasswordSchema } from "./User.js"; type ChangePasswordReq = diff --git a/backend/src/models/NativeUser.ts b/backend/src/models/NativeUser.ts index 471733c7..3730d888 100644 --- a/backend/src/models/NativeUser.ts +++ b/backend/src/models/NativeUser.ts @@ -1,4 +1,4 @@ -import { ZodType, z } from "zod"; +import { z, ZodType } from "zod"; type NativeUser = { password: string; diff --git a/backend/src/models/Response.ts b/backend/src/models/Response.ts index 7c6f2bea..36005773 100644 --- a/backend/src/models/Response.ts +++ b/backend/src/models/Response.ts @@ -1,8 +1,8 @@ +import { Response } from "express"; + import Message from "./Message.js"; import User from "./User.js"; -import { Response } from "express"; - type Send = (body?: J) => T; export interface CustomResponse extends Response { diff --git a/backend/src/models/User.ts b/backend/src/models/User.ts index 836a8ad6..5d12d17f 100644 --- a/backend/src/models/User.ts +++ b/backend/src/models/User.ts @@ -1,4 +1,4 @@ -import { ZodType, z } from "zod"; +import { z, ZodType } from "zod"; export default interface User { id: string; diff --git a/backend/src/models/routes/Page.ts b/backend/src/models/routes/Page.ts index 259afee9..b436bbea 100644 --- a/backend/src/models/routes/Page.ts +++ b/backend/src/models/routes/Page.ts @@ -1,4 +1,4 @@ -import { ZodType, z } from "zod"; +import { z, ZodType } from "zod"; interface Page { page: string | number; diff --git a/backend/src/models/routes/Search.ts b/backend/src/models/routes/Search.ts index 38b51b71..476ff38b 100644 --- a/backend/src/models/routes/Search.ts +++ b/backend/src/models/routes/Search.ts @@ -1,6 +1,7 @@ -import { ZodType, z } from "zod"; -import Page, { pageSchema } from "./Page.js"; +import { z, ZodType } from "zod"; + import { userCountrySchema } from "../User.js"; +import Page, { pageSchema } from "./Page.js"; interface Search extends Page { q: string; diff --git a/backend/src/mongoDB/MessageModel.ts b/backend/src/mongoDB/MessageModel.ts index 816a37cb..6cdce3bc 100644 --- a/backend/src/mongoDB/MessageModel.ts +++ b/backend/src/mongoDB/MessageModel.ts @@ -1,4 +1,5 @@ import { model, Schema } from "mongoose"; + import Message from "../models/Message.js"; const chatSchema = new Schema({ diff --git a/backend/src/routes/authRoute.ts b/backend/src/routes/authRoute.ts index 5becbdcb..e6ea581c 100644 --- a/backend/src/routes/authRoute.ts +++ b/backend/src/routes/authRoute.ts @@ -1,21 +1,19 @@ -import { Router, Request } from "express"; - import bcrypt from "bcrypt"; +import { Request, Router } from "express"; +import jwt, { JwtPayload } from "jsonwebtoken"; import driver from "../driver.js"; +import { leaveMeeting } from "../meetings.js"; import { - JWTRequest, authenticateToken, generateAccessToken, generateRefreshToken, + JWTRequest, } from "../misc/jwt.js"; - -import jwt, { JwtPayload } from "jsonwebtoken"; +import { Errors } from "../models/Response.js"; import { TokenErrorResponse } from "../types/authResponse.js"; import { OkErrorResponse } from "../types/userResponse.js"; -import { leaveMeeting } from "../meetings.js"; import { getDbUser } from "../users.js"; -import { Errors } from "../models/Response.js"; const authRouter = Router(); diff --git a/backend/src/routes/chatRoute.ts b/backend/src/routes/chatRoute.ts index fa6d4834..dfb8d6bc 100644 --- a/backend/src/routes/chatRoute.ts +++ b/backend/src/routes/chatRoute.ts @@ -1,11 +1,12 @@ import { Router } from "express"; + +import driver from "../driver.js"; +import { authenticateToken, JWTRequest } from "../misc/jwt.js"; import Message from "../models/Message.js"; +import { Errors } from "../models/Response.js"; import MessageModel from "../mongoDB/MessageModel.js"; -import { JWTRequest, authenticateToken } from "../misc/jwt.js"; import { AuthMessagesErrorResponse } from "../types/userResponse.js"; -import { Errors } from "../models/Response.js"; import { getTokenDbUser } from "../users.js"; -import driver from "../driver.js"; import { userNotFoundRes } from "./usersRoute.js"; const chatRouter = Router(); diff --git a/backend/src/routes/userFriendsRoute.ts b/backend/src/routes/userFriendsRoute.ts index ada077f4..e3bb0449 100644 --- a/backend/src/routes/userFriendsRoute.ts +++ b/backend/src/routes/userFriendsRoute.ts @@ -1,30 +1,33 @@ -import { Router, Request, Response } from "express"; +import { Request, Response, Router } from "express"; import { Session } from "neo4j-driver"; + import driver from "../driver.js"; +import { formatError } from "../misc/formatError.js"; +import { authenticateToken, JWTRequest } from "../misc/jwt.js"; +import { Errors } from "../models/Response.js"; +import Page, { pageSchema } from "../models/routes/Page.js"; import User from "../models/User.js"; import { - OkErrorResponse, - FriendsPageErrorResponse, + AuthOkErrorResponse, FriendRequestsPageErrorResponse, + FriendsPageErrorResponse, FriendSuggestionsPageErrorResponse, - AuthOkErrorResponse, + OkErrorResponse, } from "../types/userResponse.js"; -import { deleteFriend } from "../userFriends.js"; -import { declineFriendRequest } from "../userFriends.js"; -import { acceptFriendRequest } from "../userFriends.js"; -import { sendFriendRequest } from "../userFriends.js"; -import { getFriendSuggestionsCount } from "../userFriends.js"; -import { getFriendSuggestions } from "../userFriends.js"; -import { getFriendRequestsCount } from "../userFriends.js"; -import { getFriendRequests } from "../userFriends.js"; -import { getFriendsCount } from "../userFriends.js"; -import { getFriends } from "../userFriends.js"; -import { userNotFoundRes } from "./usersRoute.js"; -import { Errors } from "../models/Response.js"; -import Page, { pageSchema } from "../models/routes/Page.js"; -import { formatError } from "../misc/formatError.js"; -import { JWTRequest, authenticateToken } from "../misc/jwt.js"; +import { + acceptFriendRequest, + declineFriendRequest, + deleteFriend, + getFriendRequests, + getFriendRequestsCount, + getFriends, + getFriendsCount, + getFriendSuggestions, + getFriendSuggestionsCount, + sendFriendRequest, +} from "../userFriends.js"; import { getDbUser, getTokenDbUser } from "../users.js"; +import { userNotFoundRes } from "./usersRoute.js"; const friendsRouter = Router(); diff --git a/backend/src/routes/usersRoute.ts b/backend/src/routes/usersRoute.ts index 0980a84e..2c0ac793 100644 --- a/backend/src/routes/usersRoute.ts +++ b/backend/src/routes/usersRoute.ts @@ -1,6 +1,12 @@ -import { Router, Request, Response } from "express"; +import { Request, Response, Router } from "express"; + import driver from "../driver.js"; -import { JWTRequest, authenticateToken, getToken } from "../misc/jwt.js"; +import { formatError } from "../misc/formatError.js"; +import { authenticateToken, getToken, JWTRequest } from "../misc/jwt.js"; +import { changePasswordReqSchema } from "../models/ChangePasswordReq.js"; +import DbUser from "../models/DbUser.js"; +import { Errors } from "../models/Response.js"; +import { searchSchema } from "../models/routes/Search.js"; import { AuthOkErrorResponse, OkErrorResponse, @@ -8,30 +14,25 @@ import { UsersErrorResponse, UsersSearchErrorResponse, } from "../types/userResponse.js"; -import usersFriendsRoute from "./userFriendsRoute.js"; import { - getAllUsers, - searchUser as searchUsers, - getUser as getUser, + changePassword, createUser, - updateUser, deleteUser, - UserCreateResult, - registerUser, + getAllUsers, getDbUser, - changePassword, + getTokenDbUser, + getUser, getUsersCount, - registerUserSchema, + registerUser, RegisterUser, - updateUserSchema, + registerUserSchema, + searchUser as searchUsers, + updateUser, UpdateUser, - getTokenDbUser, + updateUserSchema, + UserCreateResult, } from "../users.js"; -import DbUser from "../models/DbUser.js"; -import { changePasswordReqSchema } from "../models/ChangePasswordReq.js"; -import { formatError } from "../misc/formatError.js"; -import { Errors } from "../models/Response.js"; -import { searchSchema } from "../models/routes/Search.js"; +import usersFriendsRoute from "./userFriendsRoute.js"; const usersRouter = Router(); diff --git a/backend/src/socketServer.ts b/backend/src/socketServer.ts index e9611264..94454e0b 100644 --- a/backend/src/socketServer.ts +++ b/backend/src/socketServer.ts @@ -1,23 +1,23 @@ +import { Socket, Server as SocketServer } from "socket.io"; + import driver from "./driver.js"; -import { Socket } from "socket.io"; -import { - connectToSocket, - disconnectFromSocket, - getAllSockets, -} from "./sockets.js"; -import { isFriend } from "./userFriends.js"; -import Meeting from "./models/Meeting.js"; +import ClientToServerEvents from "./events/ClientToServerEvents.js"; +import ServerToClientEvents from "./events/ServerToClientEvents.js"; +import { expressServer } from "./httpServer.js"; import { createMeeting, - leaveMeeting, isInMeeting, joinMeeting, + leaveMeeting, } from "./meetings.js"; import { addMessageToDb } from "./messages.js"; -import { Server as SocketServer } from "socket.io"; -import ClientToServerEvents from "./events/ClientToServerEvents.js"; -import ServerToClientEvents from "./events/ServerToClientEvents.js"; -import { expressServer } from "./httpServer.js"; +import Meeting from "./models/Meeting.js"; +import { + connectToSocket, + disconnectFromSocket, + getAllSockets, +} from "./sockets.js"; +import { isFriend } from "./userFriends.js"; const io = new SocketServer( expressServer, diff --git a/backend/src/types/authResponse.ts b/backend/src/types/authResponse.ts index 4e7899e0..4d514f1a 100644 --- a/backend/src/types/authResponse.ts +++ b/backend/src/types/authResponse.ts @@ -1,8 +1,8 @@ import { - CustomResponse, - JWTResponse, AuthResponse, + CustomResponse, ErrorResponse, + JWTResponse, } from "../models/Response.js"; export type TokenErrorResponse = CustomResponse< diff --git a/backend/src/types/userResponse.ts b/backend/src/types/userResponse.ts index b4f4afa7..7ff0126a 100644 --- a/backend/src/types/userResponse.ts +++ b/backend/src/types/userResponse.ts @@ -1,16 +1,16 @@ import { + AuthResponse, CustomResponse, ErrorResponse, + FriendRequestsPageResponse, + FriendsPageResponse, + FriendsResponse, + FriendSuggestionsPageResponse, + MessagesResponse, OkResponse, UserResponse, UsersResponse, - FriendsResponse, UsersSearchResponse, - AuthResponse, - FriendsPageResponse, - FriendRequestsPageResponse, - FriendSuggestionsPageResponse, - MessagesResponse, } from "../models/Response.js"; export type UsersErrorResponse = CustomResponse; diff --git a/backend/src/userFriends.ts b/backend/src/userFriends.ts index 30ae7f2c..dbeac05d 100644 --- a/backend/src/userFriends.ts +++ b/backend/src/userFriends.ts @@ -1,4 +1,5 @@ import neo4j, { Session } from "neo4j-driver"; + import User from "./models/User.js"; import { filterUser, getUser } from "./users.js"; diff --git a/backend/src/users.ts b/backend/src/users.ts index a9ae1d5a..e2426720 100644 --- a/backend/src/users.ts +++ b/backend/src/users.ts @@ -1,20 +1,21 @@ +import UserRepresentation from "@keycloak/keycloak-admin-client/lib/defs/userRepresentation.js"; +import bcrypt from "bcrypt"; +import jwt from "jsonwebtoken"; import neo4j, { Session } from "neo4j-driver"; import { v4 as uuidv4 } from "uuid"; -import bcrypt from "bcrypt"; -import User, { userSchema } from "./models/User.js"; +import { ZodType } from "zod"; + +import kcAdminClient from "./kcAdminClient.js"; +import { Either } from "./misc/Either.js"; +import { issuers } from "./misc/jwt.js"; import removeKeys from "./misc/removeKeys.js"; import wordToVec from "./misc/wordToVec.js"; +import ChangePasswordReq from "./models/ChangePasswordReq.js"; import DbUser from "./models/DbUser.js"; -import kcAdminClient from "./kcAdminClient.js"; -import UserRepresentation from "@keycloak/keycloak-admin-client/lib/defs/userRepresentation.js"; -import { Either } from "./misc/Either.js"; -import NativeUser, { nativeUserSchema } from "./models/NativeUser.js"; import ExternalUser from "./models/ExternalUser.js"; -import { ZodType } from "zod"; -import ChangePasswordReq from "./models/ChangePasswordReq.js"; -import jwt from "jsonwebtoken"; +import NativeUser, { nativeUserSchema } from "./models/NativeUser.js"; import TokenPayload from "./models/TokenPayload.js"; -import { issuers } from "./misc/jwt.js"; +import User, { userSchema } from "./models/User.js"; export const filterUser = (user: DbUser): User => { if ("password" in user) { diff --git a/backend/test/chat.test.ts b/backend/test/chat.test.ts index ac6b5c34..2234f7e7 100644 --- a/backend/test/chat.test.ts +++ b/backend/test/chat.test.ts @@ -1,4 +1,5 @@ import { describe, expect, test } from "vitest"; + import { fetchData } from "../src/misc/fetchData.js"; import User from "../src/models/User.js"; diff --git a/backend/test/unit.test.ts b/backend/test/unit.test.ts index 031aba31..da34acb4 100644 --- a/backend/test/unit.test.ts +++ b/backend/test/unit.test.ts @@ -1,20 +1,19 @@ import { expect, test } from "vitest"; -import { - letterToKb, - wordDifference, + +import removeKeys from "../src/misc/removeKeys.js"; +import wordToVec, { cosineSimilarity, - sortLetters, + dot, keepLetters, + l2Norm, lerp, - wordVecInterp, + letterToKb, + sortLetters, sum, + wordDifference, + wordVecInterp, zip, - l2Norm, - dot, } from "../src/misc/wordToVec.js"; -import removeKeys from "../src/misc/removeKeys.js"; - -import wordToVec from "../src/misc/wordToVec.js"; test("Letter to Kb", async () => { expect(letterToKb("Q")).toStrictEqual(-1); diff --git a/backend/test/userCRUD.test.ts b/backend/test/userCRUD.test.ts index 7e4881be..0ee89d4e 100644 --- a/backend/test/userCRUD.test.ts +++ b/backend/test/userCRUD.test.ts @@ -1,4 +1,5 @@ import { describe, expect, test } from "vitest"; + import { fetchData } from "../src/misc/fetchData.js"; let userId: string; diff --git a/backend/test/userFriendRequests.test.ts b/backend/test/userFriendRequests.test.ts index debf39e1..38b2f376 100644 --- a/backend/test/userFriendRequests.test.ts +++ b/backend/test/userFriendRequests.test.ts @@ -1,4 +1,5 @@ import { describe, expect, test } from "vitest"; + import { fetchData } from "../src/misc/fetchData.js"; import User from "../src/models/User.js"; diff --git a/backend/test/userFriendSuggestions.test.ts b/backend/test/userFriendSuggestions.test.ts index f79713f4..25e7b668 100644 --- a/backend/test/userFriendSuggestions.test.ts +++ b/backend/test/userFriendSuggestions.test.ts @@ -1,4 +1,5 @@ import { describe, expect, test } from "vitest"; + import { fetchData } from "../src/misc/fetchData.js"; import User from "../src/models/User.js"; @@ -66,7 +67,7 @@ describe("Get friend suggestions", () => { `?page=${page}&maxUsers=${maxUsers}`, "GET", {}, - token2 + token2, ); expect(status).toBe("forbidden"); }); diff --git a/backend/test/userFriends.test.ts b/backend/test/userFriends.test.ts index 6181d13e..3e801dfe 100644 --- a/backend/test/userFriends.test.ts +++ b/backend/test/userFriends.test.ts @@ -1,4 +1,5 @@ import { describe, expect, test } from "vitest"; + import { fetchData } from "../src/misc/fetchData.js"; import User from "../src/models/User.js"; diff --git a/backend/test/userSearch.test.ts b/backend/test/userSearch.test.ts index d71f0607..4c807989 100644 --- a/backend/test/userSearch.test.ts +++ b/backend/test/userSearch.test.ts @@ -1,4 +1,5 @@ import { describe, expect, test } from "vitest"; + import { fetchData } from "../src/misc/fetchData.js"; import User from "../src/models/User.js"; diff --git a/frontend/src/components/Banner.tsx b/frontend/src/components/Banner.tsx index a8871eeb..2c06d0e0 100644 --- a/frontend/src/components/Banner.tsx +++ b/frontend/src/components/Banner.tsx @@ -1,5 +1,5 @@ -import { Link } from "react-router-dom"; import LogoSVG from "/logo.svg"; +import { Link } from "react-router-dom"; function Banner() { return ( diff --git a/frontend/src/components/ChatBox.tsx b/frontend/src/components/ChatBox.tsx index 6779628b..fd9cfe85 100644 --- a/frontend/src/components/ChatBox.tsx +++ b/frontend/src/components/ChatBox.tsx @@ -1,12 +1,11 @@ import React, { useEffect, useMemo, useRef, useState } from "react"; - import { Socket } from "socket.io-client"; -import User from "../models/User"; import notificationSoundUrl from "../assets/notification.mp3"; -import Message, { MessageProps } from "./Message"; -import dataService from "../services/data"; import { useUser } from "../helpers/UserContext"; +import User from "../models/User"; +import dataService from "../services/data"; +import Message, { MessageProps } from "./Message"; const notificationSound = new Audio(notificationSoundUrl); @@ -119,7 +118,8 @@ function ChatBox({ user, socket, friendId }: ChatBoxProps) { const messageResponse = await dataService.fetchData( `/chat/${user.id}/${friendId}`, "GET", - {}, token + {}, + token, ); await addMessages(messageResponse.messages); diff --git a/frontend/src/components/EditDetails.tsx b/frontend/src/components/EditDetails.tsx index bb04e324..1a7ba5c8 100644 --- a/frontend/src/components/EditDetails.tsx +++ b/frontend/src/components/EditDetails.tsx @@ -1,10 +1,11 @@ -import { useForm } from "react-hook-form"; -import User, { FrontendUser } from "../models/User"; import { zodResolver } from "@hookform/resolvers/zod"; -import { userEditDetails } from "../models/RegisterUserSchema"; import { ChangeEvent, useState } from "react"; -import countriesData from "../assets/countries.json"; +import { useForm } from "react-hook-form"; import Select from "react-select"; + +import countriesData from "../assets/countries.json"; +import { userEditDetails } from "../models/RegisterUserSchema"; +import User, { FrontendUser } from "../models/User"; import Popup from "./Popup"; export interface EditDetails { diff --git a/frontend/src/components/EditPassword.tsx b/frontend/src/components/EditPassword.tsx index 48e8bc55..32b76b1b 100644 --- a/frontend/src/components/EditPassword.tsx +++ b/frontend/src/components/EditPassword.tsx @@ -1,10 +1,11 @@ -import { ChangeEvent, FormEvent, useState } from "react"; -import User from "../models/User"; -import { changePasswordSchema } from "../models/RegisterUserSchema"; -import { useNavigate } from "react-router-dom"; import { zodResolver } from "@hookform/resolvers/zod"; +import { ChangeEvent, FormEvent, useState } from "react"; import { useForm } from "react-hook-form"; +import { useNavigate } from "react-router-dom"; + import { PasswordForm } from "../models/PasswordForm"; +import { changePasswordSchema } from "../models/RegisterUserSchema"; +import User from "../models/User"; export interface EditDetails { provider: string; diff --git a/frontend/src/components/EditPhoto.tsx b/frontend/src/components/EditPhoto.tsx index 35190267..7d5f9343 100644 --- a/frontend/src/components/EditPhoto.tsx +++ b/frontend/src/components/EditPhoto.tsx @@ -1,5 +1,6 @@ -import User from "../models/User"; import { useState } from "react"; + +import User from "../models/User"; import Popup from "./Popup"; export interface EditDetails { diff --git a/frontend/src/components/FoundUser.tsx b/frontend/src/components/FoundUser.tsx index 629d5b8d..f6a05f21 100644 --- a/frontend/src/components/FoundUser.tsx +++ b/frontend/src/components/FoundUser.tsx @@ -1,8 +1,9 @@ import { useState } from "react"; -import User from "../models/User"; -import dataService from "../services/data"; + import countriesData from "../assets/countries.json"; import { useUser } from "../helpers/UserContext"; +import User from "../models/User"; +import dataService from "../services/data"; interface FoundUserProps { user: User; diff --git a/frontend/src/components/Friend.tsx b/frontend/src/components/Friend.tsx index 806aef35..3b4e79ad 100644 --- a/frontend/src/components/Friend.tsx +++ b/frontend/src/components/Friend.tsx @@ -1,12 +1,13 @@ import { + faCommentAlt, faUserMinus, faVideo, - faCommentAlt, } from "@fortawesome/free-solid-svg-icons"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; -import User from "../models/User"; -import { useNavigate } from "react-router-dom"; import { useState } from "react"; +import { useNavigate } from "react-router-dom"; + +import User from "../models/User"; import Modal from "./Modal"; export interface FriendProps { diff --git a/frontend/src/components/FriendRequest.tsx b/frontend/src/components/FriendRequest.tsx index e4691ce7..ccee85f9 100644 --- a/frontend/src/components/FriendRequest.tsx +++ b/frontend/src/components/FriendRequest.tsx @@ -1,4 +1,5 @@ import { useState } from "react"; + import User from "../models/User"; import Modal from "./Modal"; diff --git a/frontend/src/components/LoginBox.tsx b/frontend/src/components/LoginBox.tsx index 7d99c0cb..32c44f8b 100644 --- a/frontend/src/components/LoginBox.tsx +++ b/frontend/src/components/LoginBox.tsx @@ -1,6 +1,6 @@ -import { useNavigate } from "react-router-dom"; import { useEffect, useRef, useState } from "react"; -import { Link } from "react-router-dom"; +import { Link, useNavigate } from "react-router-dom"; + import { useUser } from "../helpers/UserContext"; function LoginBox() { diff --git a/frontend/src/components/Modal.tsx b/frontend/src/components/Modal.tsx index 1b8355b2..cb0b91af 100644 --- a/frontend/src/components/Modal.tsx +++ b/frontend/src/components/Modal.tsx @@ -1,4 +1,4 @@ -import { motion, AnimatePresence } from "framer-motion"; +import { AnimatePresence, motion } from "framer-motion"; interface ModalInterface { text: string; diff --git a/frontend/src/components/Navbar.tsx b/frontend/src/components/Navbar.tsx index a3a47846..3e052384 100644 --- a/frontend/src/components/Navbar.tsx +++ b/frontend/src/components/Navbar.tsx @@ -1,14 +1,16 @@ -import { Link } from "react-router-dom"; -import LogoSVG from "/logo.svg"; -import { useUser } from "../helpers/UserContext"; -import { useState } from "react"; import { faMagnifyingGlass, + faRightFromBracket, faUser, faUsers, - faRightFromBracket, } from "@fortawesome/free-solid-svg-icons"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; +import LogoSVG from "/logo.svg"; +import { useState } from "react"; +import { Link } from "react-router-dom"; + +import { useUser } from "../helpers/UserContext"; + ; export interface NavbarProps { diff --git a/frontend/src/components/PaginatorV2.tsx b/frontend/src/components/PaginatorV2.tsx index e8ad192a..fce6dc86 100644 --- a/frontend/src/components/PaginatorV2.tsx +++ b/frontend/src/components/PaginatorV2.tsx @@ -1,6 +1,7 @@ import { faArrowLeft, faArrowRight } from "@fortawesome/free-solid-svg-icons"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { useEffect, useState } from "react"; + import User from "../models/User"; import dataService from "../services/data"; diff --git a/frontend/src/components/Profile.tsx b/frontend/src/components/Profile.tsx index 271eb0fd..a3bf9efc 100644 --- a/frontend/src/components/Profile.tsx +++ b/frontend/src/components/Profile.tsx @@ -1,7 +1,8 @@ import { useState } from "react"; + +import countriesData from "../assets/countries.json"; import User from "../models/User"; import Modal from "./Modal"; -import countriesData from "../assets/countries.json"; export interface ProfilePageFormProps { user: User; diff --git a/frontend/src/components/RegisterBox.tsx b/frontend/src/components/RegisterBox.tsx index ddcf6cb5..791e7e9d 100644 --- a/frontend/src/components/RegisterBox.tsx +++ b/frontend/src/components/RegisterBox.tsx @@ -1,13 +1,14 @@ +import { zodResolver } from "@hookform/resolvers/zod"; import { useState } from "react"; -import { Link } from "react-router-dom"; import { useForm } from "react-hook-form"; -import { zodResolver } from "@hookform/resolvers/zod"; -import { userRegisterSchema } from "../models/RegisterUserSchema"; -import { FrontendUser } from "../models/User"; -import * as userPlaceholder from "../assets/user-placeholder.jpg"; -import { useUser } from "../helpers/UserContext"; +import { Link } from "react-router-dom"; import Select from "react-select"; + import countriesData from "../assets/countries.json"; +import * as userPlaceholder from "../assets/user-placeholder.jpg"; +import { useUser } from "../helpers/UserContext"; +import { userRegisterSchema } from "../models/RegisterUserSchema"; +import { FrontendUser } from "../models/User"; function RegisterBox() { const { diff --git a/frontend/src/components/Search.tsx b/frontend/src/components/Search.tsx index d3dc77ff..a255e56e 100644 --- a/frontend/src/components/Search.tsx +++ b/frontend/src/components/Search.tsx @@ -3,6 +3,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import React, { useEffect, useState } from "react"; import { useNavigate } from "react-router-dom"; import Select from "react-select"; + import countriesData from "../assets/countries.json"; import { useUser } from "../helpers/UserContext"; diff --git a/frontend/src/components/Transition.tsx b/frontend/src/components/Transition.tsx index 500e0540..3912f1d3 100644 --- a/frontend/src/components/Transition.tsx +++ b/frontend/src/components/Transition.tsx @@ -1,5 +1,5 @@ -import React, { useEffect } from "react"; import { motion, useAnimation } from "framer-motion"; +import React, { useEffect } from "react"; interface TransitionProps { startAnimation: boolean; diff --git a/frontend/src/helpers/KeycloakUserProvider.tsx b/frontend/src/helpers/KeycloakUserProvider.tsx index c3140dfb..8f159ebe 100644 --- a/frontend/src/helpers/KeycloakUserProvider.tsx +++ b/frontend/src/helpers/KeycloakUserProvider.tsx @@ -1,11 +1,12 @@ -import React, { useState, useEffect, useRef, useMemo } from "react"; -import dataService from "../services/data"; -import User, { FrontendUser } from "../models/User"; -import { Socket, io } from "socket.io-client"; -import UserContext from "./UserContext"; -import UserState from "../models/UserState"; import Keycloak from "keycloak-js"; +import React, { useEffect, useMemo, useRef, useState } from "react"; import { useNavigate } from "react-router-dom"; +import { io, Socket } from "socket.io-client"; + +import User, { FrontendUser } from "../models/User"; +import UserState from "../models/UserState"; +import dataService from "../services/data"; +import UserContext from "./UserContext"; function KeycloakUserProvider({ children }: { children: React.ReactNode }) { const navigate = useNavigate(); diff --git a/frontend/src/helpers/MeetingProvider.tsx b/frontend/src/helpers/MeetingProvider.tsx index 78d548f6..83010dea 100644 --- a/frontend/src/helpers/MeetingProvider.tsx +++ b/frontend/src/helpers/MeetingProvider.tsx @@ -1,4 +1,5 @@ import { createContext, useContext, useState } from "react"; + import Meeting from "../models/Meeting"; import { useUser } from "./UserContext"; diff --git a/frontend/src/helpers/Protected.tsx b/frontend/src/helpers/Protected.tsx index 09f6d064..55c39d6c 100644 --- a/frontend/src/helpers/Protected.tsx +++ b/frontend/src/helpers/Protected.tsx @@ -1,6 +1,7 @@ import { createContext, useContext, useEffect } from "react"; -import { useUser } from "./UserContext"; + import User from "../models/User"; +import { useUser } from "./UserContext"; export interface ProtectedContextValue { user: User; diff --git a/frontend/src/helpers/RestUserProvider.tsx b/frontend/src/helpers/RestUserProvider.tsx index 8dc58100..22a08b1a 100644 --- a/frontend/src/helpers/RestUserProvider.tsx +++ b/frontend/src/helpers/RestUserProvider.tsx @@ -1,12 +1,13 @@ -import React, { useState, useEffect, useRef, useMemo } from "react"; -import { isExpired, decodeToken } from "react-jwt"; import Cookies from "js-cookie"; -import dataService from "../services/data"; +import React, { useEffect, useMemo, useRef, useState } from "react"; +import { decodeToken, isExpired } from "react-jwt"; +import { useNavigate } from "react-router-dom"; +import { io, Socket } from "socket.io-client"; + import User, { FrontendUser } from "../models/User"; -import { Socket, io } from "socket.io-client"; -import UserContext from "./UserContext"; import UserState from "../models/UserState"; -import { useNavigate } from "react-router-dom"; +import dataService from "../services/data"; +import UserContext from "./UserContext"; function RestUserProvider({ children }: { children: React.ReactNode }) { const navigate = useNavigate(); diff --git a/frontend/src/helpers/UserContext.tsx b/frontend/src/helpers/UserContext.tsx index 058f2c53..2c8eafe4 100644 --- a/frontend/src/helpers/UserContext.tsx +++ b/frontend/src/helpers/UserContext.tsx @@ -1,5 +1,6 @@ import { createContext, useContext } from "react"; import { Socket } from "socket.io-client"; + import User, { FrontendUser } from "../models/User"; import UserState from "../models/UserState"; diff --git a/frontend/src/layout/Reasons.tsx b/frontend/src/layout/Reasons.tsx index ccbf5d0f..212f79fa 100644 --- a/frontend/src/layout/Reasons.tsx +++ b/frontend/src/layout/Reasons.tsx @@ -1,11 +1,11 @@ import { - faShield, faDesktop, - faUsers, faGlobe, + faShield, + faUsers, } from "@fortawesome/free-solid-svg-icons"; - import { motion } from "framer-motion"; + import ReasonCard from "../components/ReasonCard"; export default function Reasons() { diff --git a/frontend/src/layout/Technologies.tsx b/frontend/src/layout/Technologies.tsx index 1e4a610b..967da0d6 100644 --- a/frontend/src/layout/Technologies.tsx +++ b/frontend/src/layout/Technologies.tsx @@ -1,4 +1,5 @@ import { AnimatePresence, motion } from "framer-motion"; + import technologies from "../helpers/TechnologiesContent"; export default function Technologies() { diff --git a/frontend/src/layout/WelcomeMessage.tsx b/frontend/src/layout/WelcomeMessage.tsx index 678c5e75..7b43c47d 100644 --- a/frontend/src/layout/WelcomeMessage.tsx +++ b/frontend/src/layout/WelcomeMessage.tsx @@ -1,7 +1,8 @@ -import { useUser } from "../helpers/UserContext"; import LogoSVG from "/logo.svg"; import { Link } from "react-router-dom"; +import { useUser } from "../helpers/UserContext"; + const scrollToTop = (): void => { window.scrollTo(0, 0); }; diff --git a/frontend/src/main.tsx b/frontend/src/main.tsx index 90575beb..a67238ea 100644 --- a/frontend/src/main.tsx +++ b/frontend/src/main.tsx @@ -15,11 +15,11 @@ import VideoCallPage from "./pages/VideoCallPage.tsx"; import "./styles/styles.scss"; -import { store } from "./redux/store.ts"; +import KeycloakUserProvider from "./helpers/KeycloakUserProvider.tsx"; import MeetingProvider from "./helpers/MeetingProvider.tsx"; import Protected from "./helpers/Protected.tsx"; -import KeycloakUserProvider from "./helpers/KeycloakUserProvider.tsx"; import EditDataPage from "./pages/EditDataPage.tsx"; +import { store } from "./redux/store.ts"; const body = document.getElementsByTagName("body")[0]!; body.className = "bg-my-darker text-my-light"; diff --git a/frontend/src/models/RegisterUserSchema.ts b/frontend/src/models/RegisterUserSchema.ts index bc523890..3abc33c4 100644 --- a/frontend/src/models/RegisterUserSchema.ts +++ b/frontend/src/models/RegisterUserSchema.ts @@ -1,6 +1,7 @@ import * as z from "zod"; -import { FrontendUser } from "./User"; + import { PasswordForm } from "./PasswordForm"; +import { FrontendUser } from "./User"; export const userRegisterSchema: z.ZodType> = z.object({ first_name: z diff --git a/frontend/src/pages/EditDataPage.tsx b/frontend/src/pages/EditDataPage.tsx index d364d1c7..390cc088 100644 --- a/frontend/src/pages/EditDataPage.tsx +++ b/frontend/src/pages/EditDataPage.tsx @@ -1,10 +1,11 @@ import { useEffect, useState } from "react"; + +import EditDetails from "../components/EditDetails"; +import EditPassword from "../components/EditPassword"; +import EditPhoto from "../components/EditPhoto"; import Footer from "../components/Footer"; import Navbar from "../components/Navbar"; import Transition from "../components/Transition"; -import EditDetails from "../components/EditDetails"; -import EditPhoto from "../components/EditPhoto"; -import EditPassword from "../components/EditPassword"; import { useUser } from "../helpers/UserContext"; function EditDataPage() { diff --git a/frontend/src/pages/FriendsPage.tsx b/frontend/src/pages/FriendsPage.tsx index cd194c80..044847cc 100644 --- a/frontend/src/pages/FriendsPage.tsx +++ b/frontend/src/pages/FriendsPage.tsx @@ -1,21 +1,20 @@ -import { useEffect, useState } from "react"; -import { useNavigate } from "react-router-dom"; -import { useMeeting } from "../helpers/MeetingProvider"; - import { faPlus } from "@fortawesome/free-solid-svg-icons"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; +import { useEffect, useState } from "react"; +import { useNavigate } from "react-router-dom"; import Footer from "../components/Footer"; +import FoundUser from "../components/FoundUser"; +import Friend from "../components/Friend"; import FriendRequest from "../components/FriendRequest"; import Navbar from "../components/Navbar"; -import User from "../models/User"; -import dataService from "../services/data"; +import PaginatorV2 from "../components/PaginatorV2"; import Transition from "../components/Transition"; +import { useMeeting } from "../helpers/MeetingProvider"; import { useProtected } from "../helpers/Protected"; -import FoundUser from "../components/FoundUser"; -import Friend from "../components/Friend"; -import PaginatorV2 from "../components/PaginatorV2"; import { useUser } from "../helpers/UserContext"; +import User from "../models/User"; +import dataService from "../services/data"; function FriendsPage() { const navigate = useNavigate(); diff --git a/frontend/src/pages/HomePage.tsx b/frontend/src/pages/HomePage.tsx index 1a507b30..4f66069f 100644 --- a/frontend/src/pages/HomePage.tsx +++ b/frontend/src/pages/HomePage.tsx @@ -1,9 +1,9 @@ import Footer from "../components/Footer"; +import CallToAction from "../layout/CallToAction"; import PhotoAndText from "../layout/PhotoAndText"; import Reasons from "../layout/Reasons"; -import WelcomeMessage from "../layout/WelcomeMessage"; -import CallToAction from "../layout/CallToAction"; import Technologies from "../layout/Technologies"; +import WelcomeMessage from "../layout/WelcomeMessage"; function HomePage() { return ( diff --git a/frontend/src/pages/LoginPage.tsx b/frontend/src/pages/LoginPage.tsx index a2432ce1..4d0270c1 100644 --- a/frontend/src/pages/LoginPage.tsx +++ b/frontend/src/pages/LoginPage.tsx @@ -1,7 +1,8 @@ +import { useEffect, useState } from "react"; + +import Banner from "../components/Banner"; import Footer from "../components/Footer"; import LoginBox from "../components/LoginBox"; -import Banner from "../components/Banner"; -import { useEffect, useState } from "react"; import Transition from "../components/Transition"; function LoginPage() { diff --git a/frontend/src/pages/MessagingPage.tsx b/frontend/src/pages/MessagingPage.tsx index 70984f52..f1f17a3e 100644 --- a/frontend/src/pages/MessagingPage.tsx +++ b/frontend/src/pages/MessagingPage.tsx @@ -1,11 +1,11 @@ import { useEffect, useRef } from "react"; import { useNavigate, useParams } from "react-router-dom"; -import Navbar from "../components/Navbar"; -import Footer from "../components/Footer"; import ChatBox from "../components/ChatBox"; -import { useUser } from "../helpers/UserContext"; +import Footer from "../components/Footer"; +import Navbar from "../components/Navbar"; import { useProtected } from "../helpers/Protected"; +import { useUser } from "../helpers/UserContext"; function MessagingPage() { const navigate = useNavigate(); diff --git a/frontend/src/pages/PageNotFound.tsx b/frontend/src/pages/PageNotFound.tsx index a4ff74ce..8bd1ae82 100644 --- a/frontend/src/pages/PageNotFound.tsx +++ b/frontend/src/pages/PageNotFound.tsx @@ -1,4 +1,5 @@ import { Link } from "react-router-dom"; + import Banner from "../components/Banner"; function PageNotFound() { diff --git a/frontend/src/pages/ProfilePage.tsx b/frontend/src/pages/ProfilePage.tsx index 88a0b2aa..4236f2be 100644 --- a/frontend/src/pages/ProfilePage.tsx +++ b/frontend/src/pages/ProfilePage.tsx @@ -1,12 +1,13 @@ -import { useState, useEffect } from "react"; +import { useEffect, useState } from "react"; import { useNavigate } from "react-router-dom"; + import Footer from "../components/Footer"; import Navbar from "../components/Navbar"; -import { useUser } from "../helpers/UserContext"; import Profile from "../components/Profile"; import Transition from "../components/Transition"; import { useMeeting } from "../helpers/MeetingProvider"; import { useProtected } from "../helpers/Protected"; +import { useUser } from "../helpers/UserContext"; function ProfilePage() { const navigate = useNavigate(); diff --git a/frontend/src/pages/RegisterPage.tsx b/frontend/src/pages/RegisterPage.tsx index d9357838..8a615da7 100644 --- a/frontend/src/pages/RegisterPage.tsx +++ b/frontend/src/pages/RegisterPage.tsx @@ -1,7 +1,8 @@ +import { useEffect, useState } from "react"; + +import Banner from "../components/Banner"; import Footer from "../components/Footer"; import RegisterBox from "../components/RegisterBox"; -import Banner from "../components/Banner"; -import { useEffect, useState } from "react"; import Transition from "../components/Transition"; function RegisterPage() { diff --git a/frontend/src/pages/SearchPage.tsx b/frontend/src/pages/SearchPage.tsx index 30ee10a6..e21d4166 100644 --- a/frontend/src/pages/SearchPage.tsx +++ b/frontend/src/pages/SearchPage.tsx @@ -1,14 +1,14 @@ -import Navbar from "../components/Navbar"; -import Footer from "../components/Footer"; import { useEffect, useState } from "react"; -import FoundUser from "../components/FoundUser"; -import { useUser } from "../helpers/UserContext"; -import User from "../models/User"; -import Transition from "../components/Transition"; -import Search from "../components/Search"; +import Footer from "../components/Footer"; +import FoundUser from "../components/FoundUser"; +import Navbar from "../components/Navbar"; import PaginatorV2 from "../components/PaginatorV2"; +import Search from "../components/Search"; +import Transition from "../components/Transition"; import { useProtected } from "../helpers/Protected"; +import { useUser } from "../helpers/UserContext"; +import User from "../models/User"; function SearchPage() { // Logic diff --git a/frontend/src/pages/VideoCallPage.tsx b/frontend/src/pages/VideoCallPage.tsx index bd93d078..59b455e2 100644 --- a/frontend/src/pages/VideoCallPage.tsx +++ b/frontend/src/pages/VideoCallPage.tsx @@ -1,21 +1,22 @@ -import Navbar from "../components/Navbar"; -import Footer from "../components/Footer"; -import { useUser } from "../helpers/UserContext"; -import { useEffect, useRef, useState } from "react"; -import { useNavigate } from "react-router-dom"; -import { Socket } from "socket.io-client"; -import stunServers from "../stun/stunServers"; -import Meeting from "../models/Meeting"; -import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { - faPhoneSlash, faMicrophone, faMicrophoneSlash, + faPhoneSlash, faVideo, faVideoSlash, } from "@fortawesome/free-solid-svg-icons"; +import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; +import { useEffect, useRef, useState } from "react"; +import { useNavigate } from "react-router-dom"; +import { Socket } from "socket.io-client"; + +import Footer from "../components/Footer"; +import Navbar from "../components/Navbar"; import { useMeeting } from "../helpers/MeetingProvider"; import { useProtected } from "../helpers/Protected"; +import { useUser } from "../helpers/UserContext"; +import Meeting from "../models/Meeting"; +import stunServers from "../stun/stunServers"; function VideoCallPage() { const { user } = useProtected(); diff --git a/frontend/src/redux/store.ts b/frontend/src/redux/store.ts index 30ecd7c5..f8e22d7e 100644 --- a/frontend/src/redux/store.ts +++ b/frontend/src/redux/store.ts @@ -1,4 +1,5 @@ import { combineReducers, createStore } from "redux"; + import friendsReducer from "./reducers/friendsReducer"; const rootReducer = combineReducers({ diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts index 9cc50ead..1ff0da0a 100644 --- a/frontend/vite.config.ts +++ b/frontend/vite.config.ts @@ -1,5 +1,5 @@ -import { defineConfig } from "vite"; import react from "@vitejs/plugin-react"; +import { defineConfig } from "vite"; // https://vitejs.dev/config/ export default defineConfig({