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

Planscreen player #131

Merged
merged 11 commits into from
Apr 9, 2024
Merged

Planscreen player #131

merged 11 commits into from
Apr 9, 2024

Conversation

ajpert
Copy link
Contributor

@ajpert ajpert commented Apr 6, 2024

Plan screen for users, shows all plans right now but will eventually show just one week. Is updated once a drill is finished.

  • small issue with starting drill from plan screen before opening up drill screen

@ajpert ajpert requested review from FrankreedX and solderq35 April 7, 2024 20:10
@solderq35
Copy link
Contributor

image

  • Add unique keys to list items

image

  • What does the green highlight mean? Maybe it should be made more clear to the user, or maybe could add a help icon / popup
  • Not sure why there are no spaces between the words for some of the drills (although I noticed in the drill tab too, so probably not specific to this PR)
  • Irregular spacing between "line test" and "7-PW" vs "20 shot challenge" and "100-150 yds". I think the spacing should be more uniform between the drill name and the "target" info about the distance / club type / etc.
    • Maybe put a max width around drill name / target , and extra text wraps around to second line?
  • In general I think the font size is a bit big compared to the drill tab

Copy link
Contributor

@FrankreedX FrankreedX left a comment

Choose a reason for hiding this comment

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

I'll run this later lol

app/content/drill/[id]/description.js Outdated Show resolved Hide resolved
app/content/drill/[id]/index.js Outdated Show resolved Hide resolved
app/content/plan/index.js Outdated Show resolved Hide resolved
app/content/plan/index.js Outdated Show resolved Hide resolved
app/content/plan/index.js Outdated Show resolved Hide resolved
app/content/plan/index.js Outdated Show resolved Hide resolved
app/content/plan/index.js Show resolved Hide resolved
app/content/plan/index.js Outdated Show resolved Hide resolved
app/segments/drill/[id]/submission/input.js Outdated Show resolved Hide resolved
app/content/plan/index.js Outdated Show resolved Hide resolved
@FrankreedX
Copy link
Contributor

I've taken a look at the actual page itself when it's running and the functionality looks good.
I think I want to add one more thing: Can you store the attemptId inside the assignment also? So when a player clicks on a completed assignment, they're taken to that attempt.

Copy link
Contributor

@FrankreedX FrankreedX left a comment

Choose a reason for hiding this comment

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

I think this is my last change request. Your code looks good!

app/segments/drill/[id]/submission/input.js Outdated Show resolved Hide resolved
@ajpert ajpert merged commit 89eb868 into layout Apr 9, 2024
1 check passed
Gehrkej added a commit that referenced this pull request Apr 12, 2024
* Added handling for non numbers and empty values

* Added comments for future work

* Frankreed/unify result screens (#96)

* Result screens unified!

* fixed the display bug in result

* added title to styles, some redundancy removed from barChartScreen

---------

Co-authored-by: Jake Gehrke <[email protected]>

* Planscreen player (#131)

* plan hooked fully to database and finished by submitting drill

* scroll down to refresh

* change naming to be more clear and requre drill id and assigned_time

* add assigned_data to user on user creation

* fix key issue, lighter green, squircle, spacing of description

* styling

* updated prettier and github action settings to be more strict

* code cleanup

* ran pretty

* attemptRefId into attemptId

---------

Co-authored-by: Frankreed <[email protected]>

* added hard coded helper text

* helperText is now pulled from database

* Added handling for non numbers and empty values

* Added comments for future work

* added hard coded helper text

* helperText is now pulled from database

* added error handling for submit drill button

* adjusted uploadAttempt function after rebase

* updated SID to be 1-20

* added error handling for submit drill button

* adjusted uploadAttempt function after rebase

* updated SID to be 1-20

* Inital changes requested from frank in PR

* Converted error banners to error dialogs

* Frankreed/Bar chart is 60fps consistent now (#129)

* Database updated and codebase uses title instead of drillType

* Removed title and added prettyDrillType and subType

* Added putting to database and updated codebase

* Rebased with layout and prettiier ran

* leaderboard is more resilient to incorrect data

* style changes

* barChart performance vastly improved. Frame rate is now pegged at 60 (for ios). Still crashes on Android.

* this doesn't improve anything measurable, it just makes sense in my head

* Paginate barChart

* very minor tick change/add back

* barChart now displays 0 as the minimum instead of the lowest value (if the lowest value is lower than 0, display that instead).
Illegal attempts shall be terminated

---------

Co-authored-by: hannacol <[email protected]>

* Minor cosmetic fixes (#138)

* Database updated and codebase uses title instead of drillType

* Removed title and added prettyDrillType and subType

* Added putting to database and updated codebase

* Rebased with layout and prettiier ran

* made target an array for all drill types for consistency and fixed shotAccordion shotNum display

* updated more code for target lists

* Result screen works for putting drills

* style changes

* Ran prettier

* Updated Headers to hold title better

* prettier ran

* ran prettier

* added margin to the left and right of the segmented buttons

* commented out a lot of prints, changed uid to a string instead of reference,
sorted user in Teams based on role

* Fixed shotAccordion's weird shot spacing

---------

Co-authored-by: hannacol <[email protected]>

* Database updated and codebase uses title instead of drillType (#134)

* Database updated and codebase uses title instead of drillType

* Removed title and added prettyDrillType and subType

* Added putting to database and updated codebase

* Rebased with layout and prettiier ran

* made target an array for all drill types for consistency and fixed shotAccordion shotNum display

* Result screen works for putting drills

* style changes

* ran prettier

* Made attemptShots use an object instead of an array for targets and componentized header

* Fixed drill list styling and ran prettier after rebase

---------

Co-authored-by: Frankreed <[email protected]>

* Reworking Drill Screens to be Componentized (#140)

* DrillList has been componentized for main drill list and profile view to be sectioned off

* Moved glyphs to be in section header instead of drill card

* Drlll Description componentized for description screen and description modal and deleted image carousel

* ran yarn pretty

* slight optimization to getUnique

* Removed prettyDrillType and modified drillType

---------

Co-authored-by: Frankreed <[email protected]>

* ErrorDialog Component Created and Styled

* Added styling to Leave Dialog

* Swapped order of action buttons in leave drill dialog

* Created submitVisable varible

* Added handling for non numbers and empty values

* Added comments for future work

* added hard coded helper text

* helperText is now pulled from database

* added error handling for submit drill button

* adjusted uploadAttempt function after rebase

* updated SID to be 1-20

* Added handling for non numbers and empty values

* added error handling for submit drill button

* Inital changes requested from frank in PR

* Converted error banners to error dialogs

* ErrorDialog Component Created and Styled

* Added styling to Leave Dialog

* Swapped order of action buttons in leave drill dialog

* Created submitVisable varible

* added header import back

* fix weird stuff with rebase

* more weird rebase things

* Restart Drill functionality working (#136)

* fixed duplicate sid

* All dialogs using DialogComponent

* Added handling for non numbers and empty values

* Added comments for future work

* added hard coded helper text

* helperText is now pulled from database

* added error handling for submit drill button

* adjusted uploadAttempt function after rebase

* updated SID to be 1-20

* Added handling for non numbers and empty values

* added error handling for submit drill button

* Inital changes requested from frank in PR

* Converted error banners to error dialogs

* ErrorDialog Component Created and Styled

* Added styling to Leave Dialog

* Swapped order of action buttons in leave drill dialog

* Created submitVisable varible

* added header import back

* Added handling for non numbers and empty values

* Added comments for future work

* adjusted uploadAttempt function after rebase

* Added handling for non numbers and empty values

* ErrorDialog Component Created and Styled

* All dialogs using DialogComponent

* Fixed uploadAttempt header comment

* changed == to ===, and added one missing import, remove unused imports, and fixed calculateProxHole cuz I was stupid...

* fixed faulty getUnique

---------

Co-authored-by: Frank Nguyen <[email protected]>
Co-authored-by: ajpert <[email protected]>
Co-authored-by: Frankreed <[email protected]>
Co-authored-by: hannacol <[email protected]>
Co-authored-by: hannacol <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants