-
Срок: {String(selectedDuration)} месяц(-ев)
+
+
+
{subscription.title}
+
+
+
+
+
+ {" "}
+ {String(subscription.cost)}₽ в месяц
+
+
+
+
+ Период: {String(selectedDuration)} месяц(-ев)
+
+
+
-
diff --git a/src/entities/profileabout/ui/ui.tsx b/src/entities/profileabout/ui/ui.tsx
index 9b3e600..fec8c83 100755
--- a/src/entities/profileabout/ui/ui.tsx
+++ b/src/entities/profileabout/ui/ui.tsx
@@ -37,6 +37,11 @@ export function renderAbout(
} else {
result = newValue;
}
+ } else if (
+ authorData.info === "Укажите, чем вы занимаетесь" &&
+ window.location.pathname !== "/profile"
+ ) {
+ result = "";
} else {
result = authorData.info;
}
@@ -70,19 +75,21 @@ export function renderAbout(
const defaultModeValue = (
ОБ АВТОРЕ
-
-
{result}
+
-
);
diff --git a/src/entities/userPost/ui/ui.tsx b/src/entities/userPost/ui/ui.tsx
index b25d7b0..3d5b5b4 100755
--- a/src/entities/userPost/ui/ui.tsx
+++ b/src/entities/userPost/ui/ui.tsx
@@ -31,13 +31,12 @@ async function renderUserPost(post: any) {
styleInitial = "filter: blur(8px);";
flagBlock = `
z-index: 1;
- width: 100%;
+ width: 93%;
display: flex;
align-content: center;
justify-content: center;
align-items: center;
flex-wrap: wrap;
- height: 100%;
position: absolute;
flex-direction: column;
`;
diff --git a/src/features/controlAdaptivePageAuthor/controlAdaptivePageAuthor.ts b/src/features/controlAdaptivePageAuthor/controlAdaptivePageAuthor.ts
index 1e8a216..f6a69d0 100755
--- a/src/features/controlAdaptivePageAuthor/controlAdaptivePageAuthor.ts
+++ b/src/features/controlAdaptivePageAuthor/controlAdaptivePageAuthor.ts
@@ -21,6 +21,7 @@ import { getPageAuthor } from "../getpageauthor/getpageauthor";
import { setLike } from "../../entities/likes";
import { route } from "../../shared/routing/routing";
import {
+ controlMediaFiles,
controlSlideShow,
modifireComments,
paginateComments,
@@ -31,7 +32,6 @@ import { hasLogged } from "../../shared/utils/hasLogged";
import { showOverlay } from "../../shared/overlay/overlay";
import { setStatic } from "../../shared/getStatic/getStatic";
import {
- iconStatusPublished,
pageContainer,
urlIconComment,
urlIconLike,
@@ -40,7 +40,6 @@ import {
} from "../../app";
import { addComment } from "../../entities/comments/api/api";
import { fetchAjax } from "../../shared/fetch/fetchAjax";
-import { findCommentById } from "../../shared/findByID/findByID";
/**
* Управление адаптивностью на странице автора
@@ -232,6 +231,7 @@ export async function customizePostProfile(
post: any,
postId: any = null,
) {
+ controlMediaFiles(container);
const iconLike: any = container.querySelector(`.likes`);
const iconComment: any = container.querySelector(`.comments`);
const iconSad: any = container.querySelector(`.sad`);
@@ -243,9 +243,7 @@ export async function customizePostProfile(
if (post.status === "BLOCKED") {
setStatic(iconSad, urlSad);
}
- if (iconOk) {
- setStatic(iconOk, iconStatusPublished);
- }
+
setTitle(container, post);
setContent(container, post);
@@ -378,64 +376,33 @@ export async function setComments(container: any, post: any) {
loader.style.display = "flex";
const formComment: any = container.querySelector(`.form-group-comment`);
const nextCommentsButton: any = container.querySelector(`.next-comments`);
- if (placeContent.querySelectorAll(".container-comment").length === 1) {
- try {
- const activeRequests = new Set();
- const placeContent = container.querySelector(`.place-content`);
- await paginateComments(
- activeRequests,
- [],
- placeContent,
- post.postId,
- 1,
- );
- } finally {
- divLoader.style.display = "none";
- loader.style.display = "none";
- formComment.style.display = "flex";
- nextCommentsButton.textContent = "Скрыть комментарии";
- }
- } else if (
- placeContent.querySelectorAll(".container-comment").length === 0
- ) {
- try {
- const activeRequests = new Set();
- const placeContent = container.querySelector(`.place-content`);
- await paginateComments(
- activeRequests,
- [],
- placeContent,
- post.postId,
- 0,
- );
- } finally {
- divLoader.style.display = "none";
- loader.style.display = "none";
- formComment.style.display = "flex";
- nextCommentsButton.textContent = "Скрыть комментарии";
- }
- } else {
- try {
- formComment.style.display = "flex";
- nextCommentsButton.textContent = "Скрыть комментарии";
- divLoader.style.display = "none";
- loader.style.display = "none";
- const comments: any = await getComments(post.postId, 0, 300);
- const myComment = findCommentById(commentID, comments);
- placeContent.append(...(await renderComments([myComment])));
- modifireComments(placeContent, [myComment], post.postId);
- } catch (error) {
- } finally {
- nextCommentsButton.style.display = "flex";
- divLoader.style.display = "none";
- loader.style.display = "none";
- formComment.style.display = "flex";
- nextCommentsButton.textContent = "Скрыть комментарии";
- }
+ try {
+ const activeRequests = new Set();
+ const placeContent = container.querySelector(`.place-content`);
+ await paginateComments(
+ activeRequests,
+ [],
+ placeContent,
+ post.postId,
+ placeContent.querySelectorAll(".comment-item").length,
+ );
+ } catch (error) {
+ } finally {
+ divLoader.style.display = "none";
+ loader.style.display = "none";
+ formComment.style.display = "flex";
+ nextCommentsButton.textContent = "Скрыть комментарии";
}
+
console.log(placeContent);
text.value = "";
sendCount++;
+ const commentsCount: any = await getComments(post.postId, 0, 300);
+ const amountComments: any = container.querySelector(`.amount-comments`);
+ amountComments.innerHTML = `${commentsCount.length}`;
+ if (placeContent.querySelectorAll(".comment-item").length > 1) {
+ nextCommentsButton.style.display = "block";
+ }
};
const handleClickButtonSendComment = async (e: any) => {
e.preventDefault();
@@ -458,7 +425,7 @@ export async function setComments(container: any, post: any) {
const comments: any = await getComments(post.postId, 0, 300);
const nextComments = comments.slice(0, 1);
placeContent.append(...(await renderComments(nextComments)));
- modifireComments(placeContent, nextComments.reverse(), post.postId);
+ modifireComments(placeContent, nextComments, post.postId);
if (comments.length > 1) {
nextCommentsButton.style.display = "block";
}
@@ -475,7 +442,7 @@ export async function setComments(container: any, post: any) {
const loader = container.querySelector(`.loader__search`);
const formComment = container.querySelector(`.form-group-comment`);
- if (placeContent.querySelectorAll(".container-comment").length <= 1) {
+ if (placeContent.querySelectorAll(".comment-item").length <= 1) {
currentScrollPositipn = Number(
sessionStorage.getItem("scrollPosition"),
);
@@ -489,7 +456,7 @@ export async function setComments(container: any, post: any) {
[],
placeContent,
post.postId,
- 1,
+ placeContent.querySelectorAll(".comment-item").length,
);
} finally {
divLoader.style.display = "none";
@@ -501,7 +468,7 @@ export async function setComments(container: any, post: any) {
// Прокрутка вниз после загрузки комментариев
} else {
nextCommentsButton.textContent = "Показать следующие комментарии...";
- const allItems = placeComments.querySelectorAll(`.container-comment`);
+ const allItems = placeComments.querySelectorAll(`.comment-item`);
allItems.forEach((item: any, index: number) => {
if (index !== 0) {
item.remove();
diff --git a/src/features/controlInfo/controlInfo.ts b/src/features/controlInfo/controlInfo.ts
index 21572fb..e751855 100755
--- a/src/features/controlInfo/controlInfo.ts
+++ b/src/features/controlInfo/controlInfo.ts
@@ -3,6 +3,8 @@ import { setVibe } from "../setvibe/setvibe";
import { getPageAuthor } from "../getpageauthor/getpageauthor";
import { renderAbout } from "../../entities/profileabout";
import DOMPurify from "dompurify";
+import { setStatic } from "../../shared/getStatic/getStatic";
+import { iconEditStatus } from "../../app";
/**
* УПравление информацией "О СЕБЕ"
@@ -11,6 +13,10 @@ import DOMPurify from "dompurify";
* @returns
*/
function controlInfo(authorData: any, container: any) {
+ const title = container.querySelector(`.about-profile`);
+ if (title.textContent === "" && window.location.pathname !== "/profile") {
+ title.textContent = "Автор еще ничего про себя не написал";
+ }
if (window.location.pathname !== "/profile") {
return 0;
}
@@ -24,6 +30,10 @@ function controlInfo(authorData: any, container: any) {
const content: any = renderAbout(newdataUser, true);
const place: any = document.querySelector(`.place-edit-info`);
update(place, content);
+ const iconDivEditStatus = place.querySelector(`.edit-info-button`);
+ if (iconDivEditStatus) {
+ setStatic(iconDivEditStatus, iconEditStatus);
+ }
return;
} catch (error) {
console.error("Ошибка при обновлении информации:", error);
@@ -32,8 +42,8 @@ function controlInfo(authorData: any, container: any) {
if (event.target.classList.contains("save-info-button")) {
const input = container.querySelector(`.about-input`);
- const newValue = input.value;
-
+ let newValue = input.value;
+ if (newValue === "") newValue = "Укажите чем вы занимаетесь";
// Сохраняем информацию
try {
const response = await setVibe(newValue);
@@ -41,6 +51,10 @@ function controlInfo(authorData: any, container: any) {
const content = renderAbout(newdataUser, false, newValue);
const place: any = document.querySelector(`.place-edit-info`);
update(place, content);
+ const iconDivEditStatus = place.querySelector(`.edit-info-button`);
+ if (iconDivEditStatus) {
+ setStatic(iconDivEditStatus, iconEditStatus);
+ }
return;
} catch (error) {
console.error("Ошибка при обновлении информации:", error);
@@ -57,6 +71,10 @@ function controlInfo(authorData: any, container: any) {
const content = renderAbout(newdataUser, false, currentText);
const place: any = document.querySelector(`.place-edit-info`);
update(place, content);
+ const iconDivEditStatus = place.querySelector(`.edit-info-button`);
+ if (iconDivEditStatus) {
+ setStatic(iconDivEditStatus, iconEditStatus);
+ }
return;
}
// container.removeEventListener("click", handleClick);
diff --git a/src/features/getavatar/getavatar.ts b/src/features/getavatar/getavatar.ts
index 244b1a3..90458ad 100755
--- a/src/features/getavatar/getavatar.ts
+++ b/src/features/getavatar/getavatar.ts
@@ -6,13 +6,20 @@ import { fetchAjax } from "../../shared/fetch/fetchAjax";
* @param authorID Автор айди
* @returns
*/
-export async function getAvatar(link: string, authorID: any = null) {
+export async function getAvatar(link: string, authorId: any = null) {
return new Promise((resolve, reject) => {
fetchAjax(
+ // "GET",
+ // link == "/profile" && !authorID
+ // ? "/api/accounts/account/me/avatar"
+ // : `/api/accounts/account/${authorID ? authorID : link.split("/").pop()}/avatar`,
+
"GET",
- link == "/profile"
+ link === "/profile" && !authorId
? "/api/accounts/account/me/avatar"
- : `/api/accounts/account/${authorID ? authorID : link.split("/").pop()}/avatar`,
+ : !authorId
+ ? `/api/accounts/account/${sessionStorage.getItem("authorid") ? sessionStorage.getItem("authorid") : link.split("/").pop()}/avatar`
+ : `/api/accounts/account/${authorId ? authorId : link.split("/").pop()}/avatar`,
null,
(response) => {
if (response.ok) {
diff --git a/src/features/paginateFeed/nextarrow.tsx b/src/features/paginateFeed/nextarrow.tsx
new file mode 100644
index 0000000..07589ed
--- /dev/null
+++ b/src/features/paginateFeed/nextarrow.tsx
@@ -0,0 +1,11 @@
+import * as VDom from "vdom";
+
+function renderNextArrow(count: string) {
+ return (
+
+ );
+}
+
+export { renderNextArrow };
diff --git a/src/features/paginateFeed/paginateFeed.ts b/src/features/paginateFeed/paginateFeed.ts
index 91bfe9c..c38286f 100755
--- a/src/features/paginateFeed/paginateFeed.ts
+++ b/src/features/paginateFeed/paginateFeed.ts
@@ -15,6 +15,7 @@ import { renderComplaint } from "../../pages/feed/ui/feed";
import { fetchAjax } from "../../shared/fetch/fetchAjax";
import { setStatic } from "../../shared/getStatic/getStatic";
import {
+ iconArrowNextMediaFiles,
pageContainer,
urlDeleteComment,
urlEditComment,
@@ -38,8 +39,10 @@ import {
} from "../../widgest/feed/ui/comments/comments";
import { findCommentById } from "../../shared/findByID/findByID";
import DOMPurify from "dompurify";
+import { renderNextArrow } from "./nextarrow";
export function controlSlideShow(container: any, rightContainer: any) {
+ const nextButtonMedia = container.querySelector(`.next-media-button`);
const modalPhotos: any = document.querySelector(`.modal-view-photos`); //
const rightContent: any = rightContainer;
const closeModal: any = document.querySelector(`.close-modal-view`); //
@@ -61,9 +64,7 @@ export function controlSlideShow(container: any, rightContainer: any) {
videoHud = modalPhotos.querySelector(`.video-hud`);
}
const video: any = Array.from(container.querySelectorAll(".video-player"));
- let allContent: any = Array.from(
- container.querySelectorAll(".content-media"),
- );
+ let allContent: any = Array.from(container.querySelectorAll(".image-photo"));
// Функция для проверки, является ли элемент видео
const isAudio = (element: any) => {
// Предположим, что видео имеет тег