Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implementar Ver Endereço no Mapa na pagina Detalhes do Abrigo #267

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/components/CardAboutShelter/CardAboutShelter.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import {
Home,
UsersRound,
HandHeart,
PawPrint,
Expand All @@ -12,23 +11,22 @@ import {
import { Card } from '../ui/card';
import { ICardAboutShelter } from './types';
import { InfoRow } from './components';
import { checkAndFormatAddress } from './utils';
import { ShelterCategory } from '@/hooks/useShelter/types';
import { Fragment } from 'react/jsx-runtime';
import { AddressInfoRow } from './components/AddressInfoRow';

const CardAboutShelter = (props: ICardAboutShelter) => {
const { shelter } = props;

const check = (v?: string | number | boolean | null) => {
return v !== undefined && v !== null;
};
const formatAddress = checkAndFormatAddress(shelter, false);

return (
<Card className="flex flex-col gap-2 p-4 bg-[#E8F0F8] text-sm">
<div className="text-[#646870] font-medium">Sobre o abrigo</div>
<div className="flex flex-col flex-wrap gap-3">
<InfoRow icon={<Home />} label={formatAddress} />
<AddressInfoRow shelter={shelter} />
{Boolean(shelter.city) && (
<InfoRow icon={<Building />} label="Cidade:" value={shelter.city} />
)}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
import React from 'react';
import { Home, Map } from 'lucide-react';
import { cn } from '@/lib/utils';

import { ICardAboutShelter } from '../../types';
import { checkAndFormatAddress, getGoogleMapsUrlTo } from '../../utils';

const AddressInfoRow = ({ shelter } : ICardAboutShelter) => {

const formatAddress = checkAndFormatAddress(shelter, false);
const googleMapsUrl = getGoogleMapsUrlTo(formatAddress);

return (
<>
<div className={cn(
'flex items-start gap-2 font-medium w-full',
'md:flex'
)}>
{React.cloneElement(<Home /> as any, {
className: 'min-w-5 min-h-5 w-5 h-5 stroke-muted-foreground',
})}
<div className={cn('flex flex-col gap-2 items-start', 'sm:flex-row')}>
<a href={googleMapsUrl} target="_blank" rel="noopener noreferrer">
<span className={'font-normal'}>
{formatAddress}
</span>
</a>
</div>
</div>
<div className={cn(
'flex items-start gap-2 font-medium w-full',
'md:flex'
)}>
{React.cloneElement(<Map /> as any, {
className: 'min-w-5 min-h-5 w-5 h-5 stroke-muted-foreground',
})}
<div className={cn('flex flex-col gap-2 items-start', 'sm:flex-row')}>
<a href={googleMapsUrl} target="_blank" rel="noopener noreferrer">
<span className={'font-normal'}>
<u>Ver endereço no mapa</u>
</span>
</a>
</div>
</div>
</>
);
};

export { AddressInfoRow };
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import { AddressInfoRow } from './AddressInfoRow';

export { AddressInfoRow };
5 changes: 4 additions & 1 deletion src/components/CardAboutShelter/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,7 @@ const checkAndFormatAddress = (
);
};

export { checkAndFormatAddress };
const getGoogleMapsUrlTo = (address: string): string =>
`https://www.google.com/maps/search/?api=1&query=${encodeURIComponent(address)}`;

export { checkAndFormatAddress, getGoogleMapsUrlTo };