From 230647febe3bf7d9487f0c4d6147720e27e157e0 Mon Sep 17 00:00:00 2001
From: Alex <ddragon99999@gmail.com>
Date: Mon, 11 Dec 2023 14:14:26 +0300
Subject: [PATCH 1/3] [feature] emoji and user forum name added

---
 .../src/pages/ForumItemPage/ForumItemPage.tsx |  8 ++++--
 .../addMessageFrame/addMessageFrame.tsx       |  4 ++-
 .../forumMessagesList/forumMessagesList.tsx   | 27 ++++++++++++++++++-
 packages/client/src/pages/Main/MainPage.tsx   |  1 +
 4 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/packages/client/src/pages/ForumItemPage/ForumItemPage.tsx b/packages/client/src/pages/ForumItemPage/ForumItemPage.tsx
index 093fd71..e704ba1 100644
--- a/packages/client/src/pages/ForumItemPage/ForumItemPage.tsx
+++ b/packages/client/src/pages/ForumItemPage/ForumItemPage.tsx
@@ -10,6 +10,8 @@ import { forums as previeForums } from '../Forum/components/forumPreviewTable/st
 import { TForum, TMessage, messageFormFileds } from './model'
 import ForumMessagesList from './components/forumMessagesList/forumMessagesList'
 import AddMessageFrame from './components/addMessageFrame/addMessageFrame'
+import { useTypedSelector } from '../../redux/store'
+import { getUserData } from '../../redux/selectors'
 
 const ForumPage = () => {
   const { id } = useParams()
@@ -18,7 +20,8 @@ const ForumPage = () => {
   if (!forum) return <Navigate to="*" />
   const { theme, messages }: TForum = forum
   const [forumMessages, updateForum] = useState(messages)
-
+  const user = useTypedSelector(getUserData)
+  console.log(user)
   const callbacks = {
     onAddMessage: useCallback(
       (e: FormEvent) => {
@@ -32,7 +35,7 @@ const ForumPage = () => {
         const newMesage: TMessage = {
           messageId: uuid(),
           message,
-          author: 'Admin',
+          author: user.login ? user.login : 'Author',
           time: new Date(),
         }
         forum.messages.push(newMesage)
@@ -52,6 +55,7 @@ const ForumPage = () => {
         <AddMessageFrame
           inputName={messageFormFileds.message}
           onAddMessage={callbacks.onAddMessage}
+          name={user.login}
         />
       </div>
     </div>
diff --git a/packages/client/src/pages/ForumItemPage/components/addMessageFrame/addMessageFrame.tsx b/packages/client/src/pages/ForumItemPage/components/addMessageFrame/addMessageFrame.tsx
index 2523aac..bab0e10 100644
--- a/packages/client/src/pages/ForumItemPage/components/addMessageFrame/addMessageFrame.tsx
+++ b/packages/client/src/pages/ForumItemPage/components/addMessageFrame/addMessageFrame.tsx
@@ -6,17 +6,19 @@ import './styles.scss'
 type TAddMessageFrameProps = {
   inputName: string
   onAddMessage: (e: FormEvent) => void
+  name: string
 }
 
 const AddMessageFrame = ({
   inputName,
   onAddMessage,
+  name = 'Admin',
 }: TAddMessageFrameProps) => {
   const cn = bem('addMessageFrame')
 
   return (
     <div className={cn()}>
-      <div>Admin</div>
+      <div>{name}</div>
       <form onSubmit={onAddMessage} className={cn('form')}>
         <label htmlFor={inputName} className={cn('label')}>
           <textarea
diff --git a/packages/client/src/pages/ForumItemPage/components/forumMessagesList/forumMessagesList.tsx b/packages/client/src/pages/ForumItemPage/components/forumMessagesList/forumMessagesList.tsx
index 0d851f0..443fc36 100644
--- a/packages/client/src/pages/ForumItemPage/components/forumMessagesList/forumMessagesList.tsx
+++ b/packages/client/src/pages/ForumItemPage/components/forumMessagesList/forumMessagesList.tsx
@@ -1,11 +1,17 @@
-import { memo } from 'react'
+import { memo, useState } from 'react'
 import { TMessage } from '../../model'
 
 import bem from 'bem-ts'
 import './styles.scss'
 import { forums } from '../../../Forum/components/forumPreviewTable/stubs'
 
+const emoji = ['😀', '🤑', '😭', '💩', '❤', '👍']
 const ForumMessagesList = ({ messages }: { messages: TMessage[] }) => {
+  const [selectedEmoji, setSelectedEmoji] = useState('')
+
+  const handleEmojiSelect = (emoji: string) => {
+    setSelectedEmoji(emoji)
+  }
   const cn = bem('forumMessages')
   const getTime = (time: Date) => {
     return (
@@ -29,7 +35,26 @@ const ForumMessagesList = ({ messages }: { messages: TMessage[] }) => {
             <span>{author}</span>
             <span>{getTime(time)}</span>
           </div>
+          {selectedEmoji}
           <p>{message}</p>
+          <div
+            style={{
+              display: 'flex',
+            }}>
+            {emoji.map((item, index) => (
+              <div>
+                <button
+                  key={item}
+                  style={{
+                    width: '30px',
+                    height: '30px',
+                  }}
+                  onClick={() => handleEmojiSelect(`${item}`)}>
+                  {item}
+                </button>
+              </div>
+            ))}
+          </div>
         </li>
       ))}
     </ul>
diff --git a/packages/client/src/pages/Main/MainPage.tsx b/packages/client/src/pages/Main/MainPage.tsx
index 0642ddd..acc1230 100644
--- a/packages/client/src/pages/Main/MainPage.tsx
+++ b/packages/client/src/pages/Main/MainPage.tsx
@@ -30,6 +30,7 @@ const MainPage = () => {
       <MainButton to={'start'} text={'Начать игру'} />
       <MainButton to={'board'} text={'Таблица лидеров'} />
       <MainButton to={'profile'} text={'Профиль'} />
+      <MainButton to={'forum'} text={'Форум'} />
       <Typography
         variant={'h2'}
         component={'h2'}

From 18759bd4f0bcd9229414f31f5cc4dff328791773 Mon Sep 17 00:00:00 2001
From: Alex <ddragon99999@gmail.com>
Date: Mon, 11 Dec 2023 14:15:06 +0300
Subject: [PATCH 2/3] [lint] fix

---
 .../components/forumMessagesList/forumMessagesList.tsx         | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/client/src/pages/ForumItemPage/components/forumMessagesList/forumMessagesList.tsx b/packages/client/src/pages/ForumItemPage/components/forumMessagesList/forumMessagesList.tsx
index 443fc36..ff50fa5 100644
--- a/packages/client/src/pages/ForumItemPage/components/forumMessagesList/forumMessagesList.tsx
+++ b/packages/client/src/pages/ForumItemPage/components/forumMessagesList/forumMessagesList.tsx
@@ -3,7 +3,6 @@ import { TMessage } from '../../model'
 
 import bem from 'bem-ts'
 import './styles.scss'
-import { forums } from '../../../Forum/components/forumPreviewTable/stubs'
 
 const emoji = ['😀', '🤑', '😭', '💩', '❤', '👍']
 const ForumMessagesList = ({ messages }: { messages: TMessage[] }) => {
@@ -41,7 +40,7 @@ const ForumMessagesList = ({ messages }: { messages: TMessage[] }) => {
             style={{
               display: 'flex',
             }}>
-            {emoji.map((item, index) => (
+            {emoji.map(item => (
               <div>
                 <button
                   key={item}

From 05bd3760247f11da71662df1acb6b26de6a5c9d9 Mon Sep 17 00:00:00 2001
From: Alex <ddragon99999@gmail.com>
Date: Mon, 11 Dec 2023 18:17:37 +0300
Subject: [PATCH 3/3] [fix] log

---
 packages/client/src/pages/ForumItemPage/ForumItemPage.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/client/src/pages/ForumItemPage/ForumItemPage.tsx b/packages/client/src/pages/ForumItemPage/ForumItemPage.tsx
index e704ba1..73f8e3f 100644
--- a/packages/client/src/pages/ForumItemPage/ForumItemPage.tsx
+++ b/packages/client/src/pages/ForumItemPage/ForumItemPage.tsx
@@ -21,7 +21,6 @@ const ForumPage = () => {
   const { theme, messages }: TForum = forum
   const [forumMessages, updateForum] = useState(messages)
   const user = useTypedSelector(getUserData)
-  console.log(user)
   const callbacks = {
     onAddMessage: useCallback(
       (e: FormEvent) => {