diff --git a/astro/src/components/AddRetailerForm.tsx b/astro/src/components/AddRetailerForm.tsx index 5bb25f5..aee4894 100644 --- a/astro/src/components/AddRetailerForm.tsx +++ b/astro/src/components/AddRetailerForm.tsx @@ -2,7 +2,7 @@ import { zodResolver } from "@hookform/resolvers/zod" import { useForm } from "react-hook-form" import { z } from "zod" -import { Button } from "@/components/ui/button" +import { Button } from "@/components/ui/Button" import { Form, FormControl, diff --git a/astro/src/components/KiosMap.tsx b/astro/src/components/KiosMap.tsx index 1ab6bf7..8d169e4 100644 --- a/astro/src/components/KiosMap.tsx +++ b/astro/src/components/KiosMap.tsx @@ -6,6 +6,7 @@ import L, { LatLngBounds } from 'leaflet'; import { useQuery, useMutation, useQueryClient, queryOptions } from "@tanstack/react-query"; import axios from "axios"; import Contacts from './Contacts'; +import { Button } from './ui/Button'; //Todo: Move types to own file interface User { @@ -210,7 +211,7 @@ export const KiosMap = () => { } const handleAcceptRoute = () => { - + } const blackDotIcon = L.divIcon({ @@ -240,12 +241,18 @@ export const KiosMap = () => {
{selectedMaker !== undefined && ( +
+ /> + +
)} {selectedRetailer !== undefined && ( @@ -284,12 +291,12 @@ export const KiosMap = () => { ) :

No courier!

- +
}
diff --git a/astro/src/components/ui/button.tsx b/astro/src/components/ui/Button.tsx similarity index 92% rename from astro/src/components/ui/button.tsx rename to astro/src/components/ui/Button.tsx index 2e1d4eb..f4aeeec 100644 --- a/astro/src/components/ui/button.tsx +++ b/astro/src/components/ui/Button.tsx @@ -9,6 +9,7 @@ const buttonVariants = cva( { variants: { variant: { + kios: "border-2 border-gray-950 py-2 px-4 w-full hover:bg-gray-950 transition-all hover:text-white hover:font-bold rounded-none", default: "bg-primary text-primary-foreground hover:bg-primary/90", destructive: "bg-destructive text-destructive-foreground hover:bg-destructive/90",