From baf69c02951e1ca9f69bac6b59b84cf185d0879d Mon Sep 17 00:00:00 2001 From: killian-larcher Date: Mon, 11 Nov 2024 19:21:13 +0100 Subject: [PATCH] merging. --- .../delete-account.action.ts | 2 +- src/features/layout/page.tsx | 25 ++++--------------- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/src/components/wrappers/Dashboard/Profile/ButtonDeleteAccount/delete-account.action.ts b/src/components/wrappers/Dashboard/Profile/ButtonDeleteAccount/delete-account.action.ts index c6f54ed8..7c476a75 100644 --- a/src/components/wrappers/Dashboard/Profile/ButtonDeleteAccount/delete-account.action.ts +++ b/src/components/wrappers/Dashboard/Profile/ButtonDeleteAccount/delete-account.action.ts @@ -26,7 +26,7 @@ export const deleteUserAction = userAction userId: ctx.user.id, } }) - if(account){ + if (account) { await prisma.account.delete({ where: { id: account.id diff --git a/src/features/layout/page.tsx b/src/features/layout/page.tsx index c9dc0b79..015e69d9 100644 --- a/src/features/layout/page.tsx +++ b/src/features/layout/page.tsx @@ -2,17 +2,8 @@ import {twx} from "@/lib/twx"; import {cn} from "@/lib/utils"; -<<<<<<< HEAD export const Page = twx.div((props) => [ - cn(`flex flex-col h-full px-10 py-6`, props.className), -======= -export const PageHeader = twx.div((props)=>[ - cn(`flex justify-between`, props.className), -]) - -export const PageTitle = twx.h1((props)=>[ - cn(`text-3xl font-bold mb-6`, props.className), ->>>>>>> origin/main + cn(`flex flex-col h-full px-10 py-6`, props.className) ]) @@ -31,17 +22,11 @@ export const PageDescription = twx.h2((props) => [ ]) -<<<<<<< HEAD export const PageActions = twx.h1((props) => [ - cn(`flex gap-4 h-fit`, props.className), -]) + cn(`flex gap-4 h-fit`, props.className), + ] +) export const PageContent = twx.div((props) => [ - cn(`h-full`, props.className), -======= -export const PageActions = twx.h1((props)=>[ - cn(`flex gap-4`, props.className), ->>>>>>> origin/main + cn(`h-full`, props.className) ]) - -