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:
  fix the import path in utils
  use '@' for all import
  add websocket framework

# Conflicts:
#	frontend/src/pages/user/requests/Home.vue
This commit is contained in:
min.jiang 2024-06-23 01:21:53 +08:00
commit 97709a8e50
44 changed files with 168 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
env.sh
View File

@ -1,4 +1,4 @@
INT_DIR="../freeleaps-int/sites/freeleaps/deploy"
INT_DIR="@/freeleaps-int/sites/freeleaps/deploy"
DEPLOY_DIR="deploy"
FE_ENV="$DEPLOY_DIR/.fe.env"
if [ -d "$INT_DIR" ]; then

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

@ -86,7 +86,7 @@
</div>
</template>
<script>
import { UserAuthApi } from '../utils/backend/index'
import { UserAuthApi } from '@/utils/backend/index'
export default {
name: 'HeaderGuest',

2
frontend/src/mixins/navigator.js
View File

@ -1,4 +1,4 @@
import { userRoleEnum } from '../types/index'
import { userRoleEnum } from '@/types/index'
export default {
methods: {
//public

2
frontend/src/mixins/userAuth.js
View File

@ -1,4 +1,4 @@
import { signinActionEnum } from '../types/index'
import { signinActionEnum } from '@/types/index'
export default {
methods: {
mnx_userSignedin(authResposne, keepMeSignedin) {

4
frontend/src/pages/guest/FrontDoor.vue
View File

@ -36,8 +36,8 @@ import {
UserAuthApi,
applicantValidator
// userProfileValidator,
} from '../../utils/index'
import { signinActionEnum } from '../../types/index'
} from '@/utils/index'
import { signinActionEnum } from '@/types/index'
export default {
name: 'FrontDoor',

4
frontend/src/pages/guest/NewUserSetFlid.vue
View File

@ -24,8 +24,8 @@
</template>
<script>
import { UserAuthApi } from '../../utils/index'
import { signinActionEnum } from '../../types/index'
import { UserAuthApi } from '@/utils/index'
import { signinActionEnum } from '@/types/index'
export default {
name: 'NewUserSetFlid',
props: {

2
frontend/src/pages/guest/NewUserSetPassword.vue
View File

@ -38,7 +38,7 @@
</template>
<script>
import { UserAuthApi, passwordValidator } from '../../utils/index'
import { UserAuthApi, passwordValidator } from '@/utils/index'
export default {
name: 'NewUserSetPassword',
props: {},

4
frontend/src/pages/guest/SigninWithEmailAndCode.vue
View File

@ -24,8 +24,8 @@
</template>
<script>
import { signinActionEnum } from '../../types'
import { UserAuthApi } from '../../utils/index'
import { signinActionEnum } from '@/types'
import { UserAuthApi } from '@/utils/index'
export default {
name: 'SigninWithEmailAndCode',
props: {

4
frontend/src/pages/guest/SigninWithEmailAndPassword.vue
View File

@ -30,8 +30,8 @@
</template>
<script>
import { signinActionEnum } from '../../types'
import { UserAuthApi } from '../../utils/index'
import { signinActionEnum } from '@/types'
import { UserAuthApi } from '@/utils/index'
export default {
name: 'SigninWithEmailAndCode',
props: {

2
frontend/src/pages/lab/translation/Home.vue
View File

@ -5,7 +5,7 @@
</div>
</template>
<script>
import { LabApi } from '../../../utils/index'
import { LabApi } from '@/utils/index'
export default {
name: 'TranslationHome',
components: {},

2
frontend/src/pages/public/About.vue
View File

@ -13,7 +13,7 @@
</div>
</template>
<script>
import { ContentApi } from '../../utils/index'
import { ContentApi } from '@/utils/index'
export default {
name: 'About',
components: {},

2
frontend/src/pages/public/Blogs.vue
View File

@ -13,7 +13,7 @@
</div>
</template>
<script>
import { ContentApi } from '../../utils/index'
import { ContentApi } from '@/utils/index'
export default {
name: 'Blogs',
components: {},

2
frontend/src/pages/public/Career.vue
View File

@ -18,7 +18,7 @@
</div>
</template>
<script>
import { ContentApi } from '../../utils/index'
import { ContentApi } from '@/utils/index'
export default {
name: 'Career',
components: {},

2
frontend/src/pages/public/Contact.vue
View File

@ -7,7 +7,7 @@
</div>
</template>
<script>
import { ContentApi } from '../../utils/index'
import { ContentApi } from '@/utils/index'
export default {
name: 'Contact',
components: {},

3
frontend/src/pages/public/PdfContentViewer.vue
View File

@ -4,9 +4,6 @@
</div>
</template>
<script>
// import { pdfjsLib } from '../../plugins/index'
// import { ContentApi } from '../../utils/index'
// import { Buffer } from 'buffer'
import { ContentApi } from '@/utils/index'
import PDFReader from '@/components/PDFReader.vue'
export default {

2
frontend/src/pages/user/account/UserFinance.vue
View File

@ -8,7 +8,7 @@
import {
UserProfileApi
// userProfileValidator,
} from '../../../utils/index'
} from '@/utils/index'
export default {
name: 'UserFinance',
props: {},

2
frontend/src/pages/user/account/UserHistory.vue
View File

@ -5,7 +5,7 @@
</template>
<script>
import { HistoryApi } from '../../../utils/index'
import { HistoryApi } from '@/utils/index'
export default {
name: 'UserHistory',
props: {},

9
frontend/src/pages/user/account/UserProfile.vue
View File

@ -710,14 +710,9 @@
<script>
import SvgIcon from '@/components/SvgIcon.vue'
import { moneyCollectionTypeEnum } from '../../../types/index'
import { moneyCollectionTypeEnum } from '@/types/index'
import {
UserProfileApi,
elementHandler,
textAreaAujuster,
passwordValidator
} from '../../../utils/index'
import { UserProfileApi, elementHandler, textAreaAujuster, passwordValidator } from '@/utils/index'
import FreeleapsEditor from '@/components/FreeleapsEditor.vue'
export default {

2
frontend/src/pages/user/account/UserSubscription.vue
View File

@ -8,7 +8,7 @@
import {
UserProfileApi
// userProfileValidator,
} from '../../../utils/index'
} from '@/utils/index'
export default {
name: 'UserSubscription',
props: {},

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

@ -78,8 +78,8 @@
</div>
</template>
<script>
import SvgIcon from '../../../components/SvgIcon.vue'
import { MessageHubApi, DateUtils } from '../../../utils/index'
import SvgIcon from '@/components/SvgIcon.vue'
import { MessageHubApi, DateUtils } from '@/utils/index'
export default {
components: { SvgIcon },
name: 'MessageHub',

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

@ -266,7 +266,7 @@
import {
ProviderHubApi
// userProfileValidator,
} from '../../../utils/index'
} from '@/utils/index'
export default {
name: 'ProviderHub',
props: {},

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

@ -75,11 +75,11 @@
Propose
</button>
<div class="request-description-content" v-html="request.content"></div>
<div class="preview-btn-container" v-for="(file, index) in request.attached_files" :key="index">
<button class="btn btn-link" data-bs-toggle="modal" data-bs-target="#previewModal" :data-bs-file="file.file_name" :data-bs-rid="request.id" :data-bs-did="file.document_id">
<div v-for="(file, index) in request.attached_files" :key="index">
<button @click="previewAttachedFile(request.id, file.document_id)">
Preview{{ file.file_name }}
</button>
<button class="btn btn-link" @click="downloadAttachedFile(request.id, file.document_id)">
<button @click="downloadAttachedFile(request.id, file.document_id)">
Download{{ file.file_name }}
</button>
</div>
@ -177,56 +177,24 @@
</div>
</div>
</div>
<div class="modal fade" id="previewModal" ref="previewModal" aria-labelledby="previewModalLabel" aria-hidden="true">
<div class="modal-dialog modal-xl">
<div class="modal-content">
<div class="modal-header">
<h1 class="modal-title fs-5" id="previewModalLabel">{{previewModal.filename}}</h1>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<PDFReader :doc="previewModal.doc" />
</div>
</div>
</div>
</div>
</template>
<script>
import { RequestHubApi, WorksapceApi, DateUtils, requestHubUtils } from '../../../utils/index'
import { proposingModelEnum } from '../../../types/index'
import PDFReader from '@/components/PDFReader.vue'
import { RequestHubApi, WorksapceApi, DateUtils, requestHubUtils } from '@/utils/index'
import { proposingModelEnum } from '@/types/index'
export default {
name: 'RequestHub',
props: {},
mounted() {
this.fetchRequests()
this.$refs.previewModal.addEventListener('shown.bs.modal', event => {
const relatedTarget = event.relatedTarget
const filename = relatedTarget.getAttribute('data-bs-file')
this.previewModal = { filename }
const requestId = relatedTarget.getAttribute('data-bs-rid')
const documentId = relatedTarget.getAttribute('data-bs-did')
WorksapceApi.fetchAttachedFileAsMediaData(requestId, documentId)
.then((response) => {
this.previewModal.doc = {url: response.data}
})
.catch((error) => {
this.mnx_backendErrorHandler(error)
})
})
this.$refs.previewModal.addEventListener('hidden.bs.modal', () => {
this.previewModal = {}
})
},
data() {
return {
requestGroups: [],
message: null,
previewModal: {}
message: null
}
},
components: { PDFReader },
methods: {
fetchRequests() {
RequestHubApi.fetchRequestForHub()
@ -244,6 +212,18 @@ export default {
getDateFromFulltimeString(fulltime) {
return DateUtils.FromJsonToDateString(fulltime)
},
previewAttachedFile(request_id, document_id) {
// !!! SHOULD NOT use PdfContentViewer which is designed for unlogged in users.
// !!! Instead, should have a dedicated pdf viewer which should follow the figma design.
// WorksapceApi.fetchAttachedFileAsMediaData(request_id, document_id)
// .then((response) => {
// let media_data = response.data
// console.log(media_data)
// })
// .catch((error) => {
// this.mnx_backendErrorHandler(error)
// })
},
downloadAttachedFile(request_id, document_id) {
WorksapceApi.fetchAttachedFileAsDownload(request_id, document_id)
.then((response) => {
@ -431,15 +411,4 @@ export default {
@extend .text-start;
font-weight: bold;
}
.preview-btn-container {
display: flex;
text-align: left;
.btn-link {
font-weight: bold;
margin-right: 15px;
text-decoration: underline;
}
}
</style>

2
frontend/src/pages/user/requests/ProposalSubmitted.vue
View File

@ -15,7 +15,7 @@
import {
UserProfileApi
// userProfileValidator,
} from '../../../utils/index'
} from '@/utils/index'
export default {
name: 'ProposalSubmitted',
props: {

4
frontend/src/pages/user/requests/Propose.vue
View File

@ -291,14 +291,14 @@
</template>
<script>
import { requestHubUtils, RequestHubApi } from '../../../utils/index'
import { requestHubUtils, RequestHubApi } from '@/utils/index'
import {
proposingModelEnum,
preparedProposal,
preparedProposalStage,
preparedProposalSummary,
proposalUtils
} from '../../../types/index'
} from '@/types/index'
import SvgIcon from '@/components/SvgIcon.vue'
import FreeleapsEditor from '@/components/FreeleapsEditor.vue'
export default {

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

@ -571,7 +571,13 @@
</template>
<script>
import { WorksapceApi, DateUtils, requestIssueUtils, requestHubUtils } from '../../../utils/index'
import {
WorksapceApi,
DateUtils,
requestIssueUtils,
requestHubUtils,
WsConnectionFactory
} from '@/utils/index'
import {
projectStatusEnum,
projectIssueStatusEnum,
@ -582,12 +588,13 @@ import {
milestoneStatusEnum,
convertIntoToMilestoneStatus,
convertIntoToProjectIssueStatus
} from '../../../types/index'
} from '@/types/index'
export default {
name: 'Workspace',
props: {},
mounted() {
this.fetchView()
//this.connectWebSocket()
},
data() {
return {
@ -598,7 +605,9 @@ export default {
qrCode: {
imageUrl: null,
index: null
}
},
downstream_web_socket: null
}
},
@ -905,6 +914,27 @@ export default {
default:
return false
}
},
/** web socket. we put them here for test purpose. they need to be moved to an appropriate place**/
websocketOnOpen(event) {
console.log(event)
},
websocketOnMessage(event) {
console.log(event.data)
},
websocketOnError(event) {
console.log(event)
},
websocketOnClose(event) {
console.log(event)
},
connectWebSocket() {
this.downstream_web_socket = WsConnectionFactory.CreateWebSocket(
this.websocketOnOpen,
this.websocketOnMessage,
this.websocketOnError,
this.websocketOnClose
)
}
}
}

4
frontend/src/pages/user/workspace/projectManage/Home.vue
View File

@ -44,8 +44,8 @@
</template>
<script>
import { WorksapceApi, DateUtils } from '../../../../utils/index'
import { projectStatusEnum, convertIntoToProjectStatus } from '../../../../types/index'
import { WorksapceApi, DateUtils } from '@/utils/index'
import { projectStatusEnum, convertIntoToProjectStatus } from '@/types/index'
export default {
name: 'MyWorkspaceProjects',
props: {},

4
frontend/src/pages/user/workspace/proposalManage/Home.vue
View File

@ -44,8 +44,8 @@
</template>
<script>
import { WorksapceApi, DateUtils } from '../../../../utils/index'
import { projectStatusEnum, convertIntoToProjectStatus } from '../../../../types/index'
import { WorksapceApi, DateUtils } from '@/utils/index'
import { projectStatusEnum, convertIntoToProjectStatus } from '@/types/index'
export default {
name: 'MyWorkspaceProposal',
props: {},

2
frontend/src/pages/user/workspace/requestIssue/Deposit.vue
View File

@ -13,7 +13,7 @@
import {
UserProfileApi
// requestHubUtils,
} from '../../../../utils/index'
} from '@/utils/index'
export default {
name: 'RquestIssueDeposit',
props: {

2
frontend/src/pages/user/workspace/requestIssue/Deposited.vue
View File

@ -11,7 +11,7 @@
import {
UserProfileApi
// userProfileValidator,
} from '../../../../utils/index'
} from '@/utils/index'
export default {
name: 'RquestIssueDeposited',
props: {

4
frontend/src/pages/user/workspace/requestIssue/Issue.vue
View File

@ -170,8 +170,8 @@
</template>
<script>
import { WorksapceApi, textAreaAujuster, requestIssueUtils } from '../../../../utils/index'
import { requestIssuingModelEnum } from '../../../../types/index'
import { WorksapceApi, textAreaAujuster, requestIssueUtils } from '@/utils/index'
import { requestIssuingModelEnum } from '@/types/index'
import FreeleapsEditor from '@/components/FreeleapsEditor.vue'
import InputSelector from '@/components/InputSelector.vue'
import SvgIcon from '@/components/SvgIcon.vue'

2
frontend/src/pages/user/workspace/requestIssue/Submitted.vue
View File

@ -15,7 +15,7 @@
import {
UserProfileApi
// userProfileValidator,
} from '../../../../utils/index'
} from '@/utils/index'
export default {
name: 'RquestIssueSubmitted',
props: {

4
frontend/src/pages/user/workspace/requestManage/Home.vue
View File

@ -44,8 +44,8 @@
</template>
<script>
import { WorksapceApi, DateUtils } from '../../../../utils/index'
import { projectStatusEnum, convertIntoToProjectStatus } from '../../../../types/index'
import { WorksapceApi, DateUtils } from '@/utils/index'
import { projectStatusEnum, convertIntoToProjectStatus } from '@/types/index'
export default {
name: 'MyWorkspaceRequest',
props: {},

4
frontend/src/pages/user/workspace/requestManage/Manage.vue
View File

@ -88,8 +88,8 @@
</template>
<script>
import { WorksapceApi, requestIssueUtils, DateUtils } from '../../../../utils/index'
import { requestStatusEnum, convertIntoToRequestStatus } from '../../../../types/index'
import { WorksapceApi, requestIssueUtils, DateUtils } from '@/utils/index'
import { requestStatusEnum, convertIntoToRequestStatus } from '@/types/index'
export default {
name: 'RequestManage',
props: {

2
frontend/src/pages/user/workspace/requestManage/ReviewProposal.vue
View File

@ -65,7 +65,7 @@
import {
WorksapceApi
// userProfileValidator,
} from '../../../../utils/index'
} from '@/utils/index'
export default {
name: 'ReviewProposalBeforeAccetance',
props: {

84
frontend/src/plugins/router/router.js
View File

@ -2,70 +2,70 @@ import { createRouter, createWebHistory } from 'vue-router'
import { store, userRoleEnum } from '../store/index'
//public
import About from '../../pages/public/About.vue'
import Blogs from '../../pages/public/Blogs.vue'
import Career from '../../pages/public/Career.vue'
import Contact from '../../pages/public/Contact.vue'
import PdfContentViewer from '../../pages/public/PdfContentViewer.vue'
import LinkContentViewer from '../../pages/public/LinkContentViewer.vue'
import About from '@/pages/public/About.vue'
import Blogs from '@/pages/public/Blogs.vue'
import Career from '@/pages/public/Career.vue'
import Contact from '@/pages/public/Contact.vue'
import PdfContentViewer from '@/pages/public/PdfContentViewer.vue'
import LinkContentViewer from '@/pages/public/LinkContentViewer.vue'
//guest
import FrontDoor from '../../pages/guest/FrontDoor.vue'
import SigninWithEmailAndCode from '../../pages/guest/SigninWithEmailAndCode.vue'
import NewUserSetPassword from '../../pages/guest/NewUserSetPassword.vue'
import NewUserSetFlid from '../../pages/guest/NewUserSetFlid.vue'
import SigninWithEmailAndPassword from '../../pages/guest/SigninWithEmailAndPassword.vue'
import FrontDoor from '@/pages/guest/FrontDoor.vue'
import SigninWithEmailAndCode from '@/pages/guest/SigninWithEmailAndCode.vue'
import NewUserSetPassword from '@/pages/guest/NewUserSetPassword.vue'
import NewUserSetFlid from '@/pages/guest/NewUserSetFlid.vue'
import SigninWithEmailAndPassword from '@/pages/guest/SigninWithEmailAndPassword.vue'
//Workspace projects
import MyWorkspaceProjects from '../../pages/user/workspace/projectManage/Home.vue'
import MyWorkspaceProjects from '@/pages/user/workspace/projectManage/Home.vue'
import ProjectManage from '../../pages/user/workspace/projectManage/ProjectManage.vue'
import ProjectManageCode from '../../pages/user/workspace/projectManage/Code.vue'
import ProjectManageDeploy from '../../pages/user/workspace/projectManage/Deploy.vue'
import ProjectManageGeneral from '../../pages/user/workspace/projectManage/General.vue'
import ProjectManageIssues from '../../pages/user/workspace/projectManage/Issues.vue'
import ProjectManageProduct from '../../pages/user/workspace/projectManage/Product.vue'
import ProjectManageProgress from '../../pages/user/workspace/projectManage/Progress.vue'
import ProjectManage from '@/pages/user/workspace/projectManage/ProjectManage.vue'
import ProjectManageCode from '@/pages/user/workspace/projectManage/Code.vue'
import ProjectManageDeploy from '@/pages/user/workspace/projectManage/Deploy.vue'
import ProjectManageGeneral from '@/pages/user/workspace/projectManage/General.vue'
import ProjectManageIssues from '@/pages/user/workspace/projectManage/Issues.vue'
import ProjectManageProduct from '@/pages/user/workspace/projectManage/Product.vue'
import ProjectManageProgress from '@/pages/user/workspace/projectManage/Progress.vue'
//Workspace Requests
import MyWorkspaceRequests from '../../pages/user/workspace/requestManage/Home.vue'
import MyWorkspaceRequests from '@/pages/user/workspace/requestManage/Home.vue'
/// Request Issue
import IssueRequest from '../../pages/user/workspace/requestIssue/Issue.vue'
import RequestSubmitted from '../../pages/user/workspace/requestIssue/Submitted.vue'
import RequestDeposit from '../../pages/user/workspace/requestIssue/Deposit.vue'
import RequestDeposited from '../../pages/user/workspace/requestIssue/Deposited.vue'
import IssueRequest from '@/pages/user/workspace/requestIssue/Issue.vue'
import RequestSubmitted from '@/pages/user/workspace/requestIssue/Submitted.vue'
import RequestDeposit from '@/pages/user/workspace/requestIssue/Deposit.vue'
import RequestDeposited from '@/pages/user/workspace/requestIssue/Deposited.vue'
//Workspace Proposals
import MyWorkspaceProposals from '../../pages/user/workspace/proposalManage/Home.vue'
import MyWorkspaceProposals from '@/pages/user/workspace/proposalManage/Home.vue'
//Message Hub
import MessageHub from '../../pages/user/messages/Home.vue'
import MessageHub from '@/pages/user/messages/Home.vue'
//Provider Hub
import ProviderHub from '../../pages/user/providers/Home.vue'
import ProviderHub from '@/pages/user/providers/Home.vue'
//Request Hub
import RequestHub from '../../pages/user/requests/Home.vue'
import MakeProposal from '../../pages/user/requests/Propose.vue'
import ProposalSubmitted from '../../pages/user/requests/ProposalSubmitted.vue'
import RequestHub from '@/pages/user/requests/Home.vue'
import MakeProposal from '@/pages/user/requests/Propose.vue'
import ProposalSubmitted from '@/pages/user/requests/ProposalSubmitted.vue'
import RequestManage from '../../pages/user/workspace/requestManage/Manage.vue'
import ReviewProposalBeforeAccetance from '../../pages/user/workspace/requestManage/ReviewProposal.vue'
import UserProfile from '../../pages/user/account/UserProfile.vue'
import UserFinance from '../../pages/user/account/UserFinance.vue'
import UserHistory from '../../pages/user/account/UserHistory.vue'
import Workspace from '../../pages/user/workspace/Home.vue'
import RequestManage from '@/pages/user/workspace/requestManage/Manage.vue'
import ReviewProposalBeforeAccetance from '@/pages/user/workspace/requestManage/ReviewProposal.vue'
import UserProfile from '@/pages/user/account/UserProfile.vue'
import UserFinance from '@/pages/user/account/UserFinance.vue'
import UserHistory from '@/pages/user/account/UserHistory.vue'
import Workspace from '@/pages/user/workspace/Home.vue'
import FooterGuest from '../../footers/FooterGuest.vue'
import FooterUser from '../../footers/FooterUser.vue'
import FooterGuest from '@/footers/FooterGuest.vue'
import FooterUser from '@/footers/FooterUser.vue'
import HeaderGuest from '../../headers/HeaderGuest.vue'
import HeaderUser from '../../headers/HeaderUser.vue'
import HeaderGuest from '@/headers/HeaderGuest.vue'
import HeaderUser from '@/headers/HeaderUser.vue'
//Lab
import LabHome from '../../pages/lab/Home.vue'
import TranslationHome from '../../pages/lab/translation/Home.vue'
import LabHome from '@/pages/lab/Home.vue'
import TranslationHome from '@/pages/lab/translation/Home.vue'
const router = createRouter({
history: createWebHistory(),

2
frontend/src/plugins/store/userProfile.js
View File

@ -1,4 +1,4 @@
import { userRoleEnum } from '../../types/index'
import { userRoleEnum } from '@/types/index'
const userProfileStore = {
namespaced: true,

1
frontend/src/utils/backend/index.js
View File

@ -7,3 +7,4 @@ export { MessageHubApi } from './messageHub'
export { HistoryApi } from './history'
export { ContentApi } from './content'
export { LabApi } from './lab'
export { WsConnectionFactory } from './websocket'

14
frontend/src/utils/backend/websocket.js Normal file
View File

@ -0,0 +1,14 @@
import { userUtils } from '../store/index'
class WsConnectionFactory {
static CreateWebSocket(onOpen, onMessage, onError, onClose) {
let jwt = userUtils.getJwtToken()
this.socket = new WebSocket(`/ws/downstream/online_platform_notification?token=${jwt}`)
this.socket.onopen = onOpen
this.socket.onmessage = onMessage
this.socket.onerror = onError
this.socket.onclose = onClose
}
}
export { WsConnectionFactory }

3
frontend/src/utils/index.js
View File

@ -7,7 +7,8 @@ export {
MessageHubApi,
HistoryApi,
ContentApi,
LabApi
LabApi,
WsConnectionFactory
} from './backend/index'
export { userUtils, userProfileUtils, requestIssueUtils, requestHubUtils } from './store/index'

2
frontend/src/utils/store/requestHubUtils.js
View File

@ -1,4 +1,4 @@
import { store } from '../../plugins/index'
import { store } from '@/plugins/index'
class RequestHubUtils {
constructor(store) {

2
frontend/src/utils/store/requestIssueUtils.js
View File

@ -1,4 +1,4 @@
import { store } from '../../plugins/index'
import { store } from '@/plugins/index'
class RequestIssueUtils {
constructor(store) {

2
frontend/src/utils/store/userProfileUtils.js
View File

@ -1,4 +1,4 @@
import { store } from '../../plugins/index'
import { store } from '@/plugins/index'
class UserProfileUtils {
constructor(store) {

2
frontend/src/utils/store/userUtils.js
View File

@ -1,4 +1,4 @@
import { store } from '../../plugins/index'
import { store } from '@/plugins/index'
class UserUtils {
constructor(store) {

7
frontend/vite.config.js
View File

@ -11,6 +11,7 @@ function resolve(dir) {
// https://vitejs.dev/config/
export default defineConfig(({ command, mode }) => {
let API_URL = 'http://127.0.0.1:8001'
let WEBSOCKET_URL = 'ws://127.0.0.1:8001'
let PORT = '5173'
if (command === 'serve') {
@ -18,6 +19,7 @@ export default defineConfig(({ command, mode }) => {
console.log('loading environment variables from .env and .env.' + mode + ' under ' + process.cwd())
const env = loadEnv(mode, process.cwd());
API_URL = `${env.VITE_API_URL ?? 'http://127.0.0.1:8001'}`;
WEBSOCKET_URL = `${env.VITE_WEBSOCKET_URL ?? 'ws://127.0.0.1:8001'}`;
PORT = `${env.VITE_PORT ?? '5173'}`;
} else {
// command === 'build'
@ -58,6 +60,11 @@ export default defineConfig(({ command, mode }) => {
target: API_URL,
ws: true,
changeOrigin: true
},
'^/ws/': {
target: WEBSOCKET_URL,
ws: true,
changeOrigin: true
}
},
port: PORT,