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

8-healing-resource-pages #19

Merged
merged 3 commits into from
Oct 25, 2024
Merged

8-healing-resource-pages #19

merged 3 commits into from
Oct 25, 2024

Conversation

arfamomin
Copy link
Contributor

@arfamomin arfamomin commented Oct 23, 2024

What's new in this PR

Description

  • Main healing resources page now has two functional buttons
  • Healing Catalogue is now populated with resources from supabase querying (Resources that fit multiple categories are also populated as such)
  • Left nav buttons control navigation of themes on scroll

Screenshots

IMG_0881
IMG_0882

How to review

  • Review all at once, most work done in "HealingCatalogue" folder
  • Also review if I did the supabase querying and types stuff correctly (this is my first time doing it so def correct me if I did it wrong)

Next steps

  • I did not end up creating a new component for a "resource card" yet because not sure the complete props to give it yet
  • The themed nav button styling isnt exactly like the mid-fi so I think that can be cleaned up later (maybe developed in the HFH sprint?)

Relevant links

Online sources

https://reactnative.dev/docs/scrollview (Possibly check if there is an easier way than I did it, which was storing the y position of the header as it page gets rendered)

Related PRs

N/A for now

CC: @philipye314

@arfamomin arfamomin linked an issue Oct 23, 2024 that may be closed by this pull request
Comment on lines 70 to 71
<View style={styles.themeHeader} onLayout={onLayoutHeader(index)}>
<Text style={styles.themeHeaderText}>{theme}</Text>
Copy link
Collaborator

Choose a reason for hiding this comment

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

add a key here to stop typescript from yelling lol

Copy link
Collaborator

Choose a reason for hiding this comment

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

done

philipye314
philipye314 previously approved these changes Oct 25, 2024
Copy link
Collaborator

@philipye314 philipye314 left a comment

Choose a reason for hiding this comment

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

Looks good! I fixed some really minor things, great work

Copy link
Collaborator

@philipye314 philipye314 left a comment

Choose a reason for hiding this comment

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

APPROVED BRUH

@philipye314 philipye314 merged commit 0181d8b into main Oct 25, 2024
2 checks passed
@philipye314 philipye314 deleted the 8-healing-resource-pages branch October 25, 2024 00:03
philipye314 added a commit that referenced this pull request Oct 25, 2024
* [feat] resources rendered and scrolling by buttons

* good work arfa, minor adjustments

---------

Co-authored-by: philipye314 <[email protected]>
philipye314 added a commit that referenced this pull request Oct 25, 2024
* navigation

* got rid of unused files

* CodyGarciaa/Legal-Rights-Prea-Pages (#13)

* set up legal rights skeleton, can go to video page with nothing there yet tho

* added video and testing player

* more testing with video, lowk not getting .mp4 to work

* legal rights page scrollable

* added caption buttons, lowk still to add more to it

* closed caption buttons are toggleable and XOR

* finished pr

* resolved philip's problems lol

* 5 create resources sub pages (#15)

* seek help to resource list

* seek help to resource list

* fixed some things

* removed unused import

---------

Co-authored-by: Philip Ye <[email protected]>
Co-authored-by: philipye314 <[email protected]>

* 8-healing-resource-pages (#19)

* [feat] resources rendered and scrolling by buttons

* good work arfa, minor adjustments

---------

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

* [bug fix] removed extra type file

* navigation

* got rid of unused files

* [fix] 🐐🐐🐐

* [fix] did screen props

* deleted unused files

---------

Co-authored-by: philipye314 <[email protected]>
Co-authored-by: CodyGarciaa <[email protected]>
Co-authored-by: angelinetu <[email protected]>
Co-authored-by: Philip Ye <[email protected]>
Co-authored-by: philipye314 <[email protected]>
Co-authored-by: Arfa Momin <[email protected]>
CodyGarciaa pushed a commit that referenced this pull request Oct 26, 2024
* [feat] resources rendered and scrolling by buttons

* good work arfa, minor adjustments

---------

Co-authored-by: philipye314 <[email protected]>
CodyGarciaa added a commit that referenced this pull request Oct 26, 2024
* navigation

* got rid of unused files

* CodyGarciaa/Legal-Rights-Prea-Pages (#13)

* set up legal rights skeleton, can go to video page with nothing there yet tho

* added video and testing player

* more testing with video, lowk not getting .mp4 to work

* legal rights page scrollable

* added caption buttons, lowk still to add more to it

* closed caption buttons are toggleable and XOR

* finished pr

* resolved philip's problems lol

* 5 create resources sub pages (#15)

* seek help to resource list

* seek help to resource list

* fixed some things

* removed unused import

---------

Co-authored-by: Philip Ye <[email protected]>
Co-authored-by: philipye314 <[email protected]>

* 8-healing-resource-pages (#19)

* [feat] resources rendered and scrolling by buttons

* good work arfa, minor adjustments

---------

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

* [bug fix] removed extra type file

* navigation

* got rid of unused files

* [fix] 🐐🐐🐐

* [fix] did screen props

* deleted unused files

---------

Co-authored-by: philipye314 <[email protected]>
Co-authored-by: CodyGarciaa <[email protected]>
Co-authored-by: angelinetu <[email protected]>
Co-authored-by: Philip Ye <[email protected]>
Co-authored-by: philipye314 <[email protected]>
Co-authored-by: Arfa Momin <[email protected]>
CodyGarciaa added a commit that referenced this pull request Oct 26, 2024
* navigation

* got rid of unused files

* CodyGarciaa/Legal-Rights-Prea-Pages (#13)

* set up legal rights skeleton, can go to video page with nothing there yet tho

* added video and testing player

* more testing with video, lowk not getting .mp4 to work

* legal rights page scrollable

* added caption buttons, lowk still to add more to it

* closed caption buttons are toggleable and XOR

* finished pr

* resolved philip's problems lol

* 5 create resources sub pages (#15)

* seek help to resource list

* seek help to resource list

* fixed some things

* removed unused import

---------

Co-authored-by: Philip Ye <[email protected]>
Co-authored-by: philipye314 <[email protected]>

* 8-healing-resource-pages (#19)

* [feat] resources rendered and scrolling by buttons

* good work arfa, minor adjustments

---------

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

* [bug fix] removed extra type file

* navigation

* got rid of unused files

* [fix] 🐐🐐🐐

* [fix] did screen props

* deleted unused files

---------

Co-authored-by: philipye314 <[email protected]>
Co-authored-by: CodyGarciaa <[email protected]>
Co-authored-by: angelinetu <[email protected]>
Co-authored-by: Philip Ye <[email protected]>
Co-authored-by: philipye314 <[email protected]>
Co-authored-by: Arfa Momin <[email protected]>
philipye314 added a commit that referenced this pull request Nov 1, 2024
* navigation

* got rid of unused files

* CodyGarciaa/Legal-Rights-Prea-Pages (#13)

* set up legal rights skeleton, can go to video page with nothing there yet tho

* added video and testing player

* more testing with video, lowk not getting .mp4 to work

* legal rights page scrollable

* added caption buttons, lowk still to add more to it

* closed caption buttons are toggleable and XOR

* finished pr

* resolved philip's problems lol

* 5 create resources sub pages (#15)

* seek help to resource list

* seek help to resource list

* fixed some things

* removed unused import

---------

Co-authored-by: Philip Ye <[email protected]>
Co-authored-by: philipye314 <[email protected]>

* 8-healing-resource-pages (#19)

* [feat] resources rendered and scrolling by buttons

* good work arfa, minor adjustments

---------

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

* [bug fix] removed extra type file

* navigation

* got rid of unused files

* [fix] 🐐🐐🐐

* [fix] did screen props

* deleted unused files

---------

Co-authored-by: philipye314 <[email protected]>
Co-authored-by: CodyGarciaa <[email protected]>
Co-authored-by: angelinetu <[email protected]>
Co-authored-by: Philip Ye <[email protected]>
Co-authored-by: philipye314 <[email protected]>
Co-authored-by: Arfa Momin <[email protected]>
philipye314 added a commit that referenced this pull request Nov 1, 2024
* navigation

* got rid of unused files

* CodyGarciaa/Legal-Rights-Prea-Pages (#13)

* set up legal rights skeleton, can go to video page with nothing there yet tho

* added video and testing player

* more testing with video, lowk not getting .mp4 to work

* legal rights page scrollable

* added caption buttons, lowk still to add more to it

* closed caption buttons are toggleable and XOR

* finished pr

* resolved philip's problems lol

* 5 create resources sub pages (#15)

* seek help to resource list

* seek help to resource list

* fixed some things

* removed unused import

---------

Co-authored-by: Philip Ye <[email protected]>
Co-authored-by: philipye314 <[email protected]>

* 8-healing-resource-pages (#19)

* [feat] resources rendered and scrolling by buttons

* good work arfa, minor adjustments

---------

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

* [bug fix] removed extra type file

* navigation

* got rid of unused files

* [fix] 🐐🐐🐐

* [fix] did screen props

* deleted unused files

---------

Co-authored-by: philipye314 <[email protected]>
Co-authored-by: CodyGarciaa <[email protected]>
Co-authored-by: angelinetu <[email protected]>
Co-authored-by: Philip Ye <[email protected]>
Co-authored-by: philipye314 <[email protected]>
Co-authored-by: Arfa Momin <[email protected]>
philipye314 added a commit that referenced this pull request Nov 1, 2024
* changed page setup to render supabase data

* display is now sorted based on page number

* passing in full data for each language to video page

* new videos kinda working, just not playing rip; having problems with useState not being instant

* lowk finished, but useState making solution a bit scuffed... video's not playing anymore. but all the interactivity with supabase and within the app works lol

* not much, only rerendered on index now, comments for better understanding, video still not playing rip

* finished sprint, video plays bc of useref instead of usestate

* fixed very minor bug where the first page wont display

* 5 create resources sub pages (#15)

* seek help to resource list

* seek help to resource list

* fixed some things

* removed unused import

---------

Co-authored-by: Philip Ye <[email protected]>
Co-authored-by: philipye314 <[email protected]>

* 8-healing-resource-pages (#19)

* [feat] resources rendered and scrolling by buttons

* good work arfa, minor adjustments

---------

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

* [bug fix] removed extra type file

* Charlottelaw/jdi 14 tab navigation (#12)

* navigation

* got rid of unused files

* CodyGarciaa/Legal-Rights-Prea-Pages (#13)

* set up legal rights skeleton, can go to video page with nothing there yet tho

* added video and testing player

* more testing with video, lowk not getting .mp4 to work

* legal rights page scrollable

* added caption buttons, lowk still to add more to it

* closed caption buttons are toggleable and XOR

* finished pr

* resolved philip's problems lol

* 5 create resources sub pages (#15)

* seek help to resource list

* seek help to resource list

* fixed some things

* removed unused import

---------

Co-authored-by: Philip Ye <[email protected]>
Co-authored-by: philipye314 <[email protected]>

* 8-healing-resource-pages (#19)

* [feat] resources rendered and scrolling by buttons

* good work arfa, minor adjustments

---------

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

* [bug fix] removed extra type file

* navigation

* got rid of unused files

* [fix] 🐐🐐🐐

* [fix] did screen props

* deleted unused files

---------

Co-authored-by: philipye314 <[email protected]>
Co-authored-by: CodyGarciaa <[email protected]>
Co-authored-by: angelinetu <[email protected]>
Co-authored-by: Philip Ye <[email protected]>
Co-authored-by: philipye314 <[email protected]>
Co-authored-by: Arfa Momin <[email protected]>

* fixed some style, tried video player a bit

* Charlottelaw/jdi 14 tab navigation (#12)

* navigation

* got rid of unused files

* CodyGarciaa/Legal-Rights-Prea-Pages (#13)

* set up legal rights skeleton, can go to video page with nothing there yet tho

* added video and testing player

* more testing with video, lowk not getting .mp4 to work

* legal rights page scrollable

* added caption buttons, lowk still to add more to it

* closed caption buttons are toggleable and XOR

* finished pr

* resolved philip's problems lol

* 5 create resources sub pages (#15)

* seek help to resource list

* seek help to resource list

* fixed some things

* removed unused import

---------

Co-authored-by: Philip Ye <[email protected]>
Co-authored-by: philipye314 <[email protected]>

* 8-healing-resource-pages (#19)

* [feat] resources rendered and scrolling by buttons

* good work arfa, minor adjustments

---------

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

* [bug fix] removed extra type file

* navigation

* got rid of unused files

* [fix] 🐐🐐🐐

* [fix] did screen props

* deleted unused files

---------

Co-authored-by: philipye314 <[email protected]>
Co-authored-by: CodyGarciaa <[email protected]>
Co-authored-by: angelinetu <[email protected]>
Co-authored-by: Philip Ye <[email protected]>
Co-authored-by: philipye314 <[email protected]>
Co-authored-by: Arfa Momin <[email protected]>

* changed page setup to render supabase data

* passing in full data for each language to video page

* fixed type errors

* deleted unnecessary files

* fixed philip's comments besides english/spanishModule's defualt usestate

* fixed some pretty warnings

* done seekHelp midfi (#21)

* done seekHelp midfi

* moved caret + made button collapsable

* styling changes

* minor styling changes

* minor == fix

---------

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

* changed page setup to render supabase data

* display is now sorted based on page number

* passing in full data for each language to video page

* new videos kinda working, just not playing rip; having problems with useState not being instant

* lowk finished, but useState making solution a bit scuffed... video's not playing anymore. but all the interactivity with supabase and within the app works lol

* not much, only rerendered on index now, comments for better understanding, video still not playing rip

* finished sprint, video plays bc of useref instead of usestate

* fixed very minor bug where the first page wont display

* Charlottelaw/jdi 14 tab navigation (#12)

* navigation

* got rid of unused files

* CodyGarciaa/Legal-Rights-Prea-Pages (#13)

* set up legal rights skeleton, can go to video page with nothing there yet tho

* added video and testing player

* more testing with video, lowk not getting .mp4 to work

* legal rights page scrollable

* added caption buttons, lowk still to add more to it

* closed caption buttons are toggleable and XOR

* finished pr

* resolved philip's problems lol

* 5 create resources sub pages (#15)

* seek help to resource list

* seek help to resource list

* fixed some things

* removed unused import

---------

Co-authored-by: Philip Ye <[email protected]>
Co-authored-by: philipye314 <[email protected]>

* 8-healing-resource-pages (#19)

* [feat] resources rendered and scrolling by buttons

* good work arfa, minor adjustments

---------

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

* [bug fix] removed extra type file

* navigation

* got rid of unused files

* [fix] 🐐🐐🐐

* [fix] did screen props

* deleted unused files

---------

Co-authored-by: philipye314 <[email protected]>
Co-authored-by: CodyGarciaa <[email protected]>
Co-authored-by: angelinetu <[email protected]>
Co-authored-by: Philip Ye <[email protected]>
Co-authored-by: philipye314 <[email protected]>
Co-authored-by: Arfa Momin <[email protected]>

* fixed some style, tried video player a bit

* Charlottelaw/jdi 14 tab navigation (#12)

* navigation

* got rid of unused files

* CodyGarciaa/Legal-Rights-Prea-Pages (#13)

* set up legal rights skeleton, can go to video page with nothing there yet tho

* added video and testing player

* more testing with video, lowk not getting .mp4 to work

* legal rights page scrollable

* added caption buttons, lowk still to add more to it

* closed caption buttons are toggleable and XOR

* finished pr

* resolved philip's problems lol

* 5 create resources sub pages (#15)

* seek help to resource list

* seek help to resource list

* fixed some things

* removed unused import

---------

Co-authored-by: Philip Ye <[email protected]>
Co-authored-by: philipye314 <[email protected]>

* 8-healing-resource-pages (#19)

* [feat] resources rendered and scrolling by buttons

* good work arfa, minor adjustments

---------

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

* [bug fix] removed extra type file

* navigation

* got rid of unused files

* [fix] 🐐🐐🐐

* [fix] did screen props

* deleted unused files

---------

Co-authored-by: philipye314 <[email protected]>
Co-authored-by: CodyGarciaa <[email protected]>
Co-authored-by: angelinetu <[email protected]>
Co-authored-by: Philip Ye <[email protected]>
Co-authored-by: philipye314 <[email protected]>
Co-authored-by: Arfa Momin <[email protected]>

* changed page setup to render supabase data

* passing in full data for each language to video page

* fixed type errors

* deleted unnecessary files

* fixed philip's comments besides english/spanishModule's defualt usestate

* fixed some pretty warnings

* deleted useless file

---------

Co-authored-by: angelinetu <[email protected]>
Co-authored-by: Philip Ye <[email protected]>
Co-authored-by: philipye314 <[email protected]>
Co-authored-by: Arfa Momin <[email protected]>
Co-authored-by: philipye314 <[email protected]>
Co-authored-by: Charlotte Law <[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.

Healing Resource Pages
2 participants