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

Merge branch 'main' of https://freeleaps.com:3443/products/freeleaps into main

Browse Source 
* 'main' of https://freeleaps.com:3443/products/freeleaps:
  Add more translation fix for milestone status
  Fix english name for my work, job, workers, post a job

# Conflicts:
#	frontend/src/headers/HeaderUser.vue
#	frontend/src/lang/en.js
#	frontend/src/lang/zh.js
#	frontend/src/pages/user/workspace/Home.vue
This commit is contained in:
min.jiang 2024-07-18 20:20:34 +08:00
commit c10f5b5565
4 changed files with 130 additions and 250 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
frontend/src/headers/HeaderUser.vue
View File

@ -2,51 +2,34 @@
<template> <template>
<div class="header-container"> <div class="header-container">
<div class="header-content"> <div class="header-content">
<div <div class="information-bar" @click="gotoMessages"
class="information-bar" :class="{ active: activePath == 'message', unread: unreadConversationCount > 0 }">
@click="gotoMessages"
:class="{ active: activePath == 'message', unread: unreadConversationCount > 0 }"
>
<img alt="freeleaps logo" src="@/assets/message.png" /> <img alt="freeleaps logo" src="@/assets/message.png" />
</div> </div>
<div class="navigation-container" role="navigation"> <div class="navigation-container" role="navigation">
<button <button class="navigation-item" @click="gotoWorkspace"
class="navigation-item" :class="{ 'active': activePath == 'Workspace', 'badge': unreadWorkspace }">
@click="gotoWorkspace"
:class="{'active': activePath == 'Workspace', 'badge': unreadWorkspace}"
>
<svg-icon icon="workspace" class-name="icon" /> <svg-icon icon="workspace" class-name="icon" />
{{ $t('Workspace') }} {{ $t('My Work') }}
<div v-if="unreadWorkspace" class="navigation-item-tip"> <div v-if="unreadWorkspace" class="navigation-item-tip">
{{ $t('Some update in your work') }} {{ $t('Some update in your work') }}
</div> </div>
</button> </button>
<button <button class="navigation-item" @click="gotoRequests"
class="navigation-item" :class="{ 'active': activePath == 'Requests', 'badge': unreadRequest }">
@click="gotoRequests"
:class="{'active': activePath == 'Requests', 'badge': unreadRequest}"
>
<svg-icon icon="requests" class-name="icon" /> <svg-icon icon="requests" class-name="icon" />
{{ $t('Requests') }} {{ $t('Jobs') }}
<div v-if="unreadRequest" class="navigation-item-tip"> <div v-if="unreadRequest" class="navigation-item-tip">
{{ $t('Some update in your request') }} {{ $t('Some update in your request') }}
</div> </div>
</button> </button>
<button <button class="navigation-item" @click="gotoProviders" :class="activePath == 'Providers' ? 'active' : ''">
class="navigation-item"
@click="gotoProviders"
:class="activePath == 'Providers' ? 'active' : ''"
>
<svg-icon icon="providers" class-name="icon" /> <svg-icon icon="providers" class-name="icon" />
{{ $t('Providers') }} {{ $t('Workers') }}
</button> </button>
<button <button class="navigation-item" @click="gotoIssueRequest" :class="activePath == 'Post' ? 'active' : ''">
class="navigation-item"
@click="gotoIssueRequest"
:class="activePath == 'Post' ? 'active' : ''"
>
<svg-icon icon="post" class-name="icon" /> <svg-icon icon="post" class-name="icon" />
{{ $t('Post') }} {{ $t('Post a Job') }}
</button> </button>
<div class="form-check form-switch header-switch-container" @click="gotoProfile"> <div class="form-check form-switch header-switch-container" @click="gotoProfile">
<input <input
@ -197,6 +180,7 @@ export default {
.laguage-switch { .laguage-switch {
margin-left: 30px; margin-left: 30px;
} }
.header-container { .header-container {
width: 100%; width: 100%;
height: 100%; height: 100%;
@ -296,6 +280,7 @@ export default {
&:hover { &:hover {
color: $primary; color: $primary;
.navigation-item-tip { .navigation-item-tip {
display: block; display: block;
} }

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

@ -182,10 +182,10 @@ export default {
'Execution plan proposed by the service provider', 'Execution plan proposed by the service provider',
'Proceed to workspace': 'Proceed to workspace', 'Proceed to workspace': 'Proceed to workspace',
Workspace: 'Workspace', 'My Work': 'My Work',
Requests: 'Requests', Jobs: 'Jobs',
Providers: 'Providers', Workers: 'Workers',
Post: 'Post', 'Post a Job': 'Post a Job',
'Providing service': 'Providing service', 'Providing service': 'Providing service',
'Please go to profile page to add money receiving method': 'Please go to profile page to add money receiving method':
'Please go to profile page to add money receiving method', 'Please go to profile page to add money receiving method',
@ -208,5 +208,7 @@ export default {
'Some update in your request': 'Some update in your request', 'Some update in your request': 'Some update in your request',
'min(s)': 'min(s)', 'min(s)': 'min(s)',
'line(s)': 'line(s)', 'line(s)': 'line(s)',
'Issues management': 'Issues management' 'Issues management': 'Issues management',
'Payment progress': 'Payment progress',
'Goal': 'Goal',
} }

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

@ -4,7 +4,7 @@ export default {
Blogs: '日志博客', Blogs: '日志博客',
Career: '工作机会', Career: '工作机会',
Summary: '总结', Summary: '总结',
Status: '状态', Status: '进展状况',
Date: '日期', Date: '日期',
withdraw: '撤销', withdraw: '撤销',
edit: '编辑', edit: '编辑',
@ -21,7 +21,7 @@ export default {
'Input E-mail to invite other': '输入电子邮件邀请他人', 'Input E-mail to invite other': '输入电子邮件邀请他人',
Submit: '提交', Submit: '提交',
Progress: '进程', Progress: '进程',
milestones: '里程碑', 'Milestone(s)': '里程碑',
Paid: '已付', Paid: '已付',
Milestone: '里程碑', Milestone: '里程碑',
Description: '描述', Description: '描述',
@ -168,7 +168,8 @@ export default {
'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: '待办操作',
Proposals: '提议数',
'Proposed by': '提议来自', 'Proposed by': '提议来自',
Price: '价格', Price: '价格',
Reject: '拒绝', Reject: '拒绝',
@ -177,10 +178,10 @@ export default {
'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': '进入到我的工作',
Workspace: '推进中', 'My Work': '推进中',
Requests: '找活干', Jobs: '找活干',
Providers: '招人工', Workers: '招人工',
Post: '发需求', 'Post a Job': '发需求',
History: '历史记录', History: '历史记录',
'Providing service': '提供服务中', 'Providing service': '提供服务中',
'Please go to profile page to add money receiving method': '请于个人资料页添加收款方式', 'Please go to profile page to add money receiving method': '请于个人资料页添加收款方式',
@ -190,5 +191,7 @@ export default {
'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': '付款进度',
'Goal': '项目目标',
} }

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

@ -2,22 +2,13 @@
<div class="workspace-container"> <div class="workspace-container">
<!-- <div class="workspace-header"></div> --> <!-- <div class="workspace-header"></div> -->
<div class="workspace-body"> <div class="workspace-body">
<div <div class="accordion accordion-list" v-for="(project, project_index) in projects" :key="project_index"
class="accordion accordion-list" :id="project.id">
v-for="(project, project_index) in projects"
:key="project_index"
:id="project.id"
>
<div class="accordion-item"> <div class="accordion-item">
<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-' + project_index" aria-expanded="false"
type="button" :aria-controls="'collapse-' + project_index">
data-bs-toggle="collapse"
:data-bs-target="'#collapse-' + project_index"
aria-expanded="false"
:aria-controls="'collapse-' + project_index"
>
<div class="workspace-item-bar dashed-container"> <div class="workspace-item-bar dashed-container">
<div class="workspace-item-bar-left"> <div class="workspace-item-bar-left">
<div class="project-item-title-container"> <div class="project-item-title-container">
@ -44,11 +35,7 @@
</div> </div>
</button> </button>
</h2> </h2>
<div <div :id="'collapse-' + project_index" class="accordion-collapse collapse" :data-bs-parent="'#' + project.id">
:id="'collapse-' + project_index"
class="accordion-collapse collapse"
:data-bs-parent="'#' + project.id"
>
<div class="accordion-body" v-if="isOpenRequest(project)"> <div class="accordion-body" v-if="isOpenRequest(project)">
<div class="float-action-container"> <div class="float-action-container">
<button class="request-action-withdraw" @click="withdrawAndEditRequest(project)"> <button class="request-action-withdraw" @click="withdrawAndEditRequest(project)">
@ -56,30 +43,17 @@
</button> </button>
</div> </div>
<div class="project-request-container"> <div class="project-request-container">
<div <div class="project-request-content" v-html="project.request.content" @keyup="textAreaAdjust($event)"
class="project-request-content" contenteditable="false"></div>
v-html="project.request.content"
@keyup="textAreaAdjust($event)"
contenteditable="false"
></div>
</div> </div>
<div class="project-request-proposals-container"> <div class="project-request-proposals-container">
<div <div class="accordion" v-for="(proposal, proposal_index) in project.proposals" :key="proposal_index"
class="accordion" :id="proposal.id">
v-for="(proposal, proposal_index) in project.proposals"
:key="proposal_index"
:id="proposal.id"
>
<div class="accordion-item"> <div class="accordion-item">
<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-request-proposal' + proposal_index" aria-expanded="false"
type="button" :aria-controls="'collapse-request-proposal' + proposal_index">
data-bs-toggle="collapse"
:data-bs-target="'#collapse-request-proposal' + proposal_index"
aria-expanded="false"
:aria-controls="'collapse-request-proposal' + proposal_index"
>
<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>
@ -112,23 +86,16 @@
</div> </div>
</button> </button>
</h2> </h2>
<div <div :id="'collapse-request-proposal' + proposal_index" class="accordion-collapse collapse"
:id="'collapse-request-proposal' + proposal_index" :data-bs-parent="'#' + proposal.id">
class="accordion-collapse collapse"
:data-bs-parent="'#' + proposal.id"
>
<div class="accordion-body"> <div class="accordion-body">
<div class="request-proposal-action-container"> <div class="request-proposal-action-container">
<button <button class="request-proposal-action-reject"
class="request-proposal-action-reject" @click="rejectProposal(project, proposal_index)">
@click="rejectProposal(project, proposal_index)"
>
{{ $t('reject') }} {{ $t('reject') }}
</button> </button>
<button <button class="request-proposal-action-accept"
class="request-proposal-action-accept" @click="acceptProposal(project, proposal_index)">
@click="acceptProposal(project, proposal_index)"
>
{{ $t('accept') }} {{ $t('accept') }}
</button> </button>
</div> </div>
@ -136,12 +103,9 @@
<div class="request-proposal-content" v-html="proposal.content" /> <div class="request-proposal-content" v-html="proposal.content" />
</div> </div>
<div class="request-proposal-payment-plan"> <div class="request-proposal-payment-plan">
<div <div class="request-proposal-payment-plan-stage-container"
class="request-proposal-payment-plan-stage-container" v-for="(stage, stage_index) in proposal.payment_plan.stages" :key="stage_index"
v-for="(stage, stage_index) in proposal.payment_plan.stages" :id="'payment-stage-' + stage_index">
:key="stage_index"
:id="'payment-stage-' + stage_index"
>
<div class="project-request-proposal-stage-payment-container"> <div class="project-request-proposal-stage-payment-container">
<label class="project-item-label">{{ $t('Payment') }}</label> <label class="project-item-label">{{ $t('Payment') }}</label>
<p class="project-item-text"> <p class="project-item-text">
@ -176,12 +140,9 @@
<div class="request-proposal-content" v-html="project.proposal.content" /> <div class="request-proposal-content" v-html="project.proposal.content" />
</div> </div>
<div class="request-proposal-payment-plan"> <div class="request-proposal-payment-plan">
<div <div class="request-proposal-payment-plan-stage-container"
class="request-proposal-payment-plan-stage-container" v-for="(stage, stage_index) in project.proposal.payment_plan.stages" :key="stage_index"
v-for="(stage, stage_index) in project.proposal.payment_plan.stages" :id="'payment-stage-' + stage_index">
:key="stage_index"
:id="'payment-stage-' + stage_index"
>
<div class="project-request-proposal-stage-payment-container"> <div class="project-request-proposal-stage-payment-container">
<label class="project-item-label">{{ $t('Payment') }}</label> <label class="project-item-label">{{ $t('Payment') }}</label>
<p class="project-item-text">{{ stage.amount }} {{ stage.currency }}</p> <p class="project-item-text">{{ stage.amount }} {{ stage.currency }}</p>
@ -199,40 +160,24 @@
</div> </div>
</div> </div>
<div class="project-request-container"> <div class="project-request-container">
<div <div class="project-request-content" v-html="project.request.content" @keyup="textAreaAdjust($event)"
class="project-request-content" contenteditable="false"></div>
v-html="project.request.content"
@keyup="textAreaAdjust($event)"
contenteditable="false"
></div>
</div> </div>
</div> </div>
<div class="accordion-body inline-accordion-body" v-if="isOngoingProject(project)"> <div class="accordion-body inline-accordion-body" v-if="isOngoingProject(project)">
<div class="project-invite-collaborator-containter"> <div class="project-invite-collaborator-containter">
<button <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse"
class="accordion-button collapsed" data-bs-target="#collapse-project-invite-collaborator" aria-expanded="false"
type="button" aria-controls="collapse-project-invite-collaborator">
data-bs-toggle="collapse"
data-bs-target="#collapse-project-invite-collaborator"
aria-expanded="false"
aria-controls="collapse-project-invite-collaborator"
>
<div class="project-invite-collaborator">+ {{ $t('Invite') }}</div> <div class="project-invite-collaborator">+ {{ $t('Invite') }}</div>
</button> </button>
<div <div id="collapse-project-invite-collaborator" class="accordion-collapse collapse"
id="collapse-project-invite-collaborator" data-bs-parent="#collapse-project-invite-collaborator">
class="accordion-collapse collapse"
data-bs-parent="#collapse-project-invite-collaborator"
>
<div class="project-invite-collaborator-form-container"> <div class="project-invite-collaborator-form-container">
<input <input type="text" v-model="newInviteCollaborator[project_index]"
type="text" :placeholder="$t('Input E-mail to invite other')" @keydown.enter="
v-model="newInviteCollaborator[project_index]"
:placeholder="$t('Input E-mail to invite other')"
@keydown.enter="
inviteCollaborator(project.project_id, newInviteCollaborator[project_index]) inviteCollaborator(project.project_id, newInviteCollaborator[project_index])
" " />
/>
<svg-icon icon="msg-enter" class-name="project-invite-enter" /> <svg-icon icon="msg-enter" class-name="project-invite-enter" />
</div> </div>
</div> </div>
@ -240,14 +185,9 @@
<div class="accordion" id="workspace-project-accordion"> <div class="accordion" id="workspace-project-accordion">
<div class="accordion-item"> <div class="accordion-item">
<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-project-milestone" aria-expanded="false"
type="button" aria-controls="collapse-project-milestone">
data-bs-toggle="collapse"
data-bs-target="#collapse-project-milestone"
aria-expanded="false"
aria-controls="collapse-project-milestone"
>
<div class="project-milestone-bar-container dashed-container"> <div class="project-milestone-bar-container dashed-container">
<div class="project-milestone-bar-progress"> <div class="project-milestone-bar-progress">
<label class="project-item-label">{{ $t('Progress') }}</label> <label class="project-item-label">{{ $t('Progress') }}</label>
@ -267,7 +207,7 @@
</p> </p>
</div> </div>
<div class="project-milestone-bar-paid"> <div class="project-milestone-bar-paid">
<label class="project-item-label">{{ $t('Paid') }}</label> <label class="project-item-label">{{ $t('Payment progress') }}</label>
<p class="project-item-text"> <p class="project-item-text">
{{ project.project.progress.actual_paid }} / {{ project.project.progress.actual_paid }} /
{{ project.project.progress.expected_payment }} {{ project.project.progress.expected_payment }}
@ -283,17 +223,11 @@
</div> </div>
</button> </button>
</h2> </h2>
<div <div id="collapse-project-milestone" class="accordion-collapse collapse"
id="collapse-project-milestone" data-bs-parent="#collapse-project-milestone">
class="accordion-collapse collapse"
data-bs-parent="#collapse-project-milestone"
>
<table class="project-milestones-table"> <table class="project-milestones-table">
<tbody <tbody v-for="milestone in project.project.progress.milestones" :key="milestone.index"
v-for="milestone in project.project.progress.milestones" :id="'project-milestone-' + milestone.index">
:key="milestone.index"
:id="'project-milestone-' + milestone.index"
>
<tr> <tr>
<td> <td>
<div class="project-milestones-table-content"> <div class="project-milestones-table-content">
@ -308,7 +242,7 @@
<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('Description') $t('Goal')
}}</span> }}</span>
<span class="project-milestones-table-span">{{ <span class="project-milestones-table-span">{{
milestone.description milestone.description
@ -345,14 +279,9 @@
<td> <td>
<div class="project-milestones-table-content"> <div class="project-milestones-table-content">
<span class="project-milestones-table-label">{{ $t('Action') }}</span> <span class="project-milestones-table-label">{{ $t('Action') }}</span>
<button <button class="btn btn-link" :disabled="isMilestoneActionButtonDisabled(project.project, milestone)
class="btn btn-link" " :hidden="isMilestoneActionButtonHidden(project.project, milestone)"
:disabled=" @click="handleMilestoneAction(project.project, milestone)">
isMilestoneActionButtonDisabled(project.project, milestone)
"
:hidden="isMilestoneActionButtonHidden(project.project, milestone)"
@click="handleMilestoneAction(project.project, milestone)"
>
{{ fetchMilestoneActionButtonText(project.project, milestone) }} {{ fetchMilestoneActionButtonText(project.project, milestone) }}
</button> </button>
<!-- <span class="project-milestones-table-span">{{ getDateFromFulltimeString(milestone.update_time) }}</span> --> <!-- <span class="project-milestones-table-span">{{ getDateFromFulltimeString(milestone.update_time) }}</span> -->
@ -363,10 +292,8 @@
<td colspan="6"> <td colspan="6">
<div class="project-milestones-qrcode-content"> <div class="project-milestones-qrcode-content">
<img :src="this.qrCode.imageUrl" alt="freeleaps" /> <img :src="this.qrCode.imageUrl" alt="freeleaps" />
<button <button class="project-milestones-qrcode-button"
class="project-milestones-qrcode-button" @click="handlePaymentAction(project.project, milestone)">
@click="handlePaymentAction(project.project, milestone)"
>
{{ $t('Mark As Paid') }} {{ $t('Mark As Paid') }}
</button> </button>
</div> </div>
@ -378,14 +305,9 @@
</div> </div>
<div class="accordion-item"> <div class="accordion-item">
<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-project-code" aria-expanded="false"
type="button" aria-controls="collapse-project-code">
data-bs-toggle="collapse"
data-bs-target="#collapse-project-code"
aria-expanded="false"
aria-controls="collapse-project-code"
>
<div class="project-code-bar-container dashed-container"> <div class="project-code-bar-container dashed-container">
<div class="project-code-git-status"> <div class="project-code-git-status">
<label class="project-item-label">{{ $t('Code Depot') }}</label> <label class="project-item-label">{{ $t('Code Depot') }}</label>
@ -408,22 +330,13 @@
</div> </div>
</button> </button>
</h2> </h2>
<div <div id="collapse-project-code" class="accordion-collapse collapse"
id="collapse-project-code" data-bs-parent="#collapse-project-code">
class="accordion-collapse collapse"
data-bs-parent="#collapse-project-code"
>
<div class="project-code-details-container"> <div class="project-code-details-container">
<div class="project-code-git-url-container"> <div class="project-code-git-url-container">
<button <button v-if="project.project.code?.git_url" class="project-code-copy-git-url"
v-if="project.project.code?.git_url" @click="copyCodeGit(project)" v-tooltip title="Copied" trigger="click"
class="project-code-copy-git-url" delay='{"show":"500", "hide":"100"}'>
@click="copyCodeGit(project)"
v-tooltip
title="Copied"
trigger="click"
delay='{"show":"500", "hide":"100"}'
>
{{ $t('copy git url') }} {{ $t('copy git url') }}
</button> </button>
</div> </div>
@ -439,14 +352,9 @@
</div> </div>
<div class="accordion-item"> <div class="accordion-item">
<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-project-issue" aria-expanded="false"
type="button" aria-controls="collapse-project-issue">
data-bs-toggle="collapse"
data-bs-target="#collapse-project-issue"
aria-expanded="false"
aria-controls="collapse-project-issue"
>
<div class="project-issue-bar-container dashed-container"> <div class="project-issue-bar-container dashed-container">
<div class="project-issue-open-issues"> <div class="project-issue-open-issues">
<label class="project-item-label">{{ $t('Open issues') }}</label> <label class="project-item-label">{{ $t('Open issues') }}</label>
@ -496,26 +404,20 @@
> >
<div class="project-invite-collaborator">+ {{ $t('Add Issue') }}</div> <div class="project-invite-collaborator">+ {{ $t('Add Issue') }}</div>
</button> </button>
<div <div id="collapse-project-new-issue" class="accordion-collapse collapse"
id="collapse-project-new-issue" data-bs-parent="#collapse-project-new-issue">
class="accordion-collapse collapse"
data-bs-parent="#collapse-project-new-issue"
>
<div class="project-issue-description-container"> <div class="project-issue-description-container">
<div class="project-issue-description"> <div class="project-issue-description">
<label class="project-item-label">{{ <label class="project-item-label">{{
$t('New issue description') $t('New issue description')
}}</label> }}</label>
<button <button class="project-issue-description-btn" @click="
class="project-issue-description-btn"
@click="
postNewIssue( postNewIssue(
project.request.product_id, project.request.product_id,
project.project_id, project.project_id,
newIssueDescriptions[project_index] newIssueDescriptions[project_index]
) )
" ">
>
{{ $t('Submit') }} {{ $t('Submit') }}
</button> </button>
</div> </div>
@ -532,14 +434,9 @@
> >
<div class="accordion-item"> <div class="accordion-item">
<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-project-issue-details' + issue_index" aria-expanded="false"
type="button" aria-controls="collapse-project-issue-details">
data-bs-toggle="collapse"
:data-bs-target="'#collapse-project-issue-details' + issue_index"
aria-expanded="false"
aria-controls="collapse-project-issue-details"
>
<div class="project-issue-header dashed-container"> <div class="project-issue-header dashed-container">
<div class="project-issue-title"> <div class="project-issue-title">
<label class="project-item-label">{{ $t('Issue title') }}</label> <label class="project-item-label">{{ $t('Issue title') }}</label>
@ -560,39 +457,23 @@
</div> </div>
</button> </button>
</h2> </h2>
<div <div :id="'collapse-project-issue-details' + issue_index" class="accordion-collapse collapse"
:id="'collapse-project-issue-details' + issue_index" :data-bs-parent="'#collapse-project-issue-details' + issue_index">
class="accordion-collapse collapse"
:data-bs-parent="'#collapse-project-issue-details' + issue_index"
>
<div class="project-issue-description-container"> <div class="project-issue-description-container">
<div class="project-issue-description"> <div class="project-issue-description">
<label class="project-item-label">{{ <label class="project-item-label">{{
$t('Issue description') $t('Issue description')
}}</label> }}</label>
<button <button :hidden="!showIssueActionButton(project.project, issue, 'Resolve')
:hidden=" " class="project-issue-description-btn" @click="setProjectIssueStatus(issue.id, 1)">
!showIssueActionButton(project.project, issue, 'Resolve')
"
class="project-issue-description-btn"
@click="setProjectIssueStatus(issue.id, 1)"
>
{{ $t('Resolve') }} {{ $t('Resolve') }}
</button> </button>
<button <button :hidden="!showIssueActionButton(project.project, issue, 'Confirm')
:hidden=" " class="project-issue-description-btn" @click="setProjectIssueStatus(issue.id, 2)">
!showIssueActionButton(project.project, issue, 'Confirm')
"
class="project-issue-description-btn"
@click="setProjectIssueStatus(issue.id, 2)"
>
{{ $t('Confirm') }} {{ $t('Confirm') }}
</button> </button>
<button <button :hidden="!showIssueActionButton(project.project, issue, 'Reopen')"
:hidden="!showIssueActionButton(project.project, issue, 'Reopen')" class="project-issue-description-btn" @click="setProjectIssueStatus(issue.id, 0)">
class="project-issue-description-btn"
@click="setProjectIssueStatus(issue.id, 0)"
>
{{ $t('Reopen') }} {{ $t('Reopen') }}
</button> </button>
</div> </div>
@ -1304,12 +1185,14 @@ export default {
line-height: 1; line-height: 1;
margin-bottom: 3px; margin-bottom: 3px;
} }
.project-milestones-table-span { .project-milestones-table-span {
font-size: 14px; font-size: 14px;
font-weight: bold; font-weight: bold;
color: #242424; color: #242424;
line-height: 1; line-height: 1;
} }
.btn-link { .btn-link {
padding: 0; padding: 0;
width: fit-content; width: fit-content;
@ -1349,6 +1232,7 @@ export default {
padding-left: 24px; padding-left: 24px;
} }
} }
td:last-child { td:last-child {
.project-milestones-table-content { .project-milestones-table-content {
padding-right: 24px; padding-right: 24px;
@ -1456,10 +1340,12 @@ export default {
margin-bottom: 12px; margin-bottom: 12px;
} }
} }
.project-issue-description { .project-issue-description {
display: flex; display: flex;
align-items: center; align-items: center;
margin-bottom: 12px; margin-bottom: 12px;
label { label {
flex: 1; flex: 1;
} }
@ -1533,6 +1419,7 @@ export default {
// color: $primary; // color: $primary;
// background-color: #F3F6FF; // background-color: #F3F6FF;
padding: 12px !important; padding: 12px !important;
&::after { &::after {
display: none; display: none;
} }
@ -1555,6 +1442,7 @@ export default {
border-radius: 3px; border-radius: 3px;
align-items: center; align-items: center;
border: 1px solid #e7e8eb; border: 1px solid #e7e8eb;
&:focus-within { &:focus-within {
border: 1px solid #1748f8; border: 1px solid #1748f8;
} }
@ -1566,6 +1454,7 @@ export default {
outline: none; outline: none;
box-shadow: none; box-shadow: none;
} }
.project-invite-enter { .project-invite-enter {
width: 16px; width: 16px;
height: 16px; height: 16px;
@ -1588,6 +1477,7 @@ export default {
@extend .initiate-button; @extend .initiate-button;
@extend .float-end; @extend .float-end;
} }
.chart-container { .chart-container {
width: 100%; width: 100%;
height: 357px; height: 357px;