diff --git a/gui/package.json b/gui/package.json index 1058c087..3869d436 100644 --- a/gui/package.json +++ b/gui/package.json @@ -15,7 +15,7 @@ "buefy": "0.9.3", "clipboard": "^2.0.4", "core-js": "^3.1.2", - "dayjs": "^1.8.16", + "dayjs": "^1.10.6", "js-base64": "^2.5.1", "normalize.css": "^8.0.1", "qrcode": "^1.4.2", diff --git a/gui/public/img/icons/switch-menu.svg b/gui/public/img/icons/switch-menu.svg new file mode 100644 index 00000000..e4131a39 --- /dev/null +++ b/gui/public/img/icons/switch-menu.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/gui/src/App.vue b/gui/src/App.vue index 57636e1b..e336bade 100644 --- a/gui/src/App.vue +++ b/gui/src/App.vue @@ -26,9 +26,9 @@ @active-change="handleOutboundDropdownActiveChange" > {{ $t("operations.addOutbound") }} + >{{ $t("operations.addOutbound") }} + - + - + { + // console.log("ws opened"); + // + }; + ws.onmessage = msg => { + msg.data && that.handleMessage(JSON.parse(msg.data)); + }; + ws.onclose = () => { + ws.onmessage = null; + that.ws = null; + // console.log("ws closed"); + setTimeout(() => { + if (that.ws === null) { + that.connectWsMessage(); + } + }, 3000); + }; + this.ws = ws; + }, + handleMessage(msg) { + if (msg.type === "observatory") { + this.observatory = msg; + } + }, handleOutboundDropdownActiveChange(active) { if (active) { this.updateOutboundDropdown = false; @@ -263,12 +323,8 @@ export default { } else { return `${outbound} - ${this.runningState.outboundToServerName[outbound]}`; } - } else { - return outbound; } - return this.runningState.outboundToServerName[outbound] - ? `${outbound} - ${this.runningState.outboundToServerName[outbound]}` - : outbound; + return outbound; }, handleAddOutbound() { this.$buefy.dialog.prompt({ @@ -583,6 +639,7 @@ a { color: rgba(0, 0, 0, 0.45); animation: loading-rotate 2s infinite linear; } + .modal-custom-ports { z-index: 999; } @@ -592,20 +649,25 @@ a { margin-bottom: 0.5em; } } + .about-small { font-size: 0.85em; text-indent: 1em; color: rgba(0, 0, 0, 0.6); } + .margin-right-2em { margin-right: 2em; } + .justify-content-space-between { justify-content: space-between; } + .padding-right-1rem { padding-right: 1rem !important; } + #statusTag { width: 5em; } diff --git a/gui/src/assets/iconfont/fonts/_font-preview.html b/gui/src/assets/iconfont/fonts/_font-preview.html index 56162393..39ff5bb1 100644 --- a/gui/src/assets/iconfont/fonts/_font-preview.html +++ b/gui/src/assets/iconfont/fonts/_font-preview.html @@ -51,7 +51,7 @@
-

iconfont (30)

+

iconfont (31)

Class name prefix: icon-

@@ -187,6 +187,11 @@
+
+
icon-switch-menu
+
+
+
icon-sync
diff --git a/gui/src/assets/iconfont/fonts/font.css b/gui/src/assets/iconfont/fonts/font.css index 96b10497..f1b7553e 100644 --- a/gui/src/assets/iconfont/fonts/font.css +++ b/gui/src/assets/iconfont/fonts/font.css @@ -1,10 +1,10 @@ @font-face { font-family: iconfont; - src: url("iconfont.eot");src: url("iconfont.eot?5b1dd27b#iefix") format("embedded-opentype"), - url("iconfont.woff2?5b1dd27b") format("woff2"), - url("iconfont.woff?5b1dd27b") format("woff"), - url("iconfont.ttf?5b1dd27b") format("truetype"), - url("iconfont.svg?5b1dd27b#iconfont") format("svg"); + src: url("iconfont.eot");src: url("iconfont.eot?238fde36#iefix") format("embedded-opentype"), + url("iconfont.woff2?238fde36") format("woff2"), + url("iconfont.woff?238fde36") format("woff"), + url("iconfont.ttf?238fde36") format("truetype"), + url("iconfont.svg?238fde36#iconfont") format("svg"); font-weight: normal; font-style: normal; } @@ -121,18 +121,22 @@ content: "\ea1a"; } -.icon-sync::before { +.icon-switch-menu::before { content: "\ea1b"; } -.icon-wave::before { +.icon-sync::before { content: "\ea1c"; } -.icon-wendangxiugai::before { +.icon-wave::before { content: "\ea1d"; } -.icon-winfo-icon-chakanbaogao::before { +.icon-wendangxiugai::before { content: "\ea1e"; } + +.icon-winfo-icon-chakanbaogao::before { + content: "\ea1f"; +} diff --git a/gui/src/assets/iconfont/fonts/fonts.js b/gui/src/assets/iconfont/fonts/fonts.js index c87cb192..67e91061 100644 --- a/gui/src/assets/iconfont/fonts/fonts.js +++ b/gui/src/assets/iconfont/fonts/fonts.js @@ -131,23 +131,28 @@ export default [ "svg": "" }, { - "name": "sync", + "name": "switch-menu", "unicode": "ea1b", + "svg": "" + }, + { + "name": "sync", + "unicode": "ea1c", "svg": "" }, { "name": "wave", - "unicode": "ea1c", + "unicode": "ea1d", "svg": "" }, { "name": "wendangxiugai", - "unicode": "ea1d", + "unicode": "ea1e", "svg": "" }, { "name": "winfo-icon-chakanbaogao", - "unicode": "ea1e", + "unicode": "ea1f", "svg": "" } ] diff --git a/gui/src/assets/iconfont/fonts/iconfont.eot b/gui/src/assets/iconfont/fonts/iconfont.eot index 4aabefda..e61cfe87 100644 Binary files a/gui/src/assets/iconfont/fonts/iconfont.eot and b/gui/src/assets/iconfont/fonts/iconfont.eot differ diff --git a/gui/src/assets/iconfont/fonts/iconfont.svg b/gui/src/assets/iconfont/fonts/iconfont.svg index ba0752ee..5e0929b7 100644 --- a/gui/src/assets/iconfont/fonts/iconfont.svg +++ b/gui/src/assets/iconfont/fonts/iconfont.svg @@ -85,17 +85,20 @@ - + diff --git a/gui/src/assets/iconfont/fonts/iconfont.ttf b/gui/src/assets/iconfont/fonts/iconfont.ttf index 0f97936e..c4b56b4a 100644 Binary files a/gui/src/assets/iconfont/fonts/iconfont.ttf and b/gui/src/assets/iconfont/fonts/iconfont.ttf differ diff --git a/gui/src/assets/iconfont/fonts/iconfont.woff b/gui/src/assets/iconfont/fonts/iconfont.woff index 9bd502c1..3d195e20 100644 Binary files a/gui/src/assets/iconfont/fonts/iconfont.woff and b/gui/src/assets/iconfont/fonts/iconfont.woff differ diff --git a/gui/src/assets/iconfont/fonts/iconfont.woff2 b/gui/src/assets/iconfont/fonts/iconfont.woff2 index 1d3993de..0d05508c 100644 Binary files a/gui/src/assets/iconfont/fonts/iconfont.woff2 and b/gui/src/assets/iconfont/fonts/iconfont.woff2 differ diff --git a/gui/src/assets/iconfont/svgs/switch-menu.svg b/gui/src/assets/iconfont/svgs/switch-menu.svg new file mode 100644 index 00000000..e4131a39 --- /dev/null +++ b/gui/src/assets/iconfont/svgs/switch-menu.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/gui/src/assets/js/utils.js b/gui/src/assets/js/utils.js index 81651780..f1daadcc 100644 --- a/gui/src/assets/js/utils.js +++ b/gui/src/assets/js/utils.js @@ -95,7 +95,11 @@ function parseURL(u) { password: a.password, protocol: fakeProto ? protocol : a.protocol.replace(":", ""), host: a.hostname, - port: a.port ? parseInt(a.port) : 80, + port: a.port + ? parseInt(a.port) + : protocol === "https" || protocol === "wss" + ? 443 + : 80, query: a.search, params: (function() { var ret = {}, diff --git a/gui/src/assets/scss/buefy.scss b/gui/src/assets/scss/buefy.scss index 7e1afd9b..f9147234 100644 --- a/gui/src/assets/scss/buefy.scss +++ b/gui/src/assets/scss/buefy.scss @@ -8,6 +8,8 @@ $primary: $warning; $primary-invert: findColorInvert($primary); $twitter: #4099FF; $twitter-invert: findColorInvert($twitter); +$lightblue: #acd1f0; +$lightblue-invert: findColorInvert($lightblue); $warning: #ff845e; $warning-invert: findColorInvert($warning); @@ -35,7 +37,8 @@ $colors: ( "danger": ($danger, $danger-invert), "twitter": ($twitter, $twitter-invert), "green": ($green, $green-invert), - "delete": ($delete, $delete-invert) + "delete": ($delete, $delete-invert), + "lightblue": ($lightblue, $lightblue-invert) ); // Links diff --git a/gui/src/node.vue b/gui/src/node.vue index f52ca8a4..55a94023 100644 --- a/gui/src/node.vue +++ b/gui/src/node.vue @@ -1,5 +1,61 @@