Rearanged stuff
This commit is contained in:
parent
09228901ed
commit
d46c4bba61
2
.gitignore
vendored
2
.gitignore
vendored
@ -61,5 +61,5 @@ typings/
|
|||||||
.next
|
.next
|
||||||
|
|
||||||
UpImage/
|
UpImage/
|
||||||
|
|
||||||
archive/
|
archive/
|
||||||
|
public/assets/list/
|
17
.vscode/launch.json
vendored
Normal file
17
.vscode/launch.json
vendored
Normal file
@ -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": [
|
||||||
|
"<node_internals>/**"
|
||||||
|
],
|
||||||
|
"program": "${workspaceFolder}\\bin\\www"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
8
app.js
8
app.js
@ -29,9 +29,9 @@ db.on('error', console.error.bind(console, 'MongoDB connection error:'));
|
|||||||
|
|
||||||
var oldRouter = require('./routes/main/1_0');
|
var oldRouter = require('./routes/main/1_0');
|
||||||
var newRouter = require('./routes/main/2_0');
|
var newRouter = require('./routes/main/2_0');
|
||||||
var photosRouter = require('./routes/photoRouter');
|
var listRouter = require('./routes/list');
|
||||||
var movieRouter = require('./routes/movies/movieRouter');
|
var photosRouter = require('./routes/api/photoRouter');
|
||||||
var movieShowRouter = require('./routes/movies/movieShow');
|
var movieRouter = require('./routes/api/movieRouter');
|
||||||
|
|
||||||
var app = express();
|
var app = express();
|
||||||
|
|
||||||
@ -73,9 +73,9 @@ app.use(function (req, res, next) {
|
|||||||
|
|
||||||
app.use('/', newRouter);
|
app.use('/', newRouter);
|
||||||
app.use('/old', oldRouter);
|
app.use('/old', oldRouter);
|
||||||
|
app.use('/list', listRouter);
|
||||||
app.use('/api/photos', photosRouter);
|
app.use('/api/photos', photosRouter);
|
||||||
app.use('/api/movies', movieRouter);
|
app.use('/api/movies', movieRouter);
|
||||||
app.use('/movies', movieShowRouter);
|
|
||||||
|
|
||||||
// catch 404 and forward to error handler
|
// catch 404 and forward to error handler
|
||||||
app.use(function(req, res, next) {
|
app.use(function(req, res, next) {
|
||||||
|
@ -4,7 +4,7 @@ var multer = require('multer');
|
|||||||
var upload = multer({dest: 'public/UpImage/'});
|
var upload = multer({dest: 'public/UpImage/'});
|
||||||
|
|
||||||
var router = express.Router();
|
var router = express.Router();
|
||||||
var photoController = require('../controllers/photoController.js');
|
var photoController = require('../../controllers/photoController.js');
|
||||||
|
|
||||||
|
|
||||||
router.get('/', photoController.list);
|
router.get('/', photoController.list);
|
Loading…
x
Reference in New Issue
Block a user