Skip to content

Commit 2658bbd

Browse files
🐛 Fix styling issues
feat/filters
1 parent 4789ad3 commit 2658bbd

File tree

7 files changed

+15
-7
lines changed

7 files changed

+15
-7
lines changed

src/global.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,4 +85,9 @@
8585
margin: 0;
8686
padding: 0;
8787
}
88+
89+
#root {
90+
max-width: 100vw;
91+
overflow-x: hidden;
92+
}
8893
}

src/hooks/useShelters/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export interface IUseSheltersDataSupplyData {
2222

2323
export interface IUseShelterSearchParams {
2424
priority: number | undefined;
25-
supplies: number[] | undefined;
25+
supplies: string[] | undefined;
2626
supplyCategories: number[] | undefined;
2727
search: string | undefined;
2828
filterAvailableShelter: boolean;

src/pages/Home/Home.tsx

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { Input } from '@/components/ui/input';
66
import { useShelters, useThrottle } from '@/hooks';
77
import { Button } from '@/components/ui/button';
88
import { SessionContext } from '@/contexts';
9-
import { Filter } from '../Filter';
9+
import { Filter } from './components/Filter';
1010
import { IUseShelterSearchParams } from '@/hooks/useShelters/types';
1111

1212
const alertDescription =
@@ -76,7 +76,7 @@ const Home = () => {
7676
params: params,
7777
}, true);
7878

79-
}, [search, shelters.filters, shelters.page, shelters.perPage]);
79+
}, [search, searchValue, shelters.filters, shelters.page, shelters.perPage]);
8080

8181
return (
8282
<div className="flex flex-col h-screen items-center">
@@ -141,13 +141,17 @@ const Home = () => {
141141
</div>
142142
</div>
143143
<div className="flex flex-row">
144-
<Button variant="ghost" size="sm" className="flex gap-2 items-center" onClick={() => setOpenModal(true)}>
144+
<Button variant="ghost" size="sm"
145+
className="flex gap-2 items-center [&_svg]:stroke-blue-500"
146+
onClick={() => setOpenModal(true)}>
145147
<ListFilter className="h-5 w-5" />
146148
<h1 className="font-semibold text-[16px] text-blue-500">
147149
Filtros
148150
</h1>
149151
</Button>
150-
<Button variant="ghost" size="sm" className="flex gap-2 items-center" onClick={() => clearSearch()}>
152+
<Button variant="ghost" size="sm"
153+
className="flex gap-2 items-center [&_svg]:stroke-blue-500"
154+
onClick={() => clearSearch()}>
151155
<CircleAlert className="h-5 w-5" />
152156
<h1 className="font-semibold text-[16px] text-blue-500">
153157
Limpar Filtros

src/pages/Filter/Filter.tsx renamed to src/pages/Home/components/Filter/Filter.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ const Filter = (props: any) => {
9999
}, [result.data, props?.filters?.supplies]);
100100

101101
const handleSupplyCategoriesSelected = (supplyCategoriesSelected: readonly IComplexSelectData[]) => {
102-
console.log('init')
103102
const grouped = group(result.data ?? [], 'supplyCategory.name');
104103

105104
const supplyOptionsFiltered = Object.entries(grouped).reduce((filtered: IComplexSelectGroupedData[], option) => {
File renamed without changes.
File renamed without changes.

src/pages/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { EditShelterSupply } from './EditShelterSupply';
66
import { CreateSupply } from './CreateSupply';
77
import { CreateShelter } from './CreateShelter';
88
import { UpdateShelter } from './UpdateShelter';
9-
import { Filter } from './Filter';
9+
import { Filter } from './Home/components/Filter';
1010

1111
export {
1212
SignIn,

0 commit comments

Comments
 (0)