From ec5ef35ed47b90b9f09199d28f7885f8287815a8 Mon Sep 17 00:00:00 2001 From: physcik Date: Tue, 28 Apr 2026 12:34:36 +0500 Subject: description frontend --- backend/src/Handler.zig | 14 +++++++------ front/src/Emelents/Sidebar.tsx | 10 ++++++++-- front/src/Locales/ru_RU.ts | 5 ++++- front/src/Models/Description.ts | 5 +++++ front/src/Models/RangedWeapon.ts | 2 ++ front/src/Pages/RangedWeapon.tsx | 43 ++++++++++++++++++++++++++++++++++------ front/src/Pages/Weapons.tsx | 2 +- 7 files changed, 65 insertions(+), 16 deletions(-) create mode 100644 front/src/Models/Description.ts diff --git a/backend/src/Handler.zig b/backend/src/Handler.zig index 2f3389e..1da0d42 100644 --- a/backend/src/Handler.zig +++ b/backend/src/Handler.zig @@ -3,7 +3,7 @@ const httpz = @import("httpz"); const userModel = @import("Models/User.zig"); const tokens = @import("Authentication/Tokens.zig"); -pub const errors = error { +pub const authError = error { Unauthorized, Forbidden, }; @@ -38,10 +38,12 @@ pub const RequestData = struct { return self.User.?.Role >= minimalRole; } - pub fn CheckAccess(self: RequestData, minimalRole: userModel.Role) !void { - if (self.User == null) return errors.Unauthorized; + /// This function returns an error that is caught by a handler. Add this to + /// the start of the handler to add an auth + pub fn CheckAccess(self: RequestData, minimalRole: userModel.Role) authError!void { + if (self.User == null) return authError.Unauthorized; if (@intFromEnum(self.User.?.Role) < @intFromEnum(minimalRole)) - return errors.Forbidden; + return authError.Forbidden; } }; @@ -51,10 +53,10 @@ pub const Handler = struct { // std.debug.print("Data: {any}\n", .{ data }); action(&data, req, res) catch |err| { switch (err) { - errors.Forbidden => { + authError.Forbidden => { res.setStatus(.forbidden); }, - errors.Unauthorized => { + authError.Unauthorized => { res.setStatus(.unauthorized); }, else => { diff --git a/front/src/Emelents/Sidebar.tsx b/front/src/Emelents/Sidebar.tsx index 649f2fc..c650145 100644 --- a/front/src/Emelents/Sidebar.tsx +++ b/front/src/Emelents/Sidebar.tsx @@ -20,8 +20,14 @@ function Sidebar({setLang}: SidebarProps) { - - + + ); diff --git a/front/src/Locales/ru_RU.ts b/front/src/Locales/ru_RU.ts index 9a69130..7802055 100644 --- a/front/src/Locales/ru_RU.ts +++ b/front/src/Locales/ru_RU.ts @@ -24,12 +24,13 @@ lang.LocalizedStrings = new Map([ ["number of shots", "Количество выстрелов"], ["rate of fire", "Скорострельность"], ["reliability", "Надёжность"], + ["origin", "Источник"], // Concealabilities ["pocket", "Карман"], ["jacket", "Куртка"], ["long", "Длинный плащ"], - ["Nothing", "Невозможно спрятать"], + ["nothing", "Невозможно спрятать"], // Avaliabilities ["excellent", "Отличная"], @@ -42,6 +43,8 @@ lang.LocalizedStrings = new Map([ ["standard", "Обычное"], ["unreliable", "Ненадёжное"], + // Origins + ["corebook", "Книга игрока"], ]); export default lang; diff --git a/front/src/Models/Description.ts b/front/src/Models/Description.ts new file mode 100644 index 0000000..b737e78 --- /dev/null +++ b/front/src/Models/Description.ts @@ -0,0 +1,5 @@ +export type Description = { + Id: string, + Language: string, + Contents: string, +}; diff --git a/front/src/Models/RangedWeapon.ts b/front/src/Models/RangedWeapon.ts index 2bc9995..c554d3f 100644 --- a/front/src/Models/RangedWeapon.ts +++ b/front/src/Models/RangedWeapon.ts @@ -11,6 +11,7 @@ export type RangedWeapon = { NumberOfShots: number, RateOfFire: number, Reliability: string, + Origin: string, CreatedAt: number, UpdatedAt: number, @@ -28,4 +29,5 @@ export type RangedWeaponRequest = { NumberOfShots: number, RateOfFire: number, Reliability: string, + Origin: string, }; diff --git a/front/src/Pages/RangedWeapon.tsx b/front/src/Pages/RangedWeapon.tsx index 91471b2..9c578f8 100644 --- a/front/src/Pages/RangedWeapon.tsx +++ b/front/src/Pages/RangedWeapon.tsx @@ -1,9 +1,10 @@ import { useContext, useState } from "react"; -import { LanguageContext } from "../Locales/Context"; +import { AllowedLanguages, LanguageContext } from "../Locales/Context"; import { BackendURL } from "../Config"; import axios from "axios"; import { RangedWeapon } from "../Models/RangedWeapon"; -import { Navigate, useParams } from "react-router"; +import { Description } from "../Models/Description"; +import { useParams } from "react-router"; import { GetLocalizedString } from "../Locales/Locales"; import "./Weapons.css" @@ -13,9 +14,11 @@ function RangedWeaponPage() { const { id } = useParams(); const lang = useContext(LanguageContext); const [weapon, setWeapon] = useState(null); + const [description, setDescription] = useState(null); useState(() => { getWeapon(id).then(data => setWeapon(data)); + getWeaponDescription(id, lang).then(data => setDescription(data)); }); if (weapon == null) { @@ -30,7 +33,7 @@ function RangedWeaponPage() { { GetLocalizedString("Accuracy", lang) } - {weapon.Accuracy} + { weapon.Accuracy } { GetLocalizedString("Concealability", lang) } @@ -42,22 +45,30 @@ function RangedWeaponPage() { { GetLocalizedString("Damage/Ammunition", lang) } - {weapon.Damage}({weapon.Ammunition}) + { weapon.Damage }({ weapon.Ammunition }) { GetLocalizedString("Number Of Shots", lang) } - {weapon.NumberOfShots} + { weapon.NumberOfShots } { GetLocalizedString("Rate Of Fire", lang) } - {weapon.RateOfFire} + { weapon.RateOfFire } { GetLocalizedString("Reliability", lang) } { GetLocalizedString(weapon.Reliability, lang) } + + { GetLocalizedString("Origin", lang) } + { GetLocalizedString(weapon.Origin, lang) } + + +

+ {description?.Contents} +

); } @@ -82,4 +93,24 @@ async function getWeapon(id: string | undefined): Promise } } +async function getWeaponDescription(id: string | undefined, lanuage: AllowedLanguages): Promise { + if (id == undefined) return null; + try { + const {data, status} = await axios.get( + `${RangedWeaponsURL}/${id}/description?lang=${lanuage}`, + { + headers: { Accept: "application/json" } + } + ); + + if (status != 200) return null; + + return data; + + } catch (err) { + console.log(`Failed to get ranged weapon: ${err}`); + return null; + } +} + export default RangedWeaponPage; diff --git a/front/src/Pages/Weapons.tsx b/front/src/Pages/Weapons.tsx index 4d8632c..1b72f16 100644 --- a/front/src/Pages/Weapons.tsx +++ b/front/src/Pages/Weapons.tsx @@ -48,7 +48,7 @@ function generatedRangedWeaponsList(rangedWeapons: RangedWeapon[] | null, langua const elements = categorized.get(x)?.map(w => { return ( - {w.Name} + {w.Name} ({GetLocalizedString(w.Origin, language)}) {w.Accuracy} {w.Concealability} {w.Avaliability} -- cgit v1.3