Implemented user authentication.

2023-09-22 21:26:13 +02:00
parent 0bac17f2eb
commit 17f628739f
23 changed files with 704 additions and 326 deletions
@@ -1,7 +1,6 @@
 use leptos::*;
-use serde::de::Unexpected::Option;
 use crate::backend::company::get_company;
-use crate::backend::data::Company;
+use crate::backend::data::{ApiResponse, Company};
 use crate::components::modal_box::DialogOpener;
 use crate::locales::trl;
 use crate::pages::company_edit::CompanyEdit;
@@ -20,18 +19,23 @@ pub fn CompanyInfo() -> impl IntoView {
          <p class="card-text">
            <Transition fallback=move || view! {<p>{trl("Loading...")}</p> }>
                {move || {
-                    company.read().map(|c| match c {
-                        Err(e) => {view! {<p>{trl("Error loading data")}</p>
-                            <p>{e.to_string()}</p>
+                    company.get().map(|c| match c {
+                        Err(e) => {view! {<div><p>{trl("Error loading data")}</p>
+                            <p>{e.to_string()}</p></div>
                        }}
                        Ok(c) => {
-                            set_cmp.update(|cmp| *cmp = c.clone());
-                            view! {
-                            <p><b>{c.name}</b></p>
-                            <p>{c.street}" "{c.house_number}<br/>
-                            {c.zip_code}" "{c.city}
-                            </p>
-                        }}
+                            match c {
+                                ApiResponse::Data(d) => {set_cmp.update(|cmp| *cmp = d.clone());
+                                    view! {<div>
+                                    <p><b>{d.name}</b></p>
+                                    <p>{d.street}" "{d.house_number}<br/>
+                                    {d.zip_code}" "{d.city}
+                                    </p></div>}
+                                }
+                                ApiResponse::Error(_) => {view! {<div><p>{trl("Error loading data")}</p></div>}}
+                            }
+
+                        }
                    })
                }}
            </Transition>