-
+
+
{props.isMyCollections && (
+
+ ;
watched_count: number;
watched_time: number;
- profile_id: number;
- preferred_genres: Array;
- preferred_audiences: Array;
- preferred_themes: Array;
+ profile_id: number
}) => {
const getChartOptions = () => {
return {
@@ -90,95 +81,41 @@ export const ProfileStats = (props: {
diff --git a/app/components/CollectionLink/CollectionLink.tsx b/app/components/CollectionLink/CollectionLink.tsx
index a7887d1..aee2010 100644
--- a/app/components/CollectionLink/CollectionLink.tsx
+++ b/app/components/CollectionLink/CollectionLink.tsx
@@ -5,43 +5,60 @@ import Image from "next/image";
export const CollectionLink = (props: any) => {
return (
-
- router.push(`/profile/${userStore.user.id}`)}
- className="relative flex"
- >
-
- Профиль
-
- : ""}
- props.setIsSettingModalOpen(true)}
- className="relative flex"
- >
-
- Настройки
-
- {userStore.isAuth ?
- userStore.logout()}
- className="relative flex"
- >
-
- Выйти
-
- : router.push(`/login?redirect=${pathname}`)}
- className="relative flex"
- >
-
- Войти
-
- }
-
-
-
-
- );
-};
diff --git a/app/components/Navbar/NavbarUpdate.tsx b/app/components/Navbar/NavbarUpdate.tsx
new file mode 100644
index 0000000..a6219c0
--- /dev/null
+++ b/app/components/Navbar/NavbarUpdate.tsx
@@ -0,0 +1,215 @@
+"use client";
+
+import Link from "next/link";
+import Image from "next/image";
+import { useUserStore } from "#/store/auth";
+import { usePathname } from "next/navigation";
+import { useState } from "react";
+import { SettingsModal } from "#/components/SettingsModal/SettingsModal";
+import { usePreferencesStore } from "#/store/preferences";
+
+export const Navbar = () => {
+ const pathname = usePathname();
+ const userStore = useUserStore();
+ const [isSettingModalOpen, setIsSettingModalOpen] = useState(false);
+ const preferenceStore = usePreferencesStore();
+
+ const menuItems = [
+ {
+ id: 1,
+ title: "Домашняя",
+ href: "/",
+ hrefInCategory: "/home",
+ icon: {
+ default: "material-symbols--home-outline",
+ active: "material-symbols--home",
+ },
+ isAuthRequired: false,
+ isShownOnMobile: true,
+ },
+ {
+ id: 2,
+ title: "Поиск",
+ href: "/search",
+ icon: {
+ default: "material-symbols--search",
+ active: "material-symbols--search",
+ },
+ isAuthRequired: false,
+ isShownOnMobile: true,
+ },
+ {
+ id: 3,
+ title: "Закладки",
+ href: "/bookmarks",
+ icon: {
+ default: "material-symbols--bookmarks-outline",
+ active: "material-symbols--bookmarks",
+ },
+ isAuthRequired: true,
+ isShownOnMobile: true,
+ },
+ {
+ id: 4,
+ title: "Избранное",
+ href: "/favorites",
+ icon: {
+ default: "material-symbols--favorite-outline",
+ active: "material-symbols--favorite",
+ },
+ isAuthRequired: true,
+ isShownOnMobile: false,
+ },
+ {
+ id: 5,
+ title: "Коллекции",
+ href: "/collections",
+ icon: {
+ default: "material-symbols--collections-bookmark-outline",
+ active: "material-symbols--collections-bookmark",
+ },
+ isAuthRequired: true,
+ isShownOnMobile: false,
+ },
+ {
+ id: 6,
+ title: "История",
+ href: "/history",
+ icon: {
+ default: "material-symbols--history",
+ active: "material-symbols--history",
+ },
+ isAuthRequired: true,
+ isShownOnMobile: false,
+ },
+ ];
+
+ return (
+ <>
+
- setIsOpen(false)} dismissible>
- Выберите списки
-
- {Object.entries(FilterAgeRatingToString).map(([key, value]) => {
- return (
-
-
-
-
-
-
-
- );
-};
diff --git a/app/components/Discovery/Modal/FiltersGenreModal.tsx b/app/components/Discovery/Modal/FiltersGenreModal.tsx
deleted file mode 100644
index 7ee4362..0000000
--- a/app/components/Discovery/Modal/FiltersGenreModal.tsx
+++ /dev/null
@@ -1,141 +0,0 @@
-"use client";
-
-import { FilterGenre } from "#/api/utils";
-import {
- Button,
- Checkbox,
- Label,
- Modal,
- ModalBody,
- ModalFooter,
- ModalHeader,
- ToggleSwitch,
-} from "flowbite-react";
-import { useEffect, useState } from "react";
-
-type Props = {
- isOpen: boolean;
- setIsOpen: (isOpen: boolean) => void;
- genres: string[];
- exclusionMode: boolean;
- save: (genres, exclusionMode) => void;
-};
-export const FiltersGenreModal = ({
- isOpen,
- setIsOpen,
- genres,
- exclusionMode,
- save,
-}: Props) => {
- const [newGenres, setNewGenres] = useState(genres);
- const [newExclusionMode, setNewExclusionMode] = useState(exclusionMode);
-
- const genresLength =
- FilterGenre.uncategorized.genres.length +
- FilterGenre.audience.genres.length +
- FilterGenre.theme.genres.length;
-
- function toggleGenre(string: string) {
- if (newGenres.includes(string)) {
- setNewGenres(newGenres.filter((genre) => genre != string));
- } else {
- setNewGenres([...newGenres, string]);
- }
- }
-
- useEffect(() => {
- setNewGenres(genres);
- setNewExclusionMode(exclusionMode);
- }, [genres, exclusionMode]);
-
- return (
- setIsOpen(false)} dismissible size="6xl">
- Жанры
-
-
-
-
-
- );
-};
diff --git a/app/components/Discovery/Modal/FiltersListExcludeModal.tsx b/app/components/Discovery/Modal/FiltersListExcludeModal.tsx
deleted file mode 100644
index 4c72cf4..0000000
--- a/app/components/Discovery/Modal/FiltersListExcludeModal.tsx
+++ /dev/null
@@ -1,107 +0,0 @@
-"use client";
-
-import { FilterProfileListIdToString } from "#/api/utils";
-import {
- Button,
- Checkbox,
- Label,
- Modal,
- ModalBody,
- ModalFooter,
- ModalHeader,
-} from "flowbite-react";
-import { useEffect, useState } from "react";
-
-type Props = {
- isOpen: boolean;
- setIsOpen: (isOpen: boolean) => void;
- lists: number[];
- setLists: (lists: number[]) => void;
-};
-
-export const FiltersListExcludeModal = ({
- isOpen,
- setIsOpen,
- lists,
- setLists,
-}: Props) => {
- const [newList, setNewList] = useState(lists);
-
- function toggleList(number: number) {
- if (newList.includes(number)) {
- setNewList(newList.filter((list) => list != number));
- } else {
- setNewList([...newList, number]);
- }
- }
-
- useEffect(() => {
- setNewList(lists);
- }, [lists]);
-
- return (
- setIsOpen(false)} dismissible>
- Выберите списки
-
- {Object.entries(FilterProfileListIdToString).map(([key, value]) => {
- return (
-
-
-
-
-
-
-
- );
-};
diff --git a/app/components/Discovery/Modal/FiltersModal.tsx b/app/components/Discovery/Modal/FiltersModal.tsx
deleted file mode 100644
index f65aa4e..0000000
--- a/app/components/Discovery/Modal/FiltersModal.tsx
+++ /dev/null
@@ -1,565 +0,0 @@
-"use client";
-
-import {
- Filter,
- FilterAgeRatingToString,
- FilterCategoryIdToString,
- FilterCountry,
- FilterDefault,
- FilterEpisodeCount,
- FilterEpisodeDuration,
- FilterProfileListIdToString,
- FilterSeasonIdToString,
- FilterSortToString,
- FilterSource,
- FilterStatusIdToString,
- FilterStudio,
- FilterYear,
- tryCatchAPI,
-} from "#/api/utils";
-import {
- Button,
- Dropdown,
- DropdownItem,
- Modal,
- ModalBody,
- ModalFooter,
- ModalHeader,
-} from "flowbite-react";
-import { useEffect, useState } from "react";
-import { FiltersGenreModal } from "./FiltersGenreModal";
-import { useUserStore } from "#/store/auth";
-import { FiltersListExcludeModal } from "./FiltersListExcludeModal";
-import { ENDPOINTS } from "#/api/config";
-import { FiltersTypesModal } from "./FiltersTypesModal";
-import { FiltersAgeRatingModal } from "./FiltersAgeRatingModal";
-import { useRouter } from "next/navigation";
-
-type ModalProps = {
- isOpen: boolean;
- setIsOpen: (value: boolean) => void;
- filter?: Filter;
- setFilter?: (filter: Filter) => void;
-};
-
-export const FiltersModal = ({
- isOpen,
- setIsOpen,
- filter,
- setFilter,
-}: ModalProps) => {
- const userStore = useUserStore();
- const router = useRouter();
-
- const [newFilter, setNewFilter] = useState(filter || FilterDefault);
- const [isGenreModalOpen, setIsGenreModalOpen] = useState(false);
- const [isListExcludeModalOpen, setIsListExcludeModalOpen] = useState(false);
- const [isTypeModalOpen, setIsTypeModalOpen] = useState(false);
- const [isAgeRatingModalOpen, setIsAgeRatingModalOpen] = useState(false);
-
- const [types, setTypes] = useState([]);
- const [error, setError] = useState(null);
-
- useEffect(() => {
- const fetchData = async () => {
- setError(null);
-
- const { data, error } = await tryCatchAPI(fetch(ENDPOINTS.filterTypes));
-
- if (error) {
- setError(error);
- } else {
- setTypes(data.types);
- }
- };
- fetchData();
- }, []);
-
- function saveGenres(genres, is_genres_exclude_mode_enabled) {
- setNewFilter({ ...newFilter, genres, is_genres_exclude_mode_enabled });
- }
-
- function saveFilter() {
- const _filter = JSON.stringify(newFilter);
- if (setFilter) {
- setFilter(newFilter);
- } else {
- router.push(`/discovery/filter?filter=${_filter}`);
- }
- setIsOpen(false);
- }
-
- return (
- <>
- setIsOpen(false)}
- size="4xl"
- dismissible
- >
- Фильтр
-
-
-
-
-
-
-
- setNewFilter({ ...newFilter, profile_list_exclusions })
- }
- />
- setNewFilter({ ...newFilter, types })}
- />
-
- setNewFilter({ ...newFilter, age_ratings })
- }
- />
-
- );
-};
diff --git a/app/components/Discovery/Modal/FiltersTypesModal.tsx b/app/components/Discovery/Modal/FiltersTypesModal.tsx
deleted file mode 100644
index 80b50bb..0000000
--- a/app/components/Discovery/Modal/FiltersTypesModal.tsx
+++ /dev/null
@@ -1,100 +0,0 @@
-"use client";
-
-import {
- Button,
- Checkbox,
- Label,
- Modal,
- ModalBody,
- ModalFooter,
- ModalHeader,
-} from "flowbite-react";
-import { useEffect, useState } from "react";
-
-type Props = {
- isOpen: boolean;
- setIsOpen: (isOpen: boolean) => void;
- typesData: any[];
- types: number[];
- setTypes: (types: number[]) => void;
-};
-
-export const FiltersTypesModal = ({
- isOpen,
- setIsOpen,
- typesData,
- types,
- setTypes,
-}: Props) => {
- const [newTypes, setNewTypes] = useState(types);
-
- function toggleType(number: number) {
- if (newTypes.includes(number)) {
- setNewTypes(newTypes.filter((list) => list != number));
- } else {
- setNewTypes([...newTypes, number]);
- }
- }
-
- useEffect(() => {
- setNewTypes(types);
- }, [types]);
-
- return (
- setIsOpen(false)} dismissible>
- Выберите списки
-
- {typesData.map((item) => {
- return (
-
-
-
-
-
-
-
- );
-};
diff --git a/app/components/Discovery/Modal/PopularFilters.ts b/app/components/Discovery/Modal/PopularFilters.ts
deleted file mode 100644
index 82d0948..0000000
--- a/app/components/Discovery/Modal/PopularFilters.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { FilterDefault } from "#/api/utils";
-
-export const TabOngoing = {
- id: "ongoing",
- name: "Онгоинги",
- filter: {
- ...FilterDefault,
- sort: 3,
- episodes_from: 1,
- episodes_to: 48,
- status_id: 2,
- },
-};
-
-export const TabFinished = {
- id: "finished",
- name: "Завершённые",
- filter: { ...FilterDefault, sort: 3, status_id: 1 },
-};
-
-export const TabFilms = {
- id: "films",
- name: "Фильмы",
- filter: { ...FilterDefault, sort: 3, category_id: 2 },
-};
-
-export const TabOVA = {
- id: "ova",
- name: "OVA",
- filter: { ...FilterDefault, sort: 3, category_id: 3 },
-};
-
-export const tabs = [TabOngoing, TabFinished, TabFilms, TabOVA];
-export const tabsId = { ongoing: 0, finished: 1, films: 2, ova: 3 };
diff --git a/app/components/Discovery/Modal/PopularModal.tsx b/app/components/Discovery/Modal/PopularModal.tsx
deleted file mode 100644
index 36616ab..0000000
--- a/app/components/Discovery/Modal/PopularModal.tsx
+++ /dev/null
@@ -1,82 +0,0 @@
-"use client";
-
-import { ENDPOINTS } from "#/api/config";
-import { FetchFilter, useSWRfetcher } from "#/api/utils";
-import { useUserStore } from "#/store/auth";
-import useSWR from "swr";
-
-import { tabs, tabsId } from "./PopularFilters";
-import {
- Button,
- ButtonGroup,
- Modal,
- ModalBody,
- ModalHeader,
-} from "flowbite-react";
-import { useEffect, useState } from "react";
-import { ReleaseLink } from "#/components/ReleaseLink/ReleaseLinkUpdate";
-import { Spinner } from "#/components/Spinner/Spinner";
-type ModalProps = {
- isOpen: boolean;
- setIsOpen: (value: boolean) => void;
-};
-
-export const PopularModal = ({ isOpen, setIsOpen }: ModalProps) => {
- const token = useUserStore((state) => state.token);
- const [tab, setTab] = useState<
- "ongoing" | "finished" | "films" | "ova" | string
- >("ongoing");
- const [content, setContent] = useState(null);
-
- useEffect(() => {
- setContent(null);
- async function _loadReleases() {
- const [data, error] = await FetchFilter(
- tabs[tabsId[tab]].filter,
- 0,
- token
- );
- if (!error) {
- setContent(data.content);
- }
- }
- _loadReleases();
- }, [tab, token]);
-
- return (
- setIsOpen(false)}
- size="7xl"
- dismissible
- >
- Популярное
-
-
-
- );
-};
diff --git a/app/components/Discovery/Modal/ScheduleModal.tsx b/app/components/Discovery/Modal/ScheduleModal.tsx
deleted file mode 100644
index 1b60d49..0000000
--- a/app/components/Discovery/Modal/ScheduleModal.tsx
+++ /dev/null
@@ -1,71 +0,0 @@
-"use client";
-
-import { ENDPOINTS } from "#/api/config";
-import { useSWRfetcher } from "#/api/utils";
-import useSWR from "swr";
-import { Modal, ModalBody, ModalHeader } from "flowbite-react";
-import { Spinner } from "#/components/Spinner/Spinner";
-import { ReleaseCourusel } from "#/components/ReleaseCourusel/ReleaseCourusel";
-type ModalProps = {
- isOpen: boolean;
- setIsOpen: (value: boolean) => void;
-};
-
-export const ScheduleModal = ({ isOpen, setIsOpen }: ModalProps) => {
- const { data, isLoading, error } = useSWR(
- ENDPOINTS.discover.schedule,
- useSWRfetcher,
- {
- revalidateOnFocus: false,
- revalidateIfStale: false,
- revalidateOnReconnect: false,
- }
- );
-
- return (
- setIsOpen(false)}
- size="7xl"
- dismissible
- >
- Расписание
-
- {!error ?
- isLoading ?
-
-
- );
-};
diff --git a/app/components/Discovery/RecommendedCarousel.tsx b/app/components/Discovery/RecommendedCarousel.tsx
deleted file mode 100644
index 5fa2949..0000000
--- a/app/components/Discovery/RecommendedCarousel.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-"use client";
-
-import { ENDPOINTS } from "#/api/config";
-import { useSWRfetcher } from "#/api/utils";
-import { useUserStore } from "#/store/auth";
-import { ReleaseCourusel } from "../ReleaseCourusel/ReleaseCourusel";
-import useSWR from "swr";
-
-export const RecommendedCarousel = () => {
- const token = useUserStore((state) => state.token);
- const { data, isLoading, error } = useSWR(
- token ? `${ENDPOINTS.discover.recommendations}/-1?previous_page=-1&token=${token}` : null,
- useSWRfetcher,
- {
- revalidateOnFocus: false,
- revalidateIfStale: false,
- revalidateOnReconnect: false,
- }
- );
-
- if (!token) return <>;
- if (error) return <>;
- if (isLoading) return <>;
-
- return
-
-
- );
-};
diff --git a/app/components/Navbar/NavBarPc.tsx b/app/components/Navbar/NavBarPc.tsx
deleted file mode 100644
index 902a6ef..0000000
--- a/app/components/Navbar/NavBarPc.tsx
+++ /dev/null
@@ -1,139 +0,0 @@
-"use client";
-import {
- Avatar,
- Dropdown,
- DropdownDivider,
- DropdownItem,
-} from "flowbite-react";
-import { useUserStore } from "#/store/auth";
-import Link from "next/link";
-import { usePathname, useRouter } from "next/navigation";
-
-const NavbarItems = [
- {
- title: "Домашняя",
- icon: "mdi--home",
- href: "/",
- auth: false,
- },
- {
- title: "Обзор",
- icon: "mdi--compass",
- href: "/discovery",
- auth: false,
- },
- {
- title: "Поиск",
- icon: "mdi--search",
- href: "/search",
- auth: false,
- },
- {
- title: "Закладки",
- icon: "mdi--bookmark-multiple",
- href: "/bookmarks",
- auth: true,
- },
- {
- title: "Избранное",
- icon: "mdi--favorite",
- href: "/favorites",
- auth: true,
- },
- {
- title: "Коллекции",
- icon: "mdi--collections-bookmark",
- href: "/collections",
- auth: true,
- },
- {
- title: "История",
- icon: "mdi--history",
- href: "/history",
- auth: true,
- },
-];
-
-export const NavBarPc = (props: { setIsSettingModalOpen: any }) => {
- const userStore = useUserStore();
- const router = useRouter();
- const pathname = usePathname();
-
- return (
- <>
-
-
+
)}
+
diff --git a/app/components/CollectionsSection/CollectionsSection.tsx b/app/components/CollectionsSection/CollectionsSection.tsx
index 6e03911..c7b0775 100644
--- a/app/components/CollectionsSection/CollectionsSection.tsx
+++ b/app/components/CollectionsSection/CollectionsSection.tsx
@@ -16,7 +16,7 @@ export const CollectionsSection = (props: {
-
+ {props.comment_count && (
+
+
+
+
+ )}
+ {props.is_favorite && (
+
+
+
+ )}
+
+
-
+
- )}
- {props.is_favorite && (
- + {props.title} +
-
-
- )}
-
-
- {props.title} -
-- {props.description} -
+ {props.description && ( ++ {`${props.description.slice(0, 125)}${ + props.description.length > 125 ? "..." : "" + }`} +
+ )} +
-
diff --git a/app/components/Discovery/CollectionsOfTheWeek.tsx b/app/components/Discovery/CollectionsOfTheWeek.tsx
deleted file mode 100644
index cec280a..0000000
--- a/app/components/Discovery/CollectionsOfTheWeek.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-"use client";
-
-import { ENDPOINTS } from "#/api/config";
-import { useSWRfetcher } from "#/api/utils";
-import useSWR from "swr";
-import { CollectionCourusel } from "../CollectionCourusel/CollectionCourusel";
-import { useUserStore } from "#/store/auth";
-
-export const CollectionsOfTheWeek = () => {
- const token = useUserStore((state) => state.token);
- const { data, isLoading, error } = useSWR(
- `${ENDPOINTS.discover.collections}/-1?previous_page=0&where=2&sort=4${token ? `&token=${token}` : ""}`,
- useSWRfetcher,
- {
- revalidateOnFocus: false,
- revalidateIfStale: false,
- revalidateOnReconnect: false,
- }
- );
-
- if (error) return <>;
- if (isLoading) return <>;
-
- return (
-
+
{props.isMyCollections &&
);
})}
+ {props.content.length == 1 && !props.isMyCollections && }
-
- );
-};
diff --git a/app/components/Discovery/InterestingCarousel.module.css b/app/components/Discovery/InterestingCarousel.module.css
deleted file mode 100644
index ed205c5..0000000
--- a/app/components/Discovery/InterestingCarousel.module.css
+++ /dev/null
@@ -1,21 +0,0 @@
-.swiper-button:global(.swiper-button-disabled) {
- opacity: 0 !important;
-}
-
-.swiper-button {
- display: none !important;
-}
-
-@media (hover: hover) and (min-width: 1024px) {
- .swiper {
- overflow: visible !important;
- }
-}
-
-@media (hover: hover) {
- .swiper:hover .swiper-button {
- display: flex !important;
- width: 64px;
- height: 64px;
- }
-}
diff --git a/app/components/Discovery/InterestingCarousel.tsx b/app/components/Discovery/InterestingCarousel.tsx
deleted file mode 100644
index fa4e366..0000000
--- a/app/components/Discovery/InterestingCarousel.tsx
+++ /dev/null
@@ -1,78 +0,0 @@
-"use client";
-
-import { ENDPOINTS } from "#/api/config";
-import { useSWRfetcher } from "#/api/utils";
-import useSWR from "swr";
-import Image from "next/image";
-import { Swiper, SwiperSlide } from "swiper/react";
-import "swiper/css";
-import "swiper/css/navigation";
-import { Navigation } from "swiper/modules";
-import Styles from "./InterestingCarousel.module.css";
-import Link from "next/link";
-
-export const InterestingCarousel = () => {
- const { data, isLoading, error } = useSWR(
- ENDPOINTS.discover.interesting,
- useSWRfetcher,
- {
- revalidateOnFocus: false,
- revalidateIfStale: false,
- revalidateOnReconnect: false,
- }
- );
-
- if (error) return <>;
- if (isLoading) return <>;
-
- return (
-
-
- - Обсуждаемое сегодня -
-
- {data.content.map((item) => {
- return (
-
-
-
-
- {data.content.map((item) => {
- return (
-
-
-
- );
- })}
-
-
-
-
- );
-};
diff --git a/app/components/Discovery/Modal/FiltersAgeRatingModal.tsx b/app/components/Discovery/Modal/FiltersAgeRatingModal.tsx
deleted file mode 100644
index 167a2fe..0000000
--- a/app/components/Discovery/Modal/FiltersAgeRatingModal.tsx
+++ /dev/null
@@ -1,106 +0,0 @@
-"use client";
-
-import { FilterAgeRatingToString } from "#/api/utils";
-import {
- Button,
- Checkbox,
- Label,
- Modal,
- ModalBody,
- ModalFooter,
- ModalHeader,
-} from "flowbite-react";
-import { useEffect, useState } from "react";
-
-type Props = {
- isOpen: boolean;
- setIsOpen: (isOpen: boolean) => void;
- ageRatings: number[];
- setAgeRatings: (lists: number[]) => void;
-};
-
-export const FiltersAgeRatingModal = ({
- isOpen,
- setIsOpen,
- ageRatings,
- setAgeRatings,
-}: Props) => {
- const [newAgeRatings, setNewAgeRatings] = useState(ageRatings);
-
- function toggleRating(number: number) {
- if (newAgeRatings.includes(number)) {
- setNewAgeRatings(newAgeRatings.filter((rating) => rating != number));
- } else {
- setNewAgeRatings([...newAgeRatings, number]);
- }
- }
-
- useEffect(() => {
- setNewAgeRatings(ageRatings);
- }, [ageRatings]);
-
- return (
-
-
-
-
-
- {item.title}
-{item.description}
-
- toggleRating(Number(key))}
- checked={newAgeRatings.includes(Number(key))}
- color="blue"
- />
-
-
- );
- })}
-
- {Object.entries(FilterGenre).map(([key, value]) => {
- return (
-
-
-
- );
- })}
- {value.name}
- {value.genres.map((genre) => { - return ( -
- toggleGenre(genre)}
- checked={newGenres.includes(genre)}
- color="blue"
- />
-
-
- );
- })}
-
-
-
- setNewExclusionMode(!newExclusionMode)}
- checked={newExclusionMode}
- />
-
-
-
- Режим исключения
-- Фильтр будет искать релизы не содержащие ни один из указанных - выше жанров -
-
-
-
-
-
-
- toggleList(Number(key))}
- checked={newList.includes(Number(key))}
- color="blue"
- />
-
-
- );
- })}
-
-
-
-
- setNewFilter({ ...newFilter, country: null })}
- >
- Неважно
-
- {FilterCountry.map((item) => {
- return (
-
- setNewFilter({ ...newFilter, country: item })
- }
- >
- {item}
-
- );
- })}
-
-
- Страна
-
-
-
- setNewFilter({ ...newFilter, category_id: null })
- }
- >
- Неважно
-
- {Object.entries(FilterCategoryIdToString).map(
- ([key, value]) => {
- return (
-
- setNewFilter({
- ...newFilter,
- category_id: Number(key),
- })
- }
- >
- {value}
-
- );
- }
- )}
-
-
- Категория
-
-
- {userStore.isAuth ?
- Жанры
- -- Будет искать релизы, содержащие каждый из указанных жанров. - Рекомендуется выбирать не более 3 жанров -
-
-
- : ""}
- Исключить закладки
- -- Исключит из выдачи релизы, входящие в указанные закладки -
-
-
- Варианты озвучек
- -
-
- setNewFilter({ ...newFilter, studio: null })}
- >
- Неважно
-
- {FilterStudio.map((value) => {
- return (
-
- setNewFilter({
- ...newFilter,
- studio: value,
- })
- }
- >
- {value}
-
- );
- })}
-
-
- Студия
-
-
- setNewFilter({ ...newFilter, source: null })}
- >
- Неважно
-
- {FilterSource.map((value) => {
- return (
-
- setNewFilter({
- ...newFilter,
- source: value,
- })
- }
- >
- {value}
-
- );
- })}
-
-
- Первоисточник
-
-
- Года
-
-
-
- setNewFilter({ ...newFilter, start_year: null })
- }
- >
- Неважно
-
- {FilterYear.map((value) => {
- return (
-
- setNewFilter({
- ...newFilter,
- start_year: value,
- })
- }
- >
- {value}
-
- );
- })}
-
-
-
- setNewFilter({ ...newFilter, end_year: null })
- }
- >
- Неважно
-
- {FilterYear.map((value) => {
- return (
-
- setNewFilter({
- ...newFilter,
- end_year: value,
- })
- }
- >
- {value}
-
- );
- })}
-
-
- setNewFilter({ ...newFilter, season: null })}
- >
- Неважно
-
- {Object.entries(FilterSeasonIdToString).map(
- ([key, value]) => {
- return (
-
- setNewFilter({
- ...newFilter,
- season: Number(key),
- })
- }
- >
- {value}
-
- );
- }
- )}
-
-
- С
-По
-Сезон
-
-
-
-
-
-
- episode.episodes_from === newFilter.episodes_from &&
- episode.episodes_to === newFilter.episodes_to
- ).name
- }
- color="blue"
- className="w-full overflow-y-auto max-h-64"
- >
- {FilterEpisodeCount.map((value) => {
- return (
-
- setNewFilter({
- ...newFilter,
- episodes_from: value.episodes_from,
- episodes_to: value.episodes_to,
- })
- }
- >
- {value.name}
-
- );
- })}
-
-
- Эпизодов
-
-
- episode.episode_duration_from ===
- newFilter.episode_duration_from &&
- episode.episode_duration_to ===
- newFilter.episode_duration_to
- ).name
- }
- color="blue"
- className="w-full overflow-y-auto max-h-64"
- >
- {FilterEpisodeDuration.map((value) => {
- return (
-
- setNewFilter({
- ...newFilter,
- episode_duration_from:
- value.episode_duration_from,
- episode_duration_to: value.episode_duration_to,
- })
- }
- >
- {value.name}
-
- );
- })}
-
-
- Длительность эпизода
-
-
-
- setNewFilter({ ...newFilter, status_id: null })
- }
- >
- Неважно
-
- {Object.entries(FilterStatusIdToString).map(
- ([key, value]) => {
- return (
-
- setNewFilter({
- ...newFilter,
- status_id: Number(key),
- })
- }
- >
- {value}
-
- );
- }
- )}
-
-
- Статус
-
-
- Возрастное ограничение
- -
-
- {Object.entries(FilterSortToString).map(([key, value]) => {
- return (
-
- setNewFilter({
- ...newFilter,
- sort: Number(key),
- })
- }
- >
- {value}
-
- );
- })}
-
-
- Сортировка
-
- toggleType(Number(item.id))}
- checked={newTypes.includes(Number(item.id))}
- color="blue"
- />
-
-
- );
- })}
-
-
- {tabs.map((item) => (
-
- ))}
-
-
-
- {content ?
- content.map((release) => {
- return (
-
-
-
- );
- })
- :
-
- :
-
-
- : "Ошибка загрузки"}
-
-
-
- }
- >
- {userStore.isAuth ?
-
- {NavbarItems.map((item) => {
- if (item.auth && !userStore.isAuth) return;
- return (
-
-
- {item.title}
-
- );
- })}
-
- - {userStore.isAuth ? userStore.user.login : "Аноним"} -
-
+
+
+ {menuItems.map((item) => {
+ return (
+
+
+
+ {item.title}
+
+
+ );
+ })}
+
+
+ {!userStore.isAuth ?
+
+
+
+ Войти
+
+
+ : <>
+
+
+
-
-
- - {" "} - Смотрю {props.lists[0]} -
-- {" "} - В планах {props.lists[1]} -
-- {" "} - Просмотрено {props.lists[2]} -
-- {" "} - Отложено {props.lists[3]} -
-- {" "} - Брошено {props.lists[4]} -
-
-
+
- Жанры:{" "}
-
- {props.preferred_genres.map((item, index) => {
- return (
-
- {index > 0 && ", "}
-
- );
- })}
-
-
- Аудитория:{" "}
-
- {props.preferred_audiences.map((item, index) => {
- return (
-
- {index > 0 && ", "}
-
- );
- })}
-
-
- Тематика:{" "}
-
- {props.preferred_themes.map((item, index) => {
- return (
-
- {index > 0 && ", "}
-
- );
- })}
-
-
- Просмотрено серий:{" "} - {props.watched_count} -
-- Время просмотра:{" "} - - ~{minutesToTime(props.watched_time)} - -
-+ {" "} + Смотрю {props.lists[0]} +
++ {" "} + В планах {props.lists[1]} +
++ {" "} + Просмотрено {props.lists[2]} +
++ {" "} + Отложено {props.lists[3]} +
++ {" "} + Брошено {props.lists[4]} +
+
);
};
diff --git a/app/components/RelatedSection/RelatedSection.tsx b/app/components/RelatedSection/RelatedSection.tsx
index fa640b8..368793d 100644
--- a/app/components/RelatedSection/RelatedSection.tsx
+++ b/app/components/RelatedSection/RelatedSection.tsx
@@ -15,7 +15,7 @@ export const RelatedSection = (props: any) => {
+ Просмотрено серий:{" "} + {props.watched_count} +
++ Время просмотра:{" "} + + ~{minutesToTime(props.watched_time, "daysHours")} + +
+
{props.images.map((item, index) => {
return (
-
+
{props.content.map((release) => {
diff --git a/app/components/ReleaseInfo/ReleaseInfo.Info.tsx b/app/components/ReleaseInfo/ReleaseInfo.Info.tsx
index 0ec3cd3..631ca88 100644
--- a/app/components/ReleaseInfo/ReleaseInfo.Info.tsx
+++ b/app/components/ReleaseInfo/ReleaseInfo.Info.tsx
@@ -59,7 +59,7 @@ export const ReleaseInfoInfo = (props: {
{"/"}
{props.episodes.total ? props.episodes.total + " эп. " : "? эп. "}
{props.duration != 0 &&
- `по ${minutesToTime(props.duration)}`}
+ `по ${minutesToTime(props.duration, "daysHours")}`}
diff --git a/app/components/ReleaseInfo/ReleaseInfo.SearchLink.tsx b/app/components/ReleaseInfo/ReleaseInfo.SearchLink.tsx
index f7524a8..db19124 100644
--- a/app/components/ReleaseInfo/ReleaseInfo.SearchLink.tsx
+++ b/app/components/ReleaseInfo/ReleaseInfo.SearchLink.tsx
@@ -1,11 +1,19 @@
import Link from "next/link";
+// const searchBy = {
+// title: 0,
+// studio: 1,
+// director: 2,
+// author: 3,
+// genre: 4
+// }
+
// TODO: сделать какую-нибудь анимацию на ссылке при наведении и фокусе
-export const ReleaseInfoSearchLink = (props: { title: string, searchBy: string }) => {
+export const ReleaseInfoSearchLink = (props: { title: string, searchBy: string | number | null }) => {
return (
{props.title}
diff --git a/app/components/ReleasePoster/PosterWithStuff.tsx b/app/components/ReleasePoster/PosterWithStuff.tsx
index c4049ac..7ffbee2 100644
--- a/app/components/ReleasePoster/PosterWithStuff.tsx
+++ b/app/components/ReleasePoster/PosterWithStuff.tsx
@@ -83,7 +83,7 @@ export const PosterWithStuff = (props: {
return (
{index > 0 && ", "}
{genre}
@@ -91,18 +91,18 @@ export const PosterWithStuff = (props: {
);
})}
{props.title_ru && (
-
{settings.showDescription && props.description && (
-
)}
+
{props.title_ru}
)} {props.title_original && ( -+
{props.title_original}
)}+
{props.description}
)} diff --git a/app/components/ReleaseSection/ReleaseSection.tsx b/app/components/ReleaseSection/ReleaseSection.tsx index 95c4763..b826085 100644 --- a/app/components/ReleaseSection/ReleaseSection.tsx +++ b/app/components/ReleaseSection/ReleaseSection.tsx @@ -14,7 +14,7 @@ export const ReleaseSection = (props: {
-
+
{props.content.map((release) => {
return (
: ""}
+
@@ -23,8 +23,8 @@ export const ReleaseSection = (props: {
chipsSettings={{
enabled: true,
lastWatchedHidden:
- props.sectionTitle &&
- props.sectionTitle.toLowerCase() != "история",
+ (props.sectionTitle &&
+ props.sectionTitle.toLowerCase() != "история")
}}
/>
diff --git a/app/components/SettingsModal/SettingsModal.tsx b/app/components/SettingsModal/SettingsModal.tsx
index 54a26a8..56d9291 100644
--- a/app/components/SettingsModal/SettingsModal.tsx
+++ b/app/components/SettingsModal/SettingsModal.tsx
@@ -35,11 +35,17 @@ const BookmarksCategory = {
abandoned: "Заброшено",
};
+const NavbarTitles = {
+ always: "Всегда",
+ links: "Только ссылки",
+ selected: "Только выбранные",
+ never: "Никогда",
+};
+
const FifthButton = {
- favorites: "Избранное",
- collections: "Коллекции",
- history: "История",
- discovery: "Обзор",
+ 3: "Избранное",
+ 4: "Коллекции",
+ 5: "История",
};
export const SettingsModal = (props: { isOpen: boolean; setIsOpen: any }) => {
@@ -50,8 +56,7 @@ export const SettingsModal = (props: { isOpen: boolean; setIsOpen: any }) => {
const [isPlayerConfigured, setIsPlayerConfigured] = useState(false);
useEffect(() => {
- const NEXT_PUBLIC_PLAYER_PARSER_URL =
- env("NEXT_PUBLIC_PLAYER_PARSER_URL") || null;
+ const NEXT_PUBLIC_PLAYER_PARSER_URL = env("NEXT_PUBLIC_PLAYER_PARSER_URL") || null;
if (NEXT_PUBLIC_PLAYER_PARSER_URL) {
setIsPlayerConfigured(true);
}
@@ -171,8 +176,35 @@ export const SettingsModal = (props: { isOpen: boolean; setIsOpen: any }) => {
+
+ {Object.keys(NavbarTitles).map(
+ (key: "always" | "links" | "selected" | "never") => {
+ return (
+
+ preferenceStore.setFlags({
+ showNavbarTitles: key,
+ })
+ }
+ >
+ {NavbarTitles[key]}
+
+ );
+ }
+ )}
+
+
{userStore.isAuth ?
- + Показывать название пункта в навигации +
+
+
- preferenceStore.setFlags({ showFifthButton: key })
+ preferenceStore.setFlags({
+ showFifthButton: Number(key) as 3 | 4 | 5,
+ })
}
>
{FifthButton[key]}
@@ -228,7 +262,7 @@ export const SettingsModal = (props: { isOpen: boolean; setIsOpen: any }) => {
diff --git a/app/components/UserSection/UserSection.tsx b/app/components/UserSection/UserSection.tsx
index ece64fc..4dc7bfe 100644
--- a/app/components/UserSection/UserSection.tsx
+++ b/app/components/UserSection/UserSection.tsx
@@ -12,19 +12,20 @@ export const UserSection = (props: { sectionTitle?: string; content: any }) => {
)}
- {content && content.length > 0 ?
+ {content && content.length > 0 ? (
Пятый пункт в навигации
@@ -198,7 +230,9 @@ export const SettingsModal = (props: { isOpen: boolean; setIsOpen: any }) => {Сохранять историю просмотра
-+
При отключении, история не будет сохранятся как локально, так и на аккаунте
@@ -251,7 +285,7 @@ export const SettingsModal = (props: { isOpen: boolean; setIsOpen: any }) => {Новый плеер
-+
Поддерживаемые источники: Kodik, Sibnet, Libria
- {children}
diff --git a/app/menu/page.tsx b/app/menu/page.tsx
new file mode 100644
index 0000000..61305cc
--- /dev/null
+++ b/app/menu/page.tsx
@@ -0,0 +1,11 @@
+export const metadata = {
+ title: "Меню",
+};
+
+import { MenuPage } from "#/pages/MobileMenuPage";
+
+export const dynamic = "force-static";
+
+export default function Index() {
+ return
);
- }
+ };
if (error) {
return (
@@ -105,9 +105,7 @@ export function BookmarksCategoryPage(props: any) {
className="flex-1 max-w-full mx-4"
onSubmit={(e) => {
e.preventDefault();
- router.push(
- `/search?query=${searchVal}¶ms={"where"%3A"list"%2C"searchBy"%3A"${props.slug}"}`
- );
+ router.push(`/search?q=${searchVal}&where=list&list=${props.slug}`);
}}
>
+
diff --git a/app/discovery/collections/page.tsx b/app/discovery/collections/page.tsx
deleted file mode 100644
index ff026f3..0000000
--- a/app/discovery/collections/page.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-import { DiscoverCollectionsPage } from "#/pages/DiscoverCollections";
-
-export const metadata = {
- title: "Обзор - Коллекции",
- description: "",
-};
-
-export const dynamic = "force-static";
-
-export default function Discover() {
- return
{props.content.map((user) => {
return (
-
-
-
+
);
})}
+ {props.content.length == 1 && }
-
+
+ {user.login}
-+ {user.login} +
+ ) : (
+
- }
+ )}
{data &&
data[data.length - 1].current_page <
data[data.length - 1].total_page_count && (
diff --git a/app/pages/History.tsx b/app/pages/History.tsx
index 7b4c495..73c9f10 100644
--- a/app/pages/History.tsx
+++ b/app/pages/History.tsx
@@ -10,6 +10,7 @@ import { Button } from "flowbite-react";
import { useRouter } from "next/navigation";
import { useSWRfetcher } from "#/api/utils";
+
export function HistoryPage() {
const token = useUserStore((state) => state.token);
const authState = useUserStore((state) => state.state);
@@ -61,9 +62,7 @@ export function HistoryPage() {
className="flex-1 max-w-full mx-4 mb-4"
onSubmit={(e) => {
e.preventDefault();
- router.push(
- `/search?query=${searchVal}¶ms={"where"%3A"history"%2C"searchBy"%3A"none"}`
- );
+ router.push(`/search?q=${searchVal}&where=history`);
}}
>
- {content && content.length > 0 ?
+ {content && content.length > 0 ? (
<>
В избранном пока ничего нет...
+ ) : (
+
- }
+ )}
);
}
diff --git a/app/pages/Index.tsx b/app/pages/Index.tsx
index ef6eef8..c40c057 100644
--- a/app/pages/Index.tsx
+++ b/app/pages/Index.tsx
@@ -3,22 +3,15 @@ import { ReleaseCourusel } from "#/components/ReleaseCourusel/ReleaseCourusel";
import { Spinner } from "#/components/Spinner/Spinner";
import { useUserStore } from "#/store/auth";
import { useState, useEffect } from "react";
-import { FetchFilter } from "#/api/utils";
+import { _FetchHomePageReleases } from "#/api/utils";
import { usePreferencesStore } from "#/store/preferences";
import { useRouter } from "next/navigation";
-import {
- ListAnnounce,
- ListFilms,
- ListFinished,
- ListLast,
- ListOngoing,
-} from "./IndexFilters";
export function IndexPage() {
const token = useUserStore((state) => state.token);
const preferenceStore = usePreferencesStore();
- const router = useRouter();
+ const router = useRouter()
const [isLoading, setIsLoading] = useState(true);
const [lastReleasesData, setLastReleasesData] = useState(null);
const [ongoingReleasesData, setOngoingReleasesData] = useState(null);
@@ -28,9 +21,7 @@ export function IndexPage() {
useEffect(() => {
if (preferenceStore.params.skipToCategory.enabled) {
- router.push(
- `/home/${preferenceStore.params.skipToCategory.homeCategory}`
- );
+ router.push(`/home/${preferenceStore.params.skipToCategory.homeCategory}`);
}
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);
@@ -44,19 +35,11 @@ export function IndexPage() {
setAnnounceReleasesData(null);
setFilmsReleasesData(null);
- const [lastReleases] = await FetchFilter(ListLast.filter, 0, token);
- const [ongoingReleases] = await FetchFilter(ListOngoing.filter, 0, token);
- const [announceReleases] = await FetchFilter(
- ListAnnounce.filter,
- 0,
- token
- );
- const [finishedReleases] = await FetchFilter(
- ListFinished.filter,
- 0,
- token
- );
- const [filmsReleases] = await FetchFilter(ListFilms.filter, 0, token);
+ const lastReleases = await _FetchHomePageReleases("last", token);
+ const ongoingReleases = await _FetchHomePageReleases("ongoing", token);
+ const finishedReleases = await _FetchHomePageReleases("finished", token);
+ const announceReleases = await _FetchHomePageReleases("announce", token);
+ const filmsReleases = await _FetchHomePageReleases("films", token);
setLastReleasesData(lastReleases);
setOngoingReleasesData(ongoingReleases);
@@ -73,12 +56,16 @@ export function IndexPage() {
return (
<>
- {lastReleasesData && (
+ {lastReleasesData ? (
В истории пока ничего нет...
+
)}
{finishedReleasesData && (
-
- )}
+ {!isLoading &&
+ !lastReleasesData &&
+ !finishedReleasesData &&
+ !ongoingReleasesData &&
+ !announceReleasesData && (
+
+
+ )}
);
}
diff --git a/app/pages/IndexCategory.tsx b/app/pages/IndexCategory.tsx
index bf10bed..f3ba11d 100644
--- a/app/pages/IndexCategory.tsx
+++ b/app/pages/IndexCategory.tsx
@@ -4,10 +4,9 @@ import { Spinner } from "#/components/Spinner/Spinner";
import { useState, useEffect } from "react";
import { useScrollPosition } from "#/hooks/useScrollPosition";
import { useUserStore } from "../store/auth";
-import { FetchFilter } from "#/api/utils";
+import { _FetchHomePageReleases } from "#/api/utils";
import { Button, ButtonGroup } from "flowbite-react";
import { useRouter } from "next/navigation";
-import { slugToFilter } from "./IndexFilters";
export function IndexCategoryPage(props) {
const token = useUserStore((state) => state.token);
@@ -21,7 +20,7 @@ export function IndexCategoryPage(props) {
setIsLoading(true);
setContent(null);
- const [ data ] = await FetchFilter(slugToFilter[props.slug].filter, page, token);
+ const data: any = await _FetchHomePageReleases(props.slug, token, page);
setContent(data.content);
setIsLoading(false);
@@ -33,7 +32,7 @@ export function IndexCategoryPage(props) {
useEffect(() => {
async function _loadNextReleasesPage() {
- const [ data ] = await FetchFilter(slugToFilter[props.slug].filter, page, token);
+ const data: any = await _FetchHomePageReleases(props.slug, token, page);
const newContent = [...content, ...data.content];
setContent(newContent);
}
diff --git a/app/pages/IndexFilters.ts b/app/pages/IndexFilters.ts
deleted file mode 100644
index 0432d99..0000000
--- a/app/pages/IndexFilters.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { FilterDefault } from "#/api/utils";
-
-export const ListLast = {
- name: "Последнее",
- filter: FilterDefault,
-};
-
-export const ListOngoing = {
- name: "Онгоинги",
- filter: { ...FilterDefault, status_id: 2 },
-};
-
-export const ListAnnounce = {
- name: "Анонсы",
- filter: { ...FilterDefault, status_id: 3 },
-};
-
-export const ListFinished = {
- name: "Завершённые",
- filter: { ...FilterDefault, status_id: 1 },
-};
-
-export const ListFilms = {
- name: "Фильмы",
- filter: { ...FilterDefault, category_id: 2 },
-};
-
-export const slugToFilter = {
- last: ListLast,
- ongoing: ListOngoing,
- announce: ListAnnounce,
- finished: ListFinished,
- films: ListFilms,
-}
\ No newline at end of file
diff --git a/app/pages/MobileMenuPage.tsx b/app/pages/MobileMenuPage.tsx
new file mode 100644
index 0000000..f1f73b8
--- /dev/null
+++ b/app/pages/MobileMenuPage.tsx
@@ -0,0 +1,130 @@
+"use client";
+import { Card } from "flowbite-react";
+import { useUserStore } from "#/store/auth";
+import Link from "next/link";
+import { useRouter } from "next/navigation";
+import { SettingsModal } from "#/components/SettingsModal/SettingsModal";
+import { useEffect, useState } from "react";
+import Image from "next/image";
+import { usePreferencesStore } from "#/store/preferences";
+
+export const MenuPage = () => {
+ const userStore = useUserStore();
+ const preferenceStore = usePreferencesStore();
+ const router = useRouter();
+ const [isSettingModalOpen, setIsSettingModalOpen] = useState(false);
+
+ useEffect(() => {
+ if (!userStore.user) {
+ router.push("/");
+ }
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, [userStore.user]);
+
+ return (
+ <>
+ {userStore.user && (
+ Ошибка загрузки контента...
+
+
+
+
+ : ""}
+ {preferenceStore.flags.showFifthButton != 4 ?
+
+
+
+
+ : ""}
+ {preferenceStore.flags.showFifthButton != 5 ?
+
+
+
+
+ : ""}
+
+ )}
+
+ );
+};
diff --git a/app/pages/Profile.tsx b/app/pages/Profile.tsx
index 6eab266..fdd44b4 100644
--- a/app/pages/Profile.tsx
+++ b/app/pages/Profile.tsx
@@ -164,9 +164,6 @@ export const ProfilePage = (props: any) => {
watched_count={user.watched_episode_count}
watched_time={user.watched_time}
profile_id={user.id}
- preferred_genres={user.preferred_genres || []}
- preferred_audiences={user.preferred_audiences || []}
- preferred_themes={user.preferred_themes || []}
/>
+
+
+
+
+
+ {preferenceStore.flags.showFifthButton != 3 ?
+
+
+
+
+
+ + {userStore.user.login} +
++ {userStore.user.status} +
+
+
+
+
+
+
+
+ Избранное
+
+
+
+ Коллекции
+
+
+
+ История
+
diff --git a/app/pages/Search.tsx b/app/pages/Search.tsx
index 0f58262..c5ee065 100644
--- a/app/pages/Search.tsx
+++ b/app/pages/Search.tsx
@@ -243,7 +243,7 @@ export function SearchPage() {
return [url, JSON.stringify({ query, searchBy })];
};
- const { data, error, isLoading, size, setSize } = useSWRInfinite(
+ const { data, error, isLoading, size, setSize, mutate } = useSWRInfinite(
getKey,
([url, payload]) => postFetcher(url, payload),
{ initialSize: 2 }
@@ -279,7 +279,7 @@ export function SearchPage() {
return (
diff --git a/app/store/preferences.ts b/app/store/preferences.ts
index 056038b..1225c2d 100644
--- a/app/store/preferences.ts
+++ b/app/store/preferences.ts
@@ -9,7 +9,8 @@ interface preferencesState {
// saveSearchHistory: boolean;
saveWatchHistory?: boolean;
showChangelog?: boolean;
- showFifthButton?: null | string;
+ showNavbarTitles?: "always" | "links" | "selected" | "never";
+ showFifthButton?: null | 3 | 4 | 5;
};
params: {
isFirstLaunch?: boolean;
@@ -38,9 +39,11 @@ export const usePreferencesStore = create()(
(set, get) => ({
_hasHydrated: false,
flags: {
+ // saveSearchHistory: true,
saveWatchHistory: true,
showChangelog: true,
- showFifthButton: "discovery",
+ showNavbarTitles: "always",
+ showFifthButton: null,
},
params: {
isFirstLaunch: true,
@@ -77,7 +80,6 @@ export const usePreferencesStore = create()(
persistedState as preferencesState
);
},
- version: 2,
- },
+ }
)
);
diff --git a/next.config.mjs b/next.config.js
similarity index 93%
rename from next.config.mjs
rename to next.config.js
index 08b5070..24aa345 100644
--- a/next.config.mjs
+++ b/next.config.js
@@ -1,5 +1,4 @@
-import withFlowbiteReact from "flowbite-react/plugin/nextjs";
-
+const withFlowbiteReact = require("flowbite-react/plugin/nextjs");
/** @type {import('next').NextConfig} */
const NextConfig = {
output: "standalone",
@@ -81,4 +80,6 @@ const NextConfig = {
},
};
-export default withFlowbiteReact(NextConfig);
+const config = withFlowbiteReact(NextConfig);
+
+module.exports = config;
diff --git a/package-lock.json b/package-lock.json
index cfb8bd5..6309d00 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7,11 +7,12 @@
"": {
"name": "new",
"version": "0.1.0",
+ "hasInstallScript": true,
"dependencies": {
"apexcharts": "^3.52.0",
"deepmerge-ts": "^7.1.0",
"flowbite": "^2.4.1",
- "flowbite-react": "^0.12.7",
+ "flowbite-react": "^0.11.7",
"hls-video-element": "^1.5.0",
"markdown-to-jsx": "^7.4.7",
"media-chrome": "^4.9.0",
@@ -3347,9 +3348,9 @@
}
},
"node_modules/flowbite-react": {
- "version": "0.12.7",
- "resolved": "https://registry.npmjs.org/flowbite-react/-/flowbite-react-0.12.7.tgz",
- "integrity": "sha512-d8GR7mnCfdIl4n5RXxz4dKin6DIEA7Ax9mXDpJhz9gwxaPKUklKJZKtQ+KkdmFNrB65Zy76Pam01yr3LcxlseA==",
+ "version": "0.11.7",
+ "resolved": "https://registry.npmjs.org/flowbite-react/-/flowbite-react-0.11.7.tgz",
+ "integrity": "sha512-Z8m+ycHEsXPacSAi8P4yYDeff7LvcHNwbGAnL/+Fpiv+6ZWDEAGY/YPKhUofZsZa837JTYrbcbmgjqQ1bpt51g==",
"license": "MIT",
"dependencies": {
"@floating-ui/core": "1.6.9",
diff --git a/package.json b/package.json
index 25d6ab0..10c8582 100644
--- a/package.json
+++ b/package.json
@@ -7,13 +7,14 @@
"dev-with-services": "node ./run-all.dev.js",
"build": "next build",
"start": "next start",
- "lint": "next lint"
+ "lint": "next lint",
+ "postinstall": "flowbite-react patch"
},
"dependencies": {
"apexcharts": "^3.52.0",
"deepmerge-ts": "^7.1.0",
"flowbite": "^2.4.1",
- "flowbite-react": "^0.12.7",
+ "flowbite-react": "^0.11.7",
"hls-video-element": "^1.5.0",
"markdown-to-jsx": "^7.4.7",
"media-chrome": "^4.9.0",
diff --git a/public/changelog/3.9.0.md b/public/changelog/3.9.0.md
deleted file mode 100644
index c782610..0000000
--- a/public/changelog/3.9.0.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# 3.9.0
-
-## Добавлено
-
-- Статистика тематика, жанры и аудитория в статистике профиля
-- Страница "Обзор"
-
-## Изменено
-
-- Секции карточек релизов теперь в 2 колонки на телефонах
-- Вид карточек в поиске пользователей
-- По стандарту пятой кнопкой в мобильном навбаре стоит пункт "обзор"
-
-## Исправлено
-
-- Неправильное время просмотра в статистике профиле в некоторых случаях
-- Ссылки на переход в поиск с страницы релиза, закладок, избранных, истории, коллекциях теперь работают для нового поиска
-
-## Удалено
-
-- Настройки показа названий страниц в навигации
diff --git a/tailwind.config.js b/tailwind.config.js
index 83bda1a..d5a11ca 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -11,7 +11,7 @@ module.exports = {
"./pages/**/*.{js,ts,jsx,tsx,mdx}",
"./components/**/*.{js,ts,jsx,tsx,mdx}",
"./app/**/*.{js,ts,jsx,tsx,mdx}",
- ".flowbite-react/class-list.json"
+ ".flowbite-react\\class-list.json"
],
plugins: [
addIconSelectors(["mdi", "material-symbols", "twemoji", "fa6-brands", "solar"]),
diff --git a/tsconfig.json b/tsconfig.json
index f7fcd08..b0d0bcc 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -31,7 +31,7 @@
".next/types/**/*.ts",
"**/*.ts",
"**/*.tsx",
- "next.config.mjs"
+ "next.config.js"
],
"exclude": ["node_modules", "player-parser", "api-prox"]
}