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

CodyGarciaa/Legal-Rights-Prea-Pages #13

Merged
merged 8 commits into from
Oct 20, 2024
Merged

Conversation

CodyGarciaa
Copy link
Contributor

What's new in this PR

Description

  • created the skeleton for the legal rights page and its prea module, not connected to any backend supabase though
  • still using old react navigation, couldnt get nested react navigation to work well
  • video is just looping without user interactions (video player) or sound i think

Screenshots

LegalRightsEnglish

LegalRightsSpanish

ModuleVideoPage

How to review

  • all the files i worked on is mostly just the LegalRights folder; few lines added to App and added assets folder with videos and images
  • this should be reviewed all at once (latest commit)
  • dont think theres any edge cases yet

Next steps

Relevant links

Online sources

Related PRs

CC: @philipye314

@CodyGarciaa CodyGarciaa linked an issue Oct 16, 2024 that may be closed by this pull request
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 mostly good to me! Couple of minor changes to take note of including standard naming conventions - just make sure to follow these going forward. Great work Cody

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 nice

@philipye314 philipye314 merged commit cf3304b into main Oct 20, 2024
2 checks passed
@philipye314 philipye314 deleted the 7-create-prea-pages branch October 20, 2024 19:26
philipye314 pushed a commit that referenced this pull request Oct 25, 2024
* 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
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 <97428041+philipye314@users.noreply.github.com>
Co-authored-by: philipye314 <philipye@berkeley.edu>

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

* [feat] resources rendered and scrolling by buttons

* good work arfa, minor adjustments

---------

Co-authored-by: philipye314 <philipye314@gmail.com>

* [bug fix] removed extra type file

* navigation

* got rid of unused files

* [fix] 🐐🐐🐐

* [fix] did screen props

* deleted unused files

---------

Co-authored-by: philipye314 <philipye314@gmail.com>
Co-authored-by: CodyGarciaa <112846683+CodyGarciaa@users.noreply.github.com>
Co-authored-by: angelinetu <157329739+angelinetu@users.noreply.github.com>
Co-authored-by: Philip Ye <97428041+philipye314@users.noreply.github.com>
Co-authored-by: philipye314 <philipye@berkeley.edu>
Co-authored-by: Arfa Momin <113748174+arfamomin@users.noreply.github.com>
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 <97428041+philipye314@users.noreply.github.com>
Co-authored-by: philipye314 <philipye@berkeley.edu>

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

* [feat] resources rendered and scrolling by buttons

* good work arfa, minor adjustments

---------

Co-authored-by: philipye314 <philipye314@gmail.com>

* [bug fix] removed extra type file

* navigation

* got rid of unused files

* [fix] 🐐🐐🐐

* [fix] did screen props

* deleted unused files

---------

Co-authored-by: philipye314 <philipye314@gmail.com>
Co-authored-by: CodyGarciaa <112846683+CodyGarciaa@users.noreply.github.com>
Co-authored-by: angelinetu <157329739+angelinetu@users.noreply.github.com>
Co-authored-by: Philip Ye <97428041+philipye314@users.noreply.github.com>
Co-authored-by: philipye314 <philipye@berkeley.edu>
Co-authored-by: Arfa Momin <113748174+arfamomin@users.noreply.github.com>
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 <97428041+philipye314@users.noreply.github.com>
Co-authored-by: philipye314 <philipye@berkeley.edu>

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

* [feat] resources rendered and scrolling by buttons

* good work arfa, minor adjustments

---------

Co-authored-by: philipye314 <philipye314@gmail.com>

* [bug fix] removed extra type file

* navigation

* got rid of unused files

* [fix] 🐐🐐🐐

* [fix] did screen props

* deleted unused files

---------

Co-authored-by: philipye314 <philipye314@gmail.com>
Co-authored-by: CodyGarciaa <112846683+CodyGarciaa@users.noreply.github.com>
Co-authored-by: angelinetu <157329739+angelinetu@users.noreply.github.com>
Co-authored-by: Philip Ye <97428041+philipye314@users.noreply.github.com>
Co-authored-by: philipye314 <philipye@berkeley.edu>
Co-authored-by: Arfa Momin <113748174+arfamomin@users.noreply.github.com>
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 <97428041+philipye314@users.noreply.github.com>
Co-authored-by: philipye314 <philipye@berkeley.edu>

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

* [feat] resources rendered and scrolling by buttons

* good work arfa, minor adjustments

---------

Co-authored-by: philipye314 <philipye314@gmail.com>

* [bug fix] removed extra type file

* navigation

* got rid of unused files

* [fix] 🐐🐐🐐

* [fix] did screen props

* deleted unused files

---------

Co-authored-by: philipye314 <philipye314@gmail.com>
Co-authored-by: CodyGarciaa <112846683+CodyGarciaa@users.noreply.github.com>
Co-authored-by: angelinetu <157329739+angelinetu@users.noreply.github.com>
Co-authored-by: Philip Ye <97428041+philipye314@users.noreply.github.com>
Co-authored-by: philipye314 <philipye@berkeley.edu>
Co-authored-by: Arfa Momin <113748174+arfamomin@users.noreply.github.com>
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 <97428041+philipye314@users.noreply.github.com>
Co-authored-by: philipye314 <philipye@berkeley.edu>

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

* [feat] resources rendered and scrolling by buttons

* good work arfa, minor adjustments

---------

Co-authored-by: philipye314 <philipye314@gmail.com>

* [bug fix] removed extra type file

* navigation

* got rid of unused files

* [fix] 🐐🐐🐐

* [fix] did screen props

* deleted unused files

---------

Co-authored-by: philipye314 <philipye314@gmail.com>
Co-authored-by: CodyGarciaa <112846683+CodyGarciaa@users.noreply.github.com>
Co-authored-by: angelinetu <157329739+angelinetu@users.noreply.github.com>
Co-authored-by: Philip Ye <97428041+philipye314@users.noreply.github.com>
Co-authored-by: philipye314 <philipye@berkeley.edu>
Co-authored-by: Arfa Momin <113748174+arfamomin@users.noreply.github.com>
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 <97428041+philipye314@users.noreply.github.com>
Co-authored-by: philipye314 <philipye@berkeley.edu>

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

* [feat] resources rendered and scrolling by buttons

* good work arfa, minor adjustments

---------

Co-authored-by: philipye314 <philipye314@gmail.com>

* [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 <97428041+philipye314@users.noreply.github.com>
Co-authored-by: philipye314 <philipye@berkeley.edu>

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

* [feat] resources rendered and scrolling by buttons

* good work arfa, minor adjustments

---------

Co-authored-by: philipye314 <philipye314@gmail.com>

* [bug fix] removed extra type file

* navigation

* got rid of unused files

* [fix] 🐐🐐🐐

* [fix] did screen props

* deleted unused files

---------

Co-authored-by: philipye314 <philipye314@gmail.com>
Co-authored-by: CodyGarciaa <112846683+CodyGarciaa@users.noreply.github.com>
Co-authored-by: angelinetu <157329739+angelinetu@users.noreply.github.com>
Co-authored-by: Philip Ye <97428041+philipye314@users.noreply.github.com>
Co-authored-by: philipye314 <philipye@berkeley.edu>
Co-authored-by: Arfa Momin <113748174+arfamomin@users.noreply.github.com>

* 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 <97428041+philipye314@users.noreply.github.com>
Co-authored-by: philipye314 <philipye@berkeley.edu>

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

* [feat] resources rendered and scrolling by buttons

* good work arfa, minor adjustments

---------

Co-authored-by: philipye314 <philipye314@gmail.com>

* [bug fix] removed extra type file

* navigation

* got rid of unused files

* [fix] 🐐🐐🐐

* [fix] did screen props

* deleted unused files

---------

Co-authored-by: philipye314 <philipye314@gmail.com>
Co-authored-by: CodyGarciaa <112846683+CodyGarciaa@users.noreply.github.com>
Co-authored-by: angelinetu <157329739+angelinetu@users.noreply.github.com>
Co-authored-by: Philip Ye <97428041+philipye314@users.noreply.github.com>
Co-authored-by: philipye314 <philipye@berkeley.edu>
Co-authored-by: Arfa Momin <113748174+arfamomin@users.noreply.github.com>

* 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 <philipye314@gmail.com>

* 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 <97428041+philipye314@users.noreply.github.com>
Co-authored-by: philipye314 <philipye@berkeley.edu>

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

* [feat] resources rendered and scrolling by buttons

* good work arfa, minor adjustments

---------

Co-authored-by: philipye314 <philipye314@gmail.com>

* [bug fix] removed extra type file

* navigation

* got rid of unused files

* [fix] 🐐🐐🐐

* [fix] did screen props

* deleted unused files

---------

Co-authored-by: philipye314 <philipye314@gmail.com>
Co-authored-by: CodyGarciaa <112846683+CodyGarciaa@users.noreply.github.com>
Co-authored-by: angelinetu <157329739+angelinetu@users.noreply.github.com>
Co-authored-by: Philip Ye <97428041+philipye314@users.noreply.github.com>
Co-authored-by: philipye314 <philipye@berkeley.edu>
Co-authored-by: Arfa Momin <113748174+arfamomin@users.noreply.github.com>

* 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 <97428041+philipye314@users.noreply.github.com>
Co-authored-by: philipye314 <philipye@berkeley.edu>

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

* [feat] resources rendered and scrolling by buttons

* good work arfa, minor adjustments

---------

Co-authored-by: philipye314 <philipye314@gmail.com>

* [bug fix] removed extra type file

* navigation

* got rid of unused files

* [fix] 🐐🐐🐐

* [fix] did screen props

* deleted unused files

---------

Co-authored-by: philipye314 <philipye314@gmail.com>
Co-authored-by: CodyGarciaa <112846683+CodyGarciaa@users.noreply.github.com>
Co-authored-by: angelinetu <157329739+angelinetu@users.noreply.github.com>
Co-authored-by: Philip Ye <97428041+philipye314@users.noreply.github.com>
Co-authored-by: philipye314 <philipye@berkeley.edu>
Co-authored-by: Arfa Momin <113748174+arfamomin@users.noreply.github.com>

* 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 <157329739+angelinetu@users.noreply.github.com>
Co-authored-by: Philip Ye <97428041+philipye314@users.noreply.github.com>
Co-authored-by: philipye314 <philipye@berkeley.edu>
Co-authored-by: Arfa Momin <113748174+arfamomin@users.noreply.github.com>
Co-authored-by: philipye314 <philipye314@gmail.com>
Co-authored-by: Charlotte Law <69742430+CharlotteLaw@users.noreply.github.com>
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.

Create PREA pages
2 participants