Skip to content

feat: Implement Calendar & Meeting Schedule Page closes #80 #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
M0izz wants to merge 3 commits into
base: main
Choose a base branch
from
+945 −1
Open

feat: Implement Calendar & Meeting Schedule Page closes #80 #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d0e2f17
feat: implement Calendar and Meeting Schedule page with Month, Week, …
M0izz Jul 7, 2026
aa69614
feat: add date picker jump input to calendar filters toolbar
M0izz Jul 7, 2026
0b27cf9
fix: select and populate organization field in getAllMeetings
M0izz Jul 7, 2026
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
10 changes: 10 additions & 0 deletions client/src/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import MeetingRoom from "./pages/MeetingRoom.jsx";
import MeetingDetails from "./pages/MeetingDetails.jsx";
import TeamMembers from "./pages/TeamMembers.jsx";
import Profile from "./pages/Profile.jsx";
import Calendar from "./pages/Calendar.jsx";

// --- Components ---
import ProtectedRoute from "./components/ProtectedRoute.jsx";
Expand Down Expand Up @@ -240,6 +241,15 @@ const App = () => {
}
/>

<Route
path="/calendar"
element={
<ProtectedRoute>
<Calendar />
</ProtectedRoute>
}
/>

{/* ✅ Fallback route — send unknown routes to Home */}
<Route path="*" element={<Home />} />
</Routes>
Expand Down
2 changes: 2 additions & 0 deletions client/src/components/Navbar.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {
X,
LayoutDashboard,
Calendar,
CalendarDays,
Building2,
Search,
Bell,
Expand Down Expand Up @@ -204,6 +205,7 @@ const Navbar = () => {
const appLinks = [
{ label: "Dashboard", href: "/dashboard", icon: LayoutDashboard },
{ label: "Meetings", href: "/meetings", icon: Calendar },
{ label: "Calendar", href: "/calendar", icon: CalendarDays },
{ label: "Team Members", href: "/team-members", icon: Users },
{ label: "Organizations", href: "/select-role", icon: Building2 },
{ label: "AI Search", href: "/ai-search", icon: Search },
Expand Down
Loading
Loading