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 issuer information
  update:bug fix
  update: 初始化聊天列表
  update
  Pull from origin gitea
  add more args in docker file
This commit is contained in:
min.jiang 2024-09-03 22:27:45 +08:00
commit bd704a4691
2 changed files with 72 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -1,7 +1,7 @@
# build stage # build stage
FROM node:lts-alpine as build-stage FROM node:lts-alpine as build-stage
ARG CONTAINER_APP_ROOT="/app" ARG CONTAINER_APP_ROOT="/app"
ARG FRONTEND_PORT=8080
RUN npm update npm -g RUN npm update npm -g
RUN npm config set "@fortawesome:registry" https://npm.fontawesome.com/ RUN npm config set "@fortawesome:registry" https://npm.fontawesome.com/
RUN npm config set "//npm.fontawesome.com/:_authToken" 58624E90-2685-43C6-BF0F-0BFECCE11CD2 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 FROM nginx:1.25.2 as production-stage
COPY --from=build-stage /app/dist /usr/share/nginx/html COPY --from=build-stage /app/dist /usr/share/nginx/html
COPY frontend/nginx_docker.conf /etc/nginx/conf.d/default.conf COPY frontend/nginx_docker.conf /etc/nginx/conf.d/default.conf
EXPOSE 8080 EXPOSE ${FRONTEND_PORT}
CMD ["nginx", "-g", "daemon off;"] CMD ["nginx", "-g", "daemon off;"]

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

@ -2,22 +2,13 @@
<empty-content :loading="loading" :empty="projects?.length === 0" /> <empty-content :loading="loading" :empty="projects?.length === 0" />
<div v-if="projects && projects.length > 0" class="workspace-container"> <div v-if="projects && projects.length > 0" class="workspace-container">
<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">
@ -37,8 +28,9 @@
</div> </div>
<div class="workspace-item-bar-right"> <div class="workspace-item-bar-right">
<div class="project-item-inform-container"> <div class="project-item-inform-container">
<label class="project-item-label">{{ $t('Quote From') }}</label> <label class="project-item-label">{{ $t('Issuer') }}</label>
<p class="project-item-text">{{ project?.proposal?.proposer?.first_name }} {{ project?.proposal?.proposer?.last_name }}</p> <p class="project-item-text">{{ project?.issuer?.first_name }}
{{ project?.issuer?.last_name }}</p>
</div> </div>
</div> </div>
<!-- <div class="workspace-item-bar-right"> <!-- <div class="workspace-item-bar-right">
@ -50,11 +42,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)">
@ -62,30 +50,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>
@ -120,23 +95,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>
@ -144,12 +112,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">
@ -184,12 +149,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>
@ -207,40 +169,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>
@ -248,14 +194,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>
@ -291,17 +232,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">
@ -356,14 +291,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="project-milestones-table-btn" :disabled="isMilestoneActionButtonDisabled(project.project, milestone)
class="project-milestones-table-btn" " :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> -->
@ -374,10 +304,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>
@ -389,14 +317,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>
@ -419,22 +342,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>
@ -450,14 +364,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>
@ -480,11 +389,8 @@
</div> </div>
</button> </button>
</h2> </h2>
<div <div id="collapse-project-issue" class="accordion-collapse collapse"
id="collapse-project-issue" data-bs-parent="#collapse-project-issue">
class="accordion-collapse collapse"
data-bs-parent="#collapse-project-issue"
>
<div class="project-code-git-url-container"> <div class="project-code-git-url-container">
<button class="project-code-copy-git-url" @click="gotoIssueManage(project)"> <button class="project-code-copy-git-url" @click="gotoIssueManage(project)">
{{ $t('Issues management') }} {{ $t('Issues management') }}
@ -1596,7 +1502,7 @@ export default {
@extend .btn; @extend .btn;
@extend .btn-primary; @extend .btn-primary;
border-color: #1748f8; border-color: #1748f8;
background-color: rgba(23,72,248,0.1); background-color: rgba(23, 72, 248, 0.1);
color: #1748f8; color: #1748f8;
width: fit-content; width: fit-content;
padding: 0 8px; padding: 0 8px;