diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 0d952d7..0b9fef4 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -83,7 +83,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: carry-your-live-release - path: carry-your-live/android/app/build/outputs/release/app-release.apk + path: carry-your-live/android/app/build/outputs/apk/release/app-release.apk release: needs: build diff --git a/README.md b/README.md index 1546f05..150bc16 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,40 @@ # Carry Your Live - Mobile To-Do & Calendar App -A minimalist, offline-first task management app built with Expo, React Native, and WatermelonDB. Features three primary screens: To-Do List, Add New Task, and Calendar with bottom navigation. +A minimalist, offline-first task management app built with Expo, React Native, and WatermelonDB. Features multiple screens with bottom navigation, social features, and a full-featured backend API. -## πŸ“ Recent Fixes +## πŸ“ Recent Progress (v1.1.0 - Unreleased) -- **ListItem component**: Fixed empty component - now properly renders list items with title, subtitle, icons, and swipe actions -- **Subtask drag-and-drop**: Added `parentSubtaskId` type support for proper subtask reparenting -- **Task drag sorting**: Added task drag-and-drop reordering functionality with visual drop indicators -- **iCal import**: Fixed import functionality - replaced invalid `splice()` with proper `create()` calls and fixed date type handling -- **Settings context**: Added `accentOpacity` and `setAccentOpacity` to the Settings context -- **Tag inheritance**: Subtasks no longer automatically inherit parent task tags when converting tasks to subtasks +### Added +- **Friends feature**: Friend requests, accept/decline/remove, user search, full backend routes +- **Assignee field on tasks**: Schema v7, model, types, forms, sync, task actions +- **AssigneeSelector component** and assignee display in TaskItem +- **QuickAddBar** on tasks overview (copied from calendar) +- **Backend**: Mounted friends route, added assigneeId to task validation and sync + +### Changed +- Due date prefilled from Calendar "+" button +- 12-hour time formatting across task rows and pickers +- Calendar strip scrolls to selected day when navigating months +- Calendar completion toggle now handles repeating tasks and reminders +- Task color strips now use the task's category color + +### Fixed +- WheelTimePicker FlatList scroll clamping - all hours (0-23) and minutes (0-59) reachable +- WheelTimePicker selection highlight background connecting selected item with colon separator +- WheelTimePicker number alignment in scroll list +- Tasks without a due date no longer get overdue styling +- `useOverdueTasks` infinite re-subscription loop (Date.now in effect deps) +- Web/Android crashes from decorator transform ordering (babel config) +- FormButtons crash outside FormProvider; Cancel navigation fallback +- Task repeat settings, reminders and series info now sync to backend + +### Removed +- Task color picker (task color now comes from its category) +- Drag lift popup from TaskItem (scale + shadow on drag) +- Checkbox from task items +- Selection bar overlapping QuickAddBar on tasks overview + +--- ## Features @@ -17,97 +42,145 @@ A minimalist, offline-first task management app built with Expo, React Native, a - **Offline-First Architecture**: Full CRUD operations work offline with WatermelonDB + SQLite - **Auto-Sync**: Background synchronization with custom Postgres API when online - **Cross-Platform**: iOS, Android, and Web from single codebase +- **Desktop Support**: Electron wrapper for desktop app distribution ### Screens -#### 1. To-Do List Screen +#### 1. Tasks Screen (To-Do List) - **Header**: App logo + "TODO" title with rounded corners - **Category Filter**: Horizontal scrollable chips (Work, Personal, School, Shopping, Health, Finance, All) - Single selection with visual feedback (thicker border, shadow, scale animation) - Instant task filtering -- **Task List**: Vertical scrolling with: - - Checkbox (empty/checked states with animation) +- **QuickAddBar**: Quick task creation from list view +- **Task List**: Virtualized FlatList with sections (Pending/Completed) - Task title (truncated with ellipsis) - Three-dot overflow menu (Edit, Delete, Duplicate, Mark Complete, Change Category, Change Priority) - Priority badges with colors - Due date/time with overdue/due-today highlighting - - Completed section (collapsible) -- **Floating Action Button**: Bottom-right, opens Add Task screen with press animation + - Category color indicator strip + - Assignee display + - Swipe actions (left: delete, right: complete) + - Drag-to-reorder with visual drop indicators + - Long press β†’ Selection mode (multi-delete, multi-complete, change category/priority) +- **Floating Action Button**: Bottom-right, opens Add Task screen -#### 2. Add New Task Screen +#### 2. Calendar Screen +- **Date Strip**: Horizontal scrollable days of current month + - Current day highlighted, scrolls to selected day on month change +- **Month Label**: Centered (e.g., "JAN 2026") +- **QuickAddBar**: Quick task creation for selected date +- **Task List**: Tasks for selected day with category color, title, time, completion status +- **Analog Clock Widget**: Decorative analog clock display +- **Empty State**: "No tasks scheduled." +- **Day View**: Detailed view for selected day (pushes to stack) + +#### 3. Stats Screen +- Client-side statistics (`useStats` hook) +- Task completion metrics +- Category and priority breakdowns + +#### 4. Settings Screen +- **Account**: Login/Register/Sign Out (SyncModal) +- **Server URL Override**: Custom API endpoint configuration +- **Appearance**: Accent color picker (dark mode toggle planned) +- **Task Defaults**: Default category, sort order (Date, Priority, Alphabetically, Creation Date), show completed toggle +- **Calendar**: Days ahead to display +- **Reminders**: Global reminder preference (stored, wiring in progress) +- **Notifications**: Toggle (stored, wiring in progress) +- **Legal**: Privacy Policy, Terms of Service +- **About**: Version info + +#### 5. Add New Task Screen - **Category Selector**: Horizontal row of colored circles (required) - **Task Name**: Single-line input, 100 char max (required) -- **Subtasks**: Unlimited, add/remove individually -- **Date & Time**: Date picker, time picker, calendar button +- **Subtasks**: Unlimited, add/remove individually, nested subtask support +- **Date & Time**: Date picker, time picker (WheelTimePicker), calendar button - **Priority**: Dropdown (None, Low, Medium, High, Critical) with color indicators +- **Repeat Profile**: Recurring task configuration +- **Reminder**: Reminder offset selector +- **Assignee**: Assign task to friend - **Description**: Multi-line text area, 1000 char max - **Bottom Actions**: Submit (primary) / Cancel (secondary) fixed buttons -#### 3. Calendar Screen -- **Date Strip**: Horizontal scrollable days of current month -- **Month Label**: Centered (e.g., "JAN 2026") -- **Task List**: Tasks for selected day with category color, title, time, completion status -- **Empty State**: "No tasks scheduled." +#### 6. Task Detail Screen +- Full task view with all fields +- Subtask management (add, complete, reorder, convert to task) +- Edit functionality +- Repeat profile configuration -#### 4. Settings Screen -- Dark Mode toggle -- Push Notifications toggle -- Reminder Preferences -- Default Category selector -- Sort Tasks By (Date, Priority, Alphabetically, Creation Date) -- Backup & Sync -- Version, Privacy Policy, Terms of Service +#### 7. Subtask Detail Screen +- Nested subtask management +- Convert subtask ↔ task +- Re-parent subtasks -### Task States -- **Pending**: Empty checkbox, normal text -- **Completed**: Checked checkbox, strikethrough, reduced opacity -- **Overdue**: Red due date, warning indicator -- **Due Today**: Blue highlight -- **High Priority**: Priority badge +#### 8. Sync Modal +- Login/Register forms +- Forgot/Reset password flow +- Server URL configuration +- Sync status display -### Interactions -- Tap task β†’ Edit screen -- Long press β†’ Selection mode (multi-delete, multi-complete, change category/priority) -- Swipe left β†’ Delete -- Swipe right β†’ Complete -- Pull down β†’ Refresh +### Task Features +- **Nested Subtasks**: Unlimited depth, re-parenting, drag reorder +- **Repeating Tasks**: Repeat profiles, series IDs, this/future/all delete scopes, undo-complete +- **Categories/Tags**: 6 default categories with colors, custom category editor +- **Priorities**: None, Low, Medium, High, Critical with color badges +- **Due Dates/Times**: With all-day option +- **Reminders**: Per-task reminder offsets +- **Assignees**: Assign tasks to friends +- **Overdue/Due Today**: Visual highlighting + +### Social Features +- **Friends System**: Send/accept/decline/remove friend requests +- **User Search**: Find users by username/email +- **Task Assignment**: Assign tasks to friends (client-side, backend schema ready) + +--- ## Tech Stack | Layer | Technology | |-------|------------| -| Framework | Expo (React Native) | -| Language | TypeScript | +| Framework | Expo (React Native) / Expo Router v3 | +| Language | TypeScript (strict mode) | | Navigation | Expo Router (file-based) | -| Database | WatermelonDB + SQLite | -| State | WatermelonDB (reactive queries, no Redux needed) | +| Database | WatermelonDB + SQLite (expo-sqlite) | +| State | WatermelonDB reactive queries (no Redux) | | Forms | React Hook Form + Zod validation | -| UI Components | React Native Paper + Custom SVG icons | -| Animations | React Native Reanimated | -| Date/Time | @react-native-community/datetimepicker + date-fns | -| Build | EAS Build / Gradle (local APK) | +| UI Components | React Native Paper + Custom components | +| Animations | React Native Reanimated v3 | +| Date/Time | @react-native-community/datetimepicker + date-fns + WheelTimePicker | +| Build | EAS Build / Gradle (local APK) / Electron Builder (desktop) | | CI/CD | Gitea Actions (`.gitea/workflows/build-apk.yml`) | +| Backend | Node.js + Express + TypeScript | +| Backend DB | PostgreSQL + Drizzle ORM | +| Auth | JWT (access + refresh tokens) | +| Validation | Zod (shared with frontend) | + +--- ## Project Structure ``` carry-your-live/ β”œβ”€β”€ app/ -β”‚ β”œβ”€β”€ _layout.tsx # Root layout + DatabaseProvider +β”‚ β”œβ”€β”€ _layout.tsx # Root layout + DatabaseProvider + AuthProvider β”‚ β”œβ”€β”€ (tabs)/ β”‚ β”‚ β”œβ”€β”€ _layout.tsx # Bottom tab navigator β”‚ β”‚ β”œβ”€β”€ index.tsx # Tasks screen β”‚ β”‚ β”œβ”€β”€ calendar.tsx # Calendar screen +β”‚ β”‚ β”œβ”€β”€ stats.tsx # Stats screen β”‚ β”‚ └── settings.tsx # Settings screen -β”‚ └── add-task.tsx # Add Task screen +β”‚ β”œβ”€β”€ add-task.tsx # Add Task screen +β”‚ β”œβ”€β”€ day-view.tsx # Calendar day detail +β”‚ β”œβ”€β”€ task-detail.tsx # Task view/edit +β”‚ └── subtask-detail.tsx # Subtask view/edit β”œβ”€β”€ src/ -β”‚ β”œβ”€β”€ components/ # Reusable UI components +β”‚ β”œβ”€β”€ components/ # Reusable UI components (30+) β”‚ β”‚ β”œβ”€β”€ Header.tsx β”‚ β”‚ β”œβ”€β”€ CategoryFilter.tsx β”‚ β”‚ β”œβ”€β”€ TaskList.tsx β”‚ β”‚ β”œβ”€β”€ TaskItem.tsx β”‚ β”‚ β”œβ”€β”€ FloatingActionButton.tsx -β”‚ β”‚ β”œβ”€β”€ TabBarIcon.tsx β”‚ β”‚ β”œβ”€β”€ CategorySelector.tsx β”‚ β”‚ β”œβ”€β”€ TaskNameInput.tsx β”‚ β”‚ β”œβ”€β”€ SubtasksSection.tsx @@ -115,24 +188,102 @@ carry-your-live/ β”‚ β”‚ β”œβ”€β”€ PrioritySelector.tsx β”‚ β”‚ β”œβ”€β”€ DescriptionInput.tsx β”‚ β”‚ β”œβ”€β”€ FormButtons.tsx -β”‚ β”‚ └── ListItem.tsx +β”‚ β”‚ β”œβ”€β”€ ListItem.tsx +β”‚ β”‚ β”œβ”€β”€ AnalogClock.tsx +β”‚ β”‚ β”œβ”€β”€ AssigneeSelector.tsx +β”‚ β”‚ β”œβ”€β”€ CategoryEditorModal.tsx +β”‚ β”‚ β”œβ”€β”€ ColorPickerInput.tsx +β”‚ β”‚ β”œβ”€β”€ ColorWheel.tsx +β”‚ β”‚ β”œβ”€β”€ DateTimeInput.tsx +β”‚ β”‚ β”œβ”€β”€ ForgotPasswordModal.tsx +β”‚ β”‚ β”œβ”€β”€ FriendsModal.tsx +β”‚ β”‚ β”œβ”€β”€ LegalModal.tsx +β”‚ β”‚ β”œβ”€β”€ OptionPickerModal.tsx +β”‚ β”‚ β”œβ”€β”€ QuickAddBar.tsx +β”‚ β”‚ β”œβ”€β”€ ReminderSelector.tsx +β”‚ β”‚ β”œβ”€β”€ RepeatSelector.tsx +β”‚ β”‚ β”œβ”€β”€ ServerUrlModal.tsx +β”‚ β”‚ β”œβ”€β”€ SubtaskItem.tsx +β”‚ β”‚ β”œβ”€β”€ SyncModal.tsx +β”‚ β”‚ β”œβ”€β”€ SyncStatus.tsx +β”‚ β”‚ β”œβ”€β”€ TabBarIcon.tsx +β”‚ β”‚ β”œβ”€β”€ TaskDeleteModal.tsx +β”‚ β”‚ β”œβ”€β”€ TaskOverflowMenu.tsx +β”‚ β”‚ β”œβ”€β”€ UpdateNotifier.tsx +β”‚ β”‚ └── WheelTimePicker.tsx +β”‚ β”œβ”€β”€ constants/ +β”‚ β”‚ └── index.ts # Categories, priorities, colors, reminder options β”‚ β”œβ”€β”€ database/ -β”‚ β”‚ β”œβ”€β”€ schema.ts # WatermelonDB schema +β”‚ β”‚ β”œβ”€β”€ schema.ts # WatermelonDB schema (v21) β”‚ β”‚ β”œβ”€β”€ index.ts # Database instance + collections -β”‚ β”‚ └── sync.ts # Custom API sync adapter -β”‚ β”œβ”€β”€ models/ -β”‚ β”‚ β”œβ”€β”€ Task.ts -β”‚ β”‚ β”œβ”€β”€ Category.ts -β”‚ β”‚ └── Subtask.ts +β”‚ β”‚ β”œβ”€β”€ sync.ts # Custom API sync adapter (25KB) +β”‚ β”‚ β”œβ”€β”€ migrations.ts # Schema migrations +β”‚ β”‚ β”œβ”€β”€ adapter.ts # Platform-specific adapters +β”‚ β”‚ └── tombstones.ts # Deleted record tracking β”‚ β”œβ”€β”€ hooks/ β”‚ β”‚ β”œβ”€β”€ useDatabase.tsx # Database context & providers -β”‚ β”‚ └── useTasks.tsx # Task queries with reactive state -β”‚ β”œβ”€β”€ constants/ -β”‚ β”‚ └── index.ts # Categories, priorities, colors -β”‚ └── types/ -β”‚ └── index.ts # TypeScript interfaces +β”‚ β”‚ β”œβ”€β”€ useTasks.tsx # Task queries with reactive state +β”‚ β”‚ β”œβ”€β”€ useCategories.tsx # Category queries +β”‚ β”‚ β”œβ”€β”€ useTasksByDate.tsx # Calendar date queries +β”‚ β”‚ β”œβ”€β”€ useFriends.tsx # Friends state & actions +β”‚ β”‚ β”œβ”€β”€ useAuth.tsx # Authentication state +β”‚ β”‚ └── useStats.tsx # Statistics computation +β”‚ β”œβ”€β”€ models/ +β”‚ β”‚ β”œβ”€β”€ Task.ts # Task model (assigneeId, repeat, reminders) +β”‚ β”‚ β”œβ”€β”€ Category.ts +β”‚ β”‚ β”œβ”€β”€ Subtask.ts +β”‚ β”‚ β”œβ”€β”€ RepeatProfile.ts +β”‚ β”‚ β”œβ”€β”€ Friendship.ts +β”‚ β”‚ └── Tombstone.ts +β”‚ β”œβ”€β”€ services/ +β”‚ β”‚ β”œβ”€β”€ api.ts # API client with auth +β”‚ β”‚ β”œβ”€β”€ auth.ts # Auth token management +β”‚ β”‚ β”œβ”€β”€ friends.ts # Friends API calls +β”‚ β”‚ β”œβ”€β”€ notifications.ts # Reminder scheduling (expo-notifications) +β”‚ β”‚ β”œβ”€β”€ repeat.ts # Repeat task generation +β”‚ β”‚ └── taskActions.ts # Task CRUD + sync operations +β”‚ β”œβ”€β”€ theme/ +β”‚ β”‚ β”œβ”€β”€ index.ts # Theme context, colors, spacing +β”‚ β”‚ └── theme.tsx # Accent color picker, settings sync +β”‚ β”œβ”€β”€ types/ +β”‚ β”‚ └── index.ts # TypeScript interfaces +β”‚ └── utils/ +β”‚ β”œβ”€β”€ date.ts # Date formatting utilities +β”‚ β”œβ”€β”€ format.ts # General formatting +β”‚ └── validation.ts # Zod schemas +β”œβ”€β”€ backend/ # Backend API (separate package) +β”‚ β”œβ”€β”€ src/ +β”‚ β”‚ β”œβ”€β”€ index.ts # Express app entry +β”‚ β”‚ β”œβ”€β”€ db/ +β”‚ β”‚ β”‚ β”œβ”€β”€ schema.ts # Drizzle schema (Postgres) +β”‚ β”‚ β”‚ └── index.ts # DB connection +β”‚ β”‚ β”œβ”€β”€ routes/ +β”‚ β”‚ β”‚ β”œβ”€β”€ auth.ts # Register, login, me, forgot/reset password +β”‚ β”‚ β”‚ β”œβ”€β”€ categories.ts # Category CRUD +β”‚ β”‚ β”‚ β”œβ”€β”€ tasks.ts # Task CRUD + batch +β”‚ β”‚ β”‚ β”œβ”€β”€ subtasks.ts # Subtask CRUD +β”‚ β”‚ β”‚ β”œβ”€β”€ sync.ts # Pull/push sync endpoints +β”‚ β”‚ β”‚ β”œβ”€β”€ users.ts # User profile & settings +β”‚ β”‚ β”‚ β”œβ”€β”€ friends.ts # Friend requests, search, management +β”‚ β”‚ β”‚ β”œβ”€β”€ repeatProfiles.ts# Repeat profile CRUD +β”‚ β”‚ β”‚ └── pushNotifications.ts +β”‚ β”‚ β”œβ”€β”€ middleware/ +β”‚ β”‚ β”‚ β”œβ”€β”€ auth.ts # JWT verification +β”‚ β”‚ β”‚ β”œβ”€β”€ errorHandler.ts +β”‚ β”‚ β”‚ └── validation.ts # Zod validation middleware +β”‚ β”‚ β”œβ”€β”€ services/ +β”‚ β”‚ └── utils/ +β”‚ β”œβ”€β”€ drizzle.config.ts +β”‚ └── Dockerfile +β”œβ”€β”€ electron/ # Desktop app entry +β”œβ”€β”€ android/ # Native Android project +β”œβ”€β”€ assets/ # Images, fonts +β”œβ”€β”€ patches/ # patch-package fixes +└── plugins/ # Expo config plugins ``` +--- + ## Data Models ### Task @@ -144,8 +295,14 @@ carry-your-live/ categoryId: string; priority: 'none' | 'low' | 'medium' | 'high' | 'critical'; completed: boolean; - dueDate: number; // timestamp - dueTime: string; // "HH:MM" + dueDate: number; // timestamp (ms) + dueTime: string; // "HH:MM" (24h stored, 12h displayed) + allDay: boolean; + assigneeId: string | null; + repeatProfileId: string | null; + seriesId: string | null; // For repeating tasks + isTemplate: boolean; // Series template + reminderOffset: string | null; // e.g., "5m", "1h", "1d" createdAt: Date; updatedAt: Date; subtasks: Subtask[]; @@ -159,6 +316,8 @@ carry-your-live/ name: string; color: '#HEX'; order: number; + createdAt: Date; + updatedAt: Date; } ``` @@ -167,14 +326,47 @@ carry-your-live/ { id: string; taskId: string; + parentSubtaskId: string | null; // For nesting title: string; completed: boolean; order: number; + assigneeId: string | null; createdAt: Date; updatedAt: Date; } ``` +### Repeat Profile +```typescript +{ + id: string; + name: string; + frequency: 'daily' | 'weekly' | 'monthly' | 'yearly' | 'custom'; + interval: number; + daysOfWeek: number[]; // 0-6 for weekly + dayOfMonth: number | null; // For monthly + monthOfYear: number | null; // For yearly + endDate: number | null; // Timestamp + occurrences: number | null; + createdAt: Date; + updatedAt: Date; +} +``` + +### Friendship +```typescript +{ + id: string; + userId: string; // Requester + friendId: string; // Recipient + status: 'pending' | 'accepted' | 'declined' | 'blocked'; + createdAt: Date; + updatedAt: Date; +} +``` + +--- + ## Default Categories | Name | Color | Order | |------|-------|-------| @@ -185,6 +377,8 @@ carry-your-live/ | Health | #8E24AA (Purple) | 4 | | Finance | #FDD835 (Yellow) | 5 | +--- + ## Priority Colors | Priority | Color | |----------|-------| @@ -194,6 +388,8 @@ carry-your-live/ | High | #E53935 | | Critical | #B71C1C | +--- + ## Getting Started ### Prerequisites @@ -201,15 +397,23 @@ carry-your-live/ - npm or yarn - Expo CLI (`npm install -g expo-cli`) - iOS Simulator (Mac) / Android Studio for mobile testing +- PostgreSQL 16+ (or Docker) ### Installation ```bash cd carry-your-live npm install + +cd ../backend +npm install ``` ### Development + +#### Frontend ```bash +cd carry-your-live + # Start Expo dev server npx expo start @@ -219,6 +423,37 @@ npx expo start --android npx expo start --web ``` +#### Backend +```bash +cd backend + +# Start PostgreSQL (Docker) +docker-compose up -d postgres + +# Configure environment +cp .env.example .env +# Edit .env with your settings + +# Run migrations +npm run db:push + +# Start dev server +npm run dev +``` + +Server runs at `http://localhost:3000` (health check: `GET /health`) + +#### Desktop (Electron) +```bash +cd carry-your-live + +# Development with live reload +npm run desktop:dev + +# Production build +npm run desktop:dist +``` + ### Building #### EAS Build (cloud) @@ -234,18 +469,16 @@ eas build --platform ios eas build --platform android eas build --platform web ``` -Profiles are defined in `eas.json` (`development`, `preview`, `production`; production auto-increments version code). +Profiles defined in `eas.json` (`development`, `preview`, `production`; production auto-increments version code). #### Gradle (local Android APK) -The native Android project lives in `carry-your-live/android/`. Requires JDK 17+ and the Android SDK (platform 35, build-tools 35.0.0, NDK 27.1). - ```bash cd carry-your-live/android # Debug APK (unsigned) ./gradlew assembleDebug -# Release APK (currently signed with the debug keystore) +# Release APK (signed with debug keystore) ./gradlew assembleRelease ``` Output: @@ -253,24 +486,21 @@ Output: android/app/build/outputs/apk/debug/app-debug.apk android/app/build/outputs/apk/release/app-release.apk ``` -Key notes: -- The debug keystore (`android/app/debug.keystore`) is generated by the CI pipeline and must exist for release builds β€” create it locally with the same command used in the pipeline (see below) if it's missing. -- Release builds use `signingConfig signingConfigs.debug` until a production keystore is configured. -- Versions are set in `android/app/build.gradle` (`versionCode`, `versionName`). + +--- ## CI/CD Pipeline (Gitea Actions) -`.gitea/workflows/build-apk.yml` builds a release APK on every push to `main` (also manually triggerable via workflow_dispatch): +`.gitea/workflows/build-apk.yml` builds a release APK on every push to `main` (also manually triggerable via `workflow_dispatch`): 1. **Checkout** and setup Node 22, JDK 17 (Temurin) 2. **Android SDK**: installs cmdline-tools, licenses, platform-tools, `platforms;android-35`, `build-tools;35.0.0`, `ndk;27.1.12297006` 3. **JS deps**: `npm ci` in `carry-your-live/` -4. **Debug keystore**: generates `carry-your-live/android/app/debug.keystore` with `keytool` (alias `androiddebugkey`, passwords `android`) +4. **Debug keystore**: generates `carry-your-live/android/app/debug.keystore` with `keytool` 5. **Build**: `./gradlew assembleRelease` in `carry-your-live/android/` -6. **Upload**: the APK is saved as the `carry-your-live-release` artifact (downloadable from the run's artifacts page) - -To run the build locally exactly as CI does: +6. **Upload**: APK saved as `carry-your-live-release` artifact +To run locally exactly as CI does: ```bash keytool -genkeypair -v \ -keystore carry-your-live/android/app/debug.keystore \ @@ -280,48 +510,119 @@ keytool -genkeypair -v \ cd carry-your-live/android && ./gradlew assembleRelease ``` -## Sync API Specification +--- -The app expects a custom API at `http://localhost:3000/api` (configurable in `src/database/sync.ts`): +## Backend API Specification -### Pull Changes -``` -GET /sync?since={timestamp} -``` -Response: -```json -{ - "categories": [{ "id", "name", "color", "order", "createdAt", "updatedAt" }], - "tasks": [{ "id", "title", "description", "categoryId", "priority", "completed", "dueDate", "dueTime", "createdAt", "updatedAt" }], - "subtasks": [{ "id", "taskId", "title", "completed", "order", "createdAt", "updatedAt" }], - "timestamp": 1234567890 -} -``` +Server runs at `http://localhost:3000/api` (configurable in `src/services/api.ts` and `src/database/sync.ts`): -### Push Changes -``` -POST /sync/push -``` -Body: -```json -{ - "changes": { - "categories": [...], - "tasks": [...], - "subtasks": [...] - }, - "lastPulledAt": 1234567890 -} -``` +### Authentication +- `POST /api/auth/register` - Register new user +- `POST /api/auth/login` - Login (returns access + refresh tokens) +- `POST /api/auth/refresh` - Refresh access token +- `POST /api/auth/forgot-password` - Request password reset +- `POST /api/auth/reset-password` - Reset password with token +- `GET /api/auth/me` - Get current user + +### Categories +- `GET /api/categories` - List categories +- `POST /api/categories` - Create category +- `PATCH /api/categories/:id` - Update category +- `DELETE /api/categories/:id` - Delete category + +### Tasks +- `GET /api/tasks` - List tasks (with filters: category, completed, due date range, assignee) +- `GET /api/tasks/:id` - Get task with subtasks +- `POST /api/tasks` - Create task +- `PATCH /api/tasks/:id` - Update task +- `DELETE /api/tasks/:id` - Delete task (scopes: this/future/all for repeating) +- `POST /api/tasks/batch` - Batch operations + +### Subtasks +- `GET /api/subtasks/task/:taskId` - List subtasks for task +- `POST /api/subtasks/task/:taskId` - Create subtask +- `PATCH /api/subtasks/:id` - Update subtask +- `DELETE /api/subtasks/:id` - Delete subtask + +### Repeat Profiles +- `GET /api/repeat-profiles` - List repeat profiles +- `POST /api/repeat-profiles` - Create repeat profile +- `PATCH /api/repeat-profiles/:id` - Update repeat profile +- `DELETE /api/repeat-profiles/:id` - Delete repeat profile + +### Users +- `GET /api/users/me` - Get user with settings +- `PATCH /api/users/me/settings` - Update settings (darkMode, defaultCategoryId, sortOrder, etc.) +- `GET /api/users/search` - Search users (for friends) + +### Friends +- `GET /api/friends` - List accepted friends +- `GET /api/friends/requests` - List pending requests (incoming/outgoing) +- `POST /api/friends/request` - Send friend request +- `PATCH /api/friends/request/:id/accept` - Accept request +- `PATCH /api/friends/request/:id/decline` - Decline request +- `DELETE /api/friends/:id` - Remove friend + +### Sync (Offline-first) +- `GET /api/sync?since=` - Pull changes since timestamp +- `POST /api/sync/push` - Push local changes + +--- + +## Sync Protocol + +The sync endpoint uses a cursor-based approach with tombstones: + +1. **Pull**: Client sends `since` timestamp, server returns all changes since then + ```json + { + "categories": [...], + "tasks": [...], + "subtasks": [...], + "repeatProfiles": [...], + "friendships": [...], + "tombstones": [...], + "timestamp": 1234567890 + } + ``` + +2. **Push**: Client sends batched changes with `lastPulledAt` + ```json + { + "changes": { + "categories": [...], + "tasks": [...], + "subtasks": [...], + "repeatProfiles": [...], + "friendships": [...] + }, + "tombstones": [...], + "lastPulledAt": 1234567890 + } + ``` + +3. **Conflict Resolution**: Last-write-wins based on `updatedAt` (customizable in `src/database/sync.ts`) + +--- ## Configuration -### Environment Variables -Create `.env` file: +### Frontend Environment Variables +Create `.env` file in `carry-your-live/`: ``` EXPO_PUBLIC_API_URL=http://your-api-url/api ``` +### Backend Environment Variables +Create `.env` file in `backend/`: +``` +DATABASE_URL=postgresql://user:pass@localhost:5432/carry_your_live +JWT_SECRET=your-32-char-secret +PORT=3000 +NODE_ENV=development +FRONTEND_URL=http://localhost:8081 +``` + ### App Config Modify `app.json` for: - App name, slug, version @@ -329,10 +630,12 @@ Modify `app.json` for: - Permissions (notifications, etc.) - Orientation, theme +--- + ## Visual Style Guide -- **Background**: White (#FFFFFF) -- **Primary Accent**: #E53935 (Pink/Red) +- **Background**: White (#FFFFFF) / Dark mode (planned) +- **Primary Accent**: #E53935 (Pink/Red) - customizable - **Typography**: Black (#212121) primary, #757575 secondary, #9E9E9E tertiary - **Borders**: Thin (#E0E0E0), selected #E53935 - **Radius**: 16-20px for cards/buttons/inputs @@ -340,11 +643,13 @@ Modify `app.json` for: - **Shadows**: Minimal (elevation 1-3) - **Animations**: 150-250ms, cubic easing +--- + ## Offline-First Architecture ``` β”Œβ”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β” β”Œβ”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β” β”Œβ”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β” -β”‚ Expo App │────▢│ WatermelonDB │────▢│ Your API β”‚ +β”‚ Expo App │────▢│ WatermelonDB │────▢│ Backend β”‚ β”‚ (iOS/Androidβ”‚ β”‚ (SQLite) β”‚ β”‚ (Postgres) β”‚ β”‚ Web) │◀───▢│ + Sync │◀───▢│ β”‚ β””β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”˜ β””β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”˜ β””β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”˜ @@ -354,6 +659,79 @@ Modify `app.json` for: 2. Reactive queries update UI instantly 3. Background sync pushes/pulls changes 4. Conflict resolution: last-write-wins (customizable) +5. Tombstones track deletions for sync + +--- + +## Current Implementation Status + +Based on code audit (August 2026): + +| Feature | Status | Notes | +|---------|--------|-------| +| Core CRUD (tasks, subtasks, categories) | βœ… Complete | | +| Nested subtasks | βœ… Complete | Unlimited depth | +| Repeating tasks | βœ… Complete | Profiles, series, this/future/all delete | +| Categories & priorities | βœ… Complete | | +| Calendar with date strip | βœ… Complete | Month nav, day detail | +| Stats screen | βœ… Complete | Client-side only | +| Settings screen | βœ… Complete | Most settings wired | +| Friends system | βœ… Complete | Backend + UI | +| Task assignees | βœ… Complete | Schema v7, UI, sync | +| QuickAddBar | βœ… Complete | Tasks + Calendar | +| Offline sync (WatermelonDB) | βœ… Complete | Schema v21, tombstones | +| Backend API | βœ… Complete | Express + Drizzle + Postgres | +| Auth (JWT) | βœ… Complete | Register, login, refresh, forgot/reset | +| Dark mode / theme toggle | ❌ Missing | Backend column exists, UI not implemented | +| Notifications toggle | 🟑 Partial | Stored but not respected | +| Global reminder preference | 🟑 Partial | Stored but not applied | +| Forgot/reset password UI | 🟑 Partial | Backend done, no client UI | +| Pull-to-refresh β†’ sync | 🟑 Partial | Reloads local only | +| Client settings sync | 🟑 Partial | AsyncStorage only, not synced to backend | +| Reminder enum mismatch | 🟑 Partial | Client uses '5m'/'1h', spec uses minutes | + +--- + +## Roadmap Highlights + +### v1.1.0 β€” Friends & Assignees (Current Unreleased) +- Ship existing Unreleased changes +- Fix notifications toggle, wire up `rescheduleAllReminders()` +- Apply global reminder preference +- Make pull-to-refresh trigger real sync +- Add forgot/reset password UI +- Unify reminder offset enums + +### v1.2.0 β€” Theming & Findability +- Light mode + follow-system-theme +- Sync all settings to `PATCH /users/me/settings` +- Task search (filter + global) +- Friend request badges/indicators + +### v1.3.0 β€” Stats & Insights +- Persisted stats snapshots +- Productivity trends, streaks +- Export stats (CSV/image) + +### v1.4.0 β€” Quick Capture & Calendar UX +- Natural language quick-add +- Drag-and-drop rescheduling in calendar +- Month grid view +- "Today at a glance" dashboard + +### v1.5.0 β€” Power Tools & Personalization +- Task templates, soft-archive, attachments +- Markdown support, deep links +- Biometric lock, haptics, reduced motion +- Android home-screen widget + +### v2.0.0 β€” Collaboration +- Real task assignment delivery +- Shared lists with permissions +- Server push notifications (FCM/APNs) +- Comments/activity feed + +--- ## Contributing @@ -362,6 +740,9 @@ Modify `app.json` for: 3. Write components with React Hook Form + Zod 4. Use WatermelonDB decorators for models 5. Test offline scenarios +6. Run `npm run lint` and `npm run typecheck` before committing + +--- ## License