Merge branch 'main' into feature/rework-mobile

mafia-rust · Dec 29, 2024 · 349c8d3 · 349c8d3
2 parents 0810958 + f6caf7f
commit 349c8d3
Show file tree

Hide file tree

Showing 16 changed files with 585 additions and 249 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -46,6 +46,7 @@
         "Thanos",
         "Tidyable",
         "tungstenite",
+        "uncategorized",
         "unclicked",
         "Unswappable",
         "Uzumaki",

diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -17,14 +17,16 @@
     "react-dom": "^18.2.0",
     "react-helmet": "^6.1.0",
     "react-resizable-panels": "^2.1.6",
+    "react-responsive-masonry": "^2.6.0",
     "react-scripts": "^5.0.1",
     "react-virtuoso": "^4.12.0",
     "typescript": "^4",
     "web-vitals": "^2.1.4"
   },
   "devDependencies": {
     "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
-    "@types/react-helmet": "^6.1.11"
+    "@types/react-helmet": "^6.1.11",
+    "@types/react-responsive-masonry": "^2.1.3"
   },
   "scripts": {
     "start": "react-scripts start",