diff --git a/.gitignore b/.gitignore index 4e339c2ca3..2186866682 100644 --- a/.gitignore +++ b/.gitignore @@ -223,3 +223,6 @@ $RECYCLE.BIN/ src/**/*.css demo**/*.css dist + +# Ignore demo/uploads +demo/uploads diff --git a/demo/payload.config.json b/demo/payload.config.json index 70ec289d52..42d4425f10 100644 --- a/demo/payload.config.json +++ b/demo/payload.config.json @@ -24,8 +24,8 @@ "defaultLocale": "en", "fallback": true }, - "staticUrl": "/uploads", - "staticDir": "demo/uploads", + "staticUrl": "/media", + "staticDir": "demo/media", "imageSizes": [ { "name": "tablet", diff --git a/src/index.js b/src/index.js index 4a58c1bf2b..5b95c6db21 100644 --- a/src/index.js +++ b/src/index.js @@ -6,7 +6,7 @@ import methodOverride from 'method-override'; import jwtStrategy from './auth/jwt'; import User from '../demo/User/User.model'; import fileUpload from 'express-fileupload'; -import assetRoutes from './routes/media.routes'; +import mediaRoutes from './routes/Media.routes'; import config from '../demo/payload.config'; import locale from './middleware/locale'; @@ -48,7 +48,7 @@ module.exports = { }); } - options.router.use('/media', assetRoutes(options.config)); + options.router.use(options.config.staticUrl, mediaRoutes(options.config)); options.app.use(express.json()); options.app.use(methodOverride('X-HTTP-Method-Override')); diff --git a/src/routes/media.routes.js b/src/routes/media.routes.js index 453d96aa59..d2e13f1f63 100644 --- a/src/routes/media.routes.js +++ b/src/routes/media.routes.js @@ -6,7 +6,7 @@ import bindModel from '../middleware/bindModel'; import Media from '../models/Media.model'; const router = express.Router(); -const mediaRouter = config => { +const mediaRoutes = config => { router.all('*', bindModel(Media)); @@ -26,4 +26,4 @@ const mediaRouter = config => { return router; }; -export default mediaRouter; +export default mediaRoutes;