diff --git a/packages/strapi/lib/middlewares/public/assets/images/group_people_1.png b/packages/strapi/lib/middlewares/public/assets/images/group_people_1.png new file mode 100644 index 0000000000..efa2379bf7 Binary files /dev/null and b/packages/strapi/lib/middlewares/public/assets/images/group_people_1.png differ diff --git a/packages/strapi/lib/middlewares/public/assets/images/group_people_2.png b/packages/strapi/lib/middlewares/public/assets/images/group_people_2.png new file mode 100644 index 0000000000..05987c5de9 Binary files /dev/null and b/packages/strapi/lib/middlewares/public/assets/images/group_people_2.png differ diff --git a/packages/strapi/lib/middlewares/public/assets/images/group_people_3.png b/packages/strapi/lib/middlewares/public/assets/images/group_people_3.png new file mode 100644 index 0000000000..28cfb09a5d Binary files /dev/null and b/packages/strapi/lib/middlewares/public/assets/images/group_people_3.png differ diff --git a/packages/strapi/lib/middlewares/public/assets/images/logo_login.png b/packages/strapi/lib/middlewares/public/assets/images/logo_login.png new file mode 100644 index 0000000000..129eab4d18 Binary files /dev/null and b/packages/strapi/lib/middlewares/public/assets/images/logo_login.png differ diff --git a/packages/strapi/lib/middlewares/public/index.html b/packages/strapi/lib/middlewares/public/index.html index eaf4a6f35d..6bf76e9b5d 100644 --- a/packages/strapi/lib/middlewares/public/index.html +++ b/packages/strapi/lib/middlewares/public/index.html @@ -14,7 +14,7 @@
-

+

<% if (strapi.config.environment === 'development' && isInitialised) { %>
@@ -34,9 +34,9 @@

To discover the power provided by Strapi, you need to create an administrator.

Create the first administrator
- People saying hello - People saying hello - People saying hello + People saying hello + People saying hello + People saying hello
<% } else { %> diff --git a/packages/strapi/lib/middlewares/public/index.js b/packages/strapi/lib/middlewares/public/index.js index ad68257949..4c13d810de 100644 --- a/packages/strapi/lib/middlewares/public/index.js +++ b/packages/strapi/lib/middlewares/public/index.js @@ -10,6 +10,7 @@ const path = require('path'); const _ = require('lodash'); const koaStatic = require('koa-static'); const stream = require('stream'); +const serveStatic = require('./serve-static'); const utils = require('../../utils'); @@ -44,6 +45,7 @@ module.exports = strapi => { 'config.info.version', 'config.info.name', 'config.admin.url', + 'config.server.url', 'config.environment', ]), }; @@ -61,6 +63,10 @@ module.exports = strapi => { strapi.router.get('/', serveIndexPage); strapi.router.get('/index.html', serveIndexPage); + strapi.router.get( + '/assets/images/(.*)', + serveStatic(path.resolve(__dirname, 'assets/images'), { maxage: maxAge, defer: true }) + ); } // serve files in public folder unless a sub router renders something else @@ -78,15 +84,7 @@ module.exports = strapi => { strapi.router.get( `${strapi.config.admin.path}/*`, - async (ctx, next) => { - ctx.url = path.basename(ctx.url); - await next(); - }, - koaStatic(buildDir, { - index: 'index.html', - maxage: maxAge, - defer: false, - }) + serveStatic(buildDir, { maxage: maxAge, defer: false, index: 'index.html' }) ); strapi.router.get(`${strapi.config.admin.path}*`, ctx => { diff --git a/packages/strapi/lib/middlewares/public/serve-static.js b/packages/strapi/lib/middlewares/public/serve-static.js new file mode 100644 index 0000000000..0375aa21b7 --- /dev/null +++ b/packages/strapi/lib/middlewares/public/serve-static.js @@ -0,0 +1,21 @@ +const koaStatic = require('koa-static'); +const path = require('path'); + +// serveStatic is not supposed to be used to serve a folder that have sub-folders +const serveStatic = (filesDir, koaStaticOptions = {}) => { + const serve = koaStatic(filesDir, koaStaticOptions); + + return async (ctx, next) => { + const prev = ctx.path; + const newPath = path.basename(ctx.path); + ctx.path = newPath; + await serve(ctx, async () => { + ctx.path = prev; + await next(); + ctx.path = newPath; + }); + ctx.path = prev; + }; +}; + +module.exports = serveStatic;