Compare commits

...

3 Commits

Author SHA1 Message Date
NewPerson
cb8b2cc5aa fix problems with edateam stubs index.js 2024-05-19 21:07:33 +03:00
6651215eeb a bit refresh deployment 2024-05-19 20:50:15 +03:00
80f8cef142 Merge pull request 'edateam_branch' (#1) from edateam_branch into master
Reviewed-on: https://git.inno-js.ru/bro-students/multy-stub/pulls/1
Reviewed-by: primakov <primakovpro@gmail.com>
2024-05-19 12:48:51 +03:00
3 changed files with 10 additions and 17 deletions

View File

@ -1,14 +1,16 @@
FROM 'node:18' FROM node:18
RUN mkdir -p /usr/src/app/server/ RUN mkdir -p /usr/src/app/server/
WORKDIR /usr/src/app/ WORKDIR /usr/src/app/
COPY ./server /usr/src/app/server COPY ./server /usr/src/app/server
COPY ./package.json /usr/src/app/package.json COPY ./package.json /usr/src/app/package.json
COPY ./package-lock.json /usr/src/app/package-lock.json
COPY ./.serverrc.js /usr/src/app/.serverrc.js COPY ./.serverrc.js /usr/src/app/.serverrc.js
# COPY ./.env /usr/src/app/.env # COPY ./.env /usr/src/app/.env
RUN npm i --only=prod # RUN npm i --omit=dev
RUN npm ci
EXPOSE 8044 EXPOSE 8044
CMD ["npm", "run", "up:prod"] CMD ["npm", "run", "up:prod"]

View File

@ -1,15 +1,15 @@
const router = require('express').Router(); const router = require('express').Router();
router.get('/recipe-data', (request, response) => { router.get('/recipe-data', (request, response) => {
response.send(require('../json/recipe-data/success.json')) response.send(require('./json/recipe-data/success.json'));
}) });
router.get('/userpage-data', (req, res)=>{ router.get('/userpage-data', (req, res)=>{
res.send(require('../json/userpage-data/success.json')) res.send(require('./json/userpage-data/success.json'));
}) });
router.get('/homepage-data', (req, res)=>{ router.get('/homepage-data', (req, res)=>{
res.send(require('../json/homepage-data/success.json')) res.send(require('./json/homepage-data/success.json'));
}) });
module.exports = router; module.exports = router;

View File

@ -4,15 +4,6 @@ router.get('/landing-data', (request, response) => {
response.send(require('./json/landing-data/success.json')); response.send(require('./json/landing-data/success.json'));
}); });
router.post('/login', (req, response) => {
const { username, password } = req.body;
if (username === 'admin') {
response.send(require('./json/user/sitter.success.json'));
} else {
response.send(require('./json/landing-data/success.json'));
}
});
router.post('/search', (req, res) => { router.post('/search', (req, res) => {
const { search } = req.body; const { search } = req.body;