From 92599b1b77bd3bce55ca493361d99b8549e543b5 Mon Sep 17 00:00:00 2001 From: Anirudh Singh Date: Mon, 12 Oct 2020 21:12:32 -0400 Subject: [PATCH 01/15] Created menu items, added image from Figma for now --- public/logo.jpg | Bin 0 -> 18667 bytes src/components/NavBar.tsx | 139 ++++++++++++++++++++++++++++++++++---- 2 files changed, 126 insertions(+), 13 deletions(-) create mode 100644 public/logo.jpg diff --git a/public/logo.jpg b/public/logo.jpg new file mode 100644 index 0000000000000000000000000000000000000000..0caf1a2da90576da028400d0e638e8b791da8088 GIT binary patch literal 18667 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 { +const NavBar: React.FC = (props) => { const history = useHistory(); const location = useLocation(); const path: string = location.pathname; @@ -21,18 +23,30 @@ const NavBar: React.FC = () => { } } + const userMenu = ( + + Change Primary Account Email + Account Details + Change Password + Deactivate Account + + ); + const logoPath = '/logo.jpg'; + return ( -
- + Lucy's Love Bus Event Registration + { history.push('/'); }} + style={{marginLeft: 80}} > Home @@ -41,19 +55,118 @@ const NavBar: React.FC = () => { onClick={() => { history.push('/block-template'); }} + style={{marginLeft: 80}} > - Block Template + Upcoming Events { - history.push('/grid-template'); - }} - > - Grid Template + key="3" + onClick={() => { + history.push('/grid-template'); + }} + style={{marginLeft: 80}} + > + My Events + John Smith} + style={{float: "right", paddingTop: "inherit"}} + > + {userMenu} + -
+ // + // + // {"LLB + // + // { + // history.push('/'); + // }} + // > + // Home + // + // { + // history.push('/block-template'); + // }} + // > + // Upcoming Events + // + // { + // history.push('/grid-template'); + // }} + // > + // My Events + // + // John Smith} + + // > + // {userMenu} + // + // + //
+ // + + // { + // history.push('/'); + // }} + // style={{padding: 10}} + // > + // + // + + // {/* + //

Hello
Hello

+ // */} + + + // { + // history.push('/'); + // }} + // > + // Home + // + + // { + // history.push('/block-template'); + // }} + // > + // Upcoming Events + // + + // { + // history.push('/grid-template'); + // }} + // > + // My Events + // + // {/* + + // */} + + // + //
); }; From a829ab7efb21ddccbb149612c010dd958d871e5c Mon Sep 17 00:00:00 2001 From: Anirudh Singh Date: Wed, 21 Oct 2020 19:38:42 -0400 Subject: [PATCH 02/15] Redo of navbar using grid instead of menu --- src/components/navbar/NavBar.tsx | 132 ++++++++++++++++++++++++++++++ src/components/navbar/Navbar.less | 30 +++++++ 2 files changed, 162 insertions(+) create mode 100644 src/components/navbar/NavBar.tsx create mode 100644 src/components/navbar/Navbar.less diff --git a/src/components/navbar/NavBar.tsx b/src/components/navbar/NavBar.tsx new file mode 100644 index 0000000..73f6f03 --- /dev/null +++ b/src/components/navbar/NavBar.tsx @@ -0,0 +1,132 @@ +import React from 'react'; +import { useHistory, useLocation } from 'react-router-dom'; +import { Menu, Dropdown, Image, Typography, Row, Col, Button } from 'antd'; +import { DownOutlined, UserOutlined } from '@ant-design/icons'; +import { Link } from 'react-router-dom'; +import './Navbar.less' + +const { Text } = Typography; + + +const NavBar: React.FC = (props) => { + const history = useHistory(); + const location = useLocation(); + const path: string = location.pathname; + + function pathnameToKey(pathname: string) { + switch (pathname) { + case '/': + return '1'; + case '/block-template': + return '2'; + case '/grid-template': + return '3'; + case '/change-primary-email': + return '4'; + case '/account-details': + return '5'; + case '/change-password': + return '6'; + case '/deactivate-account': + return '7'; + default: + return '1'; + } + } + + const userMenu = ( + + Change Primary Account Email + Account Details + Change Password + Deactivate Account + + ); + + return ( + + + + {"LLB + + + + + Lucy's Love Bus + +
+ + Event Registration + + + + + + + + {/* + + + + */} + +
+ + +
+ + + + ); +}; + +export default NavBar; diff --git a/src/components/navbar/Navbar.less b/src/components/navbar/Navbar.less new file mode 100644 index 0000000..6da9908 --- /dev/null +++ b/src/components/navbar/Navbar.less @@ -0,0 +1,30 @@ +.ant-row { + background-color: white; + padding: 1em 0; +} + +.ant-btn-link { + color: black; + margin-left: 7em; +} + +// This is the font specified in Figma, but I'm not sure if we want to stick with IBM +// .ant-typography { +// font-family: 'Roboto'; +// } + +.userDropdown, .loginAndSignupBtns { + float: right; + margin-right: 3em; +} + +// need to do padding of buttons here but its not working as cleanly +// .loginBtn, .signUpBtn { } + +.signUpBtn { + color: white; + background-color: #505050; + border-color: #505050; + margin-left: 1em; +} + From 3d8b74365d4c044670ddee4a70a18698b61c67c0 Mon Sep 17 00:00:00 2001 From: Anirudh Singh Date: Mon, 26 Oct 2020 21:06:03 -0400 Subject: [PATCH 03/15] added conditional rendering of auth, removed extra code --- package.json | 1 + src/App.tsx | 2 +- src/components/navbar/Navbar.less | 12 ++++++++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 55be0c8..b7539a8 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,7 @@ "version": "0.1.0", "private": true, "dependencies": { + "@ant-design/icons": "^4.2.2", "@craco/craco": "^5.7.0", "@reduxjs/toolkit": "^1.4.0", "@testing-library/jest-dom": "^4.2.4", diff --git a/src/App.tsx b/src/App.tsx index 5347c8b..2173bb0 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -10,7 +10,7 @@ import BlockTemplate from './containers/template-1-col-block/Template'; import GridTemplate from './containers/template-24-col-grid/Template'; import NotFound from './containers/not-found/NotFound'; -import NavBar from './components/NavBar'; +import NavBar from './components/navbar/NavBar'; import Footer from './components/Footer'; import { Layout } from 'antd'; const { Content } = Layout; diff --git a/src/components/navbar/Navbar.less b/src/components/navbar/Navbar.less index 6da9908..de1a25d 100644 --- a/src/components/navbar/Navbar.less +++ b/src/components/navbar/Navbar.less @@ -8,10 +8,14 @@ margin-left: 7em; } -// This is the font specified in Figma, but I'm not sure if we want to stick with IBM -// .ant-typography { -// font-family: 'Roboto'; -// } +.llbLogo { + float: right; + +} + +.llbText { + font-size: 24px; +} .userDropdown, .loginAndSignupBtns { float: right; From 3488cf7712a8df3cbacd9098c8ca975aa49dc69a Mon Sep 17 00:00:00 2001 From: Anirudh Singh Date: Mon, 26 Oct 2020 21:10:14 -0400 Subject: [PATCH 04/15] remove unwanted code --- src/components/navbar/NavBar.tsx | 117 ++++++++++++------------------ src/components/navbar/Navbar.less | 4 - 2 files changed, 47 insertions(+), 74 deletions(-) diff --git a/src/components/navbar/NavBar.tsx b/src/components/navbar/NavBar.tsx index 73f6f03..b4024b2 100644 --- a/src/components/navbar/NavBar.tsx +++ b/src/components/navbar/NavBar.tsx @@ -1,5 +1,5 @@ -import React from 'react'; -import { useHistory, useLocation } from 'react-router-dom'; +import React, { useState } from 'react'; +import { useHistory } from 'react-router-dom'; import { Menu, Dropdown, Image, Typography, Row, Col, Button } from 'antd'; import { DownOutlined, UserOutlined } from '@ant-design/icons'; import { Link } from 'react-router-dom'; @@ -7,39 +7,16 @@ import './Navbar.less' const { Text } = Typography; - -const NavBar: React.FC = (props) => { +const NavBar: React.FC = () => { const history = useHistory(); - const location = useLocation(); - const path: string = location.pathname; - - function pathnameToKey(pathname: string) { - switch (pathname) { - case '/': - return '1'; - case '/block-template': - return '2'; - case '/grid-template': - return '3'; - case '/change-primary-email': - return '4'; - case '/account-details': - return '5'; - case '/change-password': - return '6'; - case '/deactivate-account': - return '7'; - default: - return '1'; - } - } + const [authenticated, setAuthenticated] = useState(true); const userMenu = ( - Change Primary Account Email - Account Details - Change Password - Deactivate Account + Change Primary Account Email + Account Details + Change Password + Deactivate Account ); @@ -48,28 +25,23 @@ const NavBar: React.FC = (props) => { {"LLB + - + Lucy's Love Bus
- + Event Registration + - {/* - - - - */} - -
- - -
- +
+ {authenticated ? + + + + + + : +
+ + +
+ + } +
+ ); }; diff --git a/src/components/navbar/Navbar.less b/src/components/navbar/Navbar.less index de1a25d..e405aaf 100644 --- a/src/components/navbar/Navbar.less +++ b/src/components/navbar/Navbar.less @@ -10,7 +10,6 @@ .llbLogo { float: right; - } .llbText { @@ -22,9 +21,6 @@ margin-right: 3em; } -// need to do padding of buttons here but its not working as cleanly -// .loginBtn, .signUpBtn { } - .signUpBtn { color: white; background-color: #505050; From c43ab5c2c83c0c03947b83cd77ba7f36470cd553 Mon Sep 17 00:00:00 2001 From: Anirudh Singh Date: Mon, 26 Oct 2020 21:16:52 -0400 Subject: [PATCH 05/15] remove logo.jpg since we're pulling from aws --- public/logo.jpg | Bin 18667 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 public/logo.jpg diff --git a/public/logo.jpg b/public/logo.jpg deleted file mode 100644 index 0caf1a2da90576da028400d0e638e8b791da8088..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18667 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 Date: Mon, 26 Oct 2020 21:30:38 -0400 Subject: [PATCH 06/15] fix some linting errors --- src/components/navbar/NavBar.tsx | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/components/navbar/NavBar.tsx b/src/components/navbar/NavBar.tsx index b4024b2..92fc67d 100644 --- a/src/components/navbar/NavBar.tsx +++ b/src/components/navbar/NavBar.tsx @@ -9,7 +9,7 @@ const { Text } = Typography; const NavBar: React.FC = () => { const history = useHistory(); - const [authenticated, setAuthenticated] = useState(true); + const [authenticated, setAuthenticated] = useState(false); const userMenu = ( @@ -24,10 +24,10 @@ const NavBar: React.FC = () => { - {"LLB @@ -36,14 +36,14 @@ const NavBar: React.FC = () => { Lucy's Love Bus -
+
Event Registration - - - - : + :
- - - - + + + Block Template + + + Grid Template +
- {authenticated ? + {authenticated ? ( - + - : -
- - -
+ + + Signup + + - } + )}
- - + ); }; diff --git a/src/components/navbar/Navbar.less b/src/components/navbar/Navbar.less deleted file mode 100644 index 617ba88..0000000 --- a/src/components/navbar/Navbar.less +++ /dev/null @@ -1,30 +0,0 @@ -.ant-row { - background-color: white; - padding: 1em 0; -} - -.ant-btn-link { - color: black; - margin-left: 7em; -} - -.llbLogo { - float: right; -} - -.llbText { - font-size: 24px; -} - -.userDropdown, .loginAndSignupBtns { - float: right; - margin-right: 3em; -} - -.signUpBtn { - color: white; - background-color: #2D870D; - border-color: #505050; - margin-left: 1em; -} - diff --git a/src/containers/home/Home.tsx b/src/containers/home/Home.tsx index c0fea04..a5fa87c 100644 --- a/src/containers/home/Home.tsx +++ b/src/containers/home/Home.tsx @@ -1,13 +1,14 @@ import React from 'react'; import { Helmet } from 'react-helmet'; -import './home.less'; +import {ContentContainer} from '../../components' import { Button, Checkbox, Form, Input, Typography } from 'antd'; import { login } from '../../auth/authAPI'; + const { Title } = Typography; const Home: React.FC = () => { const onFinish = (values: any) => { - login({ email: values.username, password: values.password }) + login({ email: values.username, password: values.password }); }; return ( @@ -16,7 +17,7 @@ const Home: React.FC = () => { Title goes here -
+ {/* Place relevant components in here */} @@ -55,7 +56,7 @@ const Home: React.FC = () => { -
+ ); }; diff --git a/src/containers/not-found/NotFound.tsx b/src/containers/not-found/NotFound.tsx index 47b169f..d306232 100644 --- a/src/containers/not-found/NotFound.tsx +++ b/src/containers/not-found/NotFound.tsx @@ -25,8 +25,10 @@ const Template: React.FC = () => { */} Oops! We can't find the page you're looking for. - - Take me back home! + + + Take me back home! +
diff --git a/src/containers/template-1-col-block/Template.tsx b/src/containers/template-1-col-block/Template.tsx index 8779427..8c3bd85 100644 --- a/src/containers/template-1-col-block/Template.tsx +++ b/src/containers/template-1-col-block/Template.tsx @@ -1,9 +1,8 @@ import React from 'react'; import { Helmet } from 'react-helmet'; -import './template.less'; import { Typography } from 'antd'; import { Link } from 'react-router-dom'; - +import { ContentContainer } from '../../components'; const { Title, Text, Paragraph } = Typography; /* @@ -20,7 +19,7 @@ const Template: React.FC = () => { Title goes here -
+ {/* Place relevant components in here */} @@ -65,7 +64,7 @@ const Template: React.FC = () => { Also remember that you should link like this to make use of React Router! -
+ ); }; diff --git a/src/containers/template-1-col-block/template.less b/src/containers/template-1-col-block/template.less deleted file mode 100644 index c01db0d..0000000 --- a/src/containers/template-1-col-block/template.less +++ /dev/null @@ -1,6 +0,0 @@ -.content-container { - display: block; - padding: 24px; - max-width: 960px; - margin: auto; -} diff --git a/src/containers/template-24-col-grid/Template.tsx b/src/containers/template-24-col-grid/Template.tsx index a57504d..a9093d3 100644 --- a/src/containers/template-24-col-grid/Template.tsx +++ b/src/containers/template-24-col-grid/Template.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { Helmet } from 'react-helmet'; -import './template.less'; import { Row, Col, Typography } from 'antd'; +import styled from 'styled-components'; const { Title, Paragraph } = Typography; /* Template for future page components. @@ -10,6 +10,16 @@ AntD Components: https://ant.design/components/overview/ */ +const GridContentContainer = styled.div` + padding: 24px; +`; + +const ExampleCol = styled(Col)` + border: 1px #1890ff solid; + height: 50px; + text-align: center; +`; + const Template: React.FC = () => { return ( <> @@ -18,7 +28,7 @@ const Template: React.FC = () => { -
+ And this is a 24 column grid template! @@ -62,46 +72,26 @@ const Template: React.FC = () => { -
+
- - col - + col - - - col-12 - - - col-12 - + + col-12 + col-12 - - - col-8 - - - col-8 - - - col-8 - + + col-8 + col-8 + col-8 - - - col-6 - - - col-6 - - - col-6 - - - col-6 - + + col-6 + col-6 + col-6 + col-6
diff --git a/src/containers/template-24-col-grid/template.less b/src/containers/template-24-col-grid/template.less deleted file mode 100644 index 8184f99..0000000 --- a/src/containers/template-24-col-grid/template.less +++ /dev/null @@ -1,11 +0,0 @@ -@import '~antd/dist/antd.less'; // Import Ant Design styles by less entry - -.grid-content-container { - padding: 24px; -} - -.example-col { - border: 1px @primary-color solid; - height: 50px; - text-align: center; -} diff --git a/src/index.css b/src/index.css deleted file mode 100644 index ec2585e..0000000 --- a/src/index.css +++ /dev/null @@ -1,13 +0,0 @@ -body { - margin: 0; - font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', - 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', - sans-serif; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} - -code { - font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New', - monospace; -} diff --git a/src/index.tsx b/src/index.tsx index 2b56b11..7b3b0e7 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -1,6 +1,5 @@ import React from 'react'; import ReactDOM from 'react-dom'; -import './index.css'; import App from './App'; import * as serviceWorker from './serviceWorker'; From 55cb3002d790fcf8bb040cef3a09fe6ca9422417 Mon Sep 17 00:00:00 2001 From: Ryan Jung Date: Sun, 15 Nov 2020 13:47:37 -0500 Subject: [PATCH 11/15] travis --- src/App.tsx | 2 +- src/colors.tsx | 4 ++-- src/components/navbar/NavBar.tsx | 22 +++++++--------------- src/containers/home/Home.tsx | 2 +- src/containers/not-found/NotFound.tsx | 4 +--- 5 files changed, 12 insertions(+), 22 deletions(-) diff --git a/src/App.tsx b/src/App.tsx index 75339b6..8cba136 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -20,7 +20,7 @@ const { Content } = Layout; const AppInnerContainer = styled.div` min-height: 100vh; -` +`; const App: React.FC = () => { return ( diff --git a/src/colors.tsx b/src/colors.tsx index 27ed5cf..a4c9c6d 100644 --- a/src/colors.tsx +++ b/src/colors.tsx @@ -1,2 +1,2 @@ -export const PRIMARY = "#1da57a" -export const LINK = "#1890ff" \ No newline at end of file +export const PRIMARY = '#1da57a'; +export const LINK = '#1890ff'; diff --git a/src/components/navbar/NavBar.tsx b/src/components/navbar/NavBar.tsx index bbdda0c..7ca78da 100644 --- a/src/components/navbar/NavBar.tsx +++ b/src/components/navbar/NavBar.tsx @@ -60,25 +60,17 @@ const NavBar: React.FC = () => { - - - Frontend Scaffold -
- Subtitle goes here + + Frontend Scaffold +
+ Subtitle goes here - - - Home - - - Block Template - - - Grid Template - + Home + Block Template + Grid Template
diff --git a/src/containers/home/Home.tsx b/src/containers/home/Home.tsx index 39896f3..bac1bdb 100644 --- a/src/containers/home/Home.tsx +++ b/src/containers/home/Home.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { Helmet } from 'react-helmet'; -import {ContentContainer} from '../../components' +import { ContentContainer } from '../../components'; import { Button, Form, Input, Typography } from 'antd'; import { login } from '../../auth/authAPI'; diff --git a/src/containers/not-found/NotFound.tsx b/src/containers/not-found/NotFound.tsx index 5c385cc..1a09cf6 100644 --- a/src/containers/not-found/NotFound.tsx +++ b/src/containers/not-found/NotFound.tsx @@ -25,9 +25,7 @@ const Template: React.FC = () => { Oops! We can't find the page you're looking for. - - Take me back home! - + Take me back home!
From 7a72544ab1d941d7f9ae1127e7bf7d7d368a4f14 Mon Sep 17 00:00:00 2001 From: Ryan Jung Date: Sun, 15 Nov 2020 13:54:07 -0500 Subject: [PATCH 12/15] traviss --- src/components/navbar/NavBar.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/navbar/NavBar.tsx b/src/components/navbar/NavBar.tsx index 7ca78da..fd5f3dc 100644 --- a/src/components/navbar/NavBar.tsx +++ b/src/components/navbar/NavBar.tsx @@ -1,6 +1,6 @@ import React, { useState } from 'react'; import { LinkButton } from '../../components'; -import { Menu, Dropdown, Image, Typography, Row, Col, Button } from 'antd'; +import { Menu, Dropdown, Typography, Row, Col, Button } from 'antd'; import { DownOutlined, UserOutlined } from '@ant-design/icons'; import { Link } from 'react-router-dom'; import styled from 'styled-components'; @@ -35,7 +35,7 @@ const SignupButton = styled(Button)` `; const NavBar: React.FC = () => { - const [authenticated, setAuthenticated] = useState(false); + const [authenticated] = useState(false); const userMenu = ( From 56f958212adc8afe704eb6b3e62d0d1d0439ba40 Mon Sep 17 00:00:00 2001 From: Ryan Jung Date: Sun, 15 Nov 2020 19:09:54 -0500 Subject: [PATCH 13/15] removed logo, moved linkbutton --- antd.customize.less | 5 +++-- package-lock.json | 20 ++++++++++---------- package.json | 2 +- src/App.tsx | 1 - src/components/LinkButton.tsx | 24 ++++++++++++++++++++++++ src/components/index.tsx | 24 ------------------------ src/components/navbar/NavBar.tsx | 29 ++--------------------------- 7 files changed, 40 insertions(+), 65 deletions(-) create mode 100644 src/components/LinkButton.tsx diff --git a/antd.customize.less b/antd.customize.less index 5c4429b..43f80e9 100644 --- a/antd.customize.less +++ b/antd.customize.less @@ -1,3 +1,4 @@ -@link-color: #1890ff; +@antd-blue: #1890ff; +@link-color: @antd-blue; @primary-color: #1da57a; -@font-family: 'IBM Plex Sans', sans-serif; \ No newline at end of file +@font-family: 'IBM Plex Sans', sans-serif; diff --git a/package-lock.json b/package-lock.json index 6a43e0d..0eea159 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4631,16 +4631,6 @@ "parse-json": "^4.0.0" } }, - "craco-antd": { - "version": "1.19.0", - "resolved": "https://registry.npmjs.org/craco-antd/-/craco-antd-1.19.0.tgz", - "integrity": "sha512-MpbF2LQxb/POiR003oOkuAhHwpyRx1w5opyg7SA4/2og/FMRR/2oca/eqKYQ7vre2dOpt64gkQ5xWETktHWCQQ==", - "requires": { - "babel-plugin-import": "^1.13.1", - "craco-less": "1.17.0", - "less-vars-to-js": "^1.3.0" - } - }, "coveralls": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/coveralls/-/coveralls-3.1.0.tgz", @@ -4654,6 +4644,16 @@ "request": "^2.88.2" } }, + "craco-antd": { + "version": "1.19.0", + "resolved": "https://registry.npmjs.org/craco-antd/-/craco-antd-1.19.0.tgz", + "integrity": "sha512-MpbF2LQxb/POiR003oOkuAhHwpyRx1w5opyg7SA4/2og/FMRR/2oca/eqKYQ7vre2dOpt64gkQ5xWETktHWCQQ==", + "requires": { + "babel-plugin-import": "^1.13.1", + "craco-less": "1.17.0", + "less-vars-to-js": "^1.3.0" + } + }, "craco-less": { "version": "1.17.0", "resolved": "https://registry.npmjs.org/craco-less/-/craco-less-1.17.0.tgz", diff --git a/package.json b/package.json index 6003c45..3691a26 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "typescript": "^3.7.5" }, "scripts": { - "start": "nodemon -w craco.config.js -w ./antd.customize.less --exec \"craco start\"", + "start": "nodemon -w craco.config.js -w ./antd.customize.less --exec \"craco start\"", "build": "craco build", "test": "craco test --coverage", "coveralls": "cat ./coverage/lcov.info | coveralls", diff --git a/src/App.tsx b/src/App.tsx index 8cba136..3d4f667 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -2,7 +2,6 @@ import React from 'react'; import { BrowserRouter as Router, Route, Switch } from 'react-router-dom'; import { Helmet } from 'react-helmet'; -// Import antd stylesheets import './App.less'; import Home from './containers/home/Home'; import Signup from './containers/signup/Signup'; diff --git a/src/components/LinkButton.tsx b/src/components/LinkButton.tsx new file mode 100644 index 0000000..4f72e57 --- /dev/null +++ b/src/components/LinkButton.tsx @@ -0,0 +1,24 @@ +import React from 'react'; +import { withRouter } from 'react-router'; +import { Button } from 'antd'; + +export const LinkButton = withRouter((props: any) => { + const { + history, + location, + match, + staticContext, + to, + onClick, + ...rest + } = props; + return ( +