404
-Клуб не найден
- +
+
+
+
+
+
Клуб не найден
++ Проверьте, что ID клуба в адресе указан верно. В другом случае, его могло и не существовать. +
+404
Событие не найдено
- +
-
-
-
-
-
- {
- navigator.clipboard.writeText(window.location.href);
- const { toast } = await import('react-hot-toast');
- toast.success('Ссылка скопирована');
- }}
- >
-
-
-
-
-
-
-
-
- */} - {/* Подробности */} - {/*
*/} -
- 0 && getStaticImg(event.eventImages[0])) ||
- '/img/default-club-banner.jpg'
- }
- fill
- alt={event.title || 'Event banner'}
- className="object-cover"
- priority
- />
-
-
-
-
-
-
- {event.title}
-{event.description}
-
-
-
-
- {event.location}
-
-
-
+
+
+
+
+
+ {
+ navigator.clipboard.writeText(window.location.href);
+ const { toast } = await import('react-hot-toast');
+ toast.success('Ссылка скопирована');
+ }}
+ >
+
+
+
+
+
+
+
+
+ */} + {/* Подробности */} + {/*
*/} +
+ 0 && getStaticImg(event.eventImages[0])) ||
+ '/img/default-club-banner.jpg'
+ }
+ fill
+ alt={event.title || 'Event banner'}
+ className="object-cover"
+ priority
+ />
+
+
+
+
+
+
+ {event.title}
+{event.description}
+
+
+
+
+ {event.location}
+
+
+
diff --git a/src/app/(auth)/(withMenuNavigation)/events/calendar/page.tsx b/src/app/(auth)/(withMenuNavigation)/events/calendar/page.tsx
index 1a91e74..8650bbe 100644
--- a/src/app/(auth)/(withMenuNavigation)/events/calendar/page.tsx
+++ b/src/app/(auth)/(withMenuNavigation)/events/calendar/page.tsx
@@ -4,7 +4,7 @@ import { Calendar } from './Calendar';
export const metadata: Metadata = {
title: 'Календарь событий',
- description: '',
+ description: 'Календарь со всеми событиями',
};
export default async function Page() {
diff --git a/src/app/(auth)/(withMenuNavigation)/events/page.tsx b/src/app/(auth)/(withMenuNavigation)/events/page.tsx
index 70cc495..1111f0c 100644
--- a/src/app/(auth)/(withMenuNavigation)/events/page.tsx
+++ b/src/app/(auth)/(withMenuNavigation)/events/page.tsx
@@ -1,16 +1,44 @@
import type { Metadata } from 'next';
+import Link from 'next/link';
+
+import { CalendarBadge } from '@/components/Badges';
+import { EventCard } from '@/components/EventCard';
+import { Page } from '@/components/Page';
+
+import { AUTH_PAGE } from '@/lib/config/routes.config';
import { eventsApi } from '@/api/api';
-import { Events } from './Events';
+import { Header, HeaderTitle } from '@/hoc/Header';
+import { MainContent } from '@/hoc/MainContent';
export const metadata: Metadata = {
title: 'События',
description: '',
};
-export default async function Page() {
+export const dynamic = 'force-dynamic';
+export const revalidate = 60;
+
+export default async function EventsPage() {
const events = (await eventsApi.eventsGetAll()).data;
- return
+
+ События
+
+
+
+ {events &&
+ events.map((event) => (
+
+
+ );
}
diff --git a/src/app/(auth)/(withMenuNavigation)/finder/Finder.tsx b/src/app/(auth)/(withMenuNavigation)/finder/Finder.tsx
index 759ed10..dc301bf 100644
--- a/src/app/(auth)/(withMenuNavigation)/finder/Finder.tsx
+++ b/src/app/(auth)/(withMenuNavigation)/finder/Finder.tsx
@@ -1,4 +1,4 @@
-import { Header, HeaderTitle } from '@/hoc/Header/Header';
+import { Header, HeaderTitle } from '@/hoc/Header';
export function Finder() {
return (
diff --git a/src/app/(auth)/(withMenuNavigation)/loading.tsx b/src/app/(auth)/(withMenuNavigation)/loading.tsx
index 24b250d..d3527cc 100644
--- a/src/app/(auth)/(withMenuNavigation)/loading.tsx
+++ b/src/app/(auth)/(withMenuNavigation)/loading.tsx
@@ -1,4 +1,4 @@
-import { MainLoader } from '@/components/MainLoader/MainLoader';
+import { MainLoader } from '@/components/MainLoader';
export default function Loading() {
return
+
+ );
+}
diff --git a/src/app/(auth)/(withMenuNavigation)/profile/UserProfile.tsx b/src/app/(auth)/(withMenuNavigation)/profile/UserProfile.tsx
deleted file mode 100644
index 98fba34..0000000
--- a/src/app/(auth)/(withMenuNavigation)/profile/UserProfile.tsx
+++ /dev/null
@@ -1,85 +0,0 @@
-'use client';
-
-import { useQuery } from '@tanstack/react-query';
-import Link from 'next/link';
-import { BiMessageSquare, BiSolidIdCard } from 'react-icons/bi';
-
-import { SettingBadge } from '@/components/Badges';
-import { ClubCard } from '@/components/ClubComponents/ClubCard';
-import { Page } from '@/components/Page';
-import { Avatar } from '@/components/ui/Avatar';
-import { SkeletonList } from '@/components/ui/skeleton';
-
-import { AUTH_PAGE } from '@/lib/config/routes.config';
-
-import { useProfile } from '@/hooks/useProfile';
-
-import { userApi } from '@/api/api';
-
-import { Header, HeaderTitle } from '@/hoc/Header/Header';
-import { MainContent } from '@/hoc/MainContent/MainContent';
-
-export default function UserProfile() {
- const {
- data: userClubs,
- isLoading,
- error,
- } = useQuery({
- queryKey: ['fetch-profile-user-clubs'],
- queryFn: async () => (await userApi.userGetSubscribedClubs(0, 3)).data,
- });
- const { data: user } = useProfile();
-
- return (
-
-
- Профиль
-
-
-
-
-
-
- );
-}
diff --git a/src/app/(auth)/(withMenuNavigation)/profile/[id]/Profile.tsx b/src/app/(auth)/(withMenuNavigation)/profile/[id]/Profile.tsx
index ffcf35a..8846501 100644
--- a/src/app/(auth)/(withMenuNavigation)/profile/[id]/Profile.tsx
+++ b/src/app/(auth)/(withMenuNavigation)/profile/[id]/Profile.tsx
@@ -1,13 +1,8 @@
-'use client';
-
-import { useQuery } from '@tanstack/react-query';
import { Copy, EllipsisVertical, OctagonAlert } from 'lucide-react';
import Link from 'next/link';
-import { usePathname } from 'next/navigation';
-import toast from 'react-hot-toast';
import { BiMessageSquare, BiSolidIdCard } from 'react-icons/bi';
+import { IoSettingsSharp } from 'react-icons/io5';
-import { ClubCard } from '@/components/ClubComponents/ClubCard';
import { Page } from '@/components/Page';
import { Avatar } from '@/components/ui/Avatar';
import { BackButton } from '@/components/ui/BackButton';
@@ -18,36 +13,37 @@ import {
DropdownMenuItem,
DropdownMenuTrigger,
} from '@/components/ui/dropdown-menu';
-import { SkeletonList } from '@/components/ui/skeleton';
import { AUTH_PAGE } from '@/lib/config/routes.config';
-import { clubsApi } from '@/api/api';
import type { PersonDetailDTO } from '@/api/axios-client/models';
-import { Header } from '@/hoc/Header/Header';
-import { MainContent } from '@/hoc/MainContent/MainContent';
+import UserProfileClubs from '@/app/(auth)/(withMenuNavigation)/profile/[id]/UserProfileClubs';
+import { Header } from '@/hoc/Header';
+import { MainContent } from '@/hoc/MainContent';
type Props = {
user: PersonDetailDTO;
+ isCurrent: boolean;
};
-export default function Profile({ user }: Props) {
- const {
- data: userClubs,
- isLoading,
- error,
- } = useQuery({
- queryKey: [user.id, 'fetch-profile-user-clubs'],
- queryFn: async () => (await clubsApi.clubsGetByPersonId(user.id, 0, 3)).data,
- });
-
- const pathname = usePathname();
+export const dynamic = 'force-dynamic';
+export const revalidate = 60;
+export default function Profile({ user, isCurrent }: Props) {
return (
-
+
- {
- navigator.clipboard.writeText(`https://setka-rtu.ru${pathname}`);
- toast.success('Ссылка скопирована');
- }}
- >
+
-
-
+ {!isCurrent && (
+
+
+ )}
@@ -101,18 +94,11 @@ export default function Profile({ user }: Props) {
- {isLoading &&
diff --git a/src/app/(auth)/(withMenuNavigation)/profile/[id]/UserProfileClubs.tsx b/src/app/(auth)/(withMenuNavigation)/profile/[id]/UserProfileClubs.tsx
new file mode 100644
index 0000000..ab959c3
--- /dev/null
+++ b/src/app/(auth)/(withMenuNavigation)/profile/[id]/UserProfileClubs.tsx
@@ -0,0 +1,35 @@
+'use client';
+
+import { useQuery } from '@tanstack/react-query';
+import dynamic from 'next/dynamic';
+import { Fragment } from 'react';
+
+import { SkeletonList } from '@/components/ui/skeleton';
+
+import { clubsApi } from '@/api/api';
+
+const ClubCardDynamic = dynamic(() => import('@/components/ClubComponents/ClubCard').then((mod) => mod.ClubCard), {
+ ssr: false,
+});
+
+export default function UserProfileClubs({ id }: { id: number }) {
+ const {
+ data: userClubs,
+ isLoading,
+ error,
+ } = useQuery({
+ queryKey: [id, 'fetch-profile-user-clubs'],
+ queryFn: async () => (await clubsApi.clubsGetByPersonId(id, 0, 3)).data,
+ });
+
+ return (
+
+ {isLoading &&
+ );
+}
diff --git a/src/app/(auth)/(withMenuNavigation)/profile/[id]/clubs/ProfileClubs.tsx b/src/app/(auth)/(withMenuNavigation)/profile/[id]/clubs/ProfileClubs.tsx
index 3257f6b..a46cbd0 100644
--- a/src/app/(auth)/(withMenuNavigation)/profile/[id]/clubs/ProfileClubs.tsx
+++ b/src/app/(auth)/(withMenuNavigation)/profile/[id]/clubs/ProfileClubs.tsx
@@ -3,7 +3,6 @@
import { useMemo } from 'react';
import { ClubCard } from '@/components/ClubComponents/ClubCard';
-import { BackButton } from '@/components/ui/BackButton';
import { SkeletonList } from '@/components/ui/skeleton';
import { useInfinityScroll } from '@/hooks/useInfinityScroll';
@@ -11,8 +10,6 @@ import { useInfinityScroll } from '@/hooks/useInfinityScroll';
import { clubsApi } from '@/api/api';
import type { PersonDetailDTO } from '@/api/axios-client';
-import { Header, HeaderTitle } from '@/hoc/Header/Header';
-
export default function ProfileClubs({ user }: { user: PersonDetailDTO }) {
const {
ref,
@@ -26,22 +23,14 @@ export default function ProfileClubs({ user }: { user: PersonDetailDTO }) {
const userClubs = useMemo(() => (clubs ? clubs.pages.flatMap((page) => page) : []), [clubs]);
return (
-
+
+ ))}
+
+
+
+
+
+
+ Страница не найдена
++ Страница которую вы искали к сожаления не найдена. Проверьте правильность адреса. +
+
-
-
-
-
-
- - {user?.firstName} {user?.lastName} -
-был недавно
-
-
-
-
- - {user?.about || '...'} -
-
-
- - {user?.institute?.name || 'Нет института'} -
-
-
-
-
- {isLoading && Подписки
- - Показать все - -Не удалось загрузить ваши подписки
} -Профиль
+ + {isCurrent && ( + + + + )}Подписки
- + Показать всеНе удалось загрузить подписки пользователя
- )} +Не удалось загрузить подписки пользователя
} +
-
-
- {user.firstName} {user.lastName}: подписки
-
-
-
+
+
+ {user.firstName} {user.lastName}: подписки
+
+
+
+
+
+ );
}
diff --git a/src/app/(auth)/(withMenuNavigation)/profile/[id]/page.tsx b/src/app/(auth)/(withMenuNavigation)/profile/[id]/page.tsx
index 302fda4..9b307c2 100644
--- a/src/app/(auth)/(withMenuNavigation)/profile/[id]/page.tsx
+++ b/src/app/(auth)/(withMenuNavigation)/profile/[id]/page.tsx
@@ -1,24 +1,33 @@
import type { Metadata } from 'next';
-import { redirect } from 'next/navigation';
+import { notFound } from 'next/navigation';
-import { AUTH_PAGE } from '@/lib/config/routes.config';
-
-import { userApi, usersApi } from '@/api/api';
+import { usersApi } from '@/api/api';
import type { PersonDetailDTO } from '@/api/axios-client';
import Profile from './Profile';
+import { getPersonIdFromToken } from '@/server-actions/actions/getPersonIdFromToken.action';
+
+export const revalidate = 60;
export const metadata: Metadata = {
title: 'Профиль',
- description: '',
+ description: 'Профиль пользователя',
};
export default async function Page({ params }: { params: Promise<{ id: number }> }) {
const { id } = await params;
- const user: PersonDetailDTO = (await usersApi.usersGetById(id)).data;
- const currentUser: PersonDetailDTO = (await userApi.userGetPersonalDetails()).data;
+ try {
+ const user: PersonDetailDTO = (await usersApi.usersGetById(id)).data;
+ let currentPerson = await getPersonIdFromToken();
+ if (!currentPerson) {
+ console.log('Не удалось получить текущего пользователя из токена');
+ currentPerson = '0';
+ }
- if (currentUser.id === user.id) redirect(AUTH_PAGE.PROFILE);
+ const isCurrent = user.id === Number(currentPerson);
- return
-
- Подписки
-
-
- );
-}
diff --git a/src/app/(auth)/(withMenuNavigation)/profile/clubs/page.tsx b/src/app/(auth)/(withMenuNavigation)/profile/clubs/page.tsx
deleted file mode 100644
index a84a105..0000000
--- a/src/app/(auth)/(withMenuNavigation)/profile/clubs/page.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-import type { Metadata } from 'next';
-
-import ProfileClubs from './UserProfileClubs';
-
-export const metadata: Metadata = {
- title: 'Ваши подписки',
- description: '',
-};
-
-export default function Page() {
- return
@@ -66,45 +18,20 @@ export default function Settings({ initUser }: { initUser: PersonDetailDTO }) {
- {(isFetchingNextPage || isLoading) &&
+ Нет ни одной подписки
- ) : ( - userClubs.map((club) =>
+ {(isFetchingNextPage || isLoading) &&
);
}
diff --git a/src/app/(auth)/(withMenuNavigation)/profile/[id]/clubs/page.tsx b/src/app/(auth)/(withMenuNavigation)/profile/[id]/clubs/page.tsx
index cd395f9..0b61261 100644
--- a/src/app/(auth)/(withMenuNavigation)/profile/[id]/clubs/page.tsx
+++ b/src/app/(auth)/(withMenuNavigation)/profile/[id]/clubs/page.tsx
@@ -1,18 +1,35 @@
import type { Metadata } from 'next';
+import { Page } from '@/components/Page';
+import { BackButton } from '@/components/ui/BackButton';
+
import { usersApi } from '@/api/api';
import type { PersonDetailDTO } from '@/api/axios-client';
import ProfileClubs from './ProfileClubs';
+import { Header, HeaderTitle } from '@/hoc/Header';
+import { MainContent } from '@/hoc/MainContent';
export const metadata: Metadata = {
title: 'Подписки',
- description: '',
+ description: 'Подписки пользователя',
};
-export default async function Page({ params }: { params: Promise<{ id: number }> }) {
+export default async function ClubsPage({ params }: { params: Promise<{ id: number }> }) {
const { id } = await params;
const user: PersonDetailDTO = (await usersApi.usersGetById(id)).data;
- return Нет ни одной подписки
+ ) : ( + userClubs.map((club) =>
- {(isFetchingNextPage || isLoading) &&
- Вы пока не подписаны ни на один клуб
- ) : ( - userClubs.map((club) =>
-
-
+ - {user?.firstName} {user?.lastName} -
-{user?.about}
-
-
Основные
+Основные
-Ваши клубы
- -Прочее
+Ваши клубы
+Прочее