refactor/formatting #1

Merged
qvalentin merged 2 commits from refactor/formatting into main 2023-04-11 19:01:43 +02:00
3 changed files with 4 additions and 10 deletions
Showing only changes of commit 34cdf4aea1 - Show all commits

View File

@ -1,20 +1,16 @@
import { Provider } from 'jotai'
import { useState } from 'react'
import './App.css' import './App.css'
import Meeting from './components/meeting/Meeting' import Meeting from './components/meeting/Meeting'
import Sidebar from './components/sidebar/Sidebar' import Sidebar from './components/sidebar/Sidebar'
import useBackendData from './hooks/useBackendData' import useBackendData from './hooks/useBackendData'
import useConferenceData from './hooks/useConferenceData' import useConferenceData from './hooks/useConferenceData'
import useLocalUser from './hooks/useLocalUser' import useLocalUser from './hooks/useLocalUser'
import { useRoomName } from './hooks/useRoomName'
function App() { function App() {
const { userInfo, setUserInfo } = useLocalUser() const { userInfo, setUserInfo } = useLocalUser()
const { roomData, sendMessage } = useBackendData(userInfo) const { roomData, sendMessage } = useBackendData(userInfo)
const { conferenceData, setConferenceData } = useConferenceData(sendMessage, setUserInfo) const { conferenceData, setConferenceData } = useConferenceData(sendMessage, setUserInfo)
const [meetingStarted, setMeetingStarted] = useState(false)
console.log(roomData) console.log('[App] [Room Data]', roomData)
if (roomData && userInfo) { if (roomData && userInfo) {
return ( return (

View File

@ -1,4 +1,3 @@
import { useCallback, useState } from 'react'
import { ConferenceData } from '../../background/jitsi/eventListeners' import { ConferenceData } from '../../background/jitsi/eventListeners'
import useMeetingStarted from '../../hooks/useMeetingStarted' import useMeetingStarted from '../../hooks/useMeetingStarted'
import { useRoomName } from '../../hooks/useRoomName' import { useRoomName } from '../../hooks/useRoomName'
@ -13,7 +12,7 @@ interface Props {
} }
function Meeting({ conferenceData, setConferenceData, userInfo }: Props) { function Meeting({ conferenceData, setConferenceData, userInfo }: Props) {
const [meetingStarted, setMeetingStarted] = useMeetingStarted() const [meetingStarted] = useMeetingStarted()
const { roomName } = useRoomName() const { roomName } = useRoomName()
if (meetingStarted) { if (meetingStarted) {

View File

@ -6,11 +6,10 @@ import useWebSocketConnection from './useWebSocketConnection'
function useBackendData(userInfo: UserInfo) { function useBackendData(userInfo: UserInfo) {
console.log('[Rooms] useBackendData') console.log('[Rooms] useBackendData')
const { onMessage, sendMessage, disconnect } = useWebSocketConnection(userInfo) const { onMessage, sendMessage, disconnect } = useWebSocketConnection(userInfo)
const { roomData, setRoomData } = useRoomData() const { roomData, setRoomData } = useRoomData()
const { addChatMessage } = useAllChat()
const { chatMesages, addChatMessage } = useAllChat()
useEffect(() => { useEffect(() => {
onMessage((messageString) => { onMessage((messageString) => {