Merge pull request #1063 from MinCheolS/part3-신민철-week16

[신민철] week16
codeit-bootcamp-frontend · May 2, 2024 · 42e1a2b · 42e1a2b
2 parents 74f8fde + d6ebee0
commit 42e1a2b
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 35 deletions.
diff --git a/pages/api/api.ts b/pages/api/api.ts
@@ -31,3 +31,30 @@ export const getSelectLinksInfo = async (folderId: number) => {
   const result = response.json();
   return result;
 };
+
+export const signInUser = async (email: string, password: string) => {
+  const userInfo = {
+    email: email,
+    password: password,
+  };
+
+  try {
+    const response = await fetch('https://bootcamp-api.codeit.kr/api/sign-in', {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify(userInfo),
+    });
+
+    if (response.status === 200) {
+      const result = await response.json();
+      localStorage.setItem('accessToken', result.data.accessToken);
+      return true;
+    } else {
+      return false;
+    }
+  } catch (error) {
+    console.log(error);
+  }
+};
diff --git a/pages/signin.tsx b/pages/signin.tsx
@@ -1,12 +1,13 @@
 import React, { useState } from 'react';
 import Link from 'next/link';
-import styles from '@/styles/Signin.module.css';
-import { emailRegex, passwordRegex } from '@/components/Regex';
-import logo from '@/public/logo.svg';
-import kakao from '@/public/kakao logo.svg';
-import google from '@/public/google.svg';
-import passwordOff from '@/public/passwordOff.svg';
-import passwordOn from '@/public/passwordOn.svg';
+import styles from '@styles/Signin.module.css';
+import { emailRegex, passwordRegex } from '@components/Regex';
+import logo from '@public/logo.svg';
+import kakao from '@public/kakao logo.svg';
+import google from '@public/google.svg';
+import passwordOff from '@public/passwordOff.svg';
+import passwordOn from '@public/passwordOn.svg';
+import { signInUser } from './api/api';
 
 export default function Signin() {
   const [email, setEmail] = useState('');
@@ -59,27 +60,17 @@ export default function Signin() {
   const handleSubmit = async (e: React.ChangeEvent<HTMLButtonElement>) => {
     e.preventDefault();
 
-    const userInfo = {
-      email: email,
-      password: password,
-    };
+    try {
+      const signIn = await signInUser(email, password);
 
-    const response = await fetch('https://bootcamp-api.codeit.kr/api/sign-in', {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify(userInfo),
-    });
-
-    if (response.status === 200) {
-      const result = await response.json();
-      localStorage.setItem('accessToken', result.data.accessToken);
-      window.location.assign('folder.html');
-      return;
-    } else {
-      setEmailError('이메일을 확인해 주세요.');
-      setPasswordError('비밀번호를 확인해 주세요.');
+      if (signIn) {
+        window.location.assign('folder.html');
+      } else {
+        setEmailError('이메일을 확인해 주세요.');
+        setPasswordError('비밀번호를 확인해 주세요.');
+      }
+    } catch (error) {
+      console.log(error);
     }
   };
 

diff --git a/pages/signup.tsx b/pages/signup.tsx
@@ -1,12 +1,12 @@
 import React, { useState } from 'react';
 import Link from 'next/link';
-import styles from '@/styles/Signup.module.css';
-import logo from '@/public/logo.svg';
-import kakao from '@/public/kakao logo.svg';
-import google from '@/public/google.svg';
-import passwordOff from '@/public/passwordOff.svg';
-import passwordOn from '@/public/passwordOn.svg';
-import { emailRegex, passwordRegex } from '@/components/Regex';
+import styles from '@styles/Signup.module.css';
+import logo from '@public/logo.svg';
+import kakao from '@public/kakao logo.svg';
+import google from '@public/google.svg';
+import passwordOff from '@public/passwordOff.svg';
+import passwordOn from '@public/passwordOn.svg';
+import { emailRegex, passwordRegex } from '@components/Regex';
 
 export default function Signup() {
   const [email, setEmail] = useState('');

diff --git a/tsconfig.json b/tsconfig.json
@@ -14,7 +14,10 @@
     "jsx": "preserve",
     "incremental": true,
     "paths": {
-      "@/*": ["./*"]
+      "@*": ["./*"],
+      "@components": ["./*/components"],
+      "@public": ["./*/public"],
+      "@styles": ["./*/styles"]
     }
   },
   "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],