diff --git a/public/assets/images/Logo_ND.png b/public/assets/images/Logo_ND.png index 2f966b9..e8f9b2c 100644 Binary files a/public/assets/images/Logo_ND.png and b/public/assets/images/Logo_ND.png differ diff --git a/src/App.js b/src/App.js index d435c4e..632b692 100644 --- a/src/App.js +++ b/src/App.js @@ -10,6 +10,7 @@ import { alertActions } from "./_actions"; import { history } from "./_helpers"; import { useDispatch, useSelector } from "react-redux"; import { AccountAuthentication } from "./_containers/RegisterPage/components/AccountAuthentication/AccountAuthentication"; +import ChooseOrg from "./_containers/RegisterPage/components/ChooseOrg"; function App() { const dispatch = useDispatch(); @@ -39,6 +40,11 @@ function App() {
+ - + diff --git a/src/_components/Auth/InputSelectSearch/index.scss b/src/_components/Auth/InputSelectSearch/index.scss index fe8939a..d70b2cb 100644 --- a/src/_components/Auth/InputSelectSearch/index.scss +++ b/src/_components/Auth/InputSelectSearch/index.scss @@ -86,6 +86,7 @@ $border-color: #4a4848; @include screen_mobile { font-size: 0.9rem !important; + margin-top: 1%; } } } diff --git a/src/_components/Auth/InputText/index.scss b/src/_components/Auth/InputText/index.scss index e360809..ab89c6d 100644 --- a/src/_components/Auth/InputText/index.scss +++ b/src/_components/Auth/InputText/index.scss @@ -98,6 +98,7 @@ $border-color: #4a4848; @include screen_mobile { font-size: 0.9rem !important; + margin-top: 1%; } } } diff --git a/src/_components/GlobalStyles/GlobalStyles.scss b/src/_components/GlobalStyles/GlobalStyles.scss index 3651785..1d1b3c3 100644 --- a/src/_components/GlobalStyles/GlobalStyles.scss +++ b/src/_components/GlobalStyles/GlobalStyles.scss @@ -1601,7 +1601,7 @@ img { .btn-action-popup { max-width: 200px; - width: 155px !important; + // width: 155px !important; } .btn-action-popup-smaller { diff --git a/src/_components/Header/HeaderLogoRegister/HeaderLogoRegister.js b/src/_components/Header/HeaderLogoRegister/HeaderLogoRegister.js index a548cd3..d3ed2fa 100644 --- a/src/_components/Header/HeaderLogoRegister/HeaderLogoRegister.js +++ b/src/_components/Header/HeaderLogoRegister/HeaderLogoRegister.js @@ -3,10 +3,10 @@ import { Link } from "react-router-dom"; import { useSelector } from "react-redux"; import './headerTS.style.scss' -function HeaderLogoRegister({srcImg, name, color}) { +function HeaderLogoRegister({srcImg, name, color, path}) { return (
- + {"Logo"} {!!registerInfo && - (orgLevel === 'namdinh' ? - - : - )} + + } {statusRegister.type !== "success" ? ( <>
{ message={"Xác thực tài khoản thành công!"} onClickNo={() => history.goBack()} labelNo='Quay lại' - labelYes={"Đăng nhập"} + labelYes={"Đi tới đăng nhập"} onClickYes={() => window.location.replace('https://sundayenglish.com/login')} /> } diff --git a/src/_containers/RegisterPage/components/AccountType/index.js b/src/_containers/RegisterPage/components/AccountType/index.js index 26aaa3f..ff552c8 100644 --- a/src/_containers/RegisterPage/components/AccountType/index.js +++ b/src/_containers/RegisterPage/components/AccountType/index.js @@ -61,7 +61,7 @@ const AccountType = (props) => {

ĐĂNG KÝ TÀI KHOẢN

- {`3. Học khối`} + {`3. Chọn trường`}

{/* {!props?.org &&
diff --git a/src/_containers/RegisterPage/components/AddressStudying/index.jsx b/src/_containers/RegisterPage/components/AddressStudying/index.jsx index 9f117eb..06aea70 100644 --- a/src/_containers/RegisterPage/components/AddressStudying/index.jsx +++ b/src/_containers/RegisterPage/components/AddressStudying/index.jsx @@ -19,7 +19,7 @@ export default function AddressStudying(props) { const [provinceList, setProvinceList] = useState([]); const [province, setProvince] = useState({ title: "", - value: props?.registerInfo?.province_alias || "nam_dinh_", + value: props?.registerInfo?.province_alias || "", }); const [districtList, setDistrictList] = useState([]); const [district, setDistrict] = useState({ @@ -33,6 +33,7 @@ export default function AddressStudying(props) { const [organization, setOrganization] = useState({ title: '', value: '', + id: '' }); const getProvinceList = () => { @@ -126,15 +127,15 @@ export default function AddressStudying(props) { props.setData({ province: province.value, district: district.value, - school: school.value, - school_id: school.id, + school: organization.title, + school_id: organization.id, organization: organization.value }) } useEffect(() => { if(!props?.registerInfo) { - history.push('/namdinh') + history.push('/') return; } if(province.value) { @@ -169,7 +170,7 @@ export default function AddressStudying(props) {

ĐĂNG KÝ TÀI KHOẢN

-

1. Nơi học tập

+

1. Nơi công tác

{ + const [organizationList, setOrganizationList] = useState(Object.values(registerValue)) + const [orgHover, setOrgHover] = useState(null) + + return { + organizationList, + orgHover, + setOrgHover + } +} \ No newline at end of file diff --git a/src/_containers/RegisterPage/components/ChooseOrg/ChooseOrg.style.scss b/src/_containers/RegisterPage/components/ChooseOrg/ChooseOrg.style.scss new file mode 100644 index 0000000..2b5dd60 --- /dev/null +++ b/src/_containers/RegisterPage/components/ChooseOrg/ChooseOrg.style.scss @@ -0,0 +1,98 @@ +@import "/src/_styles/mixin"; + +// .bg-register { +// max-height: 100vh; +// overflow-y: hidden; + +// @include screen_mobile { +// overflow: unset; +// max-height: unset; +// } +// } + +.choose-org-container { + width: 100%; + display: block; + padding: 5% 15% 0; + + @include screen_mobile { + padding: 10% 0; + } +} + +.choose-org-heading { + text-align: center; + font-size: 2rem; + font-weight: 600; + text-transform: uppercase; + + @include screen_mobile { + font-size: 1.6rem; + } +} + +.org-list-container { + margin-top: 94px; + display: flex; + justify-content: center; + overflow-y: auto; + + @include screen_mobile { + padding: 0 16px; + margin-top: 26px; + overflow-y: unset; + } + + @media screen and (max-height: 800px) { + margin-top: 40px; + } +} + +.org-list { + max-height: 64vh; + display: flex; + flex-wrap: wrap; + gap: 50px; + justify-content: center; + + @include screen_mobile { + max-height: unset; + gap: 32px; + } +} + +.org-item { + display: flex; + flex-direction: column; + gap: 8px; + cursor: pointer; +} + +.org-item-img { + display: flex; + justify-content: center; + + img { + width: 100px; + height: 100px; + border-radius: 50%; + object-fit: contain; + + @include screen_mobile { + width: 80px; + height: 80px; + } + } +} + +.org-item-name { + p { + font-size: 18px; + font-weight: 600; + text-align: center; + + @include screen_mobile { + font-size: 14px; + } + } +} \ No newline at end of file diff --git a/src/_containers/RegisterPage/components/ChooseOrg/index.jsx b/src/_containers/RegisterPage/components/ChooseOrg/index.jsx new file mode 100644 index 0000000..bb42270 --- /dev/null +++ b/src/_containers/RegisterPage/components/ChooseOrg/index.jsx @@ -0,0 +1,34 @@ +import { history } from '../../../../_helpers' +import { ChooseOrgLogic } from './ChooseOrg.logic' +import './ChooseOrg.style.scss' + +export default function ChooseOrg() { + const {organizationList, orgHover,setOrgHover,} = ChooseOrgLogic() + return ( +
+
+

Chọn tổ chức của bạn

+
+
+ {organizationList.map(item => ( +
setOrgHover(item)} + onMouseLeave={() => setOrgHover(null)} + onClick={() => history.push(`/${item.path}`)} + > +
+ {item.path} +
+
+

{item.organization}

+
+
+ ))} +
+
+
+
+ ) +} \ No newline at end of file