From 102c0933d1a748465240193c33fcb66bedf06375 Mon Sep 17 00:00:00 2001 From: Sergey Melyukov Date: Mon, 17 Apr 2023 19:08:13 +0300 Subject: [PATCH 01/12] 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 5fad2ff00a1bd4dad3c4b68cd0cd069696fa307a Mon Sep 17 00:00:00 2001 From: Sergey Melyukov Date: Sat, 2 Mar 2024 11:44:55 +0300 Subject: [PATCH 02/12] relax ts strictness --- tsconfig.json | 1 - 1 file changed, 1 deletion(-) diff --git a/tsconfig.json b/tsconfig.json index c3de4b67b..e8a24b4ce 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -11,7 +11,6 @@ "esModuleInterop": true, "strict": true, "noImplicitAny": true, - "noImplicitReturns": true, "resolveJsonModule": true, "declaration": true, "incremental": true, From 5258522a21de5629385fe268694bdaca4061a713 Mon Sep 17 00:00:00 2001 From: VitaValeeva Date: Sun, 7 Apr 2024 21:38:05 +0300 Subject: [PATCH 03/12] week-3 homework --- projects/loft-photo/index.js | 9 +++++++++ projects/loft-photo/pages.js | 18 ++++++++++++++++++ 2 files changed, 27 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..a66502c09 100644 --- a/projects/loft-photo/index.js +++ b/projects/loft-photo/index.js @@ -0,0 +1,9 @@ +import pages from './pages'; +import('./styles.css'); + +const pageNames = ['login', 'main', 'profile']; + +document.addEventListener('click', () => { + const pageName = model.getRandomElement(pageNames); + pages.openPage(pageName); +}); \ No newline at end of file diff --git a/projects/loft-photo/pages.js b/projects/loft-photo/pages.js new file mode 100644 index 000000000..31ae7951a --- /dev/null +++ b/projects/loft-photo/pages.js @@ -0,0 +1,18 @@ +const pagesMap = { + login: '.page-login', + main: '.page-main', + profile: '.page-profile', +}; + +let currentPage = null; + +export default { + openPage(name) { + const selector = pagesMap[name]; + const element = document.querySelector(selector); + + currentPage?.classList.add('hidden'); + currentPage = element; + currentPage.classList.remove('hidden'); + }, +}; \ No newline at end of file From 13f6c8b210f273406993ee524c234b1afa7b1c39 Mon Sep 17 00:00:00 2001 From: VitaValeeva Date: Mon, 15 Apr 2024 02:10:00 +0300 Subject: [PATCH 04/12] week-4 homework --- projects/loft-photo/friends.json | 32 --------- projects/loft-photo/index.js | 11 ++- projects/loft-photo/loginPage.js | 15 ++++ projects/loft-photo/mainPage.js | 36 ++++++++++ projects/loft-photo/model.js | 119 +++++++++++++++++++++++++++++-- projects/loft-photo/photos.json | 72 ------------------- 6 files changed, 169 insertions(+), 116 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 a66502c09..886a46e3b 100644 --- a/projects/loft-photo/index.js +++ b/projects/loft-photo/index.js @@ -1,9 +1,8 @@ import pages from './pages'; +import mainPage from './mainPage'; +import loginPage from './loginPage'; import('./styles.css'); -const pageNames = ['login', 'main', 'profile']; - -document.addEventListener('click', () => { - const pageName = model.getRandomElement(pageNames); - pages.openPage(pageName); -}); \ No newline at end of file +pages.openPage('login'); +loginPage.handleEvents(); +mainPage.handleEvents(); \ No newline at end of file diff --git a/projects/loft-photo/loginPage.js b/projects/loft-photo/loginPage.js new file mode 100644 index 000000000..87cf95640 --- /dev/null +++ b/projects/loft-photo/loginPage.js @@ -0,0 +1,15 @@ +import model from './model'; +import pages from './pages'; +import mainPage from './mainPage'; + +export default { + handleEvents() { + 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/mainPage.js b/projects/loft-photo/mainPage.js new file mode 100644 index 000000000..c2697ad33 --- /dev/null +++ b/projects/loft-photo/mainPage.js @@ -0,0 +1,36 @@ +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) { + const photoComp = document.querySelector('.component-photo'); + const headerPhotoComp = document.querySelector('.component-header-photo'); + const headerNameComp = document.querySelector('.component-header-name'); + + headerPhotoComp.style.backgroundImage = `url('${friend.photo_50}')`; + headerNameComp.innerText = `${friend.first_name ?? ''} ${friend.last_name ?? ''}`; + photoComp.style.backgroundImage = `url(${url})`; + }, + + handleEvents() { + let startFrom; + + document.querySelector('.component-photo').addEventListener('touchstart', (e) => { + e.preventDefault(); + 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(); + } + }); + }, +}; diff --git a/projects/loft-photo/model.js b/projects/loft-photo/model.js index 1e31e33b3..682c69ce4 100644 --- a/projects/loft-photo/model.js +++ b/projects/loft-photo/model.js @@ -1,9 +1,116 @@ -// eslint-disable-next-line no-unused-vars -import photosDB from './photos.json'; -// eslint-disable-next-line no-unused-vars -import friendsDB from './friends.json'; +// // eslint-disable-next-line no-unused-vars +// import photosDB from './photos.json'; +// // eslint-disable-next-line no-unused-vars +// import friendsDB from './friends.json'; + +import { rejects } from "assert"; +import { resolve } from "path"; + +const PERM_FRIENDS = 2; +const PERM_PHOTOS = 4; +const APP_ID = 5350105; export default { - getRandomElement(array) {}, - getNextPhoto() {}, + getRandomElement(array) { + if (!array.length) { + return null; + } + + const index = Math.round(Math.random() * (array.length - 1)); + + return array[index]; + }, + + async getNextPhoto() { + const friend = this.getRandomElement(this.friends.items); + const photos = await this.getFriendPhotos(friend.id); + const photo = this.getRandomElement(photos.items); + const size = this.findSize(photo); + + return { friend, id: photo.id, url: size.url }; + }, + + findSize(photo) { + 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; + }, + + async init() { + this.photoCache = {}; + this.friends = await this.getFriends(); + }, + + login() { + return new Promise((resolve, reject) => { + VK.init({ + apiID: APP_ID, + }); + + VK.Auth.login((response) => { + if (response.session) { + resolve(response); + } else { + console.error(response); + reject(response); + } + }, PERM_FRIENDS | PERM_PHOTOS); + }); + }, + + logout() {}, + + 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) { + let photos = this.photoCache[id]; + + if (photos) { + return 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 98f92d3212c189741557ca2e13c6db9ac9893c4b Mon Sep 17 00:00:00 2001 From: VitaValeeva Date: Sun, 21 Apr 2024 16:22:56 +0300 Subject: [PATCH 05/12] week-4 homework with right id --- projects/loft-photo/layout.html | 2 +- projects/loft-photo/mainPage.js | 2 +- projects/loft-photo/model.js | 7 ++----- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/projects/loft-photo/layout.html b/projects/loft-photo/layout.html index 89845cfed..bbef387d0 100644 --- a/projects/loft-photo/layout.html +++ b/projects/loft-photo/layout.html @@ -4,7 +4,7 @@ Loft Photo - +
diff --git a/projects/loft-photo/mainPage.js b/projects/loft-photo/mainPage.js index c2697ad33..f181059e7 100644 --- a/projects/loft-photo/mainPage.js +++ b/projects/loft-photo/mainPage.js @@ -5,7 +5,7 @@ export default { async getNextPhoto() { const { friend, id, url } = await model.getNextPhoto(); this.setFriendAndPhoto(friend, id, url); - }, + }, setFriendAndPhoto(friend, id, url) { const photoComp = document.querySelector('.component-photo'); diff --git a/projects/loft-photo/model.js b/projects/loft-photo/model.js index 682c69ce4..9988f775d 100644 --- a/projects/loft-photo/model.js +++ b/projects/loft-photo/model.js @@ -3,12 +3,9 @@ // // eslint-disable-next-line no-unused-vars // import friendsDB from './friends.json'; -import { rejects } from "assert"; -import { resolve } from "path"; - const PERM_FRIENDS = 2; const PERM_PHOTOS = 4; -const APP_ID = 5350105; +const APP_ID = 51904997; export default { getRandomElement(array) { @@ -54,7 +51,7 @@ export default { login() { return new Promise((resolve, reject) => { VK.init({ - apiID: APP_ID, + apiId: APP_ID, }); VK.Auth.login((response) => { From f0405b3788dacb80b3e8bd4e44dee89f50dcebd1 Mon Sep 17 00:00:00 2001 From: VitaValeeva Date: Sun, 21 Apr 2024 16:31:21 +0300 Subject: [PATCH 06/12] week-4 homework right ID --- projects/loft-photo/layout.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/loft-photo/layout.html b/projects/loft-photo/layout.html index bbef387d0..201109e10 100644 --- a/projects/loft-photo/layout.html +++ b/projects/loft-photo/layout.html @@ -6,6 +6,7 @@ Loft Photo +
+
From e22ebc3d214ccbe29ef8e16a8c677c5bb2d69ad1 Mon Sep 17 00:00:00 2001 From: VitaValeeva Date: Sun, 21 Apr 2024 20:48:29 +0300 Subject: [PATCH 07/12] Loft-photo week-5 homework --- projects/loft-photo/index.js | 1 + projects/loft-photo/mainPage.js | 21 +++++++++++- projects/loft-photo/model.js | 19 ++++++++++- projects/loft-photo/profilePage.js | 53 ++++++++++++++++++++++++++++++ 4 files changed, 92 insertions(+), 2 deletions(-) create mode 100644 projects/loft-photo/profilePage.js diff --git a/projects/loft-photo/index.js b/projects/loft-photo/index.js index 886a46e3b..94e788848 100644 --- a/projects/loft-photo/index.js +++ b/projects/loft-photo/index.js @@ -1,6 +1,7 @@ import pages from './pages'; import mainPage from './mainPage'; import loginPage from './loginPage'; +import profilePage from './profilePage'; import('./styles.css'); pages.openPage('login'); diff --git a/projects/loft-photo/mainPage.js b/projects/loft-photo/mainPage.js index f181059e7..4ca3a5d16 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'; +import pages from './pages'; export default { async getNextPhoto() { @@ -11,10 +12,14 @@ export default { 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; 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() { @@ -32,5 +37,19 @@ export default { await this.getNextPhoto(); } }); + + document + .querySelector('.component-header-profile-link') + .addEventListener('click', async () => { + await profilePage.setUser(this.getFriend()); + 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 9988f775d..0ed7ae23a 100644 --- a/projects/loft-photo/model.js +++ b/projects/loft-photo/model.js @@ -3,6 +3,8 @@ // // eslint-disable-next-line no-unused-vars // import friendsDB from './friends.json'; +import { resolve } from "path"; + const PERM_FRIENDS = 2; const PERM_PHOTOS = 4; const APP_ID = 51904997; @@ -46,6 +48,7 @@ export default { async init() { this.photoCache = {}; this.friends = await this.getFriends(); + [this.me] = await this.getUsers(); }, login() { @@ -65,7 +68,9 @@ export default { }); }, - logout() {}, + logout() { + return new Promise((resolve) => VK.Auth.revokeGrants(resolve)); + }, callApi(method, params) { params.v = params.v || '5.120'; @@ -110,4 +115,16 @@ export default { return photos; }, + + 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..21864f15c --- /dev/null +++ b/projects/loft-photo/profilePage.js @@ -0,0 +1,53 @@ +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-photos'); + 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 ?? ''}`; + photoComp.innerHTML = ''; + + for (const photo of photos.items) { + const size = model.findSize(photo); + const element = document.createElement('div'); + + element.classList.add('component-user-photo'); + element.dataset.id = photo.id; + element.style.backgroundImage = `url(${size.url})`; + photoComp.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 4841393da6c075377b81d22c30ddf17d3514aa24 Mon Sep 17 00:00:00 2001 From: VitaValeeva Date: Sun, 21 Apr 2024 20:56:58 +0300 Subject: [PATCH 08/12] Loft-photo week-5 homework --- projects/loft-photo/index.js | 2 +- projects/loft-photo/model.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/loft-photo/index.js b/projects/loft-photo/index.js index 94e788848..0862a8470 100644 --- a/projects/loft-photo/index.js +++ b/projects/loft-photo/index.js @@ -1,7 +1,7 @@ import pages from './pages'; import mainPage from './mainPage'; import loginPage from './loginPage'; -import profilePage from './profilePage'; +// import profilePage from './profilePage'; import('./styles.css'); pages.openPage('login'); diff --git a/projects/loft-photo/model.js b/projects/loft-photo/model.js index 0ed7ae23a..3da1312fb 100644 --- a/projects/loft-photo/model.js +++ b/projects/loft-photo/model.js @@ -3,7 +3,7 @@ // // eslint-disable-next-line no-unused-vars // import friendsDB from './friends.json'; -import { resolve } from "path"; +// import { resolve } from "path"; const PERM_FRIENDS = 2; const PERM_PHOTOS = 4; From e7e2f0f18530070ec5c2d6aa5e06a4c5bd8ec491 Mon Sep 17 00:00:00 2001 From: VitaValeeva Date: Mon, 29 Apr 2024 09:46:56 +0300 Subject: [PATCH 09/12] week-5 homework done --- projects/loft-photo/model.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/loft-photo/model.js b/projects/loft-photo/model.js index 3da1312fb..304038641 100644 --- a/projects/loft-photo/model.js +++ b/projects/loft-photo/model.js @@ -7,7 +7,7 @@ const PERM_FRIENDS = 2; const PERM_PHOTOS = 4; -const APP_ID = 51904997; +const APP_ID = 51908066; export default { getRandomElement(array) { From 5dbd012ac43b44d4bc4389b03fdd40fedb77527d Mon Sep 17 00:00:00 2001 From: VitaValeeva Date: Mon, 29 Apr 2024 12:07:24 +0300 Subject: [PATCH 10/12] week-6 homework --- projects/loft-photo/commentsTemplate.html.hbs | 9 +++ projects/loft-photo/mainPage.js | 81 ++++++++++++++++++- projects/loft-photo/model.js | 51 ++++++++++-- projects/loft-photo/server/index.js | 39 ++++++++- 4 files changed, 167 insertions(+), 13 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 4ca3a5d16..8a8aa5648 100644 --- a/projects/loft-photo/mainPage.js +++ b/projects/loft-photo/mainPage.js @@ -1,25 +1,30 @@ import model from './model'; import profilePage from './profilePage'; import pages from './pages'; +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() { @@ -51,5 +56,75 @@ 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; +}, +}; \ No newline at end of file diff --git a/projects/loft-photo/model.js b/projects/loft-photo/model.js index 304038641..6d922a0f4 100644 --- a/projects/loft-photo/model.js +++ b/projects/loft-photo/model.js @@ -1,9 +1,4 @@ -// // eslint-disable-next-line no-unused-vars -// import photosDB from './photos.json'; -// // eslint-disable-next-line no-unused-vars -// import friendsDB from './friends.json'; - -// import { resolve } from "path"; +import HtmlWebpackPlugin from "html-webpack-plugin"; const PERM_FRIENDS = 2; const PERM_PHOTOS = 4; @@ -59,6 +54,7 @@ export default { VK.Auth.login((response) => { if (response.session) { + this.token = response.session.sid; resolve(response); } else { console.error(response); @@ -127,4 +123,47 @@ 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, + }, + }; + + 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 postComment(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..7c2faf7c4 100644 --- a/projects/loft-photo/server/index.js +++ b/projects/loft-photo/server/index.js @@ -10,16 +10,47 @@ 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) ?? []; }, }; From 31a5768ec71ae1ae3c040ed6ae31c942df3209b1 Mon Sep 17 00:00:00 2001 From: VitaValeeva Date: Mon, 29 Apr 2024 15:52:32 +0300 Subject: [PATCH 11/12] week-6 homework corrected server.index.js --- projects/loft-photo/server/index.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/projects/loft-photo/server/index.js b/projects/loft-photo/server/index.js index 7c2faf7c4..058f31c3f 100644 --- a/projects/loft-photo/server/index.js +++ b/projects/loft-photo/server/index.js @@ -62,7 +62,13 @@ http 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); + const responseData = await methods[parsed.searchParams.get('method')]?.( + req, + res, + parsed, + vkUser, + body + ); res.end(JSON.stringify(responseData ?? null)); }) From ff2617fd4d2138d7cd1703d4422fac4844423ebc Mon Sep 17 00:00:00 2001 From: VitaValeeva Date: Mon, 29 Apr 2024 16:00:02 +0300 Subject: [PATCH 12/12] week-6 homework fixed model.js --- projects/loft-photo/model.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/loft-photo/model.js b/projects/loft-photo/model.js index 6d922a0f4..ed18b0415 100644 --- a/projects/loft-photo/model.js +++ b/projects/loft-photo/model.js @@ -1,4 +1,4 @@ -import HtmlWebpackPlugin from "html-webpack-plugin"; +// import HtmlWebpackPlugin from "html-webpack-plugin"; const PERM_FRIENDS = 2; const PERM_PHOTOS = 4;