From a1d56fe5d375cf5ee44f1e641b28acc60119e295 Mon Sep 17 00:00:00 2001 From: David Bolack Date: Thu, 19 Mar 2026 19:35:05 -0500 Subject: [PATCH] WIP --- client/homebrew/brewRenderer/brewRenderer.jsx | 40 +++++++++++-------- server/app.js | 10 +++-- vite.config.js | 1 + 3 files changed, 31 insertions(+), 20 deletions(-) diff --git a/client/homebrew/brewRenderer/brewRenderer.jsx b/client/homebrew/brewRenderer/brewRenderer.jsx index b7c23d981..9c2ca1312 100644 --- a/client/homebrew/brewRenderer/brewRenderer.jsx +++ b/client/homebrew/brewRenderer/brewRenderer.jsx @@ -304,6 +304,28 @@ const BrewRenderer = (props)=>{ const toolbarEl = 0 ? state.visiblePages : [state.centerPage]} totalPages={rawPages.length} headerState={headerState} setHeaderState={setHeaderState}/>; + const brewRenderFrameContents = ( + <> +
+ + {/* Apply CSS from Style tab and render pages from Markdown tab */} + {state.isMounted + && + <> + {renderedStyle} +
+ {renderedPages} +
+ + } +
+ {headerState ? : <>} + + ); + return ( <> {/*render dummy page while iFrame is mounting.*/} @@ -329,23 +351,7 @@ const BrewRenderer = (props)=>{ contentDidMount={frameDidMount} onClick={()=>{emitClick();}} > -
- - {/* Apply CSS from Style tab and render pages from Markdown tab */} - {state.isMounted - && - <> - {renderedStyle} -
- {renderedPages} -
- - } -
- {headerState ? : <>} + {brewRenderFrameContents} {state.isMounted &&
diff --git a/server/app.js b/server/app.js index bee173b7e..9a2d8a934 100644 --- a/server/app.js +++ b/server/app.js @@ -80,15 +80,19 @@ export default async function createApp(vite) { const herokuRegex = /^https:\/\/(?:homebrewery-pr-\d+\.herokuapp\.com|naturalcrit-pr-\d+\.herokuapp\.com)$/; // Matches any Heroku app + console.log( 'IsLocalEnvironment'); console.log(isLocalEnvironment); + console.log('localNetworkRegex'); console.log(localNetworkRegex.test(origin)); - console.log(origin == 'null'); + console.log('origin'); + console.log(origin === 'null'); + console.log(origin); - if(!origin | origin == 'null' || allowedOrigins.includes(origin) || herokuRegex.test(origin) || (isLocalEnvironment && localNetworkRegex.test(origin))) { + if(!origin || origin === 'null' || allowedOrigins.includes(origin) || herokuRegex.test(origin) || (isLocalEnvironment && localNetworkRegex.test(origin))) { callback(null, true); } else { console.log(origin, 'not allowed'); - callback(new Error('Not allowed by CORS, if you think this is an error, please contact us')); + callback(new Error('Not allowed by CORS, if you think this is an error, please contact us - Skidoosh')); } }, methods : ['GET', 'POST', 'PUT', 'DELETE', 'OPTIONS'], diff --git a/vite.config.js b/vite.config.js index d9eacd502..1e246346b 100644 --- a/vite.config.js +++ b/vite.config.js @@ -34,5 +34,6 @@ export default defineConfig({ fs : { allow : ['.'], }, + allowedHosts : ['fedora.copy.to'] }, });