From dd90d4d4de2488754aaa10ab27e15b0ed8293e79 Mon Sep 17 00:00:00 2001 From: "min.jiang" Date: Tue, 11 Jun 2024 03:48:17 +0800 Subject: [PATCH] update --- frontend/package.json | 4 +- frontend/src/assets/styles/main.scss | 14 + frontend/src/components/FreeleapsEditor.vue | 314 ++++++++++++++++++ frontend/src/components/InputSelector.vue | 70 ++++ frontend/src/components/PDFReader.vue | 116 +++---- frontend/src/components/VueQuill.vue | 70 ---- frontend/src/headers/HeaderUser.vue | 20 +- frontend/src/icons/delete.svg | 1 + frontend/src/icons/dropdown.svg | 1 + frontend/src/icons/fe-alignjustify.svg | 1 + frontend/src/icons/fe-bold.svg | 1 + frontend/src/icons/fe-char.svg | 1 + frontend/src/icons/fe-clear.svg | 1 + frontend/src/icons/fe-italic.svg | 1 + frontend/src/icons/fe-orderedlist.svg | 1 + frontend/src/icons/fe-paragraph.svg | 1 + frontend/src/icons/fe-strike.svg | 1 + frontend/src/icons/fe-underline.svg | 1 + frontend/src/icons/fe-unorderedlist.svg | 1 + frontend/src/icons/msg-enter.svg | 1 + frontend/src/pages/guest/FrontDoor.vue | 9 +- .../src/pages/guest/NewUserSetPassword.vue | 5 +- .../src/pages/public/PdfContentViewer.vue | 7 +- frontend/src/pages/user/messages/Home.vue | 263 ++++----------- frontend/src/pages/user/workspace/Home.vue | 24 +- .../user/workspace/requestIssue/Issue.vue | 61 ++-- frontend/src/plugins/index.js | 1 - frontend/src/plugins/pdfjs/index.js | 1 - frontend/src/plugins/pdfjs/pdfjs.js | 7 - frontend/src/plugins/router/router.js | 10 +- frontend/src/utils/index.js | 2 +- frontend/src/utils/validator/index.js | 1 + frontend/vite.config.js | 2 +- 33 files changed, 622 insertions(+), 392 deletions(-) create mode 100644 frontend/src/components/FreeleapsEditor.vue create mode 100644 frontend/src/components/InputSelector.vue delete mode 100644 frontend/src/components/VueQuill.vue create mode 100644 frontend/src/icons/delete.svg create mode 100644 frontend/src/icons/dropdown.svg create mode 100644 frontend/src/icons/fe-alignjustify.svg create mode 100644 frontend/src/icons/fe-bold.svg create mode 100644 frontend/src/icons/fe-char.svg create mode 100644 frontend/src/icons/fe-clear.svg create mode 100644 frontend/src/icons/fe-italic.svg create mode 100644 frontend/src/icons/fe-orderedlist.svg create mode 100644 frontend/src/icons/fe-paragraph.svg create mode 100644 frontend/src/icons/fe-strike.svg create mode 100644 frontend/src/icons/fe-underline.svg create mode 100644 frontend/src/icons/fe-unorderedlist.svg create mode 100644 frontend/src/icons/msg-enter.svg delete mode 100644 frontend/src/plugins/pdfjs/index.js delete mode 100644 frontend/src/plugins/pdfjs/pdfjs.js diff --git a/frontend/package.json b/frontend/package.json index fcfaa74..8c60d9e 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -11,13 +11,11 @@ }, "dependencies": { "@popperjs/core": "^2.11.8", - "@vueup/vue-quill": "^1.2.0", "axios": "^1.4.0", "bootstrap": "^5.3.1", "buffer": "^6.0.3", - "pdfjs-dist": "^4.2.67", + "pdfjs-dist": "3.5.141", "pinia": "^2.1.6", - "quill": "^1.3.7", "vue": "^3.3.4", "vue-router": "^4.2.4", "vuex": "^4.1.0" diff --git a/frontend/src/assets/styles/main.scss b/frontend/src/assets/styles/main.scss index 20818bb..9b5d1f5 100644 --- a/frontend/src/assets/styles/main.scss +++ b/frontend/src/assets/styles/main.scss @@ -104,3 +104,17 @@ p { height: 100%; margin: 0 auto; } +.btn-link {text-decoration: none; color: $primary;} +.dropdown-menu {border: none; box-shadow: 0px 0px 24px 0px #D4D3E380; padding: 0; overflow: hidden; + .btn-link {text-decoration: none; height: 33px; width: 100%; color: #0D1637; font-size: 14px; text-align: left; border-radius: 0; + &:hover {background-color: #F3F6FF;} + &.active {background-color: #1748F8; color: white;} + } + .dropdown-new {color: #1748F8; + &:hover {background-color: white;} + } + .dropdown-new-input-container {padding: 6px 12px; position: relative; + input {border: 1px solid #E7E8EB; box-shadow: none; border-radius: 3px; padding: 0 20px 0 5px; height: 22px; font-size: 14px;} + .dropdown-new-input-icon {width: 16px; height: 16px; padding: 3px; color: #3D455F; background-color: #EEEFF1; border-radius: 3px; position: absolute; top: 10px; right: 15px} + } +} diff --git a/frontend/src/components/FreeleapsEditor.vue b/frontend/src/components/FreeleapsEditor.vue new file mode 100644 index 0000000..e7742cb --- /dev/null +++ b/frontend/src/components/FreeleapsEditor.vue @@ -0,0 +1,314 @@ + + + + + \ No newline at end of file diff --git a/frontend/src/components/InputSelector.vue b/frontend/src/components/InputSelector.vue new file mode 100644 index 0000000..157f815 --- /dev/null +++ b/frontend/src/components/InputSelector.vue @@ -0,0 +1,70 @@ + + + + + diff --git a/frontend/src/components/PDFReader.vue b/frontend/src/components/PDFReader.vue index d212040..117e4c1 100644 --- a/frontend/src/components/PDFReader.vue +++ b/frontend/src/components/PDFReader.vue @@ -1,81 +1,81 @@ - diff --git a/frontend/src/components/VueQuill.vue b/frontend/src/components/VueQuill.vue deleted file mode 100644 index fdb3f0c..0000000 --- a/frontend/src/components/VueQuill.vue +++ /dev/null @@ -1,70 +0,0 @@ - - - - diff --git a/frontend/src/headers/HeaderUser.vue b/frontend/src/headers/HeaderUser.vue index 1211e25..73d5dec 100644 --- a/frontend/src/headers/HeaderUser.vue +++ b/frontend/src/headers/HeaderUser.vue @@ -1,23 +1,23 @@