diff --git a/pages/caricatures.html b/pages/caricatures.html index 420a573..867a781 100644 --- a/pages/caricatures.html +++ b/pages/caricatures.html @@ -14,7 +14,7 @@
@@ -23,8 +23,8 @@
- - + +
diff --git a/script.js b/script.js index 2a42f08..d414084 100644 --- a/script.js +++ b/script.js @@ -23,11 +23,11 @@ controller: 'mainController' }) - // // route for the paymentVerify page - // .when('/pendingPayment/:id', { - // templateUrl: 'pages/verify.html', - // controller: 'verifyController' - // }) + // route for the paymentVerify page + .when('/pendingPayment/:id', { + templateUrl: 'pages/verify.html', + controller: 'verifyController' + }) // route for the registration page .when('/registration/:city', { @@ -51,8 +51,6 @@ redirectTo: '/' }); - - }); scotchApp.config(['AnalyticsProvider', function (AnalyticsProvider) { @@ -71,7 +69,7 @@ //scotchApp.constant("BASE_URL", "http://0.0.0.0:4001/v1") // create the controller and inject Angular's $scope - scotchApp.controller('mainController', function($scope, $http, $location, $route, $rootScope, BASE_URL, Analytics) { + scotchApp.controller('mainController', function($scope, $http, $window, $location, $route, $rootScope, BASE_URL, Analytics) { $scope.data = { show: true, hide: false @@ -101,7 +99,7 @@ } }, 1000); - var hyderabad = new Date("Sept 21, 2018 12:00:00").getTime(); + var hyderabad = new Date("Sept 22, 2018 14:00:00").getTime(); // Update the count down every 1 second var x = setInterval(function() { // Get todays date and time @@ -125,7 +123,7 @@ } }, 1000); - var mumbai = new Date("Sept 25, 2018 12:00:00").getTime(); + var mumbai = new Date("Sept 26, 2018 14:00:00").getTime(); // Update the count down every 1 second var x = setInterval(function() { // Get todays date and time @@ -149,7 +147,7 @@ } }, 1000); - var kolkata = new Date("Oct 2, 2018 12:00:00").getTime(); + var kolkata = new Date("Oct 3, 2018 14:00:00").getTime(); // Update the count down every 1 second var x = setInterval(function() { // Get todays date and time @@ -173,7 +171,7 @@ } }, 1000); - var jaipur = new Date("Oct 4, 2018 12:00:00").getTime(); + var jaipur = new Date("Oct 5, 2018 14:00:00").getTime(); // Update the count down every 1 second var x = setInterval(function() { // Get todays date and time @@ -197,7 +195,7 @@ } }, 1000); - var delhi = new Date("Oct 7, 2018 12:00:00").getTime(); + var delhi = new Date("Oct 8, 2018 14:00:00").getTime(); // Update the count down every 1 second var x = setInterval(function() { // Get todays date and time @@ -221,7 +219,7 @@ } }, 1000); - var kanpur = new Date("Oct 9, 2018 12:00:00").getTime(); + var kanpur = new Date("Oct 10, 2018 14:00:00").getTime(); // Update the count down every 1 second var x = setInterval(function() { // Get todays date and time @@ -245,7 +243,7 @@ } }, 1000); - var ahmedabad = new Date("Oct 11, 2018 12:00:00").getTime(); + var ahmedabad = new Date("Oct 12, 2018 14:00:00").getTime(); // Update the count down every 1 second var x = setInterval(function() { // Get todays date and time @@ -269,7 +267,7 @@ } }, 1000); - var bengaluru = new Date("Oct 12, 2018 12:00:00").getTime(); + var bengaluru = new Date("Oct 13, 2018 14:00:00").getTime(); // Update the count down every 1 second var x = setInterval(function() { // Get todays date and time @@ -293,7 +291,7 @@ } }, 1000); - var dharamsala = new Date("Dec 13, 2018 12:00:00").getTime(); + var dharamsala = new Date("Dec 14, 2018 14:00:00").getTime(); // Update the count down every 1 second var x = setInterval(function() { // Get todays date and time @@ -345,10 +343,16 @@ $scope.watch = function(value){ console.log("cllll",value) $scope.data.city = value; - localStorage.setItem("city" ,value); - //$location.path('/registration').search({city: value}); - $location.path('/registration/'+value+''); - //$state.go('registration', { 'city': value}) + // if($scope.data.city == "Chennai"){ + // console.log("cllll1",value) + // $window.location.href = 'http://35.154.24.158:8007'; + // }else{ + console.log("cllll2",value) + localStorage.setItem("city" ,value); + //$location.path('/registration').search({city: value}); + $location.path('/registration/'+value+''); + //$state.go('registration', { 'city': value}) + // } } $scope.select = function(url){