Skip to content
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

Feature: Profile stats #17

Merged
merged 6 commits into from
Oct 19, 2024
Merged

Feature: Profile stats #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
42a6edf
Aggregate stats
BakerNet Oct 15, 2024
18e1002
Progress
BakerNet Oct 16, 2024
bfddfcc
Plotters working
BakerNet Oct 18, 2024
2562465
Split parsing
BakerNet Oct 18, 2024
b1501d3
Stats charts added using plotters-rs
BakerNet Oct 19, 2024
cf784e2
Fix coordinate drift and remove crates.io patch
BakerNet Oct 19, 2024
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
543 changes: 489 additions & 54 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 0 additions & 7 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,3 @@ opt-level = 'z'
lto = true
codegen-units = 1
panic = "abort"

[patch.crates-io]
leptos = { git = "https://github.com/leptos-rs/leptos", rev = "699c54e16cea34e4e2353a0f447c4cea02b41b99" }
leptos_axum = { git = "https://github.com/leptos-rs/leptos", rev = "699c54e16cea34e4e2353a0f447c4cea02b41b99", optional = true }
leptos_meta = { git = "https://github.com/leptos-rs/leptos", rev = "699c54e16cea34e4e2353a0f447c4cea02b41b99" }
leptos_router = { git = "https://github.com/leptos-rs/leptos", rev = "699c54e16cea34e4e2353a0f447c4cea02b41b99" }
server_fn = { git = "https://github.com/leptos-rs/leptos", rev = "699c54e16cea34e4e2353a0f447c4cea02b41b99" }
2 changes: 2 additions & 0 deletions rust-toolchain.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[toolchain]
channel = "nightly"
4 changes: 3 additions & 1 deletion web/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ leptos = { version = "0.7.0-gamma", features = ["nightly"] }
leptos_axum = { version = "0.7.0-gamma", optional = true }
leptos_meta = { version = "0.7.0-gamma" }
leptos_router = { version = "0.7.0-gamma", features = ["nightly"] }
leptos-use = { version = "0.14.0-beta" }
leptos-use = { version = "0.14.0-gamma" }
log = "0.4"
nanoid = { version = "0.4", optional = true }
oauth2 = { version = "4.4", optional = true }
Expand All @@ -47,6 +47,8 @@ tracing-subscriber = { version = "0.3", features = ["env-filter"], optional = tr
wasm-bindgen = "0.2"
web-sys = { version = "0.3", features = ["WebSocket", "Performance"] }
getrandom = { version = "0.2", features = ["js"] }
plotters = "0.3.7"
plotters-canvas = "0.3.0"

[features]
hydrate = ["leptos/hydrate", "leptos/nightly"]
Expand Down
2 changes: 1 addition & 1 deletion web/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
fn main() {
// trigger recompilation when a new migration is added
println!("cargo:rerun-if-changed=migrations");
}
}
17 changes: 11 additions & 6 deletions web/src/app/login.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,17 @@ use super::auth::{Login, LoginForm, OAuthTarget};
pub fn LoginView(login: ServerAction<Login>) -> impl IntoView {
view! {
<Title text="Log In" />
<>
<div class="flex-1 flex flex-col items-center justify-center py-12 px-4 space-y-4">
<LoginForm login target=OAuthTarget::Google />
<LoginForm login target=OAuthTarget::Reddit />
<LoginForm login target=OAuthTarget::Github />
<div class="flex-1 flex flex-col items-center justify-center py-12 px-4 space-y-4 mx-auto w-full max-w-sm">
<h1 class="text-4xl my-4 text-gray-900 dark:text-gray-200 font-bold">"Log In"</h1>
<div class="text-center pb-8 text-gray-900 dark:text-gray-100">
"Log in if you want to set your display name, keep game history, or see your game stats & trends"
</div>
</>
<LoginForm login target=OAuthTarget::Google />
<LoginForm login target=OAuthTarget::Reddit />
<LoginForm login target=OAuthTarget::Github />
<div class="text-center pt-8 text-gray-900 dark:text-gray-100">
"Note: None of your personal info is checked or stored - only your username is used to identify your account"
</div>
</div>
}
}
5 changes: 2 additions & 3 deletions web/src/app/minesweeper/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,10 @@ impl FrontendGame {
if !(self.started).get_untracked() || (self.completed).get_untracked() {
bail!("Tried to play when game not active")
}
let Some(player) = self.player_id.get_untracked() else {
let Some(player) = self.player_id.get_untracked() else {
bail!("Tried to play when not a player")
};
let Some(player_info) = self.players[player]
.get_untracked() else {
let Some(player_info) = self.players[player].get_untracked() else {
bail!("Tried to play when player info not available")
};
if player_info.dead {
Expand Down
2 changes: 1 addition & 1 deletion web/src/app/minesweeper/players.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ fn PlayForm(join_trigger: Trigger) -> impl IntoView {
}

#[server]
async fn start_game(game_id: String) -> Result<(), ServerFnError> {
pub async fn start_game(game_id: String) -> Result<(), ServerFnError> {
let auth_session = use_context::<AuthSession>()
.ok_or_else(|| ServerFnError::new("Unable to find auth session".to_string()))?;
let game_manager = use_context::<GameManager>()
Expand Down
286 changes: 9 additions & 277 deletions web/src/app/profile.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,40 +1,22 @@
mod display_name;
mod game_history;
mod stats;

use codee::string::JsonSerdeCodec;
use leptos::either::*;
use leptos::prelude::*;
use leptos_meta::*;
use leptos_router::components::*;
use regex::Regex;
use serde::{Deserialize, Serialize};

use super::{
auth::{FrontendUser, LogOutForm, Logout},
minesweeper::GameMode,
};
use crate::{
button_class,
components::icons::{IconTooltip, Mine, Star, Trophy},
input_class, player_class, player_icon_holder,
};
use display_name::SetDisplayName;
use game_history::GameHistory;
use stats::{PlayerStatsTable, TimelineStatsGraphs};

#[cfg(feature = "ssr")]
use super::{auth::get_user, minesweeper::GameSettings};
#[cfg(feature = "ssr")]
use crate::backend::{AuthSession, GameManager};
#[cfg(feature = "ssr")]
use axum_login::AuthUser;

fn no_prefix_serverfnerror(s: ServerFnError) -> String {
s.to_string()
.split(": ")
.last()
.expect("ServerFnError String expected to have prefix")
.to_string()
}

fn validate_display_name(name: &str) -> bool {
let re = Regex::new(r"^[\w]+$").unwrap();
re.is_match(name) && name.len() >= 3 && name.len() <= 16
}

#[component]
pub fn ProfileView(
Expand Down Expand Up @@ -69,6 +51,8 @@ pub fn ProfileView(
<hr class="w-full" />
</span>
</div>
<PlayerStatsTable />
<TimelineStatsGraphs />
<GameHistory />
</div>
</>
Expand All @@ -82,255 +66,3 @@ pub fn ProfileView(
<Suspense fallback=move || ()>{move || { user.get().map(user_profile) }}</Suspense>
}
}

#[server]
async fn set_display_name(display_name: String) -> Result<String, ServerFnError> {
if !validate_display_name(&display_name) {
return Err(ServerFnError::new("Display name not valid".to_string()));
}
let user = get_user()
.await?
.ok_or_else(|| ServerFnError::new("Unable to find user".to_string()))?;
if let Some(name) = &user.display_name {
if name == &display_name {
return Ok(display_name);
}
}
let auth_session = use_context::<AuthSession>().unwrap();
auth_session
.backend
.update_user_display_name(user.id(), &display_name)
.await
.map(|_| display_name)
.map_err(|_| ServerFnError::new("Unable to update display name".to_string()))
}

#[component]
fn SetDisplayName(user: FrontendUser, user_updated: WriteSignal<String>) -> impl IntoView {
let set_display_name = ServerAction::<SetDisplayName>::new();
let (name_err, set_name_err) = signal::<Option<String>>(None);

let on_submit = move |ev| {
let data = SetDisplayName::from_event(&ev);
if data.is_err() || !validate_display_name(&data.unwrap().display_name) {
ev.prevent_default();
set_name_err(Some("Display name not valid".to_string()));
}
};

Effect::new(move |_| match set_display_name.value().get() {
Some(Ok(name)) => {
user_updated(name);
set_name_err(None);
}
Some(Err(e)) => set_name_err(Some(
no_prefix_serverfnerror(e) + ". This display name may already be taken",
)),
_ => {}
});

let curr_name = FrontendUser::display_name_or_anon(user.display_name.as_ref(), true);

view! {
<div class="flex flex-col space-y-2 w-full max-w-xs">
<span class="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70 text-neutral-950 dark:text-neutral-50">
{curr_name.clone()}
</span>
{move || {
name_err
.get()
.map(|s| {
view! {
<span class="text-sm font-medium leading-none text-red-500">{s}</span>
}
})
}}

<ActionForm
action=set_display_name
on:submit=move |e| on_submit(e.into())
attr:class="flex space-x-2"
>
<input
class=input_class!()
type="text"
id="set_display_name_display_name"
name="display_name"
placeholder=curr_name
/>
<button type="submit" class=button_class!() disabled=set_display_name.pending()>
"Set display name"
</button>
</ActionForm>
</div>
}
}

#[derive(Clone, Debug, Serialize, Deserialize)]
pub struct PlayerGame {
game_id: String,
player: u8,
dead: bool,
victory_click: bool,
top_score: bool,
score: i64,
start_time: Option<String>,
game_time: Option<usize>,
game_mode: GameMode,
}

#[server]
async fn get_player_games() -> Result<Vec<PlayerGame>, ServerFnError> {
let auth_session = use_context::<AuthSession>()
.ok_or_else(|| ServerFnError::new("Unable to find auth session".to_string()))?;
let user = auth_session.user.ok_or(ServerFnError::new(
"Cannot find player games when not logged in".to_string(),
))?;
let game_manager = use_context::<GameManager>()
.ok_or_else(|| ServerFnError::new("No game manager".to_string()))?;

let games = game_manager
.get_player_games_for_user(&user)
.await
.map_err(|e| ServerFnError::new(e.to_string()))?;

Ok(games
.into_iter()
.map(|pu| PlayerGame {
game_id: pu.game_id,
player: pu.player,
dead: pu.dead,
victory_click: pu.victory_click,
top_score: pu.top_score,
score: pu.score,
start_time: pu
.start_time
.map(|dt| dt.date_naive().format("%Y-%m-%d").to_string()),
game_time: match (pu.start_time, pu.end_time) {
(Some(st), Some(et)) => {
Some(999.min(et.signed_duration_since(st).num_seconds() as usize))
}
_ => None,
},
game_mode: GameMode::from(GameSettings::new(
pu.rows,
pu.cols,
pu.num_mines,
pu.max_players.into(),
)),
})
.collect())
}

#[component]
fn GameHistory() -> impl IntoView {
let player_games = Resource::new(|| (), move |_| async { get_player_games().await });
let td_class = "border border-slate-100 dark:border-slate-700 p-1";
let header_class = "border dark:border-slate-600 font-medium p-4 text-gray-900 dark:text-gray-200 bg-neutral-500/50";

let loading_row = move |num: usize| {
let player_class = player_class!(0).to_owned() + " text-black";
view! {
<tr class=player_class>
<td class=td_class>"Game "{num}</td>
<td class=td_class></td>
<td class=td_class></td>
<td class=td_class>"Loading..."</td>
<td class=td_class></td>
<td class=td_class></td>
</tr>
}
};
let game_view = move |game: PlayerGame| {
let player_class = player_class!(game.player as usize).to_owned() + " text-black";
view! {
<tr class=player_class>
<td class=td_class>
<A
attr:class="text-sky-800 hover:text-sky-500 font-medium"
href=format!("/game/{}", game.game_id)
>
{game.game_id}
</A>
</td>
<td class=td_class>{game.start_time}</td>
<td class=td_class>{game.game_mode.long_name()}</td>
<td class=td_class>{game.game_time}</td>
<td class=td_class>
{if game.dead {
Either::Left(
view! {
<span class=player_icon_holder!("bg-red-600", true)>
<Mine />
<IconTooltip>"Dead"</IconTooltip>
</span>
},
)
} else {
Either::Right(())
}}
{if game.top_score {
Either::Left(
view! {
<span class=player_icon_holder!("bg-green-800", true)>
<Trophy />
<IconTooltip>"Top Score"</IconTooltip>
</span>
},
)
} else {
Either::Right(())
}}
{if game.victory_click {
Either::Left(
view! {
<span class=player_icon_holder!("bg-black", true)>
<Star />
<IconTooltip>"Victory Click"</IconTooltip>
</span>
},
)
} else {
Either::Right(())
}}

</td>
<td class=td_class>{game.score}</td>
</tr>
}
};
view! {
<h2 class="text-2xl my-4 text-gray-900 dark:text-gray-200">"Game History"</h2>
<div class="max-w-full overflow-x-auto">
<table class="border border-solid border-slate-400 border-collapse table-auto text-sm text-center bg-neutral-200/80 dark:bg-neutral-800/80">
<thead>
<tr>
<th class=header_class>"Game"</th>
<th class=header_class>"Date"</th>
<th class=header_class>"Game Mode"</th>
<th class=header_class>"Duration"</th>
<th class=header_class>"Status"</th>
<th class=header_class>"Score"</th>
</tr>
</thead>
<tbody>
<Suspense fallback=move || {
(0..5).map(loading_row).collect_view()
}>

{move || {
Suspend::new(async move {
player_games
.await
.map(|games| {
games.into_iter().map(game_view).collect_view()
})
})
}}

</Suspense>
</tbody>
</table>
</div>
}
}
Loading