0
0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-05-07 16:38:38 +00:00
This commit is contained in:
David Bolack
2026-03-19 19:35:05 -05:00
parent fe0f0c56af
commit a1d56fe5d3
3 changed files with 31 additions and 20 deletions
+23 -17
View File
@@ -304,6 +304,28 @@ const BrewRenderer = (props)=>{
const toolbarEl = <ToolBar displayOptions={displayOptions} onDisplayOptionsChange={handleDisplayOptionsChange} visiblePages={state.visiblePages.length > 0 ? state.visiblePages : [state.centerPage]} totalPages={rawPages.length} headerState={headerState} setHeaderState={setHeaderState}/>;
const brewRenderFrameContents = (
<>
<div className='brewRenderer'
onKeyDown={handleControlKeys}
tabIndex={-1}
>
{/* Apply CSS from Style tab and render pages from Markdown tab */}
{state.isMounted
&&
<>
{renderedStyle}
<div className={`pages ${displayOptions.startOnRight ? 'recto' : 'verso'} ${displayOptions.spread}`} lang={`${props.lang || 'en'}`} style={pagesStyle} ref={pagesRef}>
{renderedPages}
</div>
</>
}
</div>
{headerState ? <HeaderNav ref={pagesRef} /> : <></>}
</>
);
return (
<>
{/*render dummy page while iFrame is mounting.*/}
@@ -329,23 +351,7 @@ const BrewRenderer = (props)=>{
contentDidMount={frameDidMount}
onClick={()=>{emitClick();}}
>
<div className='brewRenderer'
onKeyDown={handleControlKeys}
tabIndex={-1}
>
{/* Apply CSS from Style tab and render pages from Markdown tab */}
{state.isMounted
&&
<>
{renderedStyle}
<div className={`pages ${displayOptions.startOnRight ? 'recto' : 'verso'} ${displayOptions.spread}`} lang={`${props.lang || 'en'}`} style={pagesStyle} ref={pagesRef}>
{renderedPages}
</div>
</>
}
</div>
{headerState ? <HeaderNav ref={pagesRef} /> : <></>}
{brewRenderFrameContents}
</Frame>
{state.isMounted &&
<div id='brewRendered'></div>
+7 -3
View File
@@ -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'],
+1
View File
@@ -34,5 +34,6 @@ export default defineConfig({
fs : {
allow : ['.'],
},
allowedHosts : ['fedora.copy.to']
},
});