diff --git a/rsconcept/frontend/public/DejaVu.woff2 b/rsconcept/frontend/public/DejaVu.woff2 deleted file mode 100644 index 97c14d5d..00000000 Binary files a/rsconcept/frontend/public/DejaVu.woff2 and /dev/null differ diff --git a/rsconcept/frontend/public/DejaVu_min.ttf b/rsconcept/frontend/public/DejaVu_min.ttf new file mode 100644 index 00000000..c1180728 Binary files /dev/null and b/rsconcept/frontend/public/DejaVu_min.ttf differ diff --git a/rsconcept/frontend/src/index.css b/rsconcept/frontend/src/index.css index fb0792c6..50ea2a98 100644 --- a/rsconcept/frontend/src/index.css +++ b/rsconcept/frontend/src/index.css @@ -82,6 +82,13 @@ @apply text-white bg-blue-400 hover:bg-blue-600 dark:bg-orange-600 dark:hover:bg-orange-400 disabled:bg-gray-400 dark:disabled:bg-gray-600 } + .clr-btn-green { + @apply text-white bg-green-400 hover:bg-green-600 dark:bg-green-600 dark:hover:bg-green-400 dark:text-black disabled:bg-gray-400 dark:disabled:bg-gray-600 + } + + .clr-btn-blue { + @apply text-white bg-blue-400 hover:bg-blue-600 dark:bg-blue-600 dark:hover:bg-blue-400 dark:text-black disabled:bg-gray-400 dark:disabled:bg-gray-600 + } .clr-btn-default { @apply text-gray-600 dark:text-zinc-200 dark:disabled:text-zinc-400 disabled:text-gray-400 bg-[#f0f2f7] hover:bg-gray-300 dark:bg-gray-600 dark:hover:bg-gray-400 } diff --git a/rsconcept/frontend/src/pages/UserProfilePage/ChangePassword.tsx b/rsconcept/frontend/src/pages/UserProfilePage/ChangePassword.tsx index 611c7c5d..7642d7fd 100644 --- a/rsconcept/frontend/src/pages/UserProfilePage/ChangePassword.tsx +++ b/rsconcept/frontend/src/pages/UserProfilePage/ChangePassword.tsx @@ -17,7 +17,7 @@ export function ChangePassword() { const navigate = useNavigate(); const colorClass = useMemo(() => { - return !!newPassword && !!newPasswordRepeat && newPassword !== newPasswordRepeat ? 'bg-red-500' : ''; + return !!newPassword && !!newPasswordRepeat && newPassword !== newPasswordRepeat ? 'bg-red-500' : 'clr-input'; }, [newPassword, newPasswordRepeat]); function handleSubmit(event: React.FormEvent) { @@ -35,39 +35,41 @@ export function ChangePassword() { } return ( -
-
- setOldPassword(event.target.value)} - /> - { - setNewPassword(event.target.value); - }} - /> - { - setNewPasswordRepeat(event.target.value); - }} - /> -
+
+ +
+ setOldPassword(event.target.value)} + /> + { + setNewPassword(event.target.value); + }} + /> + { + setNewPasswordRepeat(event.target.value); + }} + /> +
+ { error && } +
- { error && } - -
+ +
)} diff --git a/rsconcept/frontend/src/pages/UserProfilePage/UserProfile.tsx b/rsconcept/frontend/src/pages/UserProfilePage/UserProfile.tsx index 05072506..53b5d1fa 100644 --- a/rsconcept/frontend/src/pages/UserProfilePage/UserProfile.tsx +++ b/rsconcept/frontend/src/pages/UserProfilePage/UserProfile.tsx @@ -14,10 +14,6 @@ export function UserProfile() { const [email, setEmail] = useState(''); const [first_name, setFirstName] = useState(''); const [last_name, setLastName] = useState(''); - - - // const [showChangePassword, setShowChangePassword] = useState(false); - useLayoutEffect(() => { if (user) { @@ -40,34 +36,39 @@ export function UserProfile() { } return ( -

Учетные данные пользователя

-
-
-
- setUsername(event.target.value)} - /> - setFirstName(event.target.value)} - /> - setLastName(event.target.value)}/> - setEmail(event.target.value)}/> -
- -
- - -
- -
+
+
+

Учетные данные пользователя

+
+
+
+
+ setUsername(event.target.value)} + /> + setFirstName(event.target.value)} + /> + setLastName(event.target.value)}/> + setEmail(event.target.value)}/> +
+
+ +
+
+
+ +
+
)} diff --git a/rsconcept/frontend/src/utils/constants.ts b/rsconcept/frontend/src/utils/constants.ts index e14e1276..452a0ad8 100644 --- a/rsconcept/frontend/src/utils/constants.ts +++ b/rsconcept/frontend/src/utils/constants.ts @@ -24,7 +24,7 @@ export const urls = { }; export const resources = { - graph_font: '/DejaVu.ttf' + graph_font: '/DejaVu_min.ttf' } export const prefixes = {