update based on feedback, remove query-string dependency, add/move favicon url

2025-12-24 14:12:40 +00:00 · 2022-06-20 12:53:26 -05:00
parent 60a372de68
commit 755b9dcc89
5 changed files with 14 additions and 86 deletions
--- a/client/homebrew/homebrew.jsx
+++ b/client/homebrew/homebrew.jsx
@@ -2,8 +2,7 @@ require('./homebrew.less');
 const React = require('react');
 const createClass = require('create-react-class');
 const { StaticRouter:Router } = require('react-router-dom/server');
-const { Route, Routes, useParams, useLocation } = require('react-router-dom');
-const queryString = require('query-string');
+const { Route, Routes, useParams, useSearchParams } = require('react-router-dom');

 const HomePage = require('./pages/homePage/homePage.jsx');
 const EditPage = require('./pages/editPage/editPage.jsx');
@@ -13,19 +12,17 @@ const NewPage = require('./pages/newPage/newPage.jsx');
 //const ErrorPage = require('./pages/errorPage/errorPage.jsx');
 const PrintPage = require('./pages/printPage/printPage.jsx');

-const WithRoute = (props)=>{ //(Element, additionalPropsFn)=>{
+const WithRoute = (props)=>{
 	const params = useParams();
-	const location = useLocation();
-	let additionalProps = {};
-	if(props.additionalPropsFn) {
-		additionalProps = props.additionalPropsFn({ props, params, location });
-	}
+	const searchParams = useSearchParams();
 	const Element = props.el;
-	return <Element {...{
+	const allProps = {
 		...props,
-		el                : undefined,
-		additionalPropsFn : undefined
-	}} {...params} {...additionalProps}/>;
+		...params,
+		...searchParams,
+		el : undefined
+	};
+	return <Element {...allProps} />;
 };

 const Homebrew = createClass({
@@ -66,9 +63,9 @@ const Homebrew = createClass({
 					<Route path='/share/:id' element={<WithRoute el={SharePage} brew={this.props.brew} />} />
 					<Route path='/new/:id' element={<WithRoute el={NewPage} brew={this.props.brew} />} />
 					<Route path='/new' element={<WithRoute el={NewPage}/>} />
-					<Route path='/user/:username' element={<WithRoute el={UserPage} brews={this.props.brews} additionalPropsFn={({ location })=>({ query: queryString.parse(location.search) })} />} />
-					<Route path='/print/:id' element={<WithRoute el={PrintPage} brew={this.props.brew} additionalPropsFn={({ location })=>({ query: queryString.parse(location.search) })} />} />
-					<Route path='/print' element={<WithRoute el={PrintPage} additionalPropsFn={({ location })=>({ query: queryString.parse(location.search) })} />} />
+					<Route path='/user/:username' element={<WithRoute el={UserPage} brews={this.props.brews} />} />
+					<Route path='/print/:id' element={<WithRoute el={PrintPage} brew={this.props.brew} />} />
+					<Route path='/print' element={<WithRoute el={PrintPage} />} />
 					<Route path='/changelog' element={<WithRoute el={SharePage} brew={this.props.brew} />} />
 					<Route path='/faq' element={<WithRoute el={SharePage} brew={this.props.brew} />} />
 					<Route path='/v3_preview' element={<WithRoute el={HomePage} brew={this.props.brew} />} />
--- a/client/template.js
+++ b/client/template.js
@@ -8,7 +8,7 @@ module.exports = async(name, title = '', props = {})=>{
 		<link href="//use.fontawesome.com/releases/v5.15.1/css/all.css" rel="stylesheet" />
 		<link href="//fonts.googleapis.com/css?family=Open+Sans:400,300,600,700" rel="stylesheet" type="text/css" />
 		<link href=${`/${name}/bundle.css`} rel='stylesheet' />
-		<link rel="icon" href="/assets/homebrew/favicon.ico" type="image/x-icon" />
+		<link rel="icon" href="/assets/favicon.ico" type="image/x-icon" />
 		<meta property="og:title" content="${props.brew?.title || 'Homebrewery - Untitled Brew'}">
 		<meta property="og:url" content="${HOMEBREWERY_PUBLIC_URL}/${props.brew?.shareId ? `share/${props.brew.shareId}` : ''}">
 		<meta property="og:image" content="${props.brew?.thumbnail || `${HOMEBREWERY_PUBLIC_URL}/thumbnail.png`}">
--- a/package-lock.json
+++ b/package-lock.json
@@ -36,11 +36,9 @@
        "mongoose": "^6.3.8",
        "nanoid": "3.3.4",
        "nconf": "^0.12.0",
-        "query-string": "7.1.1",
        "react": "^16.14.0",
        "react-dom": "^16.14.0",
        "react-frame-component": "4.1.3",
-        "react-router": "6.3.0",
        "react-router-dom": "6.3.0",
        "sanitize-filename": "1.6.3",
        "superagent": "^6.1.0",
@@ -5610,14 +5608,6 @@
        "node": ">=8"
      }
    },
-    "node_modules/filter-obj": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/filter-obj/-/filter-obj-1.1.0.tgz",
-      "integrity": "sha1-mzERErxsYSehbgFsbF1/GeCAXFs=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
    "node_modules/finalhandler": {
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
@@ -10065,23 +10055,6 @@
        "url": "https://github.com/sponsors/ljharb"
      }
    },
-    "node_modules/query-string": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/query-string/-/query-string-7.1.1.tgz",
-      "integrity": "sha512-MplouLRDHBZSG9z7fpuAAcI7aAYjDLhtsiVZsevsfaHWDS2IDdORKbSd1kWUA+V4zyva/HZoSfpwnYMMQDhb0w==",
-      "dependencies": {
-        "decode-uri-component": "^0.2.0",
-        "filter-obj": "^1.1.0",
-        "split-on-first": "^1.0.0",
-        "strict-uri-encode": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
    "node_modules/querystring": {
      "version": "0.2.0",
      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
@@ -11005,14 +10978,6 @@
        "memory-pager": "^1.0.2"
      }
    },
-    "node_modules/split-on-first": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/split-on-first/-/split-on-first-1.1.0.tgz",
-      "integrity": "sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
    "node_modules/split-string": {
      "version": "3.1.0",
      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
@@ -11203,14 +11168,6 @@
        "readable-stream": "^2.0.2"
      }
    },
-    "node_modules/strict-uri-encode": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz",
-      "integrity": "sha1-ucczDHBChi9rFC3CdLvMWGbONUY=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
    "node_modules/string_decoder": {
      "version": "1.3.0",
      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
@@ -16896,11 +16853,6 @@
        "to-regex-range": "^5.0.1"
      }
    },
-    "filter-obj": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/filter-obj/-/filter-obj-1.1.0.tgz",
-      "integrity": "sha1-mzERErxsYSehbgFsbF1/GeCAXFs="
-    },
    "finalhandler": {
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
@@ -20265,17 +20217,6 @@
        "side-channel": "^1.0.4"
      }
    },
-    "query-string": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/query-string/-/query-string-7.1.1.tgz",
-      "integrity": "sha512-MplouLRDHBZSG9z7fpuAAcI7aAYjDLhtsiVZsevsfaHWDS2IDdORKbSd1kWUA+V4zyva/HZoSfpwnYMMQDhb0w==",
-      "requires": {
-        "decode-uri-component": "^0.2.0",
-        "filter-obj": "^1.1.0",
-        "split-on-first": "^1.0.0",
-        "strict-uri-encode": "^2.0.0"
-      }
-    },
    "querystring": {
      "version": "0.2.0",
      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
@@ -21016,11 +20957,6 @@
        "memory-pager": "^1.0.2"
      }
    },
-    "split-on-first": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/split-on-first/-/split-on-first-1.1.0.tgz",
-      "integrity": "sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw=="
-    },
    "split-string": {
      "version": "3.1.0",
      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
@@ -21182,11 +21118,6 @@
        "readable-stream": "^2.0.2"
      }
    },
-    "strict-uri-encode": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz",
-      "integrity": "sha1-ucczDHBChi9rFC3CdLvMWGbONUY="
-    },
    "string_decoder": {
      "version": "1.3.0",
      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
--- a/package.json
+++ b/package.json
@@ -77,7 +77,6 @@
    "mongoose": "^6.3.8",
    "nanoid": "3.3.4",
    "nconf": "^0.12.0",
-    "query-string": "7.1.1",
    "react": "^16.14.0",
    "react-dom": "^16.14.0",
    "react-frame-component": "4.1.3",
--- a/scripts/buildHomebrew.js
+++ b/scripts/buildHomebrew.js
@@ -26,6 +26,7 @@ const build = async ({ bundle, render, ssr })=>{
 	await fs.outputFile('./build/homebrew/ssr.js', ssr);
 	await fs.copy('./themes/fonts', './build/fonts');
 	await fs.copy('./themes/assets', './build/assets');
+	await fs.copy('./client/homebrew/favicon.ico', './build/assets/favicon.ico');
 	let src = './themes/5ePhbLegacy.style.less';
 	//Parse brew theme files
 	less.render(fs.readFileSync(src).toString(), {