Skip to content
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
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions proxy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import type { Route } from 'next';

const REFRESH_COOKIE = 'refresh';

const PROTECTED_PREFIXES = [routes.team.root()];
const PROTECTED_PREFIXES = [routes.profile(), routes.projects(), routes.tasks()];
const PUBLIC_ONLY_ROUTES = [routes.auth.signin(), routes.auth.signup()];

function startsWithOneOf(pathname: string, prefixes: string[]) {
Expand All @@ -25,7 +25,7 @@ export function proxy(req: NextRequest) {
}

if (isPublicOnly && hasRefreshCookie) {
return NextResponse.redirect(new URL(routes.team.root(), req.url));
return NextResponse.redirect(new URL(routes.profile(), req.url));
}

return NextResponse.next();
Expand Down
2 changes: 1 addition & 1 deletion src/pages/signin/ui/SigninPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ function SigninPage() {
onSuccess={(_, res) => {
if (res.success) {
AccessToken.token = res.token;
router.replace(routes.team.profile());
router.replace(routes.profile());
if (res.message) {
toast.success(res.message);
}
Expand Down
2 changes: 1 addition & 1 deletion src/pages/signup/ui/SignupPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ function SignupPage() {
if (res.success) {
clearDraft();
AccessToken.token = res.token;
router.replace(routes.team.profile());
router.replace(routes.profile());
if (res.message) {
toast.success(res.message);
}
Expand Down
9 changes: 3 additions & 6 deletions src/shared/config/routes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,12 @@ import type { Route } from 'next';

export const routes = {
home: (): Route => '/',
profile: (): Route => '/profile',
projects: (): Route => '/projects',
tasks: (): Route => '/tasks',
auth: {
signin: (): Route => '/signin',
signup: (): Route => '/signup',
forgotPassword: (): Route => '/forgot-password',
},
team: {
root: (): Route => '/team',
projects: (): Route => '/team/projects',
profile: (): Route => '/team/profile',
tasks: (): Route => '/team/tasks',
},
} as const;
6 changes: 3 additions & 3 deletions src/widgets/app-sidebar/ui/AppSidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -60,23 +60,23 @@ export function AppSidebar({ ...props }: React.ComponentProps<typeof Sidebar>) {
<SidebarMenu>
<SidebarMenuItem>
<SidebarMenuButton asChild>
<Link href={routes.team.profile()}>
<Link href={routes.profile()}>
<UserRound />
<span>Мой профиль</span>
</Link>
</SidebarMenuButton>
</SidebarMenuItem>
<SidebarMenuItem>
<SidebarMenuButton asChild>
<Link href={routes.team.tasks()}>
<Link href={routes.tasks()}>
<ListTodo />
<span>Мои задачи</span>
</Link>
</SidebarMenuButton>
</SidebarMenuItem>
<SidebarMenuItem>
<SidebarMenuButton asChild>
<Link href={routes.team.projects()}>
<Link href={routes.projects()}>
<FolderKanban />
<span>Мои Проекты</span>
</Link>
Expand Down
2 changes: 1 addition & 1 deletion src/widgets/app-sidebar/ui/NavUser.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ export function NavUser({
<DropdownMenuGroup>
<DropdownMenuItem>
<BadgeCheck />
<Link href={routes.team.profile()}>Account</Link>
<Link href={routes.profile()}>Account</Link>
</DropdownMenuItem>
<DropdownMenuItem>
<Bell />
Expand Down
Loading