diff --git a/backend/src/handlers/auth.rs b/backend/src/handlers/auth.rs index 738cd0c..c53dd5f 100644 --- a/backend/src/handlers/auth.rs +++ b/backend/src/handlers/auth.rs @@ -100,7 +100,7 @@ async fn gamma_callback( } }; - if let Err(_) = session.insert("gamma_access_token", token) { + if session.insert("gamma_access_token", token).is_err() { error!("[Gamma auth] Could not set gamma_acess_token key in cookie"); return HttpResponse::InternalServerError().finish(); } diff --git a/backend/src/repositories/user.rs b/backend/src/repositories/user.rs index 05d7a00..d653bd7 100644 --- a/backend/src/repositories/user.rs +++ b/backend/src/repositories/user.rs @@ -42,8 +42,7 @@ impl UserRepository { .get_users() .await? .into_iter() - .filter(|user| user.cid.as_str() == cid) - .next() + .find(|user| user.cid.as_str() == cid) .ok_or(HubbitError::NotFound)?; let groups = self.gamma_client.get_groups_for_user(&user.id).await?; diff --git a/backend/src/schema/device.rs b/backend/src/schema/device.rs index 40d238d..10b2853 100644 --- a/backend/src/schema/device.rs +++ b/backend/src/schema/device.rs @@ -3,7 +3,7 @@ use log::error; use uuid::Uuid; use crate::{ - models::{AuthorizedUser, GammaUser}, + models::AuthorizedUser, repositories::{ device::{CreateDevice, DeviceRepository, UpdateDevice}, session::SessionRepository, diff --git a/backend/src/schema/user.rs b/backend/src/schema/user.rs index 1d233a8..3fa5b64 100644 --- a/backend/src/schema/user.rs +++ b/backend/src/schema/user.rs @@ -5,7 +5,7 @@ use serde::{Deserialize, Serialize}; use uuid::Uuid; use crate::{ - models::{AuthorizedUser, GammaGroupType, GammaUser, UserSession}, + models::{AuthorizedUser, GammaGroupType, UserSession}, repositories::{device::DeviceRepository, user_session::UserSessionRepository}, services::{hour_stats::HourStatsService, user::UserService}, utils::{MAX_DATETIME, MIN_DATETIME}, diff --git a/frontend/src/components/stats-table/StatsTable.tsx b/frontend/src/components/stats-table/StatsTable.tsx index fd81d26..38e0c8c 100644 --- a/frontend/src/components/stats-table/StatsTable.tsx +++ b/frontend/src/components/stats-table/StatsTable.tsx @@ -10,8 +10,7 @@ import { StatsTableStatFragment, } from '../../__generated__/graphql'; import { formatNick } from '../../util'; - -import styles from './StatsTable.module.scss'; +import styles from "./StatsTable.module.scss"; import Image from 'next/image'; interface Props { @@ -85,6 +84,8 @@ const StatsTable = ({ stats, me, hideChange = false, currentActive }: Props) => src={getChangeImageName(stat.currentPosition, stat.prevPosition)} alt="position change icon" className={styles.changeIcon} + width={16} + height={16} /> )}