Merge pull request #65 from DSM-Repo/refactor

fix: 버그 픽스
DSM-Repo · Sep 9, 2024 · 4ce00ac · 4ce00ac
2 parents f3de239 + eca7ff7
commit 4ce00ac
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 54 deletions.
diff --git a/packages/main/src/Pages/Landing/index.tsx b/packages/main/src/Pages/Landing/index.tsx
@@ -4,7 +4,6 @@ import { SlideSection } from "./SlideSection";
 import { Modal } from "./Modal";
 import { LogoFull } from "@/assets";
 import { Button } from "./Button";
-import { useAuth } from "@configs/util";
 
 export const Landing = () => {
   const [open, setOpen] = useState(false);
@@ -22,16 +21,6 @@ export const Landing = () => {
     };
   }, [setOpen]);
 
-  // const { getRole } = useAuth();
-  // useEffect(() => {
-  //   const role = getRole();
-  //   if (role === "student") {
-  //     window.location.replace(process.env.VITE_APP_URL_STUDENT as string);
-  //   } else if (role === "teacher") {
-  //     window.location.replace(process.env.VITE_APP_URL_TEACHER as string);
-  //   }
-  // }, []);
-
   return (
     <div className="relative col-flex items-center">
       <div className="absolute w-full h-[421px] -z-10 bg-gradient-to-b from-[#000000] to-[#00000000] " />

diff --git a/packages/student/src/pages/Write/index.tsx b/packages/student/src/pages/Write/index.tsx
@@ -5,6 +5,7 @@ import { Preview } from "./Preview";
 import {
   completion,
   confirm,
+  currentInfo,
   feedback,
   resumeData,
   submit,
@@ -39,6 +40,7 @@ export const Write = () => {
   const { refetch: refetchResume } = resumeData();
   const { data: complete, refetch: refetchCompl } = completion();
   const { mutate } = confirm();
+  const { refetch: refetchStudent } = currentInfo();
   const { mutate: submitResume } = submit();
   const { mutate: saveResume } = update();
   const idNum = Number(id);
@@ -73,6 +75,7 @@ export const Write = () => {
               onSuccess: () => {
                 toast.success("성공적으로 저장되었습니다");
                 refetchCompl();
+                refetchStudent();
               }
             }),
           disabled: resume.status !== "ONGOING",

diff --git a/packages/teacher/src/page/Resume.tsx b/packages/teacher/src/page/Resume.tsx
@@ -107,51 +107,58 @@ export const Resume = () => {
                 content: (
                   <div className="col-flex gap-2">
                     {feedbacks?.data.length !== 0 ? (
-                      feedbacks?.data.map((i) => (
-                        <div className="col-flex gap-1">
-                          <TextArea
-                            onChange={() => {}}
-                            placeholder=""
-                            size="full"
-                            value={i.comment}
-                            disabled
-                          />
-                          <div className="w-full flex items-center justify-between">
-                            <span className="text-[16px] text-light text-green-400">
-                              {i.status === "CONFIRMED" ? "반영된 피드백" : ""}
-                            </span>
-                            <div className="flex gap-2 items-center">
-                              {i.status === "CONFIRMED" ? (
-                                <>
-                                  <span
-                                    className="text-[15px] cursor-pointer"
-                                    onClick={() =>
-                                      confirm(`?id=${i.id}`, { onSuccess })
-                                    }
-                                  >
-                                    수락
-                                  </span>
-                                  <span
-                                    className="text-[15px] cursor-pointer"
-                                    onClick={() =>
-                                      reject(`?id=${i.id}`, { onSuccess })
-                                    }
-                                  >
-                                    거절
-                                  </span>
-                                </>
-                              ) : (
-                                <span
-                                  className="text-[15px] cursor-pointer"
-                                  onClick={() => del(`/${i.id}`, { onSuccess })}
-                                >
-                                  삭제
+                      feedbacks?.data.map(
+                        (i) =>
+                          !i.rejected && (
+                            <div className="col-flex gap-1">
+                              <TextArea
+                                onChange={() => {}}
+                                placeholder=""
+                                size="full"
+                                value={i.comment}
+                                disabled
+                              />
+                              <div className="w-full flex items-center justify-between">
+                                <span className="text-[16px] text-light text-green-400">
+                                  {i.status === "CONFIRMED"
+                                    ? "반영된 피드백"
+                                    : ""}
                                 </span>
-                              )}
+                                <div className="flex gap-2 items-center">
+                                  {i.status === "CONFIRMED" ? (
+                                    <>
+                                      <span
+                                        className="text-[15px] cursor-pointer"
+                                        onClick={() =>
+                                          confirm(`?id=${i.id}`, { onSuccess })
+                                        }
+                                      >
+                                        수락
+                                      </span>
+                                      <span
+                                        className="text-[15px] cursor-pointer"
+                                        onClick={() =>
+                                          reject(`?id=${i.id}`, { onSuccess })
+                                        }
+                                      >
+                                        거절
+                                      </span>
+                                    </>
+                                  ) : (
+                                    <span
+                                      className="text-[15px] cursor-pointer"
+                                      onClick={() =>
+                                        del(`/${i.id}`, { onSuccess })
+                                      }
+                                    >
+                                      삭제
+                                    </span>
+                                  )}
+                                </div>
+                              </div>
                             </div>
-                          </div>
-                        </div>
-                      ))
+                          )
+                      )
                     ) : (
                       <span className="text-[14px]">
                         아직 피드백이 없습니다