diff --git a/src/api/challengeSubmissionPost.js b/src/api/challengeSubmissionPost.js index d99bf0b..ca09d94 100644 --- a/src/api/challengeSubmissionPost.js +++ b/src/api/challengeSubmissionPost.js @@ -1,7 +1,7 @@ import KeyCloakService from '../services/KeyCloakService'; import {API} from '../utils/globals'; -const challengeSubmission = (challengeName, repoUrl, repoBranch, description) => { +const challengeSubmission = (challengeName, repoUrl, repoBranch, description, setLoading) => { const details = { 'f1': description, 'f3': repoUrl, @@ -14,13 +14,17 @@ const challengeSubmission = (challengeName, repoUrl, repoBranch, description) => formBody.push(encodedKey + '=' + encodedValue); } formBody = formBody.join('&'); - return fetch(`${API}/challenge-submission/${challengeName}`, { + fetch(`${API}/challenge-submission/${challengeName}`, { method: 'POST', headers: { 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8', 'Authorization': `Bearer ${KeyCloakService.getToken()}` }, body: formBody + }).then((resp) => resp.json()) + .then((data) => { + setLoading(true); + window.location.replace(`https://gonito.net/view-progress/${data}#form`); }); }; diff --git a/src/components/generic/Button.js b/src/components/generic/Button.js index a385185..276f762 100644 --- a/src/components/generic/Button.js +++ b/src/components/generic/Button.js @@ -16,6 +16,10 @@ const ButtonStyle = styled(Medium)` cursor: pointer; transition: transform 0.3s ease-in-out; + * { + cursor: pointer; + } + &:hover { transform: scale(1.15); } diff --git a/src/components/specific_challenge/Submit.js b/src/components/specific_challenge/Submit.js index d707a5c..15410a3 100644 --- a/src/components/specific_challenge/Submit.js +++ b/src/components/specific_challenge/Submit.js @@ -24,10 +24,7 @@ const Submit = (props) => { }; const challengeSubmissionSubmit = () => { - challengeSubmission(props.challengeName, repoUrl, repoBranch, description) - .then((response) => response.text()) - .then((data) => console.log(data)); - props.popUpMessageHandler('Submit success!', 'Check your entries.'); + challengeSubmission(props.challengeName, repoUrl, repoBranch, description, props.setLoading); }; return ( diff --git a/src/pages/Challenge.js b/src/pages/Challenge.js index 5739698..255fd5d 100644 --- a/src/pages/Challenge.js +++ b/src/pages/Challenge.js @@ -1,7 +1,7 @@ import React from 'react'; import {Container, FlexColumn, FlexRow, Svg} from '../utils/containers'; import {useParams} from 'react-router-dom'; -import {H1, Medium} from '../utils/fonts'; +import {H1, H2, Medium} from '../utils/fonts'; import theme from '../utils/theme'; import MobileChallengeMenu from '../components/specific_challenge/MobileChallengeMenu'; import Leaderboard from '../components/specific_challenge/Leaderboard/Leaderboard'; @@ -41,7 +41,7 @@ const Challenge = (props) => { case 3: return ; case 4: - return ; + return ; default: return ; } @@ -62,28 +62,39 @@ const Challenge = (props) => { }; const desktopRender = () => { - return ( - <> - - - - - -

- {challenge.title} -

- - {challenge.description} - -
- -
- - {sectionRender()} + if (!loading) { + return ( + <> + + + + +

+ {challenge.title} +

+ + {challenge.description} + +
+ +
+ + {sectionRender()} +
+ + ); + } + else { + return ( + +

+ Submission processing... +

+
- - ); + ); + } }; return ( diff --git a/src/utils/fonts.js b/src/utils/fonts.js index 513866d..3eeb080 100644 --- a/src/utils/fonts.js +++ b/src/utils/fonts.js @@ -7,6 +7,7 @@ const H1 = styled(Container)` font-weight: 400; font-size: 24px; line-height: 24px; + letter-spacing: 0.1px; @media (min-width: ${({theme}) => theme.overMobile}) { font-size: 48px; line-height: 52px;