Merge branch 'main' into filip-tscofnig-rework

Author: sodic

.github/workflows/blog-deployment.yml

@@ -17,50 +17,58 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event_name == 'pull_request'
     steps:
-    - name: Checkout code
-      uses: actions/checkout@v3
+      - name: Checkout code
+        uses: actions/checkout@v3
 
-    - name: Setup Node.js
-      uses: actions/setup-node@v3
-      with:
-        node-version: '18'
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 'lts/*'
 
-    - name: Install dependencies
-      working-directory: ./opensaas-sh/blog
-      run: npm install
+      - name: Install dependencies
+        working-directory: ./opensaas-sh/blog
+        run: npm install
 
-    - name: Build site
-      working-directory: ./opensaas-sh/blog
-      run: npm run build
+      - name: Generate LLM files
+        working-directory: ./opensaas-sh/blog
+        run: npm run generate-llm-files
+
+      - name: Build site
+        working-directory: ./opensaas-sh/blog
+        run: npm run build
 
   deploy:
     runs-on: ubuntu-latest
     if: github.event_name == 'push' && github.ref == 'refs/heads/main'
     steps:
-    - name: Checkout code
-      uses: actions/checkout@v3
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 'lts/*'
 
-    - name: Setup Node.js
-      uses: actions/setup-node@v3
-      with:
-        node-version: '18'
+      - name: Install dependencies
+        working-directory: ./opensaas-sh/blog
+        run: npm install
 
-    - name: Install dependencies
-      working-directory: ./opensaas-sh/blog
-      run: npm install
+      - name: Generate LLM files
+        working-directory: ./opensaas-sh/blog
+        run: npm run generate-llm-files
 
-    - name: Build site
-      working-directory: ./opensaas-sh/blog
-      run: npm run build
+      - name: Build site
+        working-directory: ./opensaas-sh/blog
+        run: npm run build
 
-    - name: Deploy to Netlify
-      uses: nwtgck/actions-netlify@v2
-      with:
-        publish-dir: './opensaas-sh/blog/dist'
-        production-branch: main
-        github-token: ${{ secrets.GITHUB_TOKEN }}
-        deploy-message: "Deploy from GitHub Actions"
-      env:
-        NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
-        NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
-      timeout-minutes: 1
+      - name: Deploy to Netlify
+        uses: nwtgck/actions-netlify@v2
+        with:
+          publish-dir: './opensaas-sh/blog/dist'
+          production-branch: main
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          deploy-message: 'Deploy from GitHub Actions'
+        env:
+          NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
+          NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
+        timeout-minutes: 1

.github/workflows/e2e-tests.yml

@@ -10,7 +10,7 @@ on:
 
 env:
   WASP_TELEMETRY_DISABLE: 1
-  WASP_VERSION: 0.16.3
+  WASP_VERSION: 0.17.0
 
 jobs:
   test:
@@ -24,7 +24,7 @@ jobs:
         id: setup-node
         uses: actions/setup-node@v4
         with:
-          node-version: '20'
+          node-version: '22'
 
       - name: Docker setup
         uses: docker/setup-buildx-action@v3

README.md

@@ -1,7 +1,7 @@
 ## Welcome to your new SaaS App! 🎉
-<a href="https://www.producthunt.com/posts/open-saas?utm_source=badge-featured&utm_medium=badge&utm_souce=badge-open&#0045;saas" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=436467&theme=light" alt="Open&#0032;SaaS - Open&#0045;source&#0032;&#0038;&#0032;100&#0037;&#0032;free&#0032;React&#0032;&#0038;&#0032;Node&#0046;js&#0032;SaaS&#0032;starter&#0033; | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
+<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>
 
-https://github.com/wasp-lang/open-saas/assets/70215737/5ff289b1-12b9-4b46-aa90-a6a3122de93e
+https://github.com/user-attachments/assets/3856276b-23e9-455e-a564-b5f26f4f0e98
 
 You've decided to build a SaaS app with the Open SaaS template. Great choice! 
 
@@ -21,21 +21,21 @@ The template itself is built on top of some very powerful tools and frameworks,
 
 - 🐝 [Wasp](https://wasp.sh) - a full-stack React, NodeJS, Prisma framework with superpowers
 - 🚀 [Astro](https://starlight.astro.build/) - Astro's lightweight "Starlight" template for documentation and blog
-- 💸 [Stripe](https://stripe.com) or [Lemon Squeezy](https://lemonsqueezy.com/) - for products and payments
+- 💸 [Stripe](https://stripe.com) or [Lemon Squeezy](https://lemonsqueezy.com/) (with Polar.sh and Paddle coming soon!) - for products and payments
+- 💅 [ShadCN UI](https://tailwindcss.com) - for components & styling (plus admin dashboard!)
+- 🤖 [AI-Ready](https://docs.opensaas.sh/) - full set of Cursor rules & llms-full.txt for ai-assisted coding
 - 📈 [Plausible](https://plausible.io) or [Google](https://analytics.google.com/) Analytics
 - 🤖 [OpenAI](https://openai.com) - OpenAI API w/ function calling example
 - 📦 [AWS S3](https://aws.amazon.com/s3/) - for file uploads
 - 📧 [SendGrid](https://sendgrid.com), [MailGun](https://mailgun.com), or SMTP - for email sending
-- 💅 [TailwindCSS](https://tailwindcss.com) - for styling
-- 🧑‍💼 [TailAdmin](https://tailadmin.com/) - admin dashboard & components for TailwindCSS
 - 🧪 [Playwright](https://playwright.dev) - end-to-end tests with Playwright
 
 Because we're using Wasp as the full-stack framework, we can leverage a lot of its features to build our SaaS in record time, including:
 
 - 🔐 [Full-stack Authentication](https://wasp.sh/docs/auth/overview) - Email verified + social Auth in a few lines of code.
 - ⛑ [End-to-end Type Safety](https://wasp.sh/docs/data-model/operations/overview) - Type your backend functions and get inferred types on the front-end automatically, without the need to install or configure any third-party libraries. Oh, and type-safe Links, too!
 - 🤖 [Jobs](https://wasp.sh/docs/advanced/jobs) - Run cron jobs in the background or set up queues simply by defining a function in the config file.
-- 🚀 [One-command Deploy](https://wasp.sh/docs/advanced/deployment/overview) - Easily deploy via the CLI to [Fly.io](https://fly.io), or to other providers like [Railway](https://railway.app) and [Netlify](https://netlify.com).
+- 🚀 [One-command Deploy](https://wasp.sh/docs/advanced/deployment/overview) - Easily deploy your DB, Server, & Client with one commaned to [Railway](https://railway.app) or [Fly.io](https://fly.io) via the CLI. Or deploy manually to any other hosting serivce of your choice.
 
 You also get access to Wasp's diverse, helpful community if you get stuck or need help.
 - 🤝 [Wasp Discord](https://discord.gg/aCamt5wCpS)

opensaas-sh/.gitignore

@@ -0,0 +1,3 @@
+# We can't ignore `app/` because it messes up our patch/diff procedure (check
+# the README for more info on this)
+# app/

opensaas-sh/README.md

@@ -26,16 +26,10 @@ If you're running the `patch.sh` or `diff.sh` scripts on Mac, you need to instal
 - `gpatch`,
 - and `diffutils`.
 
-You should also create aliases for `realpath` and `patch`:
-
 ```sh
 brew install coreutils # contains grealpath
 brew install gpatch
 brew install diffutils
-
-echo 'alias realpath="grealpath"' >> ~/.zshrc
-echo 'alias patch="gpatch"' >> ~/.zshrc
-source ~/.zshrc
 ```
 
 Make sure not to commit `app/` to git. It is currently (until we resolve this) not added to .gitignore because that messes up diffing for us.

opensaas-sh/app_diff/README.md.diff

@@ -1,6 +1,6 @@
 --- template/app/README.md
 +++ opensaas-sh/app/README.md
-@@ -1,12 +1,25 @@
+@@ -1,6 +1,8 @@
 -# <YOUR_APP_NAME>
 +# opensaas.sh (demo) app
 
@@ -9,6 +9,10 @@
 +
 +It is deployed to https://opensaas.sh and serves both as a landing page for Open Saas and as a demo app.
 
+ ## UI Components
+ 
+@@ -8,9 +10,20 @@
+ 
  ## Development
 
 +### .env files

opensaas-sh/app_diff/deletions

@@ -1,7 +1,7 @@
-src/client/static/avatar-placeholder.webp
-src/client/static/da-boi.webp
-src/client/static/open-saas-banner.webp
-src/landing-page/logos/SalesforceLogo.tsx
+src/client/static/open-saas-banner-dark.png
+src/client/static/open-saas-banner-light.png
+src/landing-page/components/Hero.tsx
+src/landing-page/contentSections.ts
 src/payment/lemonSqueezy/checkoutUtils.ts
 src/payment/lemonSqueezy/paymentDetails.ts
 src/payment/lemonSqueezy/paymentProcessor.ts

opensaas-sh/app_diff/fly-client.toml.diff

@@ -1,28 +1,25 @@
 --- template/app/fly-client.toml
 +++ opensaas-sh/app/fly-client.toml
-@@ -0,0 +1,25 @@
-+# fly.toml app configuration file generated for open-saas-wasp-sh-client on 2023-12-04T12:34:07+01:00
+@@ -0,0 +1,22 @@
++# fly.toml app configuration file generated for open-saas-wasp-sh-client on 2025-07-18T17:12:02+02:00
 +#
 +# See https://fly.io/docs/reference/configuration/ for information about how to use this file.
 +#
 +
-+app = "open-saas-wasp-sh-client"
-+primary_region = "ams"
++app = 'open-saas-wasp-sh-client'
++primary_region = 'ams'
 +
 +[build]
 +
 +[http_service]
 +  internal_port = 8043
 +  force_https = true
-+  auto_stop_machines = true
++  auto_stop_machines = 'stop'
 +  auto_start_machines = true
 +  min_machines_running = 0
-+  processes = ["app"]
-+
-+[http_service.http_options.response]
-+  pristine = true
++  processes = ['app']
 +
 +[[vm]]
-+  cpu_kind = "shared"
++  memory = '1gb'
++  cpu_kind = 'shared'
 +  cpus = 1
-+  memory_mb = 1024

opensaas-sh/app_diff/fly-server.toml.diff

@@ -1,26 +1,25 @@
 --- template/app/fly-server.toml
 +++ opensaas-sh/app/fly-server.toml
 @@ -0,0 +1,22 @@
-+# fly.toml app configuration file generated for open-saas-wasp-sh-server on 2023-12-04T12:33:59+01:00
++# fly.toml app configuration file generated for open-saas-wasp-sh-server on 2025-07-18T17:11:52+02:00
 +#
 +# See https://fly.io/docs/reference/configuration/ for information about how to use this file.
 +#
 +
-+app = "open-saas-wasp-sh-server"
-+primary_region = "ams"
++app = 'open-saas-wasp-sh-server'
++primary_region = 'ams'
 +
 +[build]
 +
 +[http_service]
 +  internal_port = 8080
 +  force_https = true
-+  auto_stop_machines = true
++  auto_stop_machines = 'stop'
 +  auto_start_machines = true
 +  min_machines_running = 1
-+  processes = ["app"]
++  processes = ['app']
 +
 +[[vm]]
-+  cpu_kind = "shared"
++  memory = '1gb'
++  cpu_kind = 'shared'
 +  cpus = 1
-+  memory_mb = 1024
-\ No newline at end of file

opensaas-sh/app_diff/main.wasp.diff

@@ -1,13 +1,14 @@
 --- template/app/main.wasp
 +++ opensaas-sh/app/main.wasp
-@@ -3,30 +3,30 @@
-     version: "^0.16.0"
+@@ -3,31 +3,32 @@
+     version: "^0.17.0"
    },
 
 -  title: "My Open SaaS App",
 +  title: "Open SaaS",
 
    head: [
+     "<link rel='icon' href='/favicon.ico' />",
      "<meta charset='utf-8' />",
 -    "<meta name='description' content='Your apps main description and features.' />",
 -    "<meta name='author' content='Your (App) Name' />",
@@ -27,7 +28,7 @@
 -    "<meta name='twitter:image' content='https://your-saas-app.com/public-banner.webp' />",
 +    "<meta property='og:title' content='Open SaaS' />",
 +    "<meta property='og:url' content='https://opensaas.sh' />",
-+    "<meta property='og:description' content='Free, open-source SaaS boilerplate starter for React & NodeJS.' />",
++    "<meta property='og:description' content='Free, open-source SaaS boilerplate starter for React & NodeJS. Powered by Wasp.' />",
 +    "<meta property='og:image' content='https://opensaas.sh/public-banner.webp' />",
 +
 +    "<meta name=\"twitter:title\" content=\"Open SaaS\" />",
@@ -43,12 +44,13 @@
 -    // via the Cookie Consent component after the user clicks the "Accept" cookies button.
 -    "<script defer data-domain='<your-site-id>' src='https://plausible.io/js/script.js'></script>",  // for production
 -    "<script defer data-domain='<your-site-id>' src='https://plausible.io/js/script.local.js'></script>",  // for development
++
 +    "<script defer data-domain='opensaas.sh' data-api='/waspara/wasp/event' src='/waspara/wasp/script.js'></script>",
 +    "<script defer src='/piggy.js'></script>",
    ],
 
    // 🔐 Auth out of the box! https://wasp.sh/docs/auth/overview
-@@ -38,7 +38,7 @@
+@@ -39,7 +40,7 @@
        email: {
          fromField: {
            name: "Open SaaS App",
@@ -57,7 +59,7 @@
          },
          emailVerification: {
            clientRoute: EmailVerificationRoute,
-@@ -50,21 +50,18 @@
+@@ -51,21 +52,18 @@
          },
          userSignupFields: import { getEmailUserFields } from "@src/auth/userSignupFields",
        },
@@ -91,7 +93,7 @@
      },
      onAuthFailedRedirectTo: "/login",
      onAuthSucceededRedirectTo: "/demo-app",
-@@ -86,11 +83,11 @@
+@@ -87,11 +85,11 @@
      // NOTE: "Dummy" provider is just for local development purposes.
      //   Make sure to check the server logs for the email confirmation url (it will not be sent to an address)!
      //   Once you are ready for production, switch to e.g. "SendGrid" or "Mailgun" providers. Check out https://docs.opensaas.sh/guides/email-sending/ .
@@ -105,7 +107,7 @@
      },
    },
  }
-@@ -206,9 +203,9 @@
+@@ -207,9 +205,9 @@
  }
 
  api paymentsWebhook {
@@ -117,3 +119,11 @@
    httpRoute: (POST, "/payments-webhook")
  }
  //#endregion
+@@ -281,7 +279,6 @@
+   component: import AdminCalendar from "@src/admin/elements/calendar/CalendarPage"
+ }
+ 
+-
+ route AdminUIButtonsRoute { path: "/admin/ui/buttons", to: AdminUIButtonsPage }
+ page AdminUIButtonsPage {
+   authRequired: true,