-
+
diff --git a/src/components/children/connect-device-dialog.tsx b/src/components/children/connect-device-dialog.tsx
index 6f1fa60..2a3816b 100644
--- a/src/components/children/connect-device-dialog.tsx
+++ b/src/components/children/connect-device-dialog.tsx
@@ -12,6 +12,7 @@ import {
import { Icons } from '@/components/icons';
import QRCode from 'react-qr-code';
+import ChildModel from '@/lib/models/child';
type ConnectDeviceDialogProps = {
child: ChildModel;
diff --git a/src/components/forms/add-child-form.tsx b/src/components/forms/add-child-form.tsx
index 717e752..471eade 100644
--- a/src/components/forms/add-child-form.tsx
+++ b/src/components/forms/add-child-form.tsx
@@ -30,20 +30,6 @@ const AddChildForm: React.FC
= ({ className, ...props }) => {
const utils = api.useUtils();
const createChild = api.child.create.useMutation();
- // const queryClient = useQueryClient();
- // const { mutate: submitNewChild, isPending } = useMutation({
- // mutationFn: async (name: string) =>
- // await axios.post('/api/child/create', { name }),
- // onSuccess: (e) => {
- // console.log('add-child-form', 'onSuccess', e);
- // toast({ description: 'Added new child' });
- // queryClient.invalidateQueries({ queryKey: ['user-children'] });
- // setPIN(e.data.pin);
- // },
- // onError: () => {
- // toast({ description: 'Something went wrong', variant: 'destructive' });
- // },
- // });
const {
register,
handleSubmit,
@@ -54,12 +40,15 @@ const AddChildForm: React.FC = ({ className, ...props }) => {
const onSubmit = async (data: FormData) => {
try {
- const result = createChild.mutate({ name: data.name });
- debugger;
+ const result = await createChild.mutateAsync({ name: data.name });
toast({ description: "Added new child" });
await utils.child.invalidate();
- //queryClient.invalidateQueries({ queryKey: ['user-children'] });
- setPIN(result.data?.pin);
+ console.log("add-child-form", "onSubmit", createChild.data);
+ if (result) {
+ setPIN(result.id);
+ } else {
+ toast({ description: "Something went wrong", variant: "destructive" });
+ }
} catch (err) {
toast({ description: "Something went wrong", variant: "destructive" });
}
diff --git a/src/components/pages/dashboard-page.tsx b/src/components/pages/dashboard-page.tsx
deleted file mode 100644
index ecacde4..0000000
--- a/src/components/pages/dashboard-page.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import React from 'react';
-import ChildrenFilter from '@/components/children/children-filter';
-import dynamic from 'next/dynamic';
-import ChildModel from '@/lib/models/child';
-
-type DashboardPageProps = {
- kids: ChildModel[];
-}
-const DashboardPage: React.FC = ({ kids }) => {
- //this needs to be a dynamic import
- //otherwise it causes window not found errors
- const Map = dynamic(() => import('@/components/maps/main-map'), {
- ssr: false,
- });
-
- return (
-
- );
-};
-
-export default DashboardPage;
diff --git a/src/components/ui/navigation-menu.tsx b/src/components/ui/navigation-menu.tsx
index 1419f56..30f5d72 100644
--- a/src/components/ui/navigation-menu.tsx
+++ b/src/components/ui/navigation-menu.tsx
@@ -1,9 +1,9 @@
-import * as React from "react"
-import * as NavigationMenuPrimitive from "@radix-ui/react-navigation-menu"
-import { cva } from "class-variance-authority"
-import { ChevronDown } from "lucide-react"
+import * as React from 'react';
+import * as NavigationMenuPrimitive from '@radix-ui/react-navigation-menu';
+import { cva } from 'class-variance-authority';
+import { ChevronDown } from 'lucide-react';
-import { cn } from "@/lib/utils"
+import { cn } from '@/lib/utils';
const NavigationMenu = React.forwardRef<
React.ElementRef,
@@ -12,16 +12,16 @@ const NavigationMenu = React.forwardRef<
{children}
-))
-NavigationMenu.displayName = NavigationMenuPrimitive.Root.displayName
+));
+NavigationMenu.displayName = NavigationMenuPrimitive.Root.displayName;
const NavigationMenuList = React.forwardRef<
React.ElementRef,
@@ -30,19 +30,19 @@ const NavigationMenuList = React.forwardRef<
-))
-NavigationMenuList.displayName = NavigationMenuPrimitive.List.displayName
+));
+NavigationMenuList.displayName = NavigationMenuPrimitive.List.displayName;
-const NavigationMenuItem = NavigationMenuPrimitive.Item
+const NavigationMenuItem = NavigationMenuPrimitive.Item;
const navigationMenuTriggerStyle = cva(
- "group inline-flex h-10 w-max items-center justify-center rounded-md bg-background px-4 py-2 text-sm font-medium transition-colors hover:bg-accent hover:text-accent-foreground focus:bg-accent focus:text-accent-foreground focus:outline-none disabled:pointer-events-none disabled:opacity-50 data-[active]:bg-accent/50 data-[state=open]:bg-accent/50"
-)
+ 'group inline-flex h-10 w-max items-center justify-center rounded-md bg-background px-4 py-2 text-sm font-medium transition-colors hover:bg-accent hover:text-accent-foreground focus:bg-accent focus:text-accent-foreground focus:outline-none disabled:pointer-events-none disabled:opacity-50 data-[active]:bg-accent/50 data-[state=open]:bg-accent/50',
+);
const NavigationMenuTrigger = React.forwardRef<
React.ElementRef,
@@ -50,17 +50,17 @@ const NavigationMenuTrigger = React.forwardRef<
>(({ className, children, ...props }, ref) => (
- {children}{" "}
+ {children}{' '}
-))
-NavigationMenuTrigger.displayName = NavigationMenuPrimitive.Trigger.displayName
+));
+NavigationMenuTrigger.displayName = NavigationMenuPrimitive.Trigger.displayName;
const NavigationMenuContent = React.forwardRef<
React.ElementRef,
@@ -69,33 +69,33 @@ const NavigationMenuContent = React.forwardRef<
-))
-NavigationMenuContent.displayName = NavigationMenuPrimitive.Content.displayName
+));
+NavigationMenuContent.displayName = NavigationMenuPrimitive.Content.displayName;
-const NavigationMenuLink = NavigationMenuPrimitive.Link
+const NavigationMenuLink = NavigationMenuPrimitive.Link;
const NavigationMenuViewport = React.forwardRef<
React.ElementRef,
React.ComponentPropsWithoutRef
>(({ className, ...props }, ref) => (
-
+
-))
+));
NavigationMenuViewport.displayName =
- NavigationMenuPrimitive.Viewport.displayName
+ NavigationMenuPrimitive.Viewport.displayName;
const NavigationMenuIndicator = React.forwardRef<
React.ElementRef
,
@@ -104,16 +104,16 @@ const NavigationMenuIndicator = React.forwardRef<
-))
+));
NavigationMenuIndicator.displayName =
- NavigationMenuPrimitive.Indicator.displayName
+ NavigationMenuPrimitive.Indicator.displayName;
export {
navigationMenuTriggerStyle,
@@ -125,4 +125,4 @@ export {
NavigationMenuLink,
NavigationMenuIndicator,
NavigationMenuViewport,
-}
+};
diff --git a/src/config/site.ts b/src/config/site.ts
index b5a363b..57c7011 100644
--- a/src/config/site.ts
+++ b/src/config/site.ts
@@ -6,7 +6,7 @@ export const siteConfig = {
mainNav: [
{
title: 'Home',
- href: '/',
+ href: '/dashboard',
},
{
title: 'Children',
diff --git a/src/server/api/routers/child.ts b/src/server/api/routers/child.ts
index c47ded4..8a3ebbd 100644
--- a/src/server/api/routers/child.ts
+++ b/src/server/api/routers/child.ts
@@ -13,7 +13,8 @@ export const childRouter = createTRPCRouter({
parentId: ctx.session.user.id,
name: input.name,
};
- await ctx.db.insert(child).values(c);
+ const result = await ctx.db.insert(child).values(c).returning();
+ return result[0];
}),
mine: protectedProcedure.query(async ({ ctx }) => {
diff --git a/src/styles/globals.css b/src/styles/globals.css
index 3098dfa..ff495b3 100644
--- a/src/styles/globals.css
+++ b/src/styles/globals.css
@@ -2,74 +2,93 @@
@tailwind components;
@tailwind utilities;
@layer base {
- :root {
- --background: 0 0% 100%;
- --foreground: 240 10% 3.9%;
+ :root {
+ --background: 0 0% 100%;
+ --foreground: 240 10% 3.9%;
- --card: 0 0% 100%;
- --card-foreground: 240 10% 3.9%;
+ --card: 0 0% 100%;
+ --card-foreground: 240 10% 3.9%;
- --popover: 0 0% 100%;
- --popover-foreground: 240 10% 3.9%;
+ --popover: 0 0% 100%;
+ --popover-foreground: 240 10% 3.9%;
- --primary: 240 5.9% 10%;
- --primary-foreground: 0 0% 98%;
+ --primary: 240 5.9% 10%;
+ --primary-foreground: 0 0% 98%;
- --secondary: 240 4.8% 95.9%;
- --secondary-foreground: 240 5.9% 10%;
+ --secondary: 240 4.8% 95.9%;
+ --secondary-foreground: 240 5.9% 10%;
- --muted: 240 4.8% 95.9%;
- --muted-foreground: 240 3.8% 46.1%;
+ --muted: 240 4.8% 95.9%;
+ --muted-foreground: 240 3.8% 46.1%;
- --accent: 240 4.8% 95.9%;
- --accent-foreground: 240 5.9% 10%;
+ --accent: 240 4.8% 95.9%;
+ --accent-foreground: 240 5.9% 10%;
- --destructive: 0 84.2% 60.2%;
- --destructive-foreground: 0 0% 98%;
+ --destructive: 0 84.2% 60.2%;
+ --destructive-foreground: 0 0% 98%;
- --border: 240 5.9% 90%;
- --input: 240 5.9% 90%;
- --ring: 240 10% 3.9%;
+ --border: 240 5.9% 90%;
+ --input: 240 5.9% 90%;
+ --ring: 240 10% 3.9%;
- --radius: 0.5rem;
- }
+ --radius: 0.5rem;
+ }
- .dark {
- --background: 240 10% 3.9%;
- --foreground: 0 0% 98%;
+ .dark {
+ --background: 240 10% 3.9%;
+ --foreground: 0 0% 98%;
- --card: 240 10% 3.9%;
- --card-foreground: 0 0% 98%;
+ --card: 240 10% 3.9%;
+ --card-foreground: 0 0% 98%;
- --popover: 240 10% 3.9%;
- --popover-foreground: 0 0% 98%;
+ --popover: 240 10% 3.9%;
+ --popover-foreground: 0 0% 98%;
- --primary: 0 0% 98%;
- --primary-foreground: 240 5.9% 10%;
+ --primary: 0 0% 98%;
+ --primary-foreground: 240 5.9% 10%;
- --secondary: 240 3.7% 15.9%;
- --secondary-foreground: 0 0% 98%;
+ --secondary: 240 3.7% 15.9%;
+ --secondary-foreground: 0 0% 98%;
- --muted: 240 3.7% 15.9%;
- --muted-foreground: 240 5% 64.9%;
+ --muted: 240 3.7% 15.9%;
+ --muted-foreground: 240 5% 64.9%;
- --accent: 240 3.7% 15.9%;
- --accent-foreground: 0 0% 98%;
+ --accent: 240 3.7% 15.9%;
+ --accent-foreground: 0 0% 98%;
- --destructive: 0 62.8% 30.6%;
- --destructive-foreground: 0 0% 98%;
+ --destructive: 0 62.8% 30.6%;
+ --destructive-foreground: 0 0% 98%;
- --border: 240 3.7% 15.9%;
- --input: 240 3.7% 15.9%;
- --ring: 240 4.9% 83.9%;
- }
+ --border: 240 3.7% 15.9%;
+ --input: 240 3.7% 15.9%;
+ --ring: 240 4.9% 83.9%;
+ }
}
@layer base {
- * {
- @apply border-border;
- }
- body {
- @apply bg-background text-foreground;
- }
+ * {
+ @apply border-border;
+ }
+
+ body {
+ @apply bg-background text-foreground;
+ }
+}
+
+.map {
+ width: 100%;
+ height: 40rem;
+}
+
+.leaflet-control {
+ z-index: 0 !important;
+}
+
+.leaflet-pane {
+ z-index: 0 !important;
+}
+
+.leaflet-top,
+.leaflet-bottom {
+ z-index: 0 !important;
}