Merge branch 'main' of https://freeleaps.com:3443/products/freeleaps into main
* 'main' of https://freeleaps.com:3443/products/freeleaps: Add issuer information update:bug fix update: 初始化聊天列表 update Pull from origin gitea add more args in docker file
This commit is contained in:
min.jiang
commit
bd704a4691
@ -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;"]
|
||||
@ -2,22 +2,13 @@
|
||||
<empty-content :loading="loading" :empty="projects?.length === 0" />
|
||||
<div v-if="projects && projects.length > 0" class="workspace-container">
|
||||
<div class="workspace-body">
|
||||
<div
|
||||
class="accordion accordion-list"
|
||||
v-for="(project, project_index) in projects"
|
||||
:key="project_index"
|
||||
:id="project.id"
|
||||
>
|
||||
<div class="accordion accordion-list" v-for="(project, project_index) in projects" :key="project_index"
|
||||
:id="project.id">
|
||||
<div class="accordion-item">
|
||||
<h2 class="accordion-header">
|
||||
<button
|
||||
class="accordion-button collapsed"
|
||||
type="button"
|
||||
data-bs-toggle="collapse"
|
||||
:data-bs-target="'#collapse-' + project_index"
|
||||
aria-expanded="false"
|
||||
:aria-controls="'collapse-' + project_index"
|
||||
>
|
||||
<button class="accordion-button collapsed" type="button" 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-left">
|
||||
<div class="project-item-title-container">
|
||||
@ -37,8 +28,9 @@
|
||||
</div>
|
||||
<div class="workspace-item-bar-right">
|
||||
<div class="project-item-inform-container">
|
||||
<label class="project-item-label">{{ $t('Quote From') }}</label>
|
||||
<p class="project-item-text">{{ project?.proposal?.proposer?.first_name }} {{ project?.proposal?.proposer?.last_name }}</p>
|
||||
<label class="project-item-label">{{ $t('Issuer') }}</label>
|
||||
<p class="project-item-text">{{ project?.issuer?.first_name }}
|
||||
{{ project?.issuer?.last_name }}</p>
|
||||
</div>
|
||||
</div>
|
||||
<!-- <div class="workspace-item-bar-right">
|
||||
@ -50,11 +42,7 @@
|
||||
</div>
|
||||
</button>
|
||||
</h2>
|
||||
<div
|
||||
:id="'collapse-' + project_index"
|
||||
class="accordion-collapse collapse"
|
||||
:data-bs-parent="'#' + project.id"
|
||||
>
|
||||
<div :id="'collapse-' + project_index" class="accordion-collapse collapse" :data-bs-parent="'#' + project.id">
|
||||
<div class="accordion-body" v-if="isOpenRequest(project)">
|
||||
<div class="float-action-container">
|
||||
<button class="request-action-withdraw" @click="withdrawAndEditRequest(project)">
|
||||
@ -62,30 +50,17 @@
|
||||
</button>
|
||||
</div>
|
||||
<div class="project-request-container">
|
||||
<div
|
||||
class="project-request-content"
|
||||
v-html="project.request.content"
|
||||
@keyup="textAreaAdjust($event)"
|
||||
contenteditable="false"
|
||||
></div>
|
||||
<div class="project-request-content" v-html="project.request.content" @keyup="textAreaAdjust($event)"
|
||||
contenteditable="false"></div>
|
||||
</div>
|
||||
<div class="project-request-proposals-container">
|
||||
<div
|
||||
class="accordion"
|
||||
v-for="(proposal, proposal_index) in project.proposals"
|
||||
:key="proposal_index"
|
||||
:id="proposal.id"
|
||||
>
|
||||
<div class="accordion" v-for="(proposal, proposal_index) in project.proposals" :key="proposal_index"
|
||||
:id="proposal.id">
|
||||
<div class="accordion-item">
|
||||
<h2 class="accordion-header">
|
||||
<button
|
||||
class="accordion-button collapsed"
|
||||
type="button"
|
||||
data-bs-toggle="collapse"
|
||||
:data-bs-target="'#collapse-request-proposal' + proposal_index"
|
||||
aria-expanded="false"
|
||||
:aria-controls="'collapse-request-proposal' + proposal_index"
|
||||
>
|
||||
<button class="accordion-button collapsed" type="button" 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-quote-container">
|
||||
<label class="project-item-label">{{ $t('Quote') }}</label>
|
||||
@ -120,23 +95,16 @@
|
||||
</div>
|
||||
</button>
|
||||
</h2>
|
||||
<div
|
||||
:id="'collapse-request-proposal' + proposal_index"
|
||||
class="accordion-collapse collapse"
|
||||
:data-bs-parent="'#' + proposal.id"
|
||||
>
|
||||
<div :id="'collapse-request-proposal' + proposal_index" class="accordion-collapse collapse"
|
||||
:data-bs-parent="'#' + proposal.id">
|
||||
<div class="accordion-body">
|
||||
<div class="request-proposal-action-container">
|
||||
<button
|
||||
class="request-proposal-action-reject"
|
||||
@click="rejectProposal(project, proposal_index)"
|
||||
>
|
||||
<button class="request-proposal-action-reject"
|
||||
@click="rejectProposal(project, proposal_index)">
|
||||
{{ $t('reject') }}
|
||||
</button>
|
||||
<button
|
||||
class="request-proposal-action-accept"
|
||||
@click="acceptProposal(project, proposal_index)"
|
||||
>
|
||||
<button class="request-proposal-action-accept"
|
||||
@click="acceptProposal(project, proposal_index)">
|
||||
{{ $t('accept') }}
|
||||
</button>
|
||||
</div>
|
||||
@ -144,12 +112,9 @@
|
||||
<div class="request-proposal-content" v-html="proposal.content" />
|
||||
</div>
|
||||
<div class="request-proposal-payment-plan">
|
||||
<div
|
||||
class="request-proposal-payment-plan-stage-container"
|
||||
v-for="(stage, stage_index) in proposal.payment_plan.stages"
|
||||
:key="stage_index"
|
||||
:id="'payment-stage-' + stage_index"
|
||||
>
|
||||
<div class="request-proposal-payment-plan-stage-container"
|
||||
v-for="(stage, stage_index) in proposal.payment_plan.stages" :key="stage_index"
|
||||
:id="'payment-stage-' + stage_index">
|
||||
<div class="project-request-proposal-stage-payment-container">
|
||||
<label class="project-item-label">{{ $t('Payment') }}</label>
|
||||
<p class="project-item-text">
|
||||
@ -184,12 +149,9 @@
|
||||
<div class="request-proposal-content" v-html="project.proposal.content" />
|
||||
</div>
|
||||
<div class="request-proposal-payment-plan">
|
||||
<div
|
||||
class="request-proposal-payment-plan-stage-container"
|
||||
v-for="(stage, stage_index) in project.proposal.payment_plan.stages"
|
||||
:key="stage_index"
|
||||
:id="'payment-stage-' + stage_index"
|
||||
>
|
||||
<div class="request-proposal-payment-plan-stage-container"
|
||||
v-for="(stage, stage_index) in project.proposal.payment_plan.stages" :key="stage_index"
|
||||
:id="'payment-stage-' + stage_index">
|
||||
<div class="project-request-proposal-stage-payment-container">
|
||||
<label class="project-item-label">{{ $t('Payment') }}</label>
|
||||
<p class="project-item-text">{{ stage.amount }} {{ stage.currency }}</p>
|
||||
@ -207,40 +169,24 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="project-request-container">
|
||||
<div
|
||||
class="project-request-content"
|
||||
v-html="project.request.content"
|
||||
@keyup="textAreaAdjust($event)"
|
||||
contenteditable="false"
|
||||
></div>
|
||||
<div class="project-request-content" v-html="project.request.content" @keyup="textAreaAdjust($event)"
|
||||
contenteditable="false"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="accordion-body inline-accordion-body" v-if="isOngoingProject(project)">
|
||||
<div class="project-invite-collaborator-containter">
|
||||
<button
|
||||
class="accordion-button collapsed"
|
||||
type="button"
|
||||
data-bs-toggle="collapse"
|
||||
data-bs-target="#collapse-project-invite-collaborator"
|
||||
aria-expanded="false"
|
||||
aria-controls="collapse-project-invite-collaborator"
|
||||
>
|
||||
<button class="accordion-button collapsed" type="button" 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>
|
||||
</button>
|
||||
<div
|
||||
id="collapse-project-invite-collaborator"
|
||||
class="accordion-collapse collapse"
|
||||
data-bs-parent="#collapse-project-invite-collaborator"
|
||||
>
|
||||
<div id="collapse-project-invite-collaborator" class="accordion-collapse collapse"
|
||||
data-bs-parent="#collapse-project-invite-collaborator">
|
||||
<div class="project-invite-collaborator-form-container">
|
||||
<input
|
||||
type="text"
|
||||
v-model="newInviteCollaborator[project_index]"
|
||||
:placeholder="$t('Input E-mail to invite other')"
|
||||
@keydown.enter="
|
||||
<input type="text" v-model="newInviteCollaborator[project_index]"
|
||||
:placeholder="$t('Input E-mail to invite other')" @keydown.enter="
|
||||
inviteCollaborator(project.project_id, newInviteCollaborator[project_index])
|
||||
"
|
||||
/>
|
||||
" />
|
||||
<svg-icon icon="msg-enter" class-name="project-invite-enter" />
|
||||
</div>
|
||||
</div>
|
||||
@ -248,14 +194,9 @@
|
||||
<div class="accordion" id="workspace-project-accordion">
|
||||
<div class="accordion-item">
|
||||
<h2 class="accordion-header">
|
||||
<button
|
||||
class="accordion-button collapsed"
|
||||
type="button"
|
||||
data-bs-toggle="collapse"
|
||||
data-bs-target="#collapse-project-milestone"
|
||||
aria-expanded="false"
|
||||
aria-controls="collapse-project-milestone"
|
||||
>
|
||||
<button class="accordion-button collapsed" type="button" 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-progress">
|
||||
<label class="project-item-label">{{ $t('Progress') }}</label>
|
||||
@ -291,26 +232,20 @@
|
||||
</div>
|
||||
</button>
|
||||
</h2>
|
||||
<div
|
||||
id="collapse-project-milestone"
|
||||
class="accordion-collapse collapse"
|
||||
data-bs-parent="#collapse-project-milestone"
|
||||
>
|
||||
<div id="collapse-project-milestone" class="accordion-collapse collapse"
|
||||
data-bs-parent="#collapse-project-milestone">
|
||||
<table class="project-milestones-table">
|
||||
<tbody
|
||||
v-for="milestone in project.project.progress.milestones"
|
||||
:key="milestone.index"
|
||||
:id="'project-milestone-' + milestone.index"
|
||||
>
|
||||
<tbody v-for="milestone in project.project.progress.milestones" :key="milestone.index"
|
||||
:id="'project-milestone-' + milestone.index">
|
||||
<tr>
|
||||
<td>
|
||||
<div class="project-milestones-table-content">
|
||||
<span class="project-milestones-table-label">{{
|
||||
$t('Milestone')
|
||||
}}</span>
|
||||
}}</span>
|
||||
<span class="project-milestones-table-span">{{
|
||||
milestone.index
|
||||
}}</span>
|
||||
}}</span>
|
||||
</div>
|
||||
</td>
|
||||
<td>
|
||||
@ -318,7 +253,7 @@
|
||||
<span class="project-milestones-table-label">{{ $t('Goal') }}</span>
|
||||
<span class="project-milestones-table-span">{{
|
||||
milestone.description
|
||||
}}</span>
|
||||
}}</span>
|
||||
</div>
|
||||
</td>
|
||||
<td>
|
||||
@ -326,14 +261,14 @@
|
||||
<span class="project-milestones-table-label">{{ $t('Status') }}</span>
|
||||
<span class="project-milestones-table-span">{{
|
||||
fromIntToMilestoneStatus(milestone.status)
|
||||
}}</span>
|
||||
}}</span>
|
||||
</div>
|
||||
</td>
|
||||
<td>
|
||||
<div class="project-milestones-table-content">
|
||||
<span class="project-milestones-table-label">{{
|
||||
$t('Payment')
|
||||
}}</span>
|
||||
}}</span>
|
||||
<span class="project-milestones-table-span">
|
||||
{{
|
||||
milestone.status == 3
|
||||
@ -350,20 +285,15 @@
|
||||
<span class="project-milestones-table-label">{{ $t('Update') }}</span>
|
||||
<span class="project-milestones-table-span">{{
|
||||
getDateFromFulltimeString(milestone.update_time)
|
||||
}}</span>
|
||||
}}</span>
|
||||
</div>
|
||||
</td>
|
||||
<td>
|
||||
<div class="project-milestones-table-content">
|
||||
<span class="project-milestones-table-label">{{ $t('Action') }}</span>
|
||||
<button
|
||||
class="project-milestones-table-btn"
|
||||
:disabled="
|
||||
isMilestoneActionButtonDisabled(project.project, milestone)
|
||||
"
|
||||
:hidden="isMilestoneActionButtonHidden(project.project, milestone)"
|
||||
@click="handleMilestoneAction(project.project, milestone)"
|
||||
>
|
||||
<button class="project-milestones-table-btn" :disabled="isMilestoneActionButtonDisabled(project.project, milestone)
|
||||
" :hidden="isMilestoneActionButtonHidden(project.project, milestone)"
|
||||
@click="handleMilestoneAction(project.project, milestone)">
|
||||
{{ fetchMilestoneActionButtonText(project.project, milestone) }}
|
||||
</button>
|
||||
<!-- <span class="project-milestones-table-span">{{ getDateFromFulltimeString(milestone.update_time) }}</span> -->
|
||||
@ -374,10 +304,8 @@
|
||||
<td colspan="6">
|
||||
<div class="project-milestones-qrcode-content">
|
||||
<img :src="this.qrCode.imageUrl" alt="freeleaps" />
|
||||
<button
|
||||
class="project-milestones-qrcode-button"
|
||||
@click="handlePaymentAction(project.project, milestone)"
|
||||
>
|
||||
<button class="project-milestones-qrcode-button"
|
||||
@click="handlePaymentAction(project.project, milestone)">
|
||||
{{ $t('Mark As Paid') }}
|
||||
</button>
|
||||
</div>
|
||||
@ -389,14 +317,9 @@
|
||||
</div>
|
||||
<div class="accordion-item">
|
||||
<h2 class="accordion-header">
|
||||
<button
|
||||
class="accordion-button collapsed"
|
||||
type="button"
|
||||
data-bs-toggle="collapse"
|
||||
data-bs-target="#collapse-project-code"
|
||||
aria-expanded="false"
|
||||
aria-controls="collapse-project-code"
|
||||
>
|
||||
<button class="accordion-button collapsed" type="button" 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-git-status">
|
||||
<label class="project-item-label">{{ $t('Code Depot') }}</label>
|
||||
@ -419,22 +342,13 @@
|
||||
</div>
|
||||
</button>
|
||||
</h2>
|
||||
<div
|
||||
id="collapse-project-code"
|
||||
class="accordion-collapse collapse"
|
||||
data-bs-parent="#collapse-project-code"
|
||||
>
|
||||
<div id="collapse-project-code" class="accordion-collapse collapse"
|
||||
data-bs-parent="#collapse-project-code">
|
||||
<div class="project-code-details-container">
|
||||
<div class="project-code-git-url-container">
|
||||
<button
|
||||
v-if="project.project.code?.git_url"
|
||||
class="project-code-copy-git-url"
|
||||
@click="copyCodeGit(project)"
|
||||
v-tooltip
|
||||
title="Copied"
|
||||
trigger="click"
|
||||
delay='{"show":"500", "hide":"100"}'
|
||||
>
|
||||
<button v-if="project.project.code?.git_url" class="project-code-copy-git-url"
|
||||
@click="copyCodeGit(project)" v-tooltip title="Copied" trigger="click"
|
||||
delay='{"show":"500", "hide":"100"}'>
|
||||
{{ $t('copy git url') }}
|
||||
</button>
|
||||
</div>
|
||||
@ -450,14 +364,9 @@
|
||||
</div>
|
||||
<div class="accordion-item">
|
||||
<h2 class="accordion-header">
|
||||
<button
|
||||
class="accordion-button collapsed"
|
||||
type="button"
|
||||
data-bs-toggle="collapse"
|
||||
data-bs-target="#collapse-project-issue"
|
||||
aria-expanded="false"
|
||||
aria-controls="collapse-project-issue"
|
||||
>
|
||||
<button class="accordion-button collapsed" type="button" 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-open-issues">
|
||||
<label class="project-item-label">{{ $t('Open issues') }}</label>
|
||||
@ -480,11 +389,8 @@
|
||||
</div>
|
||||
</button>
|
||||
</h2>
|
||||
<div
|
||||
id="collapse-project-issue"
|
||||
class="accordion-collapse collapse"
|
||||
data-bs-parent="#collapse-project-issue"
|
||||
>
|
||||
<div id="collapse-project-issue" class="accordion-collapse collapse"
|
||||
data-bs-parent="#collapse-project-issue">
|
||||
<div class="project-code-git-url-container">
|
||||
<button class="project-code-copy-git-url" @click="gotoIssueManage(project)">
|
||||
{{ $t('Issues management') }}
|
||||
@ -1596,7 +1502,7 @@ export default {
|
||||
@extend .btn;
|
||||
@extend .btn-primary;
|
||||
border-color: #1748f8;
|
||||
background-color: rgba(23,72,248,0.1);
|
||||
background-color: rgba(23, 72, 248, 0.1);
|
||||
color: #1748f8;
|
||||
width: fit-content;
|
||||
padding: 0 8px;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user