slococo
/
fids
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update browser-domain

This commit is contained in:
Santiago Lo Coco 2023-12-04 19:56:04 -03:00
parent 6f7a374f4b
commit 9578780da1
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
browser-domain/src/components/Home/Card/Card.tsx
View File

@ -24,20 +24,13 @@ interface CardProps {
subscribed: boolean; subscribed: boolean;
refresh: any; refresh: any;
isAirline: boolean; isAirline: boolean;
<<<<<<< HEAD
isAdmin: boolean; isAdmin: boolean;
=======
>>>>>>> 8b9f006 (Add edit and delete flight in the frontend)
refreshFlights: any; refreshFlights: any;
} }
const { Text } = Typography; const { Text } = Typography;
<<<<<<< HEAD
export const Card: React.FC<CardProps> = ({ flight, user, subscribed, refresh, refreshFlights, isAirline, isAdmin }) => { export const Card: React.FC<CardProps> = ({ flight, user, subscribed, refresh, refreshFlights, isAirline, isAdmin }) => {
=======
export const Card: React.FC<CardProps> = ({ flight, user, subscribed, refresh, refreshFlights, isAirline }) => {
>>>>>>> 8b9f006 (Add edit and delete flight in the frontend)
const [modalVisible, setModalVisible] = useState<boolean>(false); const [modalVisible, setModalVisible] = useState<boolean>(false);
const navigate = useNavigate(); const navigate = useNavigate();
@ -165,11 +158,7 @@ export const Card: React.FC<CardProps> = ({ flight, user, subscribed, refresh, r
<Text>{flight.id}</Text> <Text>{flight.id}</Text>
</Space> </Space>
</div> </div>
<<<<<<< HEAD
{!isAirline && !isAdmin ? {!isAirline && !isAdmin ?
=======
{!isAirline ?
>>>>>>> 8b9f006 (Add edit and delete flight in the frontend)
( (
!(subscribed) ? !(subscribed) ?
<Button type="primary" onClick={handleSubscribe}> <Button type="primary" onClick={handleSubscribe}>
@ -182,11 +171,7 @@ export const Card: React.FC<CardProps> = ({ flight, user, subscribed, refresh, r
) )
: :
( (
<<<<<<< HEAD
(user && flight.user_id == user.id) || isAdmin ? (user && flight.user_id == user.id) || isAdmin ?
=======
user && flight.user_id == user.id ?
>>>>>>> 8b9f006 (Add edit and delete flight in the frontend)
<> <>
<Button type="primary" onClick={handleEdit}> <Button type="primary" onClick={handleEdit}>
Edit Edit