Merge pull request #92 from secourse2016/ionic-setup2

The app is working fine
secourse2016 · Apr 29, 2016 · 3900bb2 · 3900bb2
2 parents b1459e5 + 6f32352
commit 3900bb2
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 67 deletions.
diff --git a/www/index.html b/www/index.html
@@ -21,8 +21,8 @@
     <!-- your app's js -->
     <script src="js/app.js"></script>
     <script src="js/controllers.js"></script>
-    <!-- <script src="services/FlightSrv.js"></script>
-    <script src="controllers/flightBookingCtrl.js"></script> -->
+    <script src="services/FlightSrv.js"></script>
+    <script src="js/controllers/flightBookingCtrl.js"></script>
   </head>
 
   <body ng-app="starter">

diff --git a/www/js/app.js b/www/js/app.js
@@ -4,9 +4,9 @@
 // 'starter' is the name of this angular module example (also set in a <body> attribute in index.html)
 // the 2nd parameter is an array of 'requires'
 // 'starter.controllers' is found in controllers.js
-App=angular.module('starter', ['ionic', 'starter.controllers']);
+IonicApp=angular.module('starter', ['ionic']);
 
-App.run(function($ionicPlatform) {
+IonicApp.run(function($ionicPlatform) {
   $ionicPlatform.ready(function() {
     // Hide the accessory bar by default (remove this to show the accessory bar above the keyboard
     // for form inputs)
@@ -22,7 +22,7 @@ App.run(function($ionicPlatform) {
   });
 });
 
-App.config(function($stateProvider, $urlRouterProvider) {
+IonicApp.config(function($stateProvider, $urlRouterProvider) {
   $stateProvider
 
     .state('app', {
@@ -36,8 +36,8 @@ App.config(function($stateProvider, $urlRouterProvider) {
     url: '/oneWayBooking',
     views: {
       'menuContent': {
-        templateUrl: 'templates/oneWayBooking.html'
-        /*controller: 'flightBookingCtrl'*/
+        templateUrl: 'templates/oneWayBooking.html',
+        controller: 'flightBookingCtrl'
       }
     }
   })

diff --git a/www/js/controllers.js b/www/js/controllers.js
@@ -1,6 +1,6 @@
-angular.module('starter.controllers', [])
+/*angular.module('starter.controllers', [])*/
 
-.controller('AppCtrl', function($scope, $ionicModal, $timeout) {
+IonicApp.controller('AppCtrl', function($scope, $ionicModal, $timeout) {
 
   // With the new view caching in Ionic, Controllers are only called
   // when they are recreated or on app start, instead of every page change.
@@ -22,7 +22,7 @@ angular.module('starter.controllers', [])
 
 })
 
-.controller('PlaylistsCtrl', function($scope) {
+IonicApp.controller('PlaylistsCtrl', function($scope) {
   $scope.playlists = [
     { title: 'Loay', id: 1 },
     { title: 'Mariam ', id: 2 },
@@ -32,12 +32,12 @@ angular.module('starter.controllers', [])
     { title: 'Rania :P', id: 6 }
   ];
 })
- .controller('SearchCtrl', function($scope) {
+ IonicApp.controller('SearchCtrl', function($scope) {
 
 
 
 
  })
 
-.controller('PlaylistCtrl', function($scope, $stateParams) {
+IonicApp.controller('PlaylistCtrl', function($scope, $stateParams) {
 });
diff --git a/www/controllers/flightBookingCtrl.js → www/js/controllers/flightBookingCtrl.js b/www/controllers/flightBookingCtrl.js → www/js/controllers/flightBookingCtrl.js
@@ -1,4 +1,4 @@
-App.controller('flightBookingCtrl', function($scope, FlightSrv, $location) {
+IonicApp.controller('flightBookingCtrl', function($scope, FlightSrv,$location) {
 
   $scope.formats = ['dd-MMMM-yyyy', 'yyyy/MM/dd', 'dd.MM.yyyy', 'shortDate'];
   $scope.format = $scope.formats[1];
@@ -140,5 +140,6 @@ $scope.validateForm =function() {
 
 
 }
+
   AirportCodes();
 });
diff --git a/www/services/FlightSrv.js b/www/services/FlightSrv.js
@@ -1,4 +1,4 @@
-App.factory('FlightSrv',function($http){
+IonicApp.factory('FlightSrv',function($http){
 	return {
 		// returns all the flights in the json file
 		getInFlights : function(cb){

diff --git a/www/templates/menu.html b/www/templates/menu.html
@@ -34,7 +34,7 @@ <h1 class="title">Left</h1>
           Contact Us
         </ion-item>
         <ion-item menu-close href="#/app/ourteam">
-        Our Team
+          Our Team
         </ion-item>
         <ion-item menu-close href="#/app/welcomePage">
         Home

diff --git a/www/templates/roundTripBooking b/www/templates/roundTripBooking