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

Compare commits

base: apuc:65ca1c32ffdee6eb81663649234e88fd1d7d1e99
Branches Tags
apuc:main
apuc:fixes_tasks
apuc:developer_resume
apuc:page_under_construction
apuc:vacancy
apuc:summary_fix
apuc:current-design
..
compare: apuc:8525445e1848be2576bb01418fb0d611e79ab431
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. "65ca1c32ffdee6eb81663649234e88fd1d7d1e99" and "8525445e1848be2576bb01418fb0d611e79ab431" have entirely different histories.
65ca1c32ff ... 8525445e18

36 changed files with 135 additions and 178 deletions
Show Stats Expand all files Collapse all files

2
src/components/ArchiveTableTracker/ArchiveTasksItem/ArchiveTasksItem.jsx
View File

@ -1,6 +1,6 @@
import React from "react";
import { getCorrectDate } from "@utils/calendarHelper";
import { getCorrectDate } from "@components/Calendar/calendarHelper";
import "./archiveTasksItem.scss";

0
src/components/AuthBlock/AuthBlock.jsx → src/components/AuthBlock/AuthBlock.js
View File

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

@ -13,7 +13,7 @@ import rectangle from "assets/images/rectangle_secondPage.png";
import CalendarComponent from "./CalendarComponent";
import "./calendar.scss";
import { currentMonth } from "../../utils/calendarHelper";
import { currentMonth } from "./calendarHelper";
const Calendar = () => {
if (localStorage.getItem("role_status") !== "18") {

2
src/components/Calendar/CalendarComponent.jsx
View File

@ -7,7 +7,7 @@ import ellipse from "assets/icons/ellipse.png";
import rectangle from "assets/images/rectangle__calendar.png";
import "./calendarComponent.scss";
import { calendarHelper, currentMonthAndDay } from "../../utils/calendarHelper";
import { calendarHelper, currentMonthAndDay } from "./calendarHelper";
const CalendarComponent = ({ onSelect }) => {
const [value, setValue] = useState(moment());

0
src/utils/calendarHelper.js → src/components/Calendar/calendarHelper.js
View File

0
src/components/Modal/ModalReset/ModalReset.jsx → src/components/Modal/ModalReset/ModalReset.js
View File

0
src/components/Modal/ModalTrackerRegistration/ModalTrackerRegistration.jsx → src/components/Modal/ModalTrackerRegistration/ModalTrackerRegistration.js
View File

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

@ -43,7 +43,7 @@ import send from "assets/icons/send.svg";
import watch from "assets/icons/watch.svg";
import avatarMok from "assets/images/avatarMok.png";
import { getCorrectDate } from "../../../../utils/calendarHelper";
import { getCorrectDate } from "../../../Calendar/calendarHelper";
import "./modalTicket.scss";
registerLocale("ru", ru);

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

@ -21,7 +21,7 @@ import { apiRequest } from "@api/request";
import { useNotification } from "@hooks/useNotification";
import { getCorrectDate } from "@utils/calendarHelper";
import { getCorrectDate } from "@components/Calendar/calendarHelper";
import { Footer } from "@components/Common/Footer/Footer";
import { Loader } from "@components/Common/Loader/Loader";
import FileTracker from "@components/FileTracker/FileTracker";

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

@ -28,7 +28,7 @@ import { apiRequest } from "@api/request";
import { useNotification } from "@hooks/useNotification";
import { getCorrectDate } from "@utils/calendarHelper";
import { getCorrectDate } from "@components/Calendar/calendarHelper";
import BaseButton from "@components/Common/BaseButton/BaseButton";
import { Loader } from "@components/Common/Loader/Loader";
import ModalLayout from "@components/Common/ModalLayout/ModalLayout";

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

@ -16,7 +16,7 @@ import { urlForLocal } from "@utils/helper";
import { apiRequest } from "@api/request";
import { getReports } from "@utils/calendarHelper";
import { getReports } from "@components/Calendar/calendarHelper";
import { Footer } from "@components/Common/Footer/Footer";
import { Loader } from "@components/Common/Loader/Loader";
import { Navigation } from "@components/Navigation/Navigation";

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

@ -23,7 +23,7 @@ import {
getCorrectDate,
getReports,
hourOfNum
} from "@utils/calendarHelper";
} from "@components/Calendar/calendarHelper";
import BaseButton from "@components/Common/BaseButton/BaseButton";
import arrow from "assets/icons/arrows/arrowCalendar.png";

0
src/components/ProtectedRoute/ProtectedRoute.jsx → src/components/ProtectedRoute/ProtectedRoute.js
View File

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

@ -26,7 +26,7 @@ import {
getCorrectDate,
getCreatedDate,
hourOfNum
} from "../../utils/calendarHelper";
} from "../Calendar/calendarHelper";
import "./reportForm.scss";
registerLocale("ru", ru);

5
src/components/ReportForm/reportForm.scss
View File

@ -1,13 +1,8 @@
.report-form {
background: #f1f1f1;
min-height: 100vh;
display: flex;
flex-direction: column;
.container {
display: flex;
flex-direction: column;
flex: 1;
max-width: 1160px;
margin-top: 23px;

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

@ -14,7 +14,7 @@ import {
getCorrectDate,
getCreatedDate,
hourOfNum
} from "@utils/calendarHelper";
} from "@components/Calendar/calendarHelper";
import { Loader } from "@components/Common/Loader/Loader";
import "./shortReport.scss";

0
src/components/StarRating/StarRating.jsx → src/components/StarRating/StarRating.js
View File

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

@ -6,7 +6,7 @@ import { urlForLocal } from "@utils/helper";
import { apiRequest } from "@api/request";
import { getCorrectDate } from "@utils/calendarHelper";
import { getCorrectDate } from "@components/Calendar/calendarHelper";
import TrackerTaskSubComment from "@components/TrackerTaskComment/TrackerTaskComment";
import del from "assets/icons/delete.svg";

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

@ -13,7 +13,7 @@ import { urlForLocal } from "@utils/helper";
import { apiRequest } from "@api/request";
import { getCorrectDate } from "@utils/calendarHelper";
import { getCorrectDate } from "@components/Calendar/calendarHelper";
import { Footer } from "@components/Common/Footer/Footer";
import { Loader } from "@components/Common/Loader/Loader";
import ModalLayout from "@components/Common/ModalLayout/ModalLayout";

1
src/pages/PartnerBid/partnerBid.scss
View File

@ -5,7 +5,6 @@
min-height: 100vh;
.container {
max-width: 1160px;
display: flex;
flex-direction: column;
flex: 1;

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

@ -7,7 +7,7 @@ import { getRequestDates, setRequestDate } from "@redux/reportSlice";
import { apiRequest } from "@api/request";
import { getReports } from "@utils/calendarHelper";
import { getReports } from "@components/Calendar/calendarHelper";
import { Footer } from "@components/Common/Footer/Footer";
import { Loader } from "@components/Common/Loader/Loader";
import { Navigation } from "@components/Navigation/Navigation";

1
src/pages/PartnerEmployeeReport/partnerEmployeeReport.scss
View File

@ -5,7 +5,6 @@
min-height: 100vh;
.container {
max-width: 1160px;
display: flex;
flex-direction: column;
flex: 1;

1
src/pages/PartnerEmployees/partnerEmployees.scss
View File

@ -167,7 +167,6 @@
}
.container {
max-width: 1160px;
display: flex;
flex-direction: column;
flex: 1;

1
src/pages/PartnerRequests/partnerRequests.scss
View File

@ -5,7 +5,6 @@
min-height: 100vh;
.container {
max-width: 1160px;
display: flex;
flex-direction: column;
flex: 1;

1
src/pages/PartnerTreaties/partnerTreaties.scss
View File

@ -378,7 +378,6 @@
}
.container {
max-width: 1160px;
display: flex;
flex-direction: column;
flex: 1;

1
src/pages/PartnerСategories/partnerСategories.scss
View File

@ -144,7 +144,6 @@
}
.container {
max-width: 1160px;
display: flex;
flex-direction: column;
flex: 1;

4
src/pages/Payouts/Payouts.jsx
View File

@ -2,9 +2,7 @@ import React from "react";
import { Navigation } from "@components/Navigation/Navigation";
import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader";
import { Footer } from "@components/Common/Footer/Footer";
import "./payouts.scss";
import { Footer } from "@components/common/Footer/Footer";
export const Payouts = () => {
return (

13
src/pages/Payouts/payouts.scss
View File

@ -1,13 +0,0 @@
.payouts {
display: flex;
flex-direction: column;
min-height: 100vh;
background: #f1f1f1;
.container {
max-width: 1160px;
display: flex;
flex-direction: column;
flex: 1;
}
}

1
src/pages/ProfileCandidate/ProfileCandidate.scss
View File

@ -4,7 +4,6 @@
flex-direction: column;
min-height: 100vh;
&__container {
max-width: 1160px;
display: flex;
flex-direction: column;
margin: 0 auto 42px auto;

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

@ -58,7 +58,7 @@ import accept from "assets/images/accept.png";
import archive from "assets/images/archiveIcon.png";
import avatarMok from "assets/images/avatarMok.png";
import { getCorrectDate } from "../../utils/calendarHelper";
import { getCorrectDate } from "../../components/Calendar/calendarHelper";
export const ProjectTracker = () => {
const dispatch = useDispatch();

5
src/pages/Quiz/quiz-page.scss
View File

@ -5,7 +5,6 @@
flex-direction: column;
&__container {
max-width: 1160px;
display: flex;
flex-direction: column;
margin: 23px auto 42px auto;
@ -77,7 +76,6 @@
}
&__container {
max-width: 1160px;
display: flex;
margin: 23px auto 42px auto;
flex: 1 1 auto;
@ -100,8 +98,6 @@
flex-direction: column;
&__container {
max-width: 1160px;
flex-direction: column;
display: flex;
margin: 23px auto 42px auto;
flex: 1 1 auto;
@ -140,7 +136,6 @@
flex-direction: column;
&__container {
max-width: 1160px;
display: flex;
flex-direction: column;
margin: 23px auto 42px auto;

4
src/pages/Statistics/Statistics.jsx
View File

@ -9,7 +9,6 @@ import { copyProjectLink } from "@utils/helper";
import { Navigation } from "@components/Navigation/Navigation";
import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs";
import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader";
import { Footer } from "@components/Common/Footer/Footer";
import arrow from "assets/icons/arrows/arrowCalendar.png";
import emailImg from "assets/icons/emailStatistics.svg";
@ -72,6 +71,7 @@ const Statistics = () => {
/>
<h2 className="tracker__title">Управление проектами с трекером</h2>
</div>
</div>
<div className="tracker__tabs">
<div className="tracker__tabs__head">
<Link
@ -202,8 +202,6 @@ const Statistics = () => {
</div>
</div>
</div>
<Footer />
</div>
);
};

7
src/pages/Statistics/statistics.scss
View File

@ -4,13 +4,6 @@
flex-direction: column;
min-height: 100vh;
.container {
max-width: 1160px;
display: flex;
flex-direction: column;
flex: 1;
}
&-header {
display: flex;
justify-content: space-between;

1
src/pages/Summary/summary.scss
View File

@ -510,7 +510,6 @@
}
.container {
max-width: 1160px;
display: flex;
flex-direction: column;
flex: 1;

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

@ -10,7 +10,7 @@ import {
getCorrectDate,
getCreatedDate,
hourOfNum
} from "@utils/calendarHelper";
} from "@components/Calendar/calendarHelper";
import { Footer } from "@components/Common/Footer/Footer";
import { Loader } from "@components/Common/Loader/Loader";
import { Navigation } from "@components/Navigation/Navigation";

1
src/pages/ViewReport/viewReport.scss
View File

@ -5,7 +5,6 @@
min-height: 100vh;
.container {
max-width: 1160px;
display: flex;
flex-direction: column;
flex: 1;