-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Showing
46 changed files
with
566 additions
and
780 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,16 @@ | ||
| import React, { Component } from 'react'; | ||
| import React from 'react'; | ||
| import { BrowserRouter as Router } from 'react-router-dom'; | ||
| import Routes from './components'; | ||
|
|
||
| import './tachyons.css'; | ||
| import 'antd/dist/antd.css'; | ||
|
|
||
| export default class App extends Component { | ||
| render() { | ||
| return ( | ||
| <Router> | ||
| <div className="App"> | ||
| <Routes /> | ||
| </div> | ||
| </Router> | ||
| ); | ||
| } | ||
| export default function App() { | ||
| return ( | ||
| <Router> | ||
| <div className="App"> | ||
| <Routes /> | ||
| </div> | ||
| </Router> | ||
| ); | ||
| } |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,13 @@ | ||
| import React, { Component } from 'react'; | ||
| import React from 'react'; | ||
| import logo from '../../../assets/logo.png'; | ||
|
|
||
| import { Logo, DashboardContainer, Headline } from './Dashboard.style'; | ||
|
|
||
| export default class Dashboard extends Component { | ||
| render() { | ||
| return ( | ||
| <DashboardContainer> | ||
| <Headline>Welcome Back, Admin</Headline> | ||
| <Logo src={logo} alt="East End Trades Guild" /> | ||
| </DashboardContainer> | ||
| ); | ||
| } | ||
| export default function Dashboard() { | ||
| return ( | ||
| <DashboardContainer> | ||
| <Headline>Welcome Back, Admin</Headline> | ||
| <Logo src={logo} alt="East End Trades Guild" /> | ||
| </DashboardContainer> | ||
| ); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,119 +1,71 @@ | ||
| // creates Drawer Menu | ||
| import React, { Component } from 'react'; | ||
| import { Menu, Icon } from 'antd'; | ||
| import React, { useState } from 'react'; | ||
| import { Menu, Icon, Layout } from 'antd'; | ||
| import { Link } from 'react-router-dom'; | ||
|
|
||
| // styles | ||
| import { SideMenuWrapper, StyledButton as Button } from './SideMenu.style'; | ||
|
|
||
| // menu structure | ||
| import { menuElements } from '../../../constants/adminRoutes'; | ||
|
|
||
| const { Sider } = Layout; | ||
| const { SubMenu } = Menu; | ||
|
|
||
| const rootSubmenuKeys = menuElements.reduce((accu, current) => { | ||
| if (current.items) { | ||
| accu.push(current.route); | ||
| } | ||
| return accu; | ||
| }, []); | ||
|
|
||
| export default class SideMenu extends Component { | ||
| state = { | ||
| collapsed: false, | ||
| openKeys: [], | ||
| }; | ||
|
|
||
| componentDidMount() { | ||
| const { menuSizeObserver } = this.props; | ||
| const resizeObserver = new ResizeObserver(entries => { | ||
| menuSizeObserver(entries[0].contentRect.width); | ||
| }); | ||
| resizeObserver.observe(document.querySelector('#watcher')); | ||
| } | ||
|
|
||
| toggleCollapsed = () => { | ||
| const { collapsed } = this.state; | ||
| this.setState({ | ||
| collapsed: !collapsed, | ||
| }); | ||
| }; | ||
|
|
||
| onOpenChange = openKeys => { | ||
| const latestOpenKey = openKeys.find( | ||
| key => this.state.openKeys.indexOf(key) === -1 | ||
| ); | ||
| if (rootSubmenuKeys.indexOf(latestOpenKey) === -1) { | ||
| this.setState({ openKeys }); | ||
| } else { | ||
| this.setState({ | ||
| openKeys: latestOpenKey ? [latestOpenKey] : [], | ||
| }); | ||
| } | ||
| }; | ||
|
|
||
| render() { | ||
| // should eventually be changed to props.location | ||
| const { pathname } = window.location; | ||
| const { collapsed, openKeys } = this.state; | ||
| return ( | ||
| <SideMenuWrapper> | ||
| <Button type="primary" onClick={this.toggleCollapsed}> | ||
| <Icon type={collapsed ? 'menu-unfold' : 'menu-fold'} /> | ||
| </Button> | ||
| <Menu | ||
| defaultSelectedKeys={['/']} | ||
| defaultOpenKeys={[menuElements[0].title]} | ||
| mode="inline" | ||
| theme="light" | ||
| inlineCollapsed={collapsed} | ||
| onOpenChange={this.onOpenChange} | ||
| openKeys={ | ||
| openKeys || [`/${pathname.split('/admin')[1].split('/')[1]}`] | ||
| } | ||
| > | ||
| {menuElements.map(element => | ||
| element.items ? ( | ||
| <SubMenu | ||
| style={{ textAlign: 'left' }} | ||
| key={element.route} | ||
| title={ | ||
| <span> | ||
| <Icon type={element.icon} /> | ||
| <span>{element.title}</span> | ||
| </span> | ||
| } | ||
| > | ||
| {element.items.map(item => ( | ||
| <Menu.Item | ||
| key={element.route + item.route} | ||
| style={{ textAlign: 'left' }} | ||
| > | ||
| <Link to={`/admin${element.route + item.route}`}> | ||
| {/* <Icon type={item.icon} /> */} | ||
| <span>{item.title}</span> | ||
| </Link> | ||
| </Menu.Item> | ||
| ))} | ||
| </SubMenu> | ||
| ) : ( | ||
| <Menu.Item key={element.route} style={{ textAlign: 'left' }}> | ||
| <Link to={`/admin${element.route}`}> | ||
| export default function SideMenu() { | ||
| const [collapsed, setCollapsed] = useState(false); | ||
| return ( | ||
| <Sider | ||
| collapsible | ||
| collapsed={collapsed} | ||
| onCollapse={value => { | ||
| setCollapsed(value); | ||
| }} | ||
| theme="light" | ||
| > | ||
| <div className="logo" /> | ||
| <Menu | ||
| defaultSelectedKeys={['/']} | ||
| defaultOpenKeys={[menuElements[0].title]} | ||
| mode="inline" | ||
| theme="light" | ||
| > | ||
| {menuElements.map(element => | ||
| element.items ? ( | ||
| <SubMenu | ||
| style={{ textAlign: 'left' }} | ||
| key={element.route} | ||
| title={ | ||
| <span> | ||
| <Icon type={element.icon} /> | ||
| <span>{element.title}</span> | ||
| </Link> | ||
| </Menu.Item> | ||
| ) | ||
| )} | ||
| <Menu.Item style={{ textAlign: 'left' }}> | ||
| <Link to="/"> | ||
| <Icon type="home" /> | ||
| <span>Vist Website</span> | ||
| </Link> | ||
| </Menu.Item> | ||
| </Menu> | ||
| <div id="watcher" style={{ height: '1px', width: '100%' }} /> | ||
| </SideMenuWrapper> | ||
| ); | ||
| } | ||
| </span> | ||
| } | ||
| > | ||
| {element.items.map(item => ( | ||
| <Menu.Item | ||
| key={element.route + item.route} | ||
| style={{ textAlign: 'left' }} | ||
| > | ||
| <Link to={`/admin${element.route + item.route}`}> | ||
| <span>{item.title}</span> | ||
| </Link> | ||
| </Menu.Item> | ||
| ))} | ||
| </SubMenu> | ||
| ) : ( | ||
| <Menu.Item key={element.route} style={{ textAlign: 'left' }}> | ||
| <Link to={`/admin${element.route}`}> | ||
| <Icon type={element.icon} /> | ||
| <span>{element.title}</span> | ||
| </Link> | ||
| </Menu.Item> | ||
| ) | ||
| )} | ||
| <Menu.Item style={{ textAlign: 'left' }}> | ||
| <Link to="/"> | ||
| <Icon type="home" /> | ||
| <span>Vist Website</span> | ||
| </Link> | ||
| </Menu.Item> | ||
| </Menu> | ||
| </Sider> | ||
| ); | ||
| } |
Oops, something went wrong.