diff --git a/client/homebrew/editor/metadataEditor/metadataEditor.jsx b/client/homebrew/editor/metadataEditor/metadataEditor.jsx index 1a9fd42..baf74f4 100644 --- a/client/homebrew/editor/metadataEditor/metadataEditor.jsx +++ b/client/homebrew/editor/metadataEditor/metadataEditor.jsx @@ -135,7 +135,7 @@ const MetadataEditor = React.createClass({
{this.renderPublish()} - Published homebrews will be publicly searchable (eventually...) + Published homebrews will be publicly viewable and searchable (eventually...)
diff --git a/client/homebrew/homebrew.jsx b/client/homebrew/homebrew.jsx index 6d45aac..895346f 100644 --- a/client/homebrew/homebrew.jsx +++ b/client/homebrew/homebrew.jsx @@ -6,6 +6,7 @@ const CreateRouter = require('pico-router').createRouter; const HomePage = require('./pages/homePage/homePage.jsx'); const EditPage = require('./pages/editPage/editPage.jsx'); +const UserPage = require('./pages/userPage/userPage.jsx'); const SharePage = require('./pages/sharePage/sharePage.jsx'); const NewPage = require('./pages/newPage/newPage.jsx'); const ErrorPage = require('./pages/errorPage/errorPage.jsx'); @@ -50,9 +51,11 @@ const Homebrew = React.createClass({ id={args.id} brew={this.props.brew} /> }, - '/changelog' : (args) => { - return + '/user/:username' : (args) => { + return }, '/print/:id' : (args, query) => { return ; @@ -63,6 +66,10 @@ const Homebrew = React.createClass({ '/new' : (args) => { return }, + '/changelog' : (args) => { + return + }, '*' : , }); diff --git a/client/homebrew/pages/newPage/newPage.jsx b/client/homebrew/pages/newPage/newPage.jsx index d107b5d..edd0a0b 100644 --- a/client/homebrew/pages/newPage/newPage.jsx +++ b/client/homebrew/pages/newPage/newPage.jsx @@ -49,12 +49,14 @@ const NewPage = React.createClass({ handleControlKeys : function(e){ if(!(e.ctrlKey || e.metaKey)) return; - e.stopPropagation(); - e.preventDefault(); const S_KEY = 83; const P_KEY = 80; if(e.keyCode == S_KEY) this.save(); if(e.keyCode == P_KEY) this.print(); + if(e.keyCode == P_KEY || e.keyCode == S_KEY){ + e.stopPropagation(); + e.preventDefault(); + } }, handleSplitMove : function(){ diff --git a/client/homebrew/pages/userPage/userPage.jsx b/client/homebrew/pages/userPage/userPage.jsx new file mode 100644 index 0000000..9f39ee3 --- /dev/null +++ b/client/homebrew/pages/userPage/userPage.jsx @@ -0,0 +1,35 @@ +const React = require('react'); +const _ = require('lodash'); +const cx = require('classnames'); + +const Nav = require('naturalcrit/nav/nav.jsx'); +const Navbar = require('../../navbar/navbar.jsx'); + +const UserPage = React.createClass({ + getDefaultProps: function() { + return { + username : '', + brews : [] + }; + }, + + render : function(){ + console.log(this.props.brews); + + return
+ + + holla + + + +
+
+

{this.props.username}

+
+
+
+ } +}); + +module.exports = UserPage; diff --git a/client/homebrew/pages/userPage/userPage.less b/client/homebrew/pages/userPage/userPage.less new file mode 100644 index 0000000..52d691e --- /dev/null +++ b/client/homebrew/pages/userPage/userPage.less @@ -0,0 +1,5 @@ +.userPage{ + .content .phb{ + margin: 20px auto; + } +} \ No newline at end of file diff --git a/server.js b/server.js index f34df04..1430e21 100644 --- a/server.js +++ b/server.js @@ -117,8 +117,6 @@ app.get('/print/:id', (req, res, next)=>{ //Render Page app.use((req, res) => { - - console.log('user', req.account); vitreumRender({ page: './build/homebrew/bundle.dot', globals:{