Merge branch 'master' of https://github.com/PROCOLLAB-github/procollab

Awakich · Awakich · commit f7aea6f138ef · 2026-02-12T13:15:06.000+03:00
diff --git a/projects/social_platform/src/app/office/projects/edit/shared/project-team-step/project-team-step.component.html b/projects/social_platform/src/app/office/projects/edit/shared/project-team-step/project-team-step.component.html
@@ -148,7 +148,7 @@
     }
   </div>
 
-  <div class="project__team-tooltip">
+  <div class="project__tooltip">
     <div class="tooltip">
       <app-tooltip color="grey" iconSize="40" (show)="isHintTeamVisible.set(true)"></app-tooltip>
 
diff --git a/projects/social_platform/src/app/office/projects/edit/shared/project-team-step/project-team-step.component.scss b/projects/social_platform/src/app/office/projects/edit/shared/project-team-step/project-team-step.component.scss
@@ -4,7 +4,7 @@
 @use "styles/typography";
 
 .project {
-  position: relative;
+  max-width: 1280px;
 
   &__inner {
     width: 100%;
@@ -73,15 +73,14 @@
     transform: translateY(-50%);
   }
 
-  &__team {
-    position: relative;
-
-    &-tooltip {
-      position: absolute;
-      right: 0;
-      bottom: 0;
-      transform: translateY(calc(var(--app-height) * 0.47));
-    }
+  &__tooltip {
+    position: fixed;
+    right:
+      calc(
+        (100vw - 1080px) / 2
+      );
+    bottom: 24px;
+    z-index: 30;
   }
 }
 
diff --git a/projects/social_platform/src/app/office/services/invite.service.ts b/projects/social_platform/src/app/office/services/invite.service.ts
@@ -24,7 +24,7 @@ import { AuthService } from "@auth/services";
 export class InviteService {
   private readonly INVITES_URL = "/invites";
 
-  constructor(private readonly apiService: ApiService, private readonly authService: AuthService) {}
+  constructor(private readonly apiService: ApiService) {}
 
   /**
    * Отправляет приглашение пользователю для участия в проекте
diff --git a/projects/social_platform/src/assets/icons/svg/empty-mail.svg b/projects/social_platform/src/assets/icons/svg/empty-mail.svg
@@ -0,0 +1,17 @@
+<svg width="46" height="46" viewBox="0 0 46 46" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_24317_26933)">
+<mask id="mask0_24317_26933" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="0" y="0" width="46" height="46">
+<path d="M46 0H0V46H46V0Z" fill="white"/>
+</mask>
+<g mask="url(#mask0_24317_26933)">
+<path d="M46 0H0V46H46V0Z" fill="white"/>
+<path d="M5.75 38.3348V16.4625C5.75 15.7665 6.12737 15.1251 6.73586 14.7871L22.0693 6.26854C22.6481 5.94694 23.3519 5.94694 23.9307 6.26854L39.2641 14.7871C39.8726 15.1251 40.25 15.7665 40.25 16.4625V38.3348C40.25 39.3933 39.3919 40.2514 38.3333 40.2514H7.66667C6.60813 40.2514 5.75 39.3933 5.75 38.3348Z" stroke="#827E80" stroke-width="1.5" stroke-linejoin="round"/>
+<path d="M5.75 16.293L23 25.8763L40.25 16.293" stroke="#827E80" stroke-width="1.5" stroke-linejoin="round"/>
+</g>
+</g>
+<defs>
+<clipPath id="clip0_24317_26933">
+<rect width="46" height="46" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/projects/social_platform/src/assets/icons/symbol/svg/sprite.css.svg b/projects/social_platform/src/assets/icons/symbol/svg/sprite.css.svg
diff --git a/projects/ui/src/lib/components/layout/empty-manage-card/empty-manage-card.component.html b/projects/ui/src/lib/components/layout/empty-manage-card/empty-manage-card.component.html
@@ -0,0 +1,16 @@
+<!-- @format -->
+
+<div class="card">
+  <div class="card__inner">
+    <i appIcon icon="cross" appSquare="16" class="card__cross"></i>
+
+    <div class="card__info">
+      <i appIcon icon="empty-mail" appSquare="46"></i>
+      <p class="text-body-12 card__text">новых уведомлений пока нет</p>
+    </div>
+
+    <app-button routerLink="/office/program/all" customTypographyClass="text-body-12" size="big"
+      >начать действовать</app-button
+    >
+  </div>
+</div>
diff --git a/projects/ui/src/lib/components/layout/empty-manage-card/empty-manage-card.component.scss b/projects/ui/src/lib/components/layout/empty-manage-card/empty-manage-card.component.scss
@@ -0,0 +1,37 @@
+.card {
+  position: relative;
+  width: 100%;
+  max-width: 286px;
+  padding: 24px;
+  background-color: var(--light-white);
+  border: 0.5px solid var(--medium-grey-for-outline);
+  border-radius: var(--rounded-xl);
+
+  &__inner {
+    display: flex;
+    flex-direction: column;
+    gap: 10px;
+  }
+
+  &__info {
+    display: flex;
+    gap: 15px;
+    align-items: center;
+  }
+
+  &__text {
+    width: 60%;
+    color: var(--dark-grey);
+  }
+
+  &__cross {
+    position: absolute;
+    top: 10px;
+    right: 10px;
+  }
+
+  i {
+    color: var(--dark-grey);
+    cursor: pointer;
+  }
+}
diff --git a/projects/ui/src/lib/components/layout/empty-manage-card/empty-manage-card.component.ts b/projects/ui/src/lib/components/layout/empty-manage-card/empty-manage-card.component.ts
@@ -0,0 +1,15 @@
+/** @format */
+
+import { CommonModule } from "@angular/common";
+import { Component } from "@angular/core";
+import { ButtonComponent, IconComponent } from "@ui/components";
+import { RouterLink } from "@angular/router";
+
+@Component({
+  selector: "app-empty-manage-card",
+  templateUrl: "./empty-manage-card.component.html",
+  styleUrl: "./empty-manage-card.component.scss",
+  imports: [CommonModule, ButtonComponent, IconComponent, RouterLink],
+  standalone: true,
+})
+export class EmptyManageCardComponent {}
diff --git a/projects/ui/src/lib/components/layout/invite-manage-card/invite-manage-card.component.html b/projects/ui/src/lib/components/layout/invite-manage-card/invite-manage-card.component.html
@@ -8,20 +8,36 @@
     </div>
     <div class="invite__info">
       <div class="text-body-12 invite__text">
+        <!-- для приглашений в проект -->
         <a [routerLink]="['/office/profile', invite.sender.id]"
           >{{ invite.sender.firstName }} {{ invite.sender.lastName }}</a
         ><br />приглашает вас в проект <br />
         <a [routerLink]="['/office/projects', invite.project.id]"
           >"{{ invite.project.name | truncate: 20 }}"</a
         >
+
+        <!-- для программ -->
+        <!-- <p>В программе</p>
+        <br />
+        <a [routerLink]="['/office/program', invite.project.id]"
+          >"{{ invite.project.name | truncate: 20 }}"</a
+        > -->
+
+        <!-- для поста текст -->
+        <!-- <p>выложили новый пост</p> -->
+
+        <!-- для материалов текст -->
+        <!-- <p>опубликован новый материал</p> -->
       </div>
-      <div class="text-body-12 invite__time">
+
+      <!-- <div class="text-body-12 invite__time">
         {{ invite.datetimeCreated | dayjs: "fromX" }} назад в
         {{ invite.datetimeCreated | dayjs: "format":"HH:HH" }}
-      </div>
+      </div> -->
     </div>
   </div>
   <div class="invite__actions">
+    <!-- для приглашений в проект -->
     <app-button
       customTypographyClass="text-body-12"
       size="medium"
@@ -32,6 +48,14 @@
     <app-button customTypographyClass="text-body-12" size="medium" (click)="accept.emit(invite.id)"
       >принять</app-button
     >
+
+    <!-- для программ -->
+    <!-- <app-button
+      customTypographyClass="text-body-12"
+      size="big"
+      [routerLink]="['/office/program', invite.project.id]"
+      >перейти в программу</app-button
+    > -->
   </div>
 </div>
 }
diff --git a/projects/ui/src/lib/components/layout/profile-control-panel/profile-control-panel.component.html b/projects/ui/src/lib/components/layout/profile-control-panel/profile-control-panel.component.html
@@ -24,6 +24,8 @@
             (reject)="rejectInvite.emit($event)"
           ></app-invite-manage-card>
         </li>
+        } @empty {
+        <app-empty-manage-card></app-empty-manage-card>
         }
       </ul>
     </div>
diff --git a/projects/ui/src/lib/components/layout/profile-control-panel/profile-control-panel.component.scss b/projects/ui/src/lib/components/layout/profile-control-panel/profile-control-panel.component.scss
@@ -27,7 +27,7 @@
   &__notifications {
     position: absolute;
     top: 100%;
-    right: -10%;
+    right: 0%;
     z-index: 20;
     margin-top: 10px;
   }
diff --git a/projects/ui/src/lib/components/layout/profile-control-panel/profile-control-panel.component.ts b/projects/ui/src/lib/components/layout/profile-control-panel/profile-control-panel.component.ts
@@ -7,6 +7,7 @@ import { ClickOutsideModule } from "ng-click-outside";
 import type { Invite } from "@office/models/invite.model";
 import { RouterLink } from "@angular/router";
 import type { User } from "../../../models/user.model";
+import { EmptyManageCardComponent } from "../empty-manage-card/empty-manage-card.component";
 
 /**
  * Компонент панели управления профилем
@@ -38,6 +39,7 @@ import type { User } from "../../../models/user.model";
     ClickOutsideModule,
     IconComponent,
     RouterLink,
+    EmptyManageCardComponent,
   ],
   templateUrl: "./profile-control-panel.component.html",
   styleUrl: "./profile-control-panel.component.scss",

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@`
`148`	`148`	`}`
`149`	`149`	`</div>`
`150`	`150`
`151`		`- <div class="project__team-tooltip">`
	`151`	`+ <div class="project__tooltip">`
`152`	`152`	`<div class="tooltip">`
`153`	`153`	`<app-tooltip color="grey" iconSize="40" (show)="isHintTeamVisible.set(true)"></app-tooltip>`
`154`	`154`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,8 @@`
`24`	`24`	`(reject)="rejectInvite.emit($event)"`
`25`	`25`	`></app-invite-manage-card>`
`26`	`26`	`</li>`
	`27`	`+ } @empty {`
	`28`	`+ <app-empty-manage-card></app-empty-manage-card>`
`27`	`29`	`}`
`28`	`30`	`</ul>`
`29`	`31`	`</div>`