From 695b9916dd1563d71a3b9bcdb00ec3a6c18fcd1d Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Tue, 28 May 2024 12:39:43 -0400 Subject: [PATCH] Remove old /print page --- client/homebrew/homebrew.jsx | 20 +--- client/homebrew/pages/hijackPrint.js | 12 -- client/homebrew/pages/printPage/printPage.jsx | 112 ------------------ .../homebrew/pages/printPage/printPage.less | 3 - server/app.js | 7 -- 5 files changed, 3 insertions(+), 151 deletions(-) delete mode 100644 client/homebrew/pages/hijackPrint.js delete mode 100644 client/homebrew/pages/printPage/printPage.jsx delete mode 100644 client/homebrew/pages/printPage/printPage.less diff --git a/client/homebrew/homebrew.jsx b/client/homebrew/homebrew.jsx index 8c82f33e7..2489bc1ca 100644 --- a/client/homebrew/homebrew.jsx +++ b/client/homebrew/homebrew.jsx @@ -10,7 +10,6 @@ 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'); -const PrintPage = require('./pages/printPage/printPage.jsx'); const AccountPage = require('./pages/accountPage/accountPage.jsx'); const WithRoute = (props)=>{ @@ -72,15 +71,13 @@ const Homebrew = createClass({ } /> } /> } /> - } /> - } /> } /> } /> } /> } /> } /> - } /> - } /> + } /> + } /> @@ -88,15 +85,4 @@ const Homebrew = createClass({ } }); -module.exports = Homebrew; - -//TODO: Nicer Error page instead of just "cant get that" -// '/share/:id' : (args)=>{ -// if(!this.props.brew.shareId){ -// return ; -// } -// -// return ; -// }, +module.exports = Homebrew; \ No newline at end of file diff --git a/client/homebrew/pages/hijackPrint.js b/client/homebrew/pages/hijackPrint.js deleted file mode 100644 index c59076413..000000000 --- a/client/homebrew/pages/hijackPrint.js +++ /dev/null @@ -1,12 +0,0 @@ -//TODO: Depricate - -module.exports = function(shareId){ - return function(event){ - event = event || window.event; - if((event.ctrlKey || event.metaKey) && event.keyCode == 80){ - const win = window.open(`/homebrew/print/${shareId}?dialog=true`, '_blank'); - win.focus(); - event.preventDefault(); - } - }; -}; \ No newline at end of file diff --git a/client/homebrew/pages/printPage/printPage.jsx b/client/homebrew/pages/printPage/printPage.jsx deleted file mode 100644 index 7cda5d8c0..000000000 --- a/client/homebrew/pages/printPage/printPage.jsx +++ /dev/null @@ -1,112 +0,0 @@ -require('./printPage.less'); -const React = require('react'); -const createClass = require('create-react-class'); -const _ = require('lodash'); -const { Meta } = require('vitreum/headtags'); -const MarkdownLegacy = require('naturalcrit/markdownLegacy.js'); -const Markdown = require('naturalcrit/markdown.js'); - -const Themes = require('themes/themes.json'); - -const BREWKEY = 'homebrewery-new'; -const STYLEKEY = 'homebrewery-new-style'; -const METAKEY = 'homebrewery-new-meta'; - -const PrintPage = createClass({ - displayName : 'PrintPage', - getDefaultProps : function() { - return { - query : {}, - brew : { - text : '', - style : '', - renderer : 'legacy', - lang : '' - } - }; - }, - - getInitialState : function() { - return { - brew : { - text : this.props.brew.text || '', - style : this.props.brew.style || undefined, - renderer : this.props.brew.renderer || 'legacy', - theme : this.props.brew.theme || '5ePHB', - lang : this.props.brew.lang || 'en' - } - }; - }, - - componentDidMount : function() { - if(this.props.query.local == 'print'){ - const brewStorage = localStorage.getItem(BREWKEY); - const styleStorage = localStorage.getItem(STYLEKEY); - const metaStorage = JSON.parse(localStorage.getItem(METAKEY)); - - this.setState((prevState, prevProps)=>{ - return { - brew : { - text : brewStorage, - style : styleStorage, - renderer : metaStorage?.renderer || 'legacy', - theme : metaStorage?.theme || '5ePHB', - lang : metaStorage?.lang || 'en' - } - }; - }); - } - - if(this.props.query.dialog) window.print(); - }, - - renderStyle : function() { - if(!this.state.brew.style) return; - //return
@layer styleTab {\n${this.state.brew.style}\n} ` }} />; - return
\n${this.state.brew.style}\n` }} />; - }, - - renderPages : function(){ - if(this.state.brew.renderer == 'legacy') { - return _.map(this.state.brew.text.split('\\page'), (pageText, index)=>{ - return
; - }); - } else { - return _.map(this.state.brew.text.split(/^\\page$/gm), (pageText, index)=>{ - pageText += `\n\n \n\\column\n `; //Artificial column break at page end to emulate column-fill:auto (until `wide` is used, when column-fill:balance will reappear) - return ( -
-
-
- ); - }); - } - - }, - - render : function(){ - const rendererPath = this.state.brew.renderer == 'V3' ? 'V3' : 'Legacy'; - const themePath = this.state.brew.theme ?? '5ePHB'; - const baseThemePath = Themes[rendererPath][themePath].baseTheme; - - return
- - - {baseThemePath && - - } - - {/* Apply CSS from Style tab */} - {this.renderStyle()} -
- {this.renderPages()} -
-
; - } -}); - -module.exports = PrintPage; diff --git a/client/homebrew/pages/printPage/printPage.less b/client/homebrew/pages/printPage/printPage.less deleted file mode 100644 index 0d9e7b68b..000000000 --- a/client/homebrew/pages/printPage/printPage.less +++ /dev/null @@ -1,3 +0,0 @@ -.printPage{ - -} \ No newline at end of file diff --git a/server/app.js b/server/app.js index a08ab4404..e26c98f54 100644 --- a/server/app.js +++ b/server/app.js @@ -331,13 +331,6 @@ app.get('/share/:id', asyncHandler(getBrew('share')), asyncHandler(async (req, r return next(); })); -//Print Page -app.get('/print/:id', asyncHandler(getBrew('share')), (req, res, next)=>{ - sanitizeBrew(req.brew, 'share'); - splitTextStyleAndMetadata(req.brew); - next(); -}); - //Account Page app.get('/account', asyncHandler(async (req, res, next)=>{ const data = {};