From 2d5b61c5320e5c8c48f507e2f86d6881587d1d86 Mon Sep 17 00:00:00 2001 From: "min.jiang" Date: Thu, 27 Jun 2024 05:23:19 +0800 Subject: [PATCH] update --- frontend/src/lang/en.js | 110 +++++++++++++++++- frontend/src/pages/public/About.vue | 2 +- .../src/pages/user/account/UserHistory.vue | 34 +++--- .../src/pages/user/account/UserProfile.vue | 81 +++++++------ frontend/src/pages/user/messages/Home.vue | 4 +- frontend/src/pages/user/providers/Home.vue | 47 ++++---- frontend/src/pages/user/requests/Home.vue | 24 ++-- .../pages/user/requests/ProposalSubmitted.vue | 6 +- frontend/src/pages/user/requests/Propose.vue | 36 +++--- .../user/workspace/projectManage/Home.vue | 9 +- .../user/workspace/proposalManage/Home.vue | 9 +- .../user/workspace/requestIssue/Issue.vue | 18 +-- .../user/workspace/requestIssue/Submitted.vue | 6 +- .../user/workspace/requestManage/Home.vue | 9 +- .../user/workspace/requestManage/Manage.vue | 24 ++-- .../requestManage/ReviewProposal.vue | 14 +-- 16 files changed, 262 insertions(+), 171 deletions(-) diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 6dc94c1..2476c22 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -66,5 +66,113 @@ export default { 'invalid code': 'invalid code', Password: 'Password', 'Forget password': 'Forget password', - 'Invalid password': 'Invalid password' + 'Invalid password': 'Invalid password', + 'Read More': 'Read More', + 'Total earning': 'Total earning', + 'Payable': 'Payable', + 'Total spending': 'Total spending', + 'Deposit': 'Deposit', + 'Spending': 'Spending', + 'Updated': 'Updated', + 'Earining': 'Earining', + 'Login': 'Login', + 'User ID': 'User ID', + 'Email': 'Email', + 'Mobile': 'Mobile', + 'Personal': 'Personal', + 'Full name': 'Full name', + 'Portrait': 'Portrait', + 'Self-intro': 'Self-intro', + 'Earning now': 'Earning now', + 'Edit': 'Edit', + 'Templates': 'Templates', + 'Cancel': 'Cancel', + 'I want to be a service provider and earn money': 'I want to be a service provider and earn money', + 'Stripe account onboarding is not completed.': 'Stripe account onboarding is not completed.', + 'Upload QR code to receive payment': 'Upload QR code to receive payment', + 'Have you linked your strip account?': 'Have you linked your strip account?', + 'Visit Stripe': 'Visit Stripe', + 'You are a service provider now. Please review your self-intro to reflect your skills to deliver projects.': 'You are a service provider now. Please review your self-intro to reflect your skills to deliver projects.', + 'Achievement': 'Achievement', + 'On Freeleaps': 'On Freeleaps', + 'Connections': 'Connections', + 'Messages': 'Messages', + 'Credit': 'Credit', + '12-month spending': '12-month spending', + '3-month spending': '3-month spending', + 'Posted': 'Posted', + 'Accomplished': 'Accomplished', + 'Active': 'Active', + 'Ongoing': 'Ongoing', + '12-month earning': '12-month earning', + 'Delivered': 'Delivered', + 'Delivering time': 'Delivering time', + 'Apply self-intro template': 'Apply self-intro template', + 'Apply': 'Apply', + 'Empty conversation': 'Empty conversation', + 'Please choose conversation': 'Please choose conversation', + 'Name': 'Name', + 'Stay on Freeleaps': 'Stay on Freeleaps', + 'Delivered projects': 'Delivered projects', + 'Responding time': 'Responding time', + 'Credit score': 'Credit score', + 'Self intro': 'Self intro', + 'Profile': 'Profile', + 'Project delivering time': 'Project delivering time', + 'Top programming languages': 'Top programming languages', + 'Weekly produced code': 'Weekly produced code', + 'Ongoing projects': 'Ongoing projects', + 'Invitations to requests': 'Invitations to requests', + 'Active proposals': 'Active proposals', + 'Expected hourly rate': 'Expected hourly rate', + 'Code issue rate': 'Code issue rate', + 'Online issue rate': 'Online issue rate', + 'Issue fixing rate': 'Issue fixing rate', + 'Issue fixing time': 'Issue fixing time', + 'Action panel': 'Action panel', + 'to my open requests': 'to my open requests', + 'Once the request is selected, the provider will be invited to see the request.': 'Once the request is selected, the provider will be invited to see the request.', + 'Issuer': 'Issuer', + 'Request': 'Request', + 'Score': 'Score', + 'Propose': 'Propose', + 'Preview': 'Preview', + 'Download': 'Download', + 'Total payment': 'Total payment', + 'Your proposal has been submitted!': 'Your proposal has been submitted!', + 'You can check the status of proposals in': 'You can check the status of proposals in', + 'My work.': 'My work.', + 'Copy from existing proposals': 'Copy from existing proposals', + 'Copy': 'Copy', + 'Apply proposal template': 'Apply proposal template', + 'Proposal': 'Proposal', + 'Milestones': 'Milestones', + 'Notes': 'Notes', + 'Add Milestones': 'Add Milestones', + 'Total milestones': 'Total milestones', + 'Total duration': 'Total duration', + 'Upload file': 'Upload file', + 'Back': 'Back', + 'Issue Request': 'Issue Request', + 'pm-1': 'This is the second item\'s accordion body.', + 'pm-2': 'It is hidden by default, until the collapse plugin adds the appropriate classes that we use to style each element. These classes control the overall appearance, as well as the showing and hiding via CSS transitions. You can modify any of this with custom CSS or overriding our default variables. It\'s also worth noting that just about any HTML can go within the ', + 'pm-3': '.accordion-body', + 'pm-4': ', though the transition does limit overflow.', + 'Copy from existing request': 'Copy from existing request', + 'Apply request template': 'Apply request template', + '(Re)Submit': '(Re)Submit', + 'The request has been submitted!': 'The request has been submitted!', + 'You can find it in': 'You can find it in', + 'Review your request and the associated proposals': 'Review your request and the associated proposals', + 'Title': 'Title', + 'Action': 'Action', + 'Proposed by': 'Proposed by', + 'Price': 'Price', + 'Reject': 'Reject', + 'Accept': 'Accept', + 'Please review the following critical information': 'Please review the following critical information', + 'Payment plan proposed by the service provider': 'Payment plan proposed by the service provider', + 'Execution plan proposed by the service provider': 'Execution plan proposed by the service provider', + 'Proceed to workspace': 'Proceed to workspace', + } diff --git a/frontend/src/pages/public/About.vue b/frontend/src/pages/public/About.vue index 2f11eae..f8ccdef 100644 --- a/frontend/src/pages/public/About.vue +++ b/frontend/src/pages/public/About.vue @@ -9,7 +9,7 @@

{{ directory.title_text }}

{{ directory.summary_text }}

- + diff --git a/frontend/src/pages/user/account/UserHistory.vue b/frontend/src/pages/user/account/UserHistory.vue index a7a3873..1367f73 100644 --- a/frontend/src/pages/user/account/UserHistory.vue +++ b/frontend/src/pages/user/account/UserHistory.vue @@ -15,23 +15,23 @@
- +

2000USD

- +

2000USD

- +

2000USD

- +

2000USD

- +

2000USD

@@ -62,15 +62,15 @@
- +

Need a python programmer

- +

2000USD

- +

2023-10-19

@@ -99,15 +99,15 @@
- +

Need a python programmer

- +

2000USD

- +

2023-10-19

@@ -138,15 +138,15 @@
- +

Need a python programmer

- +

2000USD

- +

2023-10-19

@@ -162,15 +162,15 @@
- +

Need a python programmer

- +

2000USD

- +

2023-10-19

diff --git a/frontend/src/pages/user/account/UserProfile.vue b/frontend/src/pages/user/account/UserProfile.vue index 463863a..0c466bc 100644 --- a/frontend/src/pages/user/account/UserProfile.vue +++ b/frontend/src/pages/user/account/UserProfile.vue @@ -3,7 +3,7 @@
- + !
@@ -15,7 +15,7 @@ aria-controls="collapse-user-id" >
- + {{ userProfile.account.basic.FLID.identity }} @@ -29,7 +29,7 @@ aria-controls="collapse-password" >
- + ********
@@ -41,7 +41,7 @@ aria-controls="collapse-user-email" >
- + {{ userProfile.account.basic.email.address }} @@ -55,7 +55,7 @@ aria-controls="collapse-user-mobile" >
- + {{ userProfile.account.basic.mobile.number }} @@ -231,7 +231,7 @@
- +
@@ -278,7 +278,7 @@ aria-controls="collapse-personal-user-intro" >
- + {{ userProfile.account.basic.self_intro.summary }} @@ -293,7 +293,7 @@ >
{{$t('Earning now')}} {{ userProfile.account.provider.accepting_request ? 'Yes' : 'No' }} @@ -385,7 +385,7 @@ class="btn btn-link" @click="personalOperation.self_intro.is_editing = true" > - Edit + {{$t('Edit')}}
@@ -433,9 +433,9 @@ :disabled="!paymentOperation.ready_to_receive_money" />
@@ -474,7 +474,7 @@ src="@/assets/images/qr-code.png" /> Upload QR code to receive payment{{$t('Upload QR code to receive payment')}}
- Have you linked your strip account? + {{$t('Have you linked your strip account?')}}
You are a service provider now. Please review your self-intro to reflect your skills to - deliver projects.{{$t('You are a service provider now. Please review your self-intro to reflect your skills to deliver projects.')}}
- +
@@ -660,7 +659,7 @@ aria-labelledby="offcanvas-template" >
-
Apply self-intro template
+
{{$t('Apply self-intro template')}}
diff --git a/frontend/src/pages/user/messages/Home.vue b/frontend/src/pages/user/messages/Home.vue index 55c9748..38eba70 100644 --- a/frontend/src/pages/user/messages/Home.vue +++ b/frontend/src/pages/user/messages/Home.vue @@ -35,7 +35,7 @@ v-if="!conversations || conversations.length == 0" class="conversation-list-empty-container" > - Empty conversation + {{$t('Empty conversation')}}
@@ -63,7 +63,7 @@
- Please choose conversation + {{$t('Please choose conversation')}}
diff --git a/frontend/src/pages/user/providers/Home.vue b/frontend/src/pages/user/providers/Home.vue index 5bda75a..d5b8eb2 100644 --- a/frontend/src/pages/user/providers/Home.vue +++ b/frontend/src/pages/user/providers/Home.vue @@ -21,7 +21,7 @@ user portrait
- + {{ provider.user_profile.first_name }} {{ provider.user_profile.last_name }}
{{$t('Stay on Freeleaps')}} {{ provider.activeness_achievement.days_of_staying_on }} day(s)
{{$t('Delivered projects')}} {{ provider.provider_achievement.delivered_projects }} @@ -45,7 +45,7 @@
{{$t('Responding time')}} {{ provider.provider_achievement.responding_time_in_minutes }} min(s) @@ -53,7 +53,7 @@
{{$t('Credit score')}} {{ provider.provider_achievement.credit }}
- +
- +
{{$t('Delivered projects')}} {{ provider.provider_achievement.delivered_projects }} @@ -90,7 +90,7 @@
{{$t('Project delivering time')}} {{ provider.provider_deliveries.delivering_time_per_project_in_day }} day(s) @@ -98,7 +98,7 @@
{{$t('Top programming languages')}}
{{$t('Weekly produced code')}} {{ provider.provider_deliveries.lines_of_code_per_week }} line(s) @@ -126,7 +126,7 @@
{{$t('Ongoing projects')}} {{ provider.provider_activities.ongoing_projects }} @@ -134,7 +134,7 @@
{{$t('Invitations to requests')}} {{ provider.provider_activities.invitations_to_open_requests }} @@ -142,7 +142,7 @@
{{$t('Active proposals')}} {{ provider.provider_activities.active_proposals }} @@ -150,7 +150,7 @@
{{$t('Expected hourly rate')}} {{ provider.provider_profile.expected_salary.hourly }} @@ -161,7 +161,7 @@
{{$t('Code issue rate')}} {{ provider.provider_work_quality.issues_per_thousand_lines_of_codes }} @@ -169,7 +169,7 @@
{{$t('Online issue rate')}} {{ provider.provider_work_quality.issues_after_delivery_per_project }} @@ -177,7 +177,7 @@
{{$t('Issue fixing rate')}} {{ provider.provider_work_quality.issue_fixing_rate_pencentage }}% @@ -185,7 +185,7 @@
{{$t('Issue fixing time')}} {{ provider.provider_work_quality.issue_fixing_time_minutes }} min(s) @@ -205,7 +205,7 @@ aria-expanded="false" aria-controls="collapse-action-panel" > - Action panel + {{$t('Action panel')}}
diff --git a/frontend/src/pages/user/requests/Home.vue b/frontend/src/pages/user/requests/Home.vue index 7a8fe78..07c9921 100644 --- a/frontend/src/pages/user/requests/Home.vue +++ b/frontend/src/pages/user/requests/Home.vue @@ -26,7 +26,7 @@
{{$t('Issuer')}}
@@ -37,14 +37,14 @@
{{$t('Request')}}
{{ request.title }}
- On Freeleaps + {{$t('On Freeleaps')}} {{ userProfile.achievemnt.activeness.days_of_staying_on }} day(s) @@ -516,7 +515,7 @@
- Connections + {{$t('Connections')}} {{ userProfile.achievemnt.activeness.connections }} @@ -524,7 +523,7 @@
- Messages + {{$t('Messages')}} {{ userProfile.achievemnt.activeness.messages }} @@ -532,7 +531,7 @@
- Credit + {{$t('Credit')}} {{ userProfile.achievemnt.activeness.credit }} @@ -542,7 +541,7 @@
- Total spending + {{$t('Total spending')}} {{ userProfile.achievemnt.issuer.spending.total }} {{ userProfile.achievemnt.issuer.spending.currency }} @@ -551,7 +550,7 @@
- 12-month spending + {{$t('12-month spending')}} {{ userProfile.achievemnt.issuer.spending.twelve_month }} {{ userProfile.achievemnt.issuer.spending.currency }} @@ -560,7 +559,7 @@
- 3-month spending + {{$t('3-month spending')}} {{ userProfile.achievemnt.issuer.spending.three_month }} {{ userProfile.achievemnt.issuer.spending.currency }} @@ -569,7 +568,7 @@
- Deposit + {{$t('Deposit')}} {{ userProfile.achievemnt.issuer.deposit.available }} {{ userProfile.achievemnt.issuer.deposit.currency }} @@ -580,7 +579,7 @@
- Posted + {{$t('Posted')}} {{ userProfile.achievemnt.issuer.request.issued }} @@ -588,7 +587,7 @@
- Accomplished + {{$t('Accomplished')}} {{ userProfile.achievemnt.issuer.request.accomplished }} @@ -596,7 +595,7 @@
- Active + {{$t('Active')}} {{ userProfile.achievemnt.issuer.request.active }} @@ -604,7 +603,7 @@
- Ongoing + {{$t('Ongoing')}} {{ userProfile.achievemnt.issuer.request.ongoing }} @@ -614,7 +613,7 @@
- Total earning + {{$t('Total earning')}} {{ userProfile.achievemnt.provider.earnings.total }} {{ userProfile.achievemnt.provider.earnings.currency }} @@ -623,7 +622,7 @@
- 12-month earning + {{$t('12-month earning')}} {{ userProfile.achievemnt.provider.earnings.twelve_month }} {{ userProfile.achievemnt.provider.earnings.currency }} @@ -632,7 +631,7 @@
- Delivered + {{$t('Delivered')}} {{ userProfile.achievemnt.provider.deliveries.delivered_projects }} @@ -640,12 +639,12 @@
- Delivering time + {{$t('Delivering time')}} {{ userProfile.achievemnt.provider.deliveries.delivering_time_per_project_in_day }} - days + {{$t('days')}}