fixing after mege problems

Sicnecher · Jan 18, 2025 · cf3b1ac · cf3b1ac
1 parent db56d63
commit cf3b1ac
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 36 deletions.
diff --git a/src/cmps/dynamicCmps/Members.jsx b/src/cmps/dynamicCmps/Members.jsx
@@ -6,9 +6,6 @@ import { useSelector } from "react-redux";
 export function Members({ cellId, group, task, members, onTaskUpdate, users }) {
     const openModalId = useSelector(state => state.boardModule.openModal)
     const modal = (openModalId === cellId)
-    useEffect(() => {
-        console.log(members)
-    }, [])
 
     const modalRef = useRef(null)
     const membersCellRef = useRef(null)

diff --git a/src/cmps/dynamicCmps/modals/ChatModal.jsx b/src/cmps/dynamicCmps/modals/ChatModal.jsx
@@ -20,6 +20,8 @@ export function ChatModal({
     const [newReplies, setNewReplies] = useState(
         chat.map(comment => ({ id: comment.sentAt, text: "" })))
 
+    console.log(users)
+
     // toggel btween spectate and edit mode
     function toggleEditMode() {
         if (onEditMode) {
@@ -138,9 +140,9 @@ export function ChatModal({
                                     const replier = getUserById(reply.userId);
                                     return (
                                         <li key={`${reply.sentAt}-${reply.userId}`} className="reply">
-                                            <img src={replier.imgUrl} alt={replier.name} />
+                                            <img src={replier.imgUrl} alt={replier.fullName} />
                                             <div className="replay-container">
-                                                <p>{replier.name}</p>
+                                                <p>{replier.fullName}</p>
                                                 <p className="reply-text">{reply.text}</p>
                                             </div>
                                             <p className="reply-time">{simplifyTimeToStr(reply.sentAt)}</p>

diff --git a/src/cmps/dynamicCmps/progressCmps/P_Date.jsx b/src/cmps/dynamicCmps/progressCmps/P_Date.jsx
@@ -3,7 +3,6 @@ import { utilService } from "../../../services/util.service.js"
 export function P_Date({tasks}){
 
     const dates = tasks.map(task=> utilService.formatStrToDate(task.date))
-    console.log(dates)
     const {firstDate, lastDate} = getFirstAndLastDate(dates)
     const finalStr = betweenDatesStr(firstDate, lastDate)
     const progressPrecentage = precentageOfToday(firstDate, lastDate)

diff --git a/src/cmps/dynamicCmps/progressCmps/P_Members.jsx b/src/cmps/dynamicCmps/progressCmps/P_Members.jsx
@@ -22,12 +22,9 @@ export function P_Members({tasks}){
         <div className="progress-members">
             {
                 allMembers.length
-                ? allMembers.map(member=><span key={member.id}>
-                    <img src={member.imgUrl}/>
-                </span>)
+                ? allMembers.map(member=>
+                    <img key={member.id} src={member.imgUrl}/>)
                 : <img src={defultImg}/>
-
-
             }
         </div>
     )

diff --git a/src/services/board.service.js b/src/services/board.service.js
@@ -249,20 +249,7 @@ async function makeFirstBoard() {
             date: '27-02-2022',
             status: { text: 'Working on it', color: '#FDAB3D' },
             priority: { text: 'Low', color: '#86B6FB' },
-            chat: [
-              {
-                userId: 'userid0',
-                sentAt: new Date(),
-                text: 'comment comment comment...',
-                replies: [
-                  {
-                    userId: 'userid1',
-                    sentAt: new Date(),
-                    text: 'reply reply reply...',
-                  },
-                ],
-              },
-            ],
+            chat: [],
           },
           {
             id: 't102',

diff --git a/src/styles/_login.scss b/src/styles/_login.scss
@@ -10,11 +10,6 @@
   }
 }
 
-p {
-  // border-top: 1px solid #333;
-  // padding-top: 1rem;
-}
-
 a {
   text-decoration: none;
   color: #0073ea;

diff --git a/src/styles/dynamicCmps/modals/_ChatModal.scss b/src/styles/dynamicCmps/modals/_ChatModal.scss
@@ -5,7 +5,7 @@
     z-index: 100;
     position: absolute;
     top: 0px; // temporary
-    right: 0px; // temporary
+    right: 300px; // temporary
     width: 50%;
     height: 600px;
     background-color: white;

diff --git a/src/styles/dynamicCmps/progressCmps/_P_Date.scss b/src/styles/dynamicCmps/progressCmps/_P_Date.scss
@@ -1,6 +1,6 @@
 
 .prog-box.with-date{
-    height: 50px; // temporary
+    padding: 5px;
 
     .progress-date{
         position: relative;

diff --git a/src/styles/dynamicCmps/progressCmps/_P_Members.scss b/src/styles/dynamicCmps/progressCmps/_P_Members.scss
@@ -12,8 +12,8 @@
         margin-left: 5px;
 
         img{
-            width: 35px;
-            height: 35px;
+            width: 30px;
+            height: 30px;
             border-radius: 50%;
             border: solid white 2px;
             margin-left: -10px;

diff --git a/src/styles/dynamicCmps/progressCmps/_P_Priority.scss b/src/styles/dynamicCmps/progressCmps/_P_Priority.scss
@@ -1,6 +1,6 @@
 
 .prog-box.with-priority{
-    padding: none;
+    padding: 5px;
 
     .progress-priority{
         display: flex;
@@ -10,6 +10,7 @@
         border: none;
 
         .color-block{
+            padding: 0px;
             height: 100%;
         }
     }

diff --git a/src/styles/dynamicCmps/progressCmps/_P_Status.scss b/src/styles/dynamicCmps/progressCmps/_P_Status.scss
@@ -1,6 +1,6 @@
 
 .prog-box.with-status{
-    padding: none;
+    padding: 5px;
 
     .progress-status{
         display: flex;
@@ -10,6 +10,7 @@
         border: none;
 
         .color-block{
+            padding: 0px;
             height: 100%;
         }
     }