Author SHA1 Message Date
Renovate Bot ddfb642d13 Update react monorepo 2026-08-06 12:04:22 +00:00
code002lover f3dba4c483 remove csrf 2026-01-19 17:15:34 +01:00
code002lover 5584299d44 fix CSP 2026-01-19 16:20:55 +01:00
code002lover 97ac27e78a fix no data error 2026-01-19 16:18:31 +01:00
code002lover c84f617e5c use || instead of ?? 2026-01-19 16:07:58 +01:00
code002lover 15d3ab79bd use proper rand 2026-01-12 23:58:55 +01:00
code002lover 4abe8a53df do stuffs 2026-01-12 23:30:36 +01:00
code002lover 5729940a62 update deps 2026-01-12 19:40:04 +01:00
code002lover 1c48ea9230 fix black theme? 2026-01-12 19:39:25 +01:00
code002lover c196ffc265 improve login page 2026-01-12 18:32:59 +01:00
code002lover b756204514 add auth persistence 2026-01-12 15:59:04 +01:00
code002lover 76281892a2 fix bugs 2026-01-12 14:27:01 +01:00
code002lover 8601d7ced1 fully remove opinions of deleted games 2026-01-12 12:29:00 +01:00
code002lover 74941a8abc keep opinions of updated games and make sure games are sorted 2026-01-12 12:18:55 +01:00
code002lover 86683d410f fix price display 2026-01-12 12:04:17 +01:00
code002lover acc6bc4359 remove border from black theme 2026-01-12 11:21:45 +01:00
code002lover 5dfe1fbb98 price rounding 2026-01-12 11:19:21 +01:00
code002lover fdbd88dd7e change $ to € 2026-01-12 11:14:42 +01:00
code002lover d42ed445d8 fix title editing 2026-01-12 10:32:57 +01:00
code002lover d560b6db6f add extra filters 2026-01-12 08:57:42 +01:00
code002lover 500be84f39 fix price error 2026-01-11 22:28:53 +01:00
code002lover 2ee08dc7d8 better errors and refactoring 2026-01-11 21:24:18 +01:00
code002lover e7fede576c ux improvements 2026-01-11 20:32:34 +01:00
code002lover f24e8fc1e9 fix border in default theme 2026-01-11 19:44:38 +01:00
code002lover 0eea1b1ff4 add refresh state from file 2026-01-11 19:13:56 +01:00
code002lover db417e50d9 add edit/delete game capabilities 2026-01-11 18:41:56 +01:00
code002lover 4eed9adaad add more validation 2026-01-11 14:21:12 +01:00
code002lover 1b45f4c8da fix more of the same bug 2026-01-08 15:18:31 +01:00
code002lover 63cdf58671 fix frontend not recognizing you 2026-01-08 15:15:53 +01:00
code002lover ccb57637f1 fix bug 2026-01-08 15:13:31 +01:00
code002lover 42773a44d3 remove a few shaders from being selected 2026-01-08 15:01:57 +01:00
code002lover 737982ac20 fix bug and better return value on existing games 2025-12-23 16:56:39 +01:00
code002lover 9543dd78cf make login username case insensitive 2025-12-23 16:52:11 +01:00
code002lover d2a2f0ceea make theme instantly sync accross windows 2025-12-20 00:16:55 +01:00
code002lover f4628ad37f add sakura theme 2025-12-19 20:22:46 +01:00
code002lover 5cb67355fb introduce new theming category 2025-12-19 19:50:57 +01:00
code002lover d1b65231a6 store theme selection in localstorage 2025-12-19 14:08:54 +01:00
code002lover 5b397e2265 feat: modularize game filtering logic and UI into a custom hook and dedicated components.feat: modularize game filtering logic and UI into a custom hook and dedicated components. 2025-12-19 14:06:31 +01:00
code002lover d916014872 add batch game info request 2025-12-18 20:04:50 +01:00
code002lover f6d40b8f2e redesign 2025-12-18 19:23:05 +01:00
code002lover baa18484ca always have shaderbackground in the bg 2025-12-09 13:55:12 +01:00
code002lover 7586133152 format 2025-12-08 20:23:11 +01:00
code002lover aa8fb73c61 fix bug + 30fps lock 2025-12-08 19:50:19 +01:00
41 changed files with 5513 additions and 2108 deletions
+2
View File
@@ -1,2 +1,4 @@
target/ target/
cache/ cache/
tokens.bin
.auth_key
Generated
+558 -254
View File
File diff suppressed because it is too large Load Diff
+1
View File
@@ -0,0 +1 @@
["Code002Lover","HoherGeist"]
+9 -6
View File
@@ -6,17 +6,20 @@ default-run = "backend"
[dependencies] [dependencies]
prost = "0.14.1" prost = "0.14"
prost-types = "0.14.1" prost-types = "0.14"
rocket = { git = "https://github.com/rwf2/Rocket", rev = "504efef179622df82ba1dbd37f2e0d9ed2b7c9e4" } rocket = { git = "https://github.com/rwf2/Rocket", rev = "504efef179622df82ba1dbd37f2e0d9ed2b7c9e4" }
bytes = "1" bytes = "1"
rocket_prost_responder_derive = { path = "rocket_prost_responder_derive" } rocket_prost_responder_derive = { path = "rocket_prost_responder_derive" }
uuid = { version = "1.19.0", features = ["v4"] } uuid = { version = "1.19", features = ["v4"] }
bcrypt = "0.17.1" bcrypt = "0.17.1"
bincode = "2.0.1" bincode = "2.0"
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0" serde_json = "1.0"
reqwest = { version = "0.12.24", features = ["json"] } reqwest = { version = "0.13", features = ["json"] }
aes-gcm = "0.10"
base64 = "0.22"
rand = "0.9.2"
[build-dependencies] [build-dependencies]
prost-build = "0.14.1" prost-build = "0.14"
+79 -6
View File
@@ -1,19 +1,23 @@
use crate::auth_persistence::AuthStorage;
use crate::items; use crate::items;
use crate::proto_utils::Proto; use crate::proto_utils::Proto;
use rocket::State; use rocket::State;
use rocket::futures::lock::Mutex; use rocket::futures::lock::Mutex;
use std::collections::HashMap; use std::collections::{HashMap, HashSet};
use uuid::Uuid; use uuid::Uuid;
pub struct AuthState { pub struct AuthState {
// Map token -> username
tokens: Mutex<HashMap<String, String>>, tokens: Mutex<HashMap<String, String>>,
storage: AuthStorage,
} }
impl AuthState { impl AuthState {
pub fn new() -> Self { pub fn new() -> Self {
let storage = AuthStorage::new();
let tokens = storage.load_tokens();
Self { Self {
tokens: Mutex::new(HashMap::new()), tokens: Mutex::new(tokens),
storage,
} }
} }
} }
@@ -24,6 +28,24 @@ impl Default for AuthState {
} }
} }
pub struct AdminState {
pub admins: Mutex<HashSet<String>>,
}
impl AdminState {
pub fn new() -> Self {
Self {
admins: Mutex::new(crate::store::load_admins()),
}
}
}
impl Default for AdminState {
fn default() -> Self {
Self::new()
}
}
#[derive(Debug)] #[derive(Debug)]
#[allow(dead_code)] #[allow(dead_code)]
pub struct Token { pub struct Token {
@@ -42,7 +64,6 @@ impl<'r> rocket::request::FromRequest<'r> for Token {
match token { match token {
Some(token) => { Some(token) => {
// Check if token starts with "Bearer "
if let Some(token) = token.strip_prefix("Bearer ") { if let Some(token) = token.strip_prefix("Bearer ") {
let state = request.guard::<&State<AuthState>>().await.unwrap(); let state = request.guard::<&State<AuthState>>().await.unwrap();
let tokens = state.tokens.lock().await; let tokens = state.tokens.lock().await;
@@ -62,6 +83,48 @@ impl<'r> rocket::request::FromRequest<'r> for Token {
} }
} }
#[derive(Debug)]
pub struct AdminToken {
pub token: String,
pub username: String,
}
#[rocket::async_trait]
impl<'r> rocket::request::FromRequest<'r> for AdminToken {
type Error = ();
async fn from_request(
request: &'r rocket::Request<'_>,
) -> rocket::request::Outcome<Self, Self::Error> {
let token = request.headers().get_one("Authorization");
match token {
Some(token) => {
if let Some(token) = token.strip_prefix("Bearer ") {
let auth_state = request.guard::<&State<AuthState>>().await.unwrap();
let tokens = auth_state.tokens.lock().await;
if let Some(username) = tokens.get(token) {
let admin_state =
request.guard::<&State<crate::AdminState>>().await.unwrap();
let admins = admin_state.admins.lock().await;
if crate::store::is_admin(username, &admins) {
return rocket::request::Outcome::Success(AdminToken {
token: token.to_string(),
username: username.clone(),
});
}
}
}
rocket::request::Outcome::Error((rocket::http::Status::Forbidden, ()))
}
None => rocket::request::Outcome::Error((rocket::http::Status::Unauthorized, ())),
}
}
}
#[post("/login", data = "<request>")] #[post("/login", data = "<request>")]
pub async fn login( pub async fn login(
state: &State<AuthState>, state: &State<AuthState>,
@@ -71,12 +134,15 @@ pub async fn login(
let req = request.into_inner(); let req = request.into_inner();
let users = user_list.lock().await; let users = user_list.lock().await;
if let Some(user) = users.iter().find(|u| u.person.name == req.username) if let Some(user) = users
.iter()
.find(|u| u.person.name.to_lowercase() == req.username.to_lowercase())
&& bcrypt::verify(&req.password, &user.password_hash).unwrap_or(false) && bcrypt::verify(&req.password, &user.password_hash).unwrap_or(false)
{ {
let token = Uuid::new_v4().to_string(); let token = Uuid::new_v4().to_string();
let mut tokens = state.tokens.lock().await; let mut tokens = state.tokens.lock().await;
tokens.insert(token.clone(), req.username); tokens.insert(token.clone(), req.username.clone());
state.storage.save_tokens(&tokens);
return items::LoginResponse { return items::LoginResponse {
token, token,
@@ -101,6 +167,7 @@ pub async fn logout(
let mut tokens = state.tokens.lock().await; let mut tokens = state.tokens.lock().await;
if tokens.remove(&req.token).is_some() { if tokens.remove(&req.token).is_some() {
state.storage.save_tokens(&tokens);
items::LogoutResponse { items::LogoutResponse {
success: true, success: true,
message: "Logged out successfully".to_string(), message: "Logged out successfully".to_string(),
@@ -116,22 +183,28 @@ pub async fn logout(
#[post("/get_auth_status", data = "<request>")] #[post("/get_auth_status", data = "<request>")]
pub async fn get_auth_status( pub async fn get_auth_status(
state: &State<AuthState>, state: &State<AuthState>,
admin_state: &State<AdminState>,
request: Proto<items::AuthStatusRequest>, request: Proto<items::AuthStatusRequest>,
) -> items::AuthStatusResponse { ) -> items::AuthStatusResponse {
let req = request.into_inner(); let req = request.into_inner();
let tokens = state.tokens.lock().await; let tokens = state.tokens.lock().await;
if let Some(username) = tokens.get(&req.token) { if let Some(username) = tokens.get(&req.token) {
let admins = admin_state.admins.lock().await;
let is_admin = crate::store::is_admin(username, &admins);
items::AuthStatusResponse { items::AuthStatusResponse {
authenticated: true, authenticated: true,
username: username.clone(), username: username.clone(),
message: "Authenticated".to_string(), message: "Authenticated".to_string(),
is_admin,
} }
} else { } else {
items::AuthStatusResponse { items::AuthStatusResponse {
authenticated: false, authenticated: false,
username: "".to_string(), username: "".to_string(),
message: "Not authenticated".to_string(), message: "Not authenticated".to_string(),
is_admin: false,
} }
} }
} }
+227
View File
@@ -0,0 +1,227 @@
use aes_gcm::{
Aes256Gcm, Nonce,
aead::{Aead, KeyInit},
};
use base64::{Engine, engine::general_purpose::STANDARD};
use bincode::{config, decode_from_slice, encode_to_vec};
use serde::{Deserialize, Serialize};
use std::collections::HashMap;
use std::fs::File;
use std::io::{self, BufReader, BufWriter, Write};
use std::os::unix::fs::PermissionsExt;
#[derive(Debug, Serialize, Deserialize, bincode::Encode, bincode::Decode)]
pub struct TokenEntry {
pub token: String,
pub username: String,
pub created_at: u64,
}
const AUTH_KEY_FILE: &str = ".auth_key";
const TOKENS_FILE: &str = "tokens.bin";
const NONCE_SIZE: usize = 12;
const KEY_SIZE: usize = 32;
pub struct AuthStorage {
cipher: Aes256Gcm,
}
impl Default for AuthStorage {
fn default() -> Self {
Self::new()
}
}
impl AuthStorage {
pub fn new() -> Self {
let key = Self::load_or_create_key();
let cipher = Aes256Gcm::new_from_slice(&key).expect("Invalid key length");
Self { cipher }
}
fn load_or_create_key() -> Vec<u8> {
if let Ok(existing_key) = Self::load_key_from_file() {
return existing_key;
}
let key = Self::generate_key();
if let Err(e) = Self::save_key_to_file(&key) {
eprintln!("Warning: Failed to save auth key to file: {}", e);
}
key
}
fn generate_key() -> Vec<u8> {
use std::time::{SystemTime, UNIX_EPOCH};
let mut key = [0u8; KEY_SIZE];
let timestamp = SystemTime::now()
.duration_since(UNIX_EPOCH)
.unwrap_or_default()
.as_nanos();
let mut seed = timestamp as u64;
for byte in key.iter_mut() {
seed = seed.wrapping_mul(1103515245).wrapping_add(12345);
*byte = (seed >> (seed % 8)) as u8;
}
key.to_vec()
}
fn load_key_from_file() -> io::Result<Vec<u8>> {
let file = File::open(AUTH_KEY_FILE)?;
let reader = BufReader::new(file);
let encoded = std::io::read_to_string(reader)?;
let key = STANDARD.decode(encoded).map_err(|e| {
io::Error::new(
io::ErrorKind::InvalidData,
format!("Base64 decode error: {}", e),
)
})?;
if key.len() != KEY_SIZE {
return Err(io::Error::new(
io::ErrorKind::InvalidData,
"Invalid key length",
));
}
Ok(key)
}
fn save_key_to_file(key: &[u8]) -> io::Result<()> {
let encoded = STANDARD.encode(key);
let mut file = File::create(AUTH_KEY_FILE)?;
let mut permissions = file.metadata()?.permissions();
permissions.set_mode(0o600);
file.set_permissions(permissions)?;
file.write_all(encoded.as_bytes())?;
file.sync_all()?;
Ok(())
}
pub fn load_tokens(&self) -> HashMap<String, String> {
let file = match File::open(TOKENS_FILE) {
Ok(f) => f,
Err(_) => {
eprintln!("Warning: No existing tokens file, starting with empty token list");
return HashMap::new();
}
};
let reader = BufReader::new(file);
let encrypted_data = match std::io::read_to_string(reader) {
Ok(data) => data,
Err(_) => {
eprintln!("Warning: Failed to read tokens file, starting with empty token list");
return HashMap::new();
}
};
let decoded = match STANDARD.decode(&encrypted_data) {
Ok(data) => data,
Err(_) => {
eprintln!("Warning: Failed to decode tokens file, starting with empty token list");
return HashMap::new();
}
};
if decoded.len() <= NONCE_SIZE {
eprintln!("Warning: Invalid tokens file format, starting with empty token list");
return HashMap::new();
}
let (nonce_bytes, ciphertext) = decoded.split_at(NONCE_SIZE);
let nonce = Nonce::from_slice(nonce_bytes);
let plaintext = match self.cipher.decrypt(nonce, ciphertext.as_ref()) {
Ok(p) => p,
Err(_) => {
eprintln!("Warning: Failed to decrypt tokens file, starting with empty token list");
return HashMap::new();
}
};
let config = config::standard();
let (entries, _): (Vec<TokenEntry>, usize) = match decode_from_slice(&plaintext, config) {
Ok(e) => e,
Err(_) => {
eprintln!("Warning: Failed to deserialize tokens, starting with empty token list");
return HashMap::new();
}
};
entries
.into_iter()
.map(|entry| (entry.token, entry.username))
.collect()
}
pub fn save_tokens(&self, tokens: &HashMap<String, String>) {
use std::time::{SystemTime, UNIX_EPOCH};
let entries: Vec<TokenEntry> = tokens
.iter()
.map(|(token, username)| TokenEntry {
token: token.clone(),
username: username.clone(),
created_at: SystemTime::now()
.duration_since(UNIX_EPOCH)
.unwrap_or_default()
.as_secs(),
})
.collect();
let config = config::standard();
let plaintext: Vec<u8> = match encode_to_vec(&entries, config) {
Ok(data) => data,
Err(e) => {
eprintln!("Warning: Failed to serialize tokens: {}", e);
return;
}
};
let nonce_bytes: [u8; NONCE_SIZE] = rand::random();
let nonce = Nonce::from_slice(&nonce_bytes);
let ciphertext = match self.cipher.encrypt(nonce, plaintext.as_ref()) {
Ok(encrypted) => encrypted,
Err(e) => {
eprintln!("Warning: Failed to encrypt tokens: {}", e);
return;
}
};
let mut encrypted_data = nonce_bytes.to_vec();
encrypted_data.extend_from_slice(&ciphertext);
let encoded = STANDARD.encode(&encrypted_data);
match File::create(TOKENS_FILE) {
Ok(file) => {
if let Ok(metadata) = file.metadata() {
let mut permissions = metadata.permissions();
permissions.set_mode(0o600);
if let Err(e) = file.set_permissions(permissions) {
eprintln!("Warning: Failed to set permissions on tokens file: {}", e);
}
}
let mut writer = BufWriter::new(file);
if let Err(e) = writer.write_all(encoded.as_bytes()) {
eprintln!("Warning: Failed to write tokens file: {}", e);
}
if let Err(e) = writer.flush() {
eprintln!("Warning: Failed to flush tokens file: {}", e);
}
}
Err(e) => {
eprintln!("Warning: Failed to create tokens file: {}", e);
}
}
}
}
+5
View File
@@ -6,7 +6,12 @@ pub mod items {
} }
pub mod auth; pub mod auth;
pub mod auth_persistence;
pub mod proto_utils; pub mod proto_utils;
pub mod security_headers;
pub mod store; pub mod store;
pub mod validation;
pub use auth::AdminState;
pub use security_headers::SecurityHeaders;
pub use store::User; pub use store::User;
+223 -36
View File
@@ -3,9 +3,12 @@ use rocket::fs::FileServer;
use rocket::futures::lock::Mutex; use rocket::futures::lock::Mutex;
use backend::auth; use backend::auth;
use backend::auth::AdminState;
use backend::items::{self, Game}; use backend::items::{self, Game};
use backend::proto_utils; use backend::proto_utils;
use backend::security_headers::SecurityHeaders;
use backend::store::{self, User, save_state}; use backend::store::{self, User, save_state};
use backend::validation;
#[macro_use] #[macro_use]
extern crate rocket; extern crate rocket;
@@ -16,10 +19,14 @@ async fn get_user(
user_list: &rocket::State<Mutex<Vec<User>>>, user_list: &rocket::State<Mutex<Vec<User>>>,
name: &str, name: &str,
) -> Option<items::Person> { ) -> Option<items::Person> {
if validation::validate_username(name).is_err() {
return None;
}
let users = user_list.lock().await; let users = user_list.lock().await;
users users
.iter() .iter()
.find(|user| user.person.name == name) .find(|user| user.person.name.to_lowercase() == name.to_lowercase())
.map(|u| u.person.clone()) .map(|u| u.person.clone())
} }
@@ -40,8 +47,32 @@ async fn get_game(
game_list: &rocket::State<Mutex<Vec<Game>>>, game_list: &rocket::State<Mutex<Vec<Game>>>,
title: &str, title: &str,
) -> Option<items::Game> { ) -> Option<items::Game> {
if validation::validate_game_title(title).is_err() {
return None;
}
let games = game_list.lock().await; let games = game_list.lock().await;
games.iter().find(|g| g.title == title).cloned() games
.iter()
.find(|g| g.title.to_lowercase() == title.to_lowercase())
.cloned()
}
#[post("/games/batch", data = "<req>")]
async fn get_games_batch(
_token: auth::Token,
game_list: &rocket::State<Mutex<Vec<Game>>>,
req: proto_utils::Proto<items::GetGameInfoRequest>,
) -> Result<items::GameList, String> {
let req = req.into_inner();
let games_set: std::collections::HashSet<String> = req.games.into_iter().collect();
validation::validate_game_titles_batch(&games_set)?;
let games = game_list.lock().await;
let mut games = games.clone();
games.retain(|g| games_set.contains(&g.title));
Ok(items::GameList { games })
} }
#[get("/games")] #[get("/games")]
@@ -55,52 +86,192 @@ async fn get_games(
} }
} }
#[post("/game", data = "<game>")] #[post("/game", data = "<game>", rank = 1)]
async fn add_game( async fn add_game(
_token: auth::Token, _token: auth::Token,
game_list: &rocket::State<Mutex<Vec<Game>>>, game_list: &rocket::State<Mutex<Vec<Game>>>,
user_list: &rocket::State<Mutex<Vec<User>>>, user_list: &rocket::State<Mutex<Vec<User>>>,
game: proto_utils::Proto<items::Game>, game: proto_utils::Proto<items::Game>,
) -> Option<items::Game> { ) -> Result<Option<items::Game>, String> {
let mut games = game_list.lock().await;
let mut game = game.into_inner(); let mut game = game.into_inner();
if games.iter().any(|g| { game.title = game.title.trim().to_string();
g.title == game.title || (g.remote_id == game.remote_id && g.source == game.source)
}) { validation::validate_game_title(&game.title)?;
return None; validation::validate_remote_id(game.remote_id)?;
validation::validate_player_count(game.min_players, game.max_players)?;
validation::validate_price(game.price)?;
if game.title.len() > validation::MAX_GAME_TITLE_TRIMMED_LENGTH {
game.title = game
.title
.chars()
.take(validation::MAX_GAME_TITLE_TRIMMED_LENGTH)
.collect();
} }
game.title = game.title.trim().to_string(); let users = user_list.lock().await;
let mut games = game_list.lock().await;
if let Some(existing) = games.iter().find(|g| {
g.title == game.title || (g.remote_id == game.remote_id && g.source == game.source)
}) {
return Ok(Some(existing.clone()));
}
games.push(game.clone()); games.push(game.clone());
games.sort_unstable_by(|g1, g2| g1.title.cmp(&g2.title)); games.sort_unstable_by(|g1, g2| g1.title.cmp(&g2.title));
let users = user_list.lock().await;
save_state(&games, &users); save_state(&games, &users);
Some(game) Ok(Some(game))
} }
#[post("/opinion", data = "<req>")] #[patch("/game", data = "<game>", rank = 1)]
async fn add_opinion( async fn update_game(
token: auth::Token, _token: auth::AdminToken,
user_list: &rocket::State<Mutex<Vec<User>>>,
game_list: &rocket::State<Mutex<Vec<Game>>>, game_list: &rocket::State<Mutex<Vec<Game>>>,
req: proto_utils::Proto<items::AddOpinionRequest>, user_list: &rocket::State<Mutex<Vec<User>>>,
) -> Option<items::Person> { game: proto_utils::Proto<items::Game>,
let mut users = user_list.lock().await; ) -> Result<Option<items::Game>, String> {
let games = game_list.lock().await; let mut game = game.into_inner();
let mut result = None;
// Validate game exists game.title = game.title.trim().to_string();
if !games.iter().any(|g| g.title == req.game_title) {
return None; validation::validate_game_title(&game.title)?;
validation::validate_remote_id(game.remote_id)?;
validation::validate_player_count(game.min_players, game.max_players)?;
validation::validate_price(game.price)?;
if game.title.len() > validation::MAX_GAME_TITLE_TRIMMED_LENGTH {
game.title = game
.title
.chars()
.take(validation::MAX_GAME_TITLE_TRIMMED_LENGTH)
.collect();
} }
if let Some(user) = users.iter_mut().find(|u| u.person.name == token.username) { let mut users = user_list.lock().await;
let mut games = game_list.lock().await;
let mut r_existing = None;
if let Some(existing) = games.iter_mut().find(|g| {
(g.remote_id == game.remote_id && g.source == game.source) || (g.title == game.title)
}) {
if existing.title != game.title {
let old_title = existing.title.clone();
for person in users.iter_mut() {
let opinion = person
.person
.opinion
.iter_mut()
.find(|o| o.title == old_title);
if let Some(opinion) = opinion {
opinion.title = game.title.clone();
}
}
}
existing.title = game.title.clone();
existing.source = game.source;
existing.min_players = game.min_players;
existing.max_players = game.max_players;
existing.price = game.price;
existing.remote_id = game.remote_id;
r_existing = Some(existing.clone());
}
games.sort_unstable_by(|g1, g2| g1.title.cmp(&g2.title));
save_state(&games, &users);
Ok(r_existing)
}
#[delete("/game/<title>", rank = 1)]
async fn delete_game(
_token: auth::AdminToken,
game_list: &rocket::State<Mutex<Vec<Game>>>,
user_list: &rocket::State<Mutex<Vec<User>>>,
title: &str,
) -> Result<Option<items::Game>, String> {
validation::validate_game_title(title)?;
let mut users = user_list.lock().await;
let mut games = game_list.lock().await;
if let Some(pos) = games
.iter()
.position(|g| g.title.to_lowercase() == title.to_lowercase())
{
let game = games.remove(pos);
for person in users.iter_mut() {
person.person.opinion.retain_mut(|o| o.title != game.title);
}
save_state(&games, &users);
return Ok(Some(game));
}
Ok(None)
}
#[post("/refresh", rank = 1)]
async fn refresh_state(
_token: auth::AdminToken,
game_list: &rocket::State<Mutex<Vec<Game>>>,
user_list: &rocket::State<Mutex<Vec<User>>>,
admin_state: &rocket::State<AdminState>,
) -> items::RefreshResponse {
if let Some((new_games, new_users)) = store::load_state() {
let mut users = user_list.lock().await;
let mut games = game_list.lock().await;
let mut admins = admin_state.admins.lock().await;
*games = new_games;
*users = new_users;
*admins = store::load_admins();
items::RefreshResponse {
success: true,
message: "State refreshed from file".to_string(),
}
} else {
items::RefreshResponse {
success: false,
message: "Failed to load state from file".to_string(),
}
}
}
#[post("/opinion", data = "<req>", rank = 1)]
async fn add_opinion(
token: auth::Token,
game_list: &rocket::State<Mutex<Vec<Game>>>,
user_list: &rocket::State<Mutex<Vec<User>>>,
req: proto_utils::Proto<items::AddOpinionRequest>,
) -> Result<Option<items::Person>, String> {
validation::validate_username(&token.username)?;
let games = game_list.lock().await;
let mut users = user_list.lock().await;
let mut result = None;
if !games.iter().any(|g| g.title == req.game_title) {
return Err("Game not found".to_string());
}
if let Some(user) = users
.iter_mut()
.find(|u| u.person.name.to_lowercase() == token.username.to_lowercase())
{
let req = req.into_inner(); let req = req.into_inner();
validation::validate_game_title(&req.game_title)?;
let opinion = items::Opinion { let opinion = items::Opinion {
title: req.game_title.clone(), title: req.game_title.clone(),
would_play: req.would_play, would_play: req.would_play,
@@ -126,22 +297,28 @@ async fn add_opinion(
if result.is_some() { if result.is_some() {
save_state(&games, &users); save_state(&games, &users);
} }
result Ok(result)
} }
#[patch("/opinion", data = "<req>")] #[patch("/opinion", data = "<req>", rank = 1)]
async fn remove_opinion( async fn remove_opinion(
token: auth::Token, token: auth::Token,
user_list: &rocket::State<Mutex<Vec<User>>>,
game_list: &rocket::State<Mutex<Vec<Game>>>, game_list: &rocket::State<Mutex<Vec<Game>>>,
user_list: &rocket::State<Mutex<Vec<User>>>,
req: proto_utils::Proto<items::RemoveOpinionRequest>, req: proto_utils::Proto<items::RemoveOpinionRequest>,
) -> Option<items::Person> { ) -> Result<Option<items::Person>, String> {
let mut users = user_list.lock().await; validation::validate_username(&token.username)?;
let games = game_list.lock().await; let games = game_list.lock().await;
let mut users = user_list.lock().await;
let mut result = None; let mut result = None;
if let Some(user) = users.iter_mut().find(|u| u.person.name == token.username) { if let Some(user) = users
.iter_mut()
.find(|u| u.person.name.to_lowercase() == token.username.to_lowercase())
{
let req = req.into_inner(); let req = req.into_inner();
validation::validate_game_title(&req.game_title)?;
if let Some(existing) = user if let Some(existing) = user
.person .person
@@ -157,7 +334,7 @@ async fn remove_opinion(
if result.is_some() { if result.is_some() {
save_state(&games, &users); save_state(&games, &users);
} }
result Ok(result)
} }
mod cached_option; mod cached_option;
@@ -208,9 +385,13 @@ async fn get_game_thumbnail(
.json::<serde_json::Value>() .json::<serde_json::Value>()
.await .await
.ok()? .ok()?
.get("universeId")? .get("universeId")
.as_u64() .and_then(|v| v.as_u64())
.unwrap() };
let universe_id = match universe_id {
Some(id) => id,
None => return None.into(),
}; };
let api_url = format!( let api_url = format!(
@@ -306,8 +487,10 @@ async fn main() -> Result<(), std::io::Error> {
}); });
rocket::build() rocket::build()
.attach(SecurityHeaders)
.manage(Mutex::new(user_list)) .manage(Mutex::new(user_list))
.manage(auth::AuthState::new()) .manage(auth::AuthState::new())
.manage(auth::AdminState::new())
.manage(Mutex::new(game_list)) .manage(Mutex::new(game_list))
.mount( .mount(
"/api", "/api",
@@ -319,7 +502,11 @@ async fn main() -> Result<(), std::io::Error> {
add_opinion, add_opinion,
remove_opinion, remove_opinion,
add_game, add_game,
get_game_thumbnail update_game,
delete_game,
refresh_state,
get_game_thumbnail,
get_games_batch
], ],
) )
.mount( .mount(
+33
View File
@@ -0,0 +1,33 @@
use rocket::fairing::{Fairing, Info, Kind};
use rocket::http::Header;
use rocket::{Request, Response};
pub struct SecurityHeaders;
#[rocket::async_trait]
impl Fairing for SecurityHeaders {
fn info(&self) -> Info {
Info {
name: "Security Headers",
kind: Kind::Response,
}
}
async fn on_response<'r>(&self, _request: &'r Request<'_>, response: &mut Response<'r>) {
response.set_header(Header::new("X-Content-Type-Options", "nosniff"));
response.set_header(Header::new("X-Frame-Options", "DENY"));
response.set_header(Header::new("X-XSS-Protection", "1; mode=block"));
response.set_header(Header::new(
"Referrer-Policy",
"strict-origin-when-cross-origin",
));
response.set_header(Header::new(
"Content-Security-Policy",
"default-src 'self'; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; img-src 'self' data:; font-src 'self' data:; connect-src 'self'; frame-ancestors 'none';",
));
response.set_header(Header::new(
"Permissions-Policy",
"geolocation=(), microphone=(), camera=()",
));
}
}
+16
View File
@@ -1,5 +1,6 @@
use crate::items::{Game, Person}; use crate::items::{Game, Person};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::collections::HashSet;
use std::fs::File; use std::fs::File;
use std::io::BufReader; use std::io::BufReader;
@@ -30,6 +31,7 @@ pub struct PersistentState {
} }
pub const STATE_FILE: &str = "state.json"; pub const STATE_FILE: &str = "state.json";
pub const ADMINS_FILE: &str = "admins.json";
pub fn save_state(games: &[Game], users: &[User]) { pub fn save_state(games: &[Game], users: &[User]) {
let mut games = games.to_vec(); let mut games = games.to_vec();
@@ -57,3 +59,17 @@ pub fn load_state() -> Option<(Vec<Game>, Vec<User>)> {
} }
None None
} }
pub fn load_admins() -> HashSet<String> {
if let Ok(file) = File::open(ADMINS_FILE) {
let reader = BufReader::new(file);
if let Ok(admins) = serde_json::from_reader::<_, Vec<String>>(reader) {
return admins.into_iter().map(|s| s.to_lowercase()).collect();
}
}
HashSet::new()
}
pub fn is_admin(username: &str, admins: &HashSet<String>) -> bool {
admins.contains(&username.to_lowercase())
}
+108
View File
@@ -0,0 +1,108 @@
use std::collections::HashSet;
pub const MAX_USERNAME_LENGTH: usize = 50;
pub const MIN_USERNAME_LENGTH: usize = 2;
pub const MAX_GAME_TITLE_LENGTH: usize = 200;
const MIN_GAME_TITLE_LENGTH: usize = 1;
pub const MAX_GAME_TITLE_TRIMMED_LENGTH: usize = 200;
pub const MAX_PRICE: u32 = 1_000_000;
pub const MAX_PLAYERS: u32 = 10_000;
const VALID_USERNAME_CHARS: &str =
"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-";
pub fn validate_username(username: &str) -> Result<(), String> {
let trimmed = username.trim();
if trimmed.is_empty() {
return Err("Username cannot be empty".to_string());
}
if trimmed.len() < MIN_USERNAME_LENGTH {
return Err(format!(
"Username must be at least {} characters long",
MIN_USERNAME_LENGTH
));
}
if trimmed.len() > MAX_USERNAME_LENGTH {
return Err(format!(
"Username must not exceed {} characters",
MAX_USERNAME_LENGTH
));
}
for c in trimmed.chars() {
if !VALID_USERNAME_CHARS.contains(c) {
return Err(format!(
"Username contains invalid character '{}'. Only alphanumeric characters, underscores and hyphens are allowed",
c
));
}
}
Ok(())
}
pub fn validate_game_title(title: &str) -> Result<(), String> {
if title.trim().is_empty() {
return Err("Game title cannot be empty".to_string());
}
if title.len() > MAX_GAME_TITLE_LENGTH {
return Err(format!(
"Game title must not exceed {} characters",
MAX_GAME_TITLE_LENGTH
));
}
Ok(())
}
pub fn validate_remote_id(remote_id: u64) -> Result<(), String> {
if remote_id == 0 {
return Err("Remote ID cannot be zero".to_string());
}
Ok(())
}
pub fn validate_player_count(min_players: u32, max_players: u32) -> Result<(), String> {
if min_players == 0 {
return Err("Minimum players must be at least 1".to_string());
}
if min_players > max_players {
return Err("Minimum players cannot be greater than maximum players".to_string());
}
if max_players > MAX_PLAYERS {
return Err(format!("Maximum players cannot exceed {}", MAX_PLAYERS));
}
Ok(())
}
pub fn validate_price(price: u32) -> Result<(), String> {
if price > MAX_PRICE {
return Err(format!("Price cannot exceed ${}", MAX_PRICE));
}
Ok(())
}
pub fn validate_game_titles_batch(titles: &HashSet<String>) -> Result<(), String> {
if titles.is_empty() {
return Ok(());
}
if titles.len() > 100 {
return Err("Cannot request more than 100 games at once".to_string());
}
for title in titles {
validate_game_title(title)?;
}
Ok(())
}
-1
View File
@@ -3,7 +3,6 @@
<head> <head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Game List</title> <title>Game List</title>
</head> </head>
+232 -2
View File
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-ts_proto. DO NOT EDIT. // Code generated by protoc-gen-ts_proto. DO NOT EDIT.
// versions: // versions:
// protoc-gen-ts_proto v2.8.3 // protoc-gen-ts_proto v2.10.1
// protoc v6.33.1 // protoc v6.33.1
// source: items.proto // source: items.proto
@@ -90,6 +90,11 @@ export interface LogoutResponse {
message: string; message: string;
} }
export interface RefreshResponse {
success: boolean;
message: string;
}
export interface AuthStatusRequest { export interface AuthStatusRequest {
token: string; token: string;
} }
@@ -98,6 +103,7 @@ export interface AuthStatusResponse {
authenticated: boolean; authenticated: boolean;
username: string; username: string;
message: string; message: string;
isAdmin: boolean;
} }
export interface GameRequest { export interface GameRequest {
@@ -116,6 +122,14 @@ export interface RemoveOpinionRequest {
gameTitle: string; gameTitle: string;
} }
export interface GetGameInfoRequest {
games: string[];
}
export interface GameInfoResponse {
games: Game[];
}
function createBasePerson(): Person { function createBasePerson(): Person {
return { name: "", opinion: [] }; return { name: "", opinion: [] };
} }
@@ -828,6 +842,82 @@ export const LogoutResponse: MessageFns<LogoutResponse> = {
}, },
}; };
function createBaseRefreshResponse(): RefreshResponse {
return { success: false, message: "" };
}
export const RefreshResponse: MessageFns<RefreshResponse> = {
encode(message: RefreshResponse, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
if (message.success !== false) {
writer.uint32(8).bool(message.success);
}
if (message.message !== "") {
writer.uint32(18).string(message.message);
}
return writer;
},
decode(input: BinaryReader | Uint8Array, length?: number): RefreshResponse {
const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
const end = length === undefined ? reader.len : reader.pos + length;
const message = createBaseRefreshResponse();
while (reader.pos < end) {
const tag = reader.uint32();
switch (tag >>> 3) {
case 1: {
if (tag !== 8) {
break;
}
message.success = reader.bool();
continue;
}
case 2: {
if (tag !== 18) {
break;
}
message.message = reader.string();
continue;
}
}
if ((tag & 7) === 4 || tag === 0) {
break;
}
reader.skip(tag & 7);
}
return message;
},
fromJSON(object: any): RefreshResponse {
return {
success: isSet(object.success) ? globalThis.Boolean(object.success) : false,
message: isSet(object.message) ? globalThis.String(object.message) : "",
};
},
toJSON(message: RefreshResponse): unknown {
const obj: any = {};
if (message.success !== false) {
obj.success = message.success;
}
if (message.message !== "") {
obj.message = message.message;
}
return obj;
},
create<I extends Exact<DeepPartial<RefreshResponse>, I>>(base?: I): RefreshResponse {
return RefreshResponse.fromPartial(base ?? ({} as any));
},
fromPartial<I extends Exact<DeepPartial<RefreshResponse>, I>>(object: I): RefreshResponse {
const message = createBaseRefreshResponse();
message.success = object.success ?? false;
message.message = object.message ?? "";
return message;
},
};
function createBaseAuthStatusRequest(): AuthStatusRequest { function createBaseAuthStatusRequest(): AuthStatusRequest {
return { token: "" }; return { token: "" };
} }
@@ -887,7 +977,7 @@ export const AuthStatusRequest: MessageFns<AuthStatusRequest> = {
}; };
function createBaseAuthStatusResponse(): AuthStatusResponse { function createBaseAuthStatusResponse(): AuthStatusResponse {
return { authenticated: false, username: "", message: "" }; return { authenticated: false, username: "", message: "", isAdmin: false };
} }
export const AuthStatusResponse: MessageFns<AuthStatusResponse> = { export const AuthStatusResponse: MessageFns<AuthStatusResponse> = {
@@ -901,6 +991,9 @@ export const AuthStatusResponse: MessageFns<AuthStatusResponse> = {
if (message.message !== "") { if (message.message !== "") {
writer.uint32(26).string(message.message); writer.uint32(26).string(message.message);
} }
if (message.isAdmin !== false) {
writer.uint32(32).bool(message.isAdmin);
}
return writer; return writer;
}, },
@@ -935,6 +1028,14 @@ export const AuthStatusResponse: MessageFns<AuthStatusResponse> = {
message.message = reader.string(); message.message = reader.string();
continue; continue;
} }
case 4: {
if (tag !== 32) {
break;
}
message.isAdmin = reader.bool();
continue;
}
} }
if ((tag & 7) === 4 || tag === 0) { if ((tag & 7) === 4 || tag === 0) {
break; break;
@@ -949,6 +1050,7 @@ export const AuthStatusResponse: MessageFns<AuthStatusResponse> = {
authenticated: isSet(object.authenticated) ? globalThis.Boolean(object.authenticated) : false, authenticated: isSet(object.authenticated) ? globalThis.Boolean(object.authenticated) : false,
username: isSet(object.username) ? globalThis.String(object.username) : "", username: isSet(object.username) ? globalThis.String(object.username) : "",
message: isSet(object.message) ? globalThis.String(object.message) : "", message: isSet(object.message) ? globalThis.String(object.message) : "",
isAdmin: isSet(object.isAdmin) ? globalThis.Boolean(object.isAdmin) : false,
}; };
}, },
@@ -963,6 +1065,9 @@ export const AuthStatusResponse: MessageFns<AuthStatusResponse> = {
if (message.message !== "") { if (message.message !== "") {
obj.message = message.message; obj.message = message.message;
} }
if (message.isAdmin !== false) {
obj.isAdmin = message.isAdmin;
}
return obj; return obj;
}, },
@@ -974,6 +1079,7 @@ export const AuthStatusResponse: MessageFns<AuthStatusResponse> = {
message.authenticated = object.authenticated ?? false; message.authenticated = object.authenticated ?? false;
message.username = object.username ?? ""; message.username = object.username ?? "";
message.message = object.message ?? ""; message.message = object.message ?? "";
message.isAdmin = object.isAdmin ?? false;
return message; return message;
}, },
}; };
@@ -1213,6 +1319,122 @@ export const RemoveOpinionRequest: MessageFns<RemoveOpinionRequest> = {
}, },
}; };
function createBaseGetGameInfoRequest(): GetGameInfoRequest {
return { games: [] };
}
export const GetGameInfoRequest: MessageFns<GetGameInfoRequest> = {
encode(message: GetGameInfoRequest, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
for (const v of message.games) {
writer.uint32(10).string(v!);
}
return writer;
},
decode(input: BinaryReader | Uint8Array, length?: number): GetGameInfoRequest {
const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
const end = length === undefined ? reader.len : reader.pos + length;
const message = createBaseGetGameInfoRequest();
while (reader.pos < end) {
const tag = reader.uint32();
switch (tag >>> 3) {
case 1: {
if (tag !== 10) {
break;
}
message.games.push(reader.string());
continue;
}
}
if ((tag & 7) === 4 || tag === 0) {
break;
}
reader.skip(tag & 7);
}
return message;
},
fromJSON(object: any): GetGameInfoRequest {
return { games: globalThis.Array.isArray(object?.games) ? object.games.map((e: any) => globalThis.String(e)) : [] };
},
toJSON(message: GetGameInfoRequest): unknown {
const obj: any = {};
if (message.games?.length) {
obj.games = message.games;
}
return obj;
},
create<I extends Exact<DeepPartial<GetGameInfoRequest>, I>>(base?: I): GetGameInfoRequest {
return GetGameInfoRequest.fromPartial(base ?? ({} as any));
},
fromPartial<I extends Exact<DeepPartial<GetGameInfoRequest>, I>>(object: I): GetGameInfoRequest {
const message = createBaseGetGameInfoRequest();
message.games = object.games?.map((e) => e) || [];
return message;
},
};
function createBaseGameInfoResponse(): GameInfoResponse {
return { games: [] };
}
export const GameInfoResponse: MessageFns<GameInfoResponse> = {
encode(message: GameInfoResponse, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
for (const v of message.games) {
Game.encode(v!, writer.uint32(10).fork()).join();
}
return writer;
},
decode(input: BinaryReader | Uint8Array, length?: number): GameInfoResponse {
const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
const end = length === undefined ? reader.len : reader.pos + length;
const message = createBaseGameInfoResponse();
while (reader.pos < end) {
const tag = reader.uint32();
switch (tag >>> 3) {
case 1: {
if (tag !== 10) {
break;
}
message.games.push(Game.decode(reader, reader.uint32()));
continue;
}
}
if ((tag & 7) === 4 || tag === 0) {
break;
}
reader.skip(tag & 7);
}
return message;
},
fromJSON(object: any): GameInfoResponse {
return { games: globalThis.Array.isArray(object?.games) ? object.games.map((e: any) => Game.fromJSON(e)) : [] };
},
toJSON(message: GameInfoResponse): unknown {
const obj: any = {};
if (message.games?.length) {
obj.games = message.games.map((e) => Game.toJSON(e));
}
return obj;
},
create<I extends Exact<DeepPartial<GameInfoResponse>, I>>(base?: I): GameInfoResponse {
return GameInfoResponse.fromPartial(base ?? ({} as any));
},
fromPartial<I extends Exact<DeepPartial<GameInfoResponse>, I>>(object: I): GameInfoResponse {
const message = createBaseGameInfoResponse();
message.games = object.games?.map((e) => Game.fromPartial(e)) || [];
return message;
},
};
/** Authentication service */ /** Authentication service */
export interface AuthService { export interface AuthService {
Login(request: LoginRequest): Promise<LoginResponse>; Login(request: LoginRequest): Promise<LoginResponse>;
@@ -1255,6 +1477,7 @@ export interface MainService {
GetGames(request: GetGamesRequest): Promise<GameList>; GetGames(request: GetGamesRequest): Promise<GameList>;
AddGame(request: Game): Promise<Game>; AddGame(request: Game): Promise<Game>;
AddOpinion(request: AddOpinionRequest): Promise<Person>; AddOpinion(request: AddOpinionRequest): Promise<Person>;
GetGameInfo(request: GetGameInfoRequest): Promise<GameInfoResponse>;
} }
export const MainServiceServiceName = "items.MainService"; export const MainServiceServiceName = "items.MainService";
@@ -1268,6 +1491,7 @@ export class MainServiceClientImpl implements MainService {
this.GetGames = this.GetGames.bind(this); this.GetGames = this.GetGames.bind(this);
this.AddGame = this.AddGame.bind(this); this.AddGame = this.AddGame.bind(this);
this.AddOpinion = this.AddOpinion.bind(this); this.AddOpinion = this.AddOpinion.bind(this);
this.GetGameInfo = this.GetGameInfo.bind(this);
} }
GetGame(request: GameRequest): Promise<Game> { GetGame(request: GameRequest): Promise<Game> {
const data = GameRequest.encode(request).finish(); const data = GameRequest.encode(request).finish();
@@ -1292,6 +1516,12 @@ export class MainServiceClientImpl implements MainService {
const promise = this.rpc.request(this.service, "AddOpinion", data); const promise = this.rpc.request(this.service, "AddOpinion", data);
return promise.then((data) => Person.decode(new BinaryReader(data))); return promise.then((data) => Person.decode(new BinaryReader(data)));
} }
GetGameInfo(request: GetGameInfoRequest): Promise<GameInfoResponse> {
const data = GetGameInfoRequest.encode(request).finish();
const promise = this.rpc.request(this.service, "GetGameInfo", data);
return promise.then((data) => GameInfoResponse.decode(new BinaryReader(data)));
}
} }
interface Rpc { interface Rpc {
+11 -11
View File
@@ -11,24 +11,24 @@
"gen:proto": "protoc --plugin=./node_modules/.bin/protoc-gen-ts_proto --ts_proto_out=. -I ../protobuf items.proto" "gen:proto": "protoc --plugin=./node_modules/.bin/protoc-gen-ts_proto --ts_proto_out=. -I ../protobuf items.proto"
}, },
"dependencies": { "dependencies": {
"@bufbuild/protobuf": "^2.10.1", "@bufbuild/protobuf": "^2.10.2",
"react": "^19.2.1", "react": "^19.2.3",
"react-dom": "^19.2.1", "react-dom": "^19.2.3",
"react-router-dom": "^7.10.1" "react-router-dom": "^7.12.0"
}, },
"devDependencies": { "devDependencies": {
"@eslint/js": "^9.39.1", "@eslint/js": "^9.39.2",
"@types/node": "^24.10.1", "@types/node": "^24.10.7",
"@types/react": "^19.2.7", "@types/react": "^19.2.8",
"@types/react-dom": "^19.2.3", "@types/react-dom": "^19.2.3",
"@vitejs/plugin-react": "^5.1.2", "@vitejs/plugin-react": "^5.1.2",
"eslint": "^9.39.1", "eslint": "^9.39.2",
"eslint-plugin-react-hooks": "^7.0.1", "eslint-plugin-react-hooks": "^7.0.1",
"eslint-plugin-react-refresh": "^0.4.24", "eslint-plugin-react-refresh": "^0.4.26",
"globals": "^16.5.0", "globals": "^16.5.0",
"ts-proto": "^2.8.3", "ts-proto": "^2.10.1",
"typescript": "~5.9.3", "typescript": "~5.9.3",
"typescript-eslint": "^8.48.1", "typescript-eslint": "^8.53.0",
"vite": "npm:rolldown-vite@7.2.5" "vite": "npm:rolldown-vite@7.2.5"
}, },
"pnpm": { "pnpm": {
+501 -298
View File
File diff suppressed because it is too large Load Diff
+87 -26
View File
@@ -34,47 +34,108 @@
transition: color 0.2s; transition: color 0.2s;
} }
.nav-link:hover, .nav-link.active { .nav-link.active {
color: var(--accent-color); color: var(--text-color);
border-bottom: 2px solid var(--accent-color);
} }
.form-group { /* Toast Styles */
.toast-container {
position: fixed;
top: 2rem;
right: 2rem;
z-index: 1000;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
gap: 0.5rem; gap: 1rem;
margin-bottom: 1rem;
} }
.form-group label { .toast {
font-size: 0.9rem; display: flex;
align-items: center;
gap: 1rem;
padding: 1rem 1.5rem;
border-radius: 12px;
background-color: var(--secondary-bg);
border: 1px solid var(--border-color);
box-shadow: 0 10px 25px rgba(0, 0, 0, 0.3);
min-width: 300px;
animation: slideInRight 0.3s ease forwards;
}
.toast-success { border-left: 4px solid #4caf50; }
.toast-error { border-left: 4px solid #f44336; }
.toast-info { border-left: 4px solid var(--accent-color); }
.toast-icon { font-size: 1.2rem; }
.toast-message { flex: 1; font-weight: 500; }
.toast-close {
background: none;
border: none;
color: var(--text-muted); color: var(--text-muted);
cursor: pointer;
font-size: 1.5rem;
padding: 0;
line-height: 1;
} }
.btn-secondary { @keyframes slideInRight {
background-color: var(--secondary-alt-bg); from { transform: translateX(100%); opacity: 0; }
to { transform: translateX(0); opacity: 1; }
}
/* Loading Bar */
.loading-bar {
position: fixed;
top: 0;
left: 0;
height: 3px;
background: linear-gradient(90deg, var(--accent-color), #4da3ff);
z-index: 2000;
transition: width 0.3s ease;
}
/* Theme Switcher */
.theme-switcher {
display: flex;
gap: 0.5rem;
background: var(--secondary-alt-bg);
padding: 0.25rem;
border-radius: 20px;
border: 1px solid var(--border-color); border: 1px solid var(--border-color);
} }
.btn-secondary:hover { .theme-btn:not(.game-btn) {
background-color: var(--border-color); width: 32px;
} height: 32px;
border-radius: 50%;
.list-item { border: 2px solid transparent;
background-color: var(--secondary-alt-bg); cursor: pointer;
padding: 1rem;
border-radius: 8px;
margin-bottom: 1rem;
border: 1px solid var(--border-color);
transition: transform 0.2s; transition: transform 0.2s;
padding: 0;
display: flex;
align-items: center;
justify-content: center;
} }
.list-item:hover { .theme-btn:hover { transform: scale(1.1); }
transform: translateY(-2px); .theme-btn.active { border-color: var(--text-color); }
border-color: var(--accent-color);
.theme-default { background: #23283d; }
.theme-blackhole { background: #000000; }
.theme-star { background: #0a0a2a; }
.theme-ball { background: #1a1a1a; }
.theme-reflect { background: #333333; }
.theme-clouds { background: #23283d; }
.game-entry {
gap: 0.5rem;
background-color: var(--secondary-alt-bg);
margin-bottom: 10px;
border-radius: 5px;
padding: 1rem;
} }
.grid-container { .game-entry:hover {
display: grid; background-color: var(--primary-bg);
grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));
gap: 1.5rem;
} }
+127 -27
View File
@@ -1,4 +1,4 @@
import { useState, useEffect } from "react"; import { useState, useEffect, useCallback } from "react";
import { Person, PersonList as PersonListProto } from "../items"; import { Person, PersonList as PersonListProto } from "../items";
import { Login } from "./Login"; import { Login } from "./Login";
import { PersonList } from "./PersonList"; import { PersonList } from "./PersonList";
@@ -6,31 +6,85 @@ import { PersonDetails } from "./PersonDetails";
import { GameList } from "./GameList"; import { GameList } from "./GameList";
import { GameFilter } from "./GameFilter"; import { GameFilter } from "./GameFilter";
import { GameDetails } from "./GameDetails"; import { GameDetails } from "./GameDetails";
import { EditGame } from "./EditGame";
import { ShaderBackground } from "./ShaderBackground"; import { ShaderBackground } from "./ShaderBackground";
import { BrowserRouter, Routes, Route, Link } from "react-router-dom"; import { BrowserRouter, Routes, Route, NavLink } from "react-router-dom";
import "./App.css"; import "./App.css";
import { apiFetch } from "./api"; import { apiFetch } from "./api";
import { Toast } from "./Toast";
import type { ToastType } from "./Toast";
interface ToastMessage {
id: number;
message: string;
type: ToastType;
}
function App() { function App() {
const [people, setPeople] = useState<Person[]>([]); const [people, setPeople] = useState<Person[]>([]);
const [token, setToken] = useState<string>( const [token, setToken] = useState<string>(
localStorage.getItem("token") || "" localStorage.getItem("token") || ""
); );
const [theme, setTheme] = useState<string>("default"); const [theme, _setTheme] = useState<string>(
const [isShaderTheme, setIsShaderTheme] = useState(false); localStorage.getItem("theme") || "default"
);
const setTheme = (theme: string) => {
_setTheme(theme);
localStorage.setItem("theme", theme);
bc.postMessage(theme);
};
const [toasts, setToasts] = useState<ToastMessage[]>([]);
const [isLoading, setIsLoading] = useState(false);
const bc = new BroadcastChannel("theme-channel");
bc.onmessage = (ev) => {
_setTheme(ev.data as string);
};
const addToast = useCallback((message: string, type: ToastType = "info") => {
const id = Date.now();
setToasts((prev) => [...prev, { id, message, type }]);
}, []);
const removeToast = (id: number) => {
setToasts((prev) => prev.filter((t) => t.id !== id));
};
useEffect(() => { useEffect(() => {
if (theme !== "default") { if (theme !== "default" && theme !== "sakura") {
document.body.classList.remove("sakura-theme");
document.body.classList.add("shader-theme"); document.body.classList.add("shader-theme");
setIsShaderTheme(true); if (theme === "clouds" || theme === "blackhole" || theme === "ball") {
document.body.classList.add("black-theme");
return;
}
document.body.classList.remove("black-theme");
} else { } else {
document.body.classList.remove("shader-theme"); document.body.classList.remove("shader-theme");
setIsShaderTheme(false); document.body.classList.remove("black-theme");
if (theme === "sakura") {
document.body.classList.add("sakura-theme");
return;
}
document.body.classList.remove("sakura-theme");
} }
}, [theme]); }, [theme]);
useEffect(() => {
const handleUnauthorized = () => {
setToken("");
setPeople([]);
addToast("Session expired. Please log in again.", "info");
};
window.addEventListener("unauthorized", handleUnauthorized);
return () => window.removeEventListener("unauthorized", handleUnauthorized);
}, [addToast]);
const fetchPeople = () => { const fetchPeople = () => {
if (!token) return; if (!token) return;
setIsLoading(true);
apiFetch("/api") apiFetch("/api")
.then((res) => res.arrayBuffer()) .then((res) => res.arrayBuffer())
@@ -38,63 +92,109 @@ function App() {
const list = PersonListProto.decode(new Uint8Array(buffer)); const list = PersonListProto.decode(new Uint8Array(buffer));
setPeople(list.person); setPeople(list.person);
}) })
.catch((err) => console.error("Failed to fetch people:", err)); .catch((err) => {
console.error("Failed to fetch people:", err);
addToast("Failed to fetch people list", "error");
})
.finally(() => setIsLoading(false));
}; };
useEffect(() => { useEffect(() => {
if (token) {
fetchPeople(); fetchPeople();
}
// eslint-disable-next-line react-hooks/exhaustive-deps // eslint-disable-next-line react-hooks/exhaustive-deps
}, [token]); }, [token]);
const handleLogin = (newToken: string) => { const handleLogin = (newToken: string) => {
setToken(newToken); setToken(newToken);
localStorage.setItem("token", newToken); localStorage.setItem("token", newToken);
addToast("Welcome back!", "success");
}; };
const handleLogout = () => { const handleLogout = () => {
setToken(""); setToken("");
setPeople([]); setPeople([]);
localStorage.removeItem("token"); localStorage.removeItem("token");
localStorage.removeItem("isAdmin");
addToast("Logged out successfully", "info");
}; };
if (!token) { if (!token) {
return <Login onLogin={handleLogin} />; return <Login onLogin={handleLogin} />;
} }
const themes = [
{ id: "default", label: "Default", icon: "🏠" },
{ id: "blackhole", label: "Blackhole", icon: "🕳️" },
// { id: "star", label: "Star", icon: "⭐" },
// { id: "ball", label: "Ball", icon: "⚽" },
{ id: "reflect", label: "Reflect", icon: "🪞" },
// { id: "clouds", label: "Clouds", icon: "☁️" },
{ id: "sakura", label: "Sakura", icon: "🌸" },
];
return ( return (
<BrowserRouter> <BrowserRouter>
{isLoading && <div className="loading-bar" style={{ width: "50%" }} />}
<div className="toast-container">
{toasts.map((toast) => (
<Toast
key={toast.id}
message={toast.message}
type={toast.type}
onClose={() => removeToast(toast.id)}
/>
))}
</div>
<div className="card"> <div className="card">
<div className="navbar"> <div className="navbar">
<div className="nav-links"> <div className="nav-links">
<Link to="/" className="nav-link"> <NavLink to="/" className="nav-link">
People List People
</Link> </NavLink>
<Link to="/games" className="nav-link"> <NavLink to="/games" className="nav-link">
Games Games
</Link> </NavLink>
<Link to="/filter" className="nav-link"> <NavLink to="/filter" className="nav-link">
Filter Filter
</Link> </NavLink>
</div>
<div style={{ display: "flex", alignItems: "center", gap: "1.5rem" }}>
<div className="theme-switcher">
{themes.map((t) => (
<button
key={t.id}
className={`theme-btn theme-${t.id} ${
theme === t.id ? "active" : ""
}`}
onClick={() => setTheme(t.id)}
title={t.label}
>
{t.icon}
</button>
))}
</div> </div>
<button onClick={handleLogout} className="btn-secondary"> <button onClick={handleLogout} className="btn-secondary">
Logout Logout
</button> </button>
<select value={theme} onChange={(e) => setTheme(e.target.value)}>
<option value="default">Default Theme</option>
<option value="blackhole">Blackhole Theme</option>
<option value="star">Star Theme</option>
<option value="ball">Universe Ball Theme</option>
<option value="reflect">Ball Cage Theme</option>
<option value="clouds">Clouds Theme</option>
</select>
</div> </div>
{isShaderTheme && <ShaderBackground theme= {theme} />} </div>
<ShaderBackground theme={theme} />
<Routes> <Routes>
<Route path="/" element={<PersonList people={people} />} /> <Route path="/" element={<PersonList people={people} loading={isLoading} onShowToast={addToast} />} />
<Route path="/games" element={<GameList />} /> <Route path="/games" element={<GameList onShowToast={addToast} />} />
<Route path="/filter" element={<GameFilter />} /> <Route path="/filter" element={<GameFilter />} />
<Route path="/person/:name" element={<PersonDetails />} /> <Route path="/person/:name" element={<PersonDetails />} />
<Route path="/game/:title" element={<GameDetails />} /> <Route
path="/game/:title"
element={<GameDetails onShowToast={addToast} />}
/>
<Route
path="/game/:title/edit"
element={<EditGame onShowToast={addToast} />}
/>
</Routes> </Routes>
</div> </div>
</BrowserRouter> </BrowserRouter>
+403
View File
@@ -0,0 +1,403 @@
import { useState, useEffect } from "react";
import { useNavigate, useParams } from "react-router-dom";
import { Game, Source } from "../items";
import { apiFetch } from "./api";
import type { ToastType } from "./Toast";
interface Props {
onShowToast?: (message: string, type?: ToastType) => void;
}
export function EditGame({ onShowToast }: Props) {
const { title } = useParams<{ title: string }>();
const navigate = useNavigate();
const [game, setGame] = useState<Game | null>(null);
const [newTitle, setNewTitle] = useState("");
const [source, setSource] = useState<Source>(Source.STEAM);
const [minPlayers, setMinPlayers] = useState(1);
const [maxPlayers, setMaxPlayers] = useState(1);
const [price, setPrice] = useState(0);
const [remoteId, setRemoteId] = useState(0);
const [isSubmitting, setIsSubmitting] = useState(false);
const [remoteIdError, setRemoteIdError] = useState("");
const [loading, setLoading] = useState(true);
useEffect(() => {
if (!title) return;
apiFetch(`/api/game/${encodeURIComponent(title)}`)
.then(async (res) => {
if (!res.ok) throw new Error("Game not found");
return Game.decode(new Uint8Array(await res.arrayBuffer()));
})
.then((data) => {
setGame(data);
setNewTitle(data.title);
setSource(data.source);
setMinPlayers(data.minPlayers);
setMaxPlayers(data.maxPlayers);
setPrice(data.price);
setRemoteId(data.remoteId);
setLoading(false);
})
.catch((err) => {
console.error(err);
onShowToast?.("Failed to load game", "error");
setLoading(false);
});
}, [title, onShowToast]);
const handleSubmit = async (e: React.FormEvent) => {
e.preventDefault();
if (remoteId === 0) {
setRemoteIdError("Remote ID must be greater than 0");
return;
}
if (!newTitle.trim()) {
onShowToast?.("Game title is required", "error");
return;
}
setRemoteIdError("");
setIsSubmitting(true);
const updatedGame = {
title: newTitle.trim(),
source,
minPlayers,
maxPlayers,
price,
remoteId,
};
try {
const encoded = Game.encode(updatedGame).finish();
const res = await apiFetch("/api/game", {
method: "PATCH",
headers: {
"Content-Type": "application/octet-stream",
},
body: encoded,
});
if (res.ok) {
onShowToast?.("Game updated successfully!", "success");
navigate(`/game/${encodeURIComponent(newTitle.trim())}`);
} else {
onShowToast?.("Failed to update game. Please try again.", "error");
}
} catch (err) {
console.error(err);
onShowToast?.("An error occurred while updating the game.", "error");
} finally {
setIsSubmitting(false);
}
};
if (loading) return <div>Loading...</div>;
if (!game) return <div>Game not found</div>;
const formCardStyles: React.CSSProperties = {
background:
"linear-gradient(135deg, var(--secondary-bg) 0%, var(--secondary-alt-bg) 100%)",
borderRadius: "20px",
padding: "0",
maxWidth: "520px",
margin: "0 auto",
boxShadow: "0 20px 40px rgba(0, 0, 0, 0.3), 0 0 0 1px var(--border-color)",
overflow: "hidden",
};
const formHeaderStyles: React.CSSProperties = {
background:
"linear-gradient(135deg, var(--accent-color) 0%, var(--secondary-accent) 100%)",
padding: "1.5rem 2rem",
display: "flex",
alignItems: "center",
gap: "1rem",
};
const formBodyStyles: React.CSSProperties = {
padding: "2rem",
};
const sectionStyles: React.CSSProperties = {
marginBottom: "1.5rem",
};
const sectionTitleStyles: React.CSSProperties = {
fontSize: "0.75rem",
textTransform: "uppercase",
letterSpacing: "0.1em",
color: "var(--text-muted)",
marginBottom: "1rem",
display: "flex",
alignItems: "center",
gap: "0.5rem",
};
const inputGroupStyles: React.CSSProperties = {
position: "relative",
marginBottom: "1rem",
};
const labelStyles: React.CSSProperties = {
fontSize: "0.85rem",
color: "var(--text-muted)",
marginBottom: "0.5rem",
display: "block",
fontWeight: 500,
};
const inputStyles: React.CSSProperties = {
width: "100%",
padding: "0.875rem 1rem",
backgroundColor: "var(--tertiary-bg)",
border: "2px solid var(--border-color)",
borderRadius: "12px",
color: "var(--text-color)",
fontSize: "1rem",
transition: "all 0.2s ease",
boxSizing: "border-box",
};
const gridStyles: React.CSSProperties = {
display: "grid",
gridTemplateColumns: "1fr 1fr",
gap: "1rem",
};
const dividerStyles: React.CSSProperties = {
height: "1px",
background:
"linear-gradient(90deg, transparent, var(--border-color), transparent)",
margin: "1.5rem 0",
};
const buttonStyles: React.CSSProperties = {
padding: "1rem",
background:
"linear-gradient(135deg, var(--accent-color) 0%, var(--secondary-accent) 100%)",
border: "none",
borderRadius: "12px",
color: "white",
fontSize: "1rem",
fontWeight: 600,
cursor: isSubmitting ? "not-allowed" : "pointer",
transition: "all 0.3s ease",
display: "flex",
alignItems: "center",
justifyContent: "center",
gap: "0.5rem",
opacity: isSubmitting ? 0.7 : 1,
transform: isSubmitting ? "none" : undefined,
};
const cancelStyles: React.CSSProperties = {
...buttonStyles,
background: "var(--tertiary-bg)",
color: "var(--text-color)",
border: "2px solid var(--border-color)",
};
return (
<div>
<div style={formCardStyles}>
<div style={formHeaderStyles}>
<div
style={{
width: "48px",
height: "48px",
borderRadius: "14px",
backgroundColor: "rgba(255, 255, 255, 0.2)",
display: "flex",
alignItems: "center",
justifyContent: "center",
fontSize: "1.5rem",
}}
>
</div>
<div>
<h2
style={{
margin: 0,
fontSize: "1.5rem",
fontWeight: 700,
color: "white",
}}
>
Edit Game
</h2>
<p
style={{
margin: 0,
fontSize: "0.9rem",
color: "rgba(255, 255, 255, 0.8)",
}}
>
Update game information
</p>
</div>
</div>
<div style={formBodyStyles}>
<form onSubmit={handleSubmit}>
<div style={sectionStyles}>
<div style={sectionTitleStyles}>
<span>📝</span>
Basic Information
</div>
<div style={inputGroupStyles}>
<label style={labelStyles}>Game Title</label>
<input
type="text"
value={newTitle}
onChange={(e) => setNewTitle(e.target.value)}
required
placeholder="Enter game title..."
style={inputStyles}
className="add-game-input"
/>
</div>
<div style={inputGroupStyles}>
<label style={labelStyles}>Platform Source</label>
<select
value={source}
onChange={(e) => setSource(Number(e.target.value))}
style={{
...inputStyles,
cursor: "pointer",
appearance: "none",
backgroundImage: `url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' fill='%23a0a0a0' viewBox='0 0 16 16'%3E%3Cpath d='M8 11L3 6h10l-5 5z'/%3E%3C/svg%3E")`,
backgroundRepeat: "no-repeat",
backgroundPosition: "right 1rem center",
paddingRight: "2.5rem",
}}
className="add-game-input"
>
<option value={Source.STEAM}>🎮 Steam</option>
<option value={Source.ROBLOX}>🟢 Roblox</option>
</select>
</div>
</div>
<div style={dividerStyles}></div>
<div style={sectionStyles}>
<div style={sectionTitleStyles}>
<span>👥</span>
Player Count
</div>
<div style={gridStyles}>
<div style={inputGroupStyles}>
<label style={labelStyles}>Minimum Players</label>
<input
type="number"
value={minPlayers}
onChange={(e) => setMinPlayers(Number(e.target.value))}
min="1"
style={inputStyles}
className="add-game-input"
/>
</div>
<div style={inputGroupStyles}>
<label style={labelStyles}>Maximum Players</label>
<input
type="number"
value={maxPlayers}
onChange={(e) => setMaxPlayers(Number(e.target.value))}
min="1"
style={inputStyles}
className="add-game-input"
/>
</div>
</div>
</div>
<div style={dividerStyles}></div>
<div style={sectionStyles}>
<div style={sectionTitleStyles}>
<span>💰</span>
Additional Details
</div>
<div style={gridStyles}>
<div style={inputGroupStyles}>
<label style={labelStyles}>Price ()</label>
<input
type="number"
value={price}
onChange={(e) => setPrice(Math.ceil(Number(e.target.value.replace(',', '.'))))}
min="0"
step="1"
style={inputStyles}
className="add-game-input"
/>
</div>
<div style={inputGroupStyles}>
<label style={labelStyles}>Remote ID</label>
<input
type="number"
value={remoteId}
onChange={(e) => {
setRemoteId(Number(e.target.value));
setRemoteIdError("");
}}
min="0"
style={{
...inputStyles,
borderColor: remoteIdError ? "#f44336" : undefined,
}}
className="add-game-input"
/>
{remoteIdError && (
<div
style={{
color: "#f44336",
fontSize: "0.75rem",
marginTop: "0.25rem",
}}
>
{remoteIdError}
</div>
)}
</div>
</div>
</div>
<div style={gridStyles}>
<button
type="button"
onClick={() => navigate(`/game/${encodeURIComponent(game.title)}`)}
disabled={isSubmitting}
style={cancelStyles}
>
Cancel
</button>
<button
type="submit"
disabled={isSubmitting}
style={buttonStyles}
>
{isSubmitting ? (
<>Updating...</>
) : (
<>
<span style={{ fontSize: "1.1rem" }}>💾</span>
Save Changes
</>
)}
</button>
</div>
</form>
</div>
</div>
</div>
);
}
+48
View File
@@ -0,0 +1,48 @@
import { Component, type ErrorInfo, type ReactNode } from "react";
import { ErrorState } from "./components/EmptyState";
interface Props {
children: ReactNode;
fallback?: ReactNode;
}
interface State {
hasError: boolean;
error: Error | null;
}
export class ErrorBoundary extends Component<Props, State> {
public state: State = {
hasError: false,
error: null
};
public static getDerivedStateFromError(error: Error): State {
return { hasError: true, error };
}
public componentDidCatch(error: Error, errorInfo: ErrorInfo) {
console.error("ErrorBoundary caught an error:", error, errorInfo);
}
public handleReset = () => {
this.setState({ hasError: false, error: null });
};
public render() {
if (this.state.hasError) {
if (this.props.fallback) {
return this.props.fallback;
}
return (
<ErrorState
message={this.state.error?.message || "An unexpected error occurred"}
onRetry={this.handleReset}
/>
);
}
return this.props.children;
}
}
+91 -18
View File
@@ -1,33 +1,74 @@
import { useState, useEffect } from "react"; import { useState, useEffect } from "react";
import { useParams } from "react-router-dom"; import { useParams, useNavigate } from "react-router-dom";
import { Game, Source } from "../items"; import { Game, Source } from "../items";
import { apiFetch } from "./api"; import { apiFetch, get_is_admin } from "./api";
import { LoadingState, EmptyState, ErrorState } from "./components/EmptyState";
export function GameDetails() { interface Props {
onShowToast?: (message: string, type?: "success" | "error" | "info") => void;
}
export function GameDetails({ onShowToast }: Props) {
const { title } = useParams<{ title: string }>(); const { title } = useParams<{ title: string }>();
const navigate = useNavigate();
const [game, setGame] = useState<Game | null>(null); const [game, setGame] = useState<Game | null>(null);
const [loading, setLoading] = useState(true); const [loading, setLoading] = useState(!!title);
const [error, setError] = useState<string | null>(title ? null : "Game title is missing");
const isAdmin = get_is_admin();
useEffect(() => { useEffect(() => {
if (!title) return; if (!title) return;
apiFetch(`/api/game/${encodeURIComponent(title)}`) (async () => {
.then(async (res) => { try {
if (!res.ok) throw new Error("Game not found"); const res = await apiFetch(`/api/game/${encodeURIComponent(title)}`);
return Game.decode(new Uint8Array(await res.arrayBuffer())); if (!res.ok) {
}) if (res.status === 404) {
.then((data) => { throw new Error("Game not found");
setGame(data); }
setLoading(false); throw new Error("Failed to load game");
}) }
.catch((err) => { const buffer = await res.arrayBuffer();
setGame(Game.decode(new Uint8Array(buffer)));
} catch (err) {
console.error(err); console.error(err);
setError(err instanceof Error ? err.message : "Failed to load game");
} finally {
setLoading(false); setLoading(false);
}); }
})();
}, [title]); }, [title]);
if (loading) return <div>Loading...</div>; const handleDelete = async () => {
if (!game) return <div>Game not found</div>; if (
!confirm(
`Are you sure you want to delete "${game?.title}"? This action cannot be undone.`
)
) {
return;
}
try {
const res = await apiFetch(`/api/game/${encodeURIComponent(title || "")}`, {
method: "DELETE",
});
if (res.ok) {
onShowToast?.(`"${game?.title}" deleted successfully`, "success");
navigate("/games");
} else {
onShowToast?.("Failed to delete game", "error");
}
} catch (err) {
console.error(err);
onShowToast?.("An error occurred while deleting the game", "error");
}
};
if (loading) return <LoadingState message="Loading game details..." />;
if (error) return <ErrorState message={error} onRetry={() => navigate(0)} />;
if (!game) return <EmptyState icon="🎮" title="Game not found" description="This game doesn't exist or has been deleted" />;
const getExternalLink = () => { const getExternalLink = () => {
if (game.source === Source.STEAM) { if (game.source === Source.STEAM) {
@@ -40,7 +81,39 @@ export function GameDetails() {
return ( return (
<div className="card" style={{ maxWidth: "600px", margin: "0 auto" }}> <div className="card" style={{ maxWidth: "600px", margin: "0 auto" }}>
<h2>{game.title}</h2> <div
style={{
display: "flex",
justifyContent: "space-between",
alignItems: "center",
marginBottom: "1rem",
}}
>
<h2 style={{ margin: 0 }}>{game.title}</h2>
{isAdmin && (
<div style={{ display: "flex", gap: "0.5rem" }}>
<button
onClick={() => navigate(`/game/${encodeURIComponent(game.title)}/edit`)}
className="btn-secondary"
style={{ padding: "0.5rem 1rem", fontSize: "0.9rem" }}
>
Edit
</button>
<button
onClick={handleDelete}
className="btn-primary"
style={{
padding: "0.5rem 1rem",
fontSize: "0.9rem",
background: "#f44336",
border: "none",
}}
>
🗑 Delete
</button>
</div>
)}
</div>
<div style={{ display: "grid", gap: "1rem", marginTop: "1rem" }}> <div style={{ display: "grid", gap: "1rem", marginTop: "1rem" }}>
<div> <div>
<strong>Source:</strong>{" "} <strong>Source:</strong>{" "}
+92
View File
@@ -0,0 +1,92 @@
.gamefilter-entry {
border-radius: 5px;
border: 1px solid var(--border-color);
background-color: var(--secondary-alt-bg);
margin-bottom: 10px;
padding: 10px;
width: 30%;
text-align: center;
user-select: none;
}
.gamefilter-entry:hover {
background-color: var(--primary-bg);
}
.filter-controls {
background-color: var(--secondary-alt-bg);
border-radius: 8px;
padding: 1.5rem;
margin-bottom: 2rem;
border: 1px solid var(--border-color);
}
.filter-controls h3 {
margin: 0 0 1rem 0;
font-size: 1.1rem;
color: var(--text-color);
}
.filter-groups {
display: flex;
flex-wrap: wrap;
gap: 1.5rem;
}
.filter-group {
display: flex;
flex-direction: column;
gap: 0.5rem;
}
.filter-group label {
font-size: 0.9rem;
color: var(--text-color);
font-weight: 500;
}
.checkbox-wrapper {
display: flex;
align-items: center;
gap: 0.5rem;
cursor: pointer;
}
.checkbox-wrapper input[type="checkbox"] {
width: 18px;
height: 18px;
cursor: pointer;
accent-color: var(--accent-color);
}
.checkbox-wrapper span {
font-size: 0.9rem;
color: var(--text-color);
}
.price-input {
padding: 0.5rem;
border: 1px solid var(--border-color);
border-radius: 4px;
background-color: var(--primary-bg);
color: var(--text-color);
width: 120px;
font-size: 0.9rem;
}
.price-input:focus {
outline: none;
border-color: var(--accent-color);
}
.tooltip-icon {
display: inline-block;
margin-left: 0.3rem;
cursor: help;
font-size: 0.9rem;
opacity: 0.6;
}
.tooltip-icon:hover {
opacity: 1;
}
+82 -171
View File
@@ -1,102 +1,44 @@
import { useState, useEffect } from "react"; import { useState, useEffect } from "react";
import { import { Person, PersonList as PersonListProto } from "../items";
Person,
PersonList as PersonListProto,
Game as GameProto,
} from "../items";
import { apiFetch } from "./api"; import { apiFetch } from "./api";
import { Link } from "react-router-dom"; import "./GameFilter.css";
import { GameImage } from "./GameImage"; import { useGameFilter } from "./hooks/useGameFilter";
import { PersonSelector } from "./components/PersonSelector";
import { FilteredGamesList } from "./components/FilteredGamesList";
import { LoadingState } from "./components/EmptyState";
export function GameFilter() { export function GameFilter() {
const [people, setPeople] = useState<Person[]>([]); const [people, setPeople] = useState<Person[]>([]);
const [loading, setLoading] = useState(true);
const [selectedPeople, setSelectedPeople] = useState<Set<string>>(new Set()); const [selectedPeople, setSelectedPeople] = useState<Set<string>>(new Set());
const [filteredGames, setFilteredGames] = useState<string[]>([]); const [freeGamesOnly, setFreeGamesOnly] = useState(false);
const [gameToPositive, setGameToPositive] = useState< const [maxPrice, setMaxPrice] = useState<number | null>(null);
Map<string, Set<string>> const [ownershipMode, setOwnershipMode] = useState(false);
>(new Map());
// eslint-disable-next-line @typescript-eslint/no-unused-vars const { filteredGames, gameToPositive, games } = useGameFilter(
const [metaData, _setMetaData] = useState<{ [key: string]: GameProto }>({}); people,
selectedPeople,
freeGamesOnly,
maxPrice,
ownershipMode
);
useEffect(() => { useEffect(() => {
apiFetch("/api") (async () => {
.then((res) => res.arrayBuffer()) try {
.then((buffer) => { const res = await apiFetch("/api");
const buffer = await res.arrayBuffer();
const list = PersonListProto.decode(new Uint8Array(buffer)); const list = PersonListProto.decode(new Uint8Array(buffer));
setPeople(list.person); setPeople(list.person);
}) } catch (err) {
.catch((err) => console.error("Failed to fetch people:", err)); console.error("Failed to fetch people:", err);
} finally {
setLoading(false);
}
})();
}, []); }, []);
useEffect(() => { if (loading) return <LoadingState message="Loading people..." />;
if (selectedPeople.size === 0) {
// eslint-disable-next-line react-hooks/set-state-in-effect
setFilteredGames([]);
return;
}
// Get all games where ALL selected people have "Would Play"
const selectedPersons = people.filter((p) => selectedPeople.has(p.name));
if (selectedPersons.length === 0) {
setFilteredGames([]);
return;
}
// Create a map of game -> set of people who would not play it
const gameToNegative = new Map<string, Set<string>>();
const gameToPositiveOpinion = new Map<string, Set<string>>();
selectedPersons.forEach((person) => {
person.opinion.forEach((op) => {
if (!gameToNegative.has(op.title)) {
gameToNegative.set(op.title, new Set());
}
if (!gameToPositiveOpinion.has(op.title)) {
gameToPositiveOpinion.set(op.title, new Set());
}
if (!op.wouldPlay) {
gameToNegative.get(op.title)!.add(person.name);
}
if (op.wouldPlay) {
gameToPositiveOpinion.get(op.title)!.add(person.name);
}
});
});
setGameToPositive(gameToPositiveOpinion);
// Filter games where ALL selected people would play
const game_titles = Array.from(gameToNegative.entries())
.filter(([, players]) => players.size === 0)
.map(([game]) => game);
const games = game_titles.map(async (title) => {
if (metaData[title]) {
console.log("returned cached metadata");
return metaData[title];
}
return await apiFetch(`/api/game/${encodeURIComponent(title)}`)
.then((res) => res.arrayBuffer())
.then((buffer) => {
const game = GameProto.decode(new Uint8Array(buffer)) as GameProto;
metaData[title] = game;
return game;
})
.catch((err) => console.error("Failed to fetch game:", err));
});
Promise.all(games).then((games) => {
const filteredGames = games.filter((g) => {
const game = g as GameProto;
return (
game.maxPlayers >= selectedPeople.size &&
game.minPlayers <= selectedPeople.size
);
});
setFilteredGames(filteredGames.map((g) => (g as GameProto).title));
});
}, [selectedPeople, people, metaData]);
const togglePerson = (name: string) => { const togglePerson = (name: string) => {
const newSelected = new Set(selectedPeople); const newSelected = new Set(selectedPeople);
@@ -115,100 +57,69 @@ export function GameFilter() {
Select multiple people to find games that everyone would play Select multiple people to find games that everyone would play
</p> </p>
<div style={{ marginBottom: "3rem" }}> <PersonSelector
<h3>Select People</h3> people={people}
<div className="grid-container"> selectedPeople={selectedPeople}
{people.map((person) => ( onTogglePerson={togglePerson}
<div />
key={person.name}
className="list-item" <div className="filter-controls">
style={{ <h3>Additional Filters</h3>
borderColor: selectedPeople.has(person.name) <div className="filter-groups">
? "var(--accent-color)" <div className="filter-group">
: "var(--border-color)", <label className="checkbox-wrapper">
cursor: "pointer",
}}
onClick={() => togglePerson(person.name)}
>
<div
style={{ display: "flex", alignItems: "center", gap: "0.5rem" }}
>
<input <input
type="checkbox" type="checkbox"
checked={selectedPeople.has(person.name)} checked={freeGamesOnly}
onChange={() => togglePerson(person.name)} onChange={(e) => setFreeGamesOnly(e.target.checked)}
style={{ cursor: "pointer" }}
/> />
<strong>{person.name}</strong> <span>Free games only</span>
</label>
</div> </div>
<div
style={{ <div className="filter-group">
fontSize: "0.9em", <label htmlFor="max-price">Maximum price ()</label>
color: "var(--text-muted)", <input
marginTop: "0.5rem", id="max-price"
type="number"
className="price-input"
min="0"
placeholder="No limit"
value={maxPrice ?? ""}
onChange={(e) => {
const value = e.target.value;
setMaxPrice(value === "" ? null : parseInt(value, 10));
}} }}
/>
</div>
<div className="filter-group">
<label className="checkbox-wrapper">
<input
type="checkbox"
checked={ownershipMode}
onChange={(e) => setOwnershipMode(e.target.checked)}
/>
<span>
Ownership mode
<span
className="tooltip-icon"
title="For paid games, only show if ALL selected people have marked it as wouldPlay"
> >
{person.opinion.length} opinion(s) ?
</span>
</span>
</label>
</div> </div>
</div> </div>
))}
</div>
</div> </div>
{selectedPeople.size > 0 && ( <FilteredGamesList
<div> filteredGames={filteredGames}
<h3>Games Everyone Would Play ({filteredGames.length})</h3> gameToPositive={gameToPositive}
{filteredGames.length > 0 ? ( selectedPeopleCount={selectedPeople.size}
<ul className="grid-container"> games={games}
{filteredGames.map((game) => ( />
<Link
to={`/game/${encodeURIComponent(game)}`}
key={game}
className="list-item"
style={{
textDecoration: "none",
color: "inherit",
display: "flex",
justifyContent: "space-between",
alignItems: "center",
}}
>
<div>
<strong>{game}</strong>
<div
style={{
fontSize: "0.9em",
color: "#4caf50",
marginTop: "0.5rem",
}}
>
{gameToPositive.get(game)!.size} selected would play
</div>
{selectedPeople.size - gameToPositive.get(game)!.size >
0 && (
<div
style={{
fontSize: "0.9em",
color: "#d4d400",
marginTop: "0.3rem",
}}
>
? {selectedPeople.size - gameToPositive.get(game)!.size}{" "}
{(selectedPeople.size - gameToPositive.get(game)!.size) > 1 ? "are" : "is"} neutral
</div>
)}
</div>
<GameImage game={game} />
</Link>
))}
</ul>
) : (
<p style={{ color: "var(--text-muted)", fontStyle: "italic" }}>
No games found where all selected people would play
</p>
)}
</div>
)}
</div> </div>
); );
} }
+261 -81
View File
@@ -1,4 +1,4 @@
import { useState, useEffect } from "react"; import { useState, useEffect, useMemo, useCallback } from "react";
import { import {
Game, Game,
Source, Source,
@@ -11,8 +11,14 @@ import {
import { Link, useLocation } from "react-router-dom"; import { Link, useLocation } from "react-router-dom";
import { apiFetch, get_auth_status } from "./api"; import { apiFetch, get_auth_status } from "./api";
import { GameImage } from "./GameImage"; import { GameImage } from "./GameImage";
import type { ToastType } from "./Toast";
import { EmptyState } from "./components/EmptyState";
export function GameList() { interface Props {
onShowToast?: (message: string, type?: ToastType) => void;
}
export function GameList({ onShowToast }: Props) {
const [games, setGames] = useState<Game[]>([]); const [games, setGames] = useState<Game[]>([]);
const [title, setTitle] = useState(""); const [title, setTitle] = useState("");
const [source, setSource] = useState<Source>(Source.STEAM); const [source, setSource] = useState<Source>(Source.STEAM);
@@ -20,11 +26,23 @@ export function GameList() {
const [maxPlayers, setMaxPlayers] = useState(1); const [maxPlayers, setMaxPlayers] = useState(1);
const [price, setPrice] = useState(0); const [price, setPrice] = useState(0);
const [remoteId, setRemoteId] = useState(0); const [remoteId, setRemoteId] = useState(0);
const [message, setMessage] = useState("");
const [isSubmitting, setIsSubmitting] = useState(false); const [isSubmitting, setIsSubmitting] = useState(false);
const [titleError, setTitleError] = useState("");
const [playersError, setPlayersError] = useState("");
const [remoteIdError, setRemoteIdError] = useState("");
const [opinions, setOpinions] = useState<Opinion[]>([]); const [opinions, setOpinions] = useState<Opinion[]>([]);
const [gamesLoading, setGamesLoading] = useState(true);
const [searchQuery, setSearchQuery] = useState("");
const fetchGames = () => { const filteredGames = useMemo(() => {
if (!searchQuery) return games;
return games.filter(game =>
game.title.toLowerCase().includes(searchQuery.toLowerCase())
);
}, [games, searchQuery]);
const fetchGames = useCallback(() => {
setGamesLoading(true);
apiFetch("/api/games") apiFetch("/api/games")
.then((res) => res.arrayBuffer()) .then((res) => res.arrayBuffer())
.then((buffer) => { .then((buffer) => {
@@ -33,10 +51,15 @@ export function GameList() {
setGames(list.games); setGames(list.games);
} catch (e) { } catch (e) {
console.error("Failed to decode games:", e); console.error("Failed to decode games:", e);
onShowToast?.("Failed to load games", "error");
} }
}) })
.catch(console.error); .catch((err) => {
}; console.error(err);
onShowToast?.("Failed to fetch games", "error");
})
.finally(() => setGamesLoading(false));
}, [onShowToast]);
useEffect(() => { useEffect(() => {
get_auth_status().then((user) => { get_auth_status().then((user) => {
@@ -71,13 +94,42 @@ export function GameList() {
useEffect(() => { useEffect(() => {
fetchGames(); fetchGames();
}, []); }, [fetchGames]);
const handleSubmit = async (e: React.FormEvent) => { const handleSubmit = async (e: React.FormEvent) => {
e.preventDefault(); e.preventDefault();
setTitleError("");
setPlayersError("");
setRemoteIdError("");
let hasErrors = false;
if (!title.trim()) {
setTitleError("Game title is required");
hasErrors = true;
}
if (minPlayers < 1) {
setPlayersError("Minimum players must be at least 1");
hasErrors = true;
}
if (maxPlayers < minPlayers) {
setPlayersError("Maximum players cannot be less than minimum players");
hasErrors = true;
}
if (remoteId === 0) {
setRemoteIdError("Remote ID must be greater than 0");
hasErrors = true;
}
if (hasErrors) return;
setIsSubmitting(true); setIsSubmitting(true);
const game = { const game = {
title, title: title.trim(),
source, source,
minPlayers, minPlayers,
maxPlayers, maxPlayers,
@@ -96,25 +148,30 @@ export function GameList() {
}); });
if (res.ok) { if (res.ok) {
setMessage("success"); onShowToast?.("Game added successfully!", "success");
clearForm();
fetchGames();
} else {
const errorText = await res.text();
onShowToast?.(errorText || "Failed to add game. Please try again.", "error");
}
} catch (err) {
console.error(err);
onShowToast?.("An error occurred while adding the game.", "error");
} finally {
setIsSubmitting(false);
}
};
const clearForm = () => {
setTitle(""); setTitle("");
setMinPlayers(1); setMinPlayers(1);
setMaxPlayers(1); setMaxPlayers(1);
setPrice(0); setPrice(0);
setRemoteId(0); setRemoteId(0);
fetchGames(); setTitleError("");
setTimeout(() => setMessage(""), 3000); setPlayersError("");
} else { setRemoteIdError("");
setMessage("error");
setTimeout(() => setMessage(""), 3000);
}
} catch (err) {
console.error(err);
setMessage("error");
setTimeout(() => setMessage(""), 3000);
} finally {
setIsSubmitting(false);
}
}; };
const formCardStyles: React.CSSProperties = { const formCardStyles: React.CSSProperties = {
@@ -128,7 +185,8 @@ export function GameList() {
}; };
const formHeaderStyles: React.CSSProperties = { const formHeaderStyles: React.CSSProperties = {
background: "linear-gradient(135deg, var(--accent-color) 0%, var(--secondary-accent) 100%)", background:
"linear-gradient(135deg, var(--accent-color) 0%, var(--secondary-accent) 100%)",
padding: "1.5rem 2rem", padding: "1.5rem 2rem",
display: "flex", display: "flex",
alignItems: "center", alignItems: "center",
@@ -195,7 +253,8 @@ export function GameList() {
const submitButtonStyles: React.CSSProperties = { const submitButtonStyles: React.CSSProperties = {
width: "100%", width: "100%",
padding: "1rem", padding: "1rem",
background: "linear-gradient(135deg, var(--accent-color) 0%, var(--secondary-accent) 100%)", background:
"linear-gradient(135deg, var(--accent-color) 0%, var(--secondary-accent) 100%)",
border: "none", border: "none",
borderRadius: "12px", borderRadius: "12px",
color: "white", color: "white",
@@ -211,26 +270,6 @@ export function GameList() {
transform: isSubmitting ? "none" : undefined, transform: isSubmitting ? "none" : undefined,
}; };
const messageStyles: React.CSSProperties = {
padding: "1rem",
borderRadius: "12px",
marginBottom: "1.5rem",
display: "flex",
alignItems: "center",
gap: "0.75rem",
animation: "slideIn 0.3s ease",
backgroundColor:
message === "success"
? "rgba(76, 175, 80, 0.15)"
: "rgba(244, 67, 54, 0.15)",
border: `1px solid ${
message === "success"
? "rgba(76, 175, 80, 0.3)"
: "rgba(244, 67, 54, 0.3)"
}`,
color: message === "success" ? "#4caf50" : "#f44336",
};
return ( return (
<div> <div>
<style> <style>
@@ -303,19 +342,6 @@ export function GameList() {
</div> </div>
<div style={formBodyStyles}> <div style={formBodyStyles}>
{message && (
<div style={messageStyles}>
<span style={{ fontSize: "1.2rem" }}>
{message === "success" ? "✓" : "✕"}
</span>
<span style={{ fontWeight: 500 }}>
{message === "success"
? "Game added successfully!"
: "Failed to add game. Please try again."}
</span>
</div>
)}
<form onSubmit={handleSubmit}> <form onSubmit={handleSubmit}>
{/* Basic Info Section */} {/* Basic Info Section */}
<div style={sectionStyles}> <div style={sectionStyles}>
@@ -329,12 +355,23 @@ export function GameList() {
<input <input
type="text" type="text"
value={title} value={title}
onChange={(e) => setTitle(e.target.value)} onChange={(e) => {
setTitle(e.target.value);
if (titleError) setTitleError("");
}}
required required
placeholder="Enter game title..." placeholder="Enter game title..."
style={inputStyles} style={{
...inputStyles,
borderColor: titleError ? "#f44336" : undefined
}}
className="add-game-input" className="add-game-input"
/> />
{titleError && (
<div style={{ color: "#f44336", fontSize: "0.75rem", marginTop: "0.25rem" }}>
{titleError}
</div>
)}
</div> </div>
<div style={inputGroupStyles}> <div style={inputGroupStyles}>
@@ -374,9 +411,15 @@ export function GameList() {
<input <input
type="number" type="number"
value={minPlayers} value={minPlayers}
onChange={(e) => setMinPlayers(Number(e.target.value))} onChange={(e) => {
setMinPlayers(Number(e.target.value));
if (playersError) setPlayersError("");
}}
min="1" min="1"
style={inputStyles} style={{
...inputStyles,
borderColor: playersError ? "#f44336" : undefined
}}
className="add-game-input" className="add-game-input"
/> />
</div> </div>
@@ -385,13 +428,24 @@ export function GameList() {
<input <input
type="number" type="number"
value={maxPlayers} value={maxPlayers}
onChange={(e) => setMaxPlayers(Number(e.target.value))} onChange={(e) => {
setMaxPlayers(Number(e.target.value));
if (playersError) setPlayersError("");
}}
min="1" min="1"
style={inputStyles} style={{
...inputStyles,
borderColor: playersError ? "#f44336" : undefined
}}
className="add-game-input" className="add-game-input"
/> />
</div> </div>
</div> </div>
{playersError && (
<div style={{ color: "#f44336", fontSize: "0.75rem", marginTop: "0.25rem" }}>
{playersError}
</div>
)}
</div> </div>
<div style={dividerStyles}></div> <div style={dividerStyles}></div>
@@ -409,9 +463,9 @@ export function GameList() {
<input <input
type="number" type="number"
value={price} value={price}
onChange={(e) => setPrice(Number(e.target.value))} onChange={(e) => setPrice(Math.ceil(Number(e.target.value.replace(',', '.'))))}
min="0" min="0"
step="0.01" step="1"
style={inputStyles} style={inputStyles}
className="add-game-input" className="add-game-input"
/> />
@@ -421,15 +475,45 @@ export function GameList() {
<input <input
type="number" type="number"
value={remoteId} value={remoteId}
onChange={(e) => setRemoteId(Number(e.target.value))} onChange={(e) => {
setRemoteId(Number(e.target.value));
setRemoteIdError("");
}}
min="0" min="0"
style={inputStyles} style={{
...inputStyles,
borderColor: remoteIdError ? "#f44336" : undefined,
}}
className="add-game-input" className="add-game-input"
/> />
{remoteIdError && (
<div
style={{
color: "#f44336",
fontSize: "0.75rem",
marginTop: "0.25rem",
}}
>
{remoteIdError}
</div>
)}
</div> </div>
</div> </div>
</div> </div>
<div style={{ display: "flex", gap: "0.75rem", marginTop: "1rem" }}>
<button
type="button"
onClick={clearForm}
disabled={isSubmitting || (!title && minPlayers === 1 && maxPlayers === 1 && price === 0 && remoteId === 0)}
style={{
...submitButtonStyles,
background: "var(--tertiary-bg)",
flex: 1
}}
>
Clear
</button>
<button <button
type="submit" type="submit"
disabled={isSubmitting} disabled={isSubmitting}
@@ -457,6 +541,7 @@ export function GameList() {
</> </>
)} )}
</button> </button>
</div>
</form> </form>
</div> </div>
</div> </div>
@@ -470,16 +555,89 @@ export function GameList() {
</style> </style>
<div style={{ marginTop: "3rem" }}> <div style={{ marginTop: "3rem" }}>
<div
style={{
display: "flex",
justifyContent: "space-between",
alignItems: "center",
marginBottom: "1rem",
flexWrap: "wrap",
gap: "1rem"
}}
>
<h3 <h3
id="existing-games" id="existing-games"
style={{ style={{
scrollMarginBottom: "0", scrollMarginBottom: "0",
margin: 0
}} }}
> >
Existing Games Existing Games {filteredGames.length > 0 && <span style={{ fontSize: "0.7em", color: "var(--text-muted)" }}>({filteredGames.length})</span>}
</h3> </h3>
<input
type="text"
placeholder="🔍 Search games..."
value={searchQuery}
onChange={(e) => setSearchQuery(e.target.value)}
style={{
padding: "0.5rem 1rem",
fontSize: "0.9rem",
minWidth: "200px"
}}
/>
</div>
{gamesLoading ? (
<div className="grid-container">
{Array.from({ length: 6 }).map((_, i) => (
<div
key={i}
style={{
backgroundColor: "var(--secondary-alt-bg)",
border: "1px solid var(--border-color)",
borderRadius: "5px",
padding: "1rem",
minHeight: "100px",
animation: "shimmer 1.5s infinite"
}}
>
<div
style={{
width: "70%",
height: "20px",
backgroundColor: "var(--tertiary-bg)",
borderRadius: "4px",
marginBottom: "0.75rem",
animation: "shimmer 1.5s infinite"
}}
></div>
<div
style={{
width: "40%",
height: "40px",
backgroundColor: "var(--tertiary-bg)",
borderRadius: "8px",
marginTop: "0.5rem",
animation: "shimmer 1.5s infinite 0.2s"
}}
></div>
</div>
))}
<style>{`
@keyframes shimmer {
0%, 100% { opacity: 0.5; }
50% { opacity: 1; }
}
`}</style>
</div>
) : filteredGames.length === 0 ? (
<EmptyState
icon="🎮"
title={searchQuery ? "No games found" : "No games yet"}
description={searchQuery ? "Try a different search term" : "Add your first game to get started"}
/>
) : (
<ul className="grid-container"> <ul className="grid-container">
{games.map((game) => { {filteredGames.map((game) => {
const opinion = opinions.find((op) => op.title === game.title); const opinion = opinions.find((op) => op.title === game.title);
function handleOpinion(title: string, number: number): void { function handleOpinion(title: string, number: number): void {
if (number == 2) { if (number == 2) {
@@ -489,7 +647,7 @@ export function GameList() {
"Content-Type": "application/octet-stream", "Content-Type": "application/octet-stream",
}, },
body: RemoveOpinionRequest.encode( body: RemoveOpinionRequest.encode(
AddOpinionRequest.create({ RemoveOpinionRequest.create({
gameTitle: title, gameTitle: title,
}) })
).finish(), ).finish(),
@@ -501,9 +659,11 @@ export function GameList() {
); );
setOpinions(response.opinion); setOpinions(response.opinion);
onShowToast?.(`Updated opinion for ${title}`, "info");
}) })
.catch((err) => { .catch((err) => {
console.error(err); console.error(err);
onShowToast?.("Failed to update opinion", "error");
}); });
return; return;
} }
@@ -527,9 +687,11 @@ export function GameList() {
); );
setOpinions(response.opinion); setOpinions(response.opinion);
onShowToast?.(`Updated opinion for ${title}`, "info");
}) })
.catch((err) => { .catch((err) => {
console.error(err); console.error(err);
onShowToast?.("Failed to update opinion", "error");
}); });
} }
@@ -556,7 +718,7 @@ export function GameList() {
? opinion.wouldPlay ? opinion.wouldPlay
? "#4caf50" // would play (green) ? "#4caf50" // would play (green)
: "#f44336" // would not play (red) : "#f44336" // would not play (red)
: "#191f2e", // no opinion (bg-2) : "#ffff00", // no opinion (yellow)
}} }}
> >
<strong <strong
@@ -565,7 +727,7 @@ export function GameList() {
? opinion.wouldPlay ? opinion.wouldPlay
? "0 0 10px #4caf50" // would play (green) ? "0 0 10px #4caf50" // would play (green)
: "0 0 10px #f44336" // would not play (red) : "0 0 10px #f44336" // would not play (red)
: "none", // no opinion (bg-2) : "0 0 10px #ffff00", // no opinion (yellow)
}} }}
> >
{game.title} {game.title}
@@ -582,36 +744,54 @@ export function GameList() {
> >
<button <button
onClick={() => handleOpinion(game.title, 1)} onClick={() => handleOpinion(game.title, 1)}
className="theme-btn game-btn"
style={{ style={{
width: "50%", width: "33%",
borderColor: "#4caf50", borderColor: opinion?.wouldPlay
? "#4caf50"
: "transparent",
background: "rgba(76, 175, 80, 0.1)",
fontSize: "1.2rem",
}} }}
title="Would Play"
> >
Would Play 👍
</button> </button>
<button <button
onClick={() => handleOpinion(game.title, 2)} onClick={() => handleOpinion(game.title, 2)}
className="theme-btn game-btn"
style={{ style={{
width: "50%", width: "33%",
borderColor: "#ffff00", borderColor: !opinion ? "#ffff00" : "transparent",
background: "rgba(255, 255, 0, 0.1)",
fontSize: "1.2rem",
}} }}
title="Neutral"
> >
Neutral 😐
</button> </button>
<button <button
onClick={() => handleOpinion(game.title, 0)} onClick={() => handleOpinion(game.title, 0)}
className="theme-btn game-btn"
style={{ style={{
width: "50%", width: "33%",
borderColor: "#f44336", borderColor:
opinion && !opinion.wouldPlay
? "#f44336"
: "transparent",
background: "rgba(244, 67, 54, 0.1)",
fontSize: "1.2rem",
}} }}
title="Would Not Play"
> >
Would Not Play 👎
</button> </button>
</div> </div>
</div> </div>
); );
})} })}
</ul> </ul>
)}
</div> </div>
</div> </div>
); );
+364 -21
View File
@@ -1,4 +1,4 @@
import { useState } from "react"; import { useState, useRef, useEffect } from "react";
import { LoginRequest, LoginResponse } from "../items"; import { LoginRequest, LoginResponse } from "../items";
interface LoginProps { interface LoginProps {
@@ -6,16 +6,41 @@ interface LoginProps {
} }
export function Login({ onLogin }: LoginProps) { export function Login({ onLogin }: LoginProps) {
const usernameInputRef = useRef<HTMLInputElement>(null);
const [username, setUsername] = useState(""); const [username, setUsername] = useState("");
const [password, setPassword] = useState(""); const [password, setPassword] = useState("");
const [error, setError] = useState(""); const [error, setError] = useState("");
const [isSubmitting, setIsSubmitting] = useState(false);
const [fieldErrors, setFieldErrors] = useState<{ username?: string, password?: string }>({});
const [isSuccess, setIsSuccess] = useState(false);
const [shakeCard, setShakeCard] = useState(false);
useEffect(() => {
usernameInputRef.current?.focus();
}, []);
const validateForm = () => {
const errors: { username?: string, password?: string } = {};
if (!username.trim()) errors.username = "Username is required";
if (!password) errors.password = "Password is required";
setFieldErrors(errors);
return Object.keys(errors).length === 0;
};
const handleSubmit = async (e: React.FormEvent) => { const handleSubmit = async (e: React.FormEvent) => {
e.preventDefault(); e.preventDefault();
setError(""); setError("");
if (!validateForm()) {
setShakeCard(true);
setTimeout(() => setShakeCard(false), 500);
return;
}
setIsSubmitting(true);
try { try {
const req = LoginRequest.create({ username, password }); const req = LoginRequest.create({ username: username.trim(), password });
const body = LoginRequest.encode(req).finish(); const body = LoginRequest.encode(req).finish();
const res = await fetch("/auth/login", { const res = await fetch("/auth/login", {
@@ -30,47 +55,365 @@ export function Login({ onLogin }: LoginProps) {
const response = LoginResponse.decode(new Uint8Array(buffer)); const response = LoginResponse.decode(new Uint8Array(buffer));
if (response.success) { if (response.success) {
setIsSuccess(true);
onLogin(response.token); onLogin(response.token);
} else { } else {
setError(response.message); setError(response.message || "Login failed");
setShakeCard(true);
setTimeout(() => setShakeCard(false), 500);
} }
} catch (err) { } catch (err) {
console.error("Login error:", err); console.error("Login error:", err);
setError("Failed to login"); setError("An unexpected error occurred. Please try again.");
setShakeCard(true);
setTimeout(() => setShakeCard(false), 500);
} finally {
setIsSubmitting(false);
}
};
const handleKeyDown = (e: React.KeyboardEvent) => {
if (e.key === "Enter") {
handleSubmit(e);
} }
}; };
return ( return (
<div className="card" style={{ maxWidth: "400px", margin: "4rem auto" }}> <div
<h2 style={{ textAlign: "center", marginBottom: "2rem" }}>Login</h2> className="card login-card"
<form onSubmit={handleSubmit} className="form-group"> style={{
<div className="form-group"> maxWidth: "420px",
<label>Username</label> margin: "6rem auto",
<input padding: "2.5rem",
type="text" background: "linear-gradient(135deg, var(--secondary-bg) 0%, var(--secondary-alt-bg) 100%)",
value={username} position: "relative"
onChange={(e) => setUsername(e.target.value)} }}
placeholder="Enter your username" >
{isSubmitting && (
<div
style={{
position: "absolute",
top: 0,
left: 0,
right: 0,
bottom: 0,
backgroundColor: "rgba(0, 0, 0, 0.5)",
borderRadius: "16px",
display: "flex",
alignItems: "center",
justifyContent: "center",
zIndex: 10,
backdropFilter: "blur(2px)"
}}
>
<div
style={{
width: "48px",
height: "48px",
border: "4px solid rgba(255, 255, 255, 0.2)",
borderTopColor: "white",
borderRadius: "50%",
animation: "spin 0.8s linear infinite"
}}
/> />
</div> </div>
<div className="form-group"> )}
<label>Password</label>
{isSuccess && (
<div
style={{
position: "absolute",
top: "50%",
left: "50%",
transform: "translate(-50%, -50%)",
display: "flex",
flexDirection: "column",
alignItems: "center",
gap: "1rem",
animation: "fadeInScale 0.5s ease forwards",
zIndex: 10
}}
>
<div
style={{
width: "64px",
height: "64px",
borderRadius: "50%",
backgroundColor: "#4caf50",
display: "flex",
alignItems: "center",
justifyContent: "center",
fontSize: "2rem",
color: "white",
boxShadow: "0 0 20px rgba(76, 175, 80, 0.5)"
}}
>
</div>
<span style={{ color: "#4caf50", fontWeight: 600, fontSize: "1.1rem" }}>
Success!
</span>
</div>
)}
<h2
style={{
textAlign: "center",
marginBottom: "0.5rem",
fontSize: "2rem",
fontWeight: 700
}}
>
🎮 Login
</h2>
<p
style={{
textAlign: "center",
color: "var(--text-muted)",
marginBottom: "2rem",
fontSize: "0.95rem"
}}
>
Welcome back! Please sign in to continue.
</p>
<form onSubmit={handleSubmit} className="form-group">
<div className="form-group" style={{ marginBottom: "1.5rem" }}>
<label
style={{
display: "block",
marginBottom: "0.5rem",
fontWeight: 500,
color: "var(--text-color)",
fontSize: "0.95rem"
}}
>
Username
</label>
<div
style={{
position: "relative",
display: "flex",
alignItems: "center"
}}
>
<span
style={{
position: "absolute",
left: "0.75rem",
color: "var(--text-muted)",
pointerEvents: "none",
fontSize: "1.1rem"
}}
>
👤
</span>
<input
ref={usernameInputRef}
type="text"
value={username}
onChange={(e) => {
setUsername(e.target.value);
if (fieldErrors.username) setFieldErrors({ ...fieldErrors, username: undefined });
}}
onKeyDown={handleKeyDown}
placeholder="Enter your username"
aria-label="Username"
aria-invalid={!!fieldErrors.username}
aria-describedby={fieldErrors.username ? "username-error" : undefined}
style={{
width: "100%",
paddingLeft: "2.75rem",
paddingRight: "0.75rem",
paddingTop: "0.75rem",
paddingBottom: "0.75rem",
borderColor: fieldErrors.username ? "#f44336" : undefined,
borderWidth: fieldErrors.username ? "2px" : "1px",
fontSize: "1rem"
}}
/>
</div>
{fieldErrors.username && (
<span
id="username-error"
role="alert"
style={{
color: "#ff6b6b",
fontSize: "0.85rem",
marginTop: "0.5rem",
display: "flex",
alignItems: "center",
gap: "0.25rem"
}}
>
{fieldErrors.username}
</span>
)}
</div>
<div className="form-group" style={{ marginBottom: "2rem" }}>
<label
style={{
display: "block",
marginBottom: "0.5rem",
fontWeight: 500,
color: "var(--text-color)",
fontSize: "0.95rem"
}}
>
Password
</label>
<div
style={{
position: "relative",
display: "flex",
alignItems: "center"
}}
>
<span
style={{
position: "absolute",
left: "0.75rem",
color: "var(--text-muted)",
pointerEvents: "none",
fontSize: "1.1rem"
}}
>
🔒
</span>
<input <input
type="password" type="password"
value={password} value={password}
onChange={(e) => setPassword(e.target.value)} onChange={(e) => {
setPassword(e.target.value);
if (fieldErrors.password) setFieldErrors({ ...fieldErrors, password: undefined });
}}
onKeyDown={handleKeyDown}
placeholder="Enter your password" placeholder="Enter your password"
aria-label="Password"
aria-invalid={!!fieldErrors.password}
aria-describedby={fieldErrors.password ? "password-error" : undefined}
style={{
width: "100%",
paddingLeft: "2.75rem",
paddingRight: "0.75rem",
paddingTop: "0.75rem",
paddingBottom: "0.75rem",
borderColor: fieldErrors.password ? "#f44336" : undefined,
borderWidth: fieldErrors.password ? "2px" : "1px",
fontSize: "1rem"
}}
/> />
</div> </div>
<button type="submit" style={{ marginTop: "1rem" }}> {fieldErrors.password && (
<span
id="password-error"
role="alert"
style={{
color: "#ff6b6b",
fontSize: "0.85rem",
marginTop: "0.5rem",
display: "flex",
alignItems: "center",
gap: "0.25rem"
}}
>
{fieldErrors.password}
</span>
)}
</div>
<button
type="submit"
style={{
marginTop: "0.5rem",
width: "100%",
padding: "0.875rem",
fontSize: "1rem",
fontWeight: 600,
opacity: isSubmitting ? 0.7 : 1,
cursor: isSubmitting ? "not-allowed" : "pointer",
background: "linear-gradient(135deg, var(--accent-color) 0%, var(--secondary-accent) 100%)",
border: "none",
transition: "transform 0.1s, box-shadow 0.2s"
}}
disabled={isSubmitting}
onMouseEnter={(e) => {
if (!isSubmitting) {
e.currentTarget.style.transform = "translateY(-1px)";
e.currentTarget.style.boxShadow = "0 4px 12px rgba(9, 109, 192, 0.4)";
}
}}
onMouseLeave={(e) => {
if (!isSubmitting) {
e.currentTarget.style.transform = "translateY(0)";
e.currentTarget.style.boxShadow = "none";
}
}}
onMouseDown={(e) => {
if (!isSubmitting) {
e.currentTarget.style.transform = "translateY(0)";
}
}}
>
Login Login
</button> </button>
</form> </form>
{error && ( {error && (
<p style={{ color: "#ff6b6b", marginTop: "1rem", textAlign: "center" }}> <div
{error} role="alert"
</p> style={{
backgroundColor: "rgba(244, 67, 54, 0.15)",
border: "1px solid rgba(244, 67, 54, 0.4)",
color: "#ff6b6b",
padding: "0.875rem 1rem",
borderRadius: "8px",
marginTop: "1.5rem",
textAlign: "center",
fontSize: "0.9rem",
display: "flex",
alignItems: "center",
justifyContent: "center",
gap: "0.5rem"
}}
>
{error}
</div>
)} )}
<style>{`
@keyframes spin {
to { transform: rotate(360deg); }
}
@keyframes fadeInScale {
from {
opacity: 0;
transform: translate(-50%, -40%) scale(0.8);
}
to {
opacity: 1;
transform: translate(-50%, -50%) scale(1);
}
}
.login-card {
animation: ${shakeCard ? "shake 0.5s ease" : "none"};
}
@keyframes shake {
0%, 100% {
transform: translateX(0);
}
20%, 60% {
transform: translateX(-8px);
}
40%, 80% {
transform: translateX(8px);
}
}
`}</style>
</div> </div>
); );
} }
+26 -8
View File
@@ -3,32 +3,49 @@ import { Link, useParams } from "react-router-dom";
import { Person } from "../items"; import { Person } from "../items";
import { apiFetch } from "./api"; import { apiFetch } from "./api";
import { GameImage } from "./GameImage"; import { GameImage } from "./GameImage";
import { LoadingState, EmptyState } from "./components/EmptyState";
export const PersonDetails = () => { export const PersonDetails = () => {
const { name } = useParams<{ name: string }>(); const { name } = useParams<{ name: string }>();
const [person, setPerson] = useState<Person | null>(null); const [person, setPerson] = useState<Person | null>(null);
const [loading, setLoading] = useState(!!name);
const [error, setError] = useState<string | null>(name ? null : "Person name is missing");
useEffect(() => { useEffect(() => {
if (name) { if (!name) return;
apiFetch(`/api/${name}`)
.then((res) => res.arrayBuffer()) (async () => {
.then((buffer) => {
try { try {
const res = await apiFetch(`/api/${name}`);
if (!res.ok) {
throw new Error("Person not found");
}
const buffer = await res.arrayBuffer();
setPerson(Person.decode(new Uint8Array(buffer))); setPerson(Person.decode(new Uint8Array(buffer)));
} catch (e) { } catch (e) {
console.error("Failed to decode person:", e); console.error("Failed to decode person:", e);
setError(e instanceof Error ? e.message : "Failed to load person data");
} finally {
setLoading(false);
} }
}) })();
.catch(console.error);
}
}, [name]); }, [name]);
if (!person) return <div>Loading...</div>; if (loading) return <LoadingState message="Loading person details..." />;
if (error) return <EmptyState icon="⚠️" title="Error" description={error} />;
if (!person) return <EmptyState icon="👤" title="Person not found" description="This person doesn't exist" />;
return ( return (
<div> <div>
<div style={{ marginBottom: "2rem" }}> <div style={{ marginBottom: "2rem" }}>
<h2>{person.name}</h2> <h2>{person.name}</h2>
{person.opinion.length === 0 ? (
<EmptyState
icon="🎮"
title="No opinions yet"
description={`${person.name} hasn't shared any game opinions`}
/>
) : (
<ul className="grid-container"> <ul className="grid-container">
{person.opinion.map((op, i) => ( {person.opinion.map((op, i) => (
<Link <Link
@@ -50,6 +67,7 @@ export const PersonDetails = () => {
</Link> </Link>
))} ))}
</ul> </ul>
)}
</div> </div>
</div> </div>
); );
+19
View File
@@ -0,0 +1,19 @@
.list-item {
border-radius: 5px;
border: 1px solid var(--border-color);
background-color: var(--secondary-alt-bg);
margin-bottom: 10px;
padding: 10px;
text-align: center;
user-select: none;
}
.list-item:hover {
background-color: var(--primary-bg);
}
.grid-container {
display: grid;
grid-template-columns: repeat(auto-fit, minmax(300px, 1fr));
gap: 1rem;
}
+148 -6
View File
@@ -1,19 +1,53 @@
import { Person } from "../items"; import { Person } from "../items";
import { Link } from "react-router-dom"; import { Link } from "react-router-dom";
import { useState } from "react"; import { useState, useEffect, useMemo } from "react";
import { get_auth_status } from "./api"; import { get_auth_status, refresh_state, get_is_admin } from "./api";
import type { ToastType } from "./Toast";
import { EmptyState } from "./components/EmptyState";
import "./PersonList.css"
interface Props { interface Props {
people: Person[]; people: Person[];
loading?: boolean;
onShowToast?: (message: string, type?: ToastType) => void;
} }
export const PersonList = ({ people }: Props) => { export const PersonList = ({ people, loading = false, onShowToast }: Props) => {
const [current_user, set_current_user] = useState<string>(""); const [current_user, set_current_user] = useState<string>("");
const [isRefreshing, setIsRefreshing] = useState(false);
const [searchQuery, setSearchQuery] = useState("");
useEffect(() => {
get_auth_status().then((res) => { get_auth_status().then((res) => {
if (res) { if (res) {
set_current_user(res.username); set_current_user(res.username);
} }
}); });
}, []);
const filteredPeople = useMemo(() => {
if (!searchQuery) return people;
return people.filter(person =>
person.name.toLowerCase().includes(searchQuery.toLowerCase())
);
}, [people, searchQuery]);
const handleRefresh = async () => {
setIsRefreshing(true);
try {
await refresh_state();
onShowToast?.("State refreshed from file successfully", "success");
window.location.reload();
} catch (err) {
console.error(err);
onShowToast?.("Failed to refresh state from file", "error");
} finally {
setIsRefreshing(false);
}
};
const isAdmin = get_is_admin();
return ( return (
<div> <div>
<div <div
@@ -22,13 +56,114 @@ export const PersonList = ({ people }: Props) => {
justifyContent: "space-between", justifyContent: "space-between",
alignItems: "center", alignItems: "center",
marginBottom: "1rem", marginBottom: "1rem",
flexWrap: "wrap",
gap: "1rem"
}} }}
> >
<h2>People List</h2> <h2>People List {filteredPeople.length > 0 && <span style={{ fontSize: "0.8em", color: "var(--text-muted)" }}>({filteredPeople.length})</span>}</h2>
<div style={{ display: "flex", gap: "0.75rem", alignItems: "center" }}>
<input
type="text"
placeholder="🔍 Search people..."
value={searchQuery}
onChange={(e) => setSearchQuery(e.target.value)}
style={{
padding: "0.5rem 1rem",
fontSize: "0.9rem",
minWidth: "200px"
}}
/>
{isAdmin && (
<button
onClick={handleRefresh}
disabled={isRefreshing}
className="btn-secondary"
style={{
padding: "0.5rem 1rem",
fontSize: "0.9rem",
display: "flex",
alignItems: "center",
gap: "0.5rem",
opacity: isRefreshing ? 0.7 : 1,
cursor: isRefreshing ? "not-allowed" : "pointer",
}}
>
{isRefreshing ? (
<>
<span
style={{
width: "14px",
height: "14px",
border: "2px solid rgba(255,255,255,0.3)",
borderTopColor: "currentColor",
borderRadius: "50%",
animation: "spin 0.8s linear infinite",
}}
></span>
Refreshing...
</>
) : (
<>
<span>🔄</span>
Refresh from File
</>
)}
</button>
)}
</div> </div>
</div>
{loading ? (
<div className="grid-container"> <div className="grid-container">
{people.map((person, index) => { {Array.from({ length: 6 }).map((_, i) => (
if (person.name == current_user) { <div
key={i}
style={{
backgroundColor: "var(--secondary-alt-bg)",
border: "1px solid var(--border-color)",
borderRadius: "5px",
padding: "10px",
minHeight: "60px",
animation: "shimmer 1.5s infinite"
}}
>
<div
style={{
width: "60%",
height: "20px",
backgroundColor: "var(--tertiary-bg)",
borderRadius: "4px",
marginBottom: "0.5rem",
animation: "shimmer 1.5s infinite"
}}
></div>
<div
style={{
width: "40%",
height: "16px",
backgroundColor: "var(--tertiary-bg)",
borderRadius: "4px",
animation: "shimmer 1.5s infinite 0.2s"
}}
></div>
</div>
))}
<style>{`
@keyframes shimmer {
0%, 100% { opacity: 0.5; }
50% { opacity: 1; }
}
`}</style>
</div>
) : filteredPeople.length === 0 ? (
<EmptyState
icon="👥"
title={searchQuery ? "No people found" : "No people in list"}
description={searchQuery ? "Try a different search term" : "Add people to get started"}
/>
) : (
<div className="grid-container">
{filteredPeople.map((person, index) => {
if (person.name.toLowerCase() === current_user.toLowerCase()) {
return ( return (
<Link <Link
to={`/games#existing-games`} to={`/games#existing-games`}
@@ -41,6 +176,9 @@ export const PersonList = ({ people }: Props) => {
}} }}
> >
<h3>{person.name}</h3> <h3>{person.name}</h3>
<div style={{ fontSize: "0.85em", color: "var(--text-muted)", marginTop: "0.25rem" }}>
{person.opinion.length} opinion(s)
</div>
</Link> </Link>
); );
} }
@@ -57,10 +195,14 @@ export const PersonList = ({ people }: Props) => {
}} }}
> >
<h3>{person.name}</h3> <h3>{person.name}</h3>
<div style={{ fontSize: "0.85em", color: "var(--text-muted)", marginTop: "0.25rem" }}>
{person.opinion.length} opinion(s)
</div>
</Link> </Link>
); );
})} })}
</div> </div>
)}
</div> </div>
); );
}; };
+15 -1
View File
@@ -154,7 +154,6 @@ export const ShaderBackground: React.FC<ShaderBackgroundProps> = ({
shader_code = CLOUDS_SHADER_CODE; shader_code = CLOUDS_SHADER_CODE;
break; break;
default: default:
console.error("Unknown shader theme:", theme);
return; return;
} }
@@ -226,9 +225,24 @@ export const ShaderBackground: React.FC<ShaderBackgroundProps> = ({
gl!.bindTexture(gl!.TEXTURE_2D, ichannel1_texture); gl!.bindTexture(gl!.TEXTURE_2D, ichannel1_texture);
gl!.uniform1i(final_iChannel1, 1); gl!.uniform1i(final_iChannel1, 1);
let last_update: number = 0;
const compiled_theme = theme;
function update(now: number) { function update(now: number) {
// time in seconds // time in seconds
const time = now / 1000; const time = now / 1000;
if (compiled_theme !== theme) {
return;
}
if (time - last_update < (1 / 30)) {
requestAnimationFrame(update);
return;
};
last_update = time;
gl!.clear(gl!.COLOR_BUFFER_BIT); gl!.clear(gl!.COLOR_BUFFER_BIT);
setTime(finalProgram!, time); setTime(finalProgram!, time);
+45
View File
@@ -0,0 +1,45 @@
import React, { useEffect } from "react";
export type ToastType = "success" | "error" | "info";
interface ToastProps {
message: string;
type: ToastType;
onClose: () => void;
duration?: number;
}
export const Toast: React.FC<ToastProps> = ({
message,
type,
onClose,
duration = 3000,
}) => {
useEffect(() => {
const timer = setTimeout(() => {
onClose();
}, duration);
return () => clearTimeout(timer);
}, [onClose, duration]);
const getIcon = () => {
switch (type) {
case "success":
return "✓";
case "error":
return "✕";
default:
return "";
}
};
return (
<div className={`toast toast-${type}`}>
<span className="toast-icon">{getIcon()}</span>
<span className="toast-message">{message}</span>
<button className="toast-close" onClick={onClose}>
&times;
</button>
</div>
);
};
+13 -1
View File
@@ -21,7 +21,8 @@ export const apiFetch = async (
if (!response.ok) { if (!response.ok) {
if (response.status == 401) { if (response.status == 401) {
localStorage.removeItem("token"); localStorage.removeItem("token");
window.location.href = "/"; localStorage.removeItem("isAdmin");
window.dispatchEvent(new CustomEvent("unauthorized"));
} }
throw new Error(`Request failed with status ${response.status}`); throw new Error(`Request failed with status ${response.status}`);
} }
@@ -43,9 +44,20 @@ export const get_auth_status = async (): Promise<AuthStatusResponse | null> => {
const buffer = await response.arrayBuffer(); const buffer = await response.arrayBuffer();
try { try {
const response = AuthStatusResponse.decode(new Uint8Array(buffer)); const response = AuthStatusResponse.decode(new Uint8Array(buffer));
localStorage.setItem("isAdmin", String(response.isAdmin));
return response; return response;
} catch (e) { } catch (e) {
console.error("Failed to decode auth status:", e); console.error("Failed to decode auth status:", e);
return null; return null;
} }
}; };
export const get_is_admin = (): boolean => {
return localStorage.getItem("isAdmin") === "true";
};
export const refresh_state = async (): Promise<void> => {
await apiFetch("/api/refresh", {
method: "POST",
});
};
+13 -14
View File
@@ -9,8 +9,8 @@ out vec4 FragColor;
float orb(vec3 p) { float orb(vec3 p) {
// orb time // orb time
float t = T * 4.; float t = T * 4.f;
return length(p - vec3(sin(sin(t * .2) + t * .4) * 6., 1. + sin(sin(t * .5) + t * .2) * 4., 12. + T + cos(t * .3) * 8.)); return length(p - vec3(sin(sin(t * .2f) + t * .4f) * 6.f, 1.f + sin(sin(t * .5f) + t * .2f) * 4.f, 12.f + T + cos(t * .3f) * 8.f));
} }
void mainImage(out vec4 o, vec2 u) { void mainImage(out vec4 o, vec2 u) {
@@ -21,42 +21,41 @@ void mainImage(out vec4 o, vec2 u) {
u = (u + u - p.xy) / p.y; u = (u + u - p.xy) / p.y;
// camera movement // camera movement
u += vec2(cos(t * .1) * .3, cos(t * .3) * .1); u += vec2(cos(t * .1f) * .3f, cos(t * .3f) * .1f);
for(o *= i; i++ < 128.; for(o *= i; i++ < 128.f;
// accumulate distance // accumulate distance
d += s = min(.03 + .2 * abs(s), e = max(.5 * e, .01)), d += s = min(.03f + .2f * abs(s), e = max(.5f * e, .01f)),
// grayscale color and orb light // grayscale color and orb light
o += 1. / (s + e * 3.)) o += 1.f / (s + e * 3.f))
// noise loop start, march // noise loop start, march
for(p = vec3(u * d, d + t), // p = ro + rd *d, p.z + t; for(p = vec3(u * d, d + t), // p = ro + rd *d, p.z + t;
// entity (orb) // entity (orb)
e = orb(p) - .1, e = orb(p) - .1f,
// spin by t, twist by p.z // spin by t, twist by p.z
p.xy *= mat2(cos(.1 * t + p.z / 8. + vec4(0, 33, 11, 0))), p.xy *= mat2(cos(.1f * t + p.z / 8.f + vec4(0, 33, 11, 0))),
// mirrored planes 4 units apart // mirrored planes 4 units apart
s = 4. - abs(p.y), s = 4.f - abs(p.y),
// noise starts at .8 up to 32., grow by a+=a // noise starts at .8 up to 32., grow by a+=a
a = .8; a < 32.; a += a) a = .8f; a < 32.f; a += a)
// apply turbulence // apply turbulence
p += cos(.7 * t + p.yzx) * .2, p += cos(.7f * t + p.yzx) * .2f,
// apply noise // apply noise
s -= abs(dot(sin(.1 * t + p * a), .6 + p - p)) / a; s -= abs(dot(sin(.1f * t + p * a), .6f + p - p)) / a;
// tanh tonemap, brightness, light off-screen // tanh tonemap, brightness, light off-screen
o = tanh(o / 1e1); o = tanh(o / 1e1f);
} }
void main() { void main() {
mainImage(FragColor, gl_FragCoord.xy); mainImage(FragColor, gl_FragCoord.xy);
} }
+91
View File
@@ -0,0 +1,91 @@
import type { ReactNode } from "react";
interface EmptyStateProps {
icon?: string;
title: string;
description?: string;
action?: ReactNode;
}
export function EmptyState({ icon = "📭", title, description, action }: EmptyStateProps) {
return (
<div
style={{
padding: "3rem 2rem",
textAlign: "center",
background: "var(--secondary-alt-bg)",
borderRadius: "16px",
border: "1px dashed var(--border-color)",
color: "var(--text-muted)"
}}
>
<div style={{ fontSize: "3rem", marginBottom: "1rem" }}>{icon}</div>
<h3 style={{ margin: "0 0 0.5rem 0", color: "var(--text-color)" }}>{title}</h3>
{description && <p style={{ margin: "0 0 1.5rem 0", fontSize: "0.95rem" }}>{description}</p>}
{action}
</div>
);
}
export function LoadingState({ message = "Loading..." }: { message?: string }) {
return (
<div
style={{
padding: "3rem 2rem",
textAlign: "center"
}}
>
<div
style={{
width: "40px",
height: "40px",
border: "4px solid rgba(255, 255, 255, 0.2)",
borderTopColor: "currentColor",
borderRadius: "50%",
animation: "spin 0.8s linear infinite",
margin: "0 auto 1rem"
}}
></div>
<p style={{ color: "var(--text-muted)", margin: 0 }}>{message}</p>
<style>{`
@keyframes spin {
to { transform: rotate(360deg); }
}
`}</style>
</div>
);
}
export function ErrorState({ message, onRetry }: { message: string, onRetry?: () => void }) {
return (
<div
style={{
padding: "3rem 2rem",
textAlign: "center",
background: "rgba(244, 67, 54, 0.1)",
borderRadius: "16px",
border: "1px solid rgba(244, 67, 54, 0.3)"
}}
>
<div style={{ fontSize: "3rem", marginBottom: "1rem" }}></div>
<h3 style={{ margin: "0 0 0.5rem 0", color: "var(--text-color)" }}>Something went wrong</h3>
<p style={{ margin: "0 0 1.5rem 0", color: "var(--text-muted)", fontSize: "0.95rem" }}>{message}</p>
{onRetry && (
<button
onClick={onRetry}
style={{
background: "var(--accent-color)",
border: "none",
padding: "0.75rem 1.5rem",
borderRadius: "8px",
color: "white",
fontWeight: 600,
cursor: "pointer"
}}
>
🔄 Try Again
</button>
)}
</div>
);
}
@@ -0,0 +1,113 @@
import { Link } from "react-router-dom";
import { GameImage } from "../GameImage";
import { EmptyState } from "./EmptyState";
import { Game as GameProto } from "../../items";
interface FilteredGamesListProps {
filteredGames: string[];
gameToPositive: Map<string, Set<string>>;
selectedPeopleCount: number;
games: Map<string, GameProto>;
}
export function FilteredGamesList({
filteredGames,
gameToPositive,
selectedPeopleCount,
games,
}: FilteredGamesListProps) {
if (selectedPeopleCount === 0) {
return (
<EmptyState
icon="👥"
title="Select people to find games"
description="Choose one or more people from the list above to see games they would play"
/>
);
}
return (
<div>
<h3>Games Everyone Would Play ({filteredGames.length})</h3>
{filteredGames.length > 0 ? (
<ul className="grid-container">
{filteredGames.map((game) => {
const positiveCount = gameToPositive.get(game)?.size || 0;
const neutralCount = selectedPeopleCount - positiveCount;
const gameData = games.get(game);
if (!gameData) {
console.error("no data", game);
return null;
}
const price = gameData.price;
return (
<Link
to={`/game/${encodeURIComponent(game)}`}
key={game}
className="list-item game-entry"
style={{
textDecoration: "none",
color: "inherit",
display: "flex",
justifyContent: "space-between",
alignItems: "center",
}}
>
<div>
<strong>{game}</strong>
<div
style={{
fontSize: "0.9em",
color: "#4caf50",
marginTop: "0.5rem",
}}
>
<span></span> {positiveCount} selected would play
</div>
{neutralCount > 0 && (
<div
style={{
fontSize: "0.9em",
color: "#d4d400",
marginTop: "0.3rem",
}}
>
<span>?</span> {neutralCount}{" "}
{neutralCount > 1 ? "are" : "is"} neutral
</div>
)}
<div
className="price-badge"
style={{
fontSize: "0.85em",
marginTop: "0.5rem",
padding: "0.2rem 0.6rem",
borderRadius: "4px",
display: "inline-block",
backgroundColor:
price === 0
? "rgba(76, 175, 80, 0.2)"
: "rgba(255, 152, 0, 0.2)",
color: price === 0 ? "#4caf50" : "#ff9800",
fontWeight: 600,
}}
>
{price === 0 ? "0€ (Free)" : `${price}`}
</div>
</div>
<GameImage game={game} />
</Link>
);
})}
</ul>
) : (
<EmptyState
icon="🔍"
title="No games found"
description="Try selecting fewer people or adding more opinions"
/>
)}
</div>
);
}
@@ -0,0 +1,28 @@
export function LoadingSpinner({ size = "medium", text }: { size?: "small" | "medium" | "large", text?: string }) {
const sizeMap = {
small: "16px",
medium: "24px",
large: "32px"
};
return (
<div style={{ display: "flex", flexDirection: "column", alignItems: "center", gap: "1rem" }}>
<div
style={{
width: sizeMap[size],
height: sizeMap[size],
border: `${parseInt(sizeMap[size]) / 4}px solid rgba(255, 255, 255, 0.2)`,
borderTopColor: "currentColor",
borderRadius: "50%",
animation: "spin 0.8s linear infinite"
}}
></div>
{text && <span style={{ color: "var(--text-muted)", fontSize: "0.9rem" }}>{text}</span>}
<style>{`
@keyframes spin {
to { transform: rotate(360deg); }
}
`}</style>
</div>
);
}
@@ -0,0 +1,55 @@
import { Person } from "../../items";
interface PersonSelectorProps {
people: Person[];
selectedPeople: Set<string>;
onTogglePerson: (name: string) => void;
}
export function PersonSelector({
people,
selectedPeople,
onTogglePerson,
}: PersonSelectorProps) {
return (
<div style={{ marginBottom: "3rem" }}>
<h3>Select People</h3>
<div
className="grid-container"
style={{
display: "flex",
flexWrap: "wrap",
gap: "1rem",
justifyContent: "center",
}}
>
{people.map((person) => (
<div
key={person.name}
className="list-item gamefilter-entry"
style={{
borderColor: selectedPeople.has(person.name)
? "var(--accent-color)"
: "var(--border-color)",
cursor: "pointer",
}}
onClick={() => onTogglePerson(person.name)}
>
<div style={{ gap: "0.5rem" }}>
<strong>{person.name}</strong>
</div>
<div
style={{
fontSize: "0.9em",
color: "var(--text-muted)",
marginTop: "0.5rem",
}}
>
{person.opinion.length} opinion(s)
</div>
</div>
))}
</div>
</div>
);
}
@@ -0,0 +1,65 @@
export function SkeletonLoader({ width, height, count = 1 }: { width?: string | number, height?: string | number, count?: number }) {
return (
<>
{Array.from({ length: count }).map((_, i) => (
<div
key={i}
style={{
width: width || "100%",
height: height || "60px",
backgroundColor: "var(--secondary-alt-bg)",
borderRadius: "8px",
animation: "shimmer 1.5s infinite",
marginBottom: count > 1 ? "1rem" : undefined
}}
></div>
))}
<style>{`
@keyframes shimmer {
0%, 100% { opacity: 0.5; }
50% { opacity: 1; }
}
`}</style>
</>
);
}
export function CardSkeleton() {
return (
<div
style={{
backgroundColor: "var(--secondary-alt-bg)",
border: "1px solid var(--border-color)",
borderRadius: "5px",
padding: "10px",
minHeight: "80px"
}}
>
<div
style={{
width: "60%",
height: "20px",
backgroundColor: "var(--tertiary-bg)",
borderRadius: "4px",
marginBottom: "0.5rem",
animation: "shimmer 1.5s infinite"
}}
></div>
<div
style={{
width: "40%",
height: "16px",
backgroundColor: "var(--tertiary-bg)",
borderRadius: "4px",
animation: "shimmer 1.5s infinite 0.2s"
}}
></div>
<style>{`
@keyframes shimmer {
0%, 100% { opacity: 0.5; }
50% { opacity: 1; }
}
`}</style>
</div>
);
}
+151
View File
@@ -0,0 +1,151 @@
import { useState, useEffect, useRef, useMemo } from "react";
import {
Person,
Game as GameProto,
GetGameInfoRequest,
GameInfoResponse,
} from "../../items";
import { apiFetch } from "../api";
export function useGameFilter(
people: Person[],
selectedPeople: Set<string>,
freeGamesOnly: boolean,
maxPrice: number | null,
ownershipMode: boolean
) {
const [fetchedTitles, setFetchedTitles] = useState<string[]>([]);
const metaDataRef = useRef<{ [key: string]: GameProto }>({});
useEffect(() => {
return () => {
metaDataRef.current = {};
};
}, []);
const { gameToNegative, gameToPositiveOpinion } = useMemo(() => {
const gameToNegative = new Map<string, Set<string>>();
const gameToPositiveOpinion = new Map<string, Set<string>>();
if (selectedPeople.size === 0)
return { gameToNegative, gameToPositiveOpinion };
const selectedPersons = people.filter((p) => selectedPeople.has(p.name));
selectedPersons.forEach((person) => {
person.opinion.forEach((op) => {
if (!gameToNegative.has(op.title))
gameToNegative.set(op.title, new Set());
if (!gameToPositiveOpinion.has(op.title))
gameToPositiveOpinion.set(op.title, new Set());
if (!op.wouldPlay) {
gameToNegative.get(op.title)!.add(person.name);
} else {
gameToPositiveOpinion.get(op.title)!.add(person.name);
}
});
});
return { gameToNegative, gameToPositiveOpinion };
}, [people, selectedPeople]);
const titlesEveryoneWouldPlay = useMemo(() => {
return Array.from(gameToNegative.entries())
.filter(([, players]) => players.size === 0)
.map(([game]) => game);
}, [gameToNegative]);
useEffect(() => {
const titlesToFetch = titlesEveryoneWouldPlay.filter(
(title) => !metaDataRef.current[title]
);
if (titlesToFetch.length === 0) return;
const gamesToFetch = GetGameInfoRequest.encode(
GetGameInfoRequest.create({
games: titlesToFetch,
})
).finish();
apiFetch("/api/games/batch", {
method: "POST",
headers: { "Content-Type": "application/octet-stream" },
body: gamesToFetch,
})
.then((res) => res.arrayBuffer())
.then((buffer) => {
const list = GameInfoResponse.decode(new Uint8Array(buffer));
list.games.forEach((game) => {
metaDataRef.current[game.title] = game;
});
// Trigger a re-render to update filteredGames
setFetchedTitles([...titlesToFetch]);
})
.catch((err) => console.error("Failed to fetch game metadata:", err));
}, [titlesEveryoneWouldPlay]);
const filteredGames = useMemo(() => {
if (selectedPeople.size === 0) return [];
const games = titlesEveryoneWouldPlay
.filter((title) => metaDataRef.current[title])
.map((title) => metaDataRef.current[title]);
return filterGames(
games,
selectedPeople.size,
freeGamesOnly,
maxPrice,
ownershipMode,
selectedPeople,
people
);
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [
titlesEveryoneWouldPlay,
selectedPeople.size,
fetchedTitles,
freeGamesOnly,
maxPrice,
ownershipMode,
people,
selectedPeople,
]);
const gamesMap = new Map(Object.entries(metaDataRef.current));
return { filteredGames, gameToPositive: gameToPositiveOpinion, games: gamesMap };
}
function filterGames(
games: GameProto[],
playerCount: number,
freeGamesOnly: boolean,
maxPrice: number | null,
ownershipMode: boolean,
selectedPeople: Set<string>,
people: Person[]
): string[] {
const selectedPersons = people.filter((p) => selectedPeople.has(p.name));
return games
.filter(
(game) => game.maxPlayers >= playerCount && game.minPlayers <= playerCount
)
.filter((game) => {
if (freeGamesOnly) return game.price === 0;
if (maxPrice !== null) return game.price <= maxPrice;
return true;
})
.filter((game) => {
if (!ownershipMode) return true;
if (game.price === 0) return true;
return selectedPersons.every((person) =>
person.opinion.some(
(op) => op.title === game.title && op.wouldPlay
)
);
})
.map((game) => game.title);
}
+53 -22
View File
@@ -1,15 +1,21 @@
:root { :root {
--primary-bg: #23283d; --primary-bg-rgb: 35 40 61;
--secondary-bg: #1e2233; --secondary-bg-rgb: 30 34 51;
--secondary-alt-bg: #191f2e; --secondary-alt-bg-rgb: 25 31 46;
--tertiary-bg: #101320; --tertiary-bg-rgb: 16 19 32;
--accent-color: #096dc0; --accent-color-rgb: 9 109 192;
--secondary-accent: #0a4f8c; --secondary-accent-rgb: 10 79 140;
--border-color-rgb: 42 48 69;
--text-color: #ffffff; --text-color: #ffffff;
--text-muted: #a0a0a0; --text-muted: #a0a0a0;
--border-color: #2a3045;
font-family: 'Inter', system-ui, Avenir, Helvetica, Arial, sans-serif; --primary-bg: rgb(var(--primary-bg-rgb));
--secondary-bg: rgb(var(--secondary-bg-rgb));
--secondary-alt-bg: rgb(var(--tertiary-bg-rgb));
--tertiary-bg: rgb(var(--border-color-rgb));
--border-color: rgb(var(--border-color-rgb));
font-family: "Inter", system-ui, Avenir, Helvetica, Arial, sans-serif;
line-height: 1.6; line-height: 1.6;
font-weight: 400; font-weight: 400;
@@ -32,7 +38,12 @@ body {
background-color: var(--primary-bg); background-color: var(--primary-bg);
} }
h1, h2, h3, h4, h5, h6 { h1,
h2,
h3,
h4,
h5,
h6 {
color: var(--text-color); color: var(--text-color);
margin-top: 0; margin-top: 0;
} }
@@ -74,7 +85,8 @@ button:focus-visible {
outline: 4px auto -webkit-focus-ring-color; outline: 4px auto -webkit-focus-ring-color;
} }
input, select { input,
select {
background-color: var(--secondary-alt-bg); background-color: var(--secondary-alt-bg);
border: 1px solid var(--border-color); border: 1px solid var(--border-color);
color: var(--text-color); color: var(--text-color);
@@ -82,13 +94,20 @@ input, select {
border-radius: 6px; border-radius: 6px;
font-size: 1em; font-size: 1em;
font-family: inherit; font-family: inherit;
transition: all 0.2s ease;
} }
input:focus, select:focus { input:focus,
outline: 2px solid var(--accent-color); select:focus {
border-color: transparent; outline: none;
border-color: var(--accent-color);
box-shadow: 0 0 0 2px rgb(9, 109, 192, 0.2);
} }
* {
transition: background-color 0.3s ease, border-color 0.3s ease,
color 0.3s ease, box-shadow 0.3s ease;
}
ul { ul {
list-style: none; list-style: none;
@@ -97,15 +116,27 @@ ul {
.shader-theme { .shader-theme {
--primary-bg: transparent; /* Let the shader show through */ --primary-bg: transparent; /* Let the shader show through */
--secondary-bg: rgba(0, 0, 0, 0.7); /* Translucent cards */ --secondary-bg: rgb(var(--secondary-bg-rgb) / 0.7); /* Translucent cards */
--secondary-alt-bg: rgba(20, 20, 20, 0.6); /* Translucent inputs */ --secondary-alt-bg: rgb(
--tertiary-bg: rgba(40, 40, 40, 0.8); var(--secondary-alt-bg-rgb) / 0.6
--border-color: rgba(255, 255, 255, 0.15); ); /* Translucent inputs */
--text-color: #ffffff; --tertiary-bg: rgb(var(--tertiary-bg-rgb) / 0.8);
--accent-color: #121212; --border-color: rgb(var(--border-color-rgb) / 0.15);
--secondary-accent: #212121;
} }
.shader-theme body { .black-theme {
background-color: transparent; --primary-bg: transparent; /* Let the shader show through */
--secondary-bg: rgb(0, 0, 0, 0.7); /* Translucent cards */
--secondary-alt-bg: rgb(20, 20, 20, 0.6); /* Translucent inputs */
--tertiary-bg: rgb(40, 40, 40, 0.8);
--text-color: #ffffff;
--accent-color: #FF9500;
--secondary-accent: #FF6B00;
}
.sakura-theme {
--border-color: #DCABDF;
--text-color: #CFB3CD;
--accent-color: #F48FB1;
--secondary-accent: #880E4F;
} }
+3
View File
@@ -2,9 +2,12 @@ import { StrictMode } from 'react'
import { createRoot } from 'react-dom/client' import { createRoot } from 'react-dom/client'
import './index.css' import './index.css'
import App from './App.tsx' import App from './App.tsx'
import { ErrorBoundary } from './ErrorBoundary'
createRoot(document.getElementById('root')!).render( createRoot(document.getElementById('root')!).render(
<StrictMode> <StrictMode>
<ErrorBoundary>
<App /> <App />
</ErrorBoundary>
</StrictMode>, </StrictMode>,
) )
+17
View File
@@ -28,6 +28,7 @@ enum Source {
} }
message PersonList { repeated Person person = 1; } message PersonList { repeated Person person = 1; }
message GameList { repeated Game games = 1; } message GameList { repeated Game games = 1; }
// Authentication messages // Authentication messages
@@ -49,12 +50,18 @@ message LogoutResponse {
string message = 2; string message = 2;
} }
message RefreshResponse {
bool success = 1;
string message = 2;
}
message AuthStatusRequest { string token = 1; } message AuthStatusRequest { string token = 1; }
message AuthStatusResponse { message AuthStatusResponse {
bool authenticated = 1; bool authenticated = 1;
string username = 2; string username = 2;
string message = 3; string message = 3;
bool isAdmin = 4;
} }
// Authentication service // Authentication service
@@ -65,6 +72,7 @@ service AuthService {
} }
message GameRequest { string title = 1; } message GameRequest { string title = 1; }
message GetGamesRequest {} message GetGamesRequest {}
message AddOpinionRequest { message AddOpinionRequest {
@@ -74,9 +82,18 @@ message AddOpinionRequest {
message RemoveOpinionRequest { string game_title = 1; } message RemoveOpinionRequest { string game_title = 1; }
message GetGameInfoRequest {
repeated string games = 1;
}
message GameInfoResponse {
repeated Game games = 1;
}
service MainService { service MainService {
rpc GetGame(GameRequest) returns (Game); rpc GetGame(GameRequest) returns (Game);
rpc GetGames(GetGamesRequest) returns (GameList); rpc GetGames(GetGamesRequest) returns (GameList);
rpc AddGame(Game) returns (Game); rpc AddGame(Game) returns (Game);
rpc AddOpinion(AddOpinionRequest) returns (Person); rpc AddOpinion(AddOpinionRequest) returns (Person);
rpc GetGameInfo(GetGameInfoRequest) returns (GameInfoResponse);
} }
+985 -985
View File
File diff suppressed because it is too large Load Diff