From 1f7e1f79bd7dfbd49027caaec00dfeb7f0d13da3 Mon Sep 17 00:00:00 2001 From: shreya kapoor <31164665+shreyakapoor08@users.noreply.github.com> Date: Thu, 12 Mar 2020 00:09:45 +0530 Subject: [PATCH] issue #578 Error message UI fix (#598) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * issue #578 Error message UI fix * issue #578 Error message UI fix line break added * issue #578 details tab align * minor changes #578 * minor fixes #578 * corrections #578 * for review 578 * padding changed * code quality * line break added * edit * edit 2 * Update CONTRIBUTION.md * Update CONTRIBUTION.md * margin added * space removed * api link corrected * details link corrected * final correction * resolved conflicts & enhanced text message 🔨 Co-authored-by: Divyanshu Rawat --- .github/CONTRIBUTION/CONTRIBUTION.md | 5 +++++ src/ignitus-Api/constants.ts | 2 +- .../Components/errorBoundary/index.js | 16 ++++++++++++++-- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/.github/CONTRIBUTION/CONTRIBUTION.md b/.github/CONTRIBUTION/CONTRIBUTION.md index 226c8b90..b070e86e 100644 --- a/.github/CONTRIBUTION/CONTRIBUTION.md +++ b/.github/CONTRIBUTION/CONTRIBUTION.md @@ -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'``` @@ -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. diff --git a/src/ignitus-Api/constants.ts b/src/ignitus-Api/constants.ts index f45ad2f7..fb23b538 100644 --- a/src/ignitus-Api/constants.ts +++ b/src/ignitus-Api/constants.ts @@ -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'; diff --git a/src/ignitus-Shared/Components/errorBoundary/index.js b/src/ignitus-Shared/Components/errorBoundary/index.js index ec7ba5e3..ad7e8f6e 100644 --- a/src/ignitus-Shared/Components/errorBoundary/index.js +++ b/src/ignitus-Shared/Components/errorBoundary/index.js @@ -24,8 +24,20 @@ export class ErrorBoundary extends React.Component { if (errorInfo) { return (
-

Something went wrong.

-
+

+ Unable to render the component! +

+
+ This can happen if you are not connected to internet or if an underlying +
+ system or component is not rendered due to some bug. +
+
{error && error.toString()}
{errorInfo.componentStack}