diff --git a/frontend/index.html b/frontend/index.html index 99f583a..e19f748 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -4,7 +4,7 @@ - Vite App + Freeleaps
diff --git a/frontend/package.json b/frontend/package.json index 6911fa9..ec84f06 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -17,6 +17,7 @@ "pdfjs-dist": "^4.3.136", "pinia": "^2.1.6", "vue": "^3.3.4", + "vue-i18n": "^9.13.1", "vue-router": "^4.2.4", "vuex": "^4.1.0" }, diff --git a/frontend/public/favicon.ico b/frontend/public/favicon.ico index df36fcf..f831bc4 100644 Binary files a/frontend/public/favicon.ico and b/frontend/public/favicon.ico differ diff --git a/frontend/src/App.vue b/frontend/src/App.vue index 4d83cb9..8c19f19 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -1,5 +1,7 @@ diff --git a/frontend/src/pages/public/Blogs.vue b/frontend/src/pages/public/Blogs.vue index bbd108c..1aba5c6 100644 --- a/frontend/src/pages/public/Blogs.vue +++ b/frontend/src/pages/public/Blogs.vue @@ -48,14 +48,20 @@ export default { diff --git a/frontend/src/pages/public/Career.vue b/frontend/src/pages/public/Career.vue index 464e6ab..f9062ff 100644 --- a/frontend/src/pages/public/Career.vue +++ b/frontend/src/pages/public/Career.vue @@ -1,19 +1,15 @@ @@ -48,15 +44,25 @@ export default { } diff --git a/frontend/src/pages/public/Contact.vue b/frontend/src/pages/public/Contact.vue index 916892e..8dad955 100644 --- a/frontend/src/pages/public/Contact.vue +++ b/frontend/src/pages/public/Contact.vue @@ -1,8 +1,14 @@ @@ -34,6 +40,61 @@ export default { } \ No newline at end of file diff --git a/frontend/src/pages/user/workspace/Home.vue b/frontend/src/pages/user/workspace/Home.vue index 0269c2c..93569f8 100644 --- a/frontend/src/pages/user/workspace/Home.vue +++ b/frontend/src/pages/user/workspace/Home.vue @@ -594,7 +594,7 @@ export default { props: {}, mounted() { this.fetchView() - //this.connectWebSocket() + // this.connectWebSocket() }, data() { return { @@ -1008,8 +1008,8 @@ export default { .project-item-text { @extend .text-start; - @extend .mx-1; margin-bottom: 0; + font-weight: bold; } .project-request-container { @@ -1067,7 +1067,6 @@ export default { .request-proposal-content-container { @extend .container; - @extend .border; } .request-proposal-content { @@ -1076,7 +1075,10 @@ export default { .request-proposal-payment-plan { @extend .container; - @extend .border; + border: 1px dashed #9CB0F6; + border-radius: 3px; + padding: 24px; + margin: 32px 0; } .request-proposal-payment-plan-stage-container { diff --git a/frontend/src/pages/user/workspace/requestIssue/Issue.vue b/frontend/src/pages/user/workspace/requestIssue/Issue.vue index 4c48087..88ff130 100644 --- a/frontend/src/pages/user/workspace/requestIssue/Issue.vue +++ b/frontend/src/pages/user/workspace/requestIssue/Issue.vue @@ -147,21 +147,8 @@
-
-
@@ -347,9 +334,9 @@ export default { .request-issue-container { @extend .flex-colum-container; box-shadow: 0px 0px 24px 0px rgba(212, 211, 227, 0.5); - border-top-left-radius: 12px; - border-top-right-radius: 12px; + border-radius: 12px; overflow: hidden; + background: white } .action-bar { diff --git a/frontend/src/plugins/store/basic.js b/frontend/src/plugins/store/basic.js new file mode 100644 index 0000000..a213aae --- /dev/null +++ b/frontend/src/plugins/store/basic.js @@ -0,0 +1,75 @@ +/* eslint-disable no-prototype-builtins */ +import { i18n } from '@/lang' +import { WsConnectionFactory } from '@/utils/backend/websocket' + +const basicStore = { + namespaced: true, + state() { + return { + language: 'zh', + unreadCountMapper: [], + downstream_web_socket: null, + } + }, + mutations: { + setLanguage(state, language) { + state.language = language + i18n.global.locale.value = language + localStorage.setItem('language', language) + }, + initWebsocket(state, token) { + state.downstream_web_socket = WsConnectionFactory.CreateWebSocket( + token, + () => { + // keep + setInterval(() => { + state.downstream_web_socket.send(1) + }, 1000 * 60) + console.log('downstream_web_socket open') + }, + (e) => { + const data = JSON.parse(e.data) + let unread = state.unreadCountMapper[data.sender_id] + if (unread) { + unread ++ + } else { + unread = 1 + } + state.unreadCountMapper[data.sender_id] = unread + console.log('downstream_web_socket onmessage: ', data, state.unreadCountMapper) + }, + () => { + console.log('downstream_web_socket error') + }, + () => { + console.log('downstream_web_socket closed') + } + ) + } + }, + actions: { + setLanguage(context, language) { + context.commit('setLanguage', language) + }, + initWebsocket(context, token) { + context.commit('initWebsocket', token) + } + }, + getters: { + language(state) { + return state.language + }, + unreadCount(state) { + let count = 0 + for (let key in state.unreadCountMapper) { + if (state.unreadCountMapper.hasOwnProperty(key)) { + count += state.unreadCountMapper[key] + } + } + return count + } + } + } + + export { basicStore } + \ No newline at end of file diff --git a/frontend/src/plugins/store/index.js b/frontend/src/plugins/store/index.js index b40e95c..2f56e75 100644 --- a/frontend/src/plugins/store/index.js +++ b/frontend/src/plugins/store/index.js @@ -2,11 +2,13 @@ import { createStore } from 'vuex' import { userAuthStore } from './userAuth' import { userRoleEnum, userProfileStore } from './userProfile' +import { basicStore } from './basic' const store = createStore({ modules: { userAuth: userAuthStore, - userProfile: userProfileStore + userProfile: userProfileStore, + basic: basicStore } }) diff --git a/frontend/src/utils/backend/websocket.js b/frontend/src/utils/backend/websocket.js index 109ead5..6d20f23 100644 --- a/frontend/src/utils/backend/websocket.js +++ b/frontend/src/utils/backend/websocket.js @@ -1,8 +1,8 @@ -import { userUtils } from '../store/index' +// import { userUtils } from '../store/index' class WsConnectionFactory { - static CreateWebSocket(onOpen, onMessage, onError, onClose) { - let jwt = userUtils.getJwtToken() + static CreateWebSocket(jwt, 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