CodyGarciaa/Prea-Pages-Cont #20

CodyGarciaa · 2024-10-26T19:05:19Z

What's new in this PR

Description

the pages that show up on the PreaPages screen are now reflective of what is in our supabase
the posters are still the same, but the names and data connected to each page is based on the supabase
also, the spanish and english tabs work now, only having every page under its relative language according to the supabase
also, the pages are put in order before rendered on the screen
for the video page side, the video plays in relation to which page is pressed
the next and prev buttons now work for the next page in the order of pages in the relative language

Screenshots

How to review

review LegalRights's index.tsx, and then VideoPage's index.tsx
had to change things up in LegalRights first, and then work to pass data to VideoPage from LegalRights onPress
so sorry there's no commits because I was accidentally coding/committing on my remote main rip
feed back on: does all the videos play all the time? when I was testing, it's like 60% of the time playing on my end

Next steps

Relevant links

Online sources

Related PRs

erm maybe conflict with Charlotte's navigation, lowk hella hardcoded my navigation in app.tsx bc u said so :)

CC: @philipye314

…useState not being instant

…not playing anymore. but all the interactivity with supabase and within the app works lol

…ding, video still not playing rip

src/screens/LegalRights/VideoPage/index.tsx

src/screens/LegalRights/index.tsx

src/screens/LegalRights/VideoPage/index.tsx

* 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]>

* [feat] resources rendered and scrolling by buttons * good work arfa, minor adjustments --------- Co-authored-by: philipye314 <[email protected]>

* 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]>

src/screens/LegalRights/index.tsx

philipye314

looks good, just some minor changes to fix

* 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

I started doing work on some stuff (mainly pulling main into your branch), so be sure to try and match all the different typing now that we have nav. Let me/Charlotte know if you have any questions?

* done seekHelp midfi * moved caret + made button collapsable * styling changes * minor styling changes * minor == fix --------- Co-authored-by: philipye314 <[email protected]>

…useState not being instant

…not playing anymore. but all the interactivity with supabase and within the app works lol

…ding, video still not playing rip

* 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

looks good. We'll talk a little bit about styling + supabase changes in the next sprint but this is very good work overall!

The merge-base changed after approval.

CodyGarciaa added 8 commits October 23, 2024 18:12

changed page setup to render supabase data

81d2c83

display is now sorted based on page number

99712ed

passing in full data for each language to video page

c929884

new videos kinda working, just not playing rip; having problems with …

ee7fdb3

…useState not being instant

lowk finished, but useState making solution a bit scuffed... video's …

87e7b03

…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 understan…

1b1ad24

…ding, video still not playing rip

finished sprint, video plays bc of useref instead of usestate

dc43a08

fixed very minor bug where the first page wont display

db5b1c9

philipye314 reviewed Oct 26, 2024

View reviewed changes

src/screens/LegalRights/VideoPage/index.tsx Outdated Show resolved Hide resolved

philipye314 reviewed Oct 26, 2024

View reviewed changes

src/screens/LegalRights/index.tsx Outdated Show resolved Hide resolved

philipye314 reviewed Oct 26, 2024

View reviewed changes

src/screens/LegalRights/VideoPage/index.tsx Outdated Show resolved Hide resolved

angelinetu and others added 5 commits October 26, 2024 15:29

5 create resources sub pages (#15)

aba552a

* 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)

1c3c904

* [feat] resources rendered and scrolling by buttons * good work arfa, minor adjustments --------- Co-authored-by: philipye314 <[email protected]>

[bug fix] removed extra type file

aa7ab8e

fixed some style, tried video player a bit

ba3b19c

philipye314 reviewed Oct 26, 2024

View reviewed changes

src/screens/LegalRights/index.tsx Outdated Show resolved Hide resolved

philipye314 reviewed Oct 26, 2024

View reviewed changes

CharlotteLaw and others added 3 commits October 26, 2024 16:17

changed page setup to render supabase data

76dda2e

passing in full data for each language to video page

77e0000

philipye314 reviewed Oct 27, 2024

View reviewed changes

CodyGarciaa and others added 8 commits October 29, 2024 18:57

fixed type errors

e3c5911

deleted unnecessary files

fe12ac2

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

1159b88

fixed some pretty warnings

3ea9d36

done seekHelp midfi (#21)

51c12ec

* 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

038c9c2

display is now sorted based on page number

2ab374b

passing in full data for each language to video page

148ce0d

CodyGarciaa and others added 16 commits October 31, 2024 18:52

new videos kinda working, just not playing rip; having problems with …

c5a68b3

…useState not being instant

lowk finished, but useState making solution a bit scuffed... video's …

8b69c33

…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 understan…

1dbdcd7

…ding, video still not playing rip

finished sprint, video plays bc of useref instead of usestate

c2c2403

fixed very minor bug where the first page wont display

c1f1430

fixed some style, tried video player a bit

c965484

changed page setup to render supabase data

4d26729

passing in full data for each language to video page

a92add8

fixed type errors

9c6dc49

deleted unnecessary files

7370c81

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

f9369b0

fixed some pretty warnings

ff06874

deleted useless file

9d2dcba

fixed conflicts

d5bf8c7

philipye314 previously approved these changes Nov 1, 2024

View reviewed changes

philipye314 merged commit 98a8000 into main Nov 1, 2024
2 checks passed

philipye314 deleted the 14-prea-videos-contd branch November 1, 2024 02:01

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

CodyGarciaa/Prea-Pages-Cont #20

CodyGarciaa/Prea-Pages-Cont #20

CodyGarciaa commented Oct 26, 2024

philipye314 left a comment

philipye314 left a comment

philipye314 left a comment

CodyGarciaa/Prea-Pages-Cont #20

CodyGarciaa/Prea-Pages-Cont #20

Conversation

CodyGarciaa commented Oct 26, 2024

What's new in this PR

Description

Screenshots

How to review

Next steps

Relevant links

Online sources

Related PRs

philipye314 left a comment

Choose a reason for hiding this comment

philipye314 left a comment

Choose a reason for hiding this comment

philipye314 left a comment

Choose a reason for hiding this comment