Revert "Old partial attempt at "public mode""

This reverts commit 8f6b030ca8.
This commit is contained in:
Wingy 2020-10-29 11:25:05 -04:00
parent 8f6b030ca8
commit 066d72b153
6 changed files with 18 additions and 37 deletions

View file

@ -1,11 +0,0 @@
const verifyAuth = require('./verifyAuth')
const middlewareNoop = ( (_1, _2, next) => next() )
const publicMiddleware = () => process.env.LISTS_PUBLIC === 'true' ?
(req, res, next) => {
if (!req.user) req.user = { _id: 'Unknown' }
next()
}
: verifyAuth()
module.exports = publicMiddleware

View file

@ -1,5 +1,4 @@
const verifyAuth = require('../middlewares/verifyAuth'); const verifyAuth = require('../middlewares/verifyAuth');
const public = require('../middlewares/public');
const express = require('express'); const express = require('express');
const path = require('path'); const path = require('path');
@ -17,7 +16,7 @@ module.exports = ({ db, config }) => {
next(); next();
} }
}, },
public(), verifyAuth(),
(req, res) => { (req, res) => {
res.redirect('/wishlist'); res.redirect('/wishlist');
} }

View file

@ -1,5 +1,4 @@
const verifyAuth = require('../../middlewares/verifyAuth'); const verifyAuth = require('../../middlewares/verifyAuth');
const public = require('../../middlewares/public');
const getProductName = require('get-product-name'); const getProductName = require('get-product-name');
const express = require('express'); const express = require('express');
const config = require('../../config'); const config = require('../../config');
@ -30,7 +29,7 @@ const ValidURL = (string) => { // Ty SO
module.exports = (db) => { module.exports = (db) => {
const router = express.Router(); const router = express.Router();
router.get('/', public(), async (req, res) => { router.get('/', verifyAuth(), async (req, res) => {
const docs = await db.allDocs({ include_docs: true }) const docs = await db.allDocs({ include_docs: true })
if (process.env.SINGLE_LIST === 'true') { if (process.env.SINGLE_LIST === 'true') {
for (row of docs.rows) { for (row of docs.rows) {
@ -40,7 +39,7 @@ module.exports = (db) => {
res.render('wishlists', { title: 'Wishlists', users: docs.rows, totals}) res.render('wishlists', { title: 'Wishlists', users: docs.rows, totals})
}); });
router.get('/:user', public(), async (req, res) => { router.get('/:user', verifyAuth(), async (req, res) => {
try { try {
const dbUser = await db.get(req.params.user); const dbUser = await db.get(req.params.user);
if (process.env.SINGLE_LIST === 'true') { if (process.env.SINGLE_LIST === 'true') {

View file

@ -23,17 +23,13 @@ nav.navbar.is-fixed-top(role='navigation', aria-label='main navigation',style='b
.navbar-item.has-dropdown.is-hoverable .navbar-item.has-dropdown.is-hoverable
a.navbar-link= req.user._id a.navbar-link= req.user._id
.navbar-dropdown .navbar-dropdown
if req.user._id === 'Unknown' +navBarLink(`/wishlist/${req.user._id}`, 'My Wishlist')
.navbar-item +navBarLink('/profile', 'Profile')
a.button.is-primary(href='/login') Log In if req.user.admin
else +navBarLink('/admin-settings', 'Admin settings')
+navBarLink(`/wishlist/${req.user._id}`, 'My Wishlist') hr.navbar-divider
+navBarLink('/profile', 'Profile') .navbar-item
if req.user.admin form#logoutForm(action='/logout', method='POST')
+navBarLink('/admin-settings', 'Admin settings') button.button.is-warning(type='submit') Log Out
hr.navbar-divider
.navbar-item
form#logoutForm(action='/logout', method='POST')
button.button.is-warning(type='submit') Log Out
//-+navBarLink('javascript:document.getElementById("logoutForm").submit()', 'Log Out') //-+navBarLink('javascript:document.getElementById("logoutForm").submit()', 'Log Out')
script(src="/js/nav.js") script(src="/js/nav.js")

View file

@ -12,8 +12,7 @@ block title
span #{config.siteTitle} - #{title} span #{config.siteTitle} - #{title}
block content block content
if req.user script(type='data/user_id')= req.user._id
script(type='data/user_id')= req.user._id
if process.env.TABLE !== 'false' if process.env.TABLE !== 'false'
.box .box
table.table.has-mobile-cards table.table.has-mobile-cards

View file

@ -2,13 +2,12 @@ extends layout.pug
block content block content
ul.noStyle.noLeftMargin ul.noStyle.noLeftMargin
if req.user._id !== 'Unknown' li
li a(href=`/wishlist/${req.user._id}`)
a(href=`/wishlist/${req.user._id}`) .box
.box span=req.user._id
span=req.user._id span : ???/???
span : ???/??? progress.progress(value=1, max=1)
progress.progress(value=1, max=1)
each user in users each user in users
if req.user._id !== user.id if req.user._id !== user.id
li li