Compare commits
No commits in common. "091cb5ba854eabcde9659c7a3450f79dea0072ce" and "0ddac10c59348a4e9a628e1ef7af884802a5b469" have entirely different histories.
091cb5ba85
...
0ddac10c59
Binary file not shown.
@ -3,7 +3,6 @@ import { NextRequest, NextResponse } from "next/server";
|
|||||||
import { getDatabase } from "@/lib/database";
|
import { getDatabase } from "@/lib/database";
|
||||||
import { ensureUserSynced } from "@/lib/sync-user";
|
import { ensureUserSynced } from "@/lib/sync-user";
|
||||||
import log from "@/lib/logger";
|
import log from "@/lib/logger";
|
||||||
import { getUserMembershipContext } from "@/lib/membership/access";
|
|
||||||
|
|
||||||
export async function POST(req: NextRequest) {
|
export async function POST(req: NextRequest) {
|
||||||
try {
|
try {
|
||||||
@ -12,18 +11,6 @@ export async function POST(req: NextRequest) {
|
|||||||
|
|
||||||
const db = await getDatabase();
|
const db = await getDatabase();
|
||||||
await ensureUserSynced(userId, db);
|
await ensureUserSynced(userId, db);
|
||||||
const { features, membershipType } = await getUserMembershipContext(userId);
|
|
||||||
|
|
||||||
if (!features.hydrationTracking) {
|
|
||||||
return NextResponse.json(
|
|
||||||
{
|
|
||||||
error:
|
|
||||||
"Hydration tracking is available on Premium and VIP memberships",
|
|
||||||
membershipType,
|
|
||||||
},
|
|
||||||
{ status: 403 },
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
const body = await req.json();
|
const body = await req.json();
|
||||||
const { date, entries, totalWater, waterGoal } = body;
|
const { date, entries, totalWater, waterGoal } = body;
|
||||||
@ -71,18 +58,6 @@ export async function GET(req: NextRequest) {
|
|||||||
|
|
||||||
const db = await getDatabase();
|
const db = await getDatabase();
|
||||||
await ensureUserSynced(userId, db);
|
await ensureUserSynced(userId, db);
|
||||||
const { features, membershipType } = await getUserMembershipContext(userId);
|
|
||||||
|
|
||||||
if (!features.hydrationTracking) {
|
|
||||||
return NextResponse.json(
|
|
||||||
{
|
|
||||||
error:
|
|
||||||
"Hydration tracking is available on Premium and VIP memberships",
|
|
||||||
membershipType,
|
|
||||||
},
|
|
||||||
{ status: 403 },
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
const url = new URL(req.url);
|
const url = new URL(req.url);
|
||||||
const date = url.searchParams.get("date");
|
const date = url.searchParams.get("date");
|
||||||
@ -125,18 +100,6 @@ export async function DELETE(req: NextRequest) {
|
|||||||
|
|
||||||
const db = await getDatabase();
|
const db = await getDatabase();
|
||||||
await ensureUserSynced(userId, db);
|
await ensureUserSynced(userId, db);
|
||||||
const { features, membershipType } = await getUserMembershipContext(userId);
|
|
||||||
|
|
||||||
if (!features.hydrationTracking) {
|
|
||||||
return NextResponse.json(
|
|
||||||
{
|
|
||||||
error:
|
|
||||||
"Hydration tracking is available on Premium and VIP memberships",
|
|
||||||
membershipType,
|
|
||||||
},
|
|
||||||
{ status: 403 },
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
const url = new URL(req.url);
|
const url = new URL(req.url);
|
||||||
const id = url.searchParams.get("id");
|
const id = url.searchParams.get("id");
|
||||||
|
|||||||
@ -3,7 +3,6 @@ import { NextRequest, NextResponse } from "next/server";
|
|||||||
import { getDatabase } from "@/lib/database";
|
import { getDatabase } from "@/lib/database";
|
||||||
import { ensureUserSynced } from "@/lib/sync-user";
|
import { ensureUserSynced } from "@/lib/sync-user";
|
||||||
import log from "@/lib/logger";
|
import log from "@/lib/logger";
|
||||||
import { getUserMembershipContext } from "@/lib/membership/access";
|
|
||||||
|
|
||||||
export async function POST(req: NextRequest) {
|
export async function POST(req: NextRequest) {
|
||||||
try {
|
try {
|
||||||
@ -12,18 +11,6 @@ export async function POST(req: NextRequest) {
|
|||||||
|
|
||||||
const db = await getDatabase();
|
const db = await getDatabase();
|
||||||
await ensureUserSynced(userId, db);
|
await ensureUserSynced(userId, db);
|
||||||
const { features, membershipType } = await getUserMembershipContext(userId);
|
|
||||||
|
|
||||||
if (!features.nutritionTracking) {
|
|
||||||
return NextResponse.json(
|
|
||||||
{
|
|
||||||
error:
|
|
||||||
"Nutrition tracking is available on Premium and VIP memberships",
|
|
||||||
membershipType,
|
|
||||||
},
|
|
||||||
{ status: 403 },
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
const body = await req.json();
|
const body = await req.json();
|
||||||
const {
|
const {
|
||||||
@ -72,18 +59,6 @@ export async function GET(req: NextRequest) {
|
|||||||
|
|
||||||
const db = await getDatabase();
|
const db = await getDatabase();
|
||||||
await ensureUserSynced(userId, db);
|
await ensureUserSynced(userId, db);
|
||||||
const { features, membershipType } = await getUserMembershipContext(userId);
|
|
||||||
|
|
||||||
if (!features.nutritionTracking) {
|
|
||||||
return NextResponse.json(
|
|
||||||
{
|
|
||||||
error:
|
|
||||||
"Nutrition tracking is available on Premium and VIP memberships",
|
|
||||||
membershipType,
|
|
||||||
},
|
|
||||||
{ status: 403 },
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
const url = new URL(req.url);
|
const url = new URL(req.url);
|
||||||
const date = url.searchParams.get("date");
|
const date = url.searchParams.get("date");
|
||||||
@ -113,18 +88,6 @@ export async function DELETE(req: NextRequest) {
|
|||||||
|
|
||||||
const db = await getDatabase();
|
const db = await getDatabase();
|
||||||
await ensureUserSynced(userId, db);
|
await ensureUserSynced(userId, db);
|
||||||
const { features, membershipType } = await getUserMembershipContext(userId);
|
|
||||||
|
|
||||||
if (!features.nutritionTracking) {
|
|
||||||
return NextResponse.json(
|
|
||||||
{
|
|
||||||
error:
|
|
||||||
"Nutrition tracking is available on Premium and VIP memberships",
|
|
||||||
membershipType,
|
|
||||||
},
|
|
||||||
{ status: 403 },
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
const url = new URL(req.url);
|
const url = new URL(req.url);
|
||||||
const id = url.searchParams.get("id");
|
const id = url.searchParams.get("id");
|
||||||
|
|||||||
@ -3,7 +3,6 @@ import { NextRequest, NextResponse } from "next/server";
|
|||||||
import { getDatabase } from "@/lib/database";
|
import { getDatabase } from "@/lib/database";
|
||||||
import { ensureUserSynced } from "@/lib/sync-user";
|
import { ensureUserSynced } from "@/lib/sync-user";
|
||||||
import log from "@/lib/logger";
|
import log from "@/lib/logger";
|
||||||
import { getUserMembershipContext } from "@/lib/membership/access";
|
|
||||||
|
|
||||||
export async function POST(req: NextRequest) {
|
export async function POST(req: NextRequest) {
|
||||||
try {
|
try {
|
||||||
@ -12,18 +11,6 @@ export async function POST(req: NextRequest) {
|
|||||||
|
|
||||||
const db = await getDatabase();
|
const db = await getDatabase();
|
||||||
await ensureUserSynced(userId, db);
|
await ensureUserSynced(userId, db);
|
||||||
const { features, membershipType } = await getUserMembershipContext(userId);
|
|
||||||
|
|
||||||
if (!features.nutritionTracking) {
|
|
||||||
return NextResponse.json(
|
|
||||||
{
|
|
||||||
error:
|
|
||||||
"Nutrition tracking is available on Premium and VIP memberships",
|
|
||||||
membershipType,
|
|
||||||
},
|
|
||||||
{ status: 403 },
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
const body = await req.json();
|
const body = await req.json();
|
||||||
const { date, meals, totalCalories, calorieGoal } = body;
|
const { date, meals, totalCalories, calorieGoal } = body;
|
||||||
@ -71,18 +58,6 @@ export async function GET(req: NextRequest) {
|
|||||||
|
|
||||||
const db = await getDatabase();
|
const db = await getDatabase();
|
||||||
await ensureUserSynced(userId, db);
|
await ensureUserSynced(userId, db);
|
||||||
const { features, membershipType } = await getUserMembershipContext(userId);
|
|
||||||
|
|
||||||
if (!features.nutritionTracking) {
|
|
||||||
return NextResponse.json(
|
|
||||||
{
|
|
||||||
error:
|
|
||||||
"Nutrition tracking is available on Premium and VIP memberships",
|
|
||||||
membershipType,
|
|
||||||
},
|
|
||||||
{ status: 403 },
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
const url = new URL(req.url);
|
const url = new URL(req.url);
|
||||||
const date = url.searchParams.get("date");
|
const date = url.searchParams.get("date");
|
||||||
@ -125,18 +100,6 @@ export async function DELETE(req: NextRequest) {
|
|||||||
|
|
||||||
const db = await getDatabase();
|
const db = await getDatabase();
|
||||||
await ensureUserSynced(userId, db);
|
await ensureUserSynced(userId, db);
|
||||||
const { features, membershipType } = await getUserMembershipContext(userId);
|
|
||||||
|
|
||||||
if (!features.nutritionTracking) {
|
|
||||||
return NextResponse.json(
|
|
||||||
{
|
|
||||||
error:
|
|
||||||
"Nutrition tracking is available on Premium and VIP memberships",
|
|
||||||
membershipType,
|
|
||||||
},
|
|
||||||
{ status: 403 },
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
const url = new URL(req.url);
|
const url = new URL(req.url);
|
||||||
const id = url.searchParams.get("id");
|
const id = url.searchParams.get("id");
|
||||||
|
|||||||
@ -5,7 +5,6 @@ import { buildAIContext } from "@/lib/ai/ai-context";
|
|||||||
import { buildEnhancedPrompt, buildBasicPrompt } from "@/lib/ai/prompt-builder";
|
import { buildEnhancedPrompt, buildBasicPrompt } from "@/lib/ai/prompt-builder";
|
||||||
import log from "@/lib/logger";
|
import log from "@/lib/logger";
|
||||||
import { ensureUserSynced } from "@/lib/sync-user";
|
import { ensureUserSynced } from "@/lib/sync-user";
|
||||||
import { getUserMembershipContext } from "@/lib/membership/access";
|
|
||||||
|
|
||||||
export async function POST(req: Request) {
|
export async function POST(req: Request) {
|
||||||
try {
|
try {
|
||||||
@ -50,41 +49,6 @@ export async function POST(req: Request) {
|
|||||||
return NextResponse.json({ error: "User not found" }, { status: 404 });
|
return NextResponse.json({ error: "User not found" }, { status: 404 });
|
||||||
}
|
}
|
||||||
|
|
||||||
const { membershipType, features } = await getUserMembershipContext(userId);
|
|
||||||
|
|
||||||
if (features.recommendationsPerMonth === 1) {
|
|
||||||
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 >= 1) {
|
|
||||||
return NextResponse.json(
|
|
||||||
{
|
|
||||||
error:
|
|
||||||
"Basic membership includes 1 recommendation per month. Upgrade to Premium or VIP for unlimited recommendations.",
|
|
||||||
membershipType,
|
|
||||||
},
|
|
||||||
{ status: 403 },
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (currentUser.role !== "superAdmin") {
|
if (currentUser.role !== "superAdmin") {
|
||||||
if (!currentUser.gymId || targetUser.gymId !== currentUser.gymId) {
|
if (!currentUser.gymId || targetUser.gymId !== currentUser.gymId) {
|
||||||
return NextResponse.json(
|
return NextResponse.json(
|
||||||
|
|||||||
@ -17,7 +17,6 @@ import {
|
|||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
import { useUser } from "@clerk/nextjs";
|
import { useUser } from "@clerk/nextjs";
|
||||||
import log from "@/lib/logger";
|
import log from "@/lib/logger";
|
||||||
import { MEMBERSHIP_FEATURES } from "@/lib/membership/features";
|
|
||||||
|
|
||||||
interface Backup {
|
interface Backup {
|
||||||
name: string;
|
name: string;
|
||||||
@ -559,109 +558,6 @@ export default function SettingsPage() {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{/* Membership Feature Access */}
|
|
||||||
<div className="mt-6">
|
|
||||||
<h5 className="text-sm font-medium text-slate-700 mb-2">
|
|
||||||
Membership Feature Access
|
|
||||||
</h5>
|
|
||||||
<div className="overflow-x-auto border rounded-lg">
|
|
||||||
<table className="w-full text-left text-sm">
|
|
||||||
<thead className="bg-slate-50 border-b">
|
|
||||||
<tr>
|
|
||||||
<th className="px-4 py-3 font-semibold text-slate-900">
|
|
||||||
Feature
|
|
||||||
</th>
|
|
||||||
<th className="px-4 py-3 font-semibold text-slate-900">
|
|
||||||
Basic
|
|
||||||
</th>
|
|
||||||
<th className="px-4 py-3 font-semibold text-slate-900">
|
|
||||||
Premium
|
|
||||||
</th>
|
|
||||||
<th className="px-4 py-3 font-semibold text-slate-900">
|
|
||||||
VIP
|
|
||||||
</th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody className="divide-y">
|
|
||||||
<tr>
|
|
||||||
<td className="px-4 py-3 text-slate-700">
|
|
||||||
Recommendations per month
|
|
||||||
</td>
|
|
||||||
<td className="px-4 py-3 text-slate-700">
|
|
||||||
{MEMBERSHIP_FEATURES.basic.recommendationsPerMonth}
|
|
||||||
</td>
|
|
||||||
<td className="px-4 py-3 text-slate-700">
|
|
||||||
Unlimited
|
|
||||||
</td>
|
|
||||||
<td className="px-4 py-3 text-slate-700">
|
|
||||||
Unlimited
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td className="px-4 py-3 text-slate-700">
|
|
||||||
Nutrition tracking
|
|
||||||
</td>
|
|
||||||
<td className="px-4 py-3 text-slate-700">
|
|
||||||
{MEMBERSHIP_FEATURES.basic.nutritionTracking
|
|
||||||
? "Yes"
|
|
||||||
: "No"}
|
|
||||||
</td>
|
|
||||||
<td className="px-4 py-3 text-slate-700">
|
|
||||||
{MEMBERSHIP_FEATURES.premium.nutritionTracking
|
|
||||||
? "Yes"
|
|
||||||
: "No"}
|
|
||||||
</td>
|
|
||||||
<td className="px-4 py-3 text-slate-700">
|
|
||||||
{MEMBERSHIP_FEATURES.vip.nutritionTracking
|
|
||||||
? "Yes"
|
|
||||||
: "No"}
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td className="px-4 py-3 text-slate-700">
|
|
||||||
Hydration tracking
|
|
||||||
</td>
|
|
||||||
<td className="px-4 py-3 text-slate-700">
|
|
||||||
{MEMBERSHIP_FEATURES.basic.hydrationTracking
|
|
||||||
? "Yes"
|
|
||||||
: "No"}
|
|
||||||
</td>
|
|
||||||
<td className="px-4 py-3 text-slate-700">
|
|
||||||
{MEMBERSHIP_FEATURES.premium.hydrationTracking
|
|
||||||
? "Yes"
|
|
||||||
: "No"}
|
|
||||||
</td>
|
|
||||||
<td className="px-4 py-3 text-slate-700">
|
|
||||||
{MEMBERSHIP_FEATURES.vip.hydrationTracking
|
|
||||||
? "Yes"
|
|
||||||
: "No"}
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td className="px-4 py-3 text-slate-700">
|
|
||||||
Advanced statistics
|
|
||||||
</td>
|
|
||||||
<td className="px-4 py-3 text-slate-700">
|
|
||||||
{MEMBERSHIP_FEATURES.basic.advancedStatistics
|
|
||||||
? "Yes"
|
|
||||||
: "No"}
|
|
||||||
</td>
|
|
||||||
<td className="px-4 py-3 text-slate-700">
|
|
||||||
{MEMBERSHIP_FEATURES.premium.advancedStatistics
|
|
||||||
? "Yes"
|
|
||||||
: "No"}
|
|
||||||
</td>
|
|
||||||
<td className="px-4 py-3 text-slate-700">
|
|
||||||
{MEMBERSHIP_FEATURES.vip.advancedStatistics
|
|
||||||
? "Yes"
|
|
||||||
: "No"}
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
) : (
|
) : (
|
||||||
<div className="flex items-center justify-center h-64 bg-slate-50 rounded-lg">
|
<div className="flex items-center justify-center h-64 bg-slate-50 rounded-lg">
|
||||||
|
|||||||
@ -1,26 +0,0 @@
|
|||||||
import { getDatabase } from "@/lib/database";
|
|
||||||
import { getMembershipFeatures } from "./features";
|
|
||||||
|
|
||||||
export async function getUserMembershipContext(userId: string): Promise<{
|
|
||||||
membershipType: "basic" | "premium" | "vip";
|
|
||||||
features: ReturnType<typeof getMembershipFeatures>;
|
|
||||||
}> {
|
|
||||||
const db = await getDatabase();
|
|
||||||
const user = await db.getUserById(userId);
|
|
||||||
|
|
||||||
if (!user || user.role !== "client") {
|
|
||||||
const membershipType = "vip" as const;
|
|
||||||
return {
|
|
||||||
membershipType,
|
|
||||||
features: getMembershipFeatures(membershipType),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
const client = await db.getClientByUserId(userId);
|
|
||||||
const membershipType = client?.membershipType ?? "basic";
|
|
||||||
|
|
||||||
return {
|
|
||||||
membershipType,
|
|
||||||
features: getMembershipFeatures(membershipType),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -1,35 +0,0 @@
|
|||||||
import type { MembershipType } from "@/lib/validation/schemas";
|
|
||||||
|
|
||||||
export interface MembershipFeatures {
|
|
||||||
recommendationsPerMonth: number;
|
|
||||||
hydrationTracking: boolean;
|
|
||||||
nutritionTracking: boolean;
|
|
||||||
advancedStatistics: boolean;
|
|
||||||
}
|
|
||||||
|
|
||||||
export const MEMBERSHIP_FEATURES: Record<MembershipType, MembershipFeatures> = {
|
|
||||||
basic: {
|
|
||||||
recommendationsPerMonth: 1,
|
|
||||||
hydrationTracking: false,
|
|
||||||
nutritionTracking: false,
|
|
||||||
advancedStatistics: false,
|
|
||||||
},
|
|
||||||
premium: {
|
|
||||||
recommendationsPerMonth: -1,
|
|
||||||
hydrationTracking: true,
|
|
||||||
nutritionTracking: true,
|
|
||||||
advancedStatistics: true,
|
|
||||||
},
|
|
||||||
vip: {
|
|
||||||
recommendationsPerMonth: -1,
|
|
||||||
hydrationTracking: true,
|
|
||||||
nutritionTracking: true,
|
|
||||||
advancedStatistics: true,
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
export function getMembershipFeatures(
|
|
||||||
membershipType: MembershipType,
|
|
||||||
): MembershipFeatures {
|
|
||||||
return MEMBERSHIP_FEATURES[membershipType];
|
|
||||||
}
|
|
||||||
@ -14,5 +14,4 @@ export * from "./nutrition";
|
|||||||
export * from "./hydration";
|
export * from "./hydration";
|
||||||
export * from "./client";
|
export * from "./client";
|
||||||
export * from "./helpers";
|
export * from "./helpers";
|
||||||
export * from "./membership";
|
|
||||||
export * from "./gyms";
|
export * from "./gyms";
|
||||||
|
|||||||
@ -1,87 +0,0 @@
|
|||||||
import { apiClient, withAuth } from "./client";
|
|
||||||
import { API_ENDPOINTS } from "../config/api";
|
|
||||||
|
|
||||||
export type MembershipType = "basic" | "premium" | "vip";
|
|
||||||
|
|
||||||
export interface MembershipFeatures {
|
|
||||||
recommendationsPerMonth: number;
|
|
||||||
hydrationTracking: boolean;
|
|
||||||
nutritionTracking: boolean;
|
|
||||||
advancedStatistics: boolean;
|
|
||||||
}
|
|
||||||
|
|
||||||
const MEMBERSHIP_FEATURES: Record<MembershipType, MembershipFeatures> = {
|
|
||||||
basic: {
|
|
||||||
recommendationsPerMonth: 1,
|
|
||||||
hydrationTracking: false,
|
|
||||||
nutritionTracking: false,
|
|
||||||
advancedStatistics: false,
|
|
||||||
},
|
|
||||||
premium: {
|
|
||||||
recommendationsPerMonth: -1,
|
|
||||||
hydrationTracking: true,
|
|
||||||
nutritionTracking: true,
|
|
||||||
advancedStatistics: true,
|
|
||||||
},
|
|
||||||
vip: {
|
|
||||||
recommendationsPerMonth: -1,
|
|
||||||
hydrationTracking: true,
|
|
||||||
nutritionTracking: true,
|
|
||||||
advancedStatistics: true,
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
interface UsersListResponse {
|
|
||||||
success?: boolean;
|
|
||||||
data?: {
|
|
||||||
users?: Array<{
|
|
||||||
id: string;
|
|
||||||
role: string;
|
|
||||||
client?: {
|
|
||||||
membershipType?: MembershipType;
|
|
||||||
} | null;
|
|
||||||
}>;
|
|
||||||
};
|
|
||||||
users?: Array<{
|
|
||||||
id: string;
|
|
||||||
role: string;
|
|
||||||
client?: {
|
|
||||||
membershipType?: MembershipType;
|
|
||||||
} | null;
|
|
||||||
}>;
|
|
||||||
}
|
|
||||||
|
|
||||||
function isMembershipType(value: unknown): value is MembershipType {
|
|
||||||
return value === "basic" || value === "premium" || value === "vip";
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function getCurrentMembershipType(
|
|
||||||
userId: string,
|
|
||||||
token: string | null,
|
|
||||||
): Promise<MembershipType> {
|
|
||||||
if (!token || !userId) {
|
|
||||||
return "basic";
|
|
||||||
}
|
|
||||||
|
|
||||||
const response = await apiClient.get<UsersListResponse>(
|
|
||||||
API_ENDPOINTS.USERS.LIST,
|
|
||||||
withAuth(token),
|
|
||||||
);
|
|
||||||
|
|
||||||
const payload = response.data;
|
|
||||||
const users = payload.data?.users ?? payload.users ?? [];
|
|
||||||
const currentUser = users.find((user) => user.id === userId);
|
|
||||||
|
|
||||||
if (!currentUser || currentUser.role !== "client") {
|
|
||||||
return "vip";
|
|
||||||
}
|
|
||||||
|
|
||||||
const membershipType = currentUser.client?.membershipType;
|
|
||||||
return isMembershipType(membershipType) ? membershipType : "basic";
|
|
||||||
}
|
|
||||||
|
|
||||||
export function getMembershipFeatures(
|
|
||||||
membershipType: MembershipType,
|
|
||||||
): MembershipFeatures {
|
|
||||||
return MEMBERSHIP_FEATURES[membershipType];
|
|
||||||
}
|
|
||||||
@ -7,7 +7,6 @@ import {
|
|||||||
Image,
|
Image,
|
||||||
Animated,
|
Animated,
|
||||||
TouchableOpacity,
|
TouchableOpacity,
|
||||||
Alert,
|
|
||||||
} from "react-native";
|
} from "react-native";
|
||||||
import { useUser } from "@clerk/clerk-expo";
|
import { useUser } from "@clerk/clerk-expo";
|
||||||
import { useState, useCallback, useEffect, useRef, useMemo } from "react";
|
import { useState, useCallback, useEffect, useRef, useMemo } from "react";
|
||||||
@ -25,7 +24,6 @@ import { TrackMealModal } from "../../components/TrackMealModal";
|
|||||||
import { AddWaterModal } from "../../components/AddWaterModal";
|
import { AddWaterModal } from "../../components/AddWaterModal";
|
||||||
import { ScanFoodModal } from "../../components/ScanFoodModal";
|
import { ScanFoodModal } from "../../components/ScanFoodModal";
|
||||||
import { ActivityRing } from "../../components/ActivityRing";
|
import { ActivityRing } from "../../components/ActivityRing";
|
||||||
import { useMembership } from "../../hooks/useMembership";
|
|
||||||
import {
|
import {
|
||||||
checkInsToActivities,
|
checkInsToActivities,
|
||||||
completedGoalsToActivities,
|
completedGoalsToActivities,
|
||||||
@ -46,7 +44,6 @@ const WORKOUT_GOAL = 3;
|
|||||||
export default function HomeScreen() {
|
export default function HomeScreen() {
|
||||||
const { user } = useUser();
|
const { user } = useUser();
|
||||||
const { colors, typography } = useTheme();
|
const { colors, typography } = useTheme();
|
||||||
const { features, membershipType } = useMembership();
|
|
||||||
const { refetchStatistics, forceRefresh, statistics, loading } =
|
const { refetchStatistics, forceRefresh, statistics, loading } =
|
||||||
useStatistics();
|
useStatistics();
|
||||||
const { goals, refetchGoals } = useFitnessGoals();
|
const { goals, refetchGoals } = useFitnessGoals();
|
||||||
@ -389,16 +386,7 @@ export default function HomeScreen() {
|
|||||||
</TouchableOpacity>
|
</TouchableOpacity>
|
||||||
|
|
||||||
<TouchableOpacity
|
<TouchableOpacity
|
||||||
onPress={() => {
|
onPress={() => setTrackMealModalVisible(true)}
|
||||||
if (!features.nutritionTracking) {
|
|
||||||
Alert.alert(
|
|
||||||
"Premium Feature",
|
|
||||||
"Meal tracking is available on Premium and VIP plans.",
|
|
||||||
);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
setTrackMealModalVisible(true);
|
|
||||||
}}
|
|
||||||
activeOpacity={0.85}
|
activeOpacity={0.85}
|
||||||
style={[
|
style={[
|
||||||
styles.quickActionCard,
|
styles.quickActionCard,
|
||||||
@ -429,16 +417,7 @@ export default function HomeScreen() {
|
|||||||
</TouchableOpacity>
|
</TouchableOpacity>
|
||||||
|
|
||||||
<TouchableOpacity
|
<TouchableOpacity
|
||||||
onPress={() => {
|
onPress={() => setAddWaterModalVisible(true)}
|
||||||
if (!features.hydrationTracking) {
|
|
||||||
Alert.alert(
|
|
||||||
"Premium Feature",
|
|
||||||
"Hydration tracking is available on Premium and VIP plans.",
|
|
||||||
);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
setAddWaterModalVisible(true);
|
|
||||||
}}
|
|
||||||
activeOpacity={0.85}
|
activeOpacity={0.85}
|
||||||
style={[styles.quickActionCard, { backgroundColor: colors.info }]}
|
style={[styles.quickActionCard, { backgroundColor: colors.info }]}
|
||||||
>
|
>
|
||||||
@ -500,23 +479,6 @@ export default function HomeScreen() {
|
|||||||
|
|
||||||
{/* Today's Progress */}
|
{/* Today's Progress */}
|
||||||
<View style={styles.section}>
|
<View style={styles.section}>
|
||||||
{!features.nutritionTracking || !features.hydrationTracking ? (
|
|
||||||
<MinimalCard
|
|
||||||
variant="bordered"
|
|
||||||
style={[styles.progressCard, { marginBottom: 12 }]}
|
|
||||||
>
|
|
||||||
<Text
|
|
||||||
style={[
|
|
||||||
typography.body,
|
|
||||||
{ color: colors.textSecondary, textAlign: "center" },
|
|
||||||
]}
|
|
||||||
>
|
|
||||||
{membershipType === "basic"
|
|
||||||
? "Upgrade to Premium or VIP to unlock nutrition and hydration tracking."
|
|
||||||
: "Some advanced tracking features are unavailable on your plan."}
|
|
||||||
</Text>
|
|
||||||
</MinimalCard>
|
|
||||||
) : null}
|
|
||||||
<SectionHeader
|
<SectionHeader
|
||||||
title="Today's Progress"
|
title="Today's Progress"
|
||||||
subtitle="Track your daily goals"
|
subtitle="Track your daily goals"
|
||||||
|
|||||||
@ -20,7 +20,6 @@ import { Badge } from "../../components/Badge";
|
|||||||
import { IconContainer } from "../../components/IconContainer";
|
import { IconContainer } from "../../components/IconContainer";
|
||||||
import { fitnessProfileApi, FitnessProfile } from "../../api/fitnessProfile";
|
import { fitnessProfileApi, FitnessProfile } from "../../api/fitnessProfile";
|
||||||
import { gymsApi, type Gym } from "../../api/gyms";
|
import { gymsApi, type Gym } from "../../api/gyms";
|
||||||
import { useMembership } from "../../hooks/useMembership";
|
|
||||||
import log from "../../utils/logger";
|
import log from "../../utils/logger";
|
||||||
|
|
||||||
export default function ProfileScreen() {
|
export default function ProfileScreen() {
|
||||||
@ -29,7 +28,6 @@ export default function ProfileScreen() {
|
|||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const { colors, typography, theme: activeTheme, setTheme } = useTheme();
|
const { colors, typography, theme: activeTheme, setTheme } = useTheme();
|
||||||
const { getToken } = useAuth();
|
const { getToken } = useAuth();
|
||||||
const { membershipType } = useMembership();
|
|
||||||
|
|
||||||
const [gyms, setGyms] = useState<Gym[]>([]);
|
const [gyms, setGyms] = useState<Gym[]>([]);
|
||||||
const [gymsLoading, setGymsLoading] = useState(false);
|
const [gymsLoading, setGymsLoading] = useState(false);
|
||||||
@ -205,8 +203,8 @@ export default function ProfileScreen() {
|
|||||||
{user?.primaryEmailAddress?.emailAddress}
|
{user?.primaryEmailAddress?.emailAddress}
|
||||||
</Text>
|
</Text>
|
||||||
<Badge
|
<Badge
|
||||||
label={`${membershipType.toUpperCase()} Member`}
|
label="Premium Member"
|
||||||
variant={membershipType === "basic" ? "neutral" : "success"}
|
variant="success"
|
||||||
style={{ marginTop: 12 }}
|
style={{ marginTop: 12 }}
|
||||||
/>
|
/>
|
||||||
</MinimalCard>
|
</MinimalCard>
|
||||||
|
|||||||
@ -21,7 +21,6 @@ import { IconContainer } from "../../components/IconContainer";
|
|||||||
import { useRecommendations } from "../../contexts/RecommendationsContext";
|
import { useRecommendations } from "../../contexts/RecommendationsContext";
|
||||||
import { useNotifications } from "../../contexts/NotificationsContext";
|
import { useNotifications } from "../../contexts/NotificationsContext";
|
||||||
import { NotificationsModal } from "../../components/NotificationsModal";
|
import { NotificationsModal } from "../../components/NotificationsModal";
|
||||||
import { useMembership } from "../../hooks/useMembership";
|
|
||||||
import type { Recommendation } from "../../api/recommendations";
|
import type { Recommendation } from "../../api/recommendations";
|
||||||
import log from "../../utils/logger";
|
import log from "../../utils/logger";
|
||||||
|
|
||||||
@ -34,7 +33,6 @@ export default function RecommendationsScreen() {
|
|||||||
refetchRecommendations,
|
refetchRecommendations,
|
||||||
generateNewRecommendation,
|
generateNewRecommendation,
|
||||||
} = useRecommendations();
|
} = useRecommendations();
|
||||||
const { membershipType, features } = useMembership();
|
|
||||||
const { unreadCount, refetchNotifications } = useNotifications();
|
const { unreadCount, refetchNotifications } = useNotifications();
|
||||||
const [generating, setGenerating] = useState(false);
|
const [generating, setGenerating] = useState(false);
|
||||||
const [refreshing, setRefreshing] = useState(false);
|
const [refreshing, setRefreshing] = useState(false);
|
||||||
@ -71,17 +69,6 @@ export default function RecommendationsScreen() {
|
|||||||
const handleGenerateRecommendation = async () => {
|
const handleGenerateRecommendation = async () => {
|
||||||
if (!user?.id) return;
|
if (!user?.id) return;
|
||||||
|
|
||||||
if (
|
|
||||||
features.recommendationsPerMonth === 1 &&
|
|
||||||
allRecommendations.length >= 1
|
|
||||||
) {
|
|
||||||
Alert.alert(
|
|
||||||
"Basic Plan Limit",
|
|
||||||
"Basic plan includes 1 recommendation per month. Upgrade to Premium or VIP for unlimited recommendations.",
|
|
||||||
);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
Alert.alert(
|
Alert.alert(
|
||||||
"Generate AI Recommendation",
|
"Generate AI Recommendation",
|
||||||
"Generate a personalized fitness and nutrition plan based on your profile and goals?",
|
"Generate a personalized fitness and nutrition plan based on your profile and goals?",
|
||||||
@ -193,11 +180,7 @@ export default function RecommendationsScreen() {
|
|||||||
{/* Generate Button */}
|
{/* Generate Button */}
|
||||||
<View style={styles.section}>
|
<View style={styles.section}>
|
||||||
<MinimalButton
|
<MinimalButton
|
||||||
title={
|
title="Generate New Plan"
|
||||||
features.recommendationsPerMonth === 1
|
|
||||||
? "Generate Monthly Plan"
|
|
||||||
: "Generate New Plan"
|
|
||||||
}
|
|
||||||
onPress={handleGenerateRecommendation}
|
onPress={handleGenerateRecommendation}
|
||||||
variant="primary"
|
variant="primary"
|
||||||
size="lg"
|
size="lg"
|
||||||
@ -206,20 +189,6 @@ export default function RecommendationsScreen() {
|
|||||||
disabled={generating}
|
disabled={generating}
|
||||||
textStyle={{ fontSize: 16 }}
|
textStyle={{ fontSize: 16 }}
|
||||||
/>
|
/>
|
||||||
<Text
|
|
||||||
style={[
|
|
||||||
typography.caption,
|
|
||||||
{
|
|
||||||
color: colors.textTertiary,
|
|
||||||
marginTop: 8,
|
|
||||||
textAlign: "center",
|
|
||||||
},
|
|
||||||
]}
|
|
||||||
>
|
|
||||||
{membershipType === "basic"
|
|
||||||
? `Basic plan: ${Math.max(0, 1 - allRecommendations.length)} recommendation left this month`
|
|
||||||
: `${membershipType.toUpperCase()} plan: unlimited recommendations`}
|
|
||||||
</Text>
|
|
||||||
</View>
|
</View>
|
||||||
|
|
||||||
{/* Recommendations List */}
|
{/* Recommendations List */}
|
||||||
|
|||||||
@ -1,68 +0,0 @@
|
|||||||
import { useAuth, useUser } from "@clerk/clerk-expo";
|
|
||||||
import { useEffect, useState } from "react";
|
|
||||||
import {
|
|
||||||
getCurrentMembershipType,
|
|
||||||
getMembershipFeatures,
|
|
||||||
type MembershipFeatures,
|
|
||||||
type MembershipType,
|
|
||||||
} from "../api/membership";
|
|
||||||
import log from "../utils/logger";
|
|
||||||
|
|
||||||
const BASIC_FEATURES = getMembershipFeatures("basic");
|
|
||||||
|
|
||||||
interface UseMembershipResult {
|
|
||||||
membershipType: MembershipType;
|
|
||||||
features: MembershipFeatures;
|
|
||||||
loading: boolean;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function useMembership(): UseMembershipResult {
|
|
||||||
const { user } = useUser();
|
|
||||||
const { getToken, isSignedIn } = useAuth();
|
|
||||||
const [membershipType, setMembershipType] = useState<MembershipType>("basic");
|
|
||||||
const [loading, setLoading] = useState(true);
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
let isMounted = true;
|
|
||||||
|
|
||||||
const loadMembership = async () => {
|
|
||||||
if (!isSignedIn || !user?.id) {
|
|
||||||
if (isMounted) {
|
|
||||||
setMembershipType("basic");
|
|
||||||
setLoading(false);
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
setLoading(true);
|
|
||||||
const token = await getToken();
|
|
||||||
const type = await getCurrentMembershipType(user.id, token);
|
|
||||||
if (isMounted) {
|
|
||||||
setMembershipType(type);
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
log.error("Failed to load membership", error, { userId: user.id });
|
|
||||||
if (isMounted) {
|
|
||||||
setMembershipType("basic");
|
|
||||||
}
|
|
||||||
} finally {
|
|
||||||
if (isMounted) {
|
|
||||||
setLoading(false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
loadMembership();
|
|
||||||
|
|
||||||
return () => {
|
|
||||||
isMounted = false;
|
|
||||||
};
|
|
||||||
}, [isSignedIn, user?.id, getToken]);
|
|
||||||
|
|
||||||
return {
|
|
||||||
membershipType,
|
|
||||||
features: getMembershipFeatures(membershipType) || BASIC_FEATURES,
|
|
||||||
loading,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -18,35 +18,6 @@ export type GymStatus = (typeof GYM_STATUSES)[number];
|
|||||||
export const MEMBERSHIP_TYPES = ["basic", "premium", "vip"] as const;
|
export const MEMBERSHIP_TYPES = ["basic", "premium", "vip"] as const;
|
||||||
export type MembershipType = (typeof MEMBERSHIP_TYPES)[number];
|
export type MembershipType = (typeof MEMBERSHIP_TYPES)[number];
|
||||||
|
|
||||||
export const MEMBERSHIP_FEATURES = {
|
|
||||||
basic: {
|
|
||||||
recommendationsPerMonth: 1,
|
|
||||||
hydrationTracking: false,
|
|
||||||
nutritionTracking: false,
|
|
||||||
advancedStatistics: false,
|
|
||||||
},
|
|
||||||
premium: {
|
|
||||||
recommendationsPerMonth: -1,
|
|
||||||
hydrationTracking: true,
|
|
||||||
nutritionTracking: true,
|
|
||||||
advancedStatistics: true,
|
|
||||||
},
|
|
||||||
vip: {
|
|
||||||
recommendationsPerMonth: -1,
|
|
||||||
hydrationTracking: true,
|
|
||||||
nutritionTracking: true,
|
|
||||||
advancedStatistics: true,
|
|
||||||
},
|
|
||||||
} as const;
|
|
||||||
|
|
||||||
export type MembershipFeatures = (typeof MEMBERSHIP_FEATURES)[MembershipType];
|
|
||||||
|
|
||||||
export function getMembershipFeatures(
|
|
||||||
membershipType: MembershipType,
|
|
||||||
): MembershipFeatures {
|
|
||||||
return MEMBERSHIP_FEATURES[membershipType];
|
|
||||||
}
|
|
||||||
|
|
||||||
// Membership Statuses
|
// Membership Statuses
|
||||||
export const MEMBERSHIP_STATUSES = ["active", "inactive", "suspended"] as const;
|
export const MEMBERSHIP_STATUSES = ["active", "inactive", "suspended"] as const;
|
||||||
export type MembershipStatus = (typeof MEMBERSHIP_STATUSES)[number];
|
export type MembershipStatus = (typeof MEMBERSHIP_STATUSES)[number];
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user