From ab50826d31e49318aafca27795a5c8911bd260cb Mon Sep 17 00:00:00 2001 From: ecco257 Date: Fri, 4 Oct 2024 17:44:10 -0400 Subject: [PATCH 01/16] Update formatting of profile login buttons and display --- src/components/personal.rs | 6 +++--- style/personal.scss | 31 ++++++++++++++----------------- 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/src/components/personal.rs b/src/components/personal.rs index 889a780..48ee134 100644 --- a/src/components/personal.rs +++ b/src/components/personal.rs @@ -33,10 +33,10 @@ pub fn Profile() -> impl IntoView { #[component] pub fn DropDownNotLoggedIn() -> impl IntoView { view! { -
-

Not Logged in!

+
+

Not Logged In

- +
} } diff --git a/style/personal.scss b/style/personal.scss index e03e05e..7b142d4 100644 --- a/style/personal.scss +++ b/style/personal.scss @@ -27,12 +27,12 @@ } .profile-icon:hover { - transform: scale(1.1); + transform: scale(1.05); background-color: rgba(255, 255, 255, 0.1); } .profile-icon:active { - transform: scale(0.8); + transform: scale(0.95); } .dropdown-container { position: absolute; @@ -42,10 +42,10 @@ border-radius: 0.5rem; width: 10rem; z-index: 1; - background-color: red; - border: 1px solid grey; + background-color: #1c1c1c; + border: 2px solid rgba(89, 89, 89, 0.199); - .dropdown-not-logged { + .dropdown-logged { display: flex; flex-direction: column; width: 100%; @@ -55,20 +55,17 @@ font-size: 1.2rem; } .auth-button { + margin-top: 0.5rem; + padding: 0.5rem; + border-radius: 0.5rem; + background-color: #1c1c1c; + border: 2px solid rgba(89, 89, 89, 0.199); + color: white; + cursor: pointer; + transition: all 0.3s; + margin-bottom: 0.5rem; } } } - .dropdown-container:before { - content: ""; - position: absolute; - top: -0.4rem; - right: 0.92rem; - width: 10px; - height: 10px; - transform: rotate(45deg); - background-color: red; - border-left: 1px solid grey; - border-top: 1px solid grey; - } } } From 3149f65a97b2d4d6b5b373389ba8d70c4ef1a0c4 Mon Sep 17 00:00:00 2001 From: ecco257 Date: Fri, 11 Oct 2024 17:21:11 -0400 Subject: [PATCH 02/16] Detect user logged in and display "logged in" for profile --- src/auth.rs | 2 +- src/components/personal.rs | 52 +++++++++++++++++++++++++++++++++++--- src/models.rs | 2 +- src/users.rs | 2 +- 4 files changed, 52 insertions(+), 6 deletions(-) diff --git a/src/auth.rs b/src/auth.rs index 37f861f..d0c0f1c 100644 --- a/src/auth.rs +++ b/src/auth.rs @@ -137,7 +137,7 @@ pub async fn require_auth() -> Result<(), ServerFnError> { /// Ok(()) /// } /// ``` -#[cfg(feature = "ssr")] +#[server(endpoint = "get_user")] pub async fn get_user() -> Result { let auth_session = extract::>().await .map_err(|e| ServerFnError::::ServerError(format!("Error getting auth session: {}", e)))?; diff --git a/src/components/personal.rs b/src/components/personal.rs index 48ee134..a7c4141 100644 --- a/src/components/personal.rs +++ b/src/components/personal.rs @@ -1,6 +1,9 @@ use leptos::leptos_dom::*; use leptos::*; use leptos_icons::*; +use crate::auth::get_user; +use crate::auth::logout; +use crate::models::User; #[component] pub fn Personal() -> impl IntoView { @@ -14,18 +17,38 @@ pub fn Personal() -> impl IntoView { #[component] pub fn Profile() -> impl IntoView { let (dropdown_open, set_dropdown_open) = create_signal(false); + let logged_in = create_rw_signal(false); + + let user_signal = create_rw_signal(User::default()); + + let open_dropdown = move |_| { - set_dropdown_open.update(|value| *value = !*value); - log!("opened dropdown"); + spawn_local(async move { + let user = get_user().await; + if let Ok(user) = user { + logged_in.set(true); + user_signal.update(|value| *value = user); + } else { + logged_in.set(false); + } + set_dropdown_open.update(|value| *value = !*value); + }); }; + view! {
- + + }> + +
} @@ -40,3 +63,26 @@ pub fn DropDownNotLoggedIn() -> impl IntoView {
} } +#[component] +pub fn DropDownLoggedIn(user_signal: RwSignal, logged_in: RwSignal) -> impl IntoView { + + let logout = move |_| { + spawn_local(async move { + let result = logout().await; + if let Err(err) = result { + log!("Error logging out: {:?}", err); + } else { + log!("Logged out successfully"); + user_signal.update(|value| *value = User::default()); + logged_in.set(false); + } + }); + }; + + view! { +
+

"Logged In"

+ +
+ } +} diff --git a/src/models.rs b/src/models.rs index b96c8d2..59baec3 100644 --- a/src/models.rs +++ b/src/models.rs @@ -25,7 +25,7 @@ cfg_if! { #[cfg_attr(feature = "ssr", derive(Queryable, Selectable, Insertable))] #[cfg_attr(feature = "ssr", diesel(table_name = crate::schema::users))] #[cfg_attr(feature = "ssr", diesel(check_for_backend(diesel::pg::Pg)))] -#[derive(Serialize, Deserialize, Clone, Debug)] +#[derive(Serialize, Deserialize, Clone, Debug, Default)] pub struct User { /// A unique id for the user #[cfg_attr(feature = "ssr", diesel(deserialize_as = i32))] diff --git a/src/users.rs b/src/users.rs index 2d61c69..387dfcd 100644 --- a/src/users.rs +++ b/src/users.rs @@ -117,7 +117,7 @@ pub async fn validate_user(credentials: UserCredentials) -> Result, /// Get a user from the database by username or email /// Returns a Result with the user if found, None if not found, or an error if there was a problem -#[server(endpoint = "get_user")] +#[server(endpoint = "find_user")] pub async fn get_user(username_or_email: String) -> Result, ServerFnError> { let mut user = find_user(username_or_email).await?; From 071dcad0cc873cd8b08b885ad9ae900205c65f56 Mon Sep 17 00:00:00 2001 From: ecco257 Date: Tue, 15 Oct 2024 17:17:44 -0400 Subject: [PATCH 03/16] Convert borders and margins to rem from px in profile --- style/personal.scss | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/style/personal.scss b/style/personal.scss index 7b142d4..08c6e93 100644 --- a/style/personal.scss +++ b/style/personal.scss @@ -4,7 +4,7 @@ width: 16rem; background: #1c1c1c; height: 100vh; - margin: 2px; + margin: 0.2rem; border-radius: 0.5rem; .profile-container { @@ -12,7 +12,7 @@ border-radius: 0.4rem; margin: 0.2rem; min-height: 6rem; - border: 2px solid rgba(89, 89, 89, 0.199); + border: 0.2rem solid rgba(89, 89, 89, 0.199); padding: 0.5rem; .profile-icon { @@ -43,7 +43,7 @@ width: 10rem; z-index: 1; background-color: #1c1c1c; - border: 2px solid rgba(89, 89, 89, 0.199); + border: 0.2rem solid rgba(89, 89, 89, 0.199); .dropdown-logged { display: flex; @@ -55,15 +55,15 @@ font-size: 1.2rem; } .auth-button { - margin-top: 0.5rem; - padding: 0.5rem; - border-radius: 0.5rem; - background-color: #1c1c1c; - border: 2px solid rgba(89, 89, 89, 0.199); - color: white; - cursor: pointer; - transition: all 0.3s; - margin-bottom: 0.5rem; + margin-top: 0.5rem; + padding: 0.5rem; + border-radius: 0.5rem; + background-color: #1c1c1c; + border: 0.2rem solid rgba(89, 89, 89, 0.199); + color: white; + cursor: pointer; + transition: all 0.3s; + margin-bottom: 0.5rem; } } } From f78066d7a8aab2186466d0a6e2d744777f92f411 Mon Sep 17 00:00:00 2001 From: ecco257 Date: Tue, 15 Oct 2024 17:18:41 -0400 Subject: [PATCH 04/16] Display username in profile when logged in --- src/components/personal.rs | 10 ++++++---- style/personal.scss | 11 +++++++++++ 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/components/personal.rs b/src/components/personal.rs index a7c4141..7ee63dd 100644 --- a/src/components/personal.rs +++ b/src/components/personal.rs @@ -18,17 +18,16 @@ pub fn Personal() -> impl IntoView { pub fn Profile() -> impl IntoView { let (dropdown_open, set_dropdown_open) = create_signal(false); let logged_in = create_rw_signal(false); - let user_signal = create_rw_signal(User::default()); - - let open_dropdown = move |_| { spawn_local(async move { let user = get_user().await; if let Ok(user) = user { logged_in.set(true); - user_signal.update(|value| *value = user); + user_signal.update(|value| { + *value = user; + }); } else { logged_in.set(false); } @@ -82,6 +81,9 @@ pub fn DropDownLoggedIn(user_signal: RwSignal, logged_in: RwSignal) view! {

"Logged In"

+
+

{move || user_signal.with(|user| user.username.clone())}

+
} diff --git a/style/personal.scss b/style/personal.scss index 08c6e93..de02199 100644 --- a/style/personal.scss +++ b/style/personal.scss @@ -54,6 +54,17 @@ h1 { font-size: 1.2rem; } + .profile-info { + display: flex; + width: 100%; + justify-content: center; + border-top: 0.2rem solid rgba(89, 89, 89, 0.199); + border-bottom: 0.2rem solid rgba(89, 89, 89, 0.199); + h1 { + font-size: 1rem; + margin-top: 0.5rem; + } + } .auth-button { margin-top: 0.5rem; padding: 0.5rem; From f104a14f98b73cc582d7c4b9c7169d74c5da5922 Mon Sep 17 00:00:00 2001 From: ecco257 Date: Tue, 15 Oct 2024 17:26:30 -0400 Subject: [PATCH 05/16] Remove derive Default for User and make user signal Option type instead --- src/components/personal.rs | 17 ++++++++++++----- src/models.rs | 2 +- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/components/personal.rs b/src/components/personal.rs index 7ee63dd..bce2901 100644 --- a/src/components/personal.rs +++ b/src/components/personal.rs @@ -18,7 +18,8 @@ pub fn Personal() -> impl IntoView { pub fn Profile() -> impl IntoView { let (dropdown_open, set_dropdown_open) = create_signal(false); let logged_in = create_rw_signal(false); - let user_signal = create_rw_signal(User::default()); + // user signal is an option because the user may not be logged in + let user_signal = create_rw_signal(None); let open_dropdown = move |_| { spawn_local(async move { @@ -26,7 +27,7 @@ pub fn Profile() -> impl IntoView { if let Ok(user) = user { logged_in.set(true); user_signal.update(|value| { - *value = user; + *value = Some(user); }); } else { logged_in.set(false); @@ -63,7 +64,7 @@ pub fn DropDownNotLoggedIn() -> impl IntoView { } } #[component] -pub fn DropDownLoggedIn(user_signal: RwSignal, logged_in: RwSignal) -> impl IntoView { +pub fn DropDownLoggedIn(user_signal: RwSignal>, logged_in: RwSignal) -> impl IntoView { let logout = move |_| { spawn_local(async move { @@ -72,7 +73,7 @@ pub fn DropDownLoggedIn(user_signal: RwSignal, logged_in: RwSignal) log!("Error logging out: {:?}", err); } else { log!("Logged out successfully"); - user_signal.update(|value| *value = User::default()); + user_signal.update(|value| *value = None); logged_in.set(false); } }); @@ -82,7 +83,13 @@ pub fn DropDownLoggedIn(user_signal: RwSignal, logged_in: RwSignal)

"Logged In"

-

{move || user_signal.with(|user| user.username.clone())}

+

{move || user_signal.with(|user| + if let Some(user) = user { + user.username.clone() + } else { + "".to_string() + } + )}

diff --git a/src/models.rs b/src/models.rs index 59baec3..b96c8d2 100644 --- a/src/models.rs +++ b/src/models.rs @@ -25,7 +25,7 @@ cfg_if! { #[cfg_attr(feature = "ssr", derive(Queryable, Selectable, Insertable))] #[cfg_attr(feature = "ssr", diesel(table_name = crate::schema::users))] #[cfg_attr(feature = "ssr", diesel(check_for_backend(diesel::pg::Pg)))] -#[derive(Serialize, Deserialize, Clone, Debug, Default)] +#[derive(Serialize, Deserialize, Clone, Debug)] pub struct User { /// A unique id for the user #[cfg_attr(feature = "ssr", diesel(deserialize_as = i32))] From 2be665c549411dafe118f5d92ea88e776e3b4b63 Mon Sep 17 00:00:00 2001 From: ecco257 Date: Fri, 18 Oct 2024 19:26:10 -0400 Subject: [PATCH 06/16] Track logged in status and user as local resource instead of signal --- src/components/personal.rs | 34 ++++++---------------------------- 1 file changed, 6 insertions(+), 28 deletions(-) diff --git a/src/components/personal.rs b/src/components/personal.rs index bce2901..9a68575 100644 --- a/src/components/personal.rs +++ b/src/components/personal.rs @@ -17,23 +17,11 @@ pub fn Personal() -> impl IntoView { #[component] pub fn Profile() -> impl IntoView { let (dropdown_open, set_dropdown_open) = create_signal(false); - let logged_in = create_rw_signal(false); - // user signal is an option because the user may not be logged in - let user_signal = create_rw_signal(None); + let user = create_local_resource(move || dropdown_open.get(), |_| async move { get_user().await }); + let logged_in = create_local_resource(move || dropdown_open.get(), |_| async move { get_user().await.is_ok() }); let open_dropdown = move |_| { - spawn_local(async move { - let user = get_user().await; - if let Ok(user) = user { - logged_in.set(true); - user_signal.update(|value| { - *value = Some(user); - }); - } else { - logged_in.set(false); - } - set_dropdown_open.update(|value| *value = !*value); - }); + set_dropdown_open.update(|value| *value = !*value); }; view! { @@ -43,11 +31,11 @@ pub fn Profile() -> impl IntoView {
}> - +
@@ -64,7 +52,7 @@ pub fn DropDownNotLoggedIn() -> impl IntoView { } } #[component] -pub fn DropDownLoggedIn(user_signal: RwSignal>, logged_in: RwSignal) -> impl IntoView { +pub fn DropDownLoggedIn(logged_in: Resource) -> impl IntoView { let logout = move |_| { spawn_local(async move { @@ -73,7 +61,6 @@ pub fn DropDownLoggedIn(user_signal: RwSignal>, logged_in: RwSignal log!("Error logging out: {:?}", err); } else { log!("Logged out successfully"); - user_signal.update(|value| *value = None); logged_in.set(false); } }); @@ -82,15 +69,6 @@ pub fn DropDownLoggedIn(user_signal: RwSignal>, logged_in: RwSignal view! {

"Logged In"

-
-

{move || user_signal.with(|user| - if let Some(user) = user { - user.username.clone() - } else { - "".to_string() - } - )}

-
} From c2ebd8307f35d432ffed4f27397e30876c67560e Mon Sep 17 00:00:00 2001 From: ecco257 Date: Fri, 18 Oct 2024 19:30:45 -0400 Subject: [PATCH 07/16] Display user profile picture when logged in instead of generic profile icon --- src/components/personal.rs | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/components/personal.rs b/src/components/personal.rs index 9a68575..6cb8090 100644 --- a/src/components/personal.rs +++ b/src/components/personal.rs @@ -3,7 +3,6 @@ use leptos::*; use leptos_icons::*; use crate::auth::get_user; use crate::auth::logout; -use crate::models::User; #[component] pub fn Personal() -> impl IntoView { @@ -24,10 +23,26 @@ pub fn Profile() -> impl IntoView { set_dropdown_open.update(|value| *value = !*value); }; + let user_profile_picture = move || { + user.get().map(|user| { + if let Ok(user) = user { + return format!("/assets/images/profile/{}.webp", user.id.unwrap()); + } else { + return "".to_string(); + } + }) + }; + view! {
- + + }> + +
Date: Fri, 18 Oct 2024 19:31:20 -0400 Subject: [PATCH 08/16] Display username in profile container when logged in --- src/components/personal.rs | 9 +++++++++ style/personal.scss | 14 ++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/src/components/personal.rs b/src/components/personal.rs index 6cb8090..c6b46a5 100644 --- a/src/components/personal.rs +++ b/src/components/personal.rs @@ -35,6 +35,15 @@ pub fn Profile() -> impl IntoView { view! {
+
+ Not Logged In + }> +

{move || user.get().map(|user| user.map(|user| user.username).unwrap_or_default())}

+ +
Date: Fri, 25 Oct 2024 17:01:50 -0400 Subject: [PATCH 09/16] Fix formatting and styling of profile picture display, as well as display email when logged in as well --- src/components/personal.rs | 1 + style/personal.scss | 11 +++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/components/personal.rs b/src/components/personal.rs index c6b46a5..b199667 100644 --- a/src/components/personal.rs +++ b/src/components/personal.rs @@ -42,6 +42,7 @@ pub fn Profile() -> impl IntoView {

Not Logged In

}>

{move || user.get().map(|user| user.map(|user| user.username).unwrap_or_default())}

+

{move || user.get().map(|user| user.map(|user| user.email).unwrap_or_default())}
diff --git a/style/personal.scss b/style/personal.scss index 75d16fb..ef265eb 100644 --- a/style/personal.scss +++ b/style/personal.scss @@ -25,7 +25,8 @@ } h2 { font-size: 1rem; - margin: 0; + margin-top: auto; + margin-bottom: 0; } } @@ -36,8 +37,14 @@ font-size: 2rem; border-radius: 50%; transition: all 0.3s; - height: max-content; + height: 2rem; + width: 2rem; margin-left: auto; + img { + width: 100%; + height: 100%; + border-radius: 50%; + } } .profile-icon:hover { From 6aa933be09d3b4d99c6b7c32f044ad40cdd872cf Mon Sep 17 00:00:00 2001 From: ecco257 Date: Fri, 25 Oct 2024 22:59:06 -0400 Subject: [PATCH 10/16] Refactor profile picture display to account for no profile picture --- src/components/personal.rs | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/src/components/personal.rs b/src/components/personal.rs index b199667..dc072b3 100644 --- a/src/components/personal.rs +++ b/src/components/personal.rs @@ -16,6 +16,7 @@ pub fn Personal() -> impl IntoView { #[component] pub fn Profile() -> impl IntoView { let (dropdown_open, set_dropdown_open) = create_signal(false); + let (image_error, set_image_error) = create_signal(false); let user = create_local_resource(move || dropdown_open.get(), |_| async move { get_user().await }); let logged_in = create_local_resource(move || dropdown_open.get(), |_| async move { get_user().await.is_ok() }); @@ -24,12 +25,8 @@ pub fn Profile() -> impl IntoView { }; let user_profile_picture = move || { - user.get().map(|user| { - if let Ok(user) = user { - return format!("/assets/images/profile/{}.webp", user.id.unwrap()); - } else { - return "".to_string(); - } + user.get().and_then(|user| { + user.ok().map(|user| format!("/assets/images/profile/{}.webp", user.id.unwrap())) }) }; @@ -42,16 +39,23 @@ pub fn Profile() -> impl IntoView {

Not Logged In

}>

{move || user.get().map(|user| user.map(|user| user.username).unwrap_or_default())}

-

{move || user.get().map(|user| user.map(|user| user.email).unwrap_or_default())}

+

{move || user.get().map(|user| user.map(|user| user.email).unwrap_or_default())}

- - }> - + fallback=|| view! { } + > + } + > + +
From e60243e50cbea0a597f8383b738cee262a46c9bb Mon Sep 17 00:00:00 2001 From: ecco257 Date: Fri, 1 Nov 2024 17:17:06 -0400 Subject: [PATCH 11/16] Redirect to login when logging out --- src/auth.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/auth.rs b/src/auth.rs index d0c0f1c..f0ad590 100644 --- a/src/auth.rs +++ b/src/auth.rs @@ -85,6 +85,7 @@ pub async fn logout() -> Result<(), ServerFnError> { auth_session.logout().await .map_err(|e| ServerFnError::::ServerError(format!("Error getting auth session: {}", e)))?; + leptos_axum::redirect("/login"); Ok(()) } From f1affc66bc224c75040d728900fa5a8f928007c0 Mon Sep 17 00:00:00 2001 From: ecco257 Date: Fri, 1 Nov 2024 17:17:59 -0400 Subject: [PATCH 12/16] Remove email display on personal and rescale icon/pfp to be bigger & consistent --- src/components/personal.rs | 5 ++--- style/personal.scss | 19 +++++++------------ 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/src/components/personal.rs b/src/components/personal.rs index dc072b3..d029302 100644 --- a/src/components/personal.rs +++ b/src/components/personal.rs @@ -39,17 +39,16 @@ pub fn Profile() -> impl IntoView {

Not Logged In

}>

{move || user.get().map(|user| user.map(|user| user.username).unwrap_or_default())}

-

{move || user.get().map(|user| user.map(|user| user.email).unwrap_or_default())}

} + fallback=|| view! { } > } + fallback=|| view! { } > Date: Tue, 12 Nov 2024 17:11:06 -0500 Subject: [PATCH 13/16] Reduce calls to get_user by not having logged_in resource --- src/components/personal.rs | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/components/personal.rs b/src/components/personal.rs index d029302..e9fb5ea 100644 --- a/src/components/personal.rs +++ b/src/components/personal.rs @@ -18,7 +18,6 @@ pub fn Profile() -> impl IntoView { let (dropdown_open, set_dropdown_open) = create_signal(false); let (image_error, set_image_error) = create_signal(false); let user = create_local_resource(move || dropdown_open.get(), |_| async move { get_user().await }); - let logged_in = create_local_resource(move || dropdown_open.get(), |_| async move { get_user().await.is_ok() }); let open_dropdown = move |_| { set_dropdown_open.update(|value| *value = !*value); @@ -34,7 +33,7 @@ pub fn Profile() -> impl IntoView {
Not Logged In }> @@ -43,7 +42,7 @@ pub fn Profile() -> impl IntoView {
} > impl IntoView {
}> - +
@@ -80,16 +79,15 @@ pub fn DropDownNotLoggedIn() -> impl IntoView { } } #[component] -pub fn DropDownLoggedIn(logged_in: Resource) -> impl IntoView { - - let logout = move |_| { +pub fn DropDownLoggedIn() -> impl IntoView { + + let logout = move |_| { spawn_local(async move { let result = logout().await; if let Err(err) = result { log!("Error logging out: {:?}", err); } else { log!("Logged out successfully"); - logged_in.set(false); } }); }; From 73b4b7674e2911515c885ba32a9cbdb646bb2fd6 Mon Sep 17 00:00:00 2001 From: ecco257 Date: Sun, 17 Nov 2024 18:42:57 -0500 Subject: [PATCH 14/16] Use global state user instead of local resource in personal page --- src/components/personal.rs | 76 ++++++++++++++++++++++---------------- style/personal.scss | 2 +- 2 files changed, 46 insertions(+), 32 deletions(-) diff --git a/src/components/personal.rs b/src/components/personal.rs index e9fb5ea..c790b87 100644 --- a/src/components/personal.rs +++ b/src/components/personal.rs @@ -1,8 +1,8 @@ use leptos::leptos_dom::*; use leptos::*; use leptos_icons::*; -use crate::auth::get_user; use crate::auth::logout; +use crate::util::state::GlobalState; #[component] pub fn Personal() -> impl IntoView { @@ -16,54 +16,66 @@ pub fn Personal() -> impl IntoView { #[component] pub fn Profile() -> impl IntoView { let (dropdown_open, set_dropdown_open) = create_signal(false); - let (image_error, set_image_error) = create_signal(false); - let user = create_local_resource(move || dropdown_open.get(), |_| async move { get_user().await }); - - let open_dropdown = move |_| { + let user = GlobalState::logged_in_user(); + + let open_dropdown = move |_| { set_dropdown_open.update(|value| *value = !*value); }; let user_profile_picture = move || { user.get().and_then(|user| { - user.ok().map(|user| format!("/assets/images/profile/{}.webp", user.id.unwrap())) + if let Some(user) = user { + if user.id.is_none() { + return None; + } + Some(format!("/assets/images/profile/{}.webp", user.id.unwrap())) + } else { + None + } }) }; view! {
- Not Logged In }> -

{move || user.get().map(|user| user.map(|user| user.username).unwrap_or_default())}

- + Not Logged In + }> +

{move || user.get().map(|user| user.map(|user| user.username))}

+ +
- } - > - } - > - - - + }> + } + > + + + + +
- - }> - - + + }> + + }> + + +
} @@ -87,6 +99,8 @@ pub fn DropDownLoggedIn() -> impl IntoView { if let Err(err) = result { log!("Error logging out: {:?}", err); } else { + let user = GlobalState::logged_in_user(); + user.refetch(); log!("Logged out successfully"); } }); diff --git a/style/personal.scss b/style/personal.scss index e655db9..5a84aac 100644 --- a/style/personal.scss +++ b/style/personal.scss @@ -34,7 +34,7 @@ height: 45; width: 45; margin-left: auto; - img { + .profile-image { width: 100%; height: 100%; border-radius: 50%; From b25cb4549c07f50f498ed4c0862ca6f4ee1f71df Mon Sep 17 00:00:00 2001 From: ecco257 Date: Tue, 19 Nov 2024 16:21:35 -0500 Subject: [PATCH 15/16] Revert get_user to not be server function --- src/auth.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/auth.rs b/src/auth.rs index 0019c1e..cea063b 100644 --- a/src/auth.rs +++ b/src/auth.rs @@ -140,7 +140,7 @@ pub async fn require_auth() -> Result<(), ServerFnError> { /// Ok(()) /// } /// ``` -#[server(endpoint = "get_user")] +#[cfg(feature = "ssr")] pub async fn get_user() -> Result { let auth_session = extract::>().await .map_err(|e| ServerFnError::::ServerError(format!("Error getting auth session: {}", e)))?; From fcd987d433dccd1935f05703bb0e931f3f080c22 Mon Sep 17 00:00:00 2001 From: ecco257 Date: Fri, 22 Nov 2024 16:31:55 -0500 Subject: [PATCH 16/16] change unwrap or default to unwrap or false for readability --- src/components/personal.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/personal.rs b/src/components/personal.rs index c790b87..ce980df 100644 --- a/src/components/personal.rs +++ b/src/components/personal.rs @@ -43,7 +43,7 @@ pub fn Profile() -> impl IntoView {

Not Logged In

}> Not Logged In }> @@ -54,7 +54,7 @@ pub fn Profile() -> impl IntoView {
}> } > @@ -69,7 +69,7 @@ pub fn Profile() -> impl IntoView { }> }>