From 0b6f58bf9c2ba3b4a055482c2b22a217bbc0d4b5 Mon Sep 17 00:00:00 2001 From: lebaudantoine Date: Tue, 6 Aug 2024 11:08:01 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A8(frontend)=20run=20Prettier=20on=20?= =?UTF-8?q?the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ran Prettier on the entire codebase to fix formatting issues. My IDE was previously misconfigured, causing most of these errors. The IDE configuration has been corrected. --- src/frontend/src/App.tsx | 5 ++-- src/frontend/src/api/queryClient.ts | 2 +- src/frontend/src/components/ErrorScreen.tsx | 5 +++- .../src/features/auth/utils/authUrl.ts | 4 ++- .../src/features/auth/utils/silentLogin.ts | 12 ++++----- .../src/features/home/routes/Home.tsx | 10 +++---- .../src/features/rooms/api/ApiRoom.ts | 2 +- .../src/features/rooms/api/createRoom.ts | 21 ++++++++------- .../features/rooms/components/Conference.tsx | 27 +++++++++++++------ .../src/features/rooms/routes/Feedback.tsx | 4 ++- src/frontend/src/layout/Header.tsx | 4 ++- src/frontend/src/primitives/PopoverList.tsx | 2 +- src/frontend/src/utils/livekit.ts | 5 ++-- 13 files changed, 61 insertions(+), 42 deletions(-) diff --git a/src/frontend/src/App.tsx b/src/frontend/src/App.tsx index 9badb528..c9d23c3b 100644 --- a/src/frontend/src/App.tsx +++ b/src/frontend/src/App.tsx @@ -10,9 +10,8 @@ import { Layout } from './layout/Layout' import { NotFoundScreen } from './components/NotFoundScreen' import { routes } from './routes' import './i18n/init' -import { silenceLiveKitLogs } from "@/utils/livekit.ts"; -import { queryClient } from "@/api/queryClient"; - +import { silenceLiveKitLogs } from '@/utils/livekit.ts' +import { queryClient } from '@/api/queryClient' function App() { const { i18n } = useTranslation() diff --git a/src/frontend/src/api/queryClient.ts b/src/frontend/src/api/queryClient.ts index d689336f..9f692601 100644 --- a/src/frontend/src/api/queryClient.ts +++ b/src/frontend/src/api/queryClient.ts @@ -1,3 +1,3 @@ -import { QueryClient } from "@tanstack/react-query"; +import { QueryClient } from '@tanstack/react-query' export const queryClient = new QueryClient() diff --git a/src/frontend/src/components/ErrorScreen.tsx b/src/frontend/src/components/ErrorScreen.tsx index 71fd605c..b4559f0d 100644 --- a/src/frontend/src/components/ErrorScreen.tsx +++ b/src/frontend/src/components/ErrorScreen.tsx @@ -4,7 +4,10 @@ import { useTranslation } from 'react-i18next' import { Center } from '@/styled-system/jsx' import { Text } from '@/primitives' -export const ErrorScreen = ({ title, body }: { +export const ErrorScreen = ({ + title, + body, +}: { title?: string body?: string }) => { diff --git a/src/frontend/src/features/auth/utils/authUrl.ts b/src/frontend/src/features/auth/utils/authUrl.ts index 097eef9b..af8a78dc 100644 --- a/src/frontend/src/features/auth/utils/authUrl.ts +++ b/src/frontend/src/features/auth/utils/authUrl.ts @@ -4,5 +4,7 @@ export const authUrl = ({ silent = false, returnTo = window.location.href, } = {}) => { - return apiUrl(`/authenticate?silent=${encodeURIComponent(silent)}&returnTo=${encodeURIComponent(returnTo)}`) + return apiUrl( + `/authenticate?silent=${encodeURIComponent(silent)}&returnTo=${encodeURIComponent(returnTo)}` + ) } diff --git a/src/frontend/src/features/auth/utils/silentLogin.ts b/src/frontend/src/features/auth/utils/silentLogin.ts index 111cdd5d..3761a348 100644 --- a/src/frontend/src/features/auth/utils/silentLogin.ts +++ b/src/frontend/src/features/auth/utils/silentLogin.ts @@ -1,20 +1,20 @@ -import { authUrl } from "@/features/auth"; +import { authUrl } from '@/features/auth' const SILENT_LOGIN_RETRY_KEY = 'silent-login-retry' const isRetryAllowed = () => { - const lastRetryDate = localStorage.getItem(SILENT_LOGIN_RETRY_KEY); + const lastRetryDate = localStorage.getItem(SILENT_LOGIN_RETRY_KEY) if (!lastRetryDate) { - return true; + return true } - const now = new Date(); + const now = new Date() return now.getTime() > Number(lastRetryDate) } const setNextRetryTime = (retryIntervalInSeconds: number) => { const now = new Date() - const nextRetryTime = now.getTime() + (retryIntervalInSeconds * 1000); - localStorage.setItem(SILENT_LOGIN_RETRY_KEY, String(nextRetryTime)); + const nextRetryTime = now.getTime() + retryIntervalInSeconds * 1000 + localStorage.setItem(SILENT_LOGIN_RETRY_KEY, String(nextRetryTime)) } const initiateSilentLogin = () => { diff --git a/src/frontend/src/features/home/routes/Home.tsx b/src/frontend/src/features/home/routes/Home.tsx index bc47a847..33d7a93b 100644 --- a/src/frontend/src/features/home/routes/Home.tsx +++ b/src/frontend/src/features/home/routes/Home.tsx @@ -19,8 +19,8 @@ export const Home = () => { navigateTo('room', data.slug, { state: { create: true, initialRoomData: data }, }) - } - }); + }, + }) return ( @@ -43,9 +43,9 @@ export const Home = () => { onPress={ isLoggedIn ? async () => { - const slug = generateRoomId() - await createRoom({slug}) - } + const slug = generateRoomId() + await createRoom({ slug }) + } : undefined } href={isLoggedIn ? undefined : authUrl()} diff --git a/src/frontend/src/features/rooms/api/ApiRoom.ts b/src/frontend/src/features/rooms/api/ApiRoom.ts index 03238046..af889c78 100644 --- a/src/frontend/src/features/rooms/api/ApiRoom.ts +++ b/src/frontend/src/features/rooms/api/ApiRoom.ts @@ -9,6 +9,6 @@ export type ApiRoom = { token: string } configuration?: { - [key: string]: string | number | boolean; + [key: string]: string | number | boolean } } diff --git a/src/frontend/src/features/rooms/api/createRoom.ts b/src/frontend/src/features/rooms/api/createRoom.ts index 28ac424f..aef2cb55 100644 --- a/src/frontend/src/features/rooms/api/createRoom.ts +++ b/src/frontend/src/features/rooms/api/createRoom.ts @@ -1,25 +1,26 @@ -import { useMutation, UseMutationOptions } from "@tanstack/react-query"; -import { fetchApi } from '@/api/fetchApi'; -import { ApiError } from "@/api/ApiError"; -import { ApiRoom } from "./ApiRoom"; +import { useMutation, UseMutationOptions } from '@tanstack/react-query' +import { fetchApi } from '@/api/fetchApi' +import { ApiError } from '@/api/ApiError' +import { ApiRoom } from './ApiRoom' export interface CreateRoomParams { - slug: string; + slug: string } -const createRoom = ({slug}: CreateRoomParams): Promise => { +const createRoom = ({ slug }: CreateRoomParams): Promise => { return fetchApi(`rooms/`, { method: 'POST', body: JSON.stringify({ name: slug, }), }) -}; +} - -export function useCreateRoom(options?: UseMutationOptions) { +export function useCreateRoom( + options?: UseMutationOptions +) { return useMutation({ mutationFn: createRoom, onSuccess: options?.onSuccess, - }); + }) } diff --git a/src/frontend/src/features/rooms/components/Conference.tsx b/src/frontend/src/features/rooms/components/Conference.tsx index 86fa1a96..8a00ceb0 100644 --- a/src/frontend/src/features/rooms/components/Conference.tsx +++ b/src/frontend/src/features/rooms/components/Conference.tsx @@ -32,13 +32,21 @@ export const Conference = ({ }) => { const fetchKey = [keys.room, roomId, userConfig.username] - const { mutateAsync: createRoom, status: createStatus, isError: isCreateError} = useCreateRoom({ + const { + mutateAsync: createRoom, + status: createStatus, + isError: isCreateError, + } = useCreateRoom({ onSuccess: (data) => { queryClient.setQueryData(fetchKey, data) }, - }); + }) - const { status: fetchStatus, isError: isFetchError, data } = useQuery({ + const { + status: fetchStatus, + isError: isFetchError, + data, + } = useQuery({ queryKey: fetchKey, enabled: !initialRoomData, initialData: initialRoomData, @@ -48,7 +56,7 @@ export const Conference = ({ username: userConfig.username, }).catch((error) => { if (error.statusCode == '404') { - createRoom({slug: roomId}) + createRoom({ slug: roomId }) } }), retry: false, @@ -92,7 +100,12 @@ export const Conference = ({ const { t } = useTranslation('rooms') if (isCreateError) { // this error screen should be replaced by a proper waiting room for anonymous user. - return + return ( + + ) } return ( @@ -106,9 +119,7 @@ export const Conference = ({ audio={userConfig.audioEnabled} video={userConfig.videoEnabled} > - + {showInviteDialog && ( { return ( - {t('feedback.body')} + + {t('feedback.body')} + ) diff --git a/src/frontend/src/layout/Header.tsx b/src/frontend/src/layout/Header.tsx index 103f4bab..25eae694 100644 --- a/src/frontend/src/layout/Header.tsx +++ b/src/frontend/src/layout/Header.tsx @@ -74,7 +74,9 @@ export const Header = () => { {user.email} { if (value === 'logout') { window.location.href = logoutUrl() diff --git a/src/frontend/src/primitives/PopoverList.tsx b/src/frontend/src/primitives/PopoverList.tsx index fd393d0c..33dc0ddb 100644 --- a/src/frontend/src/primitives/PopoverList.tsx +++ b/src/frontend/src/primitives/PopoverList.tsx @@ -42,7 +42,7 @@ export const PopoverList = ({ }: { closeOnAction?: boolean onAction: (key: T) => void - items: Array + items: Array } & ButtonProps) => { const popoverState = useContext(OverlayTriggerStateContext)! return ( diff --git a/src/frontend/src/utils/livekit.ts b/src/frontend/src/utils/livekit.ts index 86d52d4b..84c713b6 100644 --- a/src/frontend/src/utils/livekit.ts +++ b/src/frontend/src/utils/livekit.ts @@ -1,6 +1,5 @@ -import { LogLevel, setLogLevel } from "livekit-client"; - +import { LogLevel, setLogLevel } from 'livekit-client' export const silenceLiveKitLogs = (shouldSilenceLogs: boolean) => { - setLogLevel(shouldSilenceLogs ? LogLevel.silent : LogLevel.debug); + setLogLevel(shouldSilenceLogs ? LogLevel.silent : LogLevel.debug) }