highperfocused/open-saas
1
0
Fork 0
mirror of https://github.com/wasp-lang/open-saas.git synced 2025-11-24 19:26:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

update app diff

Browse Source
This commit is contained in:
vincanger
2025-02-14 14:55:46 +01:00
parent 9536481a82
commit fe4381917e
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
opensaas-sh/app_diff/main.wasp.diff
View File

@@ -104,7 +104,7 @@
}, },
}, },
} }
@@ -212,9 +208,9 @@ @@ -207,9 +203,9 @@
} }
api paymentsWebhook { api paymentsWebhook {

4
opensaas-sh/app_diff/schema.prisma.diff
View File

@@ -1,9 +1,9 @@
--- template/app/schema.prisma --- template/app/schema.prisma
+++ opensaas-sh/app/schema.prisma +++ opensaas-sh/app/schema.prisma
@@ -14,10 +14,12 @@ @@ -13,10 +13,12 @@
email String? @unique email String? @unique
username String? @unique username String? @unique
lastActiveTimestamp DateTime @default(now())
- isAdmin Boolean @default(false) - isAdmin Boolean @default(false)
+ isAdmin Boolean @default(true) + isAdmin Boolean @default(true)
+ // isMockUser is an extra property for the demo app ensuring that all users can access + // isMockUser is an extra property for the demo app ensuring that all users can access

2
opensaas-sh/app_diff/src/admin/dashboards/users/UsersTable.tsx.diff
View File

@@ -8,7 +8,7 @@
const [isAdminFilter, setIsAdminFilter] = useState<boolean | undefined>(undefined); const [isAdminFilter, setIsAdminFilter] = useState<boolean | undefined>(undefined);
const [statusOptions, setStatusOptions] = useState<SubscriptionStatus[]>([]); const [statusOptions, setStatusOptions] = useState<SubscriptionStatus[]>([]);
const { data, isLoading, error } = useQuery(getPaginatedUsers, { const { data, isLoading, error } = useQuery(getPaginatedUsers, {
@@ -222,7 +223,7 @@ @@ -211,7 +212,7 @@
<p className='text-sm text-black dark:text-white'>{user.subscriptionStatus}</p> <p className='text-sm text-black dark:text-white'>{user.subscriptionStatus}</p>
</div> </div>
<div className='col-span-2 flex items-center'> <div className='col-span-2 flex items-center'>

4
opensaas-sh/app_diff/src/server/scripts/dbSeeds.ts.diff
View File

@@ -1,13 +1,13 @@
--- template/app/src/server/scripts/dbSeeds.ts --- template/app/src/server/scripts/dbSeeds.ts
+++ opensaas-sh/app/src/server/scripts/dbSeeds.ts +++ opensaas-sh/app/src/server/scripts/dbSeeds.ts
@@ -38,9 +38,11 @@ @@ -37,9 +37,11 @@
sendNewsletter: false, sendNewsletter: false,
credits, credits,
subscriptionStatus, subscriptionStatus,
- lemonSqueezyCustomerPortalUrl: null, - lemonSqueezyCustomerPortalUrl: null,
- paymentProcessorUserId: hasUserPaidOnStripe ? `cus_test_${faker.string.uuid()}` : null, - paymentProcessorUserId: hasUserPaidOnStripe ? `cus_test_${faker.string.uuid()}` : null,
+ stripeId: hasUserPaidOnStripe ? `cus_test_${faker.string.uuid()}` : null, + stripeId: hasUserPaidOnStripe ? `cus_test_${faker.string.uuid()}` : null,
datePaid: hasUserPaidOnStripe ? faker.date.between({ from: createdAt, to: lastActiveTimestamp }) : null, datePaid: hasUserPaidOnStripe ? faker.date.between({ from: createdAt, to: timePaid }) : null,
subscriptionPlan: subscriptionStatus ? faker.helpers.arrayElement(getSubscriptionPaymentPlanIds()) : null, subscriptionPlan: subscriptionStatus ? faker.helpers.arrayElement(getSubscriptionPaymentPlanIds()) : null,
+ // For the demo app, we want to default isMockUser to true so that our admin dash only shows mock users + // For the demo app, we want to default isMockUser to true so that our admin dash only shows mock users
+ // and not real users signing up to test the app + // and not real users signing up to test the app

16
opensaas-sh/app_diff/src/user/operations.ts.diff
View File

@@ -1,18 +1,18 @@
--- template/app/src/user/operations.ts --- template/app/src/user/operations.ts
+++ opensaas-sh/app/src/user/operations.ts +++ opensaas-sh/app/src/user/operations.ts
@@ -52,7 +52,10 @@ @@ -38,7 +38,10 @@
subscriptionStatus?: SubscriptionStatus[]; subscriptionStatus?: SubscriptionStatus[];
}; };
type GetPaginatedUsersOutput = { type GetPaginatedUsersOutput = {
- users: Pick<User, 'id' | 'email' | 'username' | 'lastActiveTimestamp' | 'subscriptionStatus' | 'paymentProcessorUserId'>[]; - users: Pick<User, 'id' | 'email' | 'username' | 'subscriptionStatus' | 'paymentProcessorUserId'>[];
+ users: Pick< + users: Pick<
+ User, + User,
+ 'id' | 'email' | 'username' | 'lastActiveTimestamp' | 'subscriptionStatus' | 'stripeId' + 'id' | 'email' | 'username' | 'subscriptionStatus' | 'stripeId'
+ >[]; + >[];
totalPages: number; totalPages: number;
}; };
@@ -65,8 +68,10 @@ @@ -51,8 +54,10 @@
} }
const allSubscriptionStatusOptions = args.subscriptionStatus as Array<string | null> | undefined; const allSubscriptionStatusOptions = args.subscriptionStatus as Array<string | null> | undefined;
@@ -25,7 +25,7 @@
const queryResults = await context.entities.User.findMany({ const queryResults = await context.entities.User.findMany({
skip: args.skip, skip: args.skip,
@@ -79,6 +84,7 @@ @@ -65,6 +70,7 @@
mode: 'insensitive', mode: 'insensitive',
}, },
isAdmin: args.isAdmin, isAdmin: args.isAdmin,
@@ -33,16 +33,16 @@
}, },
{ {
OR: [ OR: [
@@ -103,7 +109,7 @@ @@ -88,7 +94,7 @@
username: true,
isAdmin: true, isAdmin: true,
lastActiveTimestamp: true,
subscriptionStatus: true, subscriptionStatus: true,
- paymentProcessorUserId: true, - paymentProcessorUserId: true,
+ stripeId: true, + stripeId: true,
}, },
orderBy: { orderBy: {
id: 'desc', id: 'desc',
@@ -119,6 +125,7 @@ @@ -104,6 +110,7 @@
mode: 'insensitive', mode: 'insensitive',
}, },
isAdmin: args.isAdmin, isAdmin: args.isAdmin,