Compare commits
20
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
95c69d35e2 | ||
|
|
bc4903e3b8 | ||
|
|
beb6cc5715 | ||
|
|
4c6adc7117 | ||
|
|
c787b87cc5 | ||
|
|
0685735c74 | ||
|
|
064650a585 | ||
|
|
bdfe53fa83 | ||
|
|
f6abf628e3 | ||
|
|
40077da57f | ||
|
|
aa57d07dc0 | ||
|
|
89c85ed7c0 | ||
|
|
ee6af8fb26 | ||
|
|
c6e441d449 | ||
|
|
5043d9cdff | ||
|
|
7e36244478 | ||
|
|
157fc8d95b | ||
|
|
4d2f92b144 | ||
|
|
8e805316fb | ||
|
|
77051e5206 |
@@ -1,75 +0,0 @@
|
|||||||
name: Build APK
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches: [main]
|
|
||||||
workflow_dispatch:
|
|
||||||
|
|
||||||
env:
|
|
||||||
ANDROID_HOME: ${{ runner.tool_cache }}/android-sdk
|
|
||||||
ANDROID_SDK_ROOT: ${{ runner.tool_cache }}/android-sdk
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: Set up Node
|
|
||||||
uses: actions/setup-node@v4
|
|
||||||
with:
|
|
||||||
node-version: 22
|
|
||||||
|
|
||||||
- name: Set up JDK
|
|
||||||
uses: actions/setup-java@v4
|
|
||||||
with:
|
|
||||||
distribution: temurin
|
|
||||||
java-version: 17
|
|
||||||
|
|
||||||
- name: Install Android SDK
|
|
||||||
run: |
|
|
||||||
if [ -x "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" ]; then
|
|
||||||
echo "Android SDK already present in cache"
|
|
||||||
else
|
|
||||||
rm -rf "$ANDROID_HOME/cmdline-tools"
|
|
||||||
mkdir -p "$ANDROID_HOME/cmdline-tools"
|
|
||||||
wget -q https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip -O /tmp/cmdtools.zip
|
|
||||||
unzip -q /tmp/cmdtools.zip -d "$ANDROID_HOME/cmdline-tools"
|
|
||||||
mv "$ANDROID_HOME/cmdline-tools/cmdline-tools" "$ANDROID_HOME/cmdline-tools/latest"
|
|
||||||
fi
|
|
||||||
printf 'y\n' | "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" --licenses > /dev/null
|
|
||||||
"$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" \
|
|
||||||
"platform-tools" \
|
|
||||||
"platforms;android-35" \
|
|
||||||
"platforms;android-36" \
|
|
||||||
"build-tools;35.0.0" \
|
|
||||||
"build-tools;36.0.0" \
|
|
||||||
"ndk;27.1.12297006"
|
|
||||||
mkdir -p carry-your-live/android/app
|
|
||||||
echo "sdk.dir=$ANDROID_HOME" > carry-your-live/android/app/local.properties
|
|
||||||
|
|
||||||
- name: Install JS dependencies
|
|
||||||
working-directory: carry-your-live
|
|
||||||
run: npm ci
|
|
||||||
|
|
||||||
- name: Generate debug keystore (signs the release APK)
|
|
||||||
run: |
|
|
||||||
mkdir -p carry-your-live/android/app
|
|
||||||
rm -f carry-your-live/android/app/debug.keystore
|
|
||||||
keytool -genkeypair -v \
|
|
||||||
-keystore carry-your-live/android/app/debug.keystore \
|
|
||||||
-alias androiddebugkey -storepass android -keypass android \
|
|
||||||
-keyalg RSA -keysize 2048 -validity 10000 \
|
|
||||||
-dname "CN=Android Debug,O=Android,C=US"
|
|
||||||
|
|
||||||
- name: Build release APK
|
|
||||||
run: |
|
|
||||||
cd carry-your-live/android
|
|
||||||
./gradlew assembleRelease
|
|
||||||
|
|
||||||
- name: Upload APK
|
|
||||||
uses: actions/upload-artifact@v4
|
|
||||||
with:
|
|
||||||
name: carry-your-live-release
|
|
||||||
path: carry-your-live/android/app/build/outputs/release/app-release.apk
|
|
||||||
@@ -1,36 +0,0 @@
|
|||||||
name: Build Desktop (deb)
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches: [main]
|
|
||||||
workflow_dispatch:
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: Set up Node
|
|
||||||
uses: actions/setup-node@v4
|
|
||||||
with:
|
|
||||||
node-version: 22
|
|
||||||
|
|
||||||
- name: Install JS dependencies
|
|
||||||
working-directory: carry-your-live
|
|
||||||
run: npm ci
|
|
||||||
|
|
||||||
- name: Export web bundle
|
|
||||||
working-directory: carry-your-live
|
|
||||||
run: npx expo export --platform web
|
|
||||||
|
|
||||||
- name: Build deb package
|
|
||||||
working-directory: carry-your-live
|
|
||||||
run: npx electron-builder --linux deb --config electron-builder.config.js
|
|
||||||
|
|
||||||
- name: Upload deb
|
|
||||||
uses: actions/upload-artifact@v4
|
|
||||||
with:
|
|
||||||
name: carry-your-live-desktop-deb
|
|
||||||
path: carry-your-live/desktop-build/*.deb
|
|
||||||
@@ -1,15 +1,92 @@
|
|||||||
name: release
|
name: Build and Release APK
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches: [main]
|
||||||
- main
|
workflow_dispatch:
|
||||||
|
|
||||||
|
env:
|
||||||
|
ANDROID_HOME: ${{ runner.tool_cache }}/android-sdk
|
||||||
|
ANDROID_SDK_ROOT: ${{ runner.tool_cache }}/android-sdk
|
||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
contents: write
|
contents: write
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
|
build:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
outputs:
|
||||||
|
apk-path: ${{ steps.upload-apk.outputs.path }}
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Set up Node
|
||||||
|
uses: actions/setup-node@v4
|
||||||
|
with:
|
||||||
|
node-version: 22
|
||||||
|
|
||||||
|
- name: Set up JDK
|
||||||
|
uses: actions/setup-java@v4
|
||||||
|
with:
|
||||||
|
distribution: temurin
|
||||||
|
java-version: 17
|
||||||
|
|
||||||
|
- name: Install Android SDK
|
||||||
|
run: |
|
||||||
|
if [ -x "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" ]; then
|
||||||
|
echo "Android SDK already present in cache"
|
||||||
|
else
|
||||||
|
rm -rf "$ANDROID_HOME/cmdline-tools"
|
||||||
|
mkdir -p "$ANDROID_HOME/cmdline-tools"
|
||||||
|
wget -q https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip -O /tmp/cmdtools.zip
|
||||||
|
unzip -q /tmp/cmdtools.zip -d "$ANDROID_HOME/cmdline-tools"
|
||||||
|
mv "$ANDROID_HOME/cmdline-tools/cmdline-tools" "$ANDROID_HOME/cmdline-tools/latest"
|
||||||
|
fi
|
||||||
|
# Accept all licenses by writing known license hashes
|
||||||
|
mkdir -p "$ANDROID_HOME/licenses"
|
||||||
|
echo "8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
|
||||||
|
echo "d56f5187479451eabf01fb78af6dfcb131a6481e" >> "$ANDROID_HOME/licenses/android-sdk-license"
|
||||||
|
echo "24333f8a63b6825ea9c5514f83c2829b004d1fee" >> "$ANDROID_HOME/licenses/android-sdk-license"
|
||||||
|
"$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" \
|
||||||
|
"platform-tools" \
|
||||||
|
"platforms;android-36" \
|
||||||
|
"build-tools;36.0.0" \
|
||||||
|
"ndk;27.1.12297006"
|
||||||
|
mkdir -p carry-your-live/android/app
|
||||||
|
echo "sdk.dir=$ANDROID_HOME" > carry-your-live/android/app/local.properties
|
||||||
|
|
||||||
|
- name: Install JS dependencies
|
||||||
|
working-directory: carry-your-live
|
||||||
|
run: |
|
||||||
|
for i in {1..3}; do
|
||||||
|
npm ci && break || sleep 10
|
||||||
|
done
|
||||||
|
|
||||||
|
- name: Generate debug keystore (signs the release APK)
|
||||||
|
run: |
|
||||||
|
mkdir -p carry-your-live/android/app
|
||||||
|
rm -f carry-your-live/android/app/debug.keystore
|
||||||
|
keytool -genkeypair -v \
|
||||||
|
-keystore carry-your-live/android/app/debug.keystore \
|
||||||
|
-alias androiddebugkey -storepass android -keypass android \
|
||||||
|
-keyalg RSA -keysize 2048 -validity 10000 \
|
||||||
|
-dname "CN=Android Debug,O=Android,C=US"
|
||||||
|
|
||||||
|
- name: Build release APK
|
||||||
|
run: |
|
||||||
|
cd carry-your-live/android
|
||||||
|
./gradlew assembleRelease
|
||||||
|
|
||||||
|
- name: Upload APK
|
||||||
|
id: upload-apk
|
||||||
|
uses: actions/upload-artifact@v4
|
||||||
|
with:
|
||||||
|
name: carry-your-live-release
|
||||||
|
path: carry-your-live/android/app/build/outputs/release/app-release.apk
|
||||||
|
|
||||||
release:
|
release:
|
||||||
|
needs: build
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
@@ -17,6 +94,12 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
|
|
||||||
|
- name: Download APK artifact
|
||||||
|
uses: actions/download-artifact@v4
|
||||||
|
with:
|
||||||
|
name: carry-your-live-release
|
||||||
|
path: .
|
||||||
|
|
||||||
- name: Compute next version
|
- name: Compute next version
|
||||||
id: version
|
id: version
|
||||||
run: |
|
run: |
|
||||||
@@ -53,4 +136,5 @@ jobs:
|
|||||||
tag_name: ${{ steps.version.outputs.next }}
|
tag_name: ${{ steps.version.outputs.next }}
|
||||||
name: ${{ steps.version.outputs.next }}
|
name: ${{ steps.version.outputs.next }}
|
||||||
body: ${{ steps.changelog.outputs.body }}
|
body: ${{ steps.changelog.outputs.body }}
|
||||||
|
files: ./app-release.apk
|
||||||
generate_release_notes: false
|
generate_release_notes: false
|
||||||
@@ -1,15 +1,40 @@
|
|||||||
# Carry Your Live - Mobile To-Do & Calendar App
|
# 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
|
### Added
|
||||||
- **Subtask drag-and-drop**: Added `parentSubtaskId` type support for proper subtask reparenting
|
- **Friends feature**: Friend requests, accept/decline/remove, user search, full backend routes
|
||||||
- **Task drag sorting**: Added task drag-and-drop reordering functionality with visual drop indicators
|
- **Assignee field on tasks**: Schema v7, model, types, forms, sync, task actions
|
||||||
- **iCal import**: Fixed import functionality - replaced invalid `splice()` with proper `create()` calls and fixed date type handling
|
- **AssigneeSelector component** and assignee display in TaskItem
|
||||||
- **Settings context**: Added `accentOpacity` and `setAccentOpacity` to the Settings context
|
- **QuickAddBar** on tasks overview (copied from calendar)
|
||||||
- **Tag inheritance**: Subtasks no longer automatically inherit parent task tags when converting tasks to subtasks
|
- **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
|
## 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
|
- **Offline-First Architecture**: Full CRUD operations work offline with WatermelonDB + SQLite
|
||||||
- **Auto-Sync**: Background synchronization with custom Postgres API when online
|
- **Auto-Sync**: Background synchronization with custom Postgres API when online
|
||||||
- **Cross-Platform**: iOS, Android, and Web from single codebase
|
- **Cross-Platform**: iOS, Android, and Web from single codebase
|
||||||
|
- **Desktop Support**: Electron wrapper for desktop app distribution
|
||||||
|
|
||||||
### Screens
|
### Screens
|
||||||
|
|
||||||
#### 1. To-Do List Screen
|
#### 1. Tasks Screen (To-Do List)
|
||||||
- **Header**: App logo + "TODO" title with rounded corners
|
- **Header**: App logo + "TODO" title with rounded corners
|
||||||
- **Category Filter**: Horizontal scrollable chips (Work, Personal, School, Shopping, Health, Finance, All)
|
- **Category Filter**: Horizontal scrollable chips (Work, Personal, School, Shopping, Health, Finance, All)
|
||||||
- Single selection with visual feedback (thicker border, shadow, scale animation)
|
- Single selection with visual feedback (thicker border, shadow, scale animation)
|
||||||
- Instant task filtering
|
- Instant task filtering
|
||||||
- **Task List**: Vertical scrolling with:
|
- **QuickAddBar**: Quick task creation from list view
|
||||||
- Checkbox (empty/checked states with animation)
|
- **Task List**: Virtualized FlatList with sections (Pending/Completed)
|
||||||
- Task title (truncated with ellipsis)
|
- Task title (truncated with ellipsis)
|
||||||
- Three-dot overflow menu (Edit, Delete, Duplicate, Mark Complete, Change Category, Change Priority)
|
- Three-dot overflow menu (Edit, Delete, Duplicate, Mark Complete, Change Category, Change Priority)
|
||||||
- Priority badges with colors
|
- Priority badges with colors
|
||||||
- Due date/time with overdue/due-today highlighting
|
- Due date/time with overdue/due-today highlighting
|
||||||
- Completed section (collapsible)
|
- Category color indicator strip
|
||||||
- **Floating Action Button**: Bottom-right, opens Add Task screen with press animation
|
- 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)
|
- **Category Selector**: Horizontal row of colored circles (required)
|
||||||
- **Task Name**: Single-line input, 100 char max (required)
|
- **Task Name**: Single-line input, 100 char max (required)
|
||||||
- **Subtasks**: Unlimited, add/remove individually
|
- **Subtasks**: Unlimited, add/remove individually, nested subtask support
|
||||||
- **Date & Time**: Date picker, time picker, calendar button
|
- **Date & Time**: Date picker, time picker (WheelTimePicker), calendar button
|
||||||
- **Priority**: Dropdown (None, Low, Medium, High, Critical) with color indicators
|
- **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
|
- **Description**: Multi-line text area, 1000 char max
|
||||||
- **Bottom Actions**: Submit (primary) / Cancel (secondary) fixed buttons
|
- **Bottom Actions**: Submit (primary) / Cancel (secondary) fixed buttons
|
||||||
|
|
||||||
#### 3. Calendar Screen
|
#### 6. Task Detail Screen
|
||||||
- **Date Strip**: Horizontal scrollable days of current month
|
- Full task view with all fields
|
||||||
- **Month Label**: Centered (e.g., "JAN 2026")
|
- Subtask management (add, complete, reorder, convert to task)
|
||||||
- **Task List**: Tasks for selected day with category color, title, time, completion status
|
- Edit functionality
|
||||||
- **Empty State**: "No tasks scheduled."
|
- Repeat profile configuration
|
||||||
|
|
||||||
#### 4. Settings Screen
|
#### 7. Subtask Detail Screen
|
||||||
- Dark Mode toggle
|
- Nested subtask management
|
||||||
- Push Notifications toggle
|
- Convert subtask ↔ task
|
||||||
- Reminder Preferences
|
- Re-parent subtasks
|
||||||
- Default Category selector
|
|
||||||
- Sort Tasks By (Date, Priority, Alphabetically, Creation Date)
|
|
||||||
- Backup & Sync
|
|
||||||
- Version, Privacy Policy, Terms of Service
|
|
||||||
|
|
||||||
### Task States
|
#### 8. Sync Modal
|
||||||
- **Pending**: Empty checkbox, normal text
|
- Login/Register forms
|
||||||
- **Completed**: Checked checkbox, strikethrough, reduced opacity
|
- Forgot/Reset password flow
|
||||||
- **Overdue**: Red due date, warning indicator
|
- Server URL configuration
|
||||||
- **Due Today**: Blue highlight
|
- Sync status display
|
||||||
- **High Priority**: Priority badge
|
|
||||||
|
|
||||||
### Interactions
|
### Task Features
|
||||||
- Tap task → Edit screen
|
- **Nested Subtasks**: Unlimited depth, re-parenting, drag reorder
|
||||||
- Long press → Selection mode (multi-delete, multi-complete, change category/priority)
|
- **Repeating Tasks**: Repeat profiles, series IDs, this/future/all delete scopes, undo-complete
|
||||||
- Swipe left → Delete
|
- **Categories/Tags**: 6 default categories with colors, custom category editor
|
||||||
- Swipe right → Complete
|
- **Priorities**: None, Low, Medium, High, Critical with color badges
|
||||||
- Pull down → Refresh
|
- **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
|
## Tech Stack
|
||||||
|
|
||||||
| Layer | Technology |
|
| Layer | Technology |
|
||||||
|-------|------------|
|
|-------|------------|
|
||||||
| Framework | Expo (React Native) |
|
| Framework | Expo (React Native) / Expo Router v3 |
|
||||||
| Language | TypeScript |
|
| Language | TypeScript (strict mode) |
|
||||||
| Navigation | Expo Router (file-based) |
|
| Navigation | Expo Router (file-based) |
|
||||||
| Database | WatermelonDB + SQLite |
|
| Database | WatermelonDB + SQLite (expo-sqlite) |
|
||||||
| State | WatermelonDB (reactive queries, no Redux needed) |
|
| State | WatermelonDB reactive queries (no Redux) |
|
||||||
| Forms | React Hook Form + Zod validation |
|
| Forms | React Hook Form + Zod validation |
|
||||||
| UI Components | React Native Paper + Custom SVG icons |
|
| UI Components | React Native Paper + Custom components |
|
||||||
| Animations | React Native Reanimated |
|
| Animations | React Native Reanimated v3 |
|
||||||
| Date/Time | @react-native-community/datetimepicker + date-fns |
|
| Date/Time | @react-native-community/datetimepicker + date-fns + WheelTimePicker |
|
||||||
| Build | EAS Build / Gradle (local APK) |
|
| Build | EAS Build / Gradle (local APK) / Electron Builder (desktop) |
|
||||||
| CI/CD | Gitea Actions (`.gitea/workflows/build-apk.yml`) |
|
| 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
|
## Project Structure
|
||||||
|
|
||||||
```
|
```
|
||||||
carry-your-live/
|
carry-your-live/
|
||||||
├── app/
|
├── app/
|
||||||
│ ├── _layout.tsx # Root layout + DatabaseProvider
|
│ ├── _layout.tsx # Root layout + DatabaseProvider + AuthProvider
|
||||||
│ ├── (tabs)/
|
│ ├── (tabs)/
|
||||||
│ │ ├── _layout.tsx # Bottom tab navigator
|
│ │ ├── _layout.tsx # Bottom tab navigator
|
||||||
│ │ ├── index.tsx # Tasks screen
|
│ │ ├── index.tsx # Tasks screen
|
||||||
│ │ ├── calendar.tsx # Calendar screen
|
│ │ ├── calendar.tsx # Calendar screen
|
||||||
|
│ │ ├── stats.tsx # Stats screen
|
||||||
│ │ └── settings.tsx # Settings 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/
|
├── src/
|
||||||
│ ├── components/ # Reusable UI components
|
│ ├── components/ # Reusable UI components (30+)
|
||||||
│ │ ├── Header.tsx
|
│ │ ├── Header.tsx
|
||||||
│ │ ├── CategoryFilter.tsx
|
│ │ ├── CategoryFilter.tsx
|
||||||
│ │ ├── TaskList.tsx
|
│ │ ├── TaskList.tsx
|
||||||
│ │ ├── TaskItem.tsx
|
│ │ ├── TaskItem.tsx
|
||||||
│ │ ├── FloatingActionButton.tsx
|
│ │ ├── FloatingActionButton.tsx
|
||||||
│ │ ├── TabBarIcon.tsx
|
|
||||||
│ │ ├── CategorySelector.tsx
|
│ │ ├── CategorySelector.tsx
|
||||||
│ │ ├── TaskNameInput.tsx
|
│ │ ├── TaskNameInput.tsx
|
||||||
│ │ ├── SubtasksSection.tsx
|
│ │ ├── SubtasksSection.tsx
|
||||||
@@ -115,24 +188,102 @@ carry-your-live/
|
|||||||
│ │ ├── PrioritySelector.tsx
|
│ │ ├── PrioritySelector.tsx
|
||||||
│ │ ├── DescriptionInput.tsx
|
│ │ ├── DescriptionInput.tsx
|
||||||
│ │ ├── FormButtons.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/
|
│ ├── database/
|
||||||
│ │ ├── schema.ts # WatermelonDB schema
|
│ │ ├── schema.ts # WatermelonDB schema (v21)
|
||||||
│ │ ├── index.ts # Database instance + collections
|
│ │ ├── index.ts # Database instance + collections
|
||||||
│ │ └── sync.ts # Custom API sync adapter
|
│ │ ├── sync.ts # Custom API sync adapter (25KB)
|
||||||
│ ├── models/
|
│ │ ├── migrations.ts # Schema migrations
|
||||||
│ │ ├── Task.ts
|
│ │ ├── adapter.ts # Platform-specific adapters
|
||||||
│ │ ├── Category.ts
|
│ │ └── tombstones.ts # Deleted record tracking
|
||||||
│ │ └── Subtask.ts
|
|
||||||
│ ├── hooks/
|
│ ├── hooks/
|
||||||
│ │ ├── useDatabase.tsx # Database context & providers
|
│ │ ├── useDatabase.tsx # Database context & providers
|
||||||
│ │ └── useTasks.tsx # Task queries with reactive state
|
│ │ ├── useTasks.tsx # Task queries with reactive state
|
||||||
│ ├── constants/
|
│ │ ├── useCategories.tsx # Category queries
|
||||||
│ │ └── index.ts # Categories, priorities, colors
|
│ │ ├── useTasksByDate.tsx # Calendar date queries
|
||||||
│ └── types/
|
│ │ ├── useFriends.tsx # Friends state & actions
|
||||||
│ └── index.ts # TypeScript interfaces
|
│ │ ├── 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
|
## Data Models
|
||||||
|
|
||||||
### Task
|
### Task
|
||||||
@@ -144,8 +295,14 @@ carry-your-live/
|
|||||||
categoryId: string;
|
categoryId: string;
|
||||||
priority: 'none' | 'low' | 'medium' | 'high' | 'critical';
|
priority: 'none' | 'low' | 'medium' | 'high' | 'critical';
|
||||||
completed: boolean;
|
completed: boolean;
|
||||||
dueDate: number; // timestamp
|
dueDate: number; // timestamp (ms)
|
||||||
dueTime: string; // "HH:MM"
|
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;
|
createdAt: Date;
|
||||||
updatedAt: Date;
|
updatedAt: Date;
|
||||||
subtasks: Subtask[];
|
subtasks: Subtask[];
|
||||||
@@ -159,6 +316,8 @@ carry-your-live/
|
|||||||
name: string;
|
name: string;
|
||||||
color: '#HEX';
|
color: '#HEX';
|
||||||
order: number;
|
order: number;
|
||||||
|
createdAt: Date;
|
||||||
|
updatedAt: Date;
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
@@ -167,14 +326,47 @@ carry-your-live/
|
|||||||
{
|
{
|
||||||
id: string;
|
id: string;
|
||||||
taskId: string;
|
taskId: string;
|
||||||
|
parentSubtaskId: string | null; // For nesting
|
||||||
title: string;
|
title: string;
|
||||||
completed: boolean;
|
completed: boolean;
|
||||||
order: number;
|
order: number;
|
||||||
|
assigneeId: string | null;
|
||||||
createdAt: Date;
|
createdAt: Date;
|
||||||
updatedAt: 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
|
## Default Categories
|
||||||
| Name | Color | Order |
|
| Name | Color | Order |
|
||||||
|------|-------|-------|
|
|------|-------|-------|
|
||||||
@@ -185,6 +377,8 @@ carry-your-live/
|
|||||||
| Health | #8E24AA (Purple) | 4 |
|
| Health | #8E24AA (Purple) | 4 |
|
||||||
| Finance | #FDD835 (Yellow) | 5 |
|
| Finance | #FDD835 (Yellow) | 5 |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
## Priority Colors
|
## Priority Colors
|
||||||
| Priority | Color |
|
| Priority | Color |
|
||||||
|----------|-------|
|
|----------|-------|
|
||||||
@@ -194,6 +388,8 @@ carry-your-live/
|
|||||||
| High | #E53935 |
|
| High | #E53935 |
|
||||||
| Critical | #B71C1C |
|
| Critical | #B71C1C |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
## Getting Started
|
## Getting Started
|
||||||
|
|
||||||
### Prerequisites
|
### Prerequisites
|
||||||
@@ -201,15 +397,23 @@ carry-your-live/
|
|||||||
- npm or yarn
|
- npm or yarn
|
||||||
- Expo CLI (`npm install -g expo-cli`)
|
- Expo CLI (`npm install -g expo-cli`)
|
||||||
- iOS Simulator (Mac) / Android Studio for mobile testing
|
- iOS Simulator (Mac) / Android Studio for mobile testing
|
||||||
|
- PostgreSQL 16+ (or Docker)
|
||||||
|
|
||||||
### Installation
|
### Installation
|
||||||
```bash
|
```bash
|
||||||
cd carry-your-live
|
cd carry-your-live
|
||||||
npm install
|
npm install
|
||||||
|
|
||||||
|
cd ../backend
|
||||||
|
npm install
|
||||||
```
|
```
|
||||||
|
|
||||||
### Development
|
### Development
|
||||||
|
|
||||||
|
#### Frontend
|
||||||
```bash
|
```bash
|
||||||
|
cd carry-your-live
|
||||||
|
|
||||||
# Start Expo dev server
|
# Start Expo dev server
|
||||||
npx expo start
|
npx expo start
|
||||||
|
|
||||||
@@ -219,6 +423,37 @@ npx expo start --android
|
|||||||
npx expo start --web
|
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
|
### Building
|
||||||
|
|
||||||
#### EAS Build (cloud)
|
#### EAS Build (cloud)
|
||||||
@@ -234,18 +469,16 @@ eas build --platform ios
|
|||||||
eas build --platform android
|
eas build --platform android
|
||||||
eas build --platform web
|
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)
|
#### 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
|
```bash
|
||||||
cd carry-your-live/android
|
cd carry-your-live/android
|
||||||
|
|
||||||
# Debug APK (unsigned)
|
# Debug APK (unsigned)
|
||||||
./gradlew assembleDebug
|
./gradlew assembleDebug
|
||||||
|
|
||||||
# Release APK (currently signed with the debug keystore)
|
# Release APK (signed with debug keystore)
|
||||||
./gradlew assembleRelease
|
./gradlew assembleRelease
|
||||||
```
|
```
|
||||||
Output:
|
Output:
|
||||||
@@ -253,24 +486,21 @@ Output:
|
|||||||
android/app/build/outputs/apk/debug/app-debug.apk
|
android/app/build/outputs/apk/debug/app-debug.apk
|
||||||
android/app/build/outputs/apk/release/app-release.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)
|
## 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)
|
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`
|
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/`
|
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/`
|
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)
|
6. **Upload**: APK saved as `carry-your-live-release` artifact
|
||||||
|
|
||||||
To run the build locally exactly as CI does:
|
|
||||||
|
|
||||||
|
To run locally exactly as CI does:
|
||||||
```bash
|
```bash
|
||||||
keytool -genkeypair -v \
|
keytool -genkeypair -v \
|
||||||
-keystore carry-your-live/android/app/debug.keystore \
|
-keystore carry-your-live/android/app/debug.keystore \
|
||||||
@@ -280,48 +510,119 @@ keytool -genkeypair -v \
|
|||||||
cd carry-your-live/android && ./gradlew assembleRelease
|
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
|
Server runs at `http://localhost:3000/api` (configurable in `src/services/api.ts` and `src/database/sync.ts`):
|
||||||
```
|
|
||||||
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
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
### Push Changes
|
### Authentication
|
||||||
```
|
- `POST /api/auth/register` - Register new user
|
||||||
POST /sync/push
|
- `POST /api/auth/login` - Login (returns access + refresh tokens)
|
||||||
```
|
- `POST /api/auth/refresh` - Refresh access token
|
||||||
Body:
|
- `POST /api/auth/forgot-password` - Request password reset
|
||||||
```json
|
- `POST /api/auth/reset-password` - Reset password with token
|
||||||
{
|
- `GET /api/auth/me` - Get current user
|
||||||
"changes": {
|
|
||||||
"categories": [...],
|
### Categories
|
||||||
"tasks": [...],
|
- `GET /api/categories` - List categories
|
||||||
"subtasks": [...]
|
- `POST /api/categories` - Create category
|
||||||
},
|
- `PATCH /api/categories/:id` - Update category
|
||||||
"lastPulledAt": 1234567890
|
- `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=<timestamp>` - 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
|
## Configuration
|
||||||
|
|
||||||
### Environment Variables
|
### Frontend Environment Variables
|
||||||
Create `.env` file:
|
Create `.env` file in `carry-your-live/`:
|
||||||
```
|
```
|
||||||
EXPO_PUBLIC_API_URL=http://your-api-url/api
|
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
|
### App Config
|
||||||
Modify `app.json` for:
|
Modify `app.json` for:
|
||||||
- App name, slug, version
|
- App name, slug, version
|
||||||
@@ -329,10 +630,12 @@ Modify `app.json` for:
|
|||||||
- Permissions (notifications, etc.)
|
- Permissions (notifications, etc.)
|
||||||
- Orientation, theme
|
- Orientation, theme
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
## Visual Style Guide
|
## Visual Style Guide
|
||||||
|
|
||||||
- **Background**: White (#FFFFFF)
|
- **Background**: White (#FFFFFF) / Dark mode (planned)
|
||||||
- **Primary Accent**: #E53935 (Pink/Red)
|
- **Primary Accent**: #E53935 (Pink/Red) - customizable
|
||||||
- **Typography**: Black (#212121) primary, #757575 secondary, #9E9E9E tertiary
|
- **Typography**: Black (#212121) primary, #757575 secondary, #9E9E9E tertiary
|
||||||
- **Borders**: Thin (#E0E0E0), selected #E53935
|
- **Borders**: Thin (#E0E0E0), selected #E53935
|
||||||
- **Radius**: 16-20px for cards/buttons/inputs
|
- **Radius**: 16-20px for cards/buttons/inputs
|
||||||
@@ -340,11 +643,13 @@ Modify `app.json` for:
|
|||||||
- **Shadows**: Minimal (elevation 1-3)
|
- **Shadows**: Minimal (elevation 1-3)
|
||||||
- **Animations**: 150-250ms, cubic easing
|
- **Animations**: 150-250ms, cubic easing
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
## Offline-First Architecture
|
## Offline-First Architecture
|
||||||
|
|
||||||
```
|
```
|
||||||
┌─────────────┐ ┌──────────────┐ ┌─────────────┐
|
┌─────────────┐ ┌──────────────┐ ┌─────────────┐
|
||||||
│ Expo App │────▶│ WatermelonDB │────▶│ Your API │
|
│ Expo App │────▶│ WatermelonDB │────▶│ Backend │
|
||||||
│ (iOS/Android│ │ (SQLite) │ │ (Postgres) │
|
│ (iOS/Android│ │ (SQLite) │ │ (Postgres) │
|
||||||
│ Web) │◀───▶│ + Sync │◀───▶│ │
|
│ Web) │◀───▶│ + Sync │◀───▶│ │
|
||||||
└─────────────┘ └──────────────┘ └─────────────┘
|
└─────────────┘ └──────────────┘ └─────────────┘
|
||||||
@@ -354,6 +659,79 @@ Modify `app.json` for:
|
|||||||
2. Reactive queries update UI instantly
|
2. Reactive queries update UI instantly
|
||||||
3. Background sync pushes/pulls changes
|
3. Background sync pushes/pulls changes
|
||||||
4. Conflict resolution: last-write-wins (customizable)
|
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
|
## Contributing
|
||||||
|
|
||||||
@@ -362,6 +740,9 @@ Modify `app.json` for:
|
|||||||
3. Write components with React Hook Form + Zod
|
3. Write components with React Hook Form + Zod
|
||||||
4. Use WatermelonDB decorators for models
|
4. Use WatermelonDB decorators for models
|
||||||
5. Test offline scenarios
|
5. Test offline scenarios
|
||||||
|
6. Run `npm run lint` and `npm run typecheck` before committing
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
## License
|
## License
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,7 @@
|
|||||||
pluginManagement {
|
pluginManagement {
|
||||||
|
repositories {
|
||||||
|
gradlePluginPortal()
|
||||||
|
}
|
||||||
def reactNativeGradlePlugin = new File(
|
def reactNativeGradlePlugin = new File(
|
||||||
providers.exec {
|
providers.exec {
|
||||||
workingDir(rootDir)
|
workingDir(rootDir)
|
||||||
|
|||||||
@@ -63,7 +63,6 @@ screenOptions={{
|
|||||||
key={route.name}
|
key={route.name}
|
||||||
style={[
|
style={[
|
||||||
styles.tabItem,
|
styles.tabItem,
|
||||||
focused && styles.tabItemActive,
|
|
||||||
{ backgroundColor: focused ? theme.accentSoft : 'transparent' },
|
{ backgroundColor: focused ? theme.accentSoft : 'transparent' },
|
||||||
]}
|
]}
|
||||||
onPress={() => props.navigation.navigate(route.name as never)}
|
onPress={() => props.navigation.navigate(route.name as never)}
|
||||||
@@ -122,9 +121,6 @@ const styles = StyleSheet.create({
|
|||||||
borderRadius: 8,
|
borderRadius: 8,
|
||||||
minWidth: 70,
|
minWidth: 70,
|
||||||
},
|
},
|
||||||
tabItemActive: {
|
|
||||||
backgroundColor: theme.accentSoft,
|
|
||||||
},
|
|
||||||
rippleContainer: {
|
rippleContainer: {
|
||||||
width: 44,
|
width: 44,
|
||||||
height: 44,
|
height: 44,
|
||||||
|
|||||||
@@ -10,7 +10,6 @@ import { useEffect } from 'react';
|
|||||||
import { requestQuickAddFocus } from '@/utils/quickAddFocus';
|
import { requestQuickAddFocus } from '@/utils/quickAddFocus';
|
||||||
import { registerForPushNotificationsAsync, setupNotificationChannels, addNotificationResponseReceivedListener, removeNotificationSubscription } from '@/services/pushNotifications';
|
import { registerForPushNotificationsAsync, setupNotificationChannels, addNotificationResponseReceivedListener, removeNotificationSubscription } from '@/services/pushNotifications';
|
||||||
import * as Notifications from 'expo-notifications';
|
import * as Notifications from 'expo-notifications';
|
||||||
import { Platform } from 'react-native';
|
|
||||||
|
|
||||||
Notifications.setNotificationHandler({
|
Notifications.setNotificationHandler({
|
||||||
handleNotification: async () => ({
|
handleNotification: async () => ({
|
||||||
@@ -57,31 +56,18 @@ function RootNavigator() {
|
|||||||
Linking.getInitialURL().then(handleUrl).catch(() => {});
|
Linking.getInitialURL().then(handleUrl).catch(() => {});
|
||||||
const subscription = Linking.addEventListener('url', ({ url }) => handleUrl(url));
|
const subscription = Linking.addEventListener('url', ({ url }) => handleUrl(url));
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
const handleKeyDown = (event: KeyboardEvent) => {
|
const handleKeyDown = (event: KeyboardEvent) => {
|
||||||
if (event.key === 'Escape') {
|
if (event.key === 'Escape') {
|
||||||
const router = useRouter();
|
|
||||||
router.back();
|
router.back();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
window.addEventListener('keydown', handleKeyDown);
|
window.addEventListener('keydown', handleKeyDown);
|
||||||
return () => window.removeEventListener('keydown', handleKeyDown);
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
const unsubscribe = Linking.addEventListener('url', ({ url }) => {
|
|
||||||
if (!url || !url.includes('://quick-add')) return;
|
|
||||||
router.replace('/(tabs)');
|
|
||||||
requestQuickAddFocus();
|
|
||||||
});
|
|
||||||
|
|
||||||
return () => unsubscribe();
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
return () => {
|
return () => {
|
||||||
subscription.remove();
|
subscription.remove();
|
||||||
removeNotificationSubscription(responseListener);
|
removeNotificationSubscription(responseListener);
|
||||||
|
window.removeEventListener('keydown', handleKeyDown);
|
||||||
};
|
};
|
||||||
}, [router]);
|
}, [router]);
|
||||||
|
|
||||||
|
|||||||
Generated
+10
@@ -19,6 +19,7 @@
|
|||||||
"expo-constants": "~57.0.9",
|
"expo-constants": "~57.0.9",
|
||||||
"expo-dev-client": "~57.0.1",
|
"expo-dev-client": "~57.0.1",
|
||||||
"expo-device": "^57.0.1",
|
"expo-device": "^57.0.1",
|
||||||
|
"expo-intent-launcher": "~57.0.1",
|
||||||
"expo-linking": "~57.0.5",
|
"expo-linking": "~57.0.5",
|
||||||
"expo-notifications": "~57.0.8",
|
"expo-notifications": "~57.0.8",
|
||||||
"expo-router": "~57.0.10",
|
"expo-router": "~57.0.10",
|
||||||
@@ -7594,6 +7595,15 @@
|
|||||||
"react-native": "*"
|
"react-native": "*"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/expo-intent-launcher": {
|
||||||
|
"version": "57.0.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/expo-intent-launcher/-/expo-intent-launcher-57.0.1.tgz",
|
||||||
|
"integrity": "sha512-BYiPEOUeW3AkW/uxEESbS2UBw9LasJ8Heb6A8kF9Ueh6pqrXQHMNJFHzfrOP8qZfv9G2e8CTzrtzpN5p0vH5fA==",
|
||||||
|
"license": "MIT",
|
||||||
|
"peerDependencies": {
|
||||||
|
"expo": "*"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/expo-json-utils": {
|
"node_modules/expo-json-utils": {
|
||||||
"version": "57.0.1",
|
"version": "57.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/expo-json-utils/-/expo-json-utils-57.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/expo-json-utils/-/expo-json-utils-57.0.1.tgz",
|
||||||
|
|||||||
@@ -14,6 +14,7 @@
|
|||||||
"expo-constants": "~57.0.9",
|
"expo-constants": "~57.0.9",
|
||||||
"expo-dev-client": "~57.0.1",
|
"expo-dev-client": "~57.0.1",
|
||||||
"expo-device": "^57.0.1",
|
"expo-device": "^57.0.1",
|
||||||
|
"expo-intent-launcher": "~57.0.1",
|
||||||
"expo-linking": "~57.0.5",
|
"expo-linking": "~57.0.5",
|
||||||
"expo-notifications": "~57.0.8",
|
"expo-notifications": "~57.0.8",
|
||||||
"expo-router": "~57.0.10",
|
"expo-router": "~57.0.10",
|
||||||
|
|||||||
@@ -1,30 +1,278 @@
|
|||||||
import { useEffect } from 'react';
|
import { useEffect, useState, useCallback } from 'react';
|
||||||
import { Alert, Linking } from 'react-native';
|
import {
|
||||||
import { checkForUpdates, wasPromptedFor, markPrompted } from '@/services/updates';
|
Modal,
|
||||||
|
View,
|
||||||
|
Text,
|
||||||
|
StyleSheet,
|
||||||
|
Pressable,
|
||||||
|
ScrollView,
|
||||||
|
Platform,
|
||||||
|
} from 'react-native';
|
||||||
|
import { checkForUpdates, wasPromptedFor, markPrompted, downloadAPK, installAPK, openReleaseUrl, AppUpdate } from '@/services/updates';
|
||||||
|
import { useSettings } from '@/theme';
|
||||||
|
|
||||||
export function UpdateNotifier() {
|
export function UpdateNotifier() {
|
||||||
useEffect(() => {
|
const { theme } = useSettings();
|
||||||
const run = async () => {
|
const [update, setUpdate] = useState<AppUpdate | null>(null);
|
||||||
const update = await checkForUpdates();
|
const [visible, setVisible] = useState(false);
|
||||||
if (!update || (await wasPromptedFor(update.tagName))) return;
|
const [downloading, setDownloading] = useState(false);
|
||||||
await markPrompted(update.tagName);
|
const [downloadProgress, setDownloadProgress] = useState(0);
|
||||||
const url = update.apkUrl ?? update.releaseUrl;
|
const [downloadError, setDownloadError] = useState<string | null>(null);
|
||||||
Alert.alert(
|
|
||||||
'Update available',
|
const checkUpdate = useCallback(async () => {
|
||||||
`A new version (${update.version}) is available for download.`,
|
const available = await checkForUpdates();
|
||||||
[
|
if (!available) return;
|
||||||
{ text: 'Later', style: 'cancel' },
|
|
||||||
{
|
const prompted = await wasPromptedFor(available.tagName);
|
||||||
text: 'Download',
|
if (prompted && !available.mandatory) return;
|
||||||
onPress: () => {
|
|
||||||
if (url) Linking.openURL(url).catch(() => {});
|
setUpdate(available);
|
||||||
},
|
setVisible(true);
|
||||||
},
|
|
||||||
],
|
|
||||||
);
|
|
||||||
};
|
|
||||||
run();
|
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
return null;
|
useEffect(() => {
|
||||||
|
checkUpdate();
|
||||||
|
}, [checkUpdate]);
|
||||||
|
|
||||||
|
const handleDownload = async () => {
|
||||||
|
if (!update?.apkUrl) {
|
||||||
|
await openReleaseUrl(update?.releaseUrl ?? '');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
setDownloading(true);
|
||||||
|
setDownloadProgress(0);
|
||||||
|
setDownloadError(null);
|
||||||
|
|
||||||
|
try {
|
||||||
|
const uri = await downloadAPK(update.apkUrl, setDownloadProgress);
|
||||||
|
if (uri) {
|
||||||
|
const installed = await installAPK(uri);
|
||||||
|
if (!installed) {
|
||||||
|
setDownloadError('Failed to open installer. Please install manually from Downloads.');
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
setDownloadError('Download failed. Please try again or download from the release page.');
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
setDownloadError('An error occurred during download.');
|
||||||
|
} finally {
|
||||||
|
setDownloading(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleLater = async () => {
|
||||||
|
if (update) {
|
||||||
|
await markPrompted(update.tagName);
|
||||||
|
}
|
||||||
|
setVisible(false);
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleReleasePage = async () => {
|
||||||
|
if (update) {
|
||||||
|
await openReleaseUrl(update.releaseUrl);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
if (!visible || !update) return null;
|
||||||
|
|
||||||
|
const isMandatory = update.mandatory;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Modal visible={visible} transparent animationType="fade" onRequestClose={isMandatory ? () => {} : handleLater}>
|
||||||
|
<View style={[styles.overlay, { backgroundColor: theme.overlay }]}>
|
||||||
|
<View style={[styles.modal, { backgroundColor: theme.card }]}>
|
||||||
|
<View style={[styles.header, { borderBottomColor: theme.border }]}>
|
||||||
|
<Text style={[styles.title, { color: theme.text }]}>Update Available</Text>
|
||||||
|
<Text style={[styles.version, { color: theme.textSecondary }]}>Version {update.version}</Text>
|
||||||
|
</View>
|
||||||
|
|
||||||
|
<ScrollView style={styles.content} contentContainerStyle={styles.contentContainer}>
|
||||||
|
<Text style={[styles.sectionTitle, { color: theme.text }]}>What's New</Text>
|
||||||
|
<Text style={[styles.notes, { color: theme.textSecondary }]}>
|
||||||
|
{update.notes || 'No release notes provided.'}
|
||||||
|
</Text>
|
||||||
|
|
||||||
|
{isMandatory && (
|
||||||
|
<View style={styles.mandatoryBadge}>
|
||||||
|
<Text style={styles.mandatoryText}>Mandatory Update</Text>
|
||||||
|
</View>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{downloading && (
|
||||||
|
<View style={styles.progressContainer}>
|
||||||
|
<View style={[styles.progressBar, { backgroundColor: theme.border }]}>
|
||||||
|
<View
|
||||||
|
style={[
|
||||||
|
styles.progressFill,
|
||||||
|
{ backgroundColor: theme.accent, width: `${downloadProgress * 100}%` },
|
||||||
|
]}
|
||||||
|
/>
|
||||||
|
</View>
|
||||||
|
<Text style={[styles.progressText, { color: theme.textSecondary }]}>
|
||||||
|
Downloading... {Math.round(downloadProgress * 100)}%
|
||||||
|
</Text>
|
||||||
|
</View>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{downloadError && (
|
||||||
|
<View style={styles.errorContainer}>
|
||||||
|
<Text style={styles.errorText}>{downloadError}</Text>
|
||||||
|
<Pressable style={styles.errorAction} onPress={handleDownload}>
|
||||||
|
<Text style={styles.errorActionText}>Retry Download</Text>
|
||||||
|
</Pressable>
|
||||||
|
</View>
|
||||||
|
)}
|
||||||
|
</ScrollView>
|
||||||
|
|
||||||
|
<View style={[styles.actions, { borderTopColor: theme.border }]}>
|
||||||
|
{!isMandatory && (
|
||||||
|
<Pressable style={[styles.button, styles.buttonSecondary, { backgroundColor: theme.cardAlt }]} onPress={handleLater}>
|
||||||
|
<Text style={[styles.buttonText, { color: theme.textSecondary }]}>Later</Text>
|
||||||
|
</Pressable>
|
||||||
|
)}
|
||||||
|
|
||||||
|
<Pressable
|
||||||
|
style={[
|
||||||
|
styles.button,
|
||||||
|
styles.buttonPrimary,
|
||||||
|
{ backgroundColor: theme.accent, opacity: downloading ? 0.7 : 1 },
|
||||||
|
]}
|
||||||
|
onPress={handleDownload}
|
||||||
|
disabled={downloading}
|
||||||
|
>
|
||||||
|
<Text style={[styles.buttonText, { color: theme.accentText }]}>
|
||||||
|
{downloading ? 'Downloading...' : update.apkUrl ? 'Download & Install' : 'View Release'}
|
||||||
|
</Text>
|
||||||
|
</Pressable>
|
||||||
|
|
||||||
|
<Pressable style={[styles.button, styles.buttonGhost, { backgroundColor: 'transparent' }]} onPress={handleReleasePage}>
|
||||||
|
<Text style={[styles.buttonText, { color: theme.textSecondary }]}>Release Notes</Text>
|
||||||
|
</Pressable>
|
||||||
|
</View>
|
||||||
|
</View>
|
||||||
|
</View>
|
||||||
|
</Modal>
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const styles = StyleSheet.create({
|
||||||
|
overlay: {
|
||||||
|
flex: 1,
|
||||||
|
justifyContent: 'center',
|
||||||
|
alignItems: 'center',
|
||||||
|
padding: 20,
|
||||||
|
},
|
||||||
|
modal: {
|
||||||
|
width: '100%',
|
||||||
|
maxWidth: 480,
|
||||||
|
borderRadius: 20,
|
||||||
|
overflow: 'hidden',
|
||||||
|
maxHeight: '85%',
|
||||||
|
},
|
||||||
|
header: {
|
||||||
|
padding: 20,
|
||||||
|
borderBottomWidth: 1,
|
||||||
|
},
|
||||||
|
title: {
|
||||||
|
fontSize: 20,
|
||||||
|
fontWeight: '700',
|
||||||
|
marginBottom: 4,
|
||||||
|
},
|
||||||
|
version: {
|
||||||
|
fontSize: 14,
|
||||||
|
},
|
||||||
|
content: {
|
||||||
|
maxHeight: 300,
|
||||||
|
},
|
||||||
|
contentContainer: {
|
||||||
|
padding: 20,
|
||||||
|
paddingBottom: 12,
|
||||||
|
},
|
||||||
|
sectionTitle: {
|
||||||
|
fontSize: 14,
|
||||||
|
fontWeight: '600',
|
||||||
|
marginBottom: 8,
|
||||||
|
textTransform: 'uppercase',
|
||||||
|
letterSpacing: 0.5,
|
||||||
|
},
|
||||||
|
notes: {
|
||||||
|
fontSize: 14,
|
||||||
|
lineHeight: 22,
|
||||||
|
},
|
||||||
|
mandatoryBadge: {
|
||||||
|
marginTop: 12,
|
||||||
|
paddingHorizontal: 12,
|
||||||
|
paddingVertical: 6,
|
||||||
|
borderRadius: 8,
|
||||||
|
backgroundColor: '#FFEBEE',
|
||||||
|
alignSelf: 'flex-start',
|
||||||
|
},
|
||||||
|
mandatoryText: {
|
||||||
|
fontSize: 12,
|
||||||
|
fontWeight: '600',
|
||||||
|
color: '#C62828',
|
||||||
|
},
|
||||||
|
progressContainer: {
|
||||||
|
marginTop: 16,
|
||||||
|
},
|
||||||
|
progressBar: {
|
||||||
|
height: 6,
|
||||||
|
borderRadius: 3,
|
||||||
|
overflow: 'hidden',
|
||||||
|
},
|
||||||
|
progressFill: {
|
||||||
|
height: '100%',
|
||||||
|
borderRadius: 3,
|
||||||
|
},
|
||||||
|
progressText: {
|
||||||
|
fontSize: 12,
|
||||||
|
marginTop: 6,
|
||||||
|
textAlign: 'center',
|
||||||
|
},
|
||||||
|
errorContainer: {
|
||||||
|
marginTop: 16,
|
||||||
|
padding: 12,
|
||||||
|
borderRadius: 8,
|
||||||
|
backgroundColor: '#FFF3E0',
|
||||||
|
},
|
||||||
|
errorText: {
|
||||||
|
fontSize: 13,
|
||||||
|
color: '#E65100',
|
||||||
|
marginBottom: 8,
|
||||||
|
},
|
||||||
|
errorAction: {
|
||||||
|
paddingVertical: 8,
|
||||||
|
paddingHorizontal: 16,
|
||||||
|
borderRadius: 6,
|
||||||
|
backgroundColor: '#FF9800',
|
||||||
|
alignSelf: 'flex-start',
|
||||||
|
},
|
||||||
|
errorActionText: {
|
||||||
|
fontSize: 13,
|
||||||
|
fontWeight: '600',
|
||||||
|
color: '#FFF',
|
||||||
|
},
|
||||||
|
actions: {
|
||||||
|
flexDirection: 'row',
|
||||||
|
flexWrap: 'wrap',
|
||||||
|
justifyContent: 'flex-end',
|
||||||
|
gap: 8,
|
||||||
|
padding: 16,
|
||||||
|
borderTopWidth: 1,
|
||||||
|
},
|
||||||
|
button: {
|
||||||
|
paddingVertical: 10,
|
||||||
|
paddingHorizontal: 20,
|
||||||
|
borderRadius: 10,
|
||||||
|
minWidth: 100,
|
||||||
|
alignItems: 'center',
|
||||||
|
},
|
||||||
|
buttonPrimary: {},
|
||||||
|
buttonSecondary: {},
|
||||||
|
buttonGhost: {},
|
||||||
|
buttonText: {
|
||||||
|
fontSize: 14,
|
||||||
|
fontWeight: '600',
|
||||||
|
},
|
||||||
|
});
|
||||||
@@ -220,5 +220,9 @@ export const migrations = schemaMigrations({
|
|||||||
}),
|
}),
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
toVersion: 21,
|
||||||
|
steps: [],
|
||||||
|
},
|
||||||
],
|
],
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -11,7 +11,6 @@ import RepeatProfile from '@/models/RepeatProfile';
|
|||||||
import Friendship from '@/models/Friendship';
|
import Friendship from '@/models/Friendship';
|
||||||
import { TombstoneEntity } from '@/models/Tombstone';
|
import { TombstoneEntity } from '@/models/Tombstone';
|
||||||
import { fetchPendingTombstones, removeTombstonesInBatch } from './tombstones';
|
import { fetchPendingTombstones, removeTombstonesInBatch } from './tombstones';
|
||||||
import { useOnline } from '@/hooks/useOnline';
|
|
||||||
|
|
||||||
const LAST_PULLED_AT_KEY = 'sync:lastPulledAt';
|
const LAST_PULLED_AT_KEY = 'sync:lastPulledAt';
|
||||||
const LAST_PUSHED_AT_KEY = 'sync:lastPushedAt';
|
const LAST_PUSHED_AT_KEY = 'sync:lastPushedAt';
|
||||||
@@ -96,7 +95,7 @@ export async function runSync(): Promise<SyncResult> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// If offline, mark timestamps and return early - changes will sync on next foreground launch
|
// If offline, mark timestamps and return early - changes will sync on next foreground launch
|
||||||
const isCurrentlyOnline = await useOnline();
|
const isCurrentlyOnline = navigator.onLine;
|
||||||
if (!isCurrentlyOnline) {
|
if (!isCurrentlyOnline) {
|
||||||
const now = Date.now();
|
const now = Date.now();
|
||||||
await setLastPulledAt(now);
|
await setLastPulledAt(now);
|
||||||
|
|||||||
@@ -1,5 +1,8 @@
|
|||||||
import Constants from 'expo-constants';
|
import Constants from 'expo-constants';
|
||||||
import AsyncStorage from '@react-native-async-storage/async-storage';
|
import AsyncStorage from '@react-native-async-storage/async-storage';
|
||||||
|
import * as FileSystem from 'expo-file-system/legacy';
|
||||||
|
import * as IntentLauncher from 'expo-intent-launcher';
|
||||||
|
import { Platform } from 'react-native';
|
||||||
|
|
||||||
const GITEA_BASE_URL = 'https://gitea.techmos.org';
|
const GITEA_BASE_URL = 'https://gitea.techmos.org';
|
||||||
const GITEA_OWNER = 'tech08mag';
|
const GITEA_OWNER = 'tech08mag';
|
||||||
@@ -12,6 +15,8 @@ export interface AppUpdate {
|
|||||||
notes: string;
|
notes: string;
|
||||||
apkUrl: string | null;
|
apkUrl: string | null;
|
||||||
releaseUrl: string;
|
releaseUrl: string;
|
||||||
|
mandatory: boolean;
|
||||||
|
publishedAt: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function getCurrentAppVersion(): string {
|
export function getCurrentAppVersion(): string {
|
||||||
@@ -28,6 +33,13 @@ async function fetchWithTimeout(path: string, timeoutMs: number): Promise<Respon
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function parseMandatoryFromNotes(notes: string, tagName: string): boolean {
|
||||||
|
const mandatoryKeywords = ['mandatory', 'critical', 'security', 'breaking', 'required'];
|
||||||
|
const lowerNotes = notes.toLowerCase();
|
||||||
|
const lowerTag = tagName.toLowerCase();
|
||||||
|
return mandatoryKeywords.some(kw => lowerNotes.includes(kw) || lowerTag.includes(kw));
|
||||||
|
}
|
||||||
|
|
||||||
export async function fetchLatestRelease(): Promise<AppUpdate | null> {
|
export async function fetchLatestRelease(): Promise<AppUpdate | null> {
|
||||||
try {
|
try {
|
||||||
const response = await fetchWithTimeout(
|
const response = await fetchWithTimeout(
|
||||||
@@ -40,14 +52,17 @@ export async function fetchLatestRelease(): Promise<AppUpdate | null> {
|
|||||||
(asset: { name?: string }) => asset.name && /\.apk$/i.test(asset.name),
|
(asset: { name?: string }) => asset.name && /\.apk$/i.test(asset.name),
|
||||||
);
|
);
|
||||||
const tagName: string = release.tag_name ?? release.name ?? '';
|
const tagName: string = release.tag_name ?? release.name ?? '';
|
||||||
|
const notes: string = release.body ?? '';
|
||||||
return {
|
return {
|
||||||
version: tagName.replace(/^v/i, ''),
|
version: tagName.replace(/^v/i, ''),
|
||||||
tagName,
|
tagName,
|
||||||
notes: release.body ?? '',
|
notes,
|
||||||
apkUrl: apkAsset?.browser_download_url ?? null,
|
apkUrl: apkAsset?.browser_download_url ?? null,
|
||||||
releaseUrl:
|
releaseUrl:
|
||||||
release.html_url ??
|
release.html_url ??
|
||||||
`${GITEA_BASE_URL}/${GITEA_OWNER}/${GITEA_REPO}/releases/tag/${tagName}`,
|
`${GITEA_BASE_URL}/${GITEA_OWNER}/${GITEA_REPO}/releases/tag/${tagName}`,
|
||||||
|
mandatory: parseMandatoryFromNotes(notes, tagName),
|
||||||
|
publishedAt: release.published_at ?? new Date().toISOString(),
|
||||||
};
|
};
|
||||||
} catch {
|
} catch {
|
||||||
return null;
|
return null;
|
||||||
@@ -92,3 +107,55 @@ export async function markPrompted(tagName: string): Promise<void> {
|
|||||||
// ignore
|
// ignore
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export async function downloadAPK(
|
||||||
|
url: string,
|
||||||
|
onProgress?: (progress: number) => void
|
||||||
|
): Promise<string | null> {
|
||||||
|
if (Platform.OS !== 'android') return null;
|
||||||
|
|
||||||
|
try {
|
||||||
|
const downloadDir = `${FileSystem.documentDirectory}downloads/`;
|
||||||
|
await FileSystem.makeDirectoryAsync(downloadDir, { intermediates: true });
|
||||||
|
|
||||||
|
const filename = `carry-your-live-${Date.now()}.apk`;
|
||||||
|
const filepath = `${downloadDir}${filename}`;
|
||||||
|
|
||||||
|
const downloadResumable = FileSystem.createDownloadResumable(
|
||||||
|
url,
|
||||||
|
filepath,
|
||||||
|
{},
|
||||||
|
(downloadProgress) => {
|
||||||
|
const progress = downloadProgress.totalBytesWritten / downloadProgress.totalBytesExpectedToWrite;
|
||||||
|
onProgress?.(progress);
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
const result = await downloadResumable.downloadAsync();
|
||||||
|
return result?.uri ?? null;
|
||||||
|
} catch (error) {
|
||||||
|
console.error('[Updates] Download failed:', error);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function installAPK(uri: string): Promise<boolean> {
|
||||||
|
if (Platform.OS !== 'android') return false;
|
||||||
|
|
||||||
|
try {
|
||||||
|
await IntentLauncher.startActivityAsync('android.intent.action.VIEW', {
|
||||||
|
data: uri.startsWith('file://') ? uri : `file://${uri}`,
|
||||||
|
type: 'application/vnd.android.package-archive',
|
||||||
|
flags: 1,
|
||||||
|
});
|
||||||
|
return true;
|
||||||
|
} catch (error) {
|
||||||
|
console.error('[Updates] Install failed:', error);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function openReleaseUrl(url: string): Promise<void> {
|
||||||
|
const { openURL } = await import('expo-linking');
|
||||||
|
await openURL(url);
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user