-
${t.title}
-
`;
}
@@ -688,102 +725,243 @@ function renderTasks() {
const taskId = el.dataset.id;
const task = store.tasks.find(t => String(t.id) === String(taskId));
if (task && task._isEditing) return;
+
- store.toggleTaskStatus(taskId);
+ tasksSection.innerHTML = actionBar +
+ renderGroup('⚠ Overdue', overdue, 'var(--color-text-danger)') +
+ renderGroup('⚠ Due soon', dueSoon, 'var(--color-text-warning)') +
+ renderGroup('This week', thisWeek, 'var(--color-text-secondary)', true) +
+ renderGroup('Completed', completed, 'var(--color-text-tertiary)') +
+ emptyState;
+ } else {
+ const actionBar = currentView === 'archived' ? '' : `
+
+
`;
+
+ const titlePrefix = currentView === 'archived' ? 'Archived: ' : '';
+ const emptyStateText = currentView === 'archived' ? 'No archived tasks.' : 'No tasks yet. Add tasks from Smart Paste to get started.';
+
+ const emptyState = dueSoon.length === 0 && thisWeek.length === 0 && completed.length === 0
+ ? `
${emptyStateText}
`
+ : '';
+
+ tasksSection.innerHTML = actionBar +
+ renderGroup(titlePrefix + '⚠ Overdue', overdue, 'var(--color-text-danger)') +
+ renderGroup(titlePrefix + '⚠ Due soon', dueSoon, 'var(--color-text-warning)') +
+ renderGroup(titlePrefix + 'This week', thisWeek, 'var(--color-text-secondary)', true) +
+ renderGroup(titlePrefix + 'Completed', completed, 'var(--color-text-tertiary)') +
+ emptyState;
+ }
+
+ document.querySelectorAll('.task-item').forEach(el => {
+ el.addEventListener('click', (e) => {
+ if (e.target.closest('.task-actions') || e.target.closest('.task-check')) return;
+
+ const taskId = el.dataset.id;
+ const task = store.tasks.find(t => String(t.id) === String(taskId));
+ if (task && task._isEditing) return;
+
+ store.toggleTaskStatus(taskId);
+ });
});
- });
- document.querySelectorAll('.edit-task-btn').forEach(el => {
- el.addEventListener('click', (e) => {
- e.stopPropagation();
- store.setTaskEditing(el.dataset.id, true);
+ document.querySelectorAll('.edit-task-btn').forEach(el => {
+ el.addEventListener('click', (e) => {
+ e.stopPropagation();
+ store.setTaskEditing(el.dataset.id, true);
+ });
});
- });
- document.querySelectorAll('.cancel-board-edit-btn').forEach(el => {
- el.addEventListener('click', (e) => {
- e.stopPropagation();
- store.setTaskEditing(el.dataset.id, false);
+ document.querySelectorAll('.cancel-board-edit-btn').forEach(el => {
+ el.addEventListener('click', (e) => {
+ e.stopPropagation();
+ store.setTaskEditing(el.dataset.id, false);
+ });
});
- });
- document.querySelectorAll('.save-board-edit-btn').forEach(el => {
- el.addEventListener('click', (e) => {
- e.stopPropagation();
- const taskId = el.dataset.id;
- const itemEl = el.closest('.task-item');
-
- const rawTitle = itemEl.querySelector('.board-edit-title').value;
- const subject_id = itemEl.querySelector('.board-edit-subject').value;
- let dateVal = itemEl.querySelector('.board-edit-date').value;
- const notes = itemEl.querySelector('.board-edit-notes').value;
- const priority = itemEl.querySelector('.board-edit-priority').value;
-
- const { cleanTitle, labels } = extractLabels(rawTitle);
-
- store.updateTask(taskId, {
- title: cleanTitle || rawTitle,
- subject_id,
- due_at: dateVal ? new Date(dateVal).toISOString() : '',
- notes,
- priority,
- labels
+ document.querySelectorAll('.save-board-edit-btn').forEach(el => {
+ el.addEventListener('click', (e) => {
+ e.stopPropagation();
+ const taskId = el.dataset.id;
+ const itemEl = el.closest('.task-item');
+
+ const title = itemEl.querySelector('.board-edit-title').value;
+ const subject_id = itemEl.querySelector('.board-edit-subject').value;
+ let dateVal = itemEl.querySelector('.board-edit-date').value;
+ const notes = itemEl.querySelector('.board-edit-notes').value;
+ const priority = itemEl.querySelector('.board-edit-priority').value;
+
+ store.updateTask(taskId, {
+ title,
+ subject_id,
+ due_at: dateVal ? new Date(dateVal).toISOString() : '',
+ notes,
+ priority
+ });
});
});
- });
- document.querySelectorAll('.task-check').forEach(el => {
- el.addEventListener('click', (e) => {
- e.stopPropagation();
- const taskId = el.closest('.task-item').dataset.id;
- store.toggleTaskStatus(taskId);
+ document.querySelectorAll('.task-check').forEach(el => {
+ el.addEventListener('click', (e) => {
+ e.stopPropagation();
+ const taskId = el.closest('.task-item').dataset.id;
+ store.toggleTaskStatus(taskId);
+ });
});
- });
- document.querySelectorAll('.archive-task-btn').forEach(el => {
- el.addEventListener('click', (e) => {
- e.stopPropagation();
- store.archiveTask(el.dataset.id);
+ document.querySelectorAll('.archive-task-btn').forEach(el => {
+ el.addEventListener('click', (e) => {
+ e.stopPropagation();
+ store.archiveTask(el.dataset.id);
+ });
});
- });
- document.querySelectorAll('.restore-task-btn').forEach(el => {
- el.addEventListener('click', (e) => {
- e.stopPropagation();
- store.restoreTask(el.dataset.id);
+ document.querySelectorAll('.restore-task-btn').forEach(el => {
+ el.addEventListener('click', (e) => {
+ e.stopPropagation();
+ store.restoreTask(el.dataset.id);
+ });
});
- });
- document.querySelectorAll('.delete-task-btn').forEach(el => {
- el.addEventListener('click', (e) => {
- e.stopPropagation();
- store.deleteTask(el.dataset.id);
+ document.querySelectorAll('.delete-task-btn').forEach(el => {
+ el.addEventListener('click', (e) => {
+ e.stopPropagation();
+ store.deleteTask(el.dataset.id);
+ });
});
- });
- const markAllPendingBtn = document.getElementById('mark-all-pending-btn');
- if (markAllPendingBtn) {
- markAllPendingBtn.addEventListener('click', (e) => {
- e.stopPropagation();
- store.markAllPendingCompleted();
+ const markAllPendingBtn = document.getElementById('mark-all-pending-btn');
+ if (markAllPendingBtn) {
+ markAllPendingBtn.addEventListener('click', (e) => {
+ e.stopPropagation();
+ store.markAllPendingCompleted();
+ });
+ }
+
+ const markDayCompleteBtn = document.getElementById('mark-day-complete-btn');
+ if (markDayCompleteBtn) {
+ markDayCompleteBtn.addEventListener('click', (e) => {
+ e.stopPropagation();
+ store.markPendingTasksForDateCompleted(selectedDate);
+ });
+ }
+}
+
+
+function renderDayView() {
+ const targetDate = selectedDate || currentMonthDate;
+ const year = targetDate.getFullYear();
+ const month = targetDate.getMonth();
+ const day = targetDate.getDate();
+
+ const monthNames = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"];
+
+ const topbarTitle = document.querySelector('.topbar-title');
+ if(topbarTitle) {
+ topbarTitle.textContent = `${monthNames[month]} ${day}, ${year}`;
+ }
+ document.getElementById('cal-month-title').textContent = `${monthNames[month]} ${day}, ${year}`;
+
+ const dayTasks = store.tasks.filter(t => {
+ if (t.archived) return false;
+ if (!t.due_at) return false;
+ const d = new Date(t.due_at);
+ return d.getDate() === day && d.getMonth() === month && d.getFullYear() === year;
+ });
+
+ const pending = dayTasks.filter(t => t.status !== 'Done');
+ const completed = dayTasks.filter(t => t.status === 'Done');
+ pending.sort((a, b) => new Date(a.due_at) - new Date(b.due_at));
+
+ let html = '
';
+
+ html += '';
+
+ if (pending.length === 0 && completed.length === 0) {
+ html += '
No tasks for this day
';
+ html += '
';
+ } else {
+ if (pending.length > 0) {
+ for (let i = 0; i < pending.length; i++) {
+ const task = pending[i];
+ const sub = store.subjects.find(s => s.id === task.subject_id) || store.subjects[0];
+ html += '
';
+ html += '
';
+ html += '
';
+ html += '' + escapeHtml(task.title) + '';
+ html += '' + (sub?.short_code || 'Task') + '';
+ html += '
';
+ html += '
';
+ }
+ }
+
+ if (completed.length > 0) {
+ for (let i = 0; i < completed.length; i++) {
+ const task = completed[i];
+ const sub = store.subjects.find(s => s.id === task.subject_id) || store.subjects[0];
+ html += '
';
+ html += '
';
+ html += '
';
+ html += '' + escapeHtml(task.title) + '';
+ html += '' + (sub?.short_code || 'Task') + '';
+ html += '
';
+ html += '
';
+ }
+ }
+ }
+
+ html += '
';
+ document.getElementById('cal-grid').innerHTML = html;
+
+ const items = document.querySelectorAll('.checklist-item');
+ for (let i = 0; i < items.length; i++) {
+ const item = items[i];
+ item.addEventListener('click', function(e) {
+ if (e.target.classList.contains('checklist-box')) return;
+ const taskId = this.dataset.id;
+ if (taskId) {
+ store.toggleTaskStatus(taskId);
+ setTimeout(function() { renderDayView(); }, 50);
+ }
});
+
+ const box = item.querySelector('.checklist-box');
+ if (box) {
+ box.addEventListener('click', function(e) {
+ e.stopPropagation();
+ const taskId = item.dataset.id;
+ if (taskId) {
+ store.toggleTaskStatus(taskId);
+ setTimeout(function() { renderDayView(); }, 50);
+ }
+ });
+ }
}
-
- const markDayCompleteBtn = document.getElementById('mark-day-complete-btn');
- if (markDayCompleteBtn) {
- markDayCompleteBtn.addEventListener('click', (e) => {
- e.stopPropagation();
- store.markPendingTasksForDateCompleted(selectedDate);
+
+ const addBtn = document.getElementById('day-add-task-btn');
+ if (addBtn) {
+ addBtn.addEventListener('click', function() {
+ document.getElementById('add-task-btn').click();
});
}
}
+window.toggleTask = function(taskId) {
+ store.toggleTaskStatus(taskId);
+ setTimeout(() => {
+ if (currentCalendarView === 'day') renderDayView();
+ else if (currentCalendarView === 'week') renderWeekCalendar();
+ else if (currentCalendarView === 'month') renderCalendar();
+ renderTasks();
+ }, 50);
+};
-
+// Summary box from main branch
const summaryBox = document.getElementById('summary-box');
if (summaryBox) {
summaryBox.innerHTML = generateSummary(store.tasks, store.subjects);
}
-
function renderCalendar() {
const calTitle = document.getElementById('cal-month-title');
const calGrid = document.getElementById('cal-grid');
@@ -825,15 +1003,27 @@ function renderCalendar() {
let indicatorHtml = '';
if (dayTasks.length > 0) {
+ const maxDots = 3;
+ const hasMore = dayTasks.length > maxDots;
+ const dotsToShow = hasMore ? maxDots - 1 : dayTasks.length;
+
indicatorHtml = `
`;
- dayTasks.forEach((t, idx) => {
- if (idx > 2) return;
- const sub = store.subjects.find(s => s.id === t.subject_id) || store.subjects[0];
- indicatorHtml += `
`;
- });
+
+ for (let i = 0; i < dotsToShow; i++) {
+ const sub = store.subjects.find(s => s.id === dayTasks[i].subject_id) || store.subjects[0];
+ indicatorHtml += `
`;
+ }
+
+ if (hasMore) {
+ indicatorHtml += `
+${dayTasks.length - (maxDots - 1)}
`;
+ } else if (dayTasks.length <= maxDots) {
+ indicatorHtml += `
${dayTasks.length}
`;
+ }
+
indicatorHtml += `
`;
}
+ document.getElementById('cal-grid').className = 'cal-grid cal-month-view';
const extraStyle = isSelected ? `border: 1.5px solid var(--color-text-primary);` : '';
html += `
@@ -867,6 +1057,105 @@ function renderCalendar() {
});
}
+
+function renderWeekCalendar() {
+ const year = currentMonthDate.getFullYear();
+ const month = currentMonthDate.getMonth();
+ const today = currentMonthDate.getDate();
+
+ const currentDay = new Date(year, month, today);
+ const dayOfWeek = currentDay.getDay();
+ const monday = new Date(currentDay);
+ monday.setDate(currentDay.getDate() - dayOfWeek + (dayOfWeek === 0 ? -6 : 1));
+
+ const monthNames = ["January","February","March","April","May","June","July","August","September","October","November","December"];
+
+ // Update the title to show week range
+ const weekEnd = new Date(monday);
+ weekEnd.setDate(monday.getDate() + 6);
+ const topbarTitle = document.querySelector('.topbar-title');
+ if(topbarTitle) {
+ topbarTitle.textContent = `${monthNames[monday.getMonth()]} ${monday.getDate()} - ${monthNames[weekEnd.getMonth()]} ${weekEnd.getDate()}, ${monday.getFullYear()}`;
+ }
+
+ document.getElementById('cal-month-title').textContent = `${monthNames[month]} ${year}`;
+
+ let html = `
Mon
+
Tue
+
Wed
+
Thu
+
Fri
+
Sat
+
Sun
`;
+
+ for(let i = 0; i < 7; i++){
+ const date = new Date(monday);
+ date.setDate(monday.getDate() + i);
+ const dayNum = date.getDate();
+ const isToday = dayNum === new Date().getDate() &&
+ date.getMonth() === new Date().getMonth() &&
+ date.getFullYear() === new Date().getFullYear();
+
+ // Check if this day has tasks
+ const dayTasks = store.tasks.filter(t => {
+ if (t.archived) return false;
+ if (t.status === 'Done') return false;
+ if (!t.due_at) return false;
+ const d = new Date(t.due_at);
+ return d.getDate() === dayNum && d.getMonth() === date.getMonth() && d.getFullYear() === date.getFullYear();
+ });
+
+ let indicatorHtml = '';
+ if (dayTasks.length > 0) {
+ const maxDots = 3;
+ const hasMore = dayTasks.length > maxDots;
+ const dotsToShow = hasMore ? maxDots - 1 : dayTasks.length;
+
+ indicatorHtml = `
`;
+
+ for (let j = 0; j < dotsToShow; j++) {
+ const sub = store.subjects.find(s => s.id === dayTasks[j].subject_id) || store.subjects[0];
+ indicatorHtml += `
`;
+ }
+
+ if (hasMore) {
+ indicatorHtml += `
+${dayTasks.length - (maxDots - 1)}
`;
+ } else if (dayTasks.length <= maxDots) {
+ indicatorHtml += `
${dayTasks.length}
`;
+ }
+
+ indicatorHtml += `
`;
+ }
+
+ html += `
+ ${dayNum}
+ ${indicatorHtml}
+
`;
+
+ }
+
+ document.getElementById('cal-grid').innerHTML = html;
+
+ document.querySelectorAll('#cal-grid .interactive-day').forEach(el => {
+ el.addEventListener('click', (e) => {
+ const day = parseInt(el.dataset.day);
+ const month = parseInt(el.dataset.month);
+ const year = parseInt(el.dataset.year);
+ selectedDate = new Date(year, month, day);
+ currentCalendarView = 'day';
+
+ document.querySelectorAll('.view-btn').forEach(btn => {
+ btn.classList.remove('active');
+ if(btn.dataset.view === 'day') btn.classList.add('active');
+ });
+
+ renderDayView();
+ renderTasks();
+ });
+});
+}
+
+
function renderExtraction() {
const pasteItems = store.currentPaste;
if (!pasteItems || pasteItems.length === 0) {
@@ -971,6 +1260,11 @@ store.subscribe(renderExtraction);
store.subscribe(renderCalendar);
store.subscribe(renderFocusTasks);
store.subscribe(renderSidebarSubjects);
+store.subscribe(() => {
+ if (currentCalendarView === 'month') renderCalendar();
+ else if (currentCalendarView === 'week') renderWeekCalendar();
+ else if (currentCalendarView === 'day') renderDayView();
+});
document.addEventListener('DOMContentLoaded', () => {
if (newSubjectColorsEl) {
@@ -1018,6 +1312,8 @@ document.addEventListener('DOMContentLoaded', () => {
});
}
+
+
if (newSubjectName) {
newSubjectName.addEventListener('keydown', (e) => {
if (e.key === 'Enter') {
@@ -1029,11 +1325,75 @@ document.addEventListener('DOMContentLoaded', () => {
store.fetchInitialData();
+
+
+ const calSection = document.querySelector('.cal-section');
+ const collapseIcon = document.querySelector('.collapse-icon');
+ let calendarCollapsed = false;
+
+ if (collapseIcon) {
+ collapseIcon.addEventListener('click', (e) => {
+ e.stopPropagation();
+ calendarCollapsed = !calendarCollapsed;
+ if (calendarCollapsed) {
+ calSection.classList.add('collapsed');
+ collapseIcon.textContent = '▶';
+ } else {
+ calSection.classList.remove('collapsed');
+ collapseIcon.textContent = '▼';
+ }
+ });
+ }
+
const calendarBtn = document.getElementById('calendar-btn');
const allTasksBtn = document.getElementById('all-tasks-btn');
const archivedTasksBtn = document.getElementById('archived-tasks-btn');
const focusModeBtn = document.getElementById('focus-mode-btn');
+const viewBtns = document.querySelectorAll('.view-btn');
+if(viewBtns.length > 0) {
+ viewBtns.forEach(btn => {
+ btn.addEventListener('click', () => {
+ currentCalendarView = btn.dataset.view;
+
+ viewBtns.forEach(b => b.classList.remove('active'));
+ btn.classList.add('active');
+
+ if(currentCalendarView === 'month') {
+ selectedDate = null;
+ renderCalendar();
+ } else if(currentCalendarView === 'week') {
+ selectedDate = null;
+ renderWeekCalendar();
+ } else if(currentCalendarView === 'day') {
+ if (!selectedDate) {
+ selectedDate = new Date();
+ }
+ renderDayView();
+ }
+ renderTasks();
+ });
+ });
+} else {
+
+
+ const weekBtn = document.querySelector('.topbar .btn');
+ if(weekBtn && weekBtn.textContent === 'Week') {
+ weekBtn.addEventListener('click', () => {
+ if(currentCalendarView === 'month') {
+ currentCalendarView = 'week';
+ renderWeekCalendar();
+ weekBtn.textContent = 'Month';
+ } else {
+ currentCalendarView = 'month';
+ renderCalendar();
+ weekBtn.textContent = 'Week';
+ }
+ renderTasks();
+ });
+ }
+}
+
function updateSidebarActive(id) {
document.querySelectorAll('.sidebar .nav-item').forEach(el => el.classList.remove('active'));
document.getElementById(id).classList.add('active');
@@ -1066,6 +1426,7 @@ document.addEventListener('DOMContentLoaded', () => {
renderTasks();
});
+
if(focusModeBtn) {
focusModeBtn.addEventListener('click', () => {
currentView = 'focus';
@@ -1077,18 +1438,41 @@ document.addEventListener('DOMContentLoaded', () => {
});
}
- document.getElementById('cal-prev').addEventListener('click', () => {
+document.getElementById('cal-prev').addEventListener('click', () => {
+ if(currentCalendarView === 'month') {
currentMonthDate.setMonth(currentMonthDate.getMonth() - 1);
renderCalendar();
- });
+ } else if(currentCalendarView === 'week') {
+ currentMonthDate.setDate(currentMonthDate.getDate() - 7);
+ renderWeekCalendar();
+ } else if(currentCalendarView === 'day') {
+ const currentDate = selectedDate || currentMonthDate;
+ const newDate = new Date(currentDate);
+ newDate.setDate(currentDate.getDate() - 1);
+ selectedDate = newDate;
+ renderDayView();
+ }
+ renderTasks();
+});
- document.getElementById('cal-next').addEventListener('click', () => {
+document.getElementById('cal-next').addEventListener('click', () => {
+ if(currentCalendarView === 'month') {
currentMonthDate.setMonth(currentMonthDate.getMonth() + 1);
renderCalendar();
- });
+ } else if(currentCalendarView === 'week') {
+ currentMonthDate.setDate(currentMonthDate.getDate() + 7);
+ renderWeekCalendar();
+ } else if(currentCalendarView === 'day') {
+ const currentDate = selectedDate || currentMonthDate;
+ const newDate = new Date(currentDate);
+ newDate.setDate(currentDate.getDate() + 1);
+ selectedDate = newDate;
+ renderDayView();
+ }
+ renderTasks();
+});
-//NEw Task addition event listeners
newTaskBtn.addEventListener('click', () => {
if (!store.subjects || store.subjects.length === 0) {
diff --git a/js/dashboard.js b/js/dashboard.js
new file mode 100644
index 0000000..e89beb1
--- /dev/null
+++ b/js/dashboard.js
@@ -0,0 +1,274 @@
+import { store } from './store.js';
+import { initGlobalErrorBoundary } from './utils/errorBoundary.js';
+
+initGlobalErrorBoundary();
+
+function formatDate(dateStr) {
+ if (!dateStr) return '';
+ const d = new Date(dateStr);
+ return d.toLocaleDateString('en-US', { month: 'short', day: 'numeric' });
+}
+
+function getTimeAgo(date) {
+ const now = new Date();
+ const diffMs = now - date;
+ const diffMins = Math.floor(diffMs / 60000);
+ const diffHours = Math.floor(diffMs / 3600000);
+ const diffDays = Math.floor(diffMs / 86400000);
+
+ if (diffMins < 1) return 'just now';
+ if (diffMins < 60) return diffMins + 'm ago';
+ if (diffHours < 24) return diffHours + 'h ago';
+ return diffDays + 'd ago';
+}
+
+function calculateStreak(tasks) {
+ const completedTasks = tasks.filter(t => t.status === 'Done' && !t.archived);
+ const today = new Date();
+ today.setHours(0, 0, 0, 0);
+
+ let streak = 0;
+ let currentDate = new Date(today);
+
+ for (let i = 0; i < 365; i++) {
+ const dateStr = currentDate.toDateString();
+ const hasTaskOnDate = completedTasks.some(t => {
+ if (!t.due_at) return false;
+ const taskDate = new Date(t.due_at);
+ taskDate.setHours(0, 0, 0, 0);
+ return taskDate.toDateString() === dateStr;
+ });
+
+ if (hasTaskOnDate) {
+ streak++;
+ currentDate.setDate(currentDate.getDate() - 1);
+ } else {
+ break;
+ }
+ }
+
+ const allDates = completedTasks.map(t => {
+ if (!t.due_at) return null;
+ const d = new Date(t.due_at);
+ d.setHours(0, 0, 0, 0);
+ return d.toDateString();
+ }).filter(d => d);
+
+ const uniqueDates = [...new Set(allDates)].sort();
+ let bestStreak = 0;
+ let currentStreak = 1;
+
+ for (let i = 1; i < uniqueDates.length; i++) {
+ const prev = new Date(uniqueDates[i-1]);
+ const curr = new Date(uniqueDates[i]);
+ const diffDays = (curr - prev) / (1000 * 60 * 60 * 24);
+ if (diffDays === 1) {
+ currentStreak++;
+ } else {
+ bestStreak = Math.max(bestStreak, currentStreak);
+ currentStreak = 1;
+ }
+ }
+ bestStreak = Math.max(bestStreak, currentStreak);
+
+ return { current: streak, best: bestStreak };
+}
+
+function updateDashboard() {
+ const tasks = store.tasks;
+ const subjects = store.subjects;
+
+ const now = new Date();
+ const weekStart = new Date(now);
+ weekStart.setDate(now.getDate() - now.getDay());
+ weekStart.setHours(0, 0, 0, 0);
+
+ const weekEnd = new Date(weekStart);
+ weekEnd.setDate(weekStart.getDate() + 7);
+
+ const thisWeekTasks = tasks.filter(t => {
+ if (t.archived) return false;
+ if (!t.due_at) return false;
+ const d = new Date(t.due_at);
+ return d >= weekStart && d < weekEnd;
+ });
+
+ const totalThisWeek = thisWeekTasks.length;
+ const completedThisWeek = thisWeekTasks.filter(t => t.status === 'Done').length;
+ const pendingTasks = tasks.filter(t => !t.archived && t.status !== 'Done').length;
+
+ const dueSoonTasks = tasks.filter(t => {
+ if (t.archived || t.status === 'Done') return false;
+ if (!t.due_at) return false;
+ const d = new Date(t.due_at);
+ const diffDays = (d - now) / (1000 * 60 * 60 * 24);
+ return diffDays <= 3 && diffDays >= 0;
+ }).length;
+
+ const totalTasksElem = document.getElementById('total-tasks');
+ const completedTasksElem = document.getElementById('completed-tasks');
+ const pendingTasksElem = document.getElementById('pending-tasks');
+ const dueTasksElem = document.getElementById('due-tasks');
+
+ if (totalTasksElem) totalTasksElem.textContent = totalThisWeek;
+ if (completedTasksElem) completedTasksElem.textContent = completedThisWeek;
+ if (pendingTasksElem) pendingTasksElem.textContent = totalThisWeek - completedThisWeek;
+ if (dueTasksElem) dueTasksElem.textContent = dueSoonTasks;
+
+ const todayTasks = tasks.filter(t => {
+ if (t.archived || t.status === 'Done') return false;
+ if (!t.due_at) return false;
+ const d = new Date(t.due_at);
+ return d.toDateString() === now.toDateString();
+ }).sort((a, b) => new Date(a.due_at) - new Date(b.due_at));
+
+ const priorityList = document.getElementById('priority-list');
+ if (priorityList) {
+ if (todayTasks.length === 0) {
+ priorityList.innerHTML = '
No tasks for today
';
+ } else {
+ priorityList.innerHTML = todayTasks.slice(0, 5).map(task => {
+ const sub = subjects.find(s => s.id === task.subject_id) || subjects[0];
+ const timeStr = new Date(task.due_at).toLocaleTimeString('en-US', { hour: '2-digit', minute: '2-digit' });
+ return `
+
+ ${escapeHtml(task.title)}
+ ${timeStr}
+
+ `;
+ }).join('');
+
+ document.querySelectorAll('.priority-item').forEach(el => {
+ el.addEventListener('click', () => {
+ window.location.href = '/index.html';
+ });
+ });
+ }
+ }
+
+ const upcomingTasks = tasks.filter(t => {
+ if (t.archived || t.status === 'Done') return false;
+ if (!t.due_at) return false;
+ const d = new Date(t.due_at);
+ return d > now;
+ }).sort((a, b) => new Date(a.due_at) - new Date(b.due_at)).slice(0, 5);
+
+ const deadlineList = document.getElementById('deadline-list');
+ if (deadlineList) {
+ if (upcomingTasks.length === 0) {
+ deadlineList.innerHTML = '
No upcoming deadlines
';
+ } else {
+ deadlineList.innerHTML = upcomingTasks.map(task => {
+ const daysDiff = Math.ceil((new Date(task.due_at) - now) / (1000 * 60 * 60 * 24));
+ let dateClass = '';
+ let dateText = formatDate(task.due_at);
+ if (daysDiff === 0) dateText = 'Today';
+ else if (daysDiff === 1) dateText = 'Tomorrow';
+ else if (daysDiff <= 3) dateClass = 'deadline-date';
+ return `
+
+ ${escapeHtml(task.title)}
+ ${dateText}
+
+ `;
+ }).join('');
+
+ document.querySelectorAll('.deadline-item').forEach(el => {
+ el.addEventListener('click', () => {
+ window.location.href = '/index.html';
+ });
+ });
+ }
+ }
+
+ const allTasks = [...tasks].filter(t => !t.archived).sort((a, b) => {
+ const dateA = new Date(a.due_at || a.created_at || 0);
+ const dateB = new Date(b.due_at || b.created_at || 0);
+ return dateB - dateA;
+ }).slice(0, 5);
+
+ const recentList = document.getElementById('recent-list');
+ if (recentList) {
+ if (allTasks.length === 0) {
+ recentList.innerHTML = '
No recent activity
';
+ } else {
+ recentList.innerHTML = allTasks.map(task => {
+ const statusIcon = task.status === 'Done' ? '✓' : '○';
+ const statusClass = task.status === 'Done' ? 'recent-text' : 'recent-text';
+ const date = new Date(task.due_at || task.created_at || Date.now());
+ const timeAgo = getTimeAgo(date);
+ const sub = subjects.find(s => s.id === task.subject_id) || subjects[0];
+ return `
+
+
${statusIcon}
+
${escapeHtml(task.title)}
+
${timeAgo}
+
+ `;
+ }).join('');
+
+ document.querySelectorAll('.recent-item').forEach(el => {
+ el.addEventListener('click', () => {
+ window.location.href = '/index.html';
+ });
+ });
+ }
+ }
+
+ const streak = calculateStreak(tasks);
+ const streakElem = document.getElementById('streak-days');
+ const streakBarElem = document.getElementById('streak-bar');
+ const streakBestElem = document.getElementById('streak-best');
+
+ if (streakElem) streakElem.textContent = streak.current;
+ if (streakBarElem) {
+ const percent = streak.best > 0 ? (streak.current / streak.best) * 100 : 0;
+ streakBarElem.style.width = percent + '%';
+ }
+ if (streakBestElem) streakBestElem.textContent = 'Best: ' + streak.best + ' days';
+}
+
+function escapeHtml(str) {
+ if (!str) return '';
+ return String(str)
+ .replace(/&/g, '&')
+ .replace(//g, '>')
+ .replace(/"/g, '"')
+ .replace(/'/g, ''');
+}
+
+const startBtn = document.getElementById('start-planning-btn');
+if (startBtn) {
+ startBtn.addEventListener('click', () => {
+ window.location.href = '/index.html';
+ });
+}
+
+store.subscribe(() => {
+ updateDashboard();
+});
+
+store.fetchInitialData().then(() => {
+ updateDashboard();
+});
+
+const greetingElem = document.querySelector('.greeting-text');
+if (greetingElem) {
+ const hour = new Date().getHours();
+ let greeting = 'Good evening';
+ if (hour < 12) greeting = 'Good morning';
+ else if (hour < 18) greeting = 'Good afternoon';
+ greetingElem.textContent = greeting;
+}
+
+function setDate() {
+ const dateElem = document.getElementById('date-text');
+ if (dateElem) {
+ const now = new Date();
+ const options = { weekday: 'long', year: 'numeric', month: 'long', day: 'numeric' };
+ dateElem.textContent = now.toLocaleDateString('en-US', options);
+ }
+}
+
+setDate();
\ No newline at end of file
diff --git a/server.js b/server.js
index 47e1429..abb1cae 100644
--- a/server.js
+++ b/server.js
@@ -13,11 +13,23 @@ app.use(express.json());
const page404Path = path.join(__dirname, '404.html');
const page500Path = path.join(__dirname, 'error.html');
+app.get('/', (req, res) => {
+ res.sendFile(path.join(__dirname, 'dashboard.html'));
+});
+
+app.get('/index.html', (req, res) => {
+ res.sendFile(path.join(__dirname, 'index.html'));
+});
+
+app.get('/dashboard.html', (req, res) => {
+ res.sendFile(path.join(__dirname, 'dashboard.html'));
+});
+
+
// Static
app.use('/css', express.static(path.join(__dirname, 'css')));
app.use('/js', express.static(path.join(__dirname, 'js')));
app.use(express.static(__dirname));
-
initDb();
// Environment Validation
@@ -568,7 +580,9 @@ app.use((err, req, res, next) => {
return res.status(500).sendFile(page500Path);
});
-// ================= SERVER =================
+
+
+// // ================= SERVER =================
const PORT = process.env.PORT || 3000;
app.listen(PORT, () => {
console.log('Server running on port ' + PORT);
+