Refactor file upload and toast notifications

opensaas-sh/app_diff/deletions

@@ -1,7 +1,6 @@
 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/main.wasp.diff

@@ -119,7 +119,25 @@
    httpRoute: (POST, "/payments-webhook")
  }
  //#endregion
-@@ -281,7 +279,6 @@
+@@ -253,6 +251,17 @@
+   },
+   schedule: {
+     cron: "0 5 * * *" // every day at 5am
++  },
++  entities: [File]
++}
++
++job deleteFilesJob {
++  executor: PgBoss,
++  perform: {
++    fn: import { deleteFilesJob } from "@src/file-upload/workers"
++  },
++  schedule: {
++    cron: "0 0 * * *" // every day at midnight
+     // cron: "* * * * *" // every minute. useful for debugging
+   },
+   entities: [File]
+@@ -303,7 +312,6 @@
    component: import AdminCalendar from "@src/admin/elements/calendar/CalendarPage"
  }
 

opensaas-sh/app_diff/migrations/20250731133938_drop_upload_url_from_file/migration.sql.diff

@@ -0,0 +1,11 @@
+--- template/app/migrations/20250731133938_drop_upload_url_from_file/migration.sql
++++ opensaas-sh/app/migrations/20250731133938_drop_upload_url_from_file/migration.sql
+@@ -0,0 +1,8 @@
++/*
++  Warnings:
++
++  - You are about to drop the column `uploadUrl` on the `File` table. All the data in the column will be lost.
++
++*/
++-- AlterTable
++ALTER TABLE "File" DROP COLUMN "uploadUrl";

opensaas-sh/app_diff/migrations/20250806121259_add_s3_key_file/migration.sql.diff

@@ -0,0 +1,14 @@
+--- template/app/migrations/20250806121259_add_s3_key_file/migration.sql
++++ opensaas-sh/app/migrations/20250806121259_add_s3_key_file/migration.sql
+@@ -0,0 +1,11 @@
++/*
++  Warnings:
++
++  - You are about to drop the column `key` on the `File` table. All the data in the column will be lost.
++  - Added the required column `s3Key` to the `File` table without a default value. This is not possible if the table is not empty.
++
++*/
++-- AlterTable
++DELETE FROM "File";
++ALTER TABLE "File" DROP COLUMN "key",
++ADD COLUMN     "s3Key" TEXT NOT NULL;

opensaas-sh/app_diff/package.json.diff

@@ -13,9 +13,9 @@
      "@aws-sdk/client-s3": "^3.523.0",
      "@aws-sdk/s3-presigned-post": "^3.750.0",
 @@ -36,6 +41,7 @@
+     "react-apexcharts": "1.4.1",
      "react-dom": "^18.2.0",
      "react-hook-form": "^7.60.0",
-     "react-hot-toast": "^2.4.1",
 +    "react-icons": "^5.5.0",
      "react-router-dom": "^6.26.2",
      "stripe": "18.1.0",

opensaas-sh/app_diff/src/client/App.tsx.diff

@@ -0,0 +1,24 @@
+--- template/app/src/client/App.tsx
++++ opensaas-sh/app/src/client/App.tsx
+@@ -4,6 +4,7 @@
+ import './Main.css';
+ import NavBar from './components/NavBar/NavBar';
+ import { demoNavigationitems, marketingNavigationItems } from './components/NavBar/constants';
++import { useIsLandingPage } from './hooks/useIsLandingPage';
+ import CookieConsentBanner from './components/cookie-consent/Banner';
+ import { Toaster } from '../components/ui/toaster';
+
+@@ -13,11 +14,8 @@
+  */
+ export default function App() {
+   const location = useLocation();
+-  const isMarketingPage = useMemo(() => {
+-    return location.pathname === '/' || location.pathname.startsWith('/pricing');
+-  }, [location]);
+-
+-  const navigationItems = isMarketingPage ? marketingNavigationItems : demoNavigationitems;
++  const isLandingPage = useIsLandingPage();
++  const navigationItems = isLandingPage ? marketingNavigationItems : demoNavigationitems;
+
+   const shouldDisplayAppNavBar = useMemo(() => {
+     return (

opensaas-sh/app_diff/src/client/components/NavBar/constants.ts.diff

@@ -1,10 +1,16 @@
 --- template/app/src/client/components/NavBar/constants.ts
 +++ opensaas-sh/app/src/client/components/NavBar/constants.ts
-@@ -9,7 +9,6 @@
+@@ -9,12 +9,12 @@
 
  export const marketingNavigationItems: NavigationItem[] = [
    { name: 'Features', to: '/#features' },
 -  { name: 'Pricing', to: routes.PricingPageRoute.to },
    ...staticNavigationItems,
  ] as const;
 
+ export const demoNavigationitems: NavigationItem[] = [
+   { name: 'AI Scheduler', to: routes.DemoAppRoute.to },
+   { name: 'File Upload', to: routes.FileUploadRoute.to },
++  { name: 'Pricing', to: routes.PricingPageRoute.to },
+   ...staticNavigationItems,
+ ] as const;

opensaas-sh/app_diff/src/file-upload/fileUploading.ts.diff

@@ -1,9 +1,28 @@
 --- template/app/src/file-upload/fileUploading.ts
 +++ opensaas-sh/app/src/file-upload/fileUploading.ts
-@@ -1,5 +1,5 @@
--import { createFile } from 'wasp/client/operations';
+@@ -1,5 +1,7 @@
++import type { User } from 'wasp/entities';
  import axios from 'axios';
-+import { createFile } from 'wasp/client/operations';
  import { ALLOWED_FILE_TYPES, MAX_FILE_SIZE_BYTES } from './validation';
++import { PrismaClient } from '@prisma/client';
 
- export type FileWithValidType = Omit<File, 'type'> & { type: AllowedFileType };
+ type AllowedFileTypes = (typeof ALLOWED_FILE_TYPES)[number];
+ export type FileWithValidType = File & { type: AllowedFileTypes };
+@@ -51,3 +53,17 @@
+ function isFileWithAllowedFileType(file: File): file is FileWithValidType {
+   return ALLOWED_FILE_TYPES.includes(file.type as AllowedFileTypes);
+ }
++
++export async function checkIfUserHasReachedFileUploadLimit({ userId, prismaFileDelegate }: { userId: User['id']; prismaFileDelegate: PrismaClient['file'] }) {
++  const numberOfFilesByUser = await prismaFileDelegate.count({
++    where: {
++      user: {
++        id: userId,
++      },
++    },
++  });
++  if (numberOfFilesByUser >= 2) {
++    return true;
++  }
++  return false;
++}

opensaas-sh/app_diff/src/file-upload/operations.ts.diff

@@ -1,39 +1,34 @@
 --- template/app/src/file-upload/operations.ts
 +++ opensaas-sh/app/src/file-upload/operations.ts
-@@ -1,14 +1,14 @@
+@@ -1,6 +1,5 @@
 -import * as z from 'zod';
 -import { HttpError } from 'wasp/server';
  import { type File } from 'wasp/entities';
 +import { HttpError } from 'wasp/server';
  import {
-   type CreateFile,
    type GetAllFilesByUser,
    type GetDownloadFileSignedURL,
+@@ -8,6 +7,8 @@
+   type CreateFileUploadUrl,
+   type AddFileToDb,
  } from 'wasp/server/operations';
++import { checkIfUserHasReachedFileUploadLimit } from './fileUploading';
 +import * as z from 'zod';
 
--import { getUploadFileSignedURLFromS3, getDownloadFileSignedURLFromS3 } from './s3Utils';
- import { ensureArgsSchemaOrThrowHttpError } from '../server/validation';
-+import { getDownloadFileSignedURLFromS3, getUploadFileSignedURLFromS3 } from './s3Utils';
- import { ALLOWED_FILE_TYPES } from './validation';
-
- const createFileInputSchema = z.object({
-@@ -37,6 +37,18 @@
-     userId: context.user.id,
-   });
+ import {
+   getUploadFileSignedURLFromS3,
+@@ -37,6 +38,14 @@
+     throw new HttpError(401);
+   }
 
-+  const numberOfFilesByUser = await context.entities.File.count({
-+    where: {
-+      user: {
-+        id: context.user.id,
-+      },
-+    },
++  const userFileLimitReached = await checkIfUserHasReachedFileUploadLimit({
++    userId: context.user.id,
++    prismaFileDelegate: context.entities.File,
 +  });
-+
-+  if (numberOfFilesByUser >= 2) {
-+    throw new HttpError(403, 'Thanks for trying Open SaaS. This demo only allows 2 file uploads per user.');
++  if (userFileLimitReached) {
++    throw new HttpError(403, 'This demo only allows 2 file uploads per user.');
 +  }
 +
-   await context.entities.File.create({
-     data: {
-       name: fileName,
+   const { fileType, fileName } = ensureArgsSchemaOrThrowHttpError(createFileInputSchema, rawArgs);
+
+   return await getUploadFileSignedURLFromS3({

opensaas-sh/app_diff/src/file-upload/workers.ts.diff

@@ -0,0 +1,52 @@
+--- template/app/src/file-upload/workers.ts
++++ opensaas-sh/app/src/file-upload/workers.ts
+@@ -1,11 +1,8 @@
+-import type { CleanUpOrphanedFilesS3Job } from 'wasp/server/jobs';
++import type { DeleteFilesJob, CleanUpOrphanedFilesS3Job } from 'wasp/server/jobs';
+ import { s3Client, deleteFileFromS3 } from './s3Utils';
+ import { ListObjectsV2Command, ListObjectsV2CommandOutput } from '@aws-sdk/client-s3';
+
+-export const cleanUpOrphanedFilesS3: CleanUpOrphanedFilesS3Job<never, void> = async (
+-  _args,
+-  context
+-) => {
++export const cleanUpOrphanedFilesS3: CleanUpOrphanedFilesS3Job<never, void> = async (_args, context) => {
+   const allFileKeysFromS3 = await fetchAllFileKeysFromS3();
+   const allFileKeysFromDb = await context.entities.File.findMany({
+     select: { s3Key: true },
+@@ -63,3 +60,35 @@
+     `Successfully deleted ${successfulDeletions.length} out of ${s3KeysNotFoundInDb.length} orphaned files from S3`
+   );
+ };
++
++export const deleteFilesJob: DeleteFilesJob<never, void> = async (_args, context) => {
++  const dayInMiliseconds = 1000 * 60 * 60 * 24;
++  const sevenDaysAgo = Date.now() - 7 * dayInMiliseconds;
++  const filesToDelete = await context.entities.File.findMany({
++    where: {
++      createdAt: {
++        lt: new Date(sevenDaysAgo),
++      },
++    },
++    select: { s3Key: true, id: true },
++  });
++
++  const deletionResults = await Promise.allSettled(
++    filesToDelete.map(async (file) => {
++      await deleteFileFromS3({ s3Key: file.s3Key });
++      return file.id;
++    })
++  );
++
++  const successfullyDeletedFromS3Ids = deletionResults
++    .filter((result) => result.status === 'fulfilled')
++    .map((result) => result.value);
++
++  const deletedFiles = await context.entities.File.deleteMany({
++    where: {
++      id: { in: successfullyDeletedFromS3Ids },
++    },
++  });
++
++  console.log(`Deleted ${deletedFiles.count} files`);
++};