mirror of
https://github.com/wasp-lang/open-saas.git
synced 2025-08-09 02:42:10 +02:00
fix app_diff
This commit is contained in:
@@ -0,0 +1,11 @@
|
|||||||
|
--- template/app/migrations/20241030143842_checkout_session_id/migration.sql
|
||||||
|
+++ opensaas-sh/app/migrations/20241030143842_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";
|
@@ -1,23 +1,25 @@
|
|||||||
--- template/app/src/client/components/NavBar/NavBar.tsx
|
--- template/app/src/client/components/NavBar/NavBar.tsx
|
||||||
+++ opensaas-sh/app/src/client/components/NavBar/NavBar.tsx
|
+++ opensaas-sh/app/src/client/components/NavBar/NavBar.tsx
|
||||||
@@ -32,6 +32,7 @@
|
@@ -31,6 +31,7 @@
|
||||||
'shadow sticky bg-white bg-opacity-50 backdrop-blur-lg backdrop-filter dark:border dark:border-gray-100/10': !isLandingPage,
|
!isLandingPage,
|
||||||
})}
|
})}
|
||||||
>
|
>
|
||||||
+ {isLandingPage && <Announcement />}
|
+ {isLandingPage && <Announcement />}
|
||||||
<nav className='flex items-center justify-between p-6 lg:px-8' aria-label='Global'>
|
<nav className='flex items-center justify-between p-6 lg:px-8' aria-label='Global'>
|
||||||
<div className='flex items-center lg:flex-1'>
|
<div className='flex items-center lg:flex-1'>
|
||||||
<Link
|
<Link
|
||||||
@@ -39,7 +40,7 @@
|
@@ -38,9 +39,7 @@
|
||||||
className='flex items-center -m-1.5 p-1.5 text-gray-900 duration-300 ease-in-out hover:text-yellow-500'
|
className='flex items-center -m-1.5 p-1.5 text-gray-900 duration-300 ease-in-out hover:text-yellow-500'
|
||||||
>
|
>
|
||||||
<NavLogo />
|
<NavLogo />
|
||||||
- {isLandingPage && <span className='ml-2 text-sm font-semibold leading-6 dark:text-white'>Your Saas</span>}
|
- {isLandingPage && (
|
||||||
|
- <span className='ml-2 text-sm font-semibold leading-6 dark:text-white'>Your Saas</span>
|
||||||
|
- )}
|
||||||
+ {isLandingPage && <span className='ml-2 text-sm font-semibold leading-6 dark:text-white'>Open Saas</span>}
|
+ {isLandingPage && <span className='ml-2 text-sm font-semibold leading-6 dark:text-white'>Open Saas</span>}
|
||||||
</Link>
|
</Link>
|
||||||
</div>
|
</div>
|
||||||
<div className='flex lg:hidden'>
|
<div className='flex lg:hidden'>
|
||||||
@@ -59,9 +60,9 @@
|
@@ -60,9 +59,9 @@
|
||||||
</ul>
|
</ul>
|
||||||
{isUserLoading ? null : !user ? (
|
{isUserLoading ? null : !user ? (
|
||||||
<Link to='/login' className='text-sm font-semibold leading-6 ml-3'>
|
<Link to='/login' className='text-sm font-semibold leading-6 ml-3'>
|
||||||
@@ -30,7 +32,7 @@
|
|||||||
</Link>
|
</Link>
|
||||||
) : (
|
) : (
|
||||||
<div className='ml-3'>
|
<div className='ml-3'>
|
||||||
@@ -94,7 +95,7 @@
|
@@ -95,7 +94,7 @@
|
||||||
{isUserLoading ? null : !user ? (
|
{isUserLoading ? null : !user ? (
|
||||||
<Link to='/login'>
|
<Link to='/login'>
|
||||||
<div className='flex justify-end items-center duration-300 ease-in-out text-gray-900 hover:text-yellow-500 dark:text-white'>
|
<div className='flex justify-end items-center duration-300 ease-in-out text-gray-900 hover:text-yellow-500 dark:text-white'>
|
||||||
@@ -39,8 +41,8 @@
|
|||||||
</div>
|
</div>
|
||||||
</Link>
|
</Link>
|
||||||
) : (
|
) : (
|
||||||
@@ -138,3 +139,27 @@
|
@@ -137,3 +136,27 @@
|
||||||
}
|
);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
+
|
+
|
||||||
|
@@ -8,10 +8,10 @@
|
|||||||
+import { DocsUrl, BlogUrl, GithubUrl } from '../shared/common';
|
+import { DocsUrl, BlogUrl, GithubUrl } from '../shared/common';
|
||||||
|
|
||||||
export const landingPageNavigationItems = [
|
export const landingPageNavigationItems = [
|
||||||
{ name: 'Features', href: '#features' },
|
{ name: 'Features', to: '#features' },
|
||||||
- { name: 'Pricing', to: routes.PricingPageRoute.to },
|
- { name: 'Pricing', to: routes.PricingPageRoute.to },
|
||||||
{ name: 'Documentation', href: DocsUrl },
|
{ name: 'Documentation', to: DocsUrl },
|
||||||
{ name: 'Blog', href: BlogUrl },
|
{ name: 'Blog', to: BlogUrl },
|
||||||
];
|
];
|
||||||
export const features = [
|
export const features = [
|
||||||
{
|
{
|
||||||
|
@@ -11,11 +11,10 @@ import { UserMenuItems } from '../../../user/UserMenuItems';
|
|||||||
import DarkModeSwitcher from '../DarkModeSwitcher';
|
import DarkModeSwitcher from '../DarkModeSwitcher';
|
||||||
import { useIsLandingPage } from '../../hooks/useIsLandingPage';
|
import { useIsLandingPage } from '../../hooks/useIsLandingPage';
|
||||||
import { cn } from '../../cn';
|
import { cn } from '../../cn';
|
||||||
import { type Routes } from 'wasp/client/router';
|
|
||||||
|
|
||||||
interface NavigationItem {
|
interface NavigationItem {
|
||||||
name: string;
|
name: string;
|
||||||
to: string; // TODO: fix this
|
to: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
const NavLogo = () => <img className='h-8 w-8' src={logo} alt='Your SaaS App' />;
|
const NavLogo = () => <img className='h-8 w-8' src={logo} alt='Your SaaS App' />;
|
||||||
@@ -129,9 +128,9 @@ function renderNavigationItems(
|
|||||||
return (
|
return (
|
||||||
<Link
|
<Link
|
||||||
to={item.to}
|
to={item.to}
|
||||||
className={menuStyles}
|
|
||||||
key={item.name}
|
key={item.name}
|
||||||
onClick={() => setMobileMenuOpen?.(false)}
|
className={menuStyles}
|
||||||
|
onClick={setMobileMenuOpen && (() => setMobileMenuOpen(false))}
|
||||||
>
|
>
|
||||||
{item.name}
|
{item.name}
|
||||||
</Link>
|
</Link>
|
||||||
|
Reference in New Issue
Block a user