chore: Improve error page (#66)
* chore: Improve error page * fix: Fix middlware order * fix: Remove console.log
This commit is contained in:
committed by
Khaled Garbaya
parent
4ae6c82f48
commit
ffb9684691
44
app.js
44
app.js
@@ -44,22 +44,18 @@ app.use(function (req, res, next) {
|
|||||||
app.use(settings)
|
app.use(settings)
|
||||||
|
|
||||||
// Make data available for our views to consume
|
// Make data available for our views to consume
|
||||||
app.use(async function (request, response, next) {
|
app.use(catchErrors(async function (request, response, next) {
|
||||||
// Get enabled locales from Contentful
|
// Get enabled locales from Contentful
|
||||||
const space = await getSpace()
|
response.locals.locales = [{code: 'en-US', name: 'U.S. English'}]
|
||||||
response.locals.locales = space.locales
|
response.locals.currentLocale = response.locals.locales[0]
|
||||||
|
// Inject custom helpers
|
||||||
|
response.locals.helpers = helpers
|
||||||
|
|
||||||
const defaultLocale = response.locals.locales
|
// Make query string available in templates to render links properly
|
||||||
.find((locale) => locale.default)
|
const qs = querystring.stringify(request.query)
|
||||||
|
response.locals.queryString = qs ? `?${qs}` : ''
|
||||||
if (request.query.locale) {
|
response.locals.query = request.query
|
||||||
response.locals.currentLocale = space.locales
|
response.locals.currentPath = request.path
|
||||||
.find((locale) => locale.code === request.query.locale)
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!response.locals.currentLocale) {
|
|
||||||
response.locals.currentLocale = defaultLocale
|
|
||||||
}
|
|
||||||
|
|
||||||
// Initialize translations and include them on templates
|
// Initialize translations and include them on templates
|
||||||
initializeTranslations()
|
initializeTranslations()
|
||||||
@@ -80,14 +76,20 @@ app.use(async function (request, response, next) {
|
|||||||
response.locals.currentApi = apis
|
response.locals.currentApi = apis
|
||||||
.find((api) => api.id === (request.query.api || 'cda'))
|
.find((api) => api.id === (request.query.api || 'cda'))
|
||||||
|
|
||||||
// Inject custom helpers
|
const space = await getSpace()
|
||||||
response.locals.helpers = helpers
|
response.locals.locales = space.locales
|
||||||
|
|
||||||
// Make query string available in templates to render links properly
|
const defaultLocale = response.locals.locales
|
||||||
const qs = querystring.stringify(request.query)
|
.find((locale) => locale.default)
|
||||||
response.locals.queryString = qs ? `?${qs}` : ''
|
|
||||||
response.locals.query = request.query
|
if (request.query.locale) {
|
||||||
response.locals.currentPath = request.path
|
response.locals.currentLocale = space.locales
|
||||||
|
.find((locale) => locale.code === request.query.locale)
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!response.locals.currentLocale) {
|
||||||
|
response.locals.currentLocale = defaultLocale
|
||||||
|
}
|
||||||
|
|
||||||
next()
|
next()
|
||||||
}))
|
}))
|
||||||
|
|||||||
Reference in New Issue
Block a user