From 591de12e69aada38ee8c7588940f29c44a38d4f8 Mon Sep 17 00:00:00 2001 From: Zhigang Wang Date: Fri, 7 Jun 2024 13:37:43 -0700 Subject: [PATCH] update code formatting --- frontend/src/App.vue | 5 +- frontend/src/assets/styles/_variables.scss | 2 +- frontend/src/assets/styles/containers.scss | 13 ++- frontend/src/assets/styles/inputs.scss | 34 ++++-- frontend/src/components/PDFReader.vue | 66 ++++++------ frontend/src/components/SvgIcon.vue | 64 ++++++----- frontend/src/components/VueQuill.vue | 100 ++++++++++-------- frontend/src/footers/FooterGuest.vue | 15 ++- frontend/src/headers/HeaderGuest.vue | 27 +++-- frontend/src/headers/HeaderUser.vue | 77 +++++++++++--- frontend/src/main.js | 4 +- frontend/src/pages/guest/FrontDoor.vue | 61 +++++++---- frontend/src/pages/guest/NewUserSetFlid.vue | 3 +- .../src/pages/guest/NewUserSetPassword.vue | 26 ++--- .../guest/SigninWithEmailAndPassword.vue | 13 ++- .../src/pages/public/PdfContentViewer.vue | 2 +- .../user/workspace/requestIssue/Issue.vue | 2 +- frontend/vite.config.js | 2 +- 18 files changed, 335 insertions(+), 181 deletions(-) diff --git a/frontend/src/App.vue b/frontend/src/App.vue index 09d187e..4d83cb9 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -34,7 +34,10 @@ export default { margin-top: 0px; } -.body-header {width: 100%; height: $header-height;} +.body-header { + width: 100%; + height: $header-height; +} .body-main { margin-top: 0px; diff --git a/frontend/src/assets/styles/_variables.scss b/frontend/src/assets/styles/_variables.scss index f6bccf7..06d6074 100644 --- a/frontend/src/assets/styles/_variables.scss +++ b/frontend/src/assets/styles/_variables.scss @@ -2,7 +2,7 @@ $shoutout: #f0783b; //for the shoutout texts // First override some or all individual color variables -$primary: #1748F8; // #0032fd; // #25408f; +$primary: #1748f8; // #0032fd; // #25408f; // $secondary: #8f5325; // $success: #3e8d63; // $info: #13101c; diff --git a/frontend/src/assets/styles/containers.scss b/frontend/src/assets/styles/containers.scss index be9f16e..b9db231 100644 --- a/frontend/src/assets/styles/containers.scss +++ b/frontend/src/assets/styles/containers.scss @@ -26,6 +26,13 @@ @extend .container-fluid; @extend .flex-row-box; } -.flex-1 {flex: 1;} -.flex-all-center {align-items: center; justify-content: center;} -.full-height {height: $body-height;} \ No newline at end of file +.flex-1 { + flex: 1; +} +.flex-all-center { + align-items: center; + justify-content: center; +} +.full-height { + height: $body-height; +} diff --git a/frontend/src/assets/styles/inputs.scss b/frontend/src/assets/styles/inputs.scss index bbbb434..0638b85 100644 --- a/frontend/src/assets/styles/inputs.scss +++ b/frontend/src/assets/styles/inputs.scss @@ -6,17 +6,39 @@ @extend .form-control; } -.input-container {width: 460px; height: 62px; border: 2px solid $primary; border-radius: 8px; display: flex; align-items: center; position: relative; - .form-group {width: 100% !important; border: none !important;} +.input-container { + width: 460px; + height: 62px; + border: 2px solid $primary; + border-radius: 8px; + display: flex; + align-items: center; + position: relative; + .form-group { + width: 100% !important; + border: none !important; + } .input-email { @extend .input-control-item; @extend .me-1; - border: none !important; box-shadow: none !important; outline: none !important + border: none !important; + box-shadow: none !important; + outline: none !important; } .btn-start { @extend .proceed-button; @extend .ms-1; - margin: 8px !important; border-radius: 12px !important; font-weight: 500; font-size: 16px; color: #F8F8F9; + margin: 8px !important; + border-radius: 12px !important; + font-weight: 500; + font-size: 16px; + color: #f8f8f9; } - .error-msg {position: absolute; bottom: -36px; color: #9EA2AF; font-size: 18px; margin: 0;} -} \ No newline at end of file + .error-msg { + position: absolute; + bottom: -36px; + color: #9ea2af; + font-size: 18px; + margin: 0; + } +} diff --git a/frontend/src/components/PDFReader.vue b/frontend/src/components/PDFReader.vue index ce12226..dac932d 100644 --- a/frontend/src/components/PDFReader.vue +++ b/frontend/src/components/PDFReader.vue @@ -6,7 +6,7 @@ - + \ No newline at end of file +.svg-icon { + width: 1rem; + height: 1rem; + vertical-align: -0.15em; + fill: currentColor; + overflow: hidden; +} + diff --git a/frontend/src/components/VueQuill.vue b/frontend/src/components/VueQuill.vue index e0b9c62..fdb3f0c 100644 --- a/frontend/src/components/VueQuill.vue +++ b/frontend/src/components/VueQuill.vue @@ -1,22 +1,28 @@ \ No newline at end of file +.vue-quill-container { + width: 100%; + height: 100%; + min-height: 100px; +} + diff --git a/frontend/src/footers/FooterGuest.vue b/frontend/src/footers/FooterGuest.vue index 1c61248..cf31e95 100644 --- a/frontend/src/footers/FooterGuest.vue +++ b/frontend/src/footers/FooterGuest.vue @@ -24,9 +24,18 @@ export default { diff --git a/frontend/src/headers/HeaderGuest.vue b/frontend/src/headers/HeaderGuest.vue index e2e0186..7f8b201 100644 --- a/frontend/src/headers/HeaderGuest.vue +++ b/frontend/src/headers/HeaderGuest.vue @@ -39,14 +39,25 @@ export default { diff --git a/frontend/src/headers/HeaderUser.vue b/frontend/src/headers/HeaderUser.vue index 88f09e3..1211e25 100644 --- a/frontend/src/headers/HeaderUser.vue +++ b/frontend/src/headers/HeaderUser.vue @@ -23,7 +23,13 @@
- +
-
- - -
- +
+ +
+ +

{{ message }}

@@ -93,5 +93,7 @@ export default { // @extend .proceed-button; // @extend .ms-1; // } -.mb-12 {margin-bottom: 12px;} +.mb-12 { + margin-bottom: 12px; +} diff --git a/frontend/src/pages/guest/SigninWithEmailAndPassword.vue b/frontend/src/pages/guest/SigninWithEmailAndPassword.vue index 9c29964..3bd2d74 100644 --- a/frontend/src/pages/guest/SigninWithEmailAndPassword.vue +++ b/frontend/src/pages/guest/SigninWithEmailAndPassword.vue @@ -20,7 +20,9 @@

{{ message }}

- +
@@ -111,11 +113,16 @@ export default { diff --git a/frontend/src/pages/public/PdfContentViewer.vue b/frontend/src/pages/public/PdfContentViewer.vue index c8a0dcb..b1692f2 100644 --- a/frontend/src/pages/public/PdfContentViewer.vue +++ b/frontend/src/pages/public/PdfContentViewer.vue @@ -16,7 +16,7 @@ export default { type: String } }, - components: {PDFReader}, + components: { PDFReader }, computed: {}, mounted() { // this.retrieve_blog_content() diff --git a/frontend/src/pages/user/workspace/requestIssue/Issue.vue b/frontend/src/pages/user/workspace/requestIssue/Issue.vue index 56cdad9..f427288 100644 --- a/frontend/src/pages/user/workspace/requestIssue/Issue.vue +++ b/frontend/src/pages/user/workspace/requestIssue/Issue.vue @@ -185,7 +185,7 @@ export default { type: String } }, - components: {VueQuill}, + components: { VueQuill }, mounted() { this.initProducts() this.initiateFromInput() diff --git a/frontend/vite.config.js b/frontend/vite.config.js index dd7c5a5..61854f6 100644 --- a/frontend/vite.config.js +++ b/frontend/vite.config.js @@ -38,7 +38,7 @@ export default defineConfig({ server: { proxy: { '^/api/': { - target: 'https://freeleaps-alpha.com', + target: 'https://localhost:8001/', ws: true, changeOrigin: true }