Skip to content

Commit e6973f6

Browse files
committed
Upgrade to latest ionic version
1 parent 27c09de commit e6973f6

File tree

19 files changed

+109
-139
lines changed

19 files changed

+109
-139
lines changed

.editorconfig

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# EditorConfig helps developers define and maintain consistent coding styles between different editors and IDEs
2+
# editorconfig.org
3+
4+
root = true
5+
6+
[*]
7+
indent_style = space
8+
indent_size = 2
9+
10+
# We recommend you to keep these unchanged
11+
end_of_line = lf
12+
charset = utf-8
13+
trim_trailing_whitespace = true
14+
insert_final_newline = true
15+
16+
[*.md]
17+
trim_trailing_whitespace = false

package.json

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,49 @@
11
{
2-
"name": "ionic-hello-world",
2+
"name": "ionic3-chat",
33
"author": "Ionic Framework",
44
"homepage": "http://ionicframework.com/",
55
"private": true,
66
"scripts": {
77
"clean": "ionic-app-scripts clean",
88
"build": "ionic-app-scripts build",
9+
"lint": "ionic-app-scripts lint",
910
"ionic:build": "ionic-app-scripts build",
1011
"ionic:serve": "ionic-app-scripts serve"
1112
},
1213
"dependencies": {
13-
"@angular/common": "5.0.0",
14-
"@angular/compiler": "5.0.0",
15-
"@angular/compiler-cli": "5.0.0",
16-
"@angular/core": "5.0.0",
17-
"@angular/forms": "5.0.0",
18-
"@angular/http": "5.0.0",
19-
"@angular/platform-browser": "5.0.0",
20-
"@angular/platform-browser-dynamic": "5.0.0",
14+
"@angular/common": "5.1.2",
15+
"@angular/compiler": "5.1.2",
16+
"@angular/compiler-cli": "5.1.2",
17+
"@angular/core": "5.1.2",
18+
"@angular/forms": "5.1.2",
19+
"@angular/http": "5.1.2",
20+
"@angular/platform-browser": "5.1.2",
21+
"@angular/platform-browser-dynamic": "5.1.2",
2122
"@ionic/storage": "2.1.3",
2223
"ionic-angular": "3.9.2",
23-
"rxjs": "5.5.2",
24-
"zone.js": "0.8.18",
25-
"@ionic-native/core": "3.12.1",
26-
"@ionic-native/splash-screen": "3.12.1",
27-
"@ionic-native/status-bar": "3.12.1",
28-
"cordova-browser": "~4.1.0",
29-
"cordova-ios": "^4.4.0",
30-
"cordova-plugin-console": "1.0.5",
31-
"cordova-plugin-device": "1.1.4",
32-
"cordova-plugin-splashscreen": "~4.0.1",
33-
"cordova-plugin-statusbar": "2.2.1",
34-
"cordova-plugin-whitelist": "1.3.1",
24+
"rxjs": "5.5.6",
25+
"zone.js": "0.8.19",
26+
"@ionic-native/core": "4.5.2",
27+
"@ionic-native/splash-screen": "4.5.2",
28+
"@ionic-native/status-bar": "4.5.2",
29+
"cordova-browser": "~5.0.3",
30+
"cordova-ios": "^4.5.4",
31+
"cordova-plugin-console": "1.1.0",
32+
"cordova-plugin-device": "2.0.0",
33+
"cordova-plugin-splashscreen": "~5.0.0",
34+
"cordova-plugin-statusbar": "2.4.0",
35+
"cordova-plugin-whitelist": "1.3.3",
3536
"ionic-plugin-keyboard": "~2.2.1",
3637
"ionicons": "3.0.0",
37-
"moment": "^2.18.1",
38+
"moment": "^2.20.1",
3839
"sw-toolbox": "3.6.0",
39-
"cordova-android": "~6.0.0"
40+
"cordova-android": "~7.0.0"
4041
},
4142
"devDependencies": {
42-
"@ionic/cli-plugin-cordova": "1.6.2",
43-
"@ionic/cli-plugin-ionic-angular": "1.4.1",
4443
"cross-spawn": "^5.1.0",
45-
"ionic": "3.13.1",
46-
"@ionic/app-scripts": "3.1.0",
47-
"typescript" : "2.4.2"
44+
"ionic": "3.19.0",
45+
"@ionic/app-scripts": "3.1.7",
46+
"typescript": "2.6.2"
4847
},
4948
"cordovaPlugins": [
5049
"cordova-plugin-whitelist",
@@ -78,4 +77,4 @@
7877
"ionic-plugin-keyboard": {}
7978
}
8079
}
81-
}
80+
}

src/app/app.component.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ import { Platform } from 'ionic-angular';
33
import { StatusBar } from '@ionic-native/status-bar';
44
import { SplashScreen } from '@ionic-native/splash-screen';
55

6-
// import { TabsPage } from '../pages/tabs/tabs';
7-
8-
96
@Component({
107
templateUrl: 'app.html'
118
})
@@ -14,8 +11,6 @@ export class MyApp {
1411

1512
constructor(platform: Platform, statusBar: StatusBar, splashScreen: SplashScreen) {
1613
platform.ready().then(() => {
17-
// Okay, so the platform is ready and our plugins are available.
18-
// Here you can do any higher level native things you might need.
1914
statusBar.styleDefault();
2015
splashScreen.hide();
2116
});

src/app/app.module.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import { NgModule, ErrorHandler } from '@angular/core';
22
import { IonicApp, IonicModule, IonicErrorHandler } from 'ionic-angular';
3-
import { HttpModule } from "@angular/http";
43
import { BrowserModule } from '@angular/platform-browser';
54

65
import { MyApp } from './app.component';
76

87
import { StatusBar } from '@ionic-native/status-bar';
98
import { SplashScreen } from '@ionic-native/splash-screen';
109
import { EmojiProvider } from '../providers/emoji';
10+
import { HttpClientModule } from "@angular/common/http";
1111

1212

1313
@NgModule({
@@ -16,12 +16,12 @@ import { EmojiProvider } from '../providers/emoji';
1616
],
1717
imports: [
1818
BrowserModule,
19-
HttpModule,
19+
HttpClientModule,
2020
IonicModule.forRoot(MyApp,{
2121
tabsHideOnSubPages:true,
22-
tabsLayout:'icon-left'
22+
tabsLayout:'icon-left',
23+
preloadModules: true
2324
}),
24-
2525
],
2626
bootstrap: [IonicApp],
2727
entryComponents: [

src/app/app.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// http://ionicframework.com/docs/v2/theming/
1+
// http://ionicframework.com/docs/theming/
22

33

44
// App Global Sass

src/components/emoji-picker/emoji-picker.ts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,6 @@ import { Component, forwardRef } from '@angular/core';
22
import { EmojiProvider } from "../../providers/emoji";
33
import { ControlValueAccessor, NG_VALUE_ACCESSOR } from "@angular/forms";
44

5-
/**
6-
* Generated class for the EmojiPickerComponent component.
7-
*
8-
* See https://angular.io/docs/ts/latest/api/core/index/ComponentMetadata-class.html
9-
* for more info on Angular Components.
10-
*/
11-
125
export const EMOJI_PICKER_VALUE_ACCESSOR: any = {
136
provide: NG_VALUE_ACCESSOR,
147
useExisting: forwardRef(() => EmojiPickerComponent),

src/declarations.d.ts

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

src/index.html

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,19 @@
1111
<link rel="manifest" href="manifest.json">
1212
<meta name="theme-color" content="#4e8ef7">
1313

14+
<!-- add to homescreen for ios -->
15+
<meta name="apple-mobile-web-app-capable" content="yes">
16+
<meta name="apple-mobile-web-app-status-bar-style" content="black">
17+
18+
<!-- cordova.js required for cordova apps (remove if not needed) -->
19+
<script src="cordova.js"></script>
20+
1421
<!-- un-comment this code to enable service worker
1522
<script>
1623
if ('serviceWorker' in navigator) {
1724
navigator.serviceWorker.register('service-worker.js')
1825
.then(() => console.log('service worker installed'))
19-
.catch(err => console.log('Error', err));
26+
.catch(err => console.error('Error', err));
2027
}
2128
</script>-->
2229

@@ -28,17 +35,14 @@
2835
<!-- Ionic's root component and where the app will load -->
2936
<ion-app></ion-app>
3037

31-
<!-- cordova.js required for cordova apps -->
32-
<script src="cordova.js"></script>
33-
3438
<!-- The polyfills js is generated during the build process -->
3539
<script src="build/polyfills.js"></script>
3640

3741
<!-- The vendor js is generated during the build process
38-
and includes all files in the node_modules directory -->
42+
It contains all of the dependencies in node_modules -->
3943
<script src="build/vendor.js"></script>
4044

41-
<!-- The bundle js is generated during the build process -->
45+
<!-- The main bundle js is generated during the build process -->
4246
<script src="build/main.js"></script>
4347

4448
</body>

src/pages/about/about.ts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,11 @@
11
import { Component } from '@angular/core';
2+
import { IonicPage } from 'ionic-angular';
23

3-
import {NavController, IonicPage} from 'ionic-angular';
44
@IonicPage()
55
@Component({
66
selector: 'page-about',
77
templateUrl: 'about.html'
88
})
99
export class AboutPage {
1010

11-
constructor(
12-
public navCtrl: NavController,
13-
) {
14-
15-
}
16-
1711
}

src/pages/chat/chat.html

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
<!--
2-
Generated template for the Chat page.
3-
4-
See http://ionicframework.com/docs/v2/components/#navigation for more info on
5-
Ionic pages and navigation.
6-
-->
71
<ion-header>
82

93
<ion-navbar>
@@ -51,7 +45,7 @@
5145
placeholder="Text Input"
5246
[(ngModel)]="editorMsg"
5347
(keyup.enter)="sendMsg()"
54-
(focus)="onFocus()">
48+
(ionFocus)="onFocus()">
5549
</ion-textarea>
5650
</ion-col>
5751
<ion-col col-2>
@@ -62,4 +56,4 @@
6256
</ion-row>
6357
</ion-grid>
6458
<emoji-picker *ngIf="showEmojiPicker" [(ngModel)]="editorMsg"></emoji-picker>
65-
</ion-footer>
59+
</ion-footer>

0 commit comments

Comments
 (0)