Skip to content

[SZ-534] 카테고리 추가, 수정 모달 구현 #70

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.

Sign up for GitHub

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

Closed
earthyoung wants to merge 5 commits into from
Closed

[SZ-534] 카테고리 추가, 수정 모달 구현 #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9181876
style: 카테고리 수정 모달 구현
earthyoung Nov 20, 2024
9c29eee
style: 카테고리 모달 추가 시 디자인 및 상태관리 반영
earthyoung Nov 20, 2024
75ff1c9
style: 카테고리 모달 열릴 때 뒷배경색 수정
earthyoung Nov 20, 2024
568c4e1
fix: 카테고리 모달 X 버튼 눌리면 닫히도록 수정
earthyoung Nov 20, 2024
817e111
fix: 카테고리 수정, 생성 오류 확인
earthyoung Nov 20, 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
172 changes: 89 additions & 83 deletions app/_layout.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ import CategoryAddIcon from '@/components/CategoryAddIcon';
import HeaderIcon from '@/components/HeaderIcon';
import HeaderMenu from '@/components/HeaderMenu';
import { env, getSentryConfig, getStoryBookConfig } from '@/constants/env';
import CategoryBottomSheetProvider from '@/contexts/CategoryBottomSheetProvider';
import FunnelProvider from '@/contexts/FunnelContext';
import LoginProvider from '@/contexts/LoginContext';
import '@/locales/index';
import { default as theme } from '@/theme/theme.json';
Expand All @@ -16,7 +18,6 @@ import React from 'react';
import { useTranslation } from 'react-i18next';
import { GestureHandlerRootView } from 'react-native-gesture-handler';
import { default as mapping } from '../theme/mapping.json';
import FunnelProvider from '@/contexts/FunnelContext';
const SENTRY_MODE = env.SENTRY_MODE;

Sentry.init({
Expand Down Expand Up @@ -48,88 +49,93 @@ const RootLayout = () => {
<>
<QueryClientProvider client={queryClient}>
<LoginProvider>
<IconRegistry icons={[EvaIconsPack, AntDesignIconsPack]} />
<ApplicationProvider
{...eva}
theme={{ ...eva.light, ...theme }}
customMapping={mapping}
>
<FunnelProvider>
<GestureHandlerRootView>
<Stack screenOptions={{ headerShadowVisible: false }}>
<Stack.Screen name="index" options={{ headerShown: false }} />
<Stack.Screen
name="(tabs)"
options={{
headerTitle: '',
headerRight: HeaderRight,
headerLeft: HeaderLeft,
}}
/>
<Stack.Screen
name="oauthredirect"
options={{ headerShown: false }}
/>
<Stack.Screen
name="categoryView/categoryAddView"
options={{
headerTitle: t('views._layout.addCategory'),
headerTitleAlign: 'center',
}}
/>
<Stack.Screen
name="categoryView/categoryListView"
options={{
headerTitle: t('views._layout.manageCategory'),
headerTitleAlign: 'center',
headerRight: NavigateToCategoryListView,
}}
/>
<Stack.Screen
name="categoryView/categoryEditView"
options={{
headerTitle: t('views._layout.editCategory'),
headerTitleAlign: 'center',
}}
/>
<Stack.Screen
name="settingsView/settingsView"
options={{
headerTitle: t('views._layout.settings'),
headerTitleAlign: 'center',
}}
/>
<Stack.Screen
name="settingsView/settingsContactView"
options={{
headerTitle: t('views._layout.contact'),
headerTitleAlign: 'center',
}}
/>
<Stack.Screen
name="settingsView/settingsLanguageView"
options={{
headerTitle: t('views.settingsView.language'),
headerTitleAlign: 'center',
}}
/>
<Stack.Screen
name="settingsView/settingsAccountView"
options={{
headerTitle: t('views.settingsView.account'),
headerTitleAlign: 'center',
}}
/>
<Stack.Screen
name="funnelView/funnelView"
options={{
headerShown: false,
}}
/>
</Stack>
</GestureHandlerRootView>
</FunnelProvider>
</ApplicationProvider>
<CategoryBottomSheetProvider>
<IconRegistry icons={[EvaIconsPack, AntDesignIconsPack]} />
<ApplicationProvider
{...eva}
theme={{ ...eva.light, ...theme }}
customMapping={mapping}
>
<FunnelProvider>
<GestureHandlerRootView>
<Stack screenOptions={{ headerShadowVisible: false }}>
<Stack.Screen
name="index"
options={{ headerShown: false }}
/>
<Stack.Screen
name="(tabs)"
options={{
headerTitle: '',
headerRight: HeaderRight,
headerLeft: HeaderLeft,
}}
/>
<Stack.Screen
name="oauthredirect"
options={{ headerShown: false }}
/>
<Stack.Screen
name="categoryView/categoryAddView"
options={{
headerTitle: t('views._layout.addCategory'),
headerTitleAlign: 'center',
}}
/>
<Stack.Screen
name="categoryView/categoryListView"
options={{
headerTitle: t('views._layout.manageCategory'),
headerTitleAlign: 'center',
headerRight: NavigateToCategoryListView,
}}
/>
<Stack.Screen
name="categoryView/categoryEditView"
options={{
headerTitle: t('views._layout.editCategory'),
headerTitleAlign: 'center',
}}
/>
<Stack.Screen
name="settingsView/settingsView"
options={{
headerTitle: t('views._layout.settings'),
headerTitleAlign: 'center',
}}
/>
<Stack.Screen
name="settingsView/settingsContactView"
options={{
headerTitle: t('views._layout.contact'),
headerTitleAlign: 'center',
}}
/>
<Stack.Screen
name="settingsView/settingsLanguageView"
options={{
headerTitle: t('views.settingsView.language'),
headerTitleAlign: 'center',
}}
/>
<Stack.Screen
name="settingsView/settingsAccountView"
options={{
headerTitle: t('views.settingsView.account'),
headerTitleAlign: 'center',
}}
/>
<Stack.Screen
name="funnelView/funnelView"
options={{
headerShown: false,
}}
/>
</Stack>
</GestureHandlerRootView>
</FunnelProvider>
</ApplicationProvider>
</CategoryBottomSheetProvider>
</LoginProvider>
</QueryClientProvider>
</>
Expand Down
4 changes: 2 additions & 2 deletions app/categoryView/categoryEditView.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,10 @@ const CategoryEditView = () => {
const handleUpdateCategory = () => {
const updatedData = {
title: categoryName,
color: colors[selectedColor],
color: 1,
category_id: params.id,
};
updateCategory({ updatedData });
updateCategory(updatedData);
};

const renderColorItem = ({ item }) => (
Expand Down
2 changes: 2 additions & 0 deletions app/categoryView/categoryListView.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import CategoryBottomSheet from '@/components/categoryView/CategoryBottomSheet';
import CategoryListItem from '@/components/categoryView/CategoryListItem';
import { LoginContext } from '@/contexts/LoginContext';
import useCategoriesQuery from '@/hooks/api/useCategoriesQuery';
Expand Down Expand Up @@ -33,6 +34,7 @@ const CategoryListView = () => {
data={orderedCategories}
renderItem={({ item }) => renderItem({ item })}
/>
<CategoryBottomSheet />
</Layout>
</SafeAreaView>
</>
Expand Down
19 changes: 15 additions & 4 deletions components/CategoryAddIcon.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,25 @@
import { TouchableOpacity, StyleSheet } from 'react-native';
import {
ADD,
CategoryBottomSheetContext,
} from '@/contexts/CategoryBottomSheetProvider';
import { Icon, useTheme } from '@ui-kitten/components';
import React from 'react';
import { router } from 'expo-router';
import React, { useContext } from 'react';
import { StyleSheet, TouchableOpacity } from 'react-native';

const CategoryAddIcon = () => {
const theme = useTheme();
const { setMode, setCategoryId, openBottomSheet, setCategoryName } =
useContext(CategoryBottomSheetContext);
const handlePress = () => {
setMode(ADD);
setCategoryId(null);
setCategoryName('');
openBottomSheet();
};

return (
<TouchableOpacity
onPress={() => router.push('categoryView/categoryAddView')}
onPress={() => handlePress()}
style={styles.iconContainer}
>
<Icon
Expand Down
44 changes: 0 additions & 44 deletions components/categoryView/Category.tsx
View file
Open in desktop

This file was deleted.

Loading
Loading