f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-01-10 17:52:47 +00:00
Code Wiki Activity

WIP

Browse Source 
@import statements are just not working. Uploaded for other eyes.
This commit is contained in:
David Bolack
2024-02-22 23:06:40 -06:00
parent f60090e5fa
commit f9307986cd
3 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
client/homebrew/brewRenderer/brewRenderer.jsx
View File

@@ -176,10 +176,19 @@ const BrewRenderer = (props)=>{
document.dispatchEvent(new MouseEvent('click')); document.dispatchEvent(new MouseEvent('click'));
}; };
const rendererPath = props.renderer == 'V3' ? 'V3' : 'Legacy'; let rendererPath = props.renderer == 'V3' ? 'V3' : 'Legacy';
const themePath = props.theme ?? '5ePHB'; const themePath = props.theme ?? '5ePHB';
const baseThemePath = Themes[rendererPath][themePath].baseTheme; const baseThemePath = Themes[rendererPath][themePath].baseTheme;
// Override static theme values if a Brew theme.
if(themePath[0] == '#') {
themePath.slice(1);
rendererPath = '';
} else {
rendererPath += '/';
}
return ( return (
<> <>
{/*render dummy page while iFrame is mounting.*/} {/*render dummy page while iFrame is mounting.*/}
@@ -206,11 +215,11 @@ const BrewRenderer = (props)=>{
<RenderWarnings /> <RenderWarnings />
<NotificationPopup /> <NotificationPopup />
</div> </div>
<link href={`/themes/${rendererPath}/Blank/style.css`} rel='stylesheet'/> <link href={`/css/${rendererPath}Blank`} rel='stylesheet'/>
{baseThemePath && {baseThemePath &&
<link href={`/themes/${rendererPath}/${baseThemePath}/style.css`} rel='stylesheet'/> <link href={`/css/${rendererPath}${baseThemePath}`} rel='stylesheet'/>
} }
<link href={`/themes/${rendererPath}/${themePath}/style.css`} rel='stylesheet'/> <link href={`/css/${rendererPath}${themePath}`} rel='stylesheet'/>
{/* Apply CSS from Style tab and render pages from Markdown tab */} {/* Apply CSS from Style tab and render pages from Markdown tab */}
{state.isMounted {state.isMounted

8
server/app.js
View File

@@ -9,7 +9,7 @@ const yaml = require('js-yaml');
const app = express(); const app = express();
const config = require('./config.js'); const config = require('./config.js');
const { homebrewApi, getBrew } = require('./homebrew.api.js'); const { homebrewApi, getBrew, getBrewThemeWithCSS, getStaticTheme} = require('./homebrew.api.js');
const GoogleActions = require('./googleActions.js'); const GoogleActions = require('./googleActions.js');
const serveCompressedStaticAssets = require('./static-assets.mv.js'); const serveCompressedStaticAssets = require('./static-assets.mv.js');
const sanitizeFilename = require('sanitize-filename'); const sanitizeFilename = require('sanitize-filename');
@@ -120,6 +120,12 @@ app.get('/robots.txt', (req, res)=>{
return res.sendFile(`robots.txt`, { root: process.cwd() }); return res.sendFile(`robots.txt`, { root: process.cwd() });
}); });
// Theme
app.get('/css/:id', asyncHandler(getBrew('edit', true)), asyncHandler(getBrewThemeWithCSS));
app.get('/css/:engine/:id/', asyncHandler(getStaticTheme));
//Home page //Home page
app.get('/', (req, res, next)=>{ app.get('/', (req, res, next)=>{
req.brew = { req.brew = {

20
server/homebrew.api.js
View File

@@ -238,12 +238,12 @@ const api = {
getBrewThemeWithCSS : async (req, res)=>{ getBrewThemeWithCSS : async (req, res)=>{
const brew = req.brew; const brew = req.brew;
splitTextStyleAndMetadata(brew); splitTextStyleAndMetadata(brew);
if(res.hasOwnProperty('set')) { // if(res.hasOwnProperty('set')) {
res.set('Content-Type', 'text/css'); // res.set('Content-Type', 'text/css');
} // }
const staticTheme = `/api/css/${req.brew.renderer}/${req.brew.theme}/styles.css`; const staticTheme = `/api/css/${req.brew.renderer}/${req.brew.theme}/styles.css`;
const userTheme = `/api/css/${req.brew.theme.slice(1)}`; const userTheme = `/api/css/${req.brew.theme.slice(1)}`;
const parentThemeImport = `// From Theme: ${req.brew.title}\n\n@import ${req.brew.theme[0] != '#' ? staticTheme : userTheme}\n\n`; const parentThemeImport = `@import url(\"${req.brew.theme[0] != '#' ? staticTheme : userTheme}\");\n\n// From Theme: ${req.brew.title}\n\n`;
return res.status(200).send(`${req.brew.renderer == 'legacy' ? '' : parentThemeImport}${req.brew.style}`); return res.status(200).send(`${req.brew.renderer == 'legacy' ? '' : parentThemeImport}${req.brew.style}`);
}, },
getStaticTheme : async(req, res)=>{ getStaticTheme : async(req, res)=>{
@@ -251,11 +251,11 @@ const api = {
if(themeParent === undefined){ if(themeParent === undefined){
res.status(404).send(`Invalid Theme - Engine: ${req.params.engine}, Name: ${req.params.id}`); res.status(404).send(`Invalid Theme - Engine: ${req.params.engine}, Name: ${req.params.id}`);
} else { } else {
if(res.hasOwnProperty('set')) { // if(res.hasOwnProperty('set')) {
res.set('Content-Type', 'text/css'); // res.set('Content-Type', 'text/css');
} // }
const parentTheme = themeParent ? `@import /api/css/${req.params.engine}/${themeParent}\n` : ''; const parentTheme = themeParent ? `@import url(\"/css/${req.params.engine}/${themeParent}\");\n` : '';
return res.status(200).send(`${parentTheme}@import /themes/${req.params.engine}/${req.params.id}/style.css\n`); return res.status(200).send(`${parentTheme}@import url(\"/themes/${req.params.engine}/${req.params.id}/style.css\");\n`);
} }
}, },
updateBrew : async (req, res)=>{ updateBrew : async (req, res)=>{
@@ -418,7 +418,5 @@ router.put('/api/:id', asyncHandler(api.getBrew('edit', true)), asyncHandler(api
router.put('/api/update/:id', asyncHandler(api.getBrew('edit', true)), asyncHandler(api.updateBrew)); router.put('/api/update/:id', asyncHandler(api.getBrew('edit', true)), asyncHandler(api.updateBrew));
router.delete('/api/:id', asyncHandler(api.deleteBrew)); router.delete('/api/:id', asyncHandler(api.deleteBrew));
router.get('/api/remove/:id', asyncHandler(api.deleteBrew)); router.get('/api/remove/:id', asyncHandler(api.deleteBrew));
router.get('/api/css/:id', asyncHandler(api.getBrew('edit', true)), asyncHandler(api.getBrewThemeWithCSS));
router.get('/api/css/:engine/:id/', asyncHandler(api.getStaticTheme));
module.exports = api; module.exports = api;