OperationCode / operationcode_frontend

Front-end repository for live site. Please go to `front-end` repo to contribute instead.
https://operationcode.org
MIT License
101 stars 222 forks source link

Created 'Get involved' page -- need some help #871

Closed ksmacleod99 closed 6 years ago

ksmacleod99 commented 6 years ago

Description of changes

Makes a Get Involved page

Issue Resolved

Satisfies Issue #12

Needs review; and I don't know how to begin with the styles for the isLeftFocused, isRighFocused, etc booleans. Needs path to volunteer page. Also, some storybook info got sucked up into a commit, please advise on how to remove (or fix so it works properly :D )

jjhampton commented 6 years ago

@ksmacleod99 re: 'some storybook info got sucked up into a commit, please advise on how to remove' - perhaps you ran one of the storybook NPM scripts while developing. I've noticed that this has a tendency to add (unwanted) changes that will be committed to Git.

The offending commit appears to be 73977cabc91 . Since you've already submitted this PR and others may have pulled in this code to collab/review it, I would run git revert 73977ca. This will add a new commit that reverses the changes made in 73977ca. Then push the new (reverting) commit up to your remote branch.

The other option would be to use git's interactive rebase feature to delete commit 73977cabc91 (which rewrites history), and then git push --force to update your remote branch with the new version of history. Only do that if you're sure that no one else has pulled in your earlier changes.

ksmacleod99 commented 6 years ago

@jjhampton I think I did it... how bad did I break it?

jjhampton commented 6 years ago

@ksmacleod99 It looks like your revert commit got rid of some of the unwanted Storybook-related changes from commit 73977ca, but not all of them. The other files that have unwanted Storybook-related changes (and should have changes reversed by git revert) are:

If you run git revert 73977ca again, I'd suggest inspecting the revert commit afterwards to ensure that the above files have the Storybook-related changes removed (by running git diff HEAD^, or possibly by using a Git GUI tool such as the GitHub desktop app or GitKraken). Once you are sure that those files have the Storybook-related changes removed, you can push again to your remote.

ksmacleod99 commented 6 years ago

If the story book commits are gone, it should be good to go. I can work on isLeftFocus/isRightFocus on a different PR.

jjhampton commented 6 years ago

@ksmacleod99 This one's been open for quite some time now - how's it coming along? Do you need any help getting this finished up?

ksmacleod99 commented 6 years ago

I have everything except the redirect and the dangling underscore

jjhampton commented 6 years ago

@ksmacleod99 @wimo7083 @kylemh I've pushed up some more changes and feel this is ready to review/merge. Page is accessible at http://localhost:4000/get-involved if you pull down this PR branch.

Updates:

After this is merged, we can work on the following. I'll create new issues as needed: