feat: merge dev

GDSC-Hongik · Aug 20, 2024 · 1129719 · 1129719
2 parents 05a9232 + 55b19a2
commit 1129719
Show file tree

Hide file tree

Showing 40 changed files with 494 additions and 331 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -6,7 +6,7 @@ on:
       - main
       - dev
   pull_request:
-    types: [opened, ready_for_review, converted_to_draft]
+    types: [opened, ready_for_review, converted_to_draft, synchronize]
     branches:
       - main
       - dev
@@ -34,7 +34,7 @@ jobs:
           run_install: false
 
       - name: Install dependencies
-        run: pnpm install
+        run: pnpm install --no-frozen-lockfile
 
       - name: Run build
         run: pnpm run build
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,4 +1,8 @@
 {
+  "editor.codeActionsOnSave": {
+    "source.fixAll.eslint": "explicit",
+    "source.fixAll.stylelint": "explicit"
+  },
   "eslint.workingDirectories": [
     {
       "mode": "auto"

diff --git a/apps/admin/apis/auth/dashboardApi.ts b/apps/admin/apis/auth/dashboardApi.ts
@@ -0,0 +1,20 @@
+import { fetcher } from "@wow-class/utils";
+import { apiPath } from "constants/apiPath";
+import { tags } from "constants/tags";
+import type { DashboardApiResponseDto } from "types/dtos/auth";
+
+export const dashboardApi = {
+  getDashboardInfo: async () => {
+    const response = await fetcher.get<DashboardApiResponseDto>(
+      apiPath.dashboard,
+      {
+        next: { tags: [tags.dashboard] },
+      }
+    );
+
+    const studyRole = response.data?.member.studyRole;
+    const manageRole = response.data?.member.manageRole;
+
+    return { studyRole, manageRole };
+  },
+};
diff --git a/apps/admin/app/error.tsx b/apps/admin/app/error.tsx
@@ -0,0 +1,6 @@
+"use client";
+const ErrorPage = () => {
+  return <div>error</div>;
+};
+
+export default ErrorPage;
diff --git a/apps/admin/app/layout.tsx b/apps/admin/app/layout.tsx
@@ -2,7 +2,6 @@ import "./global.css";
 import "wowds-ui/styles.css";
 import "@wow-class/ui/styles.css";
 
-import Navbar from "components/Navbar";
 import type { Metadata } from "next";
 
 import { JotaiProvider } from "../components/JotaiProvider";
@@ -20,10 +19,7 @@ const RootLayout = ({
   return (
     <html lang="ko">
       <body>
-        <JotaiProvider>
-          <Navbar />
-          {children}
-        </JotaiProvider>
+        <JotaiProvider>{children}</JotaiProvider>
       </body>
     </html>
   );

diff --git a/apps/admin/app/not-found.tsx b/apps/admin/app/not-found.tsx
@@ -0,0 +1,5 @@
+const NotFound = () => {
+  return <div>요청하신 페이지를 찾을 수 없어요.</div>;
+};
+
+export default NotFound;
diff --git a/apps/admin/app/studies/create-study/_components/CreateStudyButton.tsx b/apps/admin/app/studies/create-study/_components/CreateStudyButton.tsx
@@ -0,0 +1,55 @@
+import { css } from "@styled-system/css";
+import { Flex } from "@styled-system/jsx";
+import Link from "next/link";
+import isAdmin from "utils/isAdmin";
+import { Plus } from "wowds-icons";
+
+const CreateStudyButton = async () => {
+  const adminStatus = await isAdmin();
+
+  if (!adminStatus) return null;
+
+  return (
+    <Link href="studies/create-study">
+      <button className={createStudyButtonStyle}>
+        <Flex gap="xs">
+          <p className={css({ textStyle: "label1", color: "sub" })}>
+            새로운 스터디 개설하기
+          </p>
+          <div className={PlusIconStyle}>
+            <Plus height={14} width={14} />
+          </div>
+        </Flex>
+      </button>
+    </Link>
+  );
+};
+
+export default CreateStudyButton;
+
+const createStudyButtonStyle = css({
+  width: "100%",
+  display: "flex",
+  justifyContent: "center",
+  borderRadius: "md",
+  borderStyle: "dashed",
+  borderWidth: "1px",
+  borderColor: "outline",
+  padding: "32px",
+  _hover: {
+    backgroundColor: "backgroundAlternative",
+    borderWidth: "0px",
+    cursor: "pointer",
+  },
+});
+
+const PlusIconStyle = css({
+  display: "flex",
+  justifyContent: "center",
+  alignItems: "center",
+  width: "20px",
+  height: "20px",
+  borderRadius: "full",
+  backgroundColor: "primary",
+  color: "white",
+});
diff --git a/apps/admin/app/studies/create-study/page.tsx b/apps/admin/app/studies/create-study/page.tsx
@@ -0,0 +1,5 @@
+const CreateStudyPage = () => {
+  return <div>스터디 생성</div>;
+};
+
+export default CreateStudyPage;
diff --git a/apps/admin/app/studies/layout.tsx b/apps/admin/app/studies/layout.tsx
@@ -0,0 +1,20 @@
+import { Flex, styled } from "@styled-system/jsx";
+import Navbar from "components/Navbar";
+const StudiesLayout = ({
+  children,
+}: Readonly<{
+  children: React.ReactNode;
+}>) => {
+  return (
+    <>
+      <Navbar />
+      <styled.div padding="54px 101px" width="100%">
+        <Flex direction="column" gap="sm" width="100%">
+          {children}
+        </Flex>
+      </styled.div>
+    </>
+  );
+};
+
+export default StudiesLayout;
diff --git a/apps/admin/app/studies/page.tsx b/apps/admin/app/studies/page.tsx
@@ -1,5 +1,17 @@
-const Studies = () => {
-  return <div>Studies</div>;
+import { css } from "@styled-system/css";
+import { Flex } from "@styled-system/jsx";
+
+import CreateStudyButton from "./create-study/_components/CreateStudyButton";
+
+const StudiesPage = () => {
+  return (
+    <>
+      <Flex align="center" justifyContent="space-between">
+        <p className={css({ textStyle: "h1" })}>개설된 스터디</p>
+      </Flex>
+      <CreateStudyButton />
+    </>
+  );
 };
 
-export default Studies;
+export default StudiesPage;
diff --git a/apps/admin/components/Navbar.tsx b/apps/admin/components/Navbar.tsx
@@ -56,6 +56,7 @@ export default Navbar;
 
 const navbarContainerStyle = css({
   width: "250px",
+  minWidth: "250px",
   minHeight: "100vh",
   paddingTop: "54px",
   borderRightWidth: "arrow",

diff --git a/apps/admin/constants/apiPath.ts b/apps/admin/constants/apiPath.ts
@@ -0,0 +1,3 @@
+export const enum apiPath {
+  dashboard = "/onboarding/members/me/dashboard",
+}
diff --git a/apps/admin/constants/tags.ts b/apps/admin/constants/tags.ts
@@ -0,0 +1,3 @@
+export const enum tags {
+  dashboard = "dashboard",
+}
diff --git a/apps/admin/middleware.ts b/apps/admin/middleware.ts
@@ -0,0 +1,32 @@
+import { dashboardApi } from "apis/auth/dashboardApi";
+import { cookies } from "next/headers";
+import type { NextRequest } from "next/server";
+import { NextResponse } from "next/server";
+
+export const config = {
+  matcher: ["/studies/:path*", "/participants/:path*"],
+};
+
+const middleware = async (req: NextRequest) => {
+  const cookieStore = cookies();
+  const accessToken = cookieStore.get("accessToken")?.value;
+
+  if (!accessToken) {
+    return NextResponse.redirect(new URL("/not-found", req.url));
+  }
+
+  const { studyRole, manageRole } = await dashboardApi.getDashboardInfo();
+
+  if (studyRole === "STUDENT" && manageRole === "NONE") {
+    const url =
+      process.env.NODE_ENV === "production"
+        ? process.env.CLIENT_PROD_URL
+        : process.env.CLIENT_DEV_URL;
+
+    return NextResponse.redirect(new URL("/auth", url));
+  }
+
+  return NextResponse.next();
+};
+
+export default middleware;
diff --git a/apps/admin/types/dtos/auth.ts b/apps/admin/types/dtos/auth.ts
@@ -0,0 +1,47 @@
+import type { StatusType } from "../entities/auth";
+
+export interface DashboardApiResponseDto {
+  member: {
+    memberId: number;
+    role: "GUEST" | "ADMIN" | "REGULAR";
+    manageRole: "ADMIN" | "NONE";
+    studyRole: "MENTOR" | "STUDENT";
+    basicInfo: {
+      name: string;
+      studentId: string;
+      email: string;
+      department: string;
+      phone: string;
+      discordUsername: string;
+      nickname: string;
+    };
+    associateRequirement: {
+      univStatus: StatusType;
+      discordStatus: Extract<StatusType, "UNSATISFIED" | "SATISFIED">;
+      bevyStatus: Extract<StatusType, "UNSATISFIED" | "SATISFIED">;
+      infoStatus: Extract<StatusType, "UNSATISFIED" | "SATISFIED">;
+    };
+  };
+  currentRecruitmentRound: {
+    recruitmentId: number;
+    name: string;
+    period: {
+      startDate: string;
+      endDate: string;
+      open: boolean;
+    };
+    fee: number;
+    roundType: "FIRST" | "SECOND";
+    roundTypeValue: string;
+  };
+  currentMembership: {
+    membershipId: number;
+    memberId: number;
+    recruitmentId: number;
+    regularRequirement: {
+      paymentStatus: Extract<StatusType, "UNSATISFIED" | "SATISFIED">;
+      paymentSatisfied: boolean;
+      allSatisfied: boolean;
+    };
+  };
+}
diff --git a/apps/admin/types/entities/auth.ts b/apps/admin/types/entities/auth.ts
@@ -0,0 +1 @@
+export type StatusType = "UNSATISFIED" | "IN_PROGRESS" | "SATISFIED";
diff --git a/apps/admin/types/role.ts b/apps/admin/types/role.ts
@@ -0,0 +1,3 @@
+export type ManageRole = "ADMIN" | "NONE";
+export type StudyRole = "MENTOR" | "STUDENT";
+export type UserRoleType = "GUEST" | "ASSOCIATE" | "REGULAR";
diff --git a/apps/admin/types/status.ts b/apps/admin/types/status.ts
@@ -0,0 +1,2 @@
+export type Status = "UNSATISFIED" | "SATISFIED";
+export type UnivEmailStatus = "IN_PROGRESS" | "UNSATISFIED" | "SATISFIED";
diff --git a/apps/admin/types/user.ts b/apps/admin/types/user.ts
@@ -0,0 +1,33 @@
+import type { ManageRole, StudyRole, UserRoleType } from "./role";
+import type { Status, UnivEmailStatus } from "./status";
+
+export type User = {
+  memberId: string; // C000000 (학번)
+  role: UserRoleType;
+  basicInfo: UserBasicInfo;
+  manageRole: ManageRole;
+  studyRole: StudyRole;
+  associateRequirement: {
+    univStatus: UnivEmailStatus;
+    discordStatus: Status;
+    bevyStatus: Status;
+    infoStatus: Status;
+  };
+};
+
+export type AssociateRequirement = {
+  univStatus: UnivEmailStatus;
+  discordStatus: Status;
+  bevyStatus: Status;
+  infoStatus: Status;
+};
+
+export type UserBasicInfo = {
+  name: string;
+  studentId: string;
+  email: string;
+  department: string;
+  phone: string;
+  discordUsername: string;
+  nickname: string;
+};
diff --git a/apps/admin/utils/isAdmin.ts b/apps/admin/utils/isAdmin.ts
@@ -0,0 +1,8 @@
+import { dashboardApi } from "apis/auth/dashboardApi";
+
+const isAdmin = async (): Promise<boolean> => {
+  const { manageRole } = await dashboardApi.getDashboardInfo();
+  return manageRole === "ADMIN";
+};
+
+export default isAdmin;
diff --git a/apps/client/apis/dashboardApi.ts b/apps/client/apis/dashboardApi.ts
@@ -1,22 +1,14 @@
 import { fetcher } from "@wow-class/utils";
 import { apiPath } from "constants/apiPath";
 import { tags } from "constants/tags";
-import { cookies } from "next/headers";
 import type { DashboardApiResponseDto } from "types/dtos/auth";
 
 export const dashboardApi = {
   getDashboardInfo: async () => {
-    const cookieStore = cookies();
-    const accessToken = cookieStore.get("accessToken")?.value;
-
-    // NOTE: middleware에서 호출하기 위해서 별도로 헤더 주입
     const response = await fetcher.get<DashboardApiResponseDto>(
       apiPath.dashboard,
       {
         next: { tags: [tags.dashboard] },
-        headers: {
-          Authorization: `Bearer ${accessToken}`,
-        },
       }
     );
 

diff --git a/apps/client/apis/studyApplyApi.ts b/apps/client/apis/studyApplyApi.ts
@@ -9,6 +9,7 @@ export const studyApplyApi = {
       apiPath.applyStudy,
       {
         next: { tags: [tags.studyApply] },
+        cache: "force-cache",
       }
     );
 
@@ -20,21 +21,11 @@ export const studyApplyApi = {
       null
     );
 
-    if (!response.ok) {
-      const errorData = await response.json();
-      throw new Error(errorData);
-    }
-
-    return response.data;
+    return { success: response.ok };
   },
   cancelStudyApplication: async (studyId: number) => {
     const response = await fetcher.delete(`${apiPath.applyStudy}/${studyId}`);
 
-    if (!response.ok) {
-      const errorData = await response.json();
-      throw new Error(errorData);
-    }
-
-    return response.data;
+    return { success: response.ok };
   },
 };