Final Submission: Randy Agudelo, René Borner, Caitlin Enright, Elie Hess#70
Open
eliehess wants to merge 133 commits intocs4241-19a:masterfrom
Open
Final Submission: Randy Agudelo, René Borner, Caitlin Enright, Elie Hess#70eliehess wants to merge 133 commits intocs4241-19a:masterfrom
eliehess wants to merge 133 commits intocs4241-19a:masterfrom
Conversation
Login and registration
Homepage layout
Delete dropdown, clean up login page, fix typos, code style
# Conflicts: # public/home.html
Changes: - add ability to get "/user" from app.js, which returns the currently-logged-in user - change default port to 3001 instead of 3000 because 3000 is already occupied for some reason - apply default WebStorm code styling - navbar now updates with the currently-logged-in username
# Conflicts: # app.js
# Conflicts: # public/home.html
* Testing for audio visualizer * Tried to make it be a js file * Placed audio Visualizer in the background * merging * saving current Track id in backend * working on animation * fixing play pause animation * merging
# Conflicts: # public/home.html # public/js/createPlayer.js
Turntable fix and layout
# Conflicts: # public/home.html
Update README.md
Update master branch
* Update README.md * Update README.md * Update README.md (#29) * Update README.md (#30) Ha ha I get to merge this PR without a review * Delete unnecessary comments and autoformat * Comment out all console.logs() so that they can be deleted * Update README.md (#33) * Delete Bug * Updated the readME for my part (#34) * Delete unnecessary things * Delete get("/trackInfo") Resolves #31 * Delete unnecessary console.log()s * I missed a few things * Fix scrolling (#36) * added scrolling for small computers * Switch port back to 3000 * Delete comments * Update style.css * Delete fullstar.png * Fix? * Update createPlayer.js
* Update README.md * Update README.md
Update README.md
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
GitHub usernames: RandyAgudelo, retat, eliehess, cenright71925
EDIT: if for some reason you can't create an account, use username "test" and password "password"