mirror of
https://github.com/PretendoNetwork/website.git
synced 2026-09-26 18:46:39 -05:00
Merge branch 'dev' into master
This commit is contained in:
@@ -5,7 +5,7 @@ const router = new Router();
|
||||
|
||||
const fs = require('fs');
|
||||
const path = require('path');
|
||||
const marked = require('marked');
|
||||
const { marked } = require('marked');
|
||||
const matter = require('gray-matter');
|
||||
|
||||
const postList = () => {
|
||||
@@ -96,7 +96,7 @@ router.get('/:slug', async (request, response, next) => {
|
||||
.replace(/(?<=<iframe src="https:\/\/www\.youtube-nocookie\.com\/embed\/.{11})\)/g, '" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe></div>');
|
||||
|
||||
// Convert the content into HTML
|
||||
const htmlPost = marked(content);
|
||||
const htmlPost = marked.parse(content);
|
||||
|
||||
response.render('blog/blogpost', {
|
||||
layout: 'blog-opengraph',
|
||||
|
||||
@@ -4,7 +4,7 @@ const router = new Router();
|
||||
|
||||
const fs = require('fs');
|
||||
const path = require('path');
|
||||
const marked = require('marked');
|
||||
const { marked } = require('marked');
|
||||
|
||||
router.get('/', async (request, response) => {
|
||||
response.redirect('/docs/welcome');
|
||||
@@ -56,7 +56,7 @@ router.get('/:slug', async (request, response, next) => {
|
||||
.replace(/(?<=<iframe src="https:\/\/www\.youtube-nocookie\.com\/embed\/.{11})\)/g, '" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe></div>');
|
||||
|
||||
// Convert the content into HTML
|
||||
content = marked(content);
|
||||
content = marked.parse(content);
|
||||
|
||||
// A boolean to show the quick links grid or not.
|
||||
let showQuickLinks = false;
|
||||
|
||||
@@ -26,7 +26,7 @@ router.get('/', async (request, response) => {
|
||||
|
||||
// Slices the array in half
|
||||
const specialThanksFirstRow = specialThanksPeople.slice(0, 3);
|
||||
const specialThanksSecondRow = specialThanksPeople.slice(3, 6);
|
||||
const specialThanksSecondRow = specialThanksPeople.slice(3, 7);
|
||||
|
||||
// Builds the final array to be sent to the view, and triples each row.
|
||||
specialThanksPeople = {
|
||||
|
||||
@@ -50,7 +50,9 @@ app.use(expressLocale({
|
||||
it: 'it-IT', 'it-CH': 'it-IT',
|
||||
ja: 'ja-JP',
|
||||
ko: 'ko-KR',
|
||||
pl: 'pl-PL',
|
||||
nb: 'nb-NO',
|
||||
no: 'nb-NO',
|
||||
pl: 'pl-PL',
|
||||
pt: 'pt-BR',
|
||||
ro: 'ro-RO',
|
||||
ru: 'ru-RU',
|
||||
@@ -66,6 +68,7 @@ app.use(expressLocale({
|
||||
'it', 'it-IT', 'it-CH',
|
||||
'ja', 'ja-JP',
|
||||
'ko', 'ko-KR',
|
||||
'nb', 'no', 'nb-NO',
|
||||
'pl', 'pl-PL',
|
||||
'pt', 'pt-BR',
|
||||
'ro', 'ro-RO',
|
||||
|
||||
Reference in New Issue
Block a user