Merge branch 'main' into refactor/meister

Author: Ubinquitous

src/apis/httpClient/httpClient.ts

@@ -1,7 +1,7 @@
 import axios, { AxiosInstance, AxiosRequestConfig } from "axios";
 import { requestInterceptors, responseInterceptors } from "@/apis/interceptor";
-import { ERROR } from "@/constants";
-import { TOKEN } from "@/storage/constants";
+import ERROR from "@/constants/error.constant";
+import { TOKEN } from "@/storage/constants/";
 import Storage from "../../storage";
 import { refresh } from "../token";
 
@@ -165,21 +165,21 @@ export const axiosConfig: HttpClientConfig = {
 };
 
 export default {
-  oauth: new HttpClient("api/auth/oauth/bsm", axiosConfig),
-  user: new HttpClient("api/user", axiosConfig),
-  timetable: new HttpClient("api/timeTable", axiosConfig),
-  post: new HttpClient("api/post/", axiosConfig),
-  recomment: new HttpClient("api/recomment", axiosConfig),
-  comment: new HttpClient("api/comment", axiosConfig),
-  auth: new HttpClient("api/auth/", axiosConfig),
-  bamboo: new HttpClient("api/bamboo", axiosConfig),
-  admin: new HttpClient("api/bamboo/admin", axiosConfig),
-  like: new HttpClient("api/likes/update", axiosConfig),
-  image: new HttpClient("api/image/save", axiosConfig),
-  meal: new HttpClient("api/meal", axiosConfig),
-  calendar: new HttpClient("api/calender", axiosConfig),
-  ber: new HttpClient("api/ber", axiosConfig),
-  meister: new HttpClient("api/meister", axiosConfig),
-  ranking: new HttpClient("api/meister/ranking", axiosConfig),
-  main: new HttpClient("api/main", axiosConfig),
+  oauth: new HttpClient("/api/auth/oauth/bsm", axiosConfig),
+  user: new HttpClient("/api/user", axiosConfig),
+  timetable: new HttpClient("/api/timeTable", axiosConfig),
+  post: new HttpClient("/api/post/", axiosConfig),
+  recomment: new HttpClient("/api/recomment", axiosConfig),
+  comment: new HttpClient("/api/comment", axiosConfig),
+  auth: new HttpClient("/api/auth/", axiosConfig),
+  bamboo: new HttpClient("/api/bamboo", axiosConfig),
+  admin: new HttpClient("/api/bamboo/admin", axiosConfig),
+  like: new HttpClient("/api/likes/update", axiosConfig),
+  image: new HttpClient("/api/image/save", axiosConfig),
+  meal: new HttpClient("/api/meal", axiosConfig),
+  calendar: new HttpClient("/api/calender", axiosConfig),
+  ber: new HttpClient("/api/ber", axiosConfig),
+  meister: new HttpClient("/api/meister", axiosConfig),
+  ranking: new HttpClient("/api/meister/ranking", axiosConfig),
+  main: new HttpClient("/api/main", axiosConfig),
 };

src/app/not-found.tsx

@@ -2,7 +2,7 @@
 
 import { PageNotFound } from "@/assets/images";
 import { Button } from "@/components/atoms";
-import { ROUTER } from "@/constants";
+import ROUTER from "@/constants/router.constant";
 import { color, flex } from "@/styles";
 import Image from "next/image";
 import { useRouter } from "next/navigation";

src/app/post/[id]/update/page.tsx renamed to src/app/post/[id]/edit/page.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import UpdatePage from "@/templates/forum-edit";
+import PostEditPage from "@/templates/post/layouts/edit";
 
 interface IPostUpdateAppPageParams {
   params: {
@@ -9,7 +9,7 @@ interface IPostUpdateAppPageParams {
 }
 
 const Update = ({ params }: IPostUpdateAppPageParams) => {
-  return <UpdatePage {...params} />;
+  return <PostEditPage {...params} />;
 };
 
 export default Update;

src/app/post/[id]/page.tsx

@@ -1,15 +1,15 @@
 "use client";
 
-import PostPage from "@/templates/forum-post";
+import PostDetailPage from "@/templates/post/layouts/detail";
 
 interface IPostAppPageParams {
   params: {
     id: number;
   };
 }
 
-const Post = ({ params }: IPostAppPageParams) => {
-  return <PostPage {...params} />;
+const PostDetail = ({ params }: IPostAppPageParams) => {
+  return <PostDetailPage {...params} />;
 };
 
-export default Post;
+export default PostDetail;

src/app/post/page.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import PostPage from "@/templates/post/layouts";
+import PostPage from "@/templates/post/layouts/list";
 
 const Post = () => {
   return <PostPage />;

src/app/post/write/page.tsx

@@ -1,9 +1,9 @@
 "use client";
 
-import WritePage from "@/templates/forum-write";
+import PostWritePage from "@/templates/post/layouts/write";
 
 const Write = () => {
-  return <WritePage />;
+  return <PostWritePage />;
 };
 
 export default Write;

src/assets/data/emptyInputPost.ts

@@ -1,4 +1,3 @@
-export { default as Arrow } from "./Arrow";
 export { default as CategoryArrow } from "./CategoryArrow";
 export { default as Check } from "./Check";
 export { default as Emoji } from "./Emoji";
@@ -15,7 +14,6 @@ export { default as Relaxed } from "./emojis/Relaxed";
 export { default as Curve } from "./Curve";
 export { default as HistorySeparator } from "./HistorySeparator";
 export { default as UploadIcon } from "./UploadIcon";
-export { default as AddCommentIcon } from "./AddCommentIcon";
 export { default as DesktopIcon } from "./DesktopIcon";
 export { default as MealIcon } from "./MealIcon";
 export { default as BerIcon } from "./BerIcon";

src/assets/icons/index.ts

@@ -1,21 +1,57 @@
-import styled from "styled-components";
+import styled, { css } from "styled-components";
 import { color, font } from "@/styles";
 
-interface IButtonProps extends React.ButtonHTMLAttributes<HTMLButtonElement> {
+interface ButtonProps extends React.ButtonHTMLAttributes<HTMLButtonElement> {
   color: string;
+  align?: "TOP" | "RIGHT" | "BOTTOM" | "LEFT";
+  isSmall?: boolean;
 }
 
-const Button = ({ ...props }: IButtonProps) => {
+const Button = ({ ...props }: ButtonProps) => {
   return <StyledButton {...props} />;
 };
 
-const StyledButton = styled.button<{ color: string }>`
+const StyledButton = styled.button<{
+  color: string;
+  align?: string;
+  isSmall?: boolean;
+}>`
   width: fit-content;
-  padding: 4px 16px;
   border-radius: 4px;
   background-color: ${(props) => props.color};
   color: ${color.white};
-  ${font.btn3};
+  ${({ isSmall }) =>
+    isSmall
+      ? css`
+          padding: 3px 10px;
+          ${font.caption};
+        `
+      : css`
+          padding: 4px 16px;
+          ${font.btn3};
+        `};
+  ${({ align }) => {
+    switch (align) {
+      case "TOP":
+        return css`
+          margin-bottom: auto;
+        `;
+      case "RIGHT":
+        return css`
+          margin-left: auto;
+        `;
+      case "BOTTOM":
+        return css`
+          margin-top: auto;
+        `;
+      case "LEFT":
+        return css`
+          margin-right: auto;
+        `;
+      default:
+        return "";
+    }
+  }}
 `;
 
 export default Button;

src/components/atoms/Button.tsx

@@ -23,7 +23,7 @@ interface ICustomEditorProps extends CustomEditorPropsType {
 const CustomEditor = ({ ...props }: ICustomEditorProps) => {
   const { openModal, closeModal } = useModal();
 
-  const handleImageSelected = async (file: File | undefined) => {
+  const handleImageSelected = async (file?: File) => {
     closeModal();
     const imageUrl = await getImageUrl(file);