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

Jump to bottom

clue/FEE: Implement User and Admin Menu Dropdowns #392 #487

Merged
merged 46 commits into from
Nov 19, 2024
Merged

clue/FEE: Implement User and Admin Menu Dropdowns #392 #487

merged 46 commits into from
Nov 19, 2024

Commits on Aug 28, 2024

  1. finshed implementing admin menu dropdown

    @Clue355
    Clue355 committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    8840b9d View commit details
    Browse the repository at this point in the history

  2. completed adding tests and edit profile button directs to /admin/edit… 

    …-profile page
    @Clue355
    Clue355 committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    270fcad View commit details
    Browse the repository at this point in the history

  3. attempt at fixing errors

    @Clue355
    Clue355 committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    8aacdcd View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2024

  1. edit to edit profile route

    @Clue355
    Clue355 committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    b8cd18b View commit details
    Browse the repository at this point in the history

  2. added route change function

    @Clue355
    Clue355 committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    7a38476 View commit details
    Browse the repository at this point in the history

  3. added more comments and correct return values

    @Clue355
    Clue355 committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    d4240cc View commit details
    Browse the repository at this point in the history

  4. added more jsdoc comments to the /user/edit page

    @Clue355
    Clue355 committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    a63b39b View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2024

  1. small edit to border stlying to look like figma

    @Clue355
    Clue355 committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    0a4555e View commit details
    Browse the repository at this point in the history

  2. small edit to styling

    @Clue355
    Clue355 committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    f43e026 View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2024

  1. UI/UX: re-implement league entries UI (#468) 

    # Re-Implement League Entries UI/UX
Closes #443 
My previous UI implementation was not carried over when the page was
made interactive and filled with data, therefore, I had to re-implement
it.

## Week 1 State
![Arc GridIron
Survivor-000116](https://github.com/user-attachments/assets/5ddb2dc5-c7d6-484f-b1d3-2ba0e802b776)

## Week 2+ State
If `currentWeek` is great than one, it should display a link to view
past week's picks
![Arc GridIron
Survivor-000120](https://github.com/user-attachments/assets/1c307b06-7aff-4b82-b19a-b38fdcc69cbb)

## To Do
- [X] Double-check that my code is accurate to the design.
- [X] Add tests.
    @ryandotfurrer @Clue355
    ryandotfurrer authored and Clue355 committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    e44a123 View commit details
    Browse the repository at this point in the history

  2. #496 Chris/Limit-User-Entries (#498) 

    fixes #496 

✅ Limits user to 5 entries
✅ Updated Unit Test

## SCREENSHOT
![CleanShot_2024-09-04_at_13 49
55](https://github.com/user-attachments/assets/306e60ea-15b9-4be3-b1fc-dbf1d97ba1df)
    @chris-nowicki @Clue355
    chris-nowicki authored and Clue355 committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    711bae3 View commit details
    Browse the repository at this point in the history

  3. added in code to fetch all leagues (#491) 

    Fixes #477 

1) Fetched all leagues
2) allow user to select a league to join from the dropdown 
3) add in success and error notifications
4) added in warning notifications of the same leagues have been selected
already

No tests are written as of the moment.

---------

Co-authored-by: Alex Appleget <[email protected]>
Co-authored-by: Chris Nowicki <[email protected]>
    @vmaineng @alexappleget
    @chris-nowicki @Clue355
    3 people authored and Clue355 committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    cb516d6 View commit details
    Browse the repository at this point in the history

  4. feat #315: Make a selection page updates (#447) 

    Close #315 

* Set team if the user currently has them selected
* Disable teams from being selected if they've already been used
* Fix: only one team can be selected at a time

---------

Co-authored-by: Shashi Lo <[email protected]>
Co-authored-by: Mai Vang <[email protected]>
    @jennifertieu @shashilo
    @vmaineng @Clue355
    3 people authored and Clue355 committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    39b2646 View commit details
    Browse the repository at this point in the history

  5. delete user layout

    @Clue355
    Clue355 committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    82d4d38 View commit details
    Browse the repository at this point in the history

  6. deleted blank space in api functions

    @Clue355
    Clue355 committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    6d1f156 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'develop' into clue355/implement-menu-dropdown

    @Clue355
    Clue355 authored Sep 10, 2024
    Configuration menu
    Copy the full SHA
    32a0357 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'develop' into clue355/implement-menu-dropdown

    @Clue355
    Clue355 authored Sep 10, 2024
    Configuration menu
    Copy the full SHA
    43ab662 View commit details
    Browse the repository at this point in the history

  9. update

    @Clue355
    Clue355 committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    1624e58 View commit details
    Browse the repository at this point in the history

  10. deleted merge conflics

    @Clue355
    Clue355 committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    18e7fb9 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2024

  1. fixed tests

    @Clue355
    Clue355 committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    c7548a4 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2024

  1. implemented shashi changes

    @Clue355
    Clue355 committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    806ba0c View commit details
    Browse the repository at this point in the history

  2. changes to text hover color

    @Clue355
    Clue355 committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    ab630c7 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into clue355/implement-menu-dropdown

    @Clue355
    Clue355 authored Sep 12, 2024
    Configuration menu
    Copy the full SHA
    dc96191 View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2024

  1. Update page.test.tsx 

    deleted space
    @Clue355
    Clue355 authored Sep 16, 2024
    Configuration menu
    Copy the full SHA
    131ea7c View commit details
    Browse the repository at this point in the history

  2. added back spaces

    @Clue355
    Clue355 committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    ecfe368 View commit details
    Browse the repository at this point in the history

  3. added back spaces

    @Clue355
    Clue355 committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    1f8af16 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2024

  1. Merge branch 'develop' of https://github.com/LetsGetTechnical/gridiro… 

    …n-survivor into clue355/implement-menu-dropdown
    @ryandotfurrer
    ryandotfurrer committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    bca6971 View commit details
    Browse the repository at this point in the history

  2. refine stylig of AdminUserSettings component and merge in develop

    @ryandotfurrer
    ryandotfurrer committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    989eb27 View commit details
    Browse the repository at this point in the history

  3. update adminusersettings test

    @ryandotfurrer
    ryandotfurrer committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    bbac284 View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2024

  1. Merge branch 'develop' into clue355/implement-menu-dropdown

    @Clue355
    Clue355 authored Oct 1, 2024
    Configuration menu
    Copy the full SHA
    2652962 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2024

  1. Merge branch 'develop' into clue355/implement-menu-dropdown

    @Clue355
    Clue355 authored Oct 7, 2024
    Configuration menu
    Copy the full SHA
    56c16c7 View commit details
    Browse the repository at this point in the history

  2. change PR to include no tests in adminnav.test

    @Clue355
    Clue355 committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    930b5ca View commit details
    Browse the repository at this point in the history

  3. small edit adding back test router mocking

    @Clue355
    Clue355 committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    1013bfc View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2024

  1. Merge branch 'develop' into clue355/implement-menu-dropdown

    @Clue355
    Clue355 authored Oct 8, 2024
    Configuration menu
    Copy the full SHA
    199a109 View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2024

  1. Merge branch 'develop' into clue355/implement-menu-dropdown

    @shashilo
    shashilo authored Oct 16, 2024
    Configuration menu
    Copy the full SHA
    b2ef060 View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2024

  1. Cody/link to profile edit page (#614) 

    Closes #472 

Branched off of [Carlos's
PR](#487)
where he implement the user dropdown menu

- added `href="/account/settings"` to edit profile link
- Refactored the test to reflect the changes
    @kepsteen
    kepsteen authored Oct 22, 2024
    Configuration menu
    Copy the full SHA
    843c317 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into clue355/implement-menu-dropdown

    @kepsteen
    kepsteen authored Oct 22, 2024
    Configuration menu
    Copy the full SHA
    9fb7f34 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2024

  1. add logout page

    @kepsteen
    kepsteen committed Oct 28, 2024
    Configuration menu
    Copy the full SHA
    52f9cb4 View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2024

  1. switch sign out button to LinkCustom

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

  2. Merge branch 'develop' into clue355/implement-menu-dropdown

    @kepsteen
    kepsteen authored Oct 29, 2024
    Configuration menu
    Copy the full SHA
    1a51303 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2024

  1. Merge branch 'develop' into clue355/implement-menu-dropdown

    @kepsteen
    kepsteen authored Nov 7, 2024
    Configuration menu
    Copy the full SHA
    053115e View commit details
    Browse the repository at this point in the history

  2. remove logout page and change link to button

    @kepsteen
    kepsteen committed Nov 7, 2024
    Configuration menu
    Copy the full SHA
    49bb7d8 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2024

  1. Merge remote-tracking branch 'origin/develop' into clue355/implement-… 

    …menu-dropdown
    @kepsteen
    kepsteen committed Nov 13, 2024
    Configuration menu
    Copy the full SHA
    cbad1fe View commit details
    Browse the repository at this point in the history

  2. throw actual error in handleLogout

    @kepsteen
    kepsteen committed Nov 13, 2024
    Configuration menu
    Copy the full SHA
    993bd01 View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2024

  1. Merge branch 'develop' into clue355/implement-menu-dropdown

    @Danielle254
    Danielle254 authored Nov 19, 2024
    Configuration menu
    Copy the full SHA
    83680b5 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into clue355/implement-menu-dropdown

    @Danielle254
    Danielle254 authored Nov 19, 2024
    Configuration menu
    Copy the full SHA
    22393ba View commit details
    Browse the repository at this point in the history