diff --git a/demos/component-docs/action-sheets/action-sheets.ts b/demos/component-docs/action-sheets/action-sheets.ts new file mode 100644 index 0000000000..ebdd570b29 --- /dev/null +++ b/demos/component-docs/action-sheets/action-sheets.ts @@ -0,0 +1 @@ +export * from './basic/pages'; diff --git a/demos/component-docs/actionSheet/actionSheet.html b/demos/component-docs/action-sheets/basic/basic.html similarity index 100% rename from demos/component-docs/actionSheet/actionSheet.html rename to demos/component-docs/action-sheets/basic/basic.html diff --git a/demos/component-docs/actionSheet/actionSheet.ts b/demos/component-docs/action-sheets/basic/pages.ts similarity index 93% rename from demos/component-docs/actionSheet/actionSheet.ts rename to demos/component-docs/action-sheets/basic/pages.ts index 885be0972e..be890cd7e5 100644 --- a/demos/component-docs/actionSheet/actionSheet.ts +++ b/demos/component-docs/action-sheets/basic/pages.ts @@ -1,13 +1,13 @@ import {Platform, Page, ActionSheet} from 'ionic/ionic'; import {forwardRef} from 'angular2/angular2'; -import {AndroidAttribute} from '../helpers'; +import {AndroidAttribute} from '../../helpers'; @Page({ - templateUrl: 'actionSheet/actionSheet.html', + templateUrl: 'action-sheets/basic/basic.html', directives: [forwardRef(() => AndroidAttribute)] }) -export class ActionSheetPage { +export class BasicPage { constructor(actionSheet: ActionSheet, platform: Platform) { this.actionSheet = actionSheet; diff --git a/demos/component-docs/buttons/buttons.html b/demos/component-docs/buttons/basic/basic.html similarity index 100% rename from demos/component-docs/buttons/buttons.html rename to demos/component-docs/buttons/basic/basic.html diff --git a/demos/component-docs/buttons/basic/pages.ts b/demos/component-docs/buttons/basic/pages.ts new file mode 100644 index 0000000000..dd668f91ed --- /dev/null +++ b/demos/component-docs/buttons/basic/pages.ts @@ -0,0 +1,13 @@ +import {Page} from 'ionic/ionic'; +import {forwardRef} from 'angular2/angular2'; +import {AndroidAttribute} from '../../helpers'; + +@Page({ + templateUrl: 'buttons/basic/basic.html', + directives: [forwardRef(() => AndroidAttribute)] +}) +export class BasicPage { + constructor() { + + } +} \ No newline at end of file diff --git a/demos/component-docs/buttons/block.html b/demos/component-docs/buttons/block/block.html similarity index 100% rename from demos/component-docs/buttons/block.html rename to demos/component-docs/buttons/block/block.html diff --git a/demos/component-docs/buttons/block/pages.ts b/demos/component-docs/buttons/block/pages.ts new file mode 100644 index 0000000000..5cfebde02e --- /dev/null +++ b/demos/component-docs/buttons/block/pages.ts @@ -0,0 +1,13 @@ +import {Page} from 'ionic/ionic'; +import {forwardRef} from 'angular2/angular2'; +import {AndroidAttribute} from '../../helpers'; + +@Page({ + templateUrl: 'buttons/block.html', + directives: [forwardRef(() => AndroidAttribute)] +}) +export class BlockPage { + constructor() { + + } +} \ No newline at end of file diff --git a/demos/component-docs/buttons/buttons.ts b/demos/component-docs/buttons/buttons.ts index d10bea7ecb..e6f2aae6d2 100644 --- a/demos/component-docs/buttons/buttons.ts +++ b/demos/component-docs/buttons/buttons.ts @@ -1,103 +1,10 @@ -import {Page} from 'ionic/ionic'; -import {forwardRef} from 'angular2/angular2'; -import {AndroidAttribute} from '../helpers'; - -@Page({ - templateUrl: 'buttons/buttons.html', - directives: [forwardRef(() => AndroidAttribute)] -}) -export class ButtonsPage { - constructor() { - - } -} - -@Page({ - templateUrl: 'buttons/block.html', - directives: [forwardRef(() => AndroidAttribute)] -}) -export class BlockButtonsPage { - constructor() { - - } -} - -@Page({ - templateUrl: 'buttons/clear.html', - directives: [forwardRef(() => AndroidAttribute)] -}) -export class ClearButtonsPage { - constructor() { - - } -} - -@Page({ - templateUrl: 'buttons/full.html', - directives: [forwardRef(() => AndroidAttribute)] -}) -export class FullButtonsPage { - constructor() { - - } -} - -@Page({ - templateUrl: 'buttons/outline.html', - directives: [forwardRef(() => AndroidAttribute)] -}) -export class OutlineButtonsPage { - constructor() { - - } -} - -@Page({ - templateUrl: 'buttons/round.html', - directives: [forwardRef(() => AndroidAttribute)] -}) -export class RoundButtonsPage { - constructor() { - - } -} - -@Page({ - templateUrl: 'buttons/fab.html', - directives: [forwardRef(() => AndroidAttribute)] -}) -export class FabPage { - constructor() { - - } -} - -@Page({ - templateUrl: 'buttons/sizes.html', - directives: [forwardRef(() => AndroidAttribute)] -}) -export class ButtonSizesPage { - constructor() { - - } -} - -@Page({ - templateUrl: 'buttons/icons.html', - directives: [forwardRef(() => AndroidAttribute)] -}) -export class IconButtonsPage { - constructor() { - - } -} - -@Page({ - templateUrl: 'buttons/components.html', - directives: [forwardRef(() => AndroidAttribute)] -}) -export class ButtonsInComponentsPage { - constructor() { - - } -} +export * from './basic/pages'; +export * from './block/pages'; +export * from './clear/pages'; +export * from './components/pages'; +export * from './fab/pages'; +export * from './full/pages'; +export * from './icons/pages'; +export * from './outline/pages'; +export * from './round/pages'; +export * from './sizes/pages'; diff --git a/demos/component-docs/buttons/clear.html b/demos/component-docs/buttons/clear/clear.html similarity index 100% rename from demos/component-docs/buttons/clear.html rename to demos/component-docs/buttons/clear/clear.html diff --git a/demos/component-docs/buttons/clear/pages.ts b/demos/component-docs/buttons/clear/pages.ts new file mode 100644 index 0000000000..2622ddbf26 --- /dev/null +++ b/demos/component-docs/buttons/clear/pages.ts @@ -0,0 +1,13 @@ +import {Page} from 'ionic/ionic'; +import {forwardRef} from 'angular2/angular2'; +import {AndroidAttribute} from '../../helpers'; + +@Page({ + templateUrl: 'buttons/clear.html', + directives: [forwardRef(() => AndroidAttribute)] +}) +export class ClearPage { + constructor() { + + } +} \ No newline at end of file diff --git a/demos/component-docs/buttons/components.html b/demos/component-docs/buttons/components/components.html similarity index 100% rename from demos/component-docs/buttons/components.html rename to demos/component-docs/buttons/components/components.html diff --git a/demos/component-docs/buttons/components/pages.ts b/demos/component-docs/buttons/components/pages.ts new file mode 100644 index 0000000000..4fd151ef1a --- /dev/null +++ b/demos/component-docs/buttons/components/pages.ts @@ -0,0 +1,13 @@ +import {Page} from 'ionic/ionic'; +import {forwardRef} from 'angular2/angular2'; +import {AndroidAttribute} from '../../helpers'; + +@Page({ + templateUrl: 'buttons/components.html', + directives: [forwardRef(() => AndroidAttribute)] +}) +export class ComponentsPage { + constructor() { + + } +} \ No newline at end of file diff --git a/demos/component-docs/buttons/fab.html b/demos/component-docs/buttons/fab/fab.html similarity index 100% rename from demos/component-docs/buttons/fab.html rename to demos/component-docs/buttons/fab/fab.html diff --git a/demos/component-docs/buttons/fab/pages.ts b/demos/component-docs/buttons/fab/pages.ts new file mode 100644 index 0000000000..93c01d1804 --- /dev/null +++ b/demos/component-docs/buttons/fab/pages.ts @@ -0,0 +1,13 @@ +import {Page} from 'ionic/ionic'; +import {forwardRef} from 'angular2/angular2'; +import {AndroidAttribute} from '../../helpers'; + +@Page({ + templateUrl: 'buttons/fab.html', + directives: [forwardRef(() => AndroidAttribute)] +}) +export class FabPage { + constructor() { + + } +} \ No newline at end of file diff --git a/demos/component-docs/buttons/full.html b/demos/component-docs/buttons/full/full.html similarity index 100% rename from demos/component-docs/buttons/full.html rename to demos/component-docs/buttons/full/full.html diff --git a/demos/component-docs/buttons/full/pages.ts b/demos/component-docs/buttons/full/pages.ts new file mode 100644 index 0000000000..aadf415638 --- /dev/null +++ b/demos/component-docs/buttons/full/pages.ts @@ -0,0 +1,13 @@ +import {Page} from 'ionic/ionic'; +import {forwardRef} from 'angular2/angular2'; +import {AndroidAttribute} from '../../helpers'; + +@Page({ + templateUrl: 'buttons/full.html', + directives: [forwardRef(() => AndroidAttribute)] +}) +export class FullPage { + constructor() { + + } +} \ No newline at end of file diff --git a/demos/component-docs/buttons/icons.html b/demos/component-docs/buttons/icons/icons.html similarity index 100% rename from demos/component-docs/buttons/icons.html rename to demos/component-docs/buttons/icons/icons.html diff --git a/demos/component-docs/buttons/icons/pages.ts b/demos/component-docs/buttons/icons/pages.ts new file mode 100644 index 0000000000..f2f247e34c --- /dev/null +++ b/demos/component-docs/buttons/icons/pages.ts @@ -0,0 +1,13 @@ +import {Page} from 'ionic/ionic'; +import {forwardRef} from 'angular2/angular2'; +import {AndroidAttribute} from '../../helpers'; + +@Page({ + templateUrl: 'buttons/icons.html', + directives: [forwardRef(() => AndroidAttribute)] +}) +export class IconsPage { + constructor() { + + } +} \ No newline at end of file diff --git a/demos/component-docs/buttons/outline.html b/demos/component-docs/buttons/outline/outline.html similarity index 100% rename from demos/component-docs/buttons/outline.html rename to demos/component-docs/buttons/outline/outline.html diff --git a/demos/component-docs/buttons/outline/pages.ts b/demos/component-docs/buttons/outline/pages.ts new file mode 100644 index 0000000000..5f74737ab6 --- /dev/null +++ b/demos/component-docs/buttons/outline/pages.ts @@ -0,0 +1,13 @@ +import {Page} from 'ionic/ionic'; +import {forwardRef} from 'angular2/angular2'; +import {AndroidAttribute} from '../../helpers'; + +@Page({ + templateUrl: 'buttons/outline.html', + directives: [forwardRef(() => AndroidAttribute)] +}) +export class OutlinePage { + constructor() { + + } +} \ No newline at end of file diff --git a/demos/component-docs/buttons/round/pages.ts b/demos/component-docs/buttons/round/pages.ts new file mode 100644 index 0000000000..fad823f814 --- /dev/null +++ b/demos/component-docs/buttons/round/pages.ts @@ -0,0 +1,13 @@ +import {Page} from 'ionic/ionic'; +import {forwardRef} from 'angular2/angular2'; +import {AndroidAttribute} from '../../helpers'; + +@Page({ + templateUrl: 'buttons/round.html', + directives: [forwardRef(() => AndroidAttribute)] +}) +export class RoundPage { + constructor() { + + } +} \ No newline at end of file diff --git a/demos/component-docs/buttons/round.html b/demos/component-docs/buttons/round/round.html similarity index 100% rename from demos/component-docs/buttons/round.html rename to demos/component-docs/buttons/round/round.html diff --git a/demos/component-docs/buttons/sizes/pages.ts b/demos/component-docs/buttons/sizes/pages.ts new file mode 100644 index 0000000000..a60e3decea --- /dev/null +++ b/demos/component-docs/buttons/sizes/pages.ts @@ -0,0 +1,13 @@ +import {Page} from 'ionic/ionic'; +import {forwardRef} from 'angular2/angular2'; +import {AndroidAttribute} from '../../helpers'; + +@Page({ + templateUrl: 'buttons/sizes.html', + directives: [forwardRef(() => AndroidAttribute)] +}) +export class SizesPage { + constructor() { + + } +} \ No newline at end of file diff --git a/demos/component-docs/buttons/sizes.html b/demos/component-docs/buttons/sizes/sizes.html similarity index 100% rename from demos/component-docs/buttons/sizes.html rename to demos/component-docs/buttons/sizes/sizes.html diff --git a/demos/component-docs/cards/advanced-map/pages.ts b/demos/component-docs/cards/advanced-map/pages.ts new file mode 100644 index 0000000000..ba0ec22225 --- /dev/null +++ b/demos/component-docs/cards/advanced-map/pages.ts @@ -0,0 +1,13 @@ +import {Page} from 'ionic/ionic'; +import {forwardRef} from 'angular2/angular2'; +import {AndroidAttribute} from '../../helpers'; + +@Page({ + templateUrl: 'cards/advanced-map/template.html', + directives: [forwardRef(() => AndroidAttribute)] +}) +export class AdvancedMapPage { + constructor() { + + } +} diff --git a/demos/component-docs/cards/cards-advanced-map.html b/demos/component-docs/cards/advanced-map/template.html similarity index 100% rename from demos/component-docs/cards/cards-advanced-map.html rename to demos/component-docs/cards/advanced-map/template.html diff --git a/demos/component-docs/cards/advanced-social/pages.ts b/demos/component-docs/cards/advanced-social/pages.ts new file mode 100644 index 0000000000..df80216266 --- /dev/null +++ b/demos/component-docs/cards/advanced-social/pages.ts @@ -0,0 +1,13 @@ +import {Page} from 'ionic/ionic'; +import {forwardRef} from 'angular2/angular2'; +import {AndroidAttribute} from '../../helpers'; + +@Page({ + templateUrl: 'cards/advanced-social/template.html', + directives: [forwardRef(() => AndroidAttribute)] +}) +export class AdvancedSocialPage { + constructor() { + + } +} \ No newline at end of file diff --git a/demos/component-docs/cards/cards-advanced-social.html b/demos/component-docs/cards/advanced-social/template.html similarity index 100% rename from demos/component-docs/cards/cards-advanced-social.html rename to demos/component-docs/cards/advanced-social/template.html diff --git a/demos/component-docs/cards/advanced-weather/pages.ts b/demos/component-docs/cards/advanced-weather/pages.ts new file mode 100644 index 0000000000..98626d6a40 --- /dev/null +++ b/demos/component-docs/cards/advanced-weather/pages.ts @@ -0,0 +1,13 @@ +import {Page} from 'ionic/ionic'; +import {forwardRef} from 'angular2/angular2'; +import {AndroidAttribute} from '../../helpers'; + +@Page({ + templateUrl: 'cards/advanced-weather/template.html', + directives: [forwardRef(() => AndroidAttribute)] +}) +export class AdvancedWeatherPage { + constructor() { + + } +} diff --git a/demos/component-docs/cards/cards-advanced-weather.html b/demos/component-docs/cards/advanced-weather/template.html similarity index 100% rename from demos/component-docs/cards/cards-advanced-weather.html rename to demos/component-docs/cards/advanced-weather/template.html diff --git a/demos/component-docs/cards/cards-background/pages.ts b/demos/component-docs/cards/background/pages.ts similarity index 82% rename from demos/component-docs/cards/cards-background/pages.ts rename to demos/component-docs/cards/background/pages.ts index 63d8189aba..8dd1490460 100644 --- a/demos/component-docs/cards/cards-background/pages.ts +++ b/demos/component-docs/cards/background/pages.ts @@ -3,7 +3,7 @@ import {forwardRef} from 'angular2/angular2'; import {AndroidAttribute} from '../../helpers'; @Page({ - templateUrl: 'cards/cards-background/main.html', + templateUrl: 'cards/background/template.html', directives: [forwardRef(() => AndroidAttribute)] }) export class BackgroundPage { diff --git a/demos/component-docs/cards/cards-background.html b/demos/component-docs/cards/background/template.html similarity index 100% rename from demos/component-docs/cards/cards-background.html rename to demos/component-docs/cards/background/template.html diff --git a/demos/component-docs/cards/basic/pages.ts b/demos/component-docs/cards/basic/pages.ts new file mode 100644 index 0000000000..c6bc2ad674 --- /dev/null +++ b/demos/component-docs/cards/basic/pages.ts @@ -0,0 +1,13 @@ +import {Page} from 'ionic/ionic'; +import {forwardRef} from 'angular2/angular2'; +import {AndroidAttribute} from '../../helpers'; + +@Page({ + templateUrl: 'cards/basic/template.html', + directives: [forwardRef(() => AndroidAttribute)] +}) +export class BasicPage { + constructor() { + + } +} \ No newline at end of file diff --git a/demos/component-docs/cards/cards-basic.html b/demos/component-docs/cards/basic/template.html similarity index 100% rename from demos/component-docs/cards/cards-basic.html rename to demos/component-docs/cards/basic/template.html diff --git a/demos/component-docs/cards/cards-background/main.html b/demos/component-docs/cards/cards-background/main.html deleted file mode 100644 index 91f0e4e9f4..0000000000 --- a/demos/component-docs/cards/cards-background/main.html +++ /dev/null @@ -1,36 +0,0 @@ - - - Background Images - - - - - - -

São Paulo

-

41 Listings

- - - - -

Amsterdam

-

64 Listings

- - - - -

San Francisco

-

72 Listings

- - - - -

Madison

-

28 Listings

- - - - - - - diff --git a/demos/component-docs/cards/cards.ts b/demos/component-docs/cards/cards.ts index 758e3ee1ec..caa9106d5d 100644 --- a/demos/component-docs/cards/cards.ts +++ b/demos/component-docs/cards/cards.ts @@ -1,76 +1,8 @@ -import {Page} from 'ionic/ionic'; -import {forwardRef} from 'angular2/angular2'; -import {AndroidAttribute} from '../helpers'; - -export * from './cards-background/pages'; - -@Page({ - templateUrl: 'cards/cards-basic.html', - directives: [forwardRef(() => AndroidAttribute)] -}) -export class BasicPage { - constructor() { - - } -} - -@Page({ - templateUrl: 'cards/cards-header.html', - directives: [forwardRef(() => AndroidAttribute)] -}) -export class HeaderPage { - constructor() { - - } -} - - -@Page({ - templateUrl: 'cards/cards-list.html', - directives: [forwardRef(() => AndroidAttribute)] -}) -export class ListPage { - constructor() { - - } -} - -@Page({ - templateUrl: 'cards/cards-image.html', - directives: [forwardRef(() => AndroidAttribute)] -}) -export class ImagePage { - constructor() { - - } -} - -@Page({ - templateUrl: 'cards/cards-advanced-social.html', - directives: [forwardRef(() => AndroidAttribute)] -}) -export class AdvancedSocialPage { - constructor() { - - } -} - -@Page({ - templateUrl: 'cards/cards-advanced-map.html', - directives: [forwardRef(() => AndroidAttribute)] -}) -export class AdvancedMapPage { - constructor() { - - } -} - -@Page({ - templateUrl: 'cards/cards-advanced-weather.html', - directives: [forwardRef(() => AndroidAttribute)] -}) -export class AdvancedWeatherPage { - constructor() { - - } -} +export * from './advanced-map/pages'; +export * from './advanced-social/pages'; +export * from './advanced-weather/pages'; +export * from './background/pages'; +export * from './basic/pages'; +export * from './header/pages'; +export * from './image/pages'; +export * from './list/pages'; diff --git a/demos/component-docs/cards/header/pages.ts b/demos/component-docs/cards/header/pages.ts new file mode 100644 index 0000000000..da2232a532 --- /dev/null +++ b/demos/component-docs/cards/header/pages.ts @@ -0,0 +1,13 @@ +import {Page} from 'ionic/ionic'; +import {forwardRef} from 'angular2/angular2'; +import {AndroidAttribute} from '../../helpers'; + +@Page({ + templateUrl: 'cards/header/template.html', + directives: [forwardRef(() => AndroidAttribute)] +}) +export class HeaderPage { + constructor() { + + } +} \ No newline at end of file diff --git a/demos/component-docs/cards/cards-header.html b/demos/component-docs/cards/header/template.html similarity index 100% rename from demos/component-docs/cards/cards-header.html rename to demos/component-docs/cards/header/template.html diff --git a/demos/component-docs/cards/image/pages.ts b/demos/component-docs/cards/image/pages.ts new file mode 100644 index 0000000000..c0321971d5 --- /dev/null +++ b/demos/component-docs/cards/image/pages.ts @@ -0,0 +1,13 @@ +import {Page} from 'ionic/ionic'; +import {forwardRef} from 'angular2/angular2'; +import {AndroidAttribute} from '../../helpers'; + +@Page({ + templateUrl: 'cards/image/template.html', + directives: [forwardRef(() => AndroidAttribute)] +}) +export class ImagePage { + constructor() { + + } +} \ No newline at end of file diff --git a/demos/component-docs/cards/cards-image.html b/demos/component-docs/cards/image/template.html similarity index 100% rename from demos/component-docs/cards/cards-image.html rename to demos/component-docs/cards/image/template.html diff --git a/demos/component-docs/cards/list/pages.ts b/demos/component-docs/cards/list/pages.ts new file mode 100644 index 0000000000..af241f55f2 --- /dev/null +++ b/demos/component-docs/cards/list/pages.ts @@ -0,0 +1,13 @@ +import {Page} from 'ionic/ionic'; +import {forwardRef} from 'angular2/angular2'; +import {AndroidAttribute} from '../../helpers'; + +@Page({ + templateUrl: 'cards/list/template.html', + directives: [forwardRef(() => AndroidAttribute)] +}) +export class ListPage { + constructor() { + + } +} \ No newline at end of file diff --git a/demos/component-docs/cards/cards-list.html b/demos/component-docs/cards/list/template.html similarity index 100% rename from demos/component-docs/cards/cards-list.html rename to demos/component-docs/cards/list/template.html diff --git a/demos/component-docs/forms/forms.ts b/demos/component-docs/forms/forms.ts deleted file mode 100644 index 7df7efcd3a..0000000000 --- a/demos/component-docs/forms/forms.ts +++ /dev/null @@ -1,91 +0,0 @@ -import {FORM_DIRECTIVES, FormBuilder, forwardRef, Validators, Control, ControlGroup} from 'angular2/angular2'; -import {Page} from 'ionic/ionic'; -import {AndroidAttribute} from '../helpers'; - - - -@Page({ - templateUrl: 'forms/forms.html', - providers: [FormBuilder], - directives: [forwardRef(() => AndroidAttribute)] -}) -export class FormsPage { - - constructor() { - this.form = new ControlGroup({ - firstName: new Control("", Validators.required), - lastName: new Control("", Validators.required) - }); - } - - processForm(event) { - // TODO: display input in a popup - console.log(event); - } - - -} - -@Page({ - templateUrl: 'forms/fixed-inline.html', - directives: [forwardRef(() => AndroidAttribute)] -}) -export class FixedInlinePage { - constructor() { - - } -} - -@Page({ - templateUrl: 'forms/floating.html', - directives: [forwardRef(() => AndroidAttribute)] -}) -export class FloatingPage { - constructor() { - - } -} - - -@Page({ - templateUrl: 'forms/inline.html', - directives: [forwardRef(() => AndroidAttribute)] -}) -export class InlinePage { - constructor() { - - } -} - - -@Page({ - templateUrl: 'forms/inset.html', - directives: [forwardRef(() => AndroidAttribute)] -}) -export class InsetPage { - constructor() { - - } -} - - -@Page({ - templateUrl: 'forms/placeholder.html', - directives: [forwardRef(() => AndroidAttribute)] -}) -export class PlaceholderPage { - constructor() { - - } -} - - -@Page({ - templateUrl: 'forms/stacked.html', - directives: [forwardRef(() => AndroidAttribute)] -}) -export class StackedPage { - constructor() { - - } -} diff --git a/demos/component-docs/helpers.ts b/demos/component-docs/helpers.ts index 36f4ffd672..385f210164 100644 --- a/demos/component-docs/helpers.ts +++ b/demos/component-docs/helpers.ts @@ -1,56 +1,19 @@ import {Directive, ElementRef, Renderer} from 'angular2/angular2'; import {Platform, Navbar} from 'ionic/ionic'; - -import {ActionSheetPage} from './actionSheet/actionSheet'; - -import {ButtonsPage, - BlockButtonsPage, - ClearButtonsPage, - FullButtonsPage, - OutlineButtonsPage, - RoundButtonsPage, - FabPage, - ButtonSizesPage, - IconButtonsPage, - ButtonsInComponentsPage} from './buttons/buttons'; - +import * as actionSheets from './action-sheets/action-sheets'; +import * as buttons from './buttons/buttons'; import * as cards from './cards/cards'; - -import {FormsPage, - FixedInlinePage, - FloatingPage, - InlinePage, - InsetPage, - PlaceholderPage, - StackedPage} from './forms/forms'; - -import {IconsPage} from './icons/icons'; - -import {CheckboxPage, - RadioPage, - RangePage, - SelectPage, - SwitchPage} from './inputs/inputs'; - -import {BasicListsPage, - AvatarListsPage, - IconListsPage, - BasicDividersPage, - BasicInsetListsPage, - ListHeadersPage, - MultilineListsPage, - ThumbnailListsPage} from './lists/lists'; - -import {MenusPage} from './menus/menus'; -import {ModalsPage} from './modals/modals'; -import {NavigationPage} from './navigation/navigation'; -import {PopupsPage} from './popups/popups'; -import {SlidesPage} from './slides/slides'; - -import {TabsPage} from './tabs/tabs'; -import {TabsIconPage} from './tabs/tabs-icon'; -import {TabsIconTextPage} from './tabs/tabs-icon-text'; +import * as labels from './labels/labels'; +import * as icons from './icons/icons'; +import * as inputs from './inputs/inputs'; +import * as lists from './lists/lists'; +import * as menus from './menus/menus'; +import * as modals from './modals/modals'; +import * as navigation from './navigation/navigation'; +import * as popups from './popups/popups'; +import * as slides from './slides/slides'; +import * as tabs from './tabs/tabs'; @Directive({ @@ -105,17 +68,18 @@ export function hasScrollbar() { export function getPageFor(hash) { return { - 'action-sheets': ActionSheetPage, - 'buttons': ButtonsPage, - 'block-buttons': BlockButtonsPage, - 'clear-buttons': ClearButtonsPage, - 'full-buttons': FullButtonsPage, - 'outline-buttons': OutlineButtonsPage, - 'round-buttons': RoundButtonsPage, - 'floating-action-buttons': FabPage, - 'buttons-in-components': ButtonsInComponentsPage, - 'button-sizes': ButtonSizesPage, - 'icon-buttons': IconButtonsPage, + 'action-sheets': actionSheets.BasicPage, + + 'buttons': buttons.BasicPage, + 'block-buttons': buttons.BlockPage, + 'clear-buttons': buttons.ClearPage, + 'full-buttons': buttons.FullPage, + 'outline-buttons': buttons.OutlinePage, + 'round-buttons': buttons.RoundPage, + 'floating-action-buttons': buttons.FabPage, + 'buttons-in-components': buttons.ComponentsPage, + 'button-sizes': buttons.SizesPage, + 'icon-buttons': buttons.IconsPage, 'cards': cards.BasicPage, 'card-header': cards.HeaderPage, @@ -127,40 +91,40 @@ export function getPageFor(hash) { 'card-advanced-social': cards.AdvancedSocialPage, 'card-advanced-weather': cards.AdvancedWeatherPage, - 'checkbox': CheckboxPage, - 'radio': RadioPage, - 'range': RangePage, - 'select': SelectPage, - 'switch': SwitchPage, + 'checkbox': inputs.CheckboxPage, + 'radio': inputs.RadioPage, + 'range': inputs.RangePage, + 'select': inputs.SelectPage, + 'switch': inputs.SwitchPage, - 'inputs': FormsPage, - 'fixed-inline-labels': FixedInlinePage, - 'floating-labels': FloatingPage, - 'inline-labels': InlinePage, - 'inset-labels': InsetPage, - 'placeholder-labels': PlaceholderPage, - 'stacked-labels': StackedPage, + 'inputs': labels.BasicPage, + 'fixed-inline-labels': labels.FixedInlinePage, + 'floating-labels': labels.FloatingPage, + 'inline-labels': labels.InlinePage, + 'inset-labels': labels.InsetPage, + 'placeholder-labels': labels.PlaceholderPage, + 'stacked-labels': labels.StackedPage, - 'icons': IconsPage, + 'icons': icons.BasicPage, - 'lists': BasicListsPage, - 'avatar-list': AvatarListsPage, - 'icon-list': IconListsPage, - 'list-dividers': BasicDividersPage, - 'inset-list': BasicInsetListsPage, - 'list-headers': ListHeadersPage, - 'multiline-list': MultilineListsPage, - 'thumbnail-list': ThumbnailListsPage, + 'lists': lists.BasicPage, + 'avatar-list': lists.AvatarPage, + 'icon-list': lists.IconPage, + 'list-dividers': lists.LinesPage, + 'inset-list': lists.InsetPage, + 'list-headers': lists.HeadersPage, + 'multiline-list': lists.MultilinePage, + 'thumbnail-list': lists.ThumbnailPage, - 'menus': MenusPage, - 'modals': ModalsPage, - 'navigation': NavigationPage, - 'popups': PopupsPage, - 'slides': SlidesPage, + 'menus': menus.BasicPage, + 'modals': modals.BasicPage, + 'navigation': navigation.BasicPage, + 'popups': popups.BasicPage, + 'slides': slides.BasicPage, - 'tabs': TabsPage, - 'tabs-icon': TabsIconPage, - 'tabs-icon-text': TabsIconTextPage, + 'tabs': tabs.BasicPage, + 'tabs-icon': tabs.IconPage, + 'tabs-icon-text': tabs.IconTextPage, }[hash] } diff --git a/demos/component-docs/icons/basic/pages.ts b/demos/component-docs/icons/basic/pages.ts new file mode 100644 index 0000000000..d980059046 --- /dev/null +++ b/demos/component-docs/icons/basic/pages.ts @@ -0,0 +1,13 @@ +import {Page} from 'ionic/ionic'; +import {forwardRef} from 'angular2/angular2'; +import {AndroidAttribute} from '../../helpers'; + +@Page({ + templateUrl: 'icons/basic/template.html', + directives: [forwardRef(() => AndroidAttribute)] +}) +export class BasicPage { + constructor() { + + } +} diff --git a/demos/component-docs/icons/icons.html b/demos/component-docs/icons/basic/template.html similarity index 100% rename from demos/component-docs/icons/icons.html rename to demos/component-docs/icons/basic/template.html diff --git a/demos/component-docs/icons/icons.ts b/demos/component-docs/icons/icons.ts index f7cc33ee76..ebdd570b29 100644 --- a/demos/component-docs/icons/icons.ts +++ b/demos/component-docs/icons/icons.ts @@ -1,13 +1 @@ -import {Page} from 'ionic/ionic'; -import {forwardRef} from 'angular2/angular2'; -import {AndroidAttribute} from '../helpers'; - -@Page({ - templateUrl: 'icons/icons.html', - directives: [forwardRef(() => AndroidAttribute)] -}) -export class IconsPage { - constructor() { - - } -} +export * from './basic/pages'; diff --git a/demos/component-docs/index.ts b/demos/component-docs/index.ts index 38b558645e..2af4f048f8 100644 --- a/demos/component-docs/index.ts +++ b/demos/component-docs/index.ts @@ -1,7 +1,7 @@ import {App, IonicApp, Platform, ActionSheet} from 'ionic/ionic'; import {Page, Config, Events} from 'ionic/ionic'; import {PageOne, PageTwo, PageThree} from './menus/menus'; -import {ActionSheetPage} from './actionSheet/actionSheet'; +import * as actionSheets from './action-sheets/action-sheets'; import * as helpers from './helpers'; @@ -14,7 +14,6 @@ class DemoApp { androidAttribute: any; constructor(app: IonicApp, platform: Platform) { - debugger; this.app = app; this.platform = platform; this.androidAttribute = helpers.AndroidAttribute; @@ -33,7 +32,7 @@ class DemoApp { if (data.hash) { this.nextPage = helpers.getPageFor(data.hash.replace('#', '')); } else { - this.nextPage = ActionSheetPage; + this.nextPage = actionSheets.BasicPage; } let nav = this.app.getComponent('nav'); nav.setRoot(this.nextPage); diff --git a/demos/component-docs/inputs/checkbox/pages.ts b/demos/component-docs/inputs/checkbox/pages.ts new file mode 100644 index 0000000000..3d71a40f6c --- /dev/null +++ b/demos/component-docs/inputs/checkbox/pages.ts @@ -0,0 +1,12 @@ +import {Page} from 'ionic/ionic'; +import {forwardRef} from 'angular2/angular2'; +import {AndroidAttribute} from '../../helpers'; + +@Page({ + templateUrl: 'inputs/checkbox/template.html', + directives: [forwardRef(() => AndroidAttribute)] +}) +export class CheckboxPage{ + constructor() { + } +} diff --git a/demos/component-docs/inputs/checkbox.html b/demos/component-docs/inputs/checkbox/template.html similarity index 100% rename from demos/component-docs/inputs/checkbox.html rename to demos/component-docs/inputs/checkbox/template.html diff --git a/demos/component-docs/inputs/inputs.ts b/demos/component-docs/inputs/inputs.ts index 1d4878434f..b9c4e27fdf 100644 --- a/demos/component-docs/inputs/inputs.ts +++ b/demos/component-docs/inputs/inputs.ts @@ -1,48 +1,5 @@ -import {App, IonicApp, Page} from 'ionic/ionic'; -import {forwardRef} from 'angular2/angular2'; -import * as helpers from '../helpers'; - -@Page({ - templateUrl: 'inputs/checkbox.html', - directives: [forwardRef(() => helpers.AndroidAttribute)] -}) -export class CheckboxPage{ - constructor() { - } -} - -@Page({ - templateUrl: 'inputs/radio.html', - directives: [forwardRef(() => helpers.AndroidAttribute)] -}) -export class RadioPage{ - constructor() { - } -} - -@Page({ - templateUrl: 'inputs/range.html', - directives: [forwardRef(() => helpers.AndroidAttribute)] -}) -export class RangePage{ - constructor() { - } -} - -@Page({ - templateUrl: 'inputs/select.html', - directives: [forwardRef(() => helpers.AndroidAttribute)] -}) -export class SelectPage{ - constructor() { - } -} - -@Page({ - templateUrl: 'inputs/switch.html', - directives: [forwardRef(() => helpers.AndroidAttribute)] -}) -export class SwitchPage{ - constructor() { - } -} +export * from './checkbox/pages'; +export * from './radio/pages'; +export * from './range/pages'; +export * from './select/pages'; +export * from './switch/pages'; diff --git a/demos/component-docs/inputs/radio/pages.ts b/demos/component-docs/inputs/radio/pages.ts new file mode 100644 index 0000000000..25db75ccd8 --- /dev/null +++ b/demos/component-docs/inputs/radio/pages.ts @@ -0,0 +1,12 @@ +import {App, IonicApp, Page} from 'ionic/ionic'; +import {forwardRef} from 'angular2/angular2'; +import * as helpers from '../../helpers'; + +@Page({ + templateUrl: 'inputs/radio/template.html', + directives: [forwardRef(() => helpers.AndroidAttribute)] +}) +export class RadioPage { + constructor() { + } +} diff --git a/demos/component-docs/inputs/radio.html b/demos/component-docs/inputs/radio/template.html similarity index 100% rename from demos/component-docs/inputs/radio.html rename to demos/component-docs/inputs/radio/template.html diff --git a/demos/component-docs/inputs/range/pages.ts b/demos/component-docs/inputs/range/pages.ts new file mode 100644 index 0000000000..63c6c0b1b2 --- /dev/null +++ b/demos/component-docs/inputs/range/pages.ts @@ -0,0 +1,12 @@ +import {Page} from 'ionic/ionic'; +import {forwardRef} from 'angular2/angular2'; +import {AndroidAttribute} from '../../helpers'; + +@Page({ + templateUrl: 'inputs/range/template.html', + directives: [forwardRef(() => AndroidAttribute)] +}) +export class RangePage{ + constructor() { + } +} \ No newline at end of file diff --git a/demos/component-docs/inputs/range.html b/demos/component-docs/inputs/range/template.html similarity index 100% rename from demos/component-docs/inputs/range.html rename to demos/component-docs/inputs/range/template.html diff --git a/demos/component-docs/inputs/select/pages.ts b/demos/component-docs/inputs/select/pages.ts new file mode 100644 index 0000000000..f79141dda1 --- /dev/null +++ b/demos/component-docs/inputs/select/pages.ts @@ -0,0 +1,12 @@ +import {Page} from 'ionic/ionic'; +import {forwardRef} from 'angular2/angular2'; +import {AndroidAttribute} from '../../helpers'; + +@Page({ + templateUrl: 'inputs/select/template.html', + directives: [forwardRef(() => AndroidAttribute)] +}) +export class SelectPage{ + constructor() { + } +} diff --git a/demos/component-docs/inputs/select.html b/demos/component-docs/inputs/select/template.html similarity index 100% rename from demos/component-docs/inputs/select.html rename to demos/component-docs/inputs/select/template.html diff --git a/demos/component-docs/inputs/switch/pages.ts b/demos/component-docs/inputs/switch/pages.ts new file mode 100644 index 0000000000..4c0de6acf3 --- /dev/null +++ b/demos/component-docs/inputs/switch/pages.ts @@ -0,0 +1,12 @@ +import {Page} from 'ionic/ionic'; +import {forwardRef} from 'angular2/angular2'; +import {AndroidAttribute} from '../../helpers'; + +@Page({ + templateUrl: 'inputs/switch/template.html', + directives: [forwardRef(() => AndroidAttribute)] +}) +export class SwitchPage{ + constructor() { + } +} diff --git a/demos/component-docs/inputs/switch.html b/demos/component-docs/inputs/switch/template.html similarity index 100% rename from demos/component-docs/inputs/switch.html rename to demos/component-docs/inputs/switch/template.html diff --git a/demos/component-docs/labels/basic/pages.ts b/demos/component-docs/labels/basic/pages.ts new file mode 100644 index 0000000000..48922ed770 --- /dev/null +++ b/demos/component-docs/labels/basic/pages.ts @@ -0,0 +1,24 @@ +import {FORM_DIRECTIVES, FormBuilder, forwardRef, Validators, Control, ControlGroup} from 'angular2/angular2'; +import {Page} from 'ionic/ionic'; +import {AndroidAttribute} from '../../helpers'; + +@Page({ + templateUrl: 'labels/basic/template.html', + providers: [FormBuilder], + directives: [forwardRef(() => AndroidAttribute)] +}) +export class BasicPage { + + constructor() { + this.form = new ControlGroup({ + firstName: new Control("", Validators.required), + lastName: new Control("", Validators.required) + }); + } + + processForm(event) { + // TODO: display input in a popup + console.log(event); + } + +} diff --git a/demos/component-docs/forms/forms.html b/demos/component-docs/labels/basic/template.html similarity index 100% rename from demos/component-docs/forms/forms.html rename to demos/component-docs/labels/basic/template.html diff --git a/demos/component-docs/labels/fixed-inline/pages.ts b/demos/component-docs/labels/fixed-inline/pages.ts new file mode 100644 index 0000000000..ac63ebc809 --- /dev/null +++ b/demos/component-docs/labels/fixed-inline/pages.ts @@ -0,0 +1,13 @@ +import {Page} from 'ionic/ionic'; +import {forwardRef} from 'angular2/angular2'; +import {AndroidAttribute} from '../../helpers'; + +@Page({ + templateUrl: 'labels/fixed-inline/template.html', + directives: [forwardRef(() => AndroidAttribute)] +}) +export class FixedInlinePage { + constructor() { + + } +} diff --git a/demos/component-docs/forms/fixed-inline.html b/demos/component-docs/labels/fixed-inline/template.html similarity index 100% rename from demos/component-docs/forms/fixed-inline.html rename to demos/component-docs/labels/fixed-inline/template.html diff --git a/demos/component-docs/labels/floating/pages.ts b/demos/component-docs/labels/floating/pages.ts new file mode 100644 index 0000000000..1b3dde0214 --- /dev/null +++ b/demos/component-docs/labels/floating/pages.ts @@ -0,0 +1,13 @@ +import {Page} from 'ionic/ionic'; +import {forwardRef} from 'angular2/angular2'; +import {AndroidAttribute} from '../../helpers'; + +@Page({ + templateUrl: 'labels/floating/template.html', + directives: [forwardRef(() => AndroidAttribute)] +}) +export class FloatingPage { + constructor() { + + } +} diff --git a/demos/component-docs/forms/floating.html b/demos/component-docs/labels/floating/template.html similarity index 100% rename from demos/component-docs/forms/floating.html rename to demos/component-docs/labels/floating/template.html diff --git a/demos/component-docs/labels/inline/pages.ts b/demos/component-docs/labels/inline/pages.ts new file mode 100644 index 0000000000..9662648399 --- /dev/null +++ b/demos/component-docs/labels/inline/pages.ts @@ -0,0 +1,13 @@ +import {Page} from 'ionic/ionic'; +import {forwardRef} from 'angular2/angular2'; +import {AndroidAttribute} from '../../helpers'; + +@Page({ + templateUrl: 'labels/inline/template.html', + directives: [forwardRef(() => AndroidAttribute)] +}) +export class InlinePage { + constructor() { + + } +} diff --git a/demos/component-docs/forms/inline.html b/demos/component-docs/labels/inline/template.html similarity index 100% rename from demos/component-docs/forms/inline.html rename to demos/component-docs/labels/inline/template.html diff --git a/demos/component-docs/labels/inset/pages.ts b/demos/component-docs/labels/inset/pages.ts new file mode 100644 index 0000000000..38d1970d2a --- /dev/null +++ b/demos/component-docs/labels/inset/pages.ts @@ -0,0 +1,13 @@ +import {Page} from 'ionic/ionic'; +import {forwardRef} from 'angular2/angular2'; +import {AndroidAttribute} from '../../helpers'; + +@Page({ + templateUrl: 'labels/inset/template.html', + directives: [forwardRef(() => AndroidAttribute)] +}) +export class InsetPage { + constructor() { + + } +} diff --git a/demos/component-docs/forms/inset.html b/demos/component-docs/labels/inset/template.html similarity index 100% rename from demos/component-docs/forms/inset.html rename to demos/component-docs/labels/inset/template.html diff --git a/demos/component-docs/labels/labels.ts b/demos/component-docs/labels/labels.ts new file mode 100644 index 0000000000..f5c659c2a4 --- /dev/null +++ b/demos/component-docs/labels/labels.ts @@ -0,0 +1,7 @@ +export * from './basic/pages'; +export * from './fixed-inline/pages'; +export * from './floating/pages'; +export * from './inline/pages'; +export * from './inset/pages'; +export * from './placeholder/pages'; +export * from './stacked/pages'; diff --git a/demos/component-docs/labels/placeholder/pages.ts b/demos/component-docs/labels/placeholder/pages.ts new file mode 100644 index 0000000000..a9c06d31c5 --- /dev/null +++ b/demos/component-docs/labels/placeholder/pages.ts @@ -0,0 +1,13 @@ +import {Page} from 'ionic/ionic'; +import {forwardRef} from 'angular2/angular2'; +import {AndroidAttribute} from '../../helpers'; + +@Page({ + templateUrl: 'labels/placeholder/template.html', + directives: [forwardRef(() => AndroidAttribute)] +}) +export class PlaceholderPage { + constructor() { + + } +} diff --git a/demos/component-docs/forms/placeholder.html b/demos/component-docs/labels/placeholder/template.html similarity index 100% rename from demos/component-docs/forms/placeholder.html rename to demos/component-docs/labels/placeholder/template.html diff --git a/demos/component-docs/labels/stacked/pages.ts b/demos/component-docs/labels/stacked/pages.ts new file mode 100644 index 0000000000..e3653e9ef7 --- /dev/null +++ b/demos/component-docs/labels/stacked/pages.ts @@ -0,0 +1,13 @@ +import {Page} from 'ionic/ionic'; +import {forwardRef} from 'angular2/angular2'; +import {AndroidAttribute} from '../../helpers'; + +@Page({ + templateUrl: 'labels/stacked/template.html', + directives: [forwardRef(() => AndroidAttribute)] +}) +export class StackedPage { + constructor() { + + } +} \ No newline at end of file diff --git a/demos/component-docs/forms/stacked.html b/demos/component-docs/labels/stacked/template.html similarity index 100% rename from demos/component-docs/forms/stacked.html rename to demos/component-docs/labels/stacked/template.html diff --git a/demos/component-docs/lists/avatar/pages.ts b/demos/component-docs/lists/avatar/pages.ts new file mode 100644 index 0000000000..093143d0ac --- /dev/null +++ b/demos/component-docs/lists/avatar/pages.ts @@ -0,0 +1,13 @@ +import {Page} from 'ionic/ionic'; +import {forwardRef} from 'angular2/angular2'; +import {AndroidAttribute} from '../../helpers'; + +@Page({ + templateUrl: 'lists/avatar/template.html', + directives: [forwardRef(() => AndroidAttribute)] +}) +export class AvatarPage { + constructor() { + + } +} diff --git a/demos/component-docs/lists/avatar-lists.html b/demos/component-docs/lists/avatar/template.html similarity index 100% rename from demos/component-docs/lists/avatar-lists.html rename to demos/component-docs/lists/avatar/template.html diff --git a/demos/component-docs/lists/basic/pages.ts b/demos/component-docs/lists/basic/pages.ts new file mode 100644 index 0000000000..95d94e8b27 --- /dev/null +++ b/demos/component-docs/lists/basic/pages.ts @@ -0,0 +1,13 @@ +import {Page} from 'ionic/ionic'; +import {forwardRef} from 'angular2/angular2'; +import {AndroidAttribute} from '../../helpers'; + +@Page({ + templateUrl: 'lists/basic/template.html', + directives: [forwardRef(() => AndroidAttribute)] +}) +export class BasicPage { + constructor() { + + } +} diff --git a/demos/component-docs/lists/basic-lists.html b/demos/component-docs/lists/basic/template.html similarity index 100% rename from demos/component-docs/lists/basic-lists.html rename to demos/component-docs/lists/basic/template.html diff --git a/demos/component-docs/lists/headers/pages.ts b/demos/component-docs/lists/headers/pages.ts new file mode 100644 index 0000000000..ca0cff5836 --- /dev/null +++ b/demos/component-docs/lists/headers/pages.ts @@ -0,0 +1,13 @@ +import {Page} from 'ionic/ionic'; +import {forwardRef} from 'angular2/angular2'; +import {AndroidAttribute} from '../../helpers'; + +@Page({ + templateUrl: 'lists/headers/template.html', + directives: [forwardRef(() => AndroidAttribute)] +}) +export class HeadersPage { + constructor() { + + } +} \ No newline at end of file diff --git a/demos/component-docs/lists/list-headers.html b/demos/component-docs/lists/headers/template.html similarity index 100% rename from demos/component-docs/lists/list-headers.html rename to demos/component-docs/lists/headers/template.html diff --git a/demos/component-docs/lists/icon/pages.ts b/demos/component-docs/lists/icon/pages.ts new file mode 100644 index 0000000000..fc8b793387 --- /dev/null +++ b/demos/component-docs/lists/icon/pages.ts @@ -0,0 +1,13 @@ +import {Page} from 'ionic/ionic'; +import {forwardRef} from 'angular2/angular2'; +import {AndroidAttribute} from '../../helpers'; + +@Page({ + templateUrl: 'lists/icon/template.html', + directives: [forwardRef(() => AndroidAttribute)] +}) +export class IconPage { + constructor() { + + } +} \ No newline at end of file diff --git a/demos/component-docs/lists/icon-lists.html b/demos/component-docs/lists/icon/template.html similarity index 100% rename from demos/component-docs/lists/icon-lists.html rename to demos/component-docs/lists/icon/template.html diff --git a/demos/component-docs/lists/inset/pages.ts b/demos/component-docs/lists/inset/pages.ts new file mode 100644 index 0000000000..1fe37e593d --- /dev/null +++ b/demos/component-docs/lists/inset/pages.ts @@ -0,0 +1,13 @@ +import {Page} from 'ionic/ionic'; +import {forwardRef} from 'angular2/angular2'; +import {AndroidAttribute} from '../../helpers'; + +@Page({ + templateUrl: 'lists/inset/template.html', + directives: [forwardRef(() => AndroidAttribute)] +}) +export class InsetPage { + constructor() { + + } +} \ No newline at end of file diff --git a/demos/component-docs/lists/inset-lists.html b/demos/component-docs/lists/inset/template.html similarity index 100% rename from demos/component-docs/lists/inset-lists.html rename to demos/component-docs/lists/inset/template.html diff --git a/demos/component-docs/lists/lines/pages.ts b/demos/component-docs/lists/lines/pages.ts new file mode 100644 index 0000000000..18f88178c5 --- /dev/null +++ b/demos/component-docs/lists/lines/pages.ts @@ -0,0 +1,13 @@ +import {Page} from 'ionic/ionic'; +import {forwardRef} from 'angular2/angular2'; +import {AndroidAttribute} from '../../helpers'; + +@Page({ + templateUrl: 'lists/lines/template.html', + directives: [forwardRef(() => AndroidAttribute)] +}) +export class LinesPage { + constructor() { + + } +} \ No newline at end of file diff --git a/demos/component-docs/lists/dividers.html b/demos/component-docs/lists/lines/template.html similarity index 100% rename from demos/component-docs/lists/dividers.html rename to demos/component-docs/lists/lines/template.html diff --git a/demos/component-docs/lists/lists.ts b/demos/component-docs/lists/lists.ts index 2355607fc3..d511fd2df4 100644 --- a/demos/component-docs/lists/lists.ts +++ b/demos/component-docs/lists/lists.ts @@ -1,84 +1,8 @@ -import {Page} from 'ionic/ionic'; -import {forwardRef} from 'angular2/angular2'; -import {AndroidAttribute} from '../helpers'; - - -@Page({ - templateUrl: 'lists/basic-lists.html', - directives: [forwardRef(() => AndroidAttribute)] -}) -export class BasicListsPage { - constructor() { - - } -} - -@Page({ - templateUrl: 'lists/dividers.html', - directives: [forwardRef(() => AndroidAttribute)] -}) -export class BasicDividersPage { - constructor() { - - } -} - -@Page({ - templateUrl: 'lists/inset-lists.html', - directives: [forwardRef(() => AndroidAttribute)] -}) -export class BasicInsetListsPage { - constructor() { - - } -} - -@Page({ - templateUrl: 'lists/list-headers.html', - directives: [forwardRef(() => AndroidAttribute)] -}) -export class ListHeadersPage { - constructor() { - - } -} - -@Page({ - templateUrl: 'lists/icon-lists.html', - directives: [forwardRef(() => AndroidAttribute)] -}) -export class IconListsPage { - constructor() { - - } -} - -@Page({ - templateUrl: 'lists/avatar-lists.html', - directives: [forwardRef(() => AndroidAttribute)] -}) -export class AvatarListsPage { - constructor() { - - } -} - -@Page({ - templateUrl: 'lists/multiline-lists.html', - directives: [forwardRef(() => AndroidAttribute)] -}) -export class MultilineListsPage { - constructor() { - - } -} - -@Page({ - templateUrl: 'lists/thumbnail-lists.html', - directives: [forwardRef(() => AndroidAttribute)] -}) -export class ThumbnailListsPage { - constructor() { - - } -} +export * from './avatar/pages'; +export * from './basic/pages'; +export * from './headers/pages'; +export * from './icon/pages'; +export * from './inset/pages'; +export * from './lines/pages'; +export * from './multiline/pages'; +export * from './thumbnail/pages'; diff --git a/demos/component-docs/lists/multiline/pages.ts b/demos/component-docs/lists/multiline/pages.ts new file mode 100644 index 0000000000..391900f886 --- /dev/null +++ b/demos/component-docs/lists/multiline/pages.ts @@ -0,0 +1,13 @@ +import {Page} from 'ionic/ionic'; +import {forwardRef} from 'angular2/angular2'; +import {AndroidAttribute} from '../../helpers'; + +@Page({ + templateUrl: 'lists/multiline/template.html', + directives: [forwardRef(() => AndroidAttribute)] +}) +export class MultilinePage { + constructor() { + + } +} diff --git a/demos/component-docs/lists/multiline-lists.html b/demos/component-docs/lists/multiline/template.html similarity index 100% rename from demos/component-docs/lists/multiline-lists.html rename to demos/component-docs/lists/multiline/template.html diff --git a/demos/component-docs/lists/thumbnail/pages.ts b/demos/component-docs/lists/thumbnail/pages.ts new file mode 100644 index 0000000000..395d67af97 --- /dev/null +++ b/demos/component-docs/lists/thumbnail/pages.ts @@ -0,0 +1,13 @@ +import {Page} from 'ionic/ionic'; +import {forwardRef} from 'angular2/angular2'; +import {AndroidAttribute} from '../../helpers'; + +@Page({ + templateUrl: 'lists/thumbnail/template.html', + directives: [forwardRef(() => AndroidAttribute)] +}) +export class ThumbnailPage { + constructor() { + + } +} \ No newline at end of file diff --git a/demos/component-docs/lists/thumbnail-lists.html b/demos/component-docs/lists/thumbnail/template.html similarity index 100% rename from demos/component-docs/lists/thumbnail-lists.html rename to demos/component-docs/lists/thumbnail/template.html diff --git a/demos/component-docs/menus/menu-events.html b/demos/component-docs/menus/basic/menu-events.html similarity index 100% rename from demos/component-docs/menus/menu-events.html rename to demos/component-docs/menus/basic/menu-events.html diff --git a/demos/component-docs/menus/menu-friends.html b/demos/component-docs/menus/basic/menu-friends.html similarity index 100% rename from demos/component-docs/menus/menu-friends.html rename to demos/component-docs/menus/basic/menu-friends.html diff --git a/demos/component-docs/menus/menu-home.html b/demos/component-docs/menus/basic/menu-home.html similarity index 100% rename from demos/component-docs/menus/menu-home.html rename to demos/component-docs/menus/basic/menu-home.html diff --git a/demos/component-docs/menus/menu-places.html b/demos/component-docs/menus/basic/menu-places.html similarity index 100% rename from demos/component-docs/menus/menu-places.html rename to demos/component-docs/menus/basic/menu-places.html diff --git a/demos/component-docs/menus/basic/pages.ts b/demos/component-docs/menus/basic/pages.ts new file mode 100644 index 0000000000..9aafc69e09 --- /dev/null +++ b/demos/component-docs/menus/basic/pages.ts @@ -0,0 +1,35 @@ +import {App, IonicApp, Page} from 'ionic/ionic'; +import {forwardRef} from 'angular2/angular2'; +import * as helpers from '../../helpers'; + +@Page({ + templateUrl: 'menus/basic/menu-home.html', + directives: [forwardRef(() => helpers.AndroidAttribute)] +}) +export class BasicPage{ + constructor() { + } +} + +@Page({ + templateUrl: 'menus/basic/menu-home.html', + directives: [forwardRef(() => helpers.AndroidAttribute)] +}) +export class PageOne{ + constructor() { + } +} + +@Page({ + templateUrl: 'menus/basic/menu-friends.html', + directives: [forwardRef(() => helpers.AndroidAttribute)] +}) +export class PageTwo{ +} + +@Page({ + templateUrl: 'menus/basic/menu-events.html', + directives: [forwardRef(() => helpers.AndroidAttribute)] +}) +export class PageThree{ +} diff --git a/demos/component-docs/menus/menus.ts b/demos/component-docs/menus/menus.ts index c2a243317e..ebdd570b29 100644 --- a/demos/component-docs/menus/menus.ts +++ b/demos/component-docs/menus/menus.ts @@ -1,35 +1 @@ -import {App, IonicApp, Page} from 'ionic/ionic'; -import {forwardRef} from 'angular2/angular2'; -import * as helpers from '../helpers'; - -@Page({ - templateUrl: 'menus/menu-home.html', - directives: [forwardRef(() => helpers.AndroidAttribute)] -}) -export class MenusPage{ - constructor() { - } -} - -@Page({ - templateUrl: 'menus/menu-home.html', - directives: [forwardRef(() => helpers.AndroidAttribute)] -}) -export class PageOne{ - constructor() { - } -} - -@Page({ - templateUrl: 'menus/menu-friends.html', - directives: [forwardRef(() => helpers.AndroidAttribute)] -}) -export class PageTwo{ -} - -@Page({ - templateUrl: 'menus/menu-events.html', - directives: [forwardRef(() => helpers.AndroidAttribute)] -}) -export class PageThree{ -} +export * from './basic/pages'; diff --git a/demos/component-docs/modals/modals-content.html b/demos/component-docs/modals/basic/modals-content.html similarity index 100% rename from demos/component-docs/modals/modals-content.html rename to demos/component-docs/modals/basic/modals-content.html diff --git a/demos/component-docs/modals/basic/pages.ts b/demos/component-docs/modals/basic/pages.ts new file mode 100644 index 0000000000..16476689d9 --- /dev/null +++ b/demos/component-docs/modals/basic/pages.ts @@ -0,0 +1,63 @@ +import {App, IonicApp, Animation, Modal, NavController, Page, Events} from 'ionic/ionic'; +import {forwardRef} from 'angular2/angular2'; +import * as helpers from '../../helpers'; + + +@Page({ + templateUrl: 'modals/basic/template.html', + directives: [forwardRef(() => helpers.AndroidAttribute)] +}) +class ModalsFirstPage { + + constructor( + nav: NavController, + modal: Modal, + events: Events + ) { + this.nav = nav; + this.modal = modal; + } + + openModal() { + this.modal.open(ModalsContentPage); + } + +} + +@Page({ + templateUrl: 'modals/basic/modals-content.html', + directives: [forwardRef(() => helpers.AndroidAttribute)] + +}) +class ModalsContentPage { + + constructor( + modal: Modal, + events: Events + ) { + this.modal = modal; + } + + closeModal() { + let modal = this.modal.get(); + if (modal) { + modal.close(); + } + } +} + +@Page({ + template: '' +}) +export class BasicPage { + constructor(modal: Modal) { + this.rootView = ModalsFirstPage; + this.modal = modal; + } + onPageWillLeave() { + let modal = this.modal.get(); + if (modal) { + modal.close(); + } + } +} diff --git a/demos/component-docs/modals/modals.html b/demos/component-docs/modals/basic/template.html similarity index 100% rename from demos/component-docs/modals/modals.html rename to demos/component-docs/modals/basic/template.html diff --git a/demos/component-docs/modals/modals.ts b/demos/component-docs/modals/modals.ts index a77ef2ac4a..ebdd570b29 100644 --- a/demos/component-docs/modals/modals.ts +++ b/demos/component-docs/modals/modals.ts @@ -1,63 +1 @@ -import {App, IonicApp, Animation, Modal, NavController, Page, Events} from 'ionic/ionic'; -import {forwardRef} from 'angular2/angular2'; -import * as helpers from '../helpers'; - - -@Page({ - templateUrl: 'modals/modals.html', - directives: [forwardRef(() => helpers.AndroidAttribute)] -}) -class ModalsFirstPage { - - constructor( - nav: NavController, - modal: Modal, - events: Events - ) { - this.nav = nav; - this.modal = modal; - } - - openModal() { - this.modal.open(ModalsContentPage); - } - -} - -@Page({ - templateUrl: 'modals/modals-content.html', - directives: [forwardRef(() => helpers.AndroidAttribute)] - -}) -class ModalsContentPage { - - constructor( - modal: Modal, - events: Events - ) { - this.modal = modal; - } - - closeModal() { - let modal = this.modal.get(); - if (modal) { - modal.close(); - } - } -} - -@Page({ - template: '' -}) -export class ModalsPage { - constructor(modal: Modal) { - this.rootView = ModalsFirstPage; - this.modal = modal; - } - onPageWillLeave() { - let modal = this.modal.get(); - if (modal) { - modal.close(); - } - } -} +export * from './basic/pages'; diff --git a/demos/component-docs/navigation/navigation-details.html b/demos/component-docs/navigation/basic/navigation-details.html similarity index 100% rename from demos/component-docs/navigation/navigation-details.html rename to demos/component-docs/navigation/basic/navigation-details.html diff --git a/demos/component-docs/navigation/navigation.html b/demos/component-docs/navigation/basic/navigation.html similarity index 100% rename from demos/component-docs/navigation/navigation.html rename to demos/component-docs/navigation/basic/navigation.html diff --git a/demos/component-docs/navigation/basic/pages.ts b/demos/component-docs/navigation/basic/pages.ts new file mode 100644 index 0000000000..7311c98765 --- /dev/null +++ b/demos/component-docs/navigation/basic/pages.ts @@ -0,0 +1,45 @@ +import {NavController, NavParams} from 'ionic/ionic'; +import {Page, Events} from 'ionic/ionic'; +import {forwardRef} from 'angular2/angular2'; +import * as helpers from '../../helpers'; + +@Page({ + templateUrl: 'navigation/basic/navigation-details.html', + directives: [forwardRef(() => helpers.AndroidAttribute)] +}) +class NavigationDetailsPage { + constructor(nav: NavController, params: NavParams, events: Events) { + this.nav = nav; + this.selection = { title: params.data.name }; + var navData = { + 'Angular': "A powerful Javascript framework for building single page apps. Angular is open source, and maintained by Google.", + 'CSS3': "The latest version of cascading stylesheets - the styling language of the web!", + 'HTML5': "The latest version of the web's markup language.", + 'Sass': "Syntactically Awesome Stylesheets - a mature, stable, and powerful professional grade CSS extension." + }; + var navIcons = { + 'Angular': 'ion-social-angular', + 'CSS3': 'ion-social-css3', + 'HTML5': 'ion-social-html5', + 'Sass': 'ion-social-sass' + }; + this.selection['content'] = navData[this.selection.title]; + this.selection['icon'] = navIcons[this.selection.title]; + } +} + +@Page({ + templateUrl: 'navigation/basic/navigation.html', + directives: [forwardRef(() => helpers.AndroidAttribute)] +}) +export class BasicPage { + + constructor(nav: NavController) { + this.nav = nav; + } + + openNavDetailsPage(item) { + this.nav.push(NavigationDetailsPage, { name: item }); + } + +} diff --git a/demos/component-docs/navigation/navigation.ts b/demos/component-docs/navigation/navigation.ts index 98d937eebc..ebdd570b29 100644 --- a/demos/component-docs/navigation/navigation.ts +++ b/demos/component-docs/navigation/navigation.ts @@ -1,45 +1 @@ -import {NavController, NavParams} from 'ionic/ionic'; -import {Page, Events} from 'ionic/ionic'; -import {forwardRef} from 'angular2/angular2'; -import * as helpers from '../helpers'; - -@Page({ - templateUrl: 'navigation/navigation-details.html', - directives: [forwardRef(() => helpers.AndroidAttribute)] -}) -class NavigationDetailsPage { - constructor(nav: NavController, params: NavParams, events: Events) { - this.nav = nav; - this.selection = { title: params.data.name }; - var navData = { - 'Angular': "A powerful Javascript framework for building single page apps. Angular is open source, and maintained by Google.", - 'CSS3': "The latest version of cascading stylesheets - the styling language of the web!", - 'HTML5': "The latest version of the web's markup language.", - 'Sass': "Syntactically Awesome Stylesheets - a mature, stable, and powerful professional grade CSS extension." - }; - var navIcons = { - 'Angular': 'ion-social-angular', - 'CSS3': 'ion-social-css3', - 'HTML5': 'ion-social-html5', - 'Sass': 'ion-social-sass' - }; - this.selection['content'] = navData[this.selection.title]; - this.selection['icon'] = navIcons[this.selection.title]; - } -} - -@Page({ - templateUrl: 'navigation/navigation.html', - directives: [forwardRef(() => helpers.AndroidAttribute)] -}) -export class NavigationPage { - - constructor(nav: NavController) { - this.nav = nav; - } - - openNavDetailsPage(item) { - this.nav.push(NavigationDetailsPage, { name: item }); - } - -} +export * from './basic/pages'; diff --git a/demos/component-docs/popups/basic/pages.ts b/demos/component-docs/popups/basic/pages.ts new file mode 100644 index 0000000000..39a21ee4a3 --- /dev/null +++ b/demos/component-docs/popups/basic/pages.ts @@ -0,0 +1,50 @@ +import {Page, Popup} from 'ionic/ionic'; +import {AndroidAttribute} from '../../helpers'; +import {forwardRef} from 'angular2/angular2'; + + +@Page({ + templateUrl: 'popups/basic/template.html', + directives: [forwardRef(() => AndroidAttribute)] +}) +export class BasicPage { + + constructor(popup: Popup) { + this.popup = popup; + } + + doAlert() { + this.popup.alert({ + title: "New Friend!", + template: "Your friend, Obi wan Kenobi, just accepted your friend request!", + cssClass: 'my-alert' + }); + } + + doPrompt() { + this.popup.prompt({ + title: "New Album", + template: "Enter a name for this new album you're so keen on adding", + inputPlaceholder: "Title", + okText: "Save" + }); + } + + doConfirm() { + this.popup.confirm({ + title: "Use this lightsaber?", + template: "Do you agree to use this lightsaber to do good across the intergalactic galaxy?", + cancelText: "Disagree", + okText: "Agree" + }); + } + + onPageWillLeave() { + let popup = this.popup.get(); + // only try to close if there is an active popup + if (popup) { + popup.close(); + } + } + +} diff --git a/demos/component-docs/popups/popups.html b/demos/component-docs/popups/basic/template.html similarity index 100% rename from demos/component-docs/popups/popups.html rename to demos/component-docs/popups/basic/template.html diff --git a/demos/component-docs/popups/popups.ts b/demos/component-docs/popups/popups.ts index 1ac072fc75..ebdd570b29 100644 --- a/demos/component-docs/popups/popups.ts +++ b/demos/component-docs/popups/popups.ts @@ -1,50 +1 @@ -import {Page, Popup} from 'ionic/ionic'; -import {AndroidAttribute} from '../helpers'; -import {forwardRef} from 'angular2/angular2'; - - -@Page({ - templateUrl: 'popups/popups.html', - directives: [forwardRef(() => AndroidAttribute)] -}) -export class PopupsPage { - - constructor(popup: Popup) { - this.popup = popup; - } - - doAlert() { - this.popup.alert({ - title: "New Friend!", - template: "Your friend, Obi wan Kenobi, just accepted your friend request!", - cssClass: 'my-alert' - }); - } - - doPrompt() { - this.popup.prompt({ - title: "New Album", - template: "Enter a name for this new album you're so keen on adding", - inputPlaceholder: "Title", - okText: "Save" - }); - } - - doConfirm() { - this.popup.confirm({ - title: "Use this lightsaber?", - template: "Do you agree to use this lightsaber to do good across the intergalactic galaxy?", - cancelText: "Disagree", - okText: "Agree" - }); - } - - onPageWillLeave() { - let popup = this.popup.get(); - // only try to close if there is an active popup - if (popup) { - popup.close(); - } - } - -} +export * from './basic/pages'; diff --git a/demos/component-docs/slides/basic/pages.ts b/demos/component-docs/slides/basic/pages.ts new file mode 100644 index 0000000000..a4a3bfb775 --- /dev/null +++ b/demos/component-docs/slides/basic/pages.ts @@ -0,0 +1,13 @@ +import {Page} from 'ionic/ionic'; +import {forwardRef} from 'angular2/angular2'; +import {AndroidAttribute} from '../../helpers'; + +@Page({ + templateUrl: 'slides/basic/slides.html', + directives: [forwardRef(() => AndroidAttribute)] +}) +export class BasicPage { + constructor() { + + } +} diff --git a/demos/component-docs/slides/slides.html b/demos/component-docs/slides/basic/template.html similarity index 100% rename from demos/component-docs/slides/slides.html rename to demos/component-docs/slides/basic/template.html diff --git a/demos/component-docs/slides/slides.ts b/demos/component-docs/slides/slides.ts index 8d83c79553..ebdd570b29 100644 --- a/demos/component-docs/slides/slides.ts +++ b/demos/component-docs/slides/slides.ts @@ -1,13 +1 @@ -import {Page} from 'ionic/ionic'; -import {forwardRef} from 'angular2/angular2'; -import {AndroidAttribute} from '../helpers'; - -@Page({ - templateUrl: 'slides/slides.html', - directives: [forwardRef(() => AndroidAttribute)] -}) -export class SlidesPage { - constructor() { - - } -} +export * from './basic/pages'; diff --git a/demos/component-docs/tabs/basic/pages.ts b/demos/component-docs/tabs/basic/pages.ts new file mode 100644 index 0000000000..790ee99003 --- /dev/null +++ b/demos/component-docs/tabs/basic/pages.ts @@ -0,0 +1,38 @@ +import {NavController, NavParams} from 'ionic/ionic'; +import {Page, ViewController} from 'ionic/ionic'; +import {forwardRef} from 'angular2/angular2'; +import * as helpers from '../../helpers'; + + +@Page({ + template: '' + + '' + + 'Tabs' + + '' + + '' + + '', + directives: [forwardRef(() => helpers.AndroidAttribute)], +}) +class TabTextCtrl { + constructor(nav: NavController, view: ViewController) { + this.nav = nav; + this.view = view; + } +} + +@Page({ + template: + '' + + '' + + '' + + '' + + '', +}) +export class BasicPage { + constructor(nav: NavController, params: NavParams) { + this.nav = nav; + this.tabOne = TabTextCtrl; + this.tabTwo = TabTextCtrl; + this.tabThree = TabTextCtrl; + } +} diff --git a/demos/component-docs/tabs/tabs-icon-text.ts b/demos/component-docs/tabs/icon-text/pages.ts similarity index 94% rename from demos/component-docs/tabs/tabs-icon-text.ts rename to demos/component-docs/tabs/icon-text/pages.ts index ba2a6feeb4..3a307dff63 100644 --- a/demos/component-docs/tabs/tabs-icon-text.ts +++ b/demos/component-docs/tabs/icon-text/pages.ts @@ -1,7 +1,7 @@ import {NavController, NavParams} from 'ionic/ionic'; import {Page, ViewController} from 'ionic/ionic'; import {forwardRef} from 'angular2/angular2'; -import * as helpers from '../helpers'; +import * as helpers from '../../helpers'; @Page({ @@ -29,7 +29,7 @@ class TabIconTextCtrl { '' + '', }) -export class TabsIconTextPage { +export class IconTextPage { constructor(nav: NavController, params: NavParams) { this.nav = nav; this.tabOne = TabIconTextCtrl; diff --git a/demos/component-docs/tabs/tabs-icon.ts b/demos/component-docs/tabs/icon/pages.ts similarity index 93% rename from demos/component-docs/tabs/tabs-icon.ts rename to demos/component-docs/tabs/icon/pages.ts index 24c242563b..3fe603e782 100644 --- a/demos/component-docs/tabs/tabs-icon.ts +++ b/demos/component-docs/tabs/icon/pages.ts @@ -1,7 +1,7 @@ import {NavController, NavParams} from 'ionic/ionic'; import {Page, ViewController} from 'ionic/ionic'; import {forwardRef} from 'angular2/angular2'; -import * as helpers from '../helpers'; +import * as helpers from '../../helpers'; @Page({ @@ -29,7 +29,7 @@ class TabIconCtrl { '' + '', }) -export class TabsIconPage { +export class IconPage { constructor(nav: NavController, params: NavParams) { this.nav = nav; this.tabOne = TabIconCtrl; diff --git a/demos/component-docs/tabs/tabs.ts b/demos/component-docs/tabs/tabs.ts index cf7bdb4761..5b3fc3bfcd 100644 --- a/demos/component-docs/tabs/tabs.ts +++ b/demos/component-docs/tabs/tabs.ts @@ -1,38 +1,3 @@ -import {NavController, NavParams} from 'ionic/ionic'; -import {Page, ViewController} from 'ionic/ionic'; -import {forwardRef} from 'angular2/angular2'; -import * as helpers from '../helpers'; - - -@Page({ - template: '' + - '' + - 'Tabs' + - '' + - '' + - '', - directives: [forwardRef(() => helpers.AndroidAttribute)], -}) -class TabTextCtrl { - constructor(nav: NavController, view: ViewController) { - this.nav = nav; - this.view = view; - } -} - -@Page({ - template: - '' + - '' + - '' + - '' + - '', -}) -export class TabsPage { - constructor(nav: NavController, params: NavParams) { - this.nav = nav; - this.tabOne = TabTextCtrl; - this.tabTwo = TabTextCtrl; - this.tabThree = TabTextCtrl; - } -} +export * from './basic/pages'; +export * from './icon/pages'; +export * from './icon-text/pages';