From a634b76117592158e348ee7843045222093c96c3 Mon Sep 17 00:00:00 2001 From: Scott Tolksdorf Date: Sun, 27 Nov 2016 18:55:50 -0500 Subject: [PATCH] Fixed a bug with saving while not logged in --- .../editor/metadataEditor/metadataEditor.jsx | 1 + client/homebrew/homebrew.jsx | 1 + client/homebrew/homebrew.less | 13 +++---- client/homebrew/navbar/account.navitem.jsx | 2 +- client/homebrew/pages/userPage/userPage.jsx | 7 ++++ client/homebrew/pages/userPage/userPage.less | 34 ++++++++----------- package.json | 2 +- server.js | 1 - server/homebrew.api.js | 8 +++-- 9 files changed, 37 insertions(+), 32 deletions(-) diff --git a/client/homebrew/editor/metadataEditor/metadataEditor.jsx b/client/homebrew/editor/metadataEditor/metadataEditor.jsx index baf74f4..01035b2 100644 --- a/client/homebrew/editor/metadataEditor/metadataEditor.jsx +++ b/client/homebrew/editor/metadataEditor/metadataEditor.jsx @@ -102,6 +102,7 @@ const MetadataEditor = React.createClass({ }, render : function(){ + console.log(this.props.metadata); return
diff --git a/client/homebrew/homebrew.jsx b/client/homebrew/homebrew.jsx index 9a64e23..459237e 100644 --- a/client/homebrew/homebrew.jsx +++ b/client/homebrew/homebrew.jsx @@ -20,6 +20,7 @@ const Homebrew = React.createClass({ welcomeText : '', changelog : '', version : '0.0.0', + account : null, brew : { title : '', text : '', diff --git a/client/homebrew/homebrew.less b/client/homebrew/homebrew.less index b5995e3..3d031b8 100644 --- a/client/homebrew/homebrew.less +++ b/client/homebrew/homebrew.less @@ -1,19 +1,16 @@ + @import 'naturalcrit/styles/core.less'; .homebrew{ - height : 100%; - + height : 100%; .page{ - display : flex; - height : 100%; + display : flex; + height : 100%; background-color : @steel; - flex-direction : column; + flex-direction : column; .content{ position : relative; height : calc(~"100% - 29px"); //Navbar height flex : auto; } } - - - } \ No newline at end of file diff --git a/client/homebrew/navbar/account.navitem.jsx b/client/homebrew/navbar/account.navitem.jsx index ee518a7..9f5829c 100644 --- a/client/homebrew/navbar/account.navitem.jsx +++ b/client/homebrew/navbar/account.navitem.jsx @@ -4,7 +4,7 @@ const Nav = require('naturalcrit/nav/nav.jsx'); module.exports = function(props){ if(global.account){ return - profile + {global.account.username} } let url = ''; diff --git a/client/homebrew/pages/userPage/userPage.jsx b/client/homebrew/pages/userPage/userPage.jsx index c83fcb6..19f2a5c 100644 --- a/client/homebrew/pages/userPage/userPage.jsx +++ b/client/homebrew/pages/userPage/userPage.jsx @@ -9,6 +9,13 @@ const RecentNavItem = require('../../navbar/recent.navitem.jsx'); const Account = require('../../navbar/account.navitem.jsx'); const BrewItem = require('./brewItem/brewItem.jsx'); +const brew = { + title : 'test', + authors : [] +} + +//const BREWS = _.times(25, ()=>{ return brew}); + const UserPage = React.createClass({ getDefaultProps: function() { diff --git a/client/homebrew/pages/userPage/userPage.less b/client/homebrew/pages/userPage/userPage.less index d8885fb..b2f257a 100644 --- a/client/homebrew/pages/userPage/userPage.less +++ b/client/homebrew/pages/userPage/userPage.less @@ -1,9 +1,4 @@ -html, body, #reactContainer, .homebrew, .page { - height : auto; - min-height : 100vh; -} - .noColumns(){ column-count : auto; column-fill : auto; @@ -16,21 +11,22 @@ html, body, #reactContainer, .homebrew, .page { -webkit-column-gap : auto; -moz-column-gap : auto; } - .userPage{ - .content .phb{ - min-height : 350px; - margin : 20px auto; - height : auto; - .noColumns(); - &::after{ - display : none; - } - - .noBrews{ - margin: 10px 0px; - font-style: italic; - font-size: 1.3em; + .content{ + overflow-y : scroll; + .phb{ + .noColumns(); + height : auto; + min-height : 350px; + margin : 20px auto; + &::after{ + display : none; + } + .noBrews{ + margin : 10px 0px; + font-size : 1.3em; + font-style : italic; + } } } } \ No newline at end of file diff --git a/package.json b/package.json index 1e68b59..4675d0d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "homebrewery", "description": "Create authentic looking D&D homebrews using only markdown", - "version": "2.5.1", + "version": "2.5.2", "scripts": { "build": "node_modules/.bin/gulp prod", "watch": "node_modules/.bin/gulp", diff --git a/server.js b/server.js index 5bfd559..a1c2abb 100644 --- a/server.js +++ b/server.js @@ -63,7 +63,6 @@ app.get('/user/:username', (req, res, next) => { .then((brews) => { req.brews = brews; return next(); - //return res.json(brews) }) .catch((err) => { console.log(err); diff --git a/server/homebrew.api.js b/server/homebrew.api.js index 934cb22..a297d16 100644 --- a/server/homebrew.api.js +++ b/server/homebrew.api.js @@ -37,9 +37,13 @@ const getGoodBrewTitle = (text) => { router.post('/api', (req, res)=>{ + + let authors = []; + if(req.account) authors = [req.account.username]; + const newHomebrew = new HomebrewModel(_.merge({}, req.body, - {authors : [req.account.username]} + {authors : authors} )); if(!newHomebrew.title){ newHomebrew.title = getGoodBrewTitle(newHomebrew.text); @@ -58,7 +62,7 @@ router.put('/api/update/:id', (req, res)=>{ .then((brew)=>{ brew = _.merge(brew, req.body); brew.updatedAt = new Date(); - brew.authors = _.uniq(_.concat(brew.authors, req.account.username)); + if(req.account) brew.authors = _.uniq(_.concat(brew.authors, req.account.username)); brew.save((err, obj)=>{ if(err) throw err; return res.status(200).send(obj);