diff --git a/public/assets/css/login.css b/public/assets/css/login.css
index 9027b99..77892d9 100644
--- a/public/assets/css/login.css
+++ b/public/assets/css/login.css
@@ -179,7 +179,7 @@ h2.title {
padding: 0 10px;
}
.login-form-container {
- padding: 100px 16px 40px;
+ padding: 0px 16px 40px;
}
.res-form-container {
padding: 100px 10px 40px;
diff --git a/public/assets/css/responsive.css b/public/assets/css/responsive.css
index 9589815..9020760 100644
--- a/public/assets/css/responsive.css
+++ b/public/assets/css/responsive.css
@@ -2713,9 +2713,9 @@
/* end region avatar rank */
- .responsive_small_screen_margin_login {
+ /* .responsive_small_screen_margin_login {
margin-top: -30px !important;
- }
+ } */
.register_account_type .account_content {
margin-bottom: 0 !important;
diff --git a/public/assets/images/avatar_female.png b/public/assets/images/avatar_female.png
new file mode 100644
index 0000000..7dc7ca5
Binary files /dev/null and b/public/assets/images/avatar_female.png differ
diff --git a/public/assets/images/avatar_male.png b/public/assets/images/avatar_male.png
new file mode 100644
index 0000000..ff26e06
Binary files /dev/null and b/public/assets/images/avatar_male.png differ
diff --git a/src/_containers/HomePage/index.js b/src/_containers/HomePage/index.js
index b852942..7deb79d 100644
--- a/src/_containers/HomePage/index.js
+++ b/src/_containers/HomePage/index.js
@@ -84,7 +84,7 @@ export default function HomePage() {
diff --git a/src/_containers/LoginPage/components/Login.scss b/src/_containers/LoginPage/components/Login.scss
index fd8293b..45b4ed5 100644
--- a/src/_containers/LoginPage/components/Login.scss
+++ b/src/_containers/LoginPage/components/Login.scss
@@ -1,3 +1,5 @@
+@import "/src/_styles/mixin";
+
$green: #00b9b7;
$bg-color: #f3ffff;
$bg-fb: #1b75bb;
@@ -15,14 +17,18 @@ $loading-color: #f8f8f8;
margin-top: 50px;
max-width: 450px;
- @media screen and (max-height: 800px) {
- margin-top: -145px;
- }
+ // @media screen and (max-height: 800px) {
+ // margin-top: -145px;
+ // }
.title {
font-size: 32px;
text-transform: uppercase;
- margin-bottom: 22px;
+ margin-bottom: 34px;
+
+ @include screen_mobile {
+ margin-bottom: 22px;
+ }
}
.password_options {
diff --git a/src/_containers/RegisterPage/CreateAccount/index.js b/src/_containers/RegisterPage/CreateAccount/index.js
index b290676..f62b7d6 100644
--- a/src/_containers/RegisterPage/CreateAccount/index.js
+++ b/src/_containers/RegisterPage/CreateAccount/index.js
@@ -11,6 +11,7 @@ import { useDispatch, useSelector } from "react-redux";
import { Alert } from "../../../_components/Alert";
import { userConstants } from "../../../_constants";
import { alertActions } from "../../../_actions";
+import { isEmail } from "../../../_helpers/validateEmail";
const CreateAccount = () => {
const params = new URL(document.location).searchParams;
@@ -63,6 +64,12 @@ const CreateAccount = () => {
}
}
+ const checkEmail = () => {
+ if (!isEmail(email)) {
+ setEmailError("Định dạng email không đúng");
+ }
+ };
+
const checkPw = () => {
if (password.length < 6 || password.trim() === "") {
setPwError("Mật khẩu cần tối thiểu 6 kí tự và không gồm toàn dấu cách");
@@ -135,9 +142,9 @@ const CreateAccount = () => {
const onBlurField = (type) => {
switch (type) {
case "email": {
- // if (email && !emailError) {
- // checkEmail();
- // }
+ if (email && !emailError) {
+ checkEmail();
+ }
return;
}
case "password": {
diff --git a/src/_containers/RegisterPage/CreateAccount/index.scss b/src/_containers/RegisterPage/CreateAccount/index.scss
index 35813dd..1e0aff3 100644
--- a/src/_containers/RegisterPage/CreateAccount/index.scss
+++ b/src/_containers/RegisterPage/CreateAccount/index.scss
@@ -71,7 +71,11 @@
.title {
font-size: 32px;
text-transform: uppercase;
- margin-bottom: 22px;
+ margin-bottom: 34px;
+
+ @include screen_mobile {
+ margin-bottom: 22px;
+ }
}
.button_submit {
@@ -130,4 +134,8 @@
padding: 2px;
border: 2px solid #00b9b7;
}
+
+ .input_date_base_container {
+ flex: 1;
+ }
}
\ No newline at end of file