diff --git a/dashboard/public/locales/en.json b/dashboard/public/locales/en.json
@@ -140,13 +140,14 @@
"users": {
"note-placeholder": "Additional information about user",
"data_limit": "Data Limit",
+ "traffic": "Traffic",
"used_traffic": "Used Traffic",
"data_limit_reset_strategy": "Data Reset Period",
"online_at": "Last Use",
"expire_date": "Expire Date",
"unlimited": "Unlimited",
"limited": "Limited",
- "data_limit_method": "Data limit type",
+ "data_limit_method": "Data Limit",
"determined_expire": "Determined",
"expire_method": "Expiration",
"onhold_expire": "On Hold",
diff --git a/dashboard/src/features/users/dialogs/delete-confirmation/index.tsx b/dashboard/src/features/users/components/dialogs/delete-confirmation/index.tsx
rename from dashboard/src/features/users/dialogs/delete-confirmation/index.tsx
rename to dashboard/src/features/users/components/dialogs/delete-confirmation/index.tsx
diff --git a/dashboard/src/features/users/dialogs/index.ts b/dashboard/src/features/users/components/dialogs/index.ts
rename from dashboard/src/features/users/dialogs/index.ts
rename to dashboard/src/features/users/components/dialogs/index.ts
diff --git a/dashboard/src/features/users/dialogs/mutation/fields/data-limit-reset-strategy.tsx b/dashboard/src/features/users/components/dialogs/mutation/fields/data-limit-reset-strategy.tsx
rename from dashboard/src/features/users/dialogs/mutation/fields/data-limit-reset-strategy.tsx
rename to dashboard/src/features/users/components/dialogs/mutation/fields/data-limit-reset-strategy.tsx
diff --git a/dashboard/src/features/users/dialogs/mutation/fields/data-limit.tsx b/dashboard/src/features/users/components/dialogs/mutation/fields/data-limit.tsx
rename from dashboard/src/features/users/dialogs/mutation/fields/data-limit.tsx
rename to dashboard/src/features/users/components/dialogs/mutation/fields/data-limit.tsx
@@ -21,7 +21,7 @@ export const DataLimitField: FC<DataLimitFieldProps> = () => {
name="data_limit"
render={({ field }) => (
<FormItem className="w-full">
- <FormLabel>{t('page.users.data_limit')}</FormLabel>
+ <FormLabel>{t('page.users.traffic')}</FormLabel>
<FormControl>
<Input
type="number"
diff --git a/dashboard/src/features/users/dialogs/mutation/fields/expire-date.tsx b/dashboard/src/features/users/components/dialogs/mutation/fields/expire-date.tsx
rename from dashboard/src/features/users/dialogs/mutation/fields/expire-date.tsx
rename to dashboard/src/features/users/components/dialogs/mutation/fields/expire-date.tsx
diff --git a/dashboard/src/features/users/dialogs/mutation/fields/index.ts b/dashboard/src/features/users/components/dialogs/mutation/fields/index.ts
rename from dashboard/src/features/users/dialogs/mutation/fields/index.ts
rename to dashboard/src/features/users/components/dialogs/mutation/fields/index.ts
diff --git a/dashboard/src/features/users/dialogs/mutation/fields/note.tsx b/dashboard/src/features/users/components/dialogs/mutation/fields/note.tsx
rename from dashboard/src/features/users/dialogs/mutation/fields/note.tsx
rename to dashboard/src/features/users/components/dialogs/mutation/fields/note.tsx
diff --git a/dashboard/src/features/users/dialogs/mutation/fields/onhold-expire-duration.tsx b/dashboard/src/features/users/components/dialogs/mutation/fields/onhold-expire-duration.tsx
rename from dashboard/src/features/users/dialogs/mutation/fields/onhold-expire-duration.tsx
rename to dashboard/src/features/users/components/dialogs/mutation/fields/onhold-expire-duration.tsx
diff --git a/dashboard/src/features/users/dialogs/mutation/fields/onhold-timeout.tsx b/dashboard/src/features/users/components/dialogs/mutation/fields/onhold-timeout.tsx
rename from dashboard/src/features/users/dialogs/mutation/fields/onhold-timeout.tsx
rename to dashboard/src/features/users/components/dialogs/mutation/fields/onhold-timeout.tsx
diff --git a/dashboard/src/features/users/dialogs/mutation/fields/services.tsx b/dashboard/src/features/users/components/dialogs/mutation/fields/services.tsx
rename from dashboard/src/features/users/dialogs/mutation/fields/services.tsx
rename to dashboard/src/features/users/components/dialogs/mutation/fields/services.tsx
diff --git a/dashboard/src/features/users/dialogs/mutation/fields/username.tsx b/dashboard/src/features/users/components/dialogs/mutation/fields/username.tsx
rename from dashboard/src/features/users/dialogs/mutation/fields/username.tsx
rename to dashboard/src/features/users/components/dialogs/mutation/fields/username.tsx
diff --git a/dashboard/src/features/users/dialogs/mutation/index.tsx b/dashboard/src/features/users/components/dialogs/mutation/index.tsx
rename from dashboard/src/features/users/dialogs/mutation/index.tsx
rename to dashboard/src/features/users/components/dialogs/mutation/index.tsx
@@ -1,5 +1,6 @@
import { type FC, useEffect, useCallback } from "react";
import {
+ Separator,
DialogTitle,
DialogContent,
Dialog,
@@ -84,8 +85,11 @@ export const UsersMutationDialog: FC<UsersMutationDialogProps> = ({
<div className="flex-col grid-cols-2 gap-2 sm:flex md:grid h-full">
<div>
<UsernameField disabled={!!entity?.username} />
+ <Separator className="my-3"/>
<DataLimitFields />
+ <Separator className="my-3"/>
<ExpirationMethodFields entity={entity} />
+ <Separator className="my-3"/>
<NoteField />
</div>
<VStack>
diff --git a/dashboard/src/features/users/dialogs/mutation/schema.ts b/dashboard/src/features/users/components/dialogs/mutation/schema.ts
rename from dashboard/src/features/users/dialogs/mutation/schema.ts
rename to dashboard/src/features/users/components/dialogs/mutation/schema.ts
@@ -5,15 +5,11 @@ export const UserSchema = z.object({
username: z.string().min(1, { message: 'Username is required' }),
note: z.string().nullable(),
data_limit: z
- .string()
- .min(0, 'The minimum number is 0')
- .or(z.number())
+ .union([z.string().transform((str) => Number(str) * DATA_LIMIT_METRIC), z.number()])
+ .refine(val => val >= 0, { message: 'The minimum number is 0' })
.nullable()
.optional()
- .transform((str) => {
- if (str) return Number((parseFloat(String(str)) * DATA_LIMIT_METRIC).toFixed(5));
- return 0;
- }),
+ .transform((val) => val ?? 0),
expire: z.string().or(z.number()).nullable().optional(),
data_limit_reset_strategy: z.string().nullable().optional(),
status: z.string(),
diff --git a/dashboard/src/features/users/components/dialogs/mutation/sections/data-limit/index.tsx b/dashboard/src/features/users/components/dialogs/mutation/sections/data-limit/index.tsx
@@ -0,0 +1,33 @@
+import { FC } from "react";
+import { FormLabel, Switch } from '@marzneshin/components';
+import { useTranslation } from 'react-i18next';
+import { DataLimitField, DataLimitResetStrategyField } from "../../fields";
+import { useFormContext } from "react-hook-form";
+import { useDataLimit } from "./use-data-limit";
+
+export const DataLimitFields: FC = () => {
+ const { t } = useTranslation();
+ const { isDataLimitEnabled, setIsDataLimitEnabled } = useDataLimit();
+ const form = useFormContext();
+
+ const handleToggleChange = () => {
+ setIsDataLimitEnabled(!isDataLimitEnabled);
+ };
+
+ return (
+ <div className="my-2">
+ <FormLabel className="hstack justify-between items-center text-md my-2" >
+ {t('page.users.data_limit_method')}
+ <Switch checked={isDataLimitEnabled} onCheckedChange={handleToggleChange} />
+ </FormLabel>
+ <div className="flex gap-2 items-center w-full sm:flex-row md:flex-col">
+ {isDataLimitEnabled && (
+ <div className="flex gap-2 items-center w-full">
+ <DataLimitField />
+ {form.watch().data_limit !== 0 && <DataLimitResetStrategyField />}
+ </div>
+ )}
+ </div>
+ </div>
+ );
+};
diff --git a/dashboard/src/features/users/components/dialogs/mutation/sections/data-limit/use-data-limit.ts b/dashboard/src/features/users/components/dialogs/mutation/sections/data-limit/use-data-limit.ts
@@ -0,0 +1,22 @@
+import { useEffect, useState } from "react";
+import { useFormContext } from "react-hook-form";
+
+export const useDataLimit = () => {
+ const form = useFormContext();
+ const data_limit = form.watch("data_limit");
+
+ const [isDataLimitEnabled, setIsDataLimitEnabled] = useState(data_limit !== 0);
+
+ useEffect(() => {
+ setIsDataLimitEnabled(data_limit !== 0);
+ }, [data_limit]);
+
+ useEffect(() => {
+ if (!isDataLimitEnabled) {
+ form.setValue("data_limit", 0);
+ form.setValue("data_limit_reset_strategy", "no_reset");
+ }
+ }, [isDataLimitEnabled, form]);
+
+ return { isDataLimitEnabled, setIsDataLimitEnabled };
+};
diff --git a/dashboard/src/features/users/dialogs/mutation/sections/expiration-method.tsx b/dashboard/src/features/users/components/dialogs/mutation/sections/expiration-method/index.tsx
rename from dashboard/src/features/users/dialogs/mutation/sections/expiration-method.tsx
rename to dashboard/src/features/users/components/dialogs/mutation/sections/expiration-method/index.tsx
@@ -12,31 +12,37 @@ import {
ExpireDateField,
OnHoldTimeoutField,
OnHoldExpireDurationField,
-} from "../fields";
+} from "@marzneshin/features/users/components/dialogs/mutation/fields";
import { TabsList } from "@radix-ui/react-tabs";
import { useTranslation } from "react-i18next";
-import { useExpirationMethodTabs } from "./use-expiration-method-tabs";
+import {
+ useExpirationMethodTabs,
+ type ExpirationMethodStrategy
+} from "./use-expiration-method-tabs";
interface ExpirationMethodProps {
entity: UserMutationType | null
}
-
export const ExpirationMethodFields: FC<ExpirationMethodProps> = ({ entity }) => {
- const { t } = useTranslation()
+ const { t } = useTranslation();
const {
setSelectedExpirationMethodTab,
defaultExpirationMethodTab
- } = useExpirationMethodTabs({ entity })
+ } = useExpirationMethodTabs({ entity });
+
+ const handleTabChange = (value: string) => {
+ setSelectedExpirationMethodTab(value as ExpirationMethodStrategy);
+ };
return (
<>
- <FormLabel>
+ <FormLabel className="text-md">
{t('page.users.expire_method')}
</FormLabel>
- <Tabs
- defaultValue={defaultExpirationMethodTab}
- onValueChange={setSelectedExpirationMethodTab}
+ <Tabs
+ defaultValue={defaultExpirationMethodTab}
+ onValueChange={handleTabChange}
className="mt-2 w-full"
>
<TabsList className="flex flex-row items-center p-1 w-full rounded-md bg-accent">
@@ -65,5 +71,5 @@ export const ExpirationMethodFields: FC<ExpirationMethodProps> = ({ entity }) =>
</TabsContent>
</Tabs>
</>
- )
-}
+ );
+};
diff --git a/dashboard/src/features/users/components/dialogs/mutation/sections/expiration-method/use-expiration-method-tabs.ts b/dashboard/src/features/users/components/dialogs/mutation/sections/expiration-method/use-expiration-method-tabs.ts
@@ -0,0 +1,45 @@
+import { UserMutationType } from "@marzneshin/features/users";
+import { useEffect, useState } from "react";
+import { useFormContext } from "react-hook-form";
+
+export type ExpirationMethodStrategy = "onhold" | "determined" | "unlimited";
+
+const getUserExpirationMethod = (entity: UserMutationType): ExpirationMethodStrategy => {
+ if (entity.status === "on_hold") return 'onhold';
+ if (entity.expire != null) return 'determined';
+ return 'unlimited';
+};
+
+export const useExpirationMethodTabs = ({ entity }: { entity: UserMutationType | null }) => {
+ const form = useFormContext();
+
+ const defaultExpirationMethodTab = entity ? getUserExpirationMethod(entity) : 'determined';
+ const [selectedExpirationMethodTab, setSelectedExpirationMethodTab] = useState<ExpirationMethodStrategy>(defaultExpirationMethodTab);
+
+ useEffect(() => {
+ form.setValue("status", selectedExpirationMethodTab === 'onhold' ? 'on_hold' : 'active');
+
+ if (selectedExpirationMethodTab === 'onhold') {
+ form.setValue("expire", undefined);
+ } else if (selectedExpirationMethodTab === "unlimited") {
+ form.setValue("expire", 0);
+ form.setValue("on_hold_expire_duration", undefined);
+ form.setValue("on_hold_timeout", undefined);
+ } else {
+ form.setValue("on_hold_expire_duration", 0);
+ form.setValue("on_hold_timeout", null);
+ }
+
+ form.clearErrors("expire");
+ form.clearErrors("on_hold_expire_duration");
+ form.clearErrors("on_hold_timeout");
+
+ // eslint-disable-next-line
+ }, [selectedExpirationMethodTab]);
+
+ return {
+ selectedExpirationMethodTab,
+ defaultExpirationMethodTab,
+ setSelectedExpirationMethodTab
+ };
+};
diff --git a/dashboard/src/features/users/dialogs/mutation/sections/index.ts b/dashboard/src/features/users/components/dialogs/mutation/sections/index.ts
rename from dashboard/src/features/users/dialogs/mutation/sections/index.ts
rename to dashboard/src/features/users/components/dialogs/mutation/sections/index.ts
diff --git a/dashboard/src/features/users/dialogs/settings/index.tsx b/dashboard/src/features/users/components/dialogs/settings/index.tsx
rename from dashboard/src/features/users/dialogs/settings/index.tsx
rename to dashboard/src/features/users/components/dialogs/settings/index.tsx
diff --git a/dashboard/src/features/users/dialogs/settings/user-info/index.ts b/dashboard/src/features/users/components/dialogs/settings/user-info/index.ts
rename from dashboard/src/features/users/dialogs/settings/user-info/index.ts
rename to dashboard/src/features/users/components/dialogs/settings/user-info/index.ts
diff --git a/dashboard/src/features/users/dialogs/settings/user-info/qrcode.tsx b/dashboard/src/features/users/components/dialogs/settings/user-info/qrcode.tsx
rename from dashboard/src/features/users/dialogs/settings/user-info/qrcode.tsx
rename to dashboard/src/features/users/components/dialogs/settings/user-info/qrcode.tsx
diff --git a/dashboard/src/features/users/dialogs/settings/user-info/subcription-link-button.tsx b/dashboard/src/features/users/components/dialogs/settings/user-info/subcription-link-button.tsx
rename from dashboard/src/features/users/dialogs/settings/user-info/subcription-link-button.tsx
rename to dashboard/src/features/users/components/dialogs/settings/user-info/subcription-link-button.tsx
diff --git a/dashboard/src/features/users/dialogs/settings/user-info/subscription-actions.tsx b/dashboard/src/features/users/components/dialogs/settings/user-info/subscription-actions.tsx
rename from dashboard/src/features/users/dialogs/settings/user-info/subscription-actions.tsx
rename to dashboard/src/features/users/components/dialogs/settings/user-info/subscription-actions.tsx
diff --git a/dashboard/src/features/users/dialogs/settings/user-info/table.tsx b/dashboard/src/features/users/components/dialogs/settings/user-info/table.tsx
rename from dashboard/src/features/users/dialogs/settings/user-info/table.tsx
rename to dashboard/src/features/users/components/dialogs/settings/user-info/table.tsx
diff --git a/dashboard/src/features/users/dialogs/settings/user-info/user-status-enable-button.tsx b/dashboard/src/features/users/components/dialogs/settings/user-info/user-status-enable-button.tsx
rename from dashboard/src/features/users/dialogs/settings/user-info/user-status-enable-button.tsx
rename to dashboard/src/features/users/components/dialogs/settings/user-info/user-status-enable-button.tsx
diff --git a/dashboard/src/features/users/components/index.ts b/dashboard/src/features/users/components/index.ts
@@ -3,3 +3,6 @@ export * from './services-card'
export * from './date-field'
export * from './online-status'
export * from './used-user-traffic'
+export * from "./tables"
+export * from "./dialogs"
+export * from "./widgets"
diff --git a/dashboard/src/features/users/tables/index.ts b/dashboard/src/features/users/components/tables/index.ts
rename from dashboard/src/features/users/tables/index.ts
rename to dashboard/src/features/users/components/tables/index.ts
diff --git a/dashboard/src/features/users/tables/services/columns.tsx b/dashboard/src/features/users/components/tables/services/columns.tsx
rename from dashboard/src/features/users/tables/services/columns.tsx
rename to dashboard/src/features/users/components/tables/services/columns.tsx
diff --git a/dashboard/src/features/users/tables/services/index.tsx b/dashboard/src/features/users/components/tables/services/index.tsx
rename from dashboard/src/features/users/tables/services/index.tsx
rename to dashboard/src/features/users/components/tables/services/index.tsx
diff --git a/dashboard/src/features/users/tables/users/columns.tsx b/dashboard/src/features/users/components/tables/users/columns.tsx
rename from dashboard/src/features/users/tables/users/columns.tsx
rename to dashboard/src/features/users/components/tables/users/columns.tsx
@@ -71,10 +71,21 @@ export const columns = (actions: ColumnAction): ColumnDef<UserType>[] => [
{
id: "actions",
cell: ({ row }) => {
+ const handleKeyDown = (e: React.KeyboardEvent<HTMLDivElement>) => {
+ if (e.key === 'Enter' || e.key === ' ') {
+ e.preventDefault();
+ e.stopPropagation();
+ actions.onOpen(row.original);
+ }
+ };
+
return (
<div
className="flex flex-row gap-2 items-center"
onClick={(e) => e.stopPropagation()}
+ onKeyDown={handleKeyDown}
+ tabIndex={0}
+ role="button"
>
<CopyToClipboardButton
text={getSubscriptionLink(row.original.subscription_url)}
@@ -92,5 +103,5 @@ export const columns = (actions: ColumnAction): ColumnDef<UserType>[] => [
</div>
);
},
- },
+ }
];
diff --git a/dashboard/src/features/users/tables/users/index.tsx b/dashboard/src/features/users/components/tables/users/index.tsx
rename from dashboard/src/features/users/tables/users/index.tsx
rename to dashboard/src/features/users/components/tables/users/index.tsx
diff --git a/dashboard/src/features/users/widgets/index.ts b/dashboard/src/features/users/components/widgets/index.ts
rename from dashboard/src/features/users/widgets/index.ts
rename to dashboard/src/features/users/components/widgets/index.ts
diff --git a/dashboard/src/features/users/widgets/users-stats-widget/index.tsx b/dashboard/src/features/users/components/widgets/users-stats-widget/index.tsx
rename from dashboard/src/features/users/widgets/users-stats-widget/index.tsx
rename to dashboard/src/features/users/components/widgets/users-stats-widget/index.tsx
diff --git a/dashboard/src/features/users/widgets/users-stats-widget/legend.tsx b/dashboard/src/features/users/components/widgets/users-stats-widget/legend.tsx
rename from dashboard/src/features/users/widgets/users-stats-widget/legend.tsx
rename to dashboard/src/features/users/components/widgets/users-stats-widget/legend.tsx
diff --git a/dashboard/src/features/users/widgets/users-stats-widget/users-stats-widget.stories.ts b/dashboard/src/features/users/components/widgets/users-stats-widget/users-stats-widget.stories.ts
rename from dashboard/src/features/users/widgets/users-stats-widget/users-stats-widget.stories.ts
rename to dashboard/src/features/users/components/widgets/users-stats-widget/users-stats-widget.stories.ts
diff --git a/dashboard/src/features/users/router-context/index.ts b/dashboard/src/features/users/contexts/router.ts
rename from dashboard/src/features/users/router-context/index.ts
rename to dashboard/src/features/users/contexts/router.ts
diff --git a/dashboard/src/features/users/dialogs/mutation/sections/data-limit.tsx b/dashboard/src/features/users/dialogs/mutation/sections/data-limit.tsx
@@ -1,67 +0,0 @@
-
-import { FC, useEffect, useState } from "react";
-import {
- Tabs,
- TabsTrigger,
- TabsContent,
- FormLabel
-} from '@marzneshin/components';
-import { useTranslation } from 'react-i18next';
-import {
- DataLimitField,
- DataLimitResetStrategyField,
-} from "../fields";
-import { TabsList } from "@radix-ui/react-tabs";
-import { useFormContext } from 'react-hook-form';
-
-export const DataLimitFields: FC = () => {
- const form = useFormContext()
-
- const { t } = useTranslation()
- const data_limit = form.watch().data_limit;
-
- const [
- selectedDataLimitTab,
- setSelectedDataLimitTab
- ] = useState((data_limit === 0) ? "unlimited" : "limited");
-
- useEffect(() => {
- setSelectedDataLimitTab((data_limit === 0) ? "unlimited" : "limited")
- }, [data_limit])
-
- useEffect(() => {
- if (selectedDataLimitTab !== 'limited') {
- form.setValue("data_limit", undefined)
- form.setValue("data_limit_reset_strategy", "no_reset");
- }
- // eslint-disable-next-line
- }, [selectedDataLimitTab]);
-
- return (
- <>
- <FormLabel>
- {t('page.users.data_limit_method')}
- </FormLabel>
- <div className="flex gap-2 items-center w-full sm:flex-row md:flex-col">
- <Tabs defaultValue={selectedDataLimitTab} onValueChange={setSelectedDataLimitTab} className="mt-2 w-full">
- <TabsList className="flex flex-row items-center p-1 w-full rounded-md bg-accent">
- <TabsTrigger
- className="w-full"
- value="limited">
- {t('page.users.limited')}
- </TabsTrigger>
- <TabsTrigger
- className="w-full"
- value="unlimited">
- {t('page.users.unlimited')}
- </TabsTrigger>
- </TabsList>
- <TabsContent value="limited">
- <DataLimitField />
- {form.watch().data_limit !== 0 && <DataLimitResetStrategyField />}
- </TabsContent>
- </Tabs>
- </div>
- </>
- )
-}
diff --git a/dashboard/src/features/users/dialogs/mutation/sections/use-expiration-method-tabs.ts b/dashboard/src/features/users/dialogs/mutation/sections/use-expiration-method-tabs.ts
@@ -1,50 +0,0 @@
-import { UserMutationType } from "@marzneshin/features/users";
-import { useEffect, useState } from "react";
-import { useFormContext } from "react-hook-form";
-
-type ExpirationMethodStrategy = "onhold" | "determined" | "unlimited";
-
-const getUserExpirationMethod = (entity: UserMutationType): ExpirationMethodStrategy => {
- if (entity.status === "on_hold")
- return 'onhold'
- else if (entity.expire !== undefined && entity.expire !== null)
- return 'determined'
- else
- return 'unlimited'
-}
-
-
-export const useExpirationMethodTabs = ({ entity }: { entity: UserMutationType | null }) => {
- const form = useFormContext()
-
- const defaultExpirationMethodTab =
- (entity !== null) ? getUserExpirationMethod(entity) : 'determined'
- const [
- selectedExpirationMethodTab,
- setSelectedExpirationMethodTab
- ] = useState<ExpirationMethodStrategy | string>(defaultExpirationMethodTab);
-
- useEffect(() => {
- form.setValue("status", "active")
- if (selectedExpirationMethodTab === 'onhold') {
- form.setValue("status", "on_hold")
- form.setValue("expire", undefined);
- form.clearErrors("expire");
- } else if (selectedExpirationMethodTab === "unlimited") {
- form.setValue("expire", 0);
- form.setValue("on_hold_expire_duration", undefined);
- form.setValue("on_hold_timeout", undefined);
- form.clearErrors("expire");
- form.clearErrors("on_hold_expire_duration");
- form.clearErrors("on_hold_timeout");
- } else {
- form.setValue("on_hold_expire_duration", 0);
- form.setValue("on_hold_timeout", null);
- form.clearErrors("on_hold_expire_duration");
- form.clearErrors("on_hold_timeout");
- }
- // eslint-disable-next-line
- }, [selectedExpirationMethodTab]);
-
- return { selectedExpirationMethodTab, defaultExpirationMethodTab, setSelectedExpirationMethodTab }
-}
diff --git a/dashboard/src/features/users/index.ts b/dashboard/src/features/users/index.ts
@@ -1,8 +1,5 @@
export * from './services'
export * from './types'
-export * from './tables'
export * from './components'
-export * from './dialogs'
export * from './constants'
-export * from './widgets'
-export * from './router-context'
+export * from './contexts/router'