Shilpi Saini / startup_jalsa_frontend

Download as
Browse Code ยป

Commit 857ebc69eb695dfe0848858afcda2fe4876d37d4

Authored by Palak Handa
1 parent bfa751180f
Exists in master and in 1 other branch paytm

timer add

Showing 2 changed files with 28 additions and 24 deletions   Show diff stats
pages/caricatures.html
Diff comments   View file @857ebc6
... ... @@ -14,7 +14,7 @@
14 14 <div class="pull-right">
15 15 <label class="card-sub-title"><i class="material-icons">location_on</i>
16 16 <span style="position: relative;top: -3px;font-size: 17px;">IIT-Madras</span><br>
17   - <span style="color:red;padding-left: 20%;"></span>
  17 + <span style="color:red;padding-left: 20%;">Closed</span>
18 18 </label>
19 19 </div>
20 20 <div class="clearfix"></div>
... ... @@ -23,8 +23,8 @@
23 23 </label>
24 24 <div class="clearfix"></div>
25 25 <div class="card-text2">
26   - <button class="btn btn-info apply-act" style="float: left;padding: 3px 10px 3px 10px;border-radius: 12px;" data-toggle="collapse" ng-click="select('https://startupjalsa.com/chennai/?utm_source=portal&utm_medium=link&utm_campaign=apply%20now%20portal')" >Flashback</button>
27   - <button class="btn btn-info apply-act" style="margin-bottom: 4%;float: right;padding: 3px 10px 3px 10px;margin-right: 7%;border-radius: 12px;" data-toggle="collapse" ng-click="watch('Chennai')">Select</button>
  26 + <button class="btn btn-info apply-act" style="margin-bottom: 4%;float: left;padding: 3px 10px 3px 10px;border-radius: 12px;" data-toggle="collapse" ng-click="select('https://startupjalsa.com/chennai/?utm_source=portal&utm_medium=link&utm_campaign=apply%20now%20portal')" >Flashback</button>
  27 + <!-- <button class="btn btn-info apply-act" style="margin-bottom: 4%;float: right;padding: 3px 10px 3px 10px;margin-right: 7%;border-radius: 12px;" data-toggle="collapse" ng-click="watch('Chennai')">Select</button> -->
28 28 </div>
29 29 </div>
30 30 </div>
... ...
... ... @@ -23,11 +23,11 @@
23 23 controller: 'mainController'
24 24 })
25 25  
26   - // // route for the paymentVerify page
27   - // .when('/pendingPayment/:id', {
28   - // templateUrl: 'pages/verify.html',
29   - // controller: 'verifyController'
30   - // })
  26 + // route for the paymentVerify page
  27 + .when('/pendingPayment/:id', {
  28 + templateUrl: 'pages/verify.html',
  29 + controller: 'verifyController'
  30 + })
31 31  
32 32 // route for the registration page
33 33 .when('/registration/:city', {
... ... @@ -51,8 +51,6 @@
51 51 redirectTo: '/'
52 52 });
53 53  
54   -
55   -
56 54 });
57 55  
58 56 scotchApp.config(['AnalyticsProvider', function (AnalyticsProvider) {
... ... @@ -71,7 +69,7 @@
71 69 //scotchApp.constant("BASE_URL", "http://0.0.0.0:4001/v1")
72 70  
73 71 // create the controller and inject Angular's $scope
74   - scotchApp.controller('mainController', function($scope, $http, $location, $route, $rootScope, BASE_URL, Analytics) {
  72 + scotchApp.controller('mainController', function($scope, $http, $window, $location, $route, $rootScope, BASE_URL, Analytics) {
75 73 $scope.data = {
76 74 show: true,
77 75 hide: false
... ... @@ -101,7 +99,7 @@
101 99 }
102 100 }, 1000);
103 101  
104   - var hyderabad = new Date("Sept 21, 2018 12:00:00").getTime();
  102 + var hyderabad = new Date("Sept 22, 2018 14:00:00").getTime();
105 103 // Update the count down every 1 second
106 104 var x = setInterval(function() {
107 105 // Get todays date and time
... ... @@ -125,7 +123,7 @@
125 123 }
126 124 }, 1000);
127 125  
128   - var mumbai = new Date("Sept 25, 2018 12:00:00").getTime();
  126 + var mumbai = new Date("Sept 26, 2018 14:00:00").getTime();
129 127 // Update the count down every 1 second
130 128 var x = setInterval(function() {
131 129 // Get todays date and time
... ... @@ -149,7 +147,7 @@
149 147 }
150 148 }, 1000);
151 149  
152   - var kolkata = new Date("Oct 2, 2018 12:00:00").getTime();
  150 + var kolkata = new Date("Oct 3, 2018 14:00:00").getTime();
153 151 // Update the count down every 1 second
154 152 var x = setInterval(function() {
155 153 // Get todays date and time
... ... @@ -173,7 +171,7 @@
173 171 }
174 172 }, 1000);
175 173  
176   - var jaipur = new Date("Oct 4, 2018 12:00:00").getTime();
  174 + var jaipur = new Date("Oct 5, 2018 14:00:00").getTime();
177 175 // Update the count down every 1 second
178 176 var x = setInterval(function() {
179 177 // Get todays date and time
... ... @@ -197,7 +195,7 @@
197 195 }
198 196 }, 1000);
199 197  
200   - var delhi = new Date("Oct 7, 2018 12:00:00").getTime();
  198 + var delhi = new Date("Oct 8, 2018 14:00:00").getTime();
201 199 // Update the count down every 1 second
202 200 var x = setInterval(function() {
203 201 // Get todays date and time
... ... @@ -221,7 +219,7 @@
221 219 }
222 220 }, 1000);
223 221  
224   - var kanpur = new Date("Oct 9, 2018 12:00:00").getTime();
  222 + var kanpur = new Date("Oct 10, 2018 14:00:00").getTime();
225 223 // Update the count down every 1 second
226 224 var x = setInterval(function() {
227 225 // Get todays date and time
... ... @@ -245,7 +243,7 @@
245 243 }
246 244 }, 1000);
247 245  
248   - var ahmedabad = new Date("Oct 11, 2018 12:00:00").getTime();
  246 + var ahmedabad = new Date("Oct 12, 2018 14:00:00").getTime();
249 247 // Update the count down every 1 second
250 248 var x = setInterval(function() {
251 249 // Get todays date and time
... ... @@ -269,7 +267,7 @@
269 267 }
270 268 }, 1000);
271 269  
272   - var bengaluru = new Date("Oct 12, 2018 12:00:00").getTime();
  270 + var bengaluru = new Date("Oct 13, 2018 14:00:00").getTime();
273 271 // Update the count down every 1 second
274 272 var x = setInterval(function() {
275 273 // Get todays date and time
... ... @@ -293,7 +291,7 @@
293 291 }
294 292 }, 1000);
295 293  
296   - var dharamsala = new Date("Dec 13, 2018 12:00:00").getTime();
  294 + var dharamsala = new Date("Dec 14, 2018 14:00:00").getTime();
297 295 // Update the count down every 1 second
298 296 var x = setInterval(function() {
299 297 // Get todays date and time
... ... @@ -345,10 +343,16 @@
345 343 $scope.watch = function(value){
346 344 console.log("cllll",value)
347 345 $scope.data.city = value;
348   - localStorage.setItem("city" ,value);
349   - //$location.path('/registration').search({city: value});
350   - $location.path('/registration/'+value+'');
351   - //$state.go('registration', { 'city': value})
  346 + // if($scope.data.city == "Chennai"){
  347 + // console.log("cllll1",value)
  348 + // $window.location.href = 'http://35.154.24.158:8007';
  349 + // }else{
  350 + console.log("cllll2",value)
  351 + localStorage.setItem("city" ,value);
  352 + //$location.path('/registration').search({city: value});
  353 + $location.path('/registration/'+value+'');
  354 + //$state.go('registration', { 'city': value})
  355 + // }
352 356 }
353 357  
354 358 $scope.select = function(url){
... ...