Archived
Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e80c2673ef | ||
|
|
26c5f6f06b | ||
|
|
22ded87250 |
@@ -0,0 +1,38 @@
|
||||
from django.contrib import admin
|
||||
|
||||
from apps.groups.models import (
|
||||
GroupMeeting,
|
||||
GroupMembership,
|
||||
NotificationPreference,
|
||||
PaceNotification,
|
||||
ReadingGroup,
|
||||
)
|
||||
|
||||
|
||||
@admin.register(ReadingGroup)
|
||||
class ReadingGroupAdmin(admin.ModelAdmin):
|
||||
list_display = ["name", "created_by", "created_at"]
|
||||
search_fields = ["name"]
|
||||
|
||||
|
||||
@admin.register(GroupMembership)
|
||||
class GroupMembershipAdmin(admin.ModelAdmin):
|
||||
list_display = ["user", "group", "role", "joined_at"]
|
||||
list_filter = ["role"]
|
||||
|
||||
|
||||
@admin.register(GroupMeeting)
|
||||
class GroupMeetingAdmin(admin.ModelAdmin):
|
||||
list_display = ["group", "title", "target_section_label", "scheduled_at"]
|
||||
list_filter = ["group"]
|
||||
|
||||
|
||||
@admin.register(NotificationPreference)
|
||||
class NotificationPreferenceAdmin(admin.ModelAdmin):
|
||||
list_display = ["user", "pace_notifications_enabled", "reminder_enabled", "frequency"]
|
||||
|
||||
|
||||
@admin.register(PaceNotification)
|
||||
class PaceNotificationAdmin(admin.ModelAdmin):
|
||||
list_display = ["user", "meeting", "status", "created_at"]
|
||||
list_filter = ["status"]
|
||||
@@ -0,0 +1,8 @@
|
||||
from django.apps import AppConfig
|
||||
|
||||
|
||||
class GroupsConfig(AppConfig):
|
||||
default_auto_field = "django.db.models.BigAutoField"
|
||||
name = "apps.groups"
|
||||
verbose_name = "Reading Groups"
|
||||
label = "groups"
|
||||
@@ -0,0 +1,109 @@
|
||||
# Generated by Django 5.1.7 on 2026-06-20 19:22
|
||||
|
||||
import django.db.models.deletion
|
||||
from django.conf import settings
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
initial = True
|
||||
|
||||
dependencies = [
|
||||
('books', '0003_readingprogress_epub_location'),
|
||||
('users', '0001_initial'),
|
||||
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name='NotificationPreference',
|
||||
fields=[
|
||||
('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, related_name='notification_preference', serialize=False, to=settings.AUTH_USER_MODEL)),
|
||||
('pace_notifications_enabled', models.BooleanField(default=True)),
|
||||
('reminder_enabled', models.BooleanField(default=True)),
|
||||
('frequency', models.CharField(choices=[('daily', 'Daily'), ('weekly', 'Weekly')], default='daily', max_length=16)),
|
||||
('created_at', models.DateTimeField(auto_now_add=True)),
|
||||
('updated_at', models.DateTimeField(auto_now=True)),
|
||||
],
|
||||
options={
|
||||
'verbose_name': 'Notification Preference',
|
||||
'verbose_name_plural': 'Notification Preferences',
|
||||
'db_table': 'groups_notification_preference',
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='ReadingGroup',
|
||||
fields=[
|
||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('name', models.CharField(db_index=True, max_length=256)),
|
||||
('description', models.TextField(blank=True, default='')),
|
||||
('created_at', models.DateTimeField(auto_now_add=True)),
|
||||
('book', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='reading_groups', to='books.book')),
|
||||
('created_by', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='created_groups', to=settings.AUTH_USER_MODEL)),
|
||||
('ebook', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='reading_groups', to='books.ebook')),
|
||||
],
|
||||
options={
|
||||
'verbose_name': 'Reading Group',
|
||||
'verbose_name_plural': 'Reading Groups',
|
||||
'db_table': 'groups_reading_group',
|
||||
'ordering': ['-created_at'],
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='GroupMeeting',
|
||||
fields=[
|
||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('title', models.CharField(blank=True, default='', max_length=512)),
|
||||
('scheduled_at', models.DateTimeField(db_index=True)),
|
||||
('target_section', models.PositiveIntegerField(default=0, help_text='Target chapter/section index to reach by this meeting')),
|
||||
('target_section_label', models.CharField(blank=True, default='', help_text="Human-readable label for the target section (e.g. 'Section 3')", max_length=512)),
|
||||
('created_at', models.DateTimeField(auto_now_add=True)),
|
||||
('group', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='meetings', to='groups.readinggroup')),
|
||||
],
|
||||
options={
|
||||
'verbose_name': 'Group Meeting',
|
||||
'verbose_name_plural': 'Group Meetings',
|
||||
'db_table': 'groups_meeting',
|
||||
'ordering': ['scheduled_at'],
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='PaceNotification',
|
||||
fields=[
|
||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('status', models.CharField(choices=[('pending', 'Pending'), ('sent', 'Sent'), ('dismissed', 'Dismissed')], default='pending', max_length=16)),
|
||||
('current_section', models.PositiveIntegerField(default=0)),
|
||||
('target_section', models.PositiveIntegerField(default=0)),
|
||||
('ahead_behind_delta', models.IntegerField(default=0)),
|
||||
('created_at', models.DateTimeField(auto_now_add=True)),
|
||||
('ebook', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='pace_notifications', to='books.ebook')),
|
||||
('meeting', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='pace_notifications', to='groups.groupmeeting')),
|
||||
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='pace_notifications', to=settings.AUTH_USER_MODEL)),
|
||||
],
|
||||
options={
|
||||
'verbose_name': 'Pace Notification',
|
||||
'verbose_name_plural': 'Pace Notifications',
|
||||
'db_table': 'groups_pace_notification',
|
||||
'ordering': ['-created_at'],
|
||||
'indexes': [models.Index(fields=['user', 'meeting', 'ebook'], name='groups_pace_user_id_18e929_idx')],
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='GroupMembership',
|
||||
fields=[
|
||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('role', models.CharField(choices=[('admin', 'Admin'), ('member', 'Member')], default='member', max_length=16)),
|
||||
('joined_at', models.DateTimeField(auto_now_add=True)),
|
||||
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='group_memberships', to=settings.AUTH_USER_MODEL)),
|
||||
('group', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='memberships', to='groups.readinggroup')),
|
||||
],
|
||||
options={
|
||||
'verbose_name': 'Group Membership',
|
||||
'verbose_name_plural': 'Group Memberships',
|
||||
'db_table': 'groups_membership',
|
||||
'indexes': [models.Index(fields=['user', 'group'], name='groups_memb_user_id_9cda7e_idx')],
|
||||
'unique_together': {('user', 'group')},
|
||||
},
|
||||
),
|
||||
]
|
||||
@@ -0,0 +1,190 @@
|
||||
from __future__ import annotations
|
||||
|
||||
from django.conf import settings
|
||||
from django.db import models
|
||||
|
||||
|
||||
class FrequencyChoice(models.TextChoices):
|
||||
DAILY = "daily", "Daily"
|
||||
WEEKLY = "weekly", "Weekly"
|
||||
|
||||
|
||||
class MembershipRole(models.TextChoices):
|
||||
ADMIN = "admin", "Admin"
|
||||
MEMBER = "member", "Member"
|
||||
|
||||
|
||||
class NotificationStatus(models.TextChoices):
|
||||
PENDING = "pending", "Pending"
|
||||
SENT = "sent", "Sent"
|
||||
DISMISSED = "dismissed", "Dismissed"
|
||||
|
||||
|
||||
class ReadingGroup(models.Model):
|
||||
"""A group of users reading a book together with scheduled meetings."""
|
||||
|
||||
name = models.CharField(max_length=256, db_index=True)
|
||||
description = models.TextField(blank=True, default="")
|
||||
book = models.ForeignKey(
|
||||
"books.Book",
|
||||
on_delete=models.SET_NULL,
|
||||
null=True,
|
||||
blank=True,
|
||||
related_name="reading_groups",
|
||||
)
|
||||
ebook = models.ForeignKey(
|
||||
"books.EBook",
|
||||
on_delete=models.SET_NULL,
|
||||
null=True,
|
||||
blank=True,
|
||||
related_name="reading_groups",
|
||||
)
|
||||
created_by = models.ForeignKey(
|
||||
settings.AUTH_USER_MODEL,
|
||||
on_delete=models.CASCADE,
|
||||
related_name="created_groups",
|
||||
)
|
||||
created_at = models.DateTimeField(auto_now_add=True)
|
||||
|
||||
class Meta:
|
||||
db_table = "groups_reading_group"
|
||||
verbose_name = "Reading Group"
|
||||
verbose_name_plural = "Reading Groups"
|
||||
ordering = ["-created_at"]
|
||||
|
||||
def __str__(self) -> str:
|
||||
return self.name
|
||||
|
||||
|
||||
class GroupMembership(models.Model):
|
||||
"""User membership in a reading group."""
|
||||
|
||||
user = models.ForeignKey(
|
||||
settings.AUTH_USER_MODEL,
|
||||
on_delete=models.CASCADE,
|
||||
related_name="group_memberships",
|
||||
)
|
||||
group = models.ForeignKey(
|
||||
ReadingGroup,
|
||||
on_delete=models.CASCADE,
|
||||
related_name="memberships",
|
||||
)
|
||||
role = models.CharField(
|
||||
max_length=16,
|
||||
choices=MembershipRole.choices,
|
||||
default=MembershipRole.MEMBER,
|
||||
)
|
||||
joined_at = models.DateTimeField(auto_now_add=True)
|
||||
|
||||
class Meta:
|
||||
db_table = "groups_membership"
|
||||
verbose_name = "Group Membership"
|
||||
verbose_name_plural = "Group Memberships"
|
||||
unique_together = [("user", "group")]
|
||||
indexes = [models.Index(fields=["user", "group"])]
|
||||
|
||||
def __str__(self) -> str:
|
||||
return f"{self.user} in {self.group}"
|
||||
|
||||
|
||||
class GroupMeeting(models.Model):
|
||||
"""A scheduled meeting for a reading group with a target section."""
|
||||
|
||||
group = models.ForeignKey(
|
||||
ReadingGroup,
|
||||
on_delete=models.CASCADE,
|
||||
related_name="meetings",
|
||||
)
|
||||
title = models.CharField(max_length=512, blank=True, default="")
|
||||
scheduled_at = models.DateTimeField(db_index=True)
|
||||
target_section = models.PositiveIntegerField(
|
||||
default=0,
|
||||
help_text="Target chapter/section index to reach by this meeting",
|
||||
)
|
||||
target_section_label = models.CharField(
|
||||
max_length=512,
|
||||
blank=True,
|
||||
default="",
|
||||
help_text="Human-readable label for the target section (e.g. 'Section 3')",
|
||||
)
|
||||
created_at = models.DateTimeField(auto_now_add=True)
|
||||
|
||||
class Meta:
|
||||
db_table = "groups_meeting"
|
||||
verbose_name = "Group Meeting"
|
||||
verbose_name_plural = "Group Meetings"
|
||||
ordering = ["scheduled_at"]
|
||||
|
||||
def __str__(self) -> str:
|
||||
return f"{self.group.name} — {self.title or self.target_section_label} ({self.scheduled_at.date()})"
|
||||
|
||||
|
||||
class NotificationPreference(models.Model):
|
||||
"""Per-user notification settings for reading pace alerts."""
|
||||
|
||||
user = models.OneToOneField(
|
||||
settings.AUTH_USER_MODEL,
|
||||
on_delete=models.CASCADE,
|
||||
related_name="notification_preference",
|
||||
primary_key=True,
|
||||
)
|
||||
pace_notifications_enabled = models.BooleanField(default=True)
|
||||
reminder_enabled = models.BooleanField(default=True)
|
||||
frequency = models.CharField(
|
||||
max_length=16,
|
||||
choices=FrequencyChoice.choices,
|
||||
default=FrequencyChoice.DAILY,
|
||||
)
|
||||
created_at = models.DateTimeField(auto_now_add=True)
|
||||
updated_at = models.DateTimeField(auto_now=True)
|
||||
|
||||
class Meta:
|
||||
db_table = "groups_notification_preference"
|
||||
verbose_name = "Notification Preference"
|
||||
verbose_name_plural = "Notification Preferences"
|
||||
|
||||
def __str__(self) -> str:
|
||||
return f"{self.user} — pace={'on' if self.pace_notifications_enabled else 'off'}, freq={self.frequency}"
|
||||
|
||||
|
||||
class PaceNotification(models.Model):
|
||||
"""Tracks reading pace notifications sent to users to avoid duplicates."""
|
||||
|
||||
user = models.ForeignKey(
|
||||
settings.AUTH_USER_MODEL,
|
||||
on_delete=models.CASCADE,
|
||||
related_name="pace_notifications",
|
||||
)
|
||||
meeting = models.ForeignKey(
|
||||
GroupMeeting,
|
||||
on_delete=models.CASCADE,
|
||||
related_name="pace_notifications",
|
||||
)
|
||||
ebook = models.ForeignKey(
|
||||
"books.EBook",
|
||||
on_delete=models.CASCADE,
|
||||
related_name="pace_notifications",
|
||||
null=True,
|
||||
blank=True,
|
||||
)
|
||||
status = models.CharField(
|
||||
max_length=16,
|
||||
choices=NotificationStatus.choices,
|
||||
default=NotificationStatus.PENDING,
|
||||
)
|
||||
current_section = models.PositiveIntegerField(default=0)
|
||||
target_section = models.PositiveIntegerField(default=0)
|
||||
ahead_behind_delta = models.IntegerField(default=0)
|
||||
created_at = models.DateTimeField(auto_now_add=True)
|
||||
|
||||
class Meta:
|
||||
db_table = "groups_pace_notification"
|
||||
verbose_name = "Pace Notification"
|
||||
verbose_name_plural = "Pace Notifications"
|
||||
ordering = ["-created_at"]
|
||||
indexes = [
|
||||
models.Index(fields=["user", "meeting", "ebook"]),
|
||||
]
|
||||
|
||||
def __str__(self) -> str:
|
||||
return f"{self.user} — meeting {self.meeting_id}: {self.get_status_display()}"
|
||||
@@ -0,0 +1,137 @@
|
||||
from __future__ import annotations
|
||||
|
||||
from rest_framework import serializers
|
||||
|
||||
from apps.groups.models import (
|
||||
FrequencyChoice,
|
||||
GroupMeeting,
|
||||
GroupMembership,
|
||||
NotificationPreference,
|
||||
PaceNotification,
|
||||
ReadingGroup,
|
||||
)
|
||||
from apps.groups.services.pace import PaceStatus
|
||||
|
||||
|
||||
class NotificationPreferenceSerializer(serializers.ModelSerializer):
|
||||
class Meta:
|
||||
model = NotificationPreference
|
||||
fields = [
|
||||
"pace_notifications_enabled",
|
||||
"reminder_enabled",
|
||||
"frequency",
|
||||
]
|
||||
|
||||
def validate_frequency(self, value: str) -> str:
|
||||
valid = {choice[0] for choice in FrequencyChoice.choices}
|
||||
if value not in valid:
|
||||
raise serializers.ValidationError(
|
||||
f"Frequency must be one of: {', '.join(valid)}"
|
||||
)
|
||||
return value
|
||||
|
||||
|
||||
class GroupMeetingSerializer(serializers.ModelSerializer):
|
||||
group_name = serializers.CharField(source="group.name", read_only=True)
|
||||
|
||||
class Meta:
|
||||
model = GroupMeeting
|
||||
fields = [
|
||||
"id",
|
||||
"group",
|
||||
"group_name",
|
||||
"title",
|
||||
"scheduled_at",
|
||||
"target_section",
|
||||
"target_section_label",
|
||||
"created_at",
|
||||
]
|
||||
read_only_fields = ["id", "created_at"]
|
||||
|
||||
def validate_target_section(self, value: int) -> int:
|
||||
if value < 0:
|
||||
raise serializers.ValidationError("Target section must be non-negative.")
|
||||
return value
|
||||
|
||||
|
||||
class ReadingGroupSerializer(serializers.ModelSerializer):
|
||||
member_count = serializers.SerializerMethodField()
|
||||
meeting_count = serializers.SerializerMethodField()
|
||||
|
||||
class Meta:
|
||||
model = ReadingGroup
|
||||
fields = [
|
||||
"id",
|
||||
"name",
|
||||
"description",
|
||||
"book",
|
||||
"ebook",
|
||||
"created_by",
|
||||
"created_at",
|
||||
"member_count",
|
||||
"meeting_count",
|
||||
]
|
||||
read_only_fields = ["id", "created_by", "created_at"]
|
||||
|
||||
def get_member_count(self, obj: ReadingGroup) -> int:
|
||||
return obj.memberships.count()
|
||||
|
||||
def get_meeting_count(self, obj: ReadingGroup) -> int:
|
||||
return obj.meetings.count()
|
||||
|
||||
|
||||
class GroupMembershipSerializer(serializers.ModelSerializer):
|
||||
user_email = serializers.CharField(source="user.email", read_only=True)
|
||||
group_name = serializers.CharField(source="group.name", read_only=True)
|
||||
|
||||
class Meta:
|
||||
model = GroupMembership
|
||||
fields = ["id", "user", "user_email", "group", "group_name", "role", "joined_at"]
|
||||
read_only_fields = ["id", "joined_at"]
|
||||
|
||||
|
||||
class PaceNotificationSerializer(serializers.ModelSerializer):
|
||||
status_display = serializers.CharField(source="get_status_display", read_only=True)
|
||||
|
||||
class Meta:
|
||||
model = PaceNotification
|
||||
fields = [
|
||||
"id",
|
||||
"user",
|
||||
"meeting",
|
||||
"ebook",
|
||||
"status",
|
||||
"status_display",
|
||||
"current_section",
|
||||
"target_section",
|
||||
"ahead_behind_delta",
|
||||
"created_at",
|
||||
]
|
||||
read_only_fields = ["id", "created_at"]
|
||||
|
||||
|
||||
class PaceStatusSerializer(serializers.Serializer):
|
||||
meeting_id = serializers.IntegerField()
|
||||
meeting_title = serializers.CharField()
|
||||
scheduled_at = serializers.CharField()
|
||||
target_section = serializers.IntegerField()
|
||||
target_section_label = serializers.CharField()
|
||||
current_section = serializers.IntegerField()
|
||||
ahead_behind_delta = serializers.IntegerField()
|
||||
status = serializers.CharField()
|
||||
days_until_meeting = serializers.IntegerField()
|
||||
sections_to_catch_up = serializers.IntegerField()
|
||||
ebook_id = serializers.IntegerField()
|
||||
ebook_title = serializers.CharField()
|
||||
|
||||
|
||||
class ReminderSerializer(serializers.Serializer):
|
||||
meeting_id = serializers.IntegerField()
|
||||
meeting_title = serializers.CharField()
|
||||
scheduled_at = serializers.CharField()
|
||||
target_section = serializers.IntegerField()
|
||||
target_section_label = serializers.CharField()
|
||||
group_name = serializers.CharField()
|
||||
hours_until = serializers.IntegerField()
|
||||
ebook_id = serializers.IntegerField()
|
||||
ebook_title = serializers.CharField()
|
||||
@@ -0,0 +1,219 @@
|
||||
"""Pace calculation service for reading progress vs meeting targets."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import logging
|
||||
from datetime import datetime, timedelta
|
||||
from typing import TypedDict
|
||||
|
||||
from django.db.models import QuerySet
|
||||
from django.utils import timezone
|
||||
|
||||
from apps.books.models import EBook, ReadingProgress
|
||||
from apps.groups.models import (
|
||||
GroupMeeting,
|
||||
GroupMembership,
|
||||
NotificationPreference,
|
||||
PaceNotification,
|
||||
NotificationStatus,
|
||||
)
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class PaceStatus(TypedDict):
|
||||
meeting_id: int
|
||||
meeting_title: str
|
||||
scheduled_at: str
|
||||
target_section: int
|
||||
target_section_label: str
|
||||
current_section: int
|
||||
ahead_behind_delta: int
|
||||
status: str # "ahead", "behind", "on_track", "completed"
|
||||
days_until_meeting: int
|
||||
sections_to_catch_up: int
|
||||
ebook_id: int
|
||||
ebook_title: str
|
||||
|
||||
|
||||
def get_relevant_ebooks_for_user(user) -> QuerySet[EBook]:
|
||||
"""Return ebooks that belong to groups the user is a member of."""
|
||||
group_ids = (
|
||||
GroupMembership.objects.filter(user=user)
|
||||
.values_list("group_id", flat=True)
|
||||
)
|
||||
return (
|
||||
EBook.objects.filter(reading_groups__in=group_ids)
|
||||
.select_related("reading_progress")
|
||||
.prefetch_related("chapters")
|
||||
.distinct()
|
||||
)
|
||||
|
||||
|
||||
def calculate_pace(
|
||||
user,
|
||||
ebook: EBook | None = None,
|
||||
meeting: GroupMeeting | None = None,
|
||||
) -> list[PaceStatus]:
|
||||
"""Calculate reading pace for a user's upcoming meetings.
|
||||
|
||||
Compares the user's current reading progress (chapter index) against
|
||||
the target section for each upcoming meeting within 3 days.
|
||||
"""
|
||||
now = timezone.now()
|
||||
three_days_from_now = now + timedelta(days=3)
|
||||
|
||||
# Find upcoming meetings for groups the user belongs to
|
||||
user_group_ids = (
|
||||
GroupMembership.objects.filter(user=user)
|
||||
.values_list("group_id", flat=True)
|
||||
)
|
||||
meetings_qs = GroupMeeting.objects.filter(
|
||||
group_id__in=user_group_ids,
|
||||
scheduled_at__gte=now,
|
||||
scheduled_at__lte=three_days_from_now,
|
||||
).select_related("group", "group__ebook")
|
||||
|
||||
if meeting:
|
||||
meetings_qs = meetings_qs.filter(pk=meeting.pk)
|
||||
|
||||
meetings = list(meetings_qs)
|
||||
|
||||
results: list[PaceStatus] = []
|
||||
|
||||
for m in meetings:
|
||||
group_ebook = m.group.ebook
|
||||
ebooks_to_check: list[EBook] = []
|
||||
|
||||
if ebook:
|
||||
ebooks_to_check = [ebook]
|
||||
elif group_ebook:
|
||||
ebooks_to_check = [group_ebook]
|
||||
else:
|
||||
# Check all ebooks in the group
|
||||
ebooks_to_check = list(
|
||||
EBook.objects.filter(reading_groups=m.group)
|
||||
.select_related("reading_progress")
|
||||
.prefetch_related("chapters")
|
||||
)
|
||||
|
||||
for eb in ebooks_to_check:
|
||||
pace = _compute_single_pace(user, m, eb, now)
|
||||
if pace:
|
||||
results.append(pace)
|
||||
|
||||
return results
|
||||
|
||||
|
||||
def _compute_single_pace(
|
||||
user,
|
||||
meeting: GroupMeeting,
|
||||
ebook: EBook,
|
||||
now: datetime,
|
||||
) -> PaceStatus | None:
|
||||
"""Compute pace for one user + meeting + ebook combination."""
|
||||
try:
|
||||
progress = ebook.reading_progress
|
||||
except ReadingProgress.DoesNotExist:
|
||||
# No progress yet — user hasn't started reading
|
||||
return None
|
||||
|
||||
# Current section: based on last_page (chapter index) or computed from progress %
|
||||
if progress.last_page > 0:
|
||||
current_section = progress.last_page
|
||||
elif progress.current_position > 0:
|
||||
chapter_count = ebook.chapters.count() or ebook.page_count or 1
|
||||
current_section = max(1, int((progress.current_position / 100) * chapter_count))
|
||||
else:
|
||||
current_section = 0
|
||||
|
||||
target_section = meeting.target_section or 0
|
||||
if target_section == 0:
|
||||
return None
|
||||
|
||||
delta = current_section - target_section
|
||||
days_until = max(0, (meeting.scheduled_at - now).days)
|
||||
|
||||
if current_section >= target_section:
|
||||
if current_section >= target_section and progress.current_position > 0:
|
||||
status = "completed"
|
||||
else:
|
||||
status = "ahead"
|
||||
elif delta >= -1:
|
||||
status = "on_track"
|
||||
else:
|
||||
status = "behind"
|
||||
|
||||
return PaceStatus(
|
||||
meeting_id=meeting.pk,
|
||||
meeting_title=meeting.title or meeting.target_section_label,
|
||||
scheduled_at=meeting.scheduled_at.isoformat(),
|
||||
target_section=target_section,
|
||||
target_section_label=meeting.target_section_label,
|
||||
current_section=current_section,
|
||||
ahead_behind_delta=delta,
|
||||
status=status,
|
||||
days_until_meeting=days_until,
|
||||
sections_to_catch_up=max(0, target_section - current_section),
|
||||
ebook_id=ebook.pk,
|
||||
ebook_title=ebook.title,
|
||||
)
|
||||
|
||||
|
||||
def should_send_notification(
|
||||
user,
|
||||
meeting: GroupMeeting,
|
||||
ebook: EBook,
|
||||
) -> bool:
|
||||
"""Check if a pace notification should be sent based on user preferences."""
|
||||
pref, _ = NotificationPreference.objects.get_or_create(user=user)
|
||||
|
||||
if not pref.pace_notifications_enabled:
|
||||
return False
|
||||
|
||||
# Check if notification was already sent today
|
||||
today = timezone.now().date()
|
||||
existing = PaceNotification.objects.filter(
|
||||
user=user,
|
||||
meeting=meeting,
|
||||
ebook=ebook,
|
||||
created_at__date=today,
|
||||
).exclude(status=NotificationStatus.DISMISSED)
|
||||
|
||||
if existing.exists():
|
||||
return False
|
||||
|
||||
# Frequency check
|
||||
if pref.frequency == "weekly":
|
||||
week_ago = today - timedelta(days=7)
|
||||
recent = PaceNotification.objects.filter(
|
||||
user=user,
|
||||
meeting=meeting,
|
||||
ebook=ebook,
|
||||
created_at__date__gte=week_ago,
|
||||
).exclude(status=NotificationStatus.DISMISSED)
|
||||
if recent.exists():
|
||||
return False
|
||||
|
||||
return True
|
||||
|
||||
|
||||
def get_reminder_meetings(user) -> list[GroupMeeting]:
|
||||
"""Get meetings that are within 24 hours for reminder notifications."""
|
||||
now = timezone.now()
|
||||
tomorrow = now + timedelta(days=1)
|
||||
|
||||
user_group_ids = (
|
||||
GroupMembership.objects.filter(user=user)
|
||||
.values_list("group_id", flat=True)
|
||||
)
|
||||
|
||||
return list(
|
||||
GroupMeeting.objects.filter(
|
||||
group_id__in=user_group_ids,
|
||||
scheduled_at__gte=now,
|
||||
scheduled_at__lte=tomorrow,
|
||||
)
|
||||
.select_related("group", "group__ebook")
|
||||
.order_by("scheduled_at")
|
||||
)
|
||||
@@ -0,0 +1,23 @@
|
||||
from django.urls import include, path
|
||||
from rest_framework.routers import DefaultRouter
|
||||
|
||||
from apps.groups.views import (
|
||||
GroupMeetingViewSet,
|
||||
ReadingGroupViewSet,
|
||||
dismiss_pace_notification_view,
|
||||
notification_preferences_view,
|
||||
pace_status_view,
|
||||
reminder_view,
|
||||
)
|
||||
|
||||
router = DefaultRouter()
|
||||
router.register(r"groups", ReadingGroupViewSet, basename="reading-group")
|
||||
router.register(r"meetings", GroupMeetingViewSet, basename="group-meeting")
|
||||
|
||||
urlpatterns = [
|
||||
path("", include(router.urls)),
|
||||
path("notifications/preferences/", notification_preferences_view, name="notification-preferences"),
|
||||
path("notifications/pace/", pace_status_view, name="pace-status"),
|
||||
path("notifications/dismiss/", dismiss_pace_notification_view, name="dismiss-pace"),
|
||||
path("notifications/reminders/", reminder_view, name="meeting-reminders"),
|
||||
]
|
||||
@@ -0,0 +1,207 @@
|
||||
from __future__ import annotations
|
||||
|
||||
from django.db.models import QuerySet
|
||||
from rest_framework import permissions, status, viewsets
|
||||
from rest_framework.decorators import action, api_view, permission_classes
|
||||
from rest_framework.permissions import IsAuthenticated
|
||||
from rest_framework.request import Request
|
||||
from rest_framework.response import Response
|
||||
|
||||
from apps.books.models import EBook
|
||||
from apps.groups.models import (
|
||||
GroupMeeting,
|
||||
GroupMembership,
|
||||
NotificationPreference,
|
||||
PaceNotification,
|
||||
NotificationStatus,
|
||||
ReadingGroup,
|
||||
)
|
||||
from apps.groups.serializers import (
|
||||
GroupMeetingSerializer,
|
||||
GroupMembershipSerializer,
|
||||
NotificationPreferenceSerializer,
|
||||
PaceNotificationSerializer,
|
||||
PaceStatusSerializer,
|
||||
ReadingGroupSerializer,
|
||||
ReminderSerializer,
|
||||
)
|
||||
from apps.groups.services.pace import (
|
||||
calculate_pace,
|
||||
get_reminder_meetings,
|
||||
should_send_notification,
|
||||
)
|
||||
|
||||
|
||||
class IsGroupMember(permissions.BasePermission):
|
||||
"""Only allow group members to access group resources."""
|
||||
|
||||
def has_object_permission(self, request: Request, view: object, obj: ReadingGroup) -> bool:
|
||||
return obj.memberships.filter(user=request.user).exists()
|
||||
|
||||
|
||||
class ReadingGroupViewSet(viewsets.ModelViewSet):
|
||||
permission_classes = [IsAuthenticated, IsGroupMember]
|
||||
serializer_class = ReadingGroupSerializer
|
||||
|
||||
def get_queryset(self) -> QuerySet[ReadingGroup]:
|
||||
return (
|
||||
ReadingGroup.objects.filter(memberships__user=self.request.user)
|
||||
.prefetch_related("memberships", "meetings")
|
||||
.distinct()
|
||||
)
|
||||
|
||||
def perform_create(self, serializer) -> None:
|
||||
group = serializer.save(created_by=self.request.user)
|
||||
GroupMembership.objects.create(
|
||||
user=self.request.user,
|
||||
group=group,
|
||||
role="admin",
|
||||
)
|
||||
|
||||
@action(detail=False, methods=["get"], url_path="all")
|
||||
def all_groups(self, request: Request) -> Response:
|
||||
"""Return all groups (for discovery)."""
|
||||
qs = ReadingGroup.objects.all().prefetch_related("memberships", "meetings")
|
||||
page = self.paginate_queryset(qs)
|
||||
if page is not None:
|
||||
serializer = self.get_serializer(page, many=True)
|
||||
return self.get_paginated_response(serializer.data)
|
||||
serializer = self.get_serializer(qs, many=True)
|
||||
return Response(serializer.data)
|
||||
|
||||
|
||||
class GroupMeetingViewSet(viewsets.ModelViewSet):
|
||||
permission_classes = [IsAuthenticated]
|
||||
serializer_class = GroupMeetingSerializer
|
||||
|
||||
def get_queryset(self) -> QuerySet[GroupMeeting]:
|
||||
user_group_ids = (
|
||||
GroupMembership.objects.filter(user=self.request.user)
|
||||
.values_list("group_id", flat=True)
|
||||
)
|
||||
return GroupMeeting.objects.filter(group_id__in=user_group_ids).select_related(
|
||||
"group"
|
||||
)
|
||||
|
||||
def perform_create(self, serializer) -> None:
|
||||
group = serializer.validated_data["group"]
|
||||
if not group.memberships.filter(user=self.request.user).exists():
|
||||
raise permissions.PermissionDenied("You must be a group member to create meetings.")
|
||||
serializer.save()
|
||||
|
||||
@action(detail=False, methods=["get"], url_path="upcoming")
|
||||
def upcoming(self, request: Request) -> Response:
|
||||
"""Return upcoming meetings for the user's groups (within 3 days)."""
|
||||
from django.utils import timezone
|
||||
from datetime import timedelta
|
||||
|
||||
now = timezone.now()
|
||||
three_days = now + timedelta(days=3)
|
||||
qs = self.get_queryset().filter(
|
||||
scheduled_at__gte=now,
|
||||
scheduled_at__lte=three_days,
|
||||
)
|
||||
serializer = self.get_serializer(qs, many=True)
|
||||
return Response(serializer.data)
|
||||
|
||||
|
||||
@api_view(["GET", "PATCH"])
|
||||
@permission_classes([IsAuthenticated])
|
||||
def notification_preferences_view(request: Request) -> Response:
|
||||
"""Get or update notification preferences for the current user."""
|
||||
pref, _created = NotificationPreference.objects.get_or_create(user=request.user)
|
||||
|
||||
if request.method == "GET":
|
||||
serializer = NotificationPreferenceSerializer(pref)
|
||||
return Response(serializer.data)
|
||||
|
||||
serializer = NotificationPreferenceSerializer(pref, data=request.data, partial=True)
|
||||
serializer.is_valid(raise_exception=True)
|
||||
serializer.save()
|
||||
return Response(serializer.data)
|
||||
|
||||
|
||||
@api_view(["GET"])
|
||||
@permission_classes([IsAuthenticated])
|
||||
def pace_status_view(request: Request) -> Response:
|
||||
"""Get reading pace status for the current user's upcoming meetings."""
|
||||
ebook_id = request.query_params.get("ebook_id")
|
||||
ebook: EBook | None = None
|
||||
|
||||
if ebook_id:
|
||||
try:
|
||||
ebook = EBook.objects.select_related("reading_progress").prefetch_related("chapters").get(
|
||||
pk=ebook_id, user=request.user
|
||||
)
|
||||
except EBook.DoesNotExist:
|
||||
return Response(
|
||||
{"error": "EBook not found."}, status=status.HTTP_404_NOT_FOUND
|
||||
)
|
||||
|
||||
pace_data = calculate_pace(request.user, ebook=ebook)
|
||||
serializer = PaceStatusSerializer(pace_data, many=True)
|
||||
return Response(serializer.data)
|
||||
|
||||
|
||||
@api_view(["POST"])
|
||||
@permission_classes([IsAuthenticated])
|
||||
def dismiss_pace_notification_view(request: Request) -> Response:
|
||||
"""Dismiss a pace notification so it won't show again."""
|
||||
meeting_id = request.data.get("meeting_id")
|
||||
ebook_id = request.data.get("ebook_id")
|
||||
|
||||
if not meeting_id or not ebook_id:
|
||||
return Response(
|
||||
{"error": "meeting_id and ebook_id are required."},
|
||||
status=status.HTTP_400_BAD_REQUEST,
|
||||
)
|
||||
|
||||
PaceNotification.objects.filter(
|
||||
user=request.user,
|
||||
meeting_id=meeting_id,
|
||||
ebook_id=ebook_id,
|
||||
status=NotificationStatus.PENDING,
|
||||
).update(status=NotificationStatus.DISMISSED)
|
||||
|
||||
return Response({"status": "dismissed"})
|
||||
|
||||
|
||||
@api_view(["GET"])
|
||||
@permission_classes([IsAuthenticated])
|
||||
def reminder_view(request: Request) -> Response:
|
||||
"""Get pre-meeting reminders for meetings within 24 hours."""
|
||||
pref, _ = NotificationPreference.objects.get_or_create(user=request.user)
|
||||
if not pref.reminder_enabled:
|
||||
return Response([])
|
||||
|
||||
meetings = get_reminder_meetings(request.user)
|
||||
now_dt = __import__("django").utils.timezone.now()
|
||||
|
||||
reminders = []
|
||||
for mtg in meetings:
|
||||
group_ebook = mtg.group.ebook
|
||||
ebook: EBook | None = group_ebook
|
||||
if not ebook:
|
||||
ebooks = list(
|
||||
EBook.objects.filter(reading_groups=mtg.group).select_related("reading_progress")[:1]
|
||||
)
|
||||
ebook = ebooks[0] if ebooks else None
|
||||
|
||||
if not ebook:
|
||||
continue
|
||||
|
||||
hours_until = max(0, int((mtg.scheduled_at - now_dt).total_seconds() / 3600))
|
||||
reminders.append({
|
||||
"meeting_id": mtg.pk,
|
||||
"meeting_title": mtg.title or mtg.target_section_label,
|
||||
"scheduled_at": mtg.scheduled_at.isoformat(),
|
||||
"target_section": mtg.target_section,
|
||||
"target_section_label": mtg.target_section_label,
|
||||
"group_name": mtg.group.name,
|
||||
"hours_until": hours_until,
|
||||
"ebook_id": ebook.pk,
|
||||
"ebook_title": ebook.title,
|
||||
})
|
||||
|
||||
serializer = ReminderSerializer(reminders, many=True)
|
||||
return Response(serializer.data)
|
||||
@@ -41,6 +41,7 @@ INSTALLED_APPS = [
|
||||
"apps.books",
|
||||
"apps.annotations",
|
||||
"apps.reader",
|
||||
"apps.groups",
|
||||
]
|
||||
|
||||
MIDDLEWARE = [
|
||||
|
||||
@@ -8,6 +8,7 @@ urlpatterns = [
|
||||
path("api/books/", include("apps.books.urls")),
|
||||
path("api/annotations/", include("apps.annotations.urls")),
|
||||
path("api/reader/", include("apps.reader.urls")),
|
||||
path("api/groups/", include("apps.groups.urls")),
|
||||
]
|
||||
|
||||
if settings.DEBUG:
|
||||
|
||||
@@ -0,0 +1,150 @@
|
||||
# 010 — Mobile EPUB Reader
|
||||
|
||||
**Status:** Implemented
|
||||
**Created:** 2026-06-04
|
||||
|
||||
## Objective
|
||||
|
||||
Mirror the web reading experience (`frontend/src/pages/ReadingPage.tsx` and
|
||||
`frontend/src/components/reader/*`) inside the Expo app so users can open their
|
||||
uploaded library, read EPUBs with persisted progress and typography settings,
|
||||
and manage bookmarks/highlights — reusing the same Django REST API as the web
|
||||
client.
|
||||
|
||||
The web EPUB renderer (`react-reader` / epub.js) is DOM-only, so mobile renders
|
||||
EPUBs with `@epubjs-react-native/core`, which runs epub.js inside a
|
||||
`react-native-webview`. This keeps behavior (CFI locations, themes, font
|
||||
controls, TOC, annotations) close to web while staying inside the managed Expo
|
||||
workflow.
|
||||
|
||||
## Scope
|
||||
|
||||
### Mirrored from web
|
||||
|
||||
- EPUB rendering with swipe pagination (`flow: "paginated"`).
|
||||
- Resume position and debounced progress save (CFI + percentage).
|
||||
- Table of contents drawer with jump-to-chapter.
|
||||
- Reading settings: theme presets (light/sepia/paper/dark), font family, font
|
||||
size, line spacing — persisted to `/api/reader/settings/`.
|
||||
- Bookmarks: bookmark the current page, list/jump/delete, and create highlights
|
||||
from a text selection. Highlights are re-applied on open (best-effort).
|
||||
|
||||
### Deferred (not in this pass)
|
||||
|
||||
- PDF reading. PDF books show a placeholder pointing to the web reader.
|
||||
- Brightness and orientation-lock controls.
|
||||
- Per-highlight color picker (highlights use a single default color).
|
||||
- App-wide internationalization (web uses `react-i18n-lite`).
|
||||
|
||||
## Architecture
|
||||
|
||||
```
|
||||
LibraryScreen (EBook list)
|
||||
| navigate("BookDetail", { ebookId })
|
||||
v
|
||||
BookDetailScreen ----------------> ReaderScreen ({ ebookId })
|
||||
|
|
||||
GET /api/books/ebooks/:id/ (format guard)
|
||||
|
|
||||
epub? --------------------- pdf? -> placeholder
|
||||
|
|
||||
EpubReaderView (ReaderProvider)
|
||||
|
|
||||
expo-file-system downloadAsync(file/, Bearer token) -> file:// uri
|
||||
|
|
||||
<Reader src=file:// fileSystem=useFileSystem flow="paginated" />
|
||||
|
|
||||
onLocationChange -> debounce 800ms -> PATCH progress/
|
||||
onSelected -> POST bookmarks/ (+ highlight annotation)
|
||||
useReader().toc -> goToLocation(href)
|
||||
settings change -> changeTheme / changeFontSize / changeFontFamily
|
||||
+ PATCH /api/reader/settings/ (debounced)
|
||||
```
|
||||
|
||||
The ebook file is downloaded to the app cache with an `Authorization` header
|
||||
(the `/file/` endpoint is JWT-protected) and the local `file://` URI is handed
|
||||
to the renderer — mirroring how the web client downloads a blob rather than
|
||||
using a public/signed URL.
|
||||
|
||||
## Mobile changes
|
||||
|
||||
| File | Role |
|
||||
|------|------|
|
||||
| `mobile/src/api/client.ts` | Adds `apiClient`, `saveTokens`, `loadTokens`, `getApiBaseUrl` |
|
||||
| `mobile/src/api/ebooks.ts` | `/api/books/ebooks/` list/detail/toc + `getFileUrl(id)` |
|
||||
| `mobile/src/api/reader.ts` | Reader settings + per-book progress (mirrors web `api/reader.ts`) |
|
||||
| `mobile/src/api/annotations.ts` | Bookmarks CRUD against `/api/annotations/bookmarks/` |
|
||||
| `mobile/src/types/reader.ts` | `ReadingSettings`, `ReadingProgress` (full reader shapes) |
|
||||
| `mobile/src/types/index.ts` | `AppStackParamList`, `Bookmark`, `CreateMarkerPayload` |
|
||||
| `mobile/src/hooks/useReadingSettings.ts` | Loads + debounced-saves reader settings |
|
||||
| `mobile/src/utils/epubTheme.ts` | Font stacks, theme palettes, `buildEpubTheme()` |
|
||||
| `mobile/src/navigation/AppStack.tsx` | Native stack: Tabs / BookDetail / Reader |
|
||||
| `mobile/src/screens/LibraryScreen.tsx` | Lists user EBooks (`ebooksApi.list`) |
|
||||
| `mobile/src/screens/BookDetailScreen.tsx` | Metadata + start/resume button |
|
||||
| `mobile/src/screens/ReaderScreen.tsx` | Format guard: EPUB view vs PDF placeholder |
|
||||
| `mobile/src/components/reader/EpubReaderView.tsx` | Reader, progress, bookmarks, settings wiring |
|
||||
| `mobile/src/components/reader/ReaderToolbar.tsx` | Title, chapter, progress bar, action buttons |
|
||||
| `mobile/src/components/reader/TocModal.tsx` | Table of contents sheet |
|
||||
| `mobile/src/components/reader/ReadingSettingsModal.tsx` | Theme/font/size/spacing controls |
|
||||
| `mobile/src/components/reader/BookmarksModal.tsx` | Bookmarks & highlights list |
|
||||
| `mobile/App.tsx` | Wraps the tree in `GestureHandlerRootView` |
|
||||
|
||||
Removed unused scaffolding: `mobile/src/navigation/AppNavigator.tsx`,
|
||||
`mobile/src/navigation/MainTabs.tsx`.
|
||||
|
||||
## API contracts (consumed)
|
||||
|
||||
| Method | Path | Purpose |
|
||||
|--------|------|---------|
|
||||
| GET | `/api/books/ebooks/` | User library list |
|
||||
| GET | `/api/books/ebooks/:id/` | EBook detail (format, progress, cover) |
|
||||
| GET | `/api/books/ebooks/:id/file/` | Stream EPUB bytes (JWT, owner) |
|
||||
| GET/PATCH | `/api/books/ebooks/:id/progress/` | Reading progress (`current_position`, `last_page`, `epub_location`) |
|
||||
| GET/PATCH | `/api/reader/settings/` | Reader typography/theme settings |
|
||||
| GET/POST/DELETE | `/api/annotations/bookmarks/` | Bookmarks & highlights (`ebook`, `epub_cfi`, `chapter_index`, ...) |
|
||||
|
||||
## Settings mapping (web -> mobile)
|
||||
|
||||
| Reader setting | Web (epub.js) | Mobile (`@epubjs-react-native/core`) |
|
||||
|----------------|---------------|--------------------------------------|
|
||||
| `theme` / colors | `themes.register/select` | `changeTheme(buildEpubTheme())` + `defaultTheme` |
|
||||
| `font_size` | `themes.fontSize` | `changeFontSize("Npx")` |
|
||||
| `font_family` | body font-family | `changeFontFamily(stack)` |
|
||||
| `line_height` | body line-height | `buildEpubTheme()` CSS rule |
|
||||
| `margin_width` | gap-based padding | not applied (deferred) |
|
||||
| `brightness` / `orientation_lock` | applied on web | deferred |
|
||||
|
||||
## Dependencies added
|
||||
|
||||
- `@epubjs-react-native/core@1.4.7`
|
||||
- `@epubjs-react-native/expo-file-system@1.1.4`
|
||||
- `react-native-webview@13.12.5`
|
||||
|
||||
(`react-native-gesture-handler`, `react-native-reanimated`, and
|
||||
`expo-file-system` were already present.)
|
||||
|
||||
## Configuration
|
||||
|
||||
| Env var | Purpose |
|
||||
|---------|---------|
|
||||
| `EXPO_PUBLIC_API_URL` | Backend base URL (e.g. `http://10.0.2.2:8000` on Android emulator, LAN IP on a device) |
|
||||
|
||||
## Compatibility notes
|
||||
|
||||
- The Expo file-system adapter (`@epubjs-react-native/expo-file-system`) depends
|
||||
only on `expo-file-system`, so the reader runs in Expo Go. (The library's
|
||||
bare adapter pulls native `@dr.pogodin/react-native-fs`; that path is not
|
||||
used here.)
|
||||
- React 19 / Expo SDK 52 may surface peer-dependency warnings for the
|
||||
`@epubjs-react-native/*` packages.
|
||||
|
||||
## Verification
|
||||
|
||||
- [ ] Log in; Library lists the user's uploaded EBooks with covers/progress.
|
||||
- [ ] Open an EPUB; it renders and paginates by swipe.
|
||||
- [ ] Reopen a book; it resumes at the last position.
|
||||
- [ ] Change theme/font/size/spacing; the page updates and persists across reopen.
|
||||
- [ ] Open the TOC and jump to a chapter.
|
||||
- [ ] Bookmark the current page; it appears in the bookmarks list and can be re-opened/deleted.
|
||||
- [ ] Select text to create a highlight; it persists and re-renders on reopen.
|
||||
- [ ] Open a PDF book; the placeholder is shown instead of a crash.
|
||||
@@ -0,0 +1,57 @@
|
||||
import api from "./client";
|
||||
import type {
|
||||
GroupMeeting,
|
||||
MeetingReminder,
|
||||
NotificationPreferences,
|
||||
PaceStatus,
|
||||
ReadingGroup,
|
||||
} from "../types/notifications";
|
||||
|
||||
export const groupsApi = {
|
||||
async getPaceStatus(ebookId?: number): Promise<PaceStatus[]> {
|
||||
const params: Record<string, string> = {};
|
||||
if (ebookId) params.ebook_id = String(ebookId);
|
||||
const { data } = await api.get<PaceStatus[]>("/groups/notifications/pace/", { params });
|
||||
return data;
|
||||
},
|
||||
|
||||
async getPreferences(): Promise<NotificationPreferences> {
|
||||
const { data } = await api.get<NotificationPreferences>("/groups/notifications/preferences/");
|
||||
return data;
|
||||
},
|
||||
|
||||
async updatePreferences(
|
||||
prefs: Partial<NotificationPreferences>,
|
||||
): Promise<NotificationPreferences> {
|
||||
const { data } = await api.patch<NotificationPreferences>(
|
||||
"/groups/notifications/preferences/",
|
||||
prefs,
|
||||
);
|
||||
return data;
|
||||
},
|
||||
|
||||
async dismissPaceNotification(meetingId: number, ebookId: number): Promise<void> {
|
||||
await api.post("/groups/notifications/dismiss/", {
|
||||
meeting_id: meetingId,
|
||||
ebook_id: ebookId,
|
||||
});
|
||||
},
|
||||
|
||||
async getReminders(): Promise<MeetingReminder[]> {
|
||||
const { data } = await api.get<MeetingReminder[]>("/groups/notifications/reminders/");
|
||||
return data;
|
||||
},
|
||||
|
||||
async getGroups(): Promise<ReadingGroup[]> {
|
||||
const { data } = await api.get<{ count: number; results: ReadingGroup[] } | ReadingGroup[]>(
|
||||
"/groups/groups/",
|
||||
);
|
||||
if (Array.isArray(data)) return data;
|
||||
return data.results ?? [];
|
||||
},
|
||||
|
||||
async getUpcomingMeetings(): Promise<GroupMeeting[]> {
|
||||
const { data } = await api.get<GroupMeeting[]>("/groups/meetings/upcoming/");
|
||||
return data;
|
||||
},
|
||||
};
|
||||
@@ -0,0 +1,119 @@
|
||||
import { useEffect, useState } from "react";
|
||||
import { useTranslation } from "react-i18n-lite";
|
||||
import { groupsApi } from "../api/groups";
|
||||
import type { PaceStatus } from "../types/notifications";
|
||||
|
||||
interface PaceNotificationProps {
|
||||
ebookId?: number;
|
||||
}
|
||||
|
||||
export function PaceNotification({ ebookId }: PaceNotificationProps) {
|
||||
const { t } = useTranslation();
|
||||
const [paceItems, setPaceItems] = useState<PaceStatus[]>([]);
|
||||
const [loading, setLoading] = useState(true);
|
||||
const [dismissed, setDismissed] = useState<Set<string>>(new Set());
|
||||
|
||||
useEffect(() => {
|
||||
const load = async () => {
|
||||
try {
|
||||
const data = await groupsApi.getPaceStatus(ebookId);
|
||||
setPaceItems(data);
|
||||
} catch {
|
||||
// Silently fail — notifications are non-critical
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
};
|
||||
void load();
|
||||
}, [ebookId]);
|
||||
|
||||
const handleDismiss = async (meetingId: number, itemEbookId: number) => {
|
||||
const key = `${meetingId}-${itemEbookId}`;
|
||||
setDismissed((prev) => new Set(prev).add(key));
|
||||
try {
|
||||
await groupsApi.dismissPaceNotification(meetingId, itemEbookId);
|
||||
} catch {
|
||||
// Best effort dismissal
|
||||
}
|
||||
};
|
||||
|
||||
if (loading || paceItems.length === 0) return null;
|
||||
|
||||
const visibleItems = paceItems.filter(
|
||||
(p) => !dismissed.has(`${p.meeting_id}-${p.ebook_id}`),
|
||||
);
|
||||
if (visibleItems.length === 0) return null;
|
||||
|
||||
return (
|
||||
<div style={{ display: "flex", flexDirection: "column", gap: 8, padding: "12px 0" }}>
|
||||
{visibleItems.map((item) => {
|
||||
const isBehind = item.status === "behind";
|
||||
const isAhead = item.status === "ahead" || item.status === "completed";
|
||||
const isOnTrack = item.status === "on_track";
|
||||
|
||||
const bgColor = isBehind ? "#fde8e8" : isAhead ? "#d4edda" : "#e8f4fd";
|
||||
const borderColor = isBehind ? "#e74c3c" : isAhead ? "#27ae60" : "#3498db";
|
||||
const textColor = isBehind ? "#a71d2a" : isAhead ? "#155724" : "#0c5460";
|
||||
|
||||
return (
|
||||
<div
|
||||
key={`${item.meeting_id}-${item.ebook_id}`}
|
||||
style={{
|
||||
background: bgColor,
|
||||
border: `1px solid ${borderColor}`,
|
||||
borderRadius: 8,
|
||||
padding: "12px 16px",
|
||||
display: "flex",
|
||||
alignItems: "flex-start",
|
||||
justifyContent: "space-between",
|
||||
gap: 12,
|
||||
}}
|
||||
>
|
||||
<div style={{ flex: 1 }}>
|
||||
<div style={{ fontSize: 14, fontWeight: 600, color: textColor, marginBottom: 4 }}>
|
||||
{isBehind
|
||||
? `Behind schedule — catch up ${item.sections_to_catch_up} section${item.sections_to_catch_up !== 1 ? "s" : ""}`
|
||||
: isOnTrack
|
||||
? "On track — keep going!"
|
||||
: item.status === "completed"
|
||||
? "Meeting target completed!"
|
||||
: "Ahead of schedule — great job!"}
|
||||
</div>
|
||||
<div style={{ fontSize: 13, color: textColor, opacity: 0.85 }}>
|
||||
{item.meeting_title || `Target: ${item.target_section_label || `Section ${item.target_section}`}`}
|
||||
{" — "}
|
||||
{item.ebook_title}
|
||||
</div>
|
||||
<div style={{ fontSize: 12, color: textColor, opacity: 0.7, marginTop: 2 }}>
|
||||
{isBehind
|
||||
? `Currently at section ${item.current_section}, need section ${item.target_section}`
|
||||
: `Section ${item.current_section} of ${item.target_section}`}
|
||||
{item.days_until_meeting > 0 &&
|
||||
` · ${item.days_until_meeting} day${item.days_until_meeting !== 1 ? "s" : ""} until meeting`}
|
||||
{item.days_until_meeting === 0 && " · Meeting today"}
|
||||
</div>
|
||||
</div>
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => handleDismiss(item.meeting_id, item.ebook_id)}
|
||||
style={{
|
||||
background: "none",
|
||||
border: "none",
|
||||
color: textColor,
|
||||
fontSize: 20,
|
||||
cursor: "pointer",
|
||||
padding: "0 4px",
|
||||
lineHeight: 1,
|
||||
opacity: 0.6,
|
||||
flexShrink: 0,
|
||||
}}
|
||||
title="Dismiss"
|
||||
>
|
||||
×
|
||||
</button>
|
||||
</div>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,71 @@
|
||||
import { useEffect, useState } from "react";
|
||||
import { groupsApi } from "../../api/groups";
|
||||
import type { PaceStatus } from "../../types/notifications";
|
||||
|
||||
interface ReadingPaceBannerProps {
|
||||
ebookId: number;
|
||||
currentSection: number;
|
||||
}
|
||||
|
||||
export function ReadingPaceBanner({ ebookId, currentSection }: ReadingPaceBannerProps) {
|
||||
const [paceItems, setPaceItems] = useState<PaceStatus[]>([]);
|
||||
|
||||
useEffect(() => {
|
||||
const load = async () => {
|
||||
try {
|
||||
const data = await groupsApi.getPaceStatus(ebookId);
|
||||
setPaceItems(data);
|
||||
} catch {
|
||||
// Silently fail
|
||||
}
|
||||
};
|
||||
void load();
|
||||
}, [ebookId, currentSection]);
|
||||
|
||||
if (paceItems.length === 0) return null;
|
||||
|
||||
// Only show if user is one section away from target
|
||||
const relevantItems = paceItems.filter(
|
||||
(p) => Math.abs(p.target_section - p.current_section) <= 1 && p.status !== "completed",
|
||||
);
|
||||
|
||||
if (relevantItems.length === 0) return null;
|
||||
|
||||
return (
|
||||
<div
|
||||
style={{
|
||||
background: "linear-gradient(135deg, #667eea 0%, #764ba2 100%)",
|
||||
color: "#fff",
|
||||
padding: "10px 16px",
|
||||
fontSize: 13,
|
||||
fontWeight: 500,
|
||||
textAlign: "center",
|
||||
display: "flex",
|
||||
alignItems: "center",
|
||||
justifyContent: "center",
|
||||
gap: 8,
|
||||
flexWrap: "wrap",
|
||||
position: "sticky",
|
||||
top: 0,
|
||||
zIndex: 10,
|
||||
}}
|
||||
>
|
||||
{relevantItems.map((item) => {
|
||||
const isAlmostThere = item.sections_to_catch_up === 1;
|
||||
const isAtTarget = item.sections_to_catch_up === 0;
|
||||
|
||||
return (
|
||||
<span key={item.meeting_id}>
|
||||
{isAtTarget
|
||||
? `You've reached the target for ${item.meeting_title || `Section ${item.target_section}`}!`
|
||||
: isAlmostThere
|
||||
? `Almost there! Just 1 section to go for ${item.meeting_title || `Section ${item.target_section}`}.`
|
||||
: `You should be on ${item.target_section_label || `Section ${item.target_section}`} by the upcoming meeting.`}
|
||||
{item.days_until_meeting > 0 &&
|
||||
` (${item.days_until_meeting} day${item.days_until_meeting !== 1 ? "s" : ""} left)`}
|
||||
</span>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -22,6 +22,7 @@ import { SelectionPopover } from "./SelectionPopover";
|
||||
import { BookMarkersPanel } from "./BookMarkersPanel";
|
||||
import { BookmarkReaderRail } from "./BookmarkReaderRail";
|
||||
import { ResumeReadingButton } from "./ResumeReadingButton";
|
||||
import { ReadingPaceBanner } from "../notifications/ReadingPaceBanner";
|
||||
import type { MarkerEntry } from "@/types";
|
||||
|
||||
const ReaderToolbar = lazy(() => import("./ReaderToolbar"));
|
||||
@@ -130,6 +131,10 @@ export function EpubReadingView({ book, bookId, initialEpubLocation }: EpubReadi
|
||||
|
||||
return (
|
||||
<ReaderSuspenseShell theme={settings.theme}>
|
||||
<ReadingPaceBanner
|
||||
ebookId={bookId}
|
||||
currentSection={tocItems.length > 0 ? Math.max(1, Math.ceil((progress / 100) * tocItems.length)) : 0}
|
||||
/>
|
||||
<ReaderToolbar
|
||||
bookTitle={book.title}
|
||||
chapterTitle={chapterTitle || t("reader.reading")}
|
||||
|
||||
@@ -24,6 +24,7 @@ import { BookmarkReaderRail } from "./BookmarkReaderRail";
|
||||
import { ResumeReadingButton } from "./ResumeReadingButton";
|
||||
import { PdfLimitationsNotice } from "./PdfLimitationsNotice";
|
||||
import { PdfViewer } from "./PdfViewer";
|
||||
import { ReadingPaceBanner } from "../notifications/ReadingPaceBanner";
|
||||
import type { MarkerEntry } from "@/types";
|
||||
|
||||
const ReaderToolbar = lazy(() => import("./ReaderToolbar"));
|
||||
@@ -170,6 +171,10 @@ export function PdfReadingView({ book, bookId, initialAnchor }: PdfReadingViewPr
|
||||
|
||||
return (
|
||||
<ReaderSuspenseShell theme={settings.theme}>
|
||||
<ReadingPaceBanner
|
||||
ebookId={bookId}
|
||||
currentSection={currentPage}
|
||||
/>
|
||||
<ReaderToolbar
|
||||
bookTitle={book.title}
|
||||
chapterTitle={chapterTitle || t("reader.reading")}
|
||||
|
||||
@@ -19,6 +19,7 @@ import { useVoiceSearch } from "../hooks/useVoiceSearch";
|
||||
import { useMediaQuery, BREAKPOINTS } from "../hooks/useMediaQuery";
|
||||
import { SearchSuggestions } from "../components/search/SearchSuggestions";
|
||||
import { BookContextMenu } from "../components/BookContextMenu";
|
||||
import { PaceNotification } from "../components/notifications/PaceNotification";
|
||||
|
||||
interface FilterState {
|
||||
genre: string;
|
||||
@@ -256,6 +257,9 @@ export function LibraryPage() {
|
||||
</div>
|
||||
</header>
|
||||
|
||||
{/* Pace Notifications */}
|
||||
<PaceNotification />
|
||||
|
||||
{/* Search Bar */}
|
||||
<div style={{ marginBottom: 16 }}>
|
||||
<div style={{ display: "flex", gap: 8, alignItems: "center" }}>
|
||||
|
||||
@@ -2,7 +2,9 @@ import { useEffect, useState } from "react";
|
||||
import { useNavigate } from "react-router-dom";
|
||||
import { useTranslation } from "react-i18n-lite";
|
||||
import { booksApi } from "../api/books";
|
||||
import { groupsApi } from "../api/groups";
|
||||
import type { ReadingSettings } from "../types/book";
|
||||
import type { NotificationPreferences } from "../types/notifications";
|
||||
import type { SupportedLanguage } from "../locales";
|
||||
import { SimpleFormPageLayout } from "../components/layout/SimpleFormPageLayout";
|
||||
|
||||
@@ -17,6 +19,7 @@ export function SettingsPage() {
|
||||
const { t, language, setLanguage } = useTranslation();
|
||||
const navigate = useNavigate();
|
||||
const [settings, setSettings] = useState<ReadingSettings | null>(null);
|
||||
const [notifPrefs, setNotifPrefs] = useState<NotificationPreferences | null>(null);
|
||||
const [loading, setLoading] = useState(true);
|
||||
const [saving, setSaving] = useState(false);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
@@ -24,7 +27,14 @@ export function SettingsPage() {
|
||||
|
||||
useEffect(() => {
|
||||
const load = async () => {
|
||||
try { const data = await booksApi.getSettings(); setSettings(data); }
|
||||
try {
|
||||
const [data, notifData] = await Promise.all([
|
||||
booksApi.getSettings(),
|
||||
groupsApi.getPreferences(),
|
||||
]);
|
||||
setSettings(data);
|
||||
setNotifPrefs(notifData);
|
||||
}
|
||||
catch (err) { setError(err instanceof Error ? err.message : t("settings.loadFailed")); }
|
||||
finally { setLoading(false); }
|
||||
};
|
||||
@@ -32,9 +42,15 @@ export function SettingsPage() {
|
||||
}, [t]);
|
||||
|
||||
const handleSave = async () => {
|
||||
if (!settings) return;
|
||||
if (!settings || !notifPrefs) return;
|
||||
setSaving(true); setError(null); setSuccess(false);
|
||||
try { await booksApi.updateSettings(settings); setSuccess(true); setTimeout(() => setSuccess(false), 2000); }
|
||||
try {
|
||||
await Promise.all([
|
||||
booksApi.updateSettings(settings),
|
||||
groupsApi.updatePreferences(notifPrefs),
|
||||
]);
|
||||
setSuccess(true); setTimeout(() => setSuccess(false), 2000);
|
||||
}
|
||||
catch (err) { setError(err instanceof Error ? err.message : t("settings.saveFailed")); }
|
||||
finally { setSaving(false); }
|
||||
};
|
||||
@@ -85,6 +101,48 @@ export function SettingsPage() {
|
||||
</div>
|
||||
</>}
|
||||
|
||||
{notifPrefs && <>
|
||||
<div style={{ borderTop: "1px solid #e5e7eb", paddingTop: 20 }}>
|
||||
<h3 style={{ fontSize: 16, fontWeight: 600, color: "#1f2937", marginBottom: 16 }}>
|
||||
Notification Settings
|
||||
</h3>
|
||||
|
||||
<div style={{ display: "flex", flexDirection: "column", gap: 12 }}>
|
||||
<label style={{ display: "flex", alignItems: "center", gap: 10, fontSize: 14, color: "#374151", cursor: "pointer" }}>
|
||||
<input
|
||||
type="checkbox"
|
||||
checked={notifPrefs.pace_notifications_enabled}
|
||||
onChange={(e) => setNotifPrefs({ ...notifPrefs, pace_notifications_enabled: e.target.checked })}
|
||||
style={{ width: 18, height: 18, cursor: "pointer" }}
|
||||
/>
|
||||
Enable pace notifications
|
||||
</label>
|
||||
|
||||
<label style={{ display: "flex", alignItems: "center", gap: 10, fontSize: 14, color: "#374151", cursor: "pointer" }}>
|
||||
<input
|
||||
type="checkbox"
|
||||
checked={notifPrefs.reminder_enabled}
|
||||
onChange={(e) => setNotifPrefs({ ...notifPrefs, reminder_enabled: e.target.checked })}
|
||||
style={{ width: 18, height: 18, cursor: "pointer" }}
|
||||
/>
|
||||
Enable pre-meeting reminders (24h before)
|
||||
</label>
|
||||
|
||||
<div style={{ display: "flex", flexDirection: "column", gap: 8 }}>
|
||||
<label style={{ fontSize: 14, fontWeight: 600, color: "#555" }}>Notification frequency</label>
|
||||
<select
|
||||
value={notifPrefs.frequency}
|
||||
onChange={(e) => setNotifPrefs({ ...notifPrefs, frequency: e.target.value as NotificationPreferences["frequency"] })}
|
||||
style={{ padding: "10px 12px", borderRadius: 6, border: "1px solid #ddd", fontSize: 16, background: "#fff", outline: "none" }}
|
||||
>
|
||||
<option value="daily">Daily</option>
|
||||
<option value="weekly">Weekly</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</>}
|
||||
|
||||
<button onClick={handleSave} disabled={saving} style={{ padding: "12px 24px", borderRadius: 8, border: "none", background: "#1a1a2e", color: "#fff", fontSize: 16, fontWeight: 600, cursor: "pointer", opacity: saving ? 0.6 : 1, marginTop: 8 }}>{saving ? t("common.saving") : t("settings.saveSettings")}</button>
|
||||
</div>
|
||||
</SimpleFormPageLayout>
|
||||
|
||||
@@ -0,0 +1,65 @@
|
||||
export interface PaceStatus {
|
||||
meeting_id: number;
|
||||
meeting_title: string;
|
||||
scheduled_at: string;
|
||||
target_section: number;
|
||||
target_section_label: string;
|
||||
current_section: number;
|
||||
ahead_behind_delta: number;
|
||||
status: "ahead" | "behind" | "on_track" | "completed";
|
||||
days_until_meeting: number;
|
||||
sections_to_catch_up: number;
|
||||
ebook_id: number;
|
||||
ebook_title: string;
|
||||
}
|
||||
|
||||
export interface NotificationPreferences {
|
||||
pace_notifications_enabled: boolean;
|
||||
reminder_enabled: boolean;
|
||||
frequency: "daily" | "weekly";
|
||||
}
|
||||
|
||||
export interface MeetingReminder {
|
||||
meeting_id: number;
|
||||
meeting_title: string;
|
||||
scheduled_at: string;
|
||||
target_section: number;
|
||||
target_section_label: string;
|
||||
group_name: string;
|
||||
hours_until: number;
|
||||
ebook_id: number;
|
||||
ebook_title: string;
|
||||
}
|
||||
|
||||
export interface ReadingGroup {
|
||||
id: number;
|
||||
name: string;
|
||||
description: string;
|
||||
book: number | null;
|
||||
ebook: number | null;
|
||||
created_by: number;
|
||||
created_at: string;
|
||||
member_count: number;
|
||||
meeting_count: number;
|
||||
}
|
||||
|
||||
export interface GroupMeeting {
|
||||
id: number;
|
||||
group: number;
|
||||
group_name: string;
|
||||
title: string;
|
||||
scheduled_at: string;
|
||||
target_section: number;
|
||||
target_section_label: string;
|
||||
created_at: string;
|
||||
}
|
||||
|
||||
export interface GroupMembership {
|
||||
id: number;
|
||||
user: number;
|
||||
user_email: string;
|
||||
group: number;
|
||||
group_name: string;
|
||||
role: "admin" | "member";
|
||||
joined_at: string;
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
# Mobile (Expo) environment (example – never commit real secrets)
|
||||
# Base URL of the Django backend. Must be reachable from the device/emulator.
|
||||
# - Android emulator: http://10.0.2.2:8000
|
||||
# - iOS simulator: http://localhost:8000
|
||||
# - Physical device: http://<your-lan-ip>:8000
|
||||
EXPO_PUBLIC_API_URL=http://10.0.2.2:8000
|
||||
|
||||
# EAS Build: set per profile in mobile/eas.json or via:
|
||||
# eas secret:create --name EXPO_PUBLIC_API_URL --value https://your-api.example.com
|
||||
# Run all eas commands from mobile/ (not repo root).
|
||||
@@ -1,4 +1,8 @@
|
||||
import React from "react";
|
||||
// Peer dependencies for @epubjs-react-native/core and gesture-handler.
|
||||
import "react-native-webview";
|
||||
import "react-native-reanimated";
|
||||
import { GestureHandlerRootView } from "react-native-gesture-handler";
|
||||
import { NavigationContainer } from "@react-navigation/native";
|
||||
import { StatusBar } from "expo-status-bar";
|
||||
import { AuthProvider } from "./src/context/AuthContext";
|
||||
@@ -6,11 +10,13 @@ import { RootNavigator } from "./src/navigation/RootNavigator";
|
||||
|
||||
export default function App() {
|
||||
return (
|
||||
<GestureHandlerRootView style={{ flex: 1 }}>
|
||||
<AuthProvider>
|
||||
<NavigationContainer>
|
||||
<StatusBar style="auto" />
|
||||
<RootNavigator />
|
||||
</NavigationContainer>
|
||||
</AuthProvider>
|
||||
</GestureHandlerRootView>
|
||||
);
|
||||
}
|
||||
@@ -21,7 +21,6 @@
|
||||
"package": "com.cloudreader.app"
|
||||
},
|
||||
"plugins": [
|
||||
"expo-document-picker",
|
||||
"expo-file-system"
|
||||
]
|
||||
}
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
{
|
||||
"cli": {
|
||||
"version": ">= 13.0.0",
|
||||
"appVersionSource": "remote"
|
||||
},
|
||||
"build": {
|
||||
"base": {
|
||||
"node": "20.18.0",
|
||||
"env": {
|
||||
"EXPO_PUBLIC_API_URL": "https://api.example.com"
|
||||
}
|
||||
},
|
||||
"development": {
|
||||
"extends": "base",
|
||||
"developmentClient": true,
|
||||
"distribution": "internal",
|
||||
"ios": {
|
||||
"simulator": true
|
||||
},
|
||||
"android": {
|
||||
"buildType": "apk"
|
||||
},
|
||||
"env": {
|
||||
"EXPO_PUBLIC_API_URL": "http://10.0.2.2:8000"
|
||||
}
|
||||
},
|
||||
"preview": {
|
||||
"extends": "base",
|
||||
"distribution": "internal",
|
||||
"android": {
|
||||
"buildType": "apk"
|
||||
}
|
||||
},
|
||||
"production": {
|
||||
"extends": "base",
|
||||
"autoIncrement": true
|
||||
}
|
||||
},
|
||||
"submit": {
|
||||
"production": {}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
const { getDefaultConfig } = require("expo/metro-config");
|
||||
const path = require("path");
|
||||
|
||||
const projectRoot = __dirname;
|
||||
const monorepoRoot = path.resolve(projectRoot, "..");
|
||||
|
||||
/**
|
||||
* Expo SDK 52+ configures Metro for Yarn/npm/pnpm workspaces automatically
|
||||
* when using expo/metro-config. This file keeps an explicit monorepo root so
|
||||
* @cloud-reader/shared (packages/shared) resolves reliably in dev and on EAS.
|
||||
*
|
||||
* If you previously added manual watchFolders/nodeModulesPaths and things
|
||||
* work, prefer this minimal config. After changes: npx expo start --clear
|
||||
*
|
||||
* @see https://docs.expo.dev/guides/monorepos/
|
||||
*/
|
||||
const config = getDefaultConfig(projectRoot);
|
||||
|
||||
config.watchFolders = [monorepoRoot];
|
||||
config.resolver.nodeModulesPaths = [
|
||||
path.resolve(projectRoot, "node_modules"),
|
||||
path.resolve(monorepoRoot, "node_modules"),
|
||||
];
|
||||
|
||||
module.exports = config;
|
||||
+8
-2
@@ -8,7 +8,11 @@
|
||||
"android": "expo start --android",
|
||||
"ios": "expo start --ios",
|
||||
"web": "expo start --web",
|
||||
"lint": "eslint ."
|
||||
"lint": "eslint .",
|
||||
"eas:init": "eas init",
|
||||
"eas:build:dev": "eas build --profile development --platform all",
|
||||
"eas:build:preview": "eas build --profile preview --platform all",
|
||||
"eas:build:prod": "eas build --profile production --platform all"
|
||||
},
|
||||
"dependencies": {
|
||||
"expo": "~52.0.0",
|
||||
@@ -22,10 +26,12 @@
|
||||
"@react-navigation/bottom-tabs": "^7.0.0",
|
||||
"axios": "^1.7.9",
|
||||
"@react-native-async-storage/async-storage": "2.1.0",
|
||||
"expo-document-picker": "~13.0.0",
|
||||
"@epubjs-react-native/core": "1.4.7",
|
||||
"@epubjs-react-native/expo-file-system": "1.1.4",
|
||||
"expo-file-system": "~18.0.0",
|
||||
"react-native-gesture-handler": "~2.20.0",
|
||||
"react-native-reanimated": "~3.16.0",
|
||||
"react-native-webview": "13.12.5",
|
||||
"@cloud-reader/shared": "*"
|
||||
},
|
||||
"devDependencies": {
|
||||
|
||||
@@ -1,55 +1,31 @@
|
||||
import api from "./client";
|
||||
import type {
|
||||
Bookmark,
|
||||
Note,
|
||||
CreateBookmarkPayload,
|
||||
CreateNotePayload,
|
||||
PaginatedResponse,
|
||||
} from "@cloud-reader/shared";
|
||||
import type { PaginatedResponse } from "@cloud-reader/shared";
|
||||
import type { Bookmark, CreateMarkerPayload } from "../types";
|
||||
|
||||
export function fetchBookmarks(
|
||||
bookId?: string,
|
||||
export async function fetchBookmarks(
|
||||
ebookId?: string | number,
|
||||
): Promise<PaginatedResponse<Bookmark>> {
|
||||
const params = bookId ? { book: bookId } : {};
|
||||
return api
|
||||
.get<PaginatedResponse<Bookmark>>("/api/annotations/bookmarks/", { params })
|
||||
.then((res) => res.data);
|
||||
const params: Record<string, string> = {};
|
||||
if (ebookId != null && ebookId !== "") {
|
||||
params.ebook = String(ebookId);
|
||||
}
|
||||
const { data } = await api.get<PaginatedResponse<Bookmark>>(
|
||||
"/api/annotations/bookmarks/",
|
||||
{ params },
|
||||
);
|
||||
return data;
|
||||
}
|
||||
|
||||
export function createBookmark(
|
||||
payload: CreateBookmarkPayload,
|
||||
export async function createMarker(
|
||||
payload: CreateMarkerPayload,
|
||||
): Promise<Bookmark> {
|
||||
return api
|
||||
.post<Bookmark>("/api/annotations/bookmarks/", payload)
|
||||
.then((res) => res.data);
|
||||
const { data } = await api.post<Bookmark>(
|
||||
"/api/annotations/bookmarks/",
|
||||
payload,
|
||||
);
|
||||
return data;
|
||||
}
|
||||
|
||||
export function deleteBookmark(id: string): Promise<void> {
|
||||
return api.delete(`/api/annotations/bookmarks/${id}/`).then(() => {});
|
||||
}
|
||||
|
||||
export function fetchNotes(bookId?: string): Promise<PaginatedResponse<Note>> {
|
||||
const params = bookId ? { book: bookId } : {};
|
||||
return api
|
||||
.get<PaginatedResponse<Note>>("/api/annotations/notes/", { params })
|
||||
.then((res) => res.data);
|
||||
}
|
||||
|
||||
export function createNote(payload: CreateNotePayload): Promise<Note> {
|
||||
return api
|
||||
.post<Note>("/api/annotations/notes/", payload)
|
||||
.then((res) => res.data);
|
||||
}
|
||||
|
||||
export function updateNote(
|
||||
id: string,
|
||||
content: string,
|
||||
): Promise<Note> {
|
||||
return api
|
||||
.patch<Note>(`/api/annotations/notes/${id}/`, { content })
|
||||
.then((res) => res.data);
|
||||
}
|
||||
|
||||
export function deleteNote(id: string): Promise<void> {
|
||||
return api.delete(`/api/annotations/notes/${id}/`).then(() => {});
|
||||
export async function deleteBookmark(id: string): Promise<void> {
|
||||
await api.delete(`/api/annotations/bookmarks/${id}/`);
|
||||
}
|
||||
+1
-20
@@ -1,31 +1,12 @@
|
||||
import api from "./client";
|
||||
import type { Book, PaginatedResponse } from "@cloud-reader/shared";
|
||||
|
||||
export function fetchBooks(
|
||||
page = 1,
|
||||
pageSize = 20,
|
||||
): Promise<PaginatedResponse<Book>> {
|
||||
return api
|
||||
.get<PaginatedResponse<Book>>("/api/books/", {
|
||||
params: { page, page_size: pageSize },
|
||||
})
|
||||
.then((res) => res.data);
|
||||
}
|
||||
|
||||
export function fetchBook(id: string): Promise<Book> {
|
||||
return api.get<Book>(`/api/books/${id}/`).then((res) => res.data);
|
||||
}
|
||||
|
||||
export function searchBooks(
|
||||
query: string,
|
||||
): Promise<PaginatedResponse<Book>> {
|
||||
return api
|
||||
.get<PaginatedResponse<Book>>("/api/books/search/", {
|
||||
.get<PaginatedResponse<Book>>("/api/books/", {
|
||||
params: { q: query },
|
||||
})
|
||||
.then((res) => res.data);
|
||||
}
|
||||
|
||||
export function deleteBook(id: string): Promise<void> {
|
||||
return api.delete(`/api/books/${id}/`).then(() => {});
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
import axios, { type AxiosError, type InternalAxiosRequestConfig } from "axios";
|
||||
import AsyncStorage from "@react-native-async-storage/async-storage";
|
||||
import type { TokenResponse } from "@cloud-reader/shared";
|
||||
|
||||
const STORAGE_KEYS = {
|
||||
ACCESS_TOKEN: "access_token",
|
||||
@@ -39,6 +40,26 @@ async function clearTokens(): Promise<void> {
|
||||
]);
|
||||
}
|
||||
|
||||
async function saveTokens(tokens: TokenResponse): Promise<void> {
|
||||
await setTokens(tokens.access, tokens.refresh);
|
||||
}
|
||||
|
||||
async function loadTokens(): Promise<TokenResponse | null> {
|
||||
const [access, refresh] = await Promise.all([
|
||||
getAccessToken(),
|
||||
getRefreshToken(),
|
||||
]);
|
||||
if (!access || !refresh) {
|
||||
return null;
|
||||
}
|
||||
return { access, refresh };
|
||||
}
|
||||
|
||||
/** Absolute base URL used for direct (non-axios) requests like file downloads. */
|
||||
function getApiBaseUrl(): string {
|
||||
return api.defaults.baseURL ?? "";
|
||||
}
|
||||
|
||||
// ── Request interceptor ─────────────────────────────────────────────
|
||||
|
||||
api.interceptors.request.use(async (config: InternalAxiosRequestConfig) => {
|
||||
@@ -136,5 +157,14 @@ api.interceptors.response.use(
|
||||
},
|
||||
);
|
||||
|
||||
export { getAccessToken, getRefreshToken, setTokens, clearTokens };
|
||||
const apiClient = api;
|
||||
|
||||
export {
|
||||
apiClient,
|
||||
getAccessToken,
|
||||
saveTokens,
|
||||
loadTokens,
|
||||
clearTokens,
|
||||
getApiBaseUrl,
|
||||
};
|
||||
export default api;
|
||||
+16
-35
@@ -1,54 +1,35 @@
|
||||
import { apiClient } from "./client";
|
||||
import { apiClient, getApiBaseUrl } from "./client";
|
||||
import type {
|
||||
EBookListItem,
|
||||
EBookDetail,
|
||||
ReadingProgress,
|
||||
ReadingSettings,
|
||||
TocResponse,
|
||||
ContentResponse,
|
||||
PaginatedResponse,
|
||||
} from "@cloud-reader/shared";
|
||||
|
||||
export const ebooksApi = {
|
||||
/** List uploaded e-books */
|
||||
/** List the authenticated user's uploaded e-books */
|
||||
list() {
|
||||
return apiClient.get<PaginatedResponse<EBookListItem>>("/api/ebooks/");
|
||||
return apiClient.get<PaginatedResponse<EBookListItem>>(
|
||||
"/api/books/ebooks/",
|
||||
);
|
||||
},
|
||||
|
||||
/** Get e-book detail */
|
||||
/** Get e-book detail (metadata, format, progress) */
|
||||
get(id: number) {
|
||||
return apiClient.get<EBookDetail>(`/api/ebooks/${id}/`);
|
||||
return apiClient.get<EBookDetail>(`/api/books/ebooks/${id}/`);
|
||||
},
|
||||
|
||||
/** Get table of contents */
|
||||
/** Get the table of contents (used as a fallback for chapter navigation) */
|
||||
getToc(id: number) {
|
||||
return apiClient.get<TocResponse>(`/api/ebooks/${id}/toc/`);
|
||||
return apiClient.get<TocResponse>(`/api/books/ebooks/${id}/toc/`);
|
||||
},
|
||||
|
||||
/** Get page content */
|
||||
getContent(id: number, page: number) {
|
||||
return apiClient.get<ContentResponse>(
|
||||
`/api/ebooks/${id}/content/?page=${page}`,
|
||||
);
|
||||
},
|
||||
|
||||
/** Update reading progress */
|
||||
updateProgress(id: number, data: Partial<ReadingProgress>) {
|
||||
return apiClient.patch<ReadingProgress>(
|
||||
`/api/ebooks/${id}/progress/`,
|
||||
data,
|
||||
);
|
||||
},
|
||||
|
||||
/** Get or update reading settings */
|
||||
getSettings(id: number) {
|
||||
return apiClient.get<ReadingSettings>(`/api/ebooks/${id}/settings/`);
|
||||
},
|
||||
|
||||
updateSettings(id: number, data: Partial<ReadingSettings>) {
|
||||
return apiClient.patch<ReadingSettings>(
|
||||
`/api/ebooks/${id}/settings/`,
|
||||
data,
|
||||
);
|
||||
/**
|
||||
* Absolute URL to stream the raw ebook file. The endpoint requires JWT auth,
|
||||
* so callers download it with an Authorization header (e.g. via
|
||||
* expo-file-system) rather than handing the URL to a renderer directly.
|
||||
*/
|
||||
getFileUrl(id: number): string {
|
||||
return `${getApiBaseUrl()}/api/books/ebooks/${id}/file/`;
|
||||
},
|
||||
};
|
||||
@@ -1,4 +0,0 @@
|
||||
export { apiClient, saveTokens, loadTokens, clearTokens } from "./client";
|
||||
export { booksApi } from "./books";
|
||||
export { ebooksApi } from "./ebooks";
|
||||
export { annotationsApi } from "./annotations";
|
||||
@@ -0,0 +1,75 @@
|
||||
/**
|
||||
* Reader API client — reading settings and per-book progress.
|
||||
* Mirrors frontend/src/api/reader.ts. Uses the shared axios client so the
|
||||
* JWT access token is attached automatically.
|
||||
*/
|
||||
|
||||
import api from "./client";
|
||||
import type { ReadingProgress, ReadingSettings } from "../types/reader";
|
||||
|
||||
export async function getReadingSettings(): Promise<ReadingSettings> {
|
||||
const { data } = await api.get<ReadingSettings>("/api/reader/settings/");
|
||||
return data;
|
||||
}
|
||||
|
||||
export async function updateReadingSettings(
|
||||
settings: Partial<ReadingSettings>,
|
||||
): Promise<ReadingSettings> {
|
||||
const { data } = await api.patch<ReadingSettings>(
|
||||
"/api/reader/settings/",
|
||||
settings,
|
||||
);
|
||||
return data;
|
||||
}
|
||||
|
||||
interface ProgressWire {
|
||||
current_position: number;
|
||||
last_page: number;
|
||||
epub_location?: string;
|
||||
updated_at?: string;
|
||||
}
|
||||
|
||||
function toReadingProgress(bookId: number, data: ProgressWire): ReadingProgress {
|
||||
return {
|
||||
id: bookId,
|
||||
book: bookId,
|
||||
current_chapter: data.last_page || 1,
|
||||
current_position: data.current_position ?? 0,
|
||||
percentage: data.current_position ?? 0,
|
||||
epub_location: data.epub_location ?? "",
|
||||
updated_at: data.updated_at ?? "",
|
||||
};
|
||||
}
|
||||
|
||||
export async function getReadingProgress(
|
||||
bookId: number,
|
||||
): Promise<ReadingProgress> {
|
||||
const { data } = await api.get<ProgressWire>(
|
||||
`/api/books/ebooks/${bookId}/progress/`,
|
||||
);
|
||||
return toReadingProgress(bookId, data);
|
||||
}
|
||||
|
||||
export async function updateReadingProgress(
|
||||
bookId: number,
|
||||
progress: Partial<ReadingProgress>,
|
||||
): Promise<ReadingProgress> {
|
||||
const body: Record<string, string | number> = {};
|
||||
if (
|
||||
progress.percentage !== undefined ||
|
||||
progress.current_position !== undefined
|
||||
) {
|
||||
body.current_position = progress.percentage ?? progress.current_position ?? 0;
|
||||
}
|
||||
if (progress.current_chapter !== undefined) {
|
||||
body.last_page = progress.current_chapter;
|
||||
}
|
||||
if (progress.epub_location !== undefined) {
|
||||
body.epub_location = progress.epub_location;
|
||||
}
|
||||
const { data } = await api.patch<ProgressWire>(
|
||||
`/api/books/ebooks/${bookId}/progress/`,
|
||||
body,
|
||||
);
|
||||
return toReadingProgress(bookId, data);
|
||||
}
|
||||
@@ -0,0 +1,147 @@
|
||||
import { type ReactNode } from "react";
|
||||
import {
|
||||
Text,
|
||||
FlatList,
|
||||
TouchableOpacity,
|
||||
StyleSheet,
|
||||
View,
|
||||
} from "react-native";
|
||||
import { resolvePalette } from "../../utils/epubTheme";
|
||||
import type { ReadingSettings } from "../../types/reader";
|
||||
import type { Bookmark } from "../../types";
|
||||
import { ReaderBottomSheet } from "./ReaderBottomSheet";
|
||||
|
||||
interface BookmarksModalProps {
|
||||
visible: boolean;
|
||||
bookmarks: Bookmark[];
|
||||
settings: ReadingSettings;
|
||||
onSelect: (bookmark: Bookmark) => void;
|
||||
onDelete: (bookmark: Bookmark) => void;
|
||||
onClose: () => void;
|
||||
}
|
||||
|
||||
export function BookmarksModal({
|
||||
visible,
|
||||
bookmarks,
|
||||
settings,
|
||||
onSelect,
|
||||
onDelete,
|
||||
onClose,
|
||||
}: BookmarksModalProps): ReactNode {
|
||||
const palette = resolvePalette(settings);
|
||||
|
||||
return (
|
||||
<ReaderBottomSheet
|
||||
visible={visible}
|
||||
title="Bookmarks & highlights"
|
||||
chromeColor={palette.chrome}
|
||||
textColor={palette.text}
|
||||
onClose={onClose}
|
||||
>
|
||||
<FlatList
|
||||
data={bookmarks}
|
||||
keyExtractor={(item) => item.id}
|
||||
ListEmptyComponent={
|
||||
<Text style={[styles.empty, { color: palette.text }]}>
|
||||
No bookmarks yet. Tap the star to bookmark a page, or select text to
|
||||
highlight it.
|
||||
</Text>
|
||||
}
|
||||
renderItem={({ item }) => (
|
||||
<View style={styles.row}>
|
||||
<TouchableOpacity
|
||||
style={styles.rowMain}
|
||||
onPress={() => onSelect(item)}
|
||||
>
|
||||
{item.highlight_color ? (
|
||||
<View
|
||||
style={[
|
||||
styles.dot,
|
||||
{ backgroundColor: item.highlight_color },
|
||||
]}
|
||||
/>
|
||||
) : (
|
||||
<Text style={styles.star}>★</Text>
|
||||
)}
|
||||
<View style={styles.rowTextWrap}>
|
||||
{item.chapter_title ? (
|
||||
<Text
|
||||
style={[styles.chapter, { color: palette.text }]}
|
||||
numberOfLines={1}
|
||||
>
|
||||
{item.chapter_title}
|
||||
</Text>
|
||||
) : null}
|
||||
<Text
|
||||
style={[styles.excerpt, { color: palette.text }]}
|
||||
numberOfLines={2}
|
||||
>
|
||||
{item.content || item.location_text || "Bookmarked page"}
|
||||
</Text>
|
||||
</View>
|
||||
</TouchableOpacity>
|
||||
<TouchableOpacity
|
||||
onPress={() => onDelete(item)}
|
||||
hitSlop={8}
|
||||
style={styles.deleteButton}
|
||||
>
|
||||
<Text style={styles.deleteText}>Delete</Text>
|
||||
</TouchableOpacity>
|
||||
</View>
|
||||
)}
|
||||
/>
|
||||
</ReaderBottomSheet>
|
||||
);
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
row: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
paddingVertical: 12,
|
||||
paddingHorizontal: 16,
|
||||
borderTopWidth: StyleSheet.hairlineWidth,
|
||||
borderTopColor: "rgba(127,127,127,0.2)",
|
||||
},
|
||||
rowMain: {
|
||||
flex: 1,
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
},
|
||||
rowTextWrap: {
|
||||
flex: 1,
|
||||
marginLeft: 10,
|
||||
},
|
||||
star: {
|
||||
fontSize: 16,
|
||||
color: "#4f8ef7",
|
||||
},
|
||||
dot: {
|
||||
width: 14,
|
||||
height: 14,
|
||||
borderRadius: 7,
|
||||
},
|
||||
chapter: {
|
||||
fontSize: 12,
|
||||
opacity: 0.7,
|
||||
marginBottom: 2,
|
||||
},
|
||||
excerpt: {
|
||||
fontSize: 14,
|
||||
},
|
||||
deleteButton: {
|
||||
marginLeft: 12,
|
||||
paddingHorizontal: 10,
|
||||
paddingVertical: 6,
|
||||
},
|
||||
deleteText: {
|
||||
color: "#ff453a",
|
||||
fontSize: 13,
|
||||
fontWeight: "600",
|
||||
},
|
||||
empty: {
|
||||
padding: 24,
|
||||
textAlign: "center",
|
||||
opacity: 0.7,
|
||||
},
|
||||
});
|
||||
@@ -0,0 +1,436 @@
|
||||
import { useCallback, useEffect, useRef, useState, type ReactNode } from "react";
|
||||
import {
|
||||
View,
|
||||
Text,
|
||||
ActivityIndicator,
|
||||
StyleSheet,
|
||||
type LayoutChangeEvent,
|
||||
} from "react-native";
|
||||
import { SafeAreaView } from "react-native-safe-area-context";
|
||||
import { Reader, ReaderProvider, useReader } from "@epubjs-react-native/core";
|
||||
import { useFileSystem } from "@epubjs-react-native/expo-file-system";
|
||||
import * as FileSystem from "expo-file-system";
|
||||
import type { EBookDetail } from "@cloud-reader/shared";
|
||||
import { getAccessToken } from "../../api/client";
|
||||
import { ebooksApi } from "../../api/ebooks";
|
||||
import { getReadingProgress, updateReadingProgress } from "../../api/reader";
|
||||
import {
|
||||
fetchBookmarks,
|
||||
createMarker,
|
||||
deleteBookmark,
|
||||
} from "../../api/annotations";
|
||||
import { useReadingSettings } from "../../hooks/useReadingSettings";
|
||||
import {
|
||||
buildEpubTheme,
|
||||
FONT_STACKS,
|
||||
resolvePalette,
|
||||
} from "../../utils/epubTheme";
|
||||
import type { Bookmark } from "../../types";
|
||||
import { ReaderToolbar } from "./ReaderToolbar";
|
||||
import { TocModal, type TocItem } from "./TocModal";
|
||||
import { ReadingSettingsModal } from "./ReadingSettingsModal";
|
||||
import { BookmarksModal } from "./BookmarksModal";
|
||||
|
||||
const HIGHLIGHT_COLOR = "#ffd54a";
|
||||
const PROGRESS_SAVE_MS = 800;
|
||||
|
||||
/** Loose view of the epubjs-react-native reader API we rely on. */
|
||||
interface ReaderApi {
|
||||
goToLocation?: (target: string) => void;
|
||||
changeTheme?: (theme: Record<string, Record<string, string>>) => void;
|
||||
changeFontSize?: (size: string) => void;
|
||||
changeFontFamily?: (font: string) => void;
|
||||
addAnnotation?: (
|
||||
type: string,
|
||||
cfiRange: string,
|
||||
data?: unknown,
|
||||
styles?: Record<string, unknown>,
|
||||
) => void;
|
||||
removeAnnotationByCfi?: (cfi: string) => void;
|
||||
removeSelection?: () => void;
|
||||
toc?: TocItem[];
|
||||
}
|
||||
|
||||
interface EpubLocation {
|
||||
start?: { cfi?: string };
|
||||
}
|
||||
|
||||
interface EpubSection {
|
||||
label?: string;
|
||||
index?: number;
|
||||
}
|
||||
|
||||
interface EpubReaderViewProps {
|
||||
book: EBookDetail;
|
||||
ebookId: number;
|
||||
onClose: () => void;
|
||||
}
|
||||
|
||||
export function EpubReaderView(props: EpubReaderViewProps): ReactNode {
|
||||
return (
|
||||
<ReaderProvider>
|
||||
<EpubReaderInner {...props} />
|
||||
</ReaderProvider>
|
||||
);
|
||||
}
|
||||
|
||||
function EpubReaderInner({
|
||||
book,
|
||||
ebookId,
|
||||
onClose,
|
||||
}: EpubReaderViewProps): ReactNode {
|
||||
const reader = useReader() as unknown as ReaderApi;
|
||||
const { settings, updateSettings } = useReadingSettings();
|
||||
|
||||
const [src, setSrc] = useState<string | null>(null);
|
||||
const [initialLocation, setInitialLocation] = useState<string | undefined>();
|
||||
const [fileError, setFileError] = useState(false);
|
||||
const [ready, setReady] = useState(false);
|
||||
const [size, setSize] = useState<{ width: number; height: number } | null>(
|
||||
null,
|
||||
);
|
||||
|
||||
const [progressPct, setProgressPct] = useState(
|
||||
Math.round(book.progress?.current_position ?? 0),
|
||||
);
|
||||
const [chapterTitle, setChapterTitle] = useState("");
|
||||
const [currentCfi, setCurrentCfi] = useState("");
|
||||
const [bookmarks, setBookmarks] = useState<Bookmark[]>([]);
|
||||
|
||||
const [tocOpen, setTocOpen] = useState(false);
|
||||
const [settingsOpen, setSettingsOpen] = useState(false);
|
||||
const [bookmarksOpen, setBookmarksOpen] = useState(false);
|
||||
|
||||
const currentCfiRef = useRef("");
|
||||
const progressPctRef = useRef(progressPct);
|
||||
const sectionRef = useRef<{ index: number; label: string }>({
|
||||
index: 0,
|
||||
label: "",
|
||||
});
|
||||
const bookmarksRef = useRef<Bookmark[]>([]);
|
||||
const saveTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
|
||||
|
||||
useEffect(() => {
|
||||
bookmarksRef.current = bookmarks;
|
||||
}, [bookmarks]);
|
||||
|
||||
// Download the EPUB with auth, and resolve the saved resume location.
|
||||
useEffect(() => {
|
||||
let active = true;
|
||||
(async () => {
|
||||
try {
|
||||
const progress = await getReadingProgress(ebookId).catch(() => null);
|
||||
if (active && progress?.epub_location) {
|
||||
setInitialLocation(progress.epub_location);
|
||||
currentCfiRef.current = progress.epub_location;
|
||||
setCurrentCfi(progress.epub_location);
|
||||
}
|
||||
const token = await getAccessToken();
|
||||
const url = ebooksApi.getFileUrl(ebookId);
|
||||
const dest = `${FileSystem.cacheDirectory}ebook-${ebookId}.epub`;
|
||||
const result = await FileSystem.downloadAsync(url, dest, {
|
||||
headers: token ? { Authorization: `Bearer ${token}` } : undefined,
|
||||
});
|
||||
if (!active) return;
|
||||
if (result.status >= 400) {
|
||||
setFileError(true);
|
||||
return;
|
||||
}
|
||||
setSrc(result.uri);
|
||||
} catch {
|
||||
if (active) setFileError(true);
|
||||
}
|
||||
})();
|
||||
return () => {
|
||||
active = false;
|
||||
};
|
||||
}, [ebookId]);
|
||||
|
||||
// Load existing bookmarks/highlights for this book.
|
||||
useEffect(() => {
|
||||
let active = true;
|
||||
fetchBookmarks(ebookId)
|
||||
.then((res) => {
|
||||
if (active) setBookmarks(res.results);
|
||||
})
|
||||
.catch(() => {
|
||||
/* bookmarks are optional */
|
||||
});
|
||||
return () => {
|
||||
active = false;
|
||||
};
|
||||
}, [ebookId]);
|
||||
|
||||
// Apply typography/theme to the rendition once it is ready and on changes.
|
||||
useEffect(() => {
|
||||
if (!ready) return;
|
||||
try {
|
||||
reader.changeTheme?.(buildEpubTheme(settings));
|
||||
reader.changeFontSize?.(`${settings.font_size}px`);
|
||||
reader.changeFontFamily?.(FONT_STACKS[settings.font_family]);
|
||||
} catch {
|
||||
/* ignore rendition styling errors */
|
||||
}
|
||||
}, [ready, settings, reader]);
|
||||
|
||||
const flushProgress = useCallback(() => {
|
||||
const cfi = currentCfiRef.current;
|
||||
if (!cfi) return;
|
||||
updateReadingProgress(ebookId, {
|
||||
percentage: progressPctRef.current,
|
||||
epub_location: cfi,
|
||||
current_chapter: sectionRef.current.index + 1,
|
||||
}).catch(() => {
|
||||
/* progress is best-effort */
|
||||
});
|
||||
}, [ebookId]);
|
||||
|
||||
// Flush the latest progress when leaving the reader.
|
||||
useEffect(
|
||||
() => () => {
|
||||
if (saveTimerRef.current) clearTimeout(saveTimerRef.current);
|
||||
flushProgress();
|
||||
},
|
||||
[flushProgress],
|
||||
);
|
||||
|
||||
const handleReady = useCallback(() => {
|
||||
setReady(true);
|
||||
bookmarksRef.current.forEach((bookmark) => {
|
||||
if (bookmark.highlight_color && bookmark.epub_cfi) {
|
||||
try {
|
||||
reader.addAnnotation?.("highlight", bookmark.epub_cfi, undefined, {
|
||||
fill: bookmark.highlight_color,
|
||||
});
|
||||
} catch {
|
||||
/* highlight rendering is best-effort */
|
||||
}
|
||||
}
|
||||
});
|
||||
}, [reader]);
|
||||
|
||||
const handleLocationChange = useCallback(
|
||||
(
|
||||
_total: number,
|
||||
location: EpubLocation,
|
||||
progress: number,
|
||||
section: EpubSection | null,
|
||||
) => {
|
||||
const cfi = location?.start?.cfi ?? "";
|
||||
if (cfi) {
|
||||
currentCfiRef.current = cfi;
|
||||
setCurrentCfi(cfi);
|
||||
}
|
||||
const pct = Math.round(progress ?? 0);
|
||||
progressPctRef.current = pct;
|
||||
setProgressPct(pct);
|
||||
const label = section?.label?.trim() ?? "";
|
||||
sectionRef.current = {
|
||||
index: section?.index ?? sectionRef.current.index,
|
||||
label,
|
||||
};
|
||||
setChapterTitle(label);
|
||||
|
||||
if (saveTimerRef.current) clearTimeout(saveTimerRef.current);
|
||||
saveTimerRef.current = setTimeout(flushProgress, PROGRESS_SAVE_MS);
|
||||
},
|
||||
[flushProgress],
|
||||
);
|
||||
|
||||
const handleSelected = useCallback(
|
||||
async (selectedText: string, cfiRange: string) => {
|
||||
const excerpt = (selectedText ?? "").slice(0, 280);
|
||||
try {
|
||||
const created = await createMarker({
|
||||
ebook: ebookId,
|
||||
epub_cfi: cfiRange,
|
||||
chapter_index: sectionRef.current.index,
|
||||
chapter_title: sectionRef.current.label,
|
||||
location_text: excerpt,
|
||||
content: excerpt,
|
||||
highlight_color: HIGHLIGHT_COLOR,
|
||||
});
|
||||
setBookmarks((prev) => [created, ...prev]);
|
||||
try {
|
||||
reader.addAnnotation?.("highlight", cfiRange, undefined, {
|
||||
fill: HIGHLIGHT_COLOR,
|
||||
});
|
||||
reader.removeSelection?.();
|
||||
} catch {
|
||||
/* annotation rendering is best-effort */
|
||||
}
|
||||
} catch {
|
||||
/* ignore highlight save failures */
|
||||
}
|
||||
},
|
||||
[ebookId, reader],
|
||||
);
|
||||
|
||||
const handleToggleBookmarkHere = useCallback(async () => {
|
||||
const cfi = currentCfiRef.current;
|
||||
if (!cfi) return;
|
||||
const existing = bookmarksRef.current.find((b) => b.epub_cfi === cfi);
|
||||
if (existing) {
|
||||
setBookmarks((prev) => prev.filter((b) => b.id !== existing.id));
|
||||
try {
|
||||
reader.removeAnnotationByCfi?.(cfi);
|
||||
} catch {
|
||||
/* best-effort */
|
||||
}
|
||||
deleteBookmark(existing.id).catch(() => {});
|
||||
return;
|
||||
}
|
||||
try {
|
||||
const created = await createMarker({
|
||||
ebook: ebookId,
|
||||
epub_cfi: cfi,
|
||||
chapter_index: sectionRef.current.index,
|
||||
chapter_title: sectionRef.current.label,
|
||||
location_text: sectionRef.current.label,
|
||||
});
|
||||
setBookmarks((prev) => [created, ...prev]);
|
||||
} catch {
|
||||
/* ignore bookmark save failures */
|
||||
}
|
||||
}, [ebookId, reader]);
|
||||
|
||||
const handleSelectBookmark = useCallback(
|
||||
(bookmark: Bookmark) => {
|
||||
setBookmarksOpen(false);
|
||||
try {
|
||||
reader.goToLocation?.(bookmark.epub_cfi);
|
||||
} catch {
|
||||
/* best-effort */
|
||||
}
|
||||
},
|
||||
[reader],
|
||||
);
|
||||
|
||||
const handleDeleteBookmark = useCallback(
|
||||
(bookmark: Bookmark) => {
|
||||
setBookmarks((prev) => prev.filter((b) => b.id !== bookmark.id));
|
||||
try {
|
||||
if (bookmark.highlight_color) {
|
||||
reader.removeAnnotationByCfi?.(bookmark.epub_cfi);
|
||||
}
|
||||
} catch {
|
||||
/* best-effort */
|
||||
}
|
||||
deleteBookmark(bookmark.id).catch(() => {});
|
||||
},
|
||||
[reader],
|
||||
);
|
||||
|
||||
const handleTocSelect = useCallback(
|
||||
(href: string) => {
|
||||
setTocOpen(false);
|
||||
try {
|
||||
reader.goToLocation?.(href);
|
||||
} catch {
|
||||
/* best-effort */
|
||||
}
|
||||
},
|
||||
[reader],
|
||||
);
|
||||
|
||||
const onReaderLayout = useCallback((event: LayoutChangeEvent) => {
|
||||
const { width, height } = event.nativeEvent.layout;
|
||||
setSize((prev) =>
|
||||
prev && prev.width === width && prev.height === height
|
||||
? prev
|
||||
: { width, height },
|
||||
);
|
||||
}, []);
|
||||
|
||||
const palette = resolvePalette(settings);
|
||||
const isBookmarked = bookmarks.some((b) => b.epub_cfi === currentCfi);
|
||||
|
||||
return (
|
||||
<SafeAreaView
|
||||
style={[styles.container, { backgroundColor: palette.background }]}
|
||||
edges={["top", "bottom"]}
|
||||
>
|
||||
<ReaderToolbar
|
||||
title={book.title}
|
||||
chapterTitle={chapterTitle}
|
||||
progressPct={progressPct}
|
||||
settings={settings}
|
||||
isBookmarked={isBookmarked}
|
||||
onBack={onClose}
|
||||
onToggleToc={() => setTocOpen(true)}
|
||||
onToggleSettings={() => setSettingsOpen(true)}
|
||||
onToggleBookmarks={() => setBookmarksOpen(true)}
|
||||
onToggleBookmarkHere={handleToggleBookmarkHere}
|
||||
/>
|
||||
|
||||
<View style={styles.readerArea} onLayout={onReaderLayout}>
|
||||
{fileError ? (
|
||||
<View style={styles.centered}>
|
||||
<Text style={[styles.message, { color: palette.text }]}>
|
||||
Could not download this book. Check your connection and try again.
|
||||
</Text>
|
||||
</View>
|
||||
) : src && size ? (
|
||||
<Reader
|
||||
src={src}
|
||||
fileSystem={useFileSystem}
|
||||
width={size.width}
|
||||
height={size.height}
|
||||
initialLocation={initialLocation}
|
||||
enableSelection
|
||||
flow="paginated"
|
||||
defaultTheme={buildEpubTheme(settings)}
|
||||
onReady={handleReady}
|
||||
onLocationChange={handleLocationChange}
|
||||
onSelected={handleSelected}
|
||||
/>
|
||||
) : (
|
||||
<View style={styles.centered}>
|
||||
<ActivityIndicator size="large" color="#4f8ef7" />
|
||||
</View>
|
||||
)}
|
||||
</View>
|
||||
|
||||
<TocModal
|
||||
visible={tocOpen}
|
||||
toc={reader.toc ?? []}
|
||||
settings={settings}
|
||||
onSelect={handleTocSelect}
|
||||
onClose={() => setTocOpen(false)}
|
||||
/>
|
||||
<ReadingSettingsModal
|
||||
visible={settingsOpen}
|
||||
settings={settings}
|
||||
onChange={updateSettings}
|
||||
onClose={() => setSettingsOpen(false)}
|
||||
/>
|
||||
<BookmarksModal
|
||||
visible={bookmarksOpen}
|
||||
bookmarks={bookmarks}
|
||||
settings={settings}
|
||||
onSelect={handleSelectBookmark}
|
||||
onDelete={handleDeleteBookmark}
|
||||
onClose={() => setBookmarksOpen(false)}
|
||||
/>
|
||||
</SafeAreaView>
|
||||
);
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
container: {
|
||||
flex: 1,
|
||||
},
|
||||
readerArea: {
|
||||
flex: 1,
|
||||
},
|
||||
centered: {
|
||||
flex: 1,
|
||||
justifyContent: "center",
|
||||
alignItems: "center",
|
||||
padding: 24,
|
||||
},
|
||||
message: {
|
||||
fontSize: 15,
|
||||
textAlign: "center",
|
||||
},
|
||||
});
|
||||
@@ -0,0 +1,92 @@
|
||||
import { type ReactNode } from "react";
|
||||
import {
|
||||
Modal,
|
||||
View,
|
||||
Text,
|
||||
TouchableOpacity,
|
||||
StyleSheet,
|
||||
type StyleProp,
|
||||
type ViewStyle,
|
||||
} from "react-native";
|
||||
|
||||
interface ReaderBottomSheetProps {
|
||||
visible: boolean;
|
||||
title: string;
|
||||
chromeColor: string;
|
||||
textColor: string;
|
||||
onClose: () => void;
|
||||
children: ReactNode;
|
||||
/** When true, caps sheet height (TOC/bookmarks). Settings uses a full-width panel. */
|
||||
tall?: boolean;
|
||||
sheetStyle?: StyleProp<ViewStyle>;
|
||||
}
|
||||
|
||||
export function ReaderBottomSheet({
|
||||
visible,
|
||||
title,
|
||||
chromeColor,
|
||||
textColor,
|
||||
onClose,
|
||||
children,
|
||||
tall = true,
|
||||
sheetStyle,
|
||||
}: ReaderBottomSheetProps): ReactNode {
|
||||
return (
|
||||
<Modal
|
||||
visible={visible}
|
||||
animationType="slide"
|
||||
transparent
|
||||
onRequestClose={onClose}
|
||||
>
|
||||
<View style={styles.backdrop}>
|
||||
<View
|
||||
style={[
|
||||
styles.sheet,
|
||||
tall && styles.sheetTall,
|
||||
{ backgroundColor: chromeColor },
|
||||
sheetStyle,
|
||||
]}
|
||||
>
|
||||
<View style={styles.header}>
|
||||
<Text style={[styles.headerTitle, { color: textColor }]}>
|
||||
{title}
|
||||
</Text>
|
||||
<TouchableOpacity onPress={onClose} hitSlop={12}>
|
||||
<Text style={[styles.close, { color: textColor }]}>✕</Text>
|
||||
</TouchableOpacity>
|
||||
</View>
|
||||
{children}
|
||||
</View>
|
||||
</View>
|
||||
</Modal>
|
||||
);
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
backdrop: {
|
||||
flex: 1,
|
||||
backgroundColor: "rgba(0,0,0,0.4)",
|
||||
justifyContent: "flex-end",
|
||||
},
|
||||
sheet: {
|
||||
borderTopLeftRadius: 16,
|
||||
borderTopRightRadius: 16,
|
||||
paddingBottom: 24,
|
||||
},
|
||||
sheetTall: {
|
||||
maxHeight: "75%",
|
||||
},
|
||||
header: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
justifyContent: "space-between",
|
||||
padding: 16,
|
||||
},
|
||||
headerTitle: {
|
||||
fontSize: 16,
|
||||
fontWeight: "700",
|
||||
},
|
||||
close: {
|
||||
fontSize: 18,
|
||||
},
|
||||
});
|
||||
@@ -0,0 +1,152 @@
|
||||
import { type ReactNode } from "react";
|
||||
import { View, Text, TouchableOpacity, StyleSheet } from "react-native";
|
||||
import { resolvePalette } from "../../utils/epubTheme";
|
||||
import type { ReadingSettings } from "../../types/reader";
|
||||
|
||||
interface ReaderToolbarProps {
|
||||
title: string;
|
||||
chapterTitle: string;
|
||||
progressPct: number;
|
||||
settings: ReadingSettings;
|
||||
isBookmarked: boolean;
|
||||
onBack: () => void;
|
||||
onToggleToc: () => void;
|
||||
onToggleSettings: () => void;
|
||||
onToggleBookmarks: () => void;
|
||||
onToggleBookmarkHere: () => void;
|
||||
}
|
||||
|
||||
export function ReaderToolbar({
|
||||
title,
|
||||
chapterTitle,
|
||||
progressPct,
|
||||
settings,
|
||||
isBookmarked,
|
||||
onBack,
|
||||
onToggleToc,
|
||||
onToggleSettings,
|
||||
onToggleBookmarks,
|
||||
onToggleBookmarkHere,
|
||||
}: ReaderToolbarProps): ReactNode {
|
||||
const palette = resolvePalette(settings);
|
||||
|
||||
return (
|
||||
<View style={[styles.bar, { backgroundColor: palette.chrome }]}>
|
||||
<View style={styles.row}>
|
||||
<TouchableOpacity
|
||||
onPress={onBack}
|
||||
hitSlop={12}
|
||||
style={styles.iconButton}
|
||||
>
|
||||
<Text style={[styles.icon, { color: palette.text }]}>‹</Text>
|
||||
</TouchableOpacity>
|
||||
|
||||
<View style={styles.titles}>
|
||||
<Text
|
||||
style={[styles.title, { color: palette.text }]}
|
||||
numberOfLines={1}
|
||||
>
|
||||
{title}
|
||||
</Text>
|
||||
{chapterTitle ? (
|
||||
<Text
|
||||
style={[styles.chapter, { color: palette.text }]}
|
||||
numberOfLines={1}
|
||||
>
|
||||
{chapterTitle}
|
||||
</Text>
|
||||
) : null}
|
||||
</View>
|
||||
|
||||
<TouchableOpacity
|
||||
onPress={onToggleBookmarkHere}
|
||||
hitSlop={12}
|
||||
style={styles.iconButton}
|
||||
>
|
||||
<Text style={[styles.icon, { color: palette.text }]}>
|
||||
{isBookmarked ? "★" : "☆"}
|
||||
</Text>
|
||||
</TouchableOpacity>
|
||||
<TouchableOpacity
|
||||
onPress={onToggleBookmarks}
|
||||
hitSlop={12}
|
||||
style={styles.iconButton}
|
||||
>
|
||||
<Text style={[styles.iconSmall, { color: palette.text }]}>≡</Text>
|
||||
</TouchableOpacity>
|
||||
<TouchableOpacity
|
||||
onPress={onToggleToc}
|
||||
hitSlop={12}
|
||||
style={styles.iconButton}
|
||||
>
|
||||
<Text style={[styles.iconSmall, { color: palette.text }]}>⊟</Text>
|
||||
</TouchableOpacity>
|
||||
<TouchableOpacity
|
||||
onPress={onToggleSettings}
|
||||
hitSlop={12}
|
||||
style={styles.iconButton}
|
||||
>
|
||||
<Text style={[styles.iconSmall, { color: palette.text }]}>Aa</Text>
|
||||
</TouchableOpacity>
|
||||
</View>
|
||||
|
||||
<View style={styles.progressTrack}>
|
||||
<View
|
||||
style={[
|
||||
styles.progressFill,
|
||||
{ width: `${Math.min(100, Math.max(0, progressPct))}%` },
|
||||
]}
|
||||
/>
|
||||
</View>
|
||||
</View>
|
||||
);
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
bar: {
|
||||
paddingTop: 8,
|
||||
paddingHorizontal: 8,
|
||||
paddingBottom: 6,
|
||||
},
|
||||
row: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
},
|
||||
titles: {
|
||||
flex: 1,
|
||||
marginHorizontal: 8,
|
||||
},
|
||||
title: {
|
||||
fontSize: 14,
|
||||
fontWeight: "600",
|
||||
},
|
||||
chapter: {
|
||||
fontSize: 11,
|
||||
opacity: 0.7,
|
||||
},
|
||||
iconButton: {
|
||||
paddingHorizontal: 8,
|
||||
paddingVertical: 4,
|
||||
minWidth: 28,
|
||||
alignItems: "center",
|
||||
},
|
||||
icon: {
|
||||
fontSize: 28,
|
||||
lineHeight: 30,
|
||||
},
|
||||
iconSmall: {
|
||||
fontSize: 17,
|
||||
fontWeight: "600",
|
||||
},
|
||||
progressTrack: {
|
||||
height: 3,
|
||||
borderRadius: 2,
|
||||
backgroundColor: "rgba(127,127,127,0.25)",
|
||||
marginTop: 6,
|
||||
overflow: "hidden",
|
||||
},
|
||||
progressFill: {
|
||||
height: "100%",
|
||||
backgroundColor: "#4f8ef7",
|
||||
},
|
||||
});
|
||||
@@ -0,0 +1,249 @@
|
||||
import { type ReactNode } from "react";
|
||||
import {
|
||||
View,
|
||||
Text,
|
||||
TouchableOpacity,
|
||||
StyleSheet,
|
||||
} from "react-native";
|
||||
import { resolvePalette, THEME_PALETTES } from "../../utils/epubTheme";
|
||||
import type {
|
||||
FontFamily,
|
||||
ReadingSettings,
|
||||
ThemePreset,
|
||||
} from "../../types/reader";
|
||||
import { ReaderBottomSheet } from "./ReaderBottomSheet";
|
||||
|
||||
const THEMES: ThemePreset[] = ["light", "sepia", "paper", "dark"];
|
||||
const FONTS: { value: FontFamily; label: string }[] = [
|
||||
{ value: "serif", label: "Serif" },
|
||||
{ value: "sans-serif", label: "Sans" },
|
||||
{ value: "monospace", label: "Mono" },
|
||||
];
|
||||
const FONT_SIZE_MIN = 12;
|
||||
const FONT_SIZE_MAX = 32;
|
||||
const LINE_HEIGHT_MIN = 1.2;
|
||||
const LINE_HEIGHT_MAX = 2.2;
|
||||
|
||||
interface ReadingSettingsModalProps {
|
||||
visible: boolean;
|
||||
settings: ReadingSettings;
|
||||
onChange: (patch: Partial<ReadingSettings>) => void;
|
||||
onClose: () => void;
|
||||
}
|
||||
|
||||
export function ReadingSettingsModal({
|
||||
visible,
|
||||
settings,
|
||||
onChange,
|
||||
onClose,
|
||||
}: ReadingSettingsModalProps): ReactNode {
|
||||
const palette = resolvePalette(settings);
|
||||
|
||||
const adjustFontSize = (delta: number) => {
|
||||
const next = Math.min(
|
||||
FONT_SIZE_MAX,
|
||||
Math.max(FONT_SIZE_MIN, settings.font_size + delta),
|
||||
);
|
||||
onChange({ font_size: next });
|
||||
};
|
||||
|
||||
const adjustLineHeight = (delta: number) => {
|
||||
const next = Math.min(
|
||||
LINE_HEIGHT_MAX,
|
||||
Math.max(
|
||||
LINE_HEIGHT_MIN,
|
||||
Math.round((settings.line_height + delta) * 10) / 10,
|
||||
),
|
||||
);
|
||||
onChange({ line_height: next });
|
||||
};
|
||||
|
||||
return (
|
||||
<ReaderBottomSheet
|
||||
visible={visible}
|
||||
title="Display"
|
||||
chromeColor={palette.chrome}
|
||||
textColor={palette.text}
|
||||
onClose={onClose}
|
||||
tall={false}
|
||||
sheetStyle={styles.sheetBody}
|
||||
>
|
||||
<Text style={[styles.sectionLabel, { color: palette.text }]}>Theme</Text>
|
||||
<View style={styles.rowWrap}>
|
||||
{THEMES.map((theme) => {
|
||||
const p = THEME_PALETTES[theme];
|
||||
const active = settings.theme === theme;
|
||||
return (
|
||||
<TouchableOpacity
|
||||
key={theme}
|
||||
onPress={() =>
|
||||
onChange({
|
||||
theme,
|
||||
background_color: p.background,
|
||||
text_color: p.text,
|
||||
})
|
||||
}
|
||||
style={[
|
||||
styles.themeSwatch,
|
||||
{ backgroundColor: p.background },
|
||||
active && styles.themeSwatchActive,
|
||||
]}
|
||||
>
|
||||
<Text style={[styles.themeSwatchText, { color: p.text }]}>
|
||||
Aa
|
||||
</Text>
|
||||
</TouchableOpacity>
|
||||
);
|
||||
})}
|
||||
</View>
|
||||
|
||||
<Text style={[styles.sectionLabel, { color: palette.text }]}>Font</Text>
|
||||
<View style={styles.rowWrap}>
|
||||
{FONTS.map((font) => {
|
||||
const active = settings.font_family === font.value;
|
||||
return (
|
||||
<TouchableOpacity
|
||||
key={font.value}
|
||||
onPress={() => onChange({ font_family: font.value })}
|
||||
style={[styles.pill, active && styles.pillActive]}
|
||||
>
|
||||
<Text
|
||||
style={[
|
||||
styles.pillText,
|
||||
{ color: active ? "#fff" : palette.text },
|
||||
]}
|
||||
>
|
||||
{font.label}
|
||||
</Text>
|
||||
</TouchableOpacity>
|
||||
);
|
||||
})}
|
||||
</View>
|
||||
|
||||
<Stepper
|
||||
label="Font size"
|
||||
value={`${settings.font_size}px`}
|
||||
color={palette.text}
|
||||
onDecrease={() => adjustFontSize(-1)}
|
||||
onIncrease={() => adjustFontSize(1)}
|
||||
/>
|
||||
<Stepper
|
||||
label="Line spacing"
|
||||
value={settings.line_height.toFixed(1)}
|
||||
color={palette.text}
|
||||
onDecrease={() => adjustLineHeight(-0.1)}
|
||||
onIncrease={() => adjustLineHeight(0.1)}
|
||||
/>
|
||||
</ReaderBottomSheet>
|
||||
);
|
||||
}
|
||||
|
||||
function Stepper({
|
||||
label,
|
||||
value,
|
||||
color,
|
||||
onDecrease,
|
||||
onIncrease,
|
||||
}: {
|
||||
label: string;
|
||||
value: string;
|
||||
color: string;
|
||||
onDecrease: () => void;
|
||||
onIncrease: () => void;
|
||||
}): ReactNode {
|
||||
return (
|
||||
<View style={styles.stepperRow}>
|
||||
<Text style={[styles.sectionLabel, { color, marginBottom: 0 }]}>
|
||||
{label}
|
||||
</Text>
|
||||
<View style={styles.stepperControls}>
|
||||
<TouchableOpacity style={styles.stepperButton} onPress={onDecrease}>
|
||||
<Text style={styles.stepperButtonText}>−</Text>
|
||||
</TouchableOpacity>
|
||||
<Text style={[styles.stepperValue, { color }]}>{value}</Text>
|
||||
<TouchableOpacity style={styles.stepperButton} onPress={onIncrease}>
|
||||
<Text style={styles.stepperButtonText}>+</Text>
|
||||
</TouchableOpacity>
|
||||
</View>
|
||||
</View>
|
||||
);
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
sheetBody: {
|
||||
paddingHorizontal: 20,
|
||||
paddingBottom: 32,
|
||||
},
|
||||
sectionLabel: {
|
||||
fontSize: 13,
|
||||
fontWeight: "600",
|
||||
marginBottom: 8,
|
||||
marginTop: 8,
|
||||
opacity: 0.8,
|
||||
},
|
||||
rowWrap: {
|
||||
flexDirection: "row",
|
||||
flexWrap: "wrap",
|
||||
gap: 10,
|
||||
},
|
||||
themeSwatch: {
|
||||
width: 56,
|
||||
height: 48,
|
||||
borderRadius: 10,
|
||||
justifyContent: "center",
|
||||
alignItems: "center",
|
||||
borderWidth: 2,
|
||||
borderColor: "transparent",
|
||||
},
|
||||
themeSwatchActive: {
|
||||
borderColor: "#4f8ef7",
|
||||
},
|
||||
themeSwatchText: {
|
||||
fontSize: 16,
|
||||
fontWeight: "600",
|
||||
},
|
||||
pill: {
|
||||
paddingHorizontal: 16,
|
||||
paddingVertical: 8,
|
||||
borderRadius: 20,
|
||||
borderWidth: 1,
|
||||
borderColor: "rgba(127,127,127,0.4)",
|
||||
},
|
||||
pillActive: {
|
||||
backgroundColor: "#4f8ef7",
|
||||
borderColor: "#4f8ef7",
|
||||
},
|
||||
pillText: {
|
||||
fontSize: 14,
|
||||
fontWeight: "600",
|
||||
},
|
||||
stepperRow: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
justifyContent: "space-between",
|
||||
marginTop: 16,
|
||||
},
|
||||
stepperControls: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
},
|
||||
stepperButton: {
|
||||
width: 36,
|
||||
height: 36,
|
||||
borderRadius: 18,
|
||||
backgroundColor: "rgba(127,127,127,0.2)",
|
||||
justifyContent: "center",
|
||||
alignItems: "center",
|
||||
},
|
||||
stepperButtonText: {
|
||||
fontSize: 20,
|
||||
fontWeight: "700",
|
||||
color: "#4f8ef7",
|
||||
},
|
||||
stepperValue: {
|
||||
minWidth: 56,
|
||||
textAlign: "center",
|
||||
fontSize: 15,
|
||||
fontWeight: "600",
|
||||
},
|
||||
});
|
||||
@@ -0,0 +1,111 @@
|
||||
import { type ReactNode } from "react";
|
||||
import {
|
||||
Text,
|
||||
FlatList,
|
||||
TouchableOpacity,
|
||||
StyleSheet,
|
||||
} from "react-native";
|
||||
import { resolvePalette } from "../../utils/epubTheme";
|
||||
import type { ReadingSettings } from "../../types/reader";
|
||||
import { ReaderBottomSheet } from "./ReaderBottomSheet";
|
||||
|
||||
export interface TocItem {
|
||||
id?: string;
|
||||
label: string;
|
||||
href: string;
|
||||
subitems?: TocItem[];
|
||||
}
|
||||
|
||||
interface FlatTocItem {
|
||||
key: string;
|
||||
label: string;
|
||||
href: string;
|
||||
depth: number;
|
||||
}
|
||||
|
||||
function flatten(items: TocItem[], depth = 0, acc: FlatTocItem[] = []) {
|
||||
items.forEach((item, index) => {
|
||||
acc.push({
|
||||
key: `${item.id ?? item.href}-${depth}-${index}`,
|
||||
label: (item.label ?? "").trim() || "Untitled section",
|
||||
href: item.href,
|
||||
depth,
|
||||
});
|
||||
if (item.subitems?.length) {
|
||||
flatten(item.subitems, depth + 1, acc);
|
||||
}
|
||||
});
|
||||
return acc;
|
||||
}
|
||||
|
||||
interface TocModalProps {
|
||||
visible: boolean;
|
||||
toc: TocItem[];
|
||||
settings: ReadingSettings;
|
||||
onSelect: (href: string) => void;
|
||||
onClose: () => void;
|
||||
}
|
||||
|
||||
export function TocModal({
|
||||
visible,
|
||||
toc,
|
||||
settings,
|
||||
onSelect,
|
||||
onClose,
|
||||
}: TocModalProps): ReactNode {
|
||||
const palette = resolvePalette(settings);
|
||||
const data = flatten(toc);
|
||||
|
||||
return (
|
||||
<ReaderBottomSheet
|
||||
visible={visible}
|
||||
title="Contents"
|
||||
chromeColor={palette.chrome}
|
||||
textColor={palette.text}
|
||||
onClose={onClose}
|
||||
>
|
||||
<FlatList
|
||||
data={data}
|
||||
keyExtractor={(item) => item.key}
|
||||
ListEmptyComponent={
|
||||
<Text style={[styles.empty, { color: palette.text }]}>
|
||||
No table of contents available.
|
||||
</Text>
|
||||
}
|
||||
renderItem={({ item }) => (
|
||||
<TouchableOpacity
|
||||
style={styles.row}
|
||||
onPress={() => onSelect(item.href)}
|
||||
>
|
||||
<Text
|
||||
style={[
|
||||
styles.rowText,
|
||||
{ color: palette.text, marginLeft: item.depth * 16 },
|
||||
]}
|
||||
numberOfLines={2}
|
||||
>
|
||||
{item.label}
|
||||
</Text>
|
||||
</TouchableOpacity>
|
||||
)}
|
||||
/>
|
||||
</ReaderBottomSheet>
|
||||
);
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
row: {
|
||||
paddingVertical: 12,
|
||||
paddingHorizontal: 16,
|
||||
borderTopWidth: StyleSheet.hairlineWidth,
|
||||
borderTopColor: "rgba(127,127,127,0.2)",
|
||||
},
|
||||
rowText: {
|
||||
fontSize: 14,
|
||||
},
|
||||
empty: {
|
||||
padding: 24,
|
||||
textAlign: "center",
|
||||
opacity: 0.7,
|
||||
},
|
||||
});
|
||||
@@ -1,2 +0,0 @@
|
||||
export { useAuth } from "../context/AuthContext";
|
||||
export { useAsyncData } from "./useAsyncData";
|
||||
@@ -1,33 +0,0 @@
|
||||
import { useState, useEffect, useCallback } from "react";
|
||||
|
||||
/**
|
||||
* Generic async data fetching hook for mobile screens.
|
||||
*/
|
||||
export function useAsyncData<T>(
|
||||
fetcher: () => Promise<T>,
|
||||
deps: unknown[] = [],
|
||||
) {
|
||||
const [data, setData] = useState<T | null>(null);
|
||||
const [loading, setLoading] = useState(true);
|
||||
const [error, setError] = useState<Error | null>(null);
|
||||
|
||||
const execute = useCallback(async () => {
|
||||
setLoading(true);
|
||||
setError(null);
|
||||
try {
|
||||
const result = await fetcher();
|
||||
setData(result);
|
||||
} catch (err) {
|
||||
setError(err instanceof Error ? err : new Error(String(err)));
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||
}, deps);
|
||||
|
||||
useEffect(() => {
|
||||
execute();
|
||||
}, [execute]);
|
||||
|
||||
return { data, loading, error, refetch: execute };
|
||||
}
|
||||
@@ -0,0 +1,82 @@
|
||||
import { useCallback, useEffect, useRef, useState } from "react";
|
||||
import {
|
||||
getReadingSettings,
|
||||
updateReadingSettings,
|
||||
} from "../api/reader";
|
||||
import type { ReadingSettings } from "../types/reader";
|
||||
|
||||
const DEFAULT_READING_SETTINGS: ReadingSettings = {
|
||||
font_family: "serif",
|
||||
font_size: 18,
|
||||
line_height: 1.5,
|
||||
margin_width: 16,
|
||||
background_color: "#fbfbf8",
|
||||
text_color: "#2b2b2b",
|
||||
brightness: 1,
|
||||
orientation_lock: "auto",
|
||||
theme: "paper",
|
||||
created_at: "",
|
||||
updated_at: "",
|
||||
};
|
||||
|
||||
const SAVE_DEBOUNCE_MS = 600;
|
||||
|
||||
interface UseReadingSettingsReturn {
|
||||
settings: ReadingSettings;
|
||||
loaded: boolean;
|
||||
updateSettings: (patch: Partial<ReadingSettings>) => void;
|
||||
}
|
||||
|
||||
/**
|
||||
* Loads the user's reader settings and persists changes with a debounce.
|
||||
* Mirrors frontend/src/hooks/useReadingSettings.ts behavior.
|
||||
*/
|
||||
export function useReadingSettings(): UseReadingSettingsReturn {
|
||||
const [settings, setSettings] = useState<ReadingSettings>(
|
||||
DEFAULT_READING_SETTINGS,
|
||||
);
|
||||
const [loaded, setLoaded] = useState(false);
|
||||
const pendingRef = useRef<Partial<ReadingSettings>>({});
|
||||
const timerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
|
||||
|
||||
useEffect(() => {
|
||||
let active = true;
|
||||
getReadingSettings()
|
||||
.then((data) => {
|
||||
if (active) {
|
||||
setSettings(data);
|
||||
}
|
||||
})
|
||||
.catch(() => {
|
||||
/* keep defaults if the request fails */
|
||||
})
|
||||
.finally(() => {
|
||||
if (active) {
|
||||
setLoaded(true);
|
||||
}
|
||||
});
|
||||
return () => {
|
||||
active = false;
|
||||
if (timerRef.current) {
|
||||
clearTimeout(timerRef.current);
|
||||
}
|
||||
};
|
||||
}, []);
|
||||
|
||||
const updateSettings = useCallback((patch: Partial<ReadingSettings>) => {
|
||||
setSettings((prev) => ({ ...prev, ...patch }));
|
||||
pendingRef.current = { ...pendingRef.current, ...patch };
|
||||
if (timerRef.current) {
|
||||
clearTimeout(timerRef.current);
|
||||
}
|
||||
timerRef.current = setTimeout(() => {
|
||||
const body = pendingRef.current;
|
||||
pendingRef.current = {};
|
||||
updateReadingSettings(body).catch(() => {
|
||||
/* ignore transient save failures */
|
||||
});
|
||||
}, SAVE_DEBOUNCE_MS);
|
||||
}, []);
|
||||
|
||||
return { settings, loaded, updateSettings };
|
||||
}
|
||||
@@ -1,45 +0,0 @@
|
||||
import { type ReactNode } from "react";
|
||||
import { NavigationContainer } from "@react-navigation/native";
|
||||
import { createNativeStackNavigator } from "@react-navigation/native-stack";
|
||||
import { useAuth } from "../context/AuthContext";
|
||||
import LoginScreen from "../screens/LoginScreen";
|
||||
import RegisterScreen from "../screens/RegisterScreen";
|
||||
import MainTabs from "./MainTabs";
|
||||
|
||||
export type AuthStackParamList = {
|
||||
Login: undefined;
|
||||
Register: undefined;
|
||||
};
|
||||
|
||||
export type RootStackParamList = {
|
||||
Auth: undefined;
|
||||
Main: undefined;
|
||||
};
|
||||
|
||||
const RootStack = createNativeStackNavigator<RootStackParamList>();
|
||||
const AuthStack = createNativeStackNavigator<AuthStackParamList>();
|
||||
|
||||
function AuthNavigator(): ReactNode {
|
||||
return (
|
||||
<AuthStack.Navigator screenOptions={{ headerShown: false }}>
|
||||
<AuthStack.Screen name="Login" component={LoginScreen} />
|
||||
<AuthStack.Screen name="Register" component={RegisterScreen} />
|
||||
</AuthStack.Navigator>
|
||||
);
|
||||
}
|
||||
|
||||
export default function AppNavigator(): ReactNode {
|
||||
const { state } = useAuth();
|
||||
|
||||
return (
|
||||
<NavigationContainer>
|
||||
<RootStack.Navigator screenOptions={{ headerShown: false }}>
|
||||
{state.isAuthenticated ? (
|
||||
<RootStack.Screen name="Main" component={MainTabs} />
|
||||
) : (
|
||||
<RootStack.Screen name="Auth" component={AuthNavigator} />
|
||||
)}
|
||||
</RootStack.Navigator>
|
||||
</NavigationContainer>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,36 @@
|
||||
import React from "react";
|
||||
import { createNativeStackNavigator } from "@react-navigation/native-stack";
|
||||
import { MainNavigator } from "./MainNavigator";
|
||||
import BookDetailScreen from "../screens/BookDetailScreen";
|
||||
import ReaderScreen from "../screens/ReaderScreen";
|
||||
import type { AppStackParamList } from "../types";
|
||||
|
||||
const Stack = createNativeStackNavigator<AppStackParamList>();
|
||||
|
||||
export function AppStack() {
|
||||
return (
|
||||
<Stack.Navigator
|
||||
screenOptions={{
|
||||
headerStyle: { backgroundColor: "#fff" },
|
||||
headerTitleStyle: { fontWeight: "600", color: "#1a1a2e" },
|
||||
headerTintColor: "#4a6cf7",
|
||||
}}
|
||||
>
|
||||
<Stack.Screen
|
||||
name="Tabs"
|
||||
component={MainNavigator}
|
||||
options={{ headerShown: false }}
|
||||
/>
|
||||
<Stack.Screen
|
||||
name="BookDetail"
|
||||
component={BookDetailScreen}
|
||||
options={{ title: "" }}
|
||||
/>
|
||||
<Stack.Screen
|
||||
name="Reader"
|
||||
component={ReaderScreen}
|
||||
options={{ headerShown: false }}
|
||||
/>
|
||||
</Stack.Navigator>
|
||||
);
|
||||
}
|
||||
@@ -3,7 +3,7 @@ import { createNativeStackNavigator } from "@react-navigation/native-stack";
|
||||
import LoginScreen from "../screens/LoginScreen";
|
||||
import RegisterScreen from "../screens/RegisterScreen";
|
||||
|
||||
export type AuthStackParamList = {
|
||||
type AuthStackParamList = {
|
||||
Login: undefined;
|
||||
Register: undefined;
|
||||
};
|
||||
|
||||
@@ -1,55 +0,0 @@
|
||||
import { type ReactNode } from "react";
|
||||
import { createBottomTabNavigator } from "@react-navigation/bottom-tabs";
|
||||
import { Text } from "react-native";
|
||||
import LibraryScreen from "../screens/LibraryScreen";
|
||||
import SearchScreen from "../screens/SearchScreen";
|
||||
import SettingsScreen from "../screens/SettingsScreen";
|
||||
|
||||
export type MainTabParamList = {
|
||||
Library: undefined;
|
||||
Search: undefined;
|
||||
Settings: undefined;
|
||||
};
|
||||
|
||||
const Tab = createBottomTabNavigator<MainTabParamList>();
|
||||
|
||||
function TabIcon({ label, focused }: { label: string; focused: boolean }) {
|
||||
return (
|
||||
<Text style={{ fontSize: 22, opacity: focused ? 1 : 0.5 }}>
|
||||
{label === "Library" ? "📚" : label === "Search" ? "🔍" : "⚙️"}
|
||||
</Text>
|
||||
);
|
||||
}
|
||||
|
||||
export default function MainTabs(): ReactNode {
|
||||
return (
|
||||
<Tab.Navigator
|
||||
screenOptions={({ route }) => ({
|
||||
tabBarIcon: ({ focused }: { focused: boolean }) => (
|
||||
<TabIcon label={route.name} focused={focused} />
|
||||
),
|
||||
tabBarActiveTintColor: "#4f8ef7",
|
||||
tabBarInactiveTintColor: "#888",
|
||||
headerStyle: { backgroundColor: "#1a1a2e" },
|
||||
headerTintColor: "#fff",
|
||||
tabBarStyle: { backgroundColor: "#1a1a2e", borderTopColor: "#333" },
|
||||
})}
|
||||
>
|
||||
<Tab.Screen
|
||||
name="Library"
|
||||
component={LibraryScreen}
|
||||
options={{ title: "My Library" }}
|
||||
/>
|
||||
<Tab.Screen
|
||||
name="Search"
|
||||
component={SearchScreen}
|
||||
options={{ title: "Search" }}
|
||||
/>
|
||||
<Tab.Screen
|
||||
name="Settings"
|
||||
component={SettingsScreen}
|
||||
options={{ title: "Settings" }}
|
||||
/>
|
||||
</Tab.Navigator>
|
||||
);
|
||||
}
|
||||
@@ -2,7 +2,7 @@ import React from "react";
|
||||
import { ActivityIndicator, View } from "react-native";
|
||||
import { useAuth } from "../context/AuthContext";
|
||||
import { AuthNavigator } from "./AuthNavigator";
|
||||
import { MainNavigator } from "./MainNavigator";
|
||||
import { AppStack } from "./AppStack";
|
||||
|
||||
export function RootNavigator() {
|
||||
const { isLoading, isAuthenticated } = useAuth();
|
||||
@@ -19,5 +19,5 @@ export function RootNavigator() {
|
||||
return <AuthNavigator />;
|
||||
}
|
||||
|
||||
return <MainNavigator />;
|
||||
return <AppStack />;
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
import { type ReactNode } from "react";
|
||||
import { View, Text } from "react-native";
|
||||
import { authStyles } from "./authStyles";
|
||||
|
||||
export function AuthFormError({ message }: { message: string }): ReactNode {
|
||||
return (
|
||||
<View style={authStyles.errorBox}>
|
||||
<Text style={authStyles.errorText}>{message}</Text>
|
||||
</View>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,226 @@
|
||||
import { useState, useEffect, useCallback, type ReactNode } from "react";
|
||||
import {
|
||||
View,
|
||||
Text,
|
||||
Image,
|
||||
ScrollView,
|
||||
TouchableOpacity,
|
||||
StyleSheet,
|
||||
ActivityIndicator,
|
||||
} from "react-native";
|
||||
import type { RouteProp } from "@react-navigation/native";
|
||||
import { ebooksApi } from "../api/ebooks";
|
||||
import { formatFileSize } from "@cloud-reader/shared";
|
||||
import type { EBookDetail } from "@cloud-reader/shared";
|
||||
import type { AppStackParamList } from "../types";
|
||||
|
||||
type DetailRoute = RouteProp<AppStackParamList, "BookDetail">;
|
||||
|
||||
export default function BookDetailScreen({
|
||||
route,
|
||||
navigation,
|
||||
}: {
|
||||
route: DetailRoute;
|
||||
navigation: any;
|
||||
}): ReactNode {
|
||||
const { ebookId } = route.params;
|
||||
const [book, setBook] = useState<EBookDetail | null>(null);
|
||||
const [loading, setLoading] = useState(true);
|
||||
const [error, setError] = useState(false);
|
||||
|
||||
const load = useCallback(async () => {
|
||||
try {
|
||||
const { data } = await ebooksApi.get(ebookId);
|
||||
setBook(data);
|
||||
} catch {
|
||||
setError(true);
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
}, [ebookId]);
|
||||
|
||||
useEffect(() => {
|
||||
load();
|
||||
}, [load]);
|
||||
|
||||
if (loading) {
|
||||
return (
|
||||
<View style={styles.centered}>
|
||||
<ActivityIndicator size="large" color="#4f8ef7" />
|
||||
</View>
|
||||
);
|
||||
}
|
||||
|
||||
if (error || !book) {
|
||||
return (
|
||||
<View style={styles.centered}>
|
||||
<Text style={styles.errorText}>Could not load this book.</Text>
|
||||
</View>
|
||||
);
|
||||
}
|
||||
|
||||
const progressPct =
|
||||
typeof book.progress?.current_position === "number"
|
||||
? Math.round(book.progress.current_position)
|
||||
: 0;
|
||||
const hasProgress = progressPct > 0;
|
||||
|
||||
return (
|
||||
<ScrollView style={styles.container} contentContainerStyle={styles.content}>
|
||||
<View style={styles.header}>
|
||||
{book.cover_image ? (
|
||||
<Image source={{ uri: book.cover_image }} style={styles.cover} />
|
||||
) : (
|
||||
<View style={styles.cover}>
|
||||
<Text style={styles.coverText}>
|
||||
{book.title.charAt(0).toUpperCase()}
|
||||
</Text>
|
||||
</View>
|
||||
)}
|
||||
<Text style={styles.title}>{book.title}</Text>
|
||||
<Text style={styles.author}>{book.author || "Unknown author"}</Text>
|
||||
</View>
|
||||
|
||||
<View style={styles.metaRow}>
|
||||
<MetaPill label="Format" value={book.format?.toUpperCase() || "—"} />
|
||||
<MetaPill
|
||||
label="Pages"
|
||||
value={book.page_count ? String(book.page_count) : "—"}
|
||||
/>
|
||||
<MetaPill label="Size" value={formatFileSize(book.file_size || 0)} />
|
||||
</View>
|
||||
|
||||
{hasProgress && (
|
||||
<View style={styles.progressWrap}>
|
||||
<View style={styles.progressTrack}>
|
||||
<View style={[styles.progressFill, { width: `${progressPct}%` }]} />
|
||||
</View>
|
||||
<Text style={styles.progressLabel}>{progressPct}% read</Text>
|
||||
</View>
|
||||
)}
|
||||
|
||||
<TouchableOpacity
|
||||
style={styles.readButton}
|
||||
onPress={() => navigation.navigate("Reader", { ebookId: book.id })}
|
||||
>
|
||||
<Text style={styles.readButtonText}>
|
||||
{hasProgress ? "Resume reading" : "Start reading"}
|
||||
</Text>
|
||||
</TouchableOpacity>
|
||||
</ScrollView>
|
||||
);
|
||||
}
|
||||
|
||||
function MetaPill({ label, value }: { label: string; value: string }): ReactNode {
|
||||
return (
|
||||
<View style={styles.metaPill}>
|
||||
<Text style={styles.metaValue}>{value}</Text>
|
||||
<Text style={styles.metaLabel}>{label}</Text>
|
||||
</View>
|
||||
);
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
container: {
|
||||
flex: 1,
|
||||
backgroundColor: "#0f0f23",
|
||||
},
|
||||
content: {
|
||||
padding: 24,
|
||||
},
|
||||
centered: {
|
||||
flex: 1,
|
||||
justifyContent: "center",
|
||||
alignItems: "center",
|
||||
backgroundColor: "#0f0f23",
|
||||
padding: 24,
|
||||
},
|
||||
header: {
|
||||
alignItems: "center",
|
||||
marginBottom: 24,
|
||||
},
|
||||
cover: {
|
||||
width: 140,
|
||||
height: 200,
|
||||
borderRadius: 12,
|
||||
backgroundColor: "#2a2a4e",
|
||||
justifyContent: "center",
|
||||
alignItems: "center",
|
||||
marginBottom: 16,
|
||||
},
|
||||
coverText: {
|
||||
fontSize: 56,
|
||||
fontWeight: "bold",
|
||||
color: "#4f8ef7",
|
||||
},
|
||||
title: {
|
||||
fontSize: 22,
|
||||
fontWeight: "700",
|
||||
color: "#fff",
|
||||
textAlign: "center",
|
||||
marginBottom: 6,
|
||||
},
|
||||
author: {
|
||||
fontSize: 15,
|
||||
color: "#888",
|
||||
textAlign: "center",
|
||||
},
|
||||
metaRow: {
|
||||
flexDirection: "row",
|
||||
justifyContent: "space-between",
|
||||
marginBottom: 24,
|
||||
},
|
||||
metaPill: {
|
||||
flex: 1,
|
||||
backgroundColor: "#1a1a2e",
|
||||
borderRadius: 10,
|
||||
paddingVertical: 12,
|
||||
marginHorizontal: 4,
|
||||
alignItems: "center",
|
||||
borderWidth: 1,
|
||||
borderColor: "#333",
|
||||
},
|
||||
metaValue: {
|
||||
fontSize: 15,
|
||||
fontWeight: "600",
|
||||
color: "#fff",
|
||||
},
|
||||
metaLabel: {
|
||||
fontSize: 12,
|
||||
color: "#666",
|
||||
marginTop: 2,
|
||||
},
|
||||
progressWrap: {
|
||||
marginBottom: 24,
|
||||
},
|
||||
progressTrack: {
|
||||
height: 6,
|
||||
borderRadius: 3,
|
||||
backgroundColor: "#1a1a2e",
|
||||
overflow: "hidden",
|
||||
},
|
||||
progressFill: {
|
||||
height: "100%",
|
||||
backgroundColor: "#4f8ef7",
|
||||
},
|
||||
progressLabel: {
|
||||
fontSize: 12,
|
||||
color: "#888",
|
||||
marginTop: 6,
|
||||
},
|
||||
readButton: {
|
||||
backgroundColor: "#4f8ef7",
|
||||
borderRadius: 10,
|
||||
paddingVertical: 16,
|
||||
alignItems: "center",
|
||||
},
|
||||
readButtonText: {
|
||||
color: "#fff",
|
||||
fontSize: 16,
|
||||
fontWeight: "600",
|
||||
},
|
||||
errorText: {
|
||||
color: "#888",
|
||||
fontSize: 15,
|
||||
},
|
||||
});
|
||||
@@ -2,34 +2,31 @@ import { useState, useEffect, useCallback, type ReactNode } from "react";
|
||||
import {
|
||||
View,
|
||||
Text,
|
||||
Image,
|
||||
FlatList,
|
||||
TouchableOpacity,
|
||||
StyleSheet,
|
||||
ActivityIndicator,
|
||||
RefreshControl,
|
||||
} from "react-native";
|
||||
import { fetchBooks } from "../api/books";
|
||||
import type { Book, PaginatedResponse } from "@cloud-reader/shared";
|
||||
import { ebooksApi } from "../api/ebooks";
|
||||
import type { EBookListItem } from "@cloud-reader/shared";
|
||||
|
||||
export default function LibraryScreen({ navigation }: { navigation: any }): ReactNode {
|
||||
const [books, setBooks] = useState<Book[]>([]);
|
||||
export default function LibraryScreen({
|
||||
navigation,
|
||||
}: {
|
||||
navigation: any;
|
||||
}): ReactNode {
|
||||
const [books, setBooks] = useState<EBookListItem[]>([]);
|
||||
const [loading, setLoading] = useState(true);
|
||||
const [refreshing, setRefreshing] = useState(false);
|
||||
const [page, setPage] = useState(1);
|
||||
const [hasMore, setHasMore] = useState(true);
|
||||
|
||||
const loadBooks = useCallback(async (pageNum: number, isRefresh = false) => {
|
||||
const loadBooks = useCallback(async () => {
|
||||
try {
|
||||
const data: PaginatedResponse<Book> = await fetchBooks(pageNum);
|
||||
if (isRefresh) {
|
||||
const { data } = await ebooksApi.list();
|
||||
setBooks(data.results);
|
||||
} else {
|
||||
setBooks((prev) => [...prev, ...data.results]);
|
||||
}
|
||||
setHasMore(data.next !== null);
|
||||
setPage(pageNum);
|
||||
} catch {
|
||||
// Silent error for now
|
||||
// Silent error for now; pull-to-refresh lets the user retry.
|
||||
} finally {
|
||||
setLoading(false);
|
||||
setRefreshing(false);
|
||||
@@ -37,43 +34,48 @@ export default function LibraryScreen({ navigation }: { navigation: any }): Reac
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
loadBooks(1, true);
|
||||
loadBooks();
|
||||
}, [loadBooks]);
|
||||
|
||||
const onRefresh = () => {
|
||||
setRefreshing(true);
|
||||
loadBooks(1, true);
|
||||
loadBooks();
|
||||
};
|
||||
|
||||
const loadMore = () => {
|
||||
if (hasMore && !loading) {
|
||||
loadBooks(page + 1);
|
||||
}
|
||||
};
|
||||
|
||||
const renderBook = ({ item }: { item: Book }) => (
|
||||
const renderBook = ({ item }: { item: EBookListItem }) => {
|
||||
const progress =
|
||||
typeof item.progress === "number"
|
||||
? Math.round(item.progress)
|
||||
: null;
|
||||
return (
|
||||
<TouchableOpacity
|
||||
style={styles.bookCard}
|
||||
onPress={() =>
|
||||
navigation.navigate("BookDetail", { bookId: item.id })
|
||||
}
|
||||
onPress={() => navigation.navigate("BookDetail", { ebookId: item.id })}
|
||||
>
|
||||
{item.cover_image ? (
|
||||
<Image source={{ uri: item.cover_image }} style={styles.bookCover} />
|
||||
) : (
|
||||
<View style={styles.bookCover}>
|
||||
<Text style={styles.coverText}>
|
||||
{item.title.charAt(0).toUpperCase()}
|
||||
</Text>
|
||||
</View>
|
||||
)}
|
||||
<View style={styles.bookInfo}>
|
||||
<Text style={styles.bookTitle} numberOfLines={1}>
|
||||
<Text style={styles.bookTitle} numberOfLines={2}>
|
||||
{item.title}
|
||||
</Text>
|
||||
<Text style={styles.bookAuthor} numberOfLines={1}>
|
||||
{item.author}
|
||||
{item.author || "Unknown author"}
|
||||
</Text>
|
||||
<Text style={styles.bookMeta}>
|
||||
{item.format?.toUpperCase()}
|
||||
{progress !== null ? ` · ${progress}% read` : ""}
|
||||
</Text>
|
||||
<Text style={styles.bookPages}>{item.total_pages} pages</Text>
|
||||
</View>
|
||||
</TouchableOpacity>
|
||||
);
|
||||
};
|
||||
|
||||
if (loading && books.length === 0) {
|
||||
return (
|
||||
@@ -88,9 +90,7 @@ export default function LibraryScreen({ navigation }: { navigation: any }): Reac
|
||||
<FlatList
|
||||
data={books}
|
||||
renderItem={renderBook}
|
||||
keyExtractor={(item) => item.id}
|
||||
onEndReached={loadMore}
|
||||
onEndReachedThreshold={0.5}
|
||||
keyExtractor={(item) => String(item.id)}
|
||||
contentContainerStyle={styles.list}
|
||||
refreshControl={
|
||||
<RefreshControl
|
||||
@@ -103,7 +103,7 @@ export default function LibraryScreen({ navigation }: { navigation: any }): Reac
|
||||
<View style={styles.centered}>
|
||||
<Text style={styles.emptyText}>Your library is empty</Text>
|
||||
<Text style={styles.emptySubtext}>
|
||||
Add books to get started
|
||||
Upload books from the web app to get started
|
||||
</Text>
|
||||
</View>
|
||||
}
|
||||
@@ -125,6 +125,7 @@ const styles = StyleSheet.create({
|
||||
},
|
||||
list: {
|
||||
padding: 16,
|
||||
flexGrow: 1,
|
||||
},
|
||||
bookCard: {
|
||||
flexDirection: "row",
|
||||
@@ -164,7 +165,7 @@ const styles = StyleSheet.create({
|
||||
color: "#888",
|
||||
marginBottom: 4,
|
||||
},
|
||||
bookPages: {
|
||||
bookMeta: {
|
||||
fontSize: 12,
|
||||
color: "#666",
|
||||
},
|
||||
@@ -177,5 +178,6 @@ const styles = StyleSheet.create({
|
||||
emptySubtext: {
|
||||
fontSize: 14,
|
||||
color: "#666",
|
||||
textAlign: "center",
|
||||
},
|
||||
});
|
||||
@@ -4,29 +4,31 @@ import {
|
||||
Text,
|
||||
TextInput,
|
||||
TouchableOpacity,
|
||||
StyleSheet,
|
||||
Alert,
|
||||
ActivityIndicator,
|
||||
KeyboardAvoidingView,
|
||||
Platform,
|
||||
} from "react-native";
|
||||
import { useAuth } from "../context/AuthContext";
|
||||
import { isValidEmail } from "@cloud-reader/shared";
|
||||
import { authStyles } from "./authStyles";
|
||||
import { AuthFormError } from "./AuthFormError";
|
||||
import { requireValidEmail } from "./authValidation";
|
||||
|
||||
export default function LoginScreen({ navigation }: { navigation: any }): ReactNode {
|
||||
const { state, login, clearError } = useAuth();
|
||||
export default function LoginScreen({
|
||||
navigation,
|
||||
}: {
|
||||
navigation: any;
|
||||
}): ReactNode {
|
||||
const { login } = useAuth();
|
||||
const [email, setEmail] = useState("");
|
||||
const [password, setPassword] = useState("");
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
const [submitting, setSubmitting] = useState(false);
|
||||
|
||||
const handleLogin = async () => {
|
||||
clearError();
|
||||
setError(null);
|
||||
|
||||
if (!email.trim()) {
|
||||
Alert.alert("Validation Error", "Please enter your email.");
|
||||
return;
|
||||
}
|
||||
if (!isValidEmail(email.trim())) {
|
||||
Alert.alert("Validation Error", "Please enter a valid email address.");
|
||||
if (!requireValidEmail(email)) {
|
||||
return;
|
||||
}
|
||||
if (!password) {
|
||||
@@ -34,30 +36,29 @@ export default function LoginScreen({ navigation }: { navigation: any }): ReactN
|
||||
return;
|
||||
}
|
||||
|
||||
setSubmitting(true);
|
||||
try {
|
||||
await login(email.trim(), password);
|
||||
} catch {
|
||||
// Error handled in context
|
||||
setError("Invalid email or password.");
|
||||
} finally {
|
||||
setSubmitting(false);
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<KeyboardAvoidingView
|
||||
style={styles.container}
|
||||
style={authStyles.container}
|
||||
behavior={Platform.OS === "ios" ? "padding" : "height"}
|
||||
>
|
||||
<View style={styles.inner}>
|
||||
<Text style={styles.title}>Cloud Reader</Text>
|
||||
<Text style={styles.subtitle}>Sign in to your account</Text>
|
||||
<View style={authStyles.inner}>
|
||||
<Text style={authStyles.title}>Cloud Reader</Text>
|
||||
<Text style={authStyles.subtitle}>Sign in to your account</Text>
|
||||
|
||||
{state.error && (
|
||||
<View style={styles.errorBox}>
|
||||
<Text style={styles.errorText}>{state.error}</Text>
|
||||
</View>
|
||||
)}
|
||||
{error ? <AuthFormError message={error} /> : null}
|
||||
|
||||
<TextInput
|
||||
style={styles.input}
|
||||
style={authStyles.input}
|
||||
placeholder="Email"
|
||||
placeholderTextColor="#666"
|
||||
value={email}
|
||||
@@ -68,7 +69,7 @@ export default function LoginScreen({ navigation }: { navigation: any }): ReactN
|
||||
/>
|
||||
|
||||
<TextInput
|
||||
style={styles.input}
|
||||
style={authStyles.input}
|
||||
placeholder="Password"
|
||||
placeholderTextColor="#666"
|
||||
value={password}
|
||||
@@ -77,97 +78,24 @@ export default function LoginScreen({ navigation }: { navigation: any }): ReactN
|
||||
/>
|
||||
|
||||
<TouchableOpacity
|
||||
style={[styles.button, state.isLoading && styles.buttonDisabled]}
|
||||
style={[authStyles.button, submitting && authStyles.buttonDisabled]}
|
||||
onPress={handleLogin}
|
||||
disabled={state.isLoading}
|
||||
disabled={submitting}
|
||||
>
|
||||
{state.isLoading ? (
|
||||
{submitting ? (
|
||||
<ActivityIndicator color="#fff" />
|
||||
) : (
|
||||
<Text style={styles.buttonText}>Sign In</Text>
|
||||
<Text style={authStyles.buttonText}>Sign In</Text>
|
||||
)}
|
||||
</TouchableOpacity>
|
||||
|
||||
<TouchableOpacity onPress={() => navigation.navigate("Register")}>
|
||||
<Text style={styles.linkText}>
|
||||
<Text style={authStyles.linkText}>
|
||||
Don't have an account?{" "}
|
||||
<Text style={styles.linkBold}>Sign Up</Text>
|
||||
<Text style={authStyles.linkBold}>Sign Up</Text>
|
||||
</Text>
|
||||
</TouchableOpacity>
|
||||
</View>
|
||||
</KeyboardAvoidingView>
|
||||
);
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
container: {
|
||||
flex: 1,
|
||||
backgroundColor: "#0f0f23",
|
||||
},
|
||||
inner: {
|
||||
flex: 1,
|
||||
justifyContent: "center",
|
||||
paddingHorizontal: 24,
|
||||
},
|
||||
title: {
|
||||
fontSize: 32,
|
||||
fontWeight: "bold",
|
||||
color: "#fff",
|
||||
textAlign: "center",
|
||||
marginBottom: 8,
|
||||
},
|
||||
subtitle: {
|
||||
fontSize: 16,
|
||||
color: "#888",
|
||||
textAlign: "center",
|
||||
marginBottom: 32,
|
||||
},
|
||||
input: {
|
||||
backgroundColor: "#1a1a2e",
|
||||
borderRadius: 8,
|
||||
padding: 16,
|
||||
fontSize: 16,
|
||||
color: "#fff",
|
||||
marginBottom: 12,
|
||||
borderWidth: 1,
|
||||
borderColor: "#333",
|
||||
},
|
||||
button: {
|
||||
backgroundColor: "#4f8ef7",
|
||||
borderRadius: 8,
|
||||
padding: 16,
|
||||
alignItems: "center",
|
||||
marginTop: 8,
|
||||
marginBottom: 24,
|
||||
},
|
||||
buttonDisabled: {
|
||||
opacity: 0.6,
|
||||
},
|
||||
buttonText: {
|
||||
color: "#fff",
|
||||
fontSize: 16,
|
||||
fontWeight: "600",
|
||||
},
|
||||
errorBox: {
|
||||
backgroundColor: "rgba(255, 69, 58, 0.15)",
|
||||
borderRadius: 8,
|
||||
padding: 12,
|
||||
marginBottom: 16,
|
||||
borderWidth: 1,
|
||||
borderColor: "rgba(255, 69, 58, 0.3)",
|
||||
},
|
||||
errorText: {
|
||||
color: "#ff453a",
|
||||
fontSize: 14,
|
||||
textAlign: "center",
|
||||
},
|
||||
linkText: {
|
||||
color: "#888",
|
||||
textAlign: "center",
|
||||
fontSize: 14,
|
||||
},
|
||||
linkBold: {
|
||||
color: "#4f8ef7",
|
||||
fontWeight: "600",
|
||||
},
|
||||
});
|
||||
@@ -0,0 +1,133 @@
|
||||
import { useEffect, useState, type ReactNode } from "react";
|
||||
import {
|
||||
View,
|
||||
Text,
|
||||
TouchableOpacity,
|
||||
ActivityIndicator,
|
||||
StyleSheet,
|
||||
} from "react-native";
|
||||
import { SafeAreaView } from "react-native-safe-area-context";
|
||||
import type { RouteProp } from "@react-navigation/native";
|
||||
import type { EBookDetail } from "@cloud-reader/shared";
|
||||
import { ebooksApi } from "../api/ebooks";
|
||||
import { EpubReaderView } from "../components/reader/EpubReaderView";
|
||||
import type { AppStackParamList } from "../types";
|
||||
|
||||
type ReaderRoute = RouteProp<AppStackParamList, "Reader">;
|
||||
|
||||
export default function ReaderScreen({
|
||||
route,
|
||||
navigation,
|
||||
}: {
|
||||
route: ReaderRoute;
|
||||
navigation: any;
|
||||
}): ReactNode {
|
||||
const { ebookId } = route.params;
|
||||
const [book, setBook] = useState<EBookDetail | null>(null);
|
||||
const [loading, setLoading] = useState(true);
|
||||
const [error, setError] = useState(false);
|
||||
|
||||
useEffect(() => {
|
||||
let active = true;
|
||||
ebooksApi
|
||||
.get(ebookId)
|
||||
.then(({ data }) => {
|
||||
if (active) setBook(data);
|
||||
})
|
||||
.catch(() => {
|
||||
if (active) setError(true);
|
||||
})
|
||||
.finally(() => {
|
||||
if (active) setLoading(false);
|
||||
});
|
||||
return () => {
|
||||
active = false;
|
||||
};
|
||||
}, [ebookId]);
|
||||
|
||||
if (loading) {
|
||||
return (
|
||||
<View style={styles.centered}>
|
||||
<ActivityIndicator size="large" color="#4f8ef7" />
|
||||
</View>
|
||||
);
|
||||
}
|
||||
|
||||
if (error || !book) {
|
||||
return (
|
||||
<SafeAreaView style={styles.centered} edges={["top", "bottom"]}>
|
||||
<Text style={styles.message}>Could not open this book.</Text>
|
||||
<TouchableOpacity
|
||||
style={styles.backButton}
|
||||
onPress={() => navigation.goBack()}
|
||||
>
|
||||
<Text style={styles.backText}>Go back</Text>
|
||||
</TouchableOpacity>
|
||||
</SafeAreaView>
|
||||
);
|
||||
}
|
||||
|
||||
const format = (book.format ?? "").toLowerCase();
|
||||
|
||||
if (format !== "epub") {
|
||||
return (
|
||||
<SafeAreaView style={styles.centered} edges={["top", "bottom"]}>
|
||||
<Text style={styles.placeholderTitle}>PDF reading is coming soon</Text>
|
||||
<Text style={styles.message}>
|
||||
“{book.title}” is a {format.toUpperCase() || "non-EPUB"} file. PDF
|
||||
reading isn't available on mobile yet — open it in the web reader
|
||||
for now.
|
||||
</Text>
|
||||
<TouchableOpacity
|
||||
style={styles.backButton}
|
||||
onPress={() => navigation.goBack()}
|
||||
>
|
||||
<Text style={styles.backText}>Go back</Text>
|
||||
</TouchableOpacity>
|
||||
</SafeAreaView>
|
||||
);
|
||||
}
|
||||
|
||||
return (
|
||||
<EpubReaderView
|
||||
book={book}
|
||||
ebookId={ebookId}
|
||||
onClose={() => navigation.goBack()}
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
centered: {
|
||||
flex: 1,
|
||||
justifyContent: "center",
|
||||
alignItems: "center",
|
||||
backgroundColor: "#0f0f23",
|
||||
padding: 24,
|
||||
},
|
||||
placeholderTitle: {
|
||||
fontSize: 20,
|
||||
fontWeight: "700",
|
||||
color: "#fff",
|
||||
marginBottom: 12,
|
||||
textAlign: "center",
|
||||
},
|
||||
message: {
|
||||
fontSize: 15,
|
||||
color: "#aaa",
|
||||
textAlign: "center",
|
||||
lineHeight: 22,
|
||||
},
|
||||
backButton: {
|
||||
marginTop: 24,
|
||||
backgroundColor: "#4f8ef7",
|
||||
borderRadius: 10,
|
||||
paddingHorizontal: 24,
|
||||
paddingVertical: 12,
|
||||
},
|
||||
backText: {
|
||||
color: "#fff",
|
||||
fontSize: 15,
|
||||
fontWeight: "600",
|
||||
},
|
||||
});
|
||||
@@ -1,10 +1,8 @@
|
||||
import { useState, type ReactNode } from "react";
|
||||
import {
|
||||
View,
|
||||
Text,
|
||||
TextInput,
|
||||
TouchableOpacity,
|
||||
StyleSheet,
|
||||
Alert,
|
||||
ActivityIndicator,
|
||||
KeyboardAvoidingView,
|
||||
@@ -12,40 +10,39 @@ import {
|
||||
ScrollView,
|
||||
} from "react-native";
|
||||
import { useAuth } from "../context/AuthContext";
|
||||
import {
|
||||
isValidEmail,
|
||||
validatePasswordStrength,
|
||||
} from "@cloud-reader/shared";
|
||||
import { isStrongPassword } from "@cloud-reader/shared";
|
||||
import { authStyles } from "./authStyles";
|
||||
import { AuthFormError } from "./AuthFormError";
|
||||
import { requireValidEmail } from "./authValidation";
|
||||
|
||||
export default function RegisterScreen({
|
||||
navigation,
|
||||
}: {
|
||||
navigation: any;
|
||||
}): ReactNode {
|
||||
const { state, register, clearError } = useAuth();
|
||||
const { register } = useAuth();
|
||||
const [username, setUsername] = useState("");
|
||||
const [email, setEmail] = useState("");
|
||||
const [password, setPassword] = useState("");
|
||||
const [confirmPassword, setConfirmPassword] = useState("");
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
const [submitting, setSubmitting] = useState(false);
|
||||
|
||||
const handleRegister = async () => {
|
||||
clearError();
|
||||
setError(null);
|
||||
|
||||
if (!username.trim()) {
|
||||
Alert.alert("Validation Error", "Please enter a username.");
|
||||
return;
|
||||
}
|
||||
if (!email.trim()) {
|
||||
Alert.alert("Validation Error", "Please enter your email.");
|
||||
if (!requireValidEmail(email)) {
|
||||
return;
|
||||
}
|
||||
if (!isValidEmail(email.trim())) {
|
||||
Alert.alert("Validation Error", "Please enter a valid email address.");
|
||||
return;
|
||||
}
|
||||
const passwordError = validatePasswordStrength(password);
|
||||
if (passwordError) {
|
||||
Alert.alert("Validation Error", passwordError);
|
||||
if (!isStrongPassword(password)) {
|
||||
Alert.alert(
|
||||
"Validation Error",
|
||||
"Password must be at least 8 characters and include uppercase, lowercase, and a number.",
|
||||
);
|
||||
return;
|
||||
}
|
||||
if (password !== confirmPassword) {
|
||||
@@ -53,30 +50,29 @@ export default function RegisterScreen({
|
||||
return;
|
||||
}
|
||||
|
||||
setSubmitting(true);
|
||||
try {
|
||||
await register(email.trim(), password, username.trim());
|
||||
await register(email.trim(), username.trim(), password);
|
||||
} catch {
|
||||
// Error handled in context
|
||||
setError("Could not create the account. Try a different email.");
|
||||
} finally {
|
||||
setSubmitting(false);
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<KeyboardAvoidingView
|
||||
style={styles.container}
|
||||
style={authStyles.container}
|
||||
behavior={Platform.OS === "ios" ? "padding" : "height"}
|
||||
>
|
||||
<ScrollView contentContainerStyle={styles.inner}>
|
||||
<Text style={styles.title}>Create Account</Text>
|
||||
<Text style={styles.subtitle}>Join Cloud Reader</Text>
|
||||
<ScrollView contentContainerStyle={authStyles.innerScroll}>
|
||||
<Text style={authStyles.titleCompact}>Create Account</Text>
|
||||
<Text style={authStyles.subtitle}>Join Cloud Reader</Text>
|
||||
|
||||
{state.error && (
|
||||
<View style={styles.errorBox}>
|
||||
<Text style={styles.errorText}>{state.error}</Text>
|
||||
</View>
|
||||
)}
|
||||
{error ? <AuthFormError message={error} /> : null}
|
||||
|
||||
<TextInput
|
||||
style={styles.input}
|
||||
style={authStyles.input}
|
||||
placeholder="Username"
|
||||
placeholderTextColor="#666"
|
||||
value={username}
|
||||
@@ -86,7 +82,7 @@ export default function RegisterScreen({
|
||||
/>
|
||||
|
||||
<TextInput
|
||||
style={styles.input}
|
||||
style={authStyles.input}
|
||||
placeholder="Email"
|
||||
placeholderTextColor="#666"
|
||||
value={email}
|
||||
@@ -97,7 +93,7 @@ export default function RegisterScreen({
|
||||
/>
|
||||
|
||||
<TextInput
|
||||
style={styles.input}
|
||||
style={authStyles.input}
|
||||
placeholder="Password"
|
||||
placeholderTextColor="#666"
|
||||
value={password}
|
||||
@@ -106,7 +102,7 @@ export default function RegisterScreen({
|
||||
/>
|
||||
|
||||
<TextInput
|
||||
style={styles.input}
|
||||
style={authStyles.input}
|
||||
placeholder="Confirm Password"
|
||||
placeholderTextColor="#666"
|
||||
value={confirmPassword}
|
||||
@@ -115,98 +111,24 @@ export default function RegisterScreen({
|
||||
/>
|
||||
|
||||
<TouchableOpacity
|
||||
style={[styles.button, state.isLoading && styles.buttonDisabled]}
|
||||
style={[authStyles.button, submitting && authStyles.buttonDisabled]}
|
||||
onPress={handleRegister}
|
||||
disabled={state.isLoading}
|
||||
disabled={submitting}
|
||||
>
|
||||
{state.isLoading ? (
|
||||
{submitting ? (
|
||||
<ActivityIndicator color="#fff" />
|
||||
) : (
|
||||
<Text style={styles.buttonText}>Create Account</Text>
|
||||
<Text style={authStyles.buttonText}>Create Account</Text>
|
||||
)}
|
||||
</TouchableOpacity>
|
||||
|
||||
<TouchableOpacity onPress={() => navigation.goBack()}>
|
||||
<Text style={styles.linkText}>
|
||||
<Text style={authStyles.linkText}>
|
||||
Already have an account?{" "}
|
||||
<Text style={styles.linkBold}>Sign In</Text>
|
||||
<Text style={authStyles.linkBold}>Sign In</Text>
|
||||
</Text>
|
||||
</TouchableOpacity>
|
||||
</ScrollView>
|
||||
</KeyboardAvoidingView>
|
||||
);
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
container: {
|
||||
flex: 1,
|
||||
backgroundColor: "#0f0f23",
|
||||
},
|
||||
inner: {
|
||||
flexGrow: 1,
|
||||
justifyContent: "center",
|
||||
paddingHorizontal: 24,
|
||||
paddingVertical: 48,
|
||||
},
|
||||
title: {
|
||||
fontSize: 28,
|
||||
fontWeight: "bold",
|
||||
color: "#fff",
|
||||
textAlign: "center",
|
||||
marginBottom: 8,
|
||||
},
|
||||
subtitle: {
|
||||
fontSize: 16,
|
||||
color: "#888",
|
||||
textAlign: "center",
|
||||
marginBottom: 32,
|
||||
},
|
||||
input: {
|
||||
backgroundColor: "#1a1a2e",
|
||||
borderRadius: 8,
|
||||
padding: 16,
|
||||
fontSize: 16,
|
||||
color: "#fff",
|
||||
marginBottom: 12,
|
||||
borderWidth: 1,
|
||||
borderColor: "#333",
|
||||
},
|
||||
button: {
|
||||
backgroundColor: "#4f8ef7",
|
||||
borderRadius: 8,
|
||||
padding: 16,
|
||||
alignItems: "center",
|
||||
marginTop: 8,
|
||||
marginBottom: 24,
|
||||
},
|
||||
buttonDisabled: {
|
||||
opacity: 0.6,
|
||||
},
|
||||
buttonText: {
|
||||
color: "#fff",
|
||||
fontSize: 16,
|
||||
fontWeight: "600",
|
||||
},
|
||||
errorBox: {
|
||||
backgroundColor: "rgba(255, 69, 58, 0.15)",
|
||||
borderRadius: 8,
|
||||
padding: 12,
|
||||
marginBottom: 16,
|
||||
borderWidth: 1,
|
||||
borderColor: "rgba(255, 69, 58, 0.3)",
|
||||
},
|
||||
errorText: {
|
||||
color: "#ff453a",
|
||||
fontSize: 14,
|
||||
textAlign: "center",
|
||||
},
|
||||
linkText: {
|
||||
color: "#888",
|
||||
textAlign: "center",
|
||||
fontSize: 14,
|
||||
},
|
||||
linkBold: {
|
||||
color: "#4f8ef7",
|
||||
fontWeight: "600",
|
||||
},
|
||||
});
|
||||
@@ -9,7 +9,7 @@ import {
|
||||
import { useAuth } from "../context/AuthContext";
|
||||
|
||||
export default function SettingsScreen(): ReactNode {
|
||||
const { state, logout } = useAuth();
|
||||
const { user, logout } = useAuth();
|
||||
|
||||
const handleLogout = () => {
|
||||
Alert.alert("Logout", "Are you sure you want to sign out?", [
|
||||
@@ -24,11 +24,11 @@ export default function SettingsScreen(): ReactNode {
|
||||
<Text style={styles.sectionTitle}>Account</Text>
|
||||
<View style={styles.infoRow}>
|
||||
<Text style={styles.label}>Username</Text>
|
||||
<Text style={styles.value}>{state.user?.username ?? "—"}</Text>
|
||||
<Text style={styles.value}>{user?.username ?? "—"}</Text>
|
||||
</View>
|
||||
<View style={styles.infoRow}>
|
||||
<Text style={styles.label}>Email</Text>
|
||||
<Text style={styles.value}>{state.user?.email ?? "—"}</Text>
|
||||
<Text style={styles.value}>{user?.email ?? "—"}</Text>
|
||||
</View>
|
||||
</View>
|
||||
|
||||
|
||||
@@ -0,0 +1,88 @@
|
||||
import { StyleSheet } from "react-native";
|
||||
|
||||
/** Shared layout/styles for Login and Register screens. */
|
||||
export const authStyles = StyleSheet.create({
|
||||
container: {
|
||||
flex: 1,
|
||||
backgroundColor: "#0f0f23",
|
||||
},
|
||||
inner: {
|
||||
flex: 1,
|
||||
justifyContent: "center",
|
||||
paddingHorizontal: 24,
|
||||
},
|
||||
innerScroll: {
|
||||
flexGrow: 1,
|
||||
justifyContent: "center",
|
||||
paddingHorizontal: 24,
|
||||
paddingVertical: 48,
|
||||
},
|
||||
title: {
|
||||
fontSize: 32,
|
||||
fontWeight: "bold",
|
||||
color: "#fff",
|
||||
textAlign: "center",
|
||||
marginBottom: 8,
|
||||
},
|
||||
titleCompact: {
|
||||
fontSize: 28,
|
||||
fontWeight: "bold",
|
||||
color: "#fff",
|
||||
textAlign: "center",
|
||||
marginBottom: 8,
|
||||
},
|
||||
subtitle: {
|
||||
fontSize: 16,
|
||||
color: "#888",
|
||||
textAlign: "center",
|
||||
marginBottom: 32,
|
||||
},
|
||||
input: {
|
||||
backgroundColor: "#1a1a2e",
|
||||
borderRadius: 8,
|
||||
padding: 16,
|
||||
fontSize: 16,
|
||||
color: "#fff",
|
||||
marginBottom: 12,
|
||||
borderWidth: 1,
|
||||
borderColor: "#333",
|
||||
},
|
||||
button: {
|
||||
backgroundColor: "#4f8ef7",
|
||||
borderRadius: 8,
|
||||
padding: 16,
|
||||
alignItems: "center",
|
||||
marginTop: 8,
|
||||
marginBottom: 24,
|
||||
},
|
||||
buttonDisabled: {
|
||||
opacity: 0.6,
|
||||
},
|
||||
buttonText: {
|
||||
color: "#fff",
|
||||
fontSize: 16,
|
||||
fontWeight: "600",
|
||||
},
|
||||
errorBox: {
|
||||
backgroundColor: "rgba(255, 69, 58, 0.15)",
|
||||
borderRadius: 8,
|
||||
padding: 12,
|
||||
marginBottom: 16,
|
||||
borderWidth: 1,
|
||||
borderColor: "rgba(255, 69, 58, 0.3)",
|
||||
},
|
||||
errorText: {
|
||||
color: "#ff453a",
|
||||
fontSize: 14,
|
||||
textAlign: "center",
|
||||
},
|
||||
linkText: {
|
||||
color: "#888",
|
||||
textAlign: "center",
|
||||
fontSize: 14,
|
||||
},
|
||||
linkBold: {
|
||||
color: "#4f8ef7",
|
||||
fontWeight: "600",
|
||||
},
|
||||
});
|
||||
@@ -0,0 +1,15 @@
|
||||
import { Alert } from "react-native";
|
||||
import { isValidEmail } from "@cloud-reader/shared";
|
||||
|
||||
/** Returns true when email is non-empty and well-formed. */
|
||||
export function requireValidEmail(email: string): boolean {
|
||||
if (!email.trim()) {
|
||||
Alert.alert("Validation Error", "Please enter your email.");
|
||||
return false;
|
||||
}
|
||||
if (!isValidEmail(email.trim())) {
|
||||
Alert.alert("Validation Error", "Please enter a valid email address.");
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
@@ -1,8 +1,37 @@
|
||||
// Mobile-specific type aliases and extensions not covered by shared types
|
||||
|
||||
export type RootStackParamList = {
|
||||
Auth: undefined;
|
||||
Main: undefined;
|
||||
BookReader: { bookId: number };
|
||||
BookDetail: { bookId: number };
|
||||
import type { NavigatorScreenParams } from "@react-navigation/native";
|
||||
import type { MainTabParamList } from "../navigation/MainNavigator";
|
||||
|
||||
/** Stack hosted above the bottom tabs once the user is authenticated. */
|
||||
export type AppStackParamList = {
|
||||
Tabs: NavigatorScreenParams<MainTabParamList> | undefined;
|
||||
BookDetail: { ebookId: number };
|
||||
Reader: { ebookId: number };
|
||||
};
|
||||
|
||||
/** EPUB bookmark/highlight, mirrors frontend/src/types Bookmark. */
|
||||
export interface Bookmark {
|
||||
id: string;
|
||||
ebook: number;
|
||||
ebook_title: string;
|
||||
epub_cfi: string;
|
||||
chapter_index: number;
|
||||
chapter_title: string;
|
||||
page: number;
|
||||
location_text: string;
|
||||
content: string;
|
||||
highlight_color?: string;
|
||||
created_at: string;
|
||||
updated_at: string;
|
||||
}
|
||||
|
||||
export interface CreateMarkerPayload {
|
||||
ebook: number;
|
||||
epub_cfi: string;
|
||||
chapter_index: number;
|
||||
chapter_title?: string;
|
||||
location_text?: string;
|
||||
content?: string;
|
||||
highlight_color?: string;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
/**
|
||||
* Reader module types for the mobile app. Mirrors
|
||||
* frontend/src/types/reader.ts so settings and progress behave the same
|
||||
* way across web and mobile.
|
||||
*/
|
||||
|
||||
export interface ReadingSettings {
|
||||
font_family: "sans-serif" | "serif" | "monospace";
|
||||
font_size: number;
|
||||
line_height: number;
|
||||
margin_width: number;
|
||||
background_color: string;
|
||||
text_color: string;
|
||||
brightness: number;
|
||||
orientation_lock: "auto" | "portrait" | "landscape";
|
||||
theme: "sepia" | "dark" | "light" | "paper";
|
||||
created_at: string;
|
||||
updated_at: string;
|
||||
}
|
||||
|
||||
export type ThemePreset = ReadingSettings["theme"];
|
||||
export type FontFamily = ReadingSettings["font_family"];
|
||||
|
||||
export interface ReadingProgress {
|
||||
id: number;
|
||||
book: number;
|
||||
current_chapter: number;
|
||||
current_position: number;
|
||||
percentage: number;
|
||||
epub_location: string;
|
||||
updated_at: string;
|
||||
}
|
||||
@@ -0,0 +1,66 @@
|
||||
import type { ReadingSettings, ThemePreset } from "../types/reader";
|
||||
|
||||
/** CSS font stacks per family, mirrors frontend/src/utils/epubRendition.ts. */
|
||||
export const FONT_STACKS: Record<ReadingSettings["font_family"], string> = {
|
||||
serif: 'Georgia, "Times New Roman", serif',
|
||||
"sans-serif":
|
||||
'system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif',
|
||||
monospace: 'ui-monospace, "Cascadia Code", monospace',
|
||||
};
|
||||
|
||||
/** Background/text/chrome colors for each reader theme preset. */
|
||||
export const THEME_PALETTES: Record<
|
||||
ThemePreset,
|
||||
{ background: string; text: string; chrome: string }
|
||||
> = {
|
||||
light: { background: "#ffffff", text: "#1a1a1a", chrome: "#f2f2f2" },
|
||||
dark: { background: "#121212", text: "#e0e0e0", chrome: "#1c1c1e" },
|
||||
sepia: { background: "#f4ecd8", text: "#5b4636", chrome: "#e8ddc4" },
|
||||
paper: { background: "#fbfbf8", text: "#2b2b2b", chrome: "#efefe9" },
|
||||
};
|
||||
|
||||
export function resolvePalette(settings: ReadingSettings) {
|
||||
const preset = THEME_PALETTES[settings.theme] ?? THEME_PALETTES.light;
|
||||
return {
|
||||
background: settings.background_color || preset.background,
|
||||
text: settings.text_color || preset.text,
|
||||
chrome: preset.chrome,
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Build an epub.js theme object (selector -> CSS rules) from reader settings.
|
||||
* Used with the epubjs-react-native `changeTheme` method.
|
||||
*/
|
||||
export function buildEpubTheme(
|
||||
settings: ReadingSettings,
|
||||
): Record<string, Record<string, string>> {
|
||||
const { background, text } = resolvePalette(settings);
|
||||
const fontStack = FONT_STACKS[settings.font_family] ?? FONT_STACKS.serif;
|
||||
const lineHeight = `${settings.line_height} !important`;
|
||||
const fontFamily = `${fontStack} !important`;
|
||||
const color = `${text} !important`;
|
||||
|
||||
return {
|
||||
body: {
|
||||
background: `${background} !important`,
|
||||
color,
|
||||
"font-family": fontFamily,
|
||||
"line-height": lineHeight,
|
||||
},
|
||||
p: {
|
||||
color,
|
||||
"font-family": fontFamily,
|
||||
"line-height": lineHeight,
|
||||
},
|
||||
li: { color, "font-family": fontFamily, "line-height": lineHeight },
|
||||
span: { color },
|
||||
a: { color },
|
||||
h1: { color },
|
||||
h2: { color },
|
||||
h3: { color },
|
||||
h4: { color },
|
||||
h5: { color },
|
||||
h6: { color },
|
||||
};
|
||||
}
|
||||
@@ -12,7 +12,8 @@
|
||||
"forceConsistentCasingInFileNames": true,
|
||||
"baseUrl": ".",
|
||||
"paths": {
|
||||
"@/*": ["src/*"]
|
||||
"@/*": ["src/*"],
|
||||
"@cloud-reader/shared": ["../packages/shared/src/index.ts"]
|
||||
}
|
||||
},
|
||||
"include": ["**/*.ts", "**/*.tsx"],
|
||||
|
||||
Reference in New Issue
Block a user