From bfc14ce7170d1fa0335bc46bd602d986b9cfc2d8 Mon Sep 17 00:00:00 2001 From: Fred Boniface Date: Sun, 3 Sep 2023 21:41:25 +0100 Subject: [PATCH] Update web handling --- static/favicon.ico | Bin 0 -> 16958 bytes static/favicon.png | Bin 0 -> 5633 bytes templates/base.html | 1 + web/page.route.go | 14 ++++++++++++++ web/server.go | 7 ++++--- 5 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 static/favicon.ico create mode 100644 static/favicon.png create mode 100644 web/page.route.go diff --git a/static/favicon.ico b/static/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..641d109e1989ea8a616e6d6b1bb5cd767044152a GIT binary patch literal 16958 zcmeI3SEv-t6334@e~PGx8AZ%uLJ`w3=d74>&JPC6IUqi$DCUe$Vorz{AAAtAh>D0g zq3DA-_uXIJ`(MU!cF(S^qTji_)b!3wcXd@)b#+&DPf}8v&@VYTDReECRJuV@Qof|5 zq|zY>JxZDx0-jq+{%_{Jx&)+gVEwA(eeuyF1WUB+dAHN?AXx_9Xix~`0&Bref|2? z^51o-P@#eg^{GpnHm&9S2hyicZ~5TCgN+o?ckbLdd!8muns3Uho;MecS+iytj(6|g zS$^=~!Ef3qP@sT&`}VE9i--TupFca~BKY#i4{o3;V`}Z4e%FH zQ917uk^W}+@7}%Jtz5a%tzW<1EnmLeF|J7Q=)sH`GhFZ9z1^TegWSM@1H-_5-@bj_ z$mRs`U#U_htD`ciqdvpd)~s36%4E%&)$#=k78q@6*KSg{V3Vdv?p|a}xDvCkTX7IK)3TgFb)<_)>oqDpcsZ@n5xSRcjB~QcfV7(XCsz zR4@NT=>N5A*Bo;iw!;h9`5QNGxW$VXyOJeKx@y&`xl*M{**XFFN7MhCH*Y%X1FRQ@ z3>jjwl)V4>=O4#7s$99UD_5?ZYuvc8d;k7DXv278(f>s7AFKV3WlU*KYTC4^@vE`w zAG^()H#c5Y-fsSPQNPB+zs5u?_7D65niT)g%9=)yAwve^LF*sJwCY95)koqVd3)DM z>W^m4ni;p0_v6ys<>y~?Nr$k1sa^hc>eMkA<;r4S-j`4?n z`sW$-bN~MR4a>`yFT?dz-=DvF^~%aNYShSZO5T3`Z_=cRm7}~L2Xh9xRYVVm;s;X_xfSTUDBe|}f6U_r;cD?JyD z{+u?MpC}s(fLG(uk4yKwSNoB0iZ01v(V|6;zPWerp7H$R#S1^15$`pos4LpM<5G0} ziMjY^4M>uW;lJNU;64b@C(`ZPw;g^Ce4?A^Jb6k04e>xq_|!J-M*`uHyyS=DL(&I9 zbB8e*aQU~&A3vf&g9ffeix!SKH5w4hs9(SScXm#`1U@N#`L6`pIC0{H!yiTm{WjM- z{_y9H9Xsas?b~O*4sjajZ{51JOHNL9to1ejMZ@F88T9}1<;$iq(vbl5N!TOltl}T& zxSuB3CHb<7yWm?=R^x&Bzjp1~_6!@1Z{Y`g2aO};{`M|jylDJkBcPA=7-NY9FK!xB z{39CwtjS5tk0fGb(5|_@XV0FgUjF#zlO|1aGeR*8d`!XAsZ$+mVPcx}nRLo8d+w$G znpcRaOq@8;&6zXD5x4sp00+2Eo;+zX)I1cA{)?_Xd-k~Tv%%`U2@vYL>rv$FCs~uVB7B zbm)*fe*Cz_37IqTH(49ht5@&4IoB_L>A%+Bto>WHYUS`*@N1(1Wmt>k$&<(AE*vT8 zKe~m_1fAgLKQR=N#`2XbSB$sAhY#EQA^o6?Yy`1d=`J~I1(I|nX#F3Ff9bCLf3;x< zBV0tQ{C~~Wk@%Oc;{$1)lPuMQ+6|ij{bjKG@U3`gn>KB%i1uAr|BEKsnUwe^hD~DJ z!JpseK%bt=hN1`1p|)b-U%spGsUO5Yasa3HREU2nsZ45@|L@?Ru|&K<@c8lL@P5m$ z)c>(#$C~e2v}jS6BS#L4ss2v+OShSqv1`O(uo2ig`hX-oOyu|%kF?MJA#*#q=2CCF zzf%6 zPxD()pT+u2I8x$2n*S4|-+C5H{4*t5{qpz6Kae4|Fdjg6;9WK}Qv5^x1OM!2$#!9D zuw}9I zf$;rk&N(s8iV{;LsgD)^lKdI}jQP!*H@l6Yvu2z#d;a{n)lvNG)TvXBvq)REY_YRw z?4v|VKVtvYP9&U(crLoczve&h7?rFP|5Tp^#XtP>zs8H^Vfr21LG7r`OP4MgYt*F= zG}dT0Q6SvXu>%JVd`B0$0BGJ(d`tXm{{!C_+7mth|BdpGq?6LKSk}KgcI>dYDgDh{ z@GAkG<~$gCuETQp9|O;>C+Q_Cq73c=-3W{U`kQ^B+ww{XVk# zBOd-~FVPT7Kljl?(hmK4kQ zXMIPUI*|}GuD$)sdvAO46DTA8iDQuPWyPa6XD%VWl{ar*SE57-i$^Y7w#@2KjuZ?3 z?58|?_RQV6bH~nBu}AWw01nnI^+Nkh@Zz6$bB@9$x>d|8)KnU5J%`t^cFxnIVheBK=eRQ~XNyy4U$v=_zq5`Ss#o zb^N(-5dWxAqlWdf{EWGC=Ngsz&Ln94Lwx~lX`G=m=oCEA7Xt2i9t)`7*~f!!P|0lJ|U;L|Ii3{>Q8E3sZbm$Q7AK4@JDp>EZN6dK& z@;)J734LtezP+8VBCbHvx|6+R_K^8T4to;~*l$GktZ%5t`Ge!3eQ2FSk-w8KUp{M( zePzCbp^$WOLAhpB=Hh$|5G+a zbP1>U7f#LpS}&-4P%a$t#6PGL3H)t917&6JBwyJB;tnK@W!7r+3uBcWyTG>xB-RMv zQa|vYG$Z7@QdV=k_{Tm*qEpXBm-rVB=9EMx(fT*ZKau=P7a41;BZ#e&V*^OYmUR94 zb=#k0?a5wb-MV$nf8d?u&VQ0{GKcW(95~sJ<=i?cmNmC>D2#I ID(->*0OuWuQvd(} literal 0 HcmV?d00001 diff --git a/static/favicon.png b/static/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..ae8da00b0142d5d4d5d7240a00d8b3ce8260e053 GIT binary patch literal 5633 zcmeI0X;4#F7>2V-2r>yMf_34_=0YW+Wl;lMlyyLeR?S!vD`nXUJ?vcGR^E`Lj5DWUxddC}b6-ZrU_vfi3}8@ z<=L~fIlon9djfuix(hau06vJ?fJs&}nm(!(P zX{Qnozz>W>!2e4qud99O@xC{&*XyL)(!y!|+p8)nDuO!QXimeoCv>{i6G4>>wTpQ8 zW{zl>T6qpjn^UnqdlDd=NSC@!4yFLP0-!Cb&aVN`a#U}#k4JHgMD^sussL&O_Pyi|_=vN`}$uR$J!+=+s2^Qgcfr97En=Y4rE=PBF_e{M7%qOS$fC{-h?o%UnKzW86{x;uyH*ID zlZm2wSM-$=l+|7cao;~>Cip-I0mVb!a-m#3iBG0Z^Zjt9J3PARmUQ}kuSKmg#)HxF z?N@dLx1KYsu5r&&uJM&O))g*}2Zj?E#?IvE2oGR*8pFp2-xG+&RAJL%mgJl@yy*$# z#{Hd9d|oG*SHCpmQS?U95m8T4ki0RzaB&0>j|1Xc6E;&RauUPimyHj;7Z8o9x6z_2 z?!m`A$42e@vaDpDW$d%TDdhfPMuZ#!LM>Swl0n&XyM zzU6RqQE2iiNc9^>R3!)Hf{`b=4{zEREY*iM8OGf2TRxDfHmfQmIfKI1`;lu~U3F*PD$D}g_Ny`V@|SHBa#!X>uxnkK z`SL~{*A>=VUxMMLb1^%X!767V#NJT}r^a28whuZ5x2(gvsiJ)I-r;rV?r+yeyoet;a$jEfv(CbRM zPqyVd`=*e3CH75vyjue4vD(nSSv{zd83KB!i|Ax|4Z;S-$KH)WE;9p9 zi8csZtIU2pS3sRCL)q}SSAsvQ8{}uYO{7ZZqE82#MR63eWe;aS#Q_(MkG(4cuyH}% zt`4~!IJwK_i;=q;Q!4xs barcodes + diff --git a/web/page.route.go b/web/page.route.go new file mode 100644 index 0000000..10b79a9 --- /dev/null +++ b/web/page.route.go @@ -0,0 +1,14 @@ +package web + +import ( + "fmt" + "net/http" + "strings" +) + +func mainHandler(w http.ResponseWriter, r *http.Request) { + fmt.Println("Request URL: ", r.URL.Path) + requestFile := strings.TrimRight(r.URL.Path, "/") + requestFile = strings.TrimRight(requestFile, ".html") + fmt.Println("Template File: ", requestFile) +} diff --git a/web/server.go b/web/server.go index 63767b1..8240cff 100644 --- a/web/server.go +++ b/web/server.go @@ -6,9 +6,10 @@ import ( ) func StartServer() { - http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { - fmt.Fprintf(w, "Barcodes") - }) + // What I want to do here is server from /static + // if the resource exists, else try to render from /templates + // if the template exists. Else return 404. + http.HandleFunc("/", mainHandler) http.HandleFunc("/help", helpTemplate)