WIP

client/homebrew/brewRenderer/brewRenderer.jsx

@@ -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'
+				{brewRenderFrameContents}
-					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} /> : <></>}
 			</Frame>
 			{state.isMounted &&
 			  <div id='brewRendered'></div>

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'],

vite.config.js

@@ -34,5 +34,6 @@ export default defineConfig({
 		fs   : {
 			allow : ['.'],
 		},
+		allowedHosts : ['fedora.copy.to']
 	},
 });