contrib: add Admin page to update contributor status. Start migrating from User.backer => User.contributor

This commit is contained in:
Tyler Renelle
2013-11-06 15:49:41 -08:00
parent 3b18c322bc
commit d679fa1e62
9 changed files with 88 additions and 4 deletions

View File

@@ -146,6 +146,13 @@ window.habitrpg = angular.module('habitrpg',
templateUrl: "partials/options.settings.html" templateUrl: "partials/options.settings.html"
}) })
// Options > Settings
.state('options.admin', {
url: "/admin",
controller: 'AdminCtrl',
templateUrl: "partials/options.admin.html"
})
var settings = JSON.parse(localStorage.getItem(STORAGE_SETTINGS_ID)); var settings = JSON.parse(localStorage.getItem(STORAGE_SETTINGS_ID));
if (settings && settings.auth) { if (settings && settings.auth) {
$httpProvider.defaults.headers.common['Content-Type'] = 'application/json;charset=utf-8'; $httpProvider.defaults.headers.common['Content-Type'] = 'application/json;charset=utf-8';

View File

@@ -0,0 +1,16 @@
"use strict";
habitrpg.controller("AdminCtrl", ['$scope', '$rootScope', 'User', 'Members', 'Notification',
function($scope, $rootScope, User, Members, Notification) {
$scope.profile = undefined;
$scope.loadUser = function(uuid){
$scope.profile = Members.Member.get({uid:uuid});
}
$scope.save = function(profile) {
profile.$save(function(){
Notification.text("User updated");
$scope.profile = undefined;
$scope._uuid = undefined;
})
}
}])

View File

@@ -11,6 +11,8 @@ angular.module('memberServices', ['ngResource']).
var Member = $resource(API_URL + '/api/v1/members/:uid', {uid:'@_id'}); var Member = $resource(API_URL + '/api/v1/members/:uid', {uid:'@_id'});
var memberServices = { var memberServices = {
Member: Member,
members: members, members: members,
/** /**

View File

@@ -52,7 +52,8 @@
"js/controllers/inventoryCtrl.js", "js/controllers/inventoryCtrl.js",
"js/controllers/marketCtrl.js", "js/controllers/marketCtrl.js",
"js/controllers/footerCtrl.js", "js/controllers/footerCtrl.js",
"js/controllers/challengesCtrl.js" "js/controllers/challengesCtrl.js",
"js/controllers/adminCtrl.js"
], ],
"css": [ "css": [
"bower_components/bootstrap/docs/assets/css/bootstrap.css", "bower_components/bootstrap/docs/assets/css/bootstrap.css",

View File

@@ -17,7 +17,7 @@ var api = module.exports;
*/ */
var itemFields = 'items.armor items.head items.shield items.weapon items.currentPet items.pets'; // TODO just send down count(items.pets) for better performance var itemFields = 'items.armor items.head items.shield items.weapon items.currentPet items.pets'; // TODO just send down count(items.pets) for better performance
var partyFields = 'profile preferences stats achievements party backer flags.rest auth.timestamps ' + itemFields; var partyFields = 'profile preferences stats achievements party backer contributor balance flags.rest auth.timestamps ' + itemFields;
var nameFields = 'profile.name'; var nameFields = 'profile.name';
var challengeFields = '_id name'; var challengeFields = '_id name';
var guildPopulate = {path: 'members', select: nameFields, options: {limit: 15} }; var guildPopulate = {path: 'members', select: nameFields, options: {limit: 15} };
@@ -46,6 +46,24 @@ api.getMember = function(req, res) {
}) })
} }
api.updateMember = function(req, res) {
var user = res.locals.user;
if (!(user.contributor && user.contributor.admin)) return res.json(401, {err:"You don't have access to save this user"});
async.waterfall([
function(cb){
User.findById(req.params.uid, cb);
},
function(member, cb){
if (!member) return res.json(404, {err: "User not found"});
_.merge(member, _.pick(req.body, ['contributor', 'balance']));
member.save(cb);
}
], function(err, saved){
if (err) return res.json(500,{err:err});
res.json(204);
})
}
/** /**
* Fetch groups list. This no longer returns party or tavern, as those can be requested indivdually * Fetch groups list. This no longer returns party or tavern, as those can be requested indivdually
* as /groups/party or /groups/tavern * as /groups/party or /groups/tavern

View File

@@ -54,12 +54,18 @@ var UserSchema = new Schema({
backer: { backer: {
tier: Number, tier: Number,
admin: Boolean, //admin: Boolean, // FIXME migrate to contributor.admin
npc: String, npc: String,
contributor: String, //contributor: String, // FIXME migrate to contributor.text
tokensApplied: Boolean tokensApplied: Boolean
}, },
contributor: {
level: Number, // 1-7, see https://trello.com/c/wkFzONhE/277-contributor-gear
admin: Boolean,
text: String, // Artisan, Friend, Blacksmith, etc
},
balance: Number, balance: Number,
filters: {type: Schema.Types.Mixed, 'default': {}}, filters: {type: Schema.Types.Mixed, 'default': {}},

View File

@@ -80,6 +80,7 @@ router["delete"]('/groups/:gid/chat/:messageId', auth.auth, groups.attachGroup,
/* Members */ /* Members */
router.get('/members/:uid', groups.getMember); router.get('/members/:uid', groups.getMember);
router.post('/members/:uid', auth.auth, groups.updateMember); // only for admins
// Market // Market
router.post('/market/buy', auth.auth, user.marketBuy); router.post('/market/buy', auth.auth, user.marketBuy);

28
views/options/admin.jade Normal file
View File

@@ -0,0 +1,28 @@
script(id='partials/options.admin.html', type="text/ng-template")
form.form-horizontal(ng-submit='loadUser(_uuid)')
.-options
.option-group.option-large
input.option-content(type='text', ng-model='_uuid', placeholder='UUID')
button.btn(type='submit') Load User
form.form-horizontal(ng-show='profile', ng-submit='save(profile)')
h3 {{profile.profile.name}}
h4 Contributor Status
.-options
.control-group.option-large
input.option-content(type='text', ng-model='profile.contributor.text', placeholder='Contributor Title (eg, "Blacksmith")')
.control-group.option-medium
input.option-content(type='number', step="any", ng-model='profile.contributor.level')
span.input-suffix Contrib Level
br
small [1-7] this determines which items, pets, and mounts are available. Also determines name-tag coloring. 
a(target='_blank', href='https://trello.com/c/wkFzONhE/277-contributor-gear') More details.
.control-group.option-medium
input.option-content(type='number', step="any", ng-model='profile.balance')
span.input-suffix $ (Gems/4)
.control-group.option-medium
label.checkbox
input(type='checkbox', ng-model='profile.contributor.admin')
| Admin
// h4 Backer Status
// Add backer stuff like tier, disable adds, etcs
button.btn-primary(type='submit') Save

View File

@@ -2,6 +2,7 @@ include ./profile
include ./social/index include ./social/index
include ./inventory/index include ./inventory/index
include ./settings include ./settings
include ./admin
script(id='partials/options.html', type="text/ng-template") script(id='partials/options.html', type="text/ng-template")
.grid .grid
@@ -26,6 +27,10 @@ script(id='partials/options.html', type="text/ng-template")
a(ui-sref='options.settings') a(ui-sref='options.settings')
i.icon-wrench i.icon-wrench
| Settings | Settings
li(ng-class="{ active: $state.includes('options.admin') }", ng-if='user.contributor.admin')
a(ui-sref='options.admin')
i.icon-cog
| Admin
.tab-content .tab-content
.tab-pane.active .tab-pane.active