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.

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

Dev to main #633

Merged
merged 25 commits into from
Nov 1, 2024
Merged

Dev to main #633

merged 25 commits into from
Nov 1, 2024

Commits on Oct 8, 2024

  1. added rewards page structure

    @ErpingS
    ErpingS committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    e735162 View commit details
    Browse the repository at this point in the history

  2. Update hackcamp theme colors

    @daniel-panhead
    daniel-panhead committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    667ca28 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2024

  1. Merge pull request #617 from nwplus/erping/rewards 

    Added rewards page structure
    @DonaldKLee
    DonaldKLee authored Oct 10, 2024
    Configuration menu
    Copy the full SHA
    2163473 View commit details
    Browse the repository at this point in the history

  2. Revert "Update hackcamp theme colors" 

    This reverts commit 667ca28.
    @martincai8
    martincai8 committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    8d2a178 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2024

  1. Merge branch 'main' of https://github.com/nwplus/portal into erping/r… 

    …ewards
    @ErpingS
    ErpingS committed Oct 20, 2024
    Configuration menu
    Copy the full SHA
    061539e View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2024

  1. added rewards total points UI

    @ErpingS
    ErpingS committed Oct 26, 2024
    Configuration menu
    Copy the full SHA
    2469e91 View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2024

  1. wrap getAndAssignProjects with db.runTransaction

    @tdanielles
    tdanielles committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    ee93d3a View commit details
    Browse the repository at this point in the history

  2. replaced methods to transaction

    @tdanielles
    tdanielles committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    d8fe8dc View commit details
    Browse the repository at this point in the history

  3. add error handling for functions

    @tdanielles
    tdanielles committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    8140c9a View commit details
    Browse the repository at this point in the history

  4. Merge pull request #629 from nwplus/peer-judging-bug 

    Wrap getAndAssignProjects with db.runTransaction
    @tdanielles
    tdanielles authored Oct 29, 2024
    Configuration menu
    Copy the full SHA
    038b124 View commit details
    Browse the repository at this point in the history

  5. fix schedule on mobile

    @martincai8
    martincai8 committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    afb3bf6 View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2024

  1. Add placeholder attended events card + basic rewards layout

    @daniel-panhead
    daniel-panhead committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    a7dfea7 View commit details
    Browse the repository at this point in the history

  2. Make attended events card dynamic

    @daniel-panhead
    daniel-panhead committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    37b9e8b View commit details
    Browse the repository at this point in the history

  3. Add type hinting to auth context user object

    @daniel-panhead
    daniel-panhead committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    5fa0733 View commit details
    Browse the repository at this point in the history

  4. Load user details and pass to attended events component

    @daniel-panhead
    daniel-panhead committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    3637dda View commit details
    Browse the repository at this point in the history

  5. Get user attended events from firebase

    @daniel-panhead
    daniel-panhead committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    e17a495 View commit details
    Browse the repository at this point in the history

  6. Display correct attended events type

    @daniel-panhead
    daniel-panhead committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    0d266e8 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #627 from nwplus/daniel/attended-events 

    Attended Events component
    @daniel-panhead
    daniel-panhead authored Oct 31, 2024
    Configuration menu
    Copy the full SHA
    e6e5cdc View commit details
    Browse the repository at this point in the history

  8. Merge branch 'dev' into erping/rewards

    @ErpingS
    ErpingS committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    652305b View commit details
    Browse the repository at this point in the history

  9. updated eventIDs firebase pulling

    @ErpingS
    ErpingS committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    96cb771 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'dev' into erping/rewards

    @ErpingS
    ErpingS authored Oct 31, 2024
    Configuration menu
    Copy the full SHA
    f32ff52 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #628 from nwplus/erping/rewards 

    Erping/rewards
    @ErpingS
    ErpingS authored Oct 31, 2024
    Configuration menu
    Copy the full SHA
    f72e1d9 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2024

  1. Comment out rewards page

    @martincai8
    martincai8 committed Nov 1, 2024
    Configuration menu
    Copy the full SHA
    66957e3 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #631 from nwplus/comment-out-rewards

    @martincai8
    martincai8 authored Nov 1, 2024
    Configuration menu
    Copy the full SHA
    ce1ccd2 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #632 from nwplus/main

    @martincai8
    martincai8 authored Nov 1, 2024
    Configuration menu
    Copy the full SHA
    784902d View commit details
    Browse the repository at this point in the history