+ }/)
+
+ }
+ });
+ let id_base = (*id_base).clone();
+ let prev_id = format!(
+ "{}{}",
+ &id_base,
+ match curr == 0 {
+ true => slide_cnt - 1,
+ false => curr - 1,
+ }
+ );
+ let next_id = format!(
+ "{}{}",
+ &id_base,
+ match slide_cnt - 1 == curr {
+ true => 0,
+ false => curr + 1,
+ }
+ );
+ let no_bubble = Callback::from(move |e: MouseEvent| {
+ e.stop_propagation();
+ });
+
+ html! {
+
+ }
+}
diff --git a/src/components/atoms/collapse.rs b/src/components/atoms/collapse.rs
index 5732436..e50a798 100644
--- a/src/components/atoms/collapse.rs
+++ b/src/components/atoms/collapse.rs
@@ -9,7 +9,7 @@ pub struct CollapseProps {
#[function_component(Collapse)]
pub fn collapse(props: &CollapseProps) -> Html {
html! {
-
+
+ {s.title.clone()}
+{s.summary.clone().unwrap_or_default()}
+
+
,
pub value: Option,
pub placeholder: Option,
pub autocomplete: Option,
@@ -31,9 +36,20 @@ pub struct TextInputProps {
#[function_component(TextInput)]
pub fn text_input(props: &TextInputProps) -> Html {
- let class = match &props.error {
- Some(_) => "input input-bordered shadow-md input-error text-error",
- None => "input input-bordered shadow-md",
+ let id = use_memo(
+ |id| {
+ id.clone().unwrap_or(
+ web_sys::window().unwrap().crypto().unwrap().random_uuid()[..10].to_string(),
+ )
+ },
+ props.id.clone(),
+ );
+ let (class, tooltip_class) = match &props.error {
+ Some(_) => (
+ "input input-bordered shadow-md input-error text-error w-full",
+ "whitespace-pre-line before:lg:max-w-[90%] before:max-w-[90vw] absolute left-0 right-0 top-[-0.25rem] tooltip group-focus-within:tooltip-open tooltip-top tooltip-error opacity-90 w-full",
+ ),
+ None => ("input input-bordered shadow-md w-full", "w-full"),
};
let oninput = props.onchange.clone().map(move |cb| {
Callback::from(move |e: InputEvent| {
@@ -41,11 +57,30 @@ pub fn text_input(props: &TextInputProps) -> Html {
cb.emit(target_element.value());
})
});
+ {
+ let id = id.clone();
+ let initial_state = props.value.clone();
+ use_effect_with_deps(
+ move |_| {
+ if let Some(input) = web_sys::window()
+ .and_then(|w| w.document())
+ .and_then(|d| d.get_element_by_id(id.as_str()))
+ .and_then(|e| e.dyn_into::().ok())
+ {
+ input.set_value(initial_state.as_deref().unwrap_or_default());
+ }
+ },
+ (),
+ );
+ }
html! {
-
{&props.label}
diff --git a/src/components/atoms/label.rs b/src/components/atoms/label.rs
index 510ea70..d88de7b 100644
--- a/src/components/atoms/label.rs
+++ b/src/components/atoms/label.rs
@@ -3,15 +3,15 @@ use yew::prelude::*;
#[derive(Clone, Debug, PartialEq, Properties)]
pub struct LabelProps {
pub label: String,
- pub error: Option,
+ pub error: bool,
pub children: Children,
}
#[function_component(Label)]
pub fn label(props: &LabelProps) -> Html {
- let span_class = match &props.error {
- Some(_) => "label-text lg:text-lg text-error",
- None => "label-text lg:text-lg",
+ let span_class = match props.error {
+ true => "label-text lg:text-lg text-error",
+ false => "label-text lg:text-lg",
};
html! {
![]()
}
}
diff --git a/src/components/atoms/markdown.rs b/src/components/atoms/markdown.rs
index 9fc53db..2b33ca9 100644
--- a/src/components/atoms/markdown.rs
+++ b/src/components/atoms/markdown.rs
@@ -53,7 +53,7 @@ pub fn markdown_display(props: &MarkdownDisplayProps) -> Html {
use_effect_with_deps(
|(interactive, id, navigator)| {
if interactive.is_some() {
- make_links_clickable(&navigator, id.as_str());
+ make_links_clickable(navigator, id.as_str());
}
},
(interactive, id.clone(), navigator.clone()),
@@ -132,10 +132,7 @@ pub fn edit_button(props: &EditButtonProps) -> Html {
let (resid, lang) = (props.resid.clone(), locales_store.curr);
let edit_onclick = Callback::from(move |_| {
navigator
- .push_with_query(
- &Route::Editor,
- &ResourceId::from((resid.clone(), lang)),
- )
+ .push_with_query(&Route::Editor, &ResourceId::from((resid.clone(), lang)))
.unwrap()
});
@@ -156,13 +153,20 @@ fn make_links_clickable(navigator: &Navigator, id: &str) {
let Some(href) = link.get_attribute("href") else {
continue;
};
- if let Some(onclick) = Route::get_onclick_from_str(href.as_str(), navigator.clone()) {
- link.add_event_listener_with_callback("click", onclick.as_ref().unchecked_ref())
- .unwrap();
- onclick.forget();
- };
- if href.starts_with("http") {
- link.set_attribute("target", "_blank").unwrap();
+ match href {
+ href if href.starts_with("http") => link.set_attribute("target", "_blank").unwrap(),
+ href if href.starts_with('/') => {
+ if let Some(onclick) = Route::get_onclick_from_str(href.as_str(), navigator.clone())
+ {
+ link.add_event_listener_with_callback(
+ "click",
+ onclick.as_ref().unchecked_ref(),
+ )
+ .unwrap();
+ onclick.forget();
+ }
+ }
+ _ => {}
}
}
}
diff --git a/src/components/atoms/mod.rs b/src/components/atoms/mod.rs
index 19cf6f1..be499e0 100644
--- a/src/components/atoms/mod.rs
+++ b/src/components/atoms/mod.rs
@@ -1,3 +1,4 @@
+pub mod carousel;
pub mod collapse;
pub mod date_display;
pub mod flag;
diff --git a/src/components/atoms/modal.rs b/src/components/atoms/modal.rs
index dea5379..bbee375 100644
--- a/src/components/atoms/modal.rs
+++ b/src/components/atoms/modal.rs
@@ -1,12 +1,17 @@
use deref_derive::{Deref, DerefMut};
+use std::{rc::Rc, time::Duration};
use wasm_bindgen::prelude::Closure;
use wasm_bindgen::JsCast;
-use web_sys::HtmlDialogElement;
-use yew::prelude::*;
+use web_sys::{HtmlDialogElement, HtmlElement};
+use yew::{platform::spawn_local, prelude::*};
use yew_router::prelude::*;
use yewdux::prelude::*;
use crate::{
+ components::{
+ atoms::text_input::{InputType, TextInput},
+ organisms::blob_image_select::BlobImageSelect,
+ },
data::locales::{store::LocalesStore, tk::TK},
router::route::Route,
utils::ext::Mergable,
@@ -14,16 +19,13 @@ use crate::{
#[derive(PartialEq, Clone)]
pub struct ModalButton {
- pub text: String,
+ pub text_key: TK,
pub onclick: Option>,
}
impl ModalButton {
- pub fn new(text: impl Into, onclick: Option>) -> Self {
- Self {
- text: text.into(),
- onclick,
- }
+ pub fn new(text_key: TK, onclick: Option>) -> Self {
+ Self { text_key, onclick }
}
}
@@ -36,32 +38,69 @@ pub enum Buttons {
impl Default for Buttons {
fn default() -> Self {
- Self::Confirm(ModalButton::new("OK", None))
+ Self::Confirm(ModalButton::new(TK::Ok, None))
}
}
#[derive(PartialEq, Clone, Store, Default, Deref, DerefMut)]
pub struct ModalStore(pub ModalData);
+#[derive(PartialEq, Clone)]
+pub enum ModalData {
+ Dialog(DialogData),
+ Form(FormData),
+ Image(ImageData),
+ ImageSelector(Buttons),
+}
+
+impl Default for ModalData {
+ fn default() -> Self {
+ Self::Dialog(DialogData::default())
+ }
+}
+
#[derive(PartialEq, Clone, Default)]
-pub struct ModalData {
- pub title: String,
- pub message: String,
+pub struct DialogData {
+ pub title: TK,
+ pub message: TK,
+ pub buttons: Buttons,
+}
+
+#[derive(PartialEq, Clone, Default)]
+pub struct FormData {
+ pub title: TK,
+ pub fields: Vec,
pub buttons: Buttons,
}
+#[derive(PartialEq, Clone, Default)]
+pub struct FormField {
+ pub id: String,
+ pub label: TK,
+ pub required: bool,
+}
+
+#[derive(PartialEq, Clone, Default)]
+pub struct ImageData {
+ pub src: String,
+ pub title: String,
+}
+
const MODAL_ID: &str = "modal";
pub fn show_modal(data: ModalData, dispatch: Dispatch) {
dispatch.reduce(|_| ModalStore(data).into());
- let modal: HtmlDialogElement = web_sys::window()
- .unwrap()
- .document()
- .unwrap()
- .get_element_by_id(MODAL_ID)
- .unwrap()
- .unchecked_into();
- modal.show_modal().unwrap();
+ spawn_local(async move {
+ async_std::task::sleep(Duration::from_millis(50)).await;
+ let modal: HtmlDialogElement = web_sys::window()
+ .unwrap()
+ .document()
+ .unwrap()
+ .get_element_by_id(MODAL_ID)
+ .unwrap()
+ .unchecked_into();
+ modal.show_modal().unwrap();
+ });
}
pub fn show_modal_callback(data: ModalData, dispatch: Dispatch) -> Callback {
@@ -79,17 +118,142 @@ pub struct ModalProps {
#[function_component(Modal)]
pub fn modal() -> Html {
let (store, _) = use_store::();
+ match store.0.clone() {
+ ModalData::Dialog(data) => {
+ html! {}
+ }
+ ModalData::Form(data) => {
+ html! {}
+ }
+ ModalData::Image(data) => {
+ html! {}
+ }
+ ModalData::ImageSelector(buttons) => html! {();
html! {
- <>
+ }
+}
+
+pub const MODAL_FIELD_PREFIX: &str = "modal-form-field-";
+
+#[derive(Clone, PartialEq, Properties)]
+struct FormModalProps {
+ pub title: TK,
+ pub fields: Vec,
+ pub buttons: Buttons,
+}
+
+#[function_component(FormModal)]
+fn form_modal(props: &FormModalProps) -> Html {
+ let (locales_store, _) = use_store::();
+ let fields = props.fields.clone().into_iter().map(|f| {
+ html! {
+ ();
+ let data = use_state(|| None);
+ let ondatachanged = {
+ let data = data.clone();
+ Callback::from(move |src: Option| {
+ data.set(src);
+ web_sys::window()
+ .unwrap()
+ .document()
+ .unwrap()
+ .get_element_by_id(MODAL_ID)
+ .unwrap()
+ .unchecked_into::()
+ .focus()
+ .unwrap();
+ })
+ };
+ html! {
+
+ }
+}
+
+#[derive(Clone, PartialEq, Properties)]
+struct ImageModalProps {
+ pub src: String,
+ pub title: String,
+}
+
+#[function_component(ImageModal)]
+fn image_modal(props: &ImageModalProps) -> Html {
+ let onclick = {
+ let src = props.src.clone();
+ Callback::from(move |_| {
+ web_sys::window()
+ .unwrap()
+ .open_with_url(&src)
+ .unwrap()
+ .unwrap();
+ })
+ };
+ html! {
+ <>
+
}
}
@@ -186,12 +350,12 @@ fn get_close_callback(id: &str) -> Callback {
})
}
-fn get_buttons(buttons: &Buttons) -> Html {
+fn get_buttons(buttons: &Buttons, locales_store: Rc) -> Html {
match buttons.clone() {
Buttons::Confirm(button) => {
let onclick = into_modal_onclick(button.onclick);
html! {
-
+
}
}
Buttons::ConfirmCancel(confirm_button, cancel_button) => {
@@ -199,8 +363,8 @@ fn get_buttons(buttons: &Buttons) -> Html {
let cancel_onclick = into_modal_onclick(cancel_button.onclick);
html! {
<>
-
-
+
+
}
}
@@ -209,8 +373,8 @@ fn get_buttons(buttons: &Buttons) -> Html {
let cancel_onclick = into_modal_onclick(cancel_button.onclick);
html! {
<>
-
-
+
+
}
}
diff --git a/src/components/atoms/resource_select.rs b/src/components/atoms/resource_select.rs
index ed5c329..0dfc2cc 100644
--- a/src/components/atoms/resource_select.rs
+++ b/src/components/atoms/resource_select.rs
@@ -1,5 +1,5 @@
use crate::{
- api::client::ApiClient,
+ api::{client::ApiClient, editor::EditorClient},
components::{
atoms::{flag::FlagSelect, loading::Loading},
state::State,
@@ -7,14 +7,17 @@ use crate::{
data::{
locales::{store::LocalesStore, tk::TK},
resources::{
- id::{ResId, ResourceId},
+ id::{BlobType, ResId, ResourceId},
store::LocalStore,
},
session::SessionStore,
},
- pages::editor::EditorState,
+ pages::editor::{EditorData, EditorState},
+};
+use petompp_web_models::models::{
+ blob::{blog::BlogMetaData, project::ProjectMetaData},
+ country::Country,
};
-use petompp_web_models::models::{blog_data::BlogMetaData, country::Country};
use wasm_bindgen::JsCast;
use web_sys::HtmlInputElement;
use yew::{platform::spawn_local, prelude::*};
@@ -31,14 +34,16 @@ pub struct ResourceSelectProps {
#[derive(Debug, Clone, PartialEq)]
enum Mode {
Resources,
- Posts,
+ Blogs,
+ Projects,
}
impl From<&ResId> for Mode {
fn from(resid: &ResId) -> Self {
match resid {
ResId::ResKey(_) => Self::Resources,
- ResId::Blob(_) => Self::Posts,
+ ResId::Blob(BlobType::Blog(_)) => Self::Blogs,
+ ResId::Blob(BlobType::Project(_)) => Self::Projects,
}
}
}
@@ -46,62 +51,82 @@ impl From<&ResId> for Mode {
impl Mode {
fn next(&self) -> Self {
match self {
- Self::Resources => Self::Posts,
- Self::Posts => Self::Resources,
+ Self::Resources => Self::Blogs,
+ Self::Blogs => Self::Projects,
+ Self::Projects => Self::Resources,
}
}
}
+#[derive(Debug, Clone, PartialEq)]
+struct ResourceSelectState {
+ resources: (Vec, Vec),
+ blogs: (Vec, Vec),
+ projects: (Vec, Vec),
+}
+
#[function_component(ResourceSelect)]
pub fn resource_select(props: &ResourceSelectProps) -> Html {
let (session_store, session_dispatch) = use_store::();
let (local_store, _) = use_store::();
let (locales_store, _) = use_store::();
let token = session_store.token.clone().unwrap_or_default();
- let data = use_state(|| State::Ok(None));
+ let state = use_state(|| State::Ok(None));
let last_state = use_state(|| None);
use_effect_with_deps(
- |(data, token, state, last_state, local_store)| {
- match (state, &**last_state) {
+ |(state, token, editor_state, last_editor_state, local_store)| {
+ match (editor_state, &**last_editor_state) {
(Some(State::Ok(Some(_))), Some(State::Ok(Some(_))))
| (Some(State::Ok(None)), Some(State::Ok(None)))
| (Some(State::Loading), Some(State::Loading)) => return,
- _ => last_state.set(state.clone()),
+ _ => last_editor_state.set(editor_state.clone()),
}
- let data = data.clone();
- match &*data {
+ let state = state.clone();
+ match &*state {
State::Ok(Some(_)) => {}
State::Loading | State::Err(_) => return,
- _ => data.set(State::Loading),
+ _ => state.set(State::Loading),
};
let mut cached_res = Vec::new();
- let mut cached_posts = Vec::new();
+ let mut cached_blogs = Vec::new();
+ let mut cached_projects = Vec::new();
for resid in local_store.get_all_resids() {
- match resid {
+ match &resid {
ResId::ResKey(_) => cached_res.push(resid),
- ResId::Blob(_) => cached_posts.push(resid),
+ ResId::Blob(bt) => match bt {
+ BlobType::Blog(_) => cached_blogs.push(resid),
+ BlobType::Project(_) => cached_projects.push(resid),
+ },
}
}
let token = token.clone();
spawn_local(async move {
match ApiClient::get_res_ids(token.as_str()).await {
- Ok((res, ps)) => {
+ Ok((res, bl, prj)) => {
let cached_res: Vec<_> = cached_res
.into_iter()
.filter(|r| !res.contains(r))
.collect();
- let cached_posts: Vec<_> = cached_posts
+ let cached_blogs: Vec<_> = cached_blogs
.into_iter()
- .filter(|r| !ps.contains(r))
+ .filter(|r| !bl.contains(r))
.collect();
- data.set(State::Ok(Some(((res, cached_res), (ps, cached_posts)))));
+ let cached_projects: Vec<_> = cached_projects
+ .into_iter()
+ .filter(|r| !prj.contains(r))
+ .collect();
+ state.set(State::Ok(Some(ResourceSelectState {
+ resources: (res, cached_res),
+ blogs: (bl, cached_blogs),
+ projects: (prj, cached_projects),
+ })));
}
- Err(e) => data.set(State::Err(e)),
+ Err(e) => state.set(State::Err(e)),
}
});
},
(
- data.clone(),
+ state.clone(),
token,
props.state.clone(),
last_state.clone(),
@@ -111,10 +136,9 @@ pub fn resource_select(props: &ResourceSelectProps) -> Html {
let onselectedchanged_resid = {
let props = props.clone();
Callback::from(move |r| {
- props.onselectedchanged.emit(ResourceId::from((
- r,
- props.lang.unwrap_or_default(),
- )))
+ props
+ .onselectedchanged
+ .emit(ResourceId::from((r, props.lang.unwrap_or_default())))
})
};
let onselectedchanged_lang = {
@@ -125,10 +149,12 @@ pub fn resource_select(props: &ResourceSelectProps) -> Html {
.emit(ResourceId::from((props.resid.clone().unwrap(), c)))
})
};
- let list = match (*data).clone() {
- State::Ok(Some((resources, posts))) => {
+ let list = match (*state).clone() {
+ State::Ok(Some(state)) => {
html! {
-
+
}
}
State::Ok(None) | State::Loading => html! {
@@ -138,6 +164,7 @@ pub fn resource_select(props: &ResourceSelectProps) -> Html {
if let Err(redirect) = e.handle_failed_auth(session_dispatch) {
return redirect;
}
+ gloo::console::error!(e.to_string());
html! {
,
pub currentlang: Option,
pub resources: (Vec, Vec),
- pub posts: (Vec, Vec),
+ pub blogs: (Vec, Vec),
+ pub projects: (Vec, Vec),
pub onselectedchanged: Callback,
}
#[function_component(ResourceList)]
fn resource_list(props: &ResourceListProps) -> Html {
let (locales_store, _) = use_store::();
+ let (session_store, session_dispatch) = use_store::();
let mode: UseStateHandle = use_state_eq(|| {
- props.currentresid
+ props
+ .currentresid
.as_ref()
.map(|r| r.into())
.unwrap_or(Mode::Resources)
});
let res_page = use_state_eq(|| 0);
let blog_page = use_state_eq(|| 0);
+ let proj_page = use_state_eq(|| 0);
let onclick = {
let mode = mode.clone();
Callback::from(move |_| mode.set(mode.next()))
@@ -198,8 +229,7 @@ fn resource_list(props: &ResourceListProps) -> Html {
class.push("btn-primary");
};
if cache_only {
- class.push("btn-outline");
- class.push("italic");
+ class.push("btn-outline italic bg-base-100");
};
html! {
{id}
@@ -234,16 +264,29 @@ fn resource_list(props: &ResourceListProps) -> Html {
.collect::>(),
),
),
- Mode::Posts => (
+ Mode::Blogs => (
locales_store.get(TK::BlogPosts),
blog_page,
vec_into_elements(
props
- .posts
+ .blogs
+ .0
+ .iter()
+ .map(|r| (r, false))
+ .chain(props.blogs.1.iter().map(|r| (r, true)))
+ .collect::>(),
+ ),
+ ),
+ Mode::Projects => (
+ locales_store.get(TK::Projects),
+ proj_page,
+ vec_into_elements(
+ props
+ .projects
.0
.iter()
.map(|r| (r, false))
- .chain(props.posts.1.iter().map(|r| (r, true)))
+ .chain(props.projects.1.iter().map(|r| (r, true)))
.collect::>(),
),
),
@@ -255,18 +298,19 @@ fn resource_list(props: &ResourceListProps) -> Html {
};
let dec_page = {
let page = page.clone();
- Callback::from(move |_| page.set((*page - 1).max(0)))
+ Callback::from(move |_| page.set(page.max(1) - 1))
};
const NEW_INPUT_ID: &str = "new-input-00";
let (_, local_dispatch) = use_store::();
- let new_element_input = use_state(|| false);
- let new_element_content = match *new_element_input {
- true => {
+ let new_element_input = use_state(|| State::Ok(false));
+ let new_element_content = match &*new_element_input {
+ State::Ok(true) => {
let onkeydown = {
let new_element_input = new_element_input.clone();
let onselectedchanged = props.onselectedchanged.clone();
let mode = mode.clone();
- let currlang = props.currentlang;
+ let currlang = props.currentlang.unwrap_or_default();
+ let token = session_store.token.clone();
Callback::from(move |e: KeyboardEvent| {
if e.key() != "Enter" {
return;
@@ -276,27 +320,63 @@ fn resource_list(props: &ResourceListProps) -> Html {
if id.is_empty() {
return;
}
- let (resid, meta) = match *mode {
- Mode::Resources => (ResId::ResKey(id), None),
- Mode::Posts => (ResId::Blob(id), Some(BlogMetaData::default())),
- };
- local_dispatch.reduce_mut(|s| {
- s.insert(
- resid.clone(),
- currlang.unwrap_or_default().key(),
- String::new(),
- meta.clone(),
- );
+ let new_element_input = new_element_input.clone();
+ let token = token.clone();
+ let mode = mode.clone();
+ let local_dispatch = local_dispatch.clone();
+ let onselectedchanged = onselectedchanged.clone();
+ new_element_input.set(State::Loading);
+ spawn_local(async move {
+ match ApiClient::get_res_ids(token.unwrap_or_default().as_str()).await {
+ Ok((res, bl, prj)) => {
+ let (resid, data, exists) = match *mode {
+ Mode::Resources => {
+ let resid = ResId::ResKey(id);
+ let contains = res.contains(&resid);
+ (resid, EditorData::Resource(Default::default()), contains)
+ }
+ Mode::Blogs => {
+ let meta = BlogMetaData::empty(&id, currlang);
+ let resid = ResId::Blob(BlobType::Blog(id));
+ let contains = bl.contains(&resid);
+ (
+ resid,
+ EditorData::Blog((Default::default(), meta)),
+ contains,
+ )
+ }
+ Mode::Projects => {
+ let meta = ProjectMetaData::empty(&id, currlang);
+ let resid = ResId::Blob(BlobType::Project(id));
+ let contains = prj.contains(&resid);
+ (
+ resid,
+ EditorData::Project((Default::default(), meta)),
+ contains,
+ )
+ }
+ };
+ if !exists {
+ local_dispatch.reduce_mut(|s| {
+ if s.exists(&resid) {
+ return;
+ }
+ s.insert(resid.clone(), currlang.key(), data);
+ });
+ }
+ onselectedchanged.emit(resid);
+ new_element_input.set(State::Ok(false));
+ }
+ Err(e) => new_element_input.set(State::Err(e)),
+ }
});
- onselectedchanged.emit(resid);
- new_element_input.set(false);
})
};
let onclick = {
let new_element_input = new_element_input.clone();
Callback::from(move |e: MouseEvent| {
e.set_cancel_bubble(true);
- new_element_input.set(false);
+ new_element_input.set(State::Ok(false));
})
};
html! {
@@ -306,16 +386,28 @@ fn resource_list(props: &ResourceListProps) -> Html {
}
}
- false => html! {{
+ State::Ok(false) => html! {{
match *mode {
Mode::Resources => locales_store.get(TK::NewResource),
- Mode::Posts => locales_store.get(TK::NewBlogPost),
+ Mode::Blogs => locales_store.get(TK::NewBlogPost),
+ Mode::Projects => locales_store.get(TK::NewProject),
}
}},
+ State::Loading => html! {
+
@@ -19,7 +19,6 @@ pub fn label(props: &LabelProps) -> Html {
{&props.label}
{props.children.clone()}
- {props.error.clone().unwrap_or_default()}
}
}
diff --git a/src/components/atoms/logo.rs b/src/components/atoms/logo.rs
index 262e367..119e0d1 100644
--- a/src/components/atoms/logo.rs
+++ b/src/components/atoms/logo.rs
@@ -1,12 +1,20 @@
-use crate::router::route::Route;
+use crate::{
+ hooks::color_scheme::{use_color_scheme, ColorScheme},
+ router::route::Route,
+};
use yew::prelude::*;
use yew_router::prelude::*;
#[function_component(Logo)]
pub fn logo() -> Html {
let navigator = use_navigator().unwrap();
+ let color_scheme = use_color_scheme();
let onclick = Callback::from(move |_| navigator.push(&Route::Home));
+ let src = match color_scheme {
+ ColorScheme::Light => "img/logo_light.png",
+ ColorScheme::Dark => "img/logo_dark.png",
+ };
html! {
-
+ {locales_store.get(TK::ErrorOccured)}
}
@@ -167,21 +194,25 @@ struct ResourceListProps {
pub currentresid: Option{locales_store.get(TK::ErrorOccured)}
+ }
+ }
};
use_effect_with_deps(
|new_element_input| {
- if !**new_element_input {
+ if **new_element_input != State::Ok(true) {
return;
}
if let Some(input) = web_sys::window()
@@ -330,10 +422,10 @@ fn resource_list(props: &ResourceListProps) -> Html {
);
let new_element_onclick = {
let new_element_input = new_element_input.clone();
- Callback::from(move |_| new_element_input.set(true))
+ Callback::from(move |_| new_element_input.set(State::Ok(true)))
};
let mut new_element_class = classes!("btn", "btn-secondary", "flex");
- if *new_element_input {
+ if *new_element_input == State::Ok(true) {
new_element_class.push("no-animation");
}
let elements = elements[*page].clone().into_iter();
diff --git a/src/components/atoms/text_input.rs b/src/components/atoms/text_input.rs
index d28c4bd..caa3373 100644
--- a/src/components/atoms/text_input.rs
+++ b/src/components/atoms/text_input.rs
@@ -1,4 +1,8 @@
-use crate::{components::atoms::label::Label, utils::js::set_textarea_height};
+use crate::{
+ components::atoms::label::Label,
+ utils::js::{set_textarea_height, set_textarea_text},
+};
+use wasm_bindgen::JsCast;
use web_sys::HtmlInputElement;
use yew::prelude::*;
@@ -22,6 +26,7 @@ pub struct TextInputProps {
pub label: String,
pub itype: InputType,
pub enabled: bool,
+ pub id: Option