Skip to content

Commit

Permalink
feat(writeapi): abstracted ajax calls out to new api module
Browse files Browse the repository at this point in the history
  • Loading branch information
@julianlam
julianlam committed Oct 8, 2020
1 parent ba345e5 commit d044c32
Show file tree
Hide file tree
Showing 14 changed files with 137 additions and 178 deletions.
18 changes: 6 additions & 12 deletions public/src/admin/manage/categories.js
View file
Expand Up @@ -5,7 +5,9 @@ define('admin/manage/categories', [
'translator',
'benchpress',
'categorySelector',
], function (serialize, translator, Benchpress, categorySelector) {
'sortablejs',
'api',
], function (serialize, translator, Benchpress, categorySelector, api) {
var Categories = {};
var newCategoryId = -1;
var sortables;
Expand Down Expand Up @@ -196,12 +198,8 @@ define('admin/manage/categories', [

Categories.toggle = function (cids, disabled) {
var requests = cids.map(function (cid) {
return $.ajax({
url: config.relative_path + '/api/v1/categories/' + cid,
method: 'put',
data: {
disabled: disabled ? 1 : 0,
},
return api.put('/categories/' + cid, {
disabled: disabled ? 1 : 0,
});
});

Expand Down Expand Up @@ -238,11 +236,7 @@ define('admin/manage/categories', [
newCategoryId = -1;

Object.keys(modified).forEach(function (cid) {
$.ajax({
url: config.relative_path + '/api/v1/categories/' + cid,
method: 'put',
data: modified[cid],
});
api.put('/categories/' + cid, modified[cid]);
});
}
}
Expand Down
66 changes: 24 additions & 42 deletions public/src/admin/manage/category.js
View file
Expand Up @@ -6,7 +6,8 @@ define('admin/manage/category', [
'admin/modules/colorpicker',
'categorySelector',
'benchpress',
], function (uploader, iconSelect, colorpicker, categorySelector, Benchpress) {
'api',
], function (uploader, iconSelect, colorpicker, categorySelector, Benchpress, api) {
var Category = {};
var updateHash = {};

Expand Down Expand Up @@ -54,21 +55,17 @@ define('admin/manage/category', [
}

var cid = ajaxify.data.category.cid;
$.ajax({
url: config.relative_path + '/api/v1/categories/' + cid,
method: 'put',
data: updateHash,
}).done(function (res) {
api.put('/categories/' + cid, updateHash, (res) => {
app.flags._unsaved = false;
app.alert({
title: 'Updated Categories',
message: 'Category "' + res.response.name + '" was successfully updated.',
message: 'Category "' + res.name + '" was successfully updated.',
type: 'success',
timeout: 2000,
});
updateHash = {};
}).fail(function (ev) {
app.alertError(ev.responseJSON.status.message);
}, (err) => {
app.alertError(err.status.message);
});

return false;
Expand Down Expand Up @@ -107,18 +104,15 @@ define('admin/manage/category', [
});
}, 1000);

$.ajax({
url: config.relative_path + '/api/v1/categories/' + ajaxify.data.category.cid,
method: 'delete',
}).done(function () {
api.del('/categories/' + ajaxify.data.category.cid, undefined, () => {
if (intervalId) {
clearInterval(intervalId);
}
modal.modal('hide');
app.alertSuccess('[[admin/manage/categories:alert.purge-success]]');
ajaxify.go('admin/manage/categories');
}).fail(function (ev) {
app.alertError(ev.responseJSON.status.message);
}, (err) => {
app.alertError(err.status.message);
});

return false;
Expand Down Expand Up @@ -225,35 +219,27 @@ define('admin/manage/category', [

$('button[data-action="setParent"], button[data-action="changeParent"]').on('click', Category.launchParentSelector);
$('button[data-action="removeParent"]').on('click', function () {
$.ajax({
url: config.relative_path + '/api/v1/categories/' + ajaxify.data.category.cid,
method: 'put',
data: {
parentCid: 0,
},
}).done(function () {
api.put('/categories/' + ajaxify.data.category.cid, {
parentCid: 0,
}, () => {
$('button[data-action="removeParent"]').parent().addClass('hide');
$('button[data-action="changeParent"]').parent().addClass('hide');
$('button[data-action="setParent"]').removeClass('hide');
}).fail(function (ev) {
app.alertError(ev.responseJSON.status.message);
}, (err) => {
app.alertError(err.message);
});
});
$('button[data-action="toggle"]').on('click', function () {
var $this = $(this);
var disabled = $this.attr('data-disabled') === '1';
$.ajax({
url: config.relative_path + '/api/v1/categories/' + ajaxify.data.category.cid,
method: 'put',
data: {
disabled: disabled ? 0 : 1,
},
}).done(function () {
api.put('/categories/' + ajaxify.data.category.cid, {
disabled: disabled ? 0 : 1,
}, () => {
$this.translateText(!disabled ? '[[admin/manage/categories:enable]]' : '[[admin/manage/categories:disable]]');
$this.toggleClass('btn-primary', !disabled).toggleClass('btn-danger', disabled);
$this.attr('data-disabled', disabled ? 0 : 1);
}).fail(function (ev) {
app.alertError(ev.responseJSON.status.message);
}, (err) => {
app.alertError(err.message);
});
});
};
Expand Down Expand Up @@ -303,13 +289,9 @@ define('admin/manage/category', [
});

categorySelector.modal(categories, function (parentCid) {
$.ajax({
url: config.relative_path + '/api/v1/categories/' + ajaxify.data.category.cid,
method: 'put',
data: {
parentCid: parentCid,
},
}).done(function () {
api.put('/categories/' + ajaxify.data.category.cid, {
parentCid: parentCid,
}, () => {
var parent = allCategories.filter(function (category) {
return category && parseInt(category.cid, 10) === parseInt(parentCid, 10);
});
Expand All @@ -319,8 +301,8 @@ define('admin/manage/category', [
$('button[data-action="setParent"]').addClass('hide');
var buttonHtml = '<i class="fa ' + parent.icon + '"></i> ' + parent.name;
$('button[data-action="changeParent"]').html(buttonHtml).parent().removeClass('hide');
}).fail(function (ev) {
app.alertError(ev.responseJSON.status.message);
}, (err) => {
app.alertError(err.message);
});
});
});
Expand Down
20 changes: 8 additions & 12 deletions public/src/admin/manage/groups.js
View file
@@ -1,9 +1,9 @@
'use strict';


define('admin/manage/groups', [
'categorySelector',
], function (categorySelector) {
'api',
], function (categorySelector, api) {
var Groups = {};

var intervalId = 0;
Expand Down Expand Up @@ -37,22 +37,18 @@ define('admin/manage/groups', [
hidden: $('#create-group-hidden').is(':checked') ? 1 : 0,
};

$.ajax({
url: config.relative_path + '/api/v1/groups',
method: 'post',
data: submitObj,
}).done(function (res) {
api.post('/groups', submitObj, (response) => {
createModalError.addClass('hide');
createGroupName.val('');
createModal.on('hidden.bs.modal', function () {
ajaxify.go('admin/manage/groups/' + res.response.name);
ajaxify.go('admin/manage/groups/' + response.name);
});
createModal.modal('hide');
}).fail(function (ev) {
if (utils.hasLanguageKey(ev.responseJSON.status.message)) {
ev.responseJSON.status.message = '[[admin/manage/groups:alerts.create-failure]]';
}, (err) => {
if (!utils.hasLanguageKey(err.status.message)) {
err.status.message = '[[admin/manage/groups:alerts.create-failure]]';
}
createModalError.translateHtml(ev.responseJSON.status.message).removeClass('hide');
createModalError.translateHtml(err.status.message).removeClass('hide');
});
});

Expand Down
28 changes: 8 additions & 20 deletions public/src/admin/manage/users.js
View file
@@ -1,6 +1,6 @@
'use strict';

define('admin/manage/users', ['translator', 'benchpress', 'autocomplete'], function (translator, Benchpress, autocomplete) {
define('admin/manage/users', ['translator', 'benchpress', 'autocomplete', 'api'], function (translator, Benchpress, autocomplete, api) {
var Users = {};

Users.init = function () {
Expand Down Expand Up @@ -133,10 +133,7 @@ define('admin/manage/users', ['translator', 'benchpress', 'autocomplete'], funct
bootbox.confirm((uids.length > 1 ? '[[admin/manage/users:alerts.confirm-ban-multi]]' : '[[admin/manage/users:alerts.confirm-ban]]'), function (confirm) {
if (confirm) {
var requests = uids.map(function (uid) {
return $.ajax({
url: config.relative_path + '/api/v1/users/' + uid + '/ban',
method: 'put',
});
return api.put('/users/' + uid + '/ban');
});

$.when(requests)
Expand Down Expand Up @@ -178,13 +175,9 @@ define('admin/manage/users', ['translator', 'benchpress', 'autocomplete'], funct
var until = formData.length > 0 ? (Date.now() + (formData.length * 1000 * 60 * 60 * (parseInt(formData.unit, 10) ? 24 : 1))) : 0;

var requests = uids.map(function (uid) {
return $.ajax({
url: config.relative_path + '/api/v1/users/' + uid + '/ban',
method: 'put',
data: {
until: until,
reason: formData.reason,
},
return api.put('/users/' + uid + '/ban', {
until: until,
reason: formData.reason,
});
});

Expand All @@ -209,10 +202,7 @@ define('admin/manage/users', ['translator', 'benchpress', 'autocomplete'], funct
}

var requests = uids.map(function (uid) {
return $.ajax({
url: config.relative_path + '/api/v1/users/' + uid + '/ban',
method: 'delete',
});
return api.delete('/users/' + uid + '/ban');
});

$.when(requests)
Expand Down Expand Up @@ -408,15 +398,13 @@ define('admin/manage/users', ['translator', 'benchpress', 'autocomplete'], funct
password: password,
};

$.post(config.relative_path + '/api/v1/users', user).done(function () {
api.post('/users', user, () => {
modal.modal('hide');
modal.on('hidden.bs.modal', function () {
ajaxify.refresh();
});
app.alertSuccess('[[admin/manage/users:alerts.create-success]]');
}).fail(function (ev) {
return errorEl.translateHtml('[[admin/manage/users:alerts.error-x, ' + ev.responseJSON.status.message + ']]').removeClass('d-none').addClass('d-block');
});
}, err => errorEl.translateHtml('[[admin/manage/users:alerts.error-x, ' + err.status.message + ']]').removeClass('hidden'));
}

var timeoutId = 0;
Expand Down
27 changes: 13 additions & 14 deletions public/src/client/account/edit.js
View file
@@ -1,7 +1,12 @@
'use strict';


define('forum/account/edit', ['forum/account/header', 'translator', 'components', 'pictureCropper', 'benchpress'], function (header, translator, components, pictureCropper, Benchpress) {
define('forum/account/edit', [
'forum/account/header',
'translator',
'pictureCropper',
'benchpress',
'api',
], function (header, translator, pictureCropper, Benchpress, api) {
var AccountEdit = {};

AccountEdit.init = function () {
Expand Down Expand Up @@ -42,21 +47,15 @@ define('forum/account/edit', ['forum/account/header', 'translator', 'components'

$(window).trigger('action:profile.update', userData);

$.ajax({
url: config.relative_path + '/api/v1/users/' + userData.uid,
data: userData,
method: 'put',
}).done(function (res) {
app.alertSuccess('[[user:profile_update_success]]');
api.put('/users/' + userData.uid, userData, (res) => {
app.alertSuccess('[[user:profile-update-success]]');

if (res.response.picture) {
$('#user-current-picture').attr('src', res.response.picture);
if (res.picture) {
$('#user-current-picture').attr('src', res.picture);
}

updateHeader(res.response.picture);
}).fail(function (ev) {
return app.alertError(ev.responseJSON.status.message);
});
updateHeader(res.picture);
}, err => app.alertError(err.status.message));

return false;
}
Expand Down
15 changes: 4 additions & 11 deletions public/src/client/account/edit/email.js
View file
@@ -1,7 +1,6 @@
'use strict';


define('forum/account/edit/email', ['forum/account/header'], function (header) {
define('forum/account/edit/email', ['forum/account/header', 'api'], function (header, api) {
var AccountEditEmail = {};

AccountEditEmail.init = function () {
Expand All @@ -27,16 +26,10 @@ define('forum/account/edit/email', ['forum/account/header'], function (header) {
var btn = $(this);
btn.addClass('disabled').find('i').removeClass('hide');

$.ajax({
url: config.relative_path + '/api/v1/users/' + userData.uid,
data: userData,
method: 'put',
}).done(function (res) {
api.put('/users/' + userData.uid, userData, (res) => {
btn.removeClass('disabled').find('i').addClass('hide');
ajaxify.go('user/' + res.response.userslug + '/edit');
}).fail(function (ev) {
app.alertError(ev.responseJSON.status.message);
});
ajaxify.go('user/' + res.userslug + '/edit');
}, err => app.alertError(err.status.message));

return false;
});
Expand Down
19 changes: 6 additions & 13 deletions public/src/client/account/edit/password.js
View file
@@ -1,7 +1,6 @@
'use strict';


define('forum/account/edit/password', ['forum/account/header', 'translator', 'zxcvbn'], function (header, translator, zxcvbn) {
define('forum/account/edit/password', ['forum/account/header', 'translator', 'zxcvbn', 'api',], function (header, translator, zxcvbn, api) {
var AccountEditPassword = {};

AccountEditPassword.init = function () {
Expand Down Expand Up @@ -67,22 +66,16 @@ define('forum/account/edit/password', ['forum/account/header', 'translator', 'zx
var btn = $(this);
if (passwordvalid && passwordsmatch) {
btn.addClass('disabled').find('i').removeClass('hide');
$.ajax({
url: config.relative_path + '/api/v1/users/' + ajaxify.data.theirid + '/password',
method: 'put',
data: {
currentPassword: currentPassword.val(),
newPassword: password.val(),
},
}).done(function () {
api.put('/users/' + ajaxify.data.theirid + '/password', {
currentPassword: currentPassword.val(),
newPassword: password.val(),
}, () => {
if (parseInt(app.user.uid, 10) === parseInt(ajaxify.data.uid, 10)) {
window.location.href = config.relative_path + '/login';
} else {
ajaxify.go('user/' + ajaxify.data.userslug + '/edit');
}
}).fail(function (ev) {
app.alertError(ev.responseJSON.status.message);
}).always(function () {
}, err => app.alertError(err.status.message)).always(() => {
btn.removeClass('disabled').find('i').addClass('hide');
currentPassword.val('');
password.val('');
Expand Down

0 comments on commit d044c32

Please sign in to comment.