f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-01-16 08:12:42 +00:00
Code Wiki Activity

Post merge fixes

Browse Source
This commit is contained in:
G.Ambatte
2025-03-27 18:25:56 +13:00
parent 7765cb31bf
commit ac89f428b2
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/admin/admin.jsx
View File

@@ -3,9 +3,9 @@ import React, { useEffect, useState } from 'react';
const BrewUtils = require('./brewUtils/brewUtils.jsx'); const BrewUtils = require('./brewUtils/brewUtils.jsx');
const NotificationUtils = require('./notificationUtils/notificationUtils.jsx'); const NotificationUtils = require('./notificationUtils/notificationUtils.jsx');
import AuthorUtils from './authorUtils/authorUtils.jsx'; import AuthorUtils from './authorUtils/authorUtils.jsx';
const LockTools = require('./lockTools/lockTools.jsx'); import LockTools from './lockTools/lockTools.jsx';
const tabGroups = ['brew', 'notifications', 'authors']; const tabGroups = ['brew', 'notifications', 'authors', 'locks'];
const Admin = ()=>{ const Admin = ()=>{
const [currentTab, setCurrentTab] = useState('brew'); const [currentTab, setCurrentTab] = useState('brew');
@@ -41,7 +41,7 @@ const Admin = ()=>{
{currentTab === 'brew' && <BrewUtils />} {currentTab === 'brew' && <BrewUtils />}
{currentTab === 'notifications' && <NotificationUtils />} {currentTab === 'notifications' && <NotificationUtils />}
{currentTab === 'authors' && <AuthorUtils />} {currentTab === 'authors' && <AuthorUtils />}
{currentTab === 'locks' && <LockTools />} {currentTab === 'locks' && <LockTools />}
</main> </main>
</div> </div>
); );

4
client/admin/lockTools/lockTools.jsx
View File

@@ -4,7 +4,7 @@ const React = require('react');
const createClass = require('create-react-class'); const createClass = require('create-react-class');
// const request = require('superagent'); // const request = require('superagent');
const request = require('../../homebrew/utils/request-middleware.js'); import request from '../../homebrew/utils/request-middleware.js';
const LockTools = createClass({ const LockTools = createClass({
getInitialState : function() { getInitialState : function() {
@@ -226,7 +226,7 @@ const LockTable = createClass({
</td>; </td>;
})} })}
<td className='icon' onClick={()=>{navigator.clipboard.writeText(result.shareId.toString());}}><i className='fa-regular fa-clipboard'></i></td> <td className='icon' onClick={()=>{navigator.clipboard.writeText(result.shareId.toString());}}><i className='fa-regular fa-clipboard'></i></td>
<td className='icon'><i className='fa-regular fa-circle-right'></i></td> <td className='icon'><a href={`/share/${result.shareId.toString()}`} target='_blank'><i className='fa-regular fa-circle-right'></i></a></td>
</tr>; </tr>;
})} })}
</tbody> </tbody>

4
client/homebrew/utils/request-middleware.js
View File

@@ -1,8 +1,8 @@
const version = require('../../../package.json').version; import packageJSON from '../../../package.json' with { type: 'json' };
import request from 'superagent'; import request from 'superagent';
const addHeader = (request)=>request.set('Homebrewery-Version', version); const addHeader = (request)=>request.set('Homebrewery-Version', packageJSON.version);
const requestMiddleware = { const requestMiddleware = {
get : (path)=>addHeader(request.get(path)), get : (path)=>addHeader(request.get(path)),

2
server/admin.api.js
View File

@@ -305,6 +305,8 @@ router.put('/api/lock/review/remove/:id', mw.adminOnly, async (req, res)=>{
} catch (error) { } catch (error) {
console.error(error); console.error(error);
return res.json({ status: 'ERROR', detail: `Unable to remove request for review on brew ID ${req.params.id}`, error }); return res.json({ status: 'ERROR', detail: `Unable to remove request for review on brew ID ${req.params.id}`, error });
};
});
// ####################### NOTIFICATIONS // ####################### NOTIFICATIONS