2020-2-capstone-design2 / 2017110269

Go to a project
Toggle navigation Toggle navigation pinning
MinsoftK
9e2cb806 1 parent 8729f512

Update

Inline Side-by-side
Showing 12 changed files with 46 additions and 21 deletions
...@@ -5,11 +5,11 @@ ...@@ -5,11 +5,11 @@
5 "requires": true, 5 "requires": true,
6 "dependencies": { 6 "dependencies": {
7 "@ant-design/colors": { 7 "@ant-design/colors": {
8 - "version": "3.2.2", 8 + "version": "5.0.1",
9 - "resolved": "https://registry.npmjs.org/@ant-design/colors/-/colors-3.2.2.tgz", 9 + "resolved": "https://registry.npmjs.org/@ant-design/colors/-/colors-5.0.1.tgz",
10 - "integrity": "sha512-YKgNbG2dlzqMhA9NtI3/pbY16m3Yl/EeWBRa+lB1X1YaYxHrxNexiQYCLTWO/uDvAjLFMEDU+zR901waBtMtjQ==", 10 + "integrity": "sha512-x1TUaRILaqy3zgFNo+kIqOa3eTYPt81H1/3E4dCjDP4Qvk/xaPEizLDFdRUcIx0cWwyu2LklwfyLHWpbYK8v6A==",
11 "requires": { 11 "requires": {
12 - "tinycolor2": "^1.4.1" 12 + "@ctrl/tinycolor": "^3.3.1"
13 } 13 }
14 }, 14 },
15 "@ant-design/css-animation": { 15 "@ant-design/css-animation": {
...@@ -18,16 +18,26 @@ ...@@ -18,16 +18,26 @@
18 "integrity": "sha512-LrX0OGZtW+W6iLnTAqnTaoIsRelYeuLZWsrmBJFUXDALQphPsN8cE5DCsmoSlL0QYb94BQxINiuS70Ar/8BNgA==" 18 "integrity": "sha512-LrX0OGZtW+W6iLnTAqnTaoIsRelYeuLZWsrmBJFUXDALQphPsN8cE5DCsmoSlL0QYb94BQxINiuS70Ar/8BNgA=="
19 }, 19 },
20 "@ant-design/icons": { 20 "@ant-design/icons": {
21 - "version": "4.2.1", 21 + "version": "4.3.0",
22 - "resolved": "https://registry.npmjs.org/@ant-design/icons/-/icons-4.2.1.tgz", 22 + "resolved": "https://registry.npmjs.org/@ant-design/icons/-/icons-4.3.0.tgz",
23 - "integrity": "sha512-245ZI40MOr5GGws+sNSiJIRRoEf/J2xvPSMgwRYf3bv8mVGQZ6XTQI/OMeV16KtiSZ3D+mBKXVYSBz2fhigOXQ==", 23 + "integrity": "sha512-UoIbw4oz/L/msbkgqs2nls2KP7XNKScOxVR54wRrWwnXOzJaGNwwSdYjHQz+5ETf8C53YPpzMOnRX99LFCdeIQ==",
24 "requires": { 24 "requires": {
25 - "@ant-design/colors": "^3.1.0", 25 + "@ant-design/colors": "^5.0.0",
26 "@ant-design/icons-svg": "^4.0.0", 26 "@ant-design/icons-svg": "^4.0.0",
27 - "@babel/runtime": "^7.10.1", 27 + "@babel/runtime": "^7.11.2",
28 "classnames": "^2.2.6", 28 "classnames": "^2.2.6",
29 "insert-css": "^2.0.0", 29 "insert-css": "^2.0.0",
30 "rc-util": "^5.0.1" 30 "rc-util": "^5.0.1"
31 + },
32 + "dependencies": {
33 + "@babel/runtime": {
34 + "version": "7.12.5",
35 + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz",
36 + "integrity": "sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==",
37 + "requires": {
38 + "regenerator-runtime": "^0.13.4"
39 + }
40 + }
31 } 41 }
32 }, 42 },
33 "@ant-design/icons-svg": { 43 "@ant-design/icons-svg": {
...@@ -1172,6 +1182,11 @@ ...@@ -1172,6 +1182,11 @@
1172 "resolved": "https://registry.npmjs.org/@csstools/normalize.css/-/normalize.css-10.1.0.tgz", 1182 "resolved": "https://registry.npmjs.org/@csstools/normalize.css/-/normalize.css-10.1.0.tgz",
1173 "integrity": "sha512-ij4wRiunFfaJxjB0BdrYHIH8FxBJpOwNPhhAcunlmPdXudL1WQV1qoP9un6JsEBAgQH+7UXyyjh0g7jTxXK6tg==" 1183 "integrity": "sha512-ij4wRiunFfaJxjB0BdrYHIH8FxBJpOwNPhhAcunlmPdXudL1WQV1qoP9un6JsEBAgQH+7UXyyjh0g7jTxXK6tg=="
1174 }, 1184 },
1185 + "@ctrl/tinycolor": {
1186 + "version": "3.3.1",
1187 + "resolved": "https://registry.npmjs.org/@ctrl/tinycolor/-/tinycolor-3.3.1.tgz",
1188 + "integrity": "sha512-jUJrjU62MUgHDSu5JfONfgRM2V7GfN5KknsygfIbxwRZXGeayIzxk4O9GiYgEAr9DG5HJThTF5+a5x3wtrOKzQ=="
1189 + },
1175 "@emotion/is-prop-valid": { 1190 "@emotion/is-prop-valid": {
1176 "version": "0.8.8", 1191 "version": "0.8.8",
1177 "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz", 1192 "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz",
...@@ -14006,11 +14021,6 @@ ...@@ -14006,11 +14021,6 @@
14006 "resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz", 14021 "resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz",
14007 "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==" 14022 "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA=="
14008 }, 14023 },
14009 - "tinycolor2": {
14010 - "version": "1.4.1",
14011 - "resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.1.tgz",
14012 - "integrity": "sha1-9PrTM0R7wLB9TcjpIJ2POaisd+g="
14013 - },
14014 "tmp": { 14024 "tmp": {
14015 "version": "0.0.33", 14025 "version": "0.0.33",
14016 "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", 14026 "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
3 "version": "0.1.0", 3 "version": "0.1.0",
4 "private": true, 4 "private": true,
5 "dependencies": { 5 "dependencies": {
6 - "@ant-design/icons": "^4.2.1", 6 + "@ant-design/icons": "^4.3.0",
7 "@testing-library/jest-dom": "^4.2.4", 7 "@testing-library/jest-dom": "^4.2.4",
8 "@testing-library/react": "^9.3.2", 8 "@testing-library/react": "^9.3.2",
9 "@testing-library/user-event": "^7.1.2", 9 "@testing-library/user-event": "^7.1.2",
......
...@@ -16,7 +16,7 @@ import { ...@@ -16,7 +16,7 @@ import {
16 UserOutlined, 16 UserOutlined,
17 ReadOutlined 17 ReadOutlined
18 } from '@ant-design/icons'; 18 } from '@ant-design/icons';
19 -import mathbank from '../lib/mathbank.png'; 19 +import edit from '../lib/edit.png';
20 import heartgraph from '../lib/heartgraph.png'; 20 import heartgraph from '../lib/heartgraph.png';
21 import Html from './Html.js'; 21 import Html from './Html.js';
22 import Mathcha from './Mathcha.js'; 22 import Mathcha from './Mathcha.js';
...@@ -26,6 +26,9 @@ import {getData} from 'lib/api/html'; ...@@ -26,6 +26,9 @@ import {getData} from 'lib/api/html';
26 import { getMathData } from '../lib/api/mathCha'; 26 import { getMathData } from '../lib/api/mathCha';
27 import { removeItem,removeItems } from '../lib/api/tikz'; 27 import { removeItem,removeItems } from '../lib/api/tikz';
28 28
29 +import {DingtalkOutlined } from '@ant-design/icons';
30 +
31 +
29 const { Header, Sider, Content } = Layout; 32 const { Header, Sider, Content } = Layout;
30 const { SubMenu } = Menu; 33 const { SubMenu } = Menu;
31 34
...@@ -348,12 +351,22 @@ const Home = ({history}) => { ...@@ -348,12 +351,22 @@ const Home = ({history}) => {
348 collapsed={!collapsed} 351 collapsed={!collapsed}
349 onCollapse={onCollapse} 352 onCollapse={onCollapse}
350 style={{ height: '100vh' }}> 353 style={{ height: '100vh' }}>
354 + <DingtalkOutlined
355 + onClick={() => window.location.reload()}
356 + style={{
357 + color : 'white',
358 + width: 'auto',
359 + height: '54px',
360 + fontsize:'80px',
361 + cursor: 'pointer',
362 + }} />
351 <img 363 <img
352 - className="mathbank" 364 + className="edit"
353 - src={mathbank} 365 + src={edit}
354 - alt="mathbank" 366 + alt="edit"
355 onClick={() => window.location.reload()} 367 onClick={() => window.location.reload()}
356 style={{ 368 style={{
369 + color :'white',
357 width: 'auto', 370 width: 'auto',
358 height: '54px', 371 height: '54px',
359 marginLeft: '22px', 372 marginLeft: '22px',
...@@ -361,6 +374,7 @@ const Home = ({history}) => { ...@@ -361,6 +374,7 @@ const Home = ({history}) => {
361 cursor: 'pointer', 374 cursor: 'pointer',
362 }} 375 }}
363 /> 376 />
377 +
364 <Menu 378 <Menu
365 379
366 theme="dark" 380 theme="dark"
...@@ -388,7 +402,7 @@ const Home = ({history}) => { ...@@ -388,7 +402,7 @@ const Home = ({history}) => {
388 <SubMenu 402 <SubMenu
389 key="sub2" 403 key="sub2"
390 icon={<ReadOutlined style={{ fontsize: '15px'}}/>} 404 icon={<ReadOutlined style={{ fontsize: '15px'}}/>}
391 - title="MathCha" 405 + title="Image Editing"
392 style={{ 406 style={{
393 backgroundColor: 'rgb(0, 21, 41)' 407 backgroundColor: 'rgb(0, 21, 41)'
394 }}> 408 }}>
......
...@@ -28,9 +28,10 @@ const Login = () => { ...@@ -28,9 +28,10 @@ const Login = () => {
28 28
29 setAuthenticated(isAuth); 29 setAuthenticated(isAuth);
30 } 30 }
31 + // if(authenticated){
31 if(authenticated){ 32 if(authenticated){
32 // history.push('/Home'); 33 // history.push('/Home');
33 - return <Redirect to="/Home"/> 34 + return <Redirect to="/home"/>
34 }else{ 35 }else{
35 return <LoginForm onFinish={onFinish} > 36 return <LoginForm onFinish={onFinish} >
36 </LoginForm> 37 </LoginForm>
......