Skip to content
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.

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

Creating home page #62

Merged
merged 43 commits into from
Feb 10, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
36364e7
testing home
margoglvz Jan 30, 2025
b463bb9
updated home
margoglvz Jan 30, 2025
5bfd758
feat: include active status and upcoming time/date of next booking fo…
colet0227 Jan 30, 2025
1bfe3cd
feat: add rooms, instructors/payees to programs table and ensure most…
colet0227 Jan 31, 2025
d35fe49
feat: make event delete endpoint delete related records and implement…
colet0227 Jan 31, 2025
bf4c591
feat: import icons (probably shoulda just done .svg files but oh well
colet0227 Feb 1, 2025
d414101
feat: add in icons
colet0227 Feb 1, 2025
a934d0f
new programs router
margoglvz Feb 2, 2025
cb4e311
added programs route
margoglvz Feb 2, 2025
196fb59
fixed query
margoglvz Feb 2, 2025
a7b79cc
updated home page functionality and filter modal
margoglvz Feb 2, 2025
dab17b1
added buttons with status icons
margoglvz Feb 2, 2025
36c6a57
program icon updated and implemented
margoglvz Feb 2, 2025
a513c76
fix: fix functionality for program filters modal
colet0227 Feb 2, 2025
60a589e
added and aligned icons on home page and filters modal
margoglvz Feb 2, 2025
364b50f
table format
margoglvz Feb 2, 2025
9b0ee06
updated query
margoglvz Feb 3, 2025
308aec1
fix: ensure delete endpoint removes all associated invoices, bookings…
colet0227 Feb 3, 2025
20dcbfb
fix: update program table endpoint to include programs w/out bookings…
colet0227 Feb 3, 2025
63dfc7c
updated table format, filter, and search feature
margoglvz Feb 3, 2025
9617d12
new status icon for status hover
margoglvz Feb 3, 2025
0918651
removed background of edit/delete button
margoglvz Feb 3, 2025
73907f1
feat: add header row component for home page + navbar
colet0227 Feb 3, 2025
dbabcd0
style: move home page styling to css file
colet0227 Feb 3, 2025
49334c3
Merge branch 'creating-home-page' of https://github.com/ctc-uci/lpa i…
margoglvz Feb 3, 2025
af9c044
fixed gap
margoglvz Feb 3, 2025
f6efbec
merged updated program modals
margoglvz Feb 3, 2025
51c70b6
fixed table width
margoglvz Feb 3, 2025
70dc42a
fix: spacing responsiveness when no programs available
margoglvz Feb 3, 2025
96cf92c
style: match up home page to figma mockup
colet0227 Feb 3, 2025
2e3ff04
fix: filter popup to filter dropdown
margoglvz Feb 4, 2025
b84b37d
style: add in finalized touches
colet0227 Feb 5, 2025
bdbbfa9
fix: fix to pass merge tests
colet0227 Feb 5, 2025
035d7dd
fix: filter by date + fix navbar + add multiple instructors/payees to…
colet0227 Feb 6, 2025
c61c82d
Make /home protected
theNatePi Feb 7, 2025
d443727
deleted temp reference
margoglvz Feb 7, 2025
ac5da4b
Fix spacing and row color
theNatePi Feb 9, 2025
35d08c1
Add grey icon for programs with no booking
theNatePi Feb 9, 2025
b850ace
Revert "Add grey icon for programs with no booking"
theNatePi Feb 9, 2025
91f7519
Fix no booking status icon
theNatePi Feb 9, 2025
5510d3a
filters can search sole instructor/payee when multiple instructors/pa…
margoglvz Feb 10, 2025
c3f7970
Merge branch 'main' into creating-home-page
theNatePi Feb 10, 2025
02bc580
Remove duplicate import in App
theNatePi Feb 10, 2025
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
4 changes: 4 additions & 0 deletions client/index.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
<!doctype html>
<html lang="en">
<head>
<link
href="https://fonts.googleapis.com/css2?family=Inter:wght@400;600&display=swap"
rel="stylesheet"
/>
<meta charset="UTF-8" />
<link
rel="icon"
Expand Down
5 changes: 5 additions & 0 deletions client/src/App.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { PDFViewer } from "@react-pdf/renderer";

Check warning on line 1 in client/src/App.jsx

View workflow job for this annotation

GitHub Actions / run-checks

'PDFViewer' is defined but never used. Allowed unused vars must match /^_/u
import { CookiesProvider } from "react-cookie";
import {
Navigate,
Expand All @@ -15,7 +15,7 @@
import { ForgotPassword } from "./components/login/ForgotPassword";
import { Login } from "./components/login/Login";
import { Notifications } from "./components/notifications/Notifications";
import PDFButton from "./components/PDFButton";

Check warning on line 18 in client/src/App.jsx

View workflow job for this annotation

GitHub Actions / run-checks

'PDFButton' is defined but never used. Allowed unused vars must match /^_/u
import { Playground } from "./components/playground/Playground";
import { EditProgram } from "./components/programs/EditProgram";
import { Program } from "./components/programs/Program";
Expand All @@ -24,6 +24,7 @@
import { AuthProvider } from "./contexts/AuthContext";
import { BackendProvider } from "./contexts/BackendContext";
import { RoleProvider } from "./contexts/RoleContext";
import { Home } from "./components/home/Home";

const App = () => {
return (
Expand Down Expand Up @@ -67,6 +68,10 @@
path="/playground"
element={<Playground />}
/>
<Route
path ="/home"
element={<ProtectedRoute element={<Home />} />}
/>
<Route
path="/notifications"
element={<ProtectedRoute element={<Notifications />} />}
Expand Down
8 changes: 8 additions & 0 deletions client/src/assets/icons/actions.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions client/src/assets/icons/active.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions client/src/assets/icons/archive.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions client/src/assets/icons/calendar.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions client/src/assets/icons/cancel.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions client/src/assets/icons/clock.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions client/src/assets/icons/edit.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions client/src/assets/icons/filter.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions client/src/assets/icons/google-calendar.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions client/src/assets/icons/location.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions client/src/assets/icons/none.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions client/src/assets/icons/past.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions client/src/assets/icons/person.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions client/src/assets/icons/plus.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions client/src/assets/icons/program.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions client/src/assets/icons/search.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading