diff --git a/client/admin/lockTools/lockTools.jsx b/client/admin/lockTools/lockTools.jsx
index 2135425eb..31520b88c 100644
--- a/client/admin/lockTools/lockTools.jsx
+++ b/client/admin/lockTools/lockTools.jsx
@@ -3,7 +3,8 @@ require('./lockTools.less');
const React = require('react');
const createClass = require('create-react-class');
-const request = require('superagent');
+// const request = require('superagent');
+const request = require('../../homebrew/utils/request-middleware.js');
const LockTools = createClass({
getInitialState : function() {
@@ -18,7 +19,7 @@ const LockTools = createClass({
},
updateReviewCount : async function() {
- const newCount = await request.get('/admin/lock')
+ const newCount = await request.get('/api/lock/count')
.then((res)=>{return res.body?.count || 'Unknown';});
if(newCount != this.state.reviewCount){
this.setState({
@@ -33,13 +34,13 @@ const LockTools = createClass({
Number of brews currently locked: {this.state.reviewCount}
-
+
-
-
+
+
;
@@ -48,11 +49,12 @@ const LockTools = createClass({
const LockBrew = createClass({
getInitialState : function() {
+ // Default values
return {
brewId : '',
- code : 1000,
+ code : 455,
editMessage : '',
- shareMessage : '',
+ shareMessage : 'This Brew has been locked.',
result : {}
};
},
@@ -73,7 +75,7 @@ const LockBrew = createClass({
applied : new Date
};
- request.post(`/admin/lock/${this.state.brewId}`)
+ request.post(`/api/lock/${this.state.brewId}`)
.send(newLock)
.set('Content-Type', 'application/json')
.then((response)=>{
@@ -167,7 +169,7 @@ const LockTable = createClass({
getDefaultProps : function() {
return {
title : '',
- fetchURL : '/admin/locks',
+ fetchURL : '/api/locks',
resultName : '',
propertyNames : ['shareId']
};
@@ -236,7 +238,7 @@ const LockTable = createClass({
const LockLookup = createClass({
getDefaultProps : function() {
return {
- fetchURL : '/admin/lookup'
+ fetchURL : '/api/lookup'
};
},
diff --git a/client/homebrew/utils/request-middleware.js b/client/homebrew/utils/request-middleware.js
index f6bc2571b..80ee58f5d 100644
--- a/client/homebrew/utils/request-middleware.js
+++ b/client/homebrew/utils/request-middleware.js
@@ -1,6 +1,7 @@
const request = require('superagent');
+const version = require('../../../package.json').version;
-const addHeader = (request)=>request.set('Homebrewery-Version', global.version);
+const addHeader = (request)=>request.set('Homebrewery-Version', version);
const requestMiddleware = {
get : (path)=>addHeader(request.get(path)),
diff --git a/server/admin.api.js b/server/admin.api.js
index 8f997aed9..1bf597bb4 100644
--- a/server/admin.api.js
+++ b/server/admin.api.js
@@ -139,7 +139,7 @@ router.get('/admin/stats', mw.adminOnly, async (req, res)=>{
}
});
-router.get('/admin/lock', mw.adminOnly, async (req, res)=>{
+router.get('/api/lock/count', mw.adminOnly, async (req, res)=>{
try {
const countLocksQuery = {
lock : { $exists: true }
@@ -157,7 +157,7 @@ router.get('/admin/lock', mw.adminOnly, async (req, res)=>{
}
});
-router.post('/admin/lock/:id', mw.adminOnly, async (req, res)=>{
+router.post('/api/lock/:id', mw.adminOnly, async (req, res)=>{
try {
const lock = req.body;
lock.applied = new Date;
@@ -186,7 +186,7 @@ router.post('/admin/lock/:id', mw.adminOnly, async (req, res)=>{
}
});
-router.put('/admin/unlock/:id', mw.adminOnly, async (req, res)=>{
+router.put('/api/unlock/:id', mw.adminOnly, async (req, res)=>{
try {
const filter = {
shareId : req.params.id
@@ -210,7 +210,7 @@ router.put('/admin/unlock/:id', mw.adminOnly, async (req, res)=>{
return res.json({ status: 'UNLOCKED', detail: `Lock removed from brew ID ${req.params.id}` });
});
-router.get('/admin/lock/reviews', mw.adminOnly, async (req, res)=>{
+router.get('/api/lock/reviews', mw.adminOnly, async (req, res)=>{
try {
const countReviewsPipeline = [
{
@@ -260,7 +260,7 @@ router.put('/admin/lock/review/request/:id', async (req, res)=>{
}
});
-router.put('/admin/lock/review/remove/:id', mw.adminOnly, async (req, res)=>{
+router.put('/api/lock/review/remove/:id', mw.adminOnly, async (req, res)=>{
try {
const filter = {
shareId : req.params.id,