Merge to prod #148
Merged
Merge to prod #148
Conversation
This file contains 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
… into daisy/activities
Co-authored-by: Vin Bui <[email protected]>
… into daisy/activities
* Created activity model and many to many relationship with gym model; added activity and gym rresolvers to the schema * added activity model to import statements on init_db() * deleted testing objects in init_db() * deleted duplicate code * Implemented PR edits in activity.py * Implemented PR edits in gym.py * Implemented PR changes in schema.py and added Price and Amenity class and price resolver in Activity class * Populated models to test * Cleaning up some merge conflicts * almost implementing Facilities * Created activity model and many to many relationship with gym model; added activity and gym rresolvers to the schema * added activity model to import statements on init_db() * deleted testing objects in init_db() * deleted duplicate code * Implemented PR edits in activity.py * Implemented PR edits in gym.py * Implemented PR changes in schema.py and added Price and Amenity class and price resolver in Activity class * Populated models to test * Cleaning up some merge conflicts * almost implementing Facilities * Activity model and some changes to gym * Created some of gym scraper * fixed facility.py * wrote some of gym hour scraper * Implement scraper for fitness center hours * changed some of activities * class changes * bug fixes on the scraper * fixing scraping hours * fixing activities * completed fixed activities * modified gym_scraper to accomodate special_hours * Scraped equipment and added it to the Schema * Upgrade python version for the test workflow * added back classes and class scraper * fixed scheduling of classes scraper and cleaned up code --------- Co-authored-by: Isabella Hoie <[email protected]> Co-authored-by: Kidus Zegeye <[email protected]>
Co-authored-by: Vin Bui <[email protected]>
Co-authored-by: Vin Bui <[email protected]>
Co-authored-by: Vin Bui <[email protected]>
Co-authored-by: Vin Bui <[email protected]>
Co-authored-by: Vin Bui <[email protected]>
Co-authored-by: Vin Bui <[email protected]>
Co-authored-by: Vin Bui <[email protected]>
Co-authored-by: Vin Bui <[email protected]>
Co-authored-by: Vin Bui <[email protected]>
Co-authored-by: Vin Bui <[email protected]>
… into daisy/activities
… into daisy/activities
Created Activities and Price models
Add User and Giveaway models
Fix issue where all tables were cleared
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.
No description provided.