From f944f2153b015690bc691282775cfd3830fc1208 Mon Sep 17 00:00:00 2001 From: glebkostin Date: Mon, 27 May 2024 21:50:24 +0300 Subject: [PATCH 01/14] =?UTF-8?q?HAR-146:=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D0=BB=20=D0=B2=D0=B8=D0=B4=D0=B8=D0=BC=D1=8B=D0=B9=20?= =?UTF-8?q?=D1=81=D0=BA=D1=80=D0=BE=D0=BB=D0=BB=D0=B1=D0=B0=D1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/index.js | 2 +- source/widgets/modalWindow/ui/modalWindow.scss | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/source/index.js b/source/index.js index bda67389..c6caf884 100644 --- a/source/index.js +++ b/source/index.js @@ -1,7 +1,7 @@ import {App} from './app/App.js'; if (navigator.serviceWorker) { - await navigator.serviceWorker.register('/serviceWorker.js', {scope: '/'}); + // await navigator.serviceWorker.register('/serviceWorker.js', {scope: '/'}); } const app = new App(); diff --git a/source/widgets/modalWindow/ui/modalWindow.scss b/source/widgets/modalWindow/ui/modalWindow.scss index 3a2f27c9..2cd37bc9 100644 --- a/source/widgets/modalWindow/ui/modalWindow.scss +++ b/source/widgets/modalWindow/ui/modalWindow.scss @@ -31,3 +31,14 @@ max-height: 50dvh; overflow-y: scroll; } + +.modal-list::-webkit-scrollbar { + -webkit-appearance: none; + width: 7px; +} + +.modal-list::-webkit-scrollbar-thumb { + border-radius: 4px; + background-color: rgba(0, 0, 0, .5); + -webkit-box-shadow: 0 0 1px rgba(255, 255, 255, .5); +} From fec574790e402c5f936655c89dad06b315992c08 Mon Sep 17 00:00:00 2001 From: glebkostin Date: Wed, 29 May 2024 11:34:47 +0300 Subject: [PATCH 02/14] =?UTF-8?q?HAR-146:=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D0=BB=20=D1=87=D1=82=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=83?= =?UTF-8?q?=D0=B2=D0=B5=D0=B4=D0=BE=D0=BC=D0=BB=D0=B5=D0=BD=D0=B8=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/pages/chat/ui/chat.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/pages/chat/ui/chat.js b/source/pages/chat/ui/chat.js index fb3a0d75..e80c30ce 100644 --- a/source/pages/chat/ui/chat.js +++ b/source/pages/chat/ui/chat.js @@ -49,7 +49,7 @@ export class ChatView extends View { const chatWindow = new ChatWindow('chat-window'); chatWindow.render({user}); }; - modalWindow.render(ListBlockView, response.body, UserListItemView, eventFunc); + modalWindow.render(ListBlockView, response.body.users, UserListItemView, eventFunc); }); } } From 002efb41a17edc17577f051151e91e16efaabe69 Mon Sep 17 00:00:00 2001 From: glebkostin Date: Wed, 29 May 2024 11:36:25 +0300 Subject: [PATCH 03/14] =?UTF-8?q?HAR-146:=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D0=BB=20=D1=87=D1=82=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=83?= =?UTF-8?q?=D0=B2=D0=B5=D0=B4=D0=BE=D0=BC=D0=BB=D0=B5=D0=BD=D0=B8=D0=B9=20?= =?UTF-8?q?+=20=D0=B7=D0=B0=D0=BF=D0=BE=D0=BC=D0=B8=D0=BD=D0=B0=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D1=82=D0=B5=D0=BB=D1=8F=20=D0=B2=20=D0=BD=D0=B0=D0=B2=D0=B1?= =?UTF-8?q?=D0=B0=D1=80=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/entity/notification/ui/notification.js | 6 +++++- source/pages/feed/ui/FeedView.js | 8 ++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/source/entity/notification/ui/notification.js b/source/entity/notification/ui/notification.js index c47de199..a2cf8ac6 100644 --- a/source/entity/notification/ui/notification.js +++ b/source/entity/notification/ui/notification.js @@ -1,6 +1,7 @@ import notificationTemplate from './notification.handlebars'; import './notification.scss'; import {View} from '../../../app/View.js'; +import {API} from '../../../shared/api/API.js'; export class NotificationView extends View { constructor(root, ...args) { @@ -32,8 +33,11 @@ export class NotificationView extends View { this.root.insertAdjacentElement('afterbegin', element); - this.root.addEventListener('click', (event) => { + this.root.addEventListener('click', async (event) => { event.preventDefault(); + const api = new API('/notifications/read/' + notification.notification_id); + await api.post({}); + switch (notification?.type) { case 'subscription': history.pushState(null, null, '/profile/' + diff --git a/source/pages/feed/ui/FeedView.js b/source/pages/feed/ui/FeedView.js index fedb918e..f0076700 100644 --- a/source/pages/feed/ui/FeedView.js +++ b/source/pages/feed/ui/FeedView.js @@ -10,6 +10,7 @@ export class FeedView extends View { constructor(...args) { super(...args); this.root = document.querySelector('#root'); + this.user = localStorageGetValue('user'); } async renderHomeFeed() { @@ -31,8 +32,11 @@ export class FeedView extends View { } async render() { - const navbar = new NavbarView(); - navbar.render(); + if (localStorageGetValue('user') !== this.user) { + const navbar = new NavbarView(); + navbar.render(); + this.user = localStorageGetValue('user'); + } const user = localStorageGetValue('user'); this.root.innerHTML = feedViewTemplate({user}); From 4c8695a81ecfcf4bbc066edad6c55327778ddbde Mon Sep 17 00:00:00 2001 From: glebkostin Date: Wed, 29 May 2024 12:08:06 +0300 Subject: [PATCH 04/14] =?UTF-8?q?HAR-146:=20=D0=9D=D0=BE=D0=B2=D1=8B=D0=B9?= =?UTF-8?q?=20=D0=B2=D0=B8=D0=B4=20=D1=83=20=D1=83=D0=B2=D0=B5=D0=B4=D0=BE?= =?UTF-8?q?=D0=BC=D0=BB=D0=B5=D0=BD=D0=B8=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/entity/notification/ui/notification.js | 7 +++- source/features/listBlock/ui/listBlock.js | 12 ------- source/shared/styles/App.scss | 1 + source/widgets/navbar/ui/navbar.handlebars | 11 +++++-- source/widgets/navbar/ui/navbar.js | 15 +++++++-- source/widgets/navbar/ui/navbar.scss | 33 +++++++++++++++++-- 6 files changed, 60 insertions(+), 19 deletions(-) diff --git a/source/entity/notification/ui/notification.js b/source/entity/notification/ui/notification.js index a2cf8ac6..4224bf14 100644 --- a/source/entity/notification/ui/notification.js +++ b/source/entity/notification/ui/notification.js @@ -31,7 +31,9 @@ export class NotificationView extends View { element.innerHTML = notificationTemplate({content, time: time.toLocaleString('ru', options)}); - this.root.insertAdjacentElement('afterbegin', element); + if (!notification?.delete) { + this.root.insertAdjacentElement('afterbegin', element); + } this.root.addEventListener('click', async (event) => { event.preventDefault(); @@ -50,6 +52,9 @@ export class NotificationView extends View { history.pushState(null, null, '/pin/' + notification?.pin?.pin_id); break; } + + this.root.remove(); + notification.delete = true; }); } } diff --git a/source/features/listBlock/ui/listBlock.js b/source/features/listBlock/ui/listBlock.js index bc26fd10..9b39cefb 100644 --- a/source/features/listBlock/ui/listBlock.js +++ b/source/features/listBlock/ui/listBlock.js @@ -9,18 +9,6 @@ export class ListBlockView extends View { this.id = 0; } - addRender(objects, RenderEntity, ...args) { - this.root.innerHTML += listBlockTemplate({objects, index: this.id}); - const prefix = '#list-item-'; - for (let i = this.id; i < this.id + objects.length; ++i) { - const root = document.querySelector(prefix + i); - console.log(root); - - const entity = new RenderEntity(root); - entity.render(objects[i], ...args); - } - this.id = this.id + objects.length; - } render(objects, RenderEntity, ...args) { this.root.innerHTML = listBlockTemplate({objects}); const prefix = '#list-item-'; diff --git a/source/shared/styles/App.scss b/source/shared/styles/App.scss index 629ca70d..9fdc9535 100644 --- a/source/shared/styles/App.scss +++ b/source/shared/styles/App.scss @@ -75,6 +75,7 @@ body.modal-open{ .link-text:hover{ cursor: pointer; color: variables.$font-link-selected-color; + text-decoration: underline; } .text-center{ diff --git a/source/widgets/navbar/ui/navbar.handlebars b/source/widgets/navbar/ui/navbar.handlebars index 5b113a06..f0bae857 100644 --- a/source/widgets/navbar/ui/navbar.handlebars +++ b/source/widgets/navbar/ui/navbar.handlebars @@ -18,8 +18,15 @@ -
diff --git a/source/widgets/navbar/ui/navbar.js b/source/widgets/navbar/ui/navbar.js index d61cc2df..7b9a2e45 100644 --- a/source/widgets/navbar/ui/navbar.js +++ b/source/widgets/navbar/ui/navbar.js @@ -105,9 +105,9 @@ export class NavbarView extends View { notifications = response.body.notifications; } - const notificationList = document.querySelector('#navbar-notification-list'); + const notificationList = document.querySelector('#navbar-notification-popup'); const notificationButton = document.querySelector('#navbar-notification-button'); - const listBlock = new ListBlockView('navbar-notification-list'); + const listBlock = new ListBlockView('navbar-notification__list'); notificationButton.addEventListener('click', (event) => { event.preventDefault(); @@ -118,6 +118,17 @@ export class NavbarView extends View { notificationList.classList.toggle('navbar-popup-menu_closed'); }); + const readAllNotificationButton = document.querySelector('#navbar-notification-clear-button'); + readAllNotificationButton.addEventListener('click', async (event) => { + event.preventDefault(); + if (notifications) { + const api = new API('/notifications/read/all'); + await api.post({}); + listBlock.root.innerHTML = `Уведомлений нет` + notifications = null; + } + }) + WebSocketService.register('NOTIFICATION_SUBSCRIPTION', (payload) => { payload.type = 'subscription'; try { diff --git a/source/widgets/navbar/ui/navbar.scss b/source/widgets/navbar/ui/navbar.scss index d66edcce..8c6658d6 100644 --- a/source/widgets/navbar/ui/navbar.scss +++ b/source/widgets/navbar/ui/navbar.scss @@ -201,7 +201,7 @@ position: relative; } -.navbar-notification-list{ +.navbar-notification-popup{ position: absolute; inset: 47px 0 auto auto; width: 300px; @@ -213,8 +213,29 @@ display: flex; flex-direction: column; box-shadow: 0 0 7px variables.$window-color; - overflow-y: scroll; + overflow-y: hidden; transition: all .3s; + padding: 7px; + gap: 10px; +} + +.navbar-notification__list{ + width: 100%; + flex-grow: 1; + display: flex; + flex-direction: column; + overflow-y: scroll; +} + +.navbar-notification__list::-webkit-scrollbar { + -webkit-appearance: none; + width: 7px; +} + +.navbar-notification__list::-webkit-scrollbar-thumb { + border-radius: 4px; + background-color: rgba(0, 0, 0, .5); + -webkit-box-shadow: 0 0 1px rgba(255, 255, 255, .5); } .notification-title-disable{ @@ -223,6 +244,14 @@ pointer-events: none; } +.navbar-notification-control-menu{ + width: calc(100% - 20px); + height: 10px; + padding: 5px 10px; + display: flex; + justify-content: end; +} + @media screen and (max-width: 540px) { .navbar_right-block{ position: fixed; From 95f9b6f968057c2008a6b851c4a5f01fcb1e2fff Mon Sep 17 00:00:00 2001 From: glebkostin Date: Thu, 30 May 2024 20:07:34 +0300 Subject: [PATCH 05/14] =?UTF-8?q?HAR-146:=20=D0=A2=D0=B5=D1=81=D1=82=D0=B8?= =?UTF-8?q?=D0=BC=20=D1=80=D0=B0=D0=B7=D0=BC=D0=B5=D1=80=20=D0=BF=D0=B8?= =?UTF-8?q?=D0=BD=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/entity/pin/ui/pin.handlebars | 2 +- source/entity/pin/ui/pin.js | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/source/entity/pin/ui/pin.handlebars b/source/entity/pin/ui/pin.handlebars index 25dca108..b9f99693 100644 --- a/source/entity/pin/ui/pin.handlebars +++ b/source/entity/pin/ui/pin.handlebars @@ -1 +1 @@ - + diff --git a/source/entity/pin/ui/pin.js b/source/entity/pin/ui/pin.js index 89ac636a..d8e2d201 100644 --- a/source/entity/pin/ui/pin.js +++ b/source/entity/pin/ui/pin.js @@ -27,6 +27,9 @@ export class PinFeedView extends View { * @param {object} pin - Pin entity. */ render(pin) { + const ratio = 250 / pin.content_width; + pin.content_width *= ratio; + pin.content_height *= ratio; this.root.innerHTML = pinFeedTemplate({pin}); const eventRoot = document.querySelector('#pin-' + pin.pin_id); eventRoot.addEventListener('click', (event) => { From 0fce8445eb8887d9e5213dcf84d0a9d606860679 Mon Sep 17 00:00:00 2001 From: glebkostin Date: Fri, 31 May 2024 20:31:44 +0300 Subject: [PATCH 06/14] =?UTF-8?q?HAR-146:=20=D0=9E=D1=82=D0=BE=D0=B1=D1=80?= =?UTF-8?q?=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=83=D0=B2=D0=B5=D0=B4?= =?UTF-8?q?=D0=BE=D0=BC=D0=BB=D0=B5=D0=BD=D0=B8=D0=B9=20=D0=B2=20=D0=BC?= =?UTF-8?q?=D0=BE=D0=B1=D0=B8=D0=BB=D0=BA=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/widgets/navbar/ui/navbar.scss | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/source/widgets/navbar/ui/navbar.scss b/source/widgets/navbar/ui/navbar.scss index 8c6658d6..ff227cdb 100644 --- a/source/widgets/navbar/ui/navbar.scss +++ b/source/widgets/navbar/ui/navbar.scss @@ -286,6 +286,12 @@ opacity: 1; } + + .navbar-notification-block > .navbar-popup-menu_closed{ + pointer-events: none; + opacity: 0; + } + .popup-menu__item{ border-radius: 50%; height: fit-content; @@ -321,6 +327,10 @@ .navbar_left-block{ width: 100%; } + + .navbar-notification-popup{ + inset: auto auto 60px 0; + } } @media screen and (max-width: 1023px){ From 79b579216e609be3491cc2f8ca489003a7760c8a Mon Sep 17 00:00:00 2001 From: glebkostin Date: Fri, 31 May 2024 21:17:38 +0300 Subject: [PATCH 07/14] =?UTF-8?q?HAR-146:=20=D0=A1=D0=BB=D0=BE=D0=B8=20?= =?UTF-8?q?=D0=B2=20=D1=87=D0=B0=D1=82=D0=B5=20=D0=B4=D0=BB=D1=8F=20=D0=BC?= =?UTF-8?q?=D0=BE=D0=B1=D0=B8=D0=BB=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/pages/chat/ui/chat.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/source/pages/chat/ui/chat.js b/source/pages/chat/ui/chat.js index e80c30ce..e6b2fe67 100644 --- a/source/pages/chat/ui/chat.js +++ b/source/pages/chat/ui/chat.js @@ -46,6 +46,12 @@ export class ChatView extends View { const userResponse = await userAPI.get(); const user = userResponse.body.user; + const listBlock = document.querySelector('#chat-list-block'); + const windowBlock = document.querySelector('#chat-window'); + + listBlock.classList.replace('window-on-top', 'window-on-bottom'); + windowBlock.classList.replace('window-on-bottom', 'window-on-top'); + const chatWindow = new ChatWindow('chat-window'); chatWindow.render({user}); }; From 6b2af25520c3b5f307b68b447ce00aecad82a2a9 Mon Sep 17 00:00:00 2001 From: glebkostin Date: Fri, 31 May 2024 21:31:16 +0300 Subject: [PATCH 08/14] =?UTF-8?q?HAR-146:=20=D0=98=D1=81=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D0=B2=D0=B8=D0=BB=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D1=83=20?= =?UTF-8?q?=D0=B2=20=D1=87=D0=B0=D1=82=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/features/messagesFeed/ui/messagesFeed.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/features/messagesFeed/ui/messagesFeed.js b/source/features/messagesFeed/ui/messagesFeed.js index e2bd60eb..f6cb1d94 100644 --- a/source/features/messagesFeed/ui/messagesFeed.js +++ b/source/features/messagesFeed/ui/messagesFeed.js @@ -39,7 +39,7 @@ export class MessagesFeedView extends View { } async render(messages) { - if (!messages?.isEmpty) { + if (messages) { const user = localStorageGetValue('user'); for (let i = 0; i < messages.length; i++) { const message = messages[i]; From 85f62507e74dd41ea7edae1d0e8447c6bf30c724 Mon Sep 17 00:00:00 2001 From: glebkostin Date: Fri, 31 May 2024 22:23:48 +0300 Subject: [PATCH 09/14] =?UTF-8?q?HAR-146:=20=D0=98=D1=81=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D0=B2=D0=B8=D0=BB=20=D0=BB=D0=B5=D0=BD=D1=82=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/entity/pin/ui/pin.handlebars | 2 +- source/entity/pin/ui/pin.js | 37 +++++++++++++++----- source/pages/feed/ui/FeedView.js | 31 ++++++++++++++++ source/pages/feed/ui/FeedView.scss | 4 +++ source/shared/styles/variables.scss | 4 +-- source/widgets/feedWindow/ui/feedWindow.scss | 16 ++++----- 6 files changed, 74 insertions(+), 20 deletions(-) diff --git a/source/entity/pin/ui/pin.handlebars b/source/entity/pin/ui/pin.handlebars index b9f99693..2ccb7117 100644 --- a/source/entity/pin/ui/pin.handlebars +++ b/source/entity/pin/ui/pin.handlebars @@ -1 +1 @@ - + diff --git a/source/entity/pin/ui/pin.js b/source/entity/pin/ui/pin.js index d8e2d201..25b6b48b 100644 --- a/source/entity/pin/ui/pin.js +++ b/source/entity/pin/ui/pin.js @@ -27,14 +27,33 @@ export class PinFeedView extends View { * @param {object} pin - Pin entity. */ render(pin) { - const ratio = 250 / pin.content_width; - pin.content_width *= ratio; - pin.content_height *= ratio; - this.root.innerHTML = pinFeedTemplate({pin}); - const eventRoot = document.querySelector('#pin-' + pin.pin_id); - eventRoot.addEventListener('click', (event) => { - event.preventDefault(); - this.onClick(pin.pin_id); - }); + const renderPinFunc = () => { + const width = window.innerWidth; + let pinWidth = 250; + if (width < 1024){ + if (width > 430){ + pinWidth = 200; + } else { + pinWidth = 150; + } + } + if (this.currentWidth !== pinWidth){ + this.currentWidth = pinWidth; + + const ratio = pinWidth / pin.content_width; + pin.content_width *= ratio; + pin.content_height *= ratio; + this.root.innerHTML = pinFeedTemplate({pin}); + const eventRoot = document.querySelector('#pin-' + pin.pin_id); + eventRoot.addEventListener('click', (event) => { + event.preventDefault(); + this.onClick(pin.pin_id); + }); + } + } + + renderPinFunc(); + + addEventListener('resize', renderPinFunc); } } diff --git a/source/pages/feed/ui/FeedView.js b/source/pages/feed/ui/FeedView.js index f0076700..cc775369 100644 --- a/source/pages/feed/ui/FeedView.js +++ b/source/pages/feed/ui/FeedView.js @@ -20,6 +20,37 @@ export class FeedView extends View { const pins = response.body.pins; const feed = new FeedWindowView('feed-block'); feed.render(pins); + + const widthRecount = () => { + const width = window.innerWidth; + let pinWidth = 250; + let columnsCount = 5; + if (width < 1024) { + if (width > 430) { + pinWidth = 200; + columnsCount = 5; + } else { + pinWidth = 150; + columnsCount = 2; + } + } + + if (this.currentWidth !== pinWidth) { + this.currentWidth = pinWidth; + + let elemWidth = columnsCount * pinWidth + (columnsCount - 1) * 20; + + const feedInnerBlock = document.querySelector('#feed'); + feedInnerBlock.style.width = elemWidth + "px"; + } + } + + widthRecount(); + + addEventListener('resize', (event) => { + event.preventDefault(); + widthRecount(); + }) } async renderSubsFeed() { diff --git a/source/pages/feed/ui/FeedView.scss b/source/pages/feed/ui/FeedView.scss index e69de29b..530db36e 100644 --- a/source/pages/feed/ui/FeedView.scss +++ b/source/pages/feed/ui/FeedView.scss @@ -0,0 +1,4 @@ +.feed-block{ + display: flex; + justify-content: center; +} diff --git a/source/shared/styles/variables.scss b/source/shared/styles/variables.scss index d91a36c5..b91b2c77 100644 --- a/source/shared/styles/variables.scss +++ b/source/shared/styles/variables.scss @@ -1,13 +1,13 @@ $background-color: #F6F6F6; $primary-button-color: #FF8E6E; //$secondary-button-color: #FFBB91; -$secondary-button-color: #e3deda; +$secondary-button-color: #DFDFDF; $window-color: #D5D5D5; $search-color: #777777; $select-color: #EECCCC; $select-secondary-color: #cdcdcd; $error-color: #ff4545; -$success-color: #35a445; +$success-color: $window-color; $font-color: #111111; $border-color: #CDCDCD; $input-border-radius: 12px; diff --git a/source/widgets/feedWindow/ui/feedWindow.scss b/source/widgets/feedWindow/ui/feedWindow.scss index a4138fcb..18b9a012 100644 --- a/source/widgets/feedWindow/ui/feedWindow.scss +++ b/source/widgets/feedWindow/ui/feedWindow.scss @@ -30,10 +30,12 @@ } .feed{ + align-items: center; + align-content: center; height: auto; width: auto; - margin: 30px 50px; - columns: 250px 5; + margin: 30px 0; + columns: 250px; } @@ -42,12 +44,11 @@ $width: calc(10px + 35vw); .feed_item{ - width: $width; + width: 150px; } .feed { - columns: $width 2; - margin: 30px; + columns: 150px; } } @@ -55,11 +56,10 @@ $width: calc(20px + 25vw); .feed_item{ - width: $width; + width: 200px; } .feed { - columns: $width 3; - margin: 30px; + columns: 200px; } } From 882e7aaf339cd4adbb6f208d5f37569615dafb54 Mon Sep 17 00:00:00 2001 From: glebkostin Date: Fri, 31 May 2024 22:29:27 +0300 Subject: [PATCH 10/14] =?UTF-8?q?HAR-146:=20=D0=A3=D0=B1=D1=80=D0=B0=D0=BB?= =?UTF-8?q?=20=D1=80=D0=B0=D1=81=D1=87=D0=B5=D1=82=20=D1=88=D0=B8=D1=80?= =?UTF-8?q?=D0=B8=D0=BD=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/pages/feed/ui/FeedView.js | 60 ++++++++++---------- source/pages/feed/ui/FeedView.scss | 8 +-- source/widgets/feedWindow/ui/feedWindow.scss | 4 +- 3 files changed, 38 insertions(+), 34 deletions(-) diff --git a/source/pages/feed/ui/FeedView.js b/source/pages/feed/ui/FeedView.js index cc775369..cbe39780 100644 --- a/source/pages/feed/ui/FeedView.js +++ b/source/pages/feed/ui/FeedView.js @@ -21,36 +21,38 @@ export class FeedView extends View { const feed = new FeedWindowView('feed-block'); feed.render(pins); - const widthRecount = () => { - const width = window.innerWidth; - let pinWidth = 250; - let columnsCount = 5; - if (width < 1024) { - if (width > 430) { - pinWidth = 200; - columnsCount = 5; - } else { - pinWidth = 150; - columnsCount = 2; - } - } - - if (this.currentWidth !== pinWidth) { - this.currentWidth = pinWidth; - - let elemWidth = columnsCount * pinWidth + (columnsCount - 1) * 20; - - const feedInnerBlock = document.querySelector('#feed'); + const feedInnerBlock = document.querySelector('#feed'); feedInnerBlock.style.width = elemWidth + "px"; - } - } - - widthRecount(); - - addEventListener('resize', (event) => { - event.preventDefault(); - widthRecount(); - }) + // const widthRecount = () => { + // const width = window.innerWidth; + // let pinWidth = 250; + // let columnsCount = 5; + // if (width < 1024) { + // if (width > 430) { + // pinWidth = 200; + // columnsCount = 5; + // } else { + // pinWidth = 150; + // columnsCount = 2; + // } + // } + // + // if (this.currentWidth !== pinWidth) { + // this.currentWidth = pinWidth; + // + // let elemWidth = columnsCount * pinWidth + (columnsCount - 1) * 20; + // + // const feedInnerBlock = document.querySelector('#feed'); + // feedInnerBlock.style.width = elemWidth + "px"; + // } + // } + // + // widthRecount(); + // + // addEventListener('resize', (event) => { + // event.preventDefault(); + // widthRecount(); + // }) } async renderSubsFeed() { diff --git a/source/pages/feed/ui/FeedView.scss b/source/pages/feed/ui/FeedView.scss index 530db36e..a510dedb 100644 --- a/source/pages/feed/ui/FeedView.scss +++ b/source/pages/feed/ui/FeedView.scss @@ -1,4 +1,4 @@ -.feed-block{ - display: flex; - justify-content: center; -} +//.feed-block{ +// display: flex; +// justify-content: center; +//} diff --git a/source/widgets/feedWindow/ui/feedWindow.scss b/source/widgets/feedWindow/ui/feedWindow.scss index 18b9a012..00950cd3 100644 --- a/source/widgets/feedWindow/ui/feedWindow.scss +++ b/source/widgets/feedWindow/ui/feedWindow.scss @@ -34,7 +34,7 @@ align-content: center; height: auto; width: auto; - margin: 30px 0; + margin: 30px 50px; columns: 250px; } @@ -49,6 +49,7 @@ .feed { columns: 150px; + margin: 30px; } } @@ -61,5 +62,6 @@ .feed { columns: 200px; + margin: 30px; } } From 661b38ca9df903dc290792455846fed0b59c4dfd Mon Sep 17 00:00:00 2001 From: glebkostin Date: Fri, 31 May 2024 22:32:02 +0300 Subject: [PATCH 11/14] =?UTF-8?q?HAR-146:=20=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0?= =?UTF-8?q?=D0=BB=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BA=D0=BB=D1=8E=D1=87=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BE=D0=BA=20?= =?UTF-8?q?=D0=B2=20=D0=BF=D1=80=D0=BE=D1=84=D0=B8=D0=BB=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/pages/profile/ui/profile.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/source/pages/profile/ui/profile.js b/source/pages/profile/ui/profile.js index 481fcfd5..cae93619 100644 --- a/source/pages/profile/ui/profile.js +++ b/source/pages/profile/ui/profile.js @@ -120,16 +120,20 @@ export class Profile extends View { }); } + const feedButton = document.querySelector('#profile-content-pins'); const boardButton = document.querySelector('#profile-content-boards'); boardButton.addEventListener('click', (event) =>{ event.preventDefault(); profileFeed.renderBoards(user); + boardButton.classList.replace('secondary-button', 'primary-button'); + feedButton.classList.replace('primary-button', 'secondary-button'); }); - const feedButton = document.querySelector('#profile-content-pins'); feedButton.addEventListener('click', (event) => { event.preventDefault(); profileFeed.renderFeed(user); + feedButton.classList.replace('secondary-button', 'primary-button'); + boardButton.classList.replace('primary-button', 'secondary-button'); }); }; } From 2d809cdb3f3d2a6012370e3f7e0330ecf84725f7 Mon Sep 17 00:00:00 2001 From: glebkostin Date: Fri, 31 May 2024 22:37:25 +0300 Subject: [PATCH 12/14] =?UTF-8?q?HAR-146:=20=D0=A3=D0=B1=D1=80=D0=B0=D0=BB?= =?UTF-8?q?=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/pages/feed/ui/FeedView.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/pages/feed/ui/FeedView.js b/source/pages/feed/ui/FeedView.js index cbe39780..a97f4c5f 100644 --- a/source/pages/feed/ui/FeedView.js +++ b/source/pages/feed/ui/FeedView.js @@ -21,8 +21,8 @@ export class FeedView extends View { const feed = new FeedWindowView('feed-block'); feed.render(pins); - const feedInnerBlock = document.querySelector('#feed'); - feedInnerBlock.style.width = elemWidth + "px"; + // const feedInnerBlock = document.querySelector('#feed'); + // feedInnerBlock.style.width = elemWidth + "px"; // const widthRecount = () => { // const width = window.innerWidth; // let pinWidth = 250; From 4c0be29d406a67e0b1b6fba52bea4a5164d1b838 Mon Sep 17 00:00:00 2001 From: glebkostin Date: Fri, 31 May 2024 22:37:47 +0300 Subject: [PATCH 13/14] =?UTF-8?q?HAR-146:=20=D0=A3=D0=B1=D1=80=D0=B0=D0=BB?= =?UTF-8?q?=20=D0=BB=D0=BE=D0=B3=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/features/pinControllerBlock/ui/pinControllerBlock.js | 1 - source/widgets/navbar/ui/navbar.js | 2 -- 2 files changed, 3 deletions(-) diff --git a/source/features/pinControllerBlock/ui/pinControllerBlock.js b/source/features/pinControllerBlock/ui/pinControllerBlock.js index 8d4659f3..f8301314 100644 --- a/source/features/pinControllerBlock/ui/pinControllerBlock.js +++ b/source/features/pinControllerBlock/ui/pinControllerBlock.js @@ -95,7 +95,6 @@ export class PinControllerBlock extends View { return; } - console.log(response); const comment = { value: message.value, user: user, diff --git a/source/widgets/navbar/ui/navbar.js b/source/widgets/navbar/ui/navbar.js index 7b9a2e45..e07815dc 100644 --- a/source/widgets/navbar/ui/navbar.js +++ b/source/widgets/navbar/ui/navbar.js @@ -98,8 +98,6 @@ export class NavbarView extends View { const api = new API('/notifications'); const response = await api.get(); - console.log(response); - let notifications = null; if (!response?.code) { notifications = response.body.notifications; From 4e5792ec4c648edfa38bd4c102ab3f744a641a70 Mon Sep 17 00:00:00 2001 From: glebkostin Date: Sat, 1 Jun 2024 02:23:36 +0300 Subject: [PATCH 14/14] =?UTF-8?q?HAR-146:=20=D0=98=D1=81=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D0=BB=20=D1=80=D0=B0=D0=B7=D0=BC=D0=B5=D1=80=D1=8B=20?= =?UTF-8?q?=D0=B2=20=D1=88=D0=B5=D1=80=D0=B8=D0=BD=D0=B3=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/entity/chatListItem/ui/chatListItem.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/source/entity/chatListItem/ui/chatListItem.scss b/source/entity/chatListItem/ui/chatListItem.scss index 81c18424..7a81db25 100644 --- a/source/entity/chatListItem/ui/chatListItem.scss +++ b/source/entity/chatListItem/ui/chatListItem.scss @@ -8,6 +8,11 @@ min-width: 100px; } +.chat-list-avatar{ + width: 50px; + height: 50px; +} + @media screen and (max-width: 1024px) { .chat-list-item { width: 50vw;