From f2e3b97d3b9f475980a013b9d48017e596435dcc Mon Sep 17 00:00:00 2001 From: vincanger <70215737+vincanger@users.noreply.github.com> Date: Thu, 31 Oct 2024 11:45:08 +0100 Subject: [PATCH] fix app_diff --- opensaas-sh/app_diff/deletions | 5 ----- opensaas-sh/app_diff/main.wasp.diff | 16 +++++++++++----- .../migration.sql.diff | 11 +++++++++++ .../src/landing-page/components/Clients.tsx.diff | 2 +- .../src/landing-page/components/Header.tsx.diff | 7 +++---- 5 files changed, 26 insertions(+), 15 deletions(-) create mode 100644 opensaas-sh/app_diff/migrations/20241031103046_remove_checkout_session_id/migration.sql.diff diff --git a/opensaas-sh/app_diff/deletions b/opensaas-sh/app_diff/deletions index c52ecc9..9508dd9 100644 --- a/opensaas-sh/app_diff/deletions +++ b/opensaas-sh/app_diff/deletions @@ -1,10 +1,5 @@ -public/banner.png -public/public-banner.png -src/client/static/avatar-placeholder.png src/client/static/avatar-placeholder.webp -src/client/static/da-boi.png src/client/static/da-boi.webp -src/client/static/logo.png src/client/static/open-saas-banner.webp src/landing-page/logos/SalesforceLogo.tsx src/payment/lemonSqueezy/checkoutUtils.ts diff --git a/opensaas-sh/app_diff/main.wasp.diff b/opensaas-sh/app_diff/main.wasp.diff index 496c3d0..5708e27 100644 --- a/opensaas-sh/app_diff/main.wasp.diff +++ b/opensaas-sh/app_diff/main.wasp.diff @@ -1,6 +1,6 @@ --- template/app/main.wasp +++ opensaas-sh/app/main.wasp -@@ -3,24 +3,24 @@ +@@ -3,24 +3,30 @@ version: "^0.15.0" }, @@ -8,6 +8,12 @@ + title: "Open SaaS", head: [ ++ "", ++ "", ++ "", ++ "", ++ ++ "", "", - "", + "", @@ -36,7 +42,7 @@ ], // 🔐 Auth out of the box! https://wasp-lang.dev/docs/auth/overview -@@ -32,7 +32,7 @@ +@@ -32,7 +38,7 @@ email: { fromField: { name: "Open SaaS App", @@ -45,7 +51,7 @@ }, emailVerification: { clientRoute: EmailVerificationRoute, -@@ -44,21 +44,18 @@ +@@ -44,21 +50,18 @@ }, userSignupFields: import { getEmailUserFields } from "@src/auth/userSignupFields", }, @@ -79,7 +85,7 @@ }, onAfterSignup: import { onAfterSignup } from "@src/auth/hooks", onAuthFailedRedirectTo: "/login", -@@ -81,11 +78,11 @@ +@@ -81,11 +84,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/ . @@ -93,7 +99,7 @@ }, }, } -@@ -206,9 +203,9 @@ +@@ -206,9 +209,9 @@ } api paymentsWebhook { diff --git a/opensaas-sh/app_diff/migrations/20241031103046_remove_checkout_session_id/migration.sql.diff b/opensaas-sh/app_diff/migrations/20241031103046_remove_checkout_session_id/migration.sql.diff new file mode 100644 index 0000000..e50b002 --- /dev/null +++ b/opensaas-sh/app_diff/migrations/20241031103046_remove_checkout_session_id/migration.sql.diff @@ -0,0 +1,11 @@ +--- template/app/migrations/20241031103046_remove_checkout_session_id/migration.sql ++++ opensaas-sh/app/migrations/20241031103046_remove_checkout_session_id/migration.sql +@@ -0,0 +1,8 @@ ++/* ++ Warnings: ++ ++ - You are about to drop the column `checkoutSessionId` on the `User` table. All the data in the column will be lost. ++ ++*/ ++-- AlterTable ++ALTER TABLE "User" DROP COLUMN "checkoutSessionId"; diff --git a/opensaas-sh/app_diff/src/landing-page/components/Clients.tsx.diff b/opensaas-sh/app_diff/src/landing-page/components/Clients.tsx.diff index dbde87c..4c9ed18 100644 --- a/opensaas-sh/app_diff/src/landing-page/components/Clients.tsx.diff +++ b/opensaas-sh/app_diff/src/landing-page/components/Clients.tsx.diff @@ -1,7 +1,7 @@ --- template/app/src/landing-page/components/Clients.tsx +++ opensaas-sh/app/src/landing-page/components/Clients.tsx @@ -1,23 +1,64 @@ -+import logo from '../../client/static/logo.png'; ++import logo from '../../client/static/logo.webp'; import AstroLogo from "../logos/AstroLogo"; -import OpenAILogo from "../logos/OpenAILogo"; import PrismaLogo from "../logos/PrismaLogo"; diff --git a/opensaas-sh/app_diff/src/landing-page/components/Header.tsx.diff b/opensaas-sh/app_diff/src/landing-page/components/Header.tsx.diff index 4ee4dd9..5ec25d2 100644 --- a/opensaas-sh/app_diff/src/landing-page/components/Header.tsx.diff +++ b/opensaas-sh/app_diff/src/landing-page/components/Header.tsx.diff @@ -58,13 +58,12 @@ ) : ( -@@ -125,3 +126,27 @@ +@@ -125,3 +126,26 @@ ) } + -+const ContestURL = -+ 'https://docs.opensaas.sh/blog/'; ++const ContestURL = 'https://x.com/WaspLang'; + +function Announcement() { + return ( @@ -75,7 +74,7 @@ + onClick={() => window.open(ContestURL, '_blank')} + className='hidden lg:block cursor-pointer rounded-full bg-neutral-700 px-2.5 py-1 text-xs hover:bg-neutral-600 tracking-wider' + > -+ Enter here and win prizes! → ++ Vote for the winner here! → + +
window.open(ContestURL, '_blank')}