diff --git a/src/app/auth/signup/page.tsx b/src/app/auth/signup/page.tsx
index c83b4da..f713051 100644
--- a/src/app/auth/signup/page.tsx
+++ b/src/app/auth/signup/page.tsx
@@ -169,6 +169,20 @@ export default function SignupPage() {
Sign up with Google
+ {/* Apple Sign Up */}
+
{ setIsLoading(true); signIn('apple', { callbackUrl: '/tasks' }); }}
+ disabled={isLoading}
+ className="weekly-auth-button apple"
+ style={{ marginTop: '0.75rem', backgroundColor: '#000', color: '#fff' }}
+ >
+
+
+ Sign up with Apple
+
+
{/* Links */}
Already have an account?
diff --git a/src/app/globals.css b/src/app/globals.css
index 0299435..54412ff 100644
--- a/src/app/globals.css
+++ b/src/app/globals.css
@@ -1158,7 +1158,7 @@ h3 {
/* Task Input */
.weekly-task-input {
padding: 0.5rem 1rem 0.5rem 2.5rem;
- border-bottom: 1px solid var(--weekly-border);
+ border-bottom: none;
}
.weekly-task-input input {
@@ -1177,11 +1177,17 @@ h3 {
/* Someday Section */
.weekly-someday {
- /* background color removed as per user request */
+ background-color: #f9f9f9;
+ width: 100%;
+ padding: 0 1rem;
transition: max-height 0.3s ease;
position: relative;
}
+.weekly-container.dark-mode .weekly-someday {
+ background-color: #1a1a1b;
+}
+
.weekly-someday.collapsed {
max-height: 30px;
overflow: hidden;
@@ -1251,16 +1257,16 @@ h3 {
/* Someday Lists Container - Horizontal Scroll */
.weekly-someday-lists-grid {
- display: flex;
- flex-direction: row;
- flex-wrap: nowrap;
- gap: 1rem;
- width: 100%;
- overflow-x: auto;
- overflow-y: hidden; /* Prevent vertical Scrollbar on container */
- padding-bottom: 0.5rem; /* Space for scrollbar */
+ display: flex !important;
+ flex-direction: row !important;
+ flex-wrap: nowrap !important;
+ gap: 1.5rem;
+ width: max-content; /* Allow grid to grow beyond parent width */
+ min-width: 100%;
+ padding-bottom: 1rem;
align-items: flex-start;
-webkit-overflow-scrolling: touch;
+ scroll-behavior: smooth;
}
/* Scrollbar Styling for Someday Container */
@@ -1308,25 +1314,43 @@ h3 {
/* Ruled paper lines for someday tasks */
.weekly-someday-list {
- /* border-right: 1px solid var(--weekly-border); Removed for cleaner look */
padding: 0;
min-height: 200px;
- flex: 0 0 280px; /* Fixed width for horizontal scrolling */
- width: 280px;
+ flex: 0 0 300px; /* Slightly wider lists */
+ width: 300px;
transition: transform 0.2s ease, opacity 0.2s ease;
max-width: 100%;
display: flex;
flex-direction: column;
overflow-y: auto;
- max-height: 380px;
- background-image: repeating-linear-gradient(
- transparent,
- transparent 31px,
- var(--weekly-border) 31px,
- var(--weekly-border) 32px
- );
- background-attachment: local;
- background-position: 0 40px; /* Offset for the header */
+ scrollbar-width: none; /* Hide scrollbar Firefox */
+ -ms-overflow-style: none; /* Hide scrollbar IE/Edge */
+}
+
+.weekly-someday-list::-webkit-scrollbar {
+ display: none; /* Hide scrollbar Chrome/Safari/Webkit */
+}
+
+.weekly-container.dark-mode .weekly-someday-list {
+ background-image: none;
+}
+
+.task-list-slot {
+ height: 38px;
+ width: 100%;
+ position: relative;
+ display: flex;
+ align-items: center;
+ border-bottom: 1px solid var(--weekly-border);
+ box-sizing: border-box;
+}
+
+.task-list-slot.drop-target {
+ background-color: rgba(0, 128, 128, 0.05); /* Subtle teal background for drop target */
+}
+
+.weekly-container.dark-mode .task-list-slot.drop-target {
+ background-color: rgba(0, 128, 128, 0.15);
}
.someday-drag-handle {
@@ -1363,9 +1387,18 @@ h3 {
.weekly-someday-list.placeholder-list {
background-image: repeating-linear-gradient(
transparent,
- transparent 31px,
- #f5f5f5 31px,
- #f5f5f5 32px
+ transparent 37px,
+ #e5e5e5 37px,
+ #e5e5e5 38px
+ );
+}
+
+.weekly-container.dark-mode .weekly-someday-list.placeholder-list {
+ background-image: repeating-linear-gradient(
+ transparent,
+ transparent 37px,
+ #4a4a4a 37px,
+ #4a4a4a 38px
);
}
@@ -1379,14 +1412,18 @@ h3 {
}
.weekly-someday-list .weekly-task-item {
- border-bottom: 1px solid transparent;
- min-height: 32px;
+ border-bottom: none;
+ min-height: 38px;
height: auto;
- padding: 4px 1rem;
+ padding: 6px 1rem;
display: flex;
align-items: flex-start;
}
+.weekly-container.dark-mode .weekly-someday-list .weekly-task-item {
+ border-bottom: none;
+}
+
.weekly-someday-list .weekly-task-text {
font-size: var(--base-font-size);
line-height: 1.4;
@@ -1398,25 +1435,31 @@ h3 {
}
.weekly-someday-list-title-header {
- padding: 0.75rem 1rem 0.25rem;
- height: 40px;
+ padding: 0 1rem;
+ margin-bottom: 0;
+ height: 56px;
+ min-height: 56px;
display: flex;
align-items: center;
+ border-bottom: 1px solid var(--weekly-border);
+}
+
+.weekly-container.dark-mode .weekly-someday-list-title-header {
+ border-bottom-color: var(--weekly-border);
}
.weekly-someday-list-title-input {
- font-size: 1rem;
- font-weight: 700;
+ font-size: 1.15rem;
+ font-weight: 800;
text-transform: uppercase;
- letter-spacing: 0.05em;
- color: var(--weekly-text, #333);
+ letter-spacing: 0.08em;
+ color: var(--weekly-text, #222);
background: transparent;
border: none;
- border-bottom: 1px solid transparent;
width: 100%;
- padding: 2px 0;
+ padding: 4px 0;
outline: none;
- transition: border-color 0.15s ease;
+ transition: opacity 0.15s ease;
}
.weekly-someday .weekly-task-item {
@@ -1763,32 +1806,10 @@ h3 {
/* === Tablet (≤ 1024px): 5-day view === */
@media (max-width: 1024px) {
- .weekly-days-grid {
- grid-template-columns: repeat(5, 1fr) !important;
- }
-
- .all-day-events-grid {
- grid-template-columns: repeat(5, 1fr) !important;
- }
-
- .weekly-someday-lists-grid {
- grid-template-columns: repeat(5, 1fr) !important;
- }
}
/* === Phone landscape / small tablet (≤ 768px): 3-day view === */
@media (max-width: 768px) {
- .weekly-days-grid {
- grid-template-columns: repeat(3, 1fr) !important;
- }
-
- .all-day-events-grid {
- grid-template-columns: repeat(3, 1fr) !important;
- }
-
- .weekly-someday-lists-grid {
- grid-template-columns: repeat(3, 1fr) !important;
- }
.weekly-someday-lists {
grid-template-columns: 1fr;
@@ -1838,17 +1859,6 @@ h3 {
/* === Phone portrait (≤ 480px): 1-day view === */
@media (max-width: 480px) {
- .weekly-days-grid {
- grid-template-columns: 1fr !important;
- }
-
- .all-day-events-grid {
- grid-template-columns: 1fr !important;
- }
-
- .weekly-someday-lists-grid {
- grid-template-columns: 1fr !important;
- }
/* Narrower time column on phone */
.time-column {
diff --git a/src/app/providers.tsx b/src/app/providers.tsx
index 1862a1f..cc69565 100644
--- a/src/app/providers.tsx
+++ b/src/app/providers.tsx
@@ -3,5 +3,5 @@
import { SessionProvider } from 'next-auth/react';
export function Providers({ children }: { children: React.ReactNode }) {
- return {children} ;
+ return {children} ;
}
diff --git a/src/components/CalendarEventModal.tsx b/src/components/CalendarEventModal.tsx
index f9d0699..823da85 100644
--- a/src/components/CalendarEventModal.tsx
+++ b/src/components/CalendarEventModal.tsx
@@ -72,6 +72,7 @@ export default function CalendarEventModal({
const [endDate, setEndDate] = useState(getInitialEnd());
const [allDay, setAllDay] = useState(!!event?.allDay);
const [isSaving, setIsSaving] = useState(false);
+ const [isDeleting, setIsDeleting] = useState(false);
const [error, setError] = useState('');
const handleSubmit = async () => {
@@ -122,13 +123,13 @@ export default function CalendarEventModal({
return;
}
- setIsSaving(true);
+ setIsDeleting(true);
try {
await onDelete(event.id, event.calendarId);
onClose();
} catch (err: any) {
setError(err.message || 'Failed to delete event');
- setIsSaving(false);
+ setIsDeleting(false);
setIsDeleteConfirming(false);
}
};
@@ -286,7 +287,7 @@ export default function CalendarEventModal({
{event && onDelete && (
- {isDeleteConfirming ? 'Click again to confirm delete' : 'Delete'}
+ {isDeleting ? 'Deleting...' : isDeleteConfirming ? 'Confirm Delete' : 'Delete'}
)}
- Cancel
-
+ Cancel
+
{isSaving ? 'Saving...' : 'Save'}
diff --git a/src/components/WeeklyView.tsx b/src/components/WeeklyView.tsx
index b3328af..89f1a08 100644
--- a/src/components/WeeklyView.tsx
+++ b/src/components/WeeklyView.tsx
@@ -75,6 +75,7 @@ export interface Task {
isRolling?: boolean;
isRecurring?: boolean;
somedayListId?: string | null;
+ somedaySlotIndex?: number | null;
repeatPattern?: string | null;
repeatEndDate?: string | null;
repeatStartDate?: string | null;
@@ -115,6 +116,20 @@ interface SomedayList {
// Time grid configuration options
type CellDuration = 15 | 30 | 60 | 120;
+const DEFAULT_SOMEDAY_SLOT_COUNT = 5;
+
+const getSomedaySlotCount = (tasks: Task[]) => {
+ const maxIdx = tasks.reduce((max, t) => {
+ if (t.somedaySlotIndex !== null && t.somedaySlotIndex !== undefined) {
+ return Math.max(max, t.somedaySlotIndex);
+ }
+ return max;
+ }, -1);
+ // Add 1 extra slot if more than 4 tasks exist, or at least 5 slots total.
+ // "add 5 rows and then when 4 are taken add another row"
+ // Let's ensure there's always at least one empty slot at the bottom.
+ return Math.max(DEFAULT_SOMEDAY_SLOT_COUNT, maxIdx + 2);
+};
// Font options
const AVAILABLE_FONTS = [
@@ -512,6 +527,7 @@ export default function WeeklyView() {
return () => window.removeEventListener('resize', handleResize);
}, []); // savedViewDaysRef is a ref, so no dependency needed
const [isSyncing, setIsSyncing] = useState(false);
+ const [isFetchingCalendar, setIsFetchingCalendar] = useState(false);
const [syncError, setSyncError] = useState
(null);
const syncCountRef = useRef(0);
const startSync = useCallback(() => { syncCountRef.current++; setIsSyncing(true); }, []);
@@ -717,8 +733,10 @@ export default function WeeklyView() {
);
const [currentTime, setCurrentTime] = useState(new Date());
const [dropPreview, setDropPreview] = useState<{
- day: number;
- slot: string;
+ day?: number;
+ slot?: string;
+ listId?: string;
+ slotIdx?: number;
} | null>(null);
const [viewStyle, setViewStyle] = useState("simple");
const [protectEventTimes, setProtectEventTimes] = useState(true);
@@ -904,6 +922,7 @@ export default function WeeklyView() {
// Fetch calendar events
const fetchCalendarEvents = useCallback(async (forceRefresh = false) => {
startSync();
+ setIsFetchingCalendar(true);
try {
const response = await fetch("/api/calendar/sync", {
method: "POST",
@@ -934,9 +953,10 @@ export default function WeeklyView() {
} catch (error) {
console.error("Error fetching calendar events:", error);
} finally {
+ setIsFetchingCalendar(false);
endSync();
}
- }, [currentWeekStart]);
+ }, [currentWeekStart, startSync, endSync]);
// Calendar Event Handlers
const handleEventSave = async (eventData: any) => {
@@ -1291,7 +1311,29 @@ export default function WeeklyView() {
const el = somedayGridRef.current;
if (!el) return;
const handler = (e: WheelEvent) => {
- if (e.deltaY !== 0) {
+ // Ignore if scrolling horizontally natively (trackpad)
+ if (Math.abs(e.deltaX) > Math.abs(e.deltaY)) return;
+
+ // Check if hovering over a vertically scrollable list that isn't at its boundary
+ let target = e.target as HTMLElement | null;
+ let canScrollVertically = false;
+
+ while (target && target !== el) {
+ if (target.scrollHeight > target.clientHeight) {
+ const style = window.getComputedStyle(target);
+ if (style.overflowY === 'auto' || style.overflowY === 'scroll') {
+ const atTop = target.scrollTop <= 0;
+ const atBottom = target.scrollTop + target.clientHeight >= target.scrollHeight - 1;
+ if (!(e.deltaY < 0 && atTop) && !(e.deltaY > 0 && atBottom)) {
+ canScrollVertically = true;
+ break;
+ }
+ }
+ }
+ target = target.parentElement;
+ }
+
+ if (!canScrollVertically && e.deltaY !== 0) {
e.preventDefault();
el.scrollLeft += e.deltaY;
}
@@ -2732,6 +2774,8 @@ export default function WeeklyView() {
dayOfWeek,
startTime,
scheduledDate: newScheduledDate || t.scheduledDate,
+ somedayListId: null,
+ somedaySlotIndex: null,
updatedAt: new Date(),
}
: t,
@@ -2747,6 +2791,8 @@ export default function WeeklyView() {
dayOfWeek,
startTime,
scheduledDate: newScheduledDate,
+ somedayListId: null,
+ somedaySlotIndex: null,
}),
});
@@ -2820,8 +2866,15 @@ export default function WeeklyView() {
if (match) originalId = match[1];
}
+ const taskToDelete = findTaskAnywhere(originalId);
+
setTasks((prev) =>
prev.filter((t) => {
+ if (taskToDelete && t.title === taskToDelete.title &&
+ t.recurrenceInterval === taskToDelete.recurrenceInterval &&
+ t.recurrenceUnit === taskToDelete.recurrenceUnit) {
+ return false;
+ }
if (t.id === originalId) return false;
if (t.id.startsWith(`virtual-${originalId}-`)) return false;
if (t.id === taskId) return false;
@@ -3066,6 +3119,7 @@ export default function WeeklyView() {
{
...draggedTask,
somedayListId: null,
+ somedaySlotIndex: null,
scheduledDate: newScheduledDate,
dayOfWeek,
startTime: targetSlot || "",
@@ -3079,6 +3133,7 @@ export default function WeeklyView() {
body: JSON.stringify({
id: draggedTask.id,
somedayListId: null,
+ somedaySlotIndex: null,
scheduledDate: newScheduledDate,
dayOfWeek,
startTime: targetSlot || "",
@@ -3125,6 +3180,64 @@ export default function WeeklyView() {
setDropPreview(null);
};
+ const handleSomedayDragOver = (e: React.DragEvent, listId: string, slotIdx: number) => {
+ e.preventDefault();
+ setDropPreview({ listId, slotIdx });
+ };
+
+ const handleSomedayDrop = async (e: React.DragEvent, listId: string, slotIndex: number) => {
+ e.preventDefault();
+ if (draggedTask) {
+ // Update local state for someday lists
+ setSomedayLists((prev) =>
+ prev.map((l) => {
+ // Remove the task from its current position in all lists
+ const filteredTasks = l.tasks.filter((t) => t.id !== draggedTask.id);
+ if (l.id === listId) {
+ const movedTask = {
+ ...draggedTask,
+ somedayListId: listId,
+ somedaySlotIndex: slotIndex,
+ scheduledDate: null as any,
+ dayOfWeek: null as any,
+ startTime: null as any,
+ };
+ return {
+ ...l,
+ tasks: [...filteredTasks, movedTask],
+ };
+ }
+ return { ...l, tasks: filteredTasks };
+ }),
+ );
+
+ // If it was a calendar task, remove it from the calendar tasks array
+ if (!draggedTask.somedayListId) {
+ setTasks((prev) => prev.filter((t) => t.id !== draggedTask.id));
+ }
+
+ // Persist the change
+ try {
+ await fetch("/api/tasks", {
+ method: "PATCH",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({
+ id: draggedTask.id,
+ somedayListId: listId,
+ somedaySlotIndex: slotIndex,
+ scheduledDate: null,
+ dayOfWeek: null,
+ startTime: null,
+ }),
+ });
+ } catch (error) {
+ console.error("Error moving task to someday slot:", error);
+ }
+ setDraggedTask(null);
+ setDropPreview(null);
+ }
+ };
+
// Sync calendar
const handleSync = async () => {
setSyncStatus("syncing");
@@ -4032,6 +4145,14 @@ export default function WeeklyView() {
onDragLeave={handleDragLeave}
style={{ position: "relative" }}
>
+ {/* Calendar Fetching Indicator */}
+ {showTimeGrid && colIndex === 0 && isFetchingCalendar && (
+
+
+ Syncing Calendar...
+
@@ -4368,47 +4488,7 @@ export default function WeeklyView() {
})}
{/* All Day Events Section */}
- {/* Untimed Tasks List below grid */}
-
- {/* Filter for untimed tasks */}
- {getTasksForDate(date)
- .filter((task) => !task.startTime)
- .map((task) => (
- toggleTask(task.id)}
- onEdit={() => setEditingTaskId(task.id)}
- onUpdate={(newTitle) =>
- updateTask(task.id, newTitle)
- }
- onDelete={() => deleteTask(task.id)}
- onNotes={(notes) => updateTaskNotes(task.id, notes)}
- onRollToggle={() => toggleTaskRolling(task.id)}
- onRecurrence={() =>
- setSelectedTaskForRecurrence(task)
- }
- onDragStart={(e, t) => handleDragStart(e, t)}
- onDragEnd={handleDragEnd}
- variant="minimal"
- onAddSubTask={addSubTask}
- onToggleSubTask={toggleSubTask}
- onDeleteSubTask={deleteSubTask}
- onUpdateSubTask={updateSubTask}
- editingTaskId={editingTaskId}
- onSetEditingTaskId={setEditingTaskId}
- showTaskCheckboxes={profile.showTaskCheckboxes}
- />
- ))}
-
+
) : (