Browse Source

added user info, added download link in the webapp

master
arnaucode 6 years ago
parent
commit
120820e980
13 changed files with 33 additions and 14 deletions
  1. BIN
      app/img/avatars/chameleon.png
  2. BIN
      app/img/avatars/clown-fish.png
  3. BIN
      app/img/avatars/duck.png
  4. BIN
      app/img/avatars/owl.png
  5. BIN
      app/img/avatars/penguin.png
  6. BIN
      app/img/avatars/racoon.png
  7. BIN
      app/img/avatars/siberian-husky.png
  8. BIN
      app/img/avatars/sloth.png
  9. BIN
      app/img/avatars/tiger.png
  10. BIN
      app/img/avatars/toucan.png
  11. +12
    -1
      app/index.html
  12. +7
    -6
      app/views/travel/travel.html
  13. +14
    -7
      app/views/travels/travels.html

BIN
app/img/avatars/chameleon.png

Before After
Width: 512  |  Height: 512  |  Size: 15 KiB

BIN
app/img/avatars/clown-fish.png

Before After
Width: 512  |  Height: 512  |  Size: 21 KiB

BIN
app/img/avatars/duck.png

Before After
Width: 512  |  Height: 512  |  Size: 9.6 KiB

BIN
app/img/avatars/owl.png

Before After
Width: 512  |  Height: 512  |  Size: 15 KiB

BIN
app/img/avatars/penguin.png

Before After
Width: 512  |  Height: 512  |  Size: 14 KiB

BIN
app/img/avatars/racoon.png

Before After
Width: 512  |  Height: 512  |  Size: 13 KiB

BIN
app/img/avatars/siberian-husky.png

Before After
Width: 512  |  Height: 512  |  Size: 19 KiB

BIN
app/img/avatars/sloth.png

Before After
Width: 512  |  Height: 512  |  Size: 15 KiB

BIN
app/img/avatars/tiger.png

Before After
Width: 512  |  Height: 512  |  Size: 22 KiB

BIN
app/img/avatars/toucan.png

Before After
Width: 512  |  Height: 512  |  Size: 11 KiB

+ 12
- 1
app/index.html

@ -28,7 +28,18 @@
<div ng-view></div> <div ng-view></div>
<!-- Download Section -->
<section id="download" class="content-section text-center">
<div class="download-section o_downloadBg">
<div class="container">
<div class="col-sm-8 col-sm-offset-2">
<a href="https://github.com/arnaucode/commonroutesApp/blob/master/releases/commonroutes.apk" target="_blank" class="btn btn-default btn-lg">
<i class="fa fa-android fa-fw"></i> Download the complete app (pre-alpha version)
</a>
</div>
</div>
</div>
</section>
<!-- Angular js --> <!-- Angular js -->
<script src="bower_components/angular/angular.js"></script> <script src="bower_components/angular/angular.js"></script>

+ 7
- 6
app/views/travel/travel.html

@ -5,18 +5,19 @@
<div class="panel"> <div class="panel">
<div class="panel-body"> <div class="panel-body">
<div class="pull-right"> <div class="pull-right">
<!-- <div class="row-picture" style="font-size:140%; text-align:right;" title="user">
<img style="width:40px;" class="circle" ng-src="{{travel.user.avatar}}" alt="icon"> {{travel.user.username}}
</div> -->
<div class="row-picture" style="font-size:120%; text-align:right;" title="user">
<img style="width:40px;border-radius: 50%;" class="circle" ng-src="{{travel.user.avatar}}" alt="icon"> {{travel.user.username}}
<i title="user verified" class="fa fa-check-circle" style="color: #64B5F6;"></i>
</div>
{{travel.date | date:"dd/MM HH:mm a"}} {{travel.date | date:"dd/MM HH:mm a"}}
</div> </div>
<div class="list-group"> <div class="list-group">
<div class="list-group-item"> <div class="list-group-item">
<div class="pull-right"></div> <div class="pull-right"></div>
<h4> <h4>
<i ng-show="travel.type=='offering'" class="fa fa-car fa-2x"></i>
<i ng-show="travel.type=='asking'" class="fa fa-question fa-2x"></i>
<i ng-show="travel.type=='package'" class="fa fa-archive fa-2x"></i>
<i title="offer travel" ng-show="travel.type=='offering'" class="fa fa-car fa-2x"></i>
<i title="ask for travel" ng-show="travel.type=='asking'" class="fa fa-question fa-2x"></i>
<i title="ask to send package" ng-show="travel.type=='package'" class="fa fa-archive fa-2x"></i>
{{travel.title}} {{travel.title}}
</h4> </h4>
</div> </div>

+ 14
- 7
app/views/travels/travels.html

@ -13,23 +13,30 @@
<th>From</th> <th>From</th>
<th>To</th> <th>To</th>
<th>Date</th> <th>Date</th>
<!-- <th>User</th> -->
<th>User</th>
<th></th> <th></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="travel in travels"> <tr ng-repeat="travel in travels">
<td> <td>
<i ng-show="travel.type=='offering'" class="fa fa-car fa-2x"></i>
<i ng-show="travel.type=='asking'" class="fa fa-question fa-2x"></i>
<i ng-show="travel.type=='package'" class="fa fa-archive fa-2x"></i>
<i title="offer travel" ng-show="travel.type=='offering'" class="fa fa-car fa-2x"></i>
<i title="ask for travel" ng-show="travel.type=='asking'" class="fa fa-question fa-2x"></i>
<i title="ask to send package" ng-show="travel.type=='package'" class="fa fa-archive fa-2x"></i>
</td> </td>
<td>{{travel.from.name}}</td> <td>{{travel.from.name}}</td>
<td>{{travel.to.name}}</td> <td>{{travel.to.name}}</td>
<td>{{travel.date | date:'yyyy/MM/dd'}}</td> <td>{{travel.date | date:'yyyy/MM/dd'}}</td>
<!-- <td>
<img style="width:30px;" ng-src="{{travel.user.avatar}}" title="{{travel.user.username}}">
</td> -->
<td>
<div class="row">
<div class="col-sm-6">
<img style="width:30px;border-radius: 50%;" ng-src="{{travel.user.avatar}}" title="{{travel.user.username}}">
</div>
<div class="col-sm-6">
<i title="user verified" class="fa fa-check-circle" style="color: #64B5F6;"></i>
</div>
</div>
</td>
<td><a ng-href="#!/travel/{{travel._id}}">View</a></td> <td><a ng-href="#!/travel/{{travel._id}}">View</a></td>
</tr> </tr>
</tbody> </tbody>

Loading…
Cancel
Save