From ab330c64eeed9edfc2a6ef6a6f5cd38587ba0996 Mon Sep 17 00:00:00 2001 From: l3wdfut4pwr Date: Mon, 27 Apr 2026 13:45:25 +0300 Subject: add username change and logout --- src/components/settings/AboutMe.tsx | 6 +++-- src/components/settings/AccountButton.tsx | 17 ------------- src/components/settings/LogoutButton.tsx | 31 ++++++++++++++++++++++ src/components/settings/ProfilePage.tsx | 19 ++++++++++++-- src/components/settings/SecurityPage.tsx | 4 +-- src/components/settings/changeusername.tsx | 41 ++++++++++++++++++++++++++++++ 6 files changed, 95 insertions(+), 23 deletions(-) delete mode 100644 src/components/settings/AccountButton.tsx create mode 100644 src/components/settings/LogoutButton.tsx create mode 100644 src/components/settings/changeusername.tsx (limited to 'src/components/settings') diff --git a/src/components/settings/AboutMe.tsx b/src/components/settings/AboutMe.tsx index b065a26..769885a 100644 --- a/src/components/settings/AboutMe.tsx +++ b/src/components/settings/AboutMe.tsx @@ -1,10 +1,12 @@ import { useState } from 'react'; - +import { ChangeEvent } from 'react'; +import { Input } from '@/components/ui/input'; +import { Button } from '@/components/ui/button'; export default function AboutMe() { const maxLength = 250; const [text, setText] = useState(''); - const handleChange = (e) => { + const handleChange = (e: ChangeEvent) => { const value = e.target.value; if (value.length <= maxLength) { diff --git a/src/components/settings/AccountButton.tsx b/src/components/settings/AccountButton.tsx deleted file mode 100644 index ecd0eb4..0000000 --- a/src/components/settings/AccountButton.tsx +++ /dev/null @@ -1,17 +0,0 @@ -'use client'; - -import Link from 'next/link'; -import { Button } from '@/components/ui'; -import { useUser } from '@/lib/contexts/Auth.context'; - -export default function AccountButton() { - const user = useUser(); - - if (!user) return null; - - return ( - - ); -} diff --git a/src/components/settings/LogoutButton.tsx b/src/components/settings/LogoutButton.tsx new file mode 100644 index 0000000..22cbb27 --- /dev/null +++ b/src/components/settings/LogoutButton.tsx @@ -0,0 +1,31 @@ +'use client'; + +import { Button } from '@/components/ui/button'; +import { useAuthContext } from '@/lib/contexts/Auth.context'; +import { useRouter } from 'next/navigation'; +import { useState } from 'react'; + +export default function LogoutButton() { + const { logout } = useAuthContext(); + const router = useRouter(); + const [loading, setLoading] = useState(false); + + const handleLogout = async () => { + if (loading) return; + + setLoading(true); + + try { + await logout(); + router.push('/'); + } finally { + setLoading(false); + } + }; + + return ( + + ); +} diff --git a/src/components/settings/ProfilePage.tsx b/src/components/settings/ProfilePage.tsx index cac8e7e..75370d2 100644 --- a/src/components/settings/ProfilePage.tsx +++ b/src/components/settings/ProfilePage.tsx @@ -1,16 +1,31 @@ import { InputField } from '@/components/ui/inputfield'; import { Button } from '@/components/ui'; import { Separator } from '@/components/ui'; +import { changeUsername } from './changeusername'; import { useState } from 'react'; export default function ProfilePage() { const maxLength = 250; const [about, setAbout] = useState(''); + const [username, setUsername] = useState(''); + const [usernameLoading, setUsernameLoading] = useState(false); return (

НИКНЕЙМ

- - + + setUsername(e.target.value)} + /> + +
diff --git a/src/components/settings/SecurityPage.tsx b/src/components/settings/SecurityPage.tsx index d9079df..b5f38a9 100644 --- a/src/components/settings/SecurityPage.tsx +++ b/src/components/settings/SecurityPage.tsx @@ -2,7 +2,7 @@ import { InputField } from '@/components/ui/inputfield'; import { Button } from '@/components/ui'; import { Separator } from '@/components/ui'; import { useAuthContext } from '@/lib/contexts/Auth.context'; - +import LogoutButton from './LogoutButton'; export default function SecurityPage() { const { user } = useAuthContext(); @@ -87,7 +87,7 @@ export default function SecurityPage() {
)} - +
diff --git a/src/components/settings/changeusername.tsx b/src/components/settings/changeusername.tsx new file mode 100644 index 0000000..c8527c4 --- /dev/null +++ b/src/components/settings/changeusername.tsx @@ -0,0 +1,41 @@ +const API_URL = process.env.NEXT_PUBLIC_API_URL; + +export const changeUsername = async (username: string) => { + try { + const res = await fetch(`${API_URL}/api/users/change-username`, { + method: 'PATCH', + headers: { + 'Content-Type': 'application/json', + }, + body: JSON.stringify({ username }), + credentials: 'include', + }); + + if (!res.ok) { + let errorData: any = null; + + try { + errorData = await res.json(); + } catch {} + + return { + data: null, + error: { + general: errorData?.detail || 'Ошибка изменения никнейма', + }, + }; + } + + const data = await res.json(); + + return { + data, + error: null, + }; + } catch (err: any) { + return { + data: null, + error: { general: err.message }, + }; + } +}; -- cgit v1.3-3-g829e