Deploy (#361)

Co-authored-by: 송현우 <[email protected]>
Co-authored-by: 이아론 <[email protected]>
Co-authored-by: 정태관 <[email protected]>
Co-authored-by: 태윤 <[email protected]>

.editorconfig

@@ -4,7 +4,7 @@ root = true
 # 모든 파일에 적용
 [*]
 end_of_line = lf
-insert_final_newline = false
+insert_final_newline = true
 charset = utf-8
 indent_size = 2
 indent_style = tab

.github/workflows/SMS-app-CI.yml

@@ -17,7 +17,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: pnpm/action-setup@v2
         with:
-          version: 9.1.2
+          version: 9.4.0
 
       - run: |
           touch packages/app/.env.local

.github/workflows/SMS-shared-CI.yml

@@ -17,7 +17,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: pnpm/action-setup@v2
         with:
-          version: 9.1.2
+          version: 9.4.0
 
       - run: pnpm i --frozen-lockfile
       - run: pnpm build:shared

.nvmrc

@@ -1 +1 @@
-18.13.0
+20

package.json

@@ -2,7 +2,7 @@
   "name": "@sms",
   "version": "1.0.0",
   "private": true,
-  "packageManager": "pnpm@9.1.2",
+  "packageManager": "pnpm@9.4.0",
   "scripts": {
     "format": "prettier --check --cache **/*.{tsx,ts}",
     "eslint": "eslint --cache **/*.{tsx,ts}",
@@ -45,4 +45,4 @@
     "storybook": "^7.4.0",
     "typescript": "^5.0.4"
   }
-}
+}

packages/app/next.config.js

@@ -11,13 +11,12 @@ const nextConfig = {
     formats: ['image/avif', 'image/webp'],
     domains: [process.env.IMAGE_SERVER_DOMAIN],
   },
-  async rewrites() {
-    return [
-      {
-        source: '/server/:path*', // 프론트엔드에서 요청하는 경로에 대한 리다이렉트
-        destination: `${process.env.SERVER_URL}/:path*`, // 백엔드 도메인
-      },
-    ]
+  webpack: (config, { _isServer }) => {
+    config.module.rules.push({
+      test: /\.pdf$/,
+      use: 'file-loader',
+    })
+    return config
   },
 }
 

packages/app/package.json

@@ -12,33 +12,38 @@
   "dependencies": {
     "@emotion/react": "^11.10.6",
     "@emotion/styled": "^11.10.6",
+    "@hookform/error-message": "^2.0.1",
     "@hookform/resolvers": "^3.4.2",
     "@reduxjs/toolkit": "^1.9.3",
     "@sms/shared": "workspace:*",
     "@tanstack/react-query": "^5.37.1",
     "axios": "^1.3.5",
-    "axios-retry": "^3.7.0",
+    "cookies": "^0.9.1",
     "file-saver": "^2.0.5",
-    "jsonwebtoken": "^9.0.1",
+    "formidable": "^3.5.1",
+    "jsonwebtoken": "^9.0.2",
     "lottie-web": "^5.12.2",
-    "next": "13.3.0",
-    "next-redux-wrapper": "^8.1.0",
+    "next": "13.5.6",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "react-hook-form": "^7.43.9",
+    "react-pdf": "^8.0.2",
     "react-redux": "^8.0.5",
     "sharp": "^0.32.5",
     "zod": "^3.23.8"
   },
   "devDependencies": {
     "@next/bundle-analyzer": "^13.5.2",
+    "@types/cookies": "^0.9.0",
     "@types/file-saver": "^2.0.5",
+    "@types/formidable": "^3.4.5",
     "@types/jsonwebtoken": "^9.0.2",
     "@types/node": "^18.15.11",
     "@types/qs": "^6.9.7",
     "@types/react": "^18.0.33",
     "@types/react-dom": "^18.0.11",
     "cross-env": "^7.0.3",
+    "file-loader": "^6.2.0",
     "typescript": "^5.0.4"
   }
 }

packages/app/src/api/axiosApi.ts

@@ -1,29 +1,10 @@
 import axios from 'axios'
 import qs from 'qs'
 import ParamsFilter from '@lib/ParamsFilter'
-import axiosRetry from 'axios-retry'
 
 const axiosApi = axios.create({
-  'axios-retry': {
-    retries: 3,
-    retryCondition: (e) => e.response?.status === 401,
-  },
   paramsSerializer: (params) =>
     qs.stringify(ParamsFilter(params), { arrayFormat: 'repeat' }),
 })
 
-axiosRetry(axiosApi, {
-  retries: 3,
-  retryDelay: (retryCount) => {
-    return retryCount * 1000
-  },
-  shouldResetTimeout: true,
-  retryCondition: (error) => {
-    return (
-      axiosRetry.isNetworkOrIdempotentRequestError(error) ||
-      error.response?.status === 401
-    )
-  },
-})
-
 export default axiosApi

packages/app/src/api/index.ts

@@ -1,2 +1 @@
 export { default as axiosApi } from './axiosApi'
-export { default as rtkApi } from './rtkApi'

packages/app/src/features/auth/dtos/index.ts

@@ -0,0 +1,3 @@
+export { default as LoggedInResDto } from './res/LoggedInResDto'
+
+export type { LoggedInResType } from './res/LoggedInResDto'

packages/app/src/features/auth/dtos/res/LoggedInResDto.ts

@@ -0,0 +1,26 @@
+import { z } from 'zod'
+import Role from '@/types/Role'
+
+const RoleSchema = z.enum([
+  Role.ROLE_STUDENT,
+  Role.ROLE_TEACHER,
+  Role.ROLE_DIRECTOR,
+  Role.ROLE_HOMEROOM,
+  Role.ROLE_PRINCIPAL,
+  Role.ROLE_DEPUTY_PRINCIPAL,
+])
+
+export const successDto = z.object({
+  isLoggedIn: z.literal(true),
+  role: RoleSchema,
+})
+
+export const failDto = z.object({
+  isLoggedIn: z.literal(false),
+})
+
+const LoggedInResDto = z.discriminatedUnion('isLoggedIn', [successDto, failDto])
+
+export type LoggedInResType = z.infer<typeof LoggedInResDto>
+
+export default LoggedInResDto

packages/app/src/features/auth/hook/useAuth.tsx

@@ -3,17 +3,13 @@ import env from '@lib/env'
 import { useEffect } from 'react'
 import login from '@features/auth/service/login'
 import { useToast } from '@features/toast'
-import useLocalStorage from '@features/global/hooks/useLocalStorage'
-import Token from '@lib/Token'
 import useLoading from '@features/modal/hooks/useLoading'
 
 const useAuth = () => {
   const router = useRouter()
   const code = router.query.code?.toString() || ''
   const { addToast } = useToast()
   const { loadingWrap, loadingClose } = useLoading()
-  const [_, setAccessExpires] = useLocalStorage(Token.ACCESS_TOKEN_EXP, '')
-  const [__, setRefreshExpires] = useLocalStorage(Token.REFRESH_TOKEN_EXP, '')
 
   useEffect(() => {
     if (!code) return
@@ -25,8 +21,6 @@ const useAuth = () => {
       }
       const redirectUrl =
         res.role === 'ROLE_TEACHER' ? '/register/teacher' : '/register'
-      setAccessExpires(res.accessTokenExp)
-      setRefreshExpires(res.refreshTokenExp)
       addToast('success', '로그인에 성공했습니다')
       await router.push(res.isExist ? '/' : redirectUrl)
       loadingClose()

packages/app/src/features/auth/hook/useLogout.tsx

@@ -4,17 +4,14 @@ import { useDialog } from '@hooks'
 import { useToast } from '@features/toast'
 import { useDispatch } from 'react-redux'
 import { actions } from '@features/student/stores'
-import { rtkApi } from '@api'
-import useLocalStorage from '@features/global/hooks/useLocalStorage'
-import Token from '@lib/Token'
+import useLoggedInMutation from '@features/auth/queries/useLoggedInMutation'
 
 const useLogout = () => {
   const { dialog } = useDialog()
   const { addToast } = useToast()
   const dispatch = useDispatch()
   const router = useRouter()
-  const [_, setAccess] = useLocalStorage(Token.ACCESS_TOKEN_EXP, '')
-  const [__, setRefresh] = useLocalStorage(Token.REFRESH_TOKEN_EXP, '')
+  const mutate = useLoggedInMutation()
 
   const onLogout = async () => {
     if (
@@ -28,12 +25,9 @@ const useLogout = () => {
     const res = await logout()
     if (res) return addToast('error', res)
 
-    setAccess('')
-    setRefresh('')
+    mutate()
     addToast('success', '로그아웃에 성공했습니다')
     dispatch(actions.resetPage())
-    dispatch(actions.resetStudents())
-    dispatch(rtkApi.util.resetApiState())
 
     router.push('/')
   }

packages/app/src/features/auth/hook/useWithdraw.tsx

@@ -4,13 +4,11 @@ import { useToast } from '@features/toast'
 import { useDialog } from '@hooks'
 import { useDispatch } from 'react-redux'
 import { actions } from '@features/student/stores'
-import useLoggedIn from './useLoggedIn'
 
 const useWithdraw = () => {
   const { dialog } = useDialog()
   const { addToast } = useToast()
   const dispatch = useDispatch()
-  const { refetchLoggedIn } = useLoggedIn({})
   const router = useRouter()
 
   const onWithdraw = async () => {
@@ -29,7 +27,6 @@ const useWithdraw = () => {
     dispatch(actions.resetPage())
     dispatch(actions.resetStudents())
     router.push('/')
-    refetchLoggedIn()
   }
 
   return { onWithdraw }