+
{renderNavItems()}
@@ -398,4 +407,4 @@ const ArchivePage = (props) => {
);
};
-module.exports = ArchivePage;
+module.exports = VaultPage;
diff --git a/client/homebrew/pages/archivePage/archivePage.less b/client/homebrew/pages/vaultPage/vaultPage.less
similarity index 99%
rename from client/homebrew/pages/archivePage/archivePage.less
rename to client/homebrew/pages/vaultPage/vaultPage.less
index 75e9c462e..9f6b8e3df 100644
--- a/client/homebrew/pages/archivePage/archivePage.less
+++ b/client/homebrew/pages/vaultPage/vaultPage.less
@@ -25,7 +25,7 @@ body {
}
}
-.archivePage {
+.vaultPage {
overflow-y: hidden;
height: 100%;
background-color: #2C3E50;
diff --git a/server/admin.api.js b/server/admin.api.js
index 0b5ecb1fc..66bd58852 100644
--- a/server/admin.api.js
+++ b/server/admin.api.js
@@ -85,6 +85,7 @@ router.get('/admin/lookup/:id', mw.adminOnly, async (req, res, next)=>{
});
});
+
/* Find 50 brews that aren't compressed yet */
router.get('/admin/finduncompressed', mw.adminOnly, (req, res)=>{
const query = uncompressedBrewQuery.clone();
@@ -100,6 +101,7 @@ router.get('/admin/finduncompressed', mw.adminOnly, (req, res)=>{
});
});
+
/* Compresses the "text" field of a brew to binary */
router.put('/admin/compress/:id', (req, res)=>{
HomebrewModel.findOne({ _id: req.params.id })
@@ -121,6 +123,7 @@ router.put('/admin/compress/:id', (req, res)=>{
});
});
+
router.get('/admin/stats', mw.adminOnly, async (req, res)=>{
try {
const totalBrewsCount = await HomebrewModel.countDocuments({});
diff --git a/server/app.js b/server/app.js
index cc8c7dfef..b0cb0aca5 100644
--- a/server/app.js
+++ b/server/app.js
@@ -54,7 +54,7 @@ app.use((req, res, next)=>{
app.use(homebrewApi);
app.use(require('./admin.api.js'));
-app.use(require('./archive.api.js'));
+app.use(require('./vault.api.js'));
const HomebrewModel = require('./homebrew.model.js').model;
const welcomeText = require('fs').readFileSync('client/homebrew/pages/homePage/welcome_msg.md', 'utf8');
@@ -462,8 +462,8 @@ app.use(async (err, req, res, next)=>{
res.status(err.status || err.response?.status || 500).send(err);
return;
}
- if(err.originalUrl?.startsWith('/archive/')) {
- // console.log('archive error');
+ if(err.originalUrl?.startsWith('/vault/')) {
+ // console.log('vault error');
res.status(err.status || err.response?.status || 500).send(err);
return;
}
@@ -490,8 +490,6 @@ app.use(async (err, req, res, next)=>{
res.send(page);
});
-
-
app.use((req, res)=>{
if(!res.headersSent) {
console.error('Headers have not been sent, responding with a server error.', req.url);
diff --git a/server/archive.api.js b/server/vault.api.js
similarity index 90%
rename from server/archive.api.js
rename to server/vault.api.js
index 512b071f1..97d91fc54 100644
--- a/server/archive.api.js
+++ b/server/vault.api.js
@@ -52,10 +52,10 @@ const buildBrewsQuery = (legacy, v3) => {
return brewsQuery;
};
-const archive = {
+const vault = {
findBrews: async (req, res, next) => {
try {
- console.log(`Query as received in archive api for findBrews:`);
+ console.log(`Query as received in vault api for findBrews:`);
console.table(req.query);
const title = req.query.title || '';
@@ -91,7 +91,7 @@ const archive = {
}
},
findTotal: async (req, res) => {
- console.log(`Query as received in archive api for totalBrews:`);
+ console.log(`Query as received in vault api for totalBrews:`);
console.table(req.query);
try {
const title = req.query.title || '';
@@ -102,9 +102,8 @@ const archive = {
const titleQuery = {
$and: [brewsQuery, ...titleConditionsArray],
};
-
const totalBrews = await HomebrewModel.countDocuments(titleQuery);
- console.log('when returning, totalbrews is ', totalBrews);
+ console.log('when returning, totalbrews is ', totalBrews, 'for the query ',JSON.stringify(titleQuery));
return res.json({ totalBrews });
} catch (error) {
@@ -114,7 +113,7 @@ const archive = {
},
};
-router.get('/api/archive/total', asyncHandler(archive.findTotal));
-router.get('/api/archive', asyncHandler(archive.findBrews));
+router.get('/api/vault/total', asyncHandler(vault.findTotal));
+router.get('/api/vault', asyncHandler(vault.findBrews));
module.exports = router;
diff --git a/themes/themes.json b/themes/themes.json
index cb0c5593e..bc719185d 100644
--- a/themes/themes.json
+++ b/themes/themes.json
@@ -34,7 +34,7 @@
"renderer": "V3",
"baseTheme": false,
"baseSnippets": "5ePHB",
- "path": "Journal"
+ "path": "journal"
}
}
}
\ No newline at end of file