From 2f5ae72f9edbcea0de15299b3fc9fdb8392dd672 Mon Sep 17 00:00:00 2001 From: Alex Poryadin Date: Thu, 5 Jun 2025 14:31:28 +0300 Subject: [PATCH 1/2] add submit button (enter) to login/signup forms --- frontend/src/modules/LoginForm/index.tsx | 9 +++++++-- frontend/src/modules/RegisterForm/index.tsx | 13 +++++++++---- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/frontend/src/modules/LoginForm/index.tsx b/frontend/src/modules/LoginForm/index.tsx index 9a575a07..255ba2e2 100644 --- a/frontend/src/modules/LoginForm/index.tsx +++ b/frontend/src/modules/LoginForm/index.tsx @@ -28,8 +28,13 @@ const LoginForm: FC = () => { Auth.login(login, password), ); + const handleSubmit = (event: React.FormEvent) => { + event.preventDefault(); + loginHandler(null, () => customNavigate(prevPage ?? '/')); + }; + return ( - + { sx={{ my: 1 }} variant="contained" size="large" - onClick={() => loginHandler(null, () => customNavigate(prevPage ?? '/'))} + type="submit" loading={loading} > Sign In diff --git a/frontend/src/modules/RegisterForm/index.tsx b/frontend/src/modules/RegisterForm/index.tsx index bb68951c..29ef76c5 100644 --- a/frontend/src/modules/RegisterForm/index.tsx +++ b/frontend/src/modules/RegisterForm/index.tsx @@ -29,8 +29,15 @@ const RegisterForm: FC = () => { Auth.register({ firstName, lastName, login, password }), ); + const handleSubmit = (event: React.FormEvent) => { + event.preventDefault(); + if (remPassword === password) { + registerHandler(null, () => customNavigate(prevPage ?? '/')); + } + }; + return ( - + { disabled={remPassword !== password} variant="contained" size="large" - onClick={() => - registerHandler(null, () => customNavigate(prevPage ?? '/')) - } + type="submit" loading={loading} > Sign Up From c1fddc40947eabd48ced39c677537ec43daf0b1f Mon Sep 17 00:00:00 2001 From: Alex Poryadin Date: Thu, 5 Jun 2025 14:45:10 +0300 Subject: [PATCH 2/2] fix typo --- frontend/src/modules/RegisterForm/index.tsx | 2 +- services/README.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/modules/RegisterForm/index.tsx b/frontend/src/modules/RegisterForm/index.tsx index 29ef76c5..219c4663 100644 --- a/frontend/src/modules/RegisterForm/index.tsx +++ b/frontend/src/modules/RegisterForm/index.tsx @@ -68,7 +68,7 @@ const RegisterForm: FC = () => { setRemPassword(e.target.value)} value={remPassword} /> diff --git a/services/README.md b/services/README.md index c960cfbb..78028114 100644 --- a/services/README.md +++ b/services/README.md @@ -23,9 +23,9 @@ ### Сервисы управляющие своими vpn соеденениями, имеющие общее версионируемое `vpn-api`: -1. **WireguardVpn - `wireguard-vpn-service`** - vpn-сервис на **GO**, работающий на протаколе **WireGuard**. +1. **WireguardVpn - `wireguard-vpn-service`** - vpn-сервис на **GO**, работающий на протоколе **WireGuard**. -2. **AmneziaWgVpn - `amneziawg-vpn-service`** - vpn-сервис на **GO**, работающий на протаколе **AmneziaWG** (улучшенный WireGuard). +2. **AmneziaWgVpn - `amneziawg-vpn-service`** - vpn-сервис на **GO**, работающий на протоколе **AmneziaWG** (улучшенный WireGuard). ### Таблица потдержки версий `vpn-api`: