Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. Weโ€™ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ALL] v1.0.0 ์ถœ์‹œ! ๐ŸŽ‰ #424

Merged
merged 11 commits into from
Oct 24, 2024
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e324f46
[FE] ์•ฝ์† ์ž…์žฅ ํŽ˜์ด์ง€ ๊ตฌํ˜„ ๋ฐ ๋ฐ”๋กœ ์•ฝ์† ๋“ฑ๋กํ•˜๊ธฐ ํŽ˜์ด์ง€์—์„œ ๋ฐ”๋กœ ๋“œ๋ž˜๊ทธ/ํด๋ฆญ์œผ๋กœ ์•ฝ์† ๋“ฑ๋ก์ด ๊ฐ€๋Šฅํ•˜๊ฒŒ ๊ตฌํ˜„ (#403)
Yoonkyoungme Oct 15, 2024
fb88def
[FE] ๋‚ ์งœ๋งŒ ์ž…๋ ฅ ์‹œ, ์•ฝ์† ์ถ”์ฒœ ํ•„ํ„ฐ๋ง ๊ธฐ๋Šฅ ์ œ๊ฑฐ (#400)
Largopie Oct 15, 2024
b86ec54
[ALL] ํ”„๋ก ํŠธ์—”๋“œ ์›Œํฌํ”Œ๋กœ์šฐ ๋ณ€๊ฒฝ์‚ฌํ•ญ develop ๋ธŒ๋žœ์น˜์— ์ ์šฉ (#409)
Largopie Oct 16, 2024
3120495
[BE] ํ”„๋กœ๋•์…˜ ์„œ๋ฒ„ ๋ฌด์ค‘๋‹จ ๋ฐฐํฌ ํ™˜๊ฒฝ ๊ตฌ์ถ• (#413)
hw0603 Oct 17, 2024
b70fad0
[FE] ์•ฝ์† ์ƒ์„ฑ ํ™•์ธ ๋ชจ๋‹ฌ ๋ณต๊ตฌ develop ๋ธŒ๋žœ์น˜์— ์ ์šฉ (#415)
Yoonkyoungme Oct 18, 2024
fa329ba
[FE] ํ—ค๋” ๋’ค๋กœ๊ฐ€๊ธฐ ๊ธฐ๋Šฅ ๊ตฌํ˜„ (#411)
Largopie Oct 21, 2024
cf21b3d
[FE] ์ธํ’‹ ์ปดํฌ๋„ŒํŠธ ๋””์ž์ธ ์ˆ˜์ • ๋ฐ ๋กœ๊ทธ์ธ ํŽ˜์ด์ง€ ๋””์ž์ธ ์ˆ˜์ • (#417)
hwinkr Oct 22, 2024
bce13c0
[FE] ์•ฝ์† ์ž…์žฅ, ์•ฝ์† ํ˜„ํ™ฉ ์กฐํšŒ ํŽ˜์ด์ง€(๋‹ฌ๋ ฅ)์˜ ์›น ์ ‘๊ทผ์„ฑ์„ ๊ฐœ์„  (#421)
Yoonkyoungme Oct 24, 2024
16c907a
[FE] ํด๋ผ์ด์–ธํŠธ ์˜์—ญ ์—๋Ÿฌ ํ•ธ๋“ค๋ง ๊ฐœ์„  (ํ† ์ŠคํŠธ UI) (#419)
hwinkr Oct 24, 2024
d9c8eed
[FE] ์บ๋Ÿฌ์…€์„ ์ ์šฉํ•œ ๋žœ๋”ฉ ํŽ˜์ด์ง€ ๋””์ž์ธ ์ˆ˜์ • (#422)
hwinkr Oct 24, 2024
4d56935
Merge branch 'main' into develop
Largopie Oct 24, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/backend-prod-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 6 additions & 0 deletions .github/workflows/frontend-dev-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,17 @@ jobs:
env:
CLOUDFRONT_DISTRIBUTION_ID_DEV: ${{ secrets.CLOUDFRONT_DISTRIBUTION_ID_DEV}}
steps:
- name: ๊ธฐ์กด dist ํด๋” ๋‚ด๋ถ€์— ์žˆ๋˜ ์ด์ „ ๋ฒ„์ ผ์˜ dist ํด๋” ๋‚ด๋ถ€ ๋ชจ๋“  ํŒŒ์ผ์„ ์‚ญ์ œํ•ด์š”
working-directory: ./frontend/
run: |
rm -rf dist/*

- name: ๋ชจ๋ชจ ๊นƒํ—ˆ๋ธŒ ๋ ˆํŒŒ์ง€ํ† ๋ฆฌ artifacts๋กœ ๋ถ€ํ„ฐ ๋นŒ๋“œ ๊ฒฐ๊ณผ๋ฌผ์„ ๋‹ค์šด๋ฐ›์•„์š” :)
uses: actions/download-artifact@v4
with:
name: momoResources
path: ./frontend/dist

- name: aws์— ๋ฐฐํฌํ•˜๊ณ  cloudfront ์บ์‹ฑ์„ ๋ฌดํšจํ™”ํ•ด์š”
working-directory: ./frontend/dist/
run: |
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/frontend-prod-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,17 @@ jobs:
env:
CLOUDFRONT_DISTRIBUTION_ID_PROD: ${{ secrets.CLOUDFRONT_DISTRIBUTION_ID_PROD}}
steps:
- name: ๊ธฐ์กด dist ํด๋” ๋‚ด๋ถ€์— ์žˆ๋˜ ์ด์ „ ๋ฒ„์ ผ์˜ dist ํด๋” ๋‚ด๋ถ€ ๋ชจ๋“  ํŒŒ์ผ์„ ์‚ญ์ œํ•ด์š”
working-directory: ./frontend/
run: |
rm -rf dist/*

- name: ๋ชจ๋ชจ ๊นƒํ—ˆ๋ธŒ ๋ ˆํŒŒ์ง€ํ† ๋ฆฌ artifacts๋กœ ๋ถ€ํ„ฐ ๋นŒ๋“œ ๊ฒฐ๊ณผ๋ฌผ์„ ๋‹ค์šด๋ฐ›์•„์š” :)
uses: actions/download-artifact@v4
with:
name: momoResources
path: ./frontend/dist

- name: aws์— ๋ฐฐํฌํ•˜๊ณ  cloudfront ์บ์‹ฑ์„ ๋ฌดํšจํ™”ํ•ด์š”
working-directory: ./frontend/dist/
run: |
Expand Down
2 changes: 1 addition & 1 deletion backend/src/main/resources/security
1 change: 1 addition & 0 deletions frontend/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
7 changes: 5 additions & 2 deletions frontend/.storybook/preview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand All @@ -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>
),
];
6 changes: 6 additions & 0 deletions frontend/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ module.exports = {
testEnvironment: 'jsdom',
transform: {
'^.+.tsx?$': ['ts-jest', {}],
'^.+\\.svg$': '<rootDir>/svgTransformer.js',
},
testEnvironmentOptions: {
customExportConditions: [''],
Expand All @@ -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',
},
};
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
Loading