Merge branch 'develop' into feature/OZ-38

dnd-side-project · Aug 22, 2023 · a8a8751 · a8a8751
2 parents 15a412f + cca0dde
commit a8a8751
Show file tree

Hide file tree

Showing 43 changed files with 3,574 additions and 1,755 deletions.
diff --git a/next.config.js b/next.config.js
@@ -1,6 +1,9 @@
 /** @type {import('next').NextConfig} */
 const nextConfig = {
   reactStrictMode: true,
+  images: {
+    domains: ['posepicker-image.s3.ap-northeast-2.amazonaws.com'],
+  },
 };
 
 module.exports = nextConfig;
diff --git a/package.json b/package.json
@@ -11,9 +11,11 @@
   },
   "dependencies": {
     "@emotion/css": "^11.11.2",
+    "@tanstack/react-query": "^4.32.6",
     "@types/node": "20.4.5",
     "@types/react": "18.2.17",
     "@types/react-dom": "18.2.7",
+    "axios": "^1.4.0",
     "eslint": "^8.46.0",
     "eslint-config-next": "^13.4.12",
     "framer-motion": "^10.15.0",
@@ -34,7 +36,6 @@
     "eslint-plugin-jsx-a11y": "^6.7.1",
     "eslint-plugin-prettier": "^5.0.0",
     "eslint-plugin-react": "^7.33.1",
-    "eslint-plugin-react-hooks": "^4.6.0",
     "husky": "^8.0.3",
     "postcss": "^8.4.27",
     "prettier": "^3.0.0",

diff --git a/public/icons/github.svg b/public/icons/github.svg
diff --git a/public/icons/instagram.svg b/public/icons/instagram.svg
diff --git a/public/images/menu/icon-button.svg b/public/images/menu/icon-button.svg
diff --git a/public/lotties/pick.json b/public/lotties/pick.json
diff --git a/public/lotties/posepicker.json b/public/lotties/posepicker.json
diff --git a/public/lotties/talk_after_click.json b/public/lotties/talk_after_click.json
diff --git a/public/lotties/talk_after_loading.png b/public/lotties/talk_after_loading.png