Skip to content

Commit 90fd588

Browse files
yannbfyannbf
committed
removed a few things and added some other
1 parent a364063 commit 90fd588

35 files changed

+119
-656
lines changed

‎src/app/app.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { LoginListPage } from '../pages/login/login';
33
import { ThemingPage } from '../pages/theming/theming';
44
import { AppState } from './app.global';
55
import { SlidesPage } from '../pages/slide/slide';
6-
import { ModalsPage } from '../pages/modal/modal';
6+
import { PopupModalsPage } from '../pages/popup-modal/popup-modal';
77
import { ListsPage } from '../pages/list/list';
88
import { PopupMenuListPage } from '../pages/popup-menu/popup-menu';
99
import { MiscellaneousListPage } from '../pages/miscellaneous/miscellaneous';
@@ -33,7 +33,7 @@ export class MyApp {
3333
{ title: 'Ionic Official Components', component: IonicOfficialComponentsPage },
3434
{ title: 'Login', component: LoginListPage },
3535
{ title: 'Lists', component: ListsPage },
36-
{ title: 'Modals', component: ModalsPage },
36+
{ title: 'Popup Modal', component: PopupModalsPage },
3737
{ title: 'Miscellaneous', component: MiscellaneousListPage },
3838
{ title: 'Popup Menu', component: PopupMenuListPage },
3939
{ title: 'Profile', component: ProfileListPage },

‎src/app/app.imports.ts

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,10 @@ import { IconButtonsPage } from '../pages/ionic-official-components/button/icon-
4747
import { ButtonComponentsPage } from '../pages/ionic-official-components/button/button-components/button-components';
4848

4949
// Modals
50-
import { ModalsPage } from '../pages/modal/modal';
51-
import { FullModalsPage } from '../pages/modal/full-modal/full-modal';
52-
import { BasicModalPage } from '../pages/modal/full-modal/basic-modal/basic-modal';
53-
import { ParamsModalPage } from '../pages/modal/full-modal/params-modal/params-modal';
54-
import { SmallModalsPage } from '../pages/modal/small-modal/small-modal';
55-
import { HintModalPage } from '../pages/modal/small-modal/hint-modal/hint-modal';
56-
import { SignupModalPage } from '../pages/modal/small-modal/signup-modal/signup-modal';
57-
import { WalkthroughModalPage } from '../pages/modal/small-modal/walkthrough-modal/walkthrough-modal';
50+
import { PopupModalsPage } from '../pages/popup-modal/popup-modal';
51+
import { HintModalPage } from '../pages/popup-modal/hint-modal/hint-modal';
52+
import { SignupModalPage } from '../pages/popup-modal/signup-modal/signup-modal';
53+
import { WalkthroughModalPage } from '../pages/popup-modal/walkthrough-modal/walkthrough-modal';
5854

5955
// Alerts
6056
import { AlertsPage } from '../pages/ionic-official-components/alert/alert';
@@ -79,7 +75,6 @@ import { ClockPage } from '../pages/miscellaneous/clock/clock';
7975
import { CountdownOnePage } from '../pages/miscellaneous/countdown/countdown';
8076
import { TinderCardsPage } from '../pages/miscellaneous/tinder-cards/tinder-cards';
8177
import { TestimonialsPage } from '../pages/miscellaneous/testimonials/testimonials';
82-
import { ParallaxScrollerPage } from '../pages/miscellaneous/parallax-scroller/parallax-scroller';
8378
import { CurrencyConverterPage } from '../pages/miscellaneous/currency-converter/currency-converter';
8479
import { WeatherPage } from '../pages/miscellaneous/weather/weather';
8580
import { MessagesPage } from '../pages/miscellaneous/chat/messages/messages';
@@ -158,7 +153,6 @@ export const Pages = [
158153
TestimonialsPage,
159154
TinderCardsPage,
160155
CountdownOnePage,
161-
ParallaxScrollerPage,
162156
CurrencyConverterPage,
163157
CreditCardScanPage,
164158
ClockPage,
@@ -171,11 +165,7 @@ export const Pages = [
171165

172166

173167
// Modals
174-
ModalsPage,
175-
FullModalsPage,
176-
BasicModalPage,
177-
ParamsModalPage,
178-
SmallModalsPage,
168+
PopupModalsPage,
179169
SignupModalPage,
180170
WalkthroughModalPage,
181171
HintModalPage,

‎src/pages/ionic-official-components/README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
These samples can be found at [ionic official documentation](ionicframework.com/docs/v2) and take little to no styling(which is what makes them amazing).
2+
3+
The only difference is that here they are not hardcoded, so you can just get them and adapt to your needs.

‎src/pages/ionic-official-components/card/card-map/card-map.html

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,12 @@ <h2>{{place.name}}</h2>
1919
<p>{{place.address}}</p>
2020
</ion-item>
2121
<ion-item actions>
22-
<span item-left color="secondary" class="item-bold">{{card.ETA}}</span>
23-
<span item-left color="subtle">{{card.distance}}</span>
22+
<span item-left ion-text color="secondary" class="item-bold">{{card.ETA}}</span>
23+
<span item-left ion-text color="subtle">{{card.distance}}</span>
2424
<button ion-button color="primary" clear item-right icon-left (click)="getDirections(card)">
2525
<ion-icon name='navigate'></ion-icon>
2626
Start
2727
</button>
2828
</ion-item>
2929
</ion-card>
3030
</ion-content>
31-

‎src/pages/miscellaneous/miscellaneous.ts

Lines changed: 20 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import { ChatsPage } from './chat/chats';
55
import { WeatherPage } from './weather/weather';
66
import { CurrencyConverterPage } from './currency-converter/currency-converter';
77
// import { ClockPage } from './clock/clock';
8-
import { ParallaxScrollerPage } from './parallax-scroller/parallax-scroller';
98
import { CountdownOnePage } from './countdown/countdown';
109
import { TestimonialsPage } from './testimonials/testimonials';
1110
import { TinderCardsPage } from './tinder-cards/tinder-cards';
@@ -25,49 +24,45 @@ export class MiscellaneousListPage {
2524
constructor(public navCtrl: NavController, public menu: MenuController) {
2625
this.items = [
2726
{
28-
title: 'Tinder Cards',
29-
page: TinderCardsPage
27+
title: 'Blog Post',
28+
page: BlogPostPage
3029
},
3130
{
3231
title: 'Charts',
3332
page: ChartsPage
3433
},
3534
{
36-
title: 'Countdown',
37-
page: CountdownOnePage
38-
},
39-
{
40-
title: 'Testimonials',
41-
page: TestimonialsPage
42-
},
43-
{
44-
title: 'Parallax Horizontal Scroller',
45-
page: ParallaxScrollerPage
35+
title: 'Chat',
36+
page: ChatsPage
4637
},
4738
{
48-
title: 'Currency Converter',
49-
page: CurrencyConverterPage
39+
title: 'Countdown',
40+
page: CountdownOnePage
5041
},
5142
{
5243
title: 'Credit Card Scanner',
5344
page: CreditCardScanPage
5445
},
46+
// {
47+
// title: 'Currency Converter',
48+
// page: CurrencyConverterPage
49+
// },
5550
{
56-
title: 'Weather',
57-
page: WeatherPage
58-
},
59-
{
60-
title: 'Chat',
61-
page: ChatsPage
51+
title: 'Runtime User Permissions',
52+
page: RuntimePermissionsPage
6253
},
6354
{
64-
title: 'Blog Post',
65-
page: BlogPostPage
55+
title: 'Testimonials',
56+
page: TestimonialsPage
6657
},
6758
{
68-
title: 'Runtime User Permissions',
69-
page: RuntimePermissionsPage
59+
title: 'Tinder Cards',
60+
page: TinderCardsPage
7061
},
62+
// {
63+
// title: 'Weather',
64+
// page: WeatherPage
65+
// },
7166
]
7267
}
7368

‎src/pages/miscellaneous/parallax-scroller/parallax-scroller.html

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

‎src/pages/miscellaneous/parallax-scroller/parallax-scroller.scss

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

‎src/pages/miscellaneous/parallax-scroller/parallax-scroller.ts

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

0 commit comments

Comments
 (0)