-
-
+=======
@@ -48,71 +60,106 @@
Welcome back
-Sign in to your StudyPlan account
+<<<<<<< HEAD + +Wel
- 
+
-
+
StudyPlan
-
-
+
-
+
+
+
-
-
-
+
+
+
+
+
+
-
-
- Settings
- +Settings
+
+
+
`
: '';
+ // Fix #536: added missing + operator between renderGroup calls
tasksSection.innerHTML = actionBar +
+<<<<<<< HEAD
+ renderGroup(titlePrefix + '⚠ Due soon', dueSoon, 'var(--color-text-danger)', true) +
+ renderGroup(titlePrefix + 'This week', thisWeek, 'var(--color-text-secondary)', true) +
+=======
renderGroup(titlePrefix + '⚠ Due soon', dueSoon, 'var(--color-text-danger)', true)
+ renderGroup(titlePrefix + 'This week', thisWeek, 'var(--color-text-secondary)', true) +
+>>>>>>> upstream/main
renderGroup(titlePrefix + 'Completed', completed, 'var(--color-text-tertiary)') +
emptyState;
}
@@ -1088,7 +1094,7 @@ document.addEventListener('DOMContentLoaded', () => {
});
-//NEw Task addition event listeners
+//New Task addition event listeners
newTaskBtn.addEventListener('click', () => {
if (!store.subjects || store.subjects.length === 0) {
@@ -1163,6 +1169,7 @@ if (!subject_id) {
newTaskModal.style.display = 'none';
});
+// Fix #521: removed duplicate addItemsBtn event listener (was registered twice)
addItemsBtn.addEventListener('click', () => {
if (store.currentPaste) {
const pasteWithLabels = store.currentPaste.map(t => {
@@ -1204,6 +1211,8 @@ clearBtn.addEventListener('click', () => {
pasteInput.focus(); // Puts the typing cursor back in the box
});
+<<<<<<< HEAD
+=======
// Listens to typing/pasting to show or hide the button dynamically
pasteInput.addEventListener('input', () => {
if (pasteInput.value.trim().length > 0) {
@@ -1213,6 +1222,7 @@ pasteInput.addEventListener('input', () => {
}
});
+>>>>>>> upstream/main
downloadBtn.addEventListener('click', () => {
downloadData();
});
diff --git a/js/auth.js b/js/auth.js
new file mode 100644
index 0000000..25c644b
--- /dev/null
+++ b/js/auth.js
@@ -0,0 +1,81 @@
+/* ============================================================
+ Auth Guard + Utilities (used by signin.html / signup.html)
+ ============================================================ */
+
+const USER_KEY = 'studyplan_user';
+
+export function getUser() {
+ try {
+ const raw = localStorage.getItem(USER_KEY);
+ return raw ? JSON.parse(raw) : null;
+ } catch { return null; }
+}
+
+export function setUser(data) {
+ localStorage.setItem(USER_KEY, JSON.stringify(data));
+}
+
+export function clearUser() {
+ localStorage.removeItem(USER_KEY);
+}
+
+export function isAuthenticated() {
+ return !!getUser();
+}
+
+/* Redirect if not logged in — call on dashboard pages */
+export function requireAuth() {
+ if (!isAuthenticated()) {
+ window.location.href = '/signin.html';
+ return false;
+ }
+ return true;
+}
+
+/* Redirect if already logged in — call on auth pages */
+export function redirectIfAuth() {
+ if (isAuthenticated()) {
+ window.location.href = '/';
+ return true;
+ }
+ return false;
+}
+
+/* Used by auth forms */
+export async function doSignIn(email, password) {
+ const res = await fetch('/api/auth/login', {
+ method: 'POST',
+ headers: { 'Content-Type': 'application/json' },
+ body: JSON.stringify({ email, password }),
+ });
+ const data = await res.json();
+ if (!res.ok) throw new Error(data.error || 'Sign in failed');
+ setUser({ email: data.email, id: data.id });
+ return data;
+}
+
+export async function doSignUp(email, password) {
+ const res = await fetch('/api/auth/signup', {
+ method: 'POST',
+ headers: { 'Content-Type': 'application/json' },
+ body: JSON.stringify({ email, password }),
+ });
+ const data = await res.json();
+ if (!res.ok) throw new Error(data.error || 'Sign up failed');
+ setUser({ email: data.email, id: data.id });
+ return data;
+}
+
+export function doLogout() {
+ clearUser();
+ window.location.href = '/signin.html';
+}
+
+/* Apply saved theme before paint (no flash) */
+export function applyTheme() {
+ const saved = localStorage.getItem('studyplan_theme');
+ const prefersDark = window.matchMedia('(prefers-color-scheme: dark)').matches;
+ const theme = saved || (prefersDark ? 'dark' : 'light');
+ document.documentElement.setAttribute('data-theme', theme);
+ return theme;
+}
diff --git a/js/notifications.js b/js/notifications.js
new file mode 100644
index 0000000..b9e8fdb
--- /dev/null
+++ b/js/notifications.js
@@ -0,0 +1,71 @@
+/* ============================================================
+ Toast Notification System
+ ============================================================ */
+
+const ICONS = {
+ success: '✅',
+ error: '❌',
+ warning: '⚠️',
+ info: 'ℹ️',
+};
+
+const DURATIONS = {
+ success: 3500,
+ error: 5000,
+ warning: 4500,
+ info: 3500,
+};
+
+let _container = null;
+
+function getContainer() {
+ if (!_container) {
+ _container = document.getElementById('toast-container');
+ if (!_container) {
+ _container = document.createElement('div');
+ _container.id = 'toast-container';
+ document.body.appendChild(_container);
+ }
+ }
+ return _container;
+}
+
+export function toast(type, title, message = '', duration) {
+ const container = getContainer();
+ const ms = duration ?? DURATIONS[type] ?? 3500;
+
+ const el = document.createElement('div');
+ el.className = `toast toast-${type} animate-slide-up`;
+ el.innerHTML = `
+ ${ICONS[type] ?? 'ℹ️'}
+ Sign In — StudyPlan
+
+
+
+
+
+
+
+
+
+
+Sign Up — StudyPlan
+
+
+
+
+
+
+
+
+
+
Appearance
-
+
+>>>>>>> upstream/main
diff --git a/js/app.js b/js/app.js
index 787d08a..56c7377 100644
--- a/js/app.js
+++ b/js/app.js
@@ -448,7 +448,7 @@ function renderTasks() {
const activeTasks = tasks.filter(t => !t.archived);
const archivedTasks = tasks.filter(t => t.archived);
- // Update badges
+ // Fix #523: Update badge counts dynamically from real task data
const allTasksBadge = document.querySelector('#all-tasks-btn .badge');
if (allTasksBadge) {
allTasksBadge.textContent = activeTasks.length;
@@ -666,9 +666,15 @@ function renderTasks() {
Dark Mode
-
-
+
+
+<<<<<<< HEAD
+=======
New subject
@@ -511,5 +632,6 @@New task
+ ${title ? `
+
+ `;
+
+ el.querySelector('.toast-close').addEventListener('click', () => dismiss(el));
+ container.appendChild(el);
+
+ const timer = setTimeout(() => dismiss(el), ms);
+ el._timer = timer;
+ return el;
+}
+
+export function dismiss(el) {
+ if (!el || !el.parentNode) return;
+ clearTimeout(el._timer);
+ el.classList.add('removing');
+ el.addEventListener('animationend', () => el.remove(), { once: true });
+ // Fallback
+ setTimeout(() => { if (el.parentNode) el.remove(); }, 300);
+}
+
+// Convenience aliases
+export const notify = {
+ success: (title, msg, ms) => toast('success', title, msg, ms),
+ error: (title, msg, ms) => toast('error', title, msg, ms),
+ warning: (title, msg, ms) => toast('warning', title, msg, ms),
+ info: (title, msg, ms) => toast('info', title, msg, ms),
+};
diff --git a/js/router.js b/js/router.js
new file mode 100644
index 0000000..8e680f0
--- /dev/null
+++ b/js/router.js
@@ -0,0 +1,81 @@
+/* ============================================================
+ Router — Lightweight Hash-Based View Switcher
+ ============================================================ */
+
+export const VIEWS = {
+ DASHBOARD: 'dashboard',
+ TASKS: 'tasks',
+ CALENDAR: 'calendar',
+ FOCUS: 'focus',
+ PROFILE: 'profile',
+ SETTINGS: 'settings',
+ ARCHIVED: 'archived',
+};
+
+const VIEW_TITLES = {
+ dashboard: 'Dashboard',
+ tasks: 'Tasks',
+ calendar: 'Calendar',
+ focus: 'Focus Mode',
+ profile: 'Profile',
+ settings: 'Settings',
+ archived: 'Archived',
+};
+
+let _currentView = VIEWS.DASHBOARD;
+let _onChangeCallbacks = [];
+
+export function getCurrentView() {
+ return _currentView;
+}
+
+export function onViewChange(cb) {
+ _onChangeCallbacks.push(cb);
+}
+
+export function navigateTo(view) {
+ if (!Object.values(VIEWS).includes(view)) return;
+ _currentView = view;
+ window.location.hash = view;
+ _applyView(view);
+ _onChangeCallbacks.forEach(cb => cb(view));
+}
+
+function _applyView(view) {
+ // Update all view panels
+ document.querySelectorAll('.view-panel').forEach(el => {
+ el.classList.toggle('active', el.dataset.view === view);
+ });
+
+ // Update nav items
+ document.querySelectorAll('[data-nav]').forEach(el => {
+ el.classList.toggle('active', el.dataset.nav === view);
+ });
+
+ // Update topbar title
+ const titleEl = document.getElementById('topbar-title');
+ if (titleEl) titleEl.textContent = VIEW_TITLES[view] || view;
+
+ // Scroll content area to top
+ const content = document.querySelector('.content-area');
+ if (content) content.scrollTop = 0;
+}
+
+export function initRouter() {
+ // Read initial hash
+ const hash = window.location.hash.replace('#', '').replace('/', '') || VIEWS.DASHBOARD;
+ const view = Object.values(VIEWS).includes(hash) ? hash : VIEWS.DASHBOARD;
+ _currentView = view;
+ _applyView(view);
+
+ // Listen for hash changes (back/forward)
+ window.addEventListener('hashchange', () => {
+ const newHash = window.location.hash.replace('#', '').replace('/', '') || VIEWS.DASHBOARD;
+ const newView = Object.values(VIEWS).includes(newHash) ? newHash : VIEWS.DASHBOARD;
+ if (newView !== _currentView) {
+ _currentView = newView;
+ _applyView(newView);
+ _onChangeCallbacks.forEach(cb => cb(newView));
+ }
+ });
+}
diff --git a/js/ui.js b/js/ui.js
new file mode 100644
index 0000000..6f6d458
--- /dev/null
+++ b/js/ui.js
@@ -0,0 +1,75 @@
+/* ============================================================
+ UI Utilities — Modals, Theme Toggle, Mobile Sidebar
+ ============================================================ */
+
+import { applyTheme } from './auth.js';
+
+/* --- Theme --- */
+let _currentTheme = 'light';
+
+export function initTheme() {
+ _currentTheme = applyTheme();
+ syncThemeIcons();
+}
+
+export function toggleTheme() {
+ _currentTheme = _currentTheme === 'dark' ? 'light' : 'dark';
+ document.documentElement.setAttribute('data-theme', _currentTheme);
+ localStorage.setItem('studyplan_theme', _currentTheme);
+ syncThemeIcons();
+}
+
+function syncThemeIcons() {
+ const sunIcon = ``;
+ const moonIcon = ``;
+ document.querySelectorAll('[data-theme-toggle]').forEach(btn => {
+ btn.innerHTML = _currentTheme === 'dark' ? sunIcon : moonIcon;
+ btn.setAttribute('aria-label', _currentTheme === 'dark' ? 'Switch to light mode' : 'Switch to dark mode');
+ });
+ // Sync settings checkbox if exists
+ const cb = document.getElementById('settings-dark-mode');
+ if (cb) cb.checked = (_currentTheme === 'dark');
+}
+
+/* --- Mobile Sidebar --- */
+export function initMobileSidebar() {
+ const sidebar = document.querySelector('.sidebar');
+ const overlay = document.querySelector('.sidebar-overlay');
+ const menuBtn = document.querySelector('.topbar-menu-btn');
+ if (!sidebar || !overlay || !menuBtn) return;
+
+ menuBtn.addEventListener('click', () => openSidebar());
+ overlay.addEventListener('click', () => closeSidebar());
+
+ // Close sidebar on nav item click (mobile)
+ sidebar.querySelectorAll('[data-nav]').forEach(item => {
+ item.addEventListener('click', () => {
+ if (window.innerWidth <= 768) closeSidebar();
+ });
+ });
+}
+
+export function openSidebar() {
+ const sidebar = document.querySelector('.sidebar');
+ const overlay = document.querySelector('.sidebar-overlay');
+ sidebar?.classList.add('open');
+ overlay?.classList.add('show');
+ document.body.style.overflow = 'hidden';
+}
+
+export function closeSidebar() {
+ const sidebar = document.querySelector('.sidebar');
+ const overlay = document.querySelector('.sidebar-overlay');
+ sidebar?.classList.remove('open');
+ overlay?.classList.remove('show');
+ document.body.style.overflow = '';
+}
+
+/* --- Modal Helpers --- */
+export function openModal(id) {
+ const m = document.getElementById(id);
+ if (!m) return;
+ m.classList.add('open');
+ // Focus first input
+ const first = m.querySelector('input, textarea, button');
+
\ No newline at end of file
diff --git a/signin.html b/signin.html
new file mode 100644
index 0000000..17414bf
--- /dev/null
+++ b/signin.html
@@ -0,0 +1,193 @@
+
+
+
+
+
+ ${title}
` : ''}
+ ${message ? `${message}
` : ''}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/signup.html b/signup.html
new file mode 100644
index 0000000..1ea8159
--- /dev/null
+++ b/signup.html
@@ -0,0 +1,178 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ StudyPlan
+
+ Your AI-powered
study workspace
+ study workspace
Plan smarter, study better, and never miss a deadline.
+
+
+ Smart AI task extraction
+ Calendar & deadline tracking
+ Pomodoro focus sessions
+ Subject-based organisation
+
+
+
+
+
+
+
+
+ StudyPlan
+
+
+ Welcome back
+Sign in to your account to continue
+ + + + + ++ Don't have an account? Create one free +
+
+
+
+
+
+
+
+
+
+
+
+
+
+ StudyPlan
+
+ Start studying smarter
from day one
+ from day one
Join thousands of students who plan, focus, and achieve more with StudyPlan.
+
+
+ Free forever for students
+ AI-powered task extraction
+ No credit card required
+
+
+
+
+
+
+ StudyPlan
+
+
+ Create your account
+Get started for free. No credit card needed.
+ + + + + ++ Already have an account? Sign in +
+