External/portabase
1
0
Fork 0
mirror of https://github.com/Portabase/portabase.git synced 2026-07-14 11:16:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Working on the Portabase debug.

Browse Source
This commit is contained in:
charlesgauthereau
2025-05-18 20:46:59 +02:00
parent 6f2523e524
commit 405de7b323
13 changed files with 240 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/(customer)/dashboard/[slug]/projects/[projectId]/page.tsx
+5 -6
View File
@@ -7,23 +7,22 @@ import { ButtonDeleteProject } from "@/components/wrappers/dashboard/projects/Bu
import { CardsWithPagination } from "@/components/wrappers/common/cards-with-pagination";
import { ProjectDatabaseCard } from "@/components/wrappers/dashboard/projects/ProjectCard/ProjectDatabaseCard";
import { notFound } from "next/navigation";
import { getCurrentOrganizationSlug } from "@/features/dashboard/organization-cookie";
import { db } from "@/db";
import { eq } from "drizzle-orm";
import { organization as drizzleOrganization } from "@/db/schema";
import {getOrganization} from "@/lib/auth/auth";
export default async function RoutePage(props: PageParams<{ slug: string; projectId: string }>) {
const { slug: organizationSlug, projectId } = await props.params;
const currentOrganizationSlug = await getCurrentOrganizationSlug();
const organization = await getOrganization({organizationSlug});
if (currentOrganizationSlug !== organizationSlug) {
if (!organization || organization?.slug !== organizationSlug) {
notFound();
}
const org = await db.query.organization.findFirst({
where: eq(drizzleOrganization.slug, currentOrganizationSlug),
where: eq(drizzleOrganization.slug, organization.slug),
});
if (!org) notFound();
@@ -42,7 +41,7 @@ export default async function RoutePage(props: PageParams<{ slug: string; projec
<div className="justify-between gap-2 sm:flex">
<PageTitle className="flex items-center">
{proj.name}
<Link className={buttonVariants({ variant: "outline" })} href={`/dashboard/${currentOrganizationSlug}/projects/${proj.id}/edit`}>
<Link className={buttonVariants({ variant: "outline" })} href={`/dashboard/${organization.slug}/projects/${proj.id}/edit`}>
<GearIcon className="w-7 h-7" />
</Link>
</PageTitle>
app/(customer)/dashboard/[slug]/projects/new/page.tsx
+16 -16
View File
@@ -1,36 +1,36 @@
import { PageParams } from "@/types/next";
import { Page, PageContent, PageHeader, PageTitle } from "@/features/layout/page";
import { ProjectForm } from "@/components/wrappers/dashboard/projects/ProjectsForm/ProjectForm";
import { notFound } from "next/navigation";
import { getCurrentOrganizationSlug } from "@/features/dashboard/organization-cookie";
import { db } from "@/db";
import { DatabaseWith, organization as drizzleOrganization } from "@/db/schema";
import { eq } from "drizzle-orm";
import {PageParams} from "@/types/next";
import {Page, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
import {ProjectForm} from "@/components/wrappers/dashboard/projects/ProjectsForm/ProjectForm";
import {notFound} from "next/navigation";
import {db} from "@/db";
import {DatabaseWith, organization as drizzleOrganization} from "@/db/schema";
import {eq} from "drizzle-orm";
import {getOrganization} from "@/lib/auth/auth";
export default async function RoutePage(props: PageParams<{ slug: string }>) {
const { slug: organizationSlug } = await props.params;
const {slug: organizationSlug} = await props.params;
const currentOrganizationSlug = await getCurrentOrganizationSlug();
if (currentOrganizationSlug !== organizationSlug) {
const organization = await getOrganization({organizationSlug});
if (!organization || organization?.slug !== organizationSlug) {
notFound();
}
const availableDatabases = (
await db.query.database.findMany({
where: (db, { isNull }) => isNull(db.projectId),
where: (db, {isNull}) => isNull(db.projectId),
with: {
agent: true,
project: true,
backups: true,
restorations: true,
},
orderBy: (db, { desc }) => [desc(db.createdAt)],
orderBy: (db, {desc}) => [desc(db.createdAt)],
})
).filter((db) => db.project !== null) as DatabaseWith[];
const org = await db.query.organization.findFirst({
where: eq(drizzleOrganization.slug, currentOrganizationSlug),
where: eq(drizzleOrganization.slug, organization.slug),
});
if (!org) notFound();
@@ -41,7 +41,7 @@ export default async function RoutePage(props: PageParams<{ slug: string }>) {
<PageTitle>Create new project</PageTitle>
</PageHeader>
<PageContent>
<ProjectForm databases={availableDatabases} organization={org} />
<ProjectForm databases={availableDatabases} organization={org}/>
</PageContent>
</Page>
);
app/(customer)/dashboard/[slug]/projects/page.tsx
+17 -12
View File
@@ -1,25 +1,29 @@
import Link from "next/link";
import { PageParams } from "@/types/next";
import { CardsWithPagination } from "@/components/wrappers/common/cards-with-pagination";
import { Button } from "@/components/ui/button";
import { Page, PageActions, PageContent, PageHeader, PageTitle } from "@/features/layout/page";
import { ProjectCard } from "@/components/wrappers/dashboard/projects/ProjectCard/ProjectCard";
import { db } from "@/db";
import { notFound } from "next/navigation";
import { getOrganization } from "@/lib/auth/auth";
import {PageParams} from "@/types/next";
import {CardsWithPagination} from "@/components/wrappers/common/cards-with-pagination";
import {Button} from "@/components/ui/button";
import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
import {ProjectCard} from "@/components/wrappers/dashboard/projects/ProjectCard/ProjectCard";
import {db} from "@/db";
import {notFound} from "next/navigation";
import {getOrganization} from "@/lib/auth/auth";
export default async function RoutePage(props: PageParams<{ slug: string }>) {
const { slug: organizationSlug } = await props.params;
const {slug: organizationSlug} = await props.params;
const organization = await getOrganization(organizationSlug);
const organization = await getOrganization({organizationSlug});
if (!organization || organization?.slug !== organizationSlug) {
notFound();
}
const projects = await db.query.project.findMany({
where: (project, { eq, and, not }) => and(eq(project.organizationId, organization.id), not(eq(project.isArchived, true))),
where: (project, {
eq,
and,
not
}) => and(eq(project.organizationId, organization.id), not(eq(project.isArchived, true))),
with: {
databases: true,
},
@@ -40,7 +44,8 @@ export default async function RoutePage(props: PageParams<{ slug: string }>) {
<PageContent className="mt-10">
{projects.length > 0 ? (
<CardsWithPagination organizationSlug={organizationSlug} data={projects} cardItem={ProjectCard} cardsPerPage={4} numberOfColumns={1} />
<CardsWithPagination organizationSlug={organizationSlug} data={projects} cardItem={ProjectCard}
cardsPerPage={4} numberOfColumns={1}/>
) : (
<Link
href={`/dashboard/${organizationSlug}/projects/new`}