Skip to content

Commit f57f262

Browse files
rhuamhelenapaixaofagundesjgluccas-spechtMatheusDubin
authored and
marcodmc
committed
Staging (SOS-RS#251)
* [fix] Config readme * wip: loading * Delete yarn.lock * refact: created shelter list view component in home page * Fix: mobile UI has broken for mobile devices (SOS-RS#22) *Fix: mobile UI has broken for mobile devices * fix: remove chip as fixed as no wrap property * chore: add shelter card clickable * chore: remove Fragment component * build: add set sm as max mobile dimension sm: 425px * style: add responsive layout * refactor: filter page * fix: priority * fix: filter parameters * fix: fixed volunteer supply that had been fulfilled displaying on shelter page * fix: improve readability * feat: hidden filter button if filter is empty * feat: cache in axios request * fix: cache search params * feat: cache clean on searchs * wip: donation tags * fix: clean search params * Update README.md [fix] Retirando a seção Funcionalidades e Backlog * fix: donation tags / componentized the urgent supplies section * fix: removed empty shelter tags empty row * feat: full edit shelter and improved interface of pet friendly in shelter page * refact: add live link and tech stack to readme * Fix/develop bugs (SOS-RS#90) * fix: cache bug (invalite cache on create/update operation) * feat: added update many shelter supplies and admin rule * Add license (SOS-RS#81) Closes SOS-RS#65. * fix: app port (SOS-RS#80) * docs: added shadcn/ui reference * fix for volunteer shelter title (SOS-RS#95) * treat contact link as a proper link * simplified href * docs: add discord link on readme * Normalizes search string in supply filter so it ignores accents (SOS-RS#125) * normalized search string to ignore accents * revert removed button * add a copy to clipboard button to PIX and contact info (SOS-RS#124) * add a copy to clipboard button to PIX and contact info * use && operator instead of ternary * Substitui onClick e useNavigate por <Link> para melhorar acessibilidade (SOS-RS#128) * replaced navigate in favour of html link and added card hover * fixed lint warnings * fix: change shelter title style (SOS-RS#106) Prevents badge misalignment on very large titles * Add new feature and creating LoadingSkeleton (SOS-RS#115) * Add new feature and creating LoadingSkeleton * fix/add: add favicon and canonical metatag (SOS-RS#136) * fix/add: add favicon and canonical metatag * fix: fixed the path * refactor: changed order of shelters to updated at instead priority sum (SOS-RS#137) * Remove zod dependency (SOS-RS#143) * replaced zod validation with yup * removed zod dependency from package.json * sort dependencies * fixed validation schema variable name * removed .shape() and added .strict() * deleted unused file * Added burger menu to home page (SOS-RS#149) * Implemented Burger menu * commented unused components * feat: Update BurgerMenu to display user's name when logged in * removed comments * implemented login and logout button * Feat/partners (SOS-RS#155) * fix: menu bar with api partners * fix: menu bar with api partners * fix: remove unused session in burguer menu / removed import all icons from lucide and use link icon instead custom icons * [BUG] Botão de Limpar Filtro sumindo após remover input de busca (SOS-RS#147) * fix: clean filter button disappearing after removing search input manually * fix: removing log * Modificação nas telas de abrigos para adicionar cidades (SOS-RS#110) * feat: filter shlters by cities * feat: city on shelter forms, info and list * feat: shelter city quantities on filter * fix: wrong conditional * fix: bug that removing city filter on home doesnt affect the filter * feat: new address fields on shelter forms * feat: useDebouncedValue, useViaCep * feat: adapt useFetch for conditional paths and different response * feat: address fields required and zipCode triggering viaCep * feat: address fields required on update shelter * feat: address fields on shelter details when theres no address field * fix: suggestions(shorthand, optional chaining, separated zipCode, formatted city on list) * feat: sticky footer on filter dialog * fix: reset errors on zipcode search; copy filter change * fix: timeoutId not assigned value; InfoRow copy can copy undefined * Campo de quantidade adicionado quando adicionar suprimento a um abrigo (SOS-RS#46) * feat(shelter-supply): input to add quantity supply * feat(shelter-supply): show quantity supply at Shelter page and EditShelter page * resolve conflict --------- Co-authored-by: Lipe <[email protected]> * feat: google analytics * feat: edit shelter supply item quantity (SOS-RS#170) * fix: send address field formatted (SOS-RS#171) * feat: add a template to log bugs/defects (SOS-RS#168) * feat: add a template to log bugs/defects * Feat/privacy terms about us (SOS-RS#169) * feat: privacy policy page * feat: done about us page * fix: removed redundant value check in info row component * fix: ordering the list of items on the shelter edit page (SOS-RS#166) * feat: Melhoria no esquema de cores dos chip's e ajuste de acessibilidade (SOS-RS#162) * feat: new text colors with adjusted light var colors * feat: change chip element tag to span and improve a11y * feat: added update date information to shelter page (SOS-RS#159) * Adding update date to shelter page * (Aditional) Informing when no update date for shelter in main page * feat: ajuste de textos de voluntários e doações (SOS-RS#129) * hotfix: shelter list item broken div tag * Feat/back navigation to home (SOS-RS#177) * feat: added back navigation to home when click in header label * Hotfix/merge bugs (SOS-RS#183) * fix: shelter list item duplicate code after merge * fix: order in filter select menu, filter supplies by category and useSupplies interface * fix: update shelter validation schema and created useAuthRoles hook to reduce complexity of code * fix: conflicts with master branch * feat: dev and staging gh actions * wip * feat: done supporters page * feat: added shelter category (SOS-RS#250) Co-authored-by: José Fagundes <[email protected]> --------- Co-authored-by: helenapaixao <[email protected]> Co-authored-by: José Fagundes <[email protected]> Co-authored-by: Luccas Specht <[email protected]> Co-authored-by: MatheusDubin <[email protected]> Co-authored-by: danmqs <[email protected]> Co-authored-by: Giovanni Bassi <[email protected]> Co-authored-by: Felipe Monteiro <[email protected]> Co-authored-by: André Ferraz <[email protected]> Co-authored-by: Sombrio <[email protected]> Co-authored-by: Filipe Pacheco de Fraga <[email protected]> Co-authored-by: Daniel Marques <[email protected]> Co-authored-by: Matheus Dubin Da Silveira <[email protected]> Co-authored-by: Miguel Dalberto <[email protected]> Co-authored-by: Pablo A. Maximo <[email protected]> Co-authored-by: Marcos Nascimento <[email protected]> Co-authored-by: Gilmar José <[email protected]> Co-authored-by: Kelvin <[email protected]> Co-authored-by: Jhonatan David <[email protected]> Co-authored-by: Alexander Scheibler <[email protected]> Co-authored-by: Giovani Andrino Carnaval <[email protected]> Co-authored-by: Thiago Oliveira <[email protected]> Co-authored-by: Henrique Uhlmann Gobbi <[email protected]> Co-authored-by: Janderson Soares <[email protected]>
1 parent 3cf1b21 commit f57f262

File tree

1 file changed

+13
-28
lines changed

1 file changed

+13
-28
lines changed

src/hooks/useShelters/types.ts

Lines changed: 13 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,7 @@
1-
export enum ShelterCategory {
2-
Shelter = 'Shelter',
3-
DistributionCenter = 'DistributionCenter',
4-
}
5-
6-
export enum SupplyMeasure {
7-
Unit = 'Unit',
8-
Kg = 'Kg',
9-
Litters = 'Litters',
10-
Box = 'Box',
11-
Piece = 'Piece',
12-
}
1+
import { ShelterTagType } from '@/pages/Home/components/ShelterListItem/types';
2+
import { ShelterCategory, SupplyMeasure } from '../useShelter/types';
133

14-
export interface IUseShelterData {
4+
export interface IUseSheltersData {
155
id: string;
166
name: string;
177
street?: string;
@@ -29,29 +19,24 @@ export interface IUseShelterData {
2919
verified: boolean;
3020
latitude?: string | null;
3121
longitude?: string | null;
32-
shelterSupplies: IUseShelterDataSupply[];
3322
category: ShelterCategory;
3423
actived: boolean;
3524
createdAt: string;
3625
updatedAt?: string | null;
26+
shelterSupplies: IUseSheltersDataSupplyData[];
3727
}
3828

39-
export interface IUseShelterDataSupply {
29+
export interface IUseSheltersDataSupplyData {
30+
supply: {
31+
name: string;
32+
measure: SupplyMeasure;
33+
supplyCategory: { name: string };
34+
};
4035
priority: number;
36+
tags: ShelterTagType[];
4137
quantity?: number | null;
42-
supply: IUseShelterDataSupplyData;
4338
}
4439

45-
export interface IUseShelterDataSupplyData {
46-
id: string;
47-
name: string;
48-
measure: SupplyMeasure;
49-
supplyCategory: IUseShelterDataSupplyCategory;
50-
createdAt: string;
51-
updatedAt?: string | null;
52-
}
53-
54-
export interface IUseShelterDataSupplyCategory {
55-
id: string;
56-
name: string;
40+
export interface IUseShelterOptions {
41+
cache?: boolean;
5742
}

0 commit comments

Comments
 (0)