diff --git a/e2e/app.e2e-spec.ts b/e2e/app.e2e-spec.ts index 7487cea..4a769da 100644 --- a/e2e/app.e2e-spec.ts +++ b/e2e/app.e2e-spec.ts @@ -7,8 +7,8 @@ describe('core-ui App', function() { page = new CoreUIPage(); }); - it('should display footer containing creativeLabs', () => { + it('should display footer containing Wigo4it', () => { page.navigateTo(); - expect(page.getParagraphText()).toContain('creativeLabs'); + expect(page.getParagraphText()).toContain('Wigo4it'); }); }); diff --git a/package.json b/package.json index cb11a42..f29395d 100644 --- a/package.json +++ b/package.json @@ -1,21 +1,28 @@ { - "name": "@coreui/coreui-free-angular-admin-template", - "version": "2.0.0", - "description": "CoreUI Free Angular 2+ Admin Template", + "name": "@wigo4it/fieldlab-portal", + "version": "0.1.0", + "description": "Wigo4it Portal, contribution to FieldLab Dienstverlening 2018", "author": { - "name": "Łukasz Holeczek", - "url": "http://holeczek.pl", - "github": "https://github.com/mrholek", - "twitter": "https://twitter.com/lukaszholeczek" + "name": "Wigo4it", + "url": "http://www.wigo4it.nl", + "github": "https://github.com/wigo4it" }, "contributors": [ { - "name": "Andrzej Kopański", - "url": "https://github.com/xidedix" + "name": "Sjef van Leeuwen", + "url": "https://github.com/sjefvanleeuwen" + }, + { + "name": "Marco Wiggelinkhuizen", + "url": "https://github.com/marcowig" + }, + { + "name": "Andrew Bogels", + "url": "https://github.com/bogelsa" } ], - "homepage": "https://coreui.io/angular", - "copyright": "Copyright 2018 creativeLabs Łukasz Holeczek", + "homepage": "http://www.wigo4it.nl", + "copyright": "Copyright 2018 Wigo4it", "license": "MIT", "scripts": { "ng": "ng", diff --git a/src/app/_nav.ts b/src/app/_nav.ts index 12a3d09..17c83c0 100644 --- a/src/app/_nav.ts +++ b/src/app/_nav.ts @@ -2,230 +2,37 @@ export const navItems = [ { name: 'Dashboard', url: '/dashboard', - icon: 'icon-speedometer', - badge: { - variant: 'info', - text: 'NEW' - } + icon: 'icon-speedometer' }, { - title: true, - name: 'Theme' - }, - { - name: 'Colors', - url: '/theme/colors', - icon: 'icon-drop' - }, - { - name: 'Typography', - url: '/theme/typography', - icon: 'icon-pencil' - }, - { - title: true, - name: 'Components' - }, - { - name: 'Base', - url: '/base', - icon: 'icon-puzzle', - children: [ - { - name: 'Cards', - url: '/base/cards', - icon: 'icon-puzzle' - }, - { - name: 'Carousels', - url: '/base/carousels', - icon: 'icon-puzzle' - }, - { - name: 'Collapses', - url: '/base/collapses', - icon: 'icon-puzzle' - }, - { - name: 'Forms', - url: '/base/forms', - icon: 'icon-puzzle' - }, - { - name: 'Pagination', - url: '/base/paginations', - icon: 'icon-puzzle' - }, - { - name: 'Popovers', - url: '/base/popovers', - icon: 'icon-puzzle' - }, - { - name: 'Progress', - url: '/base/progress', - icon: 'icon-puzzle' - }, - { - name: 'Switches', - url: '/base/switches', - icon: 'icon-puzzle' - }, - { - name: 'Tables', - url: '/base/tables', - icon: 'icon-puzzle' - }, - { - name: 'Tabs', - url: '/base/tabs', - icon: 'icon-puzzle' - }, - { - name: 'Tooltips', - url: '/base/tooltips', - icon: 'icon-puzzle' - } - ] - }, - { - name: 'Buttons', - url: '/buttons', - icon: 'icon-cursor', + name: 'Stadspassen', + url: '/stadspas', + icon: 'icon-credit-card', children: [ { - name: 'Buttons', - url: '/buttons/buttons', - icon: 'icon-cursor' + name: 'Persoonlijk', + url: '/stadspas/stadspas', + icon: 'icon-user' }, { - name: 'Dropdowns', - url: '/buttons/dropdowns', - icon: 'icon-cursor' - }, - { - name: 'Brand Buttons', - url: '/buttons/brand-buttons', - icon: 'icon-cursor' + name: 'Batch', + url: '/stadspas/stadspassen', + icon: 'icon-layers' } ] - }, - { - name: 'Charts', - url: '/charts', - icon: 'icon-pie-chart' - }, - { - name: 'Icons', - url: '/icons', - icon: 'icon-star', - children: [ - { - name: 'CoreUI Icons', - url: '/icons/coreui-icons', - icon: 'icon-star', - badge: { - variant: 'success', - text: 'NEW' - } - }, - { - name: 'Flags', - url: '/icons/flags', - icon: 'icon-star' - }, - { - name: 'Font Awesome', - url: '/icons/font-awesome', - icon: 'icon-star', - badge: { - variant: 'secondary', - text: '4.7' - } - }, - { - name: 'Simple Line Icons', - url: '/icons/simple-line-icons', - icon: 'icon-star' - } - ] - }, - { - name: 'Notifications', - url: '/notifications', - icon: 'icon-bell', - children: [ - { - name: 'Alerts', - url: '/notifications/alerts', - icon: 'icon-bell' - }, - { - name: 'Badges', - url: '/notifications/badges', - icon: 'icon-bell' - }, - { - name: 'Modals', - url: '/notifications/modals', - icon: 'icon-bell' - } - ] - }, - { - name: 'Widgets', - url: '/widgets', - icon: 'icon-calculator', - badge: { - variant: 'info', - text: 'NEW' - } - }, - { - divider: true - }, - { - title: true, - name: 'Extras', - }, - { - name: 'Pages', - url: '/pages', - icon: 'icon-star', - children: [ - { - name: 'Login', - url: '/login', - icon: 'icon-star' - }, - { - name: 'Register', - url: '/register', - icon: 'icon-star' - }, - { - name: 'Error 404', - url: '/404', - icon: 'icon-star' - }, - { - name: 'Error 500', - url: '/500', - icon: 'icon-star' - } - ] - }, - { + } + /*, { name: 'Download CoreUI', url: 'http://coreui.io/angular/', icon: 'icon-cloud-download', class: 'mt-auto', variant: 'success' - }, + }*/ + /*, { name: 'Try CoreUI PRO', url: 'http://coreui.io/pro/angular/', icon: 'icon-layers', variant: 'danger' - } + }*/ ]; diff --git a/src/app/app.component.css b/src/app/app.component.css deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/app.component.html b/src/app/app.component.html deleted file mode 100644 index fa2706a..0000000 --- a/src/app/app.component.html +++ /dev/null @@ -1,20 +0,0 @@ - -
-

- Welcome to {{ title }}! -

- Angular Logo -
-

Here are some links to help you start:

- - diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 3cd3bab..407fed7 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -40,6 +40,8 @@ import { BsDropdownModule } from 'ngx-bootstrap/dropdown'; import { TabsModule } from 'ngx-bootstrap/tabs'; import { ChartsModule } from 'ng2-charts/ng2-charts'; +import { StadspasModule } from './views/stadspas/stadspas.module'; + @NgModule({ imports: [ BrowserModule, @@ -52,7 +54,8 @@ import { ChartsModule } from 'ng2-charts/ng2-charts'; PerfectScrollbarModule, BsDropdownModule.forRoot(), TabsModule.forRoot(), - ChartsModule + ChartsModule, + StadspasModule ], declarations: [ AppComponent, diff --git a/src/app/app.routing.ts b/src/app/app.routing.ts index 25d05e6..42bf1ee 100644 --- a/src/app/app.routing.ts +++ b/src/app/app.routing.ts @@ -51,36 +51,12 @@ export const routes: Routes = [ }, children: [ { - path: 'base', - loadChildren: './views/base/base.module#BaseModule' - }, - { - path: 'buttons', - loadChildren: './views/buttons/buttons.module#ButtonsModule' - }, - { - path: 'charts', - loadChildren: './views/chartjs/chartjs.module#ChartJSModule' + path: 'stadspas', + loadChildren: './views/stadspas/stadspas.module#StadspasModule' }, { path: 'dashboard', loadChildren: './views/dashboard/dashboard.module#DashboardModule' - }, - { - path: 'icons', - loadChildren: './views/icons/icons.module#IconsModule' - }, - { - path: 'notifications', - loadChildren: './views/notifications/notifications.module#NotificationsModule' - }, - { - path: 'theme', - loadChildren: './views/theme/theme.module#ThemeModule' - }, - { - path: 'widgets', - loadChildren: './views/widgets/widgets.module#WidgetsModule' } ] } diff --git a/src/app/containers/default-layout/default-layout.component.html b/src/app/containers/default-layout/default-layout.component.html index 87d8a05..84f588e 100644 --- a/src/app/containers/default-layout/default-layout.component.html +++ b/src/app/containers/default-layout/default-layout.component.html @@ -1,47 +1,27 @@