Merge branch 'develop' into feat/#22

Team-O2 · Sep 6, 2021 · 616c8dd · 616c8dd
2 parents 7bee107 + 484ce49
commit 616c8dd
Show file tree

Hide file tree

Showing 20 changed files with 795 additions and 584 deletions.
diff --git a/src/DTO/adminDTO.ts b/src/DTO/adminDTO.ts
@@ -1,31 +1,18 @@
 namespace adminDTO {
-  export interface IAdmin {
-    title: String;
-    registerStartDT: Date;
-    registerEndDT: Date;
-    challengeStartDT: Date;
-    challengeEndDT: Date;
-    generation: Number;
-    limitNum: Number;
-    img: string;
-    createdDT: Date;
-    applyNum: Number;
-  }
-
-  interface Admin {
+  export interface adminResDetailDTO {
     registerStartDT: Date;
     registerEndDT: Date;
     challengeStartDT: Date;
     challengeEndDT: Date;
     generation: number;
-    createdDT: Date;
+    createdAT?: Date;
     applyNum: number;
-    participants: number;
-    postNum: number;
-    img: string;
+    participants?: number;
+    postNum?: number;
+    img?: string;
   }
   export interface adminResDTO {
-    offsetAdmin: Admin[];
+    offsetAdmin: adminResDetailDTO[];
     totalAdminNum?: number;
   }
 

diff --git a/src/DTO/authDTO.ts b/src/DTO/authDTO.ts
@@ -28,6 +28,24 @@ namespace authDTO {
     email: string;
     password: string;
   }
+
+  export interface emailReqDTO {
+    email: string;
+  }
+
+  export interface codeReqDTO {
+    email: string;
+    emailCode: string;
+  }
+
+  export interface codeResDTO {
+    isOkay: boolean;
+  }
+
+  export interface passwordReqDTO {
+    email: string;
+    password: string;
+  }
 }
 
 export default authDTO;