merge: develop -> master (SOS-RS#91)

* 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

* fix: donation tags

* fix: clean search params

* 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

* 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)

---------

Co-authored-by: Luccas Specht <[email protected]>
Co-authored-by: MatheusDubin <[email protected]>
Co-authored-by: Giovanni Bassi <[email protected]>
Co-authored-by: Felipe Monteiro <[email protected]>

Author: 5 people

package.json

@@ -28,6 +28,10 @@
     "formik": "^2.4.6",
     "lucide-react": "^0.378.0",
     "qs": "^6.12.1",
+<<<<<<< HEAD
+=======
+    "react": "^18.2.0",
+>>>>>>> 3d3f437 (merge: develop -> master (#91))
     "react-dom": "^18.2.0",
     "react-hook-form": "^7.51.4",
     "react-input-mask": "^2.0.4",
@@ -41,6 +45,10 @@
   "devDependencies": {
     "@types/node": "^20.12.8",
     "@types/qs": "^6.9.15",
+<<<<<<< HEAD
+=======
+    "@types/react": "^18.2.66",
+>>>>>>> 3d3f437 (merge: develop -> master (#91))
     "@types/react-dom": "^18.2.22",
     "@types/react-input-mask": "^3.0.5",
     "@types/react": "^18.2.66",

src/components/Authenticated/Authenticated.tsx

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 import { Fragment } from 'react';
 
 import { IAuthenticatedProps } from './types';
@@ -7,6 +8,26 @@ const Authenticated = ({ children, role = 'User' }: IAuthenticatedProps) => {
   const isAuthenticated = useAuthRoles(role);
 
   if (!isAuthenticated) return <Fragment />;
+=======
+import { Fragment, useContext } from 'react';
+
+import { SessionContext } from '@/contexts';
+import { IAuthenticatedProps } from './types';
+import { AccessLevel } from '@/service/sessions/types';
+
+const MappedRoles: Record<AccessLevel, AccessLevel[]> = {
+  Admin: ['Admin'],
+  DistributionCenter: ['Admin', 'DistributionCenter'],
+  Staff: ['Admin', 'Staff'],
+  User: ['Admin', 'Staff', 'DistributionCenter', 'User'],
+};
+
+const Authenticated = ({ children, role = 'User' }: IAuthenticatedProps) => {
+  const { session } = useContext(SessionContext);
+
+  if (!session || !MappedRoles[role].includes(session.accessLevel))
+    return <Fragment />;
+>>>>>>> 3d3f437 (merge: develop -> master (#91))
 
   return <div className="contents">{children}</div>;
 };

src/components/Footer/Footer.tsx

@@ -17,7 +17,11 @@ const Footer = React.forwardRef<
         className
       )}
     >
+<<<<<<< HEAD
       <p className="text-white max-sm:grid max-sm:place-items-center transition-all">
+=======
+      <p className="text-white">
+>>>>>>> 3d3f437 (merge: develop -> master (#91))
         Para cadastrar novos abrigos clique{' '}
         <a
           href="https://forms.gle/2S7L2gR529Dc8P3T9"
@@ -28,7 +32,11 @@ const Footer = React.forwardRef<
         </a>
       </p>
       <span className="text-white hidden md:block">•</span>
+<<<<<<< HEAD
       <span className="text-white flex flex-nowrap gap-2 items-center max-sm:grid max-sm:place-items-center transition-all">
+=======
+      <span className="text-white flex flex-nowrap gap-2 items-center">
+>>>>>>> 3d3f437 (merge: develop -> master (#91))
         Projeto Open Source disponível em{' '}
         <a
           className="underline hover:text-gray-300 flex"

src/components/Header/Header.tsx

@@ -1,4 +1,5 @@
 import React from 'react';
+
 import { IHeader } from './types';
 import { cn } from '@/lib/utils';
 import { Link } from 'react-router-dom';
@@ -17,11 +18,7 @@ const Header = React.forwardRef<HTMLDivElement, IHeader>((props, ref) => {
     <header
       ref={ref}
       className={cn(
-<<<<<<< HEAD
         'bg-red-600 fixed transition-all w-full flex items-center justify-between p-2 h-auto max-[300px]:flex-col max-[300px]:gap-2',
-=======
-        'bg-red-600 flex h-[56px] justify-between items-center text-white p-3 gap-2 w-full z-[60]',
->>>>>>> dfc7f9c (Added burger menu to home page (#149))
         className
       )}
       {...rest}
@@ -32,9 +29,7 @@ const Header = React.forwardRef<HTMLDivElement, IHeader>((props, ref) => {
           {title}
         </Link>
       </div>
-      <div className="flex w-auto items-center justify-between">
         <div className="cursor-pointer">{endAdornment}</div>
-      </div>
     </header>
   );
 });

src/components/SearchInput/SearchInput.tsx

@@ -7,19 +7,27 @@ import { cn } from '@/lib/utils';
 
 const SearchInput = React.forwardRef<HTMLDivElement, ISearchInputProps>(
   (props, ref) => {
+<<<<<<< HEAD
     const {
       value,
       onChange,
       className,
       placeholder = 'Buscar por abrigo ou endereço',
       ...rest
     } = props;
+=======
+    const { value, onChange, className, ...rest } = props;
+>>>>>>> 3d3f437 (merge: develop -> master (#91))
 
     return (
       <div ref={ref} className={cn(className, 'relative')} {...rest}>
         <Input
           value={value}
+<<<<<<< HEAD
           placeholder={placeholder}
+=======
+          placeholder="Buscar por abrigo ou endereço"
+>>>>>>> 3d3f437 (merge: develop -> master (#91))
           className="h-12 text-md font-medium text-zinc-600 pl-10 pr-4"
           onChange={onChange}
         />

src/components/index.ts

@@ -13,7 +13,10 @@ import { SearchInput } from './SearchInput';
 import { VerifiedBadge } from './VerifiedBadge';
 import { SelectField } from './SelectField';
 import { Authenticated } from './Authenticated';
+<<<<<<< HEAD
 import { BurgerMenu } from './BurgerMenu';
+=======
+>>>>>>> 3d3f437 (merge: develop -> master (#91))
 
 export {
   LoadingScreen,
@@ -31,5 +34,8 @@ export {
   SearchInput,
   SelectField,
   Authenticated,
+<<<<<<< HEAD
   BurgerMenu,
+=======
+>>>>>>> 3d3f437 (merge: develop -> master (#91))
 };

src/hooks/useFetch/useFetch.tsx

@@ -5,7 +5,11 @@ import { api } from '@/api';
 import { IServerResponse } from '@/types';
 import { IUseFetchOptions } from './types';
 
+<<<<<<< HEAD
 function useFetch<T = any>(path?: string, options: IUseFetchOptions<T> = {}) {
+=======
+function useFetch<T = any>(path: string, options: IUseFetchOptions<T> = {}) {
+>>>>>>> 3d3f437 (merge: develop -> master (#91))
   const { cache, initialValue } = options;
   const [loading, setLoading] = useState<boolean>(true);
   const [data, setData] = useState<T>(initialValue || ({} as T));
@@ -15,6 +19,7 @@ function useFetch<T = any>(path?: string, options: IUseFetchOptions<T> = {}) {
       const headers = config?.headers ?? {};
       if (cache) headers['x-app-cache'] = 'true';
       setLoading(true);
+<<<<<<< HEAD
 
       if (path) {
         api
@@ -24,6 +29,12 @@ function useFetch<T = any>(path?: string, options: IUseFetchOptions<T> = {}) {
       } else {
         setLoading(false);
       }
+=======
+      api
+        .get<IServerResponse<T>>(path, { ...config, headers })
+        .then(({ data }) => setData(data.data))
+        .finally(() => setLoading(false));
+>>>>>>> 3d3f437 (merge: develop -> master (#91))
     },
     [cache, path]
   );

src/hooks/useShelters/types.ts

@@ -30,7 +30,10 @@ export interface IUseSheltersDataSupplyData {
   };
   priority: number;
   tags: ShelterTagType[];
+<<<<<<< HEAD
   quantity?: number | null;
+=======
+>>>>>>> 3d3f437 (merge: develop -> master (#91))
 }
 
 export interface IUseShelterOptions {

src/hooks/useShelters/useShelters.tsx

@@ -27,7 +27,11 @@ const useShelters = (options: IUseShelterOptions = {}) => {
           ...config,
           headers,
           params: {
+<<<<<<< HEAD
             orderBy: 'updatedAt',
+=======
+            orderBy: 'prioritySum',
+>>>>>>> 3d3f437 (merge: develop -> master (#91))
             order: 'desc',
             search:
               search ?? new URLSearchParams(window.location.search).toString(),

src/hooks/useSupplies/useSupplies.tsx

@@ -3,7 +3,11 @@ import { PaginatedQueryPath } from '../usePaginatedQuery/paths';
 import { IUseSuppliesData } from './types';
 
 const useSupplies = () => {
+<<<<<<< HEAD
   return useFetch<IUseSuppliesData[]>(PaginatedQueryPath.Supplies, {
+=======
+  return useFetch<ISupply[]>(PaginatedQueryPath.Supplies, {
+>>>>>>> 3d3f437 (merge: develop -> master (#91))
     initialValue: [],
     cache: true,
   });