Browse Source
implemented admin login, added map to travel, added user received likes, added controller to navbar
master
arnaucode
7 years ago
24 changed files with 338 additions and 81 deletions
Unified View
Diff Options
-
+55 -2app.js
-
+18 -16bower.json
-
BINimg/avatars/chameleon.png
-
BINimg/avatars/clown-fish.png
-
BINimg/avatars/duck.png
-
BINimg/avatars/owl.png
-
BINimg/avatars/penguin.png
-
BINimg/avatars/racoon.png
-
BINimg/avatars/siberian-husky.png
-
BINimg/avatars/sloth.png
-
BINimg/avatars/tiger.png
-
BINimg/avatars/toucan.png
-
BINimg/faircoinpublickey_sample.png
-
BINimg/userProfileBackground.png
-
+11 -4index.html
-
+29 -0views/login/login.html
-
+42 -0views/login/login.js
-
+7 -4views/main/main.html
-
+5 -1views/navbar.html
-
+19 -0views/navbar.js
-
+32 -8views/travel/travel.html
-
+58 -21views/travel/travel.js
-
+34 -8views/user/user.html
-
+28 -17views/user/user.js
@ -1,18 +1,20 @@ |
|||||
{ |
{ |
||||
"name": "carsincommonAdminWeb", |
|
||||
"description": "carsincommonAdminWeb", |
|
||||
"version": "0.0.0", |
|
||||
"homepage": "https://github.com/arnaucode/carsincommonAdmin", |
|
||||
"license": "MIT", |
|
||||
"private": true, |
|
||||
"dependencies": { |
|
||||
"angular": "^1.6.2", |
|
||||
"angular-route": "^1.6.1", |
|
||||
"angular-chart.js": "^1.1.1", |
|
||||
"vis": "^4.18.1", |
|
||||
"mui": "^0.9.20", |
|
||||
"angular-bootstrap-material": "abm#^0.1.4", |
|
||||
"angular-bootstrap": "^2.5.0", |
|
||||
"angular-messages": "^1.6.5" |
|
||||
} |
|
||||
|
"name": "carsincommonAdminWeb", |
||||
|
"description": "carsincommonAdminWeb", |
||||
|
"version": "0.0.0", |
||||
|
"homepage": "https://github.com/arnaucode/carsincommonAdmin", |
||||
|
"license": "MIT", |
||||
|
"private": true, |
||||
|
"dependencies": { |
||||
|
"angular": "^1.6.2", |
||||
|
"angular-route": "^1.6.1", |
||||
|
"angular-chart.js": "^1.1.1", |
||||
|
"vis": "^4.18.1", |
||||
|
"mui": "^0.9.20", |
||||
|
"angular-bootstrap-material": "abm#^0.1.4", |
||||
|
"angular-bootstrap": "^2.5.0", |
||||
|
"angular-messages": "^1.6.5", |
||||
|
"components-font-awesome": "^4.7.0", |
||||
|
"ui-leaflet": "^2.0.0" |
||||
|
} |
||||
} |
} |
||||
| Before | After |
|---|---|
|
|
| Width: 512 | Height: 512 | Size: 15 KiB |
| Before | After |
|---|---|
|
|
| Width: 512 | Height: 512 | Size: 21 KiB |
| Before | After |
|---|---|
|
|
| Width: 512 | Height: 512 | Size: 9.6 KiB |
| Before | After |
|---|---|
|
|
| Width: 512 | Height: 512 | Size: 15 KiB |
| Before | After |
|---|---|
|
|
| Width: 512 | Height: 512 | Size: 14 KiB |
| Before | After |
|---|---|
|
|
| Width: 512 | Height: 512 | Size: 13 KiB |
| Before | After |
|---|---|
|
|
| Width: 512 | Height: 512 | Size: 19 KiB |
| Before | After |
|---|---|
|
|
| Width: 512 | Height: 512 | Size: 15 KiB |
| Before | After |
|---|---|
|
|
| Width: 512 | Height: 512 | Size: 22 KiB |
| Before | After |
|---|---|
|
|
| Width: 512 | Height: 512 | Size: 11 KiB |
| Before | After |
|---|---|
|
|
| Width: 375 | Height: 377 | Size: 21 KiB |
| Before | After |
|---|---|
|
|
| Width: 634 | Height: 393 | Size: 245 KiB |
@ -0,0 +1,29 @@ |
|||||
|
<div class="container"> |
||||
|
<div class="row"> |
||||
|
<div class="col-sm-4"> |
||||
|
|
||||
|
</div> |
||||
|
<div class="col-sm-4"> |
||||
|
<div class="panel"> |
||||
|
<div class="panel-heading c_deepPurple300"> |
||||
|
<h3 class="panel-title">Login</h3> |
||||
|
</div> |
||||
|
<div class="panel-body"> |
||||
|
<div class="form-group label-floating"> |
||||
|
<input ng-model="user.username" abmFormControl class="form-control" id="inputUsername" placeholder="Username" type="text"> |
||||
|
</div> |
||||
|
<div class="form-group"> |
||||
|
<input ng-model="user.password" abmFormControl class="form-control" id="inputPassword" placeholder="Password" type="password"> |
||||
|
</div> |
||||
|
|
||||
|
<div ng-click="doLogin()" class="btn btn-raised c_deepPurple300 pull-right">Login</div> |
||||
|
</div> |
||||
|
</div> |
||||
|
</div> |
||||
|
|
||||
|
|
||||
|
<div class="col-sm-4"> |
||||
|
|
||||
|
</div> |
||||
|
</div> |
||||
|
</div> |
||||
@ -0,0 +1,42 @@ |
|||||
|
'use strict'; |
||||
|
|
||||
|
angular.module('app.login', ['ngRoute']) |
||||
|
|
||||
|
.config(['$routeProvider', function($routeProvider) { |
||||
|
$routeProvider.when('/login', { |
||||
|
templateUrl: 'views/login/login.html', |
||||
|
controller: 'LoginCtrl' |
||||
|
}); |
||||
|
}]) |
||||
|
|
||||
|
.controller('LoginCtrl', function($scope, $http, $routeParams) { |
||||
|
$scope.user = {}; |
||||
|
$scope.doLogin = function() { |
||||
|
console.log('Doing login', $scope.user); |
||||
|
|
||||
|
$http({ |
||||
|
url: urlapi + 'admin/login', |
||||
|
method: "POST", |
||||
|
data: $scope.user |
||||
|
}) |
||||
|
.then(function(response) { |
||||
|
console.log("response: "); |
||||
|
console.log(response.data); |
||||
|
if (response.data.success == true) |
||||
|
{ |
||||
|
localStorage.setItem("cic_admin_token", response.data.token); |
||||
|
localStorage.setItem("cic_admin_userdata", JSON.stringify(response.data.user)); |
||||
|
window.location.reload(); |
||||
|
}else{ |
||||
|
console.log("login failed"); |
||||
|
} |
||||
|
|
||||
|
|
||||
|
}, |
||||
|
function(response) { // optional
|
||||
|
// failed
|
||||
|
console.log(response); |
||||
|
}); |
||||
|
|
||||
|
}; |
||||
|
}); |
||||
@ -0,0 +1,19 @@ |
|||||
|
'use strict'; |
||||
|
|
||||
|
angular.module('app.navbar', ['ngRoute']) |
||||
|
|
||||
|
.config(['$routeProvider', function($routeProvider) { |
||||
|
$routeProvider.when('/navbar', { |
||||
|
templateUrl: 'views/navbar/navbar.html', |
||||
|
controller: 'NavbarCtrl' |
||||
|
}); |
||||
|
}]) |
||||
|
|
||||
|
.controller('NavbarCtrl', function($scope, $http, $routeParams, $location) { |
||||
|
$scope.locationHash = $location.path(); |
||||
|
console.log($scope.locationHash); |
||||
|
$scope.goBack = function() { |
||||
|
console.log("goBack"); |
||||
|
window.history.back(); |
||||
|
}; |
||||
|
}); |
||||
@ -1,23 +1,60 @@ |
|||||
'use strict'; |
'use strict'; |
||||
|
|
||||
angular.module('app.travel', ['ngRoute']) |
|
||||
|
|
||||
.config(['$routeProvider', function($routeProvider) { |
|
||||
$routeProvider.when('/travel/:travelid', { |
|
||||
templateUrl: 'views/travel/travel.html', |
|
||||
controller: 'TravelCtrl' |
|
||||
}); |
|
||||
}]) |
|
||||
|
|
||||
.controller('TravelCtrl', function($scope, $http, $routeParams) { |
|
||||
$scope.travel = {}; |
|
||||
$http.get(urlapi + 'travels/id/' + $routeParams.travelid) |
|
||||
.then(function(data, status, headers, config) { |
|
||||
console.log('data success'); |
|
||||
console.log(data); |
|
||||
|
|
||||
$scope.travel = data.data; |
|
||||
}, function(data, status, headers, config) { |
|
||||
console.log('data error'); |
|
||||
}); |
|
||||
}); |
|
||||
|
angular.module('app.travel', ['ngRoute', 'ui-leaflet']) |
||||
|
|
||||
|
.config(['$routeProvider', function($routeProvider) { |
||||
|
$routeProvider.when('/travel/:travelid', { |
||||
|
templateUrl: 'views/travel/travel.html', |
||||
|
controller: 'TravelCtrl' |
||||
|
}); |
||||
|
}]) |
||||
|
|
||||
|
.controller('TravelCtrl', function($scope, $http, $routeParams, |
||||
|
leafletData, leafletBoundsHelpers) { |
||||
|
$scope.travel = {}; |
||||
|
|
||||
|
|
||||
|
//map
|
||||
|
$scope.center = { |
||||
|
/*lat: 0, |
||||
|
lng: 0, |
||||
|
zoom: 1*/ |
||||
|
}; |
||||
|
$scope.bounds = {}; |
||||
|
$scope.markers = []; |
||||
|
$scope.tiles = { |
||||
|
url: "http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png", |
||||
|
options: { |
||||
|
attribution: '<a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors' |
||||
|
} |
||||
|
}; |
||||
|
|
||||
|
$http.get(urlapi + 'travels/id/' + $routeParams.travelid) |
||||
|
.then(function(data, status, headers, config) { |
||||
|
console.log('data success'); |
||||
|
console.log(data); |
||||
|
|
||||
|
$scope.travel = data.data; |
||||
|
|
||||
|
//map
|
||||
|
$scope.markers = []; |
||||
|
$scope.markers.push({ |
||||
|
lat: Number($scope.travel.from.lat), |
||||
|
lng: Number($scope.travel.from.long), |
||||
|
message: $scope.travel.from.name |
||||
|
}); |
||||
|
$scope.markers.push({ |
||||
|
lat: Number($scope.travel.to.lat), |
||||
|
lng: Number($scope.travel.to.long), |
||||
|
message: $scope.travel.to.name |
||||
|
}); |
||||
|
$scope.center = { |
||||
|
lat: (Number($scope.travel.from.lat) + Number($scope.travel.to.lat)) / 2, |
||||
|
lng: (Number($scope.travel.from.long) + Number($scope.travel.to.long)) / 2, |
||||
|
zoom: 4 |
||||
|
}; |
||||
|
}, function(data, status, headers, config) { |
||||
|
console.log('data error'); |
||||
|
}); |
||||
|
|
||||
|
}); |
||||