-
Notifications
You must be signed in to change notification settings - Fork 0
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
Dev #22
Open
bperard
wants to merge
22
commits into
main
Choose a base branch
from
dev
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
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
* add GitHub CI * add searchYouTube route, controller, and model Co-authored-by: Brandon Perard <[email protected]>
* add GitHub CI * redundant * sear test passes!!! * mockterial girl Co-authored-by: Brandon Perard <[email protected]>
* add GitHub CI * redundant * sear test passes!!! * mockterial girl * song table updated Co-authored-by: Brandon Perard <[email protected]>
* update song controller and model for new fields and insertAll * add channel_name & channel_id columns to songs table and set to CASCADE in setup.sql * update Video model and apiUtils for additional fields * update test for formatVideos munge function * update commented lines after troubleshooting Co-authored-by: Brandon Perard <brandon.perard@gmail>
* update song controller and model for new fields and insertAll * add channel_name & channel_id columns to songs table and set to CASCADE in setup.sql * update Video model and apiUtils for additional fields * update test for formatVideos munge function * update commented lines after troubleshooting * update song post flow for JSON Co-authored-by: Brandon Perard <brandon.perard@gmail>
* update song controller and model for new fields and insertAll * add channel_name & channel_id columns to songs table and set to CASCADE in setup.sql * update Video model and apiUtils for additional fields * update test for formatVideos munge function * update commented lines after troubleshooting * update song post flow for JSON * update Song model and app to resolve errors with batch post to songs table; add socketIO.js to utils for socket.io functionality Co-authored-by: Brandon Perard <brandon.perard@gmail>
* update song controller and model for new fields and insertAll * add channel_name & channel_id columns to songs table and set to CASCADE in setup.sql * update Video model and apiUtils for additional fields * update test for formatVideos munge function * update commented lines after troubleshooting * update song post flow for JSON * update Song model and app to resolve errors with batch post to songs table; add socketIO.js to utils for socket.io functionality * update files to resolve socket.io conflicts Co-authored-by: Brandon Perard <brandon.perard@gmail> Co-authored-by: Lori <[email protected]>
* update song controller and model for new fields and insertAll * add channel_name & channel_id columns to songs table and set to CASCADE in setup.sql * update Video model and apiUtils for additional fields * update test for formatVideos munge function * update commented lines after troubleshooting * update song post flow for JSON * update Song model and app to resolve errors with batch post to songs table; add socketIO.js to utils for socket.io functionality * update files to resolve socket.io conflicts * add Queue & Room models/routes * add queue & room controllers * add event listeners for room join/create to sockerIO.js * update socketIO functionality to resolve errors in room join/create events Co-authored-by: Brandon Perard <brandon.perard@gmail> Co-authored-by: Lori <[email protected]>
* update song controller and model for new fields and insertAll * add channel_name & channel_id columns to songs table and set to CASCADE in setup.sql * update Video model and apiUtils for additional fields * update test for formatVideos munge function * update commented lines after troubleshooting * update song post flow for JSON * update Song model and app to resolve errors with batch post to songs table; add socketIO.js to utils for socket.io functionality * update files to resolve socket.io conflicts * add Queue & Room models/routes * add queue & room controllers * add event listeners for room join/create to sockerIO.js * update socketIO functionality to resolve errors in room join/create events * add SONG_QUEUE and HOST listeners to socketIO utility, updated CREATE and JOIN room listeners, and add skeleton for planned functionality * merge to dev * update socketIO welcome create and join room messages * update comment out HOST/QUEUE socketIO listeners to resolve errors while fixed * update socketIO utils to resolve errors and update naming Co-authored-by: Brandon Perard <brandon.perard@gmail> Co-authored-by: Lori <[email protected]>
* add GitHub CI * add searchYouTube route, controller, and model * add view count to song table and song model * add passcode to room table and room model Co-authored-by: Brandon Perard <[email protected]>
* update song controller and model for new fields and insertAll * add channel_name & channel_id columns to songs table and set to CASCADE in setup.sql * update Video model and apiUtils for additional fields * update test for formatVideos munge function * update commented lines after troubleshooting * update song post flow for JSON * merge * update Song model and app to resolve errors with batch post to songs table; add socketIO.js to utils for socket.io functionality * merge conflicts * update files to resolve socket.io conflicts * add Queue & Room models/routes * add queue & room controllers * add event listeners for room join/create to sockerIO.js * update socketIO functionality to resolve errors in room join/create events * add SONG_QUEUE and HOST listeners to socketIO utility, updated CREATE and JOIN room listeners, and add skeleton for planned functionality * merge to dev * update socketIO welcome create and join room messages * update comment out HOST/QUEUE socketIO listeners to resolve errors while fixed * update socketIO utils to resolve errors and update naming * updates from Dan suggestions * Dan update 2(remembered to save) * update utils for new socketIO BE structure and functionality * update to resolve test errors Co-authored-by: Brandon Perard <brandon.perard@gmail> Co-authored-by: KB <[email protected]> Co-authored-by: Lori <[email protected]>
* update song controller and model for new fields and insertAll * add channel_name & channel_id columns to songs table and set to CASCADE in setup.sql * update Video model and apiUtils for additional fields * update test for formatVideos munge function * update commented lines after troubleshooting * update song post flow for JSON * merge * update Song model and app to resolve errors with batch post to songs table; add socketIO.js to utils for socket.io functionality * merge conflicts * update files to resolve socket.io conflicts * add Queue & Room models/routes * add queue & room controllers * add event listeners for room join/create to sockerIO.js * update socketIO functionality to resolve errors in room join/create events * add SONG_QUEUE and HOST listeners to socketIO utility, updated CREATE and JOIN room listeners, and add skeleton for planned functionality * merge to dev * update socketIO welcome create and join room messages * update comment out HOST/QUEUE socketIO listeners to resolve errors while fixed * update socketIO utils to resolve errors and update naming * updates from Dan suggestions * Dan update 2(remembered to save) * update utils for new socketIO BE structure and functionality * update to resolve test errors * update socketIO listeners and functionality Co-authored-by: Brandon Perard <brandon.perard@gmail> Co-authored-by: KB <[email protected]> Co-authored-by: Lori <[email protected]>
* update song controller and model for new fields and insertAll * add channel_name & channel_id columns to songs table and set to CASCADE in setup.sql * update Video model and apiUtils for additional fields * update test for formatVideos munge function * update commented lines after troubleshooting * update song post flow for JSON * merge * update Song model and app to resolve errors with batch post to songs table; add socketIO.js to utils for socket.io functionality * merge conflicts * update files to resolve socket.io conflicts * add Queue & Room models/routes * add queue & room controllers * add event listeners for room join/create to sockerIO.js * update socketIO functionality to resolve errors in room join/create events * add SONG_QUEUE and HOST listeners to socketIO utility, updated CREATE and JOIN room listeners, and add skeleton for planned functionality * merge to dev * update socketIO welcome create and join room messages * update comment out HOST/QUEUE socketIO listeners to resolve errors while fixed * update socketIO utils to resolve errors and update naming * updates from Dan suggestions * Dan update 2(remembered to save) * update utils for new socketIO BE structure and functionality * update to resolve test errors * update socketIO listeners and functionality Co-authored-by: Brandon Perard <brandon.perard@gmail> Co-authored-by: KB <[email protected]> Co-authored-by: Lori <[email protected]>
* update song controller and model for new fields and insertAll * add channel_name & channel_id columns to songs table and set to CASCADE in setup.sql * update Video model and apiUtils for additional fields * update test for formatVideos munge function * update commented lines after troubleshooting * update song post flow for JSON * merge * update Song model and app to resolve errors with batch post to songs table; add socketIO.js to utils for socket.io functionality * merge conflicts * update files to resolve socket.io conflicts * add Queue & Room models/routes * add queue & room controllers * add event listeners for room join/create to sockerIO.js * update socketIO functionality to resolve errors in room join/create events * add SONG_QUEUE and HOST listeners to socketIO utility, updated CREATE and JOIN room listeners, and add skeleton for planned functionality * merge to dev * update socketIO welcome create and join room messages * update comment out HOST/QUEUE socketIO listeners to resolve errors while fixed * update socketIO utils to resolve errors and update naming * updates from Dan suggestions * Dan update 2(remembered to save) * update utils for new socketIO BE structure and functionality * update to resolve test errors * update socketIO listeners and functionality * update socketIO utils to resolve conflicts with listeners on FE Co-authored-by: Brandon Perard <brandon.perard@gmail> Co-authored-by: KB <[email protected]> Co-authored-by: Lori <[email protected]>
* update song controller and model for new fields and insertAll * add channel_name & channel_id columns to songs table and set to CASCADE in setup.sql * update Video model and apiUtils for additional fields * update test for formatVideos munge function * update commented lines after troubleshooting * update song post flow for JSON * merge * update Song model and app to resolve errors with batch post to songs table; add socketIO.js to utils for socket.io functionality * merge conflicts * update files to resolve socket.io conflicts * add Queue & Room models/routes * add queue & room controllers * add event listeners for room join/create to sockerIO.js * update socketIO functionality to resolve errors in room join/create events * add SONG_QUEUE and HOST listeners to socketIO utility, updated CREATE and JOIN room listeners, and add skeleton for planned functionality * merge to dev * update socketIO welcome create and join room messages * update comment out HOST/QUEUE socketIO listeners to resolve errors while fixed * update socketIO utils to resolve errors and update naming * updates from Dan suggestions * Dan update 2(remembered to save) * update utils for new socketIO BE structure and functionality * update to resolve test errors * update socketIO listeners and functionality * update socketIO utils to resolve conflicts with listeners on FE * update socketIO utils to add UPDATE_ROOMS_ARRAY event listener * update to resolve errors * update to resolve errors Co-authored-by: Brandon Perard <brandon.perard@gmail> Co-authored-by: KB <[email protected]> Co-authored-by: Lori <[email protected]>
* update song controller and model for new fields and insertAll * add channel_name & channel_id columns to songs table and set to CASCADE in setup.sql * update Video model and apiUtils for additional fields * update test for formatVideos munge function * update commented lines after troubleshooting * update song post flow for JSON * merge * update Song model and app to resolve errors with batch post to songs table; add socketIO.js to utils for socket.io functionality * merge conflicts * update files to resolve socket.io conflicts * add Queue & Room models/routes * add queue & room controllers * add event listeners for room join/create to sockerIO.js * update socketIO functionality to resolve errors in room join/create events * add SONG_QUEUE and HOST listeners to socketIO utility, updated CREATE and JOIN room listeners, and add skeleton for planned functionality * merge to dev * update socketIO welcome create and join room messages * update comment out HOST/QUEUE socketIO listeners to resolve errors while fixed * update socketIO utils to resolve errors and update naming * updates from Dan suggestions * Dan update 2(remembered to save) * update utils for new socketIO BE structure and functionality * update to resolve test errors * update socketIO listeners and functionality * update socketIO utils to resolve conflicts with listeners on FE * update socketIO utils to add UPDATE_ROOMS_ARRAY event listener * update to resolve errors * update to resolve errors * add disconnect flow to socketIO utils: removes user from directory and guestArray, and also removes empty rooms from directory * update adjust room join message and comment out prevRoomName feature until errors resolved Co-authored-by: Brandon Perard <brandon.perard@gmail> Co-authored-by: KB <[email protected]> Co-authored-by: Lori <[email protected]>
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.
Hello, I'm Brandon. This is a PR for funsies. KB is totally not here typing right now