-
Notifications
You must be signed in to change notification settings - Fork 9
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
JRA-26 #done Implement 404 Page #26
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi Phillip,
Good work, this is pretty much ready to be merged as soon as you resolve the merge conflict in src/stories/components/utils/page-container.stories.tsx
. Here are the steps you will need to take to resolve this:
- Open up the file in VSCode and find the merge conflict marker:
- Above the marker you will see a few small buttons with text such as "accept current change", "accept incoming change", and "accept both changes." The current change is your local changes, the incoming changes are from the upstream repository. In this case, the only difference is that in your local changes, the name of the story is "empty" and in the incoming changes from the 8by8 repo, it is "Empty." PascalCase is the correct case for Storybook stories, so we want to click "accept incoming changes."
- Save the file.
- Open up a terminal and run
git add .
- Then run,
git commit -m "fixed merge conflicts"
- Finally, run
git push
Once you resolve this conflict, I will approve and merge this.
As a first basic step to troubleshoot Prettier, please open VSCode and navigate to file->preferences->settings. Then search for "default formatter." Find the setting called "Editor: Default Formatter." Ensure that you have selected "Prettier - Code Formatter." If you cannot find this option, you will need to install the Prettier extension. To do this, go to file->preferences->extensions. Search for "Prettier" and install it. The go back to file->preferences->settings and select it as your default formatter.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Great job! Approved!
Checklist
Overview
Implement a 404 page when a user navigates to a page that hasn't been created for the site.
Test Plan
Follow ups
I have not been able to fix the code formatting with Prettier. I will attempt to reinstall and see if it fixes itself; the code for the 404 page will have to be reformatted manually.