- Изменить автар
+
+
-
+
+ 
+ 
| № | -id человека | -друг | -- | - | - | - | - |
|---|
+ 
Страница главная отображает посты и комментарии, diff --git a/5 lab/src/components/help/hooks/HelpFormModalHook.js b/5 lab/src/components/help/hooks/HelpFormModalHook.js index 379d3e4..720d5e1 100644 --- a/5 lab/src/components/help/hooks/HelpFormModalHook.js +++ b/5 lab/src/components/help/hooks/HelpFormModalHook.js @@ -4,6 +4,7 @@ import useLinesItemForm from '../../users/hooks/UsersItemFormHook'; const useLinesFormModal = (linesChangeHandle, password) => { const { isModalShow, showModal, hideModal } = useModal(); + // eslint-disable-next-line no-unused-vars const [currentId, setCurrentId] = useState(0); const id = localStorage.getItem('UserId'); const { diff --git a/5 lab/src/components/information/index.jsx b/5 lab/src/components/information/index.jsx deleted file mode 100644 index 33e867e..0000000 --- a/5 lab/src/components/information/index.jsx +++ /dev/null @@ -1,50 +0,0 @@ -/* eslint-disable import/no-extraneous-dependencies */ -import { useState } from 'react'; -import Modal from 'react-modal'; -import { ListGroup } from 'react-bootstrap'; - -const customStyles = { - content: { - top: '50%', - left: '50%', - right: 'auto', - bottom: 'auto', - marginRight: '-50%', - transform: 'translate(-50%, -50%)', - }, - }; - -const Information = () => { - const [modalIsOpen, setModalIsOpen] = useState(false); - -const openModal = () => { - setModalIsOpen(true); -}; - -const closeModal = () => { - setModalIsOpen(false); -}; - const modalContent = ( -
Данный сделан специально для дисциплины интернет программирование
-в 2023 году
- -
- {lastmsg.toString()}
+_
{PostText}
-
-
diff --git a/5 lab/src/components/posts/hooks/PostsFormHook.js b/5 lab/src/components/posts/hooks/PostsFormHook.js
index bdf1c40..1ec1133 100644
--- a/5 lab/src/components/posts/hooks/PostsFormHook.js
+++ b/5 lab/src/components/posts/hooks/PostsFormHook.js
@@ -2,77 +2,33 @@ import { useState } from 'react';
import toast from 'react-hot-toast';
import LinesApiService from '../service/LinesApiService';
import useLinesItem from './PostsItemHook';
-import getBase64FromFile from '../../utils/Base64';
-const useLinesItemForm = (id, linesChangeHandle) => {
- const { item, setItem } = useLinesItem(id);
+const useLinesItemForm = (id, setLiked) => {
+ const { item } = useLinesItem(id);
const [validated, setValidated] = useState(false);
-
+ const [isLiked, setIsLiked] = useState(false);
+ const resetLiked = () => {
+ setIsLiked(true);
+ };
const resetValidity = () => {
setValidated(false);
};
- const getLineObject = (formData) => {
- const personId = localStorage.getItem('UserId');
- const Time = parseInt(formData.Time, 10);
- const PostText = formData.PostText.toString();
- const PostImage = formData.PostImage.startsWith('data:image') ? formData.PostImage : '';
- const Viewed = parseInt(formData.Viewed, 10) ? formData.Viewed : 0;
- const Liked = parseInt(formData.Liked, 10) ? formData.Viewed : 0;
- return {
- personId: personId.toString(),
- Time: Time.toString(),
- PostText: PostText.toString(),
- PostImage,
- Viewed: Viewed.toString(),
- Liked: Liked.toString(),
- };
- };
- const handleImageChange = async (event) => {
- const { files } = event.target;
- const file = await getBase64FromFile(files.item(0));
- setItem({
- ...item,
- PostImage: file,
- });
- };
-
- const handleChange = (event) => {
- if (event.target.type === 'file') {
- handleImageChange(event);
- return;
- }
- const inputName = event.target.name;
- const inputValue = event.target.type === 'checkbox' ? event.target.checked : event.target.value;
- setItem({
- ...item,
- [inputName]: inputValue,
- });
- };
- const handleSubmitComment = async (event) => {
- const form = event.currentTarget;
- event.preventDefault();
- event.stopPropagation();
- const body = getLineObject(item);
- if (form.checkValidity()) {
- await LinesApiService.update(id, body);
- if (linesChangeHandle) linesChangeHandle();
- toast.success('Элемент успешно сохранен', { id: 'LinesTable' });
- return true;
- }
- return false;
- };
const handleSubmitLike = async (event) => {
const form = event.currentTarget;
event.preventDefault();
event.stopPropagation();
- const body = getLineObject(item);
+ const data = await LinesApiService.get(id);
+ data.Liked = parseInt(item.Liked, 10);
if (form.checkValidity()) {
- if (id === undefined) {
- await LinesApiService.create(body);
+ if (isLiked.isLiked !== false) {
+ data.Liked += 1;
+ setLiked(data.Liked);
+ setIsLiked({ isLiked: false });
} else {
- await LinesApiService.update(id, body);
+ setLiked(data.Liked);
+ setIsLiked({ isLiked: true });
}
- if (linesChangeHandle) linesChangeHandle();
+ LinesApiService.update(id, data);
toast.success('Элемент успешно сохранен', { id: 'LinesTable' });
return true;
}
@@ -83,10 +39,9 @@ const useLinesItemForm = (id, linesChangeHandle) => {
return {
item,
validated,
- handleSubmitComment,
handleSubmitLike,
- handleChange,
resetValidity,
+ resetLiked,
};
};
diff --git a/5 lab/src/components/posts/hooks/PostsHook.js b/5 lab/src/components/posts/hooks/PostsHook.js
index 678331e..6e6cf87 100644
--- a/5 lab/src/components/posts/hooks/PostsHook.js
+++ b/5 lab/src/components/posts/hooks/PostsHook.js
@@ -13,7 +13,6 @@ const useLines = () => {
useEffect(() => {
getLines();
- // eslint-disable-next-line react-hooks/exhaustive-deps
}, [linesRefresh]);
return {
diff --git a/5 lab/src/components/posts/hooks/PostsItemFormHook.js b/5 lab/src/components/posts/hooks/PostsItemFormHook.js
index 2151e18..26d2c14 100644
--- a/5 lab/src/components/posts/hooks/PostsItemFormHook.js
+++ b/5 lab/src/components/posts/hooks/PostsItemFormHook.js
@@ -1,5 +1,3 @@
-/* eslint-disable import/extensions */
-/* eslint-disable import/no-unresolved */
import { useState } from 'react';
import toast from 'react-hot-toast';
import getBase64FromFile from '../../utils/Base64';
@@ -21,7 +19,7 @@ const useLinesItemForm = (id, linesChangeHandle) => {
const getLineObject = (formData) => {
const personId = localStorage.getItem('UserId');
- const Time = 0;
+ const Time = `${new Date().toLocaleDateString()} ${new Date().toLocaleTimeString()}`;
const PostText = formData.PostText.toString();
const PostImage = formData.PostImage.startsWith('data:image') ? formData.PostImage : '';
const Viewed = parseInt(formData.Viewed, 10) ? formData.Viewed : 0;
diff --git a/5 lab/src/components/users/hooks/UsersHook.js b/5 lab/src/components/users/hooks/UsersHook.js
index c0e9736..b8d459f 100644
--- a/5 lab/src/components/users/hooks/UsersHook.js
+++ b/5 lab/src/components/users/hooks/UsersHook.js
@@ -13,7 +13,6 @@ const useLines = (typeFilter) => {
useEffect(() => {
getLines();
- // eslint-disable-next-line react-hooks/exhaustive-deps
}, [linesRefresh, typeFilter]);
return {
diff --git a/5 lab/src/components/users/hooks/UsersItemFormHook.js b/5 lab/src/components/users/hooks/UsersItemFormHook.js
index 1650393..0eef15e 100644
--- a/5 lab/src/components/users/hooks/UsersItemFormHook.js
+++ b/5 lab/src/components/users/hooks/UsersItemFormHook.js
@@ -1,3 +1,4 @@
+/* eslint-disable no-param-reassign */
import { useState } from 'react';
import toast from 'react-hot-toast';
import getBase64FromFile from '../../utils/Base64';
@@ -66,35 +67,38 @@ const useLinesItemForm = (id, linesChangeHandle) => {
setValidated(true);
return false;
};
-
- const handleSubmitChange = async (event, type, string) => {
- const form = event.currentTarget;
+ const handleSubmitChangeNick = async (event, string, item2) => {
event.preventDefault();
event.stopPropagation();
- const body = getLineObject(item);
- switch (type) {
- case 'nickname':
- {
- body.nickname = string;
- break;
- }
- case 'avatar':
- {
- body.image = string.image;
- break;
- }
- case 'password':
- {
- body.password = string;
- break;
- }
- default:
- break;
- }
- if (form.checkValidity()) {
- await LinesApiService.update(id, body);
- }
- if (linesChangeHandle) linesChangeHandle();
+ item2.nickname = string;
+ setItem({
+ ...item,
+ nickname: string,
+ });
+ await LinesApiService.update(id, item2);
+ console.log(id);
+ setValidated(true);
+ return true;
+ };
+ const handleSubmitChangePass = async (event, string) => {
+ event.preventDefault();
+ event.stopPropagation();
+
+ item.password = string;
+
+ await LinesApiService.update(id, item);
+ console.log(id);
+ setValidated(true);
+ return true;
+ };
+ const handleSubmitChangeAva = async (event, string, item2) => {
+ event.preventDefault();
+ event.stopPropagation();
+ setItem({
+ ...item,
+ image: string.image,
+ });
+ await LinesApiService.update(id, item2);
toast.success('Элемент успешно сохранен', { id: 'LinesTable' });
setValidated(true);
return true;
@@ -104,7 +108,9 @@ const useLinesItemForm = (id, linesChangeHandle) => {
item,
validated,
handleSubmit,
- handleSubmitChange,
+ handleSubmitChangeNick,
+ handleSubmitChangeAva,
+ handleSubmitChangePass,
handleChange,
resetValidity,
};
diff --git a/5 lab/src/components/users/table/Users.jsx b/5 lab/src/components/users/table/Users.jsx
index 21e5b78..39ec070 100644
--- a/5 lab/src/components/users/table/Users.jsx
+++ b/5 lab/src/components/users/table/Users.jsx
@@ -26,7 +26,7 @@ const Lines = () => {
<>