Skip to content

Commit c542171

Browse files
mrholekmrholek
committed
refactor: update example views
1 parent 35be1ea commit c542171

File tree

65 files changed

+3635
-2775
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+3635
-2775
lines changed

‎src/App.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ const loading = (
1212
const DefaultLayout = React.lazy(() => import('./layout/DefaultLayout'))
1313

1414
// Pages
15-
const Login = React.lazy(() => import('./views/pages/login/Login'))
16-
const Register = React.lazy(() => import('./views/pages/register/Register'))
17-
const Page404 = React.lazy(() => import('./views/pages/page404/Page404'))
18-
const Page500 = React.lazy(() => import('./views/pages/page500/Page500'))
15+
const Login = React.lazy(() => import('./views/examples/pages/login/Login'))
16+
const Register = React.lazy(() => import('./views/examples/pages/register/Register'))
17+
const Page404 = React.lazy(() => import('./views/examples/pages/page404/Page404'))
18+
const Page500 = React.lazy(() => import('./views/examples/pages/page500/Page500'))
1919

2020
class App extends Component {
2121
render() {

‎src/App.test.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from 'react'
22
import { shallow } from 'enzyme/build'
33
import App from './App'
4-
import ChartLineSimple from './views/charts/ChartLineSimple'
4+
import ChartLineSimple from './views/examples/charts/ChartLineSimple'
55
import Dashboard from './views/dashboard/Dashboard.js'
66

77
it('mounts App without crashing', () => {

‎src/containers/_nav.js‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,6 @@ const _nav = [
7373
anchor: 'Collapse',
7474
to: '/base/collapses',
7575
},
76-
{
77-
_component: 'CNavItem',
78-
as: NavLink,
79-
anchor: 'Jumbotron',
80-
to: '/base/jumbotrons',
81-
},
8276
{
8377
_component: 'CNavItem',
8478
as: NavLink,
@@ -88,15 +82,9 @@ const _nav = [
8882
{
8983
_component: 'CNavItem',
9084
as: NavLink,
91-
anchor: 'Navs',
85+
anchor: 'Navs & Tabs',
9286
to: '/base/navs',
9387
},
94-
{
95-
_component: 'CNavItem',
96-
as: NavLink,
97-
anchor: 'Navbars',
98-
to: '/base/navbars',
99-
},
10088
{
10189
_component: 'CNavItem',
10290
as: NavLink,
@@ -121,12 +109,6 @@ const _nav = [
121109
anchor: 'Tables',
122110
to: '/base/tables',
123111
},
124-
{
125-
_component: 'CNavItem',
126-
as: NavLink,
127-
anchor: 'Tabs',
128-
to: '/base/tabs',
129-
},
130112
{
131113
_component: 'CNavItem',
132114
as: NavLink,

‎src/layout/DefaultLayout.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const DefaultLayout = () => {
77
<AppSidebar />
88
<div className="wrapper d-flex flex-column min-vh-100 bg-light">
99
<AppHeader />
10-
<div className="body">
10+
<div className="body flex-grow-1 px-3">
1111
<TheContent />
1212
</div>
1313
<AppFooter />

‎src/routes.js‎

Lines changed: 42 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,51 @@
11
import React from 'react'
22

3-
const Toasts = React.lazy(() => import('./views/notifications/toasts/Toasts'))
4-
const Tables = React.lazy(() => import('./views/base/tables/Tables'))
3+
// examples
54

6-
const Accordion = React.lazy(() => import('./views/base/accordion/Accordion'))
7-
const Breadcrumbs = React.lazy(() => import('./views/base/breadcrumbs/Breadcrumbs'))
8-
const Cards = React.lazy(() => import('./views/base/cards/Cards'))
9-
const Carousels = React.lazy(() => import('./views/base/carousels/Carousels'))
10-
const Collapses = React.lazy(() => import('./views/base/collapses/Collapses'))
5+
const Colors = React.lazy(() => import('./views/examples/theme/colors/Colors'))
6+
const Typography = React.lazy(() => import('./views/examples/theme/typography/Typography'))
117

12-
const Jumbotrons = React.lazy(() => import('./views/base/jumbotrons/Jumbotrons'))
13-
const ListGroups = React.lazy(() => import('./views/base/list-groups/ListGroups'))
14-
const Navbars = React.lazy(() => import('./views/base/navbars/Navbars'))
15-
const Navs = React.lazy(() => import('./views/base/navs/Navs'))
16-
const Paginations = React.lazy(() => import('./views/base/paginations/Paginations'))
17-
const Popovers = React.lazy(() => import('./views/base/popovers/Popovers'))
18-
const Progress = React.lazy(() => import('./views/base/progress/Progress'))
8+
const Accordion = React.lazy(() => import('./views/examples/base/accordion/Accordion'))
9+
const Breadcrumbs = React.lazy(() => import('./views/examples/base/breadcrumbs/Breadcrumbs'))
10+
const Cards = React.lazy(() => import('./views/examples/base/cards/Cards'))
11+
const Carousels = React.lazy(() => import('./views/examples/base/carousels/Carousels'))
12+
const Collapses = React.lazy(() => import('./views/examples/base/collapses/Collapses'))
13+
const ListGroups = React.lazy(() => import('./views/examples/base/list-groups/ListGroups'))
14+
const Navs = React.lazy(() => import('./views/examples/base/navs/Navs'))
15+
const Paginations = React.lazy(() => import('./views/examples/base/paginations/Paginations'))
16+
const Popovers = React.lazy(() => import('./views/examples/base/popovers/Popovers'))
17+
const Progress = React.lazy(() => import('./views/examples/base/progress/Progress'))
18+
const Tables = React.lazy(() => import('./views/examples/base/tables/Tables'))
19+
const Tooltips = React.lazy(() => import('./views/examples/base/tooltips/Tooltips'))
1920

20-
const Tabs = React.lazy(() => import('./views/base/tabs/Tabs'))
21-
const Tooltips = React.lazy(() => import('./views/base/tooltips/Tooltips'))
22-
const ButtonDropdowns = React.lazy(() => import('./views/buttons/button-dropdowns/ButtonDropdowns'))
23-
const ButtonGroups = React.lazy(() => import('./views/buttons/button-groups/ButtonGroups'))
24-
const Buttons = React.lazy(() => import('./views/buttons/buttons/Buttons'))
25-
const Charts = React.lazy(() => import('./views/charts/Charts'))
26-
const Dashboard = React.lazy(() => import('./views/dashboard/Dashboard'))
27-
const CoreUIIcons = React.lazy(() => import('./views/icons/coreui-icons/CoreUIIcons'))
28-
const Flags = React.lazy(() => import('./views/icons/flags/Flags'))
29-
const Brands = React.lazy(() => import('./views/icons/brands/Brands'))
30-
const Alerts = React.lazy(() => import('./views/notifications/alerts/Alerts'))
31-
const Badges = React.lazy(() => import('./views/notifications/badges/Badges'))
32-
const Modals = React.lazy(() => import('./views/notifications/modals/Modals'))
33-
const Colors = React.lazy(() => import('./views/theme/colors/Colors'))
34-
const Typography = React.lazy(() => import('./views/theme/typography/Typography'))
35-
const Widgets = React.lazy(() => import('./views/widgets/Widgets'))
21+
const Buttons = React.lazy(() => import('./views/examples/buttons/buttons/Buttons'))
22+
const ButtonGroups = React.lazy(() => import('./views/examples/buttons/button-groups/ButtonGroups'))
23+
const Dropdowns = React.lazy(() => import('./views/examples/buttons/dropdowns/Dropdowns'))
24+
25+
const ChecksRadios = React.lazy(() => import('./views/examples/forms/checks-radios/ChecksRadios'))
26+
const FormControl = React.lazy(() => import('./views/examples/forms/form-control/FormControl'))
27+
const InputGroup = React.lazy(() => import('./views/examples/forms/input-group/InputGroup'))
28+
const Layout = React.lazy(() => import('./views/examples/forms/layout/Layout'))
29+
const Range = React.lazy(() => import('./views/examples/forms/range/Range'))
30+
const Select = React.lazy(() => import('./views/examples/forms/select/Select'))
31+
const Validation = React.lazy(() => import('./views/examples/forms/validation/Validation'))
32+
33+
const CoreUIIcons = React.lazy(() => import('./views/examples/icons/coreui-icons/CoreUIIcons'))
34+
const Flags = React.lazy(() => import('./views/examples/icons/flags/Flags'))
35+
const Brands = React.lazy(() => import('./views/examples/icons/brands/Brands'))
3636

37-
const ChecksRadios = React.lazy(() => import('./views/forms/checks-radios/ChecksRadios'))
38-
const FormControl = React.lazy(() => import('./views/forms/form-control/FormControl'))
39-
const InputGroup = React.lazy(() => import('./views/forms/input-group/InputGroup'))
40-
const Layout = React.lazy(() => import('./views/forms/layout/Layout'))
41-
const Range = React.lazy(() => import('./views/forms/range/Range'))
42-
const Select = React.lazy(() => import('./views/forms/select/Select'))
43-
const Validation = React.lazy(() => import('./views/forms/validation/Validation'))
37+
const Alerts = React.lazy(() => import('./views/examples/notifications/alerts/Alerts'))
38+
const Badges = React.lazy(() => import('./views/examples/notifications/badges/Badges'))
39+
const Modals = React.lazy(() => import('./views/examples/notifications/modals/Modals'))
40+
const Toasts = React.lazy(() => import('./views/examples/notifications/toasts/Toasts'))
4441

45-
const Login = React.lazy(() => import('./views/pages/login/Login'))
46-
const Register = React.lazy(() => import('./views/pages/register/Register'))
42+
const Login = React.lazy(() => import('./views/examples/pages/login/Login'))
43+
const Register = React.lazy(() => import('./views/examples/pages/register/Register'))
44+
45+
const Widgets = React.lazy(() => import('./views/examples/widgets/Widgets'))
46+
47+
const Charts = React.lazy(() => import('./views/examples/charts/Charts'))
48+
const Dashboard = React.lazy(() => import('./views/dashboard/Dashboard'))
4749

4850
const routes = [
4951
{ path: '/', exact: true, name: 'Home' },
@@ -57,19 +59,16 @@ const routes = [
5759
{ path: '/base/cards', name: 'Cards', component: Cards },
5860
{ path: '/base/carousels', name: 'Carousel', component: Carousels },
5961
{ path: '/base/collapses', name: 'Collapse', component: Collapses },
60-
{ path: '/base/jumbotrons', name: 'Jumbotrons', component: Jumbotrons },
6162
{ path: '/base/list-groups', name: 'List Groups', component: ListGroups },
62-
{ path: '/base/navbars', name: 'Navbars', component: Navbars },
6363
{ path: '/base/navs', name: 'Navs', component: Navs },
6464
{ path: '/base/paginations', name: 'Paginations', component: Paginations },
6565
{ path: '/base/popovers', name: 'Popovers', component: Popovers },
6666
{ path: '/base/progress', name: 'Progress', component: Progress },
6767
{ path: '/base/tables', name: 'Tables', component: Tables },
68-
{ path: '/base/tabs', name: 'Tabs', component: Tabs },
6968
{ path: '/base/tooltips', name: 'Tooltips', component: Tooltips },
7069
{ path: '/buttons', name: 'Buttons', component: Buttons, exact: true },
7170
{ path: '/buttons/buttons', name: 'Buttons', component: Buttons },
72-
{ path: '/buttons/button-dropdowns', name: 'Dropdowns', component: ButtonDropdowns },
71+
{ path: '/buttons/dropdowns', name: 'Dropdowns', component: Dropdowns },
7372
{ path: '/buttons/button-groups', name: 'Button Groups', component: ButtonGroups },
7473
{ path: '/charts', name: 'Charts', component: Charts },
7574
{ path: '/forms', name: 'Forms', component: FormControl, exact: true },

‎src/scss/style.scss‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ $enable-rtl: true;
66

77
// Import styles
88
@import "@coreui/coreui/scss/coreui";
9+
@import "@coreui/chartjs/dist/css/coreui-chartjs.css";
910

1011
@import "layout";
1112
@import "example";

0 commit comments

Comments
 (0)