f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-09-24 22:33:00 +00:00
Code Wiki Activity

Merge branch 'master' into add-settings-editor

Browse Source
This commit is contained in:
Trevor Buckner
2026-09-23 21:43:39 -04:00
committed by GitHub
parent 6ec10d6f6f 4b9fdbad7b
commit b25d8b01a0
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/homebrew/homebrew.jsx
+3 -3
View File
@@ -46,7 +46,7 @@ const Homebrew = (props)=>{
global.enablev4 = enablev4; global.enablev4 = enablev4;
const backgroundObject = ()=>{ const backgroundObject = ()=>{
if(config?.deployment || (config?.local && config?.development)) { if(config?.deployment || config?.developmentStyle) {
const bgText = config?.deployment || 'Local'; const bgText = config?.deployment || 'Local';
return { return {
backgroundImage : `url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' version='1.1' height='100px' width='200px'><text x='0' y='15' fill='%23fff7' font-size='20'>${bgText}</text></svg>")` backgroundImage : `url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' version='1.1' height='100px' width='200px'><text x='0' y='15' fill='%23fff7' font-size='20'>${bgText}</text></svg>")`
@@ -60,7 +60,7 @@ const Homebrew = (props)=>{
if(brew.pureError) { if(brew.pureError) {
return ( return (
<Router> <Router>
<div className={`homebrew${(config?.deployment || config?.local) ? ' deployment' : ''}`} style={backgroundObject()}> <div className={`homebrew${(config?.deployment || config?.developmentStyle) ? ' deployment' : ''}`} style={backgroundObject()}>
<Routes> <Routes>
<Route path={brew.originalUrl} element={<WithRoute el={ErrorPage} brew={brew} />} /> <Route path={brew.originalUrl} element={<WithRoute el={ErrorPage} brew={brew} />} />
</Routes> </Routes>
@@ -72,7 +72,7 @@ const Homebrew = (props)=>{
return ( return (
<Router> <Router>
<div className={`homebrew${(config?.deployment || config?.local) ? ' deployment' : ''}`} style={backgroundObject()}> <div className={`homebrew${(config?.deployment || config?.developmentStyle) ? ' deployment' : ''}`} style={backgroundObject()}>
<Routes> <Routes>
<Route path='/edit/:id' element={<WithRoute el={EditPage} brew={brew} userThemes={userThemes}/>} /> <Route path='/edit/:id' element={<WithRoute el={EditPage} brew={brew} userThemes={userThemes}/>} />
<Route path='/share/:id' element={<WithRoute el={SharePage} brew={brew} />} /> <Route path='/share/:id' element={<WithRoute el={SharePage} brew={brew} />} />
config/default.json
+1 -1
View File
@@ -1,5 +1,5 @@
{ {
"development": true, "development_style": false,
"host" : "homebrewery.local.naturalcrit.com:8000", "host" : "homebrewery.local.naturalcrit.com:8000",
"naturalcrit_url" : "local.naturalcrit.com:8010", "naturalcrit_url" : "local.naturalcrit.com:8010",
"secret" : "secret", "secret" : "secret",
server/app.js
+6 -5
View File
@@ -245,11 +245,12 @@ export default async function createApp(vite) {
// Create configuration object // Create configuration object
const configuration = { const configuration = {
local : isLocalEnvironment, local : isLocalEnvironment,
publicUrl : config.get('publicUrl') ?? '', publicUrl : config.get('publicUrl') ?? '',
baseUrl : `${req.protocol}://${req.get('host')}`, baseUrl : `${req.protocol}://${req.get('host')}`,
environment : nodeEnv, environment : nodeEnv,
deployment : config.get('heroku_app_name') ?? '' deployment : config.get('heroku_app_name') ?? '',
developmentStyle : config.get('development_style')
}; };
const props = { const props = {
version : version, version : version,