From 62b5b745ca598f0c81259e7a0c3681e7a89ccb6b Mon Sep 17 00:00:00 2001 From: Ali Date: Tue, 9 Jun 2020 22:46:16 +0300 Subject: [PATCH 1/3] added loading to accept button --- client/src/components/pages/admin/Submitted_Id/index.js | 9 +++++++-- server/controllers/applicant/updateApplicant.js | 1 - 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/client/src/components/pages/admin/Submitted_Id/index.js b/client/src/components/pages/admin/Submitted_Id/index.js index 3c46c89..61f1061 100644 --- a/client/src/components/pages/admin/Submitted_Id/index.js +++ b/client/src/components/pages/admin/Submitted_Id/index.js @@ -36,6 +36,7 @@ const SubmittedId = ({ location: { pathname } }) => { const [userId, setId] = useState(''); const [acceptedVal, setAcceptedVal] = useState(); const [alertMsg, setAlertMsg] = useState([]); + const [loading, setLoading] = useState(false); const history = useHistory(); useEffect(() => { @@ -48,6 +49,7 @@ const SubmittedId = ({ location: { pathname } }) => { setAcceptedVal(rows.accepted); }); } + if (!Technical) getTec().then(setTechnical); }, [data, Technical, pathname, userId, acceptedVal]); @@ -584,9 +586,11 @@ const SubmittedId = ({ location: { pathname } }) => { Go Back diff --git a/server/controllers/applicant/updateApplicant.js b/server/controllers/applicant/updateApplicant.js index 6ac28a9..3b9f4ac 100644 --- a/server/controllers/applicant/updateApplicant.js +++ b/server/controllers/applicant/updateApplicant.js @@ -4,7 +4,6 @@ const validationUpdate = require('../../utils/validation/applicantValidation'); const updateApplicant = (req, res, next) => { const { id } = req.params; const { - cohorts, freeCodeCampPoints, freeCodeCampTopics, codeWarsKyu, From 6e7684d01a344218a7c65f6f5ce15d03edd94560 Mon Sep 17 00:00:00 2001 From: Ali Date: Tue, 9 Jun 2020 23:30:23 +0300 Subject: [PATCH 2/3] fixed dashbar and set default --- client/src/components/pages/admin/Submitted_Id/index.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/client/src/components/pages/admin/Submitted_Id/index.js b/client/src/components/pages/admin/Submitted_Id/index.js index 344f8b1..af02bc5 100644 --- a/client/src/components/pages/admin/Submitted_Id/index.js +++ b/client/src/components/pages/admin/Submitted_Id/index.js @@ -9,7 +9,6 @@ import Card from '../../../common/card'; import Typography from '../../../common/Typography'; import Button from '../../../common/Button'; import backGround from '../../../../assets/images/backgroundDash.svg'; -import DashBar from '../../../dashboard/Tabs'; import Alert from '../../../common/Alert'; import './index.css'; @@ -34,7 +33,7 @@ const SubmittedId = ({ location: { pathname } }) => { const [data, setData] = useState(); const [Technical, setTechnical] = useState(); const [userId, setId] = useState(''); - const [acceptedVal, setAcceptedVal] = useState(); + const [acceptedVal, setAcceptedVal] = useState(false); const [alertMsg, setAlertMsg] = useState([]); const [loading, setLoading] = useState(false); const history = useHistory(); @@ -55,7 +54,6 @@ const SubmittedId = ({ location: { pathname } }) => { return ( <> -
Application Profile From dd4295a4d883d1aa6539e017b2c2e09bd6dc1912 Mon Sep 17 00:00:00 2001 From: Ali Date: Tue, 9 Jun 2020 23:48:55 +0300 Subject: [PATCH 3/3] fixed steps title --- client/src/components/pages/application/Steps/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/components/pages/application/Steps/index.js b/client/src/components/pages/application/Steps/index.js index 73c402a..0f90d86 100644 --- a/client/src/components/pages/application/Steps/index.js +++ b/client/src/components/pages/application/Steps/index.js @@ -37,7 +37,7 @@ const Steps = ({ userId, fullName }) => { return (
- Steps + Application Stseps backGround