feat: UI–BLL Integration

.github/CODEOWNERS

@@ -1 +1 @@
-* @kapitulin24 @perekljuchatel
+* @kapitulin24

Dockerfile.prod

@@ -1,10 +1,11 @@
-FROM node:20-alpine AS base
+FROM node:23-alpine AS base
 ENV PNPM_HOME="/pnpm"
 ENV PATH="$PNPM_HOME:$PATH"
-RUN corepack enable
+RUN corepack enable && corepack prepare pnpm@10.30.1 --activate
 WORKDIR /app
 
 FROM base AS deps
+ENV CI=true
 RUN apk add --no-cache libc6-compat
 
 COPY pnpm-lock.yaml ./
@@ -35,7 +36,7 @@ COPY . .
 
 RUN --mount=type=cache,target=/app/.next/cache pnpm run build
 
-FROM node:20-alpine AS runner
+FROM node:23-alpine AS runner
 WORKDIR /app
 
 ENV NODE_ENV=production \

app/(auth)/forgot-password/page.tsx

@@ -1 +1 @@
-export { ForgotPasswordPage as default } from 'pages/forgot-password';
+export { ForgotPasswordPage as default } from 'pages/auth/forgot-password';

app/(auth)/signin/page.tsx

@@ -1 +1 @@
-export { SigninPage as default } from 'pages/signin';
+export { SigninPage as default } from 'pages/auth/signin';

app/(auth)/signup/page.tsx

@@ -1 +1 @@
-export { SignupPage as default } from 'pages/signup';
+export { SignupPage as default } from 'pages/auth/signup';

app/(protected)/layout.tsx

@@ -1,21 +1,12 @@
-import 'app/styles/global.css';
-import { Separator, SidebarInset, SidebarProvider, SidebarTrigger } from 'shared/ui';
-import { AppSidebar } from 'app/layouts/BaseLayout';
+import { SidebarLayout } from 'app/layouts/SidebarLayout';
+import { cookies } from 'next/headers';
+import type { ReactNode } from 'react';
+import { SIDEBAR_COOKIE_NAME } from 'shared/ui';
 
-export default async function RootLayout({ children }: { children: React.ReactNode }) {
-  return (
-    <SidebarProvider>
-      <AppSidebar />
-      <SidebarInset>
-        <header className="flex h-14 shrink-0 items-center gap-2 border-b px-4">
-          <SidebarTrigger className="-ml-1" />
-          <Separator
-            orientation="vertical"
-            className="mr-2 self-center! data-[orientation=vertical]:h-6"
-          />
-        </header>
-        <div className="p-4">{children}</div>
-      </SidebarInset>
-    </SidebarProvider>
-  );
+export default async function Layout({ children }: { children: ReactNode }) {
+  const cookieStore = await cookies();
+  const stored = cookieStore.get(SIDEBAR_COOKIE_NAME)?.value === 'true';
+  const defaultSidebarOpen = stored ?? true;
+
+  return <SidebarLayout defaultOpen={defaultSidebarOpen}>{children}</SidebarLayout>;
 }

app/(protected)/profile/layout.tsx

@@ -1,12 +1,12 @@
 import { PageLayout } from 'app/layouts/PageLayout';
-import { TabsNav } from 'pages/profile';
+import { profileTabs } from 'pages/profile';
 
 export default function ProfileLayout({ children }: { children: React.ReactNode }) {
   return (
     <PageLayout
       title="Профиль"
       description="Управляйте данными аккаунта, безопасностью и уведомлениями."
-      nav={<TabsNav />}
+      tabs={profileTabs}
     >
       {children}
     </PageLayout>

app/(protected)/profile/teams/page.tsx

@@ -0,0 +1 @@
+export { TeamsPage as default } from 'pages/profile';

app/(protected)/team/invitations/page.tsx

@@ -0,0 +1 @@
+export { InvitationsPage as default } from 'pages/team';

app/(protected)/team/layout.tsx

@@ -1,14 +1,14 @@
-import { TabsNav } from 'pages/team';
 import { PageLayout } from 'app/layouts/PageLayout';
 import { Badge } from 'shared/ui';
+import { teamTabs } from 'pages/team';
 
 export default function TeamLayout({ children }: { children: React.ReactNode }) {
   return (
     <PageLayout
       title="Управление командой"
       description="Управляйте участниками рабочего пространства, ожидающими приглашениями, ролями и правами доступа."
       badge={<Badge variant="secondary">8 участников</Badge>}
-      nav={<TabsNav />}
+      tabs={teamTabs}
     >
       {children}
     </PageLayout>

infra/dev/.env.example

@@ -37,4 +37,7 @@ S3_BUCKET_NAME=''
 S3_ENDPOINT=''
 S3_REGION=''
 S3_ACCESS_KEY=''
-S3_SECRET_KEY=''
+S3_SECRET_KEY=''
+
+IMAGOR_URL=http://localhost
+IMAGOR_SECRET=super-secret

package.json

@@ -34,6 +34,7 @@
     "axios": "^1.15.0",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
+    "immer": "^11.1.7",
     "input-otp": "^1.4.2",
     "lucide-react": "^0.574.0",
     "next": "^16.1.6",

src/app/layouts/PageLayout.tsx

@@ -1 +1,15 @@
-export { PageLayout } from 'widgets/page-layout';
+import { ComponentProps } from 'react';
+import { PageLayout as PageLayoutParent } from 'widgets/page-layout';
+import { TabsNav } from 'widgets/tabs-nav';
+
+interface PageLayoutProps extends Omit<ComponentProps<typeof PageLayoutParent>, 'nav'> {
+  tabs: ComponentProps<typeof TabsNav>['tabs'];
+}
+
+export function PageLayout({ children, tabs, ...props }: PageLayoutProps) {
+  return (
+    <PageLayoutParent nav={tabs && tabs.length ? <TabsNav tabs={tabs} /> : undefined} {...props}>
+      {children}
+    </PageLayoutParent>
+  );
+}

src/app/layouts/SidebarLayout.tsx

@@ -0,0 +1,23 @@
+import { ComponentProps } from 'react';
+import { TeamSlugSync } from 'features/teams/active-team';
+import { Separator, SidebarInset, SidebarProvider, SidebarTrigger } from 'shared/ui';
+import { AppSidebar } from 'widgets/app-sidebar';
+
+export function SidebarLayout({ children, ...props }: ComponentProps<typeof SidebarProvider>) {
+  return (
+    <SidebarProvider {...props}>
+      <TeamSlugSync />
+      <AppSidebar />
+      <SidebarInset>
+        <header className="flex h-14 shrink-0 items-center gap-2 border-b px-4">
+          <SidebarTrigger className="-ml-1" />
+          <Separator
+            orientation="vertical"
+            className="mr-2 self-center! data-[orientation=vertical]:h-6"
+          />
+        </header>
+        <div className="p-4">{children}</div>
+      </SidebarInset>
+    </SidebarProvider>
+  );
+}

src/app/styles/global.css

@@ -47,74 +47,79 @@
 }
 
 :root {
-  --radius: 0.5rem;
-  --background: hsl(0 0% 100%);
-  --foreground: hsl(222 47% 11%);
-  --card: hsl(0 0% 100%);
-  --card-foreground: hsl(222 47% 11%);
-  --popover: hsl(0 0% 100%);
-  --popover-foreground: hsl(222 47% 11%);
-  --primary: hsl(207 100% 52%);
-  --primary-foreground: hsl(0 0% 100%);
-  --secondary: hsl(210 40% 96.1%);
-  --secondary-foreground: hsl(222.2 47.4% 11.2%);
-  --muted: hsl(210 40% 96.1%);
-  --muted-foreground: hsl(215.4 16.3% 46.9%);
-  --accent: hsl(210 40% 96.1%);
-  --accent-foreground: hsl(222.2 47.4% 11.2%);
-  --destructive: hsl(0 84.2% 60.2%);
-  --border: hsl(214.3 31.8% 91.4%);
-  --input: hsl(214.3 31.8% 91.4%);
-  --ring: hsl(207 100% 52%);
-  --chart-1: oklch(0.646 0.222 41.116);
-  --chart-2: oklch(0.6 0.118 184.704);
-  --chart-3: oklch(0.398 0.07 227.392);
-  --chart-4: oklch(0.828 0.189 84.429);
-  --chart-5: oklch(0.769 0.188 70.08);
-  --sidebar: hsl(0 0% 98%);
-  --sidebar-foreground: hsl(240 5.3% 26.1%);
-  --sidebar-primary: hsl(240 5.9% 10%);
-  --sidebar-primary-foreground: hsl(0 0% 98%);
-  --sidebar-accent: hsl(240 4.8% 95.9%);
-  --sidebar-accent-foreground: hsl(240 5.9% 10%);
-  --sidebar-border: hsl(220 13% 91%);
-  --sidebar-ring: hsl(217.2 91.2% 59.8%);
+  --background: oklch(1 0 0);
+  --foreground: oklch(0.3211 0 0);
+  --card: oklch(1 0 0);
+  --card-foreground: oklch(0.3211 0 0);
+  --popover: oklch(1 0 0);
+  --popover-foreground: oklch(0.3211 0 0);
+  --primary: oklch(0.6231 0.188 259.8145);
+  --primary-foreground: oklch(1 0 0);
+  --secondary: oklch(0.967 0.0029 264.5419);
+  --secondary-foreground: oklch(0.4461 0.0263 256.8018);
+  --muted: oklch(0.9846 0.0017 247.8389);
+  --muted-foreground: oklch(0.551 0.0234 264.3637);
+  --accent: oklch(0.9514 0.025 236.8242);
+  --accent-foreground: oklch(0.3791 0.1378 265.5222);
+  --destructive: oklch(0.6368 0.2078 25.3313);
+  --destructive-foreground: oklch(1 0 0);
+  --border: oklch(0.9276 0.0058 264.5313);
+  --input: oklch(0.9276 0.0058 264.5313);
+  --ring: oklch(0.6231 0.188 259.8145);
+  --chart-1: oklch(0.6231 0.188 259.8145);
+  --chart-2: oklch(0.5461 0.2152 262.8809);
+  --chart-3: oklch(0.4882 0.2172 264.3763);
+  --chart-4: oklch(0.4244 0.1809 265.6377);
+  --chart-5: oklch(0.3791 0.1378 265.5222);
+  --sidebar: oklch(0.9846 0.0017 247.8389);
+  --sidebar-foreground: oklch(0.3211 0 0);
+  --sidebar-primary: oklch(0.6231 0.188 259.8145);
+  --sidebar-primary-foreground: oklch(1 0 0);
+  --sidebar-accent: oklch(0.9514 0.025 236.8242);
+  --sidebar-accent-foreground: oklch(0.3791 0.1378 265.5222);
+  --sidebar-border: oklch(0.9276 0.0058 264.5313);
+  --sidebar-ring: oklch(0.6231 0.188 259.8145);
+  --font-sans: Inter, sans-serif;
+  --font-serif: Source Serif 4, serif;
+  --font-mono: JetBrains Mono, monospace;
+  --radius: 0.375rem;
   --link: oklch(1 0 89.876 / 0);
   --link-foreground: oklch(54.65% 0.246 262.87);
 }
 
 .dark {
-  --background: hsl(222.2 84% 4.9%);
-  --foreground: hsl(210 40% 98%);
-  --card: hsl(222.2 84% 4.9%);
-  --card-foreground: hsl(210 40% 98%);
-  --popover: hsl(222.2 84% 4.9%);
-  --popover-foreground: hsl(210 40% 98%);
-  --primary: hsl(210 40% 98%);
-  --primary-foreground: hsl(222.2 47.4% 11.2%);
-  --secondary: hsl(217.2 32.6% 17.5%);
-  --secondary-foreground: hsl(210 40% 98%);
-  --muted: hsl(217.2 32.6% 17.5%);
-  --muted-foreground: hsl(215 20.2% 65.1%);
-  --accent: hsl(217.2 32.6% 17.5%);
-  --accent-foreground: hsl(210 40% 98%);
-  --destructive: hsl(0 62.8% 30.6%);
-  --border: hsl(217.2 32.6% 17.5%);
-  --input: hsl(217.2 32.6% 17.5%);
-  --ring: hsl(212.7 26.8% 83.9%);
-  --chart-1: oklch(0.488 0.243 264.376);
-  --chart-2: oklch(0.696 0.17 162.48);
-  --chart-3: oklch(0.769 0.188 70.08);
-  --chart-4: oklch(0.627 0.265 303.9);
-  --chart-5: oklch(0.645 0.246 16.439);
-  --sidebar: hsl(240 5.9% 10%);
-  --sidebar-foreground: hsl(240 4.8% 95.9%);
-  --sidebar-primary: hsl(224.3 76.3% 48%);
-  --sidebar-primary-foreground: hsl(0 0% 100%);
-  --sidebar-accent: hsl(240 3.7% 15.9%);
-  --sidebar-accent-foreground: hsl(240 4.8% 95.9%);
-  --sidebar-border: hsl(240 3.7% 15.9%);
-  --sidebar-ring: hsl(217.2 91.2% 59.8%);
+  --background: oklch(0.2046 0 0);
+  --foreground: oklch(0.9219 0 0);
+  --card: oklch(0.2686 0 0);
+  --card-foreground: oklch(0.9219 0 0);
+  --popover: oklch(0.2686 0 0);
+  --popover-foreground: oklch(0.9219 0 0);
+  --primary: oklch(0.6231 0.188 259.8145);
+  --primary-foreground: oklch(1 0 0);
+  --secondary: oklch(0.2686 0 0);
+  --secondary-foreground: oklch(0.9219 0 0);
+  --muted: oklch(0.2393 0 0);
+  --muted-foreground: oklch(0.7155 0 0);
+  --accent: oklch(0.3791 0.1378 265.5222);
+  --accent-foreground: oklch(0.8823 0.0571 254.1284);
+  --destructive: oklch(0.6368 0.2078 25.3313);
+  --destructive-foreground: oklch(1 0 0);
+  --border: oklch(0.3715 0 0);
+  --input: oklch(0.3715 0 0);
+  --ring: oklch(0.6231 0.188 259.8145);
+  --chart-1: oklch(0.7137 0.1434 254.624);
+  --chart-2: oklch(0.6231 0.188 259.8145);
+  --chart-3: oklch(0.5461 0.2152 262.8809);
+  --chart-4: oklch(0.4882 0.2172 264.3763);
+  --chart-5: oklch(0.4244 0.1809 265.6377);
+  --sidebar: oklch(0.2046 0 0);
+  --sidebar-foreground: oklch(0.9219 0 0);
+  --sidebar-primary: oklch(0.6231 0.188 259.8145);
+  --sidebar-primary-foreground: oklch(1 0 0);
+  --sidebar-accent: oklch(0.3791 0.1378 265.5222);
+  --sidebar-accent-foreground: oklch(0.8823 0.0571 254.1284);
+  --sidebar-border: oklch(0.3715 0 0);
+  --sidebar-ring: oklch(0.6231 0.188 259.8145);
   --link: oklch(1 0 89.876 / 0);
   --link-foreground: oklch(54.65% 0.246 262.87);
 }

src/entities/file/api/http.ts → src/entities/asset/api/http.ts

@@ -1,16 +1,16 @@
 import { api } from 'shared/api';
-import { UploadFileData, UploadResponse } from '../model/types';
-import { UploadResponse as UploadResponseSchema } from '../model/schemas';
+import { UploadAssetData, UploadAssetResponse } from '../model/types';
+import { UploadAssetResponse as UploadResponseSchema } from '../model/schemas';
 
-export class UploadHttp {
-  static uploadFile(data: UploadFileData): Promise<UploadResponse> {
+export class AssetHttp {
+  static uploadFile(data: UploadAssetData): Promise<UploadAssetResponse> {
     const formData = new FormData();
 
     formData.append('file', data.file);
     // INCLUDED: SEE AT SWAGGER DOCS TO CONTEXT AND PROPS TOO
     formData.append('context', data.context);
 
-    return api<UploadResponse>({
+    return api<UploadAssetResponse>({
       url: '/upload',
       method: 'POST',
       data: formData,

src/entities/asset/index.ts

@@ -0,0 +1,3 @@
+export * as SAsset from './model/schemas';
+export type * as TAsset from './model/types';
+export { AssetHttp } from './api/http';

src/entities/asset/model/schemas.ts

@@ -0,0 +1,3 @@
+import { GlobalSuccess } from 'shared/api';
+
+export const UploadAssetResponse = GlobalSuccess;