freeleaps_product/freeleaps_frontend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update the minor UI display

Browse Source
This commit is contained in:
jetli 2024-08-08 19:56:24 +02:00
parent ea0b5e5b81
commit 9f56b63994
4 changed files with 67 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/lang/en.js
View File

@ -13,7 +13,7 @@ export default {
Duration: 'Duration', Duration: 'Duration',
days: 'days', days: 'days',
Update: 'Update', Update: 'Update',
From: 'From', "Quote From": 'From',
reject: 'reject', reject: 'reject',
accept: 'accept', accept: 'accept',
Note: 'Note', Note: 'Note',

6
frontend/src/lang/zh.js
View File

@ -13,7 +13,7 @@ export default {
Duration: '工期', Duration: '工期',
days: '天', days: '天',
Update: '更新', Update: '更新',
From: '需求方', "Quote From": '需求方',
reject: '拒绝', reject: '拒绝',
accept: '接受', accept: '接受',
Note: '标注', Note: '标注',
@ -170,7 +170,7 @@ export default {
'Review your request and the associated proposals': '核对你的请求和相关提议', 'Review your request and the associated proposals': '核对你的请求和相关提议',
Title: '标题', Title: '标题',
Action: '待办操作', Action: '待办操作',
Proposals: '提议数', Proposals: '报价数量',
'Proposed by': '提议来自', 'Proposed by': '提议来自',
Price: '价格', Price: '价格',
Reject: '拒绝', Reject: '拒绝',
@ -190,7 +190,7 @@ export default {
'day(s)': '天', 'day(s)': '天',
'Some update in your work': 'Some update in your work', 'Some update in your work': 'Some update in your work',
'Some update in your request': 'Some update in your request', 'Some update in your request': 'Some update in your request',
'min(s)': '响应时间', 'min(s)': '分钟',
'line(s)': '每周产出代码', 'line(s)': '每周产出代码',
'Issues management': '问题管理', 'Issues management': '问题管理',
'Payment progress': '付款进度', 'Payment progress': '付款进度',

165
frontend/src/pages/user/providers/Home.vue
View File

@ -1,21 +1,11 @@
<template> <template>
<div class="provider-hub-container" id="provider-accordion-container"> <div class="provider-hub-container" id="provider-accordion-container">
<template v-if="recommendedProviders"> <template v-if="recommendedProviders">
<div <div class="accordion accordion-list" v-for="(provider, index) in recommendedProviders" :key="index">
class="accordion accordion-list"
v-for="(provider, index) in recommendedProviders"
:key="index"
>
<div class="accordion-item my-3"> <div class="accordion-item my-3">
<h2 class="accordion-header"> <h2 class="accordion-header">
<button <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse"
class="accordion-button collapsed" :data-bs-target="'#collapse' + index" aria-expanded="false" :aria-controls="'collapse' + index">
type="button"
data-bs-toggle="collapse"
:data-bs-target="'#collapse' + index"
aria-expanded="false"
:aria-controls="'collapse' + index"
>
<div class="provider-summary-containter dashed-container"> <div class="provider-summary-containter dashed-container">
<div class="provider-portrait-containter"> <div class="provider-portrait-containter">
<img class="provider-portrait" alt="user portrait" src="@/assets/profile.png" /> <img class="provider-portrait" alt="user portrait" src="@/assets/profile.png" />
@ -24,26 +14,18 @@
<label class="provider-name-label" for="provider-name">{{ $t('Name') }}</label> <label class="provider-name-label" for="provider-name">{{ $t('Name') }}</label>
<span class="provider-name-span" id="provider-name"> <span class="provider-name-span" id="provider-name">
{{ provider.user_profile.first_name }} {{ provider.user_profile.first_name }}
{{ provider.user_profile.last_name }}</span {{ provider.user_profile.last_name }}</span>
>
</div> </div>
<div class="provider-stay-on-freeleaps-container"> <div class="provider-stay-on-freeleaps-container">
<label <label class="provider-stay-on-freeleaps-label" for="provider-stay-on-freeleaps">
class="provider-stay-on-freeleaps-label" {{ $t('Stay on Freeleaps') }} </label>
for="provider-stay-on-freeleaps"
>{{ $t('Stay on Freeleaps') }}</label
>
<span class="provider-stay-on-freeleaps-span" id="provider-stay-on-freeleaps"> <span class="provider-stay-on-freeleaps-span" id="provider-stay-on-freeleaps">
{{ provider.activeness_achievement.days_of_staying_on }} {{ provider.activeness_achievement.days_of_staying_on }}
{{ $t('day(s)') }}</span {{ $t('day(s)') }}</span>
>
</div> </div>
<div class="provider-delivered-projects-container"> <div class="provider-delivered-projects-container">
<label <label class="provider-delivered-projects-label" for="provider-delivered-projects">
class="provider-delivered-projects-label" {{ $t('Delivered projects') }}</label>
for="provider-delivered-projects"
>{{ $t('Delivered projects') }}</label
>
<span class="provider-delivered-projects-span" id="provider-delivered-projects"> <span class="provider-delivered-projects-span" id="provider-delivered-projects">
{{ provider.provider_achievement.delivered_projects }} {{ provider.provider_achievement.delivered_projects }}
</span> </span>
@ -51,49 +33,42 @@
<div class="provider-responding-time-container"> <div class="provider-responding-time-container">
<label class="provider-responding-time-label" for="provider-responding-time">{{ <label class="provider-responding-time-label" for="provider-responding-time">{{
$t('Responding time') $t('Responding time')
}}</label> }}</label>
<span class="provider-responding-time-span" id="provider-responding-time"> <span class="provider-responding-time-span" id="provider-responding-time">
{{ provider.provider_achievement.responding_time_in_minutes }} {{ provider.provider_achievement.activities.responding_time_in_minutes ?? 'N/A' }}
{{ $t('min(s)') }} {{ $t('min(s)') }}
</span> </span>
</div> </div>
<div class="provider-credit-score-container"> <div class="provider-credit-score-container">
<label class="provider-credit-score-label" for="provider-credit-score">{{ <label class="provider-credit-score-label" for="provider-credit-score">{{
$t('Credit score') $t('Credit score')
}}</label> }}</label>
<span class="provider-credit-score-span" id="provider-credit-score"> <span class="provider-credit-score-span" id="provider-credit-score">
{{ provider.provider_achievement.credit }}</span {{ provider.provider_achievement.credit }}</span>
>
</div> </div>
</div> </div>
</button> </button>
</h2> </h2>
<div <div :id="'collapse' + index" class="accordion-collapse collapse"
:id="'collapse' + index" data-bs-parent="#provider-accordion-container">
class="accordion-collapse collapse"
data-bs-parent="#provider-accordion-container"
>
<div class="accordion-body"> <div class="accordion-body">
<div class="self-intro-container"> <div class="self-intro-container">
<label class="self-intro-content-label" for="self-intro-content">{{ <label class="self-intro-content-label" for="self-intro-content">{{
$t('Self intro') $t('Self intro')
}}</label> }}</label>
<div <div class="self-intro-content-container" id="self-intro-content"
class="self-intro-content-container" v-html="provider.user_profile.self_intro.content_html"></div>
id="self-intro-content"
v-html="provider.user_profile.self_intro.content_html"
></div>
</div> </div>
<div class="statistics-container"> <div class="statistics-container">
<label class="self-intro-content-label" for="statistics-content">{{ <label class="self-intro-content-label" for="statistics-content">{{
$t('Profile') $t('Profile')
}}</label> }}</label>
<div class="statistics-content-container" id="statistics-content"> <div class="statistics-content-container" id="statistics-content">
<div class="delivery-container"> <div class="delivery-container">
<div class="dd-project-container"> <div class="dd-project-container">
<label class="dd-project-label" for="delivery-delivered-projects">{{ <label class="dd-project-label" for="delivery-delivered-projects">{{
$t('Delivered projects') $t('Delivered projects')
}}</label> }}</label>
<span class="dd-project-span" id="delivery-delivered-projects"> <span class="dd-project-span" id="delivery-delivered-projects">
{{ provider.provider_achievement.delivered_projects }} {{ provider.provider_achievement.delivered_projects }}
</span> </span>
@ -101,7 +76,7 @@
<div class="dd-project-container"> <div class="dd-project-container">
<label class="dd-project-label" for="delivery-time-per-project">{{ <label class="dd-project-label" for="delivery-time-per-project">{{
$t('Project delivering time') $t('Project delivering time')
}}</label> }}</label>
<span class="dd-project-span" id="delivery-time-per-project"> <span class="dd-project-span" id="delivery-time-per-project">
{{ provider.provider_deliveries.delivering_time_per_project_in_day }} {{ provider.provider_deliveries.delivering_time_per_project_in_day }}
{{ $t('day(s)') }} {{ $t('day(s)') }}
@ -110,17 +85,11 @@
<div class="dd-project-container"> <div class="dd-project-container">
<label class="dd-project-label" for="delivery-top-programming-language">{{ <label class="dd-project-label" for="delivery-top-programming-language">{{
$t('Top programming languages') $t('Top programming languages')
}}</label> }}</label>
<div <div class="delivery-top-programming-language-content-container"
class="delivery-top-programming-language-content-container" id="delivery-top-programming-language">
id="delivery-top-programming-language" <span v-for="(lang, index) in provider.provider_deliveries
> .top_programming_languages" :key="index" class="dd-project-span">
<span
v-for="(lang, index) in provider.provider_deliveries
.top_programming_languages"
:key="index"
class="dd-project-span"
>
#{{ lang }} #{{ lang }}
</span> </span>
</div> </div>
@ -128,7 +97,7 @@
<div class="dd-project-container"> <div class="dd-project-container">
<label class="dd-project-label" for="delivery-weekly-produced-code">{{ <label class="dd-project-label" for="delivery-weekly-produced-code">{{
$t('Weekly produced code') $t('Weekly produced code')
}}</label> }}</label>
<span class="dd-project-span" id="delivery-weekly-produced-code"> <span class="dd-project-span" id="delivery-weekly-produced-code">
{{ provider.provider_deliveries.lines_of_code_per_week }} {{ provider.provider_deliveries.lines_of_code_per_week }}
{{ $t('line(s)') }} {{ $t('line(s)') }}
@ -139,7 +108,7 @@
<div class="dd-project-container"> <div class="dd-project-container">
<label class="dd-project-label" for="activity-ongoing-projects">{{ <label class="dd-project-label" for="activity-ongoing-projects">{{
$t('Ongoing projects') $t('Ongoing projects')
}}</label> }}</label>
<span class="dd-project-span" id="activity-ongoing-projects"> <span class="dd-project-span" id="activity-ongoing-projects">
{{ provider.provider_activities.ongoing_projects }} {{ provider.provider_activities.ongoing_projects }}
</span> </span>
@ -147,7 +116,7 @@
<div class="dd-project-container"> <div class="dd-project-container">
<label class="dd-project-label" for="activity-invitation-to-requests">{{ <label class="dd-project-label" for="activity-invitation-to-requests">{{
$t('Invitations to requests') $t('Invitations to requests')
}}</label> }}</label>
<span class="dd-project-span" id="activity-invitation-to-requests"> <span class="dd-project-span" id="activity-invitation-to-requests">
{{ provider.provider_activities.invitations_to_open_requests }} {{ provider.provider_activities.invitations_to_open_requests }}
</span> </span>
@ -155,7 +124,7 @@
<div class="dd-project-container"> <div class="dd-project-container">
<label class="dd-project-label" for="activity-active-proposals">{{ <label class="dd-project-label" for="activity-active-proposals">{{
$t('Active proposals') $t('Active proposals')
}}</label> }}</label>
<span class="dd-project-span" id="activity-active-proposals"> <span class="dd-project-span" id="activity-active-proposals">
{{ provider.provider_activities.active_proposals }} {{ provider.provider_activities.active_proposals }}
</span> </span>
@ -163,7 +132,7 @@
<div class="dd-project-container"> <div class="dd-project-container">
<label class="dd-project-label" for="activity-hourly-rate">{{ <label class="dd-project-label" for="activity-hourly-rate">{{
$t('Expected hourly rate') $t('Expected hourly rate')
}}</label> }}</label>
<span class="dd-project-span" id="activity-hourly-rate"> <span class="dd-project-span" id="activity-hourly-rate">
{{ provider.provider_profile.expected_salary.hourly }} {{ provider.provider_profile.expected_salary.hourly }}
{{ provider.provider_profile.expected_salary.currency }} {{ provider.provider_profile.expected_salary.currency }}
@ -174,7 +143,7 @@
<div class="dd-project-container"> <div class="dd-project-container">
<label class="dd-project-label" for="quality-issue-rate">{{ <label class="dd-project-label" for="quality-issue-rate">{{
$t('Code issue rate') $t('Code issue rate')
}}</label> }}</label>
<span class="dd-project-span" id="quality-issue-rate"> <span class="dd-project-span" id="quality-issue-rate">
{{ provider.provider_work_quality.issues_per_thousand_lines_of_codes }} {{ provider.provider_work_quality.issues_per_thousand_lines_of_codes }}
</span> </span>
@ -182,7 +151,7 @@
<div class="dd-project-container"> <div class="dd-project-container">
<label class="dd-project-label" for="quality-online-issue-rate">{{ <label class="dd-project-label" for="quality-online-issue-rate">{{
$t('Online issue rate') $t('Online issue rate')
}}</label> }}</label>
<span class="dd-project-span" id="quality-online-issue-rate"> <span class="dd-project-span" id="quality-online-issue-rate">
{{ provider.provider_work_quality.issues_after_delivery_per_project }} {{ provider.provider_work_quality.issues_after_delivery_per_project }}
</span> </span>
@ -190,7 +159,7 @@
<div class="dd-project-container"> <div class="dd-project-container">
<label class="dd-project-label" for="quality-issue-fixing-rate">{{ <label class="dd-project-label" for="quality-issue-fixing-rate">{{
$t('Issue fixing rate') $t('Issue fixing rate')
}}</label> }}</label>
<span class="dd-project-span" id="quality-issue-fixing-rate"> <span class="dd-project-span" id="quality-issue-fixing-rate">
{{ provider.provider_work_quality.issue_fixing_rate_pencentage }}% {{ provider.provider_work_quality.issue_fixing_rate_pencentage }}%
</span> </span>
@ -198,7 +167,7 @@
<div class="dd-project-container"> <div class="dd-project-container">
<label class="dd-project-label" for="quality-issue-fixing-time">{{ <label class="dd-project-label" for="quality-issue-fixing-time">{{
$t('Issue fixing time') $t('Issue fixing time')
}}</label> }}</label>
<span class="dd-project-span" id="quality-issue-fixing-time"> <span class="dd-project-span" id="quality-issue-fixing-time">
{{ provider.provider_work_quality.issue_fixing_time_minutes }} {{ provider.provider_work_quality.issue_fixing_time_minutes }}
{{ $t('min(s)') }} {{ $t('min(s)') }}
@ -210,60 +179,36 @@
<div v-if="requests" class="accordion" id="accordion-action-panel"> <div v-if="requests" class="accordion" id="accordion-action-panel">
<div class="accordion-item"> <div class="accordion-item">
<h2 class="accordion-header"> <h2 class="accordion-header">
<button <button class="accordion-button" type="button" data-bs-toggle="collapse"
class="accordion-button" data-bs-target="#collapse-action-panel" aria-expanded="false"
type="button" aria-controls="collapse-action-panel">
data-bs-toggle="collapse"
data-bs-target="#collapse-action-panel"
aria-expanded="false"
aria-controls="collapse-action-panel"
>
{{ $t('Action panel') }} {{ $t('Action panel') }}
</button> </button>
</h2> </h2>
<div <div id="collapse-action-panel" class="accordion-collapse collapse"
id="collapse-action-panel" data-bs-parent="#accordion-action-panel">
class="accordion-collapse collapse"
data-bs-parent="#accordion-action-panel"
>
<div class="accordion-body"> <div class="accordion-body">
<div class="invite-to-request-container"> <div class="invite-to-request-container">
<label <label class="invite-to-request-content-label" for="invite-to-request-content">{{ $t('Invite')
class="invite-to-request-content-label" }}
for="invite-to-request-content" <span class="invite-to-request-name-span">{{ provider.user_profile.first_name }}
>{{ $t('Invite') }} {{ provider.user_profile.last_name }}</span>
<span class="invite-to-request-name-span" {{ $t('to my open requests') }}</label>
>{{ provider.user_profile.first_name }} <div class="invite-to-request-content-container" id="invite-to-request-content">
{{ provider.user_profile.last_name }}</span
>
{{ $t('to my open requests') }}</label
>
<div
class="invite-to-request-content-container"
id="invite-to-request-content"
>
<div class="form-check" v-for="(request, index) in requests" :key="index"> <div class="form-check" v-for="(request, index) in requests" :key="index">
<input <input class="form-check-input" type="checkbox" :value="request.id"
class="form-check-input" :id="'check' + request.id" v-model="checkedRequests" @change="
type="checkbox"
:value="request.id"
:id="'check' + request.id"
v-model="checkedRequests"
@change="
checkRequest($event, request.id, provider.user_profile.user_id) checkRequest($event, request.id, provider.user_profile.user_id)
" " />
/>
<label class="form-check-label" :for="'check' + request.id">{{ <label class="form-check-label" :for="'check' + request.id">{{
request.title request.title
}}</label> }}</label>
</div> </div>
<span class="invite-to-request-note-text" <span class="invite-to-request-note-text">*{{
>*{{ $t(
$t( '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.' )
) }}</span>
}}</span
>
</div> </div>
</div> </div>
</div> </div>

16
frontend/src/pages/user/workspace/Home.vue
View File

@ -57,7 +57,7 @@
<div class="project-request-proposal-bar-container"> <div class="project-request-proposal-bar-container">
<div class="project-request-proposal-quote-container"> <div class="project-request-proposal-quote-container">
<label class="project-item-label">{{ $t('Quote') }}</label> <label class="project-item-label">{{ $t('Quote') }}</label>
<p class="project-item-text">{{ proposal.price_in_usd }} USD</p> <p class="project-item-text">{{ proposal.total_amount }} {{ proposal.currency }}</p>
</div> </div>
<div class="project-request-proposal-payment-type-container"> <div class="project-request-proposal-payment-type-container">
<label class="project-item-label">{{ $t('Payment') }}</label> <label class="project-item-label">{{ $t('Payment') }}</label>
@ -78,7 +78,7 @@
</p> </p>
</div> </div>
<div class="project-request-proposal-from-container"> <div class="project-request-proposal-from-container">
<label class="project-item-label">{{ $t('From') }}</label> <label class="project-item-label">{{ $t('Quote From') }}</label>
<p class="project-item-text"> <p class="project-item-text">
{{ proposal.proposer.first_name }} {{ proposal.proposer.last_name }} {{ proposal.proposer.first_name }} {{ proposal.proposer.last_name }}
</p> </p>
@ -233,10 +233,10 @@
<div class="project-milestones-table-content"> <div class="project-milestones-table-content">
<span class="project-milestones-table-label">{{ <span class="project-milestones-table-label">{{
$t('Milestone') $t('Milestone')
}}</span> }}</span>
<span class="project-milestones-table-span">{{ <span class="project-milestones-table-span">{{
milestone.index milestone.index
}}</span> }}</span>
</div> </div>
</td> </td>
<td> <td>
@ -244,7 +244,7 @@
<span class="project-milestones-table-label">{{ $t('Goal') }}</span> <span class="project-milestones-table-label">{{ $t('Goal') }}</span>
<span class="project-milestones-table-span">{{ <span class="project-milestones-table-span">{{
milestone.description milestone.description
}}</span> }}</span>
</div> </div>
</td> </td>
<td> <td>
@ -252,14 +252,14 @@
<span class="project-milestones-table-label">{{ $t('Status') }}</span> <span class="project-milestones-table-label">{{ $t('Status') }}</span>
<span class="project-milestones-table-span">{{ <span class="project-milestones-table-span">{{
fromIntToMilestoneStatus(milestone.status) fromIntToMilestoneStatus(milestone.status)
}}</span> }}</span>
</div> </div>
</td> </td>
<td> <td>
<div class="project-milestones-table-content"> <div class="project-milestones-table-content">
<span class="project-milestones-table-label">{{ <span class="project-milestones-table-label">{{
$t('Payment') $t('Payment')
}}</span> }}</span>
<span class="project-milestones-table-span"> <span class="project-milestones-table-span">
{{ milestone.actual_paid }} / {{ milestone.expected_payment }} {{ milestone.actual_paid }} / {{ milestone.expected_payment }}
{{ project.project.progress.payment_currency }} {{ project.project.progress.payment_currency }}
@ -271,7 +271,7 @@
<span class="project-milestones-table-label">{{ $t('Update') }}</span> <span class="project-milestones-table-label">{{ $t('Update') }}</span>
<span class="project-milestones-table-span">{{ <span class="project-milestones-table-span">{{
getDateFromFulltimeString(milestone.update_time) getDateFromFulltimeString(milestone.update_time)
}}</span> }}</span>
</div> </div>
</td> </td>
<td> <td>