Skip to content

Fixes challenge visual overlap #694

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
IongIer wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fixes challenge visual overlap #694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
176 changes: 81 additions & 95 deletions apis/src/components/molecules/challenge_row.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ use crate::{
responses::ChallengeResponse,
};
use hive_lib::ColorChoice;
use leptos::{either::Either, prelude::*};
use leptos::prelude::*;
use leptos_icons::*;
use leptos_use::{use_interval_fn_with_options, use_window, UseIntervalFnOptions};
use shared_types::{ChallengeId, ChallengeVisibility, TimeInfo};
Expand Down Expand Up @@ -152,46 +152,101 @@ pub fn ChallengeRow(
challenger_rating,
)
});
let viewer_is_challenger =
move || user.with(|a| a.as_ref().map(|user| user.id)) == Some(challenger_id);

let time_info = TimeInfo {
mode: time_mode,
base: time_base,
increment: time_increment,
};
let actions = move || {
view! {
<Show
when=move || user.with(|a| a.as_ref().map(|user| user.id)) != Some(challenger_id)
fallback=move || {
view! {
{(visibility.with_value(|v| *v == ChallengeVisibility::Private) && !single)
.then(|| {
view! {
<button on:click=copy class=copy_button_class>
<Icon
icon=icondata_ai::AiCopyOutlined
attr:class="size-6"
/>
</button>
}
})}
<button
on:click=move |_| {
let ids = all_challenge_ids.get_value();
let ids_to_cancel =
if ids.is_empty() { vec![challenge_id.get_value()] } else { ids };
api.get().challenges_cancel(ids_to_cancel);
}
class=cancel_button_classes.get_value()
>
<Icon icon=icondata_io::IoCloseSharp attr:class="size-6" />
</button>
}
}
>
<button
on:click=move |_| {
api.get().challenge_accept(challenge_id.get_value());
}
class=accept_button_classes.get_value()
>
<Icon icon=icondata_ai::AiCheckOutlined attr:class="size-6" />
</button>
{has_opponent.then(|| {
view! {
<button
on:click=move |_| {
let ids = all_challenge_ids.get_value();
let ids_to_cancel =
if ids.is_empty() { vec![challenge_id.get_value()] } else { ids };
api.get().challenges_cancel(ids_to_cancel);
}
class=cancel_button_classes.get_value()
>
<Icon icon=icondata_io::IoCloseSharp attr:class="size-6" />
</button>
}
})}
</Show>
}
};
view! {
<tr class="items-center text-center cursor-pointer max-w-fit dark:odd:bg-header-twilight dark:even:bg-reserve-twilight odd:bg-odd-light even:bg-even-light">
<td class=td_class>
<div>
<div class="flex items-center justify-center gap-1">
{(group_count > 1).then(|| {
view! {
<span class="px-1.5 py-0.5 text-[10px] xs:text-xs font-bold bg-pillbug-teal text-white rounded-full leading-tight shrink-0">
{format!("x{}", group_count)}
</span>
}
})}
<Icon icon=Signal::derive(icon) attr:class=Signal::derive(icon_class) />
<div class="flex flex-col items-center justify-center sm:hidden">
{actions()}
</div>
</div>
</td>
<td class=format!("w-10 sm:w-24 {td_class}")>
<td class=td_class>
<div class="flex justify-center items-center">
{move || {
displayed_user
.with(|(username, patreon, bot, _)| {
view! {
<div class="flex items-center">
<div class="flex items-center justify-start gap-x-1 whitespace-nowrap">
<StatusIndicator username=username.clone() />
<ProfileLink
username=username.clone()
patreon=*patreon
bot=*bot
extend_tw_classes="truncate max-w-[60px] xs:max-w-[80px] sm:max-w-[120px] md:max-w-[140px] lg:max-w-[160px]"
/>
{if group_count > 1 {
Either::Left(
view! {
<span class="py-0.5 px-1.5 ml-1 text-xs font-bold text-white rounded-full bg-pillbug-teal">
{format!("x{}", group_count)}
</span>
},
)
} else {
Either::Right(view! { "" })
}}
<div>
<ProfileLink
username=username.clone()
patreon=*patreon
bot=*bot
extend_tw_classes="whitespace-nowrap leading-tight"
/>
</div>
</div>
}
})
Expand Down Expand Up @@ -230,77 +285,8 @@ pub fn ChallengeRow(
</span>
</div>
</td>
<td class=td_class>
<div class="flex justify-center items-center">
<Show
when=move || { !viewer_is_challenger() }

fallback=move || {
view! {
<Show when=move || {
visibility.with_value(|v| *v == ChallengeVisibility::Private)
&& !single
}>
<button on:click=copy class=copy_button_class>
<Icon
icon=icondata_ai::AiCopyOutlined
attr:class="size-6"
/>
</button>
</Show>
<button
on:click=move |_| {
let ids = all_challenge_ids.get_value();
let ids_to_cancel = if ids.is_empty() {
vec![challenge_id.get_value()]
} else {
ids
};
api.get().challenges_cancel(ids_to_cancel);
}
class=cancel_button_classes.get_value()
>
<Icon icon=icondata_io::IoCloseSharp attr:class="size-6" />
</button>
}
}
>

<button
on:click=move |_| {
api.get().challenge_accept(challenge_id.get_value());
}
class=accept_button_classes.get_value()
>
<Icon icon=icondata_ai::AiCheckOutlined attr:class="size-6" />

</button>
{if has_opponent {
Either::Left(
view! {
<button
on:click=move |_| {
let ids = all_challenge_ids.get_value();
let ids_to_cancel = if ids.is_empty() {
vec![challenge_id.get_value()]
} else {
ids
};
api.get().challenges_cancel(ids_to_cancel);
}
class=cancel_button_classes.get_value()
>
<Icon icon=icondata_io::IoCloseSharp attr:class="size-6" />

</button>
},
)
} else {
Either::Right(view! { "" })
}}

</Show>
</div>
<td class="xs:py-1 xs:px-1 sm:py-2 sm:px-2 hidden sm:table-cell">
<div class="flex justify-center items-center">{actions()}</div>
</td>
</tr>
}
Expand Down
16 changes: 6 additions & 10 deletions apis/src/components/organisms/challenges.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,15 +304,14 @@ pub fn Challenges() -> impl IntoView {
}>{move || bots.with(|tab| tab.rows.len().to_string())}</span>
</button>
</div>
<div class="overflow-y-auto max-h-96">
<table class="w-full min-w-0 table-fixed">
<div class="overflow-x-auto overflow-y-auto max-h-96">
<table class="w-full min-w-max table-auto">
<thead class="sticky top-0 z-10 bg-white border-b border-gray-200 dark:bg-gray-800 dark:border-gray-700">
<tr>
<th class=format!("{} w-6 min-w-0", th_class)></th>
<th class=format!(
"{} w-16 xs:w-20 sm:w-24 md:w-32 lg:w-40 min-w-0 text-xs sm:text-sm",
th_class,
)>{t!(i18n, home.challenge_details.player)}</th>
<th class=format!("{} min-w-0 text-xs sm:text-sm", th_class)>
{t!(i18n, home.challenge_details.player)}
</th>
<th class=format!(
"{} w-12 xs:w-14 sm:w-16 md:w-16 lg:w-20 min-w-0 text-xs sm:text-sm",
th_class,
Expand All @@ -329,10 +328,7 @@ pub fn Challenges() -> impl IntoView {
"{} w-8 xs:w-10 sm:w-12 md:w-14 lg:w-16 min-w-0 text-xs sm:text-sm",
th_class,
)>{t!(i18n, home.challenge_details.rated.title)}</th>
<th class=format!(
"{} w-12 xs:w-14 sm:w-16 md:w-18 lg:w-20 min-w-0",
th_class,
)></th>
<th class="py-1 px-1 md:py-2 md:px-2 lg:px-3 font-bold uppercase max-h-[80vh] max-w-screen w-12 xs:w-14 sm:w-16 md:w-18 lg:w-20 min-w-0 hidden sm:table-cell"></th>
</tr>
</thead>
<tbody>
Expand Down