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

Fix/jk 171 loading bar #172

Merged
merged 4 commits into from
Dec 4, 2019
Merged

Fix/jk 171 loading bar #172

merged 4 commits into from
Dec 4, 2019

Conversation

jimhjkim
Copy link
Collaborator

@jimhjkim jimhjkim commented Dec 4, 2019

closes #171

@jimhjkim jimhjkim merged commit 161fcca into master Dec 4, 2019
jimhjkim added a commit that referenced this pull request Dec 4, 2019
* removed cors

* modified server

* installed cors on server

* added dev start script that uses nodemon

* listening to variable port

* dotenv installed and using environment variables

* modified server code

* frontend and backend domains defined

* added _redirects file

* moved _redirects file to public folder

* added .env-example

* prod (netlify) listens to production branch (#166) (#167)

* removed cors

* modified server

* installed cors on server

* added dev start script that uses nodemon

* listening to variable port

* dotenv installed and using environment variables

* modified server code

* frontend and backend domains defined

* added _redirects file

* moved _redirects file to public folder

* Fix/jk 168 avatar (#169)

* clicking on the avatar takes user back to account authentication page

* removed spacing around loading bar

* Update README.md

* Fix/jk 171 loading bar (#172)

* background shows while the loading bar is present

* added taglines to login portal

* added paddingBottom to SongDetails component: vh dependent

* removed commented out console log

* added git ignore files to both client and server dir

* added taglines on login portal (#173) (#174)

* added taglines to login portal

* added paddingBottom to SongDetails component: vh dependent

* removed commented out console log

* merge conflict resolved
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.

loading bar spacing
1 participant