From 8eb83394f74d661c51f235776255c94e17ab315f Mon Sep 17 00:00:00 2001 From: Louis Lam Date: Sun, 17 Apr 2022 14:53:13 +0800 Subject: [PATCH] Refine UI/UX for custom css / footer text. Add switch for show/hide powered by --- db/patch-status-page-footer-css.sql | 6 ++ package.json | 2 + server/database.js | 1 + server/model/status_page.js | 6 ++ .../status-page-socket-handler.js | 3 + src/assets/app.scss | 4 + src/languages/de-DE.js | 2 +- src/languages/en.js | 2 +- src/pages/StatusPage.vue | 89 +++++++++++++------ 9 files changed, 87 insertions(+), 28 deletions(-) create mode 100644 db/patch-status-page-footer-css.sql diff --git a/db/patch-status-page-footer-css.sql b/db/patch-status-page-footer-css.sql new file mode 100644 index 00000000..413918f1 --- /dev/null +++ b/db/patch-status-page-footer-css.sql @@ -0,0 +1,6 @@ +-- You should not modify if this have pushed to Github, unless it does serious wrong with the db. +BEGIN TRANSACTION; +ALTER TABLE status_page ADD footer_text TEXT; +ALTER TABLE status_page ADD custom_css TEXT; +ALTER TABLE status_page ADD show_powered_by BOOLEAN NOT NULL DEFAULT 1; +COMMIT; diff --git a/package.json b/package.json index 73035922..305d79b8 100644 --- a/package.json +++ b/package.json @@ -91,6 +91,7 @@ "password-hash": "~1.2.2", "postcss-rtlcss": "~3.4.1", "postcss-scss": "~4.0.3", + "prismjs": "^1.27.0", "prom-client": "~13.2.0", "prometheus-api-metrics": "~3.2.1", "qrcode": "~1.5.0", @@ -110,6 +111,7 @@ "vue-i18n": "~9.1.9", "vue-image-crop-upload": "~3.0.3", "vue-multiselect": "~3.0.0-alpha.2", + "vue-prism-editor": "^2.0.0-alpha.2", "vue-qrcode": "~1.0.0", "vue-router": "~4.0.14", "vue-toastification": "~2.0.0-rc.5", diff --git a/server/database.js b/server/database.js index b398101e..330c2436 100644 --- a/server/database.js +++ b/server/database.js @@ -56,6 +56,7 @@ class Database { "patch-status-page.sql": true, "patch-proxy.sql": true, "patch-monitor-expiry-notification.sql": true, + "patch-status-page-footer-css.sql": true, } /** diff --git a/server/model/status_page.js b/server/model/status_page.js index 1383d3b0..b1befc25 100644 --- a/server/model/status_page.js +++ b/server/model/status_page.js @@ -92,6 +92,9 @@ class StatusPage extends BeanModel { published: !!this.published, showTags: !!this.show_tags, domainNameList: this.getDomainNameList(), + customCSS: this.custom_css, + footerText: this.footer_text, + showPoweredBy: !!this.show_powered_by, }; } @@ -104,6 +107,9 @@ class StatusPage extends BeanModel { theme: this.theme, published: !!this.published, showTags: !!this.show_tags, + customCSS: this.custom_css, + footerText: this.footer_text, + showPoweredBy: !!this.show_powered_by, }; } diff --git a/server/socket-handlers/status-page-socket-handler.js b/server/socket-handlers/status-page-socket-handler.js index 36e90fb9..a06271da 100644 --- a/server/socket-handlers/status-page-socket-handler.js +++ b/server/socket-handlers/status-page-socket-handler.js @@ -155,6 +155,9 @@ module.exports.statusPageSocketHandler = (socket) => { //statusPage.search_engine_index = ; statusPage.show_tags = config.showTags; //statusPage.password = null; + statusPage.footer_text = config.footerText; + statusPage.custom_css = config.customCSS; + statusPage.show_powered_by = config.showPoweredBy; statusPage.modified_date = R.isoDateTime(); await R.store(statusPage); diff --git a/src/assets/app.scss b/src/assets/app.scss index 0b27c6a6..c3f2fa79 100644 --- a/src/assets/app.scss +++ b/src/assets/app.scss @@ -469,6 +469,10 @@ textarea.form-control { color: $primary; } +.prism-editor__textarea { + outline: none !important; +} + // Localization @import "localization.scss"; diff --git a/src/languages/de-DE.js b/src/languages/de-DE.js index 63531dfa..1dd86e23 100644 --- a/src/languages/de-DE.js +++ b/src/languages/de-DE.js @@ -443,6 +443,6 @@ export default { "Fingerprint:": "Fingerabdruck:", "No status pages": "Keine Status-Seiten", Customize: "Anpassen", - "Custom Footer": "Eigener Footer (Leerlassen für Standard)", + "Custom Footer": "Eigener Footer", "Custom CSS": "Eigenes CSS", }; diff --git a/src/languages/en.js b/src/languages/en.js index 957a1356..1061f426 100644 --- a/src/languages/en.js +++ b/src/languages/en.js @@ -355,7 +355,7 @@ export default { serwersmsSenderName: "SMS Sender Name (registered via customer portal)", stackfield: "Stackfield", Customize: "Customize", - "Custom Footer": "Custom Footer (empty string for default)", + "Custom Footer": "Custom Footer", "Custom CSS": "Custom CSS", smtpDkimSettings: "DKIM Settings", smtpDkimDesc: "Please refer to the Nodemailer DKIM {0} for usage.", diff --git a/src/pages/StatusPage.vue b/src/pages/StatusPage.vue index 1b842c3d..da0bafb5 100644 --- a/src/pages/StatusPage.vue +++ b/src/pages/StatusPage.vue @@ -16,11 +16,18 @@ +
+ +
+ + +
+
@@ -31,6 +38,12 @@
+ +
+ + +
+
@@ -51,6 +64,12 @@
+ +
+
{{ $t("Custom CSS") }}
+ +
+
- -
@@ -180,15 +194,6 @@ - - -
@@ -253,8 +258,14 @@
@@ -278,6 +289,14 @@ import dayjs from "dayjs"; import Favico from "favico.js"; import { getResBaseURL } from "../util-frontend"; import Confirm from "../components/Confirm.vue"; +// import Prism Editor +import { PrismEditor } from "vue-prism-editor"; +import "vue-prism-editor/dist/prismeditor.min.css"; // import the styles somewhere + +// import highlighting library (you can use any library you want just return html string) +import { highlight, languages } from "prismjs/components/prism-core"; +import "prismjs/components/prism-css"; +import "prismjs/themes/prism-tomorrow.css"; // import syntax highlighting styles const toast = useToast(); @@ -296,6 +315,7 @@ export default { PublicGroupList, ImageCropUpload, Confirm, + PrismEditor, }, // Leave Page for vue route change @@ -324,7 +344,6 @@ export default { slug: null, enableEditMode: false, enableEditIncidentMode: false, - enableEditCustomizeMode: false, hasToken: false, config: {}, selectedMonitor: null, @@ -439,6 +458,13 @@ export default { this.$root.getSocket().emit("getStatusPage", this.slug, (res) => { if (res.ok) { this.config = res.config; + + if (!this.config.customCSS) { + this.config.customCSS = "body {\n" + + " \n" + + "}\n"; + } + } else { toast.error(res.msg); } @@ -541,6 +567,10 @@ export default { }, methods: { + highlighter(code) { + return highlight(code, languages.css); + }, + updateHeartbeatList() { // If editMode, it will use the data from websocket. if (! this.editMode) { @@ -726,14 +756,6 @@ export default { this.config.domainNameList.splice(index, 1); }, - /** customize status page */ - customizeStatusPage() { - if (this.editMode) { - // toggle modal - this.enableEditCustomizeMode = !this.enableEditCustomizeMode; - } - }, - } }; @@ -863,7 +885,7 @@ footer { } } -.incident, .customize { +.incident { .content { &[contenteditable="true"] { min-height: 60px; @@ -922,4 +944,19 @@ footer { } } +/* required class */ +.css-editor { + /* we dont use `language-` classes anymore so thats why we need to add background and text color manually */ + + border-radius: 1rem; + padding: 10px 5px; + border: 1px solid #ced4da; + + .dark & { + background: $dark-bg; + border: 1px solid $dark-border-color; + } + +} +