admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

feat: add sign out and book a call buttons to "Choose your plan" page (#5292)

Browse Source 
Resolves #5281

<img width="399" alt="buttions-light"
src="https://github.com/twentyhq/twenty/assets/16918891/d1a0ba4e-696e-476b-a792-01ae19a06a55">
<img width="390" alt="buttons-dark"
src="https://github.com/twentyhq/twenty/assets/16918891/40bea83b-bc32-45ea-a522-ecf8239cfe51">
This commit is contained in:
Orinami Olatunji
2024-05-06 09:48:34 +01:00
committed by GitHub
parent 77c0dee846
commit a1c95b92ab
6 changed files with 65 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/twenty-front/src/modules/auth/hooks/useSignOutAndRedirect.ts Normal file
View File

@ -0,0 +1,15 @@
import { useCallback } from 'react';
import { useNavigate } from 'react-router-dom';
import { useAuth } from '@/auth/hooks/useAuth';
import { AppPath } from '@/types/AppPath';
export const useSignOutAndRedirect = () => {
const { signOut } = useAuth();
const navigate = useNavigate();
return useCallback(() => {
signOut();
navigate(AppPath.SignInUp);
}, [signOut, navigate]);
};

13
packages/twenty-front/src/modules/settings/components/SettingsNavigationDrawerItems.tsx
View File

@ -1,5 +1,3 @@
import { useCallback } from 'react';
import { useNavigate } from 'react-router-dom';
import { useRecoilValue } from 'recoil';
import {
IconApps,
@ -16,10 +14,9 @@ import {
IconUsers,
} from 'twenty-ui';
import { useAuth } from '@/auth/hooks/useAuth';
import { useSignOutAndRedirect } from '@/auth/hooks/useSignOutAndRedirect';
import { billingState } from '@/client-config/states/billingState';
import { SettingsNavigationDrawerItem } from '@/settings/components/SettingsNavigationDrawerItem';
import { AppPath } from '@/types/AppPath';
import { SettingsPath } from '@/types/SettingsPath';
import { NavigationDrawerItem } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerItem';
import { NavigationDrawerItemGroup } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerItemGroup';
@ -27,13 +24,7 @@ import { NavigationDrawerSection } from '@/ui/navigation/navigation-drawer/compo
import { NavigationDrawerSectionTitle } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerSectionTitle';
export const SettingsNavigationDrawerItems = () => {
const navigate = useNavigate();
const { signOut } = useAuth();
const handleLogout = useCallback(() => {
signOut();
navigate(AppPath.SignInUp);
}, [signOut, navigate]);
const handleLogout = useSignOutAndRedirect();
const billing = useRecoilValue(billingState);

14
packages/twenty-front/src/modules/settings/profile/components/DeleteAccount.tsx
View File

@ -1,10 +1,8 @@
import { useCallback, useState } from 'react';
import { useNavigate } from 'react-router-dom';
import { useState } from 'react';
import { useRecoilValue } from 'recoil';
import { useAuth } from '@/auth/hooks/useAuth';
import { useSignOutAndRedirect } from '@/auth/hooks/useSignOutAndRedirect';
import { currentUserState } from '@/auth/states/currentUserState';
import { AppPath } from '@/types/AppPath';
import { H2Title } from '@/ui/display/typography/components/H2Title';
import { Button } from '@/ui/input/button/components/Button';
import { ConfirmationModal } from '@/ui/layout/modal/components/ConfirmationModal';
@ -17,13 +15,7 @@ export const DeleteAccount = () => {
const [deleteUserAccount] = useDeleteUserAccountMutation();
const currentUser = useRecoilValue(currentUserState);
const userEmail = currentUser?.email;
const { signOut } = useAuth();
const navigate = useNavigate();
const handleLogout = useCallback(() => {
signOut();
navigate(AppPath.SignInUp);
}, [signOut, navigate]);
const handleLogout = useSignOutAndRedirect();
const deleteAccount = async () => {
await deleteUserAccount();

13
packages/twenty-front/src/modules/settings/profile/components/DeleteWorkspace.tsx
View File

@ -1,10 +1,8 @@
import { useCallback, useState } from 'react';
import { useNavigate } from 'react-router-dom';
import { useState } from 'react';
import { useRecoilValue } from 'recoil';
import { useAuth } from '@/auth/hooks/useAuth';
import { useSignOutAndRedirect } from '@/auth/hooks/useSignOutAndRedirect';
import { currentUserState } from '@/auth/states/currentUserState';
import { AppPath } from '@/types/AppPath';
import { H2Title } from '@/ui/display/typography/components/H2Title';
import {
ConfirmationModal,
@ -19,13 +17,8 @@ export const DeleteWorkspace = () => {
const [deleteCurrentWorkspace] = useDeleteCurrentWorkspaceMutation();
const currentUser = useRecoilValue(currentUserState);
const userEmail = currentUser?.email;
const { signOut } = useAuth();
const navigate = useNavigate();
const handleLogout = useCallback(() => {
signOut();
navigate(AppPath.SignInUp);
}, [signOut, navigate]);
const handleLogout = useSignOutAndRedirect();
const deleteWorkspace = async () => {
await deleteCurrentWorkspace();

1
packages/twenty-front/src/modules/ui/navigation/link/constants/Cal.ts Normal file
View File

@ -0,0 +1 @@
export const CAL_LINK = 'https://cal.com/team/twenty/talk-to-us';