Skip to content

Commit 387a0f9

Browse files
committed
set up needed UI for Novera Fund and added Login functionality
1 parent f74a369 commit 387a0f9

File tree

6 files changed

+387
-460
lines changed

6 files changed

+387
-460
lines changed

src/_nav.1.js

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
export default {
2+
items: [
3+
{
4+
name: 'Novera Fund',
5+
url: '/fund',
6+
icon: 'icon-speedometer',
7+
badge: {
8+
variant: 'info',
9+
text: 'NEW',
10+
},
11+
},
12+
{
13+
name: 'Your Portfolio',
14+
url: '/portfolio',
15+
icon: 'icon-pie-chart',
16+
},
17+
{
18+
name: 'About',
19+
url: '/about',
20+
icon: 'icon-puzzle',
21+
},
22+
{
23+
name: 'News Feed',
24+
url: '/news',
25+
icon: 'icon-bell',
26+
},
27+
],
28+
};

src/containers/DefaultLayout/DefaultHeader.js

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -28,33 +28,22 @@ class DefaultHeader extends Component {
2828
/>
2929
<AppSidebarToggler className="d-md-down-none" display="lg" />
3030

31-
<Nav className="d-md-down-none" navbar>
32-
<NavItem className="px-3">
33-
<NavLink href="/">Dashboard</NavLink>
34-
</NavItem>
35-
<NavItem className="px-3">
36-
<Link to="/users">Users</Link>
37-
</NavItem>
38-
<NavItem className="px-3">
39-
<NavLink href="#">Settings</NavLink>
40-
</NavItem>
41-
</Nav>
4231
<Nav className="ml-auto" navbar>
43-
<NavItem className="d-md-down-none">
32+
{/* <NavItem className="d-md-down-none">
4433
<NavLink href="#"><i className="icon-bell"></i><Badge pill color="danger">5</Badge></NavLink>
4534
</NavItem>
4635
<NavItem className="d-md-down-none">
4736
<NavLink href="#"><i className="icon-list"></i></NavLink>
4837
</NavItem>
4938
<NavItem className="d-md-down-none">
5039
<NavLink href="#"><i className="icon-___location-pin"></i></NavLink>
51-
</NavItem>
40+
</NavItem> */}
5241
<AppHeaderDropdown direction="down">
5342
<DropdownToggle nav>
5443
<img src={'../../assets/img/avatars/6.jpg'} className="img-avatar" alt="[email protected]" />
5544
</DropdownToggle>
5645
<DropdownMenu right style={{ right: 'auto' }}>
57-
<DropdownItem header tag="div" className="text-center"><strong>Account</strong></DropdownItem>
46+
{/* <DropdownItem header tag="div" className="text-center"><strong>Account</strong></DropdownItem>
5847
<DropdownItem><i className="fa fa-bell-o"></i> Updates<Badge color="info">42</Badge></DropdownItem>
5948
<DropdownItem><i className="fa fa-envelope-o"></i> Messages<Badge color="success">42</Badge></DropdownItem>
6049
<DropdownItem><i className="fa fa-tasks"></i> Tasks<Badge color="danger">42</Badge></DropdownItem>
@@ -65,13 +54,11 @@ class DefaultHeader extends Component {
6554
<DropdownItem><i className="fa fa-usd"></i> Payments<Badge color="secondary">42</Badge></DropdownItem>
6655
<DropdownItem><i className="fa fa-file"></i> Projects<Badge color="primary">42</Badge></DropdownItem>
6756
<DropdownItem divider />
68-
<DropdownItem><i className="fa fa-shield"></i> Lock Account</DropdownItem>
57+
<DropdownItem><i className="fa fa-shield"></i> Lock Account</DropdownItem> */}
6958
<DropdownItem onClick={e => this.props.onLogout(e)}><i className="fa fa-lock"></i> Logout</DropdownItem>
7059
</DropdownMenu>
7160
</AppHeaderDropdown>
7261
</Nav>
73-
<AppAsideToggler className="d-md-down-none" />
74-
{/*<AppAsideToggler className="d-lg-none" mobile />*/}
7562
</React.Fragment>
7663
);
7764
}

src/containers/DefaultLayout/DefaultLayout.js

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,19 @@ import { Container } from 'reactstrap';
55
import {
66
AppAside,
77
AppBreadcrumb,
8-
AppFooter,
98
AppHeader,
109
AppSidebar,
11-
AppSidebarFooter,
1210
AppSidebarForm,
1311
AppSidebarHeader,
14-
AppSidebarMinimizer,
1512
AppSidebarNav,
1613
} from '@coreui/react';
1714
// sidebar nav config
18-
import navigation from '../../_nav';
15+
import navigation from '../../_nav.1';
1916
// routes config
2017
import routes from '../../routes';
18+
import Dashboard from '../../views/Dashboard/Dashboard';
2119

2220
const DefaultAside = React.lazy(() => import('./DefaultAside'));
23-
const DefaultFooter = React.lazy(() => import('./DefaultFooter'));
2421
const DefaultHeader = React.lazy(() => import('./DefaultHeader'));
2522

2623
class DefaultLayout extends Component {
@@ -36,22 +33,20 @@ class DefaultLayout extends Component {
3633
return (
3734
<div className="app">
3835
<AppHeader fixed>
39-
<Suspense fallback={this.loading()}>
40-
<DefaultHeader onLogout={e=>this.signOut(e)}/>
36+
<Suspense fallback={this.loading()}>
37+
<DefaultHeader onLogout={e => this.signOut(e)} />
4138
</Suspense>
4239
</AppHeader>
4340
<div className="app-body">
4441
<AppSidebar fixed display="lg">
4542
<AppSidebarHeader />
4643
<AppSidebarForm />
4744
<Suspense>
48-
<AppSidebarNav navConfig={navigation} {...this.props} />
45+
<AppSidebarNav navConfig={navigation} {...this.props} />
4946
</Suspense>
50-
<AppSidebarFooter />
51-
<AppSidebarMinimizer />
5247
</AppSidebar>
5348
<main className="main">
54-
<AppBreadcrumb appRoutes={routes}/>
49+
<AppBreadcrumb appRoutes={routes} />
5550
<Container fluid>
5651
<Suspense fallback={this.loading()}>
5752
<Switch>
@@ -72,17 +67,12 @@ class DefaultLayout extends Component {
7267
</Suspense>
7368
</Container>
7469
</main>
75-
<AppAside fixed>
70+
{/* <AppAside fixed>
7671
<Suspense fallback={this.loading()}>
7772
<DefaultAside />
7873
</Suspense>
79-
</AppAside>
74+
</AppAside> */}
8075
</div>
81-
<AppFooter>
82-
<Suspense fallback={this.loading()}>
83-
<DefaultFooter />
84-
</Suspense>
85-
</AppFooter>
8676
</div>
8777
);
8878
}

src/routes.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,13 @@ const User = React.lazy(() => import('./views/Users/User'));
3939

4040
// https://github.com/ReactTraining/react-router/tree/master/packages/react-router-config
4141
const routes = [
42+
// Novera custom routes
43+
{ path: '/fund', exact: true, name: 'Users', component: Dashboard },
44+
{ path: '/portfolio', exact: true, name: 'Users', component: Users },
45+
{ path: '/about', exact: true, name: 'Users', component: Users },
46+
{ path: '/news', exact: true, name: 'Users', component: Cards },
47+
48+
// default app routes
4249
{ path: '/', exact: true, name: 'Home', component: DefaultLayout },
4350
{ path: '/dashboard', name: 'Dashboard', component: Dashboard },
4451
{ path: '/theme', exact: true, name: 'Theme', component: Colors },

0 commit comments

Comments
 (0)