apuc/guild_front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tracker-tasks

Browse Source
This commit is contained in:
Николай Полтщук
2023-06-29 19:19:13 +03:00
parent e58a576be9
commit d48957746f
4 changed files with 37 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/pages/ProjectTracker/ProjectTracker.js
View File

@ -20,6 +20,7 @@ import {
} from "@redux/projectsTrackerSlice";
import { urlForLocal } from "@utils/helper";
import { caseOfNum } from "@utils/helper";
import { apiRequest } from "@api/request";
@ -43,7 +44,6 @@ import project from "assets/icons/trackerProject.svg";
import tasks from "assets/icons/trackerTasks.svg";
import accept from "assets/images/accept.png";
import avatarMok from "assets/images/avatarMok.png";
import { caseOfNum } from "@utils/helper";
export const ProjectTracker = () => {
const dispatch = useDispatch();
@ -563,11 +563,17 @@ export const ProjectTracker = () => {
<div className="tasks__board__item__info">
<div className="tasks__board__item__info__more">
<img src={commentsBoard} alt="commentsImg" />
<span>{task.comment_count} {caseOfNum(task.comment_count, 'comments')}</span>
<span>
{task.comment_count}{" "}
{caseOfNum(task.comment_count, "comments")}
</span>
</div>
<div className="tasks__board__item__info__more">
<img src={filesBoard} alt="filesImg" />
<span>{task.files ? task.files : 0} {caseOfNum(0, 'files')}</span>
<span>
{task.files ? task.files : 0}{" "}
{caseOfNum(0, "files")}
</span>
</div>
</div>
</div>

23
src/pages/Tracker/Tracker.js
View File

@ -27,10 +27,10 @@ import archive from "assets/icons/archiveTracker.svg";
import search from "assets/icons/serchIcon.png";
import project from "assets/icons/trackerProject.svg";
import tasks from "assets/icons/trackerTasks.svg";
import avatarMok from "assets/images/avatarMok.png";
import noProjects from "assets/images/noProjects.png";
import "./tracker.scss";
import avatarMok from "assets/images/avatarMok.png";
export const Tracker = () => {
const dispatch = useDispatch();
@ -254,12 +254,18 @@ export const Tracker = () => {
<div className="task" key={task.id}>
<div className="task__info">
<h5>{task.title}</h5>
<p dangerouslySetInnerHTML={{ __html: task.description }} />
<p
dangerouslySetInnerHTML={{
__html: task.description,
}}
/>
</div>
<div className="task__person">
<img
src={
task.user?.avatar ? urlForLocal(task.user.avatar) : avatarMok
task.user?.avatar
? urlForLocal(task.user.avatar)
: avatarMok
}
alt="avatar"
/>
@ -304,12 +310,19 @@ export const Tracker = () => {
<div className="archive__completeTask" key={index}>
<div className="archive__completeTask__description">
<p>{task.title}</p>
<p className="date" dangerouslySetInnerHTML={{ __html: task.description }} />
<p
className="date"
dangerouslySetInnerHTML={{
__html: task.description,
}}
/>
</div>
<div className="archive__completeTask__info">
<img
src={
task.user?.avatar ? urlForLocal(task.user.avatar) : avatarMok
task.user?.avatar
? urlForLocal(task.user.avatar)
: avatarMok
}
alt="avatar"
/>