Merge pull request wasp-lang#509 from wasp-lang/franjo/run-prettier

Author: FranjoMindek

.gitattributes

@@ -1 +1 @@
-*.wasp linguist-language=TypeScript
+*.wasp linguist-language=TypeScript

.github/FUNDING.yml

@@ -1,6 +1,6 @@
 # These are supported funding model platforms
 
-github: [ wasp-lang ] # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+github: [wasp-lang] # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
 patreon: # Replace with a single Patreon username
 open_collective: # Replace with a single Open Collective username
 ko_fi: # Replace with a single Ko-fi username

.github/workflows/blog-deployment.yml

@@ -5,12 +5,12 @@ on:
     branches:
       - main
     paths:
-      - 'opensaas-sh/blog/**'
+      - "opensaas-sh/blog/**"
   pull_request:
     branches:
       - main
     paths:
-      - 'opensaas-sh/blog/**'
+      - "opensaas-sh/blog/**"
 
 jobs:
   build:
@@ -23,7 +23,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 'lts/*'
+          node-version: "lts/*"
 
       - name: Install dependencies
         working-directory: ./opensaas-sh/blog
@@ -47,7 +47,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 'lts/*'
+          node-version: "lts/*"
 
       - name: Install dependencies
         working-directory: ./opensaas-sh/blog
@@ -64,10 +64,10 @@ jobs:
       - name: Deploy to Netlify
         uses: nwtgck/actions-netlify@v2
         with:
-          publish-dir: './opensaas-sh/blog/dist'
+          publish-dir: "./opensaas-sh/blog/dist"
           production-branch: main
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          deploy-message: 'Deploy from GitHub Actions'
+          deploy-message: "Deploy from GitHub Actions"
         env:
           NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
           NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}

.github/workflows/e2e-tests.yml

@@ -24,7 +24,7 @@ jobs:
         id: setup-node
         uses: actions/setup-node@v4
         with:
-          node-version: '22'
+          node-version: "22"
 
       - name: Docker setup
         uses: docker/setup-buildx-action@v3
@@ -56,7 +56,7 @@ jobs:
         run: |
           ./tools/patch.sh
 
-      - name: '[e2e-tests] Install Node.js dependencies for Playwright tests'
+      - name: "[e2e-tests] Install Node.js dependencies for Playwright tests"
         if: steps.cache-e2e-tests.outputs.cache-hit != 'true'
         working-directory: ./template
         run: |
@@ -78,14 +78,14 @@ jobs:
           path: ~/.cache/ms-playwright
           key: playwright-browsers-${{ env.PLAYWRIGHT_VERSION }}-${{ runner.os }}
 
-      - name: '[e2e-tests] Set up Playwright'
+      - name: "[e2e-tests] Set up Playwright"
         if: steps.cache-playwright-browsers.outputs.cache-hit != 'true'
         working-directory: ./template
         run: |
           cd e2e-tests
           npx playwright install --with-deps
 
-      - name: '[e2e-tests] Install Stripe CLI'
+      - name: "[e2e-tests] Install Stripe CLI"
         run: |
           curl -s https://packages.stripe.dev/api/security/keypair/stripe-cli-gpg/public | gpg --dearmor | sudo tee /usr/share/keyrings/stripe.gpg
           echo "deb [signed-by=/usr/share/keyrings/stripe.gpg] https://packages.stripe.dev/stripe-cli-debian-local stable main" | sudo tee -a /etc/apt/sources.list.d/stripe.list
@@ -95,13 +95,13 @@ jobs:
       # For Stripe webhooks to work in development, we need to run the Stripe CLI to listen for webhook events.
       # The Stripe CLI will receive the webhook events from Stripe test payments and
       # forward them to our local server so that we can test the payment flow in our e2e tests.
-      - name: '[e2e-tests] Run Stripe CLI to listen for webhooks'
+      - name: "[e2e-tests] Run Stripe CLI to listen for webhooks"
         env:
           STRIPE_DEVICE_NAME: ${{ secrets.STRIPE_DEVICE_NAME }}
         run: |
           stripe listen --api-key ${{ secrets.STRIPE_KEY }} --forward-to localhost:3001/payments-webhook &
 
-      - name: '[e2e-tests] Run Playwright tests'
+      - name: "[e2e-tests] Run Playwright tests"
         env:
           # The e2e tests are testing parts of the app that need certain env vars, so we need to access them here.
           # These secretes can be set in your GitHub repo settings, e.g. https://github.com/<account>/<repo>/settings/secrets/actions

CONTRIBUTING.md

@@ -1,6 +1,7 @@
 Thanks so much for considering contributing to Open SaaS 🙏
 
 ## Considerations before Contributing
+
 Check if there is a GitHub issue already for the thing you would like to work on. If there is no issue yet, create a new one.
 
 Let us know, in the issue, that you would like to work on it and how you plan to approach it.
@@ -15,6 +16,7 @@ Repo is divided into two main parts: [template](/template) dir and [opensaas-sh]
 `opensaas-sh` is the app deployed to https://opensaas.sh , and is actually made with open saas! It contains a demo app and open saas docs. We keep it updated as we work on the template.
 
 ## How to Contribute
+
 1. Make sure you understand the basics of how open-saas works (check out [docs](https://docs.opensaas.sh)).
 2. Check out this repo (`main` branch) and make sure you are able to get the app in [template/app/](/template/app) running (to set it up, follow the same steps as for running a new open-saas app, as explained in the open-saas docs).
 3. Create a new git branch for your work (aka feature branch) and do your changes on it.

README.md

@@ -1,9 +1,10 @@
 ## Welcome to your new SaaS App! 🎉
+
 <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/user-attachments/assets/3856276b-23e9-455e-a564-b5f26f4f0e98
 
-You've decided to build a SaaS app with the Open SaaS template. Great choice! 
+You've decided to build a SaaS app with the Open SaaS template. Great choice!
 
 This template is:
 
@@ -38,13 +39,15 @@ Because we're using Wasp as the full-stack framework, we can leverage a lot of i
 - 🚀 [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)
 
 ## Getting Started
 
 ### Simple Instructions
 
 First, to install the latest version of [Wasp](https://wasp.sh/) on macOS, Linux, or Windows with WSL, run the following command:
+
 ```bash
 curl -sSL https://get.wasp.sh/installer.sh | sh
 ```
@@ -66,6 +69,7 @@ We've documented everything in great detail, including installation instructions
 ## Getting Help & Providing Feedback
 
 There are two ways to get help or provide feedback (and we try to always respond quickly!):
+
 1. [Open an issue](https://github.com/wasp-lang/open-saas/issues)
 2. [Wasp Discord](https://discord.gg/aCamt5wCpS) -- please direct questions to the #🙋questions forum channel
 
@@ -74,4 +78,3 @@ There are two ways to get help or provide feedback (and we try to always respond
 Note that we've tried to get as many of the core features of a SaaS app into this template as possible, but there still might be some missing features or functionality.
 
 We could always use some help tying up loose ends: contributions are welcome! Check out [CONTRIBUTING.md](/CONTRIBUTING.md) for more details.
-

opensaas-sh/app_diff/README.md.diff

@@ -11,22 +11,24 @@
 
  ## UI Components
 
-@@ -8,9 +10,20 @@
+@@ -8,9 +10,22 @@
 
  ## Development
 
 +### .env files
++
 +`.env.client` file is versioned, but `.env.server` file you have to obtain by running `npm run env:pull`, since it has secrets in it.
 +This will generate `.env.server` based on the `.env.vault`.
 +We are using https://vault.dotenv.org to power this and have an account/organization up there.
 +If you modify .env.server and want to persist the changes (for yourself and for the other team members), do `npm run env:push`.
 +
  ### Running locally
-  - Make sure you have the `.env.client` and `.env.server` files with correct dev values in the root of the project.
-  - Run the database with `wasp start db` and leave it running.
-  - Run `wasp start` and leave it running.
-  - [OPTIONAL]: If this is the first time starting the app, or you've just made changes to your entities/prisma schema, also run `wasp db migrate-dev`.
 
+ - Make sure you have the `.env.client` and `.env.server` files with correct dev values in the root of the project.
+ - Run the database with `wasp start db` and leave it running.
+ - Run `wasp start` and leave it running.
+ - [OPTIONAL]: If this is the first time starting the app, or you've just made changes to your entities/prisma schema, also run `wasp db migrate-dev`.
++
 +## Deployment
 +
 +This app is deployed to fly.io, Wasp org, via `wasp deploy fly deploy`.

opensaas-sh/app_diff/package.json.diff

@@ -5,9 +5,9 @@
    "name": "opensaas",
    "type": "module",
 +  "scripts": {
++    "deploy": "REACT_APP_GOOGLE_ANALYTICS_ID=G-H3LSJCK95H wasp deploy fly deploy",
 +    "env:pull": "npx dotenv-vault@latest pull development .env.server",
-+    "env:push": "npx dotenv-vault@latest push development .env.server",
-+    "deploy": "REACT_APP_GOOGLE_ANALYTICS_ID=G-H3LSJCK95H wasp deploy fly deploy"
++    "env:push": "npx dotenv-vault@latest push development .env.server"
 +  },
    "dependencies": {
      "@aws-sdk/client-s3": "^3.523.0",

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

@@ -1,11 +1,11 @@
 --- template/app/src/admin/dashboards/users/UsersTable.tsx
 +++ opensaas-sh/app/src/admin/dashboards/users/UsersTable.tsx
-@@ -254,7 +254,7 @@
-                 <p className='text-sm text-foreground'>{user.subscriptionStatus}</p>
+@@ -302,7 +302,7 @@
                </div>
-               <div className='col-span-2 flex items-center'>
--                <p className='text-sm text-muted-foreground'>{user.paymentProcessorUserId}</p>
-+                <p className='text-sm text-muted-foreground'>{user.subscriptionStatus}</p>
+               <div className="col-span-2 flex items-center">
+                 <p className="text-muted-foreground text-sm">
+-                  {user.paymentProcessorUserId}
++                  {user.subscriptionStatus}
+                 </p>
                </div>
-               <div className='col-span-1 flex items-center'>
-                 <div className='text-sm text-foreground'>
+               <div className="col-span-1 flex items-center">

opensaas-sh/app_diff/src/analytics/providers/plausibleAnalyticsUtils.ts.diff

@@ -7,23 +7,23 @@
 -    `${PLAUSIBLE_BASE_URL}/v1/stats/aggregate?site_id=${PLAUSIBLE_SITE_ID}&metrics=pageviews`,
 +    `${PLAUSIBLE_BASE_URL}/v1/stats/aggregate?site_id=${PLAUSIBLE_SITE_ID}&metrics=pageviews&with_imported=true`,
      {
-       method: 'GET',
+       method: "GET",
        headers: {
-@@ -80,7 +80,7 @@
+@@ -90,7 +90,7 @@
  }
 
  async function getPageviewsForDate(date: string) {
 -  const url = `${PLAUSIBLE_BASE_URL}/v1/stats/aggregate?site_id=${PLAUSIBLE_SITE_ID}&period=day&date=${date}&metrics=pageviews`;
 +  const url = `${PLAUSIBLE_BASE_URL}/v1/stats/aggregate?site_id=${PLAUSIBLE_SITE_ID}&period=day&date=${date}&metrics=pageviews&with_imported=true`;
    const response = await fetch(url, {
-     method: 'GET',
+     method: "GET",
      headers: headers,
-@@ -93,7 +93,7 @@
+@@ -103,7 +103,7 @@
  }
 
  export async function getSources() {
 -  const url = `${PLAUSIBLE_BASE_URL}/v1/stats/breakdown?site_id=${PLAUSIBLE_SITE_ID}&property=visit:source&metrics=visitors`;
 +  const url = `${PLAUSIBLE_BASE_URL}/v1/stats/breakdown?site_id=${PLAUSIBLE_SITE_ID}&property=visit:source&metrics=visitors&with_imported=true`;
    const response = await fetch(url, {
-     method: 'GET',
+     method: "GET",
      headers: headers,