Compare commits
30 Commits
form
...
cb9e1bd266
| Author | SHA1 | Date | |
|---|---|---|---|
| cb9e1bd266 | |||
| 1f289e8545 | |||
| ce694f0be8 | |||
| 852ac9ad0d | |||
| 9ab2a1cb08 | |||
| 19a6d435b2 | |||
| 5b5082df38 | |||
| 2c11c3b21a | |||
| f510c8c415 | |||
| a2c1fd16c9 | |||
| 0055e09806 | |||
| db73f498f6 | |||
| be7a58b93f | |||
| 4db7276166 | |||
| ae9eef1131 | |||
| 0b068f7232 | |||
| 5ece8ca7eb | |||
| 23c0f43526 | |||
| 5c13774e63 | |||
| 5c0a7a1b5c | |||
| 5086b64200 | |||
| a2fe9bcfd7 | |||
| ef4d1be2bc | |||
| 4ff0b441f3 | |||
| e8ded7f2ae | |||
| 320872ddc9 | |||
| 9841da8b88 | |||
| b091e8d20d | |||
| c1246939cd | |||
| eb12afe763 |
3
.gitignore
vendored
3
.gitignore
vendored
@@ -23,3 +23,6 @@ dist-ssr
|
||||
*.njsproj
|
||||
*.sln
|
||||
*.sw?
|
||||
|
||||
# My
|
||||
repomix-output.*
|
||||
3
.vscode/settings.json
vendored
3
.vscode/settings.json
vendored
@@ -8,5 +8,6 @@
|
||||
"([\"'`][^\"'`]*.*?[\"'`])",
|
||||
"[\"'`]([^\"'`]*).*?[\"'`]"
|
||||
]
|
||||
]
|
||||
],
|
||||
"editor.formatOnSave": true
|
||||
}
|
||||
16
bun.lock
16
bun.lock
@@ -8,6 +8,7 @@
|
||||
"@preact/signals": "^2.0.2",
|
||||
"@tailwindcss/postcss": "^4.0.17",
|
||||
"@tailwindcss/vite": "^4.0.17",
|
||||
"@types/uuid": "^10.0.0",
|
||||
"clsx": "^2.1.1",
|
||||
"postcss": "^8.5.3",
|
||||
"preact": "^10.26.2",
|
||||
@@ -17,7 +18,8 @@
|
||||
"react-hook-form": "^7.56.1",
|
||||
"tailwind-merge": "^3.0.2",
|
||||
"tailwind-variants": "^1.0.0",
|
||||
"tailwindcss": "^4.0.17",
|
||||
"tailwindcss": "^4.1.5",
|
||||
"uuid": "^11.1.0",
|
||||
},
|
||||
"devDependencies": {
|
||||
"@eslint/js": "^9.23.0",
|
||||
@@ -281,6 +283,8 @@
|
||||
|
||||
"@types/react-transition-group": ["@types/react-transition-group@4.4.12", "", { "peerDependencies": { "@types/react": "*" } }, "sha512-8TV6R3h2j7a91c+1DXdJi3Syo69zzIZbz7Lg5tORM5LEJG7X/E6a1V3drRyBRZq7/utz7A+c4OgYLiLcYGHG6w=="],
|
||||
|
||||
"@types/uuid": ["@types/uuid@10.0.0", "", {}, "sha512-7gqG38EyHgyP1S+7+xomFtL+ZNHcKv6DwNaCZmJmo1vgMugyF3TCnXVg4t1uk89mLNwnLtnY3TpOpCOyp1/xHQ=="],
|
||||
|
||||
"@typescript-eslint/eslint-plugin": ["@typescript-eslint/eslint-plugin@8.28.0", "", { "dependencies": { "@eslint-community/regexpp": "^4.10.0", "@typescript-eslint/scope-manager": "8.28.0", "@typescript-eslint/type-utils": "8.28.0", "@typescript-eslint/utils": "8.28.0", "@typescript-eslint/visitor-keys": "8.28.0", "graphemer": "^1.4.0", "ignore": "^5.3.1", "natural-compare": "^1.4.0", "ts-api-utils": "^2.0.1" }, "peerDependencies": { "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0", "eslint": "^8.57.0 || ^9.0.0", "typescript": ">=4.8.4 <5.9.0" } }, "sha512-lvFK3TCGAHsItNdWZ/1FkvpzCxTHUVuFrdnOGLMa0GGCFIbCgQWVk3CzCGdA7kM3qGVc+dfW9tr0Z/sHnGDFyg=="],
|
||||
|
||||
"@typescript-eslint/parser": ["@typescript-eslint/parser@8.28.0", "", { "dependencies": { "@typescript-eslint/scope-manager": "8.28.0", "@typescript-eslint/types": "8.28.0", "@typescript-eslint/typescript-estree": "8.28.0", "@typescript-eslint/visitor-keys": "8.28.0", "debug": "^4.3.4" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", "typescript": ">=4.8.4 <5.9.0" } }, "sha512-LPcw1yHD3ToaDEoljFEfQ9j2xShY367h7FZ1sq5NJT9I3yj4LHer1Xd1yRSOdYy9BpsrxU7R+eoDokChYM53lQ=="],
|
||||
@@ -709,7 +713,7 @@
|
||||
|
||||
"tailwind-variants": ["tailwind-variants@1.0.0", "", { "dependencies": { "tailwind-merge": "3.0.2" }, "peerDependencies": { "tailwindcss": "*" } }, "sha512-2WSbv4ulEEyuBKomOunut65D8UZwxrHoRfYnxGcQNnHqlSCp2+B7Yz2W+yrNDrxRodOXtGD/1oCcKGNBnUqMqA=="],
|
||||
|
||||
"tailwindcss": ["tailwindcss@4.0.17", "", {}, "sha512-OErSiGzRa6rLiOvaipsDZvLMSpsBZ4ysB4f0VKGXUrjw2jfkJRd6kjRKV2+ZmTCNvwtvgdDam5D7w6WXsdLJZw=="],
|
||||
"tailwindcss": ["tailwindcss@4.1.5", "", {}, "sha512-nYtSPfWGDiWgCkwQG/m+aX83XCwf62sBgg3bIlNiiOcggnS1x3uVRDAuyelBFL+vJdOPPCGElxv9DjHJjRHiVA=="],
|
||||
|
||||
"tapable": ["tapable@2.2.1", "", {}, "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ=="],
|
||||
|
||||
@@ -735,6 +739,8 @@
|
||||
|
||||
"uri-js": ["uri-js@4.4.1", "", { "dependencies": { "punycode": "^2.1.0" } }, "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="],
|
||||
|
||||
"uuid": ["uuid@11.1.0", "", { "bin": { "uuid": "dist/esm/bin/uuid" } }, "sha512-0/A9rDy9P7cJ+8w1c9WD9V//9Wj15Ce2MPz8Ri6032usz+NfePxx5AcN3bN+r6ZL6jEo066/yNYB3tn4pQEx+A=="],
|
||||
|
||||
"varint": ["varint@6.0.0", "", {}, "sha512-cXEIW6cfr15lFv563k4GuVuW/fiwjknytD37jIOLSdSWuOI6WnO/oKwmP2FQTU2l01LP8/M5TSAJpzUaGe3uWg=="],
|
||||
|
||||
"vite": ["vite@6.2.3", "", { "dependencies": { "esbuild": "^0.25.0", "postcss": "^8.5.3", "rollup": "^4.30.1" }, "optionalDependencies": { "fsevents": "~2.3.3" }, "peerDependencies": { "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0", "jiti": ">=1.21.0", "less": "*", "lightningcss": "^1.21.0", "sass": "*", "sass-embedded": "*", "stylus": "*", "sugarss": "*", "terser": "^5.16.0", "tsx": "^4.8.1", "yaml": "^2.4.2" }, "optionalPeers": ["@types/node", "jiti", "less", "lightningcss", "sass", "sass-embedded", "stylus", "sugarss", "terser", "tsx", "yaml"], "bin": { "vite": "bin/vite.js" } }, "sha512-IzwM54g4y9JA/xAeBPNaDXiBF8Jsgl3VBQ2YQ/wOY6fyW3xMdSoltIV3Bo59DErdqdE6RxUfv8W69DvUorE4Eg=="],
|
||||
@@ -761,6 +767,12 @@
|
||||
|
||||
"@humanfs/node/@humanwhocodes/retry": ["@humanwhocodes/retry@0.3.1", "", {}, "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA=="],
|
||||
|
||||
"@tailwindcss/node/tailwindcss": ["tailwindcss@4.0.17", "", {}, "sha512-OErSiGzRa6rLiOvaipsDZvLMSpsBZ4ysB4f0VKGXUrjw2jfkJRd6kjRKV2+ZmTCNvwtvgdDam5D7w6WXsdLJZw=="],
|
||||
|
||||
"@tailwindcss/postcss/tailwindcss": ["tailwindcss@4.0.17", "", {}, "sha512-OErSiGzRa6rLiOvaipsDZvLMSpsBZ4ysB4f0VKGXUrjw2jfkJRd6kjRKV2+ZmTCNvwtvgdDam5D7w6WXsdLJZw=="],
|
||||
|
||||
"@tailwindcss/vite/tailwindcss": ["tailwindcss@4.0.17", "", {}, "sha512-OErSiGzRa6rLiOvaipsDZvLMSpsBZ4ysB4f0VKGXUrjw2jfkJRd6kjRKV2+ZmTCNvwtvgdDam5D7w6WXsdLJZw=="],
|
||||
|
||||
"@typescript-eslint/typescript-estree/minimatch": ["minimatch@9.0.5", "", { "dependencies": { "brace-expansion": "^2.0.1" } }, "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow=="],
|
||||
|
||||
"@typescript-eslint/typescript-estree/semver": ["semver@7.7.1", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA=="],
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
"@preact/signals": "^2.0.2",
|
||||
"@tailwindcss/postcss": "^4.0.17",
|
||||
"@tailwindcss/vite": "^4.0.17",
|
||||
"@types/uuid": "^10.0.0",
|
||||
"clsx": "^2.1.1",
|
||||
"postcss": "^8.5.3",
|
||||
"preact": "^10.26.2",
|
||||
@@ -22,7 +23,8 @@
|
||||
"react-hook-form": "^7.56.1",
|
||||
"tailwind-merge": "^3.0.2",
|
||||
"tailwind-variants": "^1.0.0",
|
||||
"tailwindcss": "^4.0.17"
|
||||
"tailwindcss": "^4.1.5",
|
||||
"uuid": "^11.1.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@eslint/js": "^9.23.0",
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
import { FunctionComponent } from "preact";
|
||||
import { ErrorBoundary, lazy, LocationProvider, Route, Router, useLocation } from "preact-iso";
|
||||
import "preact/debug";
|
||||
import { ru } from "primelocale/js/ru.js";
|
||||
import { addLocale, locale, PrimeReactProvider } from "primereact/api";
|
||||
import { useMountEffect } from "primereact/hooks";
|
||||
@@ -26,8 +25,6 @@ export function App() {
|
||||
<PrimeReactProvider
|
||||
value={{
|
||||
unstyled: true,
|
||||
// pt: Tailwind,
|
||||
// ptOptions: { mergeProps: true, mergeSections: true, classNameMergeFunction: cn },
|
||||
}}
|
||||
>
|
||||
<LocationProvider>
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
import { cn } from "@/utils/class-merge";
|
||||
import { ClockIcon } from "@heroicons/react/24/outline";
|
||||
import { FunctionComponent } from "preact";
|
||||
import { Dispatch, StateUpdater, useState } from "preact/hooks";
|
||||
import { Dispatch, StateUpdater, useEffect, useState } from "preact/hooks";
|
||||
import { Calendar, CalendarPassThroughMethodOptions } from "primereact/calendar";
|
||||
import { FormEvent } from "primereact/ts-helpers";
|
||||
import Button from "./ui/Button";
|
||||
import ModalWindow from "./ui/Modal";
|
||||
import ModalWindow, { ModalWindowProps } from "./ui/Modal";
|
||||
|
||||
interface ModalCalendarProps {
|
||||
interface ModalCalendarProps extends ModalWindowProps {
|
||||
isOpen?: boolean;
|
||||
setIsOpen?: Dispatch<StateUpdater<boolean>>;
|
||||
onClose?: () => void;
|
||||
@@ -27,10 +27,25 @@ const TRANSITIONS = {
|
||||
},
|
||||
};
|
||||
|
||||
const ModalCalendar: FunctionComponent<ModalCalendarProps> = ({ isOpen, setIsOpen, onClose, onChange, value }) => {
|
||||
const ModalCalendar: FunctionComponent<ModalCalendarProps> = ({
|
||||
isOpen,
|
||||
setIsOpen,
|
||||
onClose,
|
||||
onChange,
|
||||
value,
|
||||
...rest
|
||||
}) => {
|
||||
const [showTime, setShowTime] = useState(false);
|
||||
const [minDate, setMinDate] = useState(new Date());
|
||||
useEffect(() => {
|
||||
const interval = setInterval(() => {
|
||||
setMinDate(new Date());
|
||||
}, 1000);
|
||||
return () => clearInterval(interval);
|
||||
}, []);
|
||||
return (
|
||||
<ModalWindow
|
||||
{...rest}
|
||||
isOpen={isOpen}
|
||||
setIsOpen={setIsOpen}
|
||||
onClose={() => {
|
||||
@@ -38,7 +53,6 @@ const ModalCalendar: FunctionComponent<ModalCalendarProps> = ({ isOpen, setIsOpe
|
||||
setShowTime(false);
|
||||
}}
|
||||
className="md:h-[40rem] md:w-[30rem]"
|
||||
zIndex={60}
|
||||
>
|
||||
<div class="w-full flex-1 self-start">
|
||||
<Calendar
|
||||
@@ -46,6 +60,7 @@ const ModalCalendar: FunctionComponent<ModalCalendarProps> = ({ isOpen, setIsOpe
|
||||
onChange={onChange}
|
||||
value={value}
|
||||
hourFormat="24"
|
||||
minDate={minDate}
|
||||
showTime={showTime}
|
||||
pt={{
|
||||
root: ({ props }: CalendarPassThroughMethodOptions) => ({
|
||||
@@ -199,4 +214,6 @@ const ModalCalendar: FunctionComponent<ModalCalendarProps> = ({ isOpen, setIsOpe
|
||||
);
|
||||
};
|
||||
|
||||
ModalCalendar.displayName = "AHModalCalendar";
|
||||
|
||||
export default ModalCalendar;
|
||||
|
||||
135
src/components/ModalTags.tsx
Normal file
135
src/components/ModalTags.tsx
Normal file
@@ -0,0 +1,135 @@
|
||||
import { cn } from "@/utils/class-merge";
|
||||
import { BookOpenIcon, DocumentDuplicateIcon } from "@heroicons/react/24/outline";
|
||||
import { FunctionComponent } from "preact";
|
||||
import { Dispatch, StateUpdater, useEffect, useState } from "preact/hooks";
|
||||
import Button from "./ui/Button";
|
||||
import ModalWindow, { ModalWindowProps } from "./ui/Modal";
|
||||
|
||||
export interface ITags {
|
||||
first: string;
|
||||
second: string;
|
||||
overdue: boolean;
|
||||
}
|
||||
|
||||
interface ModalTagsProps extends ModalWindowProps {
|
||||
isOpen?: boolean;
|
||||
setIsOpen?: Dispatch<StateUpdater<boolean>>;
|
||||
onClose?: () => void;
|
||||
value?: ITags;
|
||||
onChange?: Dispatch<StateUpdater<ITags>>;
|
||||
tagsList?: {
|
||||
first: string[];
|
||||
second: string[];
|
||||
};
|
||||
}
|
||||
|
||||
const ModalTags: FunctionComponent<ModalTagsProps> = ({
|
||||
isOpen,
|
||||
setIsOpen,
|
||||
onClose,
|
||||
onChange,
|
||||
value,
|
||||
tagsList,
|
||||
...rest
|
||||
}) => {
|
||||
const [showFirstTags, setShowFirstTags] = useState(false);
|
||||
const [showSecondTags, setShowSecondTags] = useState(false);
|
||||
useEffect(() => {
|
||||
if (showFirstTags && showSecondTags) setShowFirstTags(false);
|
||||
}, [showSecondTags]);
|
||||
useEffect(() => {
|
||||
if (showFirstTags && showSecondTags) setShowSecondTags(false);
|
||||
}, [showFirstTags]);
|
||||
return (
|
||||
<ModalWindow
|
||||
isOpen={isOpen}
|
||||
{...rest}
|
||||
setIsOpen={setIsOpen}
|
||||
onClose={() => {
|
||||
onClose!();
|
||||
setShowFirstTags(false);
|
||||
setShowSecondTags(false);
|
||||
}}
|
||||
className="relative h-[14rem] justify-between py-4 md:h-[14rem] md:w-[25rem]"
|
||||
zIndex={70}
|
||||
>
|
||||
<p class="text-2xl font-semibold">Теги</p>
|
||||
<div class="flex w-[85%] flex-col gap-2 md:w-full">
|
||||
<Button
|
||||
className="flex w-full flex-row items-center justify-center gap-1 text-[1rem]!"
|
||||
onClick={() => setShowFirstTags(!showFirstTags)}
|
||||
>
|
||||
<BookOpenIcon class="size-6" />
|
||||
{value?.first || "Предмет"}
|
||||
</Button>
|
||||
<Button
|
||||
className="flex w-full flex-row items-center justify-center gap-1 text-[1rem]! break-words"
|
||||
onClick={() => setShowSecondTags(!showSecondTags)}
|
||||
>
|
||||
<DocumentDuplicateIcon class="size-6" />
|
||||
{value?.second || "Тема"}
|
||||
</Button>
|
||||
{showFirstTags && (
|
||||
<div class="absolute top-full left-0 mt-3 ml-2 flex h-fit w-[18rem] flex-col items-center rounded-[4rem] bg-white px-8 py-4 text-xs md:top-0 md:left-full md:mt-0 md:ml-5">
|
||||
<div class="flex h-fit max-h-[45vh] w-full flex-col gap-3 overflow-y-auto">
|
||||
{tagsList?.first.map((tag) => (
|
||||
<div
|
||||
class="flex cursor-pointer flex-row gap-2"
|
||||
onClick={() =>
|
||||
onChange?.((prev) => {
|
||||
return { ...prev, first: tag };
|
||||
})
|
||||
}
|
||||
>
|
||||
<div
|
||||
class={cn(
|
||||
"pointer-events-none flex aspect-square size-4 flex-col items-center justify-center rounded-full border-1 border-black text-white select-none",
|
||||
{
|
||||
"bg-black": value?.first === tag,
|
||||
}
|
||||
)}
|
||||
>
|
||||
✓
|
||||
</div>
|
||||
<p>{tag}</p>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
{showSecondTags && (
|
||||
<div class="absolute top-full left-0 mt-3 ml-2 flex h-fit w-[18rem] flex-col items-center rounded-[4rem] bg-white px-8 py-4 text-xs md:top-0 md:left-full md:mt-0 md:ml-5">
|
||||
<div class="flex h-fit max-h-[45vh] w-full flex-col gap-3 overflow-y-auto">
|
||||
{tagsList?.second.map((tag) => (
|
||||
<div
|
||||
class="flex cursor-pointer flex-row gap-2"
|
||||
onClick={() =>
|
||||
onChange?.((prev) => {
|
||||
return { ...prev, second: tag };
|
||||
})
|
||||
}
|
||||
>
|
||||
<div
|
||||
class={cn(
|
||||
"pointer-events-none flex aspect-square size-4 flex-col items-center justify-center rounded-full border-1 border-black text-white select-none",
|
||||
{
|
||||
"bg-black": value?.second === tag,
|
||||
}
|
||||
)}
|
||||
>
|
||||
✓
|
||||
</div>
|
||||
<p>{tag}</p>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</ModalWindow>
|
||||
);
|
||||
};
|
||||
|
||||
ModalTags.displayName = "AHModalTags";
|
||||
|
||||
export default ModalTags;
|
||||
@@ -220,6 +220,9 @@ const BigCalendar: FunctionComponent<BigCalendarProps> = ({
|
||||
|
||||
return (
|
||||
<div className={`flex w-full flex-col ${className}`}>
|
||||
<div class="fixed top-0 right-[20rem] z-100 flex h-full w-full flex-col items-center justify-center bg-white">
|
||||
Закрыто
|
||||
</div>
|
||||
<div className="mb-4 flex items-center justify-between px-2">
|
||||
<button
|
||||
onClick={handlePrevMonth}
|
||||
|
||||
@@ -4,6 +4,22 @@ import { FunctionComponent, h } from "preact";
|
||||
import { useLocation } from "preact-iso";
|
||||
import { tv } from "tailwind-variants";
|
||||
import classes from "./menu.module.scss";
|
||||
import { useEffect, useState } from "preact/hooks";
|
||||
import apiClient from "@/services/api";
|
||||
import { useAppContext } from "@/providers/AuthProvider";
|
||||
|
||||
interface UserProfile {
|
||||
username: string;
|
||||
email: string;
|
||||
status: string;
|
||||
avatar_url: string | null;
|
||||
telegram_notifications: boolean;
|
||||
telegram_chat_id: string;
|
||||
}
|
||||
|
||||
interface UserSettings {
|
||||
profile: UserProfile;
|
||||
}
|
||||
|
||||
interface MenuItemProps {
|
||||
title: string;
|
||||
@@ -35,8 +51,27 @@ const MenuItem: FunctionComponent<MenuItemProps> = ({ title, link, icon }: MenuI
|
||||
};
|
||||
|
||||
const Avatar: FunctionComponent = () => {
|
||||
const [status, setStatus] = useState("");
|
||||
const [username, setUsername] = useState("");
|
||||
const { route, path } = useLocation();
|
||||
//TODO: Move styles to scss module
|
||||
const { isLoggedIn } = useAppContext();
|
||||
|
||||
useEffect(() => {
|
||||
const fetchUserData = async () => {
|
||||
try {
|
||||
const response = await apiClient<UserSettings>("/api/settings/view_settings/", { method: "GET" }, isLoggedIn);
|
||||
setUsername(response.profile.username);
|
||||
setStatus(response.profile.status);
|
||||
} catch (error) {
|
||||
console.error("Failed to fetch user data:", error);
|
||||
}
|
||||
};
|
||||
|
||||
if (isLoggedIn.value) {
|
||||
fetchUserData();
|
||||
}
|
||||
}, [isLoggedIn.value]);
|
||||
|
||||
return (
|
||||
<button
|
||||
onClick={() => route("/profile/settings")}
|
||||
@@ -51,8 +86,8 @@ const Avatar: FunctionComponent = () => {
|
||||
>
|
||||
<div class="my-5 aspect-square h-full rounded-full bg-white"></div>
|
||||
<div class="flex flex-col items-center justify-center">
|
||||
<p class="text-3xl font-semibold">никнейм</p>
|
||||
<div class="rounded-[1rem] bg-white px-5 leading-5 font-light italic">статус</div>
|
||||
<p class="text-3xl font-semibold">{username}</p>
|
||||
<div class="rounded-[1rem] bg-white px-5 leading-5 font-light italic">{status}</div>
|
||||
</div>
|
||||
</div>
|
||||
</button>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
@reference "../index.scss";
|
||||
|
||||
.task {
|
||||
@apply flex h-24 w-full cursor-pointer flex-row items-center justify-start gap-4 rounded-[3rem] bg-[rgba(251,194,199,0.53)] px-5 py-6 text-xl shadow-[0px_4px_4px_0px_rgba(0,0,0,0.25)] transition-transform hover:scale-[1.05] hover:bg-[rgba(251,194,199,0.7)] active:scale-[1.05] md:w-[500px];
|
||||
@apply relative flex h-24 w-full cursor-pointer flex-row items-center justify-start gap-4 rounded-[3rem] bg-[rgba(251,194,199,0.53)] px-5 py-6 text-xl shadow-[0px_4px_4px_0px_rgba(0,0,0,0.25)] transition-transform hover:scale-[1.05] hover:bg-[rgba(251,194,199,0.7)] active:scale-[1.05] md:w-[500px];
|
||||
}
|
||||
|
||||
@@ -1,15 +1,18 @@
|
||||
import { FunctionComponent } from "preact";
|
||||
import { MouseEventHandler } from "preact/compat";
|
||||
import { tv } from "tailwind-variants";
|
||||
import classes from "./task.module.scss";
|
||||
|
||||
interface TaskProps {
|
||||
name: string;
|
||||
checked?: boolean;
|
||||
overdue?: boolean;
|
||||
onClick?: () => void;
|
||||
onMarkClick?: MouseEventHandler<HTMLParagraphElement>;
|
||||
}
|
||||
|
||||
const taskStyle = tv({
|
||||
base: "flex aspect-square h-full flex-col items-center justify-center rounded-full border",
|
||||
base: "hover:scale-[1.1]active:scale-[1.1] flex aspect-square h-full flex-col items-center justify-center rounded-full border transition-[scale] duration-100 ease-in-out select-none",
|
||||
variants: {
|
||||
checked: {
|
||||
true: "bg-black",
|
||||
@@ -28,18 +31,32 @@ const markStyle = tv({
|
||||
},
|
||||
});
|
||||
|
||||
const Task: FunctionComponent<TaskProps> = ({ name, checked = false, onClick = () => {} }: TaskProps) => {
|
||||
const Task: FunctionComponent<TaskProps> = ({
|
||||
name,
|
||||
checked = false,
|
||||
onClick = () => {},
|
||||
onMarkClick = () => {},
|
||||
overdue,
|
||||
}) => {
|
||||
return (
|
||||
// Временное действие для тестирования
|
||||
<button onClick={onClick} class="w-[95%]">
|
||||
<div class={classes.task}>
|
||||
<div class={taskStyle({ checked })}>
|
||||
<div class="w-[95%]">
|
||||
<div class={classes.task} onClick={onClick}>
|
||||
<div
|
||||
class={taskStyle({ checked })}
|
||||
onClick={(e) => {
|
||||
e.stopPropagation();
|
||||
onMarkClick(e);
|
||||
}}
|
||||
>
|
||||
<p class={markStyle({ checked })}>✓</p>
|
||||
</div>
|
||||
{name}
|
||||
{overdue && <span class="absolute top-2 right-16 text-xs text-red-500">Просрочено</span>}
|
||||
</div>
|
||||
</div>
|
||||
</button>
|
||||
);
|
||||
};
|
||||
|
||||
Task.displayName = "AHTask";
|
||||
|
||||
export default Task;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { FunctionComponent } from "preact";
|
||||
import { forwardRef, HTMLProps } from "preact/compat";
|
||||
import { tv } from "tailwind-variants";
|
||||
import classes from "./Button.module.scss";
|
||||
const button = tv({
|
||||
@@ -12,25 +12,20 @@ const button = tv({
|
||||
},
|
||||
});
|
||||
|
||||
interface ButtonProps {
|
||||
interface ButtonProps extends HTMLProps<HTMLButtonElement> {
|
||||
color?: "primary" | "secondary" | "red";
|
||||
onClick?: () => void;
|
||||
className?: string;
|
||||
type?: "button" | "submit";
|
||||
}
|
||||
|
||||
const Button: FunctionComponent<ButtonProps> = ({
|
||||
children,
|
||||
onClick = () => {},
|
||||
color = "primary",
|
||||
className = "",
|
||||
type = "button",
|
||||
}) => {
|
||||
const Button = forwardRef<HTMLButtonElement, ButtonProps>((props, ref) => {
|
||||
const { children, onClick = () => {}, color = "primary", className = "", type = "button" } = props;
|
||||
return (
|
||||
<button type={type} class={button({ color: color, class: className })} onClick={onClick}>
|
||||
<button ref={ref} type={type} class={button({ color: color, class: className })} onClick={onClick}>
|
||||
{children}
|
||||
</button>
|
||||
);
|
||||
};
|
||||
});
|
||||
|
||||
Button.displayName = "AHButton";
|
||||
|
||||
export default Button;
|
||||
|
||||
49
src/components/ui/Dialog.tsx
Normal file
49
src/components/ui/Dialog.tsx
Normal file
@@ -0,0 +1,49 @@
|
||||
import { FunctionComponent } from "preact";
|
||||
import Button from "./Button";
|
||||
|
||||
interface DialogProps {
|
||||
isOpen: boolean;
|
||||
setIsOpen: (isOpen: boolean) => void;
|
||||
title: string;
|
||||
content: string;
|
||||
onConfirm: () => void;
|
||||
confirmText?: string;
|
||||
cancelText?: string;
|
||||
}
|
||||
|
||||
const Dialog: FunctionComponent<DialogProps> = ({
|
||||
isOpen,
|
||||
setIsOpen,
|
||||
title,
|
||||
content,
|
||||
onConfirm,
|
||||
confirmText = "Подтвердить",
|
||||
cancelText = "Отмена",
|
||||
}) => {
|
||||
if (!isOpen) return null;
|
||||
|
||||
return (
|
||||
<div class="fixed inset-0 z-150 flex items-center justify-center bg-black/50">
|
||||
<div class="w-full max-w-md rounded-[4rem] bg-white p-6 shadow-lg">
|
||||
<h2 class="mb-4 text-xl font-semibold">{title}</h2>
|
||||
<p class="mb-6 text-sm sm:text-[1rem]">{content}</p>
|
||||
<div class="flex justify-end gap-4">
|
||||
<Button onClick={() => setIsOpen(false)} className="bg-gray-200 text-gray-800 hover:bg-gray-300">
|
||||
{cancelText}
|
||||
</Button>
|
||||
<Button
|
||||
onClick={() => {
|
||||
onConfirm();
|
||||
setIsOpen(false);
|
||||
}}
|
||||
color="red"
|
||||
>
|
||||
{confirmText}
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
export default Dialog;
|
||||
@@ -2,7 +2,7 @@ import { cn } from "@/utils/class-merge";
|
||||
import { FunctionComponent } from "preact";
|
||||
import { Dispatch, StateUpdater, useEffect } from "preact/hooks";
|
||||
|
||||
interface ModalWindowProps {
|
||||
export interface ModalWindowProps {
|
||||
isOpen?: boolean;
|
||||
setIsOpen?: Dispatch<StateUpdater<boolean>>;
|
||||
onClose?: () => void;
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
@import "tailwindcss";
|
||||
@import url("https://fonts.googleapis.com/css2?family=Montserrat:ital,wght@0,100..900;1,100..900&display=swap");
|
||||
:root {
|
||||
color: black;
|
||||
background-color: white;
|
||||
font-family: "Montserrat", sans-serif;
|
||||
}
|
||||
|
||||
|
||||
@@ -3,32 +3,17 @@ import Input from "@/components/ui/Input";
|
||||
import { withTitle } from "@/constructors/Component";
|
||||
import { UrlsTitle } from "@/enums/urls";
|
||||
import { useAppContext } from "@/providers/AuthProvider";
|
||||
import apiClient from "@/services/api";
|
||||
import { FunctionComponent } from "preact";
|
||||
import { useLocation } from "preact-iso";
|
||||
import "preact/debug";
|
||||
import { useState } from "preact/hooks";
|
||||
import { Controller, SubmitHandler, useForm } from "react-hook-form";
|
||||
import { ILoginForm } from "./login.dto";
|
||||
import classes from "./login.module.scss";
|
||||
|
||||
const testUser = {
|
||||
login: "test",
|
||||
password: "test",
|
||||
};
|
||||
const LoginPage: FunctionComponent = () => {
|
||||
const { isLoggedIn } = useAppContext();
|
||||
const { route } = useLocation();
|
||||
const [passwordError, setPasswordError] = useState("");
|
||||
const login: SubmitHandler<ILoginForm> = async (data) => {
|
||||
console.log(data);
|
||||
if (data.login !== testUser.login || data.password !== testUser.password) {
|
||||
setError("login", { message: "Неверный" }); //TODO: не показывает ошибку
|
||||
return;
|
||||
}
|
||||
isLoggedIn.value = true;
|
||||
localStorage.setItem("loggedIn", "true");
|
||||
route("/profile/tasks", true);
|
||||
};
|
||||
const { control, handleSubmit, formState, setError } = useForm({
|
||||
defaultValues: {
|
||||
login: "",
|
||||
@@ -36,12 +21,43 @@ const LoginPage: FunctionComponent = () => {
|
||||
},
|
||||
mode: "onChange",
|
||||
});
|
||||
const login: SubmitHandler<ILoginForm> = async (data) => {
|
||||
try {
|
||||
const response = await apiClient<{ success: boolean; user?: any; error?: string }>(
|
||||
"/api/login/",
|
||||
{
|
||||
method: "POST",
|
||||
body: JSON.stringify({ username: data.login, password: data.password }),
|
||||
needsCsrf: true,
|
||||
},
|
||||
isLoggedIn
|
||||
);
|
||||
|
||||
if (response.success) {
|
||||
isLoggedIn.value = true;
|
||||
localStorage.setItem("loggedIn", "true");
|
||||
route("/profile/tasks", true);
|
||||
} else {
|
||||
const errorMessage = response.error || "Неверный логин или пароль";
|
||||
setError("login", { message: errorMessage });
|
||||
setError("password", { message: " " });
|
||||
}
|
||||
} catch (error: any) {
|
||||
console.error("Login failed:", error);
|
||||
const errorMessage =
|
||||
error.message.includes("Authentication failed") || error.message.includes("Invalid credentials")
|
||||
? "Неверный логин или пароль"
|
||||
: "Ошибка входа. Попробуйте позже.";
|
||||
setError("login", { message: errorMessage });
|
||||
setError("password", { message: " " });
|
||||
}
|
||||
};
|
||||
if (isLoggedIn.value) route("/profile/tasks", true);
|
||||
return !isLoggedIn.value ? (
|
||||
<div class={classes.login_container}>
|
||||
<div class={classes.login_card}>
|
||||
<p class={classes.login_card_name}>Антихвост</p>
|
||||
<form onSubmit={handleSubmit((data) => login(data))}>
|
||||
<form onSubmit={handleSubmit(login)}>
|
||||
<Controller
|
||||
name="login"
|
||||
control={control}
|
||||
@@ -59,7 +75,13 @@ const LoginPage: FunctionComponent = () => {
|
||||
required: "Введите пароль",
|
||||
}}
|
||||
render={({ field }) => (
|
||||
<Input placeholder="Пароль" textAlign="center" type="password" error={passwordError} {...field} />
|
||||
<Input
|
||||
placeholder="Пароль"
|
||||
textAlign="center"
|
||||
type="password"
|
||||
error={formState.errors.password?.message}
|
||||
{...field}
|
||||
/>
|
||||
)}
|
||||
/>
|
||||
<Button type="submit" color="secondary" className="w-full">
|
||||
|
||||
@@ -6,8 +6,16 @@ import ids from "./profile.module.scss";
|
||||
|
||||
const ProfilePage: FunctionComponent = () => {
|
||||
const { route } = useLocation();
|
||||
const { isLoggedIn } = useAppContext();
|
||||
if (!isLoggedIn.value) route("/login", true);
|
||||
const { isLoggedIn, isCheckingAuth } = useAppContext(); // Получаем новый сигнал
|
||||
|
||||
if (isCheckingAuth.value) {
|
||||
return <div class="flex h-screen items-center justify-center">Проверка авторизации...</div>;
|
||||
}
|
||||
|
||||
if (!isLoggedIn.value) {
|
||||
route("/login", true);
|
||||
return <p>Redirecting...</p>; // Заглушка на время редиректа
|
||||
}
|
||||
return isLoggedIn.value ? (
|
||||
<div id={ids.main_container}>
|
||||
<div id={ids.router_container}>
|
||||
|
||||
@@ -1,15 +1,422 @@
|
||||
import BigCalendar from "@/components/calendar";
|
||||
import ModalCalendar from "@/components/ModalCalendar";
|
||||
import ModalTags, { ITags } from "@/components/ModalTags";
|
||||
import Task from "@/components/task";
|
||||
import Dialog from "@/components/ui/Dialog";
|
||||
import ModalWindow from "@/components/ui/Modal";
|
||||
import { withTitle } from "@/constructors/Component";
|
||||
import { UrlsTitle } from "@/enums/urls";
|
||||
import { cn } from "@/utils/class-merge";
|
||||
import {
|
||||
BookOpenIcon,
|
||||
CalendarDaysIcon,
|
||||
DocumentDuplicateIcon,
|
||||
InboxArrowDownIcon,
|
||||
PencilIcon,
|
||||
TrashIcon,
|
||||
} from "@heroicons/react/24/outline";
|
||||
import { FunctionComponent } from "preact";
|
||||
import { useEffect, useState } from "preact/hooks";
|
||||
import { Calendar, CalendarDateTemplateEvent } from "primereact/calendar";
|
||||
import { Nullable } from "primereact/ts-helpers";
|
||||
import { useForm } from "react-hook-form";
|
||||
import { ITask, ITaskForm } from "./profile_tasks.dto";
|
||||
|
||||
const example_tags: { first: string[]; second: string[] } = {
|
||||
first: ["Программирование", "Информатика", "Физика", "Математика"],
|
||||
second: ["Лабораторная работа", "Практическая работа", "Домашнее задание", "Экзамен"],
|
||||
};
|
||||
|
||||
const calendarStyles = {
|
||||
root: "inline-flex w-full relative",
|
||||
input: "font-sans text-base text-gray-600 bg-white p-3",
|
||||
panel: "bg-white min-w-full p-2",
|
||||
header: "flex items-center justify-between p-2 text-gray-700 font-semibold m-0 mb-4",
|
||||
title: "leading-8 mx-auto text-xl",
|
||||
previousButton: "flex items-center justify-center cursor-pointer w-8 h-8 text-gray-600",
|
||||
nextButton: "flex items-center justify-center cursor-pointer w-8 h-8 text-gray-600",
|
||||
table: "border-collapse w-full",
|
||||
tableHeaderCell: "p-2 text-center",
|
||||
weekDay: "text-gray-600 font-normal pb-4",
|
||||
monthTitle: "text-gray-700 font-semibold mr-2",
|
||||
yearTitle: "text-gray-700 font-semibold",
|
||||
monthPicker: "grid grid-cols-3 gap-2",
|
||||
yearPicker: "grid grid-cols-2 gap-2",
|
||||
month:
|
||||
"p-2 text-center cursor-pointer rounded-lg hover:bg-[rgba(251,194,199,0.1)] [&.p-highlight]:bg-[rgba(251,194,199,0.2)]",
|
||||
year: "p-2 text-center cursor-pointer rounded-lg hover:bg-[rgba(251,194,199,0.1)] [&.p-highlight]:bg-[rgba(251,194,199,0.2)]",
|
||||
};
|
||||
|
||||
const ProfileCalendar: FunctionComponent = () => {
|
||||
const onDateSelect = (date: Date) => {
|
||||
console.log(date);
|
||||
const [currentDate, setCurrentDate] = useState(new Date());
|
||||
const [tasks, setTasks] = useState<ITask[]>([]);
|
||||
const [selectedTasks, setSelectedTasks] = useState<ITask[]>([]);
|
||||
const [openModal, setIsOpen] = useState(false);
|
||||
const [openModalCalendar, setOpenModalCalendar] = useState(false);
|
||||
const [openModalTags, setOpenModalTags] = useState(false);
|
||||
const [isEdit, setIsEdit] = useState(false);
|
||||
const [isEditModal, setIsEditModal] = useState(false);
|
||||
const [editContent, setEditContent] = useState<ITask | null>(null);
|
||||
const [calendarDate, setCalendarDate] = useState<Nullable<Date>>();
|
||||
const [tags, setTags] = useState<ITags>({ first: "", second: "", overdue: false });
|
||||
const [showDeleteDialog, setShowDeleteDialog] = useState(false);
|
||||
|
||||
const {
|
||||
handleSubmit,
|
||||
register,
|
||||
reset,
|
||||
setError,
|
||||
formState: { errors },
|
||||
} = useForm<ITaskForm>({
|
||||
defaultValues: {
|
||||
tags: [],
|
||||
},
|
||||
});
|
||||
|
||||
useEffect(() => {
|
||||
const storedTasks = localStorage.getItem("tasks");
|
||||
if (storedTasks) {
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
const parsedTasks: ITask[] = JSON.parse(storedTasks).map((task: any) => ({
|
||||
...task,
|
||||
date: new Date(task.date),
|
||||
}));
|
||||
setTasks(parsedTasks);
|
||||
}
|
||||
}, []);
|
||||
const handleDeleteTask = () => {
|
||||
if (!editContent) return;
|
||||
setTasks(tasks.filter((task) => task.id !== editContent.id));
|
||||
setIsOpen(false);
|
||||
setShowDeleteDialog(false);
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
if (!currentDate) return;
|
||||
|
||||
const tasksForDate = tasks.filter((task) => {
|
||||
const taskDate = task.date;
|
||||
return (
|
||||
taskDate.getDate() === currentDate.getDate() &&
|
||||
taskDate.getMonth() === currentDate.getMonth() &&
|
||||
taskDate.getFullYear() === currentDate.getFullYear()
|
||||
);
|
||||
});
|
||||
|
||||
setSelectedTasks(tasksForDate);
|
||||
}, [currentDate, tasks]);
|
||||
|
||||
useEffect(() => {
|
||||
if (editContent) reset({ ...editContent, date: editContent.date.toISOString().slice(0, 16) });
|
||||
else reset();
|
||||
}, [editContent]);
|
||||
useEffect(() => {
|
||||
localStorage.setItem("tasks", JSON.stringify(tasks));
|
||||
}, [tasks]);
|
||||
|
||||
useEffect(() => {
|
||||
if (!editContent) return;
|
||||
const newEditContent = editContent;
|
||||
if (tags.first) newEditContent.tags = [tags.first, newEditContent.tags[1]];
|
||||
if (tags.second) newEditContent.tags = [newEditContent.tags[0], tags.second];
|
||||
setEditContent(newEditContent);
|
||||
}, [tags]);
|
||||
|
||||
const tasksCount = (date: CalendarDateTemplateEvent) => {
|
||||
return tasks.filter((task) => {
|
||||
const taskDate = task.date;
|
||||
return (
|
||||
taskDate.getDate() === date.day && taskDate.getMonth() === date.month && taskDate.getFullYear() === date.year
|
||||
);
|
||||
}).length;
|
||||
};
|
||||
|
||||
const hasTasksOnDate = (date: CalendarDateTemplateEvent) => {
|
||||
return tasks.some((task) => {
|
||||
const taskDate = task.date;
|
||||
return (
|
||||
taskDate.getDate() === date.day && taskDate.getMonth() === date.month && taskDate.getFullYear() === date.year
|
||||
);
|
||||
});
|
||||
};
|
||||
|
||||
const dateTemplate = (date: CalendarDateTemplateEvent) => {
|
||||
const isHighlighted = hasTasksOnDate(date);
|
||||
const countT = tasksCount(date);
|
||||
const isSelected =
|
||||
currentDate &&
|
||||
currentDate.getDate() === date.day &&
|
||||
currentDate.getMonth() === date.month &&
|
||||
currentDate.getFullYear() === date.year;
|
||||
const isToday =
|
||||
new Date().getDate() === date.day &&
|
||||
new Date().getMonth() === date.month &&
|
||||
new Date().getFullYear() === date.year;
|
||||
return (
|
||||
<div
|
||||
className={cn(
|
||||
"relative flex h-20 w-full cursor-pointer items-start justify-start rounded-lg p-2",
|
||||
"hover:bg-[rgba(251,194,199,0.1)]",
|
||||
{
|
||||
"bg-[rgba(251,194,199,0.4)]": isSelected,
|
||||
"bg-[rgba(251,194,199,0.2)]": isToday && !isSelected,
|
||||
}
|
||||
)}
|
||||
>
|
||||
<span>{date.day}</span>
|
||||
{isHighlighted && (
|
||||
<div class="absolute top-2 right-2 flex h-fit w-2 flex-col items-center gap-1 md:h-2 md:w-fit md:flex-row">
|
||||
{Array.from({ length: countT > 3 ? 3 : countT }).map((_, i) => (
|
||||
<span key={i} className="size-2 rounded-full bg-pink-400" />
|
||||
))}
|
||||
{countT > 3 && <span className="text-xs font-bold text-pink-400 select-none">+</span>}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
const handleTaskCheck = (taskId: string) => {
|
||||
const updatedTasks = tasks.map((task) => (task.id === taskId ? { ...task, checked: !task.checked } : task));
|
||||
setTasks(updatedTasks);
|
||||
localStorage.setItem("tasks", JSON.stringify(updatedTasks));
|
||||
};
|
||||
|
||||
const formatDate = (date: Date) => {
|
||||
return new Intl.DateTimeFormat("ru-RU", {
|
||||
day: "numeric",
|
||||
month: "long",
|
||||
year: "numeric",
|
||||
}).format(date);
|
||||
};
|
||||
|
||||
const saveTask = (data: ITaskForm) => {
|
||||
if (!calendarDate) {
|
||||
setError("date", { message: "Выберите дату" });
|
||||
return;
|
||||
}
|
||||
if ((!editContent?.tags[0] || !editContent.tags[1]) && (!tags.first || !tags.second)) {
|
||||
setError("tags", { message: "Выберите теги" });
|
||||
return;
|
||||
}
|
||||
const eTask: ITask = {
|
||||
...data,
|
||||
date: calendarDate,
|
||||
tags: editContent?.tags.length ? editContent.tags : [tags.first, tags.second],
|
||||
new: true,
|
||||
};
|
||||
setTasks(tasks.map((task) => (task.id === eTask.id ? eTask : task)));
|
||||
localStorage.setItem("tasks", JSON.stringify(tasks.map((task) => (task.id === eTask.id ? eTask : task))));
|
||||
setTags({ first: "", second: "", overdue: false });
|
||||
};
|
||||
|
||||
const pt = {
|
||||
root: { className: calendarStyles.root },
|
||||
input: { root: { className: calendarStyles.input } },
|
||||
panel: { className: calendarStyles.panel },
|
||||
header: { className: calendarStyles.header },
|
||||
title: { className: calendarStyles.title },
|
||||
previousButton: { className: calendarStyles.previousButton },
|
||||
nextButton: { className: calendarStyles.nextButton },
|
||||
table: { className: calendarStyles.table },
|
||||
tableHeaderCell: { className: calendarStyles.tableHeaderCell },
|
||||
weekDay: { className: calendarStyles.weekDay },
|
||||
monthTitle: { className: calendarStyles.monthTitle },
|
||||
yearTitle: { className: calendarStyles.yearTitle },
|
||||
monthPicker: { className: calendarStyles.monthPicker },
|
||||
yearPicker: { className: calendarStyles.yearPicker },
|
||||
month: { className: calendarStyles.month },
|
||||
year: { className: calendarStyles.year },
|
||||
};
|
||||
|
||||
return (
|
||||
<div class="flex w-full flex-col items-center">
|
||||
<BigCalendar onDateSelect={onDateSelect} />
|
||||
<ModalTags
|
||||
isOpen={openModalTags}
|
||||
setIsOpen={setOpenModalTags}
|
||||
tagsList={example_tags}
|
||||
value={tags}
|
||||
onClose={() => {
|
||||
setTags({ first: "", second: "", overdue: false });
|
||||
}}
|
||||
onChange={setTags}
|
||||
/>
|
||||
<ModalCalendar
|
||||
isOpen={openModalCalendar}
|
||||
setIsOpen={setOpenModalCalendar}
|
||||
onClose={() => {
|
||||
if (isEdit && !isEditModal) setCalendarDate(null);
|
||||
}}
|
||||
onChange={(e) => isEditModal && setCalendarDate(e.value)}
|
||||
value={calendarDate!}
|
||||
/>
|
||||
<ModalWindow
|
||||
isOpen={openModal}
|
||||
setIsOpen={setIsOpen}
|
||||
onClose={() => {
|
||||
setIsEdit(false);
|
||||
setEditContent(null);
|
||||
setIsEditModal(false);
|
||||
setTags({ first: "", second: "", overdue: false });
|
||||
setCalendarDate(null);
|
||||
}}
|
||||
>
|
||||
{isEdit && editContent && (
|
||||
<form
|
||||
class="flex h-full w-full flex-col items-start justify-between"
|
||||
onSubmit={(e) => {
|
||||
e.preventDefault();
|
||||
if (isEditModal) handleSubmit(saveTask)();
|
||||
else setIsEditModal(!isEditModal);
|
||||
}}
|
||||
>
|
||||
<div class="flex w-full flex-row items-start justify-between">
|
||||
<div class="flex flex-1 flex-col gap-1 pe-2">
|
||||
<input
|
||||
class="w-full text-2xl outline-0"
|
||||
disabled={!isEditModal}
|
||||
placeholder="Название"
|
||||
{...register("name", {
|
||||
required: "Заполните название",
|
||||
maxLength: { value: 20, message: "Максимум 20 символов в названии" },
|
||||
})}
|
||||
/>
|
||||
<textarea
|
||||
class="h-[5rem] w-full resize-none outline-0"
|
||||
disabled={!isEditModal}
|
||||
placeholder={isEditModal ? "Описание" : ""}
|
||||
{...register("description", {
|
||||
maxLength: { value: 200, message: "Максимум 200 символов в описании" },
|
||||
})}
|
||||
/>
|
||||
<input
|
||||
type="datetime-local"
|
||||
value={calendarDate ? calendarDate.toISOString().slice(0, 16) : ""}
|
||||
hidden
|
||||
{...register("date")}
|
||||
/>
|
||||
<input type="checkbox" hidden {...register("checked")} />
|
||||
</div>
|
||||
<div class="flex flex-row gap-4">
|
||||
<div
|
||||
className="flex cursor-pointer flex-col items-center gap-3"
|
||||
onClick={() => {
|
||||
if (isEditModal) {
|
||||
handleSubmit(saveTask)();
|
||||
setIsEditModal(!isEditModal);
|
||||
} else setIsEditModal(!isEditModal);
|
||||
}}
|
||||
>
|
||||
{isEditModal ? (
|
||||
<>
|
||||
<InboxArrowDownIcon class="size-6" />
|
||||
<p class="text-[0.7rem]">Сохранить</p>
|
||||
</>
|
||||
) : (
|
||||
<>
|
||||
<PencilIcon class="size-6" />
|
||||
<p class="text-[0.7rem]">Редактировать</p>
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
<div
|
||||
className="flex cursor-pointer flex-col items-center gap-3"
|
||||
onClick={() => setShowDeleteDialog(true)}
|
||||
>
|
||||
<TrashIcon class="size-6" />
|
||||
<p class="text-[0.7rem]">Удалить</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{errors.name && <p class="text-red-500">{errors.name.message}</p>}
|
||||
{errors.description && <p class="text-red-500">{errors.description.message}</p>}
|
||||
{errors.date && <p class="text-red-500">{errors.date.message}</p>}
|
||||
{errors.tags && <p class="text-red-500">{errors.tags.message}</p>}
|
||||
<div class="flex flex-col items-center gap-6 self-center md:flex-row md:justify-start md:self-start">
|
||||
<div
|
||||
class={cn("flex h-full flex-row items-center gap-1 rounded-2xl bg-[rgba(251,194,199,0.38)] px-2 py-1", {
|
||||
"cursor-pointer": isEditModal,
|
||||
})}
|
||||
onClick={() => {
|
||||
if (!isEditModal) return;
|
||||
setOpenModalCalendar(true);
|
||||
setCalendarDate(editContent.date);
|
||||
}}
|
||||
>
|
||||
<CalendarDaysIcon class="size-10" />
|
||||
<p>
|
||||
{Intl.DateTimeFormat("ru-RU", {
|
||||
day: "2-digit",
|
||||
month: "2-digit",
|
||||
year: "numeric",
|
||||
hour: "2-digit",
|
||||
minute: "2-digit",
|
||||
}).format(calendarDate!)}
|
||||
</p>
|
||||
</div>
|
||||
<div
|
||||
class={cn("flex h-full flex-col items-start gap-1 rounded-2xl bg-[rgba(251,194,199,0.38)] px-4 py-2", {
|
||||
"cursor-pointer": isEditModal,
|
||||
})}
|
||||
onClick={() => {
|
||||
if (!isEditModal) return;
|
||||
setTags({ first: editContent.tags[0], second: editContent.tags[1], overdue: false });
|
||||
setOpenModalTags(true);
|
||||
}}
|
||||
>
|
||||
<p class="flex flex-row gap-2">
|
||||
<BookOpenIcon class="size-5" />
|
||||
{editContent.tags[0]}
|
||||
</p>
|
||||
<p class="flex flex-row gap-2">
|
||||
<DocumentDuplicateIcon class="size-5" />
|
||||
{editContent.tags[1]}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
)}
|
||||
</ModalWindow>
|
||||
<Dialog
|
||||
isOpen={showDeleteDialog}
|
||||
setIsOpen={setShowDeleteDialog}
|
||||
title="Удаление задачи"
|
||||
content="Вы уверены, что хотите удалить эту задачу?"
|
||||
onConfirm={handleDeleteTask}
|
||||
confirmText="Удалить"
|
||||
cancelText="Отмена"
|
||||
/>
|
||||
<Calendar
|
||||
value={currentDate}
|
||||
onChange={(e) => setCurrentDate(e ? e.value! : new Date())}
|
||||
inline
|
||||
pt={pt}
|
||||
dateTemplate={dateTemplate}
|
||||
className="[&_.p-datepicker]:!border-0 [&_.p-datepicker-calendar]:border-separate [&_.p-datepicker-calendar]:border-spacing-2 [&_td]:rounded-lg [&_td]:border [&_td]:border-[rgba(251,194,199,0.38)]"
|
||||
/>
|
||||
|
||||
<div class="mt-8 w-full px-4">
|
||||
<h2 class="mb-4 text-2xl font-semibold">Задачи на {formatDate(currentDate)}</h2>
|
||||
{selectedTasks.length > 0 ? (
|
||||
<div class="flex flex-col gap-4">
|
||||
{selectedTasks.map((task) => (
|
||||
<Task
|
||||
key={task.id}
|
||||
name={task.name}
|
||||
checked={task.checked}
|
||||
onClick={() => {
|
||||
setIsOpen(true);
|
||||
setIsEdit(true);
|
||||
setEditContent(task);
|
||||
setCalendarDate(task.date);
|
||||
}}
|
||||
onMarkClick={() => handleTaskCheck(task.id)}
|
||||
/>
|
||||
))}
|
||||
</div>
|
||||
) : (
|
||||
<div class="rounded-lg bg-[rgba(251,194,199,0.2)] p-4 text-center">На этот день задач нет</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
@@ -2,48 +2,102 @@ import Button from "@/components/ui/Button";
|
||||
import { withTitle } from "@/constructors/Component";
|
||||
import { UrlsTitle } from "@/enums/urls";
|
||||
import { useAppContext } from "@/providers/AuthProvider";
|
||||
import apiClient from "@/services/api";
|
||||
import { cn } from "@/utils/class-merge";
|
||||
import { ArrowRightStartOnRectangleIcon, Cog8ToothIcon } from "@heroicons/react/24/outline";
|
||||
import { FunctionComponent } from "preact";
|
||||
import { useLocation } from "preact-iso";
|
||||
import { useEffect, useState } from "preact/hooks";
|
||||
import classes from "./profile_settings.module.scss";
|
||||
|
||||
interface UserProfile {
|
||||
username: string;
|
||||
email: string;
|
||||
status: string;
|
||||
avatar_url: string | null;
|
||||
telegram_notifications: boolean;
|
||||
telegram_chat_id: string;
|
||||
}
|
||||
|
||||
interface UserSettings {
|
||||
profile: UserProfile;
|
||||
}
|
||||
|
||||
const ProfileSettings: FunctionComponent = () => {
|
||||
const { isLoggedIn } = useAppContext();
|
||||
const { route } = useLocation();
|
||||
const status = 12;
|
||||
const [userData, setUserData] = useState<UserProfile>({
|
||||
username: "",
|
||||
email: "",
|
||||
status: "",
|
||||
avatar_url: null,
|
||||
telegram_notifications: false,
|
||||
telegram_chat_id: "",
|
||||
});
|
||||
const maxStatus = 100;
|
||||
|
||||
useEffect(() => {
|
||||
const fetchUserData = async () => {
|
||||
try {
|
||||
const response = await apiClient<UserSettings>("/api/settings/view_settings/", { method: "GET" }, isLoggedIn);
|
||||
setUserData(response.profile);
|
||||
} catch (error) {
|
||||
console.error("Failed to fetch user data:", error);
|
||||
}
|
||||
};
|
||||
|
||||
if (isLoggedIn.value) {
|
||||
fetchUserData();
|
||||
}
|
||||
}, [isLoggedIn.value]);
|
||||
|
||||
const handleLogout = async () => {
|
||||
try {
|
||||
await apiClient("/api/settings/logout/", { method: "POST", needsCsrf: true }, isLoggedIn);
|
||||
isLoggedIn.value = false;
|
||||
localStorage.removeItem("loggedIn");
|
||||
localStorage.removeItem("user");
|
||||
route("/login", true);
|
||||
} catch (error) {
|
||||
console.error("Logout failed:", error);
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<div class={classes.container}>
|
||||
<div class="flex w-full flex-col items-center rounded-[4rem] bg-[linear-gradient(180.00deg,rgb(251,194,199),rgba(206,232,251,0.72)_100%)] px-7 py-5 shadow-[0px_4px_4px_0px_rgba(0,0,0,0.25)] md:flex-row">
|
||||
<div id={classes.avatar}>Аватар</div>
|
||||
<div id={classes.avatar}>
|
||||
{userData.avatar_url ? (
|
||||
<img src={userData.avatar_url} alt="User avatar" class="h-full w-full rounded-full object-cover" />
|
||||
) : (
|
||||
"Аватар"
|
||||
)}
|
||||
</div>
|
||||
<div class={classes.header_block__name}>
|
||||
<p class="text-4xl font-semibold">Никнейм</p>
|
||||
<p class="text-2xl font-light">Статус</p>
|
||||
<p class="text-4xl font-semibold">{userData.username}</p>
|
||||
<p class="text-2xl font-light">{userData.status}</p>
|
||||
<div class="h-1.5 w-full overflow-hidden rounded-2xl bg-white">
|
||||
<div
|
||||
class={cn("relative top-0 left-0 h-2 bg-black")}
|
||||
style={{ width: `${(status / maxStatus) * 100}%` }}
|
||||
style={{ width: `${userData.telegram_chat_id ? 100 : 0}%` }}
|
||||
></div>
|
||||
</div>
|
||||
<div class="-mt-3 self-end text-sm font-light">
|
||||
{status}/{maxStatus}
|
||||
{userData.telegram_chat_id ? "100" : "0"}/{maxStatus}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class={classes.profile_container}>
|
||||
<div class={classes.settings_block}>
|
||||
<div class={classes.settings_block__buttons}>
|
||||
<Button>Сменить тему</Button>
|
||||
<Button>Настройки</Button>
|
||||
<Button className="flex flex-row items-center justify-center gap-2">
|
||||
<Cog8ToothIcon class="size-8" /> Настройки
|
||||
</Button>
|
||||
<Button
|
||||
color="secondary"
|
||||
onClick={() => {
|
||||
isLoggedIn.value = false;
|
||||
localStorage.setItem("loggedIn", "false");
|
||||
route("/login", true);
|
||||
}}
|
||||
className="flex flex-row items-center justify-center gap-2 bg-[linear-gradient(180.00deg,rgba(246,255,211,0.7),rgba(195,229,253,0.7)_100%)]"
|
||||
onClick={handleLogout}
|
||||
>
|
||||
Выйти
|
||||
<ArrowRightStartOnRectangleIcon class="size-8" /> Выйти
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,8 +1,93 @@
|
||||
export interface ITask {
|
||||
id: number;
|
||||
id: string;
|
||||
name: string;
|
||||
checked: boolean;
|
||||
date: Date;
|
||||
description: string;
|
||||
tags: string[];
|
||||
new?: boolean;
|
||||
}
|
||||
|
||||
export interface ITaskForm extends Omit<ITask, "date"> {
|
||||
date: string;
|
||||
}
|
||||
|
||||
export interface IApiTask {
|
||||
id: number;
|
||||
title: string;
|
||||
description: string;
|
||||
isCompleted: boolean;
|
||||
due_date: string;
|
||||
subject: string;
|
||||
task_type: string;
|
||||
}
|
||||
|
||||
export interface IApiDay {
|
||||
date: string;
|
||||
name: string;
|
||||
tasks: IApiTask[];
|
||||
}
|
||||
|
||||
export interface IApiResponse {
|
||||
profile: string;
|
||||
days: IApiDay[];
|
||||
subject_choices: Record<string, string>;
|
||||
task_type_choices: Record<string, string>;
|
||||
}
|
||||
|
||||
export interface ICreateTaskResponse {
|
||||
success: boolean;
|
||||
message: string;
|
||||
profile: string;
|
||||
task: {
|
||||
id: number;
|
||||
title: string;
|
||||
description: string;
|
||||
subject: string;
|
||||
taskType: string;
|
||||
dateTime_due: string;
|
||||
isCompleted: boolean;
|
||||
reminder?: {
|
||||
remind_before_days: number;
|
||||
repeat_interval: number;
|
||||
reminder_time: string;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
export interface ITaskDetails {
|
||||
profile: string;
|
||||
title: string;
|
||||
description: string;
|
||||
subject: string;
|
||||
taskType: string;
|
||||
dateTime_due: string;
|
||||
remind_before_days: number;
|
||||
repeat_reminder: number;
|
||||
reminder_time: string;
|
||||
}
|
||||
|
||||
export interface IDeleteTaskResponse {
|
||||
success: boolean;
|
||||
message: string;
|
||||
}
|
||||
|
||||
export interface IEditTaskResponse {
|
||||
success: boolean;
|
||||
message: string;
|
||||
profile: string;
|
||||
task: {
|
||||
id: number;
|
||||
title: string;
|
||||
description: string;
|
||||
subject: string;
|
||||
taskType: string;
|
||||
dateTime_due: string;
|
||||
isCompleted: boolean;
|
||||
reminder?: {
|
||||
remind_before_days: number;
|
||||
repeat_interval: number;
|
||||
reminder_time: string;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
}
|
||||
|
||||
.header {
|
||||
@apply mb-3 w-full text-3xl font-semibold md:mb-12 md:text-5xl;
|
||||
@apply mb-3 flex w-full flex-row items-center justify-between text-xl font-semibold sm:text-3xl md:mb-12 md:text-5xl;
|
||||
}
|
||||
|
||||
.tasks_container {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,20 +1,75 @@
|
||||
import { stringToBoolean } from "@/utils/converter";
|
||||
import apiClient from "@/services/api";
|
||||
import { signal, Signal } from "@preact/signals";
|
||||
import { createContext, JSX } from "preact";
|
||||
import { useContext } from "preact/hooks";
|
||||
import { useContext, useEffect } from "preact/hooks";
|
||||
|
||||
interface UserData {
|
||||
id: number;
|
||||
username: string;
|
||||
email: string;
|
||||
}
|
||||
|
||||
interface AuthStatusResponse {
|
||||
isAuthenticated: boolean;
|
||||
user?: UserData;
|
||||
}
|
||||
|
||||
interface AppContextValue {
|
||||
isLoggedIn: Signal<boolean>;
|
||||
isCheckingAuth: Signal<boolean>;
|
||||
currentUser: Signal<UserData | null>;
|
||||
checkAuth: () => Promise<void>;
|
||||
}
|
||||
const ininitialValue = stringToBoolean(localStorage.getItem("loggedIn"));
|
||||
|
||||
const AppContext = createContext<AppContextValue>({
|
||||
isLoggedIn: signal(ininitialValue),
|
||||
});
|
||||
const initialLoggedIn = localStorage.getItem("loggedIn") === "true";
|
||||
|
||||
const AppContext = createContext<AppContextValue | null>(null);
|
||||
|
||||
const AppProvider = ({ children }: { children: JSX.Element }) => {
|
||||
const isLoggedIn = signal(initialLoggedIn);
|
||||
const isCheckingAuth = signal(true);
|
||||
const currentUser = signal<UserData | null>(null);
|
||||
|
||||
const checkAuth = async () => {
|
||||
console.log("Checking auth status...");
|
||||
isCheckingAuth.value = true;
|
||||
try {
|
||||
const response = await apiClient<AuthStatusResponse>("/api/auth/status/", {
|
||||
method: "GET",
|
||||
needsCsrf: false,
|
||||
});
|
||||
|
||||
if (response.isAuthenticated && response.user) {
|
||||
console.log("User is authenticated:", response.user.username);
|
||||
isLoggedIn.value = true;
|
||||
currentUser.value = response.user;
|
||||
localStorage.setItem("loggedIn", "true");
|
||||
} else {
|
||||
console.log("User is not authenticated.");
|
||||
isLoggedIn.value = false;
|
||||
currentUser.value = null;
|
||||
localStorage.removeItem("loggedIn");
|
||||
}
|
||||
} catch (error: any) {
|
||||
console.error("Auth check failed:", error.message);
|
||||
isLoggedIn.value = false;
|
||||
currentUser.value = null;
|
||||
localStorage.removeItem("loggedIn");
|
||||
} finally {
|
||||
isCheckingAuth.value = false;
|
||||
console.log("Auth check finished. isLoggedIn:", isLoggedIn.value);
|
||||
}
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
checkAuth();
|
||||
}, []);
|
||||
|
||||
const value: AppContextValue = {
|
||||
isLoggedIn: signal(ininitialValue),
|
||||
isLoggedIn,
|
||||
isCheckingAuth,
|
||||
currentUser,
|
||||
checkAuth,
|
||||
};
|
||||
|
||||
return <AppContext.Provider value={value}>{children}</AppContext.Provider>;
|
||||
@@ -29,3 +84,4 @@ const useAppContext = () => {
|
||||
};
|
||||
|
||||
export { AppProvider, useAppContext };
|
||||
export type { UserData };
|
||||
|
||||
99
src/services/api.ts
Normal file
99
src/services/api.ts
Normal file
@@ -0,0 +1,99 @@
|
||||
import { Signal } from "@preact/signals";
|
||||
|
||||
function getCookie(name: string): string | null {
|
||||
let cookieValue = null;
|
||||
if (document.cookie && document.cookie !== "") {
|
||||
const cookies = document.cookie.split(";");
|
||||
for (let i = 0; i < cookies.length; i++) {
|
||||
const cookie = cookies[i].trim();
|
||||
if (cookie.substring(0, name.length + 1) === name + "=") {
|
||||
cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
return cookieValue;
|
||||
}
|
||||
|
||||
const API_BASE_URL = import.meta.env.VITE_API_BASE_URL || "http://localhost:8000";
|
||||
|
||||
interface RequestOptions extends RequestInit {
|
||||
needsCsrf?: boolean;
|
||||
isFormData?: boolean;
|
||||
}
|
||||
|
||||
async function apiClient<T>(
|
||||
endpoint: string,
|
||||
options: RequestOptions = {},
|
||||
isLoggedInSignal?: Signal<boolean>
|
||||
): Promise<T> {
|
||||
const url = `${API_BASE_URL}${endpoint}`;
|
||||
const { needsCsrf = true, isFormData = false, ...fetchOptions } = options;
|
||||
|
||||
const headers: HeadersInit = {
|
||||
...(isFormData ? {} : { "Content-Type": "application/json" }),
|
||||
Accept: "application/json",
|
||||
...fetchOptions.headers,
|
||||
};
|
||||
|
||||
const method = options.method?.toUpperCase() || "GET";
|
||||
if (needsCsrf && ["POST", "PUT", "PATCH", "DELETE"].includes(method)) {
|
||||
const csrfToken = getCookie("csrftoken");
|
||||
if (csrfToken) {
|
||||
(headers as Record<string, string>)["X-CSRFToken"] = csrfToken;
|
||||
} else {
|
||||
console.warn("CSRF token not found in cookies.");
|
||||
await fetchCsrfToken(); // Implement this function if needed
|
||||
const newCsrfToken = getCookie("csrftoken");
|
||||
if (newCsrfToken) {
|
||||
(headers as Record<string, string>)["X-CSRFToken"] = newCsrfToken;
|
||||
} else {
|
||||
throw new Error("CSRF token is missing");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const config: RequestInit = {
|
||||
...fetchOptions,
|
||||
headers,
|
||||
credentials: "include",
|
||||
};
|
||||
|
||||
try {
|
||||
const response = await fetch(url, config);
|
||||
|
||||
if (response.status === 401 || response.status === 403) {
|
||||
console.error("Authentication error:", response.status);
|
||||
if (isLoggedInSignal) {
|
||||
isLoggedInSignal.value = false;
|
||||
localStorage.setItem("loggedIn", "false");
|
||||
}
|
||||
throw new Error(`Authentication failed: ${response.status}`);
|
||||
}
|
||||
|
||||
if (!response.ok) {
|
||||
const errorData = await response.json().catch(() => ({}));
|
||||
console.error("API Error:", response.status, errorData);
|
||||
throw new Error(`HTTP error ${response.status}: ${JSON.stringify(errorData) || response.statusText}`);
|
||||
}
|
||||
|
||||
if (response.status === 204) {
|
||||
return {} as T;
|
||||
}
|
||||
|
||||
return (await response.json()) as T;
|
||||
} catch (error) {
|
||||
console.error("API Client Fetch Error:", error);
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
|
||||
async function fetchCsrfToken() {
|
||||
try {
|
||||
await apiClient("/api/get-csrf/", { method: "GET", needsCsrf: false });
|
||||
} catch (error) {
|
||||
console.error("Failed to fetch CSRF token:", error);
|
||||
}
|
||||
}
|
||||
|
||||
export default apiClient;
|
||||
26
src/utils/status-system.ts
Normal file
26
src/utils/status-system.ts
Normal file
@@ -0,0 +1,26 @@
|
||||
export interface StatusLevel {
|
||||
name: string;
|
||||
minPoints: number;
|
||||
}
|
||||
|
||||
export const STATUS_LEVELS: StatusLevel[] = [
|
||||
{ name: "Завтра точно начну", minPoints: 0 },
|
||||
{ name: "Всё по плану (плана нет)", minPoints: 25 },
|
||||
{ name: "Гений прокрастинации (но всё сделал)", minPoints: 50 },
|
||||
{ name: "Хвостоуничтожитель 3000", minPoints: 75 },
|
||||
{ name: "Легенда планирования", minPoints: 90 }
|
||||
];
|
||||
|
||||
const POINTS_PER_TASK = 5;
|
||||
|
||||
export const calculatePoints = (completedTasks: number): number => {
|
||||
return Math.min(completedTasks * POINTS_PER_TASK, 100);
|
||||
};
|
||||
|
||||
export const getCurrentStatus = (points: number): string => {
|
||||
const status = STATUS_LEVELS
|
||||
.slice()
|
||||
.reverse()
|
||||
.find(level => points >= level.minPoints);
|
||||
return status?.name || STATUS_LEVELS[0].name;
|
||||
};
|
||||
Reference in New Issue
Block a user