Skip to content

Commit dd64f3c

Browse files
mrholekmrholek
committed
refactor: update views
1 parent 9842172 commit dd64f3c

File tree

11 files changed

+251
-217
lines changed

11 files changed

+251
-217
lines changed

‎src/assets/icons/index.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ import {
8888
cilLockLocked,
8989
cilMagnifyingGlass,
9090
cilMap,
91+
cilMenu,
9192
cilMoon,
9293
cilNotes,
9394
cilOptions,
@@ -189,6 +190,7 @@ export const icons = Object.assign(
189190
cilLockLocked,
190191
cilMagnifyingGlass,
191192
cilMap,
193+
cilMenu,
192194
cilMoon,
193195
cilNotes,
194196
cilOptions,

‎src/components/AppBreadcrumb.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ const AppBreadcrumb = () => {
3131
const breadcrumbs = getBreadcrumbs(currentLocation)
3232

3333
return (
34-
<CBreadcrumb className="m-0">
34+
<CBreadcrumb className="m-0 ms-2">
3535
<CBreadcrumbItem href="/">Home</CBreadcrumbItem>
3636
{breadcrumbs.map((breadcrumb, index) => {
3737
return (

‎src/components/AppHeader.js‎

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@ const AppHeader = () => {
4242
className="ms-md-3 d-lg-none"
4343
onClick={() => dispatch({ type: 'set', sidebarShow: !sidebarShow })}
4444
>
45-
<CIcon name="cil-menu" />
45+
<CIcon name="cil-menu" size="lg" />
4646
</CHeaderToggler>
47-
<CHeaderBrand className="mx-auto d-lg-none" to="/">
47+
<CHeaderBrand className="mx-auto d-md-none" to="/">
4848
<CIcon name="logo" height="48" alt="Logo" />
4949
</CHeaderBrand>
5050

51-
<CHeaderNav className="d-md-down-none me-auto">
51+
<CHeaderNav className="d-none d-md-flex me-auto">
5252
<CNavItem>
5353
<CNavLink to="/dashboard" component={NavLink} activeClassName="active">
5454
Dashboard
@@ -63,9 +63,23 @@ const AppHeader = () => {
6363
</CHeaderNav>
6464

6565
<CHeaderNav>
66-
<AppHeaderDropdownNotif />
67-
<AppHeaderDropdownTasks />
68-
<AppHeaderDropdownMssg />
66+
<CNavItem>
67+
<CNavLink>
68+
<CIcon name="cil-bell" size="lg" />
69+
</CNavLink>
70+
</CNavItem>
71+
<CNavItem>
72+
<CNavLink>
73+
<CIcon name="cil-list" size="lg" />
74+
</CNavLink>
75+
</CNavItem>
76+
<CNavItem>
77+
<CNavLink>
78+
<CIcon name="cil-envelope-open" size="lg" />
79+
</CNavLink>
80+
</CNavItem>
81+
</CHeaderNav>
82+
<CHeaderNav>
6983
<AppHeaderDropdown />
7084
</CHeaderNav>
7185
</CContainer>

‎src/components/AppSidebar.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ const AppSidebar = () => {
3030
dispatch({ type: 'set', sidebarShow: false })
3131
}}
3232
>
33-
<CSidebarBrand className="d-md-down-none" to="/">
33+
<CSidebarBrand className="d-none d-md-flex" to="/">
3434
<CIcon className="sidebar-brand-full" name="logo-negative" height={35} />
3535
<CIcon className="sidebar-brand-narrow" name="sygnet" height={35} />
3636
</CSidebarBrand>
3737
<CSidebarNav>
3838
<CCreateNavItem items={navigation} />
3939
</CSidebarNav>
4040
<CSidebarToggler
41-
className="c-d-md-down-none"
41+
className="d-none d-lg-flex"
4242
onClick={() => dispatch({ type: 'set', sidebarUnfoldable: !unfoldable })}
4343
/>
4444
</CSidebar>

‎src/components/header/AppHeaderDropdown.js‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,64 +14,64 @@ import CIcon from '@coreui/icons-react'
1414
const AppHeaderDropdown = () => {
1515
return (
1616
<CDropdown variant="nav-item">
17-
<CDropdownToggle placement="bottom-end">
18-
<CAvatar image="avatars/6.jpg" />
17+
<CDropdownToggle placement="bottom-end" className="py-0" caret={false}>
18+
<CAvatar src="avatars/8.jpg" size="md" />
1919
</CDropdownToggle>
2020
<CDropdownMenu className="pt-0" placement="bottom-end">
2121
<CDropdownHeader className="bg-light fw-semibold py-2">Account</CDropdownHeader>
22-
<CDropdownItem>
22+
<CDropdownItem href="#">
2323
<CIcon name="cil-bell" className="me-2" />
2424
Updates
25-
<CBadge color="info" className="ms-auto">
25+
<CBadge color="info" className="ms-2">
2626
42
2727
</CBadge>
2828
</CDropdownItem>
29-
<CDropdownItem>
29+
<CDropdownItem href="#">
3030
<CIcon name="cil-envelope-open" className="me-2" />
3131
Messages
32-
<CBadge color="success" className="ms-auto">
32+
<CBadge color="success" className="ms-2">
3333
42
3434
</CBadge>
3535
</CDropdownItem>
36-
<CDropdownItem>
36+
<CDropdownItem href="#">
3737
<CIcon name="cil-task" className="me-2" />
3838
Tasks
39-
<CBadge color="danger" className="ms-auto">
39+
<CBadge color="danger" className="ms-2">
4040
42
4141
</CBadge>
4242
</CDropdownItem>
43-
<CDropdownItem>
43+
<CDropdownItem href="#">
4444
<CIcon name="cil-comment-square" className="me-2" />
4545
Comments
46-
<CBadge color="warning" className="ms-auto">
46+
<CBadge color="warning" className="ms-2">
4747
42
4848
</CBadge>
4949
</CDropdownItem>
5050
<CDropdownHeader className="bg-light fw-semibold py-2">Settings</CDropdownHeader>
51-
<CDropdownItem>
51+
<CDropdownItem href="#">
5252
<CIcon name="cil-user" className="me-2" />
5353
Profile
5454
</CDropdownItem>
55-
<CDropdownItem>
55+
<CDropdownItem href="#">
5656
<CIcon name="cil-settings" className="me-2" />
5757
Settings
5858
</CDropdownItem>
59-
<CDropdownItem>
59+
<CDropdownItem href="#">
6060
<CIcon name="cil-credit-card" className="me-2" />
6161
Payments
62-
<CBadge color="secondary" className="ms-auto">
62+
<CBadge color="secondary" className="ms-2">
6363
42
6464
</CBadge>
6565
</CDropdownItem>
66-
<CDropdownItem>
66+
<CDropdownItem href="#">
6767
<CIcon name="cil-file" className="me-2" />
6868
Projects
69-
<CBadge color="primary" className="ms-auto">
69+
<CBadge color="primary" className="ms-2">
7070
42
7171
</CBadge>
7272
</CDropdownItem>
7373
<CDropdownDivider />
74-
<CDropdownItem>
74+
<CDropdownItem href="#">
7575
<CIcon name="cil-lock-locked" className="me-2" />
7676
Lock Account
7777
</CDropdownItem>

‎src/components/header/AppHeaderDropdownMssg.js‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,16 @@ const AppHeaderDropdownMssg = () => {
2626
<CDropdownItem href="#">
2727
<div className="message">
2828
<div className="pt-3 me-3 float-start">
29-
<CAvatar image={'avatars/7.jpg'} status="success" />
29+
<CAvatar src={'avatars/7.jpg'} status="success" />
3030
</div>
3131
<div>
32-
<small className="text-muted">John Doe</small>
33-
<small className="text-muted float-end mt-1">Just now</small>
32+
<small className="text-medium-emphasis">John Doe</small>
33+
<small className="text-medium-emphasis float-end mt-1">Just now</small>
3434
</div>
3535
<div className="text-truncate font-weight-bold">
3636
<span className="fa fa-exclamation text-danger"></span> Important message
3737
</div>
38-
<div className="small text-muted text-truncate">
38+
<div className="small text-medium-emphasis text-truncate">
3939
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor
4040
incididunt...
4141
</div>
@@ -45,14 +45,14 @@ const AppHeaderDropdownMssg = () => {
4545
<CDropdownItem href="#">
4646
<div className="message">
4747
<div className="pt-3 me-3 float-start">
48-
<CAvatar image={'avatars/6.jpg'} status="warning" />
48+
<CAvatar src={'avatars/6.jpg'} status="warning" />
4949
</div>
5050
<div>
51-
<small className="text-muted">Jane Dovve</small>
52-
<small className="text-muted float-end mt-1">5 minutes ago</small>
51+
<small className="text-medium-emphasis">Jane Dovve</small>
52+
<small className="text-medium-emphasis float-end mt-1">5 minutes ago</small>
5353
</div>
5454
<div className="text-truncate font-weight-bold">Lorem ipsum dolor sit amet</div>
55-
<div className="small text-muted text-truncate">
55+
<div className="small text-medium-emphasis text-truncate">
5656
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor
5757
incididunt...
5858
</div>
@@ -62,14 +62,14 @@ const AppHeaderDropdownMssg = () => {
6262
<CDropdownItem href="#">
6363
<div className="message">
6464
<div className="pt-3 me-3 float-start">
65-
<CAvatar image={'avatars/5.jpg'} status="danger" />
65+
<CAvatar src={'avatars/5.jpg'} status="danger" />
6666
</div>
6767
<div>
68-
<small className="text-muted">Janet Doe</small>
69-
<small className="text-muted float-end mt-1">1:52 PM</small>
68+
<small className="text-medium-emphasis">Janet Doe</small>
69+
<small className="text-medium-emphasis float-end mt-1">1:52 PM</small>
7070
</div>
7171
<div className="text-truncate font-weight-bold">Lorem ipsum dolor sit amet</div>
72-
<div className="small text-muted text-truncate">
72+
<div className="small text-medium-emphasis text-truncate">
7373
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor
7474
incididunt...
7575
</div>
@@ -79,14 +79,14 @@ const AppHeaderDropdownMssg = () => {
7979
<CDropdownItem href="#">
8080
<div className="message">
8181
<div className="pt-3 me-3 float-start">
82-
<CAvatar image={'avatars/4.jpg'} status="info" />
82+
<CAvatar src={'avatars/4.jpg'} status="info" />
8383
</div>
8484
<div>
85-
<small className="text-muted">Joe Doe</small>
86-
<small className="text-muted float-end mt-1">4:03 AM</small>
85+
<small className="text-medium-emphasis">Joe Doe</small>
86+
<small className="text-medium-emphasis float-end mt-1">4:03 AM</small>
8787
</div>
8888
<div className="text-truncate font-weight-bold">Lorem ipsum dolor sit amet</div>
89-
<div className="small text-muted text-truncate">
89+
<div className="small text-medium-emphasis text-truncate">
9090
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor
9191
incididunt...
9292
</div>

‎src/components/header/AppHeaderDropdownNotif.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ const AppHeaderDropdownNotif = () => {
4848
</small>
4949
</div>
5050
<CProgress size="xs" color="info" value={25} />
51-
<small className="text-muted">348 Processes. 1/4 Cores.</small>
51+
<small className="text-medium-emphasis">348 Processes. 1/4 Cores.</small>
5252
</CDropdownItem>
5353
<CDropdownItem className="d-block">
5454
<div className="text-uppercase mb-1">
@@ -57,7 +57,7 @@ const AppHeaderDropdownNotif = () => {
5757
</small>
5858
</div>
5959
<CProgress size="xs" color="warning" value={70} />
60-
<small className="text-muted">11444GB/16384MB</small>
60+
<small className="text-medium-emphasis">11444GB/16384MB</small>
6161
</CDropdownItem>
6262
<CDropdownItem className="d-block">
6363
<div className="text-uppercase mb-1">
@@ -66,7 +66,7 @@ const AppHeaderDropdownNotif = () => {
6666
</small>
6767
</div>
6868
<CProgress size="xs" color="danger" value={90} />
69-
<small className="text-muted">243GB/256GB</small>
69+
<small className="text-medium-emphasis">243GB/256GB</small>
7070
</CDropdownItem>
7171
</CDropdownMenu>
7272
</CDropdown>

‎src/containers/_nav.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -139,14 +139,14 @@ const _nav = [
139139
_component: 'CNavItem',
140140
as: NavLink,
141141
anchor: 'Dropdowns',
142-
to: '/buttons/button-dropdowns',
142+
to: '/buttons/dropdowns',
143143
},
144144
],
145145
},
146146
{
147147
_component: 'CNavGroup',
148148
anchor: 'Forms',
149-
icon: <CIcon name="cil-note" customClasses="nav-icon" />,
149+
icon: <CIcon name="cil-notes" customClasses="nav-icon" />,
150150
items: [
151151
{
152152
_component: 'CNavItem',
@@ -288,25 +288,25 @@ const _nav = [
288288
_component: 'CNavItem',
289289
as: NavLink,
290290
anchor: 'Login',
291-
to: '/pages/login',
291+
to: '/login',
292292
},
293293
{
294294
_component: 'CNavItem',
295295
as: NavLink,
296296
anchor: 'Register',
297-
to: '/pages/register',
297+
to: '/register',
298298
},
299299
{
300300
_component: 'CNavItem',
301301
as: NavLink,
302302
anchor: 'Error 404',
303-
to: '/pages/404',
303+
to: '/404',
304304
},
305305
{
306306
_component: 'CNavItem',
307307
as: NavLink,
308308
anchor: 'Error 500',
309-
to: '/pages/500',
309+
to: '/500',
310310
},
311311
],
312312
},

‎src/routes.js‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ const Toasts = React.lazy(() => import('./views/examples/notifications/toasts/To
4141

4242
const Login = React.lazy(() => import('./views/examples/pages/login/Login'))
4343
const Register = React.lazy(() => import('./views/examples/pages/register/Register'))
44+
const Page404 = React.lazy(() => import('./views/examples/pages/page404/Page404'))
45+
const Page500 = React.lazy(() => import('./views/examples/pages/page500/Page500'))
4446

4547
const Widgets = React.lazy(() => import('./views/examples/widgets/Widgets'))
4648

@@ -88,8 +90,10 @@ const routes = [
8890
{ path: '/notifications/badges', name: 'Badges', component: Badges },
8991
{ path: '/notifications/modals', name: 'Modals', component: Modals },
9092
{ path: '/notifications/toasts', name: 'Toasts', component: Toasts },
91-
{ path: '/pages/login', name: 'Login', component: Login },
92-
{ path: '/pages/register', name: 'Register', component: Register },
93+
// { path: '/login', name: 'Login', component: Login },
94+
// { path: '/register', name: 'Register', component: Register },
95+
// { path: '/404', name: '404', component: Page404 },
96+
// { path: '/500', name: '500', component: Page500 },
9397
{ path: '/widgets', name: 'Widgets', component: Widgets },
9498
]
9599

0 commit comments

Comments
 (0)