Merge

42-world · Mar 12, 2022 · c8b36ef · c8b36ef
2 parents ebdf2ac + 8904f44
commit c8b36ef
Show file tree

Hide file tree

Showing 37 changed files with 1,092 additions and 947 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -20,11 +20,14 @@
     "react": "^17.0.2",
     "react-circular-progressbar": "^2.0.4",
     "react-dom": "^17.0.2",
+    "react-error-boundary": "^3.1.4",
     "react-intersection-observer": "^8.33.1",
+    "react-query": "^3.34.16",
     "react-router-dom": "^6.2.1",
     "react-scripts": "5.0.0",
     "react-textarea-autosize": "^8.3.3",
     "react-transition-group": "^4.4.2",
+    "remove-markdown": "^0.3.0",
     "styled-components": "^5.3.3",
     "web-vitals": "^2.1.3"
   },

diff --git a/public/assets/42mainlogo3.png b/public/assets/42mainlogo3.png
diff --git a/public/assets/CharacterWhiteBG/bbo.png b/public/assets/CharacterWhiteBG/bbo.png
diff --git a/public/assets/CharacterWhiteBG/bora.png b/public/assets/CharacterWhiteBG/bora.png
diff --git a/public/assets/CharacterWhiteBG/ddub.png b/public/assets/CharacterWhiteBG/ddub.png
diff --git a/public/assets/CharacterWhiteBG/nana.png b/public/assets/CharacterWhiteBG/nana.png