from admin to archive api

client/homebrew/pages/archivePage/archivePage.jsx

@@ -3,7 +3,6 @@ const React       = require('react');
 const createClass = require('create-react-class');
 const _           = require('lodash');
 const cx          = require('classnames');
-const Moment      = require('moment');
 
 const Nav           = require('naturalcrit/nav/nav.jsx');
 const Navbar        = require('../../navbar/navbar.jsx');
@@ -11,6 +10,7 @@ const RecentNavItem = require('../../navbar/recent.navitem.jsx').both;
 const Account       = require('../../navbar/account.navitem.jsx');
 const NewBrew       = require('../../navbar/newbrew.navitem.jsx');
 const HelpNavItem   = require('../../navbar/help.navitem.jsx');
+const ListPage      = require('../basePages/listPage/listPage.jsx');
 
 const request = require('superagent');
 
@@ -22,7 +22,7 @@ const ArchivePage = createClass({
   getInitialState: function () {
     return {
       query      : '',
-      foundBrews : null,
+      brewCollection : null,
       searching  : false,
       error      : null,
     };
@@ -34,80 +34,20 @@ const ArchivePage = createClass({
     this.setState({ searching: true, error: null });
 
     request
-      .get(`/admin/archive/${this.state.query}`)
-      .then((res) => this.setState({ foundBrews: res.body }))
+      .get(`/archive/${this.state.query}`)
+      .then((res) => this.setState({ brewCollection: res.body }))
       .catch((err) => this.setState({ error: err }))
       .finally(() => this.setState({ searching: false }));
   },
   renderFoundBrews() {
-    const brews = this.state.foundBrews;
+    const brews = this.state.brewCollection;
 
     if (!brews || brews.length === 0) {
       return <div>No brews found.</div>;
     }
 
-    return (
-      <div className='foundBrews'>
-        {brews.map((brew, index) => (
-          <div key={index} className='brewItem'>
-            <dl>
-              <dt>Title:</dt>
-              <dd>{brew.title}</dd>
-
-              <dt>Authors:</dt>
-              <dd>
-                {brew.authors.map((author, index) => (
-                  <span key={index}>
-                    <a
-                      href={`/user/${author}`}
-                      target='_blank'
-                      rel='noopener noreferrer'
-                    >
-                      {author}
-                    </a>
-                    {index < brew.authors.length - 1 && ', '}
-                  </span>
-                ))}
-              </dd>
-
-              <a href={`/share/${brew.shareId}`}>
-                Check the brew <i className='fas fa-external-link-alt'></i>
-              </a>
-
-              <dt>Systems:</dt>
-              <dd>{brew.systems.join(', ')}</dd>
-
-              {brew.tags?.length ? (
-                <>
-                  <div
-                    className='brewTags'
-                    title={`Tags:\n${brew.tags.join('\n')}`}
-                  >
-                    <i className='fas fa-tags' />
-                    {brew.tags.map((tag, idx) => {
-                      const matches = tag.match(/^(?:([^:]+):)?([^:]+)$/);
-                      return (
-                        <span key={idx} className={matches[1]}>
-                          {matches[2]}
-                        </span>
-                      );
-                    })}
-                  </div>
-                </>
-              ) : (
-                <></>
-              )}
-
-              <dt>Last Updated:</dt>
-              <dd>{Moment(brew.updatedAt).fromNow()}</dd>
-
-              <dt>Num of Views:</dt>
-              <dd>{brew.views}</dd>
-            </dl>
-          </div>
-        ))}
-      </div>
-    );
+      return <ListPage brewCollection={this.state.brewCollection} /*navItems={this.navItems()}*/ reportError={this.errorReported}></ListPage>;
+    
   },
 
   renderForm: function () {

server/admin.api.js

@@ -76,28 +76,6 @@ router.get('/admin/lookup/:id', mw.adminOnly, async (req, res, next) => {
 	  return res.status(500).json({ error: 'Internal Server Error' });
 	}
 });
-
-
-/* Searches for matching title, also attempts to partial match */
-router.get('/admin/archive/:title', mw.adminOnly, async (req, res, next) => {
-	try {
-	  const brews = await HomebrewModel.find({
-		title: { $regex: req.params.title, $options: 'i' },
-		published: true
-	  }).exec();
-  
-	  if (!brews || brews.length === 0) {
-		// No published documents found with the given title
-		return res.status(404).json({ error: 'Published documents not found' });
-	  }
-  
-	  return res.json(brews);
-	} catch (error) {
-	  console.error(error);
-	  return res.status(500).json({ error: 'Internal Server Error' });
-	}
-  });
-  
   
 /* Find 50 brews that aren't compressed yet */
 router.get('/admin/finduncompressed', mw.adminOnly, (req, res)=>{

server/app.js

@@ -67,6 +67,7 @@ app.use((req, res, next)=>{
 
 app.use(homebrewApi);
 app.use(require('./admin.api.js'));
+app.use(require('./archive.api.js'));
 
 const HomebrewModel     = require('./homebrew.model.js').model;
 const welcomeText       = require('fs').readFileSync('client/homebrew/pages/homePage/welcome_msg.md', 'utf8');
@@ -480,6 +481,11 @@ 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');
+		res.status(err.status || err.response?.status || 500).send(err);
+		return;
+	}
 
 	// console.log('non-API error');
 	const status = err.status || err.code || 500;
@@ -503,6 +509,8 @@ 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);

server/archive.api.js

@@ -0,0 +1,31 @@
+const HomebrewModel = require('./homebrew.model.js').model;
+const router = require('express').Router();
+const asyncHandler = require('express-async-handler');
+
+
+const archive = {
+    archiveApi : router,
+    /* Searches for matching title, also attempts to partial match */
+    findBrews  : async (req, res, next) => {
+        try {
+          const brews = await HomebrewModel.find({
+            title: { $regex: req.params.query, $options: 'i' },
+            published: true
+          }).exec();
+      
+          if (!brews || brews.length === 0) {
+            // No published documents found with the given title
+            return res.status(404).json({ error: 'Published documents not found' });
+          }
+      
+          return res.json(brews);
+        } catch (error) {
+          console.error(error);
+          return res.status(500).json({ error: 'Internal Server Error' });
+        }
+    }
+}
+router.get('/archive/:query', asyncHandler(archive.findBrews));
+
+
+module.exports = archive;