Merge branch 'release/1.0.0'

Games-of-Switzerland · Feb 23, 2024 · e355f86 · e355f86
2 parents 9f12d22 + a2ae3cb
commit e355f86
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.0.0] - 2024-02-23
+### Changed
+- fix usage of hits.total on Elasticsearch with ES8 upgrade
+
+### Fixed
+- fix filters dropdown missing translations string
+
 ## [0.1.5] - 2023-06-06
 ### Security
 - update all dependencies JavaScript
@@ -61,7 +68,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - update changelog following 'keep a changelog'
 
-[Unreleased]: https://github.com/Games-of-Switzerland/gos-website/compare/0.1.5...HEAD
+[Unreleased]: https://github.com/Games-of-Switzerland/swissgamesgarden/compare/1.0.0...HEAD
+[1.0.0]: https://github.com/Games-of-Switzerland/swissgamesgarden/compare/0.1.5...1.0.0
 [0.1.5]: https://github.com/Games-of-Switzerland/gos-website/compare/0.1.4...0.1.5
 [0.1.4]: https://github.com/Games-of-Switzerland/gos-website/compare/0.1.3...0.1.4
 [0.1.3]: https://github.com/Games-of-Switzerland/gos-website/compare/0.1.2...0.1.3

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.1.5
+1.0.0
diff --git a/src/api/games.js b/src/api/games.js
@@ -11,7 +11,7 @@ const options = {
   keepPreviousData: true,
   select: data => ({
     ...data,
-    total: data?.pages?.[0].hits?.total || 0,
+    total: data?.pages?.[0].hits?.total?.value || 0,
     facets: data?.pages?.[0].aggregations?.aggs_all || {},
   }),
 };
@@ -35,7 +35,7 @@ export const fetchGames = async ({queryKey: [, value], pageParam}) => {
   }
 
   // Set next page index for next call
-  const hasNextPage = data.hits.total > (data.hits.hits.length * ((pageParam || 0) + 1));
+  const hasNextPage = data.hits.total.value > (data.hits.hits.length * ((pageParam || 0) + 1));
 
   data.page = pageParam;
   data.nextPage = hasNextPage ? (pageParam || 0) + 1 : false;

diff --git a/src/locales/en.json b/src/locales/en.json
@@ -5,12 +5,17 @@
     "xbox_one": "XBox One",
     "xbox series x|s": "Xbox Series X/S",
     "mac": "MacOS",
+    "pc": "PC",
     "ios": "iOS",
     "android": "Android",
     "ps_vita": "PS Vita",
+    "playstation_vita": "PS Vita",
     "3ds": "3DS",
+    "nintendo_3ds": "3DS",
     "ps4": "PlayStation 4",
+    "playstation_4": "PlayStation 4",
     "ps5": "PlayStation 5",
+    "playstation_5": "PlayStation 5",
     "smartphone": "Smartphone",
     "airconsole": "Air Console",
     "smaky": "Smaky",
@@ -72,15 +77,15 @@
     "racing": "Racing",
     "cooperation": "Cooperation",
     "multiplayer": "Multiplayer",
-    "local_multiplayer": "Online Multiplayer",  
+    "local_multiplayer": "Local Multiplayer",
+    "online_multiplayer": "Online Multiplayer",
     "narrative": "Narrative",
     "point_and_click": "Point & CLick",
     "arena_shooter": "Arena Shooter",
     "base-building": "Base Building",
     "exergame": "Exergame",
     "fantasy": "Fantasy",
     "free-to-play": "Free-to-play",
-    "local_multiplayer": "Local multiplayer",
     "rythym": "Rythym",
     "survival": "Survival",
     "tower_defense": "Tower defense",
@@ -130,7 +135,7 @@
     "released": "Released",
     "pre_release": "Pre-release",
     "development": "Development",
-    "canceled": "Canceled"  
+    "canceled": "Canceled"
   },
   "release_year_range": {
     "title": "Release year"
@@ -332,6 +337,7 @@
     "appenzell": "Appenzell",
     "bern": "Bern",
     "basel-stadt": "Basel City",
+    "basel-landschaft": "Basel-Landschaft",
     "foreign": "Foreign",
     "neuch_tel": "Neuchâtel",
     "st_gallen": "St-Gallen",