krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 15:17:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed member modal on front page

Browse Source
This commit is contained in:
Keith Holliday
2016-05-16 09:54:22 -05:00
parent ad03cc8f9a
commit 11b567038e
4 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
website/client/js/services/memberServices.js
View File

@@ -1,8 +1,8 @@
'use strict';
angular.module('habitrpg')
.factory('Members', [ '$rootScope', 'Shared', 'ApiUrl', '$resource', '$http', '$q',
function($rootScope, Shared, ApiUrl, $resource, $http, $q) {
.factory('Members', [ '$rootScope', 'Shared', 'ApiUrl', '$http', '$q',
function($rootScope, Shared, ApiUrl, $http, $q) {
var members = {};
var selectedMember = {};
var apiV3Prefix = '/api/v3';

11
website/client/js/static.js
View File

@@ -6,18 +6,21 @@ window.habitrpg = angular.module('habitrpg', ['chieffancypants.loadingBar', 'ui.
.constant("STORAGE_SETTINGS_ID", 'habit-mobile-settings')
.constant("MOBILE_APP", false)
.controller("RootCtrl", ['$scope', '$location', '$modal', '$http', 'Stats', function($scope, $location, $modal, $http, Stats){
.controller("RootCtrl", ['$scope', '$location', '$modal', '$http', 'Stats', 'Members',
function($scope, $location, $modal, $http, Stats, Members) {
var memberId = $location.search()['memberId'];
if (memberId) {
$http.get('/api/v2/members/'+memberId).success(function(data, status, headers, config){
$scope.profile = window.habitrpgShared.wrap(data, false);
Members.fetchMember(memberId)
.success(function(response) {
$scope.profile = response.data;
$scope.statCalc = Stats;
$scope.Content = window.habitrpgShared.content;
$modal.open({
templateUrl: 'modals/member.html',
scope: $scope
});
})
});
}
$http.defaults.headers.common['x-client'] = 'habitica-web';

2
website/client/manifest.json
View File

@@ -136,6 +136,7 @@
"js/services/statServices.js",
"js/services/taskServices.js",
"js/services/tagsServices.js",
"js/services/memberServices.js",
"js/controllers/authCtrl.js",
"js/controllers/footerCtrl.js"
],
@@ -172,6 +173,7 @@
"js/services/taskServices.js",
"js/services/tagsServices.js",
"js/services/userServices.js",
"js/services/memberServices.js",
"js/controllers/authCtrl.js",
"js/controllers/footerCtrl.js"
],

2
website/server/controllers/api-v3/members.js
View File

@@ -33,7 +33,7 @@ let api = {};
api.getMember = {
method: 'GET',
url: '/members/:memberId',
middlewares: [authWithHeaders()],
middlewares: [],
async handler (req, res) {
req.checkParams('memberId', res.t('memberIdRequired')).notEmpty().isUUID();