Compare commits
No commits in common. "6e6d3d1823170b2bedd6c1b4fbafb1f593664724" and "43ca1b54f1e8eb1a1ff2a2c9a8c754468950a805" have entirely different histories.
6e6d3d1823
...
43ca1b54f1
@ -286,15 +286,15 @@ export const ProfileCalendarComponent = React.memo(
|
|||||||
? `${getCorrectDate(startDate)} - ${getCorrectDate(endDate)}`
|
? `${getCorrectDate(startDate)} - ${getCorrectDate(endDate)}`
|
||||||
: `${getCorrectDate(endDate)} - ${getCorrectDate(startDate)}`
|
: `${getCorrectDate(endDate)} - ${getCorrectDate(startDate)}`
|
||||||
: activePeriod
|
: activePeriod
|
||||||
? "Выберите диапазон на календаре"
|
? "Выберите диапазон на календаре"
|
||||||
: "Выбрать диапазон"}
|
: "Выбрать диапазон"}
|
||||||
</span>
|
</span>
|
||||||
<span>
|
<span>
|
||||||
{totalRangeHours
|
{totalRangeHours
|
||||||
? `${totalRangeHours} ${hourOfNum(totalRangeHours)}`
|
? `${totalRangeHours} ${hourOfNum(totalRangeHours)}`
|
||||||
: endDate
|
: endDate
|
||||||
? "0 часов"
|
? "0 часов"
|
||||||
: ""}
|
: ""}
|
||||||
</span>
|
</span>
|
||||||
{endDate && (
|
{endDate && (
|
||||||
<BaseButton
|
<BaseButton
|
||||||
|
@ -1,7 +1,5 @@
|
|||||||
import React, { Component } from "react";
|
import React, { Component } from "react";
|
||||||
|
|
||||||
import { Fallback } from "./Fallback";
|
|
||||||
|
|
||||||
class ErrorBoundary extends Component {
|
class ErrorBoundary extends Component {
|
||||||
state = {
|
state = {
|
||||||
error: null
|
error: null
|
||||||
@ -15,7 +13,7 @@ class ErrorBoundary extends Component {
|
|||||||
const { error } = this.state;
|
const { error } = this.state;
|
||||||
|
|
||||||
if (error) {
|
if (error) {
|
||||||
return <Fallback />;
|
return <div>Что-то пошло не так =( {error}</div>;
|
||||||
}
|
}
|
||||||
return this.props.children;
|
return this.props.children;
|
||||||
}
|
}
|
@ -1,19 +0,0 @@
|
|||||||
import React from "react";
|
|
||||||
|
|
||||||
import rightArrow from "assets/icons/arrows/arrowRight.svg";
|
|
||||||
import logo from "assets/images/logo/ITguild.svg";
|
|
||||||
|
|
||||||
import "./fallback.scss";
|
|
||||||
|
|
||||||
export const Fallback = () => {
|
|
||||||
return (
|
|
||||||
<div className="fallback">
|
|
||||||
<img src={logo} alt="logo" className="logo" />
|
|
||||||
<h1>Произошла непредвиденная ошибка</h1>
|
|
||||||
<a href="/profile">
|
|
||||||
Вернуться назад
|
|
||||||
<img src={rightArrow} alt="arrow" />
|
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
@ -1,19 +0,0 @@
|
|||||||
.fallback {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
align-items: center;
|
|
||||||
padding: 100px;
|
|
||||||
gap: 15px;
|
|
||||||
|
|
||||||
img {
|
|
||||||
max-width: 250px;
|
|
||||||
}
|
|
||||||
|
|
||||||
a {
|
|
||||||
display: flex;
|
|
||||||
column-gap: 10px;
|
|
||||||
align-items: center;
|
|
||||||
font-size: 16px;
|
|
||||||
color: black;
|
|
||||||
}
|
|
||||||
}
|
|
@ -3,14 +3,11 @@ import ReactDOM from "react-dom/client";
|
|||||||
import { Provider } from "react-redux";
|
import { Provider } from "react-redux";
|
||||||
|
|
||||||
import App from "./App";
|
import App from "./App";
|
||||||
import ErrorBoundary from "./hoc/ErrorBoundary";
|
|
||||||
import "./index.css";
|
import "./index.css";
|
||||||
import { store } from "./store/store";
|
import { store } from "./store/store";
|
||||||
|
|
||||||
ReactDOM.createRoot(document.getElementById("root")).render(
|
ReactDOM.createRoot(document.getElementById("root")).render(
|
||||||
<ErrorBoundary>
|
<Provider store={store}>
|
||||||
<Provider store={store}>
|
<App />
|
||||||
<App />
|
</Provider>
|
||||||
</Provider>
|
|
||||||
</ErrorBoundary>
|
|
||||||
);
|
);
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
import { getTheme } from "@table-library/react-table-library/baseline";
|
import { getTheme } from "@table-library/react-table-library/baseline";
|
||||||
import { CompactTable } from "@table-library/react-table-library/compact";
|
import { CompactTable } from "@table-library/react-table-library/compact";
|
||||||
import { usePagination } from "@table-library/react-table-library/pagination";
|
|
||||||
import { useSort } from "@table-library/react-table-library/sort";
|
import { useSort } from "@table-library/react-table-library/sort";
|
||||||
import { useTheme } from "@table-library/react-table-library/theme";
|
import { useTheme } from "@table-library/react-table-library/theme";
|
||||||
import React, { useEffect, useState } from "react";
|
import React, { useEffect, useState } from "react";
|
||||||
@ -102,13 +101,6 @@ export const PartnerCategories = () => {
|
|||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
const pagination = usePagination(data, {
|
|
||||||
state: {
|
|
||||||
page: 0,
|
|
||||||
size: 5
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
setLoader(true);
|
setLoader(true);
|
||||||
apiRequest("/project/my-employee").then((el) => {
|
apiRequest("/project/my-employee").then((el) => {
|
||||||
@ -267,30 +259,7 @@ export const PartnerCategories = () => {
|
|||||||
data={data}
|
data={data}
|
||||||
theme={theme}
|
theme={theme}
|
||||||
sort={sort}
|
sort={sort}
|
||||||
pagination={pagination}
|
|
||||||
/>
|
/>
|
||||||
<div className="table__pagination">
|
|
||||||
<span>
|
|
||||||
Total Pages: {pagination.state.getTotalPages(data.nodes)}
|
|
||||||
</span>
|
|
||||||
|
|
||||||
<span className="table__pages">
|
|
||||||
Page:{" "}
|
|
||||||
{pagination.state.getPages(data.nodes).map((_, index) => (
|
|
||||||
<button
|
|
||||||
key={index}
|
|
||||||
type="button"
|
|
||||||
style={{
|
|
||||||
fontWeight:
|
|
||||||
pagination.state.page === index ? "bold" : "normal"
|
|
||||||
}}
|
|
||||||
onClick={() => pagination.fns.onSetPage(index)}
|
|
||||||
>
|
|
||||||
{index + 1}
|
|
||||||
</button>
|
|
||||||
))}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
</>
|
</>
|
||||||
) : (
|
) : (
|
||||||
<div className="partner-categories__empty">
|
<div className="partner-categories__empty">
|
||||||
|
@ -176,19 +176,5 @@
|
|||||||
font-size: 16px;
|
font-size: 16px;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
&__pagination {
|
|
||||||
width: 100%;
|
|
||||||
display: flex;
|
|
||||||
justify-content: space-between;
|
|
||||||
font-size: 16px;
|
|
||||||
align-items: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
&__pages {
|
|
||||||
display: flex;
|
|
||||||
column-gap: 5px;
|
|
||||||
align-items: center;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user