From 6c084fda229fb239c9a22a31f908422537cc127b Mon Sep 17 00:00:00 2001 From: Mike Liao Date: Sun, 25 Aug 2024 15:17:51 -0700 Subject: [PATCH 1/6] add more args in docker file --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1e75a82..31fdab5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # build stage FROM node:lts-alpine as build-stage ARG CONTAINER_APP_ROOT="/app" - +ARG FRONTEND_PORT=8080 RUN npm update npm -g RUN npm config set "@fortawesome:registry" https://npm.fontawesome.com/ RUN npm config set "//npm.fontawesome.com/:_authToken" 58624E90-2685-43C6-BF0F-0BFECCE11CD2 @@ -23,5 +23,5 @@ RUN npm run build FROM nginx:1.25.2 as production-stage COPY --from=build-stage /app/dist /usr/share/nginx/html COPY frontend/nginx_docker.conf /etc/nginx/conf.d/default.conf -EXPOSE 8080 +EXPOSE ${FRONTEND_PORT} CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file From d1142ecfc0fcf57ccc4d60acfb45f11c2fb93a66 Mon Sep 17 00:00:00 2001 From: "min.jiang" Date: Mon, 26 Aug 2024 23:26:35 +0800 Subject: [PATCH 2/6] Pull from origin gitea --- frontend/src/lang/en.js | 1 + frontend/src/lang/zh.js | 5 +++++ frontend/src/pages/user/messages/Home.vue | 8 +++++--- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 89854a1..5c825da 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -218,4 +218,5 @@ export default { 'Didn\'t get the email? Check junk folder or': 'Didn\'t get the email? Check junk folder or ', 'send again': 'send again', 'No content yet': 'No content yet' + } diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index e7d5d62..eadf2da 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -197,6 +197,11 @@ export default { 'Payment progress': '付款进度', Goal: '项目目标', Information: '项目信息', + 'Wait for completion': '待完成', + 'Mission complete': '已完成', + 'Wait for payment': '待支付', + 'Wait for confirmation': '待确认', + 'Confirm receipt': '确认收款', 'Quote from': '报价方', 'Days on Freeleaps': '用户活跃天数', 'Number of projects fulfilled': '完成项目总数', diff --git a/frontend/src/pages/user/messages/Home.vue b/frontend/src/pages/user/messages/Home.vue index c8853c3..93ed3c6 100644 --- a/frontend/src/pages/user/messages/Home.vue +++ b/frontend/src/pages/user/messages/Home.vue @@ -6,7 +6,7 @@
- user portrait + user portrait
@@ -32,7 +32,7 @@
- user portrait + user portrait {{ item.sender_firstname }} {{ item.sender_lastname }} @@ -59,6 +59,7 @@ import SvgIcon from '@/components/SvgIcon.vue' import { MessageHubApi, DateUtils, requestHubUtils } from '@/utils/index' import { userUtils } from '@/utils/store/index' +import profileUrl from '@/assets/profile.png' export default { components: { SvgIcon }, name: 'MessageHub', @@ -73,6 +74,7 @@ export default { }, data() { return { + profileUrl, userIdentityNote: this.mnx_getUserIdentity(), selConversation: null, messages: [], @@ -87,7 +89,7 @@ export default { }, watch: { conversations(n_val) { - console.log('nval', n_val, this.selConversation, n_val[0].messages) + console.log('nval', n_val, this.selConversation, n_val[0]?.messages) if (!this.selConversation && n_val[0]) { this.selConversation = n_val[0] this.messages = n_val[0].messages || [] From 3c5256f5f9416896bb7d5a6d659bf3f5b94c4d9b Mon Sep 17 00:00:00 2001 From: "min.jiang" Date: Tue, 27 Aug 2024 01:02:29 +0800 Subject: [PATCH 3/6] update --- frontend/src/pages/user/workspace/projectIssue/Issue.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frontend/src/pages/user/workspace/projectIssue/Issue.vue b/frontend/src/pages/user/workspace/projectIssue/Issue.vue index 70db5d0..efeee79 100644 --- a/frontend/src/pages/user/workspace/projectIssue/Issue.vue +++ b/frontend/src/pages/user/workspace/projectIssue/Issue.vue @@ -511,11 +511,13 @@ export default { .project-issue-status { @extend .text-start; @extend .w-10; + flex-shrink: 0; } .project-issue-update { @extend .text-start; @extend .w-10; + flex-shrink: 0; } .project-issue-manage-button { From 709d280ce7a953294a6a1bfcc76614652e255c36 Mon Sep 17 00:00:00 2001 From: "min.jiang" Date: Tue, 27 Aug 2024 11:53:44 +0800 Subject: [PATCH 4/6] =?UTF-8?q?update:=20=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E8=81=8A=E5=A4=A9=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/pages/user/messages/Home.vue | 3 +- frontend/src/pages/user/requests/Home.vue | 48 ++++++++++++++--------- 2 files changed, 31 insertions(+), 20 deletions(-) diff --git a/frontend/src/pages/user/messages/Home.vue b/frontend/src/pages/user/messages/Home.vue index 93ed3c6..d2f7a12 100644 --- a/frontend/src/pages/user/messages/Home.vue +++ b/frontend/src/pages/user/messages/Home.vue @@ -91,8 +91,7 @@ export default { conversations(n_val) { console.log('nval', n_val, this.selConversation, n_val[0]?.messages) if (!this.selConversation && n_val[0]) { - this.selConversation = n_val[0] - this.messages = n_val[0].messages || [] + this.selectConversation(n_val[0]) this.clearUnreadMessageBy(n_val[0]) } else { if (n_val?.[0] && this.selConversation?.id === n_val?.[0]?.id) { diff --git a/frontend/src/pages/user/requests/Home.vue b/frontend/src/pages/user/requests/Home.vue index 4277a66..9d1807f 100644 --- a/frontend/src/pages/user/requests/Home.vue +++ b/frontend/src/pages/user/requests/Home.vue @@ -96,7 +96,7 @@ @@ -279,25 +279,37 @@ export default { }) }, downloadAttachedFile(request_id, document_id) { - WorksapceApi.fetchAttachedFileAsDownload(request_id, document_id) - .then((response) => { - // create file link in browser's memory - const href = URL.createObjectURL(response.data) - // create "a" HTML element with href to file & click - const link = document.createElement('a') - link.href = href - link.setAttribute('download', 'file.pdf') //or any other extension - document.body.appendChild(link) - link.click() + window.open(`http://${window.location.host}/api/workspace/request/fetch-attached-file-as-download?request_id=${request_id}&document_id=${document_id}`) - // clean up "a" element & remove ObjectURL - document.body.removeChild(link) - URL.revokeObjectURL(href) //TODO: navigate to the preview page - }) - .catch((error) => { - this.mnx_backendErrorHandler(error) - }) + // const link = document.createElement('a') + // link.href = `${window.location.host}/api/workspace/request/fetch-attached-file-as-download?request_id=${request_id}&document_id=${document_id}` + // link.download = file_name + // link.target = '_blank' + // document.body.appendChild(link) + // link.click() + // document.body.removeChild(link) + + // WorksapceApi.fetchAttachedFileAsDownload(request_id, document_id) + // .then((response) => { + // // create file link in browser's memory + // const href = URL.createObjectURL(response.data) + + // // create "a" HTML element with href to file & click + // const link = document.createElement('a') + // link.href = href + // link.setAttribute('download', 'file.pdf') //or any other extension + // link.setAttribute('_') + // document.body.appendChild(link) + // link.click() + + // // clean up "a" element & remove ObjectURL + // document.body.removeChild(link) + // URL.revokeObjectURL(href) //TODO: navigate to the preview page + // }) + // .catch((error) => { + // this.mnx_backendErrorHandler(error) + // }) } } } From 77290c9e9c7a772386e49aaf7c66ae23ea2838fe Mon Sep 17 00:00:00 2001 From: "min.jiang" Date: Tue, 27 Aug 2024 14:35:52 +0800 Subject: [PATCH 5/6] update:bug fix --- frontend/src/pages/user/providers/Home.vue | 36 ++++++++++++++++++++-- frontend/src/pages/user/workspace/Home.vue | 10 ++++-- 2 files changed, 42 insertions(+), 4 deletions(-) diff --git a/frontend/src/pages/user/providers/Home.vue b/frontend/src/pages/user/providers/Home.vue index aba1981..f3b2bcc 100644 --- a/frontend/src/pages/user/providers/Home.vue +++ b/frontend/src/pages/user/providers/Home.vue @@ -180,7 +180,35 @@
-
+
+ +
+ +
+
+ + +
+ *{{ + $t( + 'Once the request is selected, the provider will be invited to see the request.' + ) + }} +
+
+
+
@@ -389,6 +417,10 @@ export default { font-weight: bold !important; } +.marb-10 { + margin-bottom: 10px !important +} + .self-intro-content-container { @extend .container; @extend .text-start; diff --git a/frontend/src/pages/user/workspace/Home.vue b/frontend/src/pages/user/workspace/Home.vue index cd1ca40..82ba609 100644 --- a/frontend/src/pages/user/workspace/Home.vue +++ b/frontend/src/pages/user/workspace/Home.vue @@ -29,18 +29,24 @@

{{ fromIntToProjectStatus(project.status) }}

- +

{{ getDateFromFulltimeString(project.update_time) }}

+
+ +

{{ project?.proposal?.proposer?.first_name }} {{ project?.proposal?.proposer?.last_name }}

+
+
+ From ac9b7da2264d147877aaeb364e641d14e3450d78 Mon Sep 17 00:00:00 2001 From: Jet Li Date: Sat, 31 Aug 2024 10:59:15 -0700 Subject: [PATCH 6/6] Add issuer information --- frontend/src/pages/user/workspace/Home.vue | 234 ++++++--------------- 1 file changed, 70 insertions(+), 164 deletions(-) diff --git a/frontend/src/pages/user/workspace/Home.vue b/frontend/src/pages/user/workspace/Home.vue index 82ba609..57699eb 100644 --- a/frontend/src/pages/user/workspace/Home.vue +++ b/frontend/src/pages/user/workspace/Home.vue @@ -2,22 +2,13 @@
-
+

-

@@ -389,14 +317,9 @@

-

-
+
-
@@ -450,14 +364,9 @@

-

-
+