Friend Page & Components
This commit is contained in:
parent
aa9001e7d1
commit
0ad9383a08
@ -8,6 +8,7 @@ use crate::pages::login::*;
|
|||||||
use crate::pages::signup::*;
|
use crate::pages::signup::*;
|
||||||
use crate::pages::profile::*;
|
use crate::pages::profile::*;
|
||||||
use crate::pages::albumpage::*;
|
use crate::pages::albumpage::*;
|
||||||
|
use crate::pages::friends::*;
|
||||||
use crate::error_template::{AppError, ErrorTemplate};
|
use crate::error_template::{AppError, ErrorTemplate};
|
||||||
use crate::util::state::GlobalState;
|
use crate::util::state::GlobalState;
|
||||||
|
|
||||||
@ -45,6 +46,7 @@ pub fn App() -> impl IntoView {
|
|||||||
<Route path="search" view=Search />
|
<Route path="search" view=Search />
|
||||||
<Route path="user/:id" view=Profile />
|
<Route path="user/:id" view=Profile />
|
||||||
<Route path="user" view=Profile />
|
<Route path="user" view=Profile />
|
||||||
|
<Route path="user/:id/friends" view=Friends />
|
||||||
<Route path="album/:id" view=AlbumPage />
|
<Route path="album/:id" view=AlbumPage />
|
||||||
</Route>
|
</Route>
|
||||||
<Route path="/login" view=Login />
|
<Route path="/login" view=Login />
|
||||||
|
@ -9,4 +9,4 @@ pub mod song_list;
|
|||||||
pub mod loading;
|
pub mod loading;
|
||||||
pub mod error;
|
pub mod error;
|
||||||
pub mod album_info;
|
pub mod album_info;
|
||||||
pub mod user_row;
|
pub mod friend_list;
|
@ -3,9 +3,8 @@ use leptos::*;
|
|||||||
use leptos_icons::*;
|
use leptos_icons::*;
|
||||||
use crate::frienddata::FriendData;
|
use crate::frienddata::FriendData;
|
||||||
|
|
||||||
|
|
||||||
#[component]
|
#[component]
|
||||||
pub fn UserRow(user: FriendData) -> impl IntoView {
|
pub fn FriendRow(user: FriendData) -> impl IntoView {
|
||||||
|
|
||||||
view! {
|
view! {
|
||||||
<div class="friend-row">
|
<div class="friend-row">
|
||||||
@ -19,3 +18,18 @@ pub fn UserRow(user: FriendData) -> impl IntoView {
|
|||||||
</div>
|
</div>
|
||||||
}.into_view()
|
}.into_view()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[component]
|
||||||
|
pub fn FriendList(friends: Vec<FriendData>) -> impl IntoView {
|
||||||
|
view! {
|
||||||
|
<div class="friend-container">
|
||||||
|
{
|
||||||
|
friends.iter().map(|friend| {
|
||||||
|
view! {
|
||||||
|
<FriendRow user={friend.clone()} />
|
||||||
|
}
|
||||||
|
}).collect::<Vec<_>>()
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
}.into_view()
|
||||||
|
}
|
@ -2,3 +2,4 @@ pub mod login;
|
|||||||
pub mod signup;
|
pub mod signup;
|
||||||
pub mod profile;
|
pub mod profile;
|
||||||
pub mod albumpage;
|
pub mod albumpage;
|
||||||
|
pub mod friends;
|
64
src/pages/friends.rs
Normal file
64
src/pages/friends.rs
Normal file
@ -0,0 +1,64 @@
|
|||||||
|
use leptos::leptos_dom::*;
|
||||||
|
use leptos::*;
|
||||||
|
use leptos_router::*;
|
||||||
|
use crate::api::profile::*;
|
||||||
|
use crate::components::friend_list::*;
|
||||||
|
use crate::components::loading::Loading;
|
||||||
|
|
||||||
|
|
||||||
|
#[derive(Params, PartialEq)]
|
||||||
|
struct FriendParams {
|
||||||
|
id: i32
|
||||||
|
}
|
||||||
|
|
||||||
|
#[component]
|
||||||
|
pub fn Friends() -> impl IntoView {
|
||||||
|
let params = use_params::<FriendParams>();
|
||||||
|
|
||||||
|
let id = move || {params.with(|params| {
|
||||||
|
params.as_ref()
|
||||||
|
.map(|params| params.id)
|
||||||
|
.map_err(|e| e.clone())
|
||||||
|
})
|
||||||
|
};
|
||||||
|
|
||||||
|
let friend_list = create_resource(
|
||||||
|
id,
|
||||||
|
|value| async move {
|
||||||
|
match value {
|
||||||
|
Ok(v) => {friends(v).await},
|
||||||
|
Err(e) => {Err(ServerFnError::Request(format!("Error getting song data: {}", e).into()))},
|
||||||
|
}
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
view! {
|
||||||
|
<div class="friend-page-container">
|
||||||
|
<h1 class="friend-header"> "Friends:" </h1>
|
||||||
|
<Transition
|
||||||
|
fallback=move || view! {
|
||||||
|
<Loading />
|
||||||
|
}
|
||||||
|
>
|
||||||
|
<ErrorBoundary
|
||||||
|
fallback=|errors| view! {
|
||||||
|
{move || errors.get()
|
||||||
|
.into_iter()
|
||||||
|
.map(|(_, e)| view! { <p>{e.to_string()}</p>})
|
||||||
|
.collect_view()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
>
|
||||||
|
{
|
||||||
|
friend_list.get().map(|friend_list| {
|
||||||
|
friend_list.map(|friend_list| {
|
||||||
|
view! {<FriendList friends={friend_list} />}
|
||||||
|
})
|
||||||
|
})
|
||||||
|
}
|
||||||
|
</ErrorBoundary>
|
||||||
|
</Transition>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
Loading…
x
Reference in New Issue
Block a user