yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-12 15:32:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix missing images on index.html

Browse Source 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
This commit is contained in:
Pierre Noël 2020-06-22 16:32:36 +02:00
parent 9ed11a6682
commit 1a097abcf5
7 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
packages/strapi/lib/middlewares/public/assets/images/group_people_1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

BIN
packages/strapi/lib/middlewares/public/assets/images/group_people_2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

BIN
packages/strapi/lib/middlewares/public/assets/images/group_people_3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

BIN
packages/strapi/lib/middlewares/public/assets/images/logo_login.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.0 KiB

8
packages/strapi/lib/middlewares/public/index.html
View File

@ -14,7 +14,7 @@
</head>
<body lang="en">
<section class="wrapper">
<h1><img class="logo" src="https://strapi.io/assets/images/logo_login.png" /></h1>
<h1><img class="logo" src="<%= strapi.config.server.url %>/assets/images/logo_login.png" /></h1>
<% if (strapi.config.environment === 'development' && isInitialised) { %>
<div class="informations">
<div>
@ -34,9 +34,9 @@
<p>To discover the power provided by Strapi, you need to create an administrator.</p>
<a class="cta cta-secondary" href="<%= strapi.config.admin.url %>" target="_blank" title="Click to create the first administration" ><i class="fas fa-external-link-alt"></i>Create the first administrator</a>
<div class="people-saying-hello">
<img class="visible" src="https://strapi.io/assets/images/group_people_1.png" alt="People saying hello" />
<img src="https://strapi.io/assets/images/group_people_2.png" alt="People saying hello" />
<img src="https://strapi.io/assets/images/group_people_3.png" alt="People saying hello" />
<img class="visible" src="<%= strapi.config.server.url %>/assets/images/group_people_1.png" alt="People saying hello" />
<img src="<%= strapi.config.server.url %>/assets/images/group_people_2.png" alt="People saying hello" />
<img src="<%= strapi.config.server.url %>/assets/images/group_people_3.png" alt="People saying hello" />
</div>
</div>
<% } else { %>

16
packages/strapi/lib/middlewares/public/index.js
View File

@ -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 => {

21
packages/strapi/lib/middlewares/public/serve-static.js Normal file
View File

@ -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;