From 92cabfa048fd4c57292db4da5cbd416c332f9ad5 Mon Sep 17 00:00:00 2001 From: Julya Shapaeva Date: Sat, 25 May 2024 11:12:21 +0300 Subject: [PATCH 1/3] Add dogsitters-finder to server/index.json and server/routers --- server/index.js | 1 + server/routers/dogsitters-finder/index.js | 9 ++++ .../routers/dogsitters-finder/json/users.json | 43 +++++++++++++++++++ 3 files changed, 53 insertions(+) create mode 100644 server/routers/dogsitters-finder/index.js create mode 100644 server/routers/dogsitters-finder/json/users.json diff --git a/server/index.js b/server/index.js index c09b5ab..353462a 100644 --- a/server/index.js +++ b/server/index.js @@ -58,6 +58,7 @@ app.use('/zoom-bar', require('./routers/zoom-bar')) app.use('/r-and-m', require('./routers/r-and-m')) app.use('/edateam', require('./routers/edateam')) app.use('/webstar-project', require('./routers/webstar-project')) +app.use('/dogsitters-finder', require('./routers/dogsitters-finder')) //app.use('/basket', require('./routers/basket')) //app.use('/easy-project', require('./routers/easy-project')) //app.use('/sugarbun', require('./routers/sugarbun')) diff --git a/server/routers/dogsitters-finder/index.js b/server/routers/dogsitters-finder/index.js new file mode 100644 index 0000000..a161f40 --- /dev/null +++ b/server/routers/dogsitters-finder/index.js @@ -0,0 +1,9 @@ +const { response } = require('express'); + +const router = require('express').Router(); + +router.get("/users", (request, response) => { + response.send(require("../json/users.json")) +}) + +module.exports = router; diff --git a/server/routers/dogsitters-finder/json/users.json b/server/routers/dogsitters-finder/json/users.json new file mode 100644 index 0000000..2d57358 --- /dev/null +++ b/server/routers/dogsitters-finder/json/users.json @@ -0,0 +1,43 @@ +[ + { + "id": 1, + "phone_number": 89283244141, + "password": "1234", + "first_name": "Вася", + "second_name": "Пупкин", + "role": "dogsitter", + "location": "Вахитовский район", + "price": 1500, + "about_me": "Я люблю собак" + }, + { + "id": 2, + "phone_number": 89272844541, + "password": "1234", + "first_name": "Ваня", + "second_name": "Пуськин", + "role": "dogsitter", + "location": "Приволжский район", + "price": 1000000, + "about_me": "Я не люблю собак. И вообще я котоман." + }, + { + "id": 3, + "phone_number": 89872855893, + "password": "12345", + "first_name": "Гадий", + "second_name": "Петрович", + "role": "owner" + }, + { + "id": 4, + "phone_number": 89872844591, + "password": "12345", + "first_name": "Галкин", + "second_name": "Максим", + "role": ["owner", "dogsitter"], + "location": "Элитный район", + "price": 1000000, + "about_me": "Миллион алых роз" + } +] From 086c94c58a05a0af77142628017e72827fbb7399 Mon Sep 17 00:00:00 2001 From: Julya Shapaeva Date: Sun, 26 May 2024 16:28:54 +0300 Subject: [PATCH 2/3] Update json/users.json --- server/routers/dogsitters-finder/json/users.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/routers/dogsitters-finder/json/users.json b/server/routers/dogsitters-finder/json/users.json index 2d57358..17d0259 100644 --- a/server/routers/dogsitters-finder/json/users.json +++ b/server/routers/dogsitters-finder/json/users.json @@ -6,7 +6,7 @@ "first_name": "Вася", "second_name": "Пупкин", "role": "dogsitter", - "location": "Вахитовский район", + "location": "Россия, республика Татарстан, Казань, улица Пушкина, 12", "price": 1500, "about_me": "Я люблю собак" }, @@ -17,7 +17,7 @@ "first_name": "Ваня", "second_name": "Пуськин", "role": "dogsitter", - "location": "Приволжский район", + "location": "Россия, республика Татарстан, Казань, улица Абсалямова, 19", "price": 1000000, "about_me": "Я не люблю собак. И вообще я котоман." }, @@ -36,7 +36,7 @@ "first_name": "Галкин", "second_name": "Максим", "role": ["owner", "dogsitter"], - "location": "Элитный район", + "location": "Россия, республика Татарстан, Казань, проспект Ямашева, 83", "price": 1000000, "about_me": "Миллион алых роз" } From fb868bfefc0c87ba3c81d4b9495edb2f12be8079 Mon Sep 17 00:00:00 2001 From: Julya Shapaeva Date: Sun, 26 May 2024 16:29:12 +0300 Subject: [PATCH 3/3] Change path to json --- server/routers/dogsitters-finder/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/routers/dogsitters-finder/index.js b/server/routers/dogsitters-finder/index.js index a161f40..dc8fc6c 100644 --- a/server/routers/dogsitters-finder/index.js +++ b/server/routers/dogsitters-finder/index.js @@ -3,7 +3,7 @@ const { response } = require('express'); const router = require('express').Router(); router.get("/users", (request, response) => { - response.send(require("../json/users.json")) + response.send(require("./json/users.json")) }) module.exports = router;