Compare commits

...

2 Commits

Author SHA1 Message Date
minh 2a5a6acdcb create 1 year ago
minh 0d63c651cc set 1 year ago
  1. 2
      src/App.js
  2. 27
      src/_actions/users.js
  3. 2
      src/_containers/HomePage/HomePage.style.scss
  4. 18
      src/_containers/HomePage/index.js
  5. 10
      src/_containers/LoginPage/components/Login.js

@ -49,7 +49,7 @@ function App() {
path="/" path="/"
exact={true} exact={true}
component={HomePage} component={HomePage}
authentication={{isLogin: true}} authentication={authentication}
/> />
<Redirect from="*" to="/" /> <Redirect from="*" to="/" />
</Switch> </Switch>

@ -38,39 +38,14 @@ function login(data, type = "", typeWeb) {
let method = "POST"; let method = "POST";
return apiCaller(url_call_api, method, data, null, false).then( return apiCaller(url_call_api, method, data, null, false).then(
async (data) => { async (data) => {
let user = data?.data_user; let user = data;
user.isLogin = true; user.isLogin = true;
user.jwt_token = data.jwt_token;
user.is_new_acc = data.is_new_acc;
user.loginType = type;
const dataUser = new FormData();
dataUser.append("user_id", data?.data_user?.id);
dataUser.append("jwt_token", data?.jwt_token);
dataUser.append("signature", "1");
dispatch({ dispatch({
type: userConstants.LOGIN, type: userConstants.LOGIN,
user, user,
}); });
localStorage.setItem("authentication", JSON.stringify(user)); localStorage.setItem("authentication", JSON.stringify(user));
localStorage.setItem("access_token", JSON.stringify(data.access_token)); localStorage.setItem("access_token", JSON.stringify(data.access_token));
if (
data?.data_user?.last_login == null &&
data?.data_user?.role == userConstants.ROLE_STUDENT
) {
dispatch({ type: userConstants.ON_ROOTLESSNESS });
dispatch({ type: userConstants.SHOW_SIDEBAR_ROOTLESSNESS });
}
dispatch(teacherActions.getProfileV2(user.id));
let keyId = "device_id_" + data.id;
const cachedDeviceId = localStorage.getItem(keyId);
if (isNull(cachedDeviceId)) {
localStorage.setItem(keyId, device_id);
localStorage.setItem("device_id_commond", device_id);
} else {
localStorage.setItem("device_id_commond", cachedDeviceId);
}
history.push("/"); history.push("/");
}, },
(error) => { (error) => {

@ -21,7 +21,6 @@
padding: 24px; padding: 24px;
width: 50%; width: 50%;
display: flex; display: flex;
flex-direction: column;
@include screen_mobile { @include screen_mobile {
width: 100%; width: 100%;
@ -70,6 +69,7 @@
} }
.box-link { .box-link {
flex-direction: column;
.title-box-link { .title-box-link {
font-size: 24px; font-size: 24px;
font-weight: 700; font-weight: 700;

@ -2,6 +2,8 @@ import { useState } from "react";
import HeaderMain from "../../_components/Header/HeaderMain"; import HeaderMain from "../../_components/Header/HeaderMain";
import './HomePage.style.scss' import './HomePage.style.scss'
import { homeType } from "../../_constants/home_type"; import { homeType } from "../../_constants/home_type";
import { useSelector } from "react-redux";
import moment from "moment"
export default function HomePage() { export default function HomePage() {
const [typeCopy, setTypeCopy] = useState('') const [typeCopy, setTypeCopy] = useState('')
@ -9,7 +11,7 @@ export default function HomePage() {
[homeType.LANDING]: false, [homeType.LANDING]: false,
[homeType.REGISTER]: false, [homeType.REGISTER]: false,
}) })
const authentication = useSelector((state) => state.authentication);
const handleCopy = (type, value) => { const handleCopy = (type, value) => {
navigator.clipboard.writeText(value) navigator.clipboard.writeText(value)
@ -82,23 +84,23 @@ export default function HomePage() {
<div className="box-info-agency box-info"> <div className="box-info-agency box-info">
<div className="avatar-agency"> <div className="avatar-agency">
<img <img
src="https://letsenhance.io/static/73136da51c245e80edc6ccfe44888a99/1015f/MainBefore.jpg" src="https://www.svgrepo.com/show/384674/account-avatar-profile-user-11.svg"
alt="Logo Sun-E" alt="Logo Sun-E"
/> />
</div> </div>
<div className="main-info-agency"> <div className="main-info-agency">
<p className="name-agency"> <p className="name-agency">
Tên đại {authentication.fullname}
</p> </p>
<div className="sub-info-agency"> <div className="sub-info-agency">
{renderInfoAgencyItem('05/02/2000')} {renderInfoAgencyItem(moment(authentication.birthday).format("DD/MM/YYYY"))}
{renderInfoAgencyItem('0397225122')} {renderInfoAgencyItem(authentication.phone)}
{renderInfoAgencyItem('hoangmt@gmail.com')} {renderInfoAgencyItem(authentication.email)}
</div> </div>
</div> </div>
</div> </div>
{renderBoxLink('Link Đăng ký tuyến dưới', 'https://docs.google.com', homeType.REGISTER)} {renderBoxLink('Link Đăng ký tuyến dưới', authentication.downline_register, homeType.REGISTER)}
{renderBoxLink('Link Landing page cho khách hàng', 'https://docs.google.com/document/d/1hYRL9Su-zTbNXXFGb8AC8-u1NWtCIi4tZKTsRrrqSOg/edit', homeType.LANDING)} {renderBoxLink('Link Landing page cho khách hàng', authentication.promotional_link, homeType.LANDING)}
</div> </div>
</div> </div>
</div> </div>

@ -243,7 +243,7 @@ function Login(props) {
setValue={changeEmail} setValue={changeEmail}
type="text" type="text"
name="email" name="email"
placeholder="Nhập username" placeholder="Nhập email / số điện thoại"
required={true} required={true}
renderLabelIcon={renderEmailIcon} renderLabelIcon={renderEmailIcon}
errorText={emailError} errorText={emailError}
@ -284,9 +284,6 @@ function Login(props) {
Nhớ mật khẩu Nhớ mật khẩu
</label> </label>
</div> */} </div> */}
<div className="flex-1 text-center">
<Link to="/forgot-password">Quên mật khẩu?</Link>
</div>
</div> </div>
<div className="button_submit"> <div className="button_submit">
<button <button
@ -493,11 +490,6 @@ function Login(props) {
</div> </div>
</form> </form>
</div> </div>
<div className="register_text text-center">
<p>
<Link to="/register">Đăng tài khoản</Link>
</p>
</div>
</div> </div>
); );
} }

Loading…
Cancel
Save