AlchemistByte
diff --git a/‎package-lock.json‎
Lines changed: 772 additions & 0 deletions b/‎package-lock.json‎
Lines changed: 772 additions & 0 deletions
diff --git a/‎package.json‎
Lines changed: 7 additions & 10 deletions b/‎package.json‎
Lines changed: 7 additions & 10 deletions
diff --git a/‎src/components/Authenticated/Authenticated.tsx‎
Lines changed: 7 additions & 24 deletions b/‎src/components/Authenticated/Authenticated.tsx‎
Lines changed: 7 additions & 24 deletions
diff --git a/‎src/components/CardAboutShelter/components/InfoRow/InfoRow.tsx‎
Lines changed: 1 addition & 14 deletions b/‎src/components/CardAboutShelter/components/InfoRow/InfoRow.tsx‎
Lines changed: 1 addition & 14 deletions
diff --git a/‎src/components/SearchInput/SearchInput.tsx‎
Lines changed: 13 additions & 16 deletions b/‎src/components/SearchInput/SearchInput.tsx‎
Lines changed: 13 additions & 16 deletions
diff --git a/‎src/components/index.ts‎
Lines changed: 9 additions & 7 deletions b/‎src/components/index.ts‎
Lines changed: 9 additions & 7 deletions
diff --git a/‎src/hooks/useFetch/useFetch.tsx‎
Lines changed: 3 additions & 13 deletions b/‎src/hooks/useFetch/useFetch.tsx‎
Lines changed: 3 additions & 13 deletions
diff --git a/‎src/hooks/useSupplies/useSupplies.tsx‎
Lines changed: 1 addition & 5 deletions b/‎src/hooks/useSupplies/useSupplies.tsx‎
Lines changed: 1 addition & 5 deletions
diff --git a/‎src/pages/CreateShelter/CreateShelter.tsx‎
Lines changed: 8 additions & 10 deletions b/‎src/pages/CreateShelter/CreateShelter.tsx‎
Lines changed: 8 additions & 10 deletions
@@ -19,49 +19,46 @@
     "@radix-ui/react-select": "^2.0.0",
     "@radix-ui/react-separator": "^1.0.3",
     "@radix-ui/react-slot": "^1.0.2",
+    "@radix-ui/react-tabs": "^1.0.4",
     "@radix-ui/react-toast": "^1.1.5",
     "@radix-ui/react-tooltip": "^1.0.7",
     "axios": "^1.6.8",
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.1.1",
+    "crypto-js": "^4.2.0",
     "date-fns": "^3.6.0",
     "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",
     "react-router-dom": "^6.23.0",
     "react-select": "^5.8.0",
-    "react": "^18.2.0",
+    "react-to-print": "^2.15.1",
     "tailwind-merge": "^2.3.0",
     "tailwindcss-animate": "^1.0.7",
     "yup": "^1.4.0"
   },
   "devDependencies": {
+    "@types/crypto-js": "^4.2.2",
     "@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",
     "@typescript-eslint/eslint-plugin": "^7.2.0",
     "@typescript-eslint/parser": "^7.2.0",
     "@vitejs/plugin-react": "^4.2.1",
     "autoprefixer": "^10.4.19",
+    "eslint": "^8.57.0",
     "eslint-plugin-react-hooks": "^4.6.0",
     "eslint-plugin-react-refresh": "^0.4.6",
-    "eslint": "^8.57.0",
+    "javascript-obfuscator": "^4.1.0",
     "postcss": "^8.4.38",
     "tailwindcss": "^3.4.3",
     "typescript": "^5.2.2",
     "vite": "^5.2.0"
   }
-}
+}
@@ -1,35 +1,18 @@
-<<<<<<< HEAD
 import { Fragment } from 'react';
 
 import { IAuthenticatedProps } from './types';
 import { useAuthRoles } from '@/hooks';
 
-const Authenticated = ({ children, role = 'User' }: IAuthenticatedProps) => {
+const Authenticated = ({
+  children,
+  bypass = false,
+  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))
+  if (!bypass && !isAuthenticated) return <Fragment />;
 
   return <div className="contents">{children}</div>;
 };
 
-export { Authenticated };
+export { Authenticated };
@@ -4,7 +4,6 @@ import { IInfoRowProps } from './types';
 
 const InfoRow = React.forwardRef<HTMLDivElement, IInfoRowProps>(
   (props, ref) => {
-<<<<<<< HEAD
     const {
       icon,
       label,
@@ -13,20 +12,12 @@ const InfoRow = React.forwardRef<HTMLDivElement, IInfoRowProps>(
       className = '',
       ...rest
     } = props;
-=======
-    const { icon, label, value, clipboardButton = false, className = '', ...rest } = props;
->>>>>>> 4e0d9c0 (Release 0.0.1 (#135))
     const isLink = value?.startsWith('http');
     const ValueComp = !value ? (
       <Fragment />
     ) : isLink ? (
-<<<<<<< HEAD
       <a
         href={value}
-        target="_blank"
-=======
-      <a href={value} target='_blank'
->>>>>>> 4e0d9c0 (Release 0.0.1 (#135))
         className="text-blue-500 break-all cursor-pointer hover:underline"
       >
         {value}
@@ -63,14 +54,10 @@ const InfoRow = React.forwardRef<HTMLDivElement, IInfoRowProps>(
               </div>
             )}
           </span>
-<<<<<<< HEAD
-=======
-
->>>>>>> 4e0d9c0 (Release 0.0.1 (#135))
         </div>
       </div>
     );
   }
 );
 
-export { InfoRow };
+export { InfoRow };
@@ -7,29 +7,26 @@ import { cn } from '@/lib/utils';
 
 const SearchInput = React.forwardRef<HTMLDivElement, ISearchInputProps>(
   (props, ref) => {
-<<<<<<< HEAD
+    const { inputProps, value, onChange, className, ...rest } = props;
     const {
-      value,
-      onChange,
-      className,
       placeholder = 'Buscar por abrigo ou endereço',
-      ...rest
-    } = props;
-=======
-    const { value, onChange, className, ...rest } = props;
->>>>>>> 3d3f437 (merge: develop -> master (#91))
+      className: inputClassName = '',
+      ...restInputProps
+    } = inputProps ?? {};
 
     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}
+          className={cn(
+            'h-12 text-md font-medium text-zinc-600 pl-10 pr-4',
+            inputClassName
+          )}
+          onChange={(ev) =>
+            onChange ? onChange(ev.target.value ?? '') : undefined
+          }
+          {...restInputProps}
         />
         <div className="absolute inset-y-0 left-0 flex items-center pl-3">
           <Search name="search" size="20" className="stroke-zinc-300" />
@@ -39,4 +36,4 @@ const SearchInput = React.forwardRef<HTMLDivElement, ISearchInputProps>(
   }
 );
 
-export { SearchInput };
+export { SearchInput };
@@ -13,10 +13,11 @@ 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))
+import { BackToTop } from './BackToTop';
+import { DonationCartIcon } from './DonationCartIcon';
+import { DonationCart } from './DonationCart';
+import { Loader } from './Loader';
 
 export {
   LoadingScreen,
@@ -34,8 +35,9 @@ export {
   SearchInput,
   SelectField,
   Authenticated,
-<<<<<<< HEAD
   BurgerMenu,
-=======
->>>>>>> 3d3f437 (merge: develop -> master (#91))
-};
+  BackToTop,
+  DonationCartIcon,
+  DonationCart,
+  Loader,
+};
@@ -5,21 +5,17 @@ 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));
 
   const refresh = useCallback(
     (config?: AxiosRequestConfig<any>) => {
       const headers = config?.headers ?? {};
-      if (cache) headers['x-app-cache'] = 'true';
+      if (cache && import.meta.env.VITE_REQUEST_CACHE !== 'false')
+        headers['x-app-cache'] = 'true';
       setLoading(true);
-<<<<<<< HEAD
 
       if (path) {
         api
@@ -29,12 +25,6 @@ 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]
   );
@@ -46,4 +36,4 @@ function useFetch<T = any>(path: string, options: IUseFetchOptions<T> = {}) {
   return { data, loading, refresh };
 }
 
-export { useFetch };
+export { useFetch }
@@ -3,14 +3,10 @@ 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,
   });
 };
 
-export { useSupplies };
+export { useSupplies };
@@ -20,14 +20,10 @@ import { toast } from '@/components/ui/use-toast';
 import { ShelterServices } from '@/service';
 import { withAuth } from '@/hocs';
 import { clearCache } from '@/api/cache';
-<<<<<<< HEAD
 import { hardCodedRsCities } from './hardcodedCities';
 import { useDebouncedValue, useViaCep } from '@/hooks';
 import { cn } from '@/lib/utils';
 import { checkAndFormatAddress } from '@/components/CardAboutShelter';
-import { IUseShelterData } from '@/hooks/useShelter/types';
-=======
->>>>>>> 3d3f437 (merge: develop -> master (#91))
 
 const CreateShelterComponent = () => {
   const navigate = useNavigate();
@@ -79,12 +75,14 @@ const CreateShelterComponent = () => {
     }),
     onSubmit: async (values, { resetForm }) => {
       try {
-<<<<<<< HEAD
-        const address = checkAndFormatAddress(values as IUseShelterData);
+        const address = checkAndFormatAddress({
+          address: values.address,
+          city: values.city,
+          neighbourhood: values.neighbourhood,
+          street: values.street,
+          streetNumber: values.streetNumber,
+        });
         await ShelterServices.create({ ...values, address });
-=======
-        await ShelterServices.create(values);
->>>>>>> 3d3f437 (merge: develop -> master (#91))
         clearCache(false);
         toast({
           title: 'Cadastro feita com sucesso',
@@ -257,4 +255,4 @@ const CreateShelterComponent = () => {
 
 const CreateShelter = withAuth(CreateShelterComponent);
 
-export { CreateShelter };
+export { CreateShelter };