diff --git a/frontend/.eslintrc.json b/frontend/.eslintrc.json
index 57125a2..6b2ceb0 100644
--- a/frontend/.eslintrc.json
+++ b/frontend/.eslintrc.json
@@ -36,7 +36,8 @@
{
"js": "ignorePackages"
}
- ]
+ ],
+ "jsx-a11y/label-has-associated-control": ["error", { "assert": "either" }]
},
"parserOptions": {
"ecmaFeatures": {
@@ -45,5 +46,4 @@
"ecmaVersion": "latest",
"sourceType": "module"
}
-
}
diff --git a/frontend/src/components/ModalNewComment/ModalNewComment.js b/frontend/src/components/ModalNewComment/ModalNewComment.js
new file mode 100644
index 0000000..d72429f
--- /dev/null
+++ b/frontend/src/components/ModalNewComment/ModalNewComment.js
@@ -0,0 +1,26 @@
+import styles from './ModalNewComment.module.css';
+import Input from '../ui/Input/input';
+import Text from '../ui/Text/Text';
+
+function ModalNewComment({ title, post }) {
+ return (
+
+
{title}
+
+
+

+
+
+
+
+ {post.comments.map((comment) => (
+ - {comment}
+ ))}
+
+
+
+
+
+ );
+}
+export default ModalNewComment;
diff --git a/frontend/src/components/ModalNewComment/ModalNewComment.module.css b/frontend/src/components/ModalNewComment/ModalNewComment.module.css
new file mode 100644
index 0000000..bdf9477
--- /dev/null
+++ b/frontend/src/components/ModalNewComment/ModalNewComment.module.css
@@ -0,0 +1,55 @@
+h2 {
+ padding: 0;
+ display: flex;
+ justify-content: unset;
+}
+
+.comment_subTitle {
+ position: fixed;
+ top: 12rem;
+ left: 12.19rem;
+}
+
+.comment_image {
+ background-color: var(--black);
+ position: relative;
+ display: inline-block;
+ height: 23rem;
+ width: 31.9375rem;
+ left: 3.625rem;
+ top: 7.9375rem;
+}
+.image {
+ width: 100%;
+ height: 100%;
+}
+.comment_body {
+ position: relative;
+ float: right;
+ padding: 5rem;
+}
+
+.comments {
+ position: relative;
+ overflow-y: auto;
+ width: 24.68rem;
+ height: 22.5rem;
+ left: 0.625rem;
+ background-color: #d9d9d9;
+}
+
+.send_button {
+ position: relative;
+ left: 17.5rem;
+ height: 3.75rem;
+ width: 7.81rem;
+ border: none;
+}
+.list_item {
+ list-style-position: inside;
+ content: normal;
+ padding: 1.25rem;
+}
+li::marker {
+ content: normal;
+}
diff --git a/frontend/src/components/ModalNewPost/ModalNewPost.js b/frontend/src/components/ModalNewPost/ModalNewPost.js
new file mode 100644
index 0000000..479947d
--- /dev/null
+++ b/frontend/src/components/ModalNewPost/ModalNewPost.js
@@ -0,0 +1,28 @@
+import styles from './ModalNewPost.module.css';
+import Input from '../ui/Input/input';
+import Textarea from '../ui/Textarea/Textarea';
+import Text from '../ui/Text/Text';
+import UploadFile from '../UploadFile/UploadFile';
+
+function ModalNewPost() {
+ return (
+
+ );
+}
+export default ModalNewPost;
diff --git a/frontend/src/components/ModalNewPost/ModalNewPost.module.css b/frontend/src/components/ModalNewPost/ModalNewPost.module.css
new file mode 100644
index 0000000..91591d3
--- /dev/null
+++ b/frontend/src/components/ModalNewPost/ModalNewPost.module.css
@@ -0,0 +1,39 @@
+.post_container {
+ height: 80%;
+}
+
+.modal_photo {
+ display: flex;
+ position: relative;
+ left: 3.75rem;
+ top: 6.5rem;
+ width: 31.625rem;
+ height: 22.9rem;
+ background-color: var(--black);
+}
+
+.modal_right {
+ position: relative;
+ left: 32.5rem;
+ bottom: 21.25rem;
+}
+.description {
+ position: relative;
+ width: 25rem;
+}
+.title {
+ position: relative;
+ left: -.625rem;
+ width: 25rem;
+}
+.location {
+ position: relative;
+ left: -.625rem;
+}
+.modal_textareas {
+ position: relative;
+ display: grid;
+ top: 5.625rem;
+ left: 9.5625rem;
+ align-items: end;
+}
diff --git a/frontend/src/components/Post/Post.js b/frontend/src/components/Post/Post.js
index abc2375..43066b8 100644
--- a/frontend/src/components/Post/Post.js
+++ b/frontend/src/components/Post/Post.js
@@ -2,7 +2,7 @@ import styles from './Post.module.css';
import Card from '../ui/Card/Card';
import PostFooter from '../PostFooter/PostFooter';
-function Post({ post }) {
+function Post({ post, handleCommentOpen }) {
return (
}
description={post.description}
- Footer={}
+ Footer={}
size='m'
variant='wide'
/>
diff --git a/frontend/src/components/PostFooter/PostFooter.js b/frontend/src/components/PostFooter/PostFooter.js
index 7bb7443..e7ea405 100644
--- a/frontend/src/components/PostFooter/PostFooter.js
+++ b/frontend/src/components/PostFooter/PostFooter.js
@@ -3,8 +3,7 @@ import { AiFillLike } from 'react-icons/ai';
import { MdAddComment } from 'react-icons/md';
import styles from './PostFooter.module.css';
-function PostFooter({ postId, likes, comments }) {
- const [isModalOpen, setIsModalOpen] = useState(false);
+function PostFooter({ postId, post, likes, comments, handleCommentOpen }) {
const [isLiked, setIsLiked] = useState([]);
const handleLikeClick = (postId) => {
@@ -14,8 +13,8 @@ function PostFooter({ postId, likes, comments }) {
setIsLiked([...isLiked, postId]);
}
};
- const handleCommentClick = () => {
- setIsModalOpen(true);
+ const handleCommentClick = (post) => {
+ handleCommentOpen(post);
};
const isPostLiked = isLiked.includes(postId);
@@ -26,7 +25,7 @@ function PostFooter({ postId, likes, comments }) {
-