Refactor/app url and api schemas

.env.example

@@ -1,4 +1,5 @@
 NEXT_PUBLIC_API_BASE_URL=http://localhost:3000/v1/
+NEXT_PUBLIC_APP_URL=http://localhost:3000
 PORT=3000
 # Next App FRONTEND Instrumentation
 NEXT_PUBLIC_FARO_URL=http://localhost:12347/collect

.env.production

@@ -1,4 +1,5 @@
 NEXT_PUBLIC_API_BASE_URL=http://localhost:3000/v1
+NEXT_PUBLIC_APP_URL=http://localhost:3000
 PORT=3000
 # Next App FRONTEND Instrumentation
 NEXT_PUBLIC_FARO_URL=http://localhost:12347/collect

.github/workflows/build.yml

@@ -71,6 +71,7 @@ jobs:
           file: ./Dockerfile.prod
           build-args: |
             NEXT_PUBLIC_API_BASE_URL=${{ vars.NEXT_PUBLIC_API_BASE_URL }}
+            NEXT_PUBLIC_APP_URL=${{ vars.NEXT_PUBLIC_APP_URL }}
             NEXT_PUBLIC_FARO_URL=${{ vars.NEXT_PUBLIC_FARO_URL }}
             NEXT_PUBLIC_FARO_APP_VERSION=${{ vars.NEXT_PUBLIC_FARO_APP_VERSION }}
             NEXT_PUBLIC_APP_ENV=${{ vars.NEXT_PUBLIC_APP_ENV }}

.github/workflows/ci.yml

@@ -77,6 +77,7 @@ jobs:
           SKIP_ENV_VALIDATION: true
           NODE_ENV: production
           NEXT_PUBLIC_API_BASE_URL: ${{ vars.NEXT_PUBLIC_API_BASE_URL }}
+          NEXT_PUBLIC_APP_URL: ${{vars.NEXT_PUBLIC_APP_URL}}
           NEXT_PUBLIC_FARO_URL: ${{ vars.NEXT_PUBLIC_FARO_URL }}
           NEXT_PUBLIC_FARO_APP_VERSION: ${{ vars.NEXT_PUBLIC_FARO_APP_VERSION }}
           NEXT_PUBLIC_APP_ENV: ${{ vars.NEXT_PUBLIC_APP_ENV }}

.github/workflows/release-please.yml

@@ -64,6 +64,7 @@ jobs:
           file: ./Dockerfile.prod
           build-args: |
             NEXT_PUBLIC_API_BASE_URL=${{ vars.NEXT_PUBLIC_API_BASE_URL }}
+            NEXT_PUBLIC_APP_URL=${{ vars.NEXT_PUBLIC_APP_URL }}
             NEXT_PUBLIC_FARO_URL=${{ vars.NEXT_PUBLIC_FARO_URL }}
             NEXT_PUBLIC_FARO_APP_VERSION=${{ vars.NEXT_PUBLIC_FARO_APP_VERSION }}
             NEXT_PUBLIC_APP_ENV=${{ vars.NEXT_PUBLIC_APP_ENV }}

Dockerfile.prod

@@ -16,6 +16,7 @@ RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --offline --froze
 
 FROM base AS builder
 
+ARG NEXT_PUBLIC_APP_URL
 ARG NEXT_PUBLIC_API_BASE_URL
 ARG NEXT_PUBLIC_FARO_URL
 ARG NEXT_PUBLIC_FARO_APP_VERSION
@@ -24,6 +25,7 @@ ARG NEXT_PUBLIC_METRICS_ENABLED
 ARG SKIP_ENV_VALIDATION=false
 
 ENV NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL \
+    NEXT_PUBLIC_APP_URL=$NEXT_PUBLIC_APP_URL \
     NEXT_PUBLIC_FARO_URL=$NEXT_PUBLIC_FARO_URL \
     NEXT_PUBLIC_FARO_APP_NAME="frontend" \
     NEXT_PUBLIC_FARO_APP_NAMESPACE="frontend" \

app/(auth)/oauth/route.ts

@@ -58,7 +58,7 @@ export async function GET(request: NextRequest) {
         );
       }
 
-      const successUrl = new URL(routes.user.profile(), request.url);
+      const successUrl = new URL(routes.user.profile(), env.NEXT_PUBLIC_APP_URL);
 
       successUrl.searchParams.set('success', 'true');
       successUrl.searchParams.set('message', 'Операция выполнена успешно');
@@ -76,7 +76,7 @@ export async function GET(request: NextRequest) {
     }
   }
 
-  const errorUrl = new URL(routes.auth.signin(), request.url);
+  const errorUrl = new URL(routes.auth.signin(), env.NEXT_PUBLIC_APP_URL);
 
   errorUrl.searchParams.set('success', 'false');
   errorUrl.searchParams.set('message', ERROR_MESSAGE);

eslint.config.mjs

@@ -48,6 +48,7 @@ const eslintConfig = defineConfig([
           'src/**/': 'KEBAB_CASE',
         },
       ],
+      'object-shorthand': ['warn', 'always'],
     },
   },
   globalIgnores(['.next/**', 'out/**', 'build/**', 'next-env.d.ts']),

src/entities/auth/api/http.ts

@@ -7,7 +7,7 @@ export class AuthHttp {
     return api<TAuth.SigninResponse>({
       url: '/auth/sign-in',
       method: 'POST',
-      data: data,
+      data,
       skipAuthRefresh: true,
       contracts: {
         body: SAuth.SigninBody,
@@ -30,7 +30,7 @@ export class AuthHttp {
     return api<TAuth.SignupResponse>({
       url: '/auth/sign-up',
       method: 'POST',
-      data: data,
+      data,
       contracts: {
         body: SAuth.SignupBody,
         response: SAuth.SignupResponse,
@@ -42,7 +42,7 @@ export class AuthHttp {
     return api<TAuth.SignupConfirmResponse>({
       url: '/auth/sign-up/confirm',
       method: 'POST',
-      data: data,
+      data,
       skipAuthRefresh: true,
       contracts: {
         body: SAuth.SignupConfirmBody,
@@ -55,7 +55,7 @@ export class AuthHttp {
     return api<TAuth.ResetPasswordResponse>({
       url: '/auth/password/reset',
       method: 'POST',
-      data: data,
+      data,
       contracts: {
         body: SAuth.ResetPasswordBody,
         response: SAuth.ResetPasswordResponse,
@@ -67,7 +67,7 @@ export class AuthHttp {
     return api<TAuth.ResetPasswordVerifyResponse>({
       url: '/auth/password/reset/verify',
       method: 'POST',
-      data: data,
+      data,
       contracts: {
         body: SAuth.ResetPasswordVerifyBody,
         response: SAuth.ResetPasswordVerifyResponse,
@@ -79,13 +79,24 @@ export class AuthHttp {
     return api<TAuth.ResetPasswordConfirmResponse>({
       url: '/auth/password/reset/confirm',
       method: 'POST',
-      data: data,
+      data,
       contracts: {
         body: SAuth.ResetPasswordConfirmBody,
         response: SAuth.ResetPasswordConfirmResponse,
       },
     });
   }
+  static resendCode(data: TAuth.ResendCodeBody): Promise<TAuth.ResendCodeResponse> {
+    return api<TAuth.ResendCodeResponse>({
+      url: '/auth/resend',
+      method: 'POST',
+      data,
+      contracts: {
+        body: SAuth.ResendCodeBody,
+        response: SAuth.ResendCodeResponse,
+      },
+    });
+  }
   static oAuthProviders(signal: AbortSignal) {
     return api<TAuth.OAuthProvidersResponse>({
       url: '/oauth/providers',
@@ -124,22 +135,11 @@ export class AuthHttp {
       },
     });
   }
-  static resendCode(data: TAuth.ResendCodeBody): Promise<TAuth.ResendCodeResponse> {
-    return api<TAuth.ResendCodeResponse>({
-      url: '/oauth/resend',
-      method: 'POST',
-      data: data,
-      contracts: {
-        body: SAuth.ResendCodeBody,
-        response: SAuth.ResendCodeResponse,
-      },
-    });
-  }
   static exchangeToken(data: TAuth.ExchangeTokenBody): Promise<TAuth.ExchangeTokenResponse> {
     return api<TAuth.ExchangeTokenResponse>({
       url: '/oauth/exchange',
       method: 'POST',
-      data: data,
+      data,
     });
   }
 }

src/entities/board/model/mapper.ts

@@ -19,7 +19,7 @@ export class BoardMapper {
     columnList: BoardColumnResponse[],
     taskList: unknown[]
   ): KanbanBoardData {
-    const sortedColumns = [...columnList].sort((a, b) => a.orderIndex - b.orderIndex);
+    const sortedColumns = [...columnList].sort((a, b) => a.position - b.position);
     const tasksByColumn: Record<string, unknown[]> = {};
     const columns: Record<string, BoardColumnResponse> = {};
 

src/entities/board/model/schemas.ts

@@ -1,4 +1,4 @@
-import { createSortingSchema, DateTimeString, GlobalSuccess } from 'shared/api';
+import { createSortingSchema, CursorQuerySchema, DateTimeString, GlobalSuccess } from 'shared/api';
 import { z } from 'zod/v4';
 
 export const ActionResponse = GlobalSuccess;
@@ -84,7 +84,7 @@ export const BoardColumn = z.object({
     .nullable()
     .optional(),
   icon: z.string().max(20, 'Иконка должна быть не длиннее 20 символов').nullable().optional(),
-  orderIndex: z
+  position: z
     .number()
     .int('Порядковый номер должен быть целым числом')
     .min(0, 'Порядковый номер не может быть отрицательным'),
@@ -154,7 +154,7 @@ export const CreateBoardColumnBody = BoardColumn.omit({
   autoTransitionTo: true,
   stateType: true,
   category: true,
-  orderIndex: true,
+  position: true,
   isVisible: true,
   notifyOnEnter: true,
   notifyOnExit: true,
@@ -176,20 +176,9 @@ export const BoardColumnQueryParams = z
     my: z.boolean().optional(),
     category: z.string().optional(),
     overdue: z.boolean().optional(),
-    page: z.coerce.number().int().positive().optional(),
-    offset: z.coerce.number().int().min(0).optional(),
-    limit: z.coerce.number().int().min(0).max(100).optional(),
   })
-  .extend(createSortingSchema(['order', 'title', 'tasksCount', 'createdAt']).shape)
-  .transform((data) => {
-    if (data.page && data.page > 1 && data.offset === 0) {
-      return {
-        ...data,
-        offset: (data.page - 1) * (data.limit || 20),
-      };
-    }
-    return data;
-  });
+  .extend(CursorQuerySchema.shape)
+  .extend(createSortingSchema(['order', 'title', 'tasksCount', 'createdAt']).shape);
 
 export const UpdateBoardColumnResponse = GlobalSuccess;
 export const CreateBoardColumnResponse = GlobalSuccess.extend({

src/entities/board/model/types.ts

@@ -3,6 +3,7 @@ import * as SBoard from './schemas';
 
 export type BoardColumnStatus = z.infer<typeof SBoard.ColumnStatusEnum>;
 export type BoardViewType = z.infer<typeof SBoard.ViewTypeEnum>;
+export type BoardColumnQueryParams = z.infer<typeof SBoard.BoardColumnQueryParams>;
 
 export type BoardColumnResponse = z.infer<typeof SBoard.BoardColumn>;
 export type BoardColumnListResponse = z.infer<typeof SBoard.BoardColumnListResponse>;

src/entities/team/config/roles.ts

@@ -2,12 +2,10 @@ import type { TeamRole } from '../model/types';
 
 export const ROLE_LABELS: Record<Exclude<TeamRole, 'owner'>, string> = {
   admin: 'Администратор',
-  lead: 'Лид',
-  moderator: 'Модератор',
   member: 'Участник',
   viewer: 'Гость',
 } as const;
 
 export const INVITATION_ROLES = [
-  ...new Set<keyof typeof ROLE_LABELS>(['admin', 'lead', 'moderator', 'member', 'viewer']),
+  ...new Set<keyof typeof ROLE_LABELS>(['admin', 'member', 'viewer']),
 ] as const;

src/entities/team/config/statuses.ts

@@ -1,11 +1,13 @@
 import type { MemberStatus } from '../model/types';
 
-export const STATUS_LABELS: Record<MemberStatus, string> = {
+export const STATUS_LABELS = {
   active: 'Активен',
+  banned: 'Заблокирован',
   blocked: 'Заблокирован',
+  inactive: 'Неактивен',
   pending: 'Неактивен',
-} as const;
+} as const satisfies Record<MemberStatus, string>;
 
 export const MEMBER_STATUSES = [
-  ...new Set<keyof typeof STATUS_LABELS>(['active', 'pending', 'blocked']),
+  ...new Set<keyof typeof STATUS_LABELS>(['active', 'inactive', 'banned']),
 ] as const;

src/entities/team/model/schemas.ts

@@ -13,15 +13,15 @@ export const TeamAvatarSchema = z
 export const TeamRole = z.enum([
   'owner',
   'admin', // управление юзерами, настройками
-  'lead', // управление проектами
-  'moderator', // чистка контента/сообщений
   'member', // обычный работяга
   'viewer', // просто смотрит
 ]);
 
 export const MemberStatus = z.enum([
   'active', // Полноценный участник
-  'blocked', // Заблокирован не может вернуться по инвайту
+  'banned', // Заблокирован не может вернуться по инвайту
+  'inactive',
+  'blocked',
   'pending',
 ]);
 
@@ -50,8 +50,8 @@ export const TeamDetailsResponse = z.object({
   id: z.string(),
   name: z.string(),
   description: z.string().nullable(),
-  avatarUrl: z.string().nullable(),
-  coverUrl: z.string().nullable(),
+  avatar: TeamAvatarSchema,
+  cover: TeamAvatarSchema,
   ownerId: z.string().nullable(),
   createdAt: DateTimeString,
   updatedAt: DateTimeString,
@@ -71,7 +71,7 @@ export const TeamInvitationResponse = z.object({
   expiresAt: DateTimeString,
 });
 
-export const TeamInvitationListResponse = PaginatedResponseSchema(TeamInvitationResponse);
+export const TeamInvitationListResponse = TeamInvitationResponse.array();
 
 export const InviteMemberBody = z.object({
   email: z.email(),

src/features/boards/column/create/config/default-values.ts

@@ -5,6 +5,6 @@ export function getDefaultCreateBoardColumnValues(position = 0): CreateBoardColu
   return {
     title: '',
     color: DEFAULT_COLUMN_COLOR,
-    orderIndex: position,
+    position,
   };
 }

src/features/boards/column/create/model/useCreateBoardColumnForm.ts

@@ -37,7 +37,7 @@ export function useCreateBoardColumnForm(
   const onSubmit = (data: CreateBoardColumnFormValues) => {
     const body: TBoard.CreateBoardColumnBody = {
       title: data.title,
-      orderIndex: data.orderIndex,
+      position: data.position,
       ...(data.color ? { color: data.color } : {}),
     };
 

src/pages/invitations/ui/InvitationsPageContent.tsx

@@ -11,7 +11,7 @@ import { InvitationCard } from './InvitationCard';
 export function InvitationsPageContent() {
   const invitationsQuery = useSuspenseQuery(UserQueries.getMyInvitations());
   const invitations = invitationsQuery.data.items;
-  const invitationsCount = invitationsQuery.data.meta.total ?? invitations.length;
+  const invitationsCount = invitationsQuery.data.items.length ?? 0;
 
   return (
     <PageWrapper

src/pages/project/ui/boards/ProjectKanban.tsx

@@ -34,7 +34,7 @@ export const ProjectKanban = ({ data }: ProjectKanbanProps) => {
 
     const ids = Object.keys(value);
     const idsMap = new Map(ids.map((id, i) => [id, i]));
-    const columnIdsToUpdate: { columnId: string; orderIndex: number }[] = [];
+    const columnIdsToUpdate: { columnId: string; position: number }[] = [];
 
     const prevColumns = queryClient.getQueryData<TBoard.BoardColumnListResponse>(
       boardFabricKeys.columns(data.board.slug)
@@ -46,16 +46,16 @@ export const ProjectKanban = ({ data }: ProjectKanbanProps) => {
         if (!oldColumns) return oldColumns;
 
         return oldColumns.map((column) => {
-          const orderIndex = idsMap.get(column.id);
-          return orderIndex !== undefined ? { ...column, orderIndex } : column;
+          const position = idsMap.get(column.id);
+          return position !== undefined ? { ...column, position } : column;
         });
       }
     );
 
     prevColumns?.forEach((column) => {
-      const orderIndex = idsMap.get(column.id);
-      if (orderIndex !== undefined && column.orderIndex !== orderIndex) {
-        columnIdsToUpdate.push({ columnId: column.id, orderIndex });
+      const position = idsMap.get(column.id);
+      if (position !== undefined && column.position !== position) {
+        columnIdsToUpdate.push({ columnId: column.id, position });
       }
     });