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

69 archived program page and delete restore functionality #82

Merged

Conversation

dnarimot
Copy link

Description

Implemented archived program page, modals for archiving, and functionality for buttons.

Screenshots/Media

Issues

Closes #69

@dnarimot dnarimot linked an issue Feb 20, 2025 that may be closed by this pull request
6 tasks
@dnarimot dnarimot self-assigned this Feb 20, 2025
@theNatePi
Copy link
Collaborator

theNatePi commented Feb 20, 2025

Hey @dnarimot @kunaidyp, good work! I have a few edits to make:

Note

Sorry for the confusion, the /programs page is actually on /home
The code is located in /components/programs

I was unable to view any archived pages on /programs/archived. Archived events existed in the database, but none were shown in the table

  • Fix archived programs table to show archived programs in the db
    Please fix the above first, and let me know when you have pushed the fix

/home Page fixes

  • Clicking the three dots should show "deactivate", not delete. Right now it shows the old popover as shown in the screenshot below. See the Figma for how this page should look
  • As noted in the issue: "Update the programs table on the /programs page to only show unarchived programs (events)"

/programs/:id Page fixes

  • The popover does not match Figma (see screenshot)
  • The deactivate modal does not match Figma (see screenshot)

Fix server/routes/programs.js

  • Update const data = db.query to const data = await db.query in programsRouter.delete("/:id"...

Update: Archived Programs Table

  • Fix the delete modal to match the Figma (see screenshot) UNLESS the modal has changed since you implemented it, if this is the case pls lmk
  • Hitting "confirm" on the delete program modal does not delete the program
  • If filtering by time or date, N/A options should not be included

P.S.:
Thank you for fixing the route in server/routes/assignments.js!

image image image image

Priska Kunaidy and others added 4 commits February 20, 2025 16:41
…rements for /home and /programs/:id pages; also altered API endpoint to pass archived column in calls
…y' of https://github.com/ctc-uci/lpa into 69-archived-program-page-and-deleterestore-functionality

Merging local changes with remote changes.
Copy link
Collaborator

@theNatePi theNatePi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix Needed

@theNatePi
Copy link
Collaborator

Lookgs good to me!

@theNatePi theNatePi merged commit 3d5a77f into main Feb 23, 2025
1 check passed
@theNatePi theNatePi deleted the 69-archived-program-page-and-deleterestore-functionality branch February 23, 2025 21:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Archived program page and Delete/Restore functionality
2 participants