B2B-30: fix conflicts

app/home/(user)/_components/home-menu-navigation.tsx

@@ -28,7 +28,10 @@ export function HomeMenuNavigation(props: { workspace: UserWorkspace }) {
       />
 
       <div className="flex items-center justify-end gap-3">
-        <Button variant="ghost">
+        <Button className='relative px-4 py-2 h-10 border-1 mr-0 cursor-pointer' variant={'ghost'}>
+          <span className='flex items-center text-nowrap'>€ 231,89</span>
+        </Button>
+        <Button variant="ghost" className='relative px-4 py-2 h-10 border-1 mr-0 cursor-pointer' >
           <ShoppingCart className="stroke-[1.5px]" />
           <Trans i18nKey="common:shoppingCart" /> (0)
         </Button>

app/home/[account]/_components/team-account-navigation-menu.tsx

@@ -46,11 +46,6 @@ export function TeamAccountNavigationMenu(props: {
     <div className={'flex w-full flex-1 justify-between'}>
       <div className={'flex items-center space-x-8'}>
         <AppLogo />
-        <BorderedNavigationMenu>
-          {routes.map((route) => (
-            <BorderedNavigationMenuItem {...route} key={route.path} />
-          ))}
-        </BorderedNavigationMenu>
       </div>
 
       <div className={'flex items-center justify-end space-x-2.5 gap-2'}>

app/home/[account]/layout.tsx

@@ -30,7 +30,7 @@ function TeamWorkspaceLayout({ children, params }: TeamWorkspaceLayoutProps) {
     return <SidebarLayout account={account}>{children}</SidebarLayout>;
   }
 
-  return  <HeaderLayout account={account}>{children}</HeaderLayout>;
+  return <HeaderLayout account={account}>{children}</HeaderLayout>;
 }
 
 function SidebarLayout({
@@ -113,7 +113,32 @@ function HeaderLayout({
           </div>
         </PageMobileNavigation>
 
-        {children}
+        <SidebarProvider defaultOpen>
+          <Page style={'sidebar'}>
+            <PageNavigation>
+              <TeamAccountLayoutSidebar
+                account={account}
+                accountId={data.account.id}
+                accounts={accounts}
+                user={data.user}
+              />
+            </PageNavigation>
+
+            <PageMobileNavigation className={'flex items-center justify-between'}>
+              <AppLogo />
+
+              <div className={'flex space-x-4'}>
+                <TeamAccountLayoutMobileNavigation
+                  userId={data.user.id}
+                  accounts={accounts}
+                  account={account}
+                />
+              </div>
+            </PageMobileNavigation>
+
+            {children}
+          </Page>
+        </SidebarProvider>
       </Page>
     </TeamAccountWorkspaceContextProvider>
   );

supabase/migrations/20250630163951_alter_accounts_personal_code.sql

@@ -1,5 +1,8 @@
-alter table public.accounts
+ALTER TABLE public.accounts
-add column if not exists personal_code char(11) unique;
+ADD CONSTRAINT accounts_personal_code_unique UNIQUE (personal_code);
 
-alter table public.invitations
+ALTER TABLE public.invitations
-add column if not exists personal_code char(11) unique;
+ALTER COLUMN personal_code TYPE text;
+
+ALTER TABLE public.invitations
+ADD CONSTRAINT invitations_personal_code_unique UNIQUE (personal_code);

supabase/migrations/20250630170525_add_personal_code_to_invitations.sql

@@ -62,7 +62,7 @@ returns table (
   created_at timestamptz,
   updated_at timestamptz,
   expires_at timestamptz,
-  personal_code char(11),
+  personal_code text,
   inviter_name varchar,
   inviter_email varchar
 )