diff --git a/frontend/src/assets/styles/main.scss b/frontend/src/assets/styles/main.scss index 27bbfa5..bffabc1 100644 --- a/frontend/src/assets/styles/main.scss +++ b/frontend/src/assets/styles/main.scss @@ -196,4 +196,39 @@ p { background-color: #F3F6FF; } } +} + +.submission-result-container { + @extend .flex-row-container; + align-items: center; + justify-content: center; + min-height: $body-height; +} + +.submission-result-card { + width: fit-content; + min-width: 641px; + padding: 45px 10px; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + font-size: 26px; + line-height: 36px; + box-shadow: 0px 0px 24px 0px #D4D3E380; + + img { + width: 86px; + margin-bottom: 20px + } + .btn-link { + text-decoration: underline; + padding: 0; + font-size: inherit + } +} + +.upload-contianer { + display: flex; + align-items: center; } \ No newline at end of file diff --git a/frontend/src/pages/user/requests/ProposalSubmitted.vue b/frontend/src/pages/user/requests/ProposalSubmitted.vue index 1b7b96f..65f01d9 100644 --- a/frontend/src/pages/user/requests/ProposalSubmitted.vue +++ b/frontend/src/pages/user/requests/ProposalSubmitted.vue @@ -1,10 +1,13 @@ @@ -36,12 +39,3 @@ export default { } } - diff --git a/frontend/src/pages/user/requests/Propose.vue b/frontend/src/pages/user/requests/Propose.vue index c255432..bc640a5 100644 --- a/frontend/src/pages/user/requests/Propose.vue +++ b/frontend/src/pages/user/requests/Propose.vue @@ -1,111 +1,110 @@ @@ -232,8 +279,11 @@ import { preparedProposalSummary, proposalUtils } from '../../../types/index' +import SvgIcon from '@/components/SvgIcon.vue' +import FreeleapsEditor from '@/components/FreeleapsEditor.vue' export default { name: 'MakeProposal', + components: { SvgIcon, FreeleapsEditor }, props: { requestId: { required: true, @@ -252,7 +302,7 @@ export default { }, watch: { 'proposal.stages': { - handler(val, oldVal) { + handler() { this.caculateSummary() }, deep: true @@ -281,6 +331,9 @@ export default { handleFileUpload(event) { this.uploadFile = event.target.files[0] }, + clearFile() { + this.uploadFile = null + }, back() { this.mnx_goBack() }, @@ -357,7 +410,7 @@ export default { } }, addStage() { - this.proposal.stages.push(this.emptyStage) + this.proposal.stages.push({...this.emptyStage}) }, removeStage(index) { @@ -399,6 +452,13 @@ export default { diff --git a/frontend/src/pages/user/workspace/requestIssue/Issue.vue b/frontend/src/pages/user/workspace/requestIssue/Issue.vue index 665a538..700b82a 100644 --- a/frontend/src/pages/user/workspace/requestIssue/Issue.vue +++ b/frontend/src/pages/user/workspace/requestIssue/Issue.vue @@ -336,10 +336,6 @@ export default { } diff --git a/frontend/src/types/proposalUtils.js b/frontend/src/types/proposalUtils.js index 80cf49a..ee5cbad 100644 --- a/frontend/src/types/proposalUtils.js +++ b/frontend/src/types/proposalUtils.js @@ -35,8 +35,8 @@ class ProposalUtils { if (stages) stages.forEach((element) => { summary.total_stages++ - summary.total_payment += element.payment - summary.total_duration_in_days += element.duration_in_days + summary.total_payment += Number(element.payment) + summary.total_duration_in_days += Number(element.duration_in_days) summary.currency = element.currency }) }