LibreTunes/LibreTunes
7
1
Fork 0
Code Issues 31 Pull Requests Actions Packages Releases Activity

95-fix-home-screen-account-button-ui #124

Merged
eta357 merged 17 commits from 95-fix-home-screen-account-button-ui into main 2024-11-22 22:32:54 +00:00
Conversation 5 Commits 17 Files Changed 4 +6 -28
1 changed files with 6 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2be665c549 - Show all commits

34
src/components/personal.rs
View File

@@ -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() });
eta357 marked this conversation as resolved Outdated
eta357 commented 2024-11-02 03:16:42 +00:00
Outdated
Review
Copy Link

Here you're making two separate calls to get_user, each of which causes an API request. In the interest of performance, it would be best to do this as a single query.

Here you're making two separate calls to get_user, each of which causes an API request. In the interest of performance, it would be best to do this as a single query.
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 {
</div>
<div class="dropdown-container" style={move || if dropdown_open() {"display: flex"} else {"display: none"}}>
<Show
when=logged_in
when=move || logged_in.get().unwrap_or_default()
fallback=|| view!{
<DropDownNotLoggedIn />
}>
<DropDownLoggedIn user_signal=user_signal logged_in=logged_in></DropDownLoggedIn>
<DropDownLoggedIn logged_in=logged_in />
</Show>
</div>
</div>
@@ -64,7 +52,7 @@ pub fn DropDownNotLoggedIn() -> impl IntoView {
}
}
#[component]
pub fn DropDownLoggedIn(user_signal: RwSignal<Option<User>>, logged_in: RwSignal<bool>) -> impl IntoView {
pub fn DropDownLoggedIn(logged_in: Resource<bool, bool>) -> impl IntoView {
let logout = move |_| {
spawn_local(async move {
@@ -73,7 +61,6 @@ pub fn DropDownLoggedIn(user_signal: RwSignal<Option<User>>, 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<Option<User>>, logged_in: RwSignal
view! {
<div class="dropdown-logged">
<h1>"Logged In"</h1>
<div class="profile-info">
<h1>{move || user_signal.with(|user|
if let Some(user) = user {
user.username.clone()
} else {
"".to_string()
}
)}</h1>
</div>
<button on:click=logout class="auth-button">Log Out</button>
</div>
}