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

feat: add delete account feature #118

Merged
merged 1 commit into from
Jan 17, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 16 additions & 1 deletion src/api/auth/use-user.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createQuery } from 'react-query-kit';
import { createMutation, createQuery } from 'react-query-kit';

import { client } from '../common';

Expand All @@ -10,6 +10,10 @@ export type User = {
birthday: Date | null;
};

export type DeleteUserVariables = {
email: string;
};

const getUser = async () => {
const { data } = await client({
url: '/v1/users',
Expand All @@ -18,7 +22,18 @@ const getUser = async () => {
return data;
};

const deleteUser = async (variables: DeleteUserVariables) => {
const { data } = await client.delete('/v1/users', {
data: variables,
});
return data;
};

export const useUser = createQuery<User>({
queryKey: ['getUser'],
fetcher: getUser,
});

export const useDeleteUser = createMutation<{}, DeleteUserVariables>({
mutationFn: deleteUser,
});
20 changes: 18 additions & 2 deletions src/app/(app)/settings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@
import { Link } from 'expo-router';
import { useColorScheme } from 'nativewind';
import React from 'react';
import { showMessage } from 'react-native-flash-message';

import { useUser } from '@/api/auth/use-user';
import { useDeleteUser, useUser } from '@/api/auth/use-user';
import { useAuth } from '@/components/providers/auth';
import { DeleteAccountItem } from '@/components/settings/delete-account-item';
import { Item } from '@/components/settings/item';
import { ItemsContainer } from '@/components/settings/items-container';
import { LanguageItem } from '@/components/settings/language-item';
Expand All @@ -15,12 +17,25 @@ import { colors, FocusAwareStatusBar, ScrollView, Text, View } from '@/ui';
import { Website } from '@/ui/icons';

export default function Settings() {
const { data: userData } = useUser();
const { logout } = useAuth();
const { data: userData } = useUser();
const { mutateAsync: deleteUserAsync } = useDeleteUser({
onSuccess: () => {
logout();
},
onError: (error) => showMessage({ message: error.message, type: 'danger' }),
});
const { colorScheme } = useColorScheme();
const iconColor =
colorScheme === 'dark' ? colors.neutral[400] : colors.neutral[500];

const handleDeleteUser = async () => {
if (!userData?.email) {
return;
}
await deleteUserAsync({ email: userData?.email });
};

return (
<>
<FocusAwareStatusBar />
Expand Down Expand Up @@ -77,6 +92,7 @@ export default function Settings() {

<View className="my-8">
<ItemsContainer>
<DeleteAccountItem onDelete={handleDeleteUser} />
<Item text="settings.logout" onPress={logout} />
</ItemsContainer>
</View>
Expand Down
33 changes: 33 additions & 0 deletions src/components/settings/delete-account-item.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import React from 'react';
import { Alert } from 'react-native';

import { translate } from '@/core';

import { Item } from './item';

export type DeleteAccountItemProps = {
onDelete: () => void;
};

export const DeleteAccountItem = (props: DeleteAccountItemProps) => {
const handleDeleteAccount = () => {
props.onDelete();
};

const confirmDelete = () => {
Alert.alert(
translate('settings.deleteAccount.confirmTitle'),
translate('settings.deleteAccount.confirmMessage'),
[
{ text: translate('settings.deleteAccount.cancel'), style: 'cancel' },
{
text: translate('settings.deleteAccount.delete'),
style: 'destructive',
onPress: handleDeleteAccount,
},
],
);
};

return <Item text={'settings.deleteAccount.title'} onPress={confirmDelete} />;
};
51 changes: 27 additions & 24 deletions src/components/settings/item.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react';
import React, { forwardRef } from 'react';

import type { TxKeyPath } from '@/core';
import { Pressable, Text, View } from '@/ui';
Expand All @@ -11,26 +11,29 @@ type ItemProps = {
icon?: React.ReactNode;
};

export const Item = ({ text, value, icon, onPress }: ItemProps) => {
const isPressable = onPress !== undefined;
return (
<Pressable
onPress={onPress}
pointerEvents={isPressable ? 'auto' : 'none'}
className="flex-1 flex-row items-center justify-between px-4 py-2"
>
<View className="flex-row items-center">
{icon && <View className="pr-2">{icon}</View>}
<Text tx={text} />
</View>
<View className="flex-row items-center">
<Text className="text-neutral-600 dark:text-white">{value}</Text>
{isPressable && (
<View className="pl-2">
<ArrowRight />
</View>
)}
</View>
</Pressable>
);
};
export const Item = forwardRef<View, ItemProps>(
({ text, value, icon, onPress }: ItemProps, ref) => {
const isPressable = onPress !== undefined;
return (
<Pressable
ref={ref}
onPress={onPress}
pointerEvents={isPressable ? 'auto' : 'none'}
className="flex-1 flex-row items-center justify-between px-4 py-2"
>
<View className="flex-row items-center">
{icon && <View className="pr-2">{icon}</View>}
<Text tx={text} />
</View>
<View className="flex-row items-center">
<Text className="text-neutral-600 dark:text-white">{value}</Text>
{isPressable && (
<View className="pl-2">
<ArrowRight />
</View>
)}
</View>
</Pressable>
);
},
);
9 changes: 8 additions & 1 deletion src/translations/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,13 @@
},
"app_name": "App Name",
"arabic": "Arabic",
"deleteAccount": {
"cancel": "Cancel",
"confirmMessage": "Are you sure you want to delete your account? This action cannot be undone.",
"confirmTitle": "Confirm Delete",
"delete": "Delete",
"title": "Delete account"
},
"english": "English",
"generale": "General",
"github": "Github",
Expand All @@ -83,7 +90,7 @@
"rate": "Rate",
"share": "Share",
"support": "Support",
"support_us": "Support Us",
"supportUs": "Support Us",
guillermomachado marked this conversation as resolved.
Show resolved Hide resolved
"terms": "Terms of Service",
"theme": {
"dark": "Dark",
Expand Down
Loading