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

post new offering travel, and user page

Browse Source
This commit is contained in:
arnaucode
2017-01-26 14:13:32 +01:00
parent 5f16f060c1
commit 17f0f740d8
15 changed files with 177 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

125
www/css/style.css
View File

@@ -1,50 +1,95 @@
/* Empty. Add your own CSS if you like */ .o_noPaddingMargin{
.o-imgMenu{ padding: 0!important;
width: 25px!important; margin: 0!important;
height: 25px!important;
} }
.o-imgTitle{ .o_mainRow{
width: 40px!important; height: calc(100%/4);
height: 40px!important;
} }
.o-imgSelectAvatar{ .o_floatRight{
width: 45px!important;
height: 45px!important;
}
.o-bold{
font-weight: bold!important;
}
.o-float-right{
float: right; float: right;
} }
.o-text-right{ /*
text-align: right; SISTEMA DE COLORS
users: blue
routines: red
diets: yellow
la nomenclatura és:
o_bColor
la 'o' és de 'own', per saber que és una classe pròpia nostra i que no colisioni amb les classes dels frameworks css
la 'b' és de background, si és una 'f' és de font
a part podem posar ColorDark o ColorLight per fer un color més fosc o més clar
*/
.o_bSidenav{
background: #333b42!important;
color: #c6ccd2!important;
} }
.o-mini-text{ .o_fWhiteLight{
font-size: 12px; color: #c6ccd2!important;
display: inline-block;
} }
.o-img-joined{ .o_bGrey{
width: 20px!important; background: #e6e6e6!important;
height: 20px!important; color: #000000!important;
} }
.o-img-new{ .o_bGreyLight{
width: 30px!important; background: #CFD8DC!important;
height: 30px!important; color: #000000!important;
} }
.o-badgeCollectivized{ /* backgrounds color: bColor */
background: #33CD5F; .o_bRed{
padding: 5px; background: rgb(252,87,85)!important;
border-radius: 5px; color: #ffffff!important;
font-size: 12px;
color: #ffffff;
font-weight: bold;
} }
.o-badge-calm{ .o_bRedLight{
background: #11C1F3; background: #E57373!important;
padding: 5px; color: #ffffff!important;
border-radius: 7px; }
font-size: 12px; .o_bRedDark{
color: #ffffff; background: rgb(218, 89, 120)!important;
font-weight: bold; color: #ffffff!important;
}
.o_bGreen{
background: rgb(123,195,70)!important;
color: #ffffff!important;
}
.o_bGreenLight{
background: #81C784!important;
color: #ffffff!important;
}
.o_bGreenDark{
background: rgb(54,188,155)!important;
color: #ffffff!important;
}
.o_bBlue{
background: rgb(104,195,240)!important;
color: #ffffff!important;
}
.o_bBlueDark{
background: rgb(72,118,180)!important;
color: #ffffff!important;
}
.o_bYellow{
background: rgb(251,187,61)!important;
color: #ffffff!important;
}
.o_bYellowDark{
background: #F9A825!important;
color: #ffffff!important;
}
.o_bOrange{
background: rgb(251, 126, 61)!important;
color: #ffffff!important;
}
.o_bOrangeDark{
background: #FF7043!important;
color: #ffffff!important;
}
.o_bPurple{
background: #9575CD!important;
color: #ffffff!important;
}
.o_bPurpleDark{
background: #512DA8!important;
color: #ffffff!important;
} }

31
www/js/app.js
View File

@@ -131,7 +131,7 @@ angular.module('starter', [
} }
}) })
.state('app.user', { .state('app.user', {
url: '/users/:username', url: '/users/:userid',
views: { views: {
'menuContent': { 'menuContent': {
templateUrl: 'templates/user.html', templateUrl: 'templates/user.html',
@@ -201,4 +201,31 @@ angular.module('starter', [
$translateProvider.useSanitizeValueStrategy('escape'); $translateProvider.useSanitizeValueStrategy('escape');
}]); }])
.factory('httpInterceptor', function httpInterceptor($q, $window, $location) {
return {
request: function (config) {
return config;
},
requestError: function (config) {
return config;
},
response: function (res) {
return res;
},
responseError: function (res) {
return res;
}
}
})
.factory('api', function ($http) {
return {
init: function () {
$http.defaults.headers.common['X-Access-Token'] = localStorage.getItem("cim_app_token");
$http.defaults.headers.post['X-Access-Token'] = localStorage.getItem("cim_app_token");
}
};
})
.run(function (api) {
api.init();
});

3
www/js/footerMenu.js
View File

@@ -1,5 +1,6 @@
angular.module('app.footerMenu', ['pascalprecht.translate']) angular.module('app.footerMenu', ['pascalprecht.translate'])
.controller('FooterMenuCtrl', function($scope, $stateParams, $translate, $filter) { .controller('FooterMenuCtrl', function($scope, $stateParams, $translate, $filter) {
$scope.storageuser = JSON.parse(localStorage.getItem("cim_app_userdata"));
console.log($scope.storageuser);
}); });

2
www/js/login.js
View File

@@ -9,7 +9,7 @@ angular.module('app.login', ['pascalprecht.translate'])
console.log('Doing login', $scope.loginData); console.log('Doing login', $scope.loginData);
$http({ $http({
url: urlapi + 'auth', url: urlapi + 'login',
method: "POST", method: "POST",
data: $scope.loginData data: $scope.loginData
}) })

7
www/js/menu.js
View File

@@ -2,8 +2,11 @@ angular.module('app.menu', ['pascalprecht.translate'])
.controller('MenuCtrl', function($scope) { .controller('MenuCtrl', function($scope) {
$scope.storageuser = JSON.parse(localStorage.getItem("cim_app_userdata")); if (localStorage.getItem("cim_app_userdata")) {
console.log($scope.storageuser); $scope.storageuser = JSON.parse(localStorage.getItem("cim_app_userdata"));
console.log($scope.storageuser);
}
$scope.logout = function() { $scope.logout = function() {
localStorage.removeItem("cim_app_token"); localStorage.removeItem("cim_app_token");
localStorage.removeItem("cim_app_userdata"); localStorage.removeItem("cim_app_userdata");

20
www/js/offerCar.js
View File

@@ -1,5 +1,23 @@
angular.module('app.offerCar', ['pascalprecht.translate']) angular.module('app.offerCar', ['pascalprecht.translate'])
.controller('OfferCarCtrl', function($scope, $stateParams, $translate, $filter) { .controller('OfferCarCtrl', function($scope, $stateParams, $translate,
$http, $filter) {
$scope.newtravel={};
$scope.createTravel =function(){
$scope.newtravel.type="offering";
$http({
url: urlapi + 'travels',
method: "POST",
data: $scope.newtravel
})
.then(function(data) {
console.log(data);
window.location="#app/travels"
},
function(data) { // optional
// failed
console.log(data);
});
};
}); });

4
www/js/signup.js
View File

@@ -6,7 +6,7 @@ angular.module('app.signup', ['pascalprecht.translate'])
console.log('Doing signup', $scope.signupData); console.log('Doing signup', $scope.signupData);
if ($scope.emptyParams($scope.signupData)) { if ($scope.emptyParams($scope.signupData)) {
$http({ $http({
url: urlapi + 'users', url: urlapi + 'signup',
method: "POST", method: "POST",
data: $scope.signupData data: $scope.signupData
}) })
@@ -49,7 +49,7 @@ angular.module('app.signup', ['pascalprecht.translate'])
if (obj.password == undefined) { if (obj.password == undefined) {
return (false); return (false);
} }
if (obj.mail == undefined) { if (obj.email == undefined) {
return (false); return (false);
} }
/*if(obj.avatar==undefined) /*if(obj.avatar==undefined)

26
www/js/user.js
View File

@@ -1,15 +1,10 @@
angular.module('app.user', ['pascalprecht.translate']) angular.module('app.user', ['pascalprecht.translate'])
.controller('UserCtrl', function($scope, $stateParams, $http, $filter, $ionicModal) { .controller('UserCtrl', function($scope, $stateParams, $http, $filter, $ionicModal) {
if(localStorage.getItem('c_token')){// adding token to the headers
$http.defaults.headers.common['X-Access-Token'] = localStorage.getItem('c_token');
} $scope.user={};
$scope.storageusername=localStorage.getItem("c_username"); $http.get(urlapi + 'users/getByUserId/'+$stateParams.userid)
$scope.users= JSON.parse(localStorage.getItem('c_users'));
$scope.user = $filter('filter')($scope.users, {username: $stateParams.username}, true)[0];
//$scope.user="";
console.log($stateParams.username);
/*$http.get(urlapi + 'users/byusername/'+$stateParams.username)
.success(function(data, status, headers,config){ .success(function(data, status, headers,config){
console.log('data success'); console.log('data success');
console.log(data); // for browser console console.log(data); // for browser console
@@ -18,19 +13,6 @@ angular.module('app.user', ['pascalprecht.translate'])
.error(function(data, status, headers,config){ .error(function(data, status, headers,config){
console.log('data error'); console.log('data error');
}) })
.then(function(result){
user = result.data;
});*/
$http.get(urlapi + 'travels/user/'+$stateParams.username)
.success(function(data, status, headers,config){
console.log('data success');
console.log(data); // for browser console
$scope.travels = data; // for UI
})
.error(function(data, status, headers,config){
console.log('data error');
})
.then(function(result){ .then(function(result){
travels = result.data; travels = result.data;
}); });

8
www/templates/main.html
View File

@@ -1,18 +1,18 @@
<ion-view view-title="Main"> <ion-view view-title="Main">
<ion-content> <ion-content>
<a ng-href="#/app/user/{{storageuser._id}}" class="item item-icon-left o_bBlue"> <a ng-href="#/app/travels" class="item item-icon-left o_bGreenDark">
<i class="icon ion-android-car"></i> <i class="icon ion-android-car"></i>
Travels Travels
</a> </a>
<a href="#/app/dashboard" class="item item-icon-left o_bGreen"> <a href="#/app/users" class="item item-icon-left o_bBlue">
<i class="icon ion-person-stalker"></i> <i class="icon ion-person-stalker"></i>
Users Users
</a> </a>
<a href="#/app/marks/{{storageuser._id}}" class="item item-icon-left o_bOrange"> <a href="#/app/settings" class="item item-icon-left o_bOrange">
<i class="icon ion-settings"></i> <i class="icon ion-settings"></i>
Settings Settings
</a> </a>
<a href="#/app/runs/{{storageuser._id}}" class="item item-icon-left o_bPurple"> <a href="#/app/help" class="item item-icon-left">
<i class="icon ion-ios-help-outline"></i> <i class="icon ion-ios-help-outline"></i>
Help Help
</a> </a>

28
www/templates/menu.html
View File

@@ -1,6 +1,6 @@
<ion-side-menus enable-menu-with-back-views="false"> <ion-side-menus enable-menu-with-back-views="false">
<ion-side-menu-content> <ion-side-menu-content>
<ion-nav-bar class="bar-calm" ng-show="storageuser"> <ion-nav-bar class="bar-stable" ng-show="storageuser">
<ion-nav-back-button> <ion-nav-back-button>
</ion-nav-back-button> </ion-nav-back-button>
@@ -11,7 +11,7 @@
</ion-nav-bar> </ion-nav-bar>
<ion-nav-view name="menuContent"></ion-nav-view> <ion-nav-view name="menuContent"></ion-nav-view>
<!-- menu footer --> <!-- menu footer -->
<div class="tabs tabs-icon-left" ng-controller="FooterMenuCtrl" ng-show="storageuser" ng-hide="location=='message'"> <div class="tabs tabs-icon-left" ng-controller="FooterMenuCtrl" ng-show="storageuser">
<a class="tab-item" ng-href="#/app/notifications"> <a class="tab-item" ng-href="#/app/notifications">
<i class="icon ion-android-notifications-none"></i> Notifications <i class="icon ion-android-notifications-none"></i> Notifications
</a> </a>
@@ -25,36 +25,36 @@
<!-- /menu footer --> <!-- /menu footer -->
</ion-side-menu-content> </ion-side-menu-content>
<ion-side-menu side="left"> <ion-side-menu side="left" class="o_bSidenav">
<ion-header-bar class="bar-positive"> <ion-header-bar class="bar-stable o_bSidenav">
<h1 class="title">{{'Menu' | translate }}</h1> <h1 class="title o_fWhiteLight">{{'Menu' | translate }}</h1>
</ion-header-bar> </ion-header-bar>
<ion-content> <ion-content>
<ion-list> <ion-list>
<a class="item item-icon-left" menu-close href="#/app/main"> <a class="item item-icon-left o_bSidenav" menu-close href="#/app/main">
<i class="icon ion-home"></i> {{'Main' | translate }} <i class="icon ion-home"></i> {{'Main' | translate }}
</a> </a>
<a class="item item-icon-left" menu-close href="#/app/users/{{storageuser}}" ng-show="storageuser"> <a class="item item-icon-left o_bSidenav" menu-close href="#/app/users/{{storageuser._id}}">
<i class="icon ion-person"></i> {{storageuser.username}} <i class="icon ion-person"></i> {{storageuser.username}}
</a> </a>
<a class="item item-icon-left" menu-close href="#/app/travels"> <a class="item item-icon-left o_bSidenav" menu-close href="#/app/travels">
<i class="icon ion-android-car"></i> {{'Travels' | translate }} <i class="icon ion-android-car"></i> {{'Travels' | translate }}
</a> </a>
<a class="item item-icon-left" menu-close href="#/app/users"> <a class="item item-icon-left o_bSidenav" menu-close href="#/app/users">
<i class="icon ion-person-stalker"></i> {{'Users' | translate }} <i class="icon ion-person-stalker"></i> {{'Users' | translate }}
</a> </a>
<a class="item item-icon-left" menu-close href="#/app/notifications" ng-show="storageuser"> <a class="item item-icon-left o_bSidenav" menu-close href="#/app/notifications">
<i class="icon ion-android-notifications-none"></i> {{'Notifications' | translate }} <i class="icon ion-android-notifications-none"></i> {{'Notifications' | translate }}
<span class="badge badge-positive">{{userdata.notifications.length}}</span> <span class="badge badge-positive">{{userdata.notifications.length}}</span>
</a> </a>
<a class="item item-icon-left" menu-close href="#/app/settings"> <a class="item item-icon-left o_bSidenav" menu-close href="#/app/settings">
<i class="icon ion-settings"></i> {{'Settings' | translate }} <i class="icon ion-settings"></i> {{'Settings' | translate }}
</a> </a>
<a class="item item-icon-left" menu-close href="#/app/help"> <a class="item item-icon-left o_bSidenav" menu-close href="#/app/help">
<i class="icon ion-ios-help-outline"></i> {{'Help' | translate }} <i class="icon ion-ios-help-outline"></i> {{'Help' | translate }}
</a> </a>
<a class="item item-icon-left" menu-close ng-click="logout()" ng-show="storageuser"> <a class="item item-icon-left o_bSidenav" menu-close ng-click="logout()">
<i class="icon ion-home"></i> {{'Logout' | translate }} <i class="icon ion-power"></i> {{'Logout' | translate }}
</a> </a>
</ion-list> </ion-list>
</ion-content> </ion-content>

9
www/templates/offerCar.html
View File

@@ -1,6 +1,6 @@
<ion-view view-title="Offer Car"> <ion-view view-title="Offer Car">
<ion-content> <ion-content>
<form class="list"> <div class="list">
<label class="item item-input"> <label class="item item-input">
<span class="input-label"t>{{'Title' | translate}}</span> <span class="input-label"t>{{'Title' | translate}}</span>
<input ng-model="newtravel.title" class="positive" type="text" placeholder=""> <input ng-model="newtravel.title" class="positive" type="text" placeholder="">
@@ -50,13 +50,10 @@
<input ng-model="newtravel.description" type="text" placeholder="Description"> <input ng-model="newtravel.description" type="text" placeholder="Description">
</label> </label>
<p class="padding"> <p class="padding">
<button ng-click="closeNewOfferingTravel()" class="button button-assertive"> <button ng-click="createTravel()" class="button button-calm o_floatRight">
{{'Cancel' | translate}}
</button>
<button ng-click="doNewOfferingTravel()" class="button button-calm">
{{'Create_travel' | translate}} {{'Create_travel' | translate}}
</button> </button>
</p> </p>
</form> </div>
</ion-content> </ion-content>
</ion-view> </ion-view>

2
www/templates/signup.html
View File

@@ -18,7 +18,7 @@
</label> </label>
<label class="item item-input"> <label class="item item-input">
<span class="input-label">{{'Mail' | translate }}*</span> <span class="input-label">{{'Mail' | translate }}*</span>
<input type="email" ng-model="signupData.mail"> <input type="email" ng-model="signupData.email">
</label> </label>
<label class="item item-input"> <label class="item item-input">
<span class="input-label">{{'Phone' | translate }}</span> <span class="input-label">{{'Phone' | translate }}</span>

2
www/templates/travels.html
View File

@@ -24,7 +24,7 @@
</div> </div>
</div> </div>
<a ng-repeat="travel in travels | orderBy: 'date' | filter: search" class="item item-avatar" href="#/app/travels/{{travel._id}}"> <a ng-repeat="travel in travels | orderBy: 'date' | filter: search" class="item item-avatar" href="#/app/travels/{{travel._id}}">
<img ng-src="img/{{travel.modality}}.png"/> <img ng-src="img/{{travel.type}}.png"/>
<h2>{{travel.title}}</h2> <h2>{{travel.title}}</h2>
<div class="item-note text-right"> <div class="item-note text-right">
<div class="positive">{{travel.date | date:"dd/MM"}}</div> <div class="positive">{{travel.date | date:"dd/MM"}}</div>

12
www/templates/user.html
View File

@@ -1,13 +1,13 @@
<ion-view view-title="{{'User' | translate}} {{user.username}}"> <ion-view view-title="{{'User' | translate}} {{user.username}}">
<ion-content> <ion-content>
<div class="item item-avatar"> <div class="item item-avatar">
<img ng-src="img/avatars/{{user.avatar}}.png" /> <img ng-src="{{user.avatar}}" />
<h2>{{user.username}}</h2> <h2>{{user.username}}</h2>
</div> </div>
<div class="item item-body"> <div class="item item-body">
<p class="o-bold">{{user.description}}</p> <p class="o-bold">{{user.description}}</p>
<p>{{user.mail}}</p> <p>{{user.mail}}</p>
<p> <p ng-show="user.telegram">
<!--<a ng-href="https://telegram.me/{{user.telegram}}" target="_blank" class="button">--> <!--<a ng-href="https://telegram.me/{{user.telegram}}" target="_blank" class="button">-->
<img class='o-imgMenu' src="img/telegram.png" /> @{{user.telegram}} <img class='o-imgMenu' src="img/telegram.png" /> @{{user.telegram}}
<!--</a>--> <!--</a>-->
@@ -34,13 +34,13 @@
</div> </div>
<div class="item item-body"> <div class="item item-body">
{{'current_publications_of' | translate}} {{user.username}}: {{'current_publications_of' | translate}} {{user.username}}:
<div class="positive">{{travels.length}} {{'publications' | translate}}</div> <div class="positive">{{user.travels.length}} {{'publications' | translate}}</div>
<a ng-repeat="travel in travels | orderBy: 'date'" class="item item-avatar" href="#/app/travels/{{travel._id}}"> <a ng-repeat="travel in user.travels | orderBy: 'date'" class="item item-avatar" href="#/app/travels/{{travel._id}}">
<img ng-src="img/{{travel.modality}}.png"> <img ng-src="img/{{travel.type}}.png">
<h2>{{travel.title}} <h2>{{travel.title}}
<div class="item-note"> <div class="item-note">
<div class="positive">{{travel.date | date:"dd/MM HH:mm a"}}</div> <div class="positive">{{travel.date | date:"dd/MM/yyyy HH:mm a"}}</div>
</div> </div>
</h2> </h2>

2
www/templates/users.html
View File

@@ -13,7 +13,7 @@
</div> </div>
<a ng-repeat="user in users | orderBy: 'date'" class="item item-avatar" ng-href="#/app/users/{{user.username}}"> <a ng-repeat="user in users | orderBy: 'date'" class="item item-avatar" ng-href="#/app/users/{{user.username}}">
<img ng-src="img/avatars/{{user.avatar}}.png"> <img ng-src="{{user.avatar}}">
<h2>{{user.username}}</h2> <h2>{{user.username}}</h2>
<p> <p>
{{user.description}} {{user.description}}