= ({
"[&:focus-visible+*]:outline-liquid-brightmain",
)}
disabled={disabled}
- onClick={() => {}}
+ onClick={() => {onClick()}}
/>
{/* Граница при выделении через tab */}
diff --git a/src/components/button/SecondaryButton.tsx b/src/components/button/SecondaryButton.tsx
index d9d9ad3..244809f 100644
--- a/src/components/button/SecondaryButton.tsx
+++ b/src/components/button/SecondaryButton.tsx
@@ -21,7 +21,6 @@ export const SecondaryButton: React.FC = ({
disabled && "pointer-events-none",
className
)}
- onClick={() => onClick()}
>
{/* Основной контейнер, */}
= ({
"[&:focus-visible+*]:outline-liquid-brightmain",
)}
disabled={disabled}
- onClick={() => {}}
+ onClick={() => {onClick()}}
/>
{/* Граница при выделении через tab */}
diff --git a/src/components/checkbox/Checkbox.tsx b/src/components/checkbox/Checkbox.tsx
index 05632d6..0153384 100644
--- a/src/components/checkbox/Checkbox.tsx
+++ b/src/components/checkbox/Checkbox.tsx
@@ -105,7 +105,7 @@ export const Checkbox: React.FC = ({
>
("");
+
// После успешного логина
useEffect(() => {
dispatch(setMenuActivePage("account"))
@@ -27,6 +31,8 @@ const Login = () => {
}, [jwt]);
const handleLogin = () => {
+ setErr(err == "" ? "Неверная почта и/или пароль" : "");
+ console.log(123);
setSubmitClicked(true);
if (!username || !password) return;
@@ -39,67 +45,60 @@ const Login = () => {
};
return (
-
void;
+ defaultState?: string;
}
-export const Input: React.FC = ({
- size = "sm",
- // radius = "md",
+export const Input: React.FC = ({
type = "text",
- id = "",
+ error = "",
disabled = false,
required = false,
- // color = "default",
label = "",
- labelType = "in",
placeholder = "",
- variant = "bordered",
- className,
+ className = "",
onChange,
defaultState = "",
}) => {
const [value, setValue] = React.useState(defaultState);
+ const [visible, setVIsible] = React.useState(type != "password");
React.useEffect(() => onChange(value), [value]);
- if (labelType == "in" || labelType == "in-fixed")
- return (
-
- );
+
+ );
- return <>;
};
diff --git a/src/views/home/auth/Login.tsx b/src/views/home/auth/Login.tsx
index c73b7b3..b1803be 100644
--- a/src/views/home/auth/Login.tsx
+++ b/src/views/home/auth/Login.tsx
@@ -2,11 +2,12 @@ import { useState, useEffect } from "react";
import { PrimaryButton } from "../../../components/button/PrimaryButton";
import { Input } from "../../../components/input/Input";
import { useAppDispatch, useAppSelector } from "../../../redux/hooks";
-import { useNavigate } from "react-router-dom";
+import { Link, useNavigate } from "react-router-dom";
import { loginUser } from "../../../redux/slices/auth";
import { cn } from "../../../lib/cn";
import { setMenuActivePage } from "../../../redux/slices/store";
import { Balloon } from "../../../assets/icons/auth";
+import { SecondaryButton } from "../../../components/button/SecondaryButton";
const Login = () => {
const dispatch = useAppDispatch();
@@ -18,6 +19,9 @@ const Login = () => {
const { status, error, jwt } = useAppSelector((state) => state.auth);
+
+ const [err, setErr] = useState
+ {error}
+
+
+
-
-
+
+
+
-
-
- Вход в аккаунт
-
-
- Для начала работы войдите в аккаунт. Заполните поля ниже и нажмите "Войти".
-
-
-
-
- Поле не может быть пустым
+
+
+
diff --git a/src/views/home/auth/Register.tsx b/src/views/home/auth/Register.tsx
index fb5c38e..fe9bdac 100644
--- a/src/views/home/auth/Register.tsx
+++ b/src/views/home/auth/Register.tsx
@@ -3,10 +3,14 @@ import { PrimaryButton } from "../../../components/button/PrimaryButton";
import { Input } from "../../../components/input/Input";
import { useAppDispatch, useAppSelector } from "../../../redux/hooks";
import { useNavigate } from "react-router-dom";
-import { registerUser } from "../../../redux/slices/auth"; // 👈 новый экшен
+import { registerUser } from "../../../redux/slices/auth";
import { cn } from "../../../lib/cn";
import { setMenuActivePage } from "../../../redux/slices/store";
import { Balloon } from "../../../assets/icons/auth";
+import { Link } from "react-router-dom";
+import { SecondaryButton } from "../../../components/button/SecondaryButton";
+import { Checkbox } from "../../../components/checkbox/Checkbox";
+
const Register = () => {
const dispatch = useAppDispatch();
@@ -42,114 +46,72 @@ const Register = () => {
};
return (
-
+ С возвращением
- setUsername(val)}
- />
-
-
- Поле не может быть пустым
+
-
+ Вход в аккаунт
- setPassword(val)}
- />
-
- {status === "failed" && error && (
- {error}
- )}
+
+ { }} placeholder="example@gmail.com" error={err}/>
+ { }} placeholder="abCD1234" />
+
+
+
+ Забыли пароль?
+
+
+
+
+
+
+ Нет аккаунта?
+ Регистрация
+
+
+
+
-
-
+
+
+
-
-
- Регистрация
-
-
- Создайте учетную запись, заполнив поля ниже и нажав "Зарегистрироваться".
+
+
);
+
-
+ Добро пожаловать
+
+
+ Регистрация
+
- {/* Username */}
-
- Поле не может быть пустым
-
- setUsername(val)}
- />
- {/* Email */}
-
- Поле не может быть пустым
-
- setEmail(val)}
- />
+ { }} placeholder="example@gmail.com" />
+ { }} placeholder="login" />
+ { }} placeholder="abCD1234" />
+ { }} placeholder="abCD1234" />
- {/* Password */}
-
- Поле не может быть пустым
-
- setPassword(val)}
- />
+
+ { console.log(value) }}
+ className="p-0 w-fit m-[2.75px]"
+ size="md"
+ color="secondary"
+ variant="default" />
+
+ Я принимаю
+ политику конфиденциальности
+
+
- {/* Confirm Password */}
-
-
- {submitClicked && password !== confirmPassword
- ? "Пароли не совпадают"
- : "Поле не может быть пустым"}
-
- setConfirmPassword(val)}
- />
-
- {/* Ошибка с сервера */}
- {status === "failed" && error && (
- {error}
- )}
+
{ }}
+ text={status === "loading" ? "Регистрация..." : "Регистрация"}
disabled={status === "loading"}
/>
- { }}
+ text="Регистрация с Google "
/>
+
+
+
+
+
+ Уже есть аккаунт?
+ Авторизация
+
+
+
+