From 5760f597eb17eab5abe6a3ae6c905ad9e111dc46 Mon Sep 17 00:00:00 2001 From: WriterV2 Date: Mon, 11 May 2026 23:52:49 +0200 Subject: Refactor page and story --- src/data.rs | 98 +++++++++++++++++++ src/main.rs | 284 +----------------------------------------------------- src/story.rs | 187 +++++++++++++++++++++++++++++++++++ static/styles.css | 1 - 4 files changed, 289 insertions(+), 281 deletions(-) create mode 100644 src/data.rs create mode 100644 src/story.rs delete mode 100644 static/styles.css diff --git a/src/data.rs b/src/data.rs new file mode 100644 index 0000000..2e5b3d1 --- /dev/null +++ b/src/data.rs @@ -0,0 +1,98 @@ +use crate::page; +use crate::story; +use maud::{html, Markup}; +use serde::Deserialize; + +#[derive(Deserialize)] +pub struct Data { + pub stories: Vec, +} + +impl page::Page for Data { + fn page_title() -> String { + String::from("Home") + } + + fn alternative_htmlfilename() -> Option { + Some(String::from("index")) + } + + fn render_content(&self) -> Markup { + let last_story = self.stories.first(); + html!( + @if let Some(story) = last_story { + div class="latest-story" lang=(story.html_lang_value()) { + h2 lang="en" { "Latest Story" } + h3 { + (story.name) + } + @if let Some(content_warnings) = story.render_content_warnings() { + (content_warnings) + } + + p { (story.description) } + ul lang="en" { + li { "Language: " (story.language) } + li { + a href=(&story.format_pdf_path()) download + { + "PDF" + } + } + } + + } + } + ) + } + + fn content_style() -> Markup { + html!( + """ +h2 { + font-size: 2.5rem; + color: #2F3C57; + text-decoration: 0.1rem solid underline black; +} + +h3 { + font-size: 1.8rem; + color: #2F3C57; + padding: 2rem 0; +} + +.latest-story { + padding: 3rem; + margin: 3rem; + text-align: left; + background-color: #FFD1A3; + hyphens: auto; + * { + margin: 1rem 0; + } + + p { + font-size: 1.2rem; + } +} + +a { + text-decoration: underline; + color: #3D1D49; +} + +ul { + list-style: none; +} + +.content-warning { + background-color: #EC7981; + margin: 2rem 0; + padding: 0.3rem; + width: fit-content; +} + + """ + ) + } +} diff --git a/src/main.rs b/src/main.rs index 006ed58..493529e 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,287 +1,11 @@ use anyhow::{Context, Result}; -use maud::{html, Markup}; -use serde::Deserialize; -use toml::value::Date; -use self::page::Page; +use data::Data; +use page::Page; +mod data; mod page; - -#[derive(Deserialize)] -struct Data { - stories: Vec, -} - -impl page::Page for Data { - fn page_title() -> String { - String::from("Home") - } - - fn alternative_htmlfilename() -> Option { - Some(String::from("index")) - } - - fn render_content(&self) -> Markup { - let last_story = self.stories.first(); - html!( - @if let Some(story) = last_story { - div class="latest-story" lang=(story.html_lang_value()) { - h2 lang="en" { "Latest Story" } - h3 { - (story.name) - } - @if let Some(content_warnings) = story.render_content_warnings() { - (content_warnings) - } - - p { (story.description) } - ul lang="en" { - li { "Language: " (story.language) } - li { - a href=(&story.format_pdf_path()) download - { - "PDF" - } - } - } - - } - } - ) - } - - fn content_style() -> Markup { - html!( - """ -h2 { - font-size: 2.5rem; - color: #2F3C57; - text-decoration: 0.1rem solid underline black; -} - -h3 { - font-size: 1.8rem; - color: #2F3C57; - padding: 2rem 0; -} - -.latest-story { - padding: 3rem; - margin: 3rem; - text-align: left; - background-color: #FFD1A3; - hyphens: auto; - * { - margin: 1rem 0; - } - - p { - font-size: 1.2rem; - } -} - -a { - text-decoration: underline; - color: #3D1D49; -} - -ul { - list-style: none; -} - -.content-warning { - background-color: #EC7981; - margin: 2rem 0; - padding: 0.3rem; - width: fit-content; -} - - """ - ) - } -} - -impl page::Page for Vec { - fn page_title() -> String { - String::from("Stories") - } - - fn render_content(&self) -> Markup { - html!( - @for story in self { - (story.render_as_card()) - } - ) - } - - fn prepare_content(&mut self) -> Result<()> { - self.sort_by(|a, b| { - let date1 = a.update_date.unwrap_or(a.upload_date); - let date2 = b.update_date.unwrap_or(b.upload_date); - date2.cmp(&date1) - }); - for story in self { - std::fs::copy(&story.path, story.format_local_pdf_path())?; - } - Ok(()) - } - - fn content_style() -> Markup { - html!( - """ -h2 { - font-size: 1.8rem; - margin-bottom: 2rem; - color: #2F3C57; -} - -hr { - margin: 1rem; -} - - -.story-card { - text-align: left; - font-size: 1.2rem; - hyphens: auto; - ul { - display: flex; - justify-content: start; - list-style: none; - flex-wrap: wrap; - - li { - font-size: 1rem; - padding: 0.8rem; - margin: 0.8rem; - background-color: #2F3C57; - color: #ffd1a3; - outline: 0.2rem solid #2F3C57; - - a { - text-decoration: underline #E1CCEB; - color: #E1CCEB; - } - } - } - - hr { - margin: 2rem 0; - } - - p { - margin-top: 1rem; - } - - padding: 3rem; - margin: 3rem; - background-color: #ffd1a3; - border-bottom: 0.1rem dotted black; - - .content-warning { - background-color: #EC7981; - margin: 2rem 0; - padding: 0.3rem; - width: fit-content; - } -} - """ - ) - } -} - -#[derive(Deserialize, Debug)] -enum StoryLanguage { - German, - English, -} - -impl std::fmt::Display for StoryLanguage { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{:?}", self) - } -} - -#[derive(Deserialize)] -struct Story { - name: String, - description: String, - language: StoryLanguage, - upload_date: Date, - update_date: Option, - path: String, - warnings: Option>, -} - -impl Story { - fn render_as_card(&self) -> Markup { - html!(div class="story-card" lang=(self.html_lang_value()) { - card { - h2 { (self.name) } - @if let Some(content_warnings) = &self.render_content_warnings() { - (content_warnings) - } - p { (self.description) } - hr {} - ul lang="en" { - li { "Language: " (self.language) } - li { "Uploaded on: " (self.upload_date) } - @if let Some(update_date) = self.update_date { - li { "Updated on: " (update_date) } - } - li { - a href=(&self.format_pdf_path()) download - { - "PDF" - } - } - } - } - }) - } - - fn format_pdf_path(&self) -> String { - let snake_case_name = self.name.to_lowercase().replace(" ", "_"); - format!("stories/{}.pdf", snake_case_name) - } - - fn format_local_pdf_path(&self) -> String { - format!("dist/{}", self.format_pdf_path()) - } - - fn html_lang_value(&self) -> String { - match self.language { - StoryLanguage::German => String::from("de"), - StoryLanguage::English => String::from("en"), - } - } - - fn render_content_warnings(&self) -> Option { - if let Some(warnings) = &self.warnings { - let (summary, prefix) = match self.language { - StoryLanguage::German => ( - String::from("Vorsicht ist geboten."), - String::from("Die Geschichte beinhaltet: "), - ), - StoryLanguage::English => ( - String::from("Reader discretion is advised."), - String::from("The story contains: "), - ), - }; - let details = format!("{}{}", prefix, warnings.join(", ")); - Some(html!( - details { - summary { - strong { (summary) } - } - p class="content-warning" { (details) } - } - )) - } else { - None - } - } -} +mod story; fn main() -> Result<()> { let data_file_content = diff --git a/src/story.rs b/src/story.rs new file mode 100644 index 0000000..c5371ee --- /dev/null +++ b/src/story.rs @@ -0,0 +1,187 @@ +use crate::page; +use anyhow::Result; +use maud::{html, Markup}; +use serde::Deserialize; +use toml::value::Date; + +impl page::Page for Vec { + fn page_title() -> String { + String::from("Stories") + } + + fn render_content(&self) -> Markup { + html!( + @for story in self { + (story.render_as_card()) + } + ) + } + + fn prepare_content(&mut self) -> Result<()> { + self.sort_by(|a, b| { + let date1 = a.update_date.unwrap_or(a.upload_date); + let date2 = b.update_date.unwrap_or(b.upload_date); + date2.cmp(&date1) + }); + for story in self { + std::fs::copy(&story.path, story.format_local_pdf_path())?; + } + Ok(()) + } + + fn content_style() -> Markup { + html!( + """ +h2 { + font-size: 1.8rem; + margin-bottom: 2rem; + color: #2F3C57; +} + +hr { + margin: 1rem; +} + + +.story-card { + text-align: left; + font-size: 1.2rem; + hyphens: auto; + ul { + display: flex; + justify-content: start; + list-style: none; + flex-wrap: wrap; + + li { + font-size: 1rem; + padding: 0.8rem; + margin: 0.8rem; + background-color: #2F3C57; + color: #ffd1a3; + outline: 0.2rem solid #2F3C57; + + a { + text-decoration: underline #E1CCEB; + color: #E1CCEB; + } + } + } + + hr { + margin: 2rem 0; + } + + p { + margin-top: 1rem; + } + + padding: 3rem; + margin: 3rem; + background-color: #ffd1a3; + border-bottom: 0.1rem dotted black; + + .content-warning { + background-color: #EC7981; + margin: 2rem 0; + padding: 0.3rem; + width: fit-content; + } +} + """ + ) + } +} + +#[derive(Deserialize, Debug)] +pub enum StoryLanguage { + German, + English, +} + +impl std::fmt::Display for StoryLanguage { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + write!(f, "{:?}", self) + } +} + +#[derive(Deserialize)] +pub struct Story { + pub name: String, + pub description: String, + pub language: StoryLanguage, + pub upload_date: Date, + pub update_date: Option, + pub path: String, + pub warnings: Option>, +} + +impl Story { + fn render_as_card(&self) -> Markup { + html!(div class="story-card" lang=(self.html_lang_value()) { + card { + h2 { (self.name) } + @if let Some(content_warnings) = &self.render_content_warnings() { + (content_warnings) + } + p { (self.description) } + hr {} + ul lang="en" { + li { "Language: " (self.language) } + li { "Uploaded on: " (self.upload_date) } + @if let Some(update_date) = self.update_date { + li { "Updated on: " (update_date) } + } + li { + a href=(&self.format_pdf_path()) download + { + "PDF" + } + } + } + } + }) + } + + pub fn format_pdf_path(&self) -> String { + let snake_case_name = self.name.to_lowercase().replace(" ", "_"); + format!("stories/{}.pdf", snake_case_name) + } + + fn format_local_pdf_path(&self) -> String { + format!("dist/{}", self.format_pdf_path()) + } + + pub fn html_lang_value(&self) -> String { + match self.language { + StoryLanguage::German => String::from("de"), + StoryLanguage::English => String::from("en"), + } + } + + pub fn render_content_warnings(&self) -> Option { + if let Some(warnings) = &self.warnings { + let (summary, prefix) = match self.language { + StoryLanguage::German => ( + String::from("Vorsicht ist geboten."), + String::from("Die Geschichte beinhaltet: "), + ), + StoryLanguage::English => ( + String::from("Reader discretion is advised."), + String::from("The story contains: "), + ), + }; + let details = format!("{}{}", prefix, warnings.join(", ")); + Some(html!( + details { + summary { + strong { (summary) } + } + p class="content-warning" { (details) } + } + )) + } else { + None + } + } +} diff --git a/static/styles.css b/static/styles.css deleted file mode 100644 index e5b60ae..0000000 --- a/static/styles.css +++ /dev/null @@ -1 +0,0 @@ -/*! tailwindcss v3.4.4 | MIT License | https://tailwindcss.com*/*,:after,:before{box-sizing:border-box;border:0 solid #e5e7eb}:after,:before{--tw-content:""}:host,html{line-height:1.5;-webkit-text-size-adjust:100%;-moz-tab-size:4;-o-tab-size:4;tab-size:4;font-family:ui-sans-serif,system-ui,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol,Noto Color Emoji;font-feature-settings:normal;font-variation-settings:normal;-webkit-tap-highlight-color:transparent}body{margin:0;line-height:inherit}hr{height:0;color:inherit;border-top-width:1px}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-family:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,monospace;font-feature-settings:normal;font-variation-settings:normal;font-size:1em}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:initial}sub{bottom:-.25em}sup{top:-.5em}table{text-indent:0;border-color:inherit;border-collapse:collapse}button,input,optgroup,select,textarea{font-family:inherit;font-feature-settings:inherit;font-variation-settings:inherit;font-size:100%;font-weight:inherit;line-height:inherit;letter-spacing:inherit;color:inherit;margin:0;padding:0}button,select{text-transform:none}button,input:where([type=button]),input:where([type=reset]),input:where([type=submit]){-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{opacity:1;color:#9ca3af}input::placeholder,textarea::placeholder{opacity:1;color:#9ca3af}[role=button],button{cursor:pointer}:disabled{cursor:default}audio,canvas,embed,iframe,img,object,svg,video{display:block;vertical-align:middle}img,video{max-width:100%;height:auto}[hidden]{display:none}*,::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: ;--tw-contain-size: ;--tw-contain-layout: ;--tw-contain-paint: ;--tw-contain-style: }.static{position:static}.m-12{margin:3rem}.m-5{margin:1.25rem}.mt-9{margin-top:2.25rem}.mr-5{margin-right:1.25rem}.mr-9{margin-right:2.25rem}.mr-28{margin-right:7rem}.mt-5{margin-top:1.25rem}.mr-32{margin-right:8rem}.mr-10{margin-right:2.5rem}.flex{display:flex}.grid{display:grid}.grid-cols-2{grid-template-columns:repeat(2,minmax(0,1fr))}.flex-row{flex-direction:row}.flex-wrap{flex-wrap:wrap}.content-center{align-content:center}.justify-start{justify-content:flex-start}.justify-between{justify-content:space-between}.justify-around{justify-content:space-around}.gap-8{gap:2rem}.space-x-5>:not([hidden])~:not([hidden]){--tw-space-x-reverse:0;margin-right:calc(1.25rem*var(--tw-space-x-reverse));margin-left:calc(1.25rem*(1 - var(--tw-space-x-reverse)))}.space-x-4>:not([hidden])~:not([hidden]){--tw-space-x-reverse:0;margin-right:calc(1rem*var(--tw-space-x-reverse));margin-left:calc(1rem*(1 - var(--tw-space-x-reverse)))}.space-y-4>:not([hidden])~:not([hidden]){--tw-space-y-reverse:0;margin-top:calc(1rem*(1 - var(--tw-space-y-reverse)));margin-bottom:calc(1rem*var(--tw-space-y-reverse))}.space-y-6>:not([hidden])~:not([hidden]){--tw-space-y-reverse:0;margin-top:calc(1.5rem*(1 - var(--tw-space-y-reverse)));margin-bottom:calc(1.5rem*var(--tw-space-y-reverse))}.space-x-6>:not([hidden])~:not([hidden]){--tw-space-x-reverse:0;margin-right:calc(1.5rem*var(--tw-space-x-reverse));margin-left:calc(1.5rem*(1 - var(--tw-space-x-reverse)))}.border{border-width:1px}.bg-\[\#eae3d2\]{--tw-bg-opacity:1;background-color:rgb(234 227 210/var(--tw-bg-opacity))}.p-3{padding:.75rem}.p-6{padding:1.5rem}.p-9{padding:2.25rem}.text-center{text-align:center}.font-mono{font-family:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,monospace}.font-serif{font-family:ui-serif,Georgia,Cambria,Times New Roman,Times,serif}.text-base{font-size:1rem;line-height:1.5rem}.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}.tracking-wide{letter-spacing:.025em}.tracking-wider{letter-spacing:.05em}.tracking-widest{letter-spacing:.1em}.text-\[\#333\]{--tw-text-opacity:1;color:rgb(51 51 51/var(--tw-text-opacity))}.text-\[\#601B69\]{--tw-text-opacity:1;color:rgb(96 27 105/var(--tw-text-opacity))}.underline{text-decoration-line:underline}.decoration-\[\#601B69\]{text-decoration-color:#601b69}.decoration-\[\#eae3d2\]{text-decoration-color:#eae3d2}.shadow{--tw-shadow:0 1px 3px 0 #0000001a,0 1px 2px -1px #0000001a;--tw-shadow-colored:0 1px 3px 0 var(--tw-shadow-color),0 1px 2px -1px var(--tw-shadow-color);box-shadow:var(--tw-ring-offset-shadow,0 0 #0000),var(--tw-ring-shadow,0 0 #0000),var(--tw-shadow)}.hover\:underline:hover{text-decoration-line:underline}@media (prefers-color-scheme:dark){.dark\:border-\[E1B1E7\]{border-color:E1B1E7}.dark\:border-\[\#E1B1E7\]{--tw-border-opacity:1;border-color:rgb(225 177 231/var(--tw-border-opacity))}.dark\:bg-\[\#333\]{--tw-bg-opacity:1;background-color:rgb(51 51 51/var(--tw-bg-opacity))}.dark\:text-\[\#E1B1E7\]{--tw-text-opacity:1;color:rgb(225 177 231/var(--tw-text-opacity))}.dark\:text-\[\#eae3d2\]{--tw-text-opacity:1;color:rgb(234 227 210/var(--tw-text-opacity))}.dark\:decoration-\[\#E1B1E7\],.dark\:decoration-\[\#e1b1e7\]{text-decoration-color:#e1b1e7}.dark\:shadow-\[\#E1B1E7\]{--tw-shadow-color:#e1b1e7;--tw-shadow:var(--tw-shadow-colored)}} \ No newline at end of file -- cgit v1.2.3