maronato/cal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update settings back button redirect link (#7403) 

* fix(schedule): close on click #7143

* fix(EventSetupTab): validLocations length will always match validLocations length #7138

* fix(SettingsLayout): go back to right route #7379
This commit is contained in:
Esaú Morais 2023-02-25 16:07:41 -03:00 committed by GitHub
parent ddb752102f
commit 8c63b42cec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
packages/features/settings/layouts/SettingsLayout.tsx
View File

@ -123,16 +123,18 @@ const useTabs = () => {
}; };
const BackButtonInSidebar = ({ name }: { name: string }) => { const BackButtonInSidebar = ({ name }: { name: string }) => {
const router = useRouter();
return ( return (
<Link <button
href="/event-types"
className="group my-6 flex h-6 max-h-6 w-64 flex-row items-center rounded-md py-2 px-3 text-sm font-medium leading-4 text-black hover:bg-gray-100 group-hover:text-gray-700 [&[aria-current='page']]:bg-gray-200 [&[aria-current='page']]:text-gray-900" className="group my-6 flex h-6 max-h-6 w-64 flex-row items-center rounded-md py-2 px-3 text-sm font-medium leading-4 text-black hover:bg-gray-100 group-hover:text-gray-700 [&[aria-current='page']]:bg-gray-200 [&[aria-current='page']]:text-gray-900"
data-testid={`vertical-tab-${name}`}> data-testid={`vertical-tab-${name}`}
onClick={() => router.back()}>
<FiArrowLeft className="h-4 w-4 stroke-[2px] ltr:mr-[10px] rtl:ml-[10px] md:mt-0" /> <FiArrowLeft className="h-4 w-4 stroke-[2px] ltr:mr-[10px] rtl:ml-[10px] md:mt-0" />
<Skeleton title={name} as="p" className="max-w-36 min-h-4 truncate"> <Skeleton title={name} as="p" className="max-w-36 min-h-4 truncate">
{name} {name}
</Skeleton> </Skeleton>
</Link> </button>
); );
}; };
@ -243,7 +245,7 @@ const SettingsSidebarContainer = ({
}> }>
<CollapsibleTrigger> <CollapsibleTrigger>
<div <div
className="flex h-9 w-64 flex-row items-center rounded-md px-3 py-[10px] text-sm font-medium leading-none hover:bg-gray-100 group-hover:text-gray-700 [&[aria-current='page']]:bg-gray-200 [&[aria-current='page']]:text-gray-900 text-left" className="flex h-9 w-64 flex-row items-center rounded-md px-3 py-[10px] text-left text-sm font-medium leading-none hover:bg-gray-100 group-hover:text-gray-700 [&[aria-current='page']]:bg-gray-200 [&[aria-current='page']]:text-gray-900"
onClick={() => onClick={() =>
setTeamMenuState([ setTeamMenuState([
...teamMenuState, ...teamMenuState,
@ -337,6 +339,7 @@ const SettingsSidebarContainer = ({
const MobileSettingsContainer = (props: { onSideContainerOpen?: () => void }) => { const MobileSettingsContainer = (props: { onSideContainerOpen?: () => void }) => {
const { t } = useLocale(); const { t } = useLocale();
const router = useRouter();
return ( return (
<> <>
@ -346,12 +349,12 @@ const MobileSettingsContainer = (props: { onSideContainerOpen?: () => void }) =>
<span className="sr-only">{t("show_navigation")}</span> <span className="sr-only">{t("show_navigation")}</span>
</Button> </Button>
<a <button
href="/" className="flex items-center space-x-2 rounded-md px-3 py-1 hover:bg-gray-200 rtl:space-x-reverse"
className="flex items-center space-x-2 rounded-md px-3 py-1 hover:bg-gray-200 rtl:space-x-reverse"> onClick={() => router.back()}>
<FiArrowLeft className="text-gray-700" /> <FiArrowLeft className="text-gray-700" />
<p className="font-semibold text-black">{t("settings")}</p> <p className="font-semibold text-black">{t("settings")}</p>
</a> </button>
</div> </div>
</nav> </nav>
</> </>