arnaucube/commonroutesApp
1
0
Fork 0
mirror of https://github.com/arnaucube/commonroutesApp.git synced 2026-02-07 03:26:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

mdl css added, remaking everything

Browse Source
This commit is contained in:
arnaucode
2017-01-26 17:42:49 +01:00
parent 17f0f740d8
commit 5332f6d0db
10 changed files with 94 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
www/js/app.js
View File

@@ -94,7 +94,7 @@ angular.module('starter', [
})
.state('app.travel', {
url: '/travels/:travelId',
url: '/travels/:travelid',
views: {
'menuContent': {
templateUrl: 'templates/travel.html',

35
www/js/travel.js
View File

@@ -1,25 +1,25 @@
angular.module('app.travel', ['pascalprecht.translate'])
.controller('TravelCtrl', function($scope, $stateParams, $http, $ionicModal, $ionicPopup, $filter) {
if(localStorage.getItem('c_token')){// adding token to the headers
$http.defaults.headers.common['X-Access-Token'] = localStorage.getItem('c_token');
}
$scope.storageusername=localStorage.getItem("c_username");
console.log($stateParams.travelId);
$scope.travels= JSON.parse(localStorage.getItem('c_travels'));
$scope.travel = $filter('filter')($scope.travels, $stateParams.travelId, true)[0];
/*$http.get(urlapi + 'travels/comment/'+$stateParams.travelId)
.success(function(data, status, headers,config){
$scope.travel={};
$scope.doRefresh = function() {
/* travels refresh: */
$http.get(urlapi + 'travels/id/' + $stateParams.travelid)
.then(function(data){
console.log('data success travels');
console.log(data); // for browser console
$scope.comments = data; // for UI
})
.error(function(data, status, headers,config){
$scope.travel = data.data; // for UI
$scope.$broadcast('scroll.refreshComplete');//refresher stop
}, function(data){
console.log('data error');
})
.then(function(result){
comments = result.data;
});*/
$scope.$broadcast('scroll.refreshComplete');//refresher stop
$ionicLoading.show({ template: 'Error connecting server', noBackdrop: true, duration: 2000 });
});
};
$scope.doRefresh();
$scope.deleteTravel = function(){
@@ -147,9 +147,6 @@ console.log($scope.newComment);
});
$scope.closeNewComment();
};
console.log("a");
console.log($scope.storageusername);
console.log($scope.travel.owner);
$scope.arrayObjectIndexOf = function(myArray, searchTerm, property) {

223
www/js/travels.js
View File

@@ -3,236 +3,23 @@ angular.module('app.travels', ['pascalprecht.translate'])
.controller('TravelsCtrl', function($scope, $http, $ionicModal, $timeout, $ionicLoading, $filter) {
$scope.travels=[];
$scope.doRefresh = function() {
/* travels refresh: */
$http.get(urlapi + 'travels')
.success(function(data, status, headers,config){
.then(function(data){
console.log('data success travels');
console.log(data); // for browser console
$scope.travels = data; // for UI
localStorage.setItem('c_travels', JSON.stringify($scope.travels));
localStorage.setItem('c_travelsLastDate', JSON.stringify(new Date()));
$scope.travels = data.data; // for UI
$scope.$broadcast('scroll.refreshComplete');//refresher stop
})
.error(function(data, status, headers,config){
}, function(data){
console.log('data error');
$scope.$broadcast('scroll.refreshComplete');//refresher stop
$ionicLoading.show({ template: 'Error connecting server', noBackdrop: true, duration: 2000 });
})
.then(function(result){
travels = result.data;
$ionicLoading.show({ template: 'Travels actualized from server!', noBackdrop: true, duration: 2000 });
});
/* users refresh: */
$http.get(urlapi + 'users')
.success(function(data, status, headers, config){
console.log('data success users');
console.log(data); // for browser console
$scope.users = data; // for UI
localStorage.setItem('c_users', JSON.stringify($scope.users));
$scope.$broadcast('scroll.refreshComplete');//refresher stop
//set userdata
$scope.userdata = $filter('filter')($scope.users, {username: $scope.storageusername}, true)[0];
console.log("userdata");
console.log($scope.userdata);
localStorage.setItem("c_userdata", JSON.stringify($scope.userdata));
})
.error(function(data, status, headers,config){
console.log('data error');
$scope.$broadcast('scroll.refreshComplete');//refresher stop
})
.then(function(result){
users = result.data;
});
};
$scope.newtravel={};
/*$scope.newtravel={
title: "prova",
from: "prova",
to: "prova",
seats: 3,
package: true,
phone: 123,
telegram: "telusr",
description: "this is the description of prova"
};*/
// Create the login modal that we will use later
$ionicModal.fromTemplateUrl('templates/newofferingtravel.html', {
scope: $scope
}).then(function(modal) {
$scope.modalOffering = modal;
});
// Create the login modal that we will use later
$ionicModal.fromTemplateUrl('templates/newaskingtravel.html', {
scope: $scope
}).then(function(modal) {
$scope.modalAsking = modal;
});
$ionicModal.fromTemplateUrl('templates/newaskingpackage.html', {
scope: $scope
}).then(function(modal) {
$scope.modalPackage = modal;
});
// Triggered in the login modal to close it
$scope.closeNewOfferingTravel = function() {
$scope.modalOffering.hide();
};
// Triggered in the login modal to close it
$scope.closeNewAskingTravel = function() {
$scope.modalAsking.hide();
};
$scope.closeNewAskingPackage = function() {
$scope.modalPackage.hide();
};
// Open the login modal
$scope.showNewOfferingTravel = function() {
$scope.modalOffering.show();
};
// Open the login modal
$scope.showNewAskingTravel = function() {
$scope.modalAsking.show();
};
$scope.showNewAskingPackage = function() {
$scope.modalPackage.show();
};
// Perform the login action when the user submits the login form
$scope.doNewOfferingTravel = function() {
console.log('Doing new travel', $scope.newtravel);
$scope.newtravel.icon="lorry";
$scope.newtravel.generateddate=$scope.newtravel.date;
/*$scope.newtravel.owner=localStorage.getItem("c_username");
$scope.newtravel.telegram=JSON.parse(localStorage.getItem("c_userdata")).telegram;
$scope.newtravel.phone=JSON.parse(localStorage.getItem("c_userdata")).phone;*/
$scope.newtravel.modality="offering";
//$scope.newtravel.token=localStorage.getItem("c_token");
console.log($scope.newtravel);
$http({
url: urlapi + 'travels',
method: "POST",
data: $scope.newtravel
})
.then(function(response) {
// success
console.log("response: ");
console.log(response);
//$scope.newtravel._id=response.data._id;
//$scope.travels.push($scope.newtravel);
$scope.travels=response.data;
localStorage.setItem('c_travels', JSON.stringify($scope.travels));
localStorage.setItem('c_travelsLastDate', JSON.stringify(new Date()));
$scope.newtravel={};
if(response.data.success==false){
$ionicLoading.show({ template: 'failed to generate new travel', noBackdrop: true, duration: 2000 });
}
},
function(response) { // optional
// failed
$ionicLoading.show({ template: 'failed to generate new publication, all input fields needed', noBackdrop: true, duration: 2000 });
});
// Simulate a login delay. Remove this and replace with your login
// code if using a login system
$timeout(function() {
$scope.closeNewOfferingTravel();
}, 1000);
};
$scope.doNewAskingTravel = function() {
console.log('Doing new travel', $scope.newtravel);
$scope.newtravel.icon="lorry";
$scope.newtravel.generateddate=$scope.newtravel.date;
/*$scope.newtravel.owner=localStorage.getItem("c_username");
$scope.newtravel.telegram=JSON.parse(localStorage.getItem("c_userdata")).telegram;
$scope.newtravel.phone=JSON.parse(localStorage.getItem("c_userdata")).phone;*/
$scope.newtravel.modality="asking";
console.log($scope.newtravel);
$http({
url: urlapi + 'travels',
method: "POST",
data: $scope.newtravel
})
.then(function(response) {
// success
console.log("response: ");
console.log(response);
//$scope.newtravel._id=response.data._id;
//$scope.travels.push($scope.newtravel);
$scope.travels=response.data;
localStorage.setItem('c_travels', JSON.stringify($scope.travels));
localStorage.setItem('c_travelsLastDate', JSON.stringify(new Date()));
$scope.newtravel={};
if(response.data.success==false){
$ionicLoading.show({ template: 'failed to generate new asking travel', noBackdrop: true, duration: 2000 });
}
},
function(response) { // optional
// failed
$ionicLoading.show({ template: 'failed to generate new publication, all input fields needed', noBackdrop: true, duration: 2000 });
});
// Simulate a login delay. Remove this and replace with your login
// code if using a login system
$timeout(function() {
$scope.closeNewAskingTravel();
}, 1000);
};
$scope.doNewAskingPackage = function() {
console.log('Doing new package', $scope.newtravel);
$scope.newtravel.icon="lorry";
$scope.newtravel.generateddate=$scope.newtravel.date;
/*$scope.newtravel.owner=localStorage.getItem("c_username");
$scope.newtravel.telegram=JSON.parse(localStorage.getItem("c_userdata")).telegram;
$scope.newtravel.phone=JSON.parse(localStorage.getItem("c_userdata")).phone;*/
$scope.newtravel.package=true;
$scope.newtravel.modality="package";
console.log($scope.newtravel);
$http({
url: urlapi + 'travels',
method: "POST",
data: $scope.newtravel
})
.then(function(response) {
// success
console.log("response: ");
console.log(response);
//$scope.newtravel._id=response.data._id;
//$scope.travels.push($scope.newtravel);
$scope.travels=response.data;
localStorage.setItem('c_travels', JSON.stringify($scope.travels));
localStorage.setItem('c_travelsLastDate', JSON.stringify(new Date()));
$scope.newtravel={};
if(response.data.success==false){
$ionicLoading.show({ template: 'failed to generate new asking package', noBackdrop: true, duration: 2000 });
}
},
function(response) { // optional
// failed
$ionicLoading.show({ template: 'failed to generate new publication, all input fields needed', noBackdrop: true, duration: 2000 });
});
// Simulate a login delay. Remove this and replace with your login
// code if using a login system
$timeout(function() {
$scope.closeNewAskingPackage();
}, 1000);
};
$scope.doRefresh();
});

14
www/js/user.js
View File

@@ -4,18 +4,14 @@ angular.module('app.user', ['pascalprecht.translate'])
$scope.user={};
$http.get(urlapi + 'users/getByUserId/'+$stateParams.userid)
.success(function(data, status, headers,config){
$http.get(urlapi + 'users/id/'+$stateParams.userid)
.then(function(data, status, headers,config){
console.log('data success');
console.log(data); // for browser console
$scope.user = data; // for UI
})
.error(function(data, status, headers,config){
$scope.user = data.data; // for UI
},function(data, status, headers,config){
console.log('data error');
})
.then(function(result){
travels = result.data;
});
});

22
www/js/users.js
View File

@@ -6,27 +6,6 @@ angular.module('app.users', ['pascalprecht.translate'])
$scope.users=JSON.parse(localStorage.getItem('c_users'));
$scope.doRefresh = function() {
/* travels refresh: */
$http.get(urlapi + 'travels')
.success(function(data, status, headers,config){
console.log('data success');
console.log(data); // for browser console
$scope.travels = data; // for UI
localStorage.setItem('c_travels', JSON.stringify($scope.travels));
localStorage.setItem('c_travelsLastDate', JSON.stringify(new Date()));
$scope.$broadcast('scroll.refreshComplete');//refresher stop
})
.error(function(data, status, headers,config){
console.log('data error');
$scope.$broadcast('scroll.refreshComplete');//refresher stop
$ionicLoading.show({ template: 'Error connecting server', noBackdrop: true, duration: 2000 });
})
.then(function(result){
travels = result.data;
$ionicLoading.show({ template: 'Travels actualized from server!', noBackdrop: true, duration: 2000 });
});
/* users refresh: */
$http.get(urlapi + 'users')
@@ -51,4 +30,5 @@ angular.module('app.users', ['pascalprecht.translate'])
users = result.data;
});
};
$scope.doRefresh();
});