Merge pull request #98 from oleksandriia-it-team/feature/fin-022-parts/sidebar-and-lookups

Feature/fin 022 parts/sidebar and lookups

Author: dmytroreshetylo

package.json

@@ -9,7 +9,7 @@
     "build": "next build",
     "start": "next start",
     "database:migrate": "tsx src/server/database/migrate.ts",
-    "lint": "next lint && prettier --write 'src/**/*.scss' && stylelint 'src/**/*.scss' --fix",
+    "lint": "next lint && prettier --write \"src/**/*.scss\" && stylelint \"src/**/*.scss\" --fix",
     "test": "vitest",
     "database:init": "tsx src/server/database/init.ts -- --synchronize=true",
     "docker:run": "docker-compose up -d",

src/app/(admin)/admin/lookups/countries/page.tsx

@@ -0,0 +1,5 @@
+import { CountriesLookup } from '@frontend/features/admin/countries-lookup/countries-lookup';
+
+export default function CountriesPage() {
+  return <CountriesLookup />;
+}

src/app/(admin)/admin/lookups/currencies/page.tsx

@@ -0,0 +1,5 @@
+import { CurrenciesLookup } from '@frontend/features/admin/currencies-lookup/currencies-lookup';
+
+export default function CurrenciesPage() {
+  return <CurrenciesLookup />;
+}

src/app/(admin)/admin/lookups/page.tsx

@@ -0,0 +1,5 @@
+import { redirect } from 'next/navigation';
+
+export default function LookupsPage() {
+  redirect('/admin/lookups/countries');
+}

src/app/(admin)/layout.tsx

@@ -0,0 +1,20 @@
+import type { ChildrenComponentProps } from '@frontend/shared/models/component-with-chilren.model';
+import { AuthGuard } from '@frontend/entities/profile/auth-guard';
+import { RoleGuard } from '@frontend/entities/profile/role-guard';
+import { AdminSidebar } from '@frontend/widgets/admin-sidebar/admin-sidebar';
+import { AuthorizedUserProvider } from '@frontend/entities/profile/authorized-user.hook';
+
+export default function AdminLayout({ children }: ChildrenComponentProps) {
+  return (
+    <AuthGuard>
+      <RoleGuard>
+        <AuthorizedUserProvider>
+          <div className="flex h-full w-full overflow-hidden">
+            <AdminSidebar />
+            <main className="flex-1 overflow-auto bg-background">{children}</main>
+          </div>
+        </AuthorizedUserProvider>
+      </RoleGuard>
+    </AuthGuard>
+  );
+}

src/app/(auth)/login/page.tsx

@@ -12,15 +12,15 @@ import { UiSpinner } from '@frontend/ui/ui-spinner/spinner';
 import { FinControlledPassword } from '@frontend/components/controlled-fields/fin-controlled-password';
 import { FinControlledInput } from '@frontend/components/controlled-fields/fin-controlled-input';
 import { AuthTemplate } from '@frontend/entities/auth/auth-template';
-import { useUserInformation } from '@frontend/shared/services/user-information/use-user-information.store';
 import { LogoSvg } from '@frontend/shared/svg/logo-svg';
+import { useUserInformation } from '@frontend/shared/services/user-information/use-user-information.store';
 
 export default function LoginPage() {
   const refreshUser = useUserInformation((state) => state.refresh);
 
   const router = useRouter();
-  const { methods, submit, isLoading } = useSetupLogin(() => {
-    refreshUser();
+  const { methods, submit, isLoading } = useSetupLogin(async () => {
+    await refreshUser();
     router.push('/profile');
   });
 

src/app/(auth)/login/shared/login-form.ts

@@ -6,7 +6,7 @@ import { fetchClient } from '@frontend/shared/services/fetch-client/fetch-client
 import { type LoginResponse } from '@common/domains/auth/models/responses/login.response';
 import { type ApiResultOperation } from '@common/models/api-result-operation.model';
 
-export function useSetupLogin(onSuccessAction: () => void) {
+export function useSetupLogin(onSuccessAction: () => void | Promise<void>) {
   const { mutate, isPending } = useSendDataFetch(
     async (data: LoginDto) =>
       await fetchClient.post<ApiResultOperation<LoginResponse>>('/api/auth/login', data, { skipAuth: true }),

src/app/(profile)/profile/budget/(regular-operations)/layout.tsx

@@ -1,7 +1,7 @@
 'use client';
 
-import { RegularIncomesExpensesProvider } from '@frontend/features/regular-incomes-expenses/card-creation-form/regular-transaction.hook';
 import type { ChildrenComponentProps } from '@frontend/shared/models/component-with-chilren.model';
+import { RegularIncomesExpensesProvider } from '@frontend/features/regular-incomes-expenses/card-creation-form/regular-transaction.hook';
 
 export default function RegularOperationsLayout({ children }: ChildrenComponentProps) {
   return <RegularIncomesExpensesProvider>{children}</RegularIncomesExpensesProvider>;

src/client/entities/lookups/lookup-column/lookup-column.model.ts

@@ -0,0 +1,8 @@
+import { type ReactNode } from 'react';
+
+export interface LookupColumnDef<T> {
+  header: string;
+  cell: (item: T) => ReactNode;
+  headerClassName?: string;
+  cellClassName?: string;
+}

src/client/entities/lookups/lookup-created-by/lookup-created-by-cell.tsx

@@ -0,0 +1,30 @@
+import { UiGraphic } from '@frontend/ui/ui-graphic/ui-graphic';
+import { type LookupCreatedBy } from './lookup-created-by.model';
+
+interface LookupCreatedByCellProps {
+  createdBy: LookupCreatedBy;
+}
+
+export function LookupCreatedByCell({ createdBy }: LookupCreatedByCellProps) {
+  if (!createdBy.name) {
+    return <span className="text-sm text-muted-foreground">—</span>;
+  }
+
+  return (
+    <div className="flex items-center gap-2">
+      {createdBy.avatar ? (
+        <UiGraphic
+          src={createdBy.avatar}
+          alt={createdBy.name}
+          size={20}
+          className="rounded-full"
+        />
+      ) : (
+        <span className="inline-flex h-5 w-5 items-center justify-center rounded-full bg-muted text-[10px] font-semibold text-muted-foreground">
+          {createdBy.name.charAt(0).toUpperCase()}
+        </span>
+      )}
+      <span className="text-sm text-muted-foreground">{createdBy.name}</span>
+    </div>
+  );
+}