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

Compare commits

base: apuc:59d0f5eae6635f7663d99738b6f3eb7f69c25425
Branches Tags
apuc:main
apuc:fixes_tasks
apuc:developer_resume
apuc:page_under_construction
apuc:vacancy
apuc:summary_fix
apuc:current-design
..
compare: apuc:3a0426ae6d05de4cbc1fe9a49bda60479df8f3ab
Branches Tags
apuc:main
apuc:fixes_tasks
apuc:developer_resume
apuc:page_under_construction
apuc:vacancy
apuc:summary_fix
apuc:current-design

No commits in common. "59d0f5eae6635f7663d99738b6f3eb7f69c25425" and "3a0426ae6d05de4cbc1fe9a49bda60479df8f3ab" have entirely different histories.
59d0f5eae6 ... 3a0426ae6d

13 changed files with 46 additions and 51 deletions
Show Stats Expand all files Collapse all files

4
src/components/Modal/Tracker/ListEmployees/ListEmployees.jsx
View File

@ -6,7 +6,7 @@ import {
modalToggle modalToggle
} from "@redux/projectsTrackerSlice"; } from "@redux/projectsTrackerSlice";
import { caseOfNum, removeLast, urlForLocal } from "@utils/helper"; import { caseOfNum, urlForLocal } from "@utils/helper";
import { apiRequest } from "@api/request"; import { apiRequest } from "@api/request";
@ -67,7 +67,7 @@ const ListEmployees = ({
} }
alt="avatar" alt="avatar"
/> />
<span>{removeLast(person.user.fio)}</span> <span>{person.user.fio}</span>
<img <img
className="delete" className="delete"
src={close} src={close}

14
src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx
View File

@ -11,10 +11,10 @@ import { getProfileInfo } from "@redux/outstaffingSlice";
import { setProjectBoardFetch } from "@redux/projectsTrackerSlice"; import { setProjectBoardFetch } from "@redux/projectsTrackerSlice";
import { import {
backendImg,
caseOfNum, caseOfNum,
getCorrectRequestDate, getCorrectRequestDate,
getToken, getToken,
removeLast,
urlForLocal urlForLocal
} from "@utils/helper"; } from "@utils/helper";
@ -759,12 +759,12 @@ export const ModalTiсket = ({
<div className="workers_box task__info"> <div className="workers_box task__info">
<span className="exit" onClick={() => setActive(false)}></span> <span className="exit" onClick={() => setActive(false)}></span>
<h5>Создатель: </h5> <h5>Создатель: </h5>
<p className="workers__creator">{removeLast(task.user?.fio)}</p> <p className="workers__creator">{task.user?.fio}</p>
{executor ? ( {executor ? (
<> <>
<h5>Исполнитель: </h5> <h5>Исполнитель: </h5>
<div className="executor"> <div className="executor">
<p>{removeLast(executor.fio)}</p> <p>{executor.fio}</p>
<img <img
src={ src={
executor?.avatar executor?.avatar
@ -803,7 +803,7 @@ export const ModalTiсket = ({
key={person.user_id} key={person.user_id}
onClick={() => taskExecutor(person)} onClick={() => taskExecutor(person)}
> >
<span>{removeLast(person.user.fio)}</span> <span>{person.user.fio}</span>
<img <img
src={ src={
person.user?.avatar person.user?.avatar
@ -826,7 +826,7 @@ export const ModalTiсket = ({
{members.map((member) => { {members.map((member) => {
return ( return (
<div className="worker" key={member.user_id}> <div className="worker" key={member.user_id}>
<p>{removeLast(member.fio)}</p> <p>{member.fio}</p>
<img <img
src={ src={
member?.avatar member?.avatar
@ -869,7 +869,7 @@ export const ModalTiсket = ({
key={person.user_id} key={person.user_id}
onClick={() => addMember(person)} onClick={() => addMember(person)}
> >
<span>{removeLast(person.user.fio)}</span> <span>{person.user.fio}</span>
<img <img
src={ src={
person.user?.avatar person.user?.avatar
@ -895,7 +895,7 @@ export const ModalTiсket = ({
className="dead-line__container" className="dead-line__container"
onClick={() => setDatePickerOpen(!datePickerOpen)} onClick={() => setDatePickerOpen(!datePickerOpen)}
> >
<p>⌛</p> <img src={calendarIcon} alt="calendar" />
<span> <span>
{deadLine ? getCorrectDate(deadLine) : "Срок исполнения"} {deadLine ? getCorrectDate(deadLine) : "Срок исполнения"}
</span> </span>

2
src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx
View File

@ -950,7 +950,7 @@ export const TicketFullScreen = () => {
className="dead-line__container" className="dead-line__container"
onClick={() => setDatePickerOpen(!datePickerOpen)} onClick={() => setDatePickerOpen(!datePickerOpen)}
> >
<p>⌛</p> <img src={calendarIcon} alt="calendar" />
<span> <span>
{deadLine {deadLine
? getCorrectDate(deadLine) ? getCorrectDate(deadLine)

13
src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx
View File

@ -23,7 +23,7 @@ import {
} from "@redux/projectsTrackerSlice"; } from "@redux/projectsTrackerSlice";
import { getCorrectDate } from "@utils/calendarHelper"; import { getCorrectDate } from "@utils/calendarHelper";
import { getCorrectRequestDate, removeLast, urlForLocal } from "@utils/helper"; import { getCorrectRequestDate, urlForLocal } from "@utils/helper";
import { apiRequest } from "@api/request"; import { apiRequest } from "@api/request";
@ -448,7 +448,7 @@ export const TrackerModal = ({
> >
<p> <p>
{selectedWorker {selectedWorker
? removeLast(selectedWorker.employee.fio) ? selectedWorker.employee.fio
: "Выберите пользователя"} : "Выберите пользователя"}
</p> </p>
<img className="arrow" src={arrowDown} alt="arrow" /> <img className="arrow" src={arrowDown} alt="arrow" />
@ -467,7 +467,7 @@ export const TrackerModal = ({
setSelectedWorker(worker); setSelectedWorker(worker);
}} }}
> >
<span>{removeLast(worker.employee.fio)}</span> <span>{worker.employee.fio}</span>
<img <img
src={urlForLocal(worker.employee.avatar)} src={urlForLocal(worker.employee.avatar)}
alt="avatar" alt="avatar"
@ -521,6 +521,7 @@ export const TrackerModal = ({
</div> </div>
<div className="create-task-body"> <div className="create-task-body">
<div className="create-task-body__left"> <div className="create-task-body__left">
<h4>Введите название и описание задачи</h4>
<div className="input-container"> <div className="input-container">
<input <input
maxLength="100" maxLength="100"
@ -698,7 +699,7 @@ export const TrackerModal = ({
} }
alt="avatar" alt="avatar"
/> />
<span>{removeLast(person.user.fio)}</span> <span>{person.user.fio}</span>
</div> </div>
); );
}) })
@ -709,7 +710,7 @@ export const TrackerModal = ({
)} )}
</div> </div>
<div className="create-task-body__right__dead-line"> <div className="create-task-body__right__dead-line">
<p>⌛</p> <img src={calendarImg} alt="calendar" />
<p onClick={() => setDatePickerOpen(!datePickerOpen)}> <p onClick={() => setDatePickerOpen(!datePickerOpen)}>
{deadLineDate {deadLineDate
? getCorrectDate(deadLineDate) ? getCorrectDate(deadLineDate)
@ -733,7 +734,7 @@ export const TrackerModal = ({
<Loader style={"green"} /> <Loader style={"green"} />
) : ( ) : (
<BaseButton styles={"button-add"} onClick={createTicket}> <BaseButton styles={"button-add"} onClick={createTicket}>
Создать задачу Создать
</BaseButton> </BaseButton>
)} )}
</div> </div>

14
src/components/Modal/Tracker/TrackerModal/trackerModal.scss
View File

@ -262,7 +262,7 @@
position: absolute; position: absolute;
width: 100%; width: 100%;
padding: 9.5px 12px; padding: 9.5px 12px;
top: 45px; top: 48px;
left: 0; left: 0;
background: white; background: white;
border-radius: 5px; border-radius: 5px;
@ -337,7 +337,7 @@
} }
.create-task-body { .create-task-body {
padding: 15px 30px; padding: 15px 20px;
display: flex; display: flex;
column-gap: 20px; column-gap: 20px;
@ -373,8 +373,8 @@
} }
.ck-editor__editable.ck-rounded-corners { .ck-editor__editable.ck-rounded-corners {
min-height: 180px; min-height: 150px;
max-height: 180px; max-height: 150px;
} }
} }
@ -383,7 +383,6 @@
flex-direction: column; flex-direction: column;
align-items: start; align-items: start;
justify-content: end; justify-content: end;
row-gap: 10px;
&__owner { &__owner {
display: flex; display: flex;
@ -715,11 +714,6 @@
} }
} }
} }
.button-add {
margin: 0 30px;
align-self: flex-end;
}
} }
.name-project { .name-project {

2
src/components/Navigation/Navigation.jsx
View File

@ -97,7 +97,7 @@ export const Navigation = () => {
<div className="profile-header__personal-info"> <div className="profile-header__personal-info">
<h3 className="profile-header__personal-info-name"> <h3 className="profile-header__personal-info-name">
{profileInfo?.fio || profileInfo?.username} {profileInfo?.fio ? profileInfo?.fio : profileInfo?.username}
</h3> </h3>
<NavLink end to={"/profile"}> <NavLink end to={"/profile"}>
<img <img

2
src/components/ProfileCalendar/ProfileCalendar.jsx
View File

@ -95,7 +95,7 @@ export const ProfileCalendar = () => {
alt="avatar" alt="avatar"
/> />
<p className="summary__name"> <p className="summary__name">
{profileInfo?.fio || profileInfo?.username},{" "} {profileInfo?.fio ? profileInfo?.fio : profileInfo?.username},{" "}
{profileInfo.specification} разработчик {profileInfo.specification} разработчик
</p> </p>
</div> </div>

2
src/components/ProfileHeader/ProfileHeader.jsx
View File

@ -146,7 +146,7 @@ export const ProfileHeader = () => {
<nav className="auth-body__navigation"> <nav className="auth-body__navigation">
<div className="profile-header__personal-info"> <div className="profile-header__personal-info">
<h3 className="profile-header__personal-info-name"> <h3 className="profile-header__personal-info-name">
{profileInfo?.fio || profileInfo?.username} {profileInfo?.fio ? profileInfo?.fio : profileInfo?.username}
</h3> </h3>
<NavLink end to={"/profile"}> <NavLink end to={"/profile"}>
<img <img

10
src/pages/Profile/Profile.jsx
View File

@ -103,12 +103,12 @@ export const Profile = () => {
{user === "developer" ? ( {user === "developer" ? (
<span> <span>
<p>Добрый день,&nbsp;</p> <p>Добрый день,&nbsp;</p>
{profileInfo?.fio || profileInfo?.username} {profileInfo?.fio ? profileInfo?.fio : profileInfo?.username}
</span> </span>
) : ( ) : (
<span> <span>
<p>Добрый день,&nbsp;</p> <p>Добрый день,&nbsp;</p>
{profileInfo?.fio || profileInfo?.username} {profileInfo?.fio ? profileInfo?.fio : profileInfo?.username}
</span> </span>
)} )}
</h2> </h2>
@ -124,11 +124,13 @@ export const Profile = () => {
<p className="summary__name"> <p className="summary__name">
{user === "developer" ? ( {user === "developer" ? (
<span> <span>
{profileInfo?.fio || profileInfo?.username},{" "} {profileInfo?.fio ? profileInfo?.fio : profileInfo?.username},{" "}
{profileInfo?.specification} разработчик {profileInfo?.specification} разработчик
</span> </span>
) : ( ) : (
<span>{profileInfo?.fio || profileInfo?.username}</span> <span>
{profileInfo?.fio ? profileInfo?.fio : profileInfo?.username}
</span>
)} )}
</p> </p>
</div> </div>

16
src/pages/ProjectTracker/ProjectTracker.jsx
View File

@ -23,7 +23,8 @@ import {
setToggleTab setToggleTab
} from "@redux/projectsTrackerSlice"; } from "@redux/projectsTrackerSlice";
import { removeLast, urlForLocal } from "@utils/helper"; import { urlForLocal } from "@utils/helper";
import { caseOfNum } from "@utils/helper";
import { apiRequest } from "@api/request"; import { apiRequest } from "@api/request";
@ -43,6 +44,7 @@ import TrackerSelectColumn from "@components/TrackerSelectColumn/TrackerSelectCo
import arrow from "assets/icons/arrows/arrowCalendar.png"; import arrow from "assets/icons/arrows/arrowCalendar.png";
import arrowDown from "assets/icons/arrows/selectArrow.png"; import arrowDown from "assets/icons/arrows/selectArrow.png";
import calendarIcon from "assets/icons/calendar.svg";
import category from "assets/icons/category.svg"; import category from "assets/icons/category.svg";
import close from "assets/icons/close.png"; import close from "assets/icons/close.png";
import commentsBoard from "assets/icons/commentsBoard.svg"; import commentsBoard from "assets/icons/commentsBoard.svg";
@ -62,6 +64,7 @@ export const ProjectTracker = () => {
const dispatch = useDispatch(); const dispatch = useDispatch();
const projectId = useParams(); const projectId = useParams();
const currentDate = new Date().getFullYear();
const [openColumnSelect, setOpenColumnSelect] = useState({}); const [openColumnSelect, setOpenColumnSelect] = useState({});
const [selectedTab, setSelectedTab] = useState(0); const [selectedTab, setSelectedTab] = useState(0);
const [priorityTask, setPriorityTask] = useState(0); const [priorityTask, setPriorityTask] = useState(0);
@ -609,7 +612,7 @@ export const ProjectTracker = () => {
key={user.user_id} key={user.user_id}
onClick={() => executorFilter(user)} onClick={() => executorFilter(user)}
> >
<p>{removeLast(user.user?.fio)}</p> <p>{user.user?.fio}</p>
<img <img
src={ src={
user.user?.avatar user.user?.avatar
@ -907,7 +910,10 @@ export const ProjectTracker = () => {
} }
}} }}
> >
<p className="task__board__item__title"> <p
className="task__board__item__title"
style={{ color: titleColor }}
>
{task.title} {task.title}
</p> </p>
</div> </div>
@ -949,7 +955,7 @@ export const ProjectTracker = () => {
{task.dead_line && ( {task.dead_line && (
<div className="tasks__board__item__dead-line"> <div className="tasks__board__item__dead-line">
<p>⌛</p> <p>⌛</p>
<span style={{ color: titleColor }}> <span>
{getCorrectDate(task.dead_line)} {getCorrectDate(task.dead_line)}
</span> </span>
</div> </div>
@ -967,7 +973,7 @@ export const ProjectTracker = () => {
alt="avatar" alt="avatar"
/> />
<span> <span>
{removeLast(task.executor?.fio) || {task.executor?.fio ||
"Исполнитель не назначен"} "Исполнитель не назначен"}
</span> </span>
</div> </div>

2
src/pages/Summary/Summary.jsx
View File

@ -107,7 +107,7 @@ export const Summary = () => {
alt="avatar" alt="avatar"
/> />
<p className="summary__name"> <p className="summary__name">
{profileInfo?.fio || profileInfo?.username},{" "} {profileInfo?.fio ? profileInfo?.fio : profileInfo?.username},{" "}
{profileInfo.specification} разработчик {profileInfo.specification} разработчик
</p> </p>
</div> </div>

8
src/utils/helper.js
View File

@ -91,11 +91,3 @@ export function copyProjectLink(projectId) {
`https://itguild.info/tracker/project/${projectId}` `https://itguild.info/tracker/project/${projectId}`
); );
} }
export function removeLast(string = " ") {
let arr = string.trim().split(" ");
if (arr.length > 2) {
return arr.slice(0, -1).join(" ");
}
return string;
}