Commit d0f69b88 authored by Morgan McMillian's avatar Morgan McMillian

updated package dependencies

parent f02c4d62
......@@ -12,41 +12,41 @@
"ionic:serve": "ionic-app-scripts serve"
},
"dependencies": {
"@angular/common": "4.1.2",
"@angular/compiler": "4.1.2",
"@angular/compiler-cli": "4.1.2",
"@angular/core": "4.1.2",
"@angular/forms": "4.1.2",
"@angular/http": "4.1.2",
"@angular/platform-browser": "4.1.2",
"@angular/platform-browser-dynamic": "4.1.2",
"@ionic-native/core": "3.10.2",
"@ionic-native/splash-screen": "3.10.2",
"@ionic-native/status-bar": "3.10.2",
"@ionic/storage": "2.0.1",
"cordova-android": "^6.2.3",
"@angular/common": "5.2.5",
"@angular/compiler": "5.2.5",
"@angular/compiler-cli": "5.2.5",
"@angular/core": "5.2.5",
"@angular/forms": "5.2.5",
"@angular/http": "5.2.5",
"@angular/platform-browser": "5.2.5",
"@angular/platform-browser-dynamic": "5.2.5",
"@ionic-native/core": "4.5.3",
"@ionic-native/splash-screen": "4.5.3",
"@ionic-native/status-bar": "4.5.3",
"@ionic/storage": "2.1.3",
"cordova-android": "^7.0.0",
"cordova-plugin-console": "^1.0.5",
"cordova-plugin-device": "^1.1.4",
"cordova-plugin-inappbrowser": "^1.7.1",
"cordova-plugin-device": "^2.0.1",
"cordova-plugin-inappbrowser": "^2.0.2",
"cordova-plugin-share-content": "^1.0.0",
"cordova-plugin-splashscreen": "^4.0.3",
"cordova-plugin-splashscreen": "^5.0.2",
"cordova-plugin-statusbar": "^2.2.2",
"cordova-plugin-whitelist": "^1.3.1",
"ionic-angular": "3.3.0",
"ionic-angular": "3.9.2",
"ionic-plugin-keyboard": "^2.2.1",
"ionicons": "3.0.0",
"moment": "^2.18.1",
"ng2-cordova-oauth": "0.0.8",
"pnut-butter": "^0.16.0",
"pnut-butter": "^0.19.0",
"run": "^1.4.0",
"rxjs": "5.1.1",
"rxjs": "5.5.6",
"sw-toolbox": "3.6.0",
"zone.js": "0.8.11"
"zone.js": "0.8.20"
},
"devDependencies": {
"@ionic/app-scripts": "1.3.7",
"ionic": "3.9.2",
"typescript": "2.3.3"
"@ionic/app-scripts": "3.1.8",
"ionic": "3.19.1",
"typescript": "2.7.2"
},
"description": "An Ionic project",
"cordova": {
......
......@@ -3,7 +3,6 @@ import { Nav, Platform } from 'ionic-angular';
import { StatusBar } from '@ionic-native/status-bar';
import { SplashScreen } from '@ionic-native/splash-screen';
import { Storage } from '@ionic/storage';
import { Device } from '@ionic-native/device';
import { LoginPage } from '../pages/login/login';
import { StreamPage } from '../pages/stream/stream';
......@@ -22,7 +21,7 @@ export class MyApp {
pages: Array<{title: string, component: any, params: Object}>;
constructor(public platform: Platform, public statusBar: StatusBar, public splashScreen: SplashScreen,
private storage: Storage, private device: Device) {
private storage: Storage) {
this.initializeApp();
// used for an example of ngFor and navigation
......
......@@ -34,6 +34,8 @@
<!-- The polyfills js is generated during the build process -->
<script src="build/polyfills.js"></script>
<script src="build/vendor.js"></script>
<!-- The bundle js is generated during the build process -->
<script src="build/main.js"></script>
......
......@@ -24,7 +24,7 @@ export class LoginPage {
private oauth: any;
private pnutProvider: any;
private oob: boolean = false;
private showToken: boolean = false;
public showToken: boolean = false;
private token: string;
constructor(public navCtrl: NavController, public navParams: NavParams, private storage: Storage,
......
......@@ -186,8 +186,8 @@ export class StreamPage {
// data[i]['reposted_by_string'] = "Reposted by: " + reposted_by_string;
}
if (data[i].content) {
for (var j = 0; j < data[i]['content']['entities']['mentions'].length; j++) {
var men = data[i]['content']['entities']['mentions'][j]['text'];
for (var k = 0; k < data[i]['content']['entities']['mentions'].length; k++) {
var men = data[i]['content']['entities']['mentions'][k]['text'];
if (this.myUsername === men) {
data[i]['you_are_mentioned'] = true;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment