From ddfa06e76bc66eb704a51f077988da7d9a09c411 Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Tue, 15 Jul 2025 17:17:09 +0000 Subject: [PATCH 1/4] Change requires to imports --- client/homebrew/homebrew.jsx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/client/homebrew/homebrew.jsx b/client/homebrew/homebrew.jsx index 1f20b2e93..fb94e7661 100644 --- a/client/homebrew/homebrew.jsx +++ b/client/homebrew/homebrew.jsx @@ -4,14 +4,14 @@ import './homebrew.less'; import React from 'react'; import { StaticRouter as Router, Route, Routes, useParams, useSearchParams } from 'react-router'; -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'); -const VaultPage = require('./pages/vaultPage/vaultPage.jsx'); -const AccountPage = require('./pages/accountPage/accountPage.jsx'); +import HomePage from './pages/homePage/homePage.jsx'; +import EditPage from './pages/editPage/editPage.jsx'; +import UserPage from './pages/userPage/userPage.jsx'; +import SharePage from './pages/sharePage/sharePage.jsx'; +import NewPage from './pages/newPage/newPage.jsx'; +import ErrorPage from './pages/errorPage/errorPage.jsx'; +import VaultPage from './pages/vaultPage/vaultPage.jsx'; +import AccountPage from './pages/accountPage/accountPage.jsx'; const WithRoute = (props)=>{ const params = useParams(); From 0a02f910f82428463be745df3d22c90dd9a96fda Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Tue, 15 Jul 2025 17:32:10 +0000 Subject: [PATCH 2/4] Clean up WithRoute --- client/homebrew/homebrew.jsx | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/client/homebrew/homebrew.jsx b/client/homebrew/homebrew.jsx index fb94e7661..a6b4b9175 100644 --- a/client/homebrew/homebrew.jsx +++ b/client/homebrew/homebrew.jsx @@ -13,21 +13,12 @@ import ErrorPage from './pages/errorPage/errorPage.jsx'; import VaultPage from './pages/vaultPage/vaultPage.jsx'; import AccountPage from './pages/accountPage/accountPage.jsx'; -const WithRoute = (props)=>{ +const WithRoute = ({ el: Element, ...rest })=>{ const params = useParams(); const [searchParams] = useSearchParams(); - const queryParams = {}; - for (const [key, value] of searchParams?.entries() || []) { - queryParams[key] = value; - } - const Element = props.el; - const allProps = { - ...props, - ...params, - query : queryParams, - el : undefined - }; - return ; + const queryParams = Object.fromEntries(searchParams?.entries() || []); + + return ; }; const Homebrew = (props)=>{ @@ -51,11 +42,11 @@ const Homebrew = (props)=>{ brews } = props; - global.account = account; - global.version = version; - global.enable_v3 = enable_v3; + global.account = account; + global.version = version; + global.enable_v3 = enable_v3; global.enable_themes = enable_themes; - global.config = config; + global.config = config; return ( @@ -81,4 +72,4 @@ const Homebrew = (props)=>{ ); }; -module.exports = Homebrew; +module.exports = Homebrew; \ No newline at end of file From b587d1739773872d604afa4a35d9f0b3f96c2aee Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Tue, 15 Jul 2025 17:41:56 +0000 Subject: [PATCH 3/4] Remove unused React import --- client/homebrew/homebrew.jsx | 1 - 1 file changed, 1 deletion(-) diff --git a/client/homebrew/homebrew.jsx b/client/homebrew/homebrew.jsx index a6b4b9175..466b14a8c 100644 --- a/client/homebrew/homebrew.jsx +++ b/client/homebrew/homebrew.jsx @@ -1,7 +1,6 @@ /* eslint-disable camelcase */ import 'core-js/es/string/to-well-formed.js'; //Polyfill for older browsers import './homebrew.less'; -import React from 'react'; import { StaticRouter as Router, Route, Routes, useParams, useSearchParams } from 'react-router'; import HomePage from './pages/homePage/homePage.jsx'; From b6c03e88b8a18a7374b880f13c1692dd0db1725f Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Tue, 15 Jul 2025 17:53:01 +0000 Subject: [PATCH 4/4] Looks like react is needed by some other components later on --- client/homebrew/homebrew.jsx | 1 + 1 file changed, 1 insertion(+) diff --git a/client/homebrew/homebrew.jsx b/client/homebrew/homebrew.jsx index 466b14a8c..a6b4b9175 100644 --- a/client/homebrew/homebrew.jsx +++ b/client/homebrew/homebrew.jsx @@ -1,6 +1,7 @@ /* eslint-disable camelcase */ import 'core-js/es/string/to-well-formed.js'; //Polyfill for older browsers import './homebrew.less'; +import React from 'react'; import { StaticRouter as Router, Route, Routes, useParams, useSearchParams } from 'react-router'; import HomePage from './pages/homePage/homePage.jsx';