From d46c4bba61abc1d8f72c93fd4fd43f56fe24259e Mon Sep 17 00:00:00 2001 From: Nikola Petrov Date: Thu, 6 Jul 2023 23:49:39 +0200 Subject: [PATCH] Rearanged stuff --- .gitignore | 4 ++-- .vscode/launch.json | 17 +++++++++++++++++ app.js | 8 ++++---- routes/{ => api}/photoRouter.js | 2 +- 4 files changed, 24 insertions(+), 7 deletions(-) create mode 100644 .vscode/launch.json rename routes/{ => api}/photoRouter.js (87%) diff --git a/.gitignore b/.gitignore index 6e8d318..3da8e71 100644 --- a/.gitignore +++ b/.gitignore @@ -61,5 +61,5 @@ typings/ .next UpImage/ - -archive/ \ No newline at end of file +archive/ +public/assets/list/ \ No newline at end of file diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..c143481 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,17 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "type": "node", + "request": "launch", + "name": "Launch Program", + "skipFiles": [ + "/**" + ], + "program": "${workspaceFolder}\\bin\\www" + } + ] +} \ No newline at end of file diff --git a/app.js b/app.js index 07b8d70..f924702 100644 --- a/app.js +++ b/app.js @@ -29,9 +29,9 @@ db.on('error', console.error.bind(console, 'MongoDB connection error:')); var oldRouter = require('./routes/main/1_0'); var newRouter = require('./routes/main/2_0'); -var photosRouter = require('./routes/photoRouter'); -var movieRouter = require('./routes/movies/movieRouter'); -var movieShowRouter = require('./routes/movies/movieShow'); +var listRouter = require('./routes/list'); +var photosRouter = require('./routes/api/photoRouter'); +var movieRouter = require('./routes/api/movieRouter'); var app = express(); @@ -73,9 +73,9 @@ app.use(function (req, res, next) { app.use('/', newRouter); app.use('/old', oldRouter); +app.use('/list', listRouter); app.use('/api/photos', photosRouter); app.use('/api/movies', movieRouter); -app.use('/movies', movieShowRouter); // catch 404 and forward to error handler app.use(function(req, res, next) { diff --git a/routes/photoRouter.js b/routes/api/photoRouter.js similarity index 87% rename from routes/photoRouter.js rename to routes/api/photoRouter.js index f544bca..c80a3e6 100644 --- a/routes/photoRouter.js +++ b/routes/api/photoRouter.js @@ -4,7 +4,7 @@ var multer = require('multer'); var upload = multer({dest: 'public/UpImage/'}); var router = express.Router(); -var photoController = require('../controllers/photoController.js'); +var photoController = require('../../controllers/photoController.js'); router.get('/', photoController.list);