Refactor file upload and toast notifications

opensaas-sh/app_diff/main.wasp.diff

@@ -119,7 +119,7 @@
    httpRoute: (POST, "/payments-webhook")
  }
  //#endregion
-@@ -281,7 +279,6 @@
+@@ -291,7 +289,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/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,29 @@
 --- 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 AllowedFileType = (typeof ALLOWED_FILE_TYPES)[number];
+@@ -63,3 +65,17 @@
+ function isAllowedFileType(fileType: string): fileType is AllowedFileType {
+   return (ALLOWED_FILE_TYPES as readonly string[]).includes(fileType);
+ }
++
++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;
++}
+\ No newline at end of file

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);
+
+   const { s3UploadUrl, s3UploadFields, key } = await getUploadFileSignedURLFromS3({