refactor(web): login and register reg

pull/13/head
moonrailgun 4 years ago
parent 68a937ef97
commit 0302d4d888

@ -5,6 +5,7 @@ import React, { useCallback, useState } from 'react';
import { Spinner } from '../../components/Spinner'; import { Spinner } from '../../components/Spinner';
import { string } from 'yup'; import { string } from 'yup';
import { useHistory } from 'react-router'; import { useHistory } from 'react-router';
import { setUserJWT } from '../../utils/jwt-helper';
/** /**
* TODO: * TODO:
@ -42,10 +43,11 @@ export const LoginView: React.FC = React.memo(() => {
.required('密码不能为空') .required('密码不能为空')
.validate(password); .validate(password);
await loginWithEmail(email, password); const data = await loginWithEmail(email, password);
// TODO await setUserJWT(data.token);
}, [email, password]); history.push('/main');
}, [email, password, history]);
const toRegisterView = useCallback(() => { const toRegisterView = useCallback(() => {
history.push('/entry/register'); history.push('/entry/register');

@ -4,6 +4,7 @@ import { Spinner } from '../../components/Spinner';
import { string } from 'yup'; import { string } from 'yup';
import { Icon } from '@iconify/react'; import { Icon } from '@iconify/react';
import { useHistory } from 'react-router'; import { useHistory } from 'react-router';
import { setUserJWT } from '../../utils/jwt-helper';
/** /**
* *
@ -26,8 +27,8 @@ export const RegisterView: React.FC = React.memo(() => {
const data = await registerWithEmail(email, password); const data = await registerWithEmail(email, password);
// TODO await setUserJWT(data.token);
console.log(data); history.push('/main');
}, [email, password]); }, [email, password]);
const toLoginView = useCallback(() => { const toLoginView = useCallback(() => {

@ -19,7 +19,7 @@ const NavbarNavItem: React.FC<{
export const MainRoute: React.FC = React.memo(() => { export const MainRoute: React.FC = React.memo(() => {
return ( return (
<div className="flex"> <div className="flex h-full">
<div className="w-16 bg-gray-900 flex flex-col justify-start items-center pt-4 pb-4 p-1"> <div className="w-16 bg-gray-900 flex flex-col justify-start items-center pt-4 pb-4 p-1">
{/* Navbar */} {/* Navbar */}
<div className="flex-1"> <div className="flex-1">

Loading…
Cancel
Save