Skip to content

Commit f0a9c78

Browse files
th-314: * driver and truck tables (#318)
Co-authored-by: Alina Kupchyk <[email protected]>
1 parent 23ed085 commit f0a9c78

File tree

6 files changed

+14
-21
lines changed

6 files changed

+14
-21
lines changed

frontend/src/libs/components/table/styles.module.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,10 @@
107107
cursor: pointer;
108108
}
109109

110+
.spinnerWrapper {
111+
height: 40vh;
112+
}
113+
110114
@media (hover: hover) {
111115
.resizer {
112116
opacity: 0;

frontend/src/libs/components/table/table.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ type Properties<T> = {
2727
isLoading?: boolean;
2828
isTableEditable?: boolean;
2929
columns: ColumnDef<T>[];
30-
emptyTableMessage?: JSX.Element;
30+
emptyTableMessage?: string;
3131
pageSize: number;
3232
totalRow: number;
3333
pageIndex: number;
@@ -110,7 +110,9 @@ const Table = <T,>({
110110
return (
111111
<div className={styles.container}>
112112
{isLoading ? (
113-
<Spinner />
113+
<div className={styles.spinnerWrapper}>
114+
<Spinner />
115+
</div>
114116
) : (
115117
<div className={styles.wrapper}>
116118
<table

frontend/src/pages/dashboard/components/tables/drivers-table/driver-table.tsx

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,7 @@ const DriverTable: React.FC = () => {
5959
[dispatch, searchParameters, handleToggle],
6060
);
6161

62-
const message = (
63-
<div>
64-
There are no data here yet. Please,{' '}
65-
<span className={styles.red}>add new driver</span>
66-
</div>
67-
);
62+
const message = 'There are no data here yet. Please, add a driver';
6863

6964
return (
7065
<div className={styles.container}>
@@ -73,7 +68,7 @@ const DriverTable: React.FC = () => {
7368
Company Drivers
7469
</h2>
7570
<Button
76-
label="Add a Driver"
71+
label="Add Driver"
7772
className={styles.btn}
7873
onClick={handleToggle}
7974
/>

frontend/src/pages/dashboard/components/tables/drivers-table/styles.module.scss

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,3 @@
2727
.formWrapper {
2828
width: 448px;
2929
}
30-
31-
.red {
32-
color: $red;
33-
}

frontend/src/pages/dashboard/components/tables/trucks-table/styles.module.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
.title {
2222
color: $blue-extra-dark;
2323
text-align: center;
24+
text-transform: uppercase;
2425
}
2526

2627
.formWrapper {

frontend/src/pages/dashboard/components/tables/trucks-table/trucks-table.tsx

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -71,22 +71,17 @@ const TruckTable: React.FC = () => {
7171
[dispatch, searchParameters, handleToggle],
7272
);
7373

74-
const message = (
75-
<div>
76-
There are no data here yet. Please,{' '}
77-
<span className={styles.red}>add new driver</span>
78-
</div>
79-
);
74+
const message = 'There are no data here yet. Please, add a truck';
8075

8176
return (
8277
<>
8378
<div className={styles.container}>
8479
<div className={styles.header}>
85-
<h2 className={getValidClassNames('uppercase', styles.title)}>
80+
<h2 className={getValidClassNames('h3', styles.title)}>
8681
Company Trucks
8782
</h2>
8883
<Button
89-
label="Add a truck"
84+
label="Add Truck"
9085
className={styles.btn}
9186
onClick={handleToggle}
9287
/>

0 commit comments

Comments
 (0)