Feature/#159221467 #222
Merged
Feature/#159221467 #222
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
* nightwatch config and write basics of kevin smoke test * update readme and Kevin logged in successfully step * rebase master * minor change to the way we get the selenium server path * chore(git): remove unneeded .gitignore lines * add profile image upload form to profile page * show profile picture first, on hover give option to upload new, on click show upload new form * add profilePicture to User model * missed a comma in the schema definition * add placeholder profile image, display user's profile picture in header * fix some minor linting errors - passes all tests here * merge master * merge master * show profile picture first, on hover give option to upload new, on click show upload new form * add profilePicture to User model * missed a comma in the schema definition * add placeholder profile image, display user's profile picture in header * fix some minor linting errors - passes all tests here * remove redux form in favour of material ui * yarn lock after merge * re-add profile picture avatar after merging with master * run yarn * fix upload dropzone improts * add an h3 to main.scss * style profile page * add upload profile picture functionality to both front end and back end * update upload dropzone to use our scss theme colours * import profile image at top * remove arrow functions from onclick in profule picture form * fix profile picture import * add confirmation stage to profile picture upload flow
* feature #155111485- Visitor sees landing page(Section F) * some changes in app.js * changes in landingf.js * fixed error * remove first 2 lines * commented out the images * deleted 2 video images * put images back with closing tag * changed the landingf * some changes again * changed class names * changed linkedin class * styles added to social media * some changes * column1 changed * removed <a> tag * removed few links * added links * fixed error * another bug * changed logo image * font-size * changed some css * changes in margin and padding * column width change * fixing test bugs * few more bugs fixed * bug * decreased spacing between columns * fixed spacing bet columns * made changes based on review * LandingF and landing E * fixed the alignment on the button * fixed link issue in button * feature #155111485- Visitor sees landing page(Section F) * some changes in app.js * changes in landingf.js * fixed error * remove first 2 lines * commented out the images * put images back with closing tag * some changes again * changed class names * changed linkedin class * styles added to social media * some changes * column1 changed * removed <a> tag * removed few links * fixed error * changed logo image * font-size * few more bugs fixed * decreased spacing between columns * fixed spacing bet columns * fixed conflicts * few more conflicts resolved * landing D page * Landing D fixes * remove first 2 lines * deleted an image * fixed conflicts * Backend of landing D page * fix column style
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.
Pivotal Tracker Story ID: [#159221467]
Pre-Submission Checklist:
masterbranch of calltocode.orgmasteryarn testyarn e2ePost-Submission Checklist:
master(find this out at the bottom of your pull request)Description of Changes:
updated yarn lock file to enable deployment to Heroku
TODO: