Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
142 changes: 142 additions & 0 deletions DocDocs/Frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions DocDocs/Frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"@testing-library/user-event": "^13.5.0",
"axios": "^1.7.7",
"googleapis": "^144.0.0",
"@zoomus/websdk": "^2.18.3",
"react": "^18.3.1",
"react-calendar": "^5.0.0",
"react-dom": "^18.3.1",
Expand Down
86 changes: 65 additions & 21 deletions DocDocs/Frontend/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,34 @@
import React, { useState } from 'react';
import './App.css';
import Login from './components/Login/Login.js';
import NavBar from './components/Home/NavBar/NavBar.js';
import NavBar from './components/Home/NavBar/NavBar.js';
import HomePage from './components/Home/HomePage/HomePage.js';
import MeetingPage from './components/Meeting/MeetingPage.js';
import Notes from './components/Home/Notes/Notes.js';
import ViewNote from './components/Home/ViewNote/ViewNote.js'; // Import ViewNote
import EditNotes from './components/Home/EditNotes/EditNotes.js'; // Import EditNotes
import { BrowserRouter as Router, Route, Routes } from 'react-router-dom';
import { BrowserRouter, Route, Routes } from 'react-router-dom';
import Meeting from './ZoomSDK/Meetings.js';


function App() {
const [isLoggedIn, setIsLoggedIn] = useState(false);
const [meetingInProgress, setMeetingInProgress] = useState(false);
const [isAdmin, setIsAdmin] = useState(false); // Default to false
const [isAdmin, setIsAdmin] = useState(false); // Ensure this is defined

const patient = {
name: 'John Doe',
pfp: 'https://via.placeholder.com/150', // Replace with actual photo URL
pfp: 'https://via.placeholder.com/150',
};

const meetings = 2;


const handleIsAdmin = () => {
setIsAdmin(!isAdmin);
};


const handleLogin = () => {
setIsLoggedIn(true);
};
Expand All @@ -34,39 +42,75 @@ function App() {
setMeetingInProgress(true);
};

// Using environment variables for the payload
const payload = {
meetingNumber: process.env.REACT_APP_MEETING_NUMBER,
role: Number(process.env.REACT_APP_ROLE),
sdkKey: process.env.REACT_APP_SDK_KEY,
sdkSecret: process.env.REACT_APP_SDK_SECRET,
passWord: process.env.REACT_APP_PASSWORD,
userName: process.env.REACT_APP_USER_NAME,
userEmail: process.env.REACT_APP_USER_EMAIL,
leaveUrl: process.env.REACT_APP_LEAVE_URL
};

/*
return (
<div className="App">
{!isLoggedIn ? (
<Login onLogin={handleLogin} />
) : (
<>
{meetingInProgress ? (
<Meeting payload={payload} />
) : (
<>
<NavBar patient={patient} onLogout={handleLogout} />
<HomePage
patient={patient}
meetings={meetings}
onJoinMeeting={handleJoinMeeting}
/>
</>
)}
</>
)}
</div>
*/
const handleMeetingEnd = () => {
setMeetingInProgress(false); // Reset the meeting state
};

return (
<Router>
<div className="App">
{!isLoggedIn ? (
<Login onLogin={handleLogin} setIsAdmin={setIsAdmin} />
<Login onLogin={handleLogin} setIsAdmin={setIsAdmin}/>
) : (
<>
{meetingInProgress ? (
<MeetingPage
<>
{/* <MeetingPage
patient={patient}
meetings={meetings}
onJoinMeeting={handleJoinMeeting}
onEndMeeting={handleMeetingEnd}
/>
) : (
<>
<NavBar patient={patient} onLogout={handleLogout} />
<Routes>
<Route path="/" element={<HomePage patient={patient} meetings={meetings} onJoinMeeting={handleJoinMeeting} />} />
<Route path="/notes" element={<Notes isAdmin={isAdmin} />} /> {/* Notes route */}
<Route path="/view-note/:noteId" element={<ViewNote />} /> {/* New route for ViewNote */}
<Route path="/edit-notes" element={<EditNotes />} /> {/* Route for EditNotes */}
</Routes>
</>
)}
onEndMeeting={handleMeetingEnd} /> */}

<Meeting payload={payload} />
</>
) : (
<>
<NavBar patient={patient} onLogout={handleLogout} />
<Routes>
<Route path="/" element={<HomePage patient={patient} meetings={meetings} onJoinMeeting={handleJoinMeeting} />} />
<Route path="/notes" element={<Notes isAdmin={isAdmin} />} /> {/* Notes route */}
<Route path="/view-note/:noteId" element={<ViewNote />} /> {/* New route for ViewNote */}
<Route path="/edit-notes" element={<EditNotes />} /> {/* Route for EditNotes */}
</Routes>
</>
)}
</>
)}
</div>
</Router>
);
}

Expand Down
Loading