Merge pull request #1234 from academic-relations/dev

Merge dev into main.
academic-relations · Nov 27, 2024 · 2c42954 · 2c42954
2 parents 6cb866c + 548146e
commit 2c42954
Show file tree

Hide file tree

Showing 245 changed files with 9,720 additions and 4,168 deletions.
diff --git a/.vscode/typescriptreact.code-snippets b/.vscode/typescriptreact.code-snippets
@@ -43,7 +43,6 @@
       "import {",
       " axiosClientWithAuth,",
       " defineAxiosMock,",
-      " UnexpectedAPIResponseError,",
       "} from '@sparcs-clubs/web/lib/axios';",
       "",
       "const ${TM_FILENAME_BASE} = () =>",
@@ -54,12 +53,7 @@
       "       body,",
       "     );",
       "",
-      "     switch (status) {",
-      "       case 201:",
-      "         return ${1:Api}.responseBodyMap[201].parse(data);",
-      "       default:",
-      "         throw new UnexpectedAPIResponseError();",
-      "     }",
+      "     return ${1:Api}.responseBodyMap[201].parse(data);",
       "   },",
       " });",
       "",
@@ -78,7 +72,6 @@
       "import {",
       " axiosClientWithAuth,",
       " defineAxiosMock,",
-      " UnexpectedAPIResponseError,",
       "} from '@sparcs-clubs/web/lib/axios';",
       "",
       "const ${TM_FILENAME_BASE} = () =>",
@@ -90,12 +83,7 @@
       "       {},",
       "     );",
       "",
-      "     switch (status) {",
-      "       case 200:",
-      "         return ${1:api}.responseBodyMap[200].parse(data);",
-      "       default:",
-      "         throw new UnexpectedAPIResponseError();",
-      "     }",
+      "     return ${1:api}.responseBodyMap[200].parse(data);",
       "   },",
       "});",
       "",

diff --git a/package.json b/package.json
@@ -13,6 +13,8 @@
     "dev:no-db": "dotenv -- pnpm -r --stream --parallel dev:no-db",
     "mock:front": "NEXT_PUBLIC_API_MOCK_MODE=1 dotenv -- pnpm -r --stream --parallel mock:front",
     "mock:back": "NEXT_PUBLIC_API_MOCK_MODE=1 dotenv -- pnpm -r --stream --parallel mock:back",
+    "storybook": "pnpm -r storybook",
+    "build-storybook": "pnpm -r build-storybook",
     "db": "dotenv -- pnpm -F api db",
     "generate": "dotenv -- pnpm -F api generate",
     "pull": "dotenv -- pnpm -F api pull",

diff --git a/packages/api/src/app.module.ts b/packages/api/src/app.module.ts
@@ -6,6 +6,7 @@ import { AppService } from "./app.service";
 import { DrizzleModule } from "./drizzle/drizzle.module";
 import ActivityModule from "./feature/activity/activity.module";
 import { ActivityCertificateModule } from "./feature/activity-certificate/activity-certificate.module";
+
 import { AuthModule } from "./feature/auth/auth.module";
 import { JwtAccessGuard } from "./feature/auth/guard/jwt-access.guard";
 import { ClubModule } from "./feature/club/club.module";
@@ -18,6 +19,7 @@ import { NoticeModule } from "./feature/notice/notice.module";
 import { PromotionalPrintingModule } from "./feature/promotional-printing/promotional-printing.module";
 import { RegistrationModule } from "./feature/registration/registration.module";
 import { RentalModule } from "./feature/rental/rental.module";
+import SemesterModule from "./feature/semester/semester.module";
 import UserModule from "./feature/user/user.module";
 
 @Module({
@@ -38,6 +40,7 @@ import UserModule from "./feature/user/user.module";
     ActivityCertificateModule,
     AuthModule,
     MeetingModule,
+    SemesterModule,
   ],
   controllers: [AppController],
   providers: [