Skip to content

Commit 47ef6c2

Browse files
committed
Merge branch 'main' into production-template-testing
2 parents 0363f98 + 02d0c90 commit 47ef6c2

File tree

36 files changed

+2600
-1358
lines changed

36 files changed

+2600
-1358
lines changed

README.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
## Welcome to your new SaaS App! 🎉
22

3-
<a href="https://www.producthunt.com/products/open-saas?embed=true&utm_source=badge-featured&utm_medium=badge&utm_source=badge-open&#0045;saas&#0045;2" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=991058&theme=neutral&t=1753776395137" alt="Open&#0032;SaaS - The&#0032;open&#0045;source&#0032;SaaS&#0032;boilerplate&#0032;with&#0032;superpowers&#0033; | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
3+
<div style="display: flex; gap: 16px; align-items: center;">
4+
<a href="https://www.producthunt.com/products/open-saas?embed=true&utm_source=badge-top-post-topic-badge&utm_medium=badge&utm_source=badge-open&#0045;saas&#0045;2&#0045;0" target="_blank">
5+
<img src="https://api.producthunt.com/widgets/embed-image/v1/top-post-topic-badge.svg?post_id=1023519&theme=neutral&period=weekly&topic_id=237&t=1760520428563" alt="Open&#0032;SaaS&#0032;2&#0046;0 - Free&#0044;&#0032;open&#0045;source&#0032;SaaS&#0032;starter&#0032;kit&#0032;with&#0032;superpowers | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" />
6+
</a>
7+
<a href="https://www.producthunt.com/products/open-saas?embed=true&utm_source=badge-top-post-badge&utm_medium=badge&utm_source=badge-open&#0045;saas&#0045;2&#0045;0" target="_blank">
8+
<img src="https://api.producthunt.com/widgets/embed-image/v1/top-post-badge.svg?post_id=1023519&theme=neutral&period=daily&t=1760520428563" alt="Open&#0032;SaaS&#0032;2&#0046;0 - Free&#0044;&#0032;open&#0045;source&#0032;SaaS&#0032;starter&#0032;kit&#0032;with&#0032;superpowers | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" />
9+
</a>
10+
</div>
411

512
https://github.com/user-attachments/assets/3856276b-23e9-455e-a564-b5f26f4f0e98
613

opensaas-sh/app_diff/README.md.diff

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
--- template/app/README.md
22
+++ opensaas-sh/app/README.md
3-
@@ -1,6 +1,8 @@
3+
@@ -1,16 +1,31 @@
44
-# <YOUR_APP_NAME>
55
+# opensaas.sh (demo) app
66

77
-Built with [Wasp](https://wasp.sh), based on the [Open Saas](https://opensaas.sh) template.
88
+This is a Wasp app based on Open Saas template with minimal modifications that make it into a demo app that showcases Open Saas's abilities.
9-
+
10-
+It is deployed to https://opensaas.sh and serves both as a landing page for Open Saas and as a demo app.
119

10+
+It is deployed to https://opensaas.sh and serves both as a landing page for Open Saas and as a demo app.
11+
+
1212
## UI Components
1313

14-
@@ -8,9 +10,22 @@
14+
This template includes [ShadCN UI](https://ui.shadcn.com/) v2 for beautiful, accessible React components. See [SHADCN_SETUP.md](./SHADCN_SETUP.md) for details on how to use ShadCN components in your app.
1515

1616
## Development
1717

opensaas-sh/app_diff/deletions

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
src/client/static/open-saas-banner-dark.svg
22
src/client/static/open-saas-banner-light.svg
33
src/landing-page/components/Hero.tsx
4-
src/landing-page/contentSections.ts
54
src/payment/lemonSqueezy/checkoutUtils.ts
65
src/payment/lemonSqueezy/paymentDetails.ts
76
src/payment/lemonSqueezy/paymentProcessor.ts

opensaas-sh/app_diff/main.wasp.diff

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,25 @@
119119
httpRoute: (POST, "/payments-webhook")
120120
}
121121
//#endregion
122-
@@ -281,7 +279,6 @@
122+
@@ -245,6 +243,17 @@
123+
fn: import { deleteFile } from "@src/file-upload/operations",
124+
entities: [User, File]
125+
}
126+
+
127+
+job deleteFilesJob {
128+
+ executor: PgBoss,
129+
+ perform: {
130+
+ fn: import { deleteFilesJob } from "@src/file-upload/workers"
131+
+ },
132+
+ schedule: {
133+
+ cron: "0 5 * * *" // every day at 5am
134+
+ },
135+
+ entities: [File]
136+
+}
137+
//#endregion
138+
139+
//#region Analytics
140+
@@ -291,7 +300,6 @@
123141
component: import AdminCalendar from "@src/admin/elements/calendar/CalendarPage"
124142
}
125143

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- template/app/migrations/20250731133938_drop_upload_url_from_file/migration.sql
2+
+++ opensaas-sh/app/migrations/20250731133938_drop_upload_url_from_file/migration.sql
3+
@@ -0,0 +1,8 @@
4+
+/*
5+
+ Warnings:
6+
+
7+
+ - You are about to drop the column `uploadUrl` on the `File` table. All the data in the column will be lost.
8+
+
9+
+*/
10+
+-- AlterTable
11+
+ALTER TABLE "File" DROP COLUMN "uploadUrl";
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
--- template/app/migrations/20250806121259_add_s3_key_file/migration.sql
2+
+++ opensaas-sh/app/migrations/20250806121259_add_s3_key_file/migration.sql
3+
@@ -0,0 +1,11 @@
4+
+/*
5+
+ Warnings:
6+
+
7+
+ - You are about to drop the column `key` on the `File` table. All the data in the column will be lost.
8+
+ - Added the required column `s3Key` to the `File` table without a default value. This is not possible if the table is not empty.
9+
+
10+
+*/
11+
+-- AlterTable
12+
+DELETE FROM "File";
13+
+ALTER TABLE "File" DROP COLUMN "key",
14+
+ADD COLUMN "s3Key" TEXT NOT NULL;

0 commit comments

Comments
 (0)