diff --git a/app/(api)/api/calendar/[ownerId]/[projectId]/route.ts b/app/(api)/api/calendar/[ownerId]/[projectId]/route.ts index 8116188..b4d4e5b 100644 --- a/app/(api)/api/calendar/[ownerId]/[projectId]/route.ts +++ b/app/(api)/api/calendar/[ownerId]/[projectId]/route.ts @@ -100,8 +100,8 @@ export async function GET( end: timezone ? task.dueDate.toLocaleString("en-US", { timeZone: timezone }) : task.dueDate, - summary: `[${tasklist.name}] ${task.name}`, - description: task.description, + summary: `❏ [${tasklist.name}] ${task.name}`, + description: `${task.description}`, allDay: true, created: task.createdAt, lastModified: task.updatedAt, diff --git a/app/layout.tsx b/app/layout.tsx index 6daba88..9680a4c 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -1,9 +1,14 @@ import { ThemeProvider } from "@/components/core/theme-provider"; import { SITE_METADATA } from "@/data/marketing"; import { cn } from "@/lib/utils"; +import { Archivo } from "next/font/google"; import "./globals.css"; +const archivo = Archivo({ + subsets: ["latin"], +}); + export const metadata = { title: SITE_METADATA.TITLE, description: SITE_METADATA.DESCRIPTION, @@ -17,7 +22,7 @@ export default function RootLayout({ return ( diff --git a/components/form/event.tsx b/components/form/event.tsx index 261c22e..71ed18c 100644 --- a/components/form/event.tsx +++ b/components/form/event.tsx @@ -2,6 +2,7 @@ import { Input } from "@/components/ui/input"; import type { EventWithInvites, User } from "@/drizzle/types"; +import dayjs from "dayjs"; import { Trash2Icon } from "lucide-react"; import { useState } from "react"; import { RRule, rrulestr } from "rrule"; @@ -34,7 +35,7 @@ export default function EventForm({ const start = item?.start ? new Date(item.start) - : new Date(new Date().setHours(new Date().getHours() + 1)); + : dayjs(new Date()).add(2, "hours").startOf("hour").toDate(); const end = item?.end ? new Date(item.end) : undefined; diff --git a/components/project/events/events-calendar.tsx b/components/project/events/events-calendar.tsx index 25bd566..ab8b515 100644 --- a/components/project/events/events-calendar.tsx +++ b/components/project/events/events-calendar.tsx @@ -4,7 +4,6 @@ import { Calendar } from "@/components/ui/calendar"; import type { EventWithInvites } from "@/drizzle/types"; import dayjs from "dayjs"; import { useRouter } from "next/navigation"; -import { DateTimePicker } from "./date-time-picker"; import EventsList from "./events-list"; export default function EventsCalendar({ diff --git a/components/project/events/events-list.tsx b/components/project/events/events-list.tsx index 0cfbcf3..692c5e4 100644 --- a/components/project/events/events-list.tsx +++ b/components/project/events/events-list.tsx @@ -53,7 +53,7 @@ export default function EventsList({ compact?: boolean; }) { const filteredEvents = events.filter((x) => - filterByRepeatRule(x, dayjs(date).toDate()), + filterByRepeatRule(x, new Date(date)), ); return ( diff --git a/tailwind.config.js b/tailwind.config.js index f999125..ceec08a 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -74,23 +74,6 @@ module.exports = { "accordion-down": "accordion-down 0.2s ease-out", "accordion-up": "accordion-up 0.2s ease-out", }, - fontFamily: { - sans: [ - "system-ui", - "-apple-system", - "BlinkMacSystemFont", - '"Segoe UI"', - "Roboto", - '"Helvetica Neue"', - "Arial", - '"Noto Sans"', - "sans-serif", - '"Apple Color Emoji"', - '"Segoe UI Emoji"', - '"Segoe UI Symbol"', - '"Noto Color Emoji"', - ], - }, }, }, plugins: [require("tailwindcss-animate"), require("@tailwindcss/typography")],