From 721d1e8d6b48da7e60b35874d602975ed21bccab Mon Sep 17 00:00:00 2001 From: Christian Ditaputratama Date: Mon, 4 Nov 2024 16:36:22 +0700 Subject: [PATCH] feat: Added modal --- bun.lockb | Bin 46093 -> 47163 bytes internal/handler/response.go | 42 +++ internal/handler/routes.go | 1 + internal/handler/views/layout.templ | 24 ++ internal/handler/views/layout_templ.go | 52 +++- internal/handler/views/remote_nodes.templ | 20 +- internal/handler/views/remote_nodes_templ.go | 263 +++++++++++-------- internal/handler/views/src/css/main.css | 17 ++ internal/handler/views/src/js/main.js | 2 + package.json | 2 + tailwind.config.js | 6 +- 11 files changed, 319 insertions(+), 110 deletions(-) diff --git a/bun.lockb b/bun.lockb index 997b7580c52afa4252f18b0a77a594dd6b53e315..cbfeff8f34c7f2f7c0f3508162b962ff87209a43 100755 GIT binary patch delta 7260 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 IwDwp22H-ev1ONa4 delta 6655 zcmeHLdstOf7C-yI1r84ZMK6b|5{Tv_uROgf%26>>2w#bCF&|ezMR};;17F-!R8Rz3 zmSLG%IcZvH#V)j zUTg2Q*52o`-}pwZ`BJX4cR95Gvu}1xEV#Mx^v6q&jp>)yYvWgYLqB*WvZLCo>gSSe z(Tf@-z0I%BimYf^ZZLPAsdx>LBzK~aBrE7<&=#P%rKS0$xsntGz7_aQ&{IImT}6dF zIu!jO;Jr-!86~A<7$a@*lB6K??}v^*XtArfq##d{z6al;0v)sROG^spm13nCT=h-0W8Bkup36mC-cArvMGD(`| zXN)_9ezt!J{5YN&$AdfOVmZ8`NwZwJ`K6L{1q}Bm;=zWOgR*>^slN%7`E@2O%AYkQ zKVFhNj;rW|u&QZ+M!W*x3a{=g&|uJV60%k40K;tiMT(Lmg)a?|twX;+7N z$py*|*Fu45W`tqjIZz(>Uktg=*o=w%+RkOnk|+ETD15pfZYN1lb*F-= z@Z=6}ZwT!4mRDr{)Uu*^_L5ms`j}ZeiJIfQl;#)a=axy*QSiL3Jn&OoW%(VT$7VhI zp;weqZk<6n4sAhsJTf97MDDZE$WG%p@9AE2(swEi@f#tssliVZ>C}Yh%cLrras!(r z5z1cV3UnxOvLp=y=S@+HL#Y6V$w7A3&ms1b>aU3l^DkrU5XsUc94zp>D%z!W73`-pwZy001!xrlc z4Vhd44zZIO(DxJi*r80DgB>E7)DTU$$r++4uOo{_P@;kz%5`u&)|baB15qLD*}|ig zT5ud9$O0YWFg1i~iUl>reKMVeFOAfenrI+rOHDZj3D47_2Q+}1AQ?w$D^1jq6VG?4 zp_Qgsk@Wu15_)halNzRp9pnttl&>J^1&J3$A?$I~guVi737(Jc&GKh(Y4k}@vf_s# zyrbKnnp$gOBdKjPVIwD=h17uOGt|^ZQ?8hrI`QQfYGUkqfW9LTFgK=CK3&d2!1Jo3uiEX6XH07Kr@#QcpZE}?G{3T+N`D1|16-2p2vfMXAOKE*k5MrmR$ zHQ;%enxZtNM|;#0Z{(GzX< zH%EC~41l9fy4Tcej6%tNJ{vPO! zDJu>)Se-JDLs>U83KS==`LT!dfM)g2t5NFq0WHrtE$$z+UD9tiJ%@#+3UPGlO;Kq~%E0{t1Pn7klbuEMPgjbvV@29ZhMW5J>IMkWLnR4Ac z2C&(60Jr8S%Num*9m*`ni}5?RoRP3-9*K50Wd|_;ueZ6qhHkyz8}zO{$K8Kyxj(j? zUI+h|Tkd||`Tz5lYjpPL+mY_iOczB|pP5CyGK1)Qa3wTgOcs3!Zp)Z-F_W%>dtyuw zWoD&|QreuAMMJWJ$da8dX4A;*EV>SEH@LYZoLRIrJBad~>7tyJob7(sFjIfTkVg7- zraC`w`ZCAu7mE$o!sra+PQ~-D@`sJ}V?XfnOU7@%5SH&6KZ4~U|H4l^w&H`IY%FLz zG2soFYW*x!H_6ZMKzrjKFZ6~B)|byl(-*m;8XwH-YW2@9H}W`SKDAodzvAXCqj6^` zz>(wwi<^h%a|6GP^;U)_>+l(ZIqPjUp4`Xh27aySZ4RCuTgFG*IP|%X53^ai77p!s zcwqeAY!50VSUdRA^`8aRPJ*FtT&Ghqb*!$ zQ2)L(YEjRQd>C`})B}$K1n{|E1FQkql`rjDG`xb3@yCH$ARdSTIstrI-UoCCMgb22 zqk&9d43Gt61A~Dfz)&C^$N>5P$v{7#Cy)T}>D(DWCiRn-zg{bOZB=*~4@>|i0xn<@ zkPGlnf*fEh-~fgJ{eb~MEYJg}2Kbvi11JItfjl4|;GYouduR|a5a4e$r-{peGc#MF zn~Qxait#!bm;y`%dIS73rxI8WECQASZeSX~KO{I&oERIB2J{7@fk=Q8%lY8k%muh0 zIC0E-`nU26T404l>5HO*SkAgUy`si{=ES%Tz0{H zf1VTCku}tHNmm-Nq`kEzCcZ!P{PTMPQ@6-se5^gmjs5UJ$5^nzGN zSC^_{69p_&ZQEc1CFtH2)c#ym&9?3s7iW*R$4gQpomknXSCS;{H&sfjhTMF0OUy!D zCDx9#95N-gZ55xrbbhx4NuoX09*6rSs)6w{kfWB})w8DUAD4FFUC0w4$H?>a)-qN8 zUZOM0!fl@GIOp~b7lSJ2?1NfQ!%QdzSE@G8b>8rw4({IPJ!$3Wsw zDkHF_?Ufn$$Ns0v3|q6)j$`Lr$hBM*duRckN9nQU88**7-m}x@%r3tDcc7bOtZX?AU#TXQBRU}n(5k$(yY`(r{F!bmmZM)~N)FujICbJe(kNQUDcIsUnM3R6UY(!c4}~%il=ddZWdkWU)BO4x6Zu z7RDJqD0t`dWi`jEA;Id6H1(@a5HHfqYE@rX7;UV!7;iqY_Czy}HqW)zldbn$jHui< z9g~f}<4A|(6FkumEXu@hW$#XTSwrp8Ax#Mr(2L;vl_K>{pST!-_Bl(9exHq_`|>8 zmuuDG(cwlG^PC6YemZ!QMHWHm!9;G~T4sK5DQ132h!g&M87s?xMi4aO{I7o1b#R!s zEPA7dbF`M8T%+2|3sU!uLa}p3^q^B1nP`mkqQ64!xk$|sPn{n8<3^6DS>G&g|Y!+N~^jC$l?7_@pC?vB$&Xz2@W z&Z&7^7;?|$>!rM$%uo8hIS5vI8%Nq1imFqEos#QRn{oAuJMOEyPoCEH8O4a2O_Uy{ z639I_vJ;2q21Hk7^3u(6V7b*h5x1~(vMyde8A*Zl@uDqh^=gvm#+8C#HGJYF z+EK*#Iz<_Q-E`vh87Ep4uhAv3c6>Dxsit0Sm1=I!wCjfpEnh!7Iz&83d+Vc&!!6}3 zzBs6B_xqbK#z%i1*AJu3JT z*S-9S<&%Hi&4hu4JJVbK+R!lC_Go0EdBMgJemZl(b6MN(QI~=b#HdHCnJsRGC4O29 no=>oMdQW&ro73mxznD&EH + } @@ -65,3 +66,26 @@ templ BaseLayout(m Meta, cmp templ.Component) { templ BlankLayout(cmp templ.Component) { @cmp } + +templ ModalLayout(title string, cmp templ.Component) { +
+
+
+

{ title }

+ +
+
+ @cmp +
+
+ +
+
+
+} diff --git a/internal/handler/views/layout_templ.go b/internal/handler/views/layout_templ.go index 09acf1e..bd2f70c 100644 --- a/internal/handler/views/layout_templ.go +++ b/internal/handler/views/layout_templ.go @@ -231,7 +231,7 @@ func base(m Meta) templ.Component { if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(", source code licensed under BSD-3-Clause license.

") + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(", source code licensed under BSD-3-Clause license.

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -315,4 +315,54 @@ func BlankLayout(cmp templ.Component) templ.Component { }) } +func ModalLayout(title string, cmp templ.Component) templ.Component { + return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { + templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context + if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil { + return templ_7745c5c3_CtxErr + } + templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W) + if !templ_7745c5c3_IsBuffer { + defer func() { + templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer) + if templ_7745c5c3_Err == nil { + templ_7745c5c3_Err = templ_7745c5c3_BufErr + } + }() + } + ctx = templ.InitializeContext(ctx) + templ_7745c5c3_Var18 := templ.GetChildren(ctx) + if templ_7745c5c3_Var18 == nil { + templ_7745c5c3_Var18 = templ.NopComponent + } + ctx = templ.ClearChildren(ctx) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("

") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + var templ_7745c5c3_Var19 string + templ_7745c5c3_Var19, templ_7745c5c3_Err = templ.JoinStringErrs(title) + if templ_7745c5c3_Err != nil { + return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/handler/views/layout.templ`, Line: 74, Col: 33} + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var19)) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("

") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = cmp.Render(ctx, templ_7745c5c3_Buffer) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + return templ_7745c5c3_Err + }) +} + var _ = templruntime.GeneratedTemplate diff --git a/internal/handler/views/remote_nodes.templ b/internal/handler/views/remote_nodes.templ index 58bf516..4d52f67 100644 --- a/internal/handler/views/remote_nodes.templ +++ b/internal/handler/views/remote_nodes.templ @@ -194,7 +194,7 @@ templ TableNodes(data monero.Nodes, countries []monero.Countries, q monero.Query for _, row := range data.Items { - @cellHostPort(row.IPAddresses, row.Hostname, row.Port, row.IsTor, row.IPv6Only) + @cellHostPort(row.ID, row.Port, row.Hostname, row.IPAddresses, row.IsTor, row.IPv6Only) @cellNettype(row.Nettype, row.Height) @@ -225,10 +225,22 @@ templ TableNodes(data monero.Nodes, countries []monero.Countries, q monero.Query } -templ cellHostPort(ips, hostname string, port uint, isTor, ipv6Only bool) { +templ Node(data monero.Node) { +

{ fmt.Sprintf("%s:%d", data.Hostname, data.Port) }

+} + +templ cellHostPort(id, port uint, hostname, ips string, isTor, ipv6Only bool) { if isTor { - -
diff --git a/internal/handler/views/remote_nodes_templ.go b/internal/handler/views/remote_nodes_templ.go index 3f1bf5d..bed4525 100644 --- a/internal/handler/views/remote_nodes_templ.go +++ b/internal/handler/views/remote_nodes_templ.go @@ -433,7 +433,7 @@ func TableNodes(data monero.Nodes, countries []monero.Countries, q monero.QueryN if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = cellHostPort(row.IPAddresses, row.Hostname, row.Port, row.IsTor, row.IPv6Only).Render(ctx, templ_7745c5c3_Buffer) + templ_7745c5c3_Err = cellHostPort(row.ID, row.Port, row.Hostname, row.IPAddresses, row.IsTor, row.IPv6Only).Render(ctx, templ_7745c5c3_Buffer) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -541,7 +541,7 @@ func TableNodes(data monero.Nodes, countries []monero.Countries, q monero.QueryN }) } -func cellHostPort(ips, hostname string, port uint, isTor, ipv6Only bool) templ.Component { +func Node(data monero.Node) templ.Component { return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil { @@ -562,17 +562,72 @@ func cellHostPort(ips, hostname string, port uint, isTor, ipv6Only bool) templ.C templ_7745c5c3_Var22 = templ.NopComponent } ctx = templ.ClearChildren(ctx) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("

") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + var templ_7745c5c3_Var23 string + templ_7745c5c3_Var23, templ_7745c5c3_Err = templ.JoinStringErrs(fmt.Sprintf("%s:%d", data.Hostname, data.Port)) + if templ_7745c5c3_Err != nil { + return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/handler/views/remote_nodes.templ`, Line: 229, Col: 52} + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var23)) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("

") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + return templ_7745c5c3_Err + }) +} + +func cellHostPort(id, port uint, hostname, ips string, isTor, ipv6Only bool) templ.Component { + return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { + templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context + if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil { + return templ_7745c5c3_CtxErr + } + templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W) + if !templ_7745c5c3_IsBuffer { + defer func() { + templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer) + if templ_7745c5c3_Err == nil { + templ_7745c5c3_Err = templ_7745c5c3_BufErr + } + }() + } + ctx = templ.InitializeContext(ctx) + templ_7745c5c3_Var24 := templ.GetChildren(ctx) + if templ_7745c5c3_Var24 == nil { + templ_7745c5c3_Var24 = templ.NopComponent + } + ctx = templ.ClearChildren(ctx) if isTor { - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("