Merge pull request #256 from elmadev/dev

Live release 2 nov 2024
elmadev · Nov 2, 2024 · 205da74 · 205da74
2 parents aa054b8 + dae4891
commit 205da74
Show file tree

Hide file tree

Showing 4 changed files with 184 additions and 60 deletions.
diff --git a/src/api.js b/src/api.js
@@ -349,6 +349,7 @@ export const IntBestTimes = kuskiIndex => {
 };
 export const LevelPacksByLevel = LevelIndex =>
   api.get(`levelpack/byLevel/${+LevelIndex}`);
+export const CupsByLevel = LevelIndex => api.get(`cups/byLevel/${+LevelIndex}`);
 export const LatestLevelPacks = limit => api.get(`levelpack/latest/${limit}`);
 
 export const LevelPackRecordHistory = (name, opts) =>

diff --git a/src/pages/level/index.jsx b/src/pages/level/index.jsx
@@ -74,6 +74,7 @@ const Level = ({ LevelId }) => {
     eolLoading,
     timeStats,
     levelpacks,
+    cups,
     statsLoading,
     settings: { fancyMap, showGravityApples },
     personalLeaderHistory,
@@ -276,6 +277,17 @@ const Level = ({ LevelId }) => {
                           ])}
                         </div>
                       )}
+                      {cups && cups.length > 0 && (
+                        <div>
+                          {`Cup: `}
+                          {cups.map((cup, index) => [
+                            index > 0 && ', ',
+                            <Link to={`/cup/${cup.ShortName}/events`}>
+                              {cup.CupName}
+                            </Link>,
+                          ])}
+                        </div>
+                      )}
                       {level.AcceptBugs !== 0 && (
                         <div>Apple bugs are allowed in this level.</div>
                       )}

diff --git a/src/pages/level/store.js b/src/pages/level/store.js
@@ -8,6 +8,7 @@ import {
   LevelTimeStats,
   LeaderHistory,
   LevelPacksByLevel,
+  CupsByLevel,
   GetLevelTags,
   UpdateLevelTags,
 } from 'api';
@@ -17,6 +18,7 @@ export default {
   besttimesLoading: false,
   level: {},
   levelpacks: [],
+  cups: [],
   battlesForLevel: [],
   loading: true,
   allfinished: [],
@@ -63,6 +65,9 @@ export default {
   setLevelPacks: action((state, payload) => {
     state.levelpacks = payload;
   }),
+  setCups: action((state, payload) => {
+    state.cups = payload;
+  }),
   setBattlesForLevel: action((state, payload) => {
     state.battlesForLevel = payload;
   }),
@@ -84,6 +89,12 @@ export default {
         actions.setLevelPacks(res.data);
       }
     });
+
+    CupsByLevel(payload).then(res => {
+      if (res.ok) {
+        actions.setCups(res.data);
+      }
+    });
   }),
   setAllfinished: action((state, payload) => {
     state.allfinished = payload.times;