Compare commits
1 Commits
main
...
160d6014df
| Author | SHA1 | Date | |
|---|---|---|---|
| 160d6014df |
@@ -42,8 +42,8 @@ jobs:
|
||||
steps:
|
||||
- name: Deploy to Dokploy
|
||||
run: |
|
||||
curl -fsSL -X POST "${{ secrets.DOKPLOY_URL }}/api/compose.deploy" \
|
||||
curl -fsSL -X POST "${{ secrets.DOKPLOY_URL }}/api/application.deploy" \
|
||||
-H "Content-Type: application/json" \
|
||||
-H "x-api-key: ${{ secrets.DOKPLOY_API_TOKEN }}" \
|
||||
-d '{"composeId": "${{ secrets.DOKPLOY_COMPOSE_ID }}"}'
|
||||
-d '{"applicationId": "${{ secrets.DOKPLOY_APP_ID }}"}'
|
||||
echo "Deploy triggered on Dokploy"
|
||||
|
||||
2
dist/index.html
vendored
2
dist/index.html
vendored
@@ -6,7 +6,7 @@
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<meta name="description" content="Todo App - Task management made simple" />
|
||||
<title>Todo App</title>
|
||||
<script type="module" crossorigin src="/assets/index-BJQCGGBb.js"></script>
|
||||
<script type="module" crossorigin src="/assets/index-BYeSixg2.js"></script>
|
||||
<link rel="stylesheet" crossorigin href="/assets/index-C44jgAFE.css">
|
||||
</head>
|
||||
<body>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { useState, useRef, useEffect } from 'react';
|
||||
import { Plus, Calendar, X } from 'lucide-react';
|
||||
import { Plus, Calendar, Flag, Tag, X } from 'lucide-react';
|
||||
import type { Priority } from '@/types';
|
||||
import { cn, getPriorityColor } from '@/lib/utils';
|
||||
import { useTasksStore } from '@/stores/tasks';
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import { useState } from 'react';
|
||||
import { ChevronRight, ChevronDown, Check } from 'lucide-react';
|
||||
import type { Task } from '@/types';
|
||||
import { cn } from '@/lib/utils';
|
||||
import { useTasksStore } from '@/stores/tasks';
|
||||
|
||||
interface CompletedSectionProps {
|
||||
|
||||
@@ -2,7 +2,7 @@ import { useState, useRef, useEffect } from 'react';
|
||||
import { Link, useLocation, useNavigate } from 'react-router-dom';
|
||||
import {
|
||||
Inbox, Calendar, CalendarDays, Plus, ChevronDown, ChevronRight,
|
||||
Settings, LogOut, Tag, X,
|
||||
Hash, Settings, LogOut, User, FolderPlus, Tag, X, Check,
|
||||
PanelLeftClose, PanelLeftOpen
|
||||
} from 'lucide-react';
|
||||
import { cn } from '@/lib/utils';
|
||||
@@ -56,7 +56,7 @@ export function Sidebar({ mobileOpen, onMobileClose }: SidebarProps) {
|
||||
setIsCollapsed(next);
|
||||
try {
|
||||
localStorage.setItem(SIDEBAR_COLLAPSED_KEY, String(next));
|
||||
} catch { /* ignore localStorage errors */ }
|
||||
} catch {}
|
||||
};
|
||||
|
||||
const handleNavClick = () => {
|
||||
@@ -94,6 +94,7 @@ export function Sidebar({ mobileOpen, onMobileClose }: SidebarProps) {
|
||||
navigate('/login');
|
||||
};
|
||||
|
||||
const inbox = projects.find(p => p.isInbox);
|
||||
const regularProjects = projects.filter(p => !p.isInbox);
|
||||
|
||||
const navItems = [
|
||||
|
||||
@@ -4,7 +4,7 @@ import {
|
||||
Tag, MessageSquare, ChevronRight, AlertCircle, Layers
|
||||
} from 'lucide-react';
|
||||
import type { Task, Priority, Comment, Section } from '@/types';
|
||||
import { cn, getPriorityColor } from '@/lib/utils';
|
||||
import { cn, formatDate, getPriorityColor, getPriorityLabel } from '@/lib/utils';
|
||||
import { useTasksStore } from '@/stores/tasks';
|
||||
import { api } from '@/lib/api';
|
||||
|
||||
@@ -29,9 +29,7 @@ export function TaskDetail({ task, onClose }: TaskDetailProps) {
|
||||
const titleRef = useRef<HTMLInputElement>(null);
|
||||
const panelRef = useRef<HTMLDivElement>(null);
|
||||
|
||||
// Sync local state from task prop - intentional setState in effect for controlled form
|
||||
useEffect(() => {
|
||||
// eslint-disable-next-line react-hooks/set-state-in-effect -- syncing local form state from prop
|
||||
setTitle(task.title);
|
||||
setDescription(task.description || '');
|
||||
setDueDate(task.dueDate ? task.dueDate.slice(0, 10) : '');
|
||||
@@ -52,7 +50,7 @@ export function TaskDetail({ task, onClose }: TaskDetailProps) {
|
||||
if (projectId) {
|
||||
const proj = projects.find(p => p.id === projectId);
|
||||
if (proj?.sections) {
|
||||
setAvailableSections(proj.sections); // eslint-disable-line react-hooks/set-state-in-effect
|
||||
setAvailableSections(proj.sections);
|
||||
} else {
|
||||
api.getProject(projectId).then((p) => {
|
||||
setAvailableSections(p.sections || []);
|
||||
|
||||
@@ -1,23 +1,25 @@
|
||||
import { describe, it, expect, vi, beforeEach } from 'vitest';
|
||||
import type { Mock } from 'vitest';
|
||||
|
||||
// We need to test the ApiClient class, so we import the module fresh
|
||||
// The api.ts uses import.meta.env.PROD which is false in test
|
||||
// So API_BASE = '/api' and AUTH_BASE = ''
|
||||
|
||||
let api: Record<string, (...args: unknown[]) => unknown>;
|
||||
let ApiClient: any;
|
||||
let api: any;
|
||||
|
||||
beforeEach(async () => {
|
||||
vi.resetModules();
|
||||
vi.stubGlobal('fetch', vi.fn());
|
||||
const mod = await import('@/lib/api');
|
||||
api = mod.api as unknown as Record<string, (...args: unknown[]) => unknown>;
|
||||
api = mod.api;
|
||||
// Get the class from the singleton
|
||||
ApiClient = (api as any).constructor;
|
||||
});
|
||||
|
||||
function mockFetchResponse(data: unknown, ok = true, _status = 200) {
|
||||
(fetch as Mock).mockResolvedValueOnce({
|
||||
function mockFetchResponse(data: any, ok = true, status = 200) {
|
||||
(fetch as any).mockResolvedValueOnce({
|
||||
ok,
|
||||
status: _status,
|
||||
status,
|
||||
json: () => Promise.resolve(data),
|
||||
});
|
||||
}
|
||||
@@ -40,7 +42,7 @@ describe('ApiClient', () => {
|
||||
});
|
||||
|
||||
it('throws on failed login', async () => {
|
||||
(fetch as Mock).mockResolvedValueOnce({
|
||||
(fetch as any).mockResolvedValueOnce({
|
||||
ok: false,
|
||||
json: () => Promise.resolve({ message: 'Invalid credentials' }),
|
||||
});
|
||||
@@ -76,7 +78,7 @@ describe('ApiClient', () => {
|
||||
});
|
||||
|
||||
it('returns null when not authenticated', async () => {
|
||||
(fetch as Mock).mockResolvedValueOnce({
|
||||
(fetch as any).mockResolvedValueOnce({
|
||||
ok: false,
|
||||
json: () => Promise.resolve({}),
|
||||
});
|
||||
@@ -86,7 +88,7 @@ describe('ApiClient', () => {
|
||||
});
|
||||
|
||||
it('returns null on network error', async () => {
|
||||
(fetch as Mock).mockRejectedValueOnce(new Error('Network error'));
|
||||
(fetch as any).mockRejectedValueOnce(new Error('Network error'));
|
||||
|
||||
const result = await api.getSession();
|
||||
expect(result).toBeNull();
|
||||
@@ -163,7 +165,7 @@ describe('ApiClient', () => {
|
||||
|
||||
await api.getTasks({ projectId: 'proj1', completed: false, today: true });
|
||||
|
||||
const calledUrl = (fetch as Mock).mock.calls[0][0] as string;
|
||||
const calledUrl = (fetch as any).mock.calls[0][0] as string;
|
||||
expect(calledUrl).toContain('/api/tasks?');
|
||||
expect(calledUrl).toContain('projectId=proj1');
|
||||
expect(calledUrl).toContain('completed=false');
|
||||
@@ -257,14 +259,14 @@ describe('ApiClient', () => {
|
||||
|
||||
await api.getProjects();
|
||||
|
||||
const headers = (fetch as Mock).mock.calls[0][1].headers;
|
||||
const headers = (fetch as any).mock.calls[0][1].headers;
|
||||
expect(headers['Authorization']).toBeUndefined();
|
||||
});
|
||||
});
|
||||
|
||||
describe('Error handling', () => {
|
||||
it('throws error with message from non-200 response', async () => {
|
||||
(fetch as Mock).mockResolvedValueOnce({
|
||||
(fetch as any).mockResolvedValueOnce({
|
||||
ok: false,
|
||||
json: () => Promise.resolve({ error: 'Not found' }),
|
||||
});
|
||||
@@ -273,7 +275,7 @@ describe('ApiClient', () => {
|
||||
});
|
||||
|
||||
it('throws "Request failed" when error body is unparseable', async () => {
|
||||
(fetch as Mock).mockResolvedValueOnce({
|
||||
(fetch as any).mockResolvedValueOnce({
|
||||
ok: false,
|
||||
json: () => Promise.reject(new Error('parse error')),
|
||||
});
|
||||
|
||||
@@ -16,7 +16,7 @@ interface BoardViewProps {
|
||||
}
|
||||
|
||||
function TaskCard({ task, muted }: { task: Task; muted?: boolean }) {
|
||||
const { setSelectedTask } = useTasksStore();
|
||||
const { toggleComplete, setSelectedTask } = useTasksStore();
|
||||
const overdue = !task.isCompleted && isOverdue(task.dueDate);
|
||||
|
||||
return (
|
||||
@@ -84,7 +84,6 @@ function EditableHeader({
|
||||
title,
|
||||
count,
|
||||
sectionId,
|
||||
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
||||
projectId,
|
||||
onRename,
|
||||
onDelete,
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { useState } from 'react';
|
||||
import { useNavigate } from 'react-router-dom';
|
||||
import { useNavigate, Link } from 'react-router-dom';
|
||||
import { useAuthStore } from '@/stores/auth';
|
||||
|
||||
export function LoginPage() {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { useEffect, useState, useRef } from 'react';
|
||||
import { useParams, useNavigate, useLocation } from 'react-router-dom';
|
||||
import { LayoutList, LayoutGrid, Pencil, Trash2, AlertCircle } from 'lucide-react';
|
||||
import { LayoutList, LayoutGrid, Plus, Pencil, Trash2, AlertCircle } from 'lucide-react';
|
||||
import { cn } from '@/lib/utils';
|
||||
import { useTasksStore } from '@/stores/tasks';
|
||||
import { TaskItem } from '@/components/TaskItem';
|
||||
|
||||
@@ -17,7 +17,7 @@ interface AuthState {
|
||||
|
||||
export const useAuthStore = create<AuthState>()(
|
||||
persist(
|
||||
(set) => ({
|
||||
(set, get) => ({
|
||||
user: null,
|
||||
isLoading: true,
|
||||
isAuthenticated: false,
|
||||
|
||||
Reference in New Issue
Block a user