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

Compare commits

base: freeleaps_product:bd704a46918fc5832f0653553b24b0fa8ef00f81
Branches Tags
freeleaps_product:main
..
compare: freeleaps_product:a07df4ef56691e9e667db08bee02d58cca1da79f
Branches Tags
freeleaps_product:main

No commits in common. "bd704a46918fc5832f0653553b24b0fa8ef00f81" and "a07df4ef56691e9e667db08bee02d58cca1da79f" have entirely different histories.
bd704a4691 ... a07df4ef56

5 changed files with 176 additions and 132 deletions
Show Stats 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 ${FRONTEND_PORT} EXPOSE 8080
CMD ["nginx", "-g", "daemon off;"] CMD ["nginx", "-g", "daemon off;"]

3
frontend/src/pages/user/messages/Home.vue
View File

@ -91,7 +91,8 @@ export default {
conversations(n_val) { conversations(n_val) {
console.log('nval', n_val, this.selConversation, n_val[0]?.messages) console.log('nval', n_val, this.selConversation, n_val[0]?.messages)
if (!this.selConversation && n_val[0]) { if (!this.selConversation && n_val[0]) {
this.selectConversation(n_val[0]) this.selConversation = n_val[0]
this.messages = n_val[0].messages || []
this.clearUnreadMessageBy(n_val[0]) this.clearUnreadMessageBy(n_val[0])
} else { } else {
if (n_val?.[0] && this.selConversation?.id === n_val?.[0]?.id) { if (n_val?.[0] && this.selConversation?.id === n_val?.[0]?.id) {

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

@ -180,35 +180,7 @@
</div> </div>
</div> </div>
</div> </div>
<div v-if="requests" class="statistics-container"> <div v-if="requests" class="accordion" id="accordion-action-panel">
<label class="self-intro-content-label marb-10" for="statistics-content">{{
$t('Action panel')
}}</label>
<div class="invite-to-request-container">
<label class="invite-to-request-content-label" for="invite-to-request-content">{{ $t('Invite')
}}
<span class="invite-to-request-name-span">{{ provider.user_profile.first_name }}
{{ 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">
<input class="form-check-input" type="checkbox" :value="request.id"
:id="'check' + request.id" v-model="checkedRequests" @change="
checkRequest($event, request.id, provider.user_profile.user_id)
" />
<label class="form-check-label" :for="'check' + request.id">{{
request.title
}}</label>
</div>
<span class="invite-to-request-note-text">*{{
$t(
'Once the request is selected, the provider will be invited to see the request.'
)
}}</span>
</div>
</div>
</div>
<!-- <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 class="accordion-button" type="button" data-bs-toggle="collapse" <button class="accordion-button" type="button" data-bs-toggle="collapse"
@ -246,7 +218,7 @@
</div> </div>
</div> </div>
</div> </div>
</div> --> </div>
</div> </div>
</div> </div>
</div> </div>
@ -417,10 +389,6 @@ export default {
font-weight: bold !important; font-weight: bold !important;
} }
.marb-10 {
margin-bottom: 10px !important
}
.self-intro-content-container { .self-intro-content-container {
@extend .container; @extend .container;
@extend .text-start; @extend .text-start;

25
frontend/src/pages/user/requests/Home.vue
View File

@ -96,7 +96,7 @@
</button> </button>
<button <button
class="btn btn-link" class="btn btn-link"
@click="downloadAttachedFile(request.id, file.document_id, file.file_name)" @click="downloadAttachedFile(request.id, file.document_id)"
> >
{{ $t('Download') }}{{ file.file_name }} {{ $t('Download') }}{{ file.file_name }}
</button> </button>
@ -278,35 +278,22 @@ export default {
this.mnx_backendErrorHandler(error) this.mnx_backendErrorHandler(error)
}) })
}, },
downloadAttachedFile(request_id, document_id, file_name) { downloadAttachedFile(request_id, document_id) {
// window.open(`http://${window.location.host}/api/workspace/request/fetch-attached-file-as-download?request_id=${request_id}&document_id=${document_id}`)
// const link = document.createElement('a')
// link.href = `${window.location.host}/api/workspace/request/fetch-attached-file-as-download?request_id=${request_id}&document_id=${document_id}`
// link.download = file_name
// link.target = '_blank'
// document.body.appendChild(link)
// link.click()
// document.body.removeChild(link)
WorksapceApi.fetchAttachedFileAsDownload(request_id, document_id) WorksapceApi.fetchAttachedFileAsDownload(request_id, document_id)
.then((response) => { .then((response) => {
console.log('resposne', response)
// create file link in browser's memory // create file link in browser's memory
// const href = URL.createObjectURL(response.data) const href = URL.createObjectURL(response.data)
// create "a" HTML element with href to file & click // create "a" HTML element with href to file & click
const link = document.createElement('a') const link = document.createElement('a')
link.href = response.data.download_url link.href = href
link.download = file_name link.setAttribute('download', 'file.pdf') //or any other extension
link.target = '_blank'
document.body.appendChild(link) document.body.appendChild(link)
link.click() link.click()
// clean up "a" element & remove ObjectURL // clean up "a" element & remove ObjectURL
document.body.removeChild(link) document.body.removeChild(link)
// URL.revokeObjectURL(href) //TODO: navigate to the preview page URL.revokeObjectURL(href) //TODO: navigate to the preview page
}) })
.catch((error) => { .catch((error) => {
this.mnx_backendErrorHandler(error) this.mnx_backendErrorHandler(error)

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

@ -2,13 +2,22 @@
<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 class="accordion accordion-list" v-for="(project, project_index) in projects" :key="project_index" <div
:id="project.id"> class="accordion accordion-list"
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 class="accordion-button collapsed" type="button" data-bs-toggle="collapse" <button
:data-bs-target="'#collapse-' + project_index" aria-expanded="false" class="accordion-button collapsed"
:aria-controls="'collapse-' + project_index"> 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 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">
@ -20,29 +29,26 @@
<p class="project-item-text">{{ fromIntToProjectStatus(project.status) }}</p> <p class="project-item-text">{{ fromIntToProjectStatus(project.status) }}</p>
</div> </div>
<div class="project-item-date-container"> <div class="project-item-date-container">
<label class="project-item-label">{{ $t('Update') }}</label> <label class="project-item-label">{{ $t('Date') }}</label>
<p class="project-item-text"> <p class="project-item-text">
{{ getDateFromFulltimeString(project.update_time) }} {{ getDateFromFulltimeString(project.update_time) }}
</p> </p>
</div> </div>
</div> </div>
<div class="workspace-item-bar-right"> <div class="workspace-item-bar-right">
<div class="project-item-inform-container">
<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">
<div class="project-item-inform-container"> <div class="project-item-inform-container">
<label class="project-item-label">{{ getTitleForItemInfo(project) }}</label> <label class="project-item-label">{{ getTitleForItemInfo(project) }}</label>
<p class="project-item-text">{{ getContentForItemInfo(project) }}</p> <p class="project-item-text">{{ getContentForItemInfo(project) }}</p>
</div> </div>
</div> --> </div>
</div> </div>
</button> </button>
</h2> </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="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)">
@ -50,17 +56,30 @@
</button> </button>
</div> </div>
<div class="project-request-container"> <div class="project-request-container">
<div class="project-request-content" v-html="project.request.content" @keyup="textAreaAdjust($event)" <div
contenteditable="false"></div> class="project-request-content"
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 class="accordion" v-for="(proposal, proposal_index) in project.proposals" :key="proposal_index" <div
:id="proposal.id"> class="accordion"
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 class="accordion-button collapsed" type="button" data-bs-toggle="collapse" <button
:data-bs-target="'#collapse-request-proposal' + proposal_index" aria-expanded="false" class="accordion-button collapsed"
:aria-controls="'collapse-request-proposal' + proposal_index"> 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-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>
@ -95,16 +114,23 @@
</div> </div>
</button> </button>
</h2> </h2>
<div :id="'collapse-request-proposal' + proposal_index" class="accordion-collapse collapse" <div
:data-bs-parent="'#' + proposal.id"> :id="'collapse-request-proposal' + proposal_index"
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 class="request-proposal-action-reject" <button
@click="rejectProposal(project, proposal_index)"> class="request-proposal-action-reject"
@click="rejectProposal(project, proposal_index)"
>
{{ $t('reject') }} {{ $t('reject') }}
</button> </button>
<button class="request-proposal-action-accept" <button
@click="acceptProposal(project, proposal_index)"> class="request-proposal-action-accept"
@click="acceptProposal(project, proposal_index)"
>
{{ $t('accept') }} {{ $t('accept') }}
</button> </button>
</div> </div>
@ -112,9 +138,12 @@
<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 class="request-proposal-payment-plan-stage-container" <div
v-for="(stage, stage_index) in proposal.payment_plan.stages" :key="stage_index" class="request-proposal-payment-plan-stage-container"
:id="'payment-stage-' + stage_index"> 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"> <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">
@ -149,9 +178,12 @@
<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 class="request-proposal-payment-plan-stage-container" <div
v-for="(stage, stage_index) in project.proposal.payment_plan.stages" :key="stage_index" class="request-proposal-payment-plan-stage-container"
:id="'payment-stage-' + stage_index"> 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"> <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>
@ -169,24 +201,40 @@
</div> </div>
</div> </div>
<div class="project-request-container"> <div class="project-request-container">
<div class="project-request-content" v-html="project.request.content" @keyup="textAreaAdjust($event)" <div
contenteditable="false"></div> class="project-request-content"
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 class="accordion-button collapsed" type="button" data-bs-toggle="collapse" <button
data-bs-target="#collapse-project-invite-collaborator" aria-expanded="false" class="accordion-button collapsed"
aria-controls="collapse-project-invite-collaborator"> 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> <div class="project-invite-collaborator">+ {{ $t('Invite') }}</div>
</button> </button>
<div id="collapse-project-invite-collaborator" class="accordion-collapse collapse" <div
data-bs-parent="#collapse-project-invite-collaborator"> id="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 type="text" v-model="newInviteCollaborator[project_index]" <input
:placeholder="$t('Input E-mail to invite other')" @keydown.enter=" type="text"
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>
@ -194,9 +242,14 @@
<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 class="accordion-button collapsed" type="button" data-bs-toggle="collapse" <button
data-bs-target="#collapse-project-milestone" aria-expanded="false" class="accordion-button collapsed"
aria-controls="collapse-project-milestone"> 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-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>
@ -232,11 +285,17 @@
</div> </div>
</button> </button>
</h2> </h2>
<div id="collapse-project-milestone" class="accordion-collapse collapse" <div
data-bs-parent="#collapse-project-milestone"> id="collapse-project-milestone"
class="accordion-collapse collapse"
data-bs-parent="#collapse-project-milestone"
>
<table class="project-milestones-table"> <table class="project-milestones-table">
<tbody v-for="milestone in project.project.progress.milestones" :key="milestone.index" <tbody
:id="'project-milestone-' + milestone.index"> v-for="milestone in project.project.progress.milestones"
:key="milestone.index"
:id="'project-milestone-' + milestone.index"
>
<tr> <tr>
<td> <td>
<div class="project-milestones-table-content"> <div class="project-milestones-table-content">
@ -291,9 +350,14 @@
<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 class="project-milestones-table-btn" :disabled="isMilestoneActionButtonDisabled(project.project, milestone) <button
" :hidden="isMilestoneActionButtonHidden(project.project, milestone)" class="project-milestones-table-btn"
@click="handleMilestoneAction(project.project, milestone)"> :disabled="
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> -->
@ -304,8 +368,10 @@
<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 class="project-milestones-qrcode-button" <button
@click="handlePaymentAction(project.project, milestone)"> class="project-milestones-qrcode-button"
@click="handlePaymentAction(project.project, milestone)"
>
{{ $t('Mark As Paid') }} {{ $t('Mark As Paid') }}
</button> </button>
</div> </div>
@ -317,9 +383,14 @@
</div> </div>
<div class="accordion-item"> <div class="accordion-item">
<h2 class="accordion-header"> <h2 class="accordion-header">
<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" <button
data-bs-target="#collapse-project-code" aria-expanded="false" class="accordion-button collapsed"
aria-controls="collapse-project-code"> 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-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>
@ -342,13 +413,22 @@
</div> </div>
</button> </button>
</h2> </h2>
<div id="collapse-project-code" class="accordion-collapse collapse" <div
data-bs-parent="#collapse-project-code"> id="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 v-if="project.project.code?.git_url" class="project-code-copy-git-url" <button
@click="copyCodeGit(project)" v-tooltip title="Copied" trigger="click" v-if="project.project.code?.git_url"
delay='{"show":"500", "hide":"100"}'> class="project-code-copy-git-url"
@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>
@ -364,9 +444,14 @@
</div> </div>
<div class="accordion-item"> <div class="accordion-item">
<h2 class="accordion-header"> <h2 class="accordion-header">
<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" <button
data-bs-target="#collapse-project-issue" aria-expanded="false" class="accordion-button collapsed"
aria-controls="collapse-project-issue"> 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-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>
@ -389,8 +474,11 @@
</div> </div>
</button> </button>
</h2> </h2>
<div id="collapse-project-issue" class="accordion-collapse collapse" <div
data-bs-parent="#collapse-project-issue"> id="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') }}
@ -1502,7 +1590,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;