From 51eff6a29822fba9ef552b854885642a39348f91 Mon Sep 17 00:00:00 2001 From: glyph Date: Wed, 26 Jan 2022 11:44:25 +0200 Subject: [PATCH 1/8] add sbot status-related icons --- peach-web/static/icons/hermies.svg | 140 +++++++++++++++++++------- peach-web/static/icons/image-file.png | Bin 0 -> 3432 bytes peach-web/static/icons/orbits.png | Bin 0 -> 5889 bytes peach-web/static/icons/ram.png | Bin 0 -> 3536 bytes 4 files changed, 106 insertions(+), 34 deletions(-) create mode 100644 peach-web/static/icons/image-file.png create mode 100644 peach-web/static/icons/orbits.png create mode 100644 peach-web/static/icons/ram.png diff --git a/peach-web/static/icons/hermies.svg b/peach-web/static/icons/hermies.svg index 490f67f..b9c6fe9 100644 --- a/peach-web/static/icons/hermies.svg +++ b/peach-web/static/icons/hermies.svg @@ -1,23 +1,23 @@ - - - + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + inkscape:current-layer="svg4585" /> + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + id="layer5" + style="display:inline" + transform="translate(-1170,-1684.5924)"> + diff --git a/peach-web/static/icons/image-file.png b/peach-web/static/icons/image-file.png new file mode 100644 index 0000000000000000000000000000000000000000..5f135990072e67c6cbe979b75093d522604ecd51 GIT binary patch literal 3432 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 KMNUMnLSTYyuTZc6 literal 0 HcmV?d00001 diff --git a/peach-web/static/icons/orbits.png b/peach-web/static/icons/orbits.png new file mode 100644 index 0000000000000000000000000000000000000000..0b3e3994ce83d08df5344a8f89134d56b8af81f0 GIT binary patch literal 5889 zcmV+c7yjspP)gI|fAev92wqvd;uC}fFq&vpgs2b&M3yhq zCX{9&8Xu%qo2Xr}u`z2=H8IqrD@|h}d6?DuOl`1ewHhO+s5Gefh=~u-pacO$!0@E=gge%d>6CVnswoPXZGxwz0b^^J$v>x)>`&7Fvbi5Mnq*K@Cl$l z&Xh#|VrmG8pF{Ur@SzrP%4mbqpTTpXv0#5>q zqQ5WME zn3Pqv0`~*I1{PRr-z}`U95%FQ)8IJ0kRb%A~uL8Ne9R1Gp0S2GG0C>#KpE0Jm9d-zb{4 z5D@7wGl4H42B%u^7Vr<&+W&OmnFJgTd>R;v=rc=V<+on8h!Vb(Nr+-r?+aNDTnzLq z`|I}TYae9BdOAga9|I1L>KzK)lcJ6V9tH;Irm=y8(E{9nOy#vY^b#-wXepb4f%`uV zSW&0%+kyGf-!#mxmW{xLO)CJvU_=A1)rqyh7l{_Km)0^F#K(+fcN zl=XW!mV=pT>Q@K^#+V_9ra#*8%C~{Z*4lSMwYi7D(aN)%thFDescgmnV2<)rDzkc? z)2&Wmj2VcmJ0q2!cK~0u)@nrl8DvM0gl9A2cv^XuN&vh~!OHx+V1N;XtS^0T$#QaC{;?GD+i!tUj zW6Yh1(dm6-%x|JELxVGcgJb{ihnSyT_`4fp<``ohH^w|hMzNFxOmXv29 z$Sy!Tg1$Oc{hUNkaSV6|FtuQ&cL%-#{J}v(yxix&VG!Sfozo>XP8}nL)N1E%%s&e`53k4gYPqrwzT<(DQnY(l%J!B6pUc=M zgDBBST-$+bTr)xRAzX`Y37nU@{fxx6;6By6zCgww?HD9iSq+>Uu>HP>8&}%)7XY8m zfPW~WG;6q?MV5)9k(*4TfWJYEMcVt@fkTTD0N1)dp91XqzyXM&SSB8ulNz{y3> z645gjxVZ+il8pEv&_5;anHdDER+*ovPZ>Ht$-#&<6ky&3PQ_kvllYu*XrCW!0BZ(UZMTuh_+g^{}jjZZUWa( z((63hQL+WT5JUhF*KN&(X$b+>THqkynHn8^7jcYeT31E-0Ik0s1%-Q3AC-z6kUU)Xre^rCPOy))fGBd$|R^7>MAW z$YluE6uHMZivlMgI*iuW#|U)!1#vmo+Bhwb04z`ty+i=NeME6_-3ffB-n7*f3-EEo zW}@}^mjqC#k$VT)<&!5f2>@mz`u!%XW?C`Am-f7j=p~{P#e=6_z%k> z0P_?C%L$;2ApxB<>sdP=0dHa8RCFWP4q$wsHZ;fF@23&~WJ{(o=;8o`^+G?*EBqL_ znF_iOfJLmWnU9ne{1+;?H)y!E%HLEfuOfh=0?c-F{EC7Hd@ta1;Jd(`h~l-BUEyMu zM$hhy-Z>rEt6-X3{`|88;O>KNjOw(6Yn7KP6}?Tqh*e9Q`W8~ag-|45!%W~_@?FMk zi|WoK<%wQK`YK2`n`FBmlJZhV9sEC4a6evC0FdKOZEYInNlXjyyn_3EU_{`7?TrMU z*qDRquCg)08T7;v3H+da6icY%*qQ>jOOfBr0-3CIllFxM=;&n*Vy+4}m@P;^iPZra zpDe4RHiB6ukqa|gTbBpGt@#S>w%drm+#LyYn5>X1@IVZ21$|jb?f96Yjs4N5)1t~^ zVE;h0_d-J2CEIw*cYGWl-g;vCT>Rxzl$YD^49EnWt>En-z&aPjIdM7QuAl6DG^sUy$Uwh*1k8H1#cu&*>;5*8TcLnI&qYB=80u9`B zM2~PWsU10x8AS#~6FG_<71h-Suv*>+rU&ZFg9`pd0r38pf_JCOc>G1};O8RG#*c6e z-1q<;`+NP+nT@+3-O0>G^z5 zyuHx3los)nDJ=c~urF@6_*Hl+hQOr?-fg7tAgY10g4|+C;yv8jU3UW~&>4L1^_?0q zD-LTB#|0nwH{eL+`CZ6aLSgX-BHRi~ zodPgUd0|1`MkCOK>ffzL=yYSu4CGQo5?(}{M+#5Y5VdhWk|-hxp8+oNz}<#8#U|mz zyf`CRq&yo}Z4~q=!q@uurh+r~rBPrIutmYS2^d+_v|ndA&~$>;cvuY4w}kI_(mGMW z`9|~`gOnfJ@o-Q;oF6otxlg(fZ(D8cP38VvkPwVU-yM9z1Lt1oThC8=;Ov8Laz3zv zTx>|f>((#cz83F)v9-3{1LsWT*-xwzWVumbt$hZ#UHR#2#+d#&alQ{crTjEL555Rz z8{&JJgd<%7uq8#jWOeZPbMCBAV=3_!z@HokHbE|=R9yesyy@6171>|4XmIC zb}B*uv`(c3?d$)QZGt?0*4h=w#f>CP@jzRI0IXA<4X7YV6_b!VIdWERtTR@vVevv*E>ARa+U7*IhD43eK+1wsqJe#*0E6o8}-0J`v|g+|N(4O;>} z3NwHv06sH7!vr8SXsKSU2R>~E@X;x{3TV9XvCeiV&$?BR1C}Jz4>IfqZNHhzEE>Uk z%Cmz!@D&Bx*RIV9W#Q9!x}}0X-S6YkkUG_P;CoSdc7zAMqCjJq&r%f{pT^V8E&*t! z89+P4Xhs3hwtUS#18gp03HYea04FHVe9kID&j6X0fY395&;GUP1t1EYe}?kYV>$6v z5QmdESakDnT5!$)8pC|{ubNNZaF2tGrF1?RNt>pY9&07SJ3fkM+QJE)pHP1EF`i2d!+->+N@O;Tu0|6X%iAZI4_*7JX`324|JZs2E{mqYFRMe zF3Wkdi#df3a^O6~17`)@(R5Jtg`jTX$eORYaPKh@z$nfw`~n5%E1t9tQ*i#t+Fdt; zG#4F1I5mi}g`HxI(asAB17l1NWQy06wQH@lTRqTg)Bn95_(137QrLCi z@TBs>NuG^r?%LC%!Se=V%y1+q;)B2nW6aed@TO?D7jP?*Zzu^*As1rv;_i)volkKF}2WuL-=HDLDBf;y~-Vm>S}8s1{6P4W2=?&?B^*5nlqH zp!0FzFk{Tn^g^~fSZg;U!3mOZL0+5*NLm;7M)w~K0>+rLkgzt|#ng7-Y-_ErpTbv^ zXZP8Ni+Ld8;jqNx4ut2#rKE@e5yvSww-X>T7%~ON@jg-DSAP?=a|0C_Ai^2wIVIkU z6r9iO{5|$!Q6XY}uiy<8BIZ!wUy#UMdk18C1z8p!ti$-NftX)G51aoo{^8=ZoQL13 z{=PGNxH0CGsKasCiUcRf?ILE3xg3eLlY|M@+Q;(Z%}B#Il^wV1){fbKirNmM8*P^2q_`31D~-bqv_BvfpK`*8(#8@h>d z3v%sxK!A2#0jjf<^%0}IBY7ui+YdR8PqsHV0PbPv`pa0S07Mmw3>IB0)S6aS9=)e|{1OSbzVVRlKg6x^L`J6gpe!^Pj6^9%G9g6@b`e;Hyx znui=OZ;Z;Ti1Wtn$c%9^DH1$-(sY}nuRjVTTw1i#Z>AA|A`?cqLZYUb3A~qsW+}i` zj()xc3<`k%Vg>gOlvqkG1cjuG!JQ~-1ri;V1dW$~egP2xYwdg_bx9JwYmDia zoi?o3|bxjGJ9Tx&5II?Ch zXs3&05l1Y1nvthko(;@=mvidfb?c@;J_J4O+7j*St%K_k$ACN!{4;X2`-nTV0&);u}<;^jF4rC1Hjg!9ms zt=+VJ0_R9XH~Cs(X<GuX;s*nZP1Dh5M0&3WeJ46Mg87IB;sVl4N;{02V%l zhJDd(B|CsgsqtiN^ae*K=aXF@7>?)!no#XPl+Tk8g)q%2;yU056m7z*@-}b} z@Q=tv%S`@)(E#s@7@oe$F0bjd?a!sa`UkS`Dx$@;A_@eEk{ofFveVhcy1+O z1Coq$WhR6dJyB%2ioz- z4V00FV-X#}b;4F;S%ai#KaGGsf;IX&5qB2TOzVCq0WiQF4uUq}nej3sEv-mWi3RAl zl0%hO5rfrn1m4fr>EAKYm})fL;X_Mi9Uu?&3xu2lxAy2~v zAR>MswSDmCQ($uEu3nI3%4OlR(bxw0@(U4ws1tpFhiY_U4H*xRJ_-e~hPphWZ8WBR zg11{xXS(CwB3AW+S$|#IIvKi7q#`lZ*TLtrEGI;WISpkR!rU&9^n#L_`6{0132dQXa|As|0Yge?B zr7aqZhPkwrE&#EC8iM=Aur@s|L_)N*md#|PFRc-63sWp})p9oht$JNf0AhnT89h#6 zt*_=TBnIBl66qcq(QsGF*{oWgq0Wt+MiuYVz>r{!nFM^D>}l8EKpadL0E>YY)>@w= ziyCbe#1-vW#94JB*^ikY0cP7;cl8Ch#Q60$ol3l3#=!pr XL>bi8RwuQD00000NkvXXu0mjfc`pMK literal 0 HcmV?d00001 diff --git a/peach-web/static/icons/ram.png b/peach-web/static/icons/ram.png new file mode 100644 index 0000000000000000000000000000000000000000..7f601af789c9c21aa58a661c4671809404a3b0e5 GIT binary patch literal 3536 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 F{{Sdom16(^ literal 0 HcmV?d00001 -- 2.40.1 From de9b8f5d7346840674f31c477a35e3e058504cdd Mon Sep 17 00:00:00 2001 From: glyph Date: Wed, 26 Jan 2022 11:45:25 +0200 Subject: [PATCH 2/8] serialize sbot stat struct --- peach-stats/src/sbot.rs | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/peach-stats/src/sbot.rs b/peach-stats/src/sbot.rs index b67a417..22a9579 100644 --- a/peach-stats/src/sbot.rs +++ b/peach-stats/src/sbot.rs @@ -2,19 +2,27 @@ use std::{process::Command, str}; +#[cfg(feature = "miniserde_support")] +use miniserde::{Deserialize, Serialize}; + +#[cfg(feature = "serde_support")] +use serde::{Deserialize, Serialize}; + use crate::StatsError; /// go-sbot process statistics. #[derive(Debug)] +#[cfg_attr(feature = "miniserde_support", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "serde_support", derive(Serialize, Deserialize))] pub struct SbotStat { /// Current process state. - state: String, + pub state: String, /// Current process memory usage in bytes. - memory: Option, + pub memory: Option, /// Uptime for the process (if state is `active`). - uptime: Option, + pub uptime: Option, /// Downtime for the process (if state is `inactive`). - downtime: Option, + pub downtime: Option, } impl SbotStat { -- 2.40.1 From 6f03063f8da7c3e98965a0af9a0a142740d4e441 Mon Sep 17 00:00:00 2001 From: glyph Date: Wed, 26 Jan 2022 11:45:59 +0200 Subject: [PATCH 3/8] add managed state for conditional template element rendering --- peach-web/src/routes/settings/menu.rs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/peach-web/src/routes/settings/menu.rs b/peach-web/src/routes/settings/menu.rs index bb7db5d..69572cc 100644 --- a/peach-web/src/routes/settings/menu.rs +++ b/peach-web/src/routes/settings/menu.rs @@ -1,17 +1,25 @@ -use rocket::{get, request::FlashMessage}; +use rocket::{get, request::FlashMessage, State}; use rocket_dyn_templates::{tera::Context, Template}; use crate::routes::authentication::Authenticated; +use crate::RocketConfig; // HELPERS AND ROUTES FOR /settings /// View and delete currently configured admin. #[get("/settings")] -pub fn settings_menu(flash: Option, _auth: Authenticated) -> Template { +pub fn settings_menu( + _auth: Authenticated, + flash: Option, + config: &State, +) -> Template { let mut context = Context::new(); context.insert("back", &Some("/".to_string())); context.insert("title", &Some("Settings".to_string())); + // pass in mode from managed state so we can conditionally render html elements + context.insert("standalone_mode", &config.standalone_mode); + // check to see if there is a flash message to display if let Some(flash) = flash { context.insert("flash_name", &Some(flash.kind().to_string())); -- 2.40.1 From 476eaa540e6e09b1727556b5e9e053eedf39135b Mon Sep 17 00:00:00 2001 From: glyph Date: Wed, 26 Jan 2022 11:46:14 +0200 Subject: [PATCH 4/8] add managed state for conditional template element rendering --- peach-web/src/routes/status/scuttlebutt.rs | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/peach-web/src/routes/status/scuttlebutt.rs b/peach-web/src/routes/status/scuttlebutt.rs index 5ed3df1..aab41fb 100644 --- a/peach-web/src/routes/status/scuttlebutt.rs +++ b/peach-web/src/routes/status/scuttlebutt.rs @@ -1,16 +1,30 @@ -use rocket::get; +use peach_stats::sbot; +use rocket::{get, State}; use rocket_dyn_templates::{tera::Context, Template}; use crate::routes::authentication::Authenticated; +use crate::RocketConfig; // HELPERS AND ROUTES FOR /status/scuttlebutt #[get("/scuttlebutt")] -pub fn scuttlebutt_status(_auth: Authenticated) -> Template { +pub fn scuttlebutt_status(_auth: Authenticated, config: &State) -> Template { let mut context = Context::new(); + // retrieve go-sbot systemd process stats + let sbot_stats = sbot::sbot_stats().ok(); + context.insert("sbot_stats", &sbot_stats); context.insert("flash_name", &None::<()>); context.insert("flash_msg", &None::<()>); context.insert("title", &Some("Scuttlebutt Status")); + // define back arrow url based on mode + if config.standalone_mode { + // return to home page + context.insert("back", &Some("/")); + } else { + // return to status menu + context.insert("back", &Some("/status")); + } + Template::render("status/scuttlebutt", &context.into_json()) } -- 2.40.1 From 445c05e3ee5d925f0ccff921db7b816a2a3bfef0 Mon Sep 17 00:00:00 2001 From: glyph Date: Wed, 26 Jan 2022 11:46:49 +0200 Subject: [PATCH 5/8] style horizontal lines --- peach-web/templates/status/network.html.tera | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/peach-web/templates/status/network.html.tera b/peach-web/templates/status/network.html.tera index eaf630a..432a777 100644 --- a/peach-web/templates/status/network.html.tera +++ b/peach-web/templates/status/network.html.tera @@ -31,7 +31,7 @@ -
+
@@ -110,7 +110,7 @@
-
+
-- 2.40.1 From b7ec1a42be0e835869e3f4bb70618b87592ca8a9 Mon Sep 17 00:00:00 2001 From: glyph Date: Wed, 26 Jan 2022 11:47:44 +0200 Subject: [PATCH 6/8] conditionally render network settings button --- peach-web/templates/settings/menu.html.tera | 2 ++ 1 file changed, 2 insertions(+) diff --git a/peach-web/templates/settings/menu.html.tera b/peach-web/templates/settings/menu.html.tera index 8a7bdd0..4ac241e 100644 --- a/peach-web/templates/settings/menu.html.tera +++ b/peach-web/templates/settings/menu.html.tera @@ -4,7 +4,9 @@
+ {% if standalone_mode == false %} Network + {% endif %} Scuttlebutt Administration
-- 2.40.1 From e718889485dbdfa447b9b470c0dfe5e78c5818f5 Mon Sep 17 00:00:00 2001 From: glyph Date: Wed, 26 Jan 2022 11:48:34 +0200 Subject: [PATCH 7/8] update sbot status page and add live data retrieval --- .../templates/status/scuttlebutt.html.tera | 95 +++++++++++++++++-- 1 file changed, 88 insertions(+), 7 deletions(-) diff --git a/peach-web/templates/status/scuttlebutt.html.tera b/peach-web/templates/status/scuttlebutt.html.tera index 29181de..4268c07 100644 --- a/peach-web/templates/status/scuttlebutt.html.tera +++ b/peach-web/templates/status/scuttlebutt.html.tera @@ -1,17 +1,98 @@ {%- extends "nav" -%} {%- block card %} + {# ASSIGN VARIABLES #} + {# ---------------- #} + {%- if sbot_stats.memory -%} + {% set mem = sbot_stats.memory / 1024 / 1024 | round -%} + {%- else -%} + {% set mem = "X" -%} + {%- endif -%}
-
-

Network key:

-

Replication hops:

-

Sbot version:

-

Process status:

-

Process uptime:

+ +
+ +
+ + + Configure + + + +
+ Hermies + +
+ + +
+ +

1.1.0-alpha

+ {% if sbot_stats.state == "active" %} + +

{{ sbot_stats.uptime }}

+ {%- else -%} + +

{{ sbot_stats.downtime }}

+ {%- endif -%} +
+
+
+
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ + +
+ +
+
+ +
+ + +
+ +
+
{%- endblock card -%} -- 2.40.1 From abda4373aee876fd8f91ecea9f6afa3d225ef7cf Mon Sep 17 00:00:00 2001 From: glyph Date: Wed, 26 Jan 2022 12:10:28 +0200 Subject: [PATCH 8/8] conditional font colour rendering --- peach-web/templates/status/scuttlebutt.html.tera | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/peach-web/templates/status/scuttlebutt.html.tera b/peach-web/templates/status/scuttlebutt.html.tera index 4268c07..81f06e2 100644 --- a/peach-web/templates/status/scuttlebutt.html.tera +++ b/peach-web/templates/status/scuttlebutt.html.tera @@ -87,8 +87,8 @@
- - + +
-- 2.40.1