From f016a9de0eae545c46ab54d76929b7357361a0ce Mon Sep 17 00:00:00 2001 From: Gergely Brautigam <182850+Skarlso@users.noreply.github.com> Date: Sat, 25 May 2024 16:12:47 +0200 Subject: [PATCH] tiny refactor --- wasm/app-worker.js | 6 +++--- wasm/app.go | 42 ++++++++++++++++++++++-------------------- wasm/app.js | 2 +- wasm/index.html | 18 +++++++++--------- wasm/web/app.wasm | Bin 28358139 -> 28358161 bytes 5 files changed, 35 insertions(+), 33 deletions(-) diff --git a/wasm/app-worker.js b/wasm/app-worker.js index 9f3e93a..97aecf3 100644 --- a/wasm/app-worker.js +++ b/wasm/app-worker.js @@ -1,8 +1,8 @@ -const cacheName = "app-" + "65fbac8be5b22d2841d916b839e784627375616c"; +const cacheName = "app-" + "f8ac4218bb548048986824403cd7e3fdb9206c6d"; const resourcesToCache = ["/","/app.css","/app.js","/manifest.webmanifest","/wasm_exec.js","/web/app.wasm","/web/css/alert.css","/web/img/logo.png","https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js","https://cdn.jsdelivr.net/npm/halfmoon@2.0.1/css/halfmoon.min.css","https://cdnjs.cloudflare.com/ajax/libs/clipboard.js/2.0.11/clipboard.min.js","https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css","https://cdnjs.cloudflare.com/ajax/libs/prism/1.29.0/themes/prism-twilight.min.css"]; self.addEventListener("install", (event) => { - console.log("installing app worker 65fbac8be5b22d2841d916b839e784627375616c"); + console.log("installing app worker f8ac4218bb548048986824403cd7e3fdb9206c6d"); event.waitUntil( caches @@ -28,7 +28,7 @@ self.addEventListener("activate", (event) => { ); }) ); - console.log("app worker 65fbac8be5b22d2841d916b839e784627375616c is activated"); + console.log("app worker f8ac4218bb548048986824403cd7e3fdb9206c6d is activated"); }); self.addEventListener("fetch", (event) => { diff --git a/wasm/app.go b/wasm/app.go index a9f77de..b154bea 100644 --- a/wasm/app.go +++ b/wasm/app.go @@ -60,32 +60,34 @@ func (h *crdView) buildError(err error) app.UI { } func (h *crdView) OnNav(ctx app.Context) { - if strings.Contains(ctx.Page().URL().String(), "share") { - u := ctx.Page().URL().Query().Get("url") - if u == "" { - h.preRenderErr = errors.New( - "url parameter has to be define in the following format: " + - "/share?url=https://example.com/crd.yaml") - - return - } + if !strings.Contains(ctx.Page().URL().String(), "share") { + return + } - if _, err := url.Parse(u); err != nil { - h.preRenderErr = fmt.Errorf("invald url provided in query: %w", err) + u := ctx.Page().URL().Query().Get("url") + if u == "" { + h.preRenderErr = errors.New( + "url parameter has to be define in the following format: " + + "/share?url=https://example.com/crd.yaml") - return - } + return + } - f := fetcher.NewFetcher(http.DefaultClient) - content, err := f.Fetch(u) - if err != nil { - h.preRenderErr = err + if _, err := url.Parse(u); err != nil { + h.preRenderErr = fmt.Errorf("invald url provided in query: %w", err) - return - } + return + } - h.content = content + f := fetcher.NewFetcher(http.DefaultClient) + content, err := f.Fetch(u) + if err != nil { + h.preRenderErr = err + + return } + + h.content = content } // The Render method is where the component appearance is defined. Here, a diff --git a/wasm/app.js b/wasm/app.js index c0fb22a..5532d24 100644 --- a/wasm/app.js +++ b/wasm/app.js @@ -13,7 +13,7 @@ var goappOnAppInstallChange = function () { goappAppInstallChangedBeforeWasmLoaded = true; }; -const goappEnv = {"GOAPP_INTERNAL_URLS":"null","GOAPP_ROOT_PREFIX":"/","GOAPP_STATIC_RESOURCES_URL":"/web","GOAPP_VERSION":"65fbac8be5b22d2841d916b839e784627375616c"}; +const goappEnv = {"GOAPP_INTERNAL_URLS":"null","GOAPP_ROOT_PREFIX":"/","GOAPP_STATIC_RESOURCES_URL":"/web","GOAPP_VERSION":"f8ac4218bb548048986824403cd7e3fdb9206c6d"}; const goappLoadingLabel = "{progress}%"; const goappWasmContentLength = ""; const goappWasmContentLengthHeader = ""; diff --git a/wasm/index.html b/wasm/index.html index e9bf769..a608866 100644 --- a/wasm/index.html +++ b/wasm/index.html @@ -1,5 +1,5 @@ - +
@@ -7,23 +7,23 @@ - +nU%n+F+3>u3w%SgO&IPMgS2@~LCb=rfrWXqJSauMUy zZ-h#+3^sN6YGjPdaQ|a2bJXP-E}1gHWSYmUbP=nL$H_!1xl$?ScNqDNUe+U1CQ>e8 zneyj3%lrW&*XUL71Ks-N@_a2Whr=gM(}XJ;h$-u{HCt|wtXcX_E^(WSftwn+zj0zsE2XZHeH^_T zxNz5I%am@m _J{jwaLoi zw =$H*s~S8`tSo91!I2kacJka{g-Ge;j)=#w#Wh~tA5 z;%y=gIV *)5?YKHBkS`lQ zx6`%9 z>GAOA<#v0VPO;ohe!oVRj5mwz^SiR8S>&m0#(cHSG_XSa63t)rk00~r^f7NjsyRA` zP+n~n>*+Gz?rd2mjSulkEj~PaF1WSJEf>Z7R(5(%wm3r;d~+aM$ZXBanpZThYUXI> zYUXL?YZhp7Gz&G0G>bJ$G)pzhG`X7PniZOrnmj4{=D;eMSQUCE$LqKZv(Qdin=fr! zM=kU^;xHaghr_W4Bf&p+6?>P_)-GW-vh|QfUdISH7ymUoBRK0_>UHeJj)HYMIw#lb zScI=pd)vdo(Vv!k9er1L9bP*rF#FI-uOkIxQ9Ij80>kbP*{eoFyD%_&W1iO$f%d4K zZ5q7qSoX59!M+ffE$8?UenIVQ+u-c_RbEFW{
0qcpV)v+^!1DW^z0k^H4iGJUDxbz2DKoj#;nw?PPl$-I0pg z+4SJ-o9yk!F?)Jo_6LqH!d>{+?4sbTpS|8lvyU?yC(~?eL%#HsEW0mjw}_Yc-tzys zZgudwPuV+zt9A) >YG2Qq;A~I!M&Q|kjXIjm;au3L9j#Y0YJI`pS^R7# zFfGk77e`t8oUY6f#y zb#VIb;9&Wln!)<-)C`OYt|hEGShzPhSXEXt7*k#|I6b%?XVt;-cWVX<_SeiM1y;XZ z7+f!~+OB(fP(AD=2lAy)L^8*tQTuT9qj5bS&sOa{fyX>?{=s~if3N^H3b7im;dQLR aTC776)?))U;tjlsxA3;?Jy rXcxn;= delta 3998 zcmZYA3w+IWAHebR{hj~+oSAXtGM6GM J+r4q zZmU5Z;@eLeA3vabYI^*XJ}HqgvBL+%MkGWf^zWK5p!?8KL&nE<8$V=lyQE$b-4ljp zcIn%tbC=8>{f2cLJZ}8J=m` 5%6Lnx{v3^h;_KGebusEs &=R+!6 -!el&+DR>4`@hqOh^T@(9OvenofEV!+vXO(Cn1z?| z3TER~%)wmbVjkw>HN1{DkcS0Wh(%b8d=#J%OW>dgOR)@ZVmVe|C01cI)?h8xVLjf$ z+t`4O*o4j4f?{k%2}-dI+pz;XQHEXE4L{z&yV!&GuowHVAMfJ>e29 NWy5efu6*<4) M^?y!lRL*Ye68pQJ16PLANUj3 zaQ&5}BQh5nqj762jji!$yqXYAHBG3dx+Y9hLsL`Z)6~-3psB5?qp7Q@rwP~8*EG;H z)HKrEsJThgSo}#xnuu@v?Qx^h;yOgdb%?nuDlRo9xqZs0 hxlVkY9 z)1y nGPe< z==C#}af|WjkL~?RY?mvV_iw-}YK!rw7H3O+$(p90;xecCEpSpJzi_-*!N-xGSzQS1 z9w;^DQyBS)$3IqxJ9uR0EIVfcQztUb@l4xzcw1ZCp>F*!ImVu8ygsSr@ww~D=gb`m z%zlz-KF*XcrJgy)-IGta-jB~(yx_nE-pZ*}k}b`8e!%Ga6;j>EepdSeFWkM^GCMb0 za&0#EVYc4&H;ui_c)3L)w#YG_Uu(J7Xw4c+XpS?5(>2cedV?{?HyBx4z%vCFFEC=e zw-~$F*dMU>mzRBCWJwX*PJw0ZGWKr%{(b0T5x1MqT3x1XG=DuqezB1yyr!_ga{JA# z_B+Nd`}--r;e86&&gYVxLtJUY#>d$@z}0@b!MKeS@WJx~zmdhP7Wp$vv*oPGn$0g) zLd7eg#v@0|#e7jNo>^}DWw+PJ=R7{b +>zMF5jx=k@ak>E0>T`x4q4| zup?XQKCp1CSumDM`|r2G;+y6X{mR=O`Fg7{C%2l~R!FQw@Rk4h5Z|>!d=xp)>KsD3 z=5INE AKGtC^>nuX#=Ly5 a(%9gxR&coUQsBmo41 vu&CWn(uQB$8}WAW(8-fzu|N3K(Q0PQfG4(_*`@F z6{=?U1!sR;=yUa4 vyTSP zyP7>eK63H`v!_{~gDLvo?EK(tBzxVF?3`jYN+vpu))Yz)nd&5S?AmNP&%OSCuUi^? z-68f);5TPKb8VW}UCOngIjXK_d2qHXd&4o=316$TGg!|=KB{JGR?b?7+4~MZIcdzU zvc1cEuA2VZ>k7qfNkf15hC=Bi($q=ZSjc}WEuEEtW2AE_c#PjvDCZcA-5ea8w54)z zf8ZGDgcs}MNGFY>4km654(63q4xS1eBc0gN%E4@oIyh-taIj>1<)CLr <$iI@>dSVzf(Dw7d)QgsDp>!4GxCCS2>s#I7T`p z!J}typ*VIN_o|DtmUVBtKkJds71lS(*ty~R3WY4uIGQ5OQq3~Wo0{dC6`GZrRhreB XHJY`Wb(-~>w={2yKYZT?xqALTD!YMT