Compare commits
No commits in common. "master" and "screen1" have entirely different histories.
Binary file not shown.
@ -1,180 +1,137 @@
|
||||
/**
|
||||
* @jest-environment node
|
||||
*/
|
||||
import { POST as checkIn } from "../check-in/route";
|
||||
import { POST as checkOut } from "../check-out/route";
|
||||
import { GET as history } from "../history/route";
|
||||
import { NextRequest } from "next/server";
|
||||
import { POST as checkIn } from '../check-in/route'
|
||||
import { POST as checkOut } from '../check-out/route'
|
||||
import { GET as history } from '../history/route'
|
||||
import { NextRequest } from 'next/server'
|
||||
|
||||
// Mock dependencies
|
||||
jest.mock("@clerk/nextjs/server", () => ({
|
||||
auth: jest.fn(() => Promise.resolve({ userId: "test_user_id" })),
|
||||
currentUser: jest.fn(() =>
|
||||
Promise.resolve({
|
||||
id: "test_user_id",
|
||||
emailAddresses: [{ emailAddress: "test@example.com" }],
|
||||
}),
|
||||
),
|
||||
}));
|
||||
jest.mock('@clerk/nextjs/server', () => ({
|
||||
auth: jest.fn(() => Promise.resolve({ userId: 'test_user_id' })),
|
||||
currentUser: jest.fn(() => Promise.resolve({ id: 'test_user_id', emailAddresses: [{ emailAddress: 'test@example.com' }] }))
|
||||
}))
|
||||
|
||||
jest.mock("@/lib/sync-user", () => ({
|
||||
ensureUserSynced: jest.fn(),
|
||||
}));
|
||||
|
||||
jest.mock("@/lib/geofence", () => ({
|
||||
getUserGymGeofence: jest.fn(() =>
|
||||
Promise.resolve({
|
||||
id: "gym_1",
|
||||
name: "Test Gym",
|
||||
latitude: 1,
|
||||
longitude: 1,
|
||||
geofenceRadiusMeters: 30,
|
||||
geofenceEnabled: true,
|
||||
}),
|
||||
),
|
||||
parseUserLocation: jest.fn(() => ({
|
||||
latitude: 1,
|
||||
longitude: 1,
|
||||
accuracy: 10,
|
||||
})),
|
||||
validateGeofence: jest.fn(() => ({ ok: true })),
|
||||
validateGeofenceWithFallback: jest.fn(() => ({ ok: true })),
|
||||
validateCheckInGeofence: jest.fn(() => ({ ok: true })),
|
||||
}));
|
||||
jest.mock('@/lib/sync-user', () => ({
|
||||
ensureUserSynced: jest.fn()
|
||||
}))
|
||||
|
||||
const mockDb = {
|
||||
checkIn: jest.fn(),
|
||||
checkOut: jest.fn(),
|
||||
getAttendanceHistory: jest.fn(),
|
||||
getActiveCheckIn: jest.fn(),
|
||||
getUserById: jest.fn(),
|
||||
createUser: jest.fn(),
|
||||
getClientByUserId: jest.fn(),
|
||||
createClient: jest.fn(),
|
||||
getFitnessProfileByUserId: jest.fn(),
|
||||
createFitnessProfile: jest.fn(),
|
||||
};
|
||||
checkIn: jest.fn(),
|
||||
checkOut: jest.fn(),
|
||||
getAttendanceHistory: jest.fn(),
|
||||
getActiveCheckIn: jest.fn(),
|
||||
getUserById: jest.fn(),
|
||||
createUser: jest.fn(),
|
||||
getClientByUserId: jest.fn(),
|
||||
createClient: jest.fn(),
|
||||
getFitnessProfileByUserId: jest.fn(),
|
||||
createFitnessProfile: jest.fn(),
|
||||
}
|
||||
|
||||
jest.mock("@/lib/database", () => ({
|
||||
getDatabase: jest.fn(() => Promise.resolve(mockDb)),
|
||||
}));
|
||||
jest.mock('@/lib/database', () => ({
|
||||
getDatabase: jest.fn(() => Promise.resolve(mockDb))
|
||||
}))
|
||||
|
||||
describe("Attendance API", () => {
|
||||
beforeEach(() => {
|
||||
jest.clearAllMocks();
|
||||
});
|
||||
describe('Attendance API', () => {
|
||||
beforeEach(() => {
|
||||
jest.clearAllMocks()
|
||||
})
|
||||
|
||||
describe("POST /api/attendance/check-in", () => {
|
||||
it("should successfully check in", async () => {
|
||||
mockDb.getUserById.mockResolvedValue({ id: "test_user_id" });
|
||||
mockDb.getActiveCheckIn.mockResolvedValue(null);
|
||||
mockDb.checkIn.mockResolvedValue({
|
||||
id: "attendance_id",
|
||||
userId: "test_user_id",
|
||||
checkInTime: new Date(),
|
||||
type: "gym",
|
||||
});
|
||||
describe('POST /api/attendance/check-in', () => {
|
||||
it('should successfully check in', async () => {
|
||||
mockDb.getUserById.mockResolvedValue({ id: 'test_user_id' })
|
||||
mockDb.getActiveCheckIn.mockResolvedValue(null)
|
||||
mockDb.checkIn.mockResolvedValue({
|
||||
id: 'attendance_id',
|
||||
userId: 'test_user_id',
|
||||
checkInTime: new Date(),
|
||||
type: 'gym'
|
||||
})
|
||||
|
||||
const req = new NextRequest("http://localhost/api/attendance/check-in", {
|
||||
method: "POST",
|
||||
body: JSON.stringify({
|
||||
type: "gym",
|
||||
notes: "Test check-in",
|
||||
location: { latitude: 1, longitude: 1, accuracy: 10 },
|
||||
}),
|
||||
});
|
||||
const req = new NextRequest('http://localhost/api/attendance/check-in', {
|
||||
method: 'POST',
|
||||
body: JSON.stringify({ type: 'gym', notes: 'Test check-in' })
|
||||
})
|
||||
|
||||
const res = await checkIn(req);
|
||||
const data = await res.json();
|
||||
const res = await checkIn(req)
|
||||
const data = await res.json()
|
||||
|
||||
expect(res.status).toBe(200);
|
||||
expect(data.id).toBe("attendance_id");
|
||||
expect(data.userId).toBe("test_user_id");
|
||||
expect(mockDb.checkIn).toHaveBeenCalledWith(
|
||||
"test_user_id",
|
||||
"gym",
|
||||
"Test check-in",
|
||||
);
|
||||
});
|
||||
expect(res.status).toBe(200)
|
||||
expect(data.id).toBe('attendance_id')
|
||||
expect(data.userId).toBe('test_user_id')
|
||||
expect(mockDb.checkIn).toHaveBeenCalledWith('test_user_id', 'gym', 'Test check-in')
|
||||
})
|
||||
|
||||
it("should fail if already checked in", async () => {
|
||||
mockDb.getUserById.mockResolvedValue({ id: "test_user_id" });
|
||||
mockDb.getActiveCheckIn.mockResolvedValue({ id: "existing_id" });
|
||||
it('should fail if already checked in', async () => {
|
||||
mockDb.getUserById.mockResolvedValue({ id: 'test_user_id' })
|
||||
mockDb.getActiveCheckIn.mockResolvedValue({ id: 'existing_id' })
|
||||
|
||||
const req = new NextRequest("http://localhost/api/attendance/check-in", {
|
||||
method: "POST",
|
||||
body: JSON.stringify({
|
||||
type: "gym",
|
||||
location: { latitude: 1, longitude: 1, accuracy: 10 },
|
||||
}),
|
||||
});
|
||||
const req = new NextRequest('http://localhost/api/attendance/check-in', {
|
||||
method: 'POST',
|
||||
body: JSON.stringify({ type: 'gym' })
|
||||
})
|
||||
|
||||
const res = await checkIn(req);
|
||||
const text = await res.text();
|
||||
const res = await checkIn(req)
|
||||
const text = await res.text()
|
||||
|
||||
expect(res.status).toBe(400);
|
||||
expect(text).toBe("Already checked in");
|
||||
});
|
||||
});
|
||||
expect(res.status).toBe(400)
|
||||
expect(text).toBe('Already checked in')
|
||||
})
|
||||
})
|
||||
|
||||
describe("POST /api/attendance/check-out", () => {
|
||||
it("should successfully check out", async () => {
|
||||
mockDb.getActiveCheckIn.mockResolvedValue({ id: "attendance_id" });
|
||||
mockDb.checkOut.mockResolvedValue({
|
||||
id: "attendance_id",
|
||||
checkOutTime: new Date(),
|
||||
});
|
||||
describe('POST /api/attendance/check-out', () => {
|
||||
it('should successfully check out', async () => {
|
||||
mockDb.getActiveCheckIn.mockResolvedValue({ id: 'attendance_id' })
|
||||
mockDb.checkOut.mockResolvedValue({
|
||||
id: 'attendance_id',
|
||||
checkOutTime: new Date()
|
||||
})
|
||||
|
||||
const req = new NextRequest("http://localhost/api/attendance/check-out", {
|
||||
method: "POST",
|
||||
body: JSON.stringify({
|
||||
location: { latitude: 1, longitude: 1, accuracy: 10 },
|
||||
}),
|
||||
});
|
||||
const req = new NextRequest('http://localhost/api/attendance/check-out', {
|
||||
method: 'POST'
|
||||
})
|
||||
|
||||
const res = await checkOut(req);
|
||||
const data = await res.json();
|
||||
const res = await checkOut(req)
|
||||
const data = await res.json()
|
||||
|
||||
expect(res.status).toBe(200);
|
||||
expect(data.id).toBe("attendance_id");
|
||||
expect(data.checkOutTime).toBeDefined();
|
||||
expect(mockDb.checkOut).toHaveBeenCalledWith("attendance_id");
|
||||
});
|
||||
expect(res.status).toBe(200)
|
||||
expect(data.id).toBe('attendance_id')
|
||||
expect(data.checkOutTime).toBeDefined()
|
||||
expect(mockDb.checkOut).toHaveBeenCalledWith('attendance_id')
|
||||
})
|
||||
|
||||
it("should fail if not checked in", async () => {
|
||||
mockDb.getActiveCheckIn.mockResolvedValue(null);
|
||||
it('should fail if not checked in', async () => {
|
||||
mockDb.getActiveCheckIn.mockResolvedValue(null)
|
||||
|
||||
const req = new NextRequest("http://localhost/api/attendance/check-out", {
|
||||
method: "POST",
|
||||
body: JSON.stringify({
|
||||
location: { latitude: 1, longitude: 1, accuracy: 10 },
|
||||
}),
|
||||
});
|
||||
const req = new NextRequest('http://localhost/api/attendance/check-out', {
|
||||
method: 'POST'
|
||||
})
|
||||
|
||||
const res = await checkOut(req);
|
||||
const text = await res.text();
|
||||
const res = await checkOut(req)
|
||||
const text = await res.text()
|
||||
|
||||
expect(res.status).toBe(404);
|
||||
expect(text).toBe("No active check-in found");
|
||||
});
|
||||
});
|
||||
expect(res.status).toBe(404)
|
||||
expect(text).toBe('No active check-in found')
|
||||
})
|
||||
})
|
||||
|
||||
describe("GET /api/attendance/history", () => {
|
||||
it("should return attendance history", async () => {
|
||||
const historyData = [
|
||||
{ id: "1", checkInTime: new Date() },
|
||||
{ id: "2", checkInTime: new Date() },
|
||||
];
|
||||
mockDb.getUserById.mockResolvedValue({ id: "test_user_id" });
|
||||
mockDb.getAttendanceHistory.mockResolvedValue(historyData);
|
||||
describe('GET /api/attendance/history', () => {
|
||||
it('should return attendance history', async () => {
|
||||
const historyData = [
|
||||
{ id: '1', checkInTime: new Date() },
|
||||
{ id: '2', checkInTime: new Date() }
|
||||
]
|
||||
mockDb.getUserById.mockResolvedValue({ id: 'test_user_id' })
|
||||
mockDb.getAttendanceHistory.mockResolvedValue(historyData)
|
||||
|
||||
const req = new NextRequest("http://localhost/api/attendance/history");
|
||||
const res = await history(req);
|
||||
const data = await res.json();
|
||||
const req = new NextRequest('http://localhost/api/attendance/history')
|
||||
const res = await history(req)
|
||||
const data = await res.json()
|
||||
|
||||
expect(res.status).toBe(200);
|
||||
expect(data).toEqual(JSON.parse(JSON.stringify(historyData))); // Handle date serialization
|
||||
expect(mockDb.getAttendanceHistory).toHaveBeenCalledWith("test_user_id");
|
||||
});
|
||||
});
|
||||
});
|
||||
expect(res.status).toBe(200)
|
||||
expect(data).toEqual(JSON.parse(JSON.stringify(historyData))) // Handle date serialization
|
||||
expect(mockDb.getAttendanceHistory).toHaveBeenCalledWith('test_user_id')
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
@ -2,12 +2,12 @@ import { auth } from "@clerk/nextjs/server";
|
||||
import { NextRequest, NextResponse } from "next/server";
|
||||
import { getDatabase } from "@/lib/database";
|
||||
import { ensureUserSynced } from "@/lib/sync-user";
|
||||
import {
|
||||
getUserGymGeofence,
|
||||
parseUserLocation,
|
||||
validateCheckInGeofence,
|
||||
} from "@/lib/geofence";
|
||||
import log from "@/lib/logger";
|
||||
import { checkInSchema } from "@/lib/validation/schemas";
|
||||
import {
|
||||
validateRequestBody,
|
||||
validationErrorResponse,
|
||||
} from "@/lib/validation/helpers";
|
||||
|
||||
export async function POST(req: NextRequest) {
|
||||
try {
|
||||
@ -25,26 +25,8 @@ export async function POST(req: NextRequest) {
|
||||
return new NextResponse("Already checked in", { status: 400 });
|
||||
}
|
||||
|
||||
const body = await req.json().catch(() => ({}));
|
||||
const body = await req.json();
|
||||
const { type = "gym", notes } = body;
|
||||
const fallbackRequested = Boolean(body.fallbackRequested);
|
||||
|
||||
const gym = await getUserGymGeofence(userId);
|
||||
if (!gym) {
|
||||
return NextResponse.json(
|
||||
{ error: "No gym assigned for this user" },
|
||||
{ status: 400 },
|
||||
);
|
||||
}
|
||||
|
||||
const location = parseUserLocation(body.location);
|
||||
const geofence = validateCheckInGeofence(gym, location, fallbackRequested);
|
||||
if (!geofence.ok) {
|
||||
return NextResponse.json(
|
||||
{ error: geofence.error },
|
||||
{ status: geofence.status },
|
||||
);
|
||||
}
|
||||
|
||||
const attendance = await db.checkIn(userId, type, notes);
|
||||
return NextResponse.json(attendance);
|
||||
|
||||
@ -1,11 +1,6 @@
|
||||
import { auth } from "@clerk/nextjs/server";
|
||||
import { NextResponse } from "next/server";
|
||||
import { getDatabase } from "@/lib/database";
|
||||
import {
|
||||
getUserGymGeofence,
|
||||
parseUserLocation,
|
||||
validateGeofenceWithFallback,
|
||||
} from "@/lib/geofence";
|
||||
import log from "@/lib/logger";
|
||||
|
||||
export async function POST(req: Request) {
|
||||
@ -20,30 +15,6 @@ export async function POST(req: Request) {
|
||||
return new NextResponse("No active check-in found", { status: 404 });
|
||||
}
|
||||
|
||||
const body = await req.json().catch(() => ({}));
|
||||
const fallbackRequested = Boolean(body.fallbackRequested);
|
||||
|
||||
const gym = await getUserGymGeofence(userId);
|
||||
if (!gym) {
|
||||
return NextResponse.json(
|
||||
{ error: "No gym assigned for this user" },
|
||||
{ status: 400 },
|
||||
);
|
||||
}
|
||||
|
||||
const location = parseUserLocation(body.location);
|
||||
const geofence = validateGeofenceWithFallback(
|
||||
gym,
|
||||
location,
|
||||
fallbackRequested,
|
||||
);
|
||||
if (!geofence.ok) {
|
||||
return NextResponse.json(
|
||||
{ error: geofence.error },
|
||||
{ status: geofence.status },
|
||||
);
|
||||
}
|
||||
|
||||
const attendance = await db.checkOut(activeCheckIn.id);
|
||||
return NextResponse.json(attendance);
|
||||
} catch (error) {
|
||||
|
||||
@ -18,178 +18,6 @@ async function ensureGymsTable() {
|
||||
updated_at INTEGER NOT NULL
|
||||
)
|
||||
`);
|
||||
|
||||
const columns = await db.all(sql`PRAGMA table_info('gyms')`);
|
||||
const columnNames = new Set(
|
||||
(columns as Array<{ name?: string }>)
|
||||
.map((col) => col.name)
|
||||
.filter(Boolean),
|
||||
);
|
||||
|
||||
if (!columnNames.has("latitude")) {
|
||||
await db.run(sql`ALTER TABLE gyms ADD COLUMN latitude REAL`);
|
||||
}
|
||||
|
||||
if (!columnNames.has("longitude")) {
|
||||
await db.run(sql`ALTER TABLE gyms ADD COLUMN longitude REAL`);
|
||||
}
|
||||
|
||||
if (!columnNames.has("geofence_radius_meters")) {
|
||||
await db.run(
|
||||
sql`ALTER TABLE gyms ADD COLUMN geofence_radius_meters REAL NOT NULL DEFAULT 30`,
|
||||
);
|
||||
}
|
||||
|
||||
if (!columnNames.has("geofence_enabled")) {
|
||||
await db.run(
|
||||
sql`ALTER TABLE gyms ADD COLUMN geofence_enabled INTEGER NOT NULL DEFAULT 1`,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
// PATCH /api/gyms/[id]
|
||||
// Update gym details and geofence configuration
|
||||
export async function PATCH(
|
||||
request: Request,
|
||||
{ params }: { params: Promise<{ id: string }> },
|
||||
) {
|
||||
try {
|
||||
const { id: gymId } = await params;
|
||||
const { userId } = await auth();
|
||||
|
||||
if (!userId) {
|
||||
return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
|
||||
}
|
||||
|
||||
const appDb = await getDatabase();
|
||||
const currentUser = await ensureUserSynced(userId, appDb);
|
||||
|
||||
if (
|
||||
!currentUser ||
|
||||
(currentUser.role !== "superAdmin" && currentUser.role !== "admin")
|
||||
) {
|
||||
return NextResponse.json({ error: "Forbidden" }, { status: 403 });
|
||||
}
|
||||
|
||||
await ensureGymsTable();
|
||||
|
||||
const existingGym = await db
|
||||
.select()
|
||||
.from(gymsTable)
|
||||
.where(eq(gymsTable.id, gymId))
|
||||
.get();
|
||||
|
||||
if (!existingGym) {
|
||||
return NextResponse.json({ error: "Gym not found" }, { status: 404 });
|
||||
}
|
||||
|
||||
if (
|
||||
currentUser.role === "admin" &&
|
||||
currentUser.gymId &&
|
||||
currentUser.gymId !== gymId
|
||||
) {
|
||||
return NextResponse.json({ error: "Forbidden" }, { status: 403 });
|
||||
}
|
||||
|
||||
const body = await request.json().catch(() => null);
|
||||
if (!body || typeof body !== "object") {
|
||||
return NextResponse.json({ error: "Invalid body" }, { status: 400 });
|
||||
}
|
||||
|
||||
const latitude =
|
||||
body.latitude === undefined || body.latitude === null
|
||||
? null
|
||||
: Number(body.latitude);
|
||||
const longitude =
|
||||
body.longitude === undefined || body.longitude === null
|
||||
? null
|
||||
: Number(body.longitude);
|
||||
const geofenceRadiusMeters =
|
||||
body.geofenceRadiusMeters === undefined ||
|
||||
body.geofenceRadiusMeters === null
|
||||
? 30
|
||||
: Number(body.geofenceRadiusMeters);
|
||||
const geofenceEnabled =
|
||||
body.geofenceEnabled === undefined ? true : Boolean(body.geofenceEnabled);
|
||||
|
||||
if (
|
||||
latitude !== null &&
|
||||
(!Number.isFinite(latitude) || latitude < -90 || latitude > 90)
|
||||
) {
|
||||
return NextResponse.json(
|
||||
{ error: "latitude must be between -90 and 90" },
|
||||
{ status: 400 },
|
||||
);
|
||||
}
|
||||
|
||||
if (
|
||||
longitude !== null &&
|
||||
(!Number.isFinite(longitude) || longitude < -180 || longitude > 180)
|
||||
) {
|
||||
return NextResponse.json(
|
||||
{ error: "longitude must be between -180 and 180" },
|
||||
{ status: 400 },
|
||||
);
|
||||
}
|
||||
|
||||
if (!Number.isFinite(geofenceRadiusMeters) || geofenceRadiusMeters <= 0) {
|
||||
return NextResponse.json(
|
||||
{ error: "geofenceRadiusMeters must be a positive number" },
|
||||
{ status: 400 },
|
||||
);
|
||||
}
|
||||
|
||||
await db.run(sql`
|
||||
UPDATE gyms
|
||||
SET
|
||||
latitude = ${latitude},
|
||||
longitude = ${longitude},
|
||||
geofence_radius_meters = ${geofenceRadiusMeters},
|
||||
geofence_enabled = ${geofenceEnabled ? 1 : 0},
|
||||
updated_at = ${Math.floor(Date.now() / 1000)}
|
||||
WHERE id = ${gymId}
|
||||
`);
|
||||
|
||||
const updatedRows = await db.all(sql`
|
||||
SELECT
|
||||
id,
|
||||
name,
|
||||
location,
|
||||
latitude,
|
||||
longitude,
|
||||
geofence_radius_meters as geofenceRadiusMeters,
|
||||
geofence_enabled as geofenceEnabled,
|
||||
status,
|
||||
admin_user_id as adminUserId,
|
||||
created_at as createdAt,
|
||||
updated_at as updatedAt
|
||||
FROM gyms
|
||||
WHERE id = ${gymId}
|
||||
LIMIT 1
|
||||
`);
|
||||
|
||||
const updated = updatedRows?.[0]
|
||||
? {
|
||||
...updatedRows[0],
|
||||
geofenceEnabled:
|
||||
typeof (updatedRows[0] as { geofenceEnabled?: unknown })
|
||||
.geofenceEnabled === "boolean"
|
||||
? (updatedRows[0] as { geofenceEnabled: boolean }).geofenceEnabled
|
||||
: Boolean(
|
||||
(updatedRows[0] as { geofenceEnabled?: unknown })
|
||||
.geofenceEnabled,
|
||||
),
|
||||
}
|
||||
: null;
|
||||
|
||||
return NextResponse.json(updated);
|
||||
} catch (error) {
|
||||
log.error("Failed to update gym", error);
|
||||
return NextResponse.json(
|
||||
{ error: "Internal Server Error" },
|
||||
{ status: 500 },
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
// DELETE /api/gyms/[id]
|
||||
|
||||
@ -18,33 +18,6 @@ async function ensureGymsTable() {
|
||||
updated_at INTEGER NOT NULL
|
||||
)
|
||||
`);
|
||||
|
||||
const columns = await db.all(sql`PRAGMA table_info('gyms')`);
|
||||
const columnNames = new Set(
|
||||
(columns as Array<{ name?: string }>)
|
||||
.map((col) => col.name)
|
||||
.filter(Boolean),
|
||||
);
|
||||
|
||||
if (!columnNames.has("latitude")) {
|
||||
await db.run(sql`ALTER TABLE gyms ADD COLUMN latitude REAL`);
|
||||
}
|
||||
|
||||
if (!columnNames.has("longitude")) {
|
||||
await db.run(sql`ALTER TABLE gyms ADD COLUMN longitude REAL`);
|
||||
}
|
||||
|
||||
if (!columnNames.has("geofence_radius_meters")) {
|
||||
await db.run(
|
||||
sql`ALTER TABLE gyms ADD COLUMN geofence_radius_meters REAL NOT NULL DEFAULT 30`,
|
||||
);
|
||||
}
|
||||
|
||||
if (!columnNames.has("geofence_enabled")) {
|
||||
await db.run(
|
||||
sql`ALTER TABLE gyms ADD COLUMN geofence_enabled INTEGER NOT NULL DEFAULT 1`,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
// GET /api/gyms
|
||||
@ -68,35 +41,12 @@ export async function GET() {
|
||||
}
|
||||
|
||||
await ensureGymsTable();
|
||||
let rows = (await db.all(sql`
|
||||
SELECT
|
||||
id,
|
||||
name,
|
||||
location,
|
||||
latitude,
|
||||
longitude,
|
||||
geofence_radius_meters as geofenceRadiusMeters,
|
||||
geofence_enabled as geofenceEnabled,
|
||||
status,
|
||||
admin_user_id as adminUserId,
|
||||
created_at as createdAt,
|
||||
updated_at as updatedAt
|
||||
FROM gyms
|
||||
WHERE status = 'active'
|
||||
ORDER BY created_at DESC
|
||||
`)) as Array<{
|
||||
id: string;
|
||||
name: string;
|
||||
location: string | null;
|
||||
latitude: number | null;
|
||||
longitude: number | null;
|
||||
geofenceRadiusMeters: number | null;
|
||||
geofenceEnabled: number | boolean | null;
|
||||
status: "active" | "inactive";
|
||||
adminUserId: string;
|
||||
createdAt: number;
|
||||
updatedAt: number;
|
||||
}>;
|
||||
let rows = await db
|
||||
.select()
|
||||
.from(gymsTable)
|
||||
.where(eq(gymsTable.status, "active"))
|
||||
.orderBy(sql`created_at DESC`)
|
||||
.all();
|
||||
|
||||
if (currentUser.role !== "superAdmin") {
|
||||
if (!currentUser.gymId) {
|
||||
@ -105,15 +55,7 @@ export async function GET() {
|
||||
rows = rows.filter((row) => row.id === currentUser.gymId);
|
||||
}
|
||||
|
||||
return NextResponse.json(
|
||||
rows.map((row) => ({
|
||||
...row,
|
||||
geofenceEnabled:
|
||||
typeof row.geofenceEnabled === "boolean"
|
||||
? row.geofenceEnabled
|
||||
: Boolean(row.geofenceEnabled),
|
||||
})),
|
||||
);
|
||||
return NextResponse.json(rows);
|
||||
} catch (error) {
|
||||
log.error("Failed to get gyms", error);
|
||||
return new NextResponse("Internal Server Error", { status: 500 });
|
||||
@ -147,21 +89,6 @@ export async function POST(req: Request) {
|
||||
|
||||
const name = String(body.name ?? "").trim();
|
||||
const location = body.location ? String(body.location).trim() : null;
|
||||
const latitude =
|
||||
body.latitude === undefined || body.latitude === null
|
||||
? null
|
||||
: Number(body.latitude);
|
||||
const longitude =
|
||||
body.longitude === undefined || body.longitude === null
|
||||
? null
|
||||
: Number(body.longitude);
|
||||
const geofenceRadiusMeters =
|
||||
body.geofenceRadiusMeters === undefined ||
|
||||
body.geofenceRadiusMeters === null
|
||||
? 30
|
||||
: Number(body.geofenceRadiusMeters);
|
||||
const geofenceEnabled =
|
||||
body.geofenceEnabled === undefined ? true : Boolean(body.geofenceEnabled);
|
||||
let adminUserId: string | null = body.adminUserId
|
||||
? String(body.adminUserId)
|
||||
: null;
|
||||
@ -170,33 +97,6 @@ export async function POST(req: Request) {
|
||||
return NextResponse.json({ error: "name is required" }, { status: 400 });
|
||||
}
|
||||
|
||||
if (
|
||||
latitude !== null &&
|
||||
(!Number.isFinite(latitude) || latitude < -90 || latitude > 90)
|
||||
) {
|
||||
return NextResponse.json(
|
||||
{ error: "latitude must be between -90 and 90" },
|
||||
{ status: 400 },
|
||||
);
|
||||
}
|
||||
|
||||
if (
|
||||
longitude !== null &&
|
||||
(!Number.isFinite(longitude) || longitude < -180 || longitude > 180)
|
||||
) {
|
||||
return NextResponse.json(
|
||||
{ error: "longitude must be between -180 and 180" },
|
||||
{ status: 400 },
|
||||
);
|
||||
}
|
||||
|
||||
if (!Number.isFinite(geofenceRadiusMeters) || geofenceRadiusMeters <= 0) {
|
||||
return NextResponse.json(
|
||||
{ error: "geofenceRadiusMeters must be a positive number" },
|
||||
{ status: 400 },
|
||||
);
|
||||
}
|
||||
|
||||
// Enforce admin ownership rules
|
||||
if (currentUser.role === "admin") {
|
||||
adminUserId = currentUser.id;
|
||||
@ -224,33 +124,15 @@ export async function POST(req: Request) {
|
||||
const nowTs = new Date();
|
||||
|
||||
// Use Drizzle's insert method instead of raw SQL
|
||||
await db.run(sql`
|
||||
INSERT INTO gyms (
|
||||
id,
|
||||
name,
|
||||
location,
|
||||
latitude,
|
||||
longitude,
|
||||
geofence_radius_meters,
|
||||
geofence_enabled,
|
||||
status,
|
||||
admin_user_id,
|
||||
created_at,
|
||||
updated_at
|
||||
) VALUES (
|
||||
${id},
|
||||
${name},
|
||||
${location ?? null},
|
||||
${latitude},
|
||||
${longitude},
|
||||
${geofenceRadiusMeters},
|
||||
${geofenceEnabled ? 1 : 0},
|
||||
${"active"},
|
||||
${adminUserId!},
|
||||
${Math.floor(nowTs.getTime() / 1000)},
|
||||
${Math.floor(nowTs.getTime() / 1000)}
|
||||
)
|
||||
`);
|
||||
await db.insert(gymsTable).values({
|
||||
id,
|
||||
name,
|
||||
location: location ?? null,
|
||||
status: "active",
|
||||
adminUserId: adminUserId!,
|
||||
createdAt: nowTs,
|
||||
updatedAt: nowTs,
|
||||
});
|
||||
|
||||
// Assign the admin to this gym immediately after creation
|
||||
await db
|
||||
@ -258,36 +140,11 @@ export async function POST(req: Request) {
|
||||
.set({ gymId: id, updatedAt: nowTs })
|
||||
.where(eq(usersTable.id, adminUserId!));
|
||||
|
||||
const rowsCreated = await db.all(sql`
|
||||
SELECT
|
||||
id,
|
||||
name,
|
||||
location,
|
||||
latitude,
|
||||
longitude,
|
||||
geofence_radius_meters as geofenceRadiusMeters,
|
||||
geofence_enabled as geofenceEnabled,
|
||||
status,
|
||||
admin_user_id as adminUserId,
|
||||
created_at as createdAt,
|
||||
updated_at as updatedAt
|
||||
FROM gyms
|
||||
WHERE id = ${id}
|
||||
LIMIT 1
|
||||
`);
|
||||
const createdRow = rowsCreated?.[0] ?? null;
|
||||
const created = createdRow
|
||||
? {
|
||||
...createdRow,
|
||||
geofenceEnabled:
|
||||
typeof (createdRow as { geofenceEnabled?: unknown })
|
||||
.geofenceEnabled === "boolean"
|
||||
? (createdRow as { geofenceEnabled: boolean }).geofenceEnabled
|
||||
: Boolean(
|
||||
(createdRow as { geofenceEnabled?: unknown }).geofenceEnabled,
|
||||
),
|
||||
}
|
||||
: null;
|
||||
const created = await db
|
||||
.select()
|
||||
.from(gymsTable)
|
||||
.where(eq(gymsTable.id, id))
|
||||
.get();
|
||||
return NextResponse.json(created, { status: 201 });
|
||||
} catch (error) {
|
||||
log.error("Failed to create gym", error);
|
||||
|
||||
@ -4,101 +4,6 @@ import { getDatabase } from "@/lib/database";
|
||||
import log from "@/lib/logger";
|
||||
import { ensureUserSynced } from "@/lib/sync-user";
|
||||
|
||||
const AI_LINK_PREFIX = "[AI_LINKED]";
|
||||
|
||||
type GoalType =
|
||||
| "weight_target"
|
||||
| "strength_milestone"
|
||||
| "endurance_target"
|
||||
| "flexibility_goal"
|
||||
| "habit_building"
|
||||
| "custom";
|
||||
|
||||
interface ParsedPlanItem {
|
||||
id: string;
|
||||
title: string;
|
||||
description: string;
|
||||
goalType: GoalType;
|
||||
}
|
||||
|
||||
function inferGoalType(text: string): GoalType {
|
||||
const normalized = text.toLowerCase();
|
||||
|
||||
if (
|
||||
normalized.includes("strength") ||
|
||||
normalized.includes("bench") ||
|
||||
normalized.includes("squat") ||
|
||||
normalized.includes("deadlift") ||
|
||||
normalized.includes("weights")
|
||||
) {
|
||||
return "strength_milestone";
|
||||
}
|
||||
|
||||
if (
|
||||
normalized.includes("run") ||
|
||||
normalized.includes("cardio") ||
|
||||
normalized.includes("endurance") ||
|
||||
normalized.includes("cycle")
|
||||
) {
|
||||
return "endurance_target";
|
||||
}
|
||||
|
||||
if (
|
||||
normalized.includes("stretch") ||
|
||||
normalized.includes("mobility") ||
|
||||
normalized.includes("yoga") ||
|
||||
normalized.includes("flexibility")
|
||||
) {
|
||||
return "flexibility_goal";
|
||||
}
|
||||
|
||||
if (
|
||||
normalized.includes("daily") ||
|
||||
normalized.includes("routine") ||
|
||||
normalized.includes("habit")
|
||||
) {
|
||||
return "habit_building";
|
||||
}
|
||||
|
||||
return "custom";
|
||||
}
|
||||
|
||||
function parseActivityPlanToItems(activityPlan: string): ParsedPlanItem[] {
|
||||
const lines = activityPlan
|
||||
.replace(/\r\n/g, "\n")
|
||||
.split(/\n+/)
|
||||
.flatMap((line) => line.split(/(?<=[.!?])\s+(?=[A-Z0-9])/g))
|
||||
.map((line) => line.trim())
|
||||
.filter(Boolean)
|
||||
.map((line) => line.replace(/^[-*•\d.)\s]+/, "").trim())
|
||||
.filter((line) => line.length > 10)
|
||||
.slice(0, 8);
|
||||
|
||||
const uniqueLines = Array.from(new Set(lines));
|
||||
|
||||
return uniqueLines.map((line) => ({
|
||||
id: crypto.randomUUID(),
|
||||
title: line.length > 72 ? `${line.slice(0, 69)}...` : line,
|
||||
description: line,
|
||||
goalType: inferGoalType(line),
|
||||
}));
|
||||
}
|
||||
|
||||
function getDefaultPlanItems(): ParsedPlanItem[] {
|
||||
const defaults = [
|
||||
"Complete 3 strength sessions this week with progressive overload.",
|
||||
"Add 2 cardio sessions of 25-30 minutes for endurance.",
|
||||
"Do a 10-minute mobility routine daily after training.",
|
||||
];
|
||||
|
||||
return defaults.map((line) => ({
|
||||
id: crypto.randomUUID(),
|
||||
title: line.length > 72 ? `${line.slice(0, 69)}...` : line,
|
||||
description: line,
|
||||
goalType: inferGoalType(line),
|
||||
}));
|
||||
}
|
||||
|
||||
export async function POST(req: Request) {
|
||||
try {
|
||||
const { userId: clerkUserId } = await auth();
|
||||
@ -189,103 +94,8 @@ export async function POST(req: Request) {
|
||||
);
|
||||
}
|
||||
|
||||
let pausedGoalsCount = 0;
|
||||
let createdGoalsCount = 0;
|
||||
|
||||
// If approved, regenerate linked AI goals and create a notification for the user
|
||||
// If approved, create a notification for the user
|
||||
if (status === "approved") {
|
||||
try {
|
||||
const existingActiveGoals = await db.getFitnessGoalsByUserId(
|
||||
updatedRecommendation.userId,
|
||||
"active",
|
||||
);
|
||||
|
||||
const linkedGoals = existingActiveGoals.filter((goal) =>
|
||||
goal.notes?.startsWith(AI_LINK_PREFIX),
|
||||
);
|
||||
|
||||
pausedGoalsCount = linkedGoals.length;
|
||||
|
||||
await Promise.all(
|
||||
linkedGoals.map((goal) =>
|
||||
db.updateFitnessGoal(goal.id, {
|
||||
status: "paused",
|
||||
notes: `${goal.notes || ""}\nPaused due to recommendation approval on ${new Date().toISOString()}`,
|
||||
}),
|
||||
),
|
||||
);
|
||||
|
||||
let planItems = parseActivityPlanToItems(
|
||||
updatedRecommendation.activityPlan || "",
|
||||
);
|
||||
|
||||
if (
|
||||
planItems.length === 0 &&
|
||||
updatedRecommendation.recommendationText
|
||||
) {
|
||||
planItems = parseActivityPlanToItems(
|
||||
updatedRecommendation.recommendationText,
|
||||
);
|
||||
}
|
||||
|
||||
if (planItems.length === 0) {
|
||||
planItems = getDefaultPlanItems();
|
||||
}
|
||||
|
||||
const fitnessProfileId =
|
||||
updatedRecommendation.fitnessProfileId ||
|
||||
(await db.getFitnessProfileByUserId(updatedRecommendation.userId))
|
||||
?.id;
|
||||
|
||||
if (!fitnessProfileId) {
|
||||
log.warn("No fitness profile available for AI goal creation", {
|
||||
recommendationId,
|
||||
userId: updatedRecommendation.userId,
|
||||
});
|
||||
} else {
|
||||
const createdGoals = await Promise.all(
|
||||
planItems.map((item) =>
|
||||
db.createFitnessGoal({
|
||||
id: crypto.randomUUID(),
|
||||
userId: updatedRecommendation.userId,
|
||||
fitnessProfileId,
|
||||
goalType: item.goalType,
|
||||
title: item.title,
|
||||
description: item.description,
|
||||
targetValue: undefined,
|
||||
currentValue: 0,
|
||||
unit: undefined,
|
||||
startDate: new Date(),
|
||||
targetDate: undefined,
|
||||
completedDate: undefined,
|
||||
status: "active",
|
||||
progress: 0,
|
||||
priority: "medium",
|
||||
notes: `${AI_LINK_PREFIX} recommendationId=${updatedRecommendation.id}; itemId=${item.id}`,
|
||||
}),
|
||||
),
|
||||
);
|
||||
|
||||
createdGoalsCount = createdGoals.length;
|
||||
}
|
||||
|
||||
log.info("Regenerated linked AI goals from approved recommendation", {
|
||||
recommendationId: updatedRecommendation.id,
|
||||
userId: updatedRecommendation.userId,
|
||||
pausedGoals: pausedGoalsCount,
|
||||
createdGoals: createdGoalsCount,
|
||||
});
|
||||
} catch (goalConversionError) {
|
||||
log.error(
|
||||
"Failed to regenerate linked goals for approved recommendation",
|
||||
goalConversionError,
|
||||
{
|
||||
recommendationId,
|
||||
userId: updatedRecommendation.userId,
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
try {
|
||||
await db.createNotification({
|
||||
id: crypto.randomUUID(),
|
||||
@ -312,8 +122,6 @@ export async function POST(req: Request) {
|
||||
data: updatedRecommendation,
|
||||
meta: {
|
||||
timestamp: new Date().toISOString(),
|
||||
pausedGoals: pausedGoalsCount,
|
||||
createdGoals: createdGoalsCount,
|
||||
},
|
||||
});
|
||||
} catch (error) {
|
||||
|
||||
@ -1,455 +0,0 @@
|
||||
import { NextResponse } from "next/server";
|
||||
import { auth } from "@clerk/nextjs/server";
|
||||
import { getDatabase } from "@/lib/database";
|
||||
import { buildAIContext } from "@/lib/ai/ai-context";
|
||||
import { buildEnhancedPrompt, buildBasicPrompt } from "@/lib/ai/prompt-builder";
|
||||
import log from "@/lib/logger";
|
||||
import { ensureUserSynced } from "@/lib/sync-user";
|
||||
import { getUserMembershipContext } from "@/lib/membership/access";
|
||||
|
||||
const AI_LINK_PREFIX = "[AI_LINKED]";
|
||||
|
||||
interface ParsedPlanItem {
|
||||
id: string;
|
||||
title: string;
|
||||
description: string;
|
||||
goalType:
|
||||
| "weight_target"
|
||||
| "strength_milestone"
|
||||
| "endurance_target"
|
||||
| "flexibility_goal"
|
||||
| "habit_building"
|
||||
| "custom";
|
||||
}
|
||||
|
||||
interface GeneratedPlanContent {
|
||||
recommendationText?: string;
|
||||
activityPlan?: string;
|
||||
dietPlan?: string;
|
||||
}
|
||||
|
||||
function buildFallbackPlan(profile: {
|
||||
activityLevel?: string;
|
||||
fitnessGoals?: string[] | string;
|
||||
medicalConditions?: string;
|
||||
}): GeneratedPlanContent {
|
||||
const goals = Array.isArray(profile.fitnessGoals)
|
||||
? profile.fitnessGoals
|
||||
: typeof profile.fitnessGoals === "string" && profile.fitnessGoals
|
||||
? [profile.fitnessGoals]
|
||||
: ["general fitness"];
|
||||
|
||||
const primaryGoal = goals[0] || "general fitness";
|
||||
const activityLevel = profile.activityLevel || "moderate";
|
||||
const hasMedicalNotes = Boolean(profile.medicalConditions?.trim());
|
||||
|
||||
return {
|
||||
recommendationText:
|
||||
`Personalized starter plan focused on ${primaryGoal} with ${activityLevel} activity pacing.` +
|
||||
(hasMedicalNotes
|
||||
? " Medical notes detected, so keep intensity conservative and progress gradually."
|
||||
: ""),
|
||||
activityPlan:
|
||||
"- 3 strength sessions per week (full-body, 35-45 min)\n" +
|
||||
"- 2 cardio sessions per week (20-30 min brisk walk/run/cycle)\n" +
|
||||
"- 10 minutes daily mobility/stretching after workouts\n" +
|
||||
"- 1 full recovery day each week",
|
||||
dietPlan:
|
||||
"- Build meals around lean protein, vegetables, whole grains, and hydration\n" +
|
||||
"- Keep portions consistent and avoid skipping meals\n" +
|
||||
"- Track intake daily and adjust calories based on weekly progress",
|
||||
};
|
||||
}
|
||||
|
||||
function inferGoalType(text: string): ParsedPlanItem["goalType"] {
|
||||
const normalized = text.toLowerCase();
|
||||
|
||||
if (
|
||||
normalized.includes("strength") ||
|
||||
normalized.includes("bench") ||
|
||||
normalized.includes("squat") ||
|
||||
normalized.includes("deadlift") ||
|
||||
normalized.includes("weights")
|
||||
) {
|
||||
return "strength_milestone";
|
||||
}
|
||||
|
||||
if (
|
||||
normalized.includes("run") ||
|
||||
normalized.includes("cardio") ||
|
||||
normalized.includes("endurance") ||
|
||||
normalized.includes("cycle")
|
||||
) {
|
||||
return "endurance_target";
|
||||
}
|
||||
|
||||
if (
|
||||
normalized.includes("stretch") ||
|
||||
normalized.includes("mobility") ||
|
||||
normalized.includes("yoga") ||
|
||||
normalized.includes("flexibility")
|
||||
) {
|
||||
return "flexibility_goal";
|
||||
}
|
||||
|
||||
if (
|
||||
normalized.includes("daily") ||
|
||||
normalized.includes("routine") ||
|
||||
normalized.includes("habit")
|
||||
) {
|
||||
return "habit_building";
|
||||
}
|
||||
|
||||
return "custom";
|
||||
}
|
||||
|
||||
function parseActivityPlanToItems(activityPlan: string): ParsedPlanItem[] {
|
||||
const lines = activityPlan
|
||||
.replace(/\r\n/g, "\n")
|
||||
.split(/\n+/)
|
||||
.flatMap((line) => line.split(/(?<=[.!?])\s+(?=[A-Z0-9])/g))
|
||||
.map((line) => line.trim())
|
||||
.filter(Boolean)
|
||||
.map((line) => line.replace(/^[-*•\d.)\s]+/, "").trim())
|
||||
.filter((line) => line.length > 10)
|
||||
.slice(0, 8);
|
||||
|
||||
const uniqueLines = Array.from(new Set(lines));
|
||||
|
||||
return uniqueLines.map((line) => ({
|
||||
id: crypto.randomUUID(),
|
||||
title: line.length > 72 ? `${line.slice(0, 69)}...` : line,
|
||||
description: line,
|
||||
goalType: inferGoalType(line),
|
||||
}));
|
||||
}
|
||||
|
||||
function getDefaultPlanItems(): ParsedPlanItem[] {
|
||||
const defaults = [
|
||||
"Complete 3 strength sessions this week with progressive overload.",
|
||||
"Add 2 cardio sessions of 25-30 minutes for endurance.",
|
||||
"Do a 10-minute mobility routine daily after training.",
|
||||
];
|
||||
|
||||
return defaults.map((line) => ({
|
||||
id: crypto.randomUUID(),
|
||||
title: line.length > 72 ? `${line.slice(0, 69)}...` : line,
|
||||
description: line,
|
||||
goalType: inferGoalType(line),
|
||||
}));
|
||||
}
|
||||
|
||||
function parseJsonPayload(content: string): GeneratedPlanContent {
|
||||
let cleanResponse = content.trim();
|
||||
|
||||
if (cleanResponse.startsWith("```json")) {
|
||||
cleanResponse = cleanResponse
|
||||
.replace(/^```json\s*/, "")
|
||||
.replace(/\s*```$/, "");
|
||||
} else if (cleanResponse.startsWith("```")) {
|
||||
cleanResponse = cleanResponse.replace(/^```\s*/, "").replace(/\s*```$/, "");
|
||||
}
|
||||
|
||||
const firstBrace = cleanResponse.indexOf("{");
|
||||
const lastBrace = cleanResponse.lastIndexOf("}");
|
||||
if (firstBrace !== -1 && lastBrace !== -1) {
|
||||
cleanResponse = cleanResponse.substring(firstBrace, lastBrace + 1);
|
||||
}
|
||||
|
||||
return JSON.parse(cleanResponse) as GeneratedPlanContent;
|
||||
}
|
||||
|
||||
async function generateWithOpenAI(
|
||||
openaiApiKey: string,
|
||||
prompt: string,
|
||||
): Promise<GeneratedPlanContent> {
|
||||
const response = await fetch("https://api.openai.com/v1/chat/completions", {
|
||||
method: "POST",
|
||||
headers: {
|
||||
"Content-Type": "application/json",
|
||||
Authorization: `Bearer ${openaiApiKey}`,
|
||||
},
|
||||
body: JSON.stringify({
|
||||
model: "gpt-4o-mini",
|
||||
messages: [
|
||||
{
|
||||
role: "system",
|
||||
content:
|
||||
'You are a professional fitness trainer and nutritionist. Always respond with valid JSON only, no markdown or code blocks. The response must have this exact structure: {"recommendationText": "string", "activityPlan": "string", "dietPlan": "string"}',
|
||||
},
|
||||
{
|
||||
role: "user",
|
||||
content: prompt,
|
||||
},
|
||||
],
|
||||
temperature: 0.7,
|
||||
max_tokens: 1500,
|
||||
response_format: { type: "json_object" },
|
||||
}),
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
const errorText = await response.text();
|
||||
throw new Error(`OpenAI failed: ${response.status} ${errorText}`);
|
||||
}
|
||||
|
||||
const data = await response.json();
|
||||
return parseJsonPayload(data.choices[0].message.content as string);
|
||||
}
|
||||
|
||||
async function generateWithDeepSeek(
|
||||
deepseekApiKey: string,
|
||||
prompt: string,
|
||||
): Promise<GeneratedPlanContent> {
|
||||
const response = await fetch("https://api.deepseek.com/v1/chat/completions", {
|
||||
method: "POST",
|
||||
headers: {
|
||||
"Content-Type": "application/json",
|
||||
Authorization: `Bearer ${deepseekApiKey}`,
|
||||
},
|
||||
body: JSON.stringify({
|
||||
model: "deepseek-chat",
|
||||
messages: [
|
||||
{
|
||||
role: "system",
|
||||
content:
|
||||
"You are a professional fitness trainer and nutritionist. Always respond with valid JSON only, no markdown or code blocks.",
|
||||
},
|
||||
{
|
||||
role: "user",
|
||||
content: prompt,
|
||||
},
|
||||
],
|
||||
temperature: 0.7,
|
||||
max_tokens: 1200,
|
||||
}),
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
const errorText = await response.text();
|
||||
throw new Error(`DeepSeek failed: ${response.status} ${errorText}`);
|
||||
}
|
||||
|
||||
const data = await response.json();
|
||||
return parseJsonPayload(data.choices[0].message.content as string);
|
||||
}
|
||||
|
||||
async function generateWithOllama(
|
||||
prompt: string,
|
||||
): Promise<GeneratedPlanContent> {
|
||||
const response = await fetch("http://localhost:11434/api/generate", {
|
||||
method: "POST",
|
||||
headers: {
|
||||
"Content-Type": "application/json",
|
||||
},
|
||||
body: JSON.stringify({
|
||||
model: "gemma3:latest",
|
||||
prompt,
|
||||
stream: false,
|
||||
format: "json",
|
||||
}),
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
const errorText = await response.text();
|
||||
throw new Error(`Ollama failed: ${response.status} ${errorText}`);
|
||||
}
|
||||
|
||||
const data = await response.json();
|
||||
return parseJsonPayload(data.response as string);
|
||||
}
|
||||
|
||||
export async function POST() {
|
||||
try {
|
||||
const { userId } = await auth();
|
||||
if (!userId) {
|
||||
return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
|
||||
}
|
||||
|
||||
const db = await getDatabase();
|
||||
const currentUser = await ensureUserSynced(userId, db);
|
||||
|
||||
if (!currentUser) {
|
||||
return NextResponse.json({ error: "Forbidden" }, { status: 403 });
|
||||
}
|
||||
|
||||
const { membershipType, features } = await getUserMembershipContext(userId);
|
||||
|
||||
if (membershipType === "basic") {
|
||||
return NextResponse.json(
|
||||
{
|
||||
error:
|
||||
"AI plan generation is available on Premium and VIP memberships",
|
||||
membershipType,
|
||||
},
|
||||
{ status: 403 },
|
||||
);
|
||||
}
|
||||
|
||||
if (features.recommendationsPerMonth > 0) {
|
||||
const currentMonth = new Date();
|
||||
const monthStart = new Date(
|
||||
currentMonth.getFullYear(),
|
||||
currentMonth.getMonth(),
|
||||
1,
|
||||
);
|
||||
const monthEnd = new Date(
|
||||
currentMonth.getFullYear(),
|
||||
currentMonth.getMonth() + 1,
|
||||
1,
|
||||
);
|
||||
|
||||
const existingRecommendations =
|
||||
await db.getRecommendationsByUserId(userId);
|
||||
const recommendationsThisMonth = existingRecommendations.filter(
|
||||
(recommendation) =>
|
||||
recommendation.generatedAt >= monthStart &&
|
||||
recommendation.generatedAt < monthEnd,
|
||||
).length;
|
||||
|
||||
if (recommendationsThisMonth >= features.recommendationsPerMonth) {
|
||||
return NextResponse.json(
|
||||
{
|
||||
error: `Your ${membershipType} plan includes ${features.recommendationsPerMonth} AI recommendation(s) per month`,
|
||||
membershipType,
|
||||
},
|
||||
{ status: 403 },
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
const profile = await db.getFitnessProfileByUserId(userId);
|
||||
if (!profile) {
|
||||
return NextResponse.json(
|
||||
{ error: "Complete your fitness profile before generating a plan" },
|
||||
{ status: 404 },
|
||||
);
|
||||
}
|
||||
|
||||
let prompt: string;
|
||||
try {
|
||||
const context = await buildAIContext(userId);
|
||||
prompt = buildEnhancedPrompt(context);
|
||||
} catch (error) {
|
||||
log.warn("Failed to build AI context for self-generate", {
|
||||
userId,
|
||||
error: error instanceof Error ? error.message : String(error),
|
||||
});
|
||||
prompt = buildBasicPrompt(profile);
|
||||
}
|
||||
|
||||
const openaiApiKey = process.env.OPENAI_API_KEY;
|
||||
const deepseekApiKey = process.env.DEEPSEEK_API_KEY;
|
||||
|
||||
let parsedResponse: GeneratedPlanContent;
|
||||
let usedFallbackPlan = false;
|
||||
|
||||
try {
|
||||
if (openaiApiKey) {
|
||||
parsedResponse = await generateWithOpenAI(openaiApiKey, prompt);
|
||||
} else if (deepseekApiKey) {
|
||||
parsedResponse = await generateWithDeepSeek(deepseekApiKey, prompt);
|
||||
} else {
|
||||
parsedResponse = await generateWithOllama(prompt);
|
||||
}
|
||||
} catch (providerError) {
|
||||
log.error("Self-generate provider failed", providerError, {
|
||||
userId,
|
||||
hasOpenAI: Boolean(openaiApiKey),
|
||||
hasDeepSeek: Boolean(deepseekApiKey),
|
||||
});
|
||||
|
||||
parsedResponse = buildFallbackPlan({
|
||||
activityLevel: profile.activityLevel,
|
||||
fitnessGoals: profile.fitnessGoals,
|
||||
medicalConditions: profile.medicalConditions,
|
||||
});
|
||||
usedFallbackPlan = true;
|
||||
}
|
||||
|
||||
const recommendation = await db.createRecommendation({
|
||||
id: crypto.randomUUID(),
|
||||
userId,
|
||||
fitnessProfileId: profile.id,
|
||||
recommendationText: parsedResponse.recommendationText || "",
|
||||
activityPlan: parsedResponse.activityPlan || "",
|
||||
dietPlan: parsedResponse.dietPlan || "",
|
||||
status: "approved",
|
||||
generatedAt: new Date(),
|
||||
updatedAt: new Date(),
|
||||
});
|
||||
|
||||
const existingActiveGoals = await db.getFitnessGoalsByUserId(
|
||||
userId,
|
||||
"active",
|
||||
);
|
||||
const linkedGoals = existingActiveGoals.filter((goal) =>
|
||||
goal.notes?.startsWith(AI_LINK_PREFIX),
|
||||
);
|
||||
|
||||
await Promise.all(
|
||||
linkedGoals.map((goal) =>
|
||||
db.updateFitnessGoal(goal.id, {
|
||||
status: "paused",
|
||||
notes: `${goal.notes || ""}\nPaused due to new AI plan generation on ${new Date().toISOString()}`,
|
||||
}),
|
||||
),
|
||||
);
|
||||
|
||||
let planItems = parseActivityPlanToItems(parsedResponse.activityPlan || "");
|
||||
|
||||
if (planItems.length === 0 && parsedResponse.recommendationText) {
|
||||
planItems = parseActivityPlanToItems(parsedResponse.recommendationText);
|
||||
}
|
||||
|
||||
if (planItems.length === 0) {
|
||||
planItems = getDefaultPlanItems();
|
||||
}
|
||||
|
||||
log.debug("AI plan parsed into goal items", {
|
||||
recommendationId: recommendation.id,
|
||||
userId,
|
||||
parsedItems: planItems.length,
|
||||
});
|
||||
|
||||
const createdGoals = await Promise.all(
|
||||
planItems.map((item) =>
|
||||
db.createFitnessGoal({
|
||||
id: crypto.randomUUID(),
|
||||
userId,
|
||||
fitnessProfileId: profile.id,
|
||||
goalType: item.goalType,
|
||||
title: item.title,
|
||||
description: item.description,
|
||||
targetValue: undefined,
|
||||
currentValue: 0,
|
||||
unit: undefined,
|
||||
startDate: new Date(),
|
||||
targetDate: undefined,
|
||||
completedDate: undefined,
|
||||
status: "active",
|
||||
progress: 0,
|
||||
priority: "medium",
|
||||
notes: `${AI_LINK_PREFIX} recommendationId=${recommendation.id}; itemId=${item.id}`,
|
||||
}),
|
||||
),
|
||||
);
|
||||
|
||||
return NextResponse.json({
|
||||
success: true,
|
||||
data: recommendation,
|
||||
meta: {
|
||||
timestamp: new Date().toISOString(),
|
||||
createdGoals: createdGoals.length,
|
||||
pausedGoals: linkedGoals.length,
|
||||
usedFallbackPlan,
|
||||
},
|
||||
});
|
||||
} catch (error) {
|
||||
log.error("Failed to self-generate recommendation", error);
|
||||
return NextResponse.json(
|
||||
{ error: "Internal server error" },
|
||||
{ status: 500 },
|
||||
);
|
||||
}
|
||||
}
|
||||
@ -1,78 +1,8 @@
|
||||
import { NextResponse } from "next/server";
|
||||
import { auth } from "@clerk/nextjs/server";
|
||||
import { db, users as usersTable, eq, sql } from "@fitai/database";
|
||||
import { ensureGymsGeofenceColumns } from "@/lib/geofence";
|
||||
import log from "@/lib/logger";
|
||||
|
||||
export async function GET() {
|
||||
try {
|
||||
const { userId } = await auth();
|
||||
if (!userId) return new NextResponse("Unauthorized", { status: 401 });
|
||||
|
||||
const user = await db
|
||||
.select()
|
||||
.from(usersTable)
|
||||
.where(eq(usersTable.id, userId))
|
||||
.get();
|
||||
|
||||
if (!user) {
|
||||
return new NextResponse("User not found", { status: 404 });
|
||||
}
|
||||
|
||||
if (!user.gymId) {
|
||||
return NextResponse.json({ gymId: null, gym: null });
|
||||
}
|
||||
|
||||
await ensureGymsGeofenceColumns();
|
||||
|
||||
const rows = await db.all(sql`
|
||||
SELECT
|
||||
id,
|
||||
name,
|
||||
location,
|
||||
latitude,
|
||||
longitude,
|
||||
geofence_radius_meters as geofenceRadiusMeters,
|
||||
geofence_enabled as geofenceEnabled,
|
||||
status
|
||||
FROM gyms
|
||||
WHERE id = ${user.gymId}
|
||||
LIMIT 1
|
||||
`);
|
||||
|
||||
const gym = rows?.[0] as
|
||||
| {
|
||||
id: string;
|
||||
name: string;
|
||||
location: string | null;
|
||||
latitude: number | null;
|
||||
longitude: number | null;
|
||||
geofenceRadiusMeters: number | null;
|
||||
geofenceEnabled: number | boolean | null;
|
||||
status: "active" | "inactive";
|
||||
}
|
||||
| undefined;
|
||||
|
||||
if (!gym || gym.status !== "active") {
|
||||
return NextResponse.json({ gymId: user.gymId, gym: null });
|
||||
}
|
||||
|
||||
return NextResponse.json({
|
||||
gymId: user.gymId,
|
||||
gym: {
|
||||
...gym,
|
||||
geofenceEnabled:
|
||||
typeof gym.geofenceEnabled === "boolean"
|
||||
? gym.geofenceEnabled
|
||||
: Boolean(gym.geofenceEnabled),
|
||||
},
|
||||
});
|
||||
} catch (error) {
|
||||
log.error("Failed to fetch current user gym", error);
|
||||
return new NextResponse("Internal Server Error", { status: 500 });
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* PATCH /api/users/gym
|
||||
* Body: { gymId: string | null }
|
||||
|
||||
@ -29,10 +29,6 @@ interface Gym {
|
||||
id: string;
|
||||
name: string;
|
||||
location?: string | null;
|
||||
latitude?: number | null;
|
||||
longitude?: number | null;
|
||||
geofenceRadiusMeters?: number | null;
|
||||
geofenceEnabled?: boolean;
|
||||
status: "active" | "inactive";
|
||||
adminUserId: string;
|
||||
createdAt?: number;
|
||||
@ -76,11 +72,6 @@ export default function SettingsPage() {
|
||||
const [gymStats, setGymStats] = useState<GymStats | null>(null);
|
||||
const [statsLoading, setStatsLoading] = useState(false);
|
||||
const [deletingGym, setDeletingGym] = useState(false);
|
||||
const [savingGeofence, setSavingGeofence] = useState(false);
|
||||
const [geofenceLatitude, setGeofenceLatitude] = useState("");
|
||||
const [geofenceLongitude, setGeofenceLongitude] = useState("");
|
||||
const [geofenceRadiusMeters, setGeofenceRadiusMeters] = useState("30");
|
||||
const [geofenceEnabled, setGeofenceEnabled] = useState(true);
|
||||
|
||||
// Create Gym modal state
|
||||
const [showCreateGym, setShowCreateGym] = useState(false);
|
||||
@ -195,87 +186,6 @@ export default function SettingsPage() {
|
||||
const handleSelectGym = async (gym: Gym | null) => {
|
||||
setSelectedGym(gym);
|
||||
setGymStats(null);
|
||||
|
||||
if (gym) {
|
||||
setGeofenceLatitude(
|
||||
gym.latitude !== null && gym.latitude !== undefined
|
||||
? String(gym.latitude)
|
||||
: "",
|
||||
);
|
||||
setGeofenceLongitude(
|
||||
gym.longitude !== null && gym.longitude !== undefined
|
||||
? String(gym.longitude)
|
||||
: "",
|
||||
);
|
||||
setGeofenceRadiusMeters(String(gym.geofenceRadiusMeters ?? 30));
|
||||
setGeofenceEnabled(gym.geofenceEnabled ?? true);
|
||||
}
|
||||
};
|
||||
|
||||
const handleSaveGeofence = async () => {
|
||||
if (!selectedGym) return;
|
||||
|
||||
const latitude =
|
||||
geofenceLatitude.trim() === "" ? null : Number(geofenceLatitude);
|
||||
const longitude =
|
||||
geofenceLongitude.trim() === "" ? null : Number(geofenceLongitude);
|
||||
const radius = Number(geofenceRadiusMeters);
|
||||
|
||||
if (
|
||||
latitude !== null &&
|
||||
(!Number.isFinite(latitude) || latitude < -90 || latitude > 90)
|
||||
) {
|
||||
setGymMessage({
|
||||
type: "error",
|
||||
text: "Latitude must be between -90 and 90",
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
if (
|
||||
longitude !== null &&
|
||||
(!Number.isFinite(longitude) || longitude < -180 || longitude > 180)
|
||||
) {
|
||||
setGymMessage({
|
||||
type: "error",
|
||||
text: "Longitude must be between -180 and 180",
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
if (!Number.isFinite(radius) || radius <= 0) {
|
||||
setGymMessage({
|
||||
type: "error",
|
||||
text: "Radius must be a positive number",
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
setSavingGeofence(true);
|
||||
setGymMessage(null);
|
||||
|
||||
try {
|
||||
const response = await axios.patch(`/api/gyms/${selectedGym.id}`, {
|
||||
latitude,
|
||||
longitude,
|
||||
geofenceRadiusMeters: radius,
|
||||
geofenceEnabled,
|
||||
});
|
||||
setGymMessage({ type: "success", text: "Geofence settings updated" });
|
||||
const updatedGym = response.data as Gym;
|
||||
setSelectedGym(updatedGym);
|
||||
setGyms((prev) =>
|
||||
prev.map((gym) => (gym.id === updatedGym.id ? updatedGym : gym)),
|
||||
);
|
||||
} catch (error) {
|
||||
log.error("Failed to update geofence settings", error);
|
||||
setGymMessage({
|
||||
type: "error",
|
||||
text: "Failed to update geofence settings",
|
||||
});
|
||||
} finally {
|
||||
setSavingGeofence(false);
|
||||
}
|
||||
};
|
||||
|
||||
const handleDeleteGym = async (gymId: string) => {
|
||||
@ -565,91 +475,6 @@ export default function SettingsPage() {
|
||||
{selectedGym.status}
|
||||
</p>
|
||||
</div>
|
||||
<div>
|
||||
<p className="text-xs text-slate-500">Geofence</p>
|
||||
<p className="font-medium">
|
||||
{selectedGym.geofenceEnabled === false
|
||||
? "Disabled"
|
||||
: `${selectedGym.geofenceRadiusMeters ?? 30}m`}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Geofence Settings */}
|
||||
<div className="p-4 border rounded-lg space-y-3">
|
||||
<div className="flex items-center justify-between">
|
||||
<h5 className="text-sm font-medium text-slate-700">
|
||||
Attendance Geofence
|
||||
</h5>
|
||||
<label className="inline-flex items-center gap-2 text-sm text-slate-700">
|
||||
<input
|
||||
type="checkbox"
|
||||
checked={geofenceEnabled}
|
||||
onChange={(e) => setGeofenceEnabled(e.target.checked)}
|
||||
/>
|
||||
Enabled
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<div className="grid grid-cols-1 md:grid-cols-3 gap-3">
|
||||
<div>
|
||||
<label className="block text-xs text-slate-500 mb-1">
|
||||
Latitude
|
||||
</label>
|
||||
<input
|
||||
type="number"
|
||||
step="any"
|
||||
value={geofenceLatitude}
|
||||
onChange={(e) => setGeofenceLatitude(e.target.value)}
|
||||
className="w-full border border-gray-300 rounded px-3 py-2"
|
||||
placeholder="e.g. 37.7749"
|
||||
/>
|
||||
</div>
|
||||
<div>
|
||||
<label className="block text-xs text-slate-500 mb-1">
|
||||
Longitude
|
||||
</label>
|
||||
<input
|
||||
type="number"
|
||||
step="any"
|
||||
value={geofenceLongitude}
|
||||
onChange={(e) => setGeofenceLongitude(e.target.value)}
|
||||
className="w-full border border-gray-300 rounded px-3 py-2"
|
||||
placeholder="e.g. -122.4194"
|
||||
/>
|
||||
</div>
|
||||
<div>
|
||||
<label className="block text-xs text-slate-500 mb-1">
|
||||
Radius (meters)
|
||||
</label>
|
||||
<input
|
||||
type="number"
|
||||
min="1"
|
||||
value={geofenceRadiusMeters}
|
||||
onChange={(e) =>
|
||||
setGeofenceRadiusMeters(e.target.value)
|
||||
}
|
||||
className="w-full border border-gray-300 rounded px-3 py-2"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="flex items-center justify-between">
|
||||
<p className="text-xs text-slate-500">
|
||||
Default radius is 30m and geofence is enabled by default.
|
||||
</p>
|
||||
<Button
|
||||
size="sm"
|
||||
onClick={handleSaveGeofence}
|
||||
disabled={savingGeofence}
|
||||
>
|
||||
{savingGeofence ? (
|
||||
<Loader2 className="w-4 h-4 animate-spin" />
|
||||
) : (
|
||||
"Save Geofence"
|
||||
)}
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Stats */}
|
||||
|
||||
@ -1,277 +0,0 @@
|
||||
import { db, eq, sql, users } from "@fitai/database";
|
||||
|
||||
export const DEFAULT_GEOFENCE_RADIUS_METERS = 30;
|
||||
export const MAX_LOCATION_ACCURACY_METERS = 50;
|
||||
export const MAX_FALLBACK_ACCURACY_MARGIN_METERS = 120;
|
||||
|
||||
export interface UserLocation {
|
||||
latitude: number;
|
||||
longitude: number;
|
||||
accuracy: number;
|
||||
}
|
||||
|
||||
export async function ensureGymsGeofenceColumns(): Promise<void> {
|
||||
const rows = await db.all(sql`PRAGMA table_info('gyms')`);
|
||||
const columns = new Set(
|
||||
(rows as Array<{ name?: string }>).map((row) => row.name).filter(Boolean),
|
||||
);
|
||||
|
||||
if (!columns.has("latitude")) {
|
||||
await db.run(sql`ALTER TABLE gyms ADD COLUMN latitude REAL`);
|
||||
}
|
||||
|
||||
if (!columns.has("longitude")) {
|
||||
await db.run(sql`ALTER TABLE gyms ADD COLUMN longitude REAL`);
|
||||
}
|
||||
|
||||
if (!columns.has("geofence_radius_meters")) {
|
||||
await db.run(
|
||||
sql`ALTER TABLE gyms ADD COLUMN geofence_radius_meters REAL NOT NULL DEFAULT 30`,
|
||||
);
|
||||
}
|
||||
|
||||
if (!columns.has("geofence_enabled")) {
|
||||
await db.run(
|
||||
sql`ALTER TABLE gyms ADD COLUMN geofence_enabled INTEGER NOT NULL DEFAULT 1`,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
interface GymGeofenceConfig {
|
||||
id: string;
|
||||
name: string;
|
||||
latitude: number | null;
|
||||
longitude: number | null;
|
||||
geofenceRadiusMeters: number | null;
|
||||
geofenceEnabled: boolean | null;
|
||||
}
|
||||
|
||||
export async function getUserGymGeofence(
|
||||
userId: string,
|
||||
): Promise<GymGeofenceConfig | null> {
|
||||
await ensureGymsGeofenceColumns();
|
||||
|
||||
const user = await db.select().from(users).where(eq(users.id, userId)).get();
|
||||
if (!user?.gymId) {
|
||||
return null;
|
||||
}
|
||||
|
||||
const rows = await db.all(sql`
|
||||
SELECT
|
||||
id,
|
||||
name,
|
||||
latitude,
|
||||
longitude,
|
||||
geofence_radius_meters as geofenceRadiusMeters,
|
||||
geofence_enabled as geofenceEnabled
|
||||
FROM gyms
|
||||
WHERE id = ${user.gymId}
|
||||
LIMIT 1
|
||||
`);
|
||||
const gym = rows?.[0] as
|
||||
| {
|
||||
id: string;
|
||||
name: string;
|
||||
latitude: number | null;
|
||||
longitude: number | null;
|
||||
geofenceRadiusMeters: number | null;
|
||||
geofenceEnabled: number | boolean | null;
|
||||
}
|
||||
| undefined;
|
||||
if (!gym) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return {
|
||||
id: gym.id,
|
||||
name: gym.name,
|
||||
latitude: gym.latitude,
|
||||
longitude: gym.longitude,
|
||||
geofenceRadiusMeters: gym.geofenceRadiusMeters,
|
||||
geofenceEnabled:
|
||||
typeof gym.geofenceEnabled === "boolean"
|
||||
? gym.geofenceEnabled
|
||||
: gym.geofenceEnabled === null
|
||||
? null
|
||||
: Boolean(gym.geofenceEnabled),
|
||||
};
|
||||
}
|
||||
|
||||
export function parseUserLocation(payload: unknown): UserLocation | null {
|
||||
if (!payload || typeof payload !== "object") {
|
||||
return null;
|
||||
}
|
||||
|
||||
const raw = payload as Record<string, unknown>;
|
||||
const latitude = Number(raw.latitude);
|
||||
const longitude = Number(raw.longitude);
|
||||
const accuracy = Number(raw.accuracy);
|
||||
|
||||
if (
|
||||
!Number.isFinite(latitude) ||
|
||||
!Number.isFinite(longitude) ||
|
||||
!Number.isFinite(accuracy)
|
||||
) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return { latitude, longitude, accuracy };
|
||||
}
|
||||
|
||||
export function validateGeofence(
|
||||
gym: GymGeofenceConfig,
|
||||
location: UserLocation | null,
|
||||
): { ok: true } | { ok: false; status: number; error: string } {
|
||||
const geofenceEnabled = gym.geofenceEnabled ?? true;
|
||||
if (!geofenceEnabled) {
|
||||
return { ok: true };
|
||||
}
|
||||
|
||||
if (!location) {
|
||||
return {
|
||||
ok: false,
|
||||
status: 400,
|
||||
error: "Location is required for gym check-in/check-out",
|
||||
};
|
||||
}
|
||||
|
||||
if (location.accuracy > MAX_LOCATION_ACCURACY_METERS) {
|
||||
return {
|
||||
ok: false,
|
||||
status: 400,
|
||||
error: `Location accuracy too low (${Math.round(location.accuracy)}m). Move to an open area and try again.`,
|
||||
};
|
||||
}
|
||||
|
||||
if (gym.latitude === null || gym.longitude === null) {
|
||||
return {
|
||||
ok: false,
|
||||
status: 400,
|
||||
error: "Gym geofence is enabled but gym coordinates are not configured",
|
||||
};
|
||||
}
|
||||
|
||||
const radius = gym.geofenceRadiusMeters ?? DEFAULT_GEOFENCE_RADIUS_METERS;
|
||||
const distanceMeters = haversineDistanceMeters(
|
||||
gym.latitude,
|
||||
gym.longitude,
|
||||
location.latitude,
|
||||
location.longitude,
|
||||
);
|
||||
|
||||
if (distanceMeters > radius) {
|
||||
return {
|
||||
ok: false,
|
||||
status: 403,
|
||||
error: `You are outside the gym geofence (${Math.round(distanceMeters)}m away, allowed ${Math.round(radius)}m).`,
|
||||
};
|
||||
}
|
||||
|
||||
return { ok: true };
|
||||
}
|
||||
|
||||
export function validateGeofenceWithFallback(
|
||||
gym: GymGeofenceConfig,
|
||||
location: UserLocation | null,
|
||||
fallbackRequested: boolean,
|
||||
): { ok: true } | { ok: false; status: number; error: string } {
|
||||
const geofenceEnabled = gym.geofenceEnabled ?? true;
|
||||
if (!geofenceEnabled) {
|
||||
return { ok: true };
|
||||
}
|
||||
|
||||
if (!location) {
|
||||
return {
|
||||
ok: false,
|
||||
status: 400,
|
||||
error: "Location is required for gym check-in/check-out",
|
||||
};
|
||||
}
|
||||
|
||||
if (gym.latitude === null || gym.longitude === null) {
|
||||
return {
|
||||
ok: false,
|
||||
status: 400,
|
||||
error: "Gym geofence is enabled but gym coordinates are not configured",
|
||||
};
|
||||
}
|
||||
|
||||
const radius = gym.geofenceRadiusMeters ?? DEFAULT_GEOFENCE_RADIUS_METERS;
|
||||
const distanceMeters = haversineDistanceMeters(
|
||||
gym.latitude,
|
||||
gym.longitude,
|
||||
location.latitude,
|
||||
location.longitude,
|
||||
);
|
||||
|
||||
if (location.accuracy <= MAX_LOCATION_ACCURACY_METERS) {
|
||||
if (distanceMeters > radius) {
|
||||
return {
|
||||
ok: false,
|
||||
status: 403,
|
||||
error: `You are outside the gym geofence (${Math.round(distanceMeters)}m away, allowed ${Math.round(radius)}m).`,
|
||||
};
|
||||
}
|
||||
|
||||
return { ok: true };
|
||||
}
|
||||
|
||||
if (!fallbackRequested) {
|
||||
return {
|
||||
ok: false,
|
||||
status: 400,
|
||||
error: `Location accuracy too low (${Math.round(location.accuracy)}m). Move to an open area and try again.`,
|
||||
};
|
||||
}
|
||||
|
||||
const fallbackMargin = Math.min(
|
||||
location.accuracy,
|
||||
MAX_FALLBACK_ACCURACY_MARGIN_METERS,
|
||||
);
|
||||
const fallbackAllowedDistance = radius + fallbackMargin;
|
||||
|
||||
if (distanceMeters > fallbackAllowedDistance) {
|
||||
return {
|
||||
ok: false,
|
||||
status: 403,
|
||||
error: `You are outside the gym geofence (${Math.round(distanceMeters)}m away, fallback allowed ${Math.round(fallbackAllowedDistance)}m).`,
|
||||
};
|
||||
}
|
||||
|
||||
return { ok: true };
|
||||
}
|
||||
|
||||
export function validateCheckInGeofence(
|
||||
gym: GymGeofenceConfig,
|
||||
location: UserLocation | null,
|
||||
fallbackRequested: boolean,
|
||||
): { ok: true } | { ok: false; status: number; error: string } {
|
||||
return validateGeofenceWithFallback(gym, location, fallbackRequested);
|
||||
}
|
||||
|
||||
function haversineDistanceMeters(
|
||||
latitude1: number,
|
||||
longitude1: number,
|
||||
latitude2: number,
|
||||
longitude2: number,
|
||||
): number {
|
||||
const earthRadiusMeters = 6371000;
|
||||
const dLat = toRadians(latitude2 - latitude1);
|
||||
const dLng = toRadians(longitude2 - longitude1);
|
||||
const lat1Rad = toRadians(latitude1);
|
||||
const lat2Rad = toRadians(latitude2);
|
||||
|
||||
const a =
|
||||
Math.sin(dLat / 2) * Math.sin(dLat / 2) +
|
||||
Math.sin(dLng / 2) *
|
||||
Math.sin(dLng / 2) *
|
||||
Math.cos(lat1Rad) *
|
||||
Math.cos(lat2Rad);
|
||||
|
||||
const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
|
||||
return earthRadiusMeters * c;
|
||||
}
|
||||
|
||||
function toRadians(degrees: number): number {
|
||||
return (degrees * Math.PI) / 180;
|
||||
}
|
||||
16
apps/mobile/android/.gitignore
vendored
Normal file
16
apps/mobile/android/.gitignore
vendored
Normal file
@ -0,0 +1,16 @@
|
||||
# OSX
|
||||
#
|
||||
.DS_Store
|
||||
|
||||
# Android/IntelliJ
|
||||
#
|
||||
build/
|
||||
.idea
|
||||
.gradle
|
||||
local.properties
|
||||
*.iml
|
||||
*.hprof
|
||||
.cxx/
|
||||
|
||||
# Bundle artifacts
|
||||
*.jsbundle
|
||||
182
apps/mobile/android/app/build.gradle
Normal file
182
apps/mobile/android/app/build.gradle
Normal file
@ -0,0 +1,182 @@
|
||||
apply plugin: "com.android.application"
|
||||
apply plugin: "org.jetbrains.kotlin.android"
|
||||
apply plugin: "com.facebook.react"
|
||||
|
||||
def projectRoot = rootDir.getAbsoluteFile().getParentFile().getAbsolutePath()
|
||||
|
||||
/**
|
||||
* This is the configuration block to customize your React Native Android app.
|
||||
* By default you don't need to apply any configuration, just uncomment the lines you need.
|
||||
*/
|
||||
react {
|
||||
entryFile = file(["node", "-e", "require('expo/scripts/resolveAppEntry')", projectRoot, "android", "absolute"].execute(null, rootDir).text.trim())
|
||||
reactNativeDir = new File(["node", "--print", "require.resolve('react-native/package.json')"].execute(null, rootDir).text.trim()).getParentFile().getAbsoluteFile()
|
||||
hermesCommand = new File(["node", "--print", "require.resolve('react-native/package.json')"].execute(null, rootDir).text.trim()).getParentFile().getAbsolutePath() + "/sdks/hermesc/%OS-BIN%/hermesc"
|
||||
codegenDir = new File(["node", "--print", "require.resolve('@react-native/codegen/package.json', { paths: [require.resolve('react-native/package.json')] })"].execute(null, rootDir).text.trim()).getParentFile().getAbsoluteFile()
|
||||
|
||||
enableBundleCompression = (findProperty('android.enableBundleCompression') ?: false).toBoolean()
|
||||
// Use Expo CLI to bundle the app, this ensures the Metro config
|
||||
// works correctly with Expo projects.
|
||||
cliFile = new File(["node", "--print", "require.resolve('@expo/cli', { paths: [require.resolve('expo/package.json')] })"].execute(null, rootDir).text.trim())
|
||||
bundleCommand = "export:embed"
|
||||
|
||||
/* Folders */
|
||||
// The root of your project, i.e. where "package.json" lives. Default is '../..'
|
||||
// root = file("../../")
|
||||
// The folder where the react-native NPM package is. Default is ../../node_modules/react-native
|
||||
// reactNativeDir = file("../../node_modules/react-native")
|
||||
// The folder where the react-native Codegen package is. Default is ../../node_modules/@react-native/codegen
|
||||
// codegenDir = file("../../node_modules/@react-native/codegen")
|
||||
|
||||
/* Variants */
|
||||
// The list of variants to that are debuggable. For those we're going to
|
||||
// skip the bundling of the JS bundle and the assets. By default is just 'debug'.
|
||||
// If you add flavors like lite, prod, etc. you'll have to list your debuggableVariants.
|
||||
// debuggableVariants = ["liteDebug", "prodDebug"]
|
||||
|
||||
/* Bundling */
|
||||
// A list containing the node command and its flags. Default is just 'node'.
|
||||
// nodeExecutableAndArgs = ["node"]
|
||||
|
||||
//
|
||||
// The path to the CLI configuration file. Default is empty.
|
||||
// bundleConfig = file(../rn-cli.config.js)
|
||||
//
|
||||
// The name of the generated asset file containing your JS bundle
|
||||
// bundleAssetName = "MyApplication.android.bundle"
|
||||
//
|
||||
// The entry file for bundle generation. Default is 'index.android.js' or 'index.js'
|
||||
// entryFile = file("../js/MyApplication.android.js")
|
||||
//
|
||||
// A list of extra flags to pass to the 'bundle' commands.
|
||||
// See https://github.com/react-native-community/cli/blob/main/docs/commands.md#bundle
|
||||
// extraPackagerArgs = []
|
||||
|
||||
/* Hermes Commands */
|
||||
// The hermes compiler command to run. By default it is 'hermesc'
|
||||
// hermesCommand = "$rootDir/my-custom-hermesc/bin/hermesc"
|
||||
//
|
||||
// The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
|
||||
// hermesFlags = ["-O", "-output-source-map"]
|
||||
|
||||
/* Autolinking */
|
||||
autolinkLibrariesWithApp()
|
||||
}
|
||||
|
||||
/**
|
||||
* Set this to true in release builds to optimize the app using [R8](https://developer.android.com/topic/performance/app-optimization/enable-app-optimization).
|
||||
*/
|
||||
def enableMinifyInReleaseBuilds = (findProperty('android.enableMinifyInReleaseBuilds') ?: false).toBoolean()
|
||||
|
||||
/**
|
||||
* The preferred build flavor of JavaScriptCore (JSC)
|
||||
*
|
||||
* For example, to use the international variant, you can use:
|
||||
* `def jscFlavor = 'org.webkit:android-jsc-intl:+'`
|
||||
*
|
||||
* The international variant includes ICU i18n library and necessary data
|
||||
* allowing to use e.g. `Date.toLocaleString` and `String.localeCompare` that
|
||||
* give correct results when using with locales other than en-US. Note that
|
||||
* this variant is about 6MiB larger per architecture than default.
|
||||
*/
|
||||
def jscFlavor = 'io.github.react-native-community:jsc-android:2026004.+'
|
||||
|
||||
android {
|
||||
ndkVersion rootProject.ext.ndkVersion
|
||||
|
||||
buildToolsVersion rootProject.ext.buildToolsVersion
|
||||
compileSdk rootProject.ext.compileSdkVersion
|
||||
|
||||
namespace "com.fitai"
|
||||
defaultConfig {
|
||||
applicationId "com.fitai"
|
||||
minSdkVersion rootProject.ext.minSdkVersion
|
||||
targetSdkVersion rootProject.ext.targetSdkVersion
|
||||
versionCode 1
|
||||
versionName "1.0"
|
||||
|
||||
buildConfigField "String", "REACT_NATIVE_RELEASE_LEVEL", "\"${findProperty('reactNativeReleaseLevel') ?: 'stable'}\""
|
||||
}
|
||||
signingConfigs {
|
||||
debug {
|
||||
storeFile file('debug.keystore')
|
||||
storePassword 'android'
|
||||
keyAlias 'androiddebugkey'
|
||||
keyPassword 'android'
|
||||
}
|
||||
}
|
||||
buildTypes {
|
||||
debug {
|
||||
signingConfig signingConfigs.debug
|
||||
}
|
||||
release {
|
||||
// Caution! In production, you need to generate your own keystore file.
|
||||
// see https://reactnative.dev/docs/signed-apk-android.
|
||||
signingConfig signingConfigs.debug
|
||||
def enableShrinkResources = findProperty('android.enableShrinkResourcesInReleaseBuilds') ?: 'false'
|
||||
shrinkResources enableShrinkResources.toBoolean()
|
||||
minifyEnabled enableMinifyInReleaseBuilds
|
||||
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
|
||||
def enablePngCrunchInRelease = findProperty('android.enablePngCrunchInReleaseBuilds') ?: 'true'
|
||||
crunchPngs enablePngCrunchInRelease.toBoolean()
|
||||
}
|
||||
}
|
||||
packagingOptions {
|
||||
jniLibs {
|
||||
def enableLegacyPackaging = findProperty('expo.useLegacyPackaging') ?: 'false'
|
||||
useLegacyPackaging enableLegacyPackaging.toBoolean()
|
||||
}
|
||||
}
|
||||
androidResources {
|
||||
ignoreAssetsPattern '!.svn:!.git:!.ds_store:!*.scc:!CVS:!thumbs.db:!picasa.ini:!*~'
|
||||
}
|
||||
}
|
||||
|
||||
// Apply static values from `gradle.properties` to the `android.packagingOptions`
|
||||
// Accepts values in comma delimited lists, example:
|
||||
// android.packagingOptions.pickFirsts=/LICENSE,**/picasa.ini
|
||||
["pickFirsts", "excludes", "merges", "doNotStrip"].each { prop ->
|
||||
// Split option: 'foo,bar' -> ['foo', 'bar']
|
||||
def options = (findProperty("android.packagingOptions.$prop") ?: "").split(",");
|
||||
// Trim all elements in place.
|
||||
for (i in 0..<options.size()) options[i] = options[i].trim();
|
||||
// `[] - ""` is essentially `[""].filter(Boolean)` removing all empty strings.
|
||||
options -= ""
|
||||
|
||||
if (options.length > 0) {
|
||||
println "android.packagingOptions.$prop += $options ($options.length)"
|
||||
// Ex: android.packagingOptions.pickFirsts += '**/SCCS/**'
|
||||
options.each {
|
||||
android.packagingOptions[prop] += it
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
// The version of react-native is set by the React Native Gradle Plugin
|
||||
implementation("com.facebook.react:react-android")
|
||||
|
||||
def isGifEnabled = (findProperty('expo.gif.enabled') ?: "") == "true";
|
||||
def isWebpEnabled = (findProperty('expo.webp.enabled') ?: "") == "true";
|
||||
def isWebpAnimatedEnabled = (findProperty('expo.webp.animated') ?: "") == "true";
|
||||
|
||||
if (isGifEnabled) {
|
||||
// For animated gif support
|
||||
implementation("com.facebook.fresco:animated-gif:${expoLibs.versions.fresco.get()}")
|
||||
}
|
||||
|
||||
if (isWebpEnabled) {
|
||||
// For webp support
|
||||
implementation("com.facebook.fresco:webpsupport:${expoLibs.versions.fresco.get()}")
|
||||
if (isWebpAnimatedEnabled) {
|
||||
// Animated webp support
|
||||
implementation("com.facebook.fresco:animated-webp:${expoLibs.versions.fresco.get()}")
|
||||
}
|
||||
}
|
||||
|
||||
if (hermesEnabled.toBoolean()) {
|
||||
implementation("com.facebook.react:hermes-android")
|
||||
} else {
|
||||
implementation jscFlavor
|
||||
}
|
||||
}
|
||||
BIN
apps/mobile/android/app/debug.keystore
Normal file
BIN
apps/mobile/android/app/debug.keystore
Normal file
Binary file not shown.
14
apps/mobile/android/app/proguard-rules.pro
vendored
Normal file
14
apps/mobile/android/app/proguard-rules.pro
vendored
Normal file
@ -0,0 +1,14 @@
|
||||
# Add project specific ProGuard rules here.
|
||||
# By default, the flags in this file are appended to flags specified
|
||||
# in /usr/local/Cellar/android-sdk/24.3.3/tools/proguard/proguard-android.txt
|
||||
# You can edit the include path and order by changing the proguardFiles
|
||||
# directive in build.gradle.
|
||||
#
|
||||
# For more details, see
|
||||
# http://developer.android.com/guide/developing/tools/proguard.html
|
||||
|
||||
# react-native-reanimated
|
||||
-keep class com.swmansion.reanimated.** { *; }
|
||||
-keep class com.facebook.react.turbomodule.** { *; }
|
||||
|
||||
# Add any project specific keep options here:
|
||||
7
apps/mobile/android/app/src/debug/AndroidManifest.xml
Normal file
7
apps/mobile/android/app/src/debug/AndroidManifest.xml
Normal file
@ -0,0 +1,7 @@
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools">
|
||||
|
||||
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
|
||||
|
||||
<application android:usesCleartextTraffic="true" tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" tools:replace="android:usesCleartextTraffic" />
|
||||
</manifest>
|
||||
@ -0,0 +1,7 @@
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools">
|
||||
|
||||
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
|
||||
|
||||
<application android:usesCleartextTraffic="true" tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" tools:replace="android:usesCleartextTraffic" />
|
||||
</manifest>
|
||||
29
apps/mobile/android/app/src/main/AndroidManifest.xml
Normal file
29
apps/mobile/android/app/src/main/AndroidManifest.xml
Normal file
@ -0,0 +1,29 @@
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<uses-permission android:name="android.permission.INTERNET"/>
|
||||
<!-- OPTIONAL PERMISSIONS, REMOVE WHATEVER YOU DO NOT NEED -->
|
||||
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
|
||||
<uses-permission android:name="android.permission.VIBRATE"/>
|
||||
<!-- These require runtime permissions on M -->
|
||||
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
|
||||
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
|
||||
<!-- END OPTIONAL PERMISSIONS -->
|
||||
|
||||
<queries>
|
||||
<!-- Support checking for http(s) links via the Linking API -->
|
||||
<intent>
|
||||
<action android:name="android.intent.action.VIEW" />
|
||||
<category android:name="android.intent.category.BROWSABLE" />
|
||||
<data android:scheme="https" />
|
||||
</intent>
|
||||
</queries>
|
||||
|
||||
<application android:name=".MainApplication" android:label="@string/app_name" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:allowBackup="false" android:theme="@style/AppTheme" android:supportsRtl="true">
|
||||
<activity android:name=".MainActivity" android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|uiMode" android:launchMode="singleTask" android:windowSoftInputMode="adjustResize" android:theme="@style/Theme.App.SplashScreen" android:exported="true">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.MAIN"/>
|
||||
<category android:name="android.intent.category.LAUNCHER"/>
|
||||
</intent-filter>
|
||||
</activity>
|
||||
</application>
|
||||
</manifest>
|
||||
@ -0,0 +1,61 @@
|
||||
package com.anonymous.fitai
|
||||
|
||||
import android.os.Build
|
||||
import android.os.Bundle
|
||||
|
||||
import com.facebook.react.ReactActivity
|
||||
import com.facebook.react.ReactActivityDelegate
|
||||
import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.fabricEnabled
|
||||
import com.facebook.react.defaults.DefaultReactActivityDelegate
|
||||
|
||||
import expo.modules.ReactActivityDelegateWrapper
|
||||
|
||||
class MainActivity : ReactActivity() {
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
// Set the theme to AppTheme BEFORE onCreate to support
|
||||
// coloring the background, status bar, and navigation bar.
|
||||
// This is required for expo-splash-screen.
|
||||
setTheme(R.style.AppTheme);
|
||||
super.onCreate(null)
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the name of the main component registered from JavaScript. This is used to schedule
|
||||
* rendering of the component.
|
||||
*/
|
||||
override fun getMainComponentName(): String = "main"
|
||||
|
||||
/**
|
||||
* Returns the instance of the [ReactActivityDelegate]. We use [DefaultReactActivityDelegate]
|
||||
* which allows you to enable New Architecture with a single boolean flags [fabricEnabled]
|
||||
*/
|
||||
override fun createReactActivityDelegate(): ReactActivityDelegate {
|
||||
return ReactActivityDelegateWrapper(
|
||||
this,
|
||||
BuildConfig.IS_NEW_ARCHITECTURE_ENABLED,
|
||||
object : DefaultReactActivityDelegate(
|
||||
this,
|
||||
mainComponentName,
|
||||
fabricEnabled
|
||||
){})
|
||||
}
|
||||
|
||||
/**
|
||||
* Align the back button behavior with Android S
|
||||
* where moving root activities to background instead of finishing activities.
|
||||
* @see <a href="https://developer.android.com/reference/android/app/Activity#onBackPressed()">onBackPressed</a>
|
||||
*/
|
||||
override fun invokeDefaultOnBackPressed() {
|
||||
if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.R) {
|
||||
if (!moveTaskToBack(false)) {
|
||||
// For non-root activities, use the default implementation to finish them.
|
||||
super.invokeDefaultOnBackPressed()
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
// Use the default back button implementation on Android S
|
||||
// because it's doing more than [Activity.moveTaskToBack] in fact.
|
||||
super.invokeDefaultOnBackPressed()
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,56 @@
|
||||
package com.anonymous.fitai
|
||||
|
||||
import android.app.Application
|
||||
import android.content.res.Configuration
|
||||
|
||||
import com.facebook.react.PackageList
|
||||
import com.facebook.react.ReactApplication
|
||||
import com.facebook.react.ReactNativeApplicationEntryPoint.loadReactNative
|
||||
import com.facebook.react.ReactNativeHost
|
||||
import com.facebook.react.ReactPackage
|
||||
import com.facebook.react.ReactHost
|
||||
import com.facebook.react.common.ReleaseLevel
|
||||
import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint
|
||||
import com.facebook.react.defaults.DefaultReactNativeHost
|
||||
|
||||
import expo.modules.ApplicationLifecycleDispatcher
|
||||
import expo.modules.ReactNativeHostWrapper
|
||||
|
||||
class MainApplication : Application(), ReactApplication {
|
||||
|
||||
override val reactNativeHost: ReactNativeHost = ReactNativeHostWrapper(
|
||||
this,
|
||||
object : DefaultReactNativeHost(this) {
|
||||
override fun getPackages(): List<ReactPackage> =
|
||||
PackageList(this).packages.apply {
|
||||
// Packages that cannot be autolinked yet can be added manually here, for example:
|
||||
// add(MyReactNativePackage())
|
||||
}
|
||||
|
||||
override fun getJSMainModuleName(): String = ".expo/.virtual-metro-entry"
|
||||
|
||||
override fun getUseDeveloperSupport(): Boolean = BuildConfig.DEBUG
|
||||
|
||||
override val isNewArchEnabled: Boolean = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
|
||||
}
|
||||
)
|
||||
|
||||
override val reactHost: ReactHost
|
||||
get() = ReactNativeHostWrapper.createReactHost(applicationContext, reactNativeHost)
|
||||
|
||||
override fun onCreate() {
|
||||
super.onCreate()
|
||||
DefaultNewArchitectureEntryPoint.releaseLevel = try {
|
||||
ReleaseLevel.valueOf(BuildConfig.REACT_NATIVE_RELEASE_LEVEL.uppercase())
|
||||
} catch (e: IllegalArgumentException) {
|
||||
ReleaseLevel.STABLE
|
||||
}
|
||||
loadReactNative(this)
|
||||
ApplicationLifecycleDispatcher.onApplicationCreate(this)
|
||||
}
|
||||
|
||||
override fun onConfigurationChanged(newConfig: Configuration) {
|
||||
super.onConfigurationChanged(newConfig)
|
||||
ApplicationLifecycleDispatcher.onConfigurationChanged(this, newConfig)
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 20 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 13 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 28 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 46 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 65 KiB |
@ -0,0 +1,6 @@
|
||||
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:drawable="@color/splashscreen_background"/>
|
||||
<item>
|
||||
<bitmap android:gravity="center" android:src="@drawable/splashscreen_logo"/>
|
||||
</item>
|
||||
</layer-list>
|
||||
@ -0,0 +1,37 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (C) 2014 The Android Open Source Project
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
<inset xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:insetLeft="@dimen/abc_edit_text_inset_horizontal_material"
|
||||
android:insetRight="@dimen/abc_edit_text_inset_horizontal_material"
|
||||
android:insetTop="@dimen/abc_edit_text_inset_top_material"
|
||||
android:insetBottom="@dimen/abc_edit_text_inset_bottom_material"
|
||||
>
|
||||
|
||||
<selector>
|
||||
<!--
|
||||
This file is a copy of abc_edit_text_material (https://bit.ly/3k8fX7I).
|
||||
The item below with state_pressed="false" and state_focused="false" causes a NullPointerException.
|
||||
NullPointerException:tempt to invoke virtual method 'android.graphics.drawable.Drawable android.graphics.drawable.Drawable$ConstantState.newDrawable(android.content.res.Resources)'
|
||||
|
||||
<item android:state_pressed="false" android:state_focused="false" android:drawable="@drawable/abc_textfield_default_mtrl_alpha"/>
|
||||
|
||||
For more info, see https://bit.ly/3CdLStv (react-native/pull/29452) and https://bit.ly/3nxOMoR.
|
||||
-->
|
||||
<item android:state_enabled="false" android:drawable="@drawable/abc_textfield_default_mtrl_alpha"/>
|
||||
<item android:drawable="@drawable/abc_textfield_activated_mtrl_alpha"/>
|
||||
</selector>
|
||||
|
||||
</inset>
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 3.0 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 4.9 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 2.0 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 2.8 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 4.5 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 6.9 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 6.3 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 10 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 9.0 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 15 KiB |
4
apps/mobile/android/app/src/main/res/values/colors.xml
Normal file
4
apps/mobile/android/app/src/main/res/values/colors.xml
Normal file
@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||
<resources>
|
||||
<color name="splashscreen_background">#FFFFFF</color>
|
||||
</resources>
|
||||
3
apps/mobile/android/app/src/main/res/values/strings.xml
Normal file
3
apps/mobile/android/app/src/main/res/values/strings.xml
Normal file
@ -0,0 +1,3 @@
|
||||
<resources>
|
||||
<string name="app_name">FitAI</string>
|
||||
</resources>
|
||||
8
apps/mobile/android/app/src/main/res/values/styles.xml
Normal file
8
apps/mobile/android/app/src/main/res/values/styles.xml
Normal file
@ -0,0 +1,8 @@
|
||||
<resources>
|
||||
<style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
|
||||
<item name="android:editTextBackground">@drawable/rn_edit_text_material</item>
|
||||
</style>
|
||||
<style name="Theme.App.SplashScreen" parent="AppTheme">
|
||||
<item name="android:windowBackground">@drawable/splashscreen_logo</item>
|
||||
</style>
|
||||
</resources>
|
||||
24
apps/mobile/android/build.gradle
Normal file
24
apps/mobile/android/build.gradle
Normal file
@ -0,0 +1,24 @@
|
||||
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
||||
|
||||
buildscript {
|
||||
repositories {
|
||||
google()
|
||||
mavenCentral()
|
||||
}
|
||||
dependencies {
|
||||
classpath('com.android.tools.build:gradle')
|
||||
classpath('com.facebook.react:react-native-gradle-plugin')
|
||||
classpath('org.jetbrains.kotlin:kotlin-gradle-plugin')
|
||||
}
|
||||
}
|
||||
|
||||
allprojects {
|
||||
repositories {
|
||||
google()
|
||||
mavenCentral()
|
||||
maven { url 'https://www.jitpack.io' }
|
||||
}
|
||||
}
|
||||
|
||||
apply plugin: "expo-root-project"
|
||||
apply plugin: "com.facebook.react.rootproject"
|
||||
61
apps/mobile/android/gradle.properties
Normal file
61
apps/mobile/android/gradle.properties
Normal file
@ -0,0 +1,61 @@
|
||||
# Project-wide Gradle settings.
|
||||
|
||||
# IDE (e.g. Android Studio) users:
|
||||
# Gradle settings configured through the IDE *will override*
|
||||
# any settings specified in this file.
|
||||
|
||||
# For more details on how to configure your build environment visit
|
||||
# http://www.gradle.org/docs/current/userguide/build_environment.html
|
||||
|
||||
# Specifies the JVM arguments used for the daemon process.
|
||||
# The setting is particularly useful for tweaking memory settings.
|
||||
# Default value: -Xmx512m -XX:MaxMetaspaceSize=256m
|
||||
org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m
|
||||
|
||||
# When configured, Gradle will run in incubating parallel mode.
|
||||
# This option should only be used with decoupled projects. More details, visit
|
||||
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
|
||||
org.gradle.parallel=true
|
||||
|
||||
# AndroidX package structure to make it clearer which packages are bundled with the
|
||||
# Android operating system, and which are packaged with your app's APK
|
||||
# https://developer.android.com/topic/libraries/support-library/androidx-rn
|
||||
android.useAndroidX=true
|
||||
|
||||
# Enable AAPT2 PNG crunching
|
||||
android.enablePngCrunchInReleaseBuilds=true
|
||||
|
||||
# Use this property to specify which architecture you want to build.
|
||||
# You can also override it from the CLI using
|
||||
# ./gradlew <task> -PreactNativeArchitectures=x86_64
|
||||
reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
|
||||
|
||||
# Use this property to enable support to the new architecture.
|
||||
# This will allow you to use TurboModules and the Fabric render in
|
||||
# your application. You should enable this flag either if you want
|
||||
# to write custom TurboModules/Fabric components OR use libraries that
|
||||
# are providing them.
|
||||
newArchEnabled=true
|
||||
|
||||
# Use this property to enable or disable the Hermes JS engine.
|
||||
# If set to false, you will be using JSC instead.
|
||||
hermesEnabled=true
|
||||
|
||||
# Use this property to enable edge-to-edge display support.
|
||||
# This allows your app to draw behind system bars for an immersive UI.
|
||||
# Note: Only works with ReactActivity and should not be used with custom Activity.
|
||||
edgeToEdgeEnabled=true
|
||||
|
||||
# Enable GIF support in React Native images (~200 B increase)
|
||||
expo.gif.enabled=true
|
||||
# Enable webp support in React Native images (~85 KB increase)
|
||||
expo.webp.enabled=true
|
||||
# Enable animated webp support (~3.4 MB increase)
|
||||
# Disabled by default because iOS doesn't support animated webp
|
||||
expo.webp.animated=false
|
||||
|
||||
# Enable network inspector
|
||||
EX_DEV_CLIENT_NETWORK_INSPECTOR=true
|
||||
|
||||
# Use legacy packaging to compress native libraries in the resulting APK.
|
||||
expo.useLegacyPackaging=false
|
||||
39
apps/mobile/android/settings.gradle
Normal file
39
apps/mobile/android/settings.gradle
Normal file
@ -0,0 +1,39 @@
|
||||
pluginManagement {
|
||||
def reactNativeGradlePlugin = new File(
|
||||
providers.exec {
|
||||
workingDir(rootDir)
|
||||
commandLine("node", "--print", "require.resolve('@react-native/gradle-plugin/package.json', { paths: [require.resolve('react-native/package.json')] })")
|
||||
}.standardOutput.asText.get().trim()
|
||||
).getParentFile().absolutePath
|
||||
includeBuild(reactNativeGradlePlugin)
|
||||
|
||||
def expoPluginsPath = new File(
|
||||
providers.exec {
|
||||
workingDir(rootDir)
|
||||
commandLine("node", "--print", "require.resolve('expo-modules-autolinking/package.json', { paths: [require.resolve('expo/package.json')] })")
|
||||
}.standardOutput.asText.get().trim(),
|
||||
"../android/expo-gradle-plugin"
|
||||
).absolutePath
|
||||
includeBuild(expoPluginsPath)
|
||||
}
|
||||
|
||||
plugins {
|
||||
id("com.facebook.react.settings")
|
||||
id("expo-autolinking-settings")
|
||||
}
|
||||
|
||||
extensions.configure(com.facebook.react.ReactSettingsExtension) { ex ->
|
||||
if (System.getenv('EXPO_USE_COMMUNITY_AUTOLINKING') == '1') {
|
||||
ex.autolinkLibrariesFromCommand()
|
||||
} else {
|
||||
ex.autolinkLibrariesFromCommand(expoAutolinking.rnConfigCommand)
|
||||
}
|
||||
}
|
||||
expoAutolinking.useExpoModules()
|
||||
|
||||
rootProject.name = 'FitAI'
|
||||
|
||||
expoAutolinking.useExpoVersionCatalog()
|
||||
|
||||
include ':app'
|
||||
includeBuild(expoAutolinking.reactNativeGradlePlugin)
|
||||
@ -16,14 +16,7 @@
|
||||
"supportsTablet": true,
|
||||
"infoPlist": {
|
||||
"NSCameraUsageDescription": "This app uses the camera to scan food barcodes and identify nutritional information.",
|
||||
"NSUserNotificationsUsageDescription": "This app uses notifications to keep you updated on your fitness progress, recommendation approvals, and important reminders.",
|
||||
"NSMotionUsageDescription": "This app uses motion data to track your daily steps and activity progress.",
|
||||
"NSLocationWhenInUseUsageDescription": "This app uses your location to verify you are at your gym when checking in and checking out.",
|
||||
"NSLocationAlwaysAndWhenInUseUsageDescription": "This app uses your location in the background to automatically start and end workouts when you enter or leave your gym geofence."
|
||||
},
|
||||
"bundleIdentifier": "com.anonymous.fitai",
|
||||
"config": {
|
||||
"usesNonExemptEncryption": false
|
||||
"NSUserNotificationsUsageDescription": "This app uses notifications to keep you updated on your fitness progress, recommendation approvals, and important reminders."
|
||||
}
|
||||
},
|
||||
"android": {
|
||||
@ -34,11 +27,7 @@
|
||||
"permissions": [
|
||||
"CAMERA",
|
||||
"POST_NOTIFICATIONS",
|
||||
"android.permission.CAMERA",
|
||||
"android.permission.ACTIVITY_RECOGNITION",
|
||||
"android.permission.ACCESS_FINE_LOCATION",
|
||||
"android.permission.ACCESS_COARSE_LOCATION",
|
||||
"android.permission.ACCESS_BACKGROUND_LOCATION"
|
||||
"android.permission.CAMERA"
|
||||
],
|
||||
"package": "com.anonymous.fitai"
|
||||
},
|
||||
@ -49,15 +38,6 @@
|
||||
"expo-router",
|
||||
"expo-font",
|
||||
"expo-barcode-scanner",
|
||||
[
|
||||
"expo-location",
|
||||
{
|
||||
"locationWhenInUsePermission": "Allow FitAI to use your location to verify gym check-ins and check-outs.",
|
||||
"locationAlwaysAndWhenInUsePermission": "Allow FitAI to use your location in the background to automatically start and end workouts at your gym.",
|
||||
"isIosBackgroundLocationEnabled": true,
|
||||
"isAndroidBackgroundLocationEnabled": true
|
||||
}
|
||||
],
|
||||
[
|
||||
"expo-notifications",
|
||||
{
|
||||
|
||||
7
apps/mobile/ios/FitAI.xcodeproj/project.xcworkspace/contents.xcworkspacedata
generated
Normal file
7
apps/mobile/ios/FitAI.xcodeproj/project.xcworkspace/contents.xcworkspacedata
generated
Normal file
@ -0,0 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Workspace
|
||||
version = "1.0">
|
||||
<FileRef
|
||||
location = "self:">
|
||||
</FileRef>
|
||||
</Workspace>
|
||||
@ -0,0 +1,8 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>IDEDidComputeMac32BitWarning</key>
|
||||
<true/>
|
||||
</dict>
|
||||
</plist>
|
||||
44
apps/mobile/package-lock.json
generated
44
apps/mobile/package-lock.json
generated
@ -29,13 +29,10 @@
|
||||
"expo-haptics": "^15.0.7",
|
||||
"expo-linear-gradient": "~15.0.7",
|
||||
"expo-linking": "~8.0.0",
|
||||
"expo-location": "~19.0.7",
|
||||
"expo-notifications": "~0.32.0",
|
||||
"expo-router": "~6.0.14",
|
||||
"expo-secure-store": "~15.0.7",
|
||||
"expo-sensors": "~14.1.4",
|
||||
"expo-status-bar": "^3.0.8",
|
||||
"expo-task-manager": "~14.0.8",
|
||||
"expo-web-browser": "^15.0.10",
|
||||
"react": "19.1.0",
|
||||
"react-dom": "^19.1.0",
|
||||
@ -7466,15 +7463,6 @@
|
||||
"react-native": "*"
|
||||
}
|
||||
},
|
||||
"node_modules/expo-location": {
|
||||
"version": "19.0.8",
|
||||
"resolved": "https://registry.npmjs.org/expo-location/-/expo-location-19.0.8.tgz",
|
||||
"integrity": "sha512-H/FI75VuJ1coodJbbMu82pf+Zjess8X8Xkiv9Bv58ZgPKS/2ztjC1YO1/XMcGz7+s9DrbLuMIw22dFuP4HqneA==",
|
||||
"license": "MIT",
|
||||
"peerDependencies": {
|
||||
"expo": "*"
|
||||
}
|
||||
},
|
||||
"node_modules/expo-modules-autolinking": {
|
||||
"version": "3.0.22",
|
||||
"resolved": "https://registry.npmjs.org/expo-modules-autolinking/-/expo-modules-autolinking-3.0.22.tgz",
|
||||
@ -7616,19 +7604,6 @@
|
||||
"expo": "*"
|
||||
}
|
||||
},
|
||||
"node_modules/expo-sensors": {
|
||||
"version": "14.1.4",
|
||||
"resolved": "https://registry.npmjs.org/expo-sensors/-/expo-sensors-14.1.4.tgz",
|
||||
"integrity": "sha512-KHROi5C8dhXedMwx7fZ5eyv9p382F5XOIex4a+GpdOTL3OY4xyk08kt7x64FtMeeoT87gYD3mb9LrBpHyNubkg==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"invariant": "^2.2.4"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"expo": "*",
|
||||
"react-native": "*"
|
||||
}
|
||||
},
|
||||
"node_modules/expo-server": {
|
||||
"version": "1.0.4",
|
||||
"resolved": "https://registry.npmjs.org/expo-server/-/expo-server-1.0.4.tgz",
|
||||
@ -7651,19 +7626,6 @@
|
||||
"react-native": "*"
|
||||
}
|
||||
},
|
||||
"node_modules/expo-task-manager": {
|
||||
"version": "14.0.9",
|
||||
"resolved": "https://registry.npmjs.org/expo-task-manager/-/expo-task-manager-14.0.9.tgz",
|
||||
"integrity": "sha512-GKWtXrkedr4XChHfTm5IyTcSfMtCPxzx89y4CMVqKfyfROATibrE/8UI5j7UC/pUOfFoYlQvulQEvECMreYuUA==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"unimodules-app-loader": "~6.0.8"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"expo": "*",
|
||||
"react-native": "*"
|
||||
}
|
||||
},
|
||||
"node_modules/expo-web-browser": {
|
||||
"version": "15.0.10",
|
||||
"resolved": "https://registry.npmjs.org/expo-web-browser/-/expo-web-browser-15.0.10.tgz",
|
||||
@ -13457,12 +13419,6 @@
|
||||
"node": ">=4"
|
||||
}
|
||||
},
|
||||
"node_modules/unimodules-app-loader": {
|
||||
"version": "6.0.8",
|
||||
"resolved": "https://registry.npmjs.org/unimodules-app-loader/-/unimodules-app-loader-6.0.8.tgz",
|
||||
"integrity": "sha512-fqS8QwT/MC/HAmw1NKCHdzsPA6WaLm0dNmoC5Pz6lL+cDGYeYCNdHMO9fy08aL2ZD7cVkNM0pSR/AoNRe+rslA==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/unique-string": {
|
||||
"version": "2.0.0",
|
||||
"resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz",
|
||||
|
||||
@ -35,12 +35,9 @@
|
||||
"expo-haptics": "^15.0.7",
|
||||
"expo-linear-gradient": "~15.0.7",
|
||||
"expo-linking": "~8.0.0",
|
||||
"expo-location": "~19.0.7",
|
||||
"expo-notifications": "~0.32.0",
|
||||
"expo-router": "~6.0.14",
|
||||
"expo-task-manager": "~14.0.8",
|
||||
"expo-secure-store": "~15.0.7",
|
||||
"expo-sensors": "~14.1.4",
|
||||
"expo-status-bar": "^3.0.8",
|
||||
"expo-web-browser": "^15.0.10",
|
||||
"react": "19.1.0",
|
||||
|
||||
@ -1,88 +1,47 @@
|
||||
import { apiClient } from "./client";
|
||||
import { API_ENDPOINTS } from "../config/api";
|
||||
import { isAxiosError } from "axios";
|
||||
|
||||
export interface Attendance {
|
||||
id: string;
|
||||
checkInTime: string;
|
||||
checkOutTime?: string;
|
||||
type: string;
|
||||
notes?: string;
|
||||
}
|
||||
|
||||
export interface AttendanceLocationPayload {
|
||||
latitude: number;
|
||||
longitude: number;
|
||||
accuracy: number;
|
||||
id: string;
|
||||
checkInTime: string;
|
||||
checkOutTime?: string;
|
||||
type: string;
|
||||
notes?: string;
|
||||
}
|
||||
|
||||
export const attendanceApi = {
|
||||
getHistory: async (token: string): Promise<Attendance[]> => {
|
||||
try {
|
||||
const response = await apiClient.get(API_ENDPOINTS.ATTENDANCE.HISTORY, {
|
||||
headers: { Authorization: `Bearer ${token}` },
|
||||
});
|
||||
return response.data;
|
||||
} catch (error) {
|
||||
throw new Error(
|
||||
getAttendanceErrorMessage(error, "Failed to load attendance history."),
|
||||
);
|
||||
}
|
||||
},
|
||||
getHistory: async (token: string): Promise<Attendance[]> => {
|
||||
try {
|
||||
const response = await apiClient.get(API_ENDPOINTS.ATTENDANCE.HISTORY, {
|
||||
headers: { Authorization: `Bearer ${token}` },
|
||||
});
|
||||
return response.data;
|
||||
} catch (error) {
|
||||
throw error;
|
||||
}
|
||||
},
|
||||
|
||||
checkIn: async (
|
||||
type: string,
|
||||
token: string,
|
||||
location: AttendanceLocationPayload,
|
||||
fallbackRequested = false,
|
||||
): Promise<void> => {
|
||||
try {
|
||||
await apiClient.post(
|
||||
API_ENDPOINTS.ATTENDANCE.CHECK_IN,
|
||||
{ type, location, fallbackRequested },
|
||||
{ headers: { Authorization: `Bearer ${token}` } },
|
||||
);
|
||||
} catch (error) {
|
||||
throw new Error(
|
||||
getAttendanceErrorMessage(error, "Failed to start workout."),
|
||||
);
|
||||
}
|
||||
},
|
||||
checkIn: async (type: string, token: string): Promise<void> => {
|
||||
try {
|
||||
await apiClient.post(
|
||||
API_ENDPOINTS.ATTENDANCE.CHECK_IN,
|
||||
{ type },
|
||||
{ headers: { Authorization: `Bearer ${token}` } },
|
||||
);
|
||||
} catch (error) {
|
||||
throw error;
|
||||
}
|
||||
},
|
||||
|
||||
checkOut: async (
|
||||
token: string,
|
||||
location: AttendanceLocationPayload,
|
||||
fallbackRequested = false,
|
||||
): Promise<void> => {
|
||||
try {
|
||||
await apiClient.post(
|
||||
API_ENDPOINTS.ATTENDANCE.CHECK_OUT,
|
||||
{ location, fallbackRequested },
|
||||
{ headers: { Authorization: `Bearer ${token}` } },
|
||||
);
|
||||
} catch (error) {
|
||||
throw new Error(
|
||||
getAttendanceErrorMessage(error, "Failed to end workout."),
|
||||
);
|
||||
}
|
||||
},
|
||||
checkOut: async (token: string): Promise<void> => {
|
||||
try {
|
||||
await apiClient.post(
|
||||
API_ENDPOINTS.ATTENDANCE.CHECK_OUT,
|
||||
{},
|
||||
{ headers: { Authorization: `Bearer ${token}` } },
|
||||
);
|
||||
} catch (error) {
|
||||
throw error;
|
||||
}
|
||||
},
|
||||
};
|
||||
|
||||
function getAttendanceErrorMessage(error: unknown, fallback: string): string {
|
||||
if (isAxiosError(error)) {
|
||||
const payload = error.response?.data;
|
||||
|
||||
if (typeof payload === "string" && payload.trim()) {
|
||||
return payload;
|
||||
}
|
||||
|
||||
if (payload && typeof payload === "object") {
|
||||
const message = (payload as { error?: unknown }).error;
|
||||
if (typeof message === "string" && message.trim()) {
|
||||
return message;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return fallback;
|
||||
}
|
||||
|
||||
@ -6,10 +6,6 @@ export interface Gym {
|
||||
id: string;
|
||||
name: string;
|
||||
location?: string;
|
||||
latitude?: number | null;
|
||||
longitude?: number | null;
|
||||
geofenceRadiusMeters?: number;
|
||||
geofenceEnabled?: boolean;
|
||||
}
|
||||
|
||||
export const gymsApi = {
|
||||
|
||||
@ -18,16 +18,6 @@ export interface Recommendation {
|
||||
updatedAt: string;
|
||||
}
|
||||
|
||||
interface RecommendationMeta {
|
||||
usedFallbackPlan?: boolean;
|
||||
}
|
||||
|
||||
interface RecommendationApiEnvelope {
|
||||
success?: boolean;
|
||||
data?: Recommendation;
|
||||
meta?: RecommendationMeta;
|
||||
}
|
||||
|
||||
export interface GenerateRecommendationRequest {
|
||||
userId: string;
|
||||
useExternalModel?: boolean;
|
||||
@ -119,36 +109,3 @@ export async function approveRecommendation(
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Generate AI recommendation for the authenticated client user
|
||||
*/
|
||||
export async function generateSelfRecommendation(
|
||||
token: string | null,
|
||||
): Promise<Recommendation> {
|
||||
try {
|
||||
const response = await apiClient.post<RecommendationApiEnvelope>(
|
||||
`${API_ENDPOINTS.RECOMMENDATIONS}/generate-self`,
|
||||
{},
|
||||
withAuth(token),
|
||||
);
|
||||
return parseApiData<Recommendation>(response.data);
|
||||
} catch (error) {
|
||||
if (isAxiosError(error)) {
|
||||
const responseError = error.response?.data as
|
||||
| { error?: string }
|
||||
| undefined;
|
||||
|
||||
if (responseError?.error) {
|
||||
throw new Error(responseError.error);
|
||||
}
|
||||
|
||||
if (error.response) {
|
||||
throw new Error(
|
||||
`Failed to generate recommendation: ${error.response.status}`,
|
||||
);
|
||||
}
|
||||
}
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,28 +0,0 @@
|
||||
import { API_ENDPOINTS } from "../config/api";
|
||||
import { apiClient, withAuth } from "./client";
|
||||
|
||||
export interface UserGymGeofence {
|
||||
id: string;
|
||||
name: string;
|
||||
location: string | null;
|
||||
latitude: number | null;
|
||||
longitude: number | null;
|
||||
geofenceRadiusMeters: number | null;
|
||||
geofenceEnabled: boolean;
|
||||
status: "active" | "inactive";
|
||||
}
|
||||
|
||||
export interface UserGymResponse {
|
||||
gymId: string | null;
|
||||
gym: UserGymGeofence | null;
|
||||
}
|
||||
|
||||
export const userGymApi = {
|
||||
getCurrentGym: async (token: string | null): Promise<UserGymResponse> => {
|
||||
const response = await apiClient.get<UserGymResponse>(
|
||||
API_ENDPOINTS.USERS.GYM,
|
||||
withAuth(token),
|
||||
);
|
||||
return response.data;
|
||||
},
|
||||
};
|
||||
@ -17,7 +17,6 @@ import { useTheme } from "../../contexts/ThemeContext";
|
||||
import { Input } from "../../components/Input";
|
||||
import { MinimalButton } from "../../components/MinimalButton";
|
||||
import { MinimalCard } from "../../components/MinimalCard";
|
||||
import { syncAutoWorkoutGeofenceWithToken } from "../../services/autoWorkoutGeofence";
|
||||
import log from "../../utils/logger";
|
||||
|
||||
export default function OnboardingScreen() {
|
||||
@ -82,9 +81,6 @@ export default function OnboardingScreen() {
|
||||
// selectedGymId: string gym id, or null to proceed without gym
|
||||
try {
|
||||
await gymsApi.updateUserGym(selectedGymId, token);
|
||||
await syncAutoWorkoutGeofenceWithToken(token, {
|
||||
requestPermissions: true,
|
||||
});
|
||||
} catch (e) {
|
||||
log.warn("Failed to update gym selection", { gymId: selectedGymId });
|
||||
}
|
||||
|
||||
@ -83,6 +83,12 @@ export default function TabLayout() {
|
||||
title: "Plans",
|
||||
}}
|
||||
/>
|
||||
<Tabs.Screen
|
||||
name="attendance"
|
||||
options={{
|
||||
title: "Attendance",
|
||||
}}
|
||||
/>
|
||||
<Tabs.Screen
|
||||
name="profile"
|
||||
options={{
|
||||
|
||||
348
apps/mobile/src/app/(tabs)/attendance.tsx
Normal file
348
apps/mobile/src/app/(tabs)/attendance.tsx
Normal file
@ -0,0 +1,348 @@
|
||||
import {
|
||||
View,
|
||||
Text,
|
||||
StyleSheet,
|
||||
TouchableOpacity,
|
||||
ActivityIndicator,
|
||||
ScrollView,
|
||||
Alert,
|
||||
} from "react-native";
|
||||
import { useState, useEffect } from "react";
|
||||
import { useAuth } from "@clerk/clerk-expo";
|
||||
import { Ionicons } from "@expo/vector-icons";
|
||||
import { useTheme } from "../../contexts/ThemeContext";
|
||||
import { MinimalCard } from "../../components/MinimalCard";
|
||||
import { SectionHeader } from "../../components/SectionHeader";
|
||||
import { MinimalButton } from "../../components/MinimalButton";
|
||||
import { Badge } from "../../components/Badge";
|
||||
import { IconContainer } from "../../components/IconContainer";
|
||||
import { attendanceApi, Attendance } from "../../api/attendance";
|
||||
import { AttendanceCalendar } from "../../components/AttendanceCalendar";
|
||||
import { useStatistics } from "../../contexts/StatisticsContext";
|
||||
import { getErrorMessage } from "../../utils/error-helpers";
|
||||
import log from "../../utils/logger";
|
||||
|
||||
export default function AttendanceScreen() {
|
||||
const { getToken, userId } = useAuth();
|
||||
const { colors, typography } = useTheme();
|
||||
const { clearCache: clearStatisticsCache } = useStatistics();
|
||||
const [loading, setLoading] = useState(true);
|
||||
const [activeCheckIn, setActiveCheckIn] = useState<Attendance | null>(null);
|
||||
const [history, setHistory] = useState<Attendance[]>([]);
|
||||
|
||||
const fetchAttendance = async () => {
|
||||
try {
|
||||
setLoading(true);
|
||||
const token = await getToken();
|
||||
if (!token) return;
|
||||
|
||||
log.debug("Fetching attendance history");
|
||||
const data = await attendanceApi.getHistory(token);
|
||||
setHistory(data);
|
||||
|
||||
// Check if there's an active check-in (latest one has no checkOutTime)
|
||||
if (data.length > 0 && !data[0].checkOutTime) {
|
||||
setActiveCheckIn(data[0]);
|
||||
} else {
|
||||
setActiveCheckIn(null);
|
||||
}
|
||||
} catch (error) {
|
||||
log.error("Failed to fetch attendance", error);
|
||||
Alert.alert("Error", "Failed to load attendance data");
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
fetchAttendance();
|
||||
}, []);
|
||||
|
||||
const handleCheckIn = async () => {
|
||||
try {
|
||||
const token = await getToken();
|
||||
if (!token) return;
|
||||
|
||||
await attendanceApi.checkIn("gym", token);
|
||||
clearStatisticsCache();
|
||||
fetchAttendance();
|
||||
Alert.alert("Success", "Checked in successfully!");
|
||||
} catch (error: unknown) {
|
||||
log.error("Failed to check in", error);
|
||||
Alert.alert("Error", getErrorMessage(error, "Failed to check in"));
|
||||
}
|
||||
};
|
||||
|
||||
const handleCheckOut = async () => {
|
||||
try {
|
||||
const token = await getToken();
|
||||
if (!token) return;
|
||||
|
||||
await attendanceApi.checkOut(token);
|
||||
clearStatisticsCache();
|
||||
fetchAttendance();
|
||||
Alert.alert("Success", "Checked out successfully!");
|
||||
} catch (error: unknown) {
|
||||
log.error("Failed to check out", error);
|
||||
Alert.alert("Error", getErrorMessage(error, "Failed to check out"));
|
||||
}
|
||||
};
|
||||
|
||||
if (loading && !history.length) {
|
||||
return (
|
||||
<View style={[styles.centered, { backgroundColor: colors.background }]}>
|
||||
<ActivityIndicator size="large" color={colors.primary} />
|
||||
</View>
|
||||
);
|
||||
}
|
||||
|
||||
return (
|
||||
<ScrollView
|
||||
style={[styles.container, { backgroundColor: colors.background }]}
|
||||
contentContainerStyle={styles.content}
|
||||
>
|
||||
{/* Header */}
|
||||
<View style={styles.header}>
|
||||
<Text
|
||||
style={[typography.h1, { color: colors.textPrimary, fontSize: 32 }]}
|
||||
>
|
||||
Attendance
|
||||
</Text>
|
||||
<Text
|
||||
style={[
|
||||
typography.body,
|
||||
{ color: colors.textSecondary, marginTop: 8 },
|
||||
]}
|
||||
>
|
||||
{activeCheckIn
|
||||
? "You're crushing it today!"
|
||||
: history.length === 0
|
||||
? "Ready to start your fitness journey?"
|
||||
: "Track your gym visits and build streaks!"}
|
||||
</Text>
|
||||
</View>
|
||||
|
||||
{/* Check In/Out Section */}
|
||||
<View style={styles.section}>
|
||||
{activeCheckIn ? (
|
||||
<MinimalCard variant="bordered" style={styles.activeCard}>
|
||||
<View style={styles.activeHeader}>
|
||||
<View style={styles.activeHeaderLeft}>
|
||||
<IconContainer
|
||||
variant="colored"
|
||||
backgroundColor={`${colors.success}20`}
|
||||
size="lg"
|
||||
>
|
||||
<Ionicons
|
||||
name="checkmark-circle"
|
||||
size={28}
|
||||
color={colors.success}
|
||||
/>
|
||||
</IconContainer>
|
||||
<View style={{ marginLeft: 12 }}>
|
||||
<Text style={[typography.h3, { color: colors.textPrimary }]}>
|
||||
✅ Currently Checked In
|
||||
</Text>
|
||||
<Text
|
||||
style={[
|
||||
typography.caption,
|
||||
{ color: colors.textTertiary, marginTop: 2 },
|
||||
]}
|
||||
>
|
||||
Since{" "}
|
||||
{new Date(activeCheckIn.checkInTime).toLocaleTimeString(
|
||||
[],
|
||||
{
|
||||
hour: "2-digit",
|
||||
minute: "2-digit",
|
||||
},
|
||||
)}
|
||||
</Text>
|
||||
</View>
|
||||
</View>
|
||||
</View>
|
||||
<MinimalButton
|
||||
title="Check Out"
|
||||
onPress={handleCheckOut}
|
||||
variant="danger"
|
||||
size="lg"
|
||||
style={{ marginTop: 16 }}
|
||||
/>
|
||||
</MinimalCard>
|
||||
) : (
|
||||
<MinimalButton
|
||||
title="💪 Check In"
|
||||
onPress={handleCheckIn}
|
||||
variant="primary"
|
||||
size="lg"
|
||||
/>
|
||||
)}
|
||||
</View>
|
||||
|
||||
{/* Attendance Calendar */}
|
||||
<View style={styles.section}>
|
||||
<SectionHeader title="📅 Calendar" />
|
||||
<MinimalCard variant="default" style={{ borderRadius: 20 }}>
|
||||
<AttendanceCalendar attendanceRecords={history} />
|
||||
</MinimalCard>
|
||||
</View>
|
||||
|
||||
{/* Recent History */}
|
||||
<View style={styles.section}>
|
||||
<SectionHeader title="📊 Recent History" />
|
||||
{history.length === 0 ? (
|
||||
<MinimalCard variant="default" style={{ borderRadius: 20 }}>
|
||||
<View style={styles.emptyState}>
|
||||
<Text style={{ fontSize: 64 }}>📍</Text>
|
||||
<Text
|
||||
style={[
|
||||
typography.bodyEmphasis,
|
||||
{ color: colors.textPrimary, marginTop: 16 },
|
||||
]}
|
||||
>
|
||||
No attendance history yet
|
||||
</Text>
|
||||
<Text
|
||||
style={[
|
||||
typography.body,
|
||||
{
|
||||
color: colors.textSecondary,
|
||||
marginTop: 8,
|
||||
textAlign: "center",
|
||||
},
|
||||
]}
|
||||
>
|
||||
Check in to start building your streak! 🔥
|
||||
</Text>
|
||||
</View>
|
||||
</MinimalCard>
|
||||
) : (
|
||||
<View style={styles.historyList}>
|
||||
{history.slice(0, 10).map((record, index) => {
|
||||
const checkIn = new Date(record.checkInTime);
|
||||
const checkOut = record.checkOutTime
|
||||
? new Date(record.checkOutTime)
|
||||
: null;
|
||||
const duration = checkOut
|
||||
? Math.round((checkOut.getTime() - checkIn.getTime()) / 60000)
|
||||
: null;
|
||||
|
||||
return (
|
||||
<MinimalCard
|
||||
key={index}
|
||||
variant="bordered"
|
||||
style={{ borderRadius: 16 }}
|
||||
>
|
||||
<View style={styles.historyItem}>
|
||||
<View style={styles.historyLeft}>
|
||||
<IconContainer
|
||||
variant="colored"
|
||||
backgroundColor={
|
||||
checkOut ? `${colors.success}20` : `${colors.info}20`
|
||||
}
|
||||
>
|
||||
<Ionicons
|
||||
name={checkOut ? "checkmark-done" : "time"}
|
||||
size={20}
|
||||
color={checkOut ? colors.success : colors.info}
|
||||
/>
|
||||
</IconContainer>
|
||||
<View style={{ marginLeft: 12, flex: 1 }}>
|
||||
<Text
|
||||
style={[typography.h3, { color: colors.textPrimary }]}
|
||||
>
|
||||
{checkIn.toLocaleDateString()}
|
||||
</Text>
|
||||
<Text
|
||||
style={[
|
||||
typography.caption,
|
||||
{ color: colors.textTertiary, marginTop: 2 },
|
||||
]}
|
||||
>
|
||||
{checkIn.toLocaleTimeString([], {
|
||||
hour: "2-digit",
|
||||
minute: "2-digit",
|
||||
})}
|
||||
{checkOut &&
|
||||
` - ${checkOut.toLocaleTimeString([], {
|
||||
hour: "2-digit",
|
||||
minute: "2-digit",
|
||||
})}`}
|
||||
</Text>
|
||||
</View>
|
||||
</View>
|
||||
{duration && (
|
||||
<Badge
|
||||
label={`${duration}m`}
|
||||
variant="neutral"
|
||||
size="sm"
|
||||
/>
|
||||
)}
|
||||
</View>
|
||||
</MinimalCard>
|
||||
);
|
||||
})}
|
||||
</View>
|
||||
)}
|
||||
</View>
|
||||
|
||||
{/* Bottom Spacer */}
|
||||
<View style={{ height: 100 }} />
|
||||
</ScrollView>
|
||||
);
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
container: {
|
||||
flex: 1,
|
||||
},
|
||||
centered: {
|
||||
flex: 1,
|
||||
justifyContent: "center",
|
||||
alignItems: "center",
|
||||
},
|
||||
content: {
|
||||
paddingBottom: 20,
|
||||
},
|
||||
header: {
|
||||
paddingHorizontal: 24,
|
||||
paddingTop: 60,
|
||||
paddingBottom: 24,
|
||||
},
|
||||
section: {
|
||||
paddingHorizontal: 24,
|
||||
marginBottom: 24,
|
||||
},
|
||||
activeCard: {
|
||||
padding: 20,
|
||||
borderRadius: 20,
|
||||
},
|
||||
activeHeader: {
|
||||
flexDirection: "row",
|
||||
justifyContent: "space-between",
|
||||
alignItems: "center",
|
||||
},
|
||||
activeHeaderLeft: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
flex: 1,
|
||||
},
|
||||
emptyState: {
|
||||
alignItems: "center",
|
||||
paddingVertical: 40,
|
||||
paddingHorizontal: 20,
|
||||
},
|
||||
historyList: {
|
||||
gap: 12,
|
||||
},
|
||||
historyItem: {
|
||||
flexDirection: "row",
|
||||
justifyContent: "space-between",
|
||||
alignItems: "center",
|
||||
},
|
||||
historyLeft: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
flex: 1,
|
||||
},
|
||||
});
|
||||
@ -22,7 +22,6 @@ import { GoalProgressCard } from "../../components/GoalProgressCard";
|
||||
import { GoalCreationModal } from "../../components/GoalCreationModal";
|
||||
import { WeeklyProgressChart } from "../../components/WeeklyProgressChart";
|
||||
import { GoalTypeBreakdownChart } from "../../components/GoalTypeBreakdownChart";
|
||||
import { useMembership } from "../../hooks/useMembership";
|
||||
import type { FitnessGoal, CreateGoalData } from "../../services/fitnessGoals";
|
||||
import { useStatistics } from "../../contexts/StatisticsContext";
|
||||
import { useFitnessGoals } from "../../contexts/FitnessGoalsContext";
|
||||
@ -46,24 +45,15 @@ export default function GoalsScreen() {
|
||||
deleteGoal,
|
||||
clearCache: clearGoalsCache,
|
||||
} = useFitnessGoals();
|
||||
const {
|
||||
recommendations,
|
||||
clearCache: clearRecommendationsCache,
|
||||
refetchRecommendations,
|
||||
generateSelfPlan,
|
||||
} = useRecommendations();
|
||||
const { membershipType, features } = useMembership();
|
||||
const { clearCache: clearRecommendationsCache } = useRecommendations();
|
||||
const [refreshing, setRefreshing] = useState(false);
|
||||
const [isModalVisible, setIsModalVisible] = useState(false);
|
||||
const [showAnalytics, setShowAnalytics] = useState(false);
|
||||
const [isGeneratingPlan, setIsGeneratingPlan] = useState(false);
|
||||
const [showFullPlan, setShowFullPlan] = useState(false);
|
||||
|
||||
const loadData = useCallback(async () => {
|
||||
await refetchGoals();
|
||||
await refetchRecommendations();
|
||||
await refetchStatistics();
|
||||
}, [refetchGoals, refetchRecommendations, refetchStatistics]);
|
||||
}, [refetchGoals, refetchStatistics]);
|
||||
|
||||
const clearClerkCache = async () => {
|
||||
Alert.alert(
|
||||
@ -146,76 +136,6 @@ export default function GoalsScreen() {
|
||||
)
|
||||
: 0;
|
||||
|
||||
const latestApprovedRecommendation = [...recommendations]
|
||||
.filter((rec) => rec.status === "approved")
|
||||
.sort(
|
||||
(a, b) =>
|
||||
new Date(b.generatedAt).getTime() - new Date(a.generatedAt).getTime(),
|
||||
)[0];
|
||||
|
||||
const isGoalAiAligned = (goal: FitnessGoal) => {
|
||||
if (goal.notes?.startsWith("[AI_LINKED]")) return true;
|
||||
if (!latestApprovedRecommendation?.activityPlan) return false;
|
||||
|
||||
const planText = latestApprovedRecommendation.activityPlan.toLowerCase();
|
||||
const title = goal.title.toLowerCase();
|
||||
const description = (goal.description || "").toLowerCase();
|
||||
|
||||
const content = `${title} ${description}`;
|
||||
|
||||
if (goal.goalType === "strength_milestone") {
|
||||
return planText.includes("strength") || planText.includes("weight");
|
||||
}
|
||||
if (goal.goalType === "endurance_target") {
|
||||
return (
|
||||
planText.includes("cardio") ||
|
||||
planText.includes("endurance") ||
|
||||
planText.includes("run")
|
||||
);
|
||||
}
|
||||
if (goal.goalType === "flexibility_goal") {
|
||||
return planText.includes("stretch") || planText.includes("mobility");
|
||||
}
|
||||
if (goal.goalType === "habit_building") {
|
||||
return planText.includes("habit") || planText.includes("daily");
|
||||
}
|
||||
|
||||
return (
|
||||
planText.includes(content.split(" ")[0] || "") ||
|
||||
content
|
||||
.split(" ")
|
||||
.some((word) => word.length > 4 && planText.includes(word))
|
||||
);
|
||||
};
|
||||
|
||||
const handleGenerateAiPlan = async () => {
|
||||
if (!features.recommendationsPerMonth || membershipType === "basic") {
|
||||
Alert.alert(
|
||||
"Premium Feature",
|
||||
"AI plan generation is available on Premium and VIP memberships.",
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
setIsGeneratingPlan(true);
|
||||
await generateSelfPlan();
|
||||
await Promise.all([refetchRecommendations(), refetchGoals()]);
|
||||
Alert.alert(
|
||||
"Plan Ready",
|
||||
"Your new activity plan is ready and active goals were added.",
|
||||
);
|
||||
} catch (error) {
|
||||
const message =
|
||||
error instanceof Error
|
||||
? error.message
|
||||
: "Failed to generate AI activity plan.";
|
||||
Alert.alert("Could not generate plan", message);
|
||||
} finally {
|
||||
setIsGeneratingPlan(false);
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<View style={[styles.container, { backgroundColor: colors.background }]}>
|
||||
<ScrollView
|
||||
@ -432,89 +352,6 @@ export default function GoalsScreen() {
|
||||
|
||||
{/* Active Goals */}
|
||||
<View style={styles.section}>
|
||||
<MinimalCard variant="elevated" style={styles.aiPlanCard}>
|
||||
<View style={styles.aiPlanHeader}>
|
||||
<View style={styles.aiPlanHeaderLeft}>
|
||||
<View
|
||||
style={[
|
||||
styles.aiPlanIcon,
|
||||
{ backgroundColor: `${colors.primary}15` },
|
||||
]}
|
||||
>
|
||||
<Ionicons name="sparkles" size={20} color={colors.primary} />
|
||||
</View>
|
||||
<View>
|
||||
<Text style={[typography.h3, { color: colors.textPrimary }]}>
|
||||
AI Activity Plan
|
||||
</Text>
|
||||
<Text
|
||||
style={[
|
||||
typography.caption,
|
||||
{ color: colors.textTertiary, marginTop: 2 },
|
||||
]}
|
||||
>
|
||||
{latestApprovedRecommendation
|
||||
? `Generated ${new Date(latestApprovedRecommendation.generatedAt).toLocaleDateString()}`
|
||||
: "Generate a plan aligned to your fitness profile"}
|
||||
</Text>
|
||||
</View>
|
||||
</View>
|
||||
<Badge
|
||||
variant={membershipType === "basic" ? "neutral" : "success"}
|
||||
label={membershipType.toUpperCase()}
|
||||
size="sm"
|
||||
/>
|
||||
</View>
|
||||
|
||||
{latestApprovedRecommendation ? (
|
||||
<>
|
||||
<Text
|
||||
style={[
|
||||
typography.body,
|
||||
{ color: colors.textSecondary, marginTop: 14 },
|
||||
]}
|
||||
numberOfLines={showFullPlan ? undefined : 4}
|
||||
>
|
||||
{latestApprovedRecommendation.activityPlan}
|
||||
</Text>
|
||||
<TouchableOpacity
|
||||
onPress={() => setShowFullPlan((prev) => !prev)}
|
||||
style={styles.showPlanButton}
|
||||
>
|
||||
<Text style={[typography.caption, { color: colors.primary }]}>
|
||||
{showFullPlan ? "Show less" : "View full plan"}
|
||||
</Text>
|
||||
</TouchableOpacity>
|
||||
</>
|
||||
) : (
|
||||
<Text
|
||||
style={[
|
||||
typography.body,
|
||||
{ color: colors.textSecondary, marginTop: 14 },
|
||||
]}
|
||||
>
|
||||
No AI activity plan yet. Generate one to get personalized
|
||||
guidance.
|
||||
</Text>
|
||||
)}
|
||||
|
||||
<MinimalButton
|
||||
title={
|
||||
membershipType === "basic"
|
||||
? "Upgrade to Generate Plan"
|
||||
: latestApprovedRecommendation
|
||||
? "Regenerate Plan"
|
||||
: "Generate Plan"
|
||||
}
|
||||
onPress={handleGenerateAiPlan}
|
||||
disabled={isGeneratingPlan}
|
||||
loading={isGeneratingPlan}
|
||||
size="md"
|
||||
fullWidth
|
||||
style={{ marginTop: 14 }}
|
||||
/>
|
||||
</MinimalCard>
|
||||
|
||||
<SectionHeader
|
||||
title={`Active Goals (${activeGoals.length})`}
|
||||
subtitle="Keep pushing forward!"
|
||||
@ -549,7 +386,6 @@ export default function GoalsScreen() {
|
||||
<GoalProgressCard
|
||||
key={goal.id}
|
||||
goal={goal}
|
||||
aiAligned={isGoalAiAligned(goal)}
|
||||
onComplete={() => handleCompleteGoal(goal)}
|
||||
onDelete={() => handleDeleteGoal(goal.id)}
|
||||
/>
|
||||
@ -673,33 +509,6 @@ const styles = StyleSheet.create({
|
||||
borderTopWidth: 1,
|
||||
borderTopColor: "rgba(0,0,0,0.05)",
|
||||
},
|
||||
aiPlanCard: {
|
||||
padding: 18,
|
||||
marginBottom: 16,
|
||||
},
|
||||
aiPlanHeader: {
|
||||
flexDirection: "row",
|
||||
justifyContent: "space-between",
|
||||
alignItems: "center",
|
||||
},
|
||||
aiPlanHeaderLeft: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
flex: 1,
|
||||
marginRight: 12,
|
||||
},
|
||||
aiPlanIcon: {
|
||||
width: 40,
|
||||
height: 40,
|
||||
borderRadius: 12,
|
||||
justifyContent: "center",
|
||||
alignItems: "center",
|
||||
marginRight: 12,
|
||||
},
|
||||
showPlanButton: {
|
||||
marginTop: 8,
|
||||
alignSelf: "flex-start",
|
||||
},
|
||||
chartSection: {
|
||||
marginBottom: 20,
|
||||
},
|
||||
|
||||
@ -10,8 +10,7 @@ import {
|
||||
Alert,
|
||||
AppState,
|
||||
} from "react-native";
|
||||
import * as Location from "expo-location";
|
||||
import { useAuth, useUser } from "@clerk/clerk-expo";
|
||||
import { useUser } from "@clerk/clerk-expo";
|
||||
import { useState, useCallback, useEffect, useRef, useMemo } from "react";
|
||||
import { useFocusEffect } from "@react-navigation/native";
|
||||
import AsyncStorage from "@react-native-async-storage/async-storage";
|
||||
@ -28,9 +27,6 @@ import { AddWaterModal } from "../../components/AddWaterModal";
|
||||
import { ScanFoodModal } from "../../components/ScanFoodModal";
|
||||
import { ActivityRing } from "../../components/ActivityRing";
|
||||
import { useMembership } from "../../hooks/useMembership";
|
||||
import { attendanceApi, type Attendance } from "../../api/attendance";
|
||||
import { useDailySteps } from "../../hooks/useDailySteps";
|
||||
import { syncAutoWorkoutGeofenceWithToken } from "../../services/autoWorkoutGeofence";
|
||||
import {
|
||||
checkInsToActivities,
|
||||
completedGoalsToActivities,
|
||||
@ -78,15 +74,7 @@ const getRandomMotivation = () => {
|
||||
|
||||
export default function HomeScreen() {
|
||||
const { user } = useUser();
|
||||
const { getToken } = useAuth();
|
||||
const { colors, typography } = useTheme();
|
||||
const {
|
||||
steps,
|
||||
goal: stepsGoal,
|
||||
loading: stepsLoading,
|
||||
supported: stepsSupported,
|
||||
permissionGranted: stepsPermissionGranted,
|
||||
} = useDailySteps();
|
||||
const { features, membershipType } = useMembership();
|
||||
const { refetchStatistics, forceRefresh, statistics, loading } =
|
||||
useStatistics();
|
||||
@ -97,9 +85,6 @@ export default function HomeScreen() {
|
||||
const [scanFoodModalVisible, setScanFoodModalVisible] = useState(false);
|
||||
const [calories, setCalories] = useState(0);
|
||||
const [waterIntake, setWaterIntake] = useState(0);
|
||||
const [activeWorkoutSession, setActiveWorkoutSession] =
|
||||
useState<Attendance | null>(null);
|
||||
const [workoutActionLoading, setWorkoutActionLoading] = useState(false);
|
||||
const [motivationalMessage, setMotivationalMessage] = useState(
|
||||
"Let's crush it today! 💪",
|
||||
);
|
||||
@ -196,107 +181,14 @@ export default function HomeScreen() {
|
||||
}, getMillisecondsUntilNextMidnight() + 50);
|
||||
}, [reconcileDailyMetrics]);
|
||||
|
||||
const fetchActiveWorkoutSession = useCallback(async () => {
|
||||
try {
|
||||
const token = await getToken();
|
||||
if (!token) {
|
||||
setActiveWorkoutSession(null);
|
||||
return;
|
||||
}
|
||||
|
||||
const history = await attendanceApi.getHistory(token);
|
||||
if (history.length > 0 && !history[0].checkOutTime) {
|
||||
setActiveWorkoutSession(history[0]);
|
||||
} else {
|
||||
setActiveWorkoutSession(null);
|
||||
}
|
||||
} catch {
|
||||
setActiveWorkoutSession(null);
|
||||
}
|
||||
}, [getToken]);
|
||||
|
||||
useFocusEffect(
|
||||
useCallback(() => {
|
||||
void reconcileDailyMetrics();
|
||||
void fetchActiveWorkoutSession();
|
||||
refetchStatistics();
|
||||
refetchGoals();
|
||||
}, [
|
||||
fetchActiveWorkoutSession,
|
||||
reconcileDailyMetrics,
|
||||
refetchStatistics,
|
||||
refetchGoals,
|
||||
]),
|
||||
}, [reconcileDailyMetrics, refetchStatistics, refetchGoals]),
|
||||
);
|
||||
|
||||
const handleWorkoutAction = useCallback(async () => {
|
||||
try {
|
||||
setWorkoutActionLoading(true);
|
||||
const token = await getToken();
|
||||
if (!token) {
|
||||
Alert.alert("Sign in required", "Please sign in to log your workout.");
|
||||
return;
|
||||
}
|
||||
|
||||
await syncAutoWorkoutGeofenceWithToken(token, {
|
||||
requestPermissions: true,
|
||||
});
|
||||
|
||||
const permission = await Location.requestForegroundPermissionsAsync();
|
||||
if (permission.status !== "granted") {
|
||||
Alert.alert(
|
||||
"Location required",
|
||||
"Location access is required to check in and check out.",
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
const position = await Location.getCurrentPositionAsync({
|
||||
accuracy: Location.Accuracy.Balanced,
|
||||
});
|
||||
const locationPayload = {
|
||||
latitude: position.coords.latitude,
|
||||
longitude: position.coords.longitude,
|
||||
accuracy: position.coords.accuracy ?? 999,
|
||||
};
|
||||
|
||||
if (activeWorkoutSession) {
|
||||
const fallbackRequested = locationPayload.accuracy > 50;
|
||||
await attendanceApi.checkOut(token, locationPayload, fallbackRequested);
|
||||
Alert.alert("Workout logged", "Session ended successfully.");
|
||||
} else {
|
||||
const fallbackRequested = locationPayload.accuracy > 50;
|
||||
await attendanceApi.checkIn(
|
||||
"gym",
|
||||
token,
|
||||
locationPayload,
|
||||
fallbackRequested,
|
||||
);
|
||||
Alert.alert("Workout started", "Session started successfully.");
|
||||
}
|
||||
|
||||
await Promise.all([
|
||||
fetchActiveWorkoutSession(),
|
||||
forceRefresh(),
|
||||
refetchStatistics(),
|
||||
]);
|
||||
} catch (error: unknown) {
|
||||
const message =
|
||||
error instanceof Error
|
||||
? error.message
|
||||
: "Unable to update workout session. Please try again.";
|
||||
Alert.alert("Workout action failed", message);
|
||||
} finally {
|
||||
setWorkoutActionLoading(false);
|
||||
}
|
||||
}, [
|
||||
activeWorkoutSession,
|
||||
fetchActiveWorkoutSession,
|
||||
forceRefresh,
|
||||
getToken,
|
||||
refetchStatistics,
|
||||
]);
|
||||
|
||||
const onRefresh = useCallback(async () => {
|
||||
setRefreshing(true);
|
||||
await Promise.all([forceRefresh(), refetchGoals()]);
|
||||
@ -599,57 +491,6 @@ export default function HomeScreen() {
|
||||
</MinimalCard>
|
||||
</View>
|
||||
|
||||
{/* Steps */}
|
||||
<View style={styles.section}>
|
||||
<SectionHeader title="Steps" subtitle="Daily movement progress" />
|
||||
<MinimalCard variant="bordered" style={styles.progressCard}>
|
||||
<View style={styles.progressHeader}>
|
||||
<View style={styles.progressLabelRow}>
|
||||
<View
|
||||
style={[
|
||||
styles.progressIcon,
|
||||
{ backgroundColor: `${colors.workouts}20` },
|
||||
]}
|
||||
>
|
||||
<Text style={{ fontSize: 20 }}>👣</Text>
|
||||
</View>
|
||||
<View style={{ marginLeft: 12 }}>
|
||||
<Text style={[typography.h4, { color: colors.textPrimary }]}>
|
||||
Steps
|
||||
</Text>
|
||||
<Text
|
||||
style={[typography.caption, { color: colors.textTertiary }]}
|
||||
>
|
||||
{stepsLoading
|
||||
? "Loading steps..."
|
||||
: !stepsSupported
|
||||
? "Step tracking not supported on this device"
|
||||
: !stepsPermissionGranted
|
||||
? "Enable motion access in settings"
|
||||
: steps >= stepsGoal
|
||||
? "Daily step goal reached!"
|
||||
: `${Math.max(0, stepsGoal - steps)} steps remaining`}
|
||||
</Text>
|
||||
</View>
|
||||
</View>
|
||||
<Text
|
||||
style={[typography.h3, { color: colors.workouts }]}
|
||||
numberOfLines={1}
|
||||
adjustsFontSizeToFit
|
||||
minimumFontScale={0.7}
|
||||
>
|
||||
{stepsLoading ? "--" : `${steps}/${stepsGoal}`}
|
||||
</Text>
|
||||
</View>
|
||||
<ProgressBar
|
||||
progress={Math.min(steps / stepsGoal, 1)}
|
||||
color={colors.workouts}
|
||||
height={12}
|
||||
style={{ marginTop: 16 }}
|
||||
/>
|
||||
</MinimalCard>
|
||||
</View>
|
||||
|
||||
{/* Quick Actions */}
|
||||
<View style={styles.section}>
|
||||
<SectionHeader
|
||||
@ -658,17 +499,11 @@ export default function HomeScreen() {
|
||||
/>
|
||||
<View style={styles.quickActionsGrid}>
|
||||
<TouchableOpacity
|
||||
onPress={handleWorkoutAction}
|
||||
disabled={workoutActionLoading}
|
||||
onPress={() => console.log("Log workout")}
|
||||
activeOpacity={0.85}
|
||||
style={[
|
||||
styles.quickActionCard,
|
||||
{
|
||||
backgroundColor: activeWorkoutSession
|
||||
? colors.warning
|
||||
: colors.primary,
|
||||
opacity: workoutActionLoading ? 0.7 : 1,
|
||||
},
|
||||
{ backgroundColor: colors.primary },
|
||||
]}
|
||||
>
|
||||
<View
|
||||
@ -677,16 +512,12 @@ export default function HomeScreen() {
|
||||
{ backgroundColor: "rgba(255,255,255,0.2)" },
|
||||
]}
|
||||
>
|
||||
<Ionicons
|
||||
name={activeWorkoutSession ? "stop-circle" : "barbell"}
|
||||
size={28}
|
||||
color={colors.white}
|
||||
/>
|
||||
<Ionicons name="barbell" size={28} color={colors.white} />
|
||||
</View>
|
||||
<Text
|
||||
style={[typography.h4, { color: colors.white, marginTop: 12 }]}
|
||||
>
|
||||
{activeWorkoutSession ? "End Workout" : "Start Workout"}
|
||||
Workout
|
||||
</Text>
|
||||
<Text
|
||||
style={[
|
||||
@ -694,16 +525,7 @@ export default function HomeScreen() {
|
||||
{ color: "rgba(255,255,255,0.7)", marginTop: 4 },
|
||||
]}
|
||||
>
|
||||
{activeWorkoutSession
|
||||
? `In session since ${new Date(
|
||||
activeWorkoutSession.checkInTime,
|
||||
).toLocaleTimeString([], {
|
||||
hour: "2-digit",
|
||||
minute: "2-digit",
|
||||
})}`
|
||||
: workoutActionLoading
|
||||
? "Updating session..."
|
||||
: "Log your session"}
|
||||
Log your session
|
||||
</Text>
|
||||
</TouchableOpacity>
|
||||
|
||||
@ -1109,12 +931,7 @@ const styles = StyleSheet.create({
|
||||
justifyContent: "space-between",
|
||||
alignItems: "center",
|
||||
},
|
||||
progressLabelRow: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
flex: 1,
|
||||
minWidth: 0,
|
||||
},
|
||||
progressLabelRow: { flexDirection: "row", alignItems: "center" },
|
||||
progressIcon: {
|
||||
width: 48,
|
||||
height: 48,
|
||||
|
||||
@ -21,7 +21,6 @@ import { IconContainer } from "../../components/IconContainer";
|
||||
import { fitnessProfileApi, FitnessProfile } from "../../api/fitnessProfile";
|
||||
import { gymsApi, type Gym } from "../../api/gyms";
|
||||
import { useMembership } from "../../hooks/useMembership";
|
||||
import { syncAutoWorkoutGeofenceWithToken } from "../../services/autoWorkoutGeofence";
|
||||
import log from "../../utils/logger";
|
||||
|
||||
export default function ProfileScreen() {
|
||||
@ -116,12 +115,6 @@ export default function ProfileScreen() {
|
||||
"Success",
|
||||
selectedGymId ? "Gym selected successfully" : "Proceeding without gym",
|
||||
);
|
||||
|
||||
if (token) {
|
||||
await syncAutoWorkoutGeofenceWithToken(token, {
|
||||
requestPermissions: true,
|
||||
});
|
||||
}
|
||||
} catch (err) {
|
||||
log.error("Failed to update gym selection", err);
|
||||
Alert.alert("Error", "Failed to update gym selection");
|
||||
|
||||
@ -13,7 +13,6 @@ import { RecommendationsProvider } from "../contexts/RecommendationsContext";
|
||||
import { NotificationsProvider } from "../contexts/NotificationsContext";
|
||||
import { MembershipProvider } from "../contexts/MembershipContext";
|
||||
import { queryClient } from "../lib/query-client";
|
||||
import { useAutoWorkoutGeofence } from "../hooks/useAutoWorkoutGeofence";
|
||||
import log from "../utils/logger";
|
||||
|
||||
// Wrapper to use notification permissions hook after ClerkLoaded
|
||||
@ -23,7 +22,6 @@ function AppContent() {
|
||||
useNotificationPermissions,
|
||||
} = require("../hooks/useNotificationPermissions");
|
||||
useNotificationPermissions();
|
||||
useAutoWorkoutGeofence();
|
||||
|
||||
return (
|
||||
<Stack>
|
||||
|
||||
303
apps/mobile/src/components/AttendanceCalendar.tsx
Normal file
303
apps/mobile/src/components/AttendanceCalendar.tsx
Normal file
@ -0,0 +1,303 @@
|
||||
import React, { useState, useEffect } from "react";
|
||||
import { View, Text, StyleSheet, TouchableOpacity } from "react-native";
|
||||
import { LinearGradient } from "expo-linear-gradient";
|
||||
import { Ionicons } from "@expo/vector-icons";
|
||||
import { theme } from "../styles/theme";
|
||||
|
||||
interface AttendanceRecord {
|
||||
id: string;
|
||||
checkInTime: string;
|
||||
checkOutTime?: string | null;
|
||||
duration?: number | null;
|
||||
}
|
||||
|
||||
interface AttendanceCalendarProps {
|
||||
attendanceRecords: AttendanceRecord[];
|
||||
}
|
||||
|
||||
export function AttendanceCalendar({
|
||||
attendanceRecords,
|
||||
}: AttendanceCalendarProps) {
|
||||
const [currentMonth, setCurrentMonth] = useState(new Date());
|
||||
const [calendarDays, setCalendarDays] = useState<
|
||||
Array<{ date: Date | null; hasAttendance: boolean; isToday: boolean }>
|
||||
>([]);
|
||||
|
||||
useEffect(() => {
|
||||
generateCalendar(currentMonth);
|
||||
}, [currentMonth, attendanceRecords]);
|
||||
|
||||
const generateCalendar = (month: Date) => {
|
||||
const year = month.getFullYear();
|
||||
const monthIndex = month.getMonth();
|
||||
|
||||
// Get first day of month and number of days
|
||||
const firstDay = new Date(year, monthIndex, 1);
|
||||
const lastDay = new Date(year, monthIndex + 1, 0);
|
||||
const daysInMonth = lastDay.getDate();
|
||||
const startingDayOfWeek = firstDay.getDay();
|
||||
|
||||
// Create attendance lookup set
|
||||
const attendanceDates = new Set(
|
||||
attendanceRecords.map((record) =>
|
||||
new Date(record.checkInTime).toDateString(),
|
||||
),
|
||||
);
|
||||
|
||||
const today = new Date().toDateString();
|
||||
|
||||
// Build calendar array
|
||||
const days: Array<{
|
||||
date: Date | null;
|
||||
hasAttendance: boolean;
|
||||
isToday: boolean;
|
||||
}> = [];
|
||||
|
||||
// Add empty cells for days before month starts
|
||||
for (let i = 0; i < startingDayOfWeek; i++) {
|
||||
days.push({ date: null, hasAttendance: false, isToday: false });
|
||||
}
|
||||
|
||||
// Add days of the month
|
||||
for (let day = 1; day <= daysInMonth; day++) {
|
||||
const date = new Date(year, monthIndex, day);
|
||||
const dateString = date.toDateString();
|
||||
days.push({
|
||||
date,
|
||||
hasAttendance: attendanceDates.has(dateString),
|
||||
isToday: dateString === today,
|
||||
});
|
||||
}
|
||||
|
||||
setCalendarDays(days);
|
||||
};
|
||||
|
||||
const goToPreviousMonth = () => {
|
||||
setCurrentMonth(
|
||||
new Date(currentMonth.getFullYear(), currentMonth.getMonth() - 1),
|
||||
);
|
||||
};
|
||||
|
||||
const goToNextMonth = () => {
|
||||
setCurrentMonth(
|
||||
new Date(currentMonth.getFullYear(), currentMonth.getMonth() + 1),
|
||||
);
|
||||
};
|
||||
|
||||
const monthName = currentMonth.toLocaleDateString("en-US", {
|
||||
month: "long",
|
||||
year: "numeric",
|
||||
});
|
||||
|
||||
return (
|
||||
<View style={styles.container}>
|
||||
<LinearGradient
|
||||
colors={[theme.colors.white, theme.colors.gray50]}
|
||||
style={[styles.card, theme.shadows.medium]}
|
||||
>
|
||||
{/* Header */}
|
||||
<View style={styles.header}>
|
||||
<Text style={styles.title}>Attendance Calendar</Text>
|
||||
</View>
|
||||
|
||||
{/* Month Navigation */}
|
||||
<View style={styles.monthNav}>
|
||||
<TouchableOpacity
|
||||
onPress={goToPreviousMonth}
|
||||
style={styles.navButton}
|
||||
>
|
||||
<Ionicons
|
||||
name="chevron-back"
|
||||
size={20}
|
||||
color={theme.colors.primary}
|
||||
/>
|
||||
</TouchableOpacity>
|
||||
<Text style={styles.monthText}>{monthName}</Text>
|
||||
<TouchableOpacity onPress={goToNextMonth} style={styles.navButton}>
|
||||
<Ionicons
|
||||
name="chevron-forward"
|
||||
size={20}
|
||||
color={theme.colors.primary}
|
||||
/>
|
||||
</TouchableOpacity>
|
||||
</View>
|
||||
|
||||
{/* Day Headers */}
|
||||
<View style={styles.dayHeaders}>
|
||||
{["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"].map((day) => (
|
||||
<Text key={day} style={styles.dayHeader}>
|
||||
{day}
|
||||
</Text>
|
||||
))}
|
||||
</View>
|
||||
|
||||
{/* Calendar Grid */}
|
||||
<View style={styles.calendarGrid}>
|
||||
{calendarDays.map((day, index) => (
|
||||
<View key={index} style={styles.dayCell}>
|
||||
{day.date ? (
|
||||
<View
|
||||
style={[
|
||||
styles.dayContent,
|
||||
day.isToday && styles.todayContent,
|
||||
day.hasAttendance && styles.attendanceContent,
|
||||
]}
|
||||
>
|
||||
<Text
|
||||
style={[
|
||||
styles.dayText,
|
||||
day.isToday && styles.todayText,
|
||||
day.hasAttendance && styles.attendanceText,
|
||||
]}
|
||||
>
|
||||
{day.date.getDate()}
|
||||
</Text>
|
||||
{day.hasAttendance && <View style={styles.attendanceDot} />}
|
||||
</View>
|
||||
) : (
|
||||
<View style={styles.emptyCell} />
|
||||
)}
|
||||
</View>
|
||||
))}
|
||||
</View>
|
||||
|
||||
{/* Legend */}
|
||||
<View style={styles.legend}>
|
||||
<View style={styles.legendItem}>
|
||||
<View style={styles.legendDotAttendance} />
|
||||
<Text style={styles.legendText}>Attended</Text>
|
||||
</View>
|
||||
<View style={styles.legendItem}>
|
||||
<View style={styles.legendDotToday} />
|
||||
<Text style={styles.legendText}>Today</Text>
|
||||
</View>
|
||||
</View>
|
||||
</LinearGradient>
|
||||
</View>
|
||||
);
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
container: {
|
||||
paddingHorizontal: 20,
|
||||
marginBottom: 20,
|
||||
},
|
||||
card: {
|
||||
borderRadius: theme.borderRadius["2xl"],
|
||||
padding: 20,
|
||||
},
|
||||
header: {
|
||||
marginBottom: 16,
|
||||
},
|
||||
title: {
|
||||
fontSize: theme.typography.fontSize.xl,
|
||||
fontWeight: theme.typography.fontWeight.bold,
|
||||
color: theme.colors.gray800,
|
||||
},
|
||||
monthNav: {
|
||||
flexDirection: "row",
|
||||
justifyContent: "space-between",
|
||||
alignItems: "center",
|
||||
marginBottom: 16,
|
||||
paddingHorizontal: 8,
|
||||
},
|
||||
navButton: {
|
||||
padding: 8,
|
||||
},
|
||||
monthText: {
|
||||
fontSize: theme.typography.fontSize.lg,
|
||||
fontWeight: theme.typography.fontWeight.semibold,
|
||||
color: theme.colors.gray700,
|
||||
},
|
||||
dayHeaders: {
|
||||
flexDirection: "row",
|
||||
marginBottom: 8,
|
||||
},
|
||||
dayHeader: {
|
||||
flex: 1,
|
||||
textAlign: "center",
|
||||
fontSize: theme.typography.fontSize.xs,
|
||||
fontWeight: theme.typography.fontWeight.semibold,
|
||||
color: theme.colors.gray500,
|
||||
},
|
||||
calendarGrid: {
|
||||
flexDirection: "row",
|
||||
flexWrap: "wrap",
|
||||
},
|
||||
dayCell: {
|
||||
width: `${100 / 7}%`,
|
||||
aspectRatio: 1,
|
||||
padding: 2,
|
||||
},
|
||||
dayContent: {
|
||||
flex: 1,
|
||||
justifyContent: "center",
|
||||
alignItems: "center",
|
||||
borderRadius: theme.borderRadius.md,
|
||||
position: "relative",
|
||||
},
|
||||
todayContent: {
|
||||
backgroundColor: theme.colors.primaryLight,
|
||||
borderWidth: 1,
|
||||
borderColor: theme.colors.primary,
|
||||
},
|
||||
attendanceContent: {
|
||||
backgroundColor: theme.colors.successLight,
|
||||
},
|
||||
emptyCell: {
|
||||
flex: 1,
|
||||
},
|
||||
dayText: {
|
||||
fontSize: theme.typography.fontSize.sm,
|
||||
color: theme.colors.gray700,
|
||||
fontWeight: theme.typography.fontWeight.medium,
|
||||
},
|
||||
todayText: {
|
||||
color: theme.colors.white,
|
||||
fontWeight: theme.typography.fontWeight.bold,
|
||||
},
|
||||
attendanceText: {
|
||||
color: theme.colors.white,
|
||||
fontWeight: theme.typography.fontWeight.bold,
|
||||
},
|
||||
attendanceDot: {
|
||||
position: "absolute",
|
||||
bottom: 2,
|
||||
width: 4,
|
||||
height: 4,
|
||||
borderRadius: 2,
|
||||
backgroundColor: theme.colors.white,
|
||||
},
|
||||
legend: {
|
||||
flexDirection: "row",
|
||||
justifyContent: "center",
|
||||
gap: 20,
|
||||
marginTop: 16,
|
||||
paddingTop: 16,
|
||||
borderTopWidth: 1,
|
||||
borderTopColor: theme.colors.gray200,
|
||||
},
|
||||
legendItem: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
gap: 6,
|
||||
},
|
||||
legendDotAttendance: {
|
||||
width: 12,
|
||||
height: 12,
|
||||
borderRadius: 6,
|
||||
backgroundColor: theme.colors.successLight,
|
||||
},
|
||||
legendDotToday: {
|
||||
width: 12,
|
||||
height: 12,
|
||||
borderRadius: 6,
|
||||
backgroundColor: theme.colors.primaryLight,
|
||||
borderWidth: 1,
|
||||
borderColor: theme.colors.primary,
|
||||
},
|
||||
legendText: {
|
||||
fontSize: theme.typography.fontSize.xs,
|
||||
color: theme.colors.gray600,
|
||||
},
|
||||
});
|
||||
@ -49,6 +49,8 @@ export function CustomTabBar({
|
||||
return focused ? "home" : "home-outline";
|
||||
case "goals":
|
||||
return focused ? "trophy" : "trophy-outline";
|
||||
case "attendance":
|
||||
return focused ? "calendar" : "calendar-outline";
|
||||
case "recommendations":
|
||||
return focused ? "sparkles" : "sparkles-outline";
|
||||
case "profile":
|
||||
@ -64,6 +66,8 @@ export function CustomTabBar({
|
||||
return "Home";
|
||||
case "goals":
|
||||
return "Goals";
|
||||
case "attendance":
|
||||
return "Attendance";
|
||||
case "recommendations":
|
||||
return "Plans";
|
||||
case "profile":
|
||||
|
||||
@ -20,7 +20,6 @@ interface GoalProgressCardProps {
|
||||
onPress?: () => void;
|
||||
onComplete?: () => void;
|
||||
onDelete?: () => void;
|
||||
aiAligned?: boolean;
|
||||
}
|
||||
|
||||
export function GoalProgressCard({
|
||||
@ -28,7 +27,6 @@ export function GoalProgressCard({
|
||||
onPress,
|
||||
onComplete,
|
||||
onDelete,
|
||||
aiAligned = false,
|
||||
}: GoalProgressCardProps) {
|
||||
const { colors, typography } = useTheme();
|
||||
const isCompleted = goal.status === "completed";
|
||||
@ -279,10 +277,6 @@ export function GoalProgressCard({
|
||||
</Text>
|
||||
)}
|
||||
|
||||
{aiAligned && !isCompleted && (
|
||||
<Badge variant="info" label="AI-ALIGNED" size="sm" />
|
||||
)}
|
||||
|
||||
{isCompleted && goal.completedDate && (
|
||||
<Text style={[typography.caption, { color: colors.success }]}>
|
||||
Completed {new Date(goal.completedDate).toLocaleDateString()}
|
||||
|
||||
@ -10,7 +10,6 @@ import { useUser, useAuth } from "@clerk/clerk-expo";
|
||||
import {
|
||||
getRecommendations,
|
||||
generateRecommendation,
|
||||
generateSelfRecommendation,
|
||||
type Recommendation,
|
||||
type GenerateRecommendationRequest,
|
||||
} from "../api/recommendations";
|
||||
@ -24,7 +23,6 @@ interface RecommendationsContextValue {
|
||||
generateNewRecommendation: (
|
||||
data: GenerateRecommendationRequest,
|
||||
) => Promise<Recommendation>;
|
||||
generateSelfPlan: () => Promise<Recommendation>;
|
||||
clearCache: () => void;
|
||||
}
|
||||
|
||||
@ -109,18 +107,6 @@ export function RecommendationsProvider({
|
||||
[user?.id, getToken],
|
||||
);
|
||||
|
||||
const generateSelfPlan = useCallback(async (): Promise<Recommendation> => {
|
||||
if (!user?.id) throw new Error("User not authenticated");
|
||||
|
||||
const token = await getToken();
|
||||
const recommendation = await generateSelfRecommendation(token);
|
||||
|
||||
setRecommendations((prev) => [recommendation, ...prev]);
|
||||
setLastFetchTime(Date.now());
|
||||
|
||||
return recommendation;
|
||||
}, [user?.id, getToken]);
|
||||
|
||||
const clearCache = useCallback(() => {
|
||||
setRecommendations([]);
|
||||
setLoading(false);
|
||||
@ -147,7 +133,6 @@ export function RecommendationsProvider({
|
||||
error,
|
||||
refetchRecommendations,
|
||||
generateNewRecommendation,
|
||||
generateSelfPlan,
|
||||
clearCache,
|
||||
}}
|
||||
>
|
||||
|
||||
@ -4,7 +4,6 @@ import React, {
|
||||
useState,
|
||||
useCallback,
|
||||
useEffect,
|
||||
useRef,
|
||||
} from "react";
|
||||
import { useUser, useAuth } from "@clerk/clerk-expo";
|
||||
import { getUserStatistics } from "../api/statistics";
|
||||
@ -37,9 +36,6 @@ export function StatisticsProvider({
|
||||
const [loading, setLoading] = useState(false);
|
||||
const [error, setError] = useState<Error | null>(null);
|
||||
const [lastFetchTime, setLastFetchTime] = useState<number>(0);
|
||||
const statisticsRef = useRef<UserStatisticsResponse | null>(null);
|
||||
const lastFetchTimeRef = useRef<number>(0);
|
||||
const fetchInProgressRef = useRef(false);
|
||||
|
||||
// Cache statistics for 30 seconds to avoid duplicate calls
|
||||
const CACHE_DURATION = 30000; // 30 seconds
|
||||
@ -47,49 +43,48 @@ export function StatisticsProvider({
|
||||
const refetchStatistics = useCallback(async () => {
|
||||
if (!user?.id) return;
|
||||
|
||||
if (fetchInProgressRef.current) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Check if we have recent cached data
|
||||
const now = Date.now();
|
||||
if (
|
||||
statisticsRef.current &&
|
||||
now - lastFetchTimeRef.current < CACHE_DURATION
|
||||
) {
|
||||
if (statistics && now - lastFetchTime < CACHE_DURATION) {
|
||||
log.debug("Using cached statistics", {
|
||||
age: now - lastFetchTime,
|
||||
cacheRemaining: CACHE_DURATION - (now - lastFetchTime),
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
fetchInProgressRef.current = true;
|
||||
setLoading(true);
|
||||
setError(null);
|
||||
log.debug("Fetching fresh statistics", { userId: user.id });
|
||||
|
||||
const token = await getToken();
|
||||
const stats = await getUserStatistics(user.id, token);
|
||||
|
||||
setStatistics(stats);
|
||||
statisticsRef.current = stats;
|
||||
setLastFetchTime(now);
|
||||
lastFetchTimeRef.current = now;
|
||||
log.debug("Statistics fetched and cached", {
|
||||
userId: user.id,
|
||||
hasWeeklyTrend: !!stats.weeklyTrend,
|
||||
weeklyTrendLength: stats.weeklyTrend?.length || 0,
|
||||
weeklyTrendSample: stats.weeklyTrend?.[0],
|
||||
stats,
|
||||
});
|
||||
} catch (err) {
|
||||
const error = err instanceof Error ? err : new Error(String(err));
|
||||
log.error("Failed to fetch statistics", error);
|
||||
setError(error);
|
||||
} finally {
|
||||
setLoading(false);
|
||||
fetchInProgressRef.current = false;
|
||||
}
|
||||
}, [user?.id, getToken]);
|
||||
}, [user?.id, getToken, statistics, lastFetchTime]);
|
||||
|
||||
const clearCache = useCallback(() => {
|
||||
setStatistics(null);
|
||||
statisticsRef.current = null;
|
||||
setLoading(false);
|
||||
setLastFetchTime(0);
|
||||
lastFetchTimeRef.current = 0;
|
||||
setError(null);
|
||||
fetchInProgressRef.current = false;
|
||||
log.debug("Statistics cache cleared");
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
@ -105,25 +100,28 @@ export function StatisticsProvider({
|
||||
if (!user?.id) return;
|
||||
|
||||
try {
|
||||
fetchInProgressRef.current = true;
|
||||
setLoading(true);
|
||||
setError(null);
|
||||
log.debug("Force fetching statistics", { userId: user.id });
|
||||
|
||||
const token = await getToken();
|
||||
const stats = await getUserStatistics(user.id, token);
|
||||
|
||||
setStatistics(stats);
|
||||
statisticsRef.current = stats;
|
||||
const now = Date.now();
|
||||
setLastFetchTime(now);
|
||||
lastFetchTimeRef.current = now;
|
||||
setLastFetchTime(Date.now());
|
||||
log.debug("Statistics force fetched and cached", {
|
||||
userId: user.id,
|
||||
hasWeeklyTrend: !!stats.weeklyTrend,
|
||||
weeklyTrendLength: stats.weeklyTrend?.length || 0,
|
||||
weeklyTrendSample: stats.weeklyTrend?.[0],
|
||||
stats,
|
||||
});
|
||||
} catch (err) {
|
||||
const error = err instanceof Error ? err : new Error(String(err));
|
||||
log.error("Failed to force fetch statistics", error);
|
||||
setError(error);
|
||||
} finally {
|
||||
setLoading(false);
|
||||
fetchInProgressRef.current = false;
|
||||
}
|
||||
}, [user?.id, getToken]);
|
||||
|
||||
|
||||
@ -1,68 +0,0 @@
|
||||
import { useAuth } from "@clerk/clerk-expo";
|
||||
import { useCallback, useEffect } from "react";
|
||||
import { AppState } from "react-native";
|
||||
import {
|
||||
disableAutoWorkoutGeofence,
|
||||
syncAutoWorkoutGeofenceWithToken,
|
||||
} from "../services/autoWorkoutGeofence";
|
||||
import log from "../utils/logger";
|
||||
|
||||
export function useAutoWorkoutGeofence() {
|
||||
const { isSignedIn, getToken } = useAuth();
|
||||
|
||||
const syncGeofence = useCallback(async () => {
|
||||
try {
|
||||
if (!isSignedIn) {
|
||||
await disableAutoWorkoutGeofence();
|
||||
return;
|
||||
}
|
||||
|
||||
const token = await getToken();
|
||||
if (!token) {
|
||||
await disableAutoWorkoutGeofence();
|
||||
return;
|
||||
}
|
||||
|
||||
await syncAutoWorkoutGeofenceWithToken(token, {
|
||||
requestPermissions: true,
|
||||
});
|
||||
} catch (error) {
|
||||
log.warn("Failed to sync auto workout geofence", {
|
||||
error: error instanceof Error ? error.message : String(error),
|
||||
});
|
||||
}
|
||||
}, [getToken, isSignedIn]);
|
||||
|
||||
useEffect(() => {
|
||||
void syncGeofence();
|
||||
}, [syncGeofence]);
|
||||
|
||||
useEffect(() => {
|
||||
const appStateSubscription = AppState.addEventListener(
|
||||
"change",
|
||||
(state) => {
|
||||
if (state === "active") {
|
||||
void syncGeofence();
|
||||
}
|
||||
},
|
||||
);
|
||||
|
||||
const interval = setInterval(
|
||||
() => {
|
||||
void syncGeofence();
|
||||
},
|
||||
5 * 60 * 1000,
|
||||
);
|
||||
|
||||
return () => {
|
||||
appStateSubscription.remove();
|
||||
clearInterval(interval);
|
||||
};
|
||||
}, [syncGeofence]);
|
||||
|
||||
useEffect(() => {
|
||||
if (!isSignedIn) {
|
||||
void disableAutoWorkoutGeofence();
|
||||
}
|
||||
}, [isSignedIn]);
|
||||
}
|
||||
@ -1,136 +0,0 @@
|
||||
import { useAuth } from "@clerk/clerk-expo";
|
||||
import { Pedometer } from "expo-sensors";
|
||||
import { useCallback, useEffect, useRef, useState } from "react";
|
||||
import { AppState } from "react-native";
|
||||
|
||||
interface DailyStepsState {
|
||||
steps: number;
|
||||
goal: number;
|
||||
loading: boolean;
|
||||
supported: boolean;
|
||||
permissionGranted: boolean;
|
||||
refresh: () => Promise<void>;
|
||||
}
|
||||
|
||||
const DEFAULT_DAILY_STEPS_GOAL = 8000;
|
||||
|
||||
function startOfToday(): Date {
|
||||
const now = new Date();
|
||||
return new Date(now.getFullYear(), now.getMonth(), now.getDate());
|
||||
}
|
||||
|
||||
function millisecondsUntilNextMidnight(): number {
|
||||
const now = new Date();
|
||||
const nextMidnight = new Date(now);
|
||||
nextMidnight.setHours(24, 0, 0, 0);
|
||||
return Math.max(1000, nextMidnight.getTime() - now.getTime());
|
||||
}
|
||||
|
||||
export function useDailySteps(): DailyStepsState {
|
||||
const { isSignedIn } = useAuth();
|
||||
const [steps, setSteps] = useState(0);
|
||||
const [loading, setLoading] = useState(true);
|
||||
const [supported, setSupported] = useState(true);
|
||||
const [permissionGranted, setPermissionGranted] = useState(true);
|
||||
const pedometerSubscriptionRef = useRef<ReturnType<
|
||||
typeof Pedometer.watchStepCount
|
||||
> | null>(null);
|
||||
const midnightTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
|
||||
|
||||
const fetchDailySteps = useCallback(async () => {
|
||||
if (!isSignedIn) {
|
||||
setSteps(0);
|
||||
setLoading(false);
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
setLoading(true);
|
||||
const isAvailable = await Pedometer.isAvailableAsync();
|
||||
setSupported(Boolean(isAvailable));
|
||||
|
||||
if (!isAvailable) {
|
||||
setSteps(0);
|
||||
setPermissionGranted(false);
|
||||
return;
|
||||
}
|
||||
|
||||
const start = startOfToday();
|
||||
const end = new Date();
|
||||
const result = await Pedometer.getStepCountAsync(start, end);
|
||||
|
||||
setSteps(Math.max(0, result.steps ?? 0));
|
||||
setPermissionGranted(true);
|
||||
} catch {
|
||||
setPermissionGranted(false);
|
||||
setSteps(0);
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
}, [isSignedIn]);
|
||||
|
||||
const resetAtMidnight = useCallback(() => {
|
||||
if (midnightTimerRef.current) {
|
||||
clearTimeout(midnightTimerRef.current);
|
||||
}
|
||||
|
||||
midnightTimerRef.current = setTimeout(() => {
|
||||
void fetchDailySteps();
|
||||
resetAtMidnight();
|
||||
}, millisecondsUntilNextMidnight() + 100);
|
||||
}, [fetchDailySteps]);
|
||||
|
||||
useEffect(() => {
|
||||
void fetchDailySteps();
|
||||
}, [fetchDailySteps]);
|
||||
|
||||
useEffect(() => {
|
||||
if (pedometerSubscriptionRef.current) {
|
||||
pedometerSubscriptionRef.current.remove();
|
||||
pedometerSubscriptionRef.current = null;
|
||||
}
|
||||
|
||||
if (!isSignedIn || !supported || !permissionGranted) {
|
||||
return;
|
||||
}
|
||||
|
||||
pedometerSubscriptionRef.current = Pedometer.watchStepCount(
|
||||
(result: { steps: number }) => {
|
||||
setSteps((prev) => Math.max(0, prev + Math.max(0, result.steps ?? 0)));
|
||||
},
|
||||
);
|
||||
|
||||
return () => {
|
||||
if (pedometerSubscriptionRef.current) {
|
||||
pedometerSubscriptionRef.current.remove();
|
||||
pedometerSubscriptionRef.current = null;
|
||||
}
|
||||
};
|
||||
}, [isSignedIn, permissionGranted, supported]);
|
||||
|
||||
useEffect(() => {
|
||||
const subscription = AppState.addEventListener("change", (state) => {
|
||||
if (state === "active") {
|
||||
void fetchDailySteps();
|
||||
}
|
||||
});
|
||||
|
||||
resetAtMidnight();
|
||||
|
||||
return () => {
|
||||
subscription.remove();
|
||||
if (midnightTimerRef.current) {
|
||||
clearTimeout(midnightTimerRef.current);
|
||||
}
|
||||
};
|
||||
}, [fetchDailySteps, resetAtMidnight]);
|
||||
|
||||
return {
|
||||
steps,
|
||||
goal: DEFAULT_DAILY_STEPS_GOAL,
|
||||
loading,
|
||||
supported,
|
||||
permissionGranted,
|
||||
refresh: fetchDailySteps,
|
||||
};
|
||||
}
|
||||
@ -1,19 +0,0 @@
|
||||
import * as SecureStore from "expo-secure-store";
|
||||
|
||||
const BACKGROUND_AUTH_TOKEN_KEY = "fitai_background_auth_token";
|
||||
|
||||
export async function saveBackgroundAuthToken(token: string): Promise<void> {
|
||||
if (!looksLikeJwt(token)) {
|
||||
return;
|
||||
}
|
||||
|
||||
await SecureStore.setItemAsync(BACKGROUND_AUTH_TOKEN_KEY, token);
|
||||
}
|
||||
|
||||
export async function getBackgroundAuthToken(): Promise<string | null> {
|
||||
return SecureStore.getItemAsync(BACKGROUND_AUTH_TOKEN_KEY);
|
||||
}
|
||||
|
||||
function looksLikeJwt(token: string): boolean {
|
||||
return token.split(".").length === 3;
|
||||
}
|
||||
@ -1,296 +0,0 @@
|
||||
import * as Location from "expo-location";
|
||||
import * as TaskManager from "expo-task-manager";
|
||||
import { apiClient } from "../api/client";
|
||||
import { userGymApi } from "../api/userGym";
|
||||
import { API_ENDPOINTS } from "../config/api";
|
||||
import { saveBackgroundAuthToken } from "../lib/background-auth-token";
|
||||
import { getBackgroundAuthToken } from "../lib/background-auth-token";
|
||||
import log from "../utils/logger";
|
||||
|
||||
const AUTO_WORKOUT_GEOFENCE_TASK = "fitai-auto-workout-geofence";
|
||||
const DEFAULT_RADIUS_METERS = 30;
|
||||
const MAX_ACCEPTABLE_ACCURACY_METERS = 50;
|
||||
const ACTION_COOLDOWN_MS = 90_000;
|
||||
|
||||
let lastActionAt = 0;
|
||||
|
||||
interface GeofenceRegion {
|
||||
identifier: string;
|
||||
latitude: number;
|
||||
longitude: number;
|
||||
radius: number;
|
||||
notifyOnEnter: boolean;
|
||||
notifyOnExit: boolean;
|
||||
}
|
||||
|
||||
if (!TaskManager.isTaskDefined(AUTO_WORKOUT_GEOFENCE_TASK)) {
|
||||
TaskManager.defineTask(
|
||||
AUTO_WORKOUT_GEOFENCE_TASK,
|
||||
async ({ data, error }: TaskManager.TaskManagerTaskBody) => {
|
||||
if (error) {
|
||||
log.error("Auto workout geofence task failed", error);
|
||||
return;
|
||||
}
|
||||
|
||||
const event = data as
|
||||
| {
|
||||
eventType?: Location.GeofencingEventType;
|
||||
region?: GeofenceRegion;
|
||||
}
|
||||
| undefined;
|
||||
|
||||
const eventType = event?.eventType;
|
||||
if (
|
||||
eventType !== Location.GeofencingEventType.Enter &&
|
||||
eventType !== Location.GeofencingEventType.Exit
|
||||
) {
|
||||
return;
|
||||
}
|
||||
|
||||
const now = Date.now();
|
||||
if (now - lastActionAt < ACTION_COOLDOWN_MS) {
|
||||
return;
|
||||
}
|
||||
lastActionAt = now;
|
||||
|
||||
try {
|
||||
const token = await getBackgroundAuthToken();
|
||||
if (!token) {
|
||||
log.warn("Skipping geofence auto-workout due to missing auth token");
|
||||
return;
|
||||
}
|
||||
|
||||
const location = await Location.getCurrentPositionAsync({
|
||||
accuracy: Location.Accuracy.Balanced,
|
||||
});
|
||||
|
||||
const accuracy = location.coords.accuracy ?? 999;
|
||||
if (accuracy > MAX_ACCEPTABLE_ACCURACY_METERS) {
|
||||
log.warn("Skipping geofence auto-workout due to poor GPS accuracy", {
|
||||
accuracy,
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
const headers = { Authorization: `Bearer ${token}` };
|
||||
const locationPayload = {
|
||||
latitude: location.coords.latitude,
|
||||
longitude: location.coords.longitude,
|
||||
accuracy,
|
||||
};
|
||||
|
||||
const historyRes = await apiClient.get(
|
||||
API_ENDPOINTS.ATTENDANCE.HISTORY,
|
||||
{
|
||||
headers,
|
||||
},
|
||||
);
|
||||
const history = Array.isArray(historyRes.data)
|
||||
? (historyRes.data as Array<{ id: string; checkOutTime?: string }>)
|
||||
: [];
|
||||
const activeSession = history.find((item) => !item.checkOutTime);
|
||||
|
||||
if (eventType === Location.GeofencingEventType.Enter) {
|
||||
if (activeSession) {
|
||||
return;
|
||||
}
|
||||
|
||||
await apiClient.post(
|
||||
API_ENDPOINTS.ATTENDANCE.CHECK_IN,
|
||||
{ type: "gym", location: locationPayload },
|
||||
{ headers },
|
||||
);
|
||||
log.info("Auto-started workout after geofence enter");
|
||||
return;
|
||||
}
|
||||
|
||||
if (!activeSession) {
|
||||
return;
|
||||
}
|
||||
|
||||
await apiClient.post(
|
||||
API_ENDPOINTS.ATTENDANCE.CHECK_OUT,
|
||||
{
|
||||
location: locationPayload,
|
||||
fallbackRequested: accuracy > MAX_ACCEPTABLE_ACCURACY_METERS,
|
||||
},
|
||||
{ headers },
|
||||
);
|
||||
log.info("Auto-ended workout after geofence exit");
|
||||
} catch (taskError: unknown) {
|
||||
if (
|
||||
isApiError(taskError, 400, "Already checked in") ||
|
||||
isApiError(taskError, 404, "No active check-in found")
|
||||
) {
|
||||
return;
|
||||
}
|
||||
|
||||
log.error("Auto workout geofence action failed", taskError);
|
||||
}
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
export async function configureAutoWorkoutGeofence(params: {
|
||||
latitude: number;
|
||||
longitude: number;
|
||||
radiusMeters?: number | null;
|
||||
}): Promise<void> {
|
||||
const started = await Location.hasStartedGeofencingAsync(
|
||||
AUTO_WORKOUT_GEOFENCE_TASK,
|
||||
);
|
||||
|
||||
const region: GeofenceRegion = {
|
||||
identifier: "user-gym",
|
||||
latitude: params.latitude,
|
||||
longitude: params.longitude,
|
||||
radius: params.radiusMeters ?? DEFAULT_RADIUS_METERS,
|
||||
notifyOnEnter: true,
|
||||
notifyOnExit: true,
|
||||
};
|
||||
|
||||
if (started) {
|
||||
try {
|
||||
await Location.stopGeofencingAsync(AUTO_WORKOUT_GEOFENCE_TASK);
|
||||
} catch (error) {
|
||||
if (!isTaskNotFoundError(error)) {
|
||||
throw error;
|
||||
}
|
||||
|
||||
log.warn("Geofence task was not found while stopping before restart", {
|
||||
task: AUTO_WORKOUT_GEOFENCE_TASK,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
await Location.startGeofencingAsync(AUTO_WORKOUT_GEOFENCE_TASK, [region]);
|
||||
}
|
||||
|
||||
export async function disableAutoWorkoutGeofence(): Promise<void> {
|
||||
try {
|
||||
const started = await Location.hasStartedGeofencingAsync(
|
||||
AUTO_WORKOUT_GEOFENCE_TASK,
|
||||
);
|
||||
|
||||
if (!started) {
|
||||
return;
|
||||
}
|
||||
|
||||
await Location.stopGeofencingAsync(AUTO_WORKOUT_GEOFENCE_TASK);
|
||||
} catch (error) {
|
||||
if (!isTaskNotFoundError(error)) {
|
||||
throw error;
|
||||
}
|
||||
|
||||
log.warn("Geofence task was not found while disabling", {
|
||||
task: AUTO_WORKOUT_GEOFENCE_TASK,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
export async function syncAutoWorkoutGeofenceWithToken(
|
||||
token: string,
|
||||
options?: { requestPermissions?: boolean },
|
||||
): Promise<void> {
|
||||
const shouldRequestPermissions = options?.requestPermissions ?? false;
|
||||
|
||||
await saveBackgroundAuthToken(token);
|
||||
|
||||
const foregroundPermission = await Location.getForegroundPermissionsAsync();
|
||||
const foregroundStatus =
|
||||
foregroundPermission.status === "granted"
|
||||
? foregroundPermission.status
|
||||
: shouldRequestPermissions
|
||||
? (await Location.requestForegroundPermissionsAsync()).status
|
||||
: foregroundPermission.status;
|
||||
|
||||
if (foregroundStatus !== "granted") {
|
||||
log.info("Auto workout geofence disabled: foreground location not granted");
|
||||
await disableAutoWorkoutGeofence();
|
||||
return;
|
||||
}
|
||||
|
||||
const backgroundPermission = await Location.getBackgroundPermissionsAsync();
|
||||
const backgroundStatus =
|
||||
backgroundPermission.status === "granted"
|
||||
? backgroundPermission.status
|
||||
: shouldRequestPermissions
|
||||
? (await Location.requestBackgroundPermissionsAsync()).status
|
||||
: backgroundPermission.status;
|
||||
|
||||
if (backgroundStatus !== "granted") {
|
||||
log.info("Auto workout geofence disabled: background location not granted");
|
||||
await disableAutoWorkoutGeofence();
|
||||
return;
|
||||
}
|
||||
|
||||
const currentGym = await userGymApi.getCurrentGym(token);
|
||||
const gym = currentGym.gym;
|
||||
|
||||
if (
|
||||
!gym ||
|
||||
gym.geofenceEnabled === false ||
|
||||
gym.latitude === null ||
|
||||
gym.longitude === null
|
||||
) {
|
||||
log.info("Auto workout geofence disabled: missing/disabled gym geofence");
|
||||
await disableAutoWorkoutGeofence();
|
||||
return;
|
||||
}
|
||||
|
||||
await configureAutoWorkoutGeofence({
|
||||
latitude: gym.latitude,
|
||||
longitude: gym.longitude,
|
||||
radiusMeters: gym.geofenceRadiusMeters ?? DEFAULT_RADIUS_METERS,
|
||||
});
|
||||
}
|
||||
|
||||
function isApiError(
|
||||
error: unknown,
|
||||
status: number,
|
||||
expectedMessage: string,
|
||||
): boolean {
|
||||
if (!error || typeof error !== "object") {
|
||||
return false;
|
||||
}
|
||||
|
||||
const maybe = error as {
|
||||
response?: {
|
||||
status?: number;
|
||||
data?: unknown;
|
||||
};
|
||||
};
|
||||
|
||||
if (maybe.response?.status !== status) {
|
||||
return false;
|
||||
}
|
||||
|
||||
const data = maybe.response.data;
|
||||
if (typeof data === "string") {
|
||||
return data === expectedMessage;
|
||||
}
|
||||
|
||||
if (data && typeof data === "object") {
|
||||
const errorField = (data as { error?: unknown }).error;
|
||||
if (typeof errorField === "string") {
|
||||
return errorField.includes(expectedMessage);
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
function isTaskNotFoundError(error: unknown): boolean {
|
||||
if (!error || typeof error !== "object") {
|
||||
return false;
|
||||
}
|
||||
|
||||
const message =
|
||||
"message" in error && typeof error.message === "string"
|
||||
? error.message
|
||||
: String(error);
|
||||
|
||||
return (
|
||||
message.includes("TaskNotFoundException") || message.includes("not found")
|
||||
);
|
||||
}
|
||||
@ -48,12 +48,6 @@ export const gyms = sqliteTable(
|
||||
id: text("id").primaryKey(),
|
||||
name: text("name").notNull(),
|
||||
location: text("location"),
|
||||
latitude: real("latitude"),
|
||||
longitude: real("longitude"),
|
||||
geofenceRadiusMeters: real("geofence_radius_meters").notNull().default(30),
|
||||
geofenceEnabled: integer("geofence_enabled", { mode: "boolean" })
|
||||
.notNull()
|
||||
.default(true),
|
||||
status: text("status", { enum: ["active", "inactive"] })
|
||||
.notNull()
|
||||
.default("active"),
|
||||
|
||||
@ -137,10 +137,6 @@ export interface Gym {
|
||||
id: string;
|
||||
name: string;
|
||||
location?: string;
|
||||
latitude?: number;
|
||||
longitude?: number;
|
||||
geofenceRadiusMeters?: number;
|
||||
geofenceEnabled?: boolean;
|
||||
status: GymStatus;
|
||||
adminUserId: string;
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user