diff --git a/client/homebrew/pages/editPage/editPage.jsx b/client/homebrew/pages/editPage/editPage.jsx index aa642226b..2cb3ee90b 100644 --- a/client/homebrew/pages/editPage/editPage.jsx +++ b/client/homebrew/pages/editPage/editPage.jsx @@ -290,6 +290,12 @@ const EditPage = createClass({ } }, + processShareId : function() { + return this.state.brew.googleId ? + this.state.brew.googleId + this.state.brew.shareId : + this.state.brew.shareId; + }, + renderNavbar : function(){ return @@ -300,10 +306,10 @@ const EditPage = createClass({ {this.renderGoogleDriveIcon()} {this.renderSaveButton()} - + Share - + diff --git a/client/homebrew/pages/sharePage/sharePage.jsx b/client/homebrew/pages/sharePage/sharePage.jsx index 8d3b10ce4..c04a95435 100644 --- a/client/homebrew/pages/sharePage/sharePage.jsx +++ b/client/homebrew/pages/sharePage/sharePage.jsx @@ -45,15 +45,10 @@ const SharePage = createClass({ } }, - renderSourceButton : function() { - let shareLink = this.props.brew.shareId; - if(this.props.brew.googleId) { - shareLink = this.props.brew.googleId + shareLink; - } - - return - source - ; + processShareId : function() { + return this.props.brew.googleId ? + this.props.brew.googleId + this.props.brew.shareId : + this.props.brew.shareId; }, render : function(){ @@ -65,8 +60,10 @@ const SharePage = createClass({ - - {this.renderSourceButton()} + + + source + diff --git a/server.js b/server.js index 0aeecc761..0f83c23f6 100644 --- a/server.js +++ b/server.js @@ -174,15 +174,33 @@ app.get('/share/:id', (req, res, next)=>{ //Print Page app.get('/print/:id', (req, res, next)=>{ - HomebrewModel.get({ shareId: req.params.id }) + if(req.params.id.length > 12) { + const googleId = req.params.id.slice(0, -12); + const shareId = req.params.id.slice(-12); + GoogleActions.readFileMetadata(config.get('google_api_key'), googleId, shareId, 'share') .then((brew)=>{ - req.brew = brew.sanatize(true); + req.brew = brew; //TODO Need to sanitize later return next(); }) .catch((err)=>{ console.log(err); - return res.status(400).send(`Can't get that`); + return res.status(400).send('Can\'t get brew from Google'); }); + } else { + HomebrewModel.get({ shareId: req.params.id }) + .then((brew)=>{ + req.brew = brew.sanatize(true); + return next(); + }) + .catch((err)=>{ + console.log(err); + return res.status(400).send(`Can't get that`); + }); + } +}); + +app.get('/source/:id', (req, res)=>{ + });