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

Compare commits

base: apuc:a7c58b26096059ceeafb3c21e73c54a0f6e835dd
Branches Tags
apuc:main
apuc:fixes_tasks
apuc:developer_resume
apuc:page_under_construction
apuc:vacancy
apuc:summary_fix
apuc:current-design
..
compare: apuc:94136c97e6f522a20a8ae8758ab7b2d8e223642d
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. "a7c58b26096059ceeafb3c21e73c54a0f6e835dd" and "94136c97e6f522a20a8ae8758ab7b2d8e223642d" have entirely different histories.
a7c58b2609 ... 94136c97e6

11 changed files with 21 additions and 83 deletions
Show Stats Expand all files Collapse all files

3
src/assets/icons/arrows/tableArrow.svg
View File

@ -1,3 +0,0 @@
<svg width="9" height="6" viewBox="0 0 9 6" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M4.11629 5.8584L8.07227 0.858398H0.160323L4.11629 5.8584Z" fill="#2E3A59"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 184 B

4
src/components/Calendar/calendarComponent.scss
View File

@ -299,7 +299,7 @@
}
.pass {
background-color: #ba5c33 !important;
background-color: #f7d7c9 !important;
}
.today {
@ -308,7 +308,7 @@
}
.selected {
background-color: #cbcbb4 !important;
background-color: #f9f9c3 !important;
}
.block {

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

@ -664,8 +664,11 @@ export const ModalTiсket = ({
"EasyImage",
"Image",
"ImageCaption",
"ImageStyle",
"ImageToolbar",
"ImageUpload",
"MediaEmbed"
"MediaEmbed",
"BlockQuote"
]
}}
onChange={(event, editor) => {

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

@ -683,8 +683,11 @@ export const TicketFullScreen = () => {
"EasyImage",
"Image",
"ImageCaption",
"ImageStyle",
"ImageToolbar",
"ImageUpload",
"MediaEmbed"
"MediaEmbed",
"BlockQuote"
]
}}
onChange={(event, editor) => {

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

@ -624,15 +624,7 @@ export const TrackerModal = ({
"bulletedList",
"numberedList"
],
removePlugins: [
"CKFinderUploadAdapter",
"CKFinder",
"EasyImage",
"Image",
"ImageCaption",
"ImageUpload",
"MediaEmbed"
],
removePlugins: ["BlockQuote"],
placeholder: "Описание задачи"
}}
onChange={(event, editor) => {

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

@ -34,15 +34,11 @@
display: flex;
align-items: center;
grid-column-gap: 30px;
column-gap: 10px;
column-gap: 30px;
margin-top: 20px;
cursor: pointer;
text-decoration: none;
img {
width: 23px;
}
p {
margin-bottom: 0;
font-size: 14px;

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

@ -127,8 +127,11 @@ export const TrackerTaskComment = ({
"EasyImage",
"Image",
"ImageCaption",
"ImageStyle",
"ImageToolbar",
"ImageUpload",
"MediaEmbed"
"MediaEmbed",
"BlockQuote"
]
}}
onChange={(event, editor) => {

31
src/pages/PartnerСategories/PartnerСategories.jsx
View File

@ -44,25 +44,9 @@ export const PartnerCategories = () => {
const theme = useTheme(getTheme());
const [nodes, setNodes] = useState([]);
const [initialNodes, setInitialNodes] = useState([]);
const [activeTab, setActiveTab] = useState(1);
const [search, setSearch] = useState("");
const tabs = [
{
id: 1,
name: "Все"
},
{
id: 2,
name: "Фронтенд"
},
{
id: 3,
name: "Бэкенд"
}
];
const COLUMNS = [
{
label: "",
@ -272,21 +256,6 @@ export const PartnerCategories = () => {
<div className="partner-categories__items">
{Boolean(initialNodes.length) ? (
<>
<div className="table__tabs">
{tabs.map((tab) => {
return (
<button
onClick={() => setActiveTab(tab.id)}
key={tab.id}
className={`table__tab ${
tab.id === activeTab ? "table__tab--active" : ""
}`}
>
{tab.name}
</button>
);
})}
</div>
<label className="table__search" htmlFor="search">
Поиск по имени:
<input

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

@ -204,29 +204,6 @@
}
}
&__tabs {
margin: 0 auto 36px 18px;
background: rgba(240, 242, 245, 1);
padding: 4px 8px 4px 8px;
border-radius: 6px;
display: flex;
}
&__tab {
color: rgba(46, 58, 89, 1);
font-size: 15px;
outline: none;
background: none;
border: none;
padding: 0 12px;
&--active {
background: rgba(255, 255, 255, 1);
border-radius: 5px;
font-size: 16px;
}
}
&__pagination {
width: 100%;
display: flex;

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

@ -243,8 +243,11 @@ export const Summary = () => {
"EasyImage",
"Image",
"ImageCaption",
"ImageStyle",
"ImageToolbar",
"ImageUpload",
"MediaEmbed"
"MediaEmbed",
"BlockQuote"
]
}}
onChange={(event, editor) => {

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

@ -64,18 +64,13 @@
&__back {
display: flex;
align-items: center;
column-gap: 10px;
column-gap: 30px;
margin-top: 20px;
cursor: pointer;
&:hover {
text-decoration: none;
}
img {
width: 23px;
}
p {
margin-bottom: 0;
font-weight: 400;