diff --git a/README.md b/README.md index 14ad3b0..d61dba3 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,9 @@ To create a simple place for your entire family to use to find gifts that people ## Amazon Smile By default, Christmas Community converts www.amazon.com links to smile.amazon.com. If you do not want this, set the environment variable SMILE to false (if you are using Docker Compose, make sure to put "false" in quotes). +## Root Path +If you want put Christmas Community on a subdirectory, such as `/christmas-community`, set `ROOT_PATH` to that path. + ## Docker ``` docker run --detach --name christmas-community -p 80:80 --restart always wingysam/christmas-community diff --git a/config/index.js b/config/index.js index 8f4c34c..f13b502 100644 --- a/config/index.js +++ b/config/index.js @@ -13,5 +13,6 @@ module.exports = { siteTitle: process.env.SITE_TITLE || 'Christmas Community', shortTitle: process.env.SHORT_TITLE || 'Christmas', useCDN: yesNo.parse(process.env.USE_CDN || true), - wishlist: require('./wishlist') + wishlist: require('./wishlist'), + base: (process.env.ROOT_PATH || '/').endsWith('/') ? (process.env.ROOT_PATH || '/') : `${process.env.ROOT_PATH}/` }; diff --git a/index.js b/index.js index 9daaf4d..bf600ec 100644 --- a/index.js +++ b/index.js @@ -1,3 +1,4 @@ +global._CC = {} const expressSessionLevel = require('express-session-level'); const LocalStrategy = require('passport-local').Strategy; const session = require('express-session'); @@ -9,10 +10,12 @@ const PouchDB = require('pouchdb'); const level = require('level'); const config = require('./config'); +_CC.config = config const logger = require('./logger'); const app = express(); +app.set('base', config.base) const db = new PouchDB(config.dbUrl); @@ -54,7 +57,8 @@ app.use(session({ store: new LevelStore(sessionDb), cookie: { maxAge: config.sessionMaxAge - } + }, + name: 'christmas_community.connect.sid' })); app.use(flash()); app.use(passport.initialize()); @@ -68,6 +72,6 @@ app.use((req, res, next) => { }); app.set('view engine', 'pug'); -app.use('/', require('./routes')({ db, config })); +app.use(config.base, require('./routes')({ db, config })); app.listen(config.port, () => logger.success('express', `Express server started on port ${config.port}!`)) diff --git a/package.json b/package.json index fc29b76..8171f0a 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,10 @@ { "name": "christmas-community", - "version": "1.10.5", + "version": "1.11.0", "description": "Christmas lists for communities", "main": "main.js", "scripts": { + "postinstall": "cp patched-express-response.js node_modules/express/lib/response.js", "test": "echo \"Error: no test specified\" && exit 1", "start": "node index.js" }, @@ -15,7 +16,7 @@ "chalk": "^2.4.1", "connect-flash": "^0.1.1", "dotenv": "^6.1.0", - "express": "^4.16.4", + "express": "4.17.1", "express-session": "^1.15.6", "express-session-level": "^1.0.0", "get-product-name": "^1.5.0", diff --git a/patched-express-response.js b/patched-express-response.js new file mode 100644 index 0000000..f30fe0b --- /dev/null +++ b/patched-express-response.js @@ -0,0 +1,1146 @@ +/*! + * express + * Copyright(c) 2009-2013 TJ Holowaychuk + * Copyright(c) 2014-2015 Douglas Christopher Wilson + * MIT Licensed + */ + +'use strict'; + +/** + * Module dependencies. + * @private + */ + +var Buffer = require('safe-buffer').Buffer +var contentDisposition = require('content-disposition'); +var deprecate = require('depd')('express'); +var encodeUrl = require('encodeurl'); +var escapeHtml = require('escape-html'); +var http = require('http'); +var isAbsolute = require('./utils').isAbsolute; +var onFinished = require('on-finished'); +var path = require('path'); +var statuses = require('statuses') +var merge = require('utils-merge'); +var sign = require('cookie-signature').sign; +var normalizeType = require('./utils').normalizeType; +var normalizeTypes = require('./utils').normalizeTypes; +var setCharset = require('./utils').setCharset; +var cookie = require('cookie'); +var send = require('send'); +var extname = path.extname; +var mime = send.mime; +var resolve = path.resolve; +var vary = require('vary'); + +/** + * Response prototype. + * @public + */ + +var res = Object.create(http.ServerResponse.prototype) + +/** + * Module exports. + * @public + */ + +module.exports = res + +/** + * Module variables. + * @private + */ + +var charsetRegExp = /;\s*charset\s*=/; + +/** + * Set status `code`. + * + * @param {Number} code + * @return {ServerResponse} + * @public + */ + +res.status = function status(code) { + this.statusCode = code; + return this; +}; + +/** + * Set Link header field with the given `links`. + * + * Examples: + * + * res.links({ + * next: 'http://api.example.com/users?page=2', + * last: 'http://api.example.com/users?page=5' + * }); + * + * @param {Object} links + * @return {ServerResponse} + * @public + */ + +res.links = function(links){ + var link = this.get('Link') || ''; + if (link) link += ', '; + return this.set('Link', link + Object.keys(links).map(function(rel){ + return '<' + links[rel] + '>; rel="' + rel + '"'; + }).join(', ')); +}; + +/** + * Send a response. + * + * Examples: + * + * res.send(Buffer.from('wahoo')); + * res.send({ some: 'json' }); + * res.send('
some html
'); + * + * @param {string|number|boolean|object|Buffer} body + * @public + */ + +res.send = function send(body) { + var chunk = body; + var encoding; + var req = this.req; + var type; + + // settings + var app = this.app; + + // allow status / body + if (arguments.length === 2) { + // res.send(body, status) backwards compat + if (typeof arguments[0] !== 'number' && typeof arguments[1] === 'number') { + deprecate('res.send(body, status): Use res.status(status).send(body) instead'); + this.statusCode = arguments[1]; + } else { + deprecate('res.send(status, body): Use res.status(status).send(body) instead'); + this.statusCode = arguments[0]; + chunk = arguments[1]; + } + } + + // disambiguate res.send(status) and res.send(status, num) + if (typeof chunk === 'number' && arguments.length === 1) { + // res.send(status) will set status message as text string + if (!this.get('Content-Type')) { + this.type('txt'); + } + + deprecate('res.send(status): Use res.sendStatus(status) instead'); + this.statusCode = chunk; + chunk = statuses[chunk] + } + + switch (typeof chunk) { + // string defaulting to html + case 'string': + if (!this.get('Content-Type')) { + this.type('html'); + } + break; + case 'boolean': + case 'number': + case 'object': + if (chunk === null) { + chunk = ''; + } else if (Buffer.isBuffer(chunk)) { + if (!this.get('Content-Type')) { + this.type('bin'); + } + } else { + return this.json(chunk); + } + break; + } + + // write strings in utf-8 + if (typeof chunk === 'string') { + encoding = 'utf8'; + type = this.get('Content-Type'); + + // reflect this in content-type + if (typeof type === 'string') { + this.set('Content-Type', setCharset(type, 'utf-8')); + } + } + + // determine if ETag should be generated + var etagFn = app.get('etag fn') + var generateETag = !this.get('ETag') && typeof etagFn === 'function' + + // populate Content-Length + var len + if (chunk !== undefined) { + if (Buffer.isBuffer(chunk)) { + // get length of Buffer + len = chunk.length + } else if (!generateETag && chunk.length < 1000) { + // just calculate length when no ETag + small chunk + len = Buffer.byteLength(chunk, encoding) + } else { + // convert chunk to Buffer and calculate + chunk = Buffer.from(chunk, encoding) + encoding = undefined; + len = chunk.length + } + + this.set('Content-Length', len); + } + + // populate ETag + var etag; + if (generateETag && len !== undefined) { + if ((etag = etagFn(chunk, encoding))) { + this.set('ETag', etag); + } + } + + // freshness + if (req.fresh) this.statusCode = 304; + + // strip irrelevant headers + if (204 === this.statusCode || 304 === this.statusCode) { + this.removeHeader('Content-Type'); + this.removeHeader('Content-Length'); + this.removeHeader('Transfer-Encoding'); + chunk = ''; + } + + if (req.method === 'HEAD') { + // skip body for HEAD + this.end(); + } else { + // respond + this.end(chunk, encoding); + } + + return this; +}; + +/** + * Send JSON response. + * + * Examples: + * + * res.json(null); + * res.json({ user: 'tj' }); + * + * @param {string|number|boolean|object} obj + * @public + */ + +res.json = function json(obj) { + var val = obj; + + // allow status / body + if (arguments.length === 2) { + // res.json(body, status) backwards compat + if (typeof arguments[1] === 'number') { + deprecate('res.json(obj, status): Use res.status(status).json(obj) instead'); + this.statusCode = arguments[1]; + } else { + deprecate('res.json(status, obj): Use res.status(status).json(obj) instead'); + this.statusCode = arguments[0]; + val = arguments[1]; + } + } + + // settings + var app = this.app; + var escape = app.get('json escape') + var replacer = app.get('json replacer'); + var spaces = app.get('json spaces'); + var body = stringify(val, replacer, spaces, escape) + + // content-type + if (!this.get('Content-Type')) { + this.set('Content-Type', 'application/json'); + } + + return this.send(body); +}; + +/** + * Send JSON response with JSONP callback support. + * + * Examples: + * + * res.jsonp(null); + * res.jsonp({ user: 'tj' }); + * + * @param {string|number|boolean|object} obj + * @public + */ + +res.jsonp = function jsonp(obj) { + var val = obj; + + // allow status / body + if (arguments.length === 2) { + // res.json(body, status) backwards compat + if (typeof arguments[1] === 'number') { + deprecate('res.jsonp(obj, status): Use res.status(status).json(obj) instead'); + this.statusCode = arguments[1]; + } else { + deprecate('res.jsonp(status, obj): Use res.status(status).jsonp(obj) instead'); + this.statusCode = arguments[0]; + val = arguments[1]; + } + } + + // settings + var app = this.app; + var escape = app.get('json escape') + var replacer = app.get('json replacer'); + var spaces = app.get('json spaces'); + var body = stringify(val, replacer, spaces, escape) + var callback = this.req.query[app.get('jsonp callback name')]; + + // content-type + if (!this.get('Content-Type')) { + this.set('X-Content-Type-Options', 'nosniff'); + this.set('Content-Type', 'application/json'); + } + + // fixup callback + if (Array.isArray(callback)) { + callback = callback[0]; + } + + // jsonp + if (typeof callback === 'string' && callback.length !== 0) { + this.set('X-Content-Type-Options', 'nosniff'); + this.set('Content-Type', 'text/javascript'); + + // restrict callback charset + callback = callback.replace(/[^\[\]\w$.]/g, ''); + + // replace chars not allowed in JavaScript that are in JSON + body = body + .replace(/\u2028/g, '\\u2028') + .replace(/\u2029/g, '\\u2029'); + + // the /**/ is a specific security mitigation for "Rosetta Flash JSONP abuse" + // the typeof check is just to reduce client error noise + body = '/**/ typeof ' + callback + ' === \'function\' && ' + callback + '(' + body + ');'; + } + + return this.send(body); +}; + +/** + * Send given HTTP status code. + * + * Sets the response status to `statusCode` and the body of the + * response to the standard description from node's http.STATUS_CODES + * or the statusCode number if no description. + * + * Examples: + * + * res.sendStatus(200); + * + * @param {number} statusCode + * @public + */ + +res.sendStatus = function sendStatus(statusCode) { + var body = statuses[statusCode] || String(statusCode) + + this.statusCode = statusCode; + this.type('txt'); + + return this.send(body); +}; + +/** + * Transfer the file at the given `path`. + * + * Automatically sets the _Content-Type_ response header field. + * The callback `callback(err)` is invoked when the transfer is complete + * or when an error occurs. Be sure to check `res.sentHeader` + * if you wish to attempt responding, as the header and some data + * may have already been transferred. + * + * Options: + * + * - `maxAge` defaulting to 0 (can be string converted by `ms`) + * - `root` root directory for relative filenames + * - `headers` object of headers to serve with file + * - `dotfiles` serve dotfiles, defaulting to false; can be `"allow"` to send them + * + * Other options are passed along to `send`. + * + * Examples: + * + * The following example illustrates how `res.sendFile()` may + * be used as an alternative for the `static()` middleware for + * dynamic situations. The code backing `res.sendFile()` is actually + * the same code, so HTTP cache support etc is identical. + * + * app.get('/user/:uid/photos/:file', function(req, res){ + * var uid = req.params.uid + * , file = req.params.file; + * + * req.user.mayViewFilesFrom(uid, function(yes){ + * if (yes) { + * res.sendFile('/uploads/' + uid + '/' + file); + * } else { + * res.send(403, 'Sorry! you cant see that.'); + * } + * }); + * }); + * + * @public + */ + +res.sendFile = function sendFile(path, options, callback) { + var done = callback; + var req = this.req; + var res = this; + var next = req.next; + var opts = options || {}; + + if (!path) { + throw new TypeError('path argument is required to res.sendFile'); + } + + if (typeof path !== 'string') { + throw new TypeError('path must be a string to res.sendFile') + } + + // support function as second arg + if (typeof options === 'function') { + done = options; + opts = {}; + } + + if (!opts.root && !isAbsolute(path)) { + throw new TypeError('path must be absolute or specify root to res.sendFile'); + } + + // create file stream + var pathname = encodeURI(path); + var file = send(req, pathname, opts); + + // transfer + sendfile(res, file, opts, function (err) { + if (done) return done(err); + if (err && err.code === 'EISDIR') return next(); + + // next() all but write errors + if (err && err.code !== 'ECONNABORTED' && err.syscall !== 'write') { + next(err); + } + }); +}; + +/** + * Transfer the file at the given `path`. + * + * Automatically sets the _Content-Type_ response header field. + * The callback `callback(err)` is invoked when the transfer is complete + * or when an error occurs. Be sure to check `res.sentHeader` + * if you wish to attempt responding, as the header and some data + * may have already been transferred. + * + * Options: + * + * - `maxAge` defaulting to 0 (can be string converted by `ms`) + * - `root` root directory for relative filenames + * - `headers` object of headers to serve with file + * - `dotfiles` serve dotfiles, defaulting to false; can be `"allow"` to send them + * + * Other options are passed along to `send`. + * + * Examples: + * + * The following example illustrates how `res.sendfile()` may + * be used as an alternative for the `static()` middleware for + * dynamic situations. The code backing `res.sendfile()` is actually + * the same code, so HTTP cache support etc is identical. + * + * app.get('/user/:uid/photos/:file', function(req, res){ + * var uid = req.params.uid + * , file = req.params.file; + * + * req.user.mayViewFilesFrom(uid, function(yes){ + * if (yes) { + * res.sendfile('/uploads/' + uid + '/' + file); + * } else { + * res.send(403, 'Sorry! you cant see that.'); + * } + * }); + * }); + * + * @public + */ + +res.sendfile = function (path, options, callback) { + var done = callback; + var req = this.req; + var res = this; + var next = req.next; + var opts = options || {}; + + // support function as second arg + if (typeof options === 'function') { + done = options; + opts = {}; + } + + // create file stream + var file = send(req, path, opts); + + // transfer + sendfile(res, file, opts, function (err) { + if (done) return done(err); + if (err && err.code === 'EISDIR') return next(); + + // next() all but write errors + if (err && err.code !== 'ECONNABORTED' && err.syscall !== 'write') { + next(err); + } + }); +}; + +res.sendfile = deprecate.function(res.sendfile, + 'res.sendfile: Use res.sendFile instead'); + +/** + * Transfer the file at the given `path` as an attachment. + * + * Optionally providing an alternate attachment `filename`, + * and optional callback `callback(err)`. The callback is invoked + * when the data transfer is complete, or when an error has + * ocurred. Be sure to check `res.headersSent` if you plan to respond. + * + * Optionally providing an `options` object to use with `res.sendFile()`. + * This function will set the `Content-Disposition` header, overriding + * any `Content-Disposition` header passed as header options in order + * to set the attachment and filename. + * + * This method uses `res.sendFile()`. + * + * @public + */ + +res.download = function download (path, filename, options, callback) { + var done = callback; + var name = filename; + var opts = options || null + + // support function as second or third arg + if (typeof filename === 'function') { + done = filename; + name = null; + opts = null + } else if (typeof options === 'function') { + done = options + opts = null + } + + // set Content-Disposition when file is sent + var headers = { + 'Content-Disposition': contentDisposition(name || path) + }; + + // merge user-provided headers + if (opts && opts.headers) { + var keys = Object.keys(opts.headers) + for (var i = 0; i < keys.length; i++) { + var key = keys[i] + if (key.toLowerCase() !== 'content-disposition') { + headers[key] = opts.headers[key] + } + } + } + + // merge user-provided options + opts = Object.create(opts) + opts.headers = headers + + // Resolve the full path for sendFile + var fullPath = resolve(path); + + // send file + return this.sendFile(fullPath, opts, done) +}; + +/** + * Set _Content-Type_ response header with `type` through `mime.lookup()` + * when it does not contain "/", or set the Content-Type to `type` otherwise. + * + * Examples: + * + * res.type('.html'); + * res.type('html'); + * res.type('json'); + * res.type('application/json'); + * res.type('png'); + * + * @param {String} type + * @return {ServerResponse} for chaining + * @public + */ + +res.contentType = +res.type = function contentType(type) { + var ct = type.indexOf('/') === -1 + ? mime.lookup(type) + : type; + + return this.set('Content-Type', ct); +}; + +/** + * Respond to the Acceptable formats using an `obj` + * of mime-type callbacks. + * + * This method uses `req.accepted`, an array of + * acceptable types ordered by their quality values. + * When "Accept" is not present the _first_ callback + * is invoked, otherwise the first match is used. When + * no match is performed the server responds with + * 406 "Not Acceptable". + * + * Content-Type is set for you, however if you choose + * you may alter this within the callback using `res.type()` + * or `res.set('Content-Type', ...)`. + * + * res.format({ + * 'text/plain': function(){ + * res.send('hey'); + * }, + * + * 'text/html': function(){ + * res.send('hey
'); + * }, + * + * 'appliation/json': function(){ + * res.send({ message: 'hey' }); + * } + * }); + * + * In addition to canonicalized MIME types you may + * also use extnames mapped to these types: + * + * res.format({ + * text: function(){ + * res.send('hey'); + * }, + * + * html: function(){ + * res.send('hey
'); + * }, + * + * json: function(){ + * res.send({ message: 'hey' }); + * } + * }); + * + * By default Express passes an `Error` + * with a `.status` of 406 to `next(err)` + * if a match is not made. If you provide + * a `.default` callback it will be invoked + * instead. + * + * @param {Object} obj + * @return {ServerResponse} for chaining + * @public + */ + +res.format = function(obj){ + var req = this.req; + var next = req.next; + + var fn = obj.default; + if (fn) delete obj.default; + var keys = Object.keys(obj); + + var key = keys.length > 0 + ? req.accepts(keys) + : false; + + this.vary("Accept"); + + if (key) { + this.set('Content-Type', normalizeType(key).value); + obj[key](req, this, next); + } else if (fn) { + fn(); + } else { + var err = new Error('Not Acceptable'); + err.status = err.statusCode = 406; + err.types = normalizeTypes(keys).map(function(o){ return o.value }); + next(err); + } + + return this; +}; + +/** + * Set _Content-Disposition_ header to _attachment_ with optional `filename`. + * + * @param {String} filename + * @return {ServerResponse} + * @public + */ + +res.attachment = function attachment(filename) { + if (filename) { + this.type(extname(filename)); + } + + this.set('Content-Disposition', contentDisposition(filename)); + + return this; +}; + +/** + * Append additional header `field` with value `val`. + * + * Example: + * + * res.append('Link', ['' + statuses[status] + '. Redirecting to ' + u + '
' + }, + + default: function(){ + body = ''; + } + }); + + // Respond + this.statusCode = status; + this.set('Content-Length', Buffer.byteLength(body)); + + if (this.req.method === 'HEAD') { + this.end(); + } else { + this.end(body); + } +}; + +/** + * Add `field` to Vary. If already present in the Vary set, then + * this call is simply ignored. + * + * @param {Array|String} field + * @return {ServerResponse} for chaining + * @public + */ + +res.vary = function(field){ + // checks for back-compat + if (!field || (Array.isArray(field) && !field.length)) { + deprecate('res.vary(): Provide a field name'); + return this; + } + + vary(this, field); + + return this; +}; + +/** + * Render `view` with the given `options` and optional callback `fn`. + * When a callback function is given a response will _not_ be made + * automatically, otherwise a response of _200_ and _text/html_ is given. + * + * Options: + * + * - `cache` boolean hinting to the engine it should cache + * - `filename` filename of the view being rendered + * + * @public + */ + +res.render = function render(view, options, callback) { + var app = this.req.app; + var done = callback; + var opts = options || {}; + var req = this.req; + var self = this; + + // support callback function as second arg + if (typeof options === 'function') { + done = options; + opts = {}; + } + + // merge res.locals + opts._locals = self.locals; + + // default callback to respond + done = done || function (err, str) { + if (err) return req.next(err); + self.send(str); + }; + + // render + app.render(view, opts, done); +}; + +// pipe the send file stream +function sendfile(res, file, options, callback) { + var done = false; + var streaming; + + // request aborted + function onaborted() { + if (done) return; + done = true; + + var err = new Error('Request aborted'); + err.code = 'ECONNABORTED'; + callback(err); + } + + // directory + function ondirectory() { + if (done) return; + done = true; + + var err = new Error('EISDIR, read'); + err.code = 'EISDIR'; + callback(err); + } + + // errors + function onerror(err) { + if (done) return; + done = true; + callback(err); + } + + // ended + function onend() { + if (done) return; + done = true; + callback(); + } + + // file + function onfile() { + streaming = false; + } + + // finished + function onfinish(err) { + if (err && err.code === 'ECONNRESET') return onaborted(); + if (err) return onerror(err); + if (done) return; + + setImmediate(function () { + if (streaming !== false && !done) { + onaborted(); + return; + } + + if (done) return; + done = true; + callback(); + }); + } + + // streaming + function onstream() { + streaming = true; + } + + file.on('directory', ondirectory); + file.on('end', onend); + file.on('error', onerror); + file.on('file', onfile); + file.on('stream', onstream); + onFinished(res, onfinish); + + if (options.headers) { + // set headers on successful transfer + file.on('headers', function headers(res) { + var obj = options.headers; + var keys = Object.keys(obj); + + for (var i = 0; i < keys.length; i++) { + var k = keys[i]; + res.setHeader(k, obj[k]); + } + }); + } + + // pipe + file.pipe(res); +} + +/** + * Stringify JSON, like JSON.stringify, but v8 optimized, with the + * ability to escape characters that can trigger HTML sniffing. + * + * @param {*} value + * @param {function} replaces + * @param {number} spaces + * @param {boolean} escape + * @returns {string} + * @private + */ + +function stringify (value, replacer, spaces, escape) { + // v8 checks arguments.length for optimizing simple call + // https://bugs.chromium.org/p/v8/issues/detail?id=4730 + var json = replacer || spaces + ? JSON.stringify(value, replacer, spaces) + : JSON.stringify(value); + + if (escape) { + json = json.replace(/[<>&]/g, function (c) { + switch (c.charCodeAt(0)) { + case 0x3c: + return '\\u003c' + case 0x3e: + return '\\u003e' + case 0x26: + return '\\u0026' + /* istanbul ignore next: unreachable default */ + default: + return c + } + }) + } + + return json +} diff --git a/views/adminSettings.pug b/views/adminSettings.pug index 299bfdd..093b8b4 100644 --- a/views/adminSettings.pug +++ b/views/adminSettings.pug @@ -5,14 +5,14 @@ block content each user in users span.is-size-6.inline= user.id if !user.doc.admin - a(href=`/admin-settings/remove/${user.id}`) + a(href=`${_CC.config.base}admin-settings/remove/${user.id}`) span.is-size-7.icon.has-text-danger i.fas.fa-times span.is-sr-only Remove br h3 Add user - form(action='/admin-settings/add', method='POST') + form(action=`${_CC.config.base}admin-settings/add`, method='POST') .field label.label Username .control.has-icons-left diff --git a/views/includes/navbar.pug b/views/includes/navbar.pug index 39a9091..a85e8c1 100644 --- a/views/includes/navbar.pug +++ b/views/includes/navbar.pug @@ -5,13 +5,13 @@ mixin navBarLink(href, title) a.navbar-item(href=href)= title nav.navbar.is-fixed-top(role='navigation', aria-label='main navigation',style='box-shadow: 0px 0px 7px rgb(14, 15, 17);') .navbar-brand - if '/' === req.path - a.is-active.navbar-item(href='/') - img(src='/img/logo.png', alt='') + if _CC.config.base === req.path + a.is-active.navbar-item(href=_CC.config.base) + img(src=`${_CC.config.base}img/logo.png`, alt='') span #{config.siteTitle} else - a.navbar-item(href='/') - img(src='/img/logo.png', alt='') + a.navbar-item(href=_CC.config.base) + img(src=`${_CC.config.base}img/logo.png`, alt='') span #{config.siteTitle} a.navbar-burger#navBarBurger(role='button', aria-label='menu', aria-expanded='false') span(aria-hidden='true') @@ -23,13 +23,13 @@ nav.navbar.is-fixed-top(role='navigation', aria-label='main navigation',style='b .navbar-item.has-dropdown.is-hoverable a.navbar-link= req.user._id .navbar-dropdown - +navBarLink(`/wishlist/${req.user._id}`, 'My Wishlist') - +navBarLink('/profile', 'Profile') + +navBarLink(`${_CC.config.base}wishlist/${req.user._id}`, 'My Wishlist') + +navBarLink(`${_CC.config.base}profile`, 'Profile') if req.user.admin - +navBarLink('/admin-settings', 'Admin settings') + +navBarLink(`${_CC.config.base}admin-settings`, 'Admin settings') hr.navbar-divider .navbar-item - form#logoutForm(action='/logout', method='POST') + form#logoutForm(action=`${_CC.config.base}logout`, method='POST') button.button.is-warning(type='submit') Log Out //-+navBarLink('javascript:document.getElementById("logoutForm").submit()', 'Log Out') - script(src="/js/nav.js") + script(src=`${_CC.config.base}js/nav.js`) diff --git a/views/layout.pug b/views/layout.pug index e0ac2ce..8fe0aca 100644 --- a/views/layout.pug +++ b/views/layout.pug @@ -3,8 +3,8 @@ html(lang='en') head meta(name='viewport', content='width=device-width, initial-scale=1, user-scalable=no') - link(rel='manifest', href='/manifest.json') - link(rel='apple-touch-icon', href='/img/logo.png', sizes='1280x1280') + link(rel='manifest', href=`${_CC.config.base}manifest.json`) + link(rel='apple-touch-icon', href=`${_CC.config.base}img/logo.png`, sizes='1280x1280') if title title #{config.siteTitle} - #{title} @@ -19,10 +19,10 @@ html(lang='en') ) link(rel='stylesheet', href='https://cdnjs.cloudflare.com/ajax/libs/animate.css/3.7.2/animate.min.css') else - link(rel='stylesheet', href='/libraries/bulma.min.css') - link(rel='stylesheet', href='/libraries/fontawesome/css/all.css') - link(rel='stylesheet', href='/libraries/animate.min.css') - link(rel='stylesheet', href='/css/main.css') + link(rel='stylesheet', href=`${_CC.config.base}libraries/bulma.min.css`) + link(rel='stylesheet', href=`${_CC.config.base}libraries/fontawesome/css/all.css`) + link(rel='stylesheet', href=`${_CC.config.base}libraries/animate.min.css`) + link(rel='stylesheet', href=`${_CC.config.base}css/main.css`) body .print .content diff --git a/views/setup.pug b/views/setup.pug index a902949..178c1f5 100644 --- a/views/setup.pug +++ b/views/setup.pug @@ -2,7 +2,7 @@ extends layout.pug block content h2 Admin User - form(action='/setup', method='POST') + form(action=`${_CC.config.base}setup`, method='POST') .field label.label Username .control.has-icons-left diff --git a/views/wishlist.pug b/views/wishlist.pug index 5503559..6e9079f 100644 --- a/views/wishlist.pug +++ b/views/wishlist.pug @@ -42,7 +42,7 @@ block content td.ugc(data-label='Name')= item.name td.ugc(data-label='Note')= item.note td(data-label='Edit Item') - form.inline(method='GET', action=`/wishlist/${req.params.user}/note/${item.id}`) + form.inline(method='GET', action=`${_CC.config.base}wishlist/${req.params.user}/note/${item.id}`) .field.inline .control.inline button.button.is-text( @@ -55,7 +55,7 @@ block content td.ugc(data-label='Added By')= item.addedBy if req.params.user === req.user._id td(data-label='Move Item Up') - form.upForm.inline(method='POST', action=`/wishlist/${req.params.user}/move/up/${item.id}`) + form.upForm.inline(method='POST', action=`${_CC.config.base}wishlist/${req.params.user}/move/up/${item.id}`) .field.inline .control.inline button.button.is-text( @@ -66,7 +66,7 @@ block content span.icon i.fas.fa-arrow-up td(data-label='Move Item Down') - form.downForm.inline(method='POST', action=`/wishlist/${req.params.user}/move/down/${item.id}`) + form.downForm.inline(method='POST', action=`${_CC.config.base}wishlist/${req.params.user}/move/down/${item.id}`) .field.inline .control.inline button.button.is-text( @@ -79,12 +79,12 @@ block content else td(data-label='Pledge') if req.params.user !== req.user._id && !item.pledgedBy - form.inline(method='POST', action=`/wishlist/${req.params.user}/pledge/${item.id}`) + form.inline(method='POST', action=`${_CC.config.base}wishlist/${req.params.user}/pledge/${item.id}`) .field.inline .control.inline input.inline.button.is-primary(type='submit' value='Pledge') if item.pledgedBy === req.user._id - form.inline(method='POST', action=`/wishlist/${req.params.user}/unpledge/${item.id}`) + form.inline(method='POST', action=`${_CC.config.base}wishlist/${req.params.user}/unpledge/${item.id}`) .field.inline .control.inline input.inline.button(type='submit' value='Unpledge') @@ -93,7 +93,7 @@ block content td(data-label='Delete Item') form.inline( method='POST', - action=`/wishlist/${req.params.user}/${req.user._id === req.params.user ? 'remove' : 'unpledge'}/${item.id}` + action=`${_CC.config.base}wishlist/${req.params.user}/${req.user._id === req.params.user ? 'remove' : 'unpledge'}/${item.id}` ) .field.inline .control.inline @@ -128,32 +128,32 @@ block content hr div if req.params.user !== req.user._id && !item.pledgedBy - form.inline(method='POST', action=`/wishlist/${req.params.user}/pledge/${item.id}`) + form.inline(method='POST', action=`${_CC.config.base}wishlist/${req.params.user}/pledge/${item.id}`) .field.inline .control.inline input.inline.button.is-primary(type='submit' value='Pledge') if item.pledgedBy === req.user._id - form.inline(method='POST', action=`/wishlist/${req.params.user}/unpledge/${item.id}`) + form.inline(method='POST', action=`${_CC.config.base}wishlist/${req.params.user}/unpledge/${item.id}`) .field.inline .control.inline input.inline.button(type='submit' value='Unpledge') if req.user._id === req.params.user - form.inline(method='POST', action=`/wishlist/${req.params.user}/remove/${item.id}`) + form.inline(method='POST', action=`${_CC.config.base}wishlist/${req.params.user}/remove/${item.id}`) .field.inline .control.inline input.inline.button.is-warning(type='submit' value='Remove') if req.user._id === req.params.user || req.user._id === item.addedBy - form.inline(method='GET', action=`/wishlist/${req.params.user}/note/${item.id}`) + form.inline(method='GET', action=`${_CC.config.base}wishlist/${req.params.user}/note/${item.id}`) .field.inline .control.inline input.inline.button(type='submit', value='Edit item') if index !== firstCanSee && req.user._id === req.params.user - form.inline(method='POST', action=`/wishlist/${req.params.user}/move/up/${item.id}`) + form.inline(method='POST', action=`${_CC.config.base}wishlist/${req.params.user}/move/up/${item.id}`) .field.inline .control.inline input.inline.button(type='submit' value='Move item up') if index !== lastCanSee && req.user._id === req.params.user - form.inline(method='POST', action=`/wishlist/${req.params.user}/move/down/${item.id}`) + form.inline(method='POST', action=`${_CC.config.base}wishlist/${req.params.user}/move/down/${item.id}`) .field.inline .control.inline input.inline.button(type='submit' value='Move item down') @@ -178,7 +178,7 @@ block content .field .control input.button(type='submit' value=(req.user._id === req.params.user ? 'Add item to wishlist' : 'Pledge item')) - script(src='/js/wishlist.js') + script(src=`${_CC.config.base}js/wishlist.js`) block print h1 #{req.params.user}'s Wishlist diff --git a/views/wishlists.pug b/views/wishlists.pug index e99d07e..89e6d76 100644 --- a/views/wishlists.pug +++ b/views/wishlists.pug @@ -3,7 +3,7 @@ extends layout.pug block content ul.noStyle.noLeftMargin li - a(href=`/wishlist/${req.user._id}`) + a(href=`${_CC.config.base}wishlist/${req.user._id}`) .box span=req.user._id span : ???/??? @@ -11,7 +11,7 @@ block content each user in users if req.user._id !== user.id li - a(href=`/wishlist/${user.id}`) + a(href=`${_CC.config.base}wishlist/${user.id}`) .box span= user.id span : #{totals(user.doc.wishlist).pledged}/#{user.doc.wishlist.length}