MinsoftK

Update

......@@ -5,11 +5,11 @@
"requires": true,
"dependencies": {
"@ant-design/colors": {
"version": "3.2.2",
"resolved": "https://registry.npmjs.org/@ant-design/colors/-/colors-3.2.2.tgz",
"integrity": "sha512-YKgNbG2dlzqMhA9NtI3/pbY16m3Yl/EeWBRa+lB1X1YaYxHrxNexiQYCLTWO/uDvAjLFMEDU+zR901waBtMtjQ==",
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/@ant-design/colors/-/colors-5.0.1.tgz",
"integrity": "sha512-x1TUaRILaqy3zgFNo+kIqOa3eTYPt81H1/3E4dCjDP4Qvk/xaPEizLDFdRUcIx0cWwyu2LklwfyLHWpbYK8v6A==",
"requires": {
"tinycolor2": "^1.4.1"
"@ctrl/tinycolor": "^3.3.1"
}
},
"@ant-design/css-animation": {
......@@ -18,16 +18,26 @@
"integrity": "sha512-LrX0OGZtW+W6iLnTAqnTaoIsRelYeuLZWsrmBJFUXDALQphPsN8cE5DCsmoSlL0QYb94BQxINiuS70Ar/8BNgA=="
},
"@ant-design/icons": {
"version": "4.2.1",
"resolved": "https://registry.npmjs.org/@ant-design/icons/-/icons-4.2.1.tgz",
"integrity": "sha512-245ZI40MOr5GGws+sNSiJIRRoEf/J2xvPSMgwRYf3bv8mVGQZ6XTQI/OMeV16KtiSZ3D+mBKXVYSBz2fhigOXQ==",
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/@ant-design/icons/-/icons-4.3.0.tgz",
"integrity": "sha512-UoIbw4oz/L/msbkgqs2nls2KP7XNKScOxVR54wRrWwnXOzJaGNwwSdYjHQz+5ETf8C53YPpzMOnRX99LFCdeIQ==",
"requires": {
"@ant-design/colors": "^3.1.0",
"@ant-design/colors": "^5.0.0",
"@ant-design/icons-svg": "^4.0.0",
"@babel/runtime": "^7.10.1",
"@babel/runtime": "^7.11.2",
"classnames": "^2.2.6",
"insert-css": "^2.0.0",
"rc-util": "^5.0.1"
},
"dependencies": {
"@babel/runtime": {
"version": "7.12.5",
"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz",
"integrity": "sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==",
"requires": {
"regenerator-runtime": "^0.13.4"
}
}
}
},
"@ant-design/icons-svg": {
......@@ -1172,6 +1182,11 @@
"resolved": "https://registry.npmjs.org/@csstools/normalize.css/-/normalize.css-10.1.0.tgz",
"integrity": "sha512-ij4wRiunFfaJxjB0BdrYHIH8FxBJpOwNPhhAcunlmPdXudL1WQV1qoP9un6JsEBAgQH+7UXyyjh0g7jTxXK6tg=="
},
"@ctrl/tinycolor": {
"version": "3.3.1",
"resolved": "https://registry.npmjs.org/@ctrl/tinycolor/-/tinycolor-3.3.1.tgz",
"integrity": "sha512-jUJrjU62MUgHDSu5JfONfgRM2V7GfN5KknsygfIbxwRZXGeayIzxk4O9GiYgEAr9DG5HJThTF5+a5x3wtrOKzQ=="
},
"@emotion/is-prop-valid": {
"version": "0.8.8",
"resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz",
......@@ -14006,11 +14021,6 @@
"resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz",
"integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA=="
},
"tinycolor2": {
"version": "1.4.1",
"resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.1.tgz",
"integrity": "sha1-9PrTM0R7wLB9TcjpIJ2POaisd+g="
},
"tmp": {
"version": "0.0.33",
"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
......
......@@ -3,7 +3,7 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"@ant-design/icons": "^4.2.1",
"@ant-design/icons": "^4.3.0",
"@testing-library/jest-dom": "^4.2.4",
"@testing-library/react": "^9.3.2",
"@testing-library/user-event": "^7.1.2",
......
......@@ -16,7 +16,7 @@ import {
UserOutlined,
ReadOutlined
} from '@ant-design/icons';
import mathbank from '../lib/mathbank.png';
import edit from '../lib/edit.png';
import heartgraph from '../lib/heartgraph.png';
import Html from './Html.js';
import Mathcha from './Mathcha.js';
......@@ -26,6 +26,9 @@ import {getData} from 'lib/api/html';
import { getMathData } from '../lib/api/mathCha';
import { removeItem,removeItems } from '../lib/api/tikz';
import {DingtalkOutlined } from '@ant-design/icons';
const { Header, Sider, Content } = Layout;
const { SubMenu } = Menu;
......@@ -348,12 +351,22 @@ const Home = ({history}) => {
collapsed={!collapsed}
onCollapse={onCollapse}
style={{ height: '100vh' }}>
<DingtalkOutlined
onClick={() => window.location.reload()}
style={{
color : 'white',
width: 'auto',
height: '54px',
fontsize:'80px',
cursor: 'pointer',
}} />
<img
className="mathbank"
src={mathbank}
alt="mathbank"
className="edit"
src={edit}
alt="edit"
onClick={() => window.location.reload()}
style={{
color :'white',
width: 'auto',
height: '54px',
marginLeft: '22px',
......@@ -361,6 +374,7 @@ const Home = ({history}) => {
cursor: 'pointer',
}}
/>
<Menu
theme="dark"
......@@ -388,7 +402,7 @@ const Home = ({history}) => {
<SubMenu
key="sub2"
icon={<ReadOutlined style={{ fontsize: '15px'}}/>}
title="MathCha"
title="Image Editing"
style={{
backgroundColor: 'rgb(0, 21, 41)'
}}>
......
......@@ -28,9 +28,10 @@ const Login = () => {
setAuthenticated(isAuth);
}
// if(authenticated){
if(authenticated){
// history.push('/Home');
return <Redirect to="/Home"/>
return <Redirect to="/home"/>
}else{
return <LoginForm onFinish={onFinish} >
</LoginForm>
......