From 062160ed39975bafdb6506e3640b59104cd22750 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B3=A0=EB=B3=91=EC=B0=AC?= <70642609+byungchanKo99@users.noreply.github.com> Date: Fri, 22 Nov 2024 00:17:56 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[SZ-542]feat:=20=EC=8B=A0=EA=B7=9C=EC=9C=A0?= =?UTF-8?q?=EC=A0=80=20=EA=B0=80=EC=9E=85=EC=8B=9C=20=EA=B8=B0=EB=B3=B8=20?= =?UTF-8?q?=EC=B9=B4=ED=85=8C=EA=B3=A0=EB=A6=AC=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hooks/auth/useLogin.js | 13 +++++++++++++ locales/en.json | 4 +++- locales/ko.json | 4 +++- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/hooks/auth/useLogin.js b/hooks/auth/useLogin.js index bc8be1e..cf125f4 100644 --- a/hooks/auth/useLogin.js +++ b/hooks/auth/useLogin.js @@ -10,13 +10,24 @@ import { useContext } from 'react'; import 'react-native-get-random-values'; import { useDeviceToken } from './useDeviceToken'; import { useStorage } from './useStorage'; +import { useCategoryAddMutation } from '../api/useCategoryMutation'; +import { useTranslation } from 'react-i18next'; const useLogin = () => { const storage = useStorage(); const { deviceToken } = useDeviceToken(); const router = useRouter(); const { setIsLoggedIn, setUserId, setAccessToken } = useContext(LoginContext); + const { mutate: addCategory } = useCategoryAddMutation(); + const { t } = useTranslation(); + const handleAddCategory = ({ categoryName }) => { + const addCategoryData = { + title: categoryName, + color: 1, + }; + addCategory({ addCategoryData }); + }; const setLoginContextVariable = async (token, loginType, type) => { const { isJwtIssued, jwtTokenData } = await issueJwtToken( token, @@ -33,6 +44,8 @@ const useLogin = () => { setUserId(jwtTokenData.userId); setIsLoggedIn(true); if (jwtTokenData.isNew) { + handleAddCategory({ categoryName: t('veiws.categoryAddView.init') }); + handleAddCategory({ categoryName: t('veiws.categoryAddView.init2') }); router.push('/funnelView/funnelView'); } else { router.push('/(tabs)'); diff --git a/locales/en.json b/locales/en.json index b9f86e7..1bf860d 100644 --- a/locales/en.json +++ b/locales/en.json @@ -44,7 +44,9 @@ "placeholder": "Write a category", "color": "Color", "close": "Close", - "title": "Add Category" + "title": "Add Category", + "init": "To Do", + "init2": "Important Task" }, "categoryEditView": { "category": "category", diff --git a/locales/ko.json b/locales/ko.json index ff0a978..a95e1ec 100644 --- a/locales/ko.json +++ b/locales/ko.json @@ -45,7 +45,9 @@ "placeholder": "카테고리를 입력해주세요", "color": "색상", "close": "닫기", - "title": "카테고리 생성" + "title": "카테고리 생성", + "init": "할일", + "init2": "중요한일" }, "categoryEditView": { "category": "카테고리", From 4efad8c5738ed9cb8182fa4f15296c988215a30c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B3=A0=EB=B3=91=EC=B0=AC?= <70642609+byungchanKo99@users.noreply.github.com> Date: Fri, 22 Nov 2024 00:38:36 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[SZ-542]feat:=20=EC=84=A4=EC=A0=95=ED=99=94?= =?UTF-8?q?=EB=A9=B4=20=EC=9C=A0=EB=8B=88=ED=81=AC=20=EC=95=84=EC=9D=B4?= =?UTF-8?q?=EB=94=94=20=EC=9B=8C=EB=8B=9D=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/settingsView/settingsView.jsx | 70 ++++++++++++++----------------- 1 file changed, 31 insertions(+), 39 deletions(-) diff --git a/app/settingsView/settingsView.jsx b/app/settingsView/settingsView.jsx index d598710..32ebe02 100644 --- a/app/settingsView/settingsView.jsx +++ b/app/settingsView/settingsView.jsx @@ -154,46 +154,38 @@ const SettingsView = () => { /> ); return ( - <> - - - - 이미지 - - - - {t('views.settingsView.greeting')} - - user - + + + + 이미지 - - {data.map((listData, index) => ( - <> - - renderItem({ item })} - /> - - ))} - - - - + + + {t('views.settingsView.greeting')} + + user + + + + {data.map((listData, index) => ( + + + + + ))} + + + ); };