Compare commits

...

18 Commits

Author SHA1 Message Date
Primakov Alexandr Alexandrovich
3e27c0110c docker compose up script fix 2024-08-23 16:38:07 +03:00
c2ada9072f Merge pull request 'school-stage stubs' (#27) from school-stage-branch into master
Reviewed-on: https://git.inno-js.ru/bro-students/multy-stub/pulls/27
2024-06-03 23:26:56 +03:00
1bd1d2b279 school-stage stubs 2024-06-03 23:26:23 +03:00
7b1ce2ae83 Merge pull request 'school-stage stubs' (#26) from school-stage-branch into master
Reviewed-on: https://git.inno-js.ru/bro-students/multy-stub/pulls/26
2024-06-03 23:20:29 +03:00
de22881c28 school-stage stubs 2024-06-03 23:19:56 +03:00
20d370f120 Merge pull request 'school-stage stubs' (#25) from school-stage-branch into master
Reviewed-on: https://git.inno-js.ru/bro-students/multy-stub/pulls/25
2024-06-03 19:02:09 +03:00
85986d1844 school-stage stubs 2024-06-03 19:00:44 +03:00
dccf769477 Merge pull request 'school-stage stubs' (#24) from school-stage-branch into master
Reviewed-on: https://git.inno-js.ru/bro-students/multy-stub/pulls/24
2024-06-02 20:31:21 +03:00
d088ef7af8 school-stage stubs 2024-06-02 20:30:51 +03:00
fad8cdfe08 Merge pull request 'school-stage stubs' (#23) from school-stage-branch into master
Reviewed-on: https://git.inno-js.ru/bro-students/multy-stub/pulls/23
2024-06-02 20:26:27 +03:00
a55e6d2ab2 school-stage stubs 2024-06-02 20:25:51 +03:00
eb6da8aa1b Merge pull request 'school-stage stubs' (#22) from school-stage-branch into master
Reviewed-on: https://git.inno-js.ru/bro-students/multy-stub/pulls/22
2024-06-02 20:16:40 +03:00
19a55f57c0 school-stage stubs 2024-06-02 20:15:01 +03:00
b649e86a43 Merge pull request 'stubs-kazan-explore' (#21) from stubs-kazan-explore into master
Reviewed-on: https://git.inno-js.ru/bro-students/multy-stub/pulls/21
2024-06-02 15:28:00 +03:00
bd4de9d7ba Merge pull request 'Add trip schedule stubs kazan-explore' (#20) from stubs-kazan-explore into master
Reviewed-on: https://git.inno-js.ru/bro-students/multy-stub/pulls/20
2024-06-02 13:20:37 +03:00
435f17ee22 Merge pull request 'Add stubs kazan-explore' (#19) from stubs-kazan-explore into master
Reviewed-on: https://git.inno-js.ru/bro-students/multy-stub/pulls/19
2024-06-01 20:40:27 +03:00
88e3fe4172 Merge pull request 'Add stubs kazan-explore' (#18) from stubs-kazan-explore into master
Reviewed-on: https://git.inno-js.ru/bro-students/multy-stub/pulls/18
2024-06-01 20:34:05 +03:00
4778dba7ed Merge pull request 'stubs-kazan-explore' (#17) from stubs-kazan-explore into master
Reviewed-on: https://git.inno-js.ru/bro-students/multy-stub/pulls/17
2024-06-01 20:25:16 +03:00
4 changed files with 76 additions and 34 deletions

View File

@ -6,9 +6,9 @@
"scripts": {
"start": "npx nodemon ./server",
"up:prod": "cross-env NODE_ENV=\"production\" node ./server",
"deploy:d:stop": "docker-compose down",
"deploy:d:build": "docker-compose build",
"deploy:d:up": "docker-compose up -d",
"deploy:d:stop": "docker compose down",
"deploy:d:build": "docker compose build",
"deploy:d:up": "docker compose up -d",
"redeploy": "npm run deploy:d:stop && npm run deploy:d:build && npm run deploy:d:up",
"eslint": "npx eslint ./server",
"eslint:fix": "npx eslint ./server --fix",

View File

@ -1,3 +1,18 @@
/*const router = require('express').Router();
module.exports = router;
router.get('/teachers', (request, response) => {
response.send(require('../json/teachers/success.json'))
})
router.get('/account', (request, response) => {
response.send(require('../json/account/account.json'))
})
router.post('/login', (request, response) => {
response.send(require('../json/login/success.json'))
})*/
const router = require('express').Router();
router.get('/teachers', (request, response) => {
@ -7,8 +22,28 @@ router.get('/teachers', (request, response) => {
router.get('/account', (request, response) => {
response.send(require('./json/account/account.json'))
})
router.post('/login', (request, response) => {
response.send(require('./json/login/success.json'))
const login = request.body.login;
const password = request.body.password;
try {
const users = require('./json/account/account.json');
const user = users.data.find(user => user.login === login && user.password === password);
if (!user) {
return response.status(401).send('Неверные данные');
}
const responseObject = {
login: user.login,
}
return response.json(responseObject);
} catch (error) {
console.error('Error reading file:', error);
response.status(400).send('Internal server error');
}
})
module.exports = router;

View File

@ -1,26 +1,28 @@
{
"data": [
{
"login": "user1",
"photo": "boy",
"surname": "Иванов",
"name": "Иван",
"class": "2",
"group": "1",
"number": "+7 927 030 13 00",
"teacher": "Иванова Валерия Константиновна",
"lessons": ["02.05", "07.05", "14.05", "17.05", "21.05", "24.05", "28.05"]
},
{
"login": "user2",
"photo": "boy",
"surname": "Александров",
"name": "Александр",
"class": "3",
"group": "2",
"number": "+7 927 030 13 00",
"teacher": "Иванова Валерия Константиновна",
"lessons": ["02.05", "07.05", "14.05", "17.05", "21.05", "24.05", "28.05"]
}
]
}
"data": [
{
"login": "user1",
"password":"1234",
"photo": "boy",
"surname": "Иванов",
"name": "Иван",
"class": "2",
"group": "1",
"number": "+7 927 030 13 00",
"teacher": "Иванова Валерия Константиновна",
"lessons": ["02.05", "07.05", "14.05", "17.05", "21.05", "24.05", "28.05"]
},
{
"login": "user2",
"password":"123",
"photo": "boy",
"surname": "Александров",
"name": "Евгений",
"class": "2",
"group": "1",
"number": "+7 927 030 13 00",
"teacher": "Иванова Валерия Константиновна",
"lessons": ["02.05", "07.05", "14.05", "17.05", "21.05", "24.05", "28.05"]
}
]
}

View File

@ -1,10 +1,15 @@
{
"data": [
"data":
[
{
"imageUrl": "teacher1"
"imageUrl": "teacher1",
"name": "Иванова Валерия Константинова",
"status": "Педагог с бакалаврской степенью по театральному искусству. Обладает более чем 15-летним опытом работы на театральной сцене, является действующим актером театра и кино."
},
{
"imageUrl": "teacher2"
"imageUrl": "teacher2",
"name": "Рогов Сергей Владимирович",
"status": "Педагог по актерскому мастерству с высшим образованием в области режиссуры, постановщик спектаклей. Опыт работы с детьми 10 лет."
}
]
}
}