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

issue #578 Error message UI fix #598

Merged
merged 22 commits into from
Mar 11, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/CONTRIBUTION/CONTRIBUTION.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
### Contributing.

**IMP:** Please create a new branch from ```develop``` not from ```master```, and also create a pull request to ```develop``` not to ```master```.

1. Create your **branch**: ```git checkout -b my-new-feature```

2. **Commit** your changes: ```git commit -m 'Add some feature'```
Expand Down Expand Up @@ -44,3 +46,6 @@ A pluggable and configurable linter tool for identifying and reporting on patter
``` npm run lint ```

``` npm run lint:fix ```


**IMP:** Please don't commit your ```package-lock.json``` until & unless you are not adding a new package.
2 changes: 1 addition & 1 deletion src/ignitus-Api/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export const STUDENT_SIGN_IN = `${BASE_URL}/login`;

export const FRONTEND_CONTRIBUTOR_API = 'https://api.github.com/repos/Ignitus/Ignitus-Client-Side-Development/contributors?per_page=14';

export const BACKEND_CONTRIBUTOR_API = 'https://api.github.com/repos/Ignitus/Ignitus-rest-api/contributors';
export const BACKEND_CONTRIBUTOR_API = 'https://api.github.com/repos/Ignitus/Ignitus-rest-api/';

export const CONTRIBUTORS_STORE = 'contributors';
export const TESTIMONIALS_STORE = 'testimonials';
Expand Down
16 changes: 14 additions & 2 deletions src/ignitus-Shared/Components/errorBoundary/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,20 @@ export class ErrorBoundary extends React.Component {
if (errorInfo) {
return (
<div className="container">
<h2>Something went wrong.</h2>
<details style={{ whiteSpace: 'pre-wrap' }}>
<h2
style={{ textAlign: 'center', marginTop: '4em', color: '#000066' }}
>
Unable to render the component!
</h2>
<h5 style={{ textAlign: 'center', marginTop: '20px' }}>
This can happen if you are not connected to internet or if an underlying
<br />
system or component is not rendered due to some bug.
</h5>
<details style={{
whiteSpace: 'pre-wrap', fontSize: '15px', marginBottom: '4em', marginRight: '530px', marginLeft: '220px',
}}
>
{error && error.toString()}
<br />
{errorInfo.componentStack}
Expand Down