From 468798c4aacf295d4e55ac6a37bee2eccba0d073 Mon Sep 17 00:00:00 2001 From: Sergey Melyukov Date: Mon, 17 Apr 2023 19:08:13 +0300 Subject: [PATCH 1/7] loft photo --- projects/loft-photo/friends.json | 32 ++ projects/loft-photo/images/arrow-left.svg | 4 + projects/loft-photo/images/button.svg | 17 ++ projects/loft-photo/images/chat.svg | 3 + projects/loft-photo/images/exit.svg | 5 + projects/loft-photo/images/heart-red.svg | 3 + projects/loft-photo/images/heart.svg | 3 + projects/loft-photo/images/logo.svg | 11 + projects/loft-photo/images/send.svg | 3 + projects/loft-photo/images/vert1.svg | 22 ++ projects/loft-photo/images/vert2.svg | 22 ++ projects/loft-photo/images/vert3.svg | 22 ++ projects/loft-photo/index.js | 0 projects/loft-photo/layout.html | 64 ++++ projects/loft-photo/model.js | 9 + projects/loft-photo/photos.json | 72 +++++ projects/loft-photo/server/index.js | 91 ++++++ projects/loft-photo/settings.json | 7 + projects/loft-photo/styles.css | 348 ++++++++++++++++++++++ 19 files changed, 738 insertions(+) create mode 100644 projects/loft-photo/friends.json create mode 100644 projects/loft-photo/images/arrow-left.svg create mode 100644 projects/loft-photo/images/button.svg create mode 100644 projects/loft-photo/images/chat.svg create mode 100644 projects/loft-photo/images/exit.svg create mode 100644 projects/loft-photo/images/heart-red.svg create mode 100644 projects/loft-photo/images/heart.svg create mode 100644 projects/loft-photo/images/logo.svg create mode 100644 projects/loft-photo/images/send.svg create mode 100644 projects/loft-photo/images/vert1.svg create mode 100644 projects/loft-photo/images/vert2.svg create mode 100644 projects/loft-photo/images/vert3.svg create mode 100644 projects/loft-photo/index.js create mode 100644 projects/loft-photo/layout.html create mode 100644 projects/loft-photo/model.js create mode 100644 projects/loft-photo/photos.json create mode 100644 projects/loft-photo/server/index.js create mode 100644 projects/loft-photo/settings.json create mode 100644 projects/loft-photo/styles.css diff --git a/projects/loft-photo/friends.json b/projects/loft-photo/friends.json new file mode 100644 index 000000000..b861e0c00 --- /dev/null +++ b/projects/loft-photo/friends.json @@ -0,0 +1,32 @@ +[ + { + "id": 0, + "avatar": "https://via.placeholder.com/100?text=avatar", + "firstName": "Adrian", + "lastName": "Norman" + }, + { + "id": 1, + "avatar": "https://via.placeholder.com/100?text=avatar", + "firstName": "Gail", + "lastName": "Norton" + }, + { + "id": 2, + "avatar": "https://via.placeholder.com/100?text=avatar", + "firstName": "Molina", + "lastName": "Rodgers" + }, + { + "id": 3, + "avatar": "https://via.placeholder.com/100?text=avatar", + "firstName": "Adams", + "lastName": "Parrish" + }, + { + "id": 4, + "avatar": "https://via.placeholder.com/100?text=avatar", + "firstName": "Mercer", + "lastName": "Wiggins" + } +] \ No newline at end of file diff --git a/projects/loft-photo/images/arrow-left.svg b/projects/loft-photo/images/arrow-left.svg new file mode 100644 index 000000000..a4e4c339a --- /dev/null +++ b/projects/loft-photo/images/arrow-left.svg @@ -0,0 +1,4 @@ + + + + diff --git a/projects/loft-photo/images/button.svg b/projects/loft-photo/images/button.svg new file mode 100644 index 000000000..6ce85ea9f --- /dev/null +++ b/projects/loft-photo/images/button.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/projects/loft-photo/images/chat.svg b/projects/loft-photo/images/chat.svg new file mode 100644 index 000000000..fc47d01e1 --- /dev/null +++ b/projects/loft-photo/images/chat.svg @@ -0,0 +1,3 @@ + + + diff --git a/projects/loft-photo/images/exit.svg b/projects/loft-photo/images/exit.svg new file mode 100644 index 000000000..d28c122e1 --- /dev/null +++ b/projects/loft-photo/images/exit.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/projects/loft-photo/images/heart-red.svg b/projects/loft-photo/images/heart-red.svg new file mode 100644 index 000000000..e9985dca6 --- /dev/null +++ b/projects/loft-photo/images/heart-red.svg @@ -0,0 +1,3 @@ + + + diff --git a/projects/loft-photo/images/heart.svg b/projects/loft-photo/images/heart.svg new file mode 100644 index 000000000..4bcdacd80 --- /dev/null +++ b/projects/loft-photo/images/heart.svg @@ -0,0 +1,3 @@ + + + diff --git a/projects/loft-photo/images/logo.svg b/projects/loft-photo/images/logo.svg new file mode 100644 index 000000000..12685673d --- /dev/null +++ b/projects/loft-photo/images/logo.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/projects/loft-photo/images/send.svg b/projects/loft-photo/images/send.svg new file mode 100644 index 000000000..5a55b025c --- /dev/null +++ b/projects/loft-photo/images/send.svg @@ -0,0 +1,3 @@ + + + diff --git a/projects/loft-photo/images/vert1.svg b/projects/loft-photo/images/vert1.svg new file mode 100644 index 000000000..d5d86e658 --- /dev/null +++ b/projects/loft-photo/images/vert1.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/projects/loft-photo/images/vert2.svg b/projects/loft-photo/images/vert2.svg new file mode 100644 index 000000000..0f5e75ed2 --- /dev/null +++ b/projects/loft-photo/images/vert2.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/projects/loft-photo/images/vert3.svg b/projects/loft-photo/images/vert3.svg new file mode 100644 index 000000000..7b481af03 --- /dev/null +++ b/projects/loft-photo/images/vert3.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/projects/loft-photo/index.js b/projects/loft-photo/index.js new file mode 100644 index 000000000..e69de29bb diff --git a/projects/loft-photo/layout.html b/projects/loft-photo/layout.html new file mode 100644 index 000000000..89845cfed --- /dev/null +++ b/projects/loft-photo/layout.html @@ -0,0 +1,64 @@ + + + + + + Loft Photo + + + +
+ + + +
+ + diff --git a/projects/loft-photo/model.js b/projects/loft-photo/model.js new file mode 100644 index 000000000..1e31e33b3 --- /dev/null +++ b/projects/loft-photo/model.js @@ -0,0 +1,9 @@ +// eslint-disable-next-line no-unused-vars +import photosDB from './photos.json'; +// eslint-disable-next-line no-unused-vars +import friendsDB from './friends.json'; + +export default { + getRandomElement(array) {}, + getNextPhoto() {}, +}; diff --git a/projects/loft-photo/photos.json b/projects/loft-photo/photos.json new file mode 100644 index 000000000..a299e6057 --- /dev/null +++ b/projects/loft-photo/photos.json @@ -0,0 +1,72 @@ +{ + "0": [ + { + "id": 10, + "url": "https://via.placeholder.com/360x680?text=photo 1 for Adrian Norman" + }, + { + "id": 11, + "url": "https://via.placeholder.com/360x680?text=photo 2 for Adrian Norman" + }, + { + "id": 12, + "url": "https://via.placeholder.com/360x680?text=photo 3 for Adrian Norman" + } + ], + "1": [ + { + "id": 20, + "url": "https://via.placeholder.com/360x680?text=photo 1 for Gail Norton" + }, + { + "id": 21, + "url": "https://via.placeholder.com/360x680?text=photo 2 for Gail Norton" + }, + { + "id": 22, + "url": "https://via.placeholder.com/360x680?text=photo 3 for Gail Norton" + } + ], + "2": [ + { + "id": 30, + "url": "https://via.placeholder.com/360x680?text=photo 1 for Molina Rodgers" + }, + { + "id": 31, + "url": "https://via.placeholder.com/360x680?text=photo 2 for Molina Rodgers" + }, + { + "id": 32, + "url": "https://via.placeholder.com/360x680?text=photo 3 for Molina Rodgers" + } + ], + "3": [ + { + "id": 40, + "url": "https://via.placeholder.com/360x680?text=photo 1 for Adams Parrish" + }, + { + "id": 41, + "url": "https://via.placeholder.com/360x680?text=photo 2 for Adams Parrish" + }, + { + "id": 42, + "url": "https://via.placeholder.com/360x680?text=photo 3 for Adams Parrish" + } + ], + "4": [ + { + "id": 50, + "url": "https://via.placeholder.com/360x680?text=photo 1 for Mercer Wiggins" + }, + { + "id": 51, + "url": "https://via.placeholder.com/360x680?text=photo 2 for Mercer Wiggins" + }, + { + "id": 52, + "url": "https://via.placeholder.com/360x680?text=photo 3 for Mercer Wiggins" + } + ] +} \ No newline at end of file diff --git a/projects/loft-photo/server/index.js b/projects/loft-photo/server/index.js new file mode 100644 index 000000000..e9057c6c4 --- /dev/null +++ b/projects/loft-photo/server/index.js @@ -0,0 +1,91 @@ +const http = require('node:http'); +const https = require('node:https'); +const url = require('node:url'); + +const DB = { + tokens: new Map(), + likes: new Map(), + comments: new Map(), +}; + +const methods = { + like(req, res, url, vkUser) { + // todo + }, + photoStats(req, res, url, vkUser) { + // todo + }, + postComment(req, res, url, vkUser, body) { + // todo + }, + getComments(req, res, url) { + // todo + }, +}; + +http + .createServer(async (req, res) => { + console.log('➡️ Поступил запрос:', req.method, req.url); + const token = req.headers['vk_token']; + const parsed = new url.URL(req.url, 'http://localhost'); + const vkUser = await getMe(token); + const body = await readBody(req); + const method = parsed.searchParams.get('method'); + const responseData = await methods[method]?.(req, res, parsed, vkUser, body); + + res.end(JSON.stringify(responseData ?? null)); + }) + .listen('8888', () => { + console.log('🚀 Сервер запущен'); + }); + +async function readBody(req) { + if (req.method === 'GET') { + return null; + } + + return new Promise((resolve) => { + let body = ''; + req + .on('data', (chunk) => { + body += chunk; + }) + .on('end', () => resolve(JSON.parse(body))); + }); +} + +async function getVKUser(token) { + const body = await new Promise((resolve, reject) => + https + .get( + `https://api.vk.com/method/users.get?access_token=${token}&fields=photo_50&v=5.120` + ) + .on('response', (res) => { + let body = ''; + + res.setEncoding('utf8'); + res + .on('data', (chunk) => { + body += chunk; + }) + .on('end', () => resolve(JSON.parse(body))); + }) + .on('error', reject) + ); + + return body.response[0]; +} + +async function getMe(token) { + const existing = DB.tokens.get(token); + + if (existing) { + return existing; + } + + const user = getVKUser(token); + + DB.tokens.set(token, user); + + return user; +} diff --git a/projects/loft-photo/settings.json b/projects/loft-photo/settings.json new file mode 100644 index 000000000..3d20b4405 --- /dev/null +++ b/projects/loft-photo/settings.json @@ -0,0 +1,7 @@ +{ + "proxy": { + "/loft-photo/api/": { + "target": "http://localhost:8888" + } + } +} diff --git a/projects/loft-photo/styles.css b/projects/loft-photo/styles.css new file mode 100644 index 000000000..62d5fba21 --- /dev/null +++ b/projects/loft-photo/styles.css @@ -0,0 +1,348 @@ +/* base */ + +body { + font-family: "Roboto Light", Geneva, Arial, Helvetica, sans-serif; +} + +.hidden { + display: none !important; +} + +a { + text-decoration: none; +} + +/* app */ + +#app { + position: absolute; + top: 0; + bottom: 0; + left: 0; + right: 0; + display: flex; + + align-items: center; + justify-content: center; +} + +.page { + height: 100%; + width: 360px; + position: relative; +} + +/* page login */ + +.page-login { + display: flex; + justify-content: center; + background: #1C1B1F; +} + +.page-login-button { + border: none; + background: url('images/button.svg'); + width: 219px; + height: 40px; + position: absolute; + bottom: 60px; + margin: 0 auto; +} + +.page-login-logo { + top: 429px; + position: absolute; + gap: 16px; + display: flex; + flex-direction: column; + align-items: center; +} + +.page-login-image { + width: 147px; + height: 24px; + background: url('images/logo.svg'); +} + +.page-login-text { + font-size: 14px; + line-height: 20px; + text-align: center; + width: 237px; + color: #B0B0B0; +} + +.page-login-vert1, .page-login-vert2, .page-login-vert3 { + width: 71px; + height: 333px; + position: absolute; +} + +.page-login-vert1 { + top: 59px; + left: 49px; + background: linear-gradient(180deg, rgba(28, 27, 31, 0) 80%, #1C1B1F 100%), url('images/vert1.svg'); +} + +.page-login-vert2 { + top: 81px; + left: 144px; + background: linear-gradient(180deg, rgba(28, 27, 31, 0) 80%, #1C1B1F 100%), url('images/vert2.svg'); +} + +.page-login-vert3 { + top: 59px; + left: 239px; + background: linear-gradient(180deg, rgba(28, 27, 31, 0) 80%, #1C1B1F 100%), url('images/vert3.svg'); +} + +/* page main */ + +.page-main .component-header { + position: absolute; + display: flex; + height: 80px; + top: 0; + left: 0; + right: 0; + background: rgba(0 0 0 / 25%); + padding: 0 24px; +} + +.page-main .component-header-profile-link { + display: flex; + align-items: center; +} + +.page-main .component-header-photo { + width: 40px; + height: 40px; + border-radius: 50%; + flex-shrink: 0; +} + +.page-main .component-header-name { + margin-left: 8px; + font-weight: 400; + font-size: 16px; + color: white; +} + +.page-main .component-footer { + position: absolute; + display: flex; + height: 80px; + bottom: 0; + left: 0; + right: 0; + background: rgba(0 0 0 / 25%); + padding: 0 24px; +} + +.page-main .component-footer-container { + display: flex; + align-items: center; + width: 100%; +} + +.page-main .component-footer-container-profile-link { + margin-left: auto; +} + +.page-main .component-footer-photo { + width: 40px; + height: 40px; + border-radius: 50%; +} + +.page-main .component-footer-container-social-comments, +.page-main .component-footer-container-social-likes { + color: white; + display: flex; + align-items: center; +} + +.page-main .component-footer-container-social-comments:before, +.page-main .component-footer-container-social-likes:before { + display: inline-block; + content: ''; + width: 20px; + height: 20px; + margin-right: 6px; +} + +.page-main .component-footer-container-social-comments:before { + background: url("images/chat.svg"); +} + +.page-main .component-footer-container-social-likes:before { + background: url("images/heart.svg"); + margin-left: 18px; +} + +.page-main .component-footer-container-social-likes.liked:before { + background: url("images/heart-red.svg"); + margin-left: 18px; +} + +.page-main .component-photo { + height: 100%; + width: 360px; + position: relative; + + background-size: cover; + background-position: center; +} + +.component-comments { + position: fixed; + bottom: 0; + left: 0; + right: 0; + top: 0; + background: rgba(0, 0, 0, 0.4); +} + +.component-comments-container { + position: absolute; + display: flex; + flex-direction: column; + top: 50vh; + bottom: 0; + left: 0; + right: 0; + padding: 16px; + border-radius: 28px 28px 0 0; + background: white; +} + +.component-comments-container-title { + font-size: 14px; + text-align: center; + width: 100%; +} + +.component-comments-container-list { + margin-top: 24px; + flex-grow: 1; + display: flex; + gap: 12px; + flex-direction: column; + overflow-y: auto; + margin-bottom: 14px +} + +.component-comments-container-form { + display: flex; + align-items: center; + gap: 16px; + height: 48px; +} + +.component-comments-container-form-input { + box-sizing: border-box; + border: 1px solid #E0E0E0; + border-radius: 32px; + flex-grow: 1; + height: 48px; +} + +.component-comments-container-form-input, +.component-comments-container-form-input, +.component-comments-container-form-input, +.component-comments-container-form-input { + padding: 14px 16px; +} + +.component-comments-container-form-send { + background: url('images/send.svg'); + width: 40px; + height: 40px; +} + +.component-comment { + display: flex; + gap: 8px +} + +.component-comment-photo { + width: 24px; + height: 24px; + border-radius: 50%; + background-position: center; + background-size: cover; +} + +.component-comment-content { + flex-direction: column; +} + +.component-comment-name { + font-size: 12px; +} + +.component-comment-text { + font-size: 14px; +} + +/* page profile */ + +.page-profile { + margin-top: 52px; +} + +.page-profile-back { + background: url('images/arrow-left.svg'); + width: 24px; + height: 24px; + + position: absolute; + left: 24px; +} + +.page-profile-exit { + background: url('images/exit.svg'); + width: 24px; + height: 24px; + + position: absolute; + right: 24px; +} + +.component-user-photos { + display: flex; + flex-wrap: wrap; + gap: 8px; + padding: 24px 16px 16px 16px; +} + +.component-user-photo { + width: 104px; + height: 104px; + background-size: cover; + background-repeat: no-repeat; + background-position: center; +} + +.page-profile .component-user-info { + display: flex; + flex-direction: column; + align-items: center; +} + +.page-profile .component-user-info-photo { + height: 72px; + width: 72px; + border-radius: 50%; + + background-size: cover; + background-position: center; +} + +.page-profile .component-user-info-name { + font-weight: 400; + font-size: 18px; + line-height: 26px; + margin-top: 8px; +} \ No newline at end of file From 7ed963d427c9c7bc7979359fd921dd36d8ee74d0 Mon Sep 17 00:00:00 2001 From: Darya Kolesnikova Date: Sun, 18 Jun 2023 21:03:11 +0500 Subject: [PATCH 2/7] =?UTF-8?q?=D0=B4=D0=B71=20=D0=BF=D0=BE=20=D0=B2=D1=8B?= =?UTF-8?q?=D0=BF=D1=83=D1=81=D0=BA=D0=BD=D0=BE=D0=BC=D1=83=20=D0=BF=D1=80?= =?UTF-8?q?=D0=BE=D0=B5=D0=BA=D1=82=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- projects/loft-photo/model.js | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/projects/loft-photo/model.js b/projects/loft-photo/model.js index 1e31e33b3..60bd3db00 100644 --- a/projects/loft-photo/model.js +++ b/projects/loft-photo/model.js @@ -4,6 +4,18 @@ import photosDB from './photos.json'; import friendsDB from './friends.json'; export default { - getRandomElement(array) {}, - getNextPhoto() {}, + getRandomElement(array) { + if (!array.length) { + return null; + } + const index = Math.round(Math.random() * (array.length -1)); + return array(index); + }, + getNextPhoto() { + const friend = this.getRandomElement(friendsDB); + const photos = photosDB.get(friend.id); + const photo = this.getRandomElement(photos); + + return {friend, url: photo.url}; + }, }; From 37f29a8c8a618e61fdd9e3a2d2a1578a501a0f55 Mon Sep 17 00:00:00 2001 From: Darya Kolesnikova Date: Sun, 25 Jun 2023 18:29:49 +0500 Subject: [PATCH 3/7] =?UTF-8?q?=D1=84=D1=83=D0=BD=D0=BA=D1=86=D0=B8=D1=8F?= =?UTF-8?q?=20openpage=20=D0=B8=20=D1=80=D0=B0=D0=BD=D0=B4=D0=BE=D0=BC?= =?UTF-8?q?=D0=BD=D0=BE=D0=B5=20=D0=BE=D1=82=D0=BA=D1=80=D1=8B=D1=82=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=B1=D0=BB=D0=BE=D0=BA=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- projects/loft-photo/index.js | 10 ++++++++++ projects/loft-photo/pages.js | 22 ++++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 projects/loft-photo/pages.js diff --git a/projects/loft-photo/index.js b/projects/loft-photo/index.js index e69de29bb..ec39ca698 100644 --- a/projects/loft-photo/index.js +++ b/projects/loft-photo/index.js @@ -0,0 +1,10 @@ +import pages from './pages'; +import('./styles.css'); + +const pageNames = ['login', 'main', 'profile']; + +document.addEventListener('click', () => { + const openBlock = getRandomElement(pageNames); + openPage(openBlock); + +}); diff --git a/projects/loft-photo/pages.js b/projects/loft-photo/pages.js new file mode 100644 index 000000000..d9bd17b0a --- /dev/null +++ b/projects/loft-photo/pages.js @@ -0,0 +1,22 @@ +const pagesMap = { + login: '.page-login', + main: '.page-main', + profile: '.page-profile', +}; + +export default { + openPage(name) { + const selector = pagesMap[name]; + const clickblock = document.querySelector(selector); + const logBlock = document.querySelector('.page-login'); + const mainBlock = document.querySelector('.page-main'); + const profileBlock = document.querySelector('.page-profile'); + + logBlock.classList.add('hidden'); + mainBlock.classList.add('hidden'); + profileBlock.classList.add('hidden'); + + clickblock.classList.remove('hidden'); + }, +}; + \ No newline at end of file From b674fc7c993dea24fa680f2d3dac8de40b959b75 Mon Sep 17 00:00:00 2001 From: Darya Kolesnikova Date: Mon, 3 Jul 2023 13:02:47 +0500 Subject: [PATCH 4/7] =?UTF-8?q?=D0=B4=D0=B7=20=D0=BF=D0=BE=20=D0=B2=D1=8B?= =?UTF-8?q?=D0=BF=D1=83=D1=81=D0=BA=D0=BD=D0=BE=D0=BC=D1=83=20=D0=BF=D1=80?= =?UTF-8?q?=D0=BE=D0=B5=D0=BA=D1=82=D1=83=20=D1=87=D0=B0=D1=81=D1=82=D1=8C?= =?UTF-8?q?=201?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- projects/loft-photo/friends.json | 32 ----------- projects/loft-photo/index.js | 10 ++-- projects/loft-photo/loginPage.js | 11 ++++ projects/loft-photo/mainPage.js | 13 +++++ projects/loft-photo/model.js | 95 +++++++++++++++++++++++++++++--- projects/loft-photo/photos.json | 72 ------------------------ 6 files changed, 116 insertions(+), 117 deletions(-) delete mode 100644 projects/loft-photo/friends.json create mode 100644 projects/loft-photo/loginPage.js create mode 100644 projects/loft-photo/mainPage.js delete mode 100644 projects/loft-photo/photos.json diff --git a/projects/loft-photo/friends.json b/projects/loft-photo/friends.json deleted file mode 100644 index b861e0c00..000000000 --- a/projects/loft-photo/friends.json +++ /dev/null @@ -1,32 +0,0 @@ -[ - { - "id": 0, - "avatar": "https://via.placeholder.com/100?text=avatar", - "firstName": "Adrian", - "lastName": "Norman" - }, - { - "id": 1, - "avatar": "https://via.placeholder.com/100?text=avatar", - "firstName": "Gail", - "lastName": "Norton" - }, - { - "id": 2, - "avatar": "https://via.placeholder.com/100?text=avatar", - "firstName": "Molina", - "lastName": "Rodgers" - }, - { - "id": 3, - "avatar": "https://via.placeholder.com/100?text=avatar", - "firstName": "Adams", - "lastName": "Parrish" - }, - { - "id": 4, - "avatar": "https://via.placeholder.com/100?text=avatar", - "firstName": "Mercer", - "lastName": "Wiggins" - } -] \ No newline at end of file diff --git a/projects/loft-photo/index.js b/projects/loft-photo/index.js index ec39ca698..ac5c1fc9a 100644 --- a/projects/loft-photo/index.js +++ b/projects/loft-photo/index.js @@ -3,8 +3,10 @@ import('./styles.css'); const pageNames = ['login', 'main', 'profile']; -document.addEventListener('click', () => { - const openBlock = getRandomElement(pageNames); - openPage(openBlock); +import mainPage from './mainPage'; +import loginPage from './loginPage'; + +pages.openPage('login'); +loginPage.handleEvents(); +mainPage.handleEvents(); -}); diff --git a/projects/loft-photo/loginPage.js b/projects/loft-photo/loginPage.js new file mode 100644 index 000000000..337acbe28 --- /dev/null +++ b/projects/loft-photo/loginPage.js @@ -0,0 +1,11 @@ +import model from './model'; +import pages from './pages'; +import mainPage from './mainPage'; + +export default { + handleEvents() { + document + .querySelector('.page-login-button') + .addEventListener('click', async () => {}); + }, +}; diff --git a/projects/loft-photo/mainPage.js b/projects/loft-photo/mainPage.js new file mode 100644 index 000000000..f16610ed4 --- /dev/null +++ b/projects/loft-photo/mainPage.js @@ -0,0 +1,13 @@ +import pages from './pages'; +import model from './model'; + +export default { + async getNextPhoto() { + const { friend, id, url } = await model.getNextPhoto(); + this.setFriendAndPhoto(friend, id, url); + }, + + setFriendAndPhoto(friend, id, url) {}, + + handleEvents() {}, +}; diff --git a/projects/loft-photo/model.js b/projects/loft-photo/model.js index 60bd3db00..74b6821ac 100644 --- a/projects/loft-photo/model.js +++ b/projects/loft-photo/model.js @@ -1,7 +1,6 @@ -// eslint-disable-next-line no-unused-vars -import photosDB from './photos.json'; -// eslint-disable-next-line no-unused-vars -import friendsDB from './friends.json'; +const PERM_FRIENDS = 2; +const PERM_PHOTOS = 4; +const APP_ID = 51694434; export default { getRandomElement(array) { @@ -11,11 +10,89 @@ export default { const index = Math.round(Math.random() * (array.length -1)); return array(index); }, - getNextPhoto() { - const friend = this.getRandomElement(friendsDB); - const photos = photosDB.get(friend.id); - const photo = this.getRandomElement(photos); + async getNextPhoto() { + //рандомно получаем друга + const friend = this.getRandomElement(this.friends.items); + //берем список всех фотографий полученного друга + const photos = await this.getFriendPhotos(friend.id); + const photo = this.getRandimElement(photos.items); + const size = this.findSize(photo); - return {friend, url: photo.url}; + return { friend, id: photo.id, url: size.url }; + }, + findSize(photo) { + //находим элемент с шириной не менее 360 + const size = photo.sizes.find((size) => size.width >= 360); + //если не нашли такую, то ищем любую самую большую из имеющихся + if (!size) { + return photo.sizes.reduce((biggest, current) => { + if (current.width > biggest.width) { + return current; + } + + return biggest; + }, photo.sizes[0]); + } + return size; + }, + login() { + return new Promise((resolve, reject) => { + VK.init({ + apiID: APP_ID, + }); + + VK.Auth.login((response) => { + if (response.session) { + resolve(response); + } else { + console.error(response); + } + }, PERM_FRIENDS | PERM_PHOTOS); + }); + }, + async init() { + this.photoCache = {}; + //сохраняем список в свойство friends + this.friends = await this.getFriends(); + }, + photoCache: {}, + callApi(method, params) { + params.v = params.v || '5,120'; + return new Promise((resolve, reject) => { + VK.api(method, params, (response) => { + if (response.error) { + reject(new Error(response.error.error_msg)); + } else { + resolve(response.response); + } + }) + }) + }, + getFriends() { + const params = { + //размеры для фотографий + fields: ["photo_50", "photo_100"], + }; + return this.callApi("friends.get", params); + }, + getPhotos(owner) { + const params = { + owner_id: owner, + }; + return this.callApi("photos.getAll", params); + }, + async getFriendPhotos(id) { + const photos = this.photoCache[id]; + + if (photos) { + return photos; + } + + // const photos = вместо этого комментария вставьте код для получения фотографии друга из ВК + photos = await this.getPhotos(id); + + this.photoCache[id] = photos; + + return photos; }, }; diff --git a/projects/loft-photo/photos.json b/projects/loft-photo/photos.json deleted file mode 100644 index a299e6057..000000000 --- a/projects/loft-photo/photos.json +++ /dev/null @@ -1,72 +0,0 @@ -{ - "0": [ - { - "id": 10, - "url": "https://via.placeholder.com/360x680?text=photo 1 for Adrian Norman" - }, - { - "id": 11, - "url": "https://via.placeholder.com/360x680?text=photo 2 for Adrian Norman" - }, - { - "id": 12, - "url": "https://via.placeholder.com/360x680?text=photo 3 for Adrian Norman" - } - ], - "1": [ - { - "id": 20, - "url": "https://via.placeholder.com/360x680?text=photo 1 for Gail Norton" - }, - { - "id": 21, - "url": "https://via.placeholder.com/360x680?text=photo 2 for Gail Norton" - }, - { - "id": 22, - "url": "https://via.placeholder.com/360x680?text=photo 3 for Gail Norton" - } - ], - "2": [ - { - "id": 30, - "url": "https://via.placeholder.com/360x680?text=photo 1 for Molina Rodgers" - }, - { - "id": 31, - "url": "https://via.placeholder.com/360x680?text=photo 2 for Molina Rodgers" - }, - { - "id": 32, - "url": "https://via.placeholder.com/360x680?text=photo 3 for Molina Rodgers" - } - ], - "3": [ - { - "id": 40, - "url": "https://via.placeholder.com/360x680?text=photo 1 for Adams Parrish" - }, - { - "id": 41, - "url": "https://via.placeholder.com/360x680?text=photo 2 for Adams Parrish" - }, - { - "id": 42, - "url": "https://via.placeholder.com/360x680?text=photo 3 for Adams Parrish" - } - ], - "4": [ - { - "id": 50, - "url": "https://via.placeholder.com/360x680?text=photo 1 for Mercer Wiggins" - }, - { - "id": 51, - "url": "https://via.placeholder.com/360x680?text=photo 2 for Mercer Wiggins" - }, - { - "id": 52, - "url": "https://via.placeholder.com/360x680?text=photo 3 for Mercer Wiggins" - } - ] -} \ No newline at end of file From e58b0262f9c0a01e6da633befa849e3463867eaa Mon Sep 17 00:00:00 2001 From: Darya Kolesnikova Date: Mon, 3 Jul 2023 13:35:01 +0500 Subject: [PATCH 5/7] =?UTF-8?q?=D0=B4=D0=B7=20=D1=87=D0=B0=D1=81=D1=82?= =?UTF-8?q?=D1=8C2=20=D0=BF=D0=BE=20=D0=B2=D1=8B=D0=BF=D1=83=D1=81=D0=BA?= =?UTF-8?q?=D0=BD=D0=BE=D0=BC=D1=83=20=D0=BF=D1=80=D0=BE=D0=B5=D0=BA=D1=82?= =?UTF-8?q?=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- projects/loft-photo/index.js | 1 - projects/loft-photo/loginPage.js | 10 +++++++--- projects/loft-photo/model.js | 16 ++++++++-------- projects/loft-photo/pages.js | 31 +++++++++++++++---------------- 4 files changed, 30 insertions(+), 28 deletions(-) diff --git a/projects/loft-photo/index.js b/projects/loft-photo/index.js index ac5c1fc9a..770187302 100644 --- a/projects/loft-photo/index.js +++ b/projects/loft-photo/index.js @@ -9,4 +9,3 @@ import loginPage from './loginPage'; pages.openPage('login'); loginPage.handleEvents(); mainPage.handleEvents(); - diff --git a/projects/loft-photo/loginPage.js b/projects/loft-photo/loginPage.js index 337acbe28..87cf95640 100644 --- a/projects/loft-photo/loginPage.js +++ b/projects/loft-photo/loginPage.js @@ -4,8 +4,12 @@ import mainPage from './mainPage'; export default { handleEvents() { - document - .querySelector('.page-login-button') - .addEventListener('click', async () => {}); + document.querySelector('.page-login-button').addEventListener('click', async () => { + await model.login(); + await model.init(); + + pages.openPage('main'); + await mainPage.getNextPhoto(); + }); }, }; diff --git a/projects/loft-photo/model.js b/projects/loft-photo/model.js index 74b6821ac..52aa4068f 100644 --- a/projects/loft-photo/model.js +++ b/projects/loft-photo/model.js @@ -1,13 +1,13 @@ const PERM_FRIENDS = 2; const PERM_PHOTOS = 4; -const APP_ID = 51694434; +const APP_ID = 5350105; export default { getRandomElement(array) { if (!array.length) { return null; } - const index = Math.round(Math.random() * (array.length -1)); + const index = Math.round(Math.random() * (array.length - 1)); return array(index); }, async getNextPhoto() { @@ -42,7 +42,7 @@ export default { }); VK.Auth.login((response) => { - if (response.session) { + if (response.session) { resolve(response); } else { console.error(response); @@ -65,21 +65,21 @@ export default { } else { resolve(response.response); } - }) - }) + }); + }); }, getFriends() { const params = { //размеры для фотографий - fields: ["photo_50", "photo_100"], + fields: ['photo_50', 'photo_100'], }; - return this.callApi("friends.get", params); + return this.callApi('friends.get', params); }, getPhotos(owner) { const params = { owner_id: owner, }; - return this.callApi("photos.getAll", params); + return this.callApi('photos.getAll', params); }, async getFriendPhotos(id) { const photos = this.photoCache[id]; diff --git a/projects/loft-photo/pages.js b/projects/loft-photo/pages.js index d9bd17b0a..3637a6168 100644 --- a/projects/loft-photo/pages.js +++ b/projects/loft-photo/pages.js @@ -1,22 +1,21 @@ const pagesMap = { - login: '.page-login', - main: '.page-main', - profile: '.page-profile', + login: '.page-login', + main: '.page-main', + profile: '.page-profile', }; - + export default { - openPage(name) { - const selector = pagesMap[name]; - const clickblock = document.querySelector(selector); - const logBlock = document.querySelector('.page-login'); - const mainBlock = document.querySelector('.page-main'); - const profileBlock = document.querySelector('.page-profile'); + openPage(name) { + const selector = pagesMap[name]; + const clickblock = document.querySelector(selector); + const logBlock = document.querySelector('.page-login'); + const mainBlock = document.querySelector('.page-main'); + const profileBlock = document.querySelector('.page-profile'); - logBlock.classList.add('hidden'); - mainBlock.classList.add('hidden'); - profileBlock.classList.add('hidden'); + logBlock.classList.add('hidden'); + mainBlock.classList.add('hidden'); + profileBlock.classList.add('hidden'); - clickblock.classList.remove('hidden'); - }, + clickblock.classList.remove('hidden'); + }, }; - \ No newline at end of file From 53e1715f34ed3be96222f11f37eb897d73ac5e2a Mon Sep 17 00:00:00 2001 From: Darya Kolesnikova Date: Sun, 9 Jul 2023 22:00:31 +0500 Subject: [PATCH 6/7] =?UTF-8?q?=D0=B4=D0=B7=205=20=D0=BD=D0=B5=D0=B4=D0=B5?= =?UTF-8?q?=D0=BB=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- projects/loft-photo/index.js | 2 ++ projects/loft-photo/mainPage.js | 48 ++++++++++++++++++++++++-- projects/loft-photo/model.js | 22 ++++++++++-- projects/loft-photo/profilePage.js | 54 ++++++++++++++++++++++++++++++ 4 files changed, 122 insertions(+), 4 deletions(-) create mode 100644 projects/loft-photo/profilePage.js diff --git a/projects/loft-photo/index.js b/projects/loft-photo/index.js index 770187302..e3e9980e3 100644 --- a/projects/loft-photo/index.js +++ b/projects/loft-photo/index.js @@ -1,4 +1,5 @@ import pages from './pages'; +import profilePage from './profilePage'; import('./styles.css'); const pageNames = ['login', 'main', 'profile']; @@ -9,3 +10,4 @@ import loginPage from './loginPage'; pages.openPage('login'); loginPage.handleEvents(); mainPage.handleEvents(); +profilePage.handleEvents(); diff --git a/projects/loft-photo/mainPage.js b/projects/loft-photo/mainPage.js index f16610ed4..914a1757c 100644 --- a/projects/loft-photo/mainPage.js +++ b/projects/loft-photo/mainPage.js @@ -1,5 +1,6 @@ import pages from './pages'; import model from './model'; +import profilePage from './profilePage'; export default { async getNextPhoto() { @@ -7,7 +8,50 @@ export default { this.setFriendAndPhoto(friend, id, url); }, - setFriendAndPhoto(friend, id, url) {}, + setFriendAndPhoto(friend, id, url) { + const photoComp = document.querySelector('.component-photo'); + const headerPhotoComp = document.querySelector('.component-header-photo'); + const headerNameComp = document.querySelector('.component-header-name'); + const footerPhotoComp = document.querySelector('.component-footer-photo'); + //сохраняем текущего друга, которого передали + this.friend = friend; - handleEvents() {}, + headerPhotoComp.style.backgroundImage = `url('${friend.photo_50}')`; + headerNameComp.innerText = `${friend.first_name ?? ''} ${friend.last_name ?? ''}`; + photoComp.style.backgroundImage = `url(${url})`; + //отображаем аватарку + footerPhotoComp.style.backgroundImage = `url('${model.me.photo_50}')`; + }, + + handleEvents() { + let startFrom; + + document.querySelector('.component-photo').addEventListener('touchstart', (e) => { + e.preventDefault(); + startFrom = { + y: e.changedTouches[0].pageY + }; + startFrom = { + y: e.changedTouches[0].pageY + }; + }); + + document.querySelector('.component-photo').addEventListener('touchend', async (e) => { + const direction = e.changedTouches[0].pageY - startFrom.y; + if (direction < 0) { + await this.getNextPhoto(); + } + }); + + //обработчик клика на аватарку друга + document.querySelector('.component-header-profie-link').addEventListener('click', async() => { + await profilePage.setUser(this.friend); + pages.openPage('profile'); + }); + //обработчик клика на свою аватарку + document.querySelector('.component-footer-container-profile-link').addEventListener('click', async() => { + await profilePage.setUser(model.me); + pages.openPage('profile'); + }); + }, }; diff --git a/projects/loft-photo/model.js b/projects/loft-photo/model.js index 52aa4068f..d50e0201b 100644 --- a/projects/loft-photo/model.js +++ b/projects/loft-photo/model.js @@ -1,6 +1,6 @@ const PERM_FRIENDS = 2; const PERM_PHOTOS = 4; -const APP_ID = 5350105; +const APP_ID = 51694434; export default { getRandomElement(array) { @@ -38,7 +38,7 @@ export default { login() { return new Promise((resolve, reject) => { VK.init({ - apiID: APP_ID, + apiId: APP_ID, }); VK.Auth.login((response) => { @@ -54,6 +54,8 @@ export default { this.photoCache = {}; //сохраняем список в свойство friends this.friends = await this.getFriends(); + //сохраняем информацию о текущем пользователе в свойство me + [this.me] = await this.getUsers(); }, photoCache: {}, callApi(method, params) { @@ -95,4 +97,20 @@ export default { return photos; }, + logout() { + return new Promise((resolve) => VK.Auth.revokeGrants(resolve)); + }, + + getUsers(ids) { + const params = { + fields: ['photo_50', 'photo_100'], + }; + + if (ids) { + params.user_ids = ids; + } + + return this.callApi('users.get', params); + }, + }; diff --git a/projects/loft-photo/profilePage.js b/projects/loft-photo/profilePage.js new file mode 100644 index 000000000..c84668236 --- /dev/null +++ b/projects/loft-photo/profilePage.js @@ -0,0 +1,54 @@ +import model from './model'; +import mainPage from './mainPage'; +import pages from './pages'; + +export default { + async setUser(user) { + const photoComp = document.querySelector('.component-user-info-photo'); + const nameComp = document.querySelector('.component-user-info-name'); + const photosComp = document.querySelector('.component-user-photo'); + //берем все фотографии друга + const photos = await model.getPhotos(user.id); + + this.user = user; + //вставляем фото и имя друга + photoComp.style.backgroundImage = `url('${user.photo_100}')`; + nameComp.innerText = `${user.first_name ?? ''} ${user.last_name ?? ''}`; + //очищаем контейнер с фотографиями + photosComp.innerHTML = ''; + //перебор фотографий друга + for (const photo of photos.items) { + const size = model.findeSize(photo); + const element = document.createElement('div'); + + element.classList.add('component-user-photo'); + //id фотографии + element.dataset.id = photo.id; + element.style.backgroundImage = `url(${size.url})`; + photosComp.append(element); + } + }, + + handleEvents() { + document.querySelector('.component-user-photos').addEventListener('click', async(e) => { + if (e.target.classList.contains('component-user-photo')) { + const photoId= e.target.dataset.id; + const friendsPhotos = await model.getPhotos(this.user.id); + const photo = friendsPhotos.items.find((photo) => photo.id == photoId); + const size = model.findSize(photo); + + mainPage.setFriendAndPhoto(this.user, parseInt(photoId), size.url); + pages.openPage('main'); + } + }); + + document.querySelector('.page-profile-back').addEventListener('click', async() => { + pages.openPage('main'); + }); + + document.querySelector('.page-profile-exit').addEventListener('click', async() => { + await model.logout(); + pages.openPage('login'); + }); + }, +}; From 3a9aa3aabdc58657aad8c737bfe60e36f4fc7b34 Mon Sep 17 00:00:00 2001 From: Darya Kolesnikova Date: Fri, 21 Jul 2023 00:05:22 +0500 Subject: [PATCH 7/7] =?UTF-8?q?=D0=B4=D0=B7=20=D0=BD=D0=B5=D0=B4=D0=B5?= =?UTF-8?q?=D0=BB=D1=8F=206?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- projects/loft-photo/commentsTemplate.html.hbs | 9 +++ projects/loft-photo/mainPage.js | 76 ++++++++++++++++++- projects/loft-photo/model.js | 45 +++++++++++ projects/loft-photo/server/index.js | 48 +++++++++++- 4 files changed, 172 insertions(+), 6 deletions(-) create mode 100644 projects/loft-photo/commentsTemplate.html.hbs diff --git a/projects/loft-photo/commentsTemplate.html.hbs b/projects/loft-photo/commentsTemplate.html.hbs new file mode 100644 index 000000000..982631d14 --- /dev/null +++ b/projects/loft-photo/commentsTemplate.html.hbs @@ -0,0 +1,9 @@ +{{#each list}} +
+
+
+
{{name}}
+
{{text}}
+
+
+{{/each}} \ No newline at end of file diff --git a/projects/loft-photo/mainPage.js b/projects/loft-photo/mainPage.js index 914a1757c..659213761 100644 --- a/projects/loft-photo/mainPage.js +++ b/projects/loft-photo/mainPage.js @@ -1,26 +1,31 @@ import pages from './pages'; import model from './model'; import profilePage from './profilePage'; +import commentsTemplate from './commentsTemplate.html.hbs'; export default { async getNextPhoto() { const { friend, id, url } = await model.getNextPhoto(); - this.setFriendAndPhoto(friend, id, url); + const photoStats = await model.photoStats(id); + this.setFriendAndPhoto(friend, id, url, photoStats); }, - setFriendAndPhoto(friend, id, url) { + setFriendAndPhoto(friend, id, url, stats) { const photoComp = document.querySelector('.component-photo'); const headerPhotoComp = document.querySelector('.component-header-photo'); const headerNameComp = document.querySelector('.component-header-name'); const footerPhotoComp = document.querySelector('.component-footer-photo'); //сохраняем текущего друга, которого передали this.friend = friend; + this.photoId = id; headerPhotoComp.style.backgroundImage = `url('${friend.photo_50}')`; headerNameComp.innerText = `${friend.first_name ?? ''} ${friend.last_name ?? ''}`; photoComp.style.backgroundImage = `url(${url})`; //отображаем аватарку footerPhotoComp.style.backgroundImage = `url('${model.me.photo_50}')`; + this.setLikes(stats.likes, stats.liked); + this.setComments(stats.comments); }, handleEvents() { @@ -53,5 +58,72 @@ export default { await profilePage.setUser(model.me); pages.openPage('profile'); }); + //обработчик клика на лайк + document.querySelector('.component-footer-container-social-likes').addEventListener('click', async () => { + const { likes, liked } = await model.like(this.photoId); + this.setLikes(likes, liked); + }); + //обработчик клика на значок комментария + document.querySelector('.component-footer-container-social-comments').addEventListener('click', async () => { + //убираем класс хидден для видимости + document.querySelector('component-comments').classList.remove('hidden'); + await this.loadComments(this.photoId); + }); + + const input = document.querySelector('.component- comments-container-form-input'); + //обработчик скрытия списка + document.querySelector('.component-comments').addEventListener('click', (e) => { + if (e.target === e.currentTarget) { + document.querySelector('.component-comments').classList.add('hidden'); + } + }); + //обработчик отправки комментария + document.querySelector('.component-comments-container-form-send').addEventListener('click', async () => { + //обрезаем текст пользователя от пробелов и проверяем не пустая ли строка + if (input.value.trim().length) { + await model.postComment(this.photoId, input.value.trim()); + //очищаем инпут после отправки + input.value = ''; + await this.loadComments(this.photoId); + } + }); + }, + async loadComments(photo) { + const comments = await model.getComments(photo); + const commentsElements = commentsTemplate({ + list: comments.map((comment) => { + return { + name: `${comment.user.first_name ?? ''} ${comment.user.last_name ?? ''}`, + photo: comment.user.photo_50, + text: comment.text, + }; + }), + }); + //очищаем предыдущие комментарии + document.querySelector('.component-comments-container-list').innerHTML = ''; + document.querySelector('.component-comments-container-list').append(commentsElements); + //обновляем счетчик + this.setComments(comments.length); + }, + setLikes(total, liked) { + const likesElement = document.querySelector( + '.component-footer-container-social-likes' + ); + //пустанавливаем кол-во лайков + likesElement.innerText = total; + //если лайкнуто, добавляем класс. Если нет - убираем класс + if (liked) { + likesElement.classList.add('liked'); + } else { + likesElement.classList.remove('liked') + } + }, + + setComments(total) { + const likesElement = document.querySelector( + '.component-footer-container-social-comments' + ); + //устанавливаем кол-во комментариев + likesElement.innerText = total; }, }; diff --git a/projects/loft-photo/model.js b/projects/loft-photo/model.js index d50e0201b..c57c12553 100644 --- a/projects/loft-photo/model.js +++ b/projects/loft-photo/model.js @@ -43,9 +43,12 @@ export default { VK.Auth.login((response) => { if (response.session) { + //получаем vk_token + this.token = response.session.sid; resolve(response); } else { console.error(response); + reject(response); } }, PERM_FRIENDS | PERM_PHOTOS); }); @@ -113,4 +116,46 @@ export default { return this.callApi('users.get', params); }, + async callServer(method, queryParams, body) { + queryParams = { + ...queryParams, + method, + }; + const query = Object.entries(queryParams) + .reduce((all, [name, value]) => { + all.push(`${name}=${encodeURIComponent(value)}`); + return all; + }, []) + .join('&'); + const params = { + headers: { + vk_token: this.token, + }, + }; + //если указано тело, то отправляем post запрос + if (body) { + params.method = 'POST'; + params.body = JSON.stringify(body) + } + + const response = await fetch(`/loft-photo-lite-5/api/?${query}`, params); + + return response.json(); + }, + + async like(photo) { + return this.callServer('like', { photo }); + }, + + async photoStats(photo) { + return this.callServer('photoStats', { photo }); + }, + + async getComments(photo) { + return this.callServer('getComments', { photo }); + }, + + async postComments(photo, text) { + return this.callServer('postComment', { photo }, { text }); + }, }; diff --git a/projects/loft-photo/server/index.js b/projects/loft-photo/server/index.js index e9057c6c4..8b9bce01f 100644 --- a/projects/loft-photo/server/index.js +++ b/projects/loft-photo/server/index.js @@ -10,16 +10,56 @@ const DB = { const methods = { like(req, res, url, vkUser) { - // todo + const photoId = url.searchParams.get('photo'); + //берем все лайки для фотографии с переданным айди + let photoLikes = DB.likes.get(photoId); + + if (!photoLikes) { + photoLikes = new Map(); //создаем список лайков + DB.likes.set(photoId, photoLikes); //и передаем для фотографии ее список лайков (в данном случае пустой) + } + //если в списке есть лайк от нас, то удаляем нас из списка и передаем флаг фолс + if (photoLikes.get(vkUser.id)) { + photoLikes.delete(vkUser.id); + return { + likes: photoLikes.size, liked: false + }; + } + + photoLikes.set(vkUser.id, true); + return { + likes: photoLikes.size, liked: true + }; }, photoStats(req, res, url, vkUser) { - // todo + const photoId = url.searchParams.get('photo'); + const photoLikes = DB.likes.get(photoId); + const photoComments = DB.comments.get(photoId); + + return { + //кол-во лайков + likes: photoLikes?.size ?? 0, + //лайкнули мы или нет + liked: photoLikes?.has(vkUser.id) ?? false, + //кол-во комментариев + comments: photoComments?.length ?? 0, + }; }, postComment(req, res, url, vkUser, body) { - // todo + const photoId = url.searchParams.get('photo'); + //получаем список комментариев + let photoComments = DB.comments.get(photoId); + + if (!photoComments) { + photoComments = []; + DB.comments.set(photoId, photoComments); + } + //добавляем комментарий в начале + photoComments.unshift({ user: vkUser, text: body.text }); }, getComments(req, res, url) { - // todo + const photoId = url.searchParams.get('photo'); + return DB.comments.get(photoId) ?? []; }, };