diff --git a/changelog.md b/changelog.md index 3bb7bfb..386f1a3 100644 --- a/changelog.md +++ b/changelog.md @@ -8,6 +8,8 @@ - Can now search for brews by a specific author - Editing a brew in anyway while logged in will now add you to the list of authors - Added a new user page to see others published brews, as well as all of your own brews. +- Added a new nav item for accessing your profile and logging in + ### Monday, 14/11/2016 - Updated snippet bar style diff --git a/client/homebrew/homebrew.jsx b/client/homebrew/homebrew.jsx index 895346f..9a64e23 100644 --- a/client/homebrew/homebrew.jsx +++ b/client/homebrew/homebrew.jsx @@ -31,6 +31,9 @@ const Homebrew = React.createClass({ }; }, componentWillMount: function() { + global.account = this.props.account; + + Router = CreateRouter({ '/edit/:id' : (args) => { if(!this.props.brew.editId){ diff --git a/client/homebrew/navbar/account.navitem.jsx b/client/homebrew/navbar/account.navitem.jsx new file mode 100644 index 0000000..ee518a7 --- /dev/null +++ b/client/homebrew/navbar/account.navitem.jsx @@ -0,0 +1,17 @@ +const React = require('react'); +const Nav = require('naturalcrit/nav/nav.jsx'); + +module.exports = function(props){ + if(global.account){ + return + profile + + } + let url = ''; + if(typeof window !== 'undefined'){ + url = window.location.href + } + return + login + +}; \ No newline at end of file diff --git a/client/homebrew/pages/editPage/editPage.jsx b/client/homebrew/pages/editPage/editPage.jsx index e5e041c..db5adb2 100644 --- a/client/homebrew/pages/editPage/editPage.jsx +++ b/client/homebrew/pages/editPage/editPage.jsx @@ -8,7 +8,8 @@ const Navbar = require('../../navbar/navbar.jsx'); const ReportIssue = require('../../navbar/issue.navitem.jsx'); const PrintLink = require('../../navbar/print.navitem.jsx'); -const RecentlyEdited = require('../../navbar/recent.navitem.jsx').edited; +const Account = require('../../navbar/account.navitem.jsx'); +//const RecentlyEdited = require('../../navbar/recent.navitem.jsx').edited; const SplitPane = require('naturalcrit/splitPane/splitPane.jsx'); @@ -191,11 +192,12 @@ const EditPage = React.createClass({ {this.renderSaveButton()} - + {/**/} Share + }, diff --git a/client/homebrew/pages/homePage/homePage.jsx b/client/homebrew/pages/homePage/homePage.jsx index e75dfc7..a1ffecc 100644 --- a/client/homebrew/pages/homePage/homePage.jsx +++ b/client/homebrew/pages/homePage/homePage.jsx @@ -1,22 +1,23 @@ -var React = require('react'); -var _ = require('lodash'); -var cx = require('classnames'); -var request = require("superagent"); +const React = require('react'); +const _ = require('lodash'); +const cx = require('classnames'); +const request = require("superagent"); -var Nav = require('naturalcrit/nav/nav.jsx'); -var Navbar = require('../../navbar/navbar.jsx'); -var PatreonNavItem = require('../../navbar/patreon.navitem.jsx'); -var IssueNavItem = require('../../navbar/issue.navitem.jsx'); -var RecentNavItem = require('../../navbar/recent.navitem.jsx'); +const Nav = require('naturalcrit/nav/nav.jsx'); +const Navbar = require('../../navbar/navbar.jsx'); +const PatreonNavItem = require('../../navbar/patreon.navitem.jsx'); +const IssueNavItem = require('../../navbar/issue.navitem.jsx'); +const RecentNavItem = require('../../navbar/recent.navitem.jsx'); +const AccountNavItem = require('../../navbar/account.navitem.jsx'); -var SplitPane = require('naturalcrit/splitPane/splitPane.jsx'); -var Editor = require('../../editor/editor.jsx'); -var BrewRenderer = require('../../brewRenderer/brewRenderer.jsx'); +const SplitPane = require('naturalcrit/splitPane/splitPane.jsx'); +const Editor = require('../../editor/editor.jsx'); +const BrewRenderer = require('../../brewRenderer/brewRenderer.jsx'); -var HomePage = React.createClass({ +const HomePage = React.createClass({ getDefaultProps: function() { return { welcomeText : '', @@ -56,9 +57,12 @@ var HomePage = React.createClass({ Changelog + + {/*} New Brew + */} }, diff --git a/client/homebrew/pages/sharePage/sharePage.jsx b/client/homebrew/pages/sharePage/sharePage.jsx index e849de1..6bf1e58 100644 --- a/client/homebrew/pages/sharePage/sharePage.jsx +++ b/client/homebrew/pages/sharePage/sharePage.jsx @@ -5,7 +5,9 @@ const cx = require('classnames'); const Nav = require('naturalcrit/nav/nav.jsx'); const Navbar = require('../../navbar/navbar.jsx'); const PrintLink = require('../../navbar/print.navitem.jsx'); -const RecentlyViewed = require('../../navbar/recent.navitem.jsx').viewed; +//const RecentlyViewed = require('../../navbar/recent.navitem.jsx').viewed; +const Account = require('../../navbar/account.navitem.jsx'); + const BrewRenderer = require('../../brewRenderer/brewRenderer.jsx'); @@ -46,11 +48,12 @@ const SharePage = React.createClass({ - + {/**/} source + diff --git a/client/homebrew/pages/userPage/userPage.jsx b/client/homebrew/pages/userPage/userPage.jsx index db4173c..b16fac1 100644 --- a/client/homebrew/pages/userPage/userPage.jsx +++ b/client/homebrew/pages/userPage/userPage.jsx @@ -5,6 +5,8 @@ const cx = require('classnames'); const Nav = require('naturalcrit/nav/nav.jsx'); const Navbar = require('../../navbar/navbar.jsx'); +const RecentNavItem = require('../../navbar/recent.navitem.jsx'); +const Account = require('../../navbar/account.navitem.jsx'); const BrewItem = require('./brewItem/brewItem.jsx'); const UserPage = React.createClass({ @@ -29,10 +31,13 @@ const UserPage = React.createClass({ render : function(){ const brews = this.getSortedBrews(); + + return
- holla + + diff --git a/client/homebrew/pages/userPage/userPage.less b/client/homebrew/pages/userPage/userPage.less index 56bad40..9041470 100644 --- a/client/homebrew/pages/userPage/userPage.less +++ b/client/homebrew/pages/userPage/userPage.less @@ -1,8 +1,9 @@ + .userPage{ .content .phb{ - margin: 20px auto; - min-height : 350px; - height : 80%; + height : 80%; + min-height : 350px; + margin : 20px auto; column-count : 1; &::after{ display : none; diff --git a/server.js b/server.js index 661821e..5bfd559 100644 --- a/server.js +++ b/server.js @@ -126,7 +126,8 @@ app.use((req, res) => { welcomeText : welcomeText, changelog : changelogText, brew : req.brew, - brews : req.brews + brews : req.brews, + account : req.account }, clearRequireCache : !process.env.PRODUCTION, }, (err, page) => {