Merge pull request #424 from woowacourse-teams/develop

[ALL] v1.0.0 출시! 🎉
woowacourse-teams · Oct 24, 2024 · 0111ce1 · 0111ce1
2 parents 50c327f + 4d56935
commit 0111ce1
Show file tree

Hide file tree

Showing 154 changed files with 6,653 additions and 5,610 deletions.
diff --git a/.github/workflows/backend-prod-cd.yml b/.github/workflows/backend-prod-cd.yml
@@ -109,10 +109,10 @@ jobs:
       - name: docker pull
         run: docker pull ${{ secrets.DOCKERHUB_USERNAME }}/momo-api-prod
 
-      # 2. 실행 컨테이너 중 app 서비스만 재시작
-      - name: Restart app service
-        run: docker compose -f $HOME/security/docker-compose-prod.yml restart app --no-deps
+      # 2. 블루그린 배포 스크립트 실행
+      - name: Launch Blue-Green Deployment
+        run: chmod +x $HOME/security/deploy.sh; $HOME/security/deploy.sh
 
-      # 3. 미사용 이미지를 정리
+      # 3. 미사용 이미지 정리
       - name: delete old docker image
         run: docker system prune -f
diff --git a/backend/src/main/resources/security b/backend/src/main/resources/security
diff --git a/frontend/.eslintrc.json b/frontend/.eslintrc.json
@@ -26,6 +26,7 @@
     "plugin:storybook/recommended"
   ],
   "rules": {
+    "react/prop-types": "off",
     "@typescript-eslint/consistent-type-imports": "error",
     "jsx-a11y/click-events-have-key-events": "off",
     "jsx-a11y/no-noninteractive-element-interactions": "off",

diff --git a/frontend/.storybook/preview.tsx b/frontend/.storybook/preview.tsx
@@ -2,6 +2,7 @@ import { Global, ThemeProvider } from '@emotion/react';
 import type { Preview } from '@storybook/react';
 import React from 'react';
 
+import ToastProvider from '../src/contexts/ToastProvider';
 import globalStyles from '../src/styles/global';
 import theme from '../src/styles/theme';
 
@@ -21,8 +22,10 @@ export default preview;
 export const decorators = [
   (Story) => (
     <ThemeProvider theme={theme}>
-      <Global styles={globalStyles} />
-      <Story />
+      <ToastProvider>
+        <Global styles={globalStyles} />
+        <Story />
+      </ToastProvider>
     </ThemeProvider>
   ),
 ];
diff --git a/frontend/jest.config.js b/frontend/jest.config.js
@@ -3,6 +3,7 @@ module.exports = {
   testEnvironment: 'jsdom',
   transform: {
     '^.+.tsx?$': ['ts-jest', {}],
+    '^.+\\.svg$': '<rootDir>/svgTransformer.js',
   },
   testEnvironmentOptions: {
     customExportConditions: [''],
@@ -13,5 +14,10 @@ module.exports = {
   moduleNameMapper: {
     '^@utils/(.*)$': '<rootDir>/src/utils/$1',
     '^@constants/(.*)$': '<rootDir>/src/constants/$1',
+    '^@contexts/(.*)$': '<rootDir>/src/contexts/$1',
+    '^@components/(.*)$': '<rootDir>/src/components/$1',
+    '^@hooks/(.*)$': '<rootDir>/src/hooks/$1',
+    '^@assets/(.*)$': '<rootDir>/src/assets/$1',
+    '^@styles/(.*)$': '<rootDir>/src/styles/$1',
   },
 };
diff --git a/frontend/legacy/components/AllSchedules/AllSchdules.utils.ts b/frontend/legacy/components/AllSchedules/AllSchdules.utils.ts
@@ -1,8 +1,10 @@
+import { DAY_OF_WEEK_KR } from '../../../src/constants/date';
+
 export const formatDate = (dateString: string) => {
   const currentDateObj = new Date(dateString);
   const currentMonth = currentDateObj.getMonth() + 1;
   const currentDay = currentDateObj.getDate();
-  const dayOfWeek = ['일', '월', '화', '수', '목', '금', '토'][currentDateObj.getDay()];
+  const dayOfWeek = DAY_OF_WEEK_KR[currentDateObj.getDay()];
 
   return {
     dayOfWeek,