Merge branch 'development' of https://github.com/existence-master/Sentient into development

Author: itsskofficial

src/client/app/api/integrations/gcalendar/events/route.js

@@ -8,27 +8,17 @@ import React, {
 	useMemo
 } from "react"
 import { useRouter, useSearchParams } from "next/navigation"
-import {
-	format,
-	isSameDay,
-	parseISO,
-	startOfMonth,
-	endOfMonth,
-	startOfWeek,
-	endOfWeek
-} from "date-fns"
+import { format, isSameDay, parseISO } from "date-fns"
 import { IconLoader, IconX, IconSparkles, IconCheck } from "@tabler/icons-react"
 import { AnimatePresence, motion } from "framer-motion"
 import toast from "react-hot-toast"
-import { cn } from "@utils/cn"
 import { Tooltip } from "react-tooltip"
 import { calculateNextRun } from "@utils/taskUtils"
 
 import TaskDetailsPanel from "@components/tasks/TaskDetailsPanel"
 import TaskViewSwitcher from "@components/tasks/TaskViewSwitcher"
 import ListView from "@components/tasks/ListView"
 import CalendarView from "@components/tasks/CalendarView"
-import GCalEventDetailsPanel from "@components/tasks/GCalEventCardDetailsPanel"
 import WelcomePanel from "@components/tasks/WelcomePanel"
 import CreateTaskInput from "@components/tasks/CreateTaskInput"
 import InteractiveNetworkBackground from "@components/ui/InteractiveNetworkBackground"
@@ -153,9 +143,7 @@ function TasksPageContent() {
 		type: "initial",
 		data: null
 	}) // { type: 'initial' | 'hidden' | 'welcome' | 'task' | 'day', data: any }
-	const [gcalEvents, setGcalEvents] = useState([])
-	const [isGcalConnected, setIsGcalConnected] = useState(false)
-	const [currentCalendarDate, setCurrentCalendarDate] = useState(new Date()) // To track calendar view range
+	const [currentCalendarDate, setCurrentCalendarDate] = useState(new Date())
 	const [searchQuery, setSearchQuery] = useState("")
 	const [createTaskPrompt, setCreateTaskPrompt] = useState("")
 	const [isUpgradeModalOpen, setUpgradeModalOpen] = useState(false)
@@ -294,51 +282,6 @@ function TasksPageContent() {
 		}
 	}, [])
 
-	useEffect(() => {
-		const gcal = integrations.find((i) => i.name === "gcalendar")
-		setIsGcalConnected(gcal?.connected || false)
-	}, [integrations])
-
-	// New useEffect for fetching GCal events
-	const fetchGcalEvents = useCallback(
-		async (date) => {
-			if (!isGcalConnected || view !== "calendar") return
-
-			// Calculate the visible date range for the calendar view
-			const monthStart = startOfMonth(date)
-			const monthEnd = endOfMonth(date)
-			const startDate = startOfWeek(monthStart)
-			const endDate = endOfWeek(monthEnd)
-
-			try {
-				const res = await fetch(
-					`/api/integrations/gcalendar/events?start_date=${startDate.toISOString()}&end_date=${endDate.toISOString()}`
-				)
-				if (!res.ok)
-					throw new Error("Failed to fetch Google Calendar events")
-				const data = await res.json()
-
-				// Add a type and parse dates
-				const formattedEvents = (data.events || []).map((event) => ({
-					...event,
-					type: "gcal",
-					scheduled_date: parseISO(event.start), // Use 'start' from GCal event
-					end_date: parseISO(event.end),
-					instance_id: `gcal-${event.id}` // Unique ID for React key
-				}))
-				setGcalEvents(formattedEvents)
-			} catch (error) {
-				toast.error(error.message)
-				setGcalEvents([]) // Clear on error
-			}
-		},
-		[isGcalConnected, view]
-	)
-
-	useEffect(() => {
-		fetchGcalEvents(currentCalendarDate)
-	}, [currentCalendarDate, fetchGcalEvents])
-
 	useEffect(() => {
 		fetchTasks()
 	}, [fetchTasks])
@@ -412,24 +355,16 @@ function TasksPageContent() {
 	}
 
 	const handleSelectItem = (item) => {
-		if (item.type === "gcal") {
-			setRightPanelContent({ type: "gcal", data: item })
-		} else {
-			setRightPanelContent({ type: "task", data: item })
-		}
+		setRightPanelContent({ type: "task", data: item })
 	}
 
 	const handleShowMoreClick = (date) => {
 		const tasksForDay = filteredCalendarTasks.filter(
 			(task) => isSameDay(task.scheduled_date, date) // prettier-ignore
 		)
-		const eventsForDay = gcalEvents.filter((event) =>
-			isSameDay(event.scheduled_date, date)
-		)
-		const allItemsForDay = [...tasksForDay, ...eventsForDay]
 		setRightPanelContent({
 			type: "day",
-			data: { date, tasks: allItemsForDay }
+			data: { date, tasks: tasksForDay }
 		})
 	}
 
@@ -585,7 +520,6 @@ Description: ${event.description || "No description."}`
 									) : (
 										<CalendarView
 											tasks={filteredCalendarTasks} // prettier-ignore
-											gcalEvents={gcalEvents}
 											onSelectTask={handleSelectItem}
 											onDayClick={handleDayClick}
 											onShowMoreClick={
@@ -759,23 +693,6 @@ Description: ${event.description || "No description."}`
 											}
 										/>
 									</motion.div>
-								) : rightPanelContent.type === "gcal" &&
-								  rightPanelContent.data ? (
-									<motion.div
-										key={`gcal-${rightPanelContent.data.id}`}
-										initial={{ opacity: 0 }}
-										animate={{ opacity: 1 }}
-										exit={{ opacity: 0 }}
-										className="h-full"
-									>
-										<GCalEventDetailsPanel
-											event={rightPanelContent.data}
-											onClose={handleCloseRightPanel}
-											onCreateTask={
-												handleCreateTaskFromEvent
-											}
-										/>
-									</motion.div>
 								) : rightPanelContent.type === "day" &&
 								  rightPanelContent.data ? (
 									<motion.div

src/client/app/tasks/page.js

@@ -21,7 +21,6 @@ import {
 	IconDots
 } from "@tabler/icons-react"
 import { cn } from "@utils/cn"
-import GCalEventCard from "./GCalEventCard"
 import TaskCardCalendar from "./TaskCardCalendar"
 
 const cellVariants = {
@@ -91,18 +90,12 @@ const CalendarDayCell = ({
 				className="space-y-1 flex-1 cursor-pointer"
 				onClick={() => onShowMoreClick(day)}
 			>
-				{firstItem &&
-					(firstItem.type === "gcal" ? (
-						<GCalEventCard
-							event={firstItem}
-							onSelectTask={onSelectTask}
-						/>
-					) : (
-						<TaskCardCalendar
-							task={firstItem}
-							onSelectTask={onSelectTask}
-						/>
-					))}
+				{firstItem && (
+					<TaskCardCalendar
+						task={firstItem}
+						onSelectTask={onSelectTask}
+					/>
+				)}
 				{items.length > 0 && (
 					<div className="w-1 h-1 bg-brand-yellow rounded-full mx-auto mt-1"></div>
 				)}
@@ -118,7 +111,6 @@ const CalendarDayCell = ({
 
 const CalendarView = ({
 	tasks,
-	gcalEvents,
 	onSelectTask,
 	onDayClick,
 	onShowMoreClick,
@@ -197,15 +189,11 @@ const CalendarView = ({
 						(task) =>
 						isSameDay(task.scheduled_date, day) // prettier-ignore
 					)
-					const eventsForDay = (gcalEvents || []).filter((event) =>
-						isSameDay(event.scheduled_date, day)
-					)
-					const allItemsForDay = [...tasksForDay, ...eventsForDay]
 					return (
 						<CalendarDayCell
 							key={day.toString()}
 							day={day}
-							items={allItemsForDay}
+							items={tasksForDay}
 							isCurrentMonth={isSameMonth(day, currentMonth)}
 							onSelectTask={onSelectTask}
 							onDayClick={handleDayClickInternal}

src/client/components/tasks/CalendarView.js

@@ -2,7 +2,6 @@
 import React, { useState, useEffect, useRef } from "react"
 import { format, getHours, getMinutes, parseISO, isToday } from "date-fns"
 import { cn } from "@utils/cn"
-import GCalEventCardDayView from "./GCalEventCardDayView"
 import TaskCardDayView from "./TaskCardDayView"
 import { IconX } from "@tabler/icons-react"
 
@@ -17,23 +16,16 @@ const DayDetailView = ({ date, tasks: items, onSelectTask, onClose }) => {
 
 	const hours = Array.from({ length: 24 }, (_, i) => i)
 
-	const allDayItems = (items || []).filter((item) => {
-		if (item.type === "gcal") {
-			return item.start && !item.start.includes("T")
-		}
-		return !item.schedule?.run_at || !item.schedule.run_at.includes("T")
-	})
-	const timedItems = (items || []).filter((item) => {
-		if (item.type === "gcal") {
-			return item.start && item.start.includes("T")
-		}
-		return item.schedule?.run_at && item.schedule.run_at.includes("T")
-	})
+	const allDayItems = (items || []).filter(
+		(item) => !item.schedule?.run_at || !item.schedule.run_at.includes("T")
+	)
+	const timedItems = (items || []).filter(
+		(item) => item.schedule?.run_at && item.schedule.run_at.includes("T")
+	)
 
 	const getTopPosition = (item) => {
 		try {
-			const isoString =
-				item.type === "gcal" ? item.start : item.schedule?.run_at
+			const isoString = item.schedule?.run_at
 			if (!isoString) return 0
 			const date = parseISO(isoString)
 			const hours = getHours(date)
@@ -69,21 +61,13 @@ const DayDetailView = ({ date, tasks: items, onSelectTask, onClose }) => {
 				<div className="p-4 border-b border-neutral-800">
 					<div className="space-y-2">
 						{allDayItems.length > 0 ? (
-							allDayItems.map((item) =>
-								item.type === "gcal" ? (
-									<GCalEventCardDayView
-										key={item.instance_id}
-										event={item}
-										onSelectTask={onSelectTask}
-									/>
-								) : (
-									<TaskCardDayView
-										key={item.instance_id}
-										task={item}
-										onSelectTask={onSelectTask}
-									/>
-								)
-							)
+							allDayItems.map((item) => (
+								<TaskCardDayView
+									key={item.instance_id}
+									task={item}
+									onSelectTask={onSelectTask}
+								/>
+							))
 						) : (
 							<p className="text-xs text-neutral-500">
 								No all-day tasks or events.
@@ -121,17 +105,10 @@ const DayDetailView = ({ date, tasks: items, onSelectTask, onClose }) => {
 									top: `${getTopPosition(item)}px`
 								}}
 							>
-								{item.type === "gcal" ? (
-									<GCalEventCardDayView
-										event={item}
-										onSelectTask={onSelectTask}
-									/>
-								) : (
-									<TaskCardDayView
-										task={item}
-										onSelectTask={onSelectTask}
-									/>
-								)}
+								<TaskCardDayView
+									task={item}
+									onSelectTask={onSelectTask}
+								/>
 							</div>
 						))}
 					</div>