GDSC-Hongik · eugene028 · Aug 16, 2024 · Aug 12, 2024 · Aug 12, 2024 · Aug 12, 2024
@@ -1,4 +1,8 @@
 {
+  "editor.codeActionsOnSave": {
+    "source.fixAll.eslint": "explicit",
+    "source.fixAll.stylelint": "explicit"
+  },
   "eslint.workingDirectories": [
     {
       "mode": "auto"

@@ -0,0 +1,6 @@
+"use client";
+const ErrorPage = () => {
+  return <div>error</div>;
+};
+
+export default ErrorPage;
@@ -1,7 +1,6 @@
 import "./global.css";
 import "wowds-ui/styles.css";
 
-import Navbar from "components/Navbar";
 import type { Metadata } from "next";
 
 import { JotaiProvider } from "../components/JotaiProvider";
@@ -19,10 +18,7 @@ const RootLayout = ({
   return (
     <html lang="ko">
       <body>
-        <JotaiProvider>
-          <Navbar />
-          {children}
-        </JotaiProvider>
+        <JotaiProvider>{children}</JotaiProvider>
       </body>
     </html>
   );

@@ -0,0 +1,5 @@
+const NotFound = () => {
+  return <div>요청하신 페이지를 찾을 수 없어요.</div>;
+};
+
+export default NotFound;
diff --git a/apps/admin/app/studies/createStudy/page.tsx b/apps/admin/app/studies/createStudy/page.tsx
@@ -0,0 +1,5 @@
+const CreateStudyPage = () => {
+  return <div>스터디 생성</div>;
+};
+
+export default CreateStudyPage;
@@ -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;
@@ -1,5 +1,18 @@
+import { css } from "@styled-system/css";
+import { Flex } from "@styled-system/jsx";
+import CreateStudyButton from "components/createStudy/CreateStudyButton";
+import SelectStudySemester from "components/createStudy/SelectStudySemester";
+
 const Studies = () => {
-  return <div>Studies</div>;
+  return (
+    <>
+      <Flex align="center" justifyContent="space-between">
+        <p className={css({ textStyle: "h1" })}>개설된 스터디</p>
+        <SelectStudySemester />
+      </Flex>
+      <CreateStudyButton />
+    </>
+  );
 };
 
 export default Studies;
@@ -59,6 +59,7 @@ export default Navbar;
 
 const navbarContainerStyle = css({
   width: "250px",
+  minWidth: "250px",
   minHeight: "100vh",
   paddingTop: "54px",
   borderRightWidth: "arrow",

diff --git a/apps/admin/components/createStudy/CreateStudyButton.tsx b/apps/admin/components/createStudy/CreateStudyButton.tsx
@@ -0,0 +1,50 @@
+"use client";
+import { css } from "@styled-system/css";
+import { Flex } from "@styled-system/jsx";
+import { useRouter } from "next/navigation";
+
+const CreateStudyButton = () => {
+  const router = useRouter();
+  return (
+    <button
+      className={createStudyButtonStyle}
+      onClick={() => router.push("studies/createStudy")}
+    >
+      <Flex gap="xs">
+        <p className={css({ textStyle: "label1", color: "sub" })}>
+          새로운 스터디 개설하기
+        </p>
+        <div className={PlusIconStyle}>+</div>
+      </Flex>
+    </button>
+  );
+};
+
+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/components/createStudy/SelectStudySemester.tsx b/apps/admin/components/createStudy/SelectStudySemester.tsx
@@ -0,0 +1,20 @@
+import { styled } from "@styled-system/jsx";
+import { Suspense } from "react";
+import DropDown from "wowds-ui/DropDown";
+import DropDownOption from "wowds-ui/DropDownOption";
+
+//TODO: 추후 학기 API 생성되면 대체할 것
+const SelectStudySemester = () => {
+  return (
+    <Suspense fallback={null}>
+      <styled.div width="120px">
+        <DropDown defaultValue="all">
+          <DropDownOption text="2024-2" value="2024-2" />
+          <DropDownOption text="전체" value="all" />
+        </DropDown>
+      </styled.div>
+    </Suspense>
+  );
+};
+
+export default SelectStudySemester;
diff --git a/apps/admin/middleware.tsx b/apps/admin/middleware.tsx
@@ -0,0 +1,17 @@
+import { cookies } from "next/headers";
+import type { NextRequest } from "next/server";
+import { NextResponse } from "next/server";
+
+export const config = {
+  matcher: ["/studies/:path*", "/participants/:path*"],
+};
+
+export function middleware(req: NextRequest) {
+  const cookieStore = cookies();
+  const accessToken = cookieStore.get("accessToken")?.value;
+
+  if (!accessToken) {
+    return NextResponse.redirect(new URL("/not-found", req.url));
+  }
+  return NextResponse.next();
+}
diff --git a/apps/admin/styled-system/types/prop-type.d.ts b/apps/admin/styled-system/types/prop-type.d.ts
@@ -670,7 +670,6 @@ export interface UtilityValues {
     | "h1"
     | "h2"
     | "h3"
-    | "body0"
     | "body1"
     | "body2"
     | "body3"

diff --git a/apps/admin/types/MemberType.ts b/apps/admin/types/MemberType.ts
@@ -0,0 +1,32 @@
+import type { Status } from "types/status";
+import type { User } from "types/user";
+
+export interface MemberInfoResponse {
+  member: User;
+  currentRecruitmentRound: CurrentRecruitmentType;
+  currentMembership: CurrentMembershipType;
+}
+
+export interface CurrentRecruitmentType {
+  recruitmentId: number;
+  name: string;
+  period: {
+    startDate: string;
+    endDate: string;
+    open: boolean;
+  };
+  fee: number;
+  roundType: "FIRST" | "SECOND";
+  roundTypeValue: string;
+}
+
+export interface CurrentMembershipType {
+  membershipId: number;
+  memberId: number;
+  recruitmentId: number;
+  regularRequirement: {
+    paymentStatus: Status;
+    allSatisfied: boolean;
+    paymentSatisfied: boolean;
+  };
+}
@@ -0,0 +1,3 @@
+export type ManageRole = "ADMIN" | "NONE";
+export type StudyRole = "MENTOR" | "STUDENT";
+export type UserRoleType = "GUEST" | "ASSOCIATE" | "REGULAR";
@@ -0,0 +1,2 @@
+export type Status = "UNSATISFIED" | "SATISFIED";
+export type UnivEmailStatus = "IN_PROGRESS" | "UNSATISFIED" | "SATISFIED";
@@ -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/isMentor.ts b/apps/admin/utils/isMentor.ts
@@ -0,0 +1,14 @@
+import { fetcher } from "@wow-class/utils";
+import type { User } from "types/user";
+
+const isMentor = async () => {
+  const response = await fetcher
+    .get<User>("/onboarding/members/me/dashboard", {
+      credentials: "include",
+    })
+    .then((response) => {
+      console.log(response.data?.studyRole);
+    });
+};
+
+export default isMentor;
diff --git a/apps/client/styled-system/types/prop-type.d.ts b/apps/client/styled-system/types/prop-type.d.ts
@@ -670,7 +670,6 @@ export interface UtilityValues {
     | "h1"
     | "h2"
     | "h3"
-    | "body0"
     | "body1"
     | "body2"
     | "body3"

diff --git a/packages/ui/styled-system/types/prop-type.d.ts b/packages/ui/styled-system/types/prop-type.d.ts
@@ -670,7 +670,6 @@ export interface UtilityValues {
     | "h1"
     | "h2"
     | "h3"
-    | "body0"
     | "body1"
     | "body2"
     | "body3"

@@ -2,6 +2,9 @@
   "name": "@wow-class/utils",
   "version": "0.0.0",
   "private": true,
+  "exports": {
+    ".": "./src/index.tsx"
+  },
   "scripts": {
     "test": "jest"
   },
@@ -10,6 +13,8 @@
     "jest": "^29.7.0",
     "jest-fetch-mock": "^3.0.3",
     "ts-jest": "^29.2.4",
-    "@wow-class/typescript-config": "workspace:*"
+    "@wow-class/typescript-config": "workspace:*",
+    "@wow-class/eslint-config": "workspace:*",
+    "typescript": "^5.3.3"
   }
 }
diff --git a/packages/utils/src/fetcher/fetcher.ts → packages/utils/src/fetcher/index.ts b/packages/utils/src/fetcher/fetcher.ts → packages/utils/src/fetcher/index.ts
diff --git a/packages/utils/src/index.tsx b/packages/utils/src/index.tsx
@@ -0,0 +1 @@
+export * from "./fetcher";
@@ -1,5 +1,8 @@
 {
   "extends": "@wow-class/typescript-config/basic.json",
+  "compilerOptions": {
+    "baseUrl": "./src"
+  },
   "include": ["src", "jest.setup.ts"],
   "exclude": ["node_modules"]
 }