Merge pull request #99 from Onion-City/dev

Feat: 일정 검색 & 게시글, 댓글 & 출석

package.json

@@ -29,6 +29,8 @@
     "react-datepicker": "^6.9.0",
     "react-dom": "^18",
     "react-hook-form": "^7.51.2",
+    "react-query": "^3.39.3",
+    "react-toastify": "^10.0.5",
     "rsuite": "^5.58.1",
     "styled-components": "^6.1.8"
   },

src/apis/http.tsx

@@ -58,7 +58,7 @@ axiosInstance.interceptors.response.use(
     console.log(err);
     // access token 만료 시
     if (response?.status && response?.status === 403) {
-      window.location.href = "/login";
+      window.location.href = "/user/login";
       localStorage.clear();
       return config;
     }

src/app/info/board/like/page.tsx

@@ -0,0 +1,11 @@
+import { InfoBoardLike } from "@/features/info/board/like/InfoBoardLike";
+
+const InfoBoardLikePage = () => {
+  return (
+    <>
+      <InfoBoardLike/>
+    </>
+  );
+};
+
+export default InfoBoardLikePage;

src/app/user/club/page.tsx → src/app/user/club/create/page.tsx

@@ -1,8 +1,8 @@
 import SetupUserClub from "@/features/user/club/SetupUserClub";
 
-const UserClub = () => {
+const UserClubCreate = () => {
     // 모임 등록 페이지
     return <SetupUserClub />;
 }
 
-export default UserClub;
+export default UserClubCreate;

src/app/user/club/join/[clubId]/page.tsx

@@ -0,0 +1,7 @@
+import InvitationCode from "@/features/user/joinClub/InvitationCode";
+
+const JoinClubInfo = () => {
+  return <InvitationCode />;
+};
+
+export default JoinClubInfo;

src/app/login/page.tsx → src/app/user/login/page.tsx

@@ -1,4 +1,4 @@
-import Login from "@/features/Login/Login";
+import Login from "@/features/user/Login/Login";
 
 const UserLogin = () => {
   return <Login />;

src/components/atoms/comment/Comment.css

@@ -1,10 +1,11 @@
 .comment__box {
   display: flex;
   align-items: center;
-  width:fit-content;
+  width: 100%;
 }
 .comment__box__wrapper {
   margin-top: 0.94rem;
+  width: 100%;
 }
 .comment__box__is__reply img {
   width: 0.875rem;
@@ -15,6 +16,7 @@
 .comment__box__profile {
   display: flex;
   align-items: center;
+  width: 100%;
 }
 .comment__box__profile img {
   width: 1.8125rem;
@@ -27,10 +29,9 @@
   margin-bottom: 0.31rem;
   display: flex;
   flex-direction: column;
+  margin-right: auto;
 }
-.comment__box__edit {
-  margin-left: auto;
-}
+
 .comment__box__margin__left {
   margin-left: 2.4125rem;
 }