-
Notifications
You must be signed in to change notification settings - Fork 0
Release 3.1.0 Build 36 (#83) #84
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
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Addressed Matt's comments - Removed TabView and used environment object to allow tab bar to be hidden when necessary - Allowed rescaling of font size for class title - Added instructor label * Merge Release to Main (#69) * Add support for custom GraphQL errors * Remove codegen build phase * Implemented classes page - Performed soft reset and squashing the previous commits - Implemented ClassesView, ClassCell, ClassDetailView, NextSessionCell, and ClassesViewModel - Created FitnessClass and FitnessClassInstance models - Other modifications to create the classes screens * Comment out giveaway modal on home * Update Package.resolved * Updated build number * Release 2.5.8 Build 29 (#68) * Add support for custom GraphQL errors * Update queries * Remove codegen build phase * Implemented classes page - Performed soft reset and squashing the previous commits - Implemented ClassesView, ClassCell, ClassDetailView, NextSessionCell, and ClassesViewModel - Created FitnessClass and FitnessClassInstance models - Other modifications to create the classes screens * Comment out giveaway modal on home * Optimized filtered classes * Optimized next sessions * Cleaned up code * Update fragments and mutations * Fixed error due to updated mutation * Update project.pbxproj * Create Package.resolved --------- Co-authored-by: Vin Bui <vdb23@cornell.edu> Co-authored-by: Vin Bui <75594943+vinnie4k@users.noreply.github.com> --------- Co-authored-by: Vin Bui <vdb23@cornell.edu> Co-authored-by: Caitlyn Jin <cj384@cornell.edu> Co-authored-by: Caitlyn Jin <118781810+caitlynjin@users.noreply.github.com> Co-authored-by: Vin Bui <75594943+vinnie4k@users.noreply.github.com> * Fixed spacing of tabbar and transition * Fix spacing of tab bar * Update class detail page navigation - Removed navigation to new pages of class details - Instead updates information on current class detail page when clicking a next sessions cell - Includes animation of scrolling back to top of screen * Fix spelling error * Implement onboarding flow (#75) * Implement start of the sign in view * Implement sign in view * Implement all screens for user onboarding * Implement onboarding UI + photo picker * Implement google sign in - WIP - google sign in works at this point - no networking yet * Implemented classes page - Performed soft reset and squashing the previous commits - Implemented ClassesView, ClassCell, ClassDetailView, NextSessionCell, and ClassesViewModel - Created FitnessClass and FitnessClassInstance models - Other modifications to create the classes screens * Update project.pbxproj * Implement start of the sign in view * Implement all screens for user onboarding * Implement google sign in - WIP - google sign in works at this point - no networking yet * Implement button actions - Revise logic flow - Current implementation works for everything * Resolve slight bug in constants * Implemented classes page - Performed soft reset and squashing the previous commits - Implemented ClassesView, ClassCell, ClassDetailView, NextSessionCell, and ClassesViewModel - Created FitnessClass and FitnessClassInstance models - Other modifications to create the classes screens * Address PR comments * Fix constants * Fix issues w classes PR - also revise app delegate to configure firebase * Fix issue with app delegate again * Address PR comments WIP - still need to address animation * Implement animation transitions b/w screens - Animation from Sign in to main view - Animation from create profile to main view - Refactor the Launching screen conditional logic * Implement animation part 1 - able to get loginButton and skipButton to fade in now * Implement animation part 2 - able to get everything except the bars animated * Finish implement animation (SignInView) * Address second round of PR comments * Change background color logic --------- Co-authored-by: Caitlyn Jin <cj384@cornell.edu> * Implemented Capacity Reminders UI (#65) * Modified back button and setup reminders screen - Created temporary Profile tab - Set up reminders page - Modified NavBackButton so that it can be initialized with a different color back button * Implemented reminders page - Added capacity reminders cell * Implemented capacity reminders page - Selection UI and toggle reminders - Updated reminders view * Set text to multiline * Add documentation for profile page * Fixed layout issues * Remove duplicate build files * Update project.pbxproj * ten intervals (#81) * Implemented Popular Times (#79) * Changed hours layout * Implemented capacity semi circle for gym detail * Progress on popular times * Implemented popular times - Created chart for popular times - Dummy data for hourly capacities - Updated equipment fragment and model - Removal of equipment type (in progress) * Fix ordering of mdoels * Implemented amenities section * Created reusable drop down arrow * Implemented equipment section * IMplemented popularTimes * Update Uplift/Models/Equipment.swift * Updated Equipment Filtering * Resolved Conflicts * Fixed Range issue * Addressed Jayson's Changes and disabled onboarding --------- Co-authored-by: Caitlyn Jin <cj384@cornell.edu> Co-authored-by: Caitlyn Jin <118781810+caitlynjin@users.noreply.github.com> * Caitlyn/gym details layout (#82) * Changed hours layout * Implemented capacity semi circle for gym detail * Progress on popular times * Implemented popular times - Created chart for popular times - Dummy data for hourly capacities - Updated equipment fragment and model - Removal of equipment type (in progress) * Fix ordering of mdoels * Implemented amenities section * Created reusable drop down arrow * Implemented equipment section * IMplemented popularTimes * Update Uplift/Models/Equipment.swift * Updated Equipment Filtering * Resolved Conflicts * Fixed Range issue * Addressed Jayson's Changes and disabled onboarding * Comment out profile code --------- Co-authored-by: Caitlyn Jin <cj384@cornell.edu> Co-authored-by: Caitlyn Jin <118781810+caitlynjin@users.noreply.github.com> * incremented version and build * Chanegs --------- Co-authored-by: Caitlyn Jin <cj384@cornell.edu> Co-authored-by: Vin Bui <vdb23@cornell.edu> Co-authored-by: Caitlyn Jin <118781810+caitlynjin@users.noreply.github.com> Co-authored-by: Vin Bui <75594943+vinnie4k@users.noreply.github.com> Co-authored-by: belle hu <115846928+belle-hu@users.noreply.github.com> Co-authored-by: Jayson Hahn <46629787+JaysonHahn@users.noreply.github.com> Co-authored-by: Jiwon Jeong <65582198+JiwonJeong414@users.noreply.github.com>
* Addressed Matt's comments - Removed TabView and used environment object to allow tab bar to be hidden when necessary - Allowed rescaling of font size for class title - Added instructor label * Merge Release to Main (#69) * Add support for custom GraphQL errors * Remove codegen build phase * Implemented classes page - Performed soft reset and squashing the previous commits - Implemented ClassesView, ClassCell, ClassDetailView, NextSessionCell, and ClassesViewModel - Created FitnessClass and FitnessClassInstance models - Other modifications to create the classes screens * Comment out giveaway modal on home * Update Package.resolved * Updated build number * Release 2.5.8 Build 29 (#68) * Add support for custom GraphQL errors * Update queries * Remove codegen build phase * Implemented classes page - Performed soft reset and squashing the previous commits - Implemented ClassesView, ClassCell, ClassDetailView, NextSessionCell, and ClassesViewModel - Created FitnessClass and FitnessClassInstance models - Other modifications to create the classes screens * Comment out giveaway modal on home * Optimized filtered classes * Optimized next sessions * Cleaned up code * Update fragments and mutations * Fixed error due to updated mutation * Update project.pbxproj * Create Package.resolved --------- Co-authored-by: Vin Bui <vdb23@cornell.edu> Co-authored-by: Vin Bui <75594943+vinnie4k@users.noreply.github.com> --------- Co-authored-by: Vin Bui <vdb23@cornell.edu> Co-authored-by: Caitlyn Jin <cj384@cornell.edu> Co-authored-by: Caitlyn Jin <118781810+caitlynjin@users.noreply.github.com> Co-authored-by: Vin Bui <75594943+vinnie4k@users.noreply.github.com> * Fixed spacing of tabbar and transition * Fix spacing of tab bar * Update class detail page navigation - Removed navigation to new pages of class details - Instead updates information on current class detail page when clicking a next sessions cell - Includes animation of scrolling back to top of screen * Fix spelling error * Implement onboarding flow (#75) * Implement start of the sign in view * Implement sign in view * Implement all screens for user onboarding * Implement onboarding UI + photo picker * Implement google sign in - WIP - google sign in works at this point - no networking yet * Implemented classes page - Performed soft reset and squashing the previous commits - Implemented ClassesView, ClassCell, ClassDetailView, NextSessionCell, and ClassesViewModel - Created FitnessClass and FitnessClassInstance models - Other modifications to create the classes screens * Update project.pbxproj * Implement start of the sign in view * Implement all screens for user onboarding * Implement google sign in - WIP - google sign in works at this point - no networking yet * Implement button actions - Revise logic flow - Current implementation works for everything * Resolve slight bug in constants * Implemented classes page - Performed soft reset and squashing the previous commits - Implemented ClassesView, ClassCell, ClassDetailView, NextSessionCell, and ClassesViewModel - Created FitnessClass and FitnessClassInstance models - Other modifications to create the classes screens * Address PR comments * Fix constants * Fix issues w classes PR - also revise app delegate to configure firebase * Fix issue with app delegate again * Address PR comments WIP - still need to address animation * Implement animation transitions b/w screens - Animation from Sign in to main view - Animation from create profile to main view - Refactor the Launching screen conditional logic * Implement animation part 1 - able to get loginButton and skipButton to fade in now * Implement animation part 2 - able to get everything except the bars animated * Finish implement animation (SignInView) * Address second round of PR comments * Change background color logic --------- Co-authored-by: Caitlyn Jin <cj384@cornell.edu> * Implemented Capacity Reminders UI (#65) * Modified back button and setup reminders screen - Created temporary Profile tab - Set up reminders page - Modified NavBackButton so that it can be initialized with a different color back button * Implemented reminders page - Added capacity reminders cell * Implemented capacity reminders page - Selection UI and toggle reminders - Updated reminders view * Set text to multiline * Add documentation for profile page * Fixed layout issues * Remove duplicate build files * Update project.pbxproj * ten intervals (#81) * Implemented Popular Times (#79) * Changed hours layout * Implemented capacity semi circle for gym detail * Progress on popular times * Implemented popular times - Created chart for popular times - Dummy data for hourly capacities - Updated equipment fragment and model - Removal of equipment type (in progress) * Fix ordering of mdoels * Implemented amenities section * Created reusable drop down arrow * Implemented equipment section * IMplemented popularTimes * Update Uplift/Models/Equipment.swift * Updated Equipment Filtering * Resolved Conflicts * Fixed Range issue * Addressed Jayson's Changes and disabled onboarding --------- Co-authored-by: Caitlyn Jin <cj384@cornell.edu> Co-authored-by: Caitlyn Jin <118781810+caitlynjin@users.noreply.github.com> * Caitlyn/gym details layout (#82) * Changed hours layout * Implemented capacity semi circle for gym detail * Progress on popular times * Implemented popular times - Created chart for popular times - Dummy data for hourly capacities - Updated equipment fragment and model - Removal of equipment type (in progress) * Fix ordering of mdoels * Implemented amenities section * Created reusable drop down arrow * Implemented equipment section * IMplemented popularTimes * Update Uplift/Models/Equipment.swift * Updated Equipment Filtering * Resolved Conflicts * Fixed Range issue * Addressed Jayson's Changes and disabled onboarding * Comment out profile code --------- Co-authored-by: Caitlyn Jin <cj384@cornell.edu> Co-authored-by: Caitlyn Jin <118781810+caitlynjin@users.noreply.github.com> * incremented version and build * Chanegs * Updated package.resolved file --------- Co-authored-by: Caitlyn Jin <cj384@cornell.edu> Co-authored-by: Vin Bui <vdb23@cornell.edu> Co-authored-by: Caitlyn Jin <118781810+caitlynjin@users.noreply.github.com> Co-authored-by: Vin Bui <75594943+vinnie4k@users.noreply.github.com> Co-authored-by: belle hu <115846928+belle-hu@users.noreply.github.com> Co-authored-by: Jayson Hahn <46629787+JaysonHahn@users.noreply.github.com> Co-authored-by: Jiwon Jeong <65582198+JiwonJeong414@users.noreply.github.com>
* Addressed Matt's comments - Removed TabView and used environment object to allow tab bar to be hidden when necessary - Allowed rescaling of font size for class title - Added instructor label * Merge Release to Main (#69) * Add support for custom GraphQL errors * Remove codegen build phase * Implemented classes page - Performed soft reset and squashing the previous commits - Implemented ClassesView, ClassCell, ClassDetailView, NextSessionCell, and ClassesViewModel - Created FitnessClass and FitnessClassInstance models - Other modifications to create the classes screens * Comment out giveaway modal on home * Update Package.resolved * Updated build number * Release 2.5.8 Build 29 (#68) * Add support for custom GraphQL errors * Update queries * Remove codegen build phase * Implemented classes page - Performed soft reset and squashing the previous commits - Implemented ClassesView, ClassCell, ClassDetailView, NextSessionCell, and ClassesViewModel - Created FitnessClass and FitnessClassInstance models - Other modifications to create the classes screens * Comment out giveaway modal on home * Optimized filtered classes * Optimized next sessions * Cleaned up code * Update fragments and mutations * Fixed error due to updated mutation * Update project.pbxproj * Create Package.resolved --------- Co-authored-by: Vin Bui <vdb23@cornell.edu> Co-authored-by: Vin Bui <75594943+vinnie4k@users.noreply.github.com> --------- Co-authored-by: Vin Bui <vdb23@cornell.edu> Co-authored-by: Caitlyn Jin <cj384@cornell.edu> Co-authored-by: Caitlyn Jin <118781810+caitlynjin@users.noreply.github.com> Co-authored-by: Vin Bui <75594943+vinnie4k@users.noreply.github.com> * Fixed spacing of tabbar and transition * Fix spacing of tab bar * Update class detail page navigation - Removed navigation to new pages of class details - Instead updates information on current class detail page when clicking a next sessions cell - Includes animation of scrolling back to top of screen * Fix spelling error * Implement onboarding flow (#75) * Implement start of the sign in view * Implement sign in view * Implement all screens for user onboarding * Implement onboarding UI + photo picker * Implement google sign in - WIP - google sign in works at this point - no networking yet * Implemented classes page - Performed soft reset and squashing the previous commits - Implemented ClassesView, ClassCell, ClassDetailView, NextSessionCell, and ClassesViewModel - Created FitnessClass and FitnessClassInstance models - Other modifications to create the classes screens * Update project.pbxproj * Implement start of the sign in view * Implement all screens for user onboarding * Implement google sign in - WIP - google sign in works at this point - no networking yet * Implement button actions - Revise logic flow - Current implementation works for everything * Resolve slight bug in constants * Implemented classes page - Performed soft reset and squashing the previous commits - Implemented ClassesView, ClassCell, ClassDetailView, NextSessionCell, and ClassesViewModel - Created FitnessClass and FitnessClassInstance models - Other modifications to create the classes screens * Address PR comments * Fix constants * Fix issues w classes PR - also revise app delegate to configure firebase * Fix issue with app delegate again * Address PR comments WIP - still need to address animation * Implement animation transitions b/w screens - Animation from Sign in to main view - Animation from create profile to main view - Refactor the Launching screen conditional logic * Implement animation part 1 - able to get loginButton and skipButton to fade in now * Implement animation part 2 - able to get everything except the bars animated * Finish implement animation (SignInView) * Address second round of PR comments * Change background color logic --------- Co-authored-by: Caitlyn Jin <cj384@cornell.edu> * Implemented Capacity Reminders UI (#65) * Modified back button and setup reminders screen - Created temporary Profile tab - Set up reminders page - Modified NavBackButton so that it can be initialized with a different color back button * Implemented reminders page - Added capacity reminders cell * Implemented capacity reminders page - Selection UI and toggle reminders - Updated reminders view * Set text to multiline * Add documentation for profile page * Fixed layout issues * Remove duplicate build files * Update project.pbxproj * ten intervals (#81) * Implemented Popular Times (#79) * Changed hours layout * Implemented capacity semi circle for gym detail * Progress on popular times * Implemented popular times - Created chart for popular times - Dummy data for hourly capacities - Updated equipment fragment and model - Removal of equipment type (in progress) * Fix ordering of mdoels * Implemented amenities section * Created reusable drop down arrow * Implemented equipment section * IMplemented popularTimes * Update Uplift/Models/Equipment.swift * Updated Equipment Filtering * Resolved Conflicts * Fixed Range issue * Addressed Jayson's Changes and disabled onboarding --------- Co-authored-by: Caitlyn Jin <cj384@cornell.edu> Co-authored-by: Caitlyn Jin <118781810+caitlynjin@users.noreply.github.com> * Caitlyn/gym details layout (#82) * Changed hours layout * Implemented capacity semi circle for gym detail * Progress on popular times * Implemented popular times - Created chart for popular times - Dummy data for hourly capacities - Updated equipment fragment and model - Removal of equipment type (in progress) * Fix ordering of mdoels * Implemented amenities section * Created reusable drop down arrow * Implemented equipment section * IMplemented popularTimes * Update Uplift/Models/Equipment.swift * Updated Equipment Filtering * Resolved Conflicts * Fixed Range issue * Addressed Jayson's Changes and disabled onboarding * Comment out profile code --------- Co-authored-by: Caitlyn Jin <cj384@cornell.edu> Co-authored-by: Caitlyn Jin <118781810+caitlynjin@users.noreply.github.com> * incremented version and build * Chanegs * Updated package.resolved file * Updated Uplift Package Configs --------- Co-authored-by: Caitlyn Jin <cj384@cornell.edu> Co-authored-by: Vin Bui <vdb23@cornell.edu> Co-authored-by: Caitlyn Jin <118781810+caitlynjin@users.noreply.github.com> Co-authored-by: Vin Bui <75594943+vinnie4k@users.noreply.github.com> Co-authored-by: belle hu <115846928+belle-hu@users.noreply.github.com> Co-authored-by: Jayson Hahn <46629787+JaysonHahn@users.noreply.github.com> Co-authored-by: Jiwon Jeong <65582198+JiwonJeong414@users.noreply.github.com>
* Addressed Matt's comments - Removed TabView and used environment object to allow tab bar to be hidden when necessary - Allowed rescaling of font size for class title - Added instructor label * Merge Release to Main (#69) * Add support for custom GraphQL errors * Remove codegen build phase * Implemented classes page - Performed soft reset and squashing the previous commits - Implemented ClassesView, ClassCell, ClassDetailView, NextSessionCell, and ClassesViewModel - Created FitnessClass and FitnessClassInstance models - Other modifications to create the classes screens * Comment out giveaway modal on home * Update Package.resolved * Updated build number * Release 2.5.8 Build 29 (#68) * Add support for custom GraphQL errors * Update queries * Remove codegen build phase * Implemented classes page - Performed soft reset and squashing the previous commits - Implemented ClassesView, ClassCell, ClassDetailView, NextSessionCell, and ClassesViewModel - Created FitnessClass and FitnessClassInstance models - Other modifications to create the classes screens * Comment out giveaway modal on home * Optimized filtered classes * Optimized next sessions * Cleaned up code * Update fragments and mutations * Fixed error due to updated mutation * Update project.pbxproj * Create Package.resolved --------- Co-authored-by: Vin Bui <vdb23@cornell.edu> Co-authored-by: Vin Bui <75594943+vinnie4k@users.noreply.github.com> --------- Co-authored-by: Vin Bui <vdb23@cornell.edu> Co-authored-by: Caitlyn Jin <cj384@cornell.edu> Co-authored-by: Caitlyn Jin <118781810+caitlynjin@users.noreply.github.com> Co-authored-by: Vin Bui <75594943+vinnie4k@users.noreply.github.com> * Fixed spacing of tabbar and transition * Fix spacing of tab bar * Update class detail page navigation - Removed navigation to new pages of class details - Instead updates information on current class detail page when clicking a next sessions cell - Includes animation of scrolling back to top of screen * Fix spelling error * Implement onboarding flow (#75) * Implement start of the sign in view * Implement sign in view * Implement all screens for user onboarding * Implement onboarding UI + photo picker * Implement google sign in - WIP - google sign in works at this point - no networking yet * Implemented classes page - Performed soft reset and squashing the previous commits - Implemented ClassesView, ClassCell, ClassDetailView, NextSessionCell, and ClassesViewModel - Created FitnessClass and FitnessClassInstance models - Other modifications to create the classes screens * Update project.pbxproj * Implement start of the sign in view * Implement all screens for user onboarding * Implement google sign in - WIP - google sign in works at this point - no networking yet * Implement button actions - Revise logic flow - Current implementation works for everything * Resolve slight bug in constants * Implemented classes page - Performed soft reset and squashing the previous commits - Implemented ClassesView, ClassCell, ClassDetailView, NextSessionCell, and ClassesViewModel - Created FitnessClass and FitnessClassInstance models - Other modifications to create the classes screens * Address PR comments * Fix constants * Fix issues w classes PR - also revise app delegate to configure firebase * Fix issue with app delegate again * Address PR comments WIP - still need to address animation * Implement animation transitions b/w screens - Animation from Sign in to main view - Animation from create profile to main view - Refactor the Launching screen conditional logic * Implement animation part 1 - able to get loginButton and skipButton to fade in now * Implement animation part 2 - able to get everything except the bars animated * Finish implement animation (SignInView) * Address second round of PR comments * Change background color logic --------- Co-authored-by: Caitlyn Jin <cj384@cornell.edu> * Implemented Capacity Reminders UI (#65) * Modified back button and setup reminders screen - Created temporary Profile tab - Set up reminders page - Modified NavBackButton so that it can be initialized with a different color back button * Implemented reminders page - Added capacity reminders cell * Implemented capacity reminders page - Selection UI and toggle reminders - Updated reminders view * Set text to multiline * Add documentation for profile page * Fixed layout issues * Remove duplicate build files * Update project.pbxproj * ten intervals (#81) * Implemented Popular Times (#79) * Changed hours layout * Implemented capacity semi circle for gym detail * Progress on popular times * Implemented popular times - Created chart for popular times - Dummy data for hourly capacities - Updated equipment fragment and model - Removal of equipment type (in progress) * Fix ordering of mdoels * Implemented amenities section * Created reusable drop down arrow * Implemented equipment section * IMplemented popularTimes * Update Uplift/Models/Equipment.swift * Updated Equipment Filtering * Resolved Conflicts * Fixed Range issue * Addressed Jayson's Changes and disabled onboarding --------- Co-authored-by: Caitlyn Jin <cj384@cornell.edu> Co-authored-by: Caitlyn Jin <118781810+caitlynjin@users.noreply.github.com> * Caitlyn/gym details layout (#82) * Changed hours layout * Implemented capacity semi circle for gym detail * Progress on popular times * Implemented popular times - Created chart for popular times - Dummy data for hourly capacities - Updated equipment fragment and model - Removal of equipment type (in progress) * Fix ordering of mdoels * Implemented amenities section * Created reusable drop down arrow * Implemented equipment section * IMplemented popularTimes * Update Uplift/Models/Equipment.swift * Updated Equipment Filtering * Resolved Conflicts * Fixed Range issue * Addressed Jayson's Changes and disabled onboarding * Comment out profile code --------- Co-authored-by: Caitlyn Jin <cj384@cornell.edu> Co-authored-by: Caitlyn Jin <118781810+caitlynjin@users.noreply.github.com> * Jiwon/profile (#80) * General Profile Layout * Mock Data + Header * ProgressBar * Animation WorkoutProgressArc * ProfileView Layout * Layout Updated * Edits * minor changes * Edits * Clean up Code * Addressed Richie's Comments * Padding Bug Fixed * Renamed Settings * Added Space * Updated Main View * Addressed Asen's Comments * Changed Debug to Release (#87) * Incremented Version and Build Version --------- Co-authored-by: Caitlyn Jin <cj384@cornell.edu> Co-authored-by: Vin Bui <vdb23@cornell.edu> Co-authored-by: Caitlyn Jin <118781810+caitlynjin@users.noreply.github.com> Co-authored-by: Vin Bui <75594943+vinnie4k@users.noreply.github.com> Co-authored-by: belle hu <115846928+belle-hu@users.noreply.github.com> Co-authored-by: Jayson Hahn <46629787+JaysonHahn@users.noreply.github.com> Co-authored-by: Jiwon Jeong <65582198+JiwonJeong414@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge Release to Main (Merge Release to Main #69)
Add support for custom GraphQL errors
Remove codegen build phase
Implemented classes page
Comment out giveaway modal on home
Update Package.resolved
Updated build number
Release 2.5.8 Build 29 (Release 2.5.8 Build 29 #68)
Add support for custom GraphQL errors
Update queries
Remove codegen build phase
Implemented classes page
Comment out giveaway modal on home
Optimized filtered classes
Optimized next sessions
Cleaned up code
Update fragments and mutations
Fixed error due to updated mutation
Update project.pbxproj
Create Package.resolved
Fixed spacing of tabbar and transition
Fix spacing of tab bar
Update class detail page navigation
Fix spelling error
Implement onboarding flow (Implement onboarding flow #75)
Implement start of the sign in view
Implement sign in view
Implement all screens for user onboarding
Implement onboarding UI + photo picker
Implement google sign in
Update project.pbxproj
Implement start of the sign in view
Implement all screens for user onboarding
Implement google sign in
Resolve slight bug in constants
Implemented classes page
Address PR comments
Fix constants
Fix issues w classes PR
Fix issue with app delegate again
Address PR comments WIP
Finish implement animation (SignInView)
Address second round of PR comments
Change background color logic
Implemented Capacity Reminders UI (Implemented Capacity Reminders UI #65)
Modified back button and setup reminders screen
Set text to multiline
Add documentation for profile page
Fixed layout issues
Remove duplicate build files
Update project.pbxproj
ten intervals (ten intervals #81)
Implemented Popular Times (Implemented Popular Times #79)
Changed hours layout
Implemented capacity semi circle for gym detail
Progress on popular times
Implemented popular times
Fix ordering of mdoels
Implemented amenities section
Created reusable drop down arrow
Implemented equipment section
IMplemented popularTimes
Update Uplift/Models/Equipment.swift
Updated Equipment Filtering
Resolved Conflicts
Fixed Range issue
Addressed Jayson's Changes and disabled onboarding
Caitlyn/gym details layout (Caitlyn/gym details layout #82)
Changed hours layout
Implemented capacity semi circle for gym detail
Progress on popular times
Implemented popular times
Fix ordering of mdoels
Implemented amenities section
Created reusable drop down arrow
Implemented equipment section
IMplemented popularTimes
Update Uplift/Models/Equipment.swift
Updated Equipment Filtering
Resolved Conflicts
Fixed Range issue
Addressed Jayson's Changes and disabled onboarding
Comment out profile code
incremented version and build
Chanegs
Overview
TODO
Changes Made
Change 1
Change 2
Test Coverage
Next Steps (optional)
TODO
Related PRs or Issues (optional)
TODO
Screenshots (optional)
TODO
TODO
TODO