Merge from upstream #7
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # template/app/src/user/AccountPage.tsx # template/e2e-tests/tests/utils.ts
Co-authored-by: cprecioso <511681+cprecioso@users.noreply.github.com> Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: Carlos Precioso <github@precioso.design> Co-authored-by: Carlos Precioso <carlos@wasp-lang.dev>
Co-authored-by: Mihovil Ilakovac <mihovil@ilakovac.com>
* Refactor file upload and toast notifications Replaces react-hot-toast with a custom toast system using @radix-ui/react-toast, updating all usages and adding new UI components for toast and dialog. Refactors file upload to use a two-step process: first generating an S3 upload URL, then adding the file to the database, and adds file deletion support with confirmation dialog and S3 cleanup. Updates Prisma schema, removes unused fields, and cleans up navigation and admin settings page. * Enforce file upload limit and update dependencies on opensaas-sh Added a check to restrict users to 2 file uploads in the demo, with a new helper function and error handling. Updated navigation items, improved landing page content, and removed unused dependencies (react-hot-toast). Added @radix-ui/react-toast, updated testimonials, and made minor content and code improvements. * update tests * Improve file deletion error handling and cleanup Refactors file deletion to delete the database record before attempting S3 deletion, ensuring the file is removed from the app even if S3 deletion fails. Adds error logging for failed S3 deletions to aid in manual cleanup. Also simplifies error handling in the file upload page and removes unused imports in the demo app page. * Add credit check and S3 file existence validation Added logic to decrement user credits or throw an error if out of credits in the AI demo app. Updated file upload operations to validate file existence in S3 before adding to the database, and implemented S3 file existence check utility. Minor UI and code improvements included. * Update s3Utils.ts * update app_diff * fix diff * Update deletions * Improve toast UI, error handling, and credit messaging Updated toast action hover style and icon spacing for better UI consistency. Enhanced error handling in file deletion to display specific error messages. Refined credit/subscription error message in GPT response operation for clarity and removed redundant credit decrement logic. * Refactor file upload validation and error handling Replaces error state management with toast notifications for file upload errors and success. Refactors file type validation to use a new ALLOWED_FILE_TYPES_CONST and type AllowedFileTypes. Updates validation logic to throw errors instead of returning error objects, and simplifies type handling across file upload modules. * Refactor file upload to use s3Key and add cleanup job Replaces the 'key' field with 's3Key' for file storage references throughout the codebase and database schema. Updates all related logic, types, and API contracts to use 's3Key'. Adds a scheduled job to delete old files from S3 and the database. Cleans up file type validation constants and improves consistency in file upload and download operations. * add orphaned file clean up * remove s3 cleanup job from template removed but added suggestion to docs. * Update SettingsPage.tsx * prettier format * Update UI, remove unused files Updated README with deployment and demo details. Removed unused App.tsx and package-lock.json files. Modified Main.css, NavBar constants, file uploading logic, file upload operations, and landing page content sections for improved UI and functionality. * remove pricing page from isMarketingPage
Replaced the old Product Hunt badge with two new badges for top post topic and top post, displayed side by side for improved visibility.
Removed branch restriction for pull requests in e2e tests.
Co-authored-by: Mihovil Ilakovac <mihovil@ilakovac.com>
Added a new blog post detailing the use of Gemini 3, Cursor, and Open SaaS for SaaS development, including a video demonstration and step-by-step feature implementations. Also added a related banner image for the post.
Introduced two new webp images (chat interface and landing page) and updated the Gemini 3 Open SaaS blog post to display them using Astro's Image component for improved visual context.
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Franjo Mindek <84568328+FranjoMindek@users.noreply.github.com> Co-authored-by: Mihovil Ilakovac <mihovil@ilakovac.com> Co-authored-by: Franjo Mindek <franjo.mindek@gmail.com>
* Add roadmap feature and update dependencies Introduces a new Roadmap component and related operations to the landing page, adds a getGithubRoadmap query, and updates navigation constants. Also updates several dependencies and lockfile entries, including TailwindCSS and React-related packages. * Update operations.ts.diff * Update .env.vault.diff * Create 2025-11-21-open-saas-public-roadmap.mdx * Add images and update Open SaaS roadmap blog post Added new roadmap-related images to the assets and banner directories. Updated the 2025-11-21 blog post to include these images, improve structure, and provide more details about the public roadmap, guiding themes, upcoming features, and ways to participate in the Open SaaS project. * Update roadmap blog post and add subscribe image Revised the 2025-11-21 roadmap blog post for clarity and improved messaging, added a tip section about subscribing to GitHub epics, and included a new 'subscribe-github.webp' image asset. * Refactor roadmap components and data model Reworked roadmap UI by splitting logic into RoadmapEpicCard and RoadmapStatusColumn components. Updated roadmap data model and operations to use GithubEpic and GithubEpicStatus, improving type safety and maintainability. Enhanced roadmap fetching and caching logic, and simplified App.tsx scroll behavior. * Update package-lock.json.diff * Update landing page feature and roadmap components Refactored HighlightedFeature and Roadmap components for improved clarity and maintainability. Minor updates to App.tsx to support these changes.
![cursor[bot]](https://avatars.githubusercontent.com/in/1210556?s=60&v=4){kind=small}
There was a problem hiding this comment.
This PR is being reviewed by Cursor Bugbot
Details
You are on the Bugbot Free tier. On this plan, Bugbot will review limited PRs each billing cycle.
To receive Bugbot reviews on all of your PRs, visit the Cursor dashboard to activate Pro and start your 14-day free trial.
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v6 |
There was a problem hiding this comment.
Bug: Non-existent GitHub Actions checkout versions will break workflows
The new workflow files reference actions/checkout@v6 and actions/checkout@v5, but the latest stable version is v4. These non-existent versions will cause the workflows to fail immediately upon execution. Other workflows in the repository correctly use actions/checkout@v3 or actions/checkout@v4.
Additional Locations (1)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Note
Adds Polar payment integration, overhauls S3 upload/delete flow with presigned URLs and UX, introduces shadcn toasts/dialog, refactors Stripe client/webhooks and shared user updates, and refreshes docs/blog plus tooling/tests.
polarprovider (client, checkout, webhooks, middleware) with sandbox support and webhook validation.stripeClient, safer customer/session creation, invoice/subscription handling, raw-body middleware, and shared user update utils.getPaymentPlanIdByPaymentProcessorPlanIdand typed plan lookups.createFileUploadUrlandaddFileToDb; validate types; show progress; add delete with S3 cleanup; check object existence.toast/toasteranddialog; migrate many components undersrc/client/components/uiand update imports; new SVG hero banners.tools/dope.shand docs for diff/patch workflow; template-test harness; minor Tailwind/template tweaks.Written by Cursor Bugbot for commit ad45427. This will update automatically on new commits. Configure here.