Merge branch 'master' into RegExp-Crash-in-Curly-Syntax

2025-12-24 14:12:40 +00:00 · 2022-11-13 20:06:05 -06:00
parent 4493d86fd5 77ad2c8958
commit 29b89bdc00
6 changed files with 12084 additions and 5730 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -27,7 +27,7 @@ jobs:
          # fallback to using the latest cache if no exact match is found
          - v1-dependencies-

-      - node/install-npm
+      - run: sudo npm install -g npm@8.10.0
      - node/install-packages:
          app-dir: ~/homebrewery
          cache-path: node_modules
@@ -55,13 +55,13 @@ jobs:
          at: .

      # run tests!
-      - run: 
+      - run:
          name: Test - Basic
          command: npm run test:basic
-      - run: 
+      - run:
          name: Test - Mustache Spans
          command: npm run test:mustache-span
-      - run: 
+      - run:
          name: Test - Routes
          command: npm run test:route

@@ -71,4 +71,4 @@ workflows:
      - build
      - test:
          requires:
-            - build
+            - build
--- a/client/template.js
+++ b/client/template.js
@@ -1,28 +1,30 @@
-module.exports = async(name, title = '', props = {})=>{
-	const HOMEBREWERY_PUBLIC_URL=props.config.publicUrl;
+const template = async function(name, title='', props = {}){
+	const ogTags = [];
+	Object.entries(props.ogMeta).forEach(([key, value])=>{
+		if(!value) return;
+		const tag = `<meta property="og:${key}" content="${value}">`;
+		ogTags.push(tag);
+	});
+	const ogMetaTags = ogTags.join('\n');

-	return `
-<!DOCTYPE html>
-<html>
-	<head>
-		<link href="//use.fontawesome.com/releases/v5.15.1/css/all.css" rel="stylesheet" />
-		<link href="//fonts.googleapis.com/css?family=Open+Sans:400,300,600,700" rel="stylesheet" type="text/css" />
-		<link href=${`/${name}/bundle.css`} rel='stylesheet' />
-		<link rel="icon" href="/assets/favicon.ico" type="image/x-icon" />
-		<meta property="og:title" content="${props.brew?.title || 'Homebrewery - Untitled Brew'}">
-		<meta property="og:url" content="${HOMEBREWERY_PUBLIC_URL}/${props.brew?.shareId ? `share/${props.brew.shareId}` : ''}">
-		<meta property="og:image" content="${props.brew?.thumbnail || `${HOMEBREWERY_PUBLIC_URL}/thumbnail.png`}">
-		<meta property="og:description" content="${props.brew?.description || 'No description.'}">
-		<meta property="og:site_name" content="The Homebrewery - Make your Homebrew content look legit!">
-		<meta property="og:type" content="article">
-		<meta name="twitter:card" content="summary">
-		<title>${title.length ? `${title} - The Homebrewery`: 'The Homebrewery - NaturalCrit'}</title>
-	</head>
-	<body>
-		<main id="reactRoot">${require(`../build/${name}/ssr.js`)(props)}</main>
-		<script src=${`/${name}/bundle.js`}></script>
-		<script>start_app(${JSON.stringify(props)})</script>
-	</body>
-</html>
-`;
+	return `<!DOCTYPE html>
+	<html>
+		<head>
+			<link href="//use.fontawesome.com/releases/v5.15.1/css/all.css" rel="stylesheet" />
+			<link href="//fonts.googleapis.com/css?family=Open+Sans:400,300,600,700" rel="stylesheet" type="text/css" />
+			<link href=${`/${name}/bundle.css`} rel='stylesheet' />
+			<link rel="icon" href="/assets/favicon.ico" type="image/x-icon" />
+			${ogMetaTags}
+			<meta name="twitter:card" content="summary">
+			<title>${title.length ? `${title} - The Homebrewery`: 'The Homebrewery - NaturalCrit'}</title>
+		</head>
+		<body>
+			<main id="reactRoot">${require(`../build/${name}/ssr.js`)(props)}</main>
+			<script src=${`/${name}/bundle.js`}></script>
+			<script>start_app(${JSON.stringify(props)})</script>
+		</body>
+	</html>
+	`;
 };
+
+module.exports = template;
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -65,22 +65,23 @@
    "express-async-handler": "^1.2.0",
    "express-static-gzip": "2.1.7",
    "fs-extra": "10.1.0",
-    "googleapis": "108.0.1",
+    "googleapis": "109.0.1",
    "js-yaml": "^4.1.0",
    "jwt-simple": "^0.5.6",
    "less": "^3.13.1",
    "lodash": "^4.17.21",
-    "marked": "4.1.1",
+    "marked": "4.2.2",
    "marked-extended-tables": "^1.0.5",
    "markedLegacy": "npm:marked@^0.3.19",
    "moment": "^2.29.4",
    "mongoose": "^6.7.0",
    "nanoid": "3.3.4",
    "nconf": "^0.12.0",
+    "npm": "^8.10.0",
    "react": "^16.14.0",
    "react-dom": "^16.14.0",
    "react-frame-component": "4.1.3",
-    "react-router-dom": "6.4.2",
+    "react-router-dom": "6.4.3",
    "sanitize-filename": "1.6.3",
    "superagent": "^6.1.0",
    "vitreum": "git+https://git@github.com/calculuschild/vitreum.git"
--- a/server/app.js
+++ b/server/app.js
@@ -87,16 +87,32 @@ app.get('/', (req, res, next)=>{
 	req.brew = {
 		text     : welcomeText,
 		renderer : 'V3'
+	},
+
+	req.ogMeta = {
+		siteName    : 'The Homebrewery - Make your Homebrew content look legit!',
+		title       : 'Homepage',
+		description : 'Homepage',
+		thumbnail   : `${config.get('publicUrl')}/thumbnail.png`,
+		type        : 'website'
 	};
 	splitTextStyleAndMetadata(req.brew);
 	return next();
 });

-//Home page v3
+//Home page Legacy
 app.get('/legacy', (req, res, next)=>{
 	req.brew = {
 		text     : welcomeTextLegacy,
 		renderer : 'legacy'
+	},
+
+	req.ogMeta = {
+		siteName    : 'The Homebrewery - Make your Homebrew content look legit!',
+		title       : 'Homepage (Legacy)',
+		description : 'Homepage',
+		thumbnail   : `${config.get('publicUrl')}/thumbnail.png`,
+		type        : 'website'
 	};
 	splitTextStyleAndMetadata(req.brew);
 	return next();
@@ -107,6 +123,14 @@ app.get('/migrate', (req, res, next)=>{
 	req.brew = {
 		text     : migrateText,
 		renderer : 'V3'
+	},
+
+	req.ogMeta = {
+		siteName    : 'The Homebrewery - Make your Homebrew content look legit!',
+		title       : 'v3 Migration Guide',
+		description : 'A brief guide to converting Legacy documents to the v3 renderer.',
+		thumbnail   : `${config.get('publicUrl')}/thumbnail.png`,
+		type        : 'website'
 	};
 	splitTextStyleAndMetadata(req.brew);
 	return next();
@@ -118,6 +142,14 @@ app.get('/changelog', async (req, res, next)=>{
 		title    : 'Changelog',
 		text     : changelogText,
 		renderer : 'V3'
+	},
+
+	req.ogMeta = {
+		siteName    : 'The Homebrewery - Make your Homebrew content look legit!',
+		title       : 'Changelog',
+		description : 'Development changelog.',
+		thumbnail   : null,
+		type        : 'website'
 	};
 	splitTextStyleAndMetadata(req.brew);
 	return next();
@@ -129,7 +161,16 @@ app.get('/faq', async (req, res, next)=>{
 		title    : 'FAQ',
 		text     : faqText,
 		renderer : 'V3'
+	},
+
+	req.ogMeta = {
+		siteName    : 'The Homebrewery - Make your Homebrew content look legit!',
+		title       : 'FAQ',
+		description : 'Frequently Asked Questions',
+		thumbnail   : `${config.get('publicUrl')}/thumbnail.png`,
+		type        : 'website'
 	};
+
 	splitTextStyleAndMetadata(req.brew);
 	return next();
 });
@@ -167,6 +208,14 @@ app.get('/download/:id', asyncHandler(getBrew('share')), (req, res)=>{
 app.get('/user/:username', async (req, res, next)=>{
 	const ownAccount = req.account && (req.account.username == req.params.username);

+	req.ogMeta = {
+		siteName    : 'The Homebrewery - Make your Homebrew content look legit!',
+		title       : `${req.params.username}'s Collection`,
+		description : 'View my collection of homebrew on the Homebrewery.',
+		image       : null,
+		type        : 'website'  // or 'profile'?
+	};
+
 	const fields = [
 		'googleId',
 		'title',
@@ -224,6 +273,14 @@ app.get('/user/:username', async (req, res, next)=>{
 //Edit Page
 app.get('/edit/:id', asyncHandler(getBrew('edit')), (req, res, next)=>{
 	req.brew = req.brew.toObject ? req.brew.toObject() : req.brew;
+
+	req.ogMeta = {
+		siteName    : 'The Homebrewery - Make your Homebrew content look legit!',
+		title       : req.brew.title || 'Untitled Brew',
+		description : req.brew.description || 'No description.',
+		image       : req.brew.thumbnail || null,
+		type        : 'article'
+	};
 	sanitizeBrew(req.brew, 'edit');
 	splitTextStyleAndMetadata(req.brew);
 	res.header('Cache-Control', 'no-cache, no-store');	//reload the latest saved brew when pressing back button, not the cached version before save.
@@ -235,6 +292,13 @@ app.get('/new/:id', asyncHandler(getBrew('share')), (req, res, next)=>{
 	sanitizeBrew(req.brew, 'share');
 	splitTextStyleAndMetadata(req.brew);
 	req.brew.title = `CLONE - ${req.brew.title}`;
+	req.ogMeta = {
+		siteName    : 'The Homebrewery - Make your Homebrew content look legit!',
+		title       : 'New',
+		description : 'Start crafting your homebrew on the Homebrewery!',
+		image       : null,
+		type        : 'website'
+	};
 	return next();
 });

@@ -242,6 +306,14 @@ app.get('/new/:id', asyncHandler(getBrew('share')), (req, res, next)=>{
 app.get('/share/:id', asyncHandler(getBrew('share')), asyncHandler(async (req, res, next)=>{
 	const { brew } = req;

+	req.ogMeta = {
+		siteName    : 'The Homebrewery - Make your Homebrew content look legit!',
+		title       : req.brew.title || 'Untitled Brew',
+		description : req.brew.description || 'No description.',
+		image       : req.brew.thumbnail || null,
+		type        : 'article'
+	};
+
 	if(req.params.id.length > 12 && !brew._id) {
 		const googleId = req.params.id.slice(0, -12);
 		const shareId = req.params.id.slice(-12);
@@ -342,7 +414,8 @@ app.use(asyncHandler(async (req, res, next)=>{
 		account       : req.account,
 		enable_v3     : config.get('enable_v3'),
 		enable_themes : config.get('enable_themes'),
-		config        : configuration
+		config        : configuration,
+		ogMeta        : req.ogMeta
 	};
 	const title = req.brew ? req.brew.title : '';
 	const page = await templateFn('homebrew', title, props)
--- a/tests/routes/static-pages.test.js
+++ b/tests/routes/static-pages.test.js
@@ -9,8 +9,8 @@ describe('Tests for static pages', ()=>{
 		return app.get('/').expect(200);
 	});

-	it('Home page v3 works', ()=>{
-		return app.get('/v3_preview').expect(200);
+	it('Home page legacy works', ()=>{
+		return app.get('/legacy').expect(200);
 	});

 	it('Changelog page works', ()=>{