diff --git a/public/styles/tailwind.min.css b/public/styles/tailwind.min.css index 9e98ad8..ceb1808 100644 --- a/public/styles/tailwind.min.css +++ b/public/styles/tailwind.min.css @@ -1 +1 @@ -/*! tailwindcss v3.3.0 | MIT License | https://tailwindcss.com*/*,:after,:before{box-sizing:border-box;border:0 solid #e5e7eb}:after,:before{--tw-content:""}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,-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,Noto Sans,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol,Noto Color Emoji;font-feature-settings:normal;font-variation-settings:normal}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-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-size:100%;font-weight:inherit;line-height:inherit;color: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}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-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}}.mx-auto{margin-left:auto;margin-right:auto}.ml-2{margin-left:.5rem}.mr-2{margin-right:.5rem}.flex{display:flex}.grid{display:grid}.hidden{display:none}.min-h-screen{min-height:100vh}.max-w-fit{max-width:-moz-fit-content;max-width:fit-content}.max-w-full{max-width:100%}.grid-flow-row{grid-auto-flow:row}.flex-row{flex-direction:row}.flex-col{flex-direction:column}.justify-center{justify-content:center}.gap-y-4{row-gap:1rem}.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))}.bg-alice-werefox-grey{--tw-bg-opacity:1;background-color:rgb(36 36 36/var(--tw-bg-opacity))}.bg-alice-werefox-grey-dark{--tw-bg-opacity:1;background-color:rgb(18 18 18/var(--tw-bg-opacity))}.bg-alice-werefox-grey-light{--tw-bg-opacity:1;background-color:rgb(204 204 204/var(--tw-bg-opacity))}.bg-alice-werefox-grey-lightest{--tw-bg-opacity:1;background-color:rgb(238 238 238/var(--tw-bg-opacity))}.p-2{padding:.5rem}.p-4{padding:1rem}.py-4{padding-top:1rem;padding-bottom:1rem}.text-center{text-align:center}.align-middle{vertical-align:middle}.font-nerd{font-family:DejaVuSansMono}.font-open{font-family:OpenDyslexic}.text-lg{font-size:1.125rem}.text-lg,.text-xl{line-height:1.75rem}.text-xl{font-size:1.25rem}.text-alice-werefox-grey-dark{--tw-text-opacity:1;color:rgb(18 18 18/var(--tw-text-opacity))}.text-alice-werefox-grey-light{--tw-text-opacity:1;color:rgb(204 204 204/var(--tw-text-opacity))}.ring-2{--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(2px + var(--tw-ring-offset-width)) var(--tw-ring-color)}.ring-2,.ring-4{box-shadow:var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow,0 0 #0000)}.ring-4{--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(4px + var(--tw-ring-offset-width)) var(--tw-ring-color)}.ring-alice-werefox-red{--tw-ring-opacity:1;--tw-ring-color:rgb(201 52 57/var(--tw-ring-opacity))}.ring-alice-werefox-red-dark{--tw-ring-opacity:1;--tw-ring-color:rgb(128 0 8/var(--tw-ring-opacity))}.transition{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);transition-duration:.15s}@font-face{font-family:OpenDyslexic;src:url(/fonts/OpenDyslexic-Regular.otf)}@font-face{font-family:DejaVuSansMono;src:url(/fonts/DejaVuSansMono.ttf)}.before\:content-\[\'Open\'\]:before{--tw-content:"Open";content:var(--tw-content)}@keyframes yip{0%,to{transform:scale(1)}50%{transform:scale(1.01)}}.hover\:animate-yip:hover{animation:yip .1s ease-in-out}.hover\:text-alice-werefox-blue-dark:hover{--tw-text-opacity:1;color:rgb(51 0 255/var(--tw-text-opacity))}.hover\:text-alice-werefox-blue-light:hover{--tw-text-opacity:1;color:rgb(145 151 243/var(--tw-text-opacity))}.hover\:ring-alice-werefox-blue:hover{--tw-ring-opacity:1;--tw-ring-color:rgb(27 41 224/var(--tw-ring-opacity))}.group[open] .group-open\:before\:content-\[\'Close\'\]:before{--tw-content:"Close";content:var(--tw-content)}@media (prefers-color-scheme:dark){.dark\:bg-alice-werefox-grey{--tw-bg-opacity:1;background-color:rgb(36 36 36/var(--tw-bg-opacity))}.dark\:bg-alice-werefox-grey-dark{--tw-bg-opacity:1;background-color:rgb(18 18 18/var(--tw-bg-opacity))}.dark\:text-alice-werefox-grey-light{--tw-text-opacity:1;color:rgb(204 204 204/var(--tw-text-opacity))}.dark\:ring-alice-werefox-red{--tw-ring-opacity:1;--tw-ring-color:rgb(201 52 57/var(--tw-ring-opacity))}.dark\:hover\:text-alice-werefox-blue-light:hover{--tw-text-opacity:1;color:rgb(145 151 243/var(--tw-text-opacity))}.dark\:hover\:ring-alice-werefox-blue:hover{--tw-ring-opacity:1;--tw-ring-color:rgb(27 41 224/var(--tw-ring-opacity))}}@media (min-width:768px){.md\:grid-flow-col{grid-auto-flow:column}.md\:pl-8{padding-left:2rem}.md\:pr-8{padding-right:2rem}} \ No newline at end of file +/*! tailwindcss v3.3.0 | MIT License | https://tailwindcss.com*/*,:after,:before{box-sizing:border-box;border:0 solid #e5e7eb}:after,:before{--tw-content:""}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,-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,Noto Sans,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol,Noto Color Emoji;font-feature-settings:normal;font-variation-settings:normal}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-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-size:100%;font-weight:inherit;line-height:inherit;color: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}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-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}}.mx-auto{margin-left:auto;margin-right:auto}.ml-2{margin-left:.5rem}.mr-2{margin-right:.5rem}.flex{display:flex}.min-h-screen{min-height:100vh}.max-w-fit{max-width:-moz-fit-content;max-width:fit-content}.max-w-full{max-width:100%}.basis-full{flex-basis:100%}.flex-row{flex-direction:row}.flex-col{flex-direction:column}.justify-center{justify-content:center}.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))}.bg-alice-werefox-grey{--tw-bg-opacity:1;background-color:rgb(36 36 36/var(--tw-bg-opacity))}.bg-alice-werefox-grey-dark{--tw-bg-opacity:1;background-color:rgb(18 18 18/var(--tw-bg-opacity))}.bg-alice-werefox-grey-light{--tw-bg-opacity:1;background-color:rgb(204 204 204/var(--tw-bg-opacity))}.bg-alice-werefox-grey-lightest{--tw-bg-opacity:1;background-color:rgb(238 238 238/var(--tw-bg-opacity))}.p-2{padding:.5rem}.p-4{padding:1rem}.py-4{padding-top:1rem;padding-bottom:1rem}.text-center{text-align:center}.align-middle{vertical-align:middle}.font-nerd{font-family:DejaVuSansMono}.font-open{font-family:OpenDyslexic}.text-lg{font-size:1.125rem}.text-lg,.text-xl{line-height:1.75rem}.text-xl{font-size:1.25rem}.text-alice-werefox-grey-dark{--tw-text-opacity:1;color:rgb(18 18 18/var(--tw-text-opacity))}.text-alice-werefox-grey-light{--tw-text-opacity:1;color:rgb(204 204 204/var(--tw-text-opacity))}.ring-2{--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(2px + var(--tw-ring-offset-width)) var(--tw-ring-color)}.ring-2,.ring-4{box-shadow:var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow,0 0 #0000)}.ring-4{--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(4px + var(--tw-ring-offset-width)) var(--tw-ring-color)}.ring-alice-werefox-red{--tw-ring-opacity:1;--tw-ring-color:rgb(201 52 57/var(--tw-ring-opacity))}.ring-alice-werefox-red-dark{--tw-ring-opacity:1;--tw-ring-color:rgb(128 0 8/var(--tw-ring-opacity))}.transition{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);transition-duration:.15s}@font-face{font-family:OpenDyslexic;src:url(/fonts/OpenDyslexic-Regular.otf)}@font-face{font-family:DejaVuSansMono;src:url(/fonts/DejaVuSansMono.ttf)}.before\:content-\[\'Open\'\]:before{--tw-content:"Open";content:var(--tw-content)}@keyframes yip{0%,to{transform:scale(1)}50%{transform:scale(1.01)}}.hover\:animate-yip:hover{animation:yip .1s ease-in-out}.hover\:text-alice-werefox-blue-dark:hover{--tw-text-opacity:1;color:rgb(51 0 255/var(--tw-text-opacity))}.hover\:text-alice-werefox-blue-light:hover{--tw-text-opacity:1;color:rgb(145 151 243/var(--tw-text-opacity))}.hover\:ring-alice-werefox-blue:hover{--tw-ring-opacity:1;--tw-ring-color:rgb(27 41 224/var(--tw-ring-opacity))}.group[open] .group-open\:before\:content-\[\'Close\'\]:before{--tw-content:"Close";content:var(--tw-content)}@media (prefers-color-scheme:dark){.dark\:bg-alice-werefox-grey{--tw-bg-opacity:1;background-color:rgb(36 36 36/var(--tw-bg-opacity))}.dark\:bg-alice-werefox-grey-dark{--tw-bg-opacity:1;background-color:rgb(18 18 18/var(--tw-bg-opacity))}.dark\:text-alice-werefox-grey-light{--tw-text-opacity:1;color:rgb(204 204 204/var(--tw-text-opacity))}.dark\:ring-alice-werefox-red{--tw-ring-opacity:1;--tw-ring-color:rgb(201 52 57/var(--tw-ring-opacity))}.dark\:hover\:text-alice-werefox-blue-light:hover{--tw-text-opacity:1;color:rgb(145 151 243/var(--tw-text-opacity))}.dark\:hover\:ring-alice-werefox-blue:hover{--tw-ring-opacity:1;--tw-ring-color:rgb(27 41 224/var(--tw-ring-opacity))}}@media (min-width:768px){.md\:flex-row{flex-direction:row}.md\:space-y-0>:not([hidden])~:not([hidden]){--tw-space-y-reverse:0;margin-top:calc(0px*(1 - var(--tw-space-y-reverse)));margin-bottom:calc(0px*var(--tw-space-y-reverse))}.md\:pl-8{padding-left:2rem}.md\:pr-8{padding-right:2rem}} \ No newline at end of file diff --git a/void-fe/src/components/void_buttons.rs b/void-fe/src/components/void_buttons.rs index 2f5df72..492a70d 100644 --- a/void-fe/src/components/void_buttons.rs +++ b/void-fe/src/components/void_buttons.rs @@ -1,13 +1,14 @@ -use crate::utils::prop_structs::{ButtonProps, ContentChildren}; +use super::super::utils::{prop_structs::{ButtonProps, ContentChildren}, user_prefs::{UserPrefs, ThemedComponent}}; use dioxus::prelude::*; #[cfg(target_family = "wasm")] use dioxus_router::Link; -pub fn BackToHomePage(cx: Scope) -> Element { +pub fn BackToHomePage(cx: Scope) -> Element { + let (user_theme, user_font)= cx.props.clone().get_pref_classes(ThemedComponent::Button); #[cfg(any(target_family = "windows", target_family = "unix"))] return cx.render(rsx!{ - a { class: "flex justify-center p-4 text-xl text-center ring-2", + a { class: "flex justify-center p-4 text-xl text-center ring-2 hover:animate-yip transition {user_theme} {user_font}", href: "/", p { "Back to the homepage" @@ -16,7 +17,7 @@ pub fn BackToHomePage(cx: Scope) -> Element { }); #[cfg(target_family = "wasm")] return cx.render(rsx!{ - Link { class: "flex justify-center p-4 text-xl text-center ring-2", + Link { class: "flex justify-center p-4 text-xl text-center ring-2 hover:animate-yip transition {user_theme} {user_font}", to: "/", p { "Back to the homepage" @@ -26,20 +27,21 @@ pub fn BackToHomePage(cx: Scope) -> Element { } pub fn NavigationButton(cx: Scope) -> Element { + let (user_theme, user_font)= cx.props.user_prefs.clone().get_pref_classes(ThemedComponent::Button); let title = cx.props.title.clone(); let title_ref = title.as_str(); let slug = cx.props.slug.clone(); let slug_ref = slug.as_str(); #[cfg(any(target_family = "windows", target_family = "unix"))] return cx.render(rsx!{ - a { class: "flex mx-auto max-w-full justify-center p-4 ml-2 mr-2 text-xl text-center ring-2", + a { class: "flex basis-full justify-center p-4 ml-2 mr-2 text-xl text-center ring-2 hover:animate-yip transition {user_theme} {user_font}", href: "{slug_ref}", "{title_ref}" } }); #[cfg(target_family = "wasm")] return cx.render(rsx!{ - Link { class: "flex mx-auto max-w-full justify-center p-4 ml-2 mr-2 text-xl text-center ring-2", + Link { class: "flex basis-full justify-center p-4 ml-2 mr-2 text-xl text-center ring-2 hover:animate-yip transition {user_theme} {user_font}", to: "{slug_ref}", div { dangerous_inner_html: "{title_ref}", @@ -50,7 +52,7 @@ pub fn NavigationButton(cx: Scope) -> Element { pub fn ButtonGroup<'a>(cx: Scope<'a, ContentChildren<'a>>) -> Element { cx.render(rsx! { - div { class: "grid md:grid-flow-col grid-flow-row gap-y-4", + div { class: "flex md:flex-row md:space-y-0 flex-col space-y-4", &cx.props.children } }) diff --git a/void-fe/src/components/void_content.rs b/void-fe/src/components/void_content.rs index 4c17227..83dcfc3 100644 --- a/void-fe/src/components/void_content.rs +++ b/void-fe/src/components/void_content.rs @@ -1,12 +1,14 @@ // Might wanna move stuff form `void_poem.rs` into here... use crate::utils::prop_structs::{ContentProps}; +use super::super::utils::user_prefs::ThemedComponent; use dioxus::prelude::*; pub fn RenderContent(cx: Scope) -> Element { + let (user_theme, user_font) = cx.props.user_prefs.get_pref_classes(ThemedComponent::Card); let content = &cx.props.content; #[cfg(any(target_family = "windows", target_family = "unix"))] return cx.render(rsx!{ - div { class: "flex p-4 md:pl-8 md:pr-8 ml-2 mr-2 text-lg text-center ring-4", + div { class: "flex p-4 md:pl-8 md:pr-8 ml-2 mr-2 text-lg text-center ring-4 {user_theme} {user_font}", "{content}", } }); diff --git a/void-fe/src/components/void_footer.rs b/void-fe/src/components/void_footer.rs index e657110..f675e58 100644 --- a/void-fe/src/components/void_footer.rs +++ b/void-fe/src/components/void_footer.rs @@ -1,16 +1,19 @@ use dioxus::prelude::*; -use crate::components::void_buttons::NavigationButton; +use crate::{components::void_buttons::NavigationButton, utils::user_prefs::{UserPrefs, ThemedComponent}}; -pub fn Footer(cx: Scope) -> Element { +pub fn Footer(cx: Scope) -> Element { cx.render(rsx! { - MutantStandardFooter {} + MutantStandardFooter { theme: cx.props.clone().get_theme(), font: cx.props.clone().get_font() } }) } -fn MutantStandardFooter(cx: Scope) -> Element { +fn MutantStandardFooter(cx: Scope) -> Element { + let user_prefs = UserPrefs::new(cx.props.clone().get_theme(), cx.props.clone().get_font()); + let user_theme = cx.props.get_theme_classes(ThemedComponent::Card); + let user_font = cx.props.get_font_class(); cx.render(rsx!{ - div { class: "p-4 flex flex-col space-y-4 mx-auto max-w-full justify-center ring-4", - NavigationButton { title: "⚙️".to_string(), slug: "/settings".to_string() } + div { class: "p-4 flex flex-col space-y-4 mx-auto max-w-full justify-center ring-4 {user_theme} {user_font}", + NavigationButton { title: "⚙️ Settings".to_string(), slug: "/settings".to_string(), user_prefs: user_prefs } div { class: "flex mx-auto max-w-full justify-center text-md text-center", "This site uses Mutant Standard emoji, which are licensed under a Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License" } diff --git a/void-fe/src/components/void_page.rs b/void-fe/src/components/void_page.rs index fb81a19..dd68e39 100644 --- a/void-fe/src/components/void_page.rs +++ b/void-fe/src/components/void_page.rs @@ -3,7 +3,6 @@ use dioxus::prelude::*; pub fn PageBase<'a>(cx: Scope<'a, PageChildren<'a>>) -> Element { cx.render(rsx!{ - // div { class: "bg-alice-werefox-grey-lightest ring-alice-werefox-red-dark text-alice-werefox-grey-dark dark:bg-alice-werefox-grey-dark dark:ring-alice-werefox-red dark:text-alice-werefox-grey-light let button_classes hover:text-alice-werefox-blue-dark hover:ring-alice-werefox-blue dark:hover:text-alice-werefox-blue-light dark:hover:ring-alice-werefox-blue hover:animate-yip transition", hidden: true } div { class: "min-h-screen", div { class: "container space-y-4 mx-auto p-4", &cx.props.children diff --git a/void-fe/src/components/void_poem.rs b/void-fe/src/components/void_poem.rs index 807743b..a9790dd 100644 --- a/void-fe/src/components/void_poem.rs +++ b/void-fe/src/components/void_poem.rs @@ -1,18 +1,17 @@ use crate::components::void_buttons::*; use crate::components::void_title::*; -use crate::utils::helpers; -use crate::utils::prop_structs::{PoemChildren, PoemData}; -use super::super::utils::user_prefs::*; +use crate::utils::{helpers, prop_structs::{PoemChildren, PoemData}, user_prefs::{UserPrefs, ThemedComponent} }; use dioxus::prelude::*; -pub fn PoemList(cx: Scope) -> Element { +pub fn PoemList(cx: Scope) -> Element { let poem_list = helpers::get_poem_list(); cx.render(rsx! { ul { class: "flex flex-col space-y-4", poem_list.into_iter().map(|p| { + let user_prefs = cx.props.clone(); let slug = format!("/poems/{}", p.1); rsx!{ - NavigationButton { title: p.0, slug: slug } + NavigationButton { title: p.0, slug: slug, user_prefs: user_prefs.clone() } } }) } @@ -31,14 +30,15 @@ pub fn GetPoem(cx: Scope) -> Element { let slug = String::from(cx.props.slug.clone().expect("No slug specified.")); let (title, content, creation_date) = helpers::get_poem(slug.clone()); cx.render(rsx! { - Title { title: title, is_html: true, user_prefs: UserPrefs::new(ThemePref::Auto, FontPref::OpenDyslexic)} + Title { title: title, is_html: true, user_prefs: cx.props.user_prefs.clone() } MakePoem{ - PoemContent { content: content, creation_date: creation_date } + PoemContent { content: content, creation_date: creation_date, user_prefs: cx.props.user_prefs.clone() } } }) } pub fn PoemContent(cx: Scope) -> Element { + let (user_theme, user_font) = cx.props.user_prefs.get_pref_classes(ThemedComponent::Card); let content = cx.props.content.clone().expect("No content specified."); let creation_date = cx .props @@ -48,10 +48,10 @@ pub fn PoemContent(cx: Scope) -> Element { #[cfg(any(target_family = "unix", target_family = "windows"))] return cx.render(rsx! { div { class: "flex p-2 mx-auto max-w-full justify-center", - details { class: "group p-4 max-w-fit space-y-4 ring-4", - summary { class: "group-open:before:content-['Close'] before:content-['Open'] flex justify-center p-2 ring-2", + details { class: "group p-4 max-w-fit space-y-4 ring-4 {user_theme} {user_font}", + summary { class: "group-open:before:content-['Close'] before:content-['Open'] flex justify-center p-2 hover:animate-yip transition ring-2 {user_theme} {user_font}", } - div { class: "font-nerd flex flex-col space-y-4 py-4", "{content}{creation_date}" + div { class: "flex flex-col space-y-4 py-4", "{content}{creation_date}" } } } @@ -59,10 +59,10 @@ pub fn PoemContent(cx: Scope) -> Element { #[cfg(target_family = "wasm")] return cx.render(rsx! { div { class: "flex p-2 mx-auto max-w-full justify-center", - details { class: "group p-4 max-w-fit space-y-4", - summary { class: "group-open:before:content-['Close'] before:content-['Open'] flex justify-center p-2 ring-2", + details { class: "group p-4 max-w-fit space-y-4 ring-4 {user_theme} {user_font}", + summary { class: "group-open:before:content-['Close'] before:content-['Open'] flex justify-center p-2 hover:animate-yip transition ring-2 {user_theme} {user_font}", } - div { class: "font-nerd flex flex-col space-y-4 py-4", + div { class: "flex flex-col space-y-4 py-4", dangerous_inner_html: "{content}{creation_date}", } } diff --git a/void-fe/src/lib.rs b/void-fe/src/lib.rs index 9fbe3c2..07bfb66 100644 --- a/void-fe/src/lib.rs +++ b/void-fe/src/lib.rs @@ -64,30 +64,19 @@ pub mod void_app { /// Renders the app and returns the rendered Element. pub fn HomePage(cx: Scope) -> Element { let user_prefs = cx.props.clone(); - let (user_theme, user_font) = user_prefs.get_prefs(ThemedComponent::Page); + let (user_theme, user_font) = user_prefs.get_pref_classes(ThemedComponent::Page); let title = "A Letter to the Void".to_string(); cx.render(rsx!{ - // class: "bg-alice-werefox-grey-light dark:bg-alice-werefox-grey" - // class: "bg-alice-werefox-grey" - // class: "bg-alice-werefox-grey-lightest ring-alice-werefox-red-dark text-alice-werefox-grey-dark" - // class: "dark:bg-alice-werefox-grey-dark dark:ring-alice-werefox-red dark:text-alice-werefox-grey-light" - // class: "bg-alice-werefox-grey-dark ring-alice-werefox-red text-alice-werefox-grey-light" - // class: "bg-alice-werefox-grey-lightest ring-alice-werefox-red-dark text-alice-werefox-grey-dark" - // class: "hover:text-alice-werefox-blue-dark" - // class: "hover:ring-alice-werefox-blue dark:bg-alice-werefox-grey-dark dark:ring-alice-werefox-red" - // class: "bg-alice-werefox-grey-dark ring-alice-werefox-red" - // class: "dark:text-alice-werefox-grey-light dark:hover:text-alice-werefox-blue-light dark:hover:ring-alice-werefox-blue" - // class: "text-alice-werefox-grey-light hover:text-alice-werefox-blue-light hover:ring-alice-werefox-blue" div { class: "{user_theme} {user_font}", PageBase { - Title { title: title, is_html: false, user_prefs: user_prefs } - RenderContent { content: helpers::get_homepage_paragraph() } + Title { title: title, is_html: false, user_prefs: user_prefs.clone() } + RenderContent { content: helpers::get_homepage_paragraph(), user_prefs: user_prefs.clone() } ButtonGroup { - NavigationButton { title: "See Latest Entry".to_string(), slug: helpers::get_latest_entry("".to_string()) } - NavigationButton { title: "See Oldest Entry".to_string(), slug: helpers::get_oldest_entry("".to_string()) } - NavigationButton { title: "See All Entries".to_string(), slug: "/poems".to_string() } + NavigationButton { title: "See Latest Entry".to_string(), slug: helpers::get_latest_entry("".to_string()), user_prefs: user_prefs.clone() } + NavigationButton { title: "See Oldest Entry".to_string(), slug: helpers::get_oldest_entry("".to_string()), user_prefs: user_prefs.clone() } + NavigationButton { title: "See All Entries".to_string(), slug: "/poems".to_string(), user_prefs: user_prefs.clone() } } - Footer {} + Footer { theme: user_prefs.clone().get_theme(), font: user_prefs.get_font() } } } }) @@ -96,15 +85,15 @@ pub mod void_app { /// Renders the app and returns the rendered Element. pub fn PoemListPage(cx: Scope) -> Element { let user_prefs = cx.props.clone(); - let (user_theme, user_font) = user_prefs.get_prefs(ThemedComponent::Page); + let (user_theme, user_font) = user_prefs.get_pref_classes(ThemedComponent::Page); cx.render(rsx! { div { class: "{user_theme} {user_font}", PageBase { - Title { title: "A Letter to the Void".to_string(), is_html: false, user_prefs: user_prefs } - BackToHomePage {} - PoemList {} - BackToHomePage {} - Footer {} + Title { title: "A Letter to the Void".to_string(), is_html: false, user_prefs: user_prefs.clone() } + BackToHomePage { theme: user_prefs.clone().get_theme(), font: user_prefs.clone().get_font() } + PoemList { theme: user_prefs.clone().get_theme(), font: user_prefs.clone().get_font() } + BackToHomePage { theme: user_prefs.clone().get_theme(), font: user_prefs.clone().get_font() } + Footer { theme: user_prefs.clone().get_theme(), font: user_prefs.get_font() } } } }) @@ -112,7 +101,7 @@ pub mod void_app { pub fn PoemPage(cx: Scope) -> Element { let user_prefs = cx.props.user_prefs.clone(); - let (user_theme, user_font) = user_prefs.get_prefs(ThemedComponent::Page); + let (user_theme, user_font) = user_prefs.get_pref_classes(ThemedComponent::Page); #[cfg(any(target_family = "unix", target_family = "windows"))] let slug = cx.props.slug.clone(); #[cfg(target_family = "wasm")] @@ -124,16 +113,16 @@ pub mod void_app { cx.render(rsx!{ div { class: "{user_theme} {user_font}", PageBase { - BackToHomePage {} - GetPoem { slug: slug.clone() } + BackToHomePage { theme: user_prefs.clone().get_theme(), font: user_prefs.clone().get_font() } + GetPoem { slug: slug.clone(), user_prefs: user_prefs.clone() } ButtonGroup { - NavigationButton { title: "Oldest".to_string(), slug: helpers::get_oldest_entry(slug.clone()) } - NavigationButton { title: "Previous".to_string(), slug: helpers::get_previous_entry(slug.clone()) } - NavigationButton { title: "Next".to_string(), slug: helpers::get_next_entry(slug.clone()) } - NavigationButton { title: "Latest".to_string(), slug: helpers::get_latest_entry(slug.clone()) } + NavigationButton { title: "Oldest".to_string(), slug: helpers::get_oldest_entry(slug.clone()), user_prefs: user_prefs.clone() } + NavigationButton { title: "Previous".to_string(), slug: helpers::get_previous_entry(slug.clone()), user_prefs: user_prefs.clone() } + NavigationButton { title: "Next".to_string(), slug: helpers::get_next_entry(slug.clone()), user_prefs: user_prefs.clone() } + NavigationButton { title: "Latest".to_string(), slug: helpers::get_latest_entry(slug.clone()), user_prefs: user_prefs.clone() } } - BackToHomePage {} - Footer {} + BackToHomePage { theme: user_prefs.clone().get_theme(), font: user_prefs.clone().get_font() } + Footer { theme: user_prefs.clone().get_theme(), font: user_prefs.get_font() } } } }) @@ -141,28 +130,40 @@ pub mod void_app { pub fn SettingsPage(cx: Scope) -> Element { let user_prefs = cx.props.clone(); - let (user_theme, user_font) = user_prefs.get_prefs(ThemedComponent::Page); + let (user_theme, user_font) = user_prefs.get_pref_classes(ThemedComponent::Page); + // Get rid of this and create a general card component with children. + let (user_theme_card, user_font_card) = user_prefs.get_pref_classes(ThemedComponent::Card); cx.render(rsx! { div { class: "{user_theme} {user_font}", PageBase { - Title { title: "Settings".to_string(), is_html: false, user_prefs: user_prefs } - BackToHomePage {} - div { class: "grid grid-flow-row space-y-4", - ButtonGroup { - NavigationButton { title: "Light".to_string(), slug: "/settings/?theme=light".to_string() } - NavigationButton { title: "Dark".to_string(), slug: "/settings/?theme=dark".to_string() } - NavigationButton { title: "Auto".to_string(), slug: "/settings/?theme=auto".to_string() } - } - ButtonGroup { - span { class: "font-nerd", - NavigationButton { title: "Nerd Font".to_string(), slug: "/settings/?font=nerd".to_string() } + Title { title: "Settings".to_string(), is_html: false, user_prefs: user_prefs.clone() } + BackToHomePage { theme: user_prefs.clone().get_theme(), font: user_prefs.clone().get_font() } + div { class: "p-4 flex flex-col space-y-4 mx-auto max-w-full justify-center", + div { class: "p-4 flex flex-col space-y-4 text-xl text-center ring-4 {user_theme_card} {user_font_card}", + p { + "Theme" } - span { class: "font-open", - NavigationButton { title: "Open Dyslexic".to_string(), slug: "/settings/?font=open".to_string() } + ButtonGroup { + NavigationButton { title: "Light".to_string(), slug: "/settings/?theme=light".to_string(), user_prefs: user_prefs.clone() } + NavigationButton { title: "Dark".to_string(), slug: "/settings/?theme=dark".to_string(), user_prefs: user_prefs.clone() } + NavigationButton { title: "Auto".to_string(), slug: "/settings/?theme=auto".to_string(), user_prefs: user_prefs.clone() } + } + } + div { class: "p-4 flex flex-col space-y-4 text-xl text-center ring-4 {user_theme_card} {user_font_card}", + p { + "Font" + } + ButtonGroup { + span { class: "font-nerd flex basis-full", + NavigationButton { title: "Nerd Font".to_string(), slug: "/settings/?font=nerd".to_string(), user_prefs: user_prefs.clone() } + } + span { class: "font-open flex basis-full", + NavigationButton { title: "Open Dyslexic".to_string(), slug: "/settings/?font=open".to_string(), user_prefs: user_prefs.clone() } + } } } } - BackToHomePage {} + BackToHomePage { theme: user_prefs.clone().get_theme(), font: user_prefs.get_font() } } } }) diff --git a/void-fe/src/utils/prop_structs.rs b/void-fe/src/utils/prop_structs.rs index 9df06d1..de61828 100644 --- a/void-fe/src/utils/prop_structs.rs +++ b/void-fe/src/utils/prop_structs.rs @@ -18,12 +18,14 @@ pub struct TitleProps { #[derive(PartialEq, Props)] pub struct ContentProps { pub content: String, + pub user_prefs: UserPrefs, } #[derive(PartialEq, Props)] pub struct ButtonProps { pub title: String, pub slug: String, + pub user_prefs: UserPrefs, } #[derive(PartialEq, Props)] @@ -32,7 +34,7 @@ pub struct PoemData { pub content: Option, pub creation_date: Option, pub slug: Option, - pub dark_mode: Option, + pub user_prefs: UserPrefs, } // These next three should all just be one prop. diff --git a/void-fe/src/utils/user_prefs.rs b/void-fe/src/utils/user_prefs.rs index d674d67..c7730a0 100644 --- a/void-fe/src/utils/user_prefs.rs +++ b/void-fe/src/utils/user_prefs.rs @@ -58,6 +58,12 @@ impl UserPrefs { } } + pub fn get_pref_classes(&self, component: ThemedComponent) -> (String, String) { + let theme = self.get_theme_classes(component).clone(); + let font = self.get_font_class().clone(); + (theme, font) + } + pub fn get_theme_classes(&self, component: ThemedComponent) -> String { match &self.theme { ThemePref::Light => match component { @@ -111,29 +117,38 @@ impl UserPrefs { } } - pub fn set_theme(mut self, theme: ThemePref) { - self.theme = theme; - } - - pub fn get_font(&self) -> String { + pub fn get_font_class(&self) -> String { match &self.font { FontPref::OpenDyslexic => "font-open".to_string(), FontPref::NerdFont => "font-nerd".to_string(), } } - pub fn set_font(mut self, font: FontPref) { - self.font = font; - } - - pub fn get_prefs(&self, component: ThemedComponent) -> (String, String) { - let theme = self.get_theme_classes(component).clone(); - let font = self.get_font().clone(); - (theme, font) - } - pub fn set_prefs(mut self, prefs: UserPrefs) { self.theme = prefs.theme; self.font = prefs.font; } + + pub fn set_theme(mut self, theme: ThemePref) { + self.theme = theme; + } + + pub fn set_font(mut self, font: FontPref) { + self.font = font; + } + + pub fn get_prefs(self) -> (ThemePref, FontPref) { + let prefs = self.clone(); + (prefs.theme, prefs.font) + } + + pub fn get_theme(self) -> ThemePref { + let prefs = self.clone(); + prefs.theme.clone() + } + + pub fn get_font(self) -> FontPref { + let prefs = self.clone(); + prefs.font.clone() + } }