diff --git a/server/app.js b/server/app.js index 9e04c7b5b..eb078a877 100644 --- a/server/app.js +++ b/server/app.js @@ -16,11 +16,11 @@ import path from 'path'; import fs from 'fs-extra'; import api from './homebrew.api.js'; -import pageRoutes from './page-routes.js'; -const { homebrewApi, getBrew, getUsersBrewThemes, getCSS } = api; +const { homebrewApi, getBrew, getCSS } = api; import adminApi from './admin.api.js'; import vaultApi from './vault.api.js'; -import GoogleActions from './googleActions.js'; +import pageRoutes from './page-routes.js'; + import serveCompressedStaticAssets from './static-assets.mv.js'; import asyncHandler from 'express-async-handler'; import { model as HomebrewModel } from './homebrew.model.js'; @@ -113,12 +113,6 @@ export default async function createApp(vite) { app.use(adminApi(vite)); app.use(vaultApi); - const welcomeText = fs.readFileSync('./client/homebrew/pages/homePage/welcome_msg.md', 'utf8'); - const welcomeTextLegacy = fs.readFileSync('./client/homebrew/pages/homePage/welcome_msg_legacy.md', 'utf8'); - const migrateText = fs.readFileSync('./client/homebrew/pages/homePage/migrate.md', 'utf8'); - const changelogText = fs.readFileSync('changelog.md', 'utf8'); - const faqText = fs.readFileSync('faq.md', 'utf8'); - String.prototype.replaceAll = function(s, r){return this.split(s).join(r);}; const defaultMetaTags = { @@ -131,16 +125,8 @@ export default async function createApp(vite) { app.use(pageRoutes({ defaultMetaTags, - welcomeText, - welcomeTextLegacy, - migrateText, - changelogText, - faqText, - getBrew, - getUsersBrewThemes, - HomebrewModel, - GoogleActions, - sanitizeBrew, + HomebrewModel, + sanitizeBrew, })); //Robots.txt diff --git a/server/page-routes.js b/server/page-routes.js index df9fc2c44..c357db7dc 100644 --- a/server/page-routes.js +++ b/server/page-routes.js @@ -15,18 +15,20 @@ import dbCheck from './middleware/dbCheck.js'; import sanitizeFilename from 'sanitize-filename'; import { DEFAULT_BREW } from './brewDefaults.js'; import { splitTextStyleAndMetadata } from '../shared/helpers.js'; +import GoogleActions from './googleActions.js'; + +import api from './homebrew.api.js'; +const { getBrew, getUsersBrewThemes } = api; + +const welcomeText = fs.readFileSync('./client/homebrew/pages/homePage/welcome_msg.md', 'utf8'); +const welcomeTextLegacy = fs.readFileSync('./client/homebrew/pages/homePage/welcome_msg_legacy.md', 'utf8'); +const migrateText = fs.readFileSync('./client/homebrew/pages/homePage/migrate.md', 'utf8'); +const changelogText = fs.readFileSync('changelog.md', 'utf8'); +const faqText = fs.readFileSync('faq.md', 'utf8'); export default function pageRoutes({ defaultMetaTags, - welcomeText, - welcomeTextLegacy, - migrateText, - changelogText, - faqText, - getBrew, - getUsersBrewThemes, HomebrewModel, - GoogleActions, sanitizeBrew, }) { const app = express.Router();