Merge branch 'main' into B2B-65

app/(marketing)/page.tsx

@@ -1,6 +1,6 @@
 import Link from 'next/link';
 
-import { MedReportTitle } from '@/components/med-report-title';
+import { MedReportLogo } from '@/components/med-report-title';
 import { ArrowRightIcon } from 'lucide-react';
 
 import { CtaButton, Hero } from '@kit/ui/marketing';
@@ -13,7 +13,7 @@ function Home() {
     <div className={'mt-4 flex flex-col space-y-24 py-14'}>
       <div className={'container mx-auto'}>
         <Hero
-          title={<MedReportTitle />}
+          title={<MedReportLogo />}
           subtitle={
             <span>
               <Trans i18nKey={'marketing:heroSubtitle'} />

app/(public)/register-company/page.tsx

@@ -4,20 +4,19 @@ import React from 'react';
 
 import { useRouter } from 'next/navigation';
 
-import { MedReportTitle } from '@/components/med-report-title';
-import { SubmitButton } from '@/components/ui/submit-button';
-import { sendCompanyOfferEmail } from '@/lib/services/mailer.service';
-import { submitCompanyRegistration } from '@/lib/services/register-company.service';
-import { CompanySubmitData } from '@/lib/types/company';
-import { companySchema } from '@/lib/validations/companySchema';
-import { zodResolver } from '@hookform/resolvers/zod';
-import { useForm } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
-
-import { FormItem } from '@kit/ui/form';
-import { Input } from '@kit/ui/input';
-import { Label } from '@kit/ui/label';
-import { Trans } from '@kit/ui/trans';
+import { MedReportLogo } from "@/components/med-report-title";
+import React from "react";
+import { yupResolver } from "@hookform/resolvers/yup";
+import { useForm } from "react-hook-form";
+import { companySchema } from "@/lib/validations/companySchema";
+import { CompanySubmitData } from "@/lib/types/company";
+import { submitCompanyRegistration } from "@/lib/services/register-company.service";
+import { useRouter } from "next/navigation";
+import { Label } from "@kit/ui/label";
+import { Input } from "@kit/ui/input";
+import { SubmitButton } from "@/components/ui/submit-button";
+import { FormItem } from "@kit/ui/form";
+import { Trans } from "@kit/ui/trans";
 
 export default function RegisterCompany() {
   const router = useRouter();

app/(public)/register-company/success/page.tsx

@@ -1,10 +1,9 @@
 import Image from 'next/image';
 import Link from 'next/link';
 
-import { MedReportTitle } from '@/components/med-report-title';
-import { Button } from '@/packages/ui/src/shadcn/button';
+import { MedReportLogo } from '@/components/med-report-title';
 
-import { Trans } from '@kit/ui/trans';
+import { Button } from '@kit/ui/button';
 
 export default function CompanyRegistrationSuccess() {
   return (

app/admin/_components/admin-sidebar.tsx

@@ -15,6 +15,7 @@ import {
   SidebarHeader,
   SidebarMenu,
   SidebarMenuButton,
+  useSidebar,
 } from '@kit/ui/shadcn-sidebar';
 
 import { AppLogo } from '~/components/app-logo';
@@ -22,11 +23,12 @@ import { ProfileAccountDropdownContainer } from '~/components/personal-account-d
 
 export function AdminSidebar() {
   const path = usePathname();
+  const { open } = useSidebar();
 
   return (
     <Sidebar collapsible="icon">
       <SidebarHeader className={'m-2'}>
-        <AppLogo href={'/admin'} className="max-w-full" />
+        <AppLogo href={'/admin'} className="max-w-full" compact={!open} />
       </SidebarHeader>
 
       <SidebarContent>
@@ -64,4 +66,4 @@ export function AdminSidebar() {
       </SidebarFooter>
     </Sidebar>
   );
-}
+}

app/admin/accounts/page.tsx

@@ -2,6 +2,7 @@ import { ServerDataLoader } from '@makerkit/data-loader-supabase-nextjs';
 
 import { AdminAccountsTable } from '@kit/admin/components/admin-accounts-table';
 import { AdminCreateUserDialog } from '@kit/admin/components/admin-create-user-dialog';
+import { AdminCreateCompanyDialog } from '@kit/admin/components/admin-create-company-dialog';
 import { AdminGuard } from '@kit/admin/components/admin-guard';
 import { getSupabaseServerClient } from '@kit/supabase/server-client';
 import { AppBreadcrumbs } from '@kit/ui/app-breadcrumbs';
@@ -30,10 +31,14 @@ async function AccountsPage(props: AdminAccountsPageProps) {
   return (
     <>
       <PageHeader description={<AppBreadcrumbs />}>
-        <div className="flex justify-end">
+        <div className="flex justify-end gap-2">
           <AdminCreateUserDialog>
-            <Button data-test="admin-create-user-button">Create User</Button>
+            <Button data-test="admin-create-user-button">Create Personal Account</Button>
           </AdminCreateUserDialog>
+          <AdminCreateCompanyDialog>
+            <Button>Create Company Account</Button>
+          </AdminCreateCompanyDialog>
+
         </div>
       </PageHeader>