Skip to content

Commit 9d17555

Browse files
yannbfyannbf
committed
chore(slides): Bring slides back to life
1 parent 081ce6a commit 9d17555

File tree

18 files changed

+92
-114
lines changed

18 files changed

+92
-114
lines changed

‎src/app/app.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ export class MyApp {
4646
{ title: 'Profile', component: 'ProfileListPage', active: false, icon: 'camera' },
4747
{ title: 'Side Menu', component: 'SideMenuPage', active: false, icon: 'bookmark' },
4848
// Removed for now as there were breaking changes in slides
49-
// { title: 'Slides', component: SlidesPage },
49+
{ title: 'Slides', component: 'SlidesPage', active: false, icon: 'contact' },
5050
{ title: 'Theming', component: 'ThemingPage', active: false, icon: 'power' },
5151
];
5252

‎src/app/app.imports.ts

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,6 @@
11
// Global state (used for theming)
22
import { AppState } from './app.global';
33

4-
// Slides
5-
import { SlidesPage } from '../pages/slide/slide';
6-
import { SlideTransitionsPage } from '../pages/slide/slide-transitions/slide-transitions';
7-
import { SlideCarouselPage } from '../pages/slide/slide-carousel/slide-carousel';
8-
import { SlidePhotoGalleryPage } from '../pages/slide/slide-photo-gallery/slide-photo-gallery';
9-
import { SlideCustomPaginationPage } from '../pages/slide/slide-custom-pagination/slide-custom-pagination';
10-
import { SliderListTwoPage } from '../pages/slide/slider-list-two/slider-list-two';
11-
import { SliderListPage } from '../pages/slide/slider-list/slider-list';
12-
import { SlideMultirowPage } from '../pages/slide/slide-multirow/slide-multirow';
13-
import { SlideRightToLeftPage } from '../pages/slide/slide-rtl/slide-rtl';
14-
import { SlideFreeModePage } from '../pages/slide/slide-free-mode/slide-free-mode';
15-
import { SlideNestedPage } from '../pages/slide/slide-nested/slide-nested';
16-
import { SlideColorChangingPage } from '../pages/slide/slide-color-changing/slide-color-changing';
17-
184
// Providers
195
import { ToastService } from '../providers/util/toast.service';
206
import { AlertService } from '../providers/util/alert.service';

‎src/app/app.module.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@ import { NgModule, ErrorHandler } from '@angular/core';
33
import { IonicApp, IonicModule, IonicErrorHandler } from 'ionic-angular';
44
import { MyApp } from './app.component';
55

6-
import { Modules, Pages, Providers } from './app.imports';
6+
import { Modules, Providers } from './app.imports';
77

88
@NgModule({
99
declarations: [
1010
// App Core
1111
MyApp,
12-
Pages,
1312
],
1413
imports: [
1514
Modules,
@@ -19,7 +18,6 @@ import { Modules, Pages, Providers } from './app.imports';
1918
bootstrap: [IonicApp],
2019
entryComponents: [
2120
MyApp,
22-
Pages
2321
],
2422
providers: [Providers, { provide: ErrorHandler, useClass: IonicErrorHandler }]
2523
})

‎src/pages/slide/slide-carousel/slide-carousel.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import { Component } from '@angular/core';
22

3-
import { NavController } from 'ionic-angular';
3+
import { NavController, IonicPage } from 'ionic-angular';
44

5+
@IonicPage()
56
@Component({
67
selector: 'page-slide-carousel',
78
templateUrl: 'slide-carousel.html'

‎src/pages/slide/slide-color-changing/slide-color-changing.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { Component } from '@angular/core';
2-
import { AlertController, NavController, Slides } from 'ionic-angular';
3-
import { ViewChild } from '@angular/core';
1+
import { Component, ViewChild } from '@angular/core';
2+
import { AlertController, NavController, Slides, IonicPage } from 'ionic-angular';
43

4+
@IonicPage()
55
@Component({
66
selector: 'page-slide-color-changing',
77
templateUrl: 'slide-color-changing.html'

‎src/pages/slide/slide-custom-pagination/slide-custom-pagination.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { Component } from '@angular/core';
2-
import { AlertController, NavController, Slides } from 'ionic-angular';
3-
import { ViewChild } from '@angular/core';
1+
import { Component, ViewChild } from '@angular/core';
2+
import { AlertController, NavController, Slides, IonicPage } from 'ionic-angular';
43

4+
@IonicPage()
55
@Component({
66
selector: 'page-slide-custom-pagination',
77
templateUrl: 'slide-custom-pagination.html'

‎src/pages/slide/slide-free-mode/slide-free-mode.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { Component } from '@angular/core';
2-
import { AlertController, NavController, Slides } from 'ionic-angular';
3-
import { ViewChild } from '@angular/core';
1+
import { Component, ViewChild } from '@angular/core';
2+
import { AlertController, NavController, Slides, IonicPage } from 'ionic-angular';
43

4+
@IonicPage()
55
@Component({
66
selector: 'page-slide-free-mode',
77
templateUrl: 'slide-free-mode.html'

‎src/pages/slide/slide-multirow/slide-multirow.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { Component } from '@angular/core';
2-
import { AlertController, NavController, Slides } from 'ionic-angular';
3-
import { ViewChild } from '@angular/core';
1+
import { Component, ViewChild } from '@angular/core';
2+
import { AlertController, NavController, Slides, IonicPage } from 'ionic-angular';
43

4+
@IonicPage()
55
@Component({
66
selector: 'page-slide-multirow',
77
templateUrl: 'slide-multirow.html'

‎src/pages/slide/slide-nested/slide-nested.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { Component } from '@angular/core';
2-
import { AlertController, NavController, Slides } from 'ionic-angular';
3-
import { ViewChild } from '@angular/core';
1+
import { Component, ViewChild } from '@angular/core';
2+
import { AlertController, NavController, Slides, IonicPage } from 'ionic-angular';
43

4+
@IonicPage()
55
@Component({
66
selector: 'page-slide-nested',
77
templateUrl: 'slide-nested.html'

‎src/pages/slide/slide-photo-gallery/slide-photo-gallery.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { Component } from '@angular/core';
2-
import { NavController } from 'ionic-angular';
2+
import { NavController, IonicPage } from 'ionic-angular';
33

4+
@IonicPage()
45
@Component({
56
selector: 'page-slide-photo-gallery',
67
templateUrl: 'slide-photo-gallery.html'

‎src/pages/slide/slide-rtl/slide-rtl.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { Component } from '@angular/core';
2-
import { AlertController, NavController, Slides } from 'ionic-angular';
3-
import { ViewChild } from '@angular/core';
1+
import { Component, ViewChild } from '@angular/core';
2+
import { AlertController, NavController, Slides, IonicPage } from 'ionic-angular';
43

4+
@IonicPage()
55
@Component({
66
selector: 'page-slide-rtl',
77
templateUrl: 'slide-rtl.html'

‎src/pages/slide/slide-transitions/slide-transitions.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { Component } from '@angular/core';
2-
import { AlertController, NavController, Slides } from 'ionic-angular';
3-
import { ViewChild } from '@angular/core';
1+
import { Component, ViewChild } from '@angular/core';
2+
import { AlertController, NavController, Slides, IonicPage } from 'ionic-angular';
43

4+
@IonicPage()
55
@Component({
66
selector: 'page-slide-transitions',
77
templateUrl: 'slide-transitions.html'
@@ -62,7 +62,8 @@ export class SlideTransitionsPage {
6262
transition = 'slide';
6363

6464
changeSlideStyle() {
65-
this.slider.noSwiping = true;
65+
this.slideEffect = 'cube';
66+
// this.slider.noSwiping = true;
6667
// Hack just to make the styles change. Without it, changing options dinamically won't work.
6768
// NOTE: You DON'T need to do this if you are using only one type of slider.
6869
setTimeout(() => this.showSlide = true, 100);

‎src/pages/slide/slide.scss

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎src/pages/slide/slide.ts

Lines changed: 0 additions & 68 deletions
This file was deleted.

‎src/pages/slide/slider-list/slider-list.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { Component } from '@angular/core';
2-
import { NavController } from 'ionic-angular';
2+
import { NavController, IonicPage } from 'ionic-angular';
33

4+
@IonicPage()
45
@Component({
56
selector: 'page-slider-list',
67
templateUrl: 'slider-list.html'

‎src/pages/slide/slide.html renamed to ‎src/pages/slide/slides.html

File renamed without changes.

‎src/pages/slide/slides.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
page-slides {
2+
3+
}

‎src/pages/slide/slides.ts

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
import { Component } from '@angular/core';
2+
import { NavController, IonicPage } from 'ionic-angular';
3+
4+
@IonicPage()
5+
@Component({
6+
selector: 'page-slides',
7+
templateUrl: 'slides.html'
8+
})
9+
export class SlidesPage {
10+
rootPage: any;
11+
items: Array<{ title: string, page: any }>;
12+
13+
constructor(public navCtrl: NavController) {
14+
this.rootPage = SlidesPage;
15+
this.items = [
16+
{
17+
title: 'Slide Transitions',
18+
page: 'SlideTransitionsPage'
19+
},
20+
{
21+
title: 'Slide Right to Left',
22+
page: 'SlideRightToLeftPage'
23+
},
24+
// {
25+
// title: 'Nested Slides',
26+
// page: SlideNestedPage
27+
// },
28+
{
29+
title: 'List of Sliders',
30+
page: 'SliderListPage'
31+
},
32+
{
33+
title: 'Color Changing Sliders',
34+
page: 'SlideColorChangingPage'
35+
},
36+
{
37+
title: 'Free Mode Slide (no fixed positions)',
38+
page: 'SlideFreeModePage'
39+
},
40+
{
41+
title: 'Custom Pagination',
42+
page: 'SlideCustomPaginationPage'
43+
},
44+
{
45+
title: 'Carousel',
46+
page: 'SlideCarouselPage'
47+
},
48+
{
49+
title: 'Photo Gallery (not working)',
50+
page: 'SlidePhotoGalleryPage'
51+
},
52+
]
53+
}
54+
55+
itemTapped(event, item) {
56+
this.navCtrl.push(item.page);
57+
}
58+
}

0 commit comments

Comments
 (0)