Skip to content

Commit

Permalink
Merge pull request #14 from digipolisantwerp/refactor/calendar-title-…
Browse files Browse the repository at this point in the history
…case

Refactor/calendar title case
  • Loading branch information
jsprds authored Jul 6, 2018
2 parents 8090ad9 + 12512bd commit db37ee3
Show file tree
Hide file tree
Showing 17 changed files with 64 additions and 50 deletions.
2 changes: 1 addition & 1 deletion angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@
"project": "packages/calendar/ng-package.prod.json"
},
"examples": {
"project": "packages/avatar/ng-package.examples.json"
"project": "packages/calendar/ng-package.examples.json"
}
}
},
Expand Down
18 changes: 18 additions & 0 deletions packages/calendar/examples/calendar/calendar.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { CalendarModule } from '@acpaas-ui/ngx-components/calendar';
import { CodeSnippetModule } from '@acpaas-ui/ngx-components/code-snippet';

import { Pages } from './pages/index';

@NgModule({
imports: [
CommonModule,
CalendarModule,
CodeSnippetModule,
],
declarations: [
Pages,
],
})
export class CalendarExamplesModule {}
11 changes: 11 additions & 0 deletions packages/calendar/examples/calendar/calendar.routes.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import { Routes } from '@angular/router';

import { DemoPageComponent } from './pages/demo/demo.page';

export const CALENDAR_EXAMPLES_ROUTES: Routes = [
{
path: '',
component: DemoPageComponent,
pathMatch: 'full',
},
];
3 changes: 3 additions & 0 deletions packages/calendar/examples/calendar/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export { DemoPageComponent } from './pages/demo/demo.page';
export { CalendarExamplesModule } from './calendar.module';
export { CALENDAR_EXAMPLES_ROUTES } from './calendar.routes';
5 changes: 5 additions & 0 deletions packages/calendar/examples/calendar/pages/demo/demo.page.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<h3 class="u-margin-bottom">Calendar demo</h3>

<aui-calendar
(selectDate)="selectDate($event)"
></aui-calendar>
10 changes: 10 additions & 0 deletions packages/calendar/examples/calendar/pages/demo/demo.page.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { Component } from '@angular/core';

@Component({
templateUrl: './demo.page.html',
})
export class DemoPageComponent {
public selectDate(event) {
console.log(event);
}
}
5 changes: 5 additions & 0 deletions packages/calendar/examples/calendar/pages/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { DemoPageComponent } from './demo/demo.page';

export const Pages = [
DemoPageComponent,
];
1 change: 1 addition & 0 deletions packages/calendar/examples/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './calendar/index';
8 changes: 6 additions & 2 deletions packages/calendar/ng-package.examples.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
{
"$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
"dest": "../../examples/avatar",
"dest": "../../examples/calendar",
"deleteDestPath": false,
"lib": {
"entryFile": "examples/index.ts"
}
},
"whitelistedNonPeerDependencies": [
"@acpaas-ui/js-date-utils",
"lodash-es"
]
}
3 changes: 0 additions & 3 deletions packages/calendar/src/lib/calendar/calendar.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { CommonModule } from '@angular/common';

import { Components } from './components/index';
import { Services } from './services/index';
import { Pipes } from './pipes/index';

import {
CALENDAR_WEEKDAY_LABELS,
Expand All @@ -20,11 +19,9 @@ import { CalendarService } from './services/calendar.service';
],
declarations: [
Components,
Pipes,
],
exports: [
Components,
Pipes,
],
providers: [
Services,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import { Component, DebugElement } from '@angular/core';
import { CalendarMonthComponent } from './month.component';
import { CALENDAR_WEEKDAY_LABELS, CALENDAR_DEFAULT_WEEKDAY_LABELS } from '../../calendar.conf';
import { CalendarService } from '../../services/calendar.service';
import { TitleCasePipe } from '../../pipes/title-case.pipe';

@Component({
selector: 'aui-test',
Expand Down Expand Up @@ -67,7 +66,6 @@ describe('The Calendar Month Component', () => {
declarations: [
TestComponent,
CalendarMonthComponent,
TitleCasePipe,
],
providers: [
{ provide: CALENDAR_WEEKDAY_LABELS, useValue: CALENDAR_DEFAULT_WEEKDAY_LABELS },
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { By } from '@angular/platform-browser';
import { Component, DebugElement } from '@angular/core';

import { CalendarYearComponent } from './year.component';
import { CALENDAR_MONTH_LABELS, CALENDAR_DEFAULT_MONTH_LABELS } from '../../calendar.conf';
import { CalendarService } from '../../services/calendar.service';
import { TitleCasePipe } from '../../pipes/title-case.pipe';

@Component({
selector: 'aui-test',
Expand Down Expand Up @@ -39,7 +36,6 @@ describe('The Calendar Year Component', () => {
declarations: [
TestComponent,
CalendarYearComponent,
TitleCasePipe,
],
providers: [
{ provide: CALENDAR_MONTH_LABELS, useValue: CALENDAR_DEFAULT_MONTH_LABELS },
Expand Down
1 change: 0 additions & 1 deletion packages/calendar/src/lib/calendar/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,3 @@ export {
CALENDAR_WEEKDAY_LABELS
} from './calendar.conf';
export { CalendarModule } from './calendar.module';
export { TitleCasePipe } from './pipes/title-case.pipe';
5 changes: 0 additions & 5 deletions packages/calendar/src/lib/calendar/pipes/index.ts

This file was deleted.

32 changes: 0 additions & 32 deletions packages/calendar/src/lib/calendar/pipes/title-case.pipe.ts

This file was deleted.

2 changes: 2 additions & 0 deletions styleguide/app/examples.modules.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import { AvatarExamplesModule } from '@acpaas-ui/ngx-examples/avatar';
import { CalendarExamplesModule } from '@acpaas-ui/ngx-examples/calendar';
import { LogoExamplesModule } from '@acpaas-ui/ngx-examples/logo';

export const ExamplesModules = [
AvatarExamplesModule,
CalendarExamplesModule,
LogoExamplesModule,
];
2 changes: 2 additions & 0 deletions styleguide/app/examples.routes.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import { AVATAR_EXAMPLES_ROUTES } from '@acpaas-ui/ngx-examples/avatar';
import { CALENDAR_EXAMPLES_ROUTES } from '@acpaas-ui/ngx-examples/calendar';
import { LOGO_EXAMPLES_ROUTES } from '@acpaas-ui/ngx-examples/logo';

export const EXAMPLES_ROUTES = [
{ path: 'avatar', children: AVATAR_EXAMPLES_ROUTES },
{ path: 'calendar', children: CALENDAR_EXAMPLES_ROUTES },
{ path: 'logo', children: LOGO_EXAMPLES_ROUTES },
];

0 comments on commit db37ee3

Please sign in to comment.