description frontend

6 files changed, 57 insertions, 10 deletions

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) {
                     <SidebarListElement Href='/classes' Text='Classes' />
                     <SidebarListElement Href='/weapons' Text='Weapons' />
                 </ul>
-                <button onClick={() => setLang("ru")}> ru </button>
-                <button onClick={() => setLang("en")}> en </button>
+                <button onClick={() => {
+                    setLang("ru");
+                    window.location.reload();
+                }}> ru </button>
+                <button onClick={() => {
+                    setLang("en");
+                    window.location.reload();
+                }}> en </button>
             </div>
         </nav>
     );
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<string, string>([
     ["number of shots", "Количество выстрелов"],
     ["rate of fire", "Скорострельность"],
     ["reliability", "Надёжность"],
+    ["origin", "Источник"],
 
     // Concealabilities
     ["pocket", "Карман"],
     ["jacket", "Куртка"],
     ["long", "Длинный плащ"],
-    ["Nothing", "Невозможно спрятать"],
+    ["nothing", "Невозможно спрятать"],
 
     // Avaliabilities
     ["excellent", "Отличная"],
@@ -42,6 +43,8 @@ lang.LocalizedStrings = new Map<string, string>([
     ["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<RangedWeapon | null>(null);
+    const [description, setDescription] = useState<Description | null>(null);
 
     useState(() => {
         getWeapon(id).then(data => setWeapon(data));
+        getWeaponDescription(id, lang).then(data => setDescription(data));
     });
 
     if (weapon == null) {
@@ -30,7 +33,7 @@ function RangedWeaponPage() {
                 <tbody>
                     <tr> 
                         <td> { GetLocalizedString("Accuracy", lang) } </td>
-                        <td> {weapon.Accuracy} </td>
+                        <td> { weapon.Accuracy } </td>
                     </tr>
                     <tr>
                         <td> { GetLocalizedString("Concealability", lang) } </td>
@@ -42,22 +45,30 @@ function RangedWeaponPage() {
                     </tr>
                     <tr>
                         <td> { GetLocalizedString("Damage/Ammunition", lang) } </td>
-                        <td> {weapon.Damage}({weapon.Ammunition}) </td>
+                        <td> { weapon.Damage }({ weapon.Ammunition }) </td>
                     </tr>
                     <tr>
                         <td> { GetLocalizedString("Number Of Shots", lang) } </td>
-                        <td> {weapon.NumberOfShots} </td>
+                        <td> { weapon.NumberOfShots } </td>
                     </tr>
                     <tr>
                         <td> { GetLocalizedString("Rate Of Fire", lang) } </td>
-                        <td> {weapon.RateOfFire} </td>
+                        <td> { weapon.RateOfFire } </td>
                     </tr>
                     <tr>
                         <td> { GetLocalizedString("Reliability", lang) } </td>
                         <td> { GetLocalizedString(weapon.Reliability, lang) } </td>
                     </tr>
+                    <tr>
+                        <td> { GetLocalizedString("Origin", lang) } </td>
+                        <td> { GetLocalizedString(weapon.Origin, lang) } </td>
+                    </tr>
                 </tbody>
             </table>
+
+            <p>
+                {description?.Contents}
+            </p>
         </div>
     );
 }
@@ -82,4 +93,24 @@ async function getWeapon(id: string | undefined): Promise<RangedWeapon | null>
     }
 }
 
+async function getWeaponDescription(id: string | undefined, lanuage: AllowedLanguages): Promise<Description | null> {
+    if (id == undefined) return null;
+    try {
+        const {data, status} = await axios.get<Description>(
+            `${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 (
             <tr key={w.Id}>
-                <td> <a href={`/weapons/${w.Id}`}> {w.Name} </a> </td>
+                <td> <a href={`/weapons/${w.Id}`}> {w.Name} ({GetLocalizedString(w.Origin, language)}) </a> </td>
                 <td> {w.Accuracy} </td>
                 <td> {w.Concealability} </td>
                 <td> {w.Avaliability} </td>