diff --git a/.gitignore b/.gitignore index bf8acb1..b38d94e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /target tailwindcss +mutants* diff --git a/Cargo.lock b/Cargo.lock index 884fc59..098b1e1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -683,6 +683,7 @@ dependencies = [ "config", "hyper", "insta", + "maud", "notify", "reqwest", "serde", @@ -1153,6 +1154,30 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" +[[package]] +name = "maud" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df518b75016b4289cdddffa1b01f2122f4a49802c93191f3133f6dc2472ebcaa" +dependencies = [ + "axum-core", + "http", + "itoa", + "maud_macros", +] + +[[package]] +name = "maud_macros" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa453238ec218da0af6b11fc5978d3b5c3a45ed97b722391a2a11f3306274e18" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "memchr" version = "2.7.4" @@ -1528,6 +1553,29 @@ dependencies = [ "zerocopy", ] +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + [[package]] name = "proc-macro2" version = "1.0.86" diff --git a/Cargo.toml b/Cargo.toml index e5e8c5e..9b8c765 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,11 +8,14 @@ default-run = "gathering_surf" [dependencies] anyhow = "1.0.81" -axum = { version = "0.7", features= ["ws"]} +axum = { version = "0.7", features = ["ws"] } chrono = "0.4" chrono-tz = "0.9" -config = { git = "https://github.com/mehcode/config-rs.git", rev = "e3c1d0b452639478662a44f15ef6d5b6d969bf9b", default-features = false, features = ["yaml"] } +config = { git = "https://github.com/mehcode/config-rs.git", rev = "e3c1d0b452639478662a44f15ef6d5b6d969bf9b", default-features = false, features = [ + "yaml", +] } hyper = { version = "1", features = ["full"] } +maud = { version = "0.26.0", features = ["axum"] } notify = "6.1.1" reqwest = { version = "0.12", features = ["json"] } serde = { version = "1", features = ["derive"] } @@ -25,7 +28,7 @@ tokio-stream = "0.1.15" tower = "0.5" tower-http = { version = "0.5", features = ["full"] } tracing = "0.1" -tracing-subscriber = { version = "0.3", features = ["env-filter"] } +tracing-subscriber = { version = "0.3", features = ["env-filter"] } [dev-dependencies] insta = { version = "1", features = ["yaml"] } diff --git a/assets/styles.css b/assets/styles.css index c6b7014..641df77 100644 --- a/assets/styles.css +++ b/assets/styles.css @@ -1 +1 @@ -/*! tailwindcss v3.4.1 | MIT License | https://tailwindcss.com*/*,:after,:before{border:0 solid #e5e7eb;box-sizing:border-box}:after,:before{--tw-content:""}:host,html{-webkit-text-size-adjust:100%;font-feature-settings:normal;-webkit-tap-highlight-color:transparent;font-family:ui-sans-serif,system-ui,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol,Noto Color Emoji;font-variation-settings:normal;line-height:1.5;-moz-tab-size:4;-o-tab-size:4;tab-size:4}body{line-height:inherit;margin:0}hr{border-top-width:1px;color:inherit;height:0}abbr:where([title]){-webkit-text-decoration:underline dotted;text-decoration:underline dotted}h1,h2,h3,h4,h5,h6{font-size:inherit;font-weight:inherit}a{color:inherit;text-decoration:inherit}b,strong{font-weight:bolder}code,kbd,pre,samp{font-feature-settings:normal;font-family:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,monospace;font-size:1em;font-variation-settings:normal}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:initial}sub{bottom:-.25em}sup{top:-.5em}table{border-collapse:collapse;border-color:inherit;text-indent:0}button,input,optgroup,select,textarea{font-feature-settings:inherit;color:inherit;font-family:inherit;font-size:100%;font-variation-settings:inherit;font-weight:inherit;line-height:inherit;margin:0;padding:0}button,select{text-transform:none}[type=button],[type=reset],[type=submit],button{-webkit-appearance:button;background-color:initial;background-image:none}:-moz-focusring{outline:auto}:-moz-ui-invalid{box-shadow:none}progress{vertical-align:initial}::-webkit-inner-spin-button,::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}summary{display:list-item}blockquote,dd,dl,figure,h1,h2,h3,h4,h5,h6,hr,p,pre{margin:0}fieldset{margin:0}fieldset,legend{padding:0}menu,ol,ul{list-style:none;margin:0;padding:0}dialog{padding:0}textarea{resize:vertical}input::-moz-placeholder,textarea::-moz-placeholder{color:#9ca3af;opacity:1}input::placeholder,textarea::placeholder{color:#9ca3af;opacity:1}[role=button],button{cursor:pointer}:disabled{cursor:default}audio,canvas,embed,iframe,img,object,svg,video{display:block;vertical-align:middle}img,video{height:auto;max-width:100%}[hidden]{display:none}html{scroll-behavior:smooth}body{font-family:Satoshi,sans-serif}h1{font-size:2rem;font-weight:bolder;margin-bottom:2rem}@media screen and (min-width:640px){h1{font-size:3rem}}*,::backdrop,:after,:before{--tw-border-spacing-x:0;--tw-border-spacing-y:0;--tw-translate-x:0;--tw-translate-y:0;--tw-rotate:0;--tw-skew-x:0;--tw-skew-y:0;--tw-scale-x:1;--tw-scale-y:1;--tw-pan-x: ;--tw-pan-y: ;--tw-pinch-zoom: ;--tw-scroll-snap-strictness:proximity;--tw-gradient-from-position: ;--tw-gradient-via-position: ;--tw-gradient-to-position: ;--tw-ordinal: ;--tw-slashed-zero: ;--tw-numeric-figure: ;--tw-numeric-spacing: ;--tw-numeric-fraction: ;--tw-ring-inset: ;--tw-ring-offset-width:0px;--tw-ring-offset-color:#fff;--tw-ring-color:#3b82f680;--tw-ring-offset-shadow:0 0 #0000;--tw-ring-shadow:0 0 #0000;--tw-shadow:0 0 #0000;--tw-shadow-colored:0 0 #0000;--tw-blur: ;--tw-brightness: ;--tw-contrast: ;--tw-grayscale: ;--tw-hue-rotate: ;--tw-invert: ;--tw-saturate: ;--tw-sepia: ;--tw-drop-shadow: ;--tw-backdrop-blur: ;--tw-backdrop-brightness: ;--tw-backdrop-contrast: ;--tw-backdrop-grayscale: ;--tw-backdrop-hue-rotate: ;--tw-backdrop-invert: ;--tw-backdrop-opacity: ;--tw-backdrop-saturate: ;--tw-backdrop-sepia: }.container{width:100%}@media (min-width:640px){.container{max-width:640px}}@media (min-width:768px){.container{max-width:768px}}@media (min-width:1024px){.container{max-width:1024px}}@media (min-width:1280px){.container{max-width:1280px}}@media (min-width:1536px){.container{max-width:1536px}}.sr-only{clip:rect(0,0,0,0);border-width:0;height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;white-space:nowrap;width:1px}.pointer-events-none{pointer-events:none}.fixed{position:fixed}.absolute{position:absolute}.relative{position:relative}.sticky{position:sticky}.inset-0{inset:0}.left-0{left:0}.left-full{left:100%}.right-0{right:0}.top-0{top:0}.top-24{top:6rem}.top-\[64px\]{top:64px}.z-10{z-index:10}.z-40{z-index:40}.z-50{z-index:50}.order-first{order:-9999}.-m-2{margin:-.5rem}.-m-2\.5{margin:-.625rem}.m-auto{margin:auto}.-mx-2{margin-left:-.5rem;margin-right:-.5rem}.-mx-6{margin-left:-1.5rem;margin-right:-1.5rem}.mx-auto{margin-left:auto;margin-right:auto}.my-8{margin-bottom:2rem;margin-top:2rem}.mb-0{margin-bottom:0}.mb-10{margin-bottom:2.5rem}.mb-20{margin-bottom:5rem}.ml-2{margin-left:.5rem}.mr-16{margin-right:4rem}.mr-2{margin-right:.5rem}.mr-\[10px\]{margin-right:10px}.mt-14{margin-top:3.5rem}.mt-2{margin-top:.5rem}.mt-28{margin-top:7rem}.mt-4{margin-top:1rem}.mt-auto{margin-top:auto}.block{display:block}.flex{display:flex}.grid{display:grid}.hidden{display:none}.h-12{height:3rem}.h-16{height:4rem}.h-4{height:1rem}.h-5{height:1.25rem}.h-6{height:1.5rem}.h-\[118px\]{height:118px}.h-\[150px\]{height:150px}.h-\[20px\]{height:20px}.h-\[315px\]{height:315px}.h-\[40px\]{height:40px}.h-full{height:100%}.max-h-96{max-height:24rem}.max-h-\[24px\]{max-height:24px}.w-16{width:4rem}.w-4{width:1rem}.w-5{width:1.25rem}.w-6{width:1.5rem}.w-80{width:20rem}.w-\[10px\]{width:10px}.w-\[40px\]{width:40px}.w-\[6px\]{width:6px}.w-\[90\%\]{width:90%}.w-fit{width:-moz-fit-content;width:fit-content}.w-full{width:100%}.min-w-10{min-width:2.5rem}.min-w-72{min-width:18rem}.min-w-8{min-width:2rem}.max-w-7xl{max-width:80rem}.max-w-xs{max-width:20rem}.flex-1{flex:1 1 0%}.shrink-0{flex-shrink:0}.grow{flex-grow:1}.transform{transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}@keyframes pulse{50%{opacity:.5}}.animate-pulse{animation:pulse 2s cubic-bezier(.4,0,.6,1) infinite}.select-none{-webkit-user-select:none;-moz-user-select:none;user-select:none}.grid-cols-1{grid-template-columns:repeat(1,minmax(0,1fr))}.grid-cols-2{grid-template-columns:repeat(2,minmax(0,1fr))}.grid-rows-1{grid-template-rows:repeat(1,minmax(0,1fr))}.flex-col{flex-direction:column}.flex-col-reverse{flex-direction:column-reverse}.items-start{align-items:flex-start}.items-end{align-items:flex-end}.items-center{align-items:center}.items-baseline{align-items:baseline}.justify-end{justify-content:flex-end}.justify-center{justify-content:center}.justify-between{justify-content:space-between}.gap-px{gap:1px}.gap-x-2{-moz-column-gap:.5rem;column-gap:.5rem}.gap-x-3{-moz-column-gap:.75rem;column-gap:.75rem}.gap-x-4{-moz-column-gap:1rem;column-gap:1rem}.gap-x-6{-moz-column-gap:1.5rem;column-gap:1.5rem}.gap-x-8{-moz-column-gap:2rem;column-gap:2rem}.gap-y-2{row-gap:.5rem}.gap-y-5{row-gap:1.25rem}.gap-y-7{row-gap:1.75rem}.space-x-1>:not([hidden])~:not([hidden]){--tw-space-x-reverse:0;margin-left:calc(.25rem*(1 - var(--tw-space-x-reverse)));margin-right:calc(.25rem*var(--tw-space-x-reverse))}.space-x-2>:not([hidden])~:not([hidden]){--tw-space-x-reverse:0;margin-left:calc(.5rem*(1 - var(--tw-space-x-reverse)));margin-right:calc(.5rem*var(--tw-space-x-reverse))}.space-y-1>:not([hidden])~:not([hidden]){--tw-space-y-reverse:0;margin-bottom:calc(.25rem*var(--tw-space-y-reverse));margin-top:calc(.25rem*(1 - var(--tw-space-y-reverse)))}.self-center{align-self:center}.overflow-hidden{overflow:hidden}.overflow-y-auto{overflow-y:auto}.whitespace-nowrap{white-space:nowrap}.rounded{border-radius:.25rem}.rounded-full{border-radius:9999px}.rounded-md{border-radius:.375rem}.rounded-xl{border-radius:.75rem}.border{border-width:1px}.border-b{border-bottom-width:1px}.border-t{border-top-width:1px}.border-white{--tw-border-opacity:1;border-color:rgb(255 255 255/var(--tw-border-opacity))}.border-white\/15{border-color:#ffffff26}.border-white\/5{border-color:#ffffff0d}.bg-\[\#36a2eb\]{--tw-bg-opacity:1;background-color:rgb(54 162 235/var(--tw-bg-opacity))}.bg-\[\#ffc0cb\]{--tw-bg-opacity:1;background-color:rgb(255 192 203/var(--tw-bg-opacity))}.bg-black{--tw-bg-opacity:1;background-color:rgb(0 0 0/var(--tw-bg-opacity))}.bg-black\/10{background-color:#0000001a}.bg-black\/80{background-color:#000c}.bg-black\/90{background-color:#000000e6}.bg-gray-400\/10{background-color:#9ca3af1a}.bg-gray-700{--tw-bg-opacity:1;background-color:rgb(55 65 81/var(--tw-bg-opacity))}.bg-gray-700\/10{background-color:#3741511a}.bg-gray-800{--tw-bg-opacity:1;background-color:rgb(31 41 55/var(--tw-bg-opacity))}.bg-slate-700{--tw-bg-opacity:1;background-color:rgb(51 65 85/var(--tw-bg-opacity))}.fill-black{fill:#000}.fill-gray-300{fill:#d1d5db}.fill-white{fill:#fff}.p-12{padding:3rem}.p-2{padding:.5rem}.p-2\.5{padding:.625rem}.px-2{padding-left:.5rem;padding-right:.5rem}.px-3{padding-left:.75rem;padding-right:.75rem}.px-4{padding-left:1rem;padding-right:1rem}.px-6{padding-left:1.5rem;padding-right:1.5rem}.py-1{padding-bottom:.25rem;padding-top:.25rem}.py-2{padding-bottom:.5rem;padding-top:.5rem}.py-3{padding-bottom:.75rem;padding-top:.75rem}.py-4{padding-bottom:1rem;padding-top:1rem}.pt-5{padding-top:1.25rem}.pt-\[3px\]{padding-top:3px}.text-center{text-align:center}.text-end{text-align:end}.align-middle{vertical-align:middle}.font-\[\'Array\'\]{font-family:Array}.font-mono{font-family:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,monospace}.text-2xl{font-size:1.5rem;line-height:2rem}.text-3xl{font-size:1.875rem;line-height:2.25rem}.text-lg{font-size:1.125rem;line-height:1.75rem}.text-sm{font-size:.875rem;line-height:1.25rem}.text-xl{font-size:1.25rem;line-height:1.75rem}.text-xs{font-size:.75rem;line-height:1rem}.font-bold{font-weight:700}.font-light{font-weight:300}.font-medium{font-weight:500}.font-semibold{font-weight:600}.leading-3{line-height:.75rem}.leading-6{line-height:1.5rem}.leading-7{line-height:1.75rem}.tracking-tight{letter-spacing:-.025em}.text-black{--tw-text-opacity:1;color:rgb(0 0 0/var(--tw-text-opacity))}.text-gray-200{--tw-text-opacity:1;color:rgb(229 231 235/var(--tw-text-opacity))}.text-gray-300{--tw-text-opacity:1;color:rgb(209 213 219/var(--tw-text-opacity))}.text-gray-400{--tw-text-opacity:1;color:rgb(156 163 175/var(--tw-text-opacity))}.text-gray-500{--tw-text-opacity:1;color:rgb(107 114 128/var(--tw-text-opacity))}.text-gray-700{--tw-text-opacity:1;color:rgb(55 65 81/var(--tw-text-opacity))}.text-gray-900{--tw-text-opacity:1;color:rgb(17 24 39/var(--tw-text-opacity))}.text-white{--tw-text-opacity:1;color:rgb(255 255 255/var(--tw-text-opacity))}.shadow-sm{--tw-shadow:0 1px 2px 0 #0000000d;--tw-shadow-colored:0 1px 2px 0 var(--tw-shadow-color);box-shadow:var(--tw-ring-offset-shadow,0 0 #0000),var(--tw-ring-shadow,0 0 #0000),var(--tw-shadow)}.ring-1{--tw-ring-offset-shadow:var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);--tw-ring-shadow:var(--tw-ring-inset) 0 0 0 calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color);box-shadow:var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow,0 0 #0000)}.ring-inset{--tw-ring-inset:inset}.ring-gray-400\/30{--tw-ring-color:#9ca3af4d}.ring-white\/10{--tw-ring-color:#ffffff1a}.backdrop-blur-md{--tw-backdrop-blur:blur(12px);-webkit-backdrop-filter:var(--tw-backdrop-blur) var(--tw-backdrop-brightness) var(--tw-backdrop-contrast) var(--tw-backdrop-grayscale) var(--tw-backdrop-hue-rotate) var(--tw-backdrop-invert) var(--tw-backdrop-opacity) var(--tw-backdrop-saturate) var(--tw-backdrop-sepia);backdrop-filter:var(--tw-backdrop-blur) var(--tw-backdrop-brightness) var(--tw-backdrop-contrast) var(--tw-backdrop-grayscale) var(--tw-backdrop-hue-rotate) var(--tw-backdrop-invert) var(--tw-backdrop-opacity) var(--tw-backdrop-saturate) var(--tw-backdrop-sepia)}.transition{transition-duration:.15s;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,-webkit-backdrop-filter;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter,-webkit-backdrop-filter;transition-timing-function:cubic-bezier(.4,0,.2,1)}.hover\:border-gray-300:hover{--tw-border-opacity:1;border-color:rgb(209 213 219/var(--tw-border-opacity))}.hover\:bg-gray-800:hover{--tw-bg-opacity:1;background-color:rgb(31 41 55/var(--tw-bg-opacity))}.hover\:fill-gray-300:hover{fill:#d1d5db}.hover\:fill-gray-500:hover{fill:#6b7280}.hover\:text-gray-300:hover{--tw-text-opacity:1;color:rgb(209 213 219/var(--tw-text-opacity))}.hover\:text-gray-500:hover{--tw-text-opacity:1;color:rgb(107 114 128/var(--tw-text-opacity))}.hover\:text-white:hover{--tw-text-opacity:1;color:rgb(255 255 255/var(--tw-text-opacity))}.disabled\:border-zinc-700:disabled{--tw-border-opacity:1;border-color:rgb(63 63 70/var(--tw-border-opacity))}.disabled\:text-zinc-700:disabled{--tw-text-opacity:1;color:rgb(63 63 70/var(--tw-text-opacity))}.group:hover .group-hover\:text-gray-500{--tw-text-opacity:1;color:rgb(107 114 128/var(--tw-text-opacity))}@media (min-width:640px){.sm\:order-none{order:0}.sm\:ml-6{margin-left:1.5rem}.sm\:mt-16{margin-top:4rem}.sm\:block{display:block}.sm\:hidden{display:none}.sm\:h-8{height:2rem}.sm\:w-8{width:2rem}.sm\:grid-cols-3{grid-template-columns:repeat(3,minmax(0,1fr))}.sm\:flex-row{flex-direction:row}.sm\:items-center{align-items:center}.sm\:self-center{align-self:center}.sm\:border-l{border-left-width:1px}.sm\:p-3{padding:.75rem}.sm\:px-6{padding-left:1.5rem;padding-right:1.5rem}.sm\:py-2{padding-bottom:.5rem;padding-top:.5rem}.sm\:text-2xl{font-size:1.5rem;line-height:2rem}.sm\:text-3xl{font-size:1.875rem;line-height:2.25rem}.sm\:text-4xl{font-size:2.25rem;line-height:2.5rem}.sm\:text-lg{font-size:1.125rem;line-height:1.75rem}}@media (min-width:768px){.md\:mt-10{margin-top:2.5rem}.md\:grid{display:grid}.md\:h-\[472px\]{height:472px}.md\:min-w-32{min-width:8rem}.md\:grid-cols-4{grid-template-columns:repeat(4,minmax(0,1fr))}.md\:space-y-16>:not([hidden])~:not([hidden]){--tw-space-y-reverse:0;margin-bottom:calc(4rem*var(--tw-space-y-reverse));margin-top:calc(4rem*(1 - var(--tw-space-y-reverse)))}}@media (min-width:1024px){.lg\:block{display:block}.lg\:flex{display:flex}.lg\:grid{display:grid}.lg\:hidden{display:none}.lg\:h-\[630px\]{height:630px}.lg\:max-h-\[600px\]{max-height:600px}.lg\:w-\[1040px\]{width:1040px}.lg\:w-full{width:100%}.lg\:grid-cols-2{grid-template-columns:repeat(2,minmax(0,1fr))}.lg\:grid-cols-3{grid-template-columns:repeat(3,minmax(0,1fr))}.lg\:grid-cols-6{grid-template-columns:repeat(6,minmax(0,1fr))}.lg\:flex-row{flex-direction:row}.lg\:justify-between{justify-content:space-between}.lg\:border-l{border-left-width:1px}.lg\:px-8{padding-left:2rem;padding-right:2rem}}@media (min-width:1280px){.xl\:w-full{width:100%}.xl\:text-center{text-align:center}} \ No newline at end of file +/*! tailwindcss v3.4.1 | MIT License | https://tailwindcss.com*/*,:after,:before{border:0 solid #e5e7eb;box-sizing:border-box}:after,:before{--tw-content:""}:host,html{-webkit-text-size-adjust:100%;font-feature-settings:normal;-webkit-tap-highlight-color:transparent;font-family:ui-sans-serif,system-ui,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol,Noto Color Emoji;font-variation-settings:normal;line-height:1.5;-moz-tab-size:4;-o-tab-size:4;tab-size:4}body{line-height:inherit;margin:0}hr{border-top-width:1px;color:inherit;height:0}abbr:where([title]){-webkit-text-decoration:underline dotted;text-decoration:underline dotted}h1,h2,h3,h4,h5,h6{font-size:inherit;font-weight:inherit}a{color:inherit;text-decoration:inherit}b,strong{font-weight:bolder}code,kbd,pre,samp{font-feature-settings:normal;font-family:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,monospace;font-size:1em;font-variation-settings:normal}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:initial}sub{bottom:-.25em}sup{top:-.5em}table{border-collapse:collapse;border-color:inherit;text-indent:0}button,input,optgroup,select,textarea{font-feature-settings:inherit;color:inherit;font-family:inherit;font-size:100%;font-variation-settings:inherit;font-weight:inherit;line-height:inherit;margin:0;padding:0}button,select{text-transform:none}[type=button],[type=reset],[type=submit],button{-webkit-appearance:button;background-color:initial;background-image:none}:-moz-focusring{outline:auto}:-moz-ui-invalid{box-shadow:none}progress{vertical-align:initial}::-webkit-inner-spin-button,::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}summary{display:list-item}blockquote,dd,dl,figure,h1,h2,h3,h4,h5,h6,hr,p,pre{margin:0}fieldset{margin:0}fieldset,legend{padding:0}menu,ol,ul{list-style:none;margin:0;padding:0}dialog{padding:0}textarea{resize:vertical}input::-moz-placeholder,textarea::-moz-placeholder{color:#9ca3af;opacity:1}input::placeholder,textarea::placeholder{color:#9ca3af;opacity:1}[role=button],button{cursor:pointer}:disabled{cursor:default}audio,canvas,embed,iframe,img,object,svg,video{display:block;vertical-align:middle}img,video{height:auto;max-width:100%}[hidden]{display:none}html{scroll-behavior:smooth}body{font-family:Satoshi,sans-serif}h1{font-size:2rem;font-weight:bolder;margin-bottom:2rem}@media screen and (min-width:640px){h1{font-size:3rem}}*,::backdrop,:after,:before{--tw-border-spacing-x:0;--tw-border-spacing-y:0;--tw-translate-x:0;--tw-translate-y:0;--tw-rotate:0;--tw-skew-x:0;--tw-skew-y:0;--tw-scale-x:1;--tw-scale-y:1;--tw-pan-x: ;--tw-pan-y: ;--tw-pinch-zoom: ;--tw-scroll-snap-strictness:proximity;--tw-gradient-from-position: ;--tw-gradient-via-position: ;--tw-gradient-to-position: ;--tw-ordinal: ;--tw-slashed-zero: ;--tw-numeric-figure: ;--tw-numeric-spacing: ;--tw-numeric-fraction: ;--tw-ring-inset: ;--tw-ring-offset-width:0px;--tw-ring-offset-color:#fff;--tw-ring-color:#3b82f680;--tw-ring-offset-shadow:0 0 #0000;--tw-ring-shadow:0 0 #0000;--tw-shadow:0 0 #0000;--tw-shadow-colored:0 0 #0000;--tw-blur: ;--tw-brightness: ;--tw-contrast: ;--tw-grayscale: ;--tw-hue-rotate: ;--tw-invert: ;--tw-saturate: ;--tw-sepia: ;--tw-drop-shadow: ;--tw-backdrop-blur: ;--tw-backdrop-brightness: ;--tw-backdrop-contrast: ;--tw-backdrop-grayscale: ;--tw-backdrop-hue-rotate: ;--tw-backdrop-invert: ;--tw-backdrop-opacity: ;--tw-backdrop-saturate: ;--tw-backdrop-sepia: }.container{width:100%}@media (min-width:640px){.container{max-width:640px}}@media (min-width:768px){.container{max-width:768px}}@media (min-width:1024px){.container{max-width:1024px}}@media (min-width:1280px){.container{max-width:1280px}}@media (min-width:1536px){.container{max-width:1536px}}.sr-only{clip:rect(0,0,0,0);border-width:0;height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;white-space:nowrap;width:1px}.pointer-events-none{pointer-events:none}.fixed{position:fixed}.absolute{position:absolute}.relative{position:relative}.sticky{position:sticky}.inset-0{inset:0}.left-0{left:0}.left-full{left:100%}.right-0{right:0}.top-0{top:0}.top-24{top:6rem}.top-\[64px\]{top:64px}.z-10{z-index:10}.z-40{z-index:40}.z-50{z-index:50}.order-first{order:-9999}.-m-2{margin:-.5rem}.-m-2\.5{margin:-.625rem}.m-auto{margin:auto}.-mx-2{margin-left:-.5rem;margin-right:-.5rem}.-mx-6{margin-left:-1.5rem;margin-right:-1.5rem}.mx-auto{margin-left:auto;margin-right:auto}.my-8{margin-bottom:2rem;margin-top:2rem}.mb-0{margin-bottom:0}.mb-10{margin-bottom:2.5rem}.mb-20{margin-bottom:5rem}.ml-2{margin-left:.5rem}.mr-16{margin-right:4rem}.mr-2{margin-right:.5rem}.mr-\[10px\]{margin-right:10px}.mt-14{margin-top:3.5rem}.mt-2{margin-top:.5rem}.mt-28{margin-top:7rem}.mt-4{margin-top:1rem}.mt-auto{margin-top:auto}.block{display:block}.inline{display:inline}.flex{display:flex}.grid{display:grid}.hidden{display:none}.h-12{height:3rem}.h-16{height:4rem}.h-4{height:1rem}.h-5{height:1.25rem}.h-6{height:1.5rem}.h-\[118px\]{height:118px}.h-\[150px\]{height:150px}.h-\[20px\]{height:20px}.h-\[315px\]{height:315px}.h-\[40px\]{height:40px}.h-full{height:100%}.max-h-96{max-height:24rem}.max-h-\[24px\]{max-height:24px}.w-16{width:4rem}.w-4{width:1rem}.w-5{width:1.25rem}.w-6{width:1.5rem}.w-80{width:20rem}.w-\[10px\]{width:10px}.w-\[40px\]{width:40px}.w-\[6px\]{width:6px}.w-\[90\%\]{width:90%}.w-fit{width:-moz-fit-content;width:fit-content}.w-full{width:100%}.min-w-10{min-width:2.5rem}.min-w-72{min-width:18rem}.min-w-8{min-width:2rem}.max-w-7xl{max-width:80rem}.max-w-xs{max-width:20rem}.flex-1{flex:1 1 0%}.shrink-0{flex-shrink:0}.grow{flex-grow:1}.transform{transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}@keyframes pulse{50%{opacity:.5}}.animate-pulse{animation:pulse 2s cubic-bezier(.4,0,.6,1) infinite}.select-none{-webkit-user-select:none;-moz-user-select:none;user-select:none}.grid-cols-1{grid-template-columns:repeat(1,minmax(0,1fr))}.grid-cols-2{grid-template-columns:repeat(2,minmax(0,1fr))}.grid-rows-1{grid-template-rows:repeat(1,minmax(0,1fr))}.flex-col{flex-direction:column}.flex-col-reverse{flex-direction:column-reverse}.items-start{align-items:flex-start}.items-end{align-items:flex-end}.items-center{align-items:center}.items-baseline{align-items:baseline}.justify-end{justify-content:flex-end}.justify-center{justify-content:center}.justify-between{justify-content:space-between}.gap-px{gap:1px}.gap-x-2{-moz-column-gap:.5rem;column-gap:.5rem}.gap-x-3{-moz-column-gap:.75rem;column-gap:.75rem}.gap-x-4{-moz-column-gap:1rem;column-gap:1rem}.gap-x-6{-moz-column-gap:1.5rem;column-gap:1.5rem}.gap-x-8{-moz-column-gap:2rem;column-gap:2rem}.gap-y-2{row-gap:.5rem}.gap-y-5{row-gap:1.25rem}.gap-y-7{row-gap:1.75rem}.space-x-1>:not([hidden])~:not([hidden]){--tw-space-x-reverse:0;margin-left:calc(.25rem*(1 - var(--tw-space-x-reverse)));margin-right:calc(.25rem*var(--tw-space-x-reverse))}.space-x-2>:not([hidden])~:not([hidden]){--tw-space-x-reverse:0;margin-left:calc(.5rem*(1 - var(--tw-space-x-reverse)));margin-right:calc(.5rem*var(--tw-space-x-reverse))}.space-y-1>:not([hidden])~:not([hidden]){--tw-space-y-reverse:0;margin-bottom:calc(.25rem*var(--tw-space-y-reverse));margin-top:calc(.25rem*(1 - var(--tw-space-y-reverse)))}.self-center{align-self:center}.overflow-hidden{overflow:hidden}.overflow-y-auto{overflow-y:auto}.whitespace-nowrap{white-space:nowrap}.rounded{border-radius:.25rem}.rounded-full{border-radius:9999px}.rounded-md{border-radius:.375rem}.rounded-xl{border-radius:.75rem}.border{border-width:1px}.border-b{border-bottom-width:1px}.border-t{border-top-width:1px}.border-white{--tw-border-opacity:1;border-color:rgb(255 255 255/var(--tw-border-opacity))}.border-white\/15{border-color:#ffffff26}.border-white\/5{border-color:#ffffff0d}.bg-\[\#36a2eb\]{--tw-bg-opacity:1;background-color:rgb(54 162 235/var(--tw-bg-opacity))}.bg-\[\#ffc0cb\]{--tw-bg-opacity:1;background-color:rgb(255 192 203/var(--tw-bg-opacity))}.bg-black{--tw-bg-opacity:1;background-color:rgb(0 0 0/var(--tw-bg-opacity))}.bg-black\/10{background-color:#0000001a}.bg-black\/80{background-color:#000c}.bg-black\/90{background-color:#000000e6}.bg-gray-400\/10{background-color:#9ca3af1a}.bg-gray-700{--tw-bg-opacity:1;background-color:rgb(55 65 81/var(--tw-bg-opacity))}.bg-gray-700\/10{background-color:#3741511a}.bg-gray-800{--tw-bg-opacity:1;background-color:rgb(31 41 55/var(--tw-bg-opacity))}.bg-slate-700{--tw-bg-opacity:1;background-color:rgb(51 65 85/var(--tw-bg-opacity))}.fill-black{fill:#000}.fill-gray-300{fill:#d1d5db}.fill-white{fill:#fff}.p-12{padding:3rem}.p-2{padding:.5rem}.p-2\.5{padding:.625rem}.px-2{padding-left:.5rem;padding-right:.5rem}.px-3{padding-left:.75rem;padding-right:.75rem}.px-4{padding-left:1rem;padding-right:1rem}.px-6{padding-left:1.5rem;padding-right:1.5rem}.py-1{padding-bottom:.25rem;padding-top:.25rem}.py-2{padding-bottom:.5rem;padding-top:.5rem}.py-3{padding-bottom:.75rem;padding-top:.75rem}.py-4{padding-bottom:1rem;padding-top:1rem}.pt-5{padding-top:1.25rem}.pt-\[3px\]{padding-top:3px}.text-center{text-align:center}.text-end{text-align:end}.align-middle{vertical-align:middle}.font-\[\'Array\'\]{font-family:Array}.font-mono{font-family:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,monospace}.text-2xl{font-size:1.5rem;line-height:2rem}.text-3xl{font-size:1.875rem;line-height:2.25rem}.text-lg{font-size:1.125rem;line-height:1.75rem}.text-sm{font-size:.875rem;line-height:1.25rem}.text-xl{font-size:1.25rem;line-height:1.75rem}.text-xs{font-size:.75rem;line-height:1rem}.font-bold{font-weight:700}.font-light{font-weight:300}.font-medium{font-weight:500}.font-semibold{font-weight:600}.leading-3{line-height:.75rem}.leading-6{line-height:1.5rem}.leading-7{line-height:1.75rem}.tracking-tight{letter-spacing:-.025em}.text-black{--tw-text-opacity:1;color:rgb(0 0 0/var(--tw-text-opacity))}.text-gray-200{--tw-text-opacity:1;color:rgb(229 231 235/var(--tw-text-opacity))}.text-gray-300{--tw-text-opacity:1;color:rgb(209 213 219/var(--tw-text-opacity))}.text-gray-400{--tw-text-opacity:1;color:rgb(156 163 175/var(--tw-text-opacity))}.text-gray-500{--tw-text-opacity:1;color:rgb(107 114 128/var(--tw-text-opacity))}.text-gray-700{--tw-text-opacity:1;color:rgb(55 65 81/var(--tw-text-opacity))}.text-gray-900{--tw-text-opacity:1;color:rgb(17 24 39/var(--tw-text-opacity))}.text-white{--tw-text-opacity:1;color:rgb(255 255 255/var(--tw-text-opacity))}.shadow-sm{--tw-shadow:0 1px 2px 0 #0000000d;--tw-shadow-colored:0 1px 2px 0 var(--tw-shadow-color);box-shadow:var(--tw-ring-offset-shadow,0 0 #0000),var(--tw-ring-shadow,0 0 #0000),var(--tw-shadow)}.ring-1{--tw-ring-offset-shadow:var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);--tw-ring-shadow:var(--tw-ring-inset) 0 0 0 calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color);box-shadow:var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow,0 0 #0000)}.ring-inset{--tw-ring-inset:inset}.ring-gray-400\/30{--tw-ring-color:#9ca3af4d}.ring-white\/10{--tw-ring-color:#ffffff1a}.backdrop-blur-md{--tw-backdrop-blur:blur(12px);-webkit-backdrop-filter:var(--tw-backdrop-blur) var(--tw-backdrop-brightness) var(--tw-backdrop-contrast) var(--tw-backdrop-grayscale) var(--tw-backdrop-hue-rotate) var(--tw-backdrop-invert) var(--tw-backdrop-opacity) var(--tw-backdrop-saturate) var(--tw-backdrop-sepia);backdrop-filter:var(--tw-backdrop-blur) var(--tw-backdrop-brightness) var(--tw-backdrop-contrast) var(--tw-backdrop-grayscale) var(--tw-backdrop-hue-rotate) var(--tw-backdrop-invert) var(--tw-backdrop-opacity) var(--tw-backdrop-saturate) var(--tw-backdrop-sepia)}.transition{transition-duration:.15s;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,-webkit-backdrop-filter;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter,-webkit-backdrop-filter;transition-timing-function:cubic-bezier(.4,0,.2,1)}.hover\:border-gray-300:hover{--tw-border-opacity:1;border-color:rgb(209 213 219/var(--tw-border-opacity))}.hover\:bg-gray-800:hover{--tw-bg-opacity:1;background-color:rgb(31 41 55/var(--tw-bg-opacity))}.hover\:fill-gray-300:hover{fill:#d1d5db}.hover\:fill-gray-500:hover{fill:#6b7280}.hover\:text-gray-300:hover{--tw-text-opacity:1;color:rgb(209 213 219/var(--tw-text-opacity))}.hover\:text-gray-500:hover{--tw-text-opacity:1;color:rgb(107 114 128/var(--tw-text-opacity))}.hover\:text-white:hover{--tw-text-opacity:1;color:rgb(255 255 255/var(--tw-text-opacity))}.disabled\:border-zinc-700:disabled{--tw-border-opacity:1;border-color:rgb(63 63 70/var(--tw-border-opacity))}.disabled\:text-zinc-700:disabled{--tw-text-opacity:1;color:rgb(63 63 70/var(--tw-text-opacity))}.group:hover .group-hover\:text-gray-500{--tw-text-opacity:1;color:rgb(107 114 128/var(--tw-text-opacity))}@media (min-width:640px){.sm\:order-none{order:0}.sm\:ml-6{margin-left:1.5rem}.sm\:mt-16{margin-top:4rem}.sm\:block{display:block}.sm\:hidden{display:none}.sm\:h-8{height:2rem}.sm\:w-8{width:2rem}.sm\:grid-cols-3{grid-template-columns:repeat(3,minmax(0,1fr))}.sm\:flex-row{flex-direction:row}.sm\:items-center{align-items:center}.sm\:self-center{align-self:center}.sm\:border-l{border-left-width:1px}.sm\:p-3{padding:.75rem}.sm\:px-6{padding-left:1.5rem;padding-right:1.5rem}.sm\:py-2{padding-bottom:.5rem;padding-top:.5rem}.sm\:text-2xl{font-size:1.5rem;line-height:2rem}.sm\:text-3xl{font-size:1.875rem;line-height:2.25rem}.sm\:text-4xl{font-size:2.25rem;line-height:2.5rem}.sm\:text-lg{font-size:1.125rem;line-height:1.75rem}}@media (min-width:768px){.md\:mt-10{margin-top:2.5rem}.md\:grid{display:grid}.md\:h-\[472px\]{height:472px}.md\:min-w-32{min-width:8rem}.md\:grid-cols-4{grid-template-columns:repeat(4,minmax(0,1fr))}.md\:space-y-16>:not([hidden])~:not([hidden]){--tw-space-y-reverse:0;margin-bottom:calc(4rem*var(--tw-space-y-reverse));margin-top:calc(4rem*(1 - var(--tw-space-y-reverse)))}}@media (min-width:1024px){.lg\:block{display:block}.lg\:flex{display:flex}.lg\:grid{display:grid}.lg\:hidden{display:none}.lg\:h-\[630px\]{height:630px}.lg\:max-h-\[600px\]{max-height:600px}.lg\:w-\[1040px\]{width:1040px}.lg\:w-full{width:100%}.lg\:grid-cols-2{grid-template-columns:repeat(2,minmax(0,1fr))}.lg\:grid-cols-3{grid-template-columns:repeat(3,minmax(0,1fr))}.lg\:grid-cols-6{grid-template-columns:repeat(6,minmax(0,1fr))}.lg\:flex-row{flex-direction:row}.lg\:justify-between{justify-content:space-between}.lg\:border-l{border-left-width:1px}.lg\:px-8{padding-left:2rem;padding-right:2rem}}@media (min-width:1280px){.xl\:w-full{width:100%}.xl\:text-center{text-align:center}} \ No newline at end of file diff --git a/client/index.js b/client/index.js index 223cc7b..1203165 100644 --- a/client/index.js +++ b/client/index.js @@ -35,7 +35,7 @@ const observerCallback = (mutationList) => { if (mutation.target instanceof HTMLElement) { try { parseForecast(JSON.parse(mutation.target.innerText)); - } catch(e) { + } catch (e) { forecastFailed(e); } } diff --git a/src/quality.rs b/src/quality.rs index ff9ec20..390a4c9 100644 --- a/src/quality.rs +++ b/src/quality.rs @@ -1,4 +1,5 @@ /// Contains quality text and associated color. +#[derive(Debug)] pub struct Quality(pub &'static str, pub &'static str); pub const GOOD: Quality = Quality("Good", "#0bd674"); @@ -102,3 +103,47 @@ impl Quality { &POOR } } + +#[cfg(test)] +mod tests { + use super::*; + + const HIGH_WIND: f64 = 33.3; + const LOW_WIND: f64 = 5.5; + + const HIGH_WAVES: f64 = 5.7; + const SMALL_WAVES: f64 = 0.3; + + const NORTH_WIND: f64 = 180.0; + const SOUTH_WIND: f64 = 0.0; + + #[test] + fn basic_wave_check_works_when_its_not_flat() { + assert!(Quality::basic_wave_check(2.1).is_none()); + } + + #[test] + fn basic_wave_check_works_when_it_is_flat() { + assert!(Quality::basic_wave_check(0.1).is_some()); + assert_eq!(Quality::basic_wave_check(0.1).unwrap().0, "Flat"); + assert_eq!(Quality::basic_wave_check(0.1).unwrap().1, "#a8a29e"); + } + + #[test] + fn a_north_beach_should_be_good_in_some_condition() { + assert_eq!(Quality::north(HIGH_WAVES, LOW_WIND, SOUTH_WIND).0, "Good"); + } + + #[test] + fn a_north_beach_shoud_be_bad_in_some_condition() { + assert_eq!( + Quality::north(HIGH_WAVES, HIGH_WIND, NORTH_WIND).0, + "Very Poor" + ); + } + + #[test] + fn a_north_beach_shoud_be_flat_in_some_condition() { + assert_eq!(Quality::north(SMALL_WAVES, HIGH_WIND, NORTH_WIND).0, "Flat"); + } +} diff --git a/src/routes/root.rs b/src/routes/root.rs index 8d1b4b7..6c41203 100644 --- a/src/routes/root.rs +++ b/src/routes/root.rs @@ -6,8 +6,36 @@ use axum::{ http::StatusCode, response::{IntoResponse, Response}, }; +use maud::{html, Markup, PreEscaped}; use std::{convert::Infallible, sync::Arc}; -use tokio::sync::{mpsc, Mutex}; +use tokio::sync::mpsc; + +/// This is ugly. Might be worth reverting to tera to create the +/// inline JS. Allows not having to pass the context around in a +/// mutex to the other threads though. +fn error_markup(error_type: &str, e: anyhow::Error) -> Markup { + html! { + script { + (PreEscaped("document.querySelector('#")) + (error_type) + (PreEscaped(r#"-container').classList.add("hidden"); + document.querySelector('#"#)) + (error_type) + (PreEscaped(r#"-error').innerHTML = ` +
+

+ Error loading "#)) + (error_type) + (PreEscaped(r#" data - please refresh the page or try again later. +

+

"#)) + span class="font-mono" { + "Error: " (e) + } + (PreEscaped("

`;")) + } + } +} /// Handler to return the website's index pub async fn root( @@ -17,49 +45,40 @@ pub async fn root( // Create a channel to stream content to client as we get it let (tx, rx) = mpsc::channel::>(2); - let context = Arc::new(Mutex::new(tera::Context::new())); + let mut context = tera::Context::new(); let spot: Arc = Arc::new(selected_spot.0.into()); // Add the initial context to the page for the loading state - { - let mut context = context.lock().await; - - // Update with inital values. - context.insert("spot", &*spot); - context.insert("breaks", &state.breaks); - #[cfg(debug_assertions)] - context.insert("live_reload", &true); - #[cfg(not(debug_assertions))] - context.insert("live_reload", &false); - - tx.send(Ok(TEMPLATES.render("index.html", &context)?)) - .await?; - } + context.insert("spot", &*spot); + context.insert("breaks", &state.breaks); + #[cfg(debug_assertions)] + context.insert("live_reload", &true); + #[cfg(not(debug_assertions))] + context.insert("live_reload", &false); + + tx.send(Ok(TEMPLATES.render("index.html", &context)?)) + .await?; let realtime_tx = tx.clone(); - let realtime_context = context.clone(); let realtime_spot = spot.clone(); let realtime_state = state.clone(); tokio::spawn(async move { match Realtime::try_get(realtime_spot, realtime_state.realtime_url).await { Ok(realtime) => { - let mut context = realtime_context.lock().await; - context.insert("realtime_json", &serde_json::to_string(&realtime).unwrap()); - - realtime_tx - .send(Ok(TEMPLATES.render("realtime.html", &context).unwrap())) - .await - .unwrap(); + let html = html!( + script type="application/json" id="realtime-data" {( + PreEscaped( + serde_json::to_string(&realtime).unwrap()) + )} + ) + .into(); + + realtime_tx.send(Ok(html)).await.unwrap(); } Err(e) => { - let mut context = realtime_context.lock().await; - context.insert("error", &e.to_string()); - context.insert("error_type", &"latest"); - context.insert("container", &"latest-container"); - context.insert("error_container", &"latest-error"); realtime_tx - .send(Ok(TEMPLATES.render("error.html", &context).unwrap())) + .send(Ok(html!((error_markup("latest", e))).into())) .await .unwrap(); } @@ -67,33 +86,24 @@ pub async fn root( }); let water_quality_tx = tx.clone(); - let water_quality_context = context.clone(); let water_quality_spot = spot.clone(); let water_quality_state = state.clone(); tokio::spawn(async move { match WaterQuality::try_get(water_quality_spot, water_quality_state.quality_url).await { Ok(water_quality) => { - let mut context = water_quality_context.lock().await; - context.insert( - "water_quality_json", - &serde_json::to_string(&water_quality).unwrap(), - ); - - water_quality_tx - .send(Ok(TEMPLATES - .render("water_quality.html", &context) - .unwrap())) - .await - .unwrap(); + let html = html!( + script type="application/json" id="water-quality-data" {( + PreEscaped( + serde_json::to_string(&water_quality).unwrap()) + )} + ) + .into(); + + water_quality_tx.send(Ok(html)).await.unwrap(); } Err(e) => { - let mut context = water_quality_context.lock().await; - context.insert("error", &e.to_string()); - context.insert("error_type", &"beach status"); - context.insert("container", &"water-quality-container"); - context.insert("error_container", &"water-quality-error"); water_quality_tx - .send(Ok(TEMPLATES.render("error.html", &context).unwrap())) + .send(Ok(html!((error_markup("water quality", e))).into())) .await .unwrap(); } @@ -103,22 +113,21 @@ pub async fn root( tokio::spawn(async move { match Forecast::try_get(&spot, state.forecast_url).await { Ok(forecast) => { - let mut context = context.lock().await; - context.insert("forecast_json", &serde_json::to_string(&forecast).unwrap()); + let html = html!( + script src="https://cdn.jsdelivr.net/npm/chart.js@4.4.3/dist/chart.umd.min.js" {} + script type="application/json" id="forecast-data" {( + PreEscaped( + serde_json::to_string(&forecast).unwrap()) + )} + ) + .into(); - tx.send(Ok(TEMPLATES.render("forecast.html", &context).unwrap())) - .await - .unwrap(); + tx.send(Ok(html)).await.unwrap(); Ok(()) } Err(e) => { - let mut context = context.lock().await; - context.insert("error", &e.to_string()); - context.insert("error_type", &"forecast"); - context.insert("container", &"forecast-container"); - context.insert("error_container", &"forecast-error"); - tx.send(Ok(TEMPLATES.render("error.html", &context).unwrap())) + tx.send(Ok(html!((error_markup("forecast", e))).into())) .await .unwrap(); diff --git a/tailwind.config.js b/tailwind.config.js index be0fe63..a1e6dae 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -1,5 +1,5 @@ /** @type {import('tailwindcss').Config} */ module.exports = { - content: ["./templates/**/*.{html,js}"], + content: ["./templates/**/*.{html,js}", "./src/routes/**"], }; diff --git a/templates/base.html b/templates/base.html index 10879fc..20016e6 100644 --- a/templates/base.html +++ b/templates/base.html @@ -17,7 +17,7 @@ - + @@ -46,7 +46,7 @@ @keyup.escape="showLiveFeed = false; showNav = false;" :class="{ 'overflow-hidden': showNav || showLiveFeed }" > - + {% block body %} {% endblock %} {% include "includes/footer.html" %} {% if live_reload %} diff --git a/templates/forecast.html b/templates/forecast.html deleted file mode 100644 index 072b4d6..0000000 --- a/templates/forecast.html +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/templates/realtime.html b/templates/realtime.html deleted file mode 100644 index 1df0d1c..0000000 --- a/templates/realtime.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/templates/water_quality.html b/templates/water_quality.html deleted file mode 100644 index 143b633..0000000 --- a/templates/water_quality.html +++ /dev/null @@ -1 +0,0 @@ -