Shilpi Saini / startup_jalsa_frontend

Download as
Browse Code ยป

Commit 93646a5a992c78a38b6b4db9c3987db3147f2346

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

minor changes

Showing 4 changed files with 31 additions and 31 deletions   Show diff stats
... ... @@ -880,26 +880,26 @@ stroke-dashoffset:0
880 880  
881 881 #snackbar.show {
882 882 visibility: visible;
883   - -webkit-animation: fadein 0.5s, fadeout 0.5s 2.5s;
884   - animation: fadein 0.5s, fadeout 0.5s 2.5s;
  883 + -webkit-animation: fadin 0.5s, fadout 0.5s 2.5s;
  884 + animation: fadin 0.5s, fadout 0.5s 2.5s;
885 885 }
886 886  
887   -@-webkit-keyframes fadein {
  887 +@-webkit-keyframes fadin {
888 888 from {bottom: 0; opacity: 0;}
889 889 to {bottom: 30px; opacity: 1;}
890 890 }
891 891  
892   -@keyframes fadein {
  892 +@keyframes fadin {
893 893 from {bottom: 0; opacity: 0;}
894 894 to {bottom: 30px; opacity: 1;}
895 895 }
896 896  
897   -@-webkit-keyframes fadeout {
  897 +@-webkit-keyframes fadout {
898 898 from {bottom: 30px; opacity: 1;}
899 899 to {bottom: 0; opacity: 0;}
900 900 }
901 901  
902   -@keyframes fadeout {
  902 +@keyframes fadout {
903 903 from {bottom: 30px; opacity: 1;}
904 904 to {bottom: 0; opacity: 0;}
905 905 }
... ...
... ... @@ -432,20 +432,19 @@
432 432 <i class="material-icons" style="line-height: 30px;">perm_identity</i>
433 433 </div>
434 434 <div class="identity-question">
435   - <div class="col-xs-12 font f-family" style="margin:10px 10px 21px 10px;">
  435 + <div class="col-xs-12 font f-family" style="margin:10px 10px 0px 10px;">
436 436 <b>Who are you?</b>
  437 + <p style="color:grey">kindly choose one option (if you select the student then please upload the Id proof).</p>
437 438 </div>
438 439 <div class="clearfix"></div>
439 440 </div>
440 441 <div class="stages identity-align">
441   - <div class="col-xs-6">
  442 + <div class="col-xs-12">
442 443 <label class="card-small">
443 444 <input type="radio" required value="student" ng-model="data.identity" class="option-input-a radio-a" ng-change="student(data.identity); studentkeyPress()" name="file" ng-click="show='a'">
444 445 <!-- <img src="images/RURAL_ICON.png"> -->
445 446 <label class="f-family">Student</label>
446 447 </label>
447   - </div>
448   - <div class="col-xs-12">
449 448 <label class="card-small">
450 449 <input type="radio" required value="others" ng-model="data.identity" class="option-input-a radio-a" ng-change="student(data.identity); studentkeyPress()" name="file" ng-click="show='b'">
451 450 <!-- <img src="images/education.png"> -->
... ... @@ -454,7 +453,7 @@
454 453 </div>
455 454 <div class="col-xs-6">
456 455 <label class="card-small">
457   - <!-- <input file-model="data.pic" id="file" type="file" name="title" multiple ng-show="show=='a'"> -->
  456 +
458 457 <input type="file" file-model="data.pic" required id="picture" name="pic" accept="image/*" ng-show="show=='a'">
459 458 </label>
460 459 </div>
... ...
pages/verify.html
Diff comments   View file @93646a5
... ... @@ -6,9 +6,9 @@
6 6 <div class="panel-body">
7 7 <div class="box box-info">
8 8 <div class="box-body">
9   - <div class="card" style="width: 33%;margin: 5% 33%">
10   - <div style="padding: 0% 20% 16%;">
11   - <img class="irc_mi" src="https://www.chemie.uni-hamburg.de/lc/fischer/mitarbeiter/Personschematisch.jpg" style="margin-bottom:1%; width:100%;">
  9 + <div class="card" style="width: 31%;margin: 5% 34%">
  10 + <div style="padding: 0% 20% 6%;">
  11 + <img class="irc_mi" src="https://www.library.caltech.edu/sites/default/files/styles/headshot/public/default_images/user.png?itok=1HlTtL2d" style="margin-bottom:1%; width:100%;">
12 12 </div>
13 13 <!-- <div class="container container1"> -->
14 14 <!-- <div class="col-sm-6">
... ... @@ -18,20 +18,20 @@
18 18 </div>
19 19 <div class="clearfix"></div>
20 20 <div style="margin:5px 0 5px 0">
21   - <div class="col-sm-5 col-xs-6 tital" align="center" style="padding-left:23%">Name:</div>
22   - <div class="col-sm-7 col-xs-6" style="padding-left:22%">{{data.name}}</div>
  21 + <div class="col-sm-5 col-xs-6 tital">Name:</div>
  22 + <div class="col-sm-7 col-xs-6">{{data.name}}</div>
23 23 <div class="clearfix"></div>
24 24 <div class="bot-border"></div>
25   - <div class="col-sm-5 col-xs-6 tital" align="center" style="padding-left:23%">Amount:</div>
26   - <div class="col-sm-7" style="padding-left:22%">{{paymentRecord[0].amount}}</div>
  25 + <div class="col-sm-5 col-xs-6 tital">Amount:</div>
  26 + <div class="col-sm-7">{{paymentRecord[0].amount}}</div>
27 27 <div class="clearfix"></div>
28 28 <div class="bot-border"></div>
29   - <div class="col-sm-5 col-xs-6 tital" align="center" style="padding-left:23%">Currency:</div>
30   - <div class="col-sm-7" style="padding-left:22%">INR</div>
  29 + <div class="col-sm-5 col-xs-6 tital">Currency:</div>
  30 + <div class="col-sm-7">INR</div>
31 31 <div class="clearfix"></div>
32 32 <div class="bot-border"></div>
33   - <div class="col-sm-5 col-xs-6 tital" align="center" style="padding-left:23%">Status:</div>
34   - <div class="col-sm-7" style="padding-left:22%">{{paymentRecord[0].status}}</div>
  33 + <div class="col-sm-5 col-xs-6 tital">Status:</div>
  34 + <div class="col-sm-7">{{paymentRecord[0].status}}</div>
35 35 <div class="clearfix"></div>
36 36 <div class="bot-border"></div>
37 37 </div>
... ...
... ... @@ -119,13 +119,13 @@
119 119 $scope.next = function() {
120 120 var BASE_URL = "http://139.59.68.74:4001/api";
121 121 $scope.data.status = null
122   - if ($scope.data.name == undefined || $scope.data.email == undefined || $scope.data.number == undefined || $scope.data.city == undefined) {
  122 + if ($scope.data.stage == undefined || $scope.data.name == undefined || $scope.data.email == undefined || $scope.data.number == undefined || $scope.data.city == undefined) {
123 123 var x = document.getElementById("snackbar")
124 124 x.className = "show";
125 125 setTimeout(function(){ x.className = x.className.replace("show", ""); }, 3000);
126   - }else if($scope.data.name != undefined && $scope.data.email != undefined && $scope.data.number != undefined && $scope.data.city != undefined) {
  126 + }else if($scope.data.stage != undefined && $scope.data.name != undefined && $scope.data.email != undefined && $scope.data.number != undefined && $scope.data.city != undefined) {
127 127 $scope.infoForm = true;
128   - console.log("sdasdasdsa");
  128 + console.log("sdasdasdsa");
129 129 $scope.data.stage = $scope.data.stage;
130 130 $scope.detail = {};
131 131 $scope.data.phone = "+91"+$scope.data.number;
... ... @@ -149,28 +149,29 @@
149 149 /*****THIS IS FOR STEP THREE FORM ******/
150 150 $scope.create = function() {
151 151 console.log("$scope.data.identity",$scope.data.identity)
  152 + /*****PAYMENT WITH 18% GST*****/
152 153 if($scope.data.stage == "Idea"){
153 154 console.log("$scope.data",$scope.data)
154 155 if($scope.data.identity == "student"){
155   - $scope.payingAmnt = 50000;
  156 + $scope.payingAmnt = 59000;
156 157 }else{
157   - $scope.payingAmnt = 100000;
  158 + $scope.payingAmnt = 118000;
158 159 }
159 160 }
160 161  
161 162 if($scope.data.stage == "Product"){
162 163 if($scope.data.identity == "student"){
163   - $scope.payingAmnt = 100000;
  164 + $scope.payingAmnt = 59000;
164 165 }else{
165   - $scope.payingAmnt = 200000;
  166 + $scope.payingAmnt = 118000;
166 167 }
167 168 }
168 169  
169 170 if($scope.data.stage == "Growth"){
170 171 if($scope.data.identity == "student"){
171   - $scope.payingAmnt = 250000;
  172 + $scope.payingAmnt = 59000;
172 173 }else{
173   - $scope.payingAmnt = 500000;
  174 + $scope.payingAmnt = 118000;
174 175 }
175 176 }
176 177  
... ...