Skip to content

Commit

Permalink
Error in app.module corrected
Browse files Browse the repository at this point in the history
  • Loading branch information
royken committed May 14, 2017
1 parent 9a240d3 commit 073724b
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 41 deletions.
77 changes: 36 additions & 41 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
import { NgModule} from '@angular/core';
import { IonicApp, IonicModule} from 'ionic-angular';
import { MyApp } from './app.component';
import { HomePage } from '../pages/home/home';
import { LoginPage } from '../pages/login/login';
import { AuthService } from '../providers/auth-service';
import { RegisterPage } from '../pages/register/register';
import {NgModule} from '@angular/core';
import {IonicApp, IonicModule} from 'ionic-angular';
import {MyApp} from './app.component';
import {HomePage} from '../pages/home/home';
import {LoginPage} from '../pages/login/login';
import {AuthService} from '../providers/auth-service';
import {RegisterPage} from '../pages/register/register';
import {ConfirmationPage} from '../pages/confirmation/confirmation';
import { BookingPage } from '../pages/booking/booking';
import { ChatsPage } from '../pages/chats/chats';
import {BookingPage} from '../pages/booking/booking';
import {ChatsPage} from '../pages/chats/chats';
//import { MapsPage } from '../pages/maps/maps';
import { MeteoPage } from '../pages/meteo/meteo';
import { HttpModule, JsonpModule } from '@angular/http';
import {MeteoPage} from '../pages/meteo/meteo';
import {HttpModule, JsonpModule} from '@angular/http';
//import { StationListPage } from '../pages/station-list/station-list';
import { StationMapPage } from '../pages/station-map/station-map';
import { Locations } from '../providers/locations';
import { GoogleMaps } from '../providers/google-maps';
import { Connectivity } from '../providers/connectivity';
import { LocationTracker } from '../providers/location-tracker';
import { BackgroundGeolocation } from '@ionic-native/background-geolocation';
import { Geolocation } from '@ionic-native/geolocation';
import { TrackingPage } from '../pages/tracking/tracking';
import {StationMapPage} from '../pages/station-map/station-map';
import {Locations} from '../providers/locations';
import {GoogleMaps} from '../providers/google-maps';
import {Connectivity} from '../providers/connectivity';
import {LocationTracker} from '../providers/location-tracker';
import {BackgroundGeolocation} from '@ionic-native/background-geolocation';
import {Geolocation} from '@ionic-native/geolocation';
import {TrackingPage} from '../pages/tracking/tracking';
import {Database} from "../providers/database";

// les modules de la meteo
Expand All @@ -30,29 +30,20 @@ import {ChartComponent} from '../components/ChartComponent';
@NgModule({

imports: [
HttpModule,
JsonpModule,
IonicModule.forRoot(MyApp, {
//backButtonText: 'Go Back',
//iconMode: 'ios',
//modalEnter: 'modal-slide-in',
//modalLeave: 'modal-slide-out',
//tabsPlacement: 'top',
//pageTransition: 'ios'
}, {}
)
HttpModule, JsonpModule, IonicModule.forRoot(MyApp, {
// backButtonText: 'Go Back', iconMode: 'ios', modalEnter: 'modal-slide-in',
// modalLeave: 'modal-slide-out', tabsPlacement: 'top', pageTransition: 'ios'
}, {})
],
declarations: [
MyApp,
HomePage,
LoginPage,
RegisterPage,
ConfirmationPage,
StationListPage,
StationMapPage,
BookingPage,
ChatsPage,
MapsPage,
MeteoPage,
ChartComponent,
TrackingPage
Expand All @@ -65,18 +56,22 @@ import {ChartComponent} from '../components/ChartComponent';
LoginPage,
RegisterPage,
ConfirmationPage,
StationListPage,
StationMapPage,
BookingPage,
ChatsPage,
MapsPage,
MeteoPage,
TrackingPage,


TrackingPage
],
providers: [AuthService, Locations, GoogleMaps, Connectivity, LocationTracker,BackgroundGeolocation,
Geolocation, WeatherService,Database],

providers: [
AuthService,
Locations,
GoogleMaps,
Connectivity,
LocationTracker,
BackgroundGeolocation,
Geolocation,
WeatherService,
Database
]
})
export class AppModule {}
export class AppModule {}
1 change: 1 addition & 0 deletions src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
<meta name="format-detection" content="telephone=no">
<meta name="msapplication-tap-highlight" content="no">
<meta http-equiv="Content-Security-Policy" content="script-src * 'unsafe-inline' 'unsafe-eval'">

<link rel="icon" type="image/x-icon" href="assets/icon/favicon.ico">
<link rel="manifest" href="manifest.json">
Expand Down

0 comments on commit 073724b

Please sign in to comment.