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

Author: Awakich

projects/social_platform/src/app/auth/set-password/set-password.component.scss

@@ -3,3 +3,11 @@
     margin-bottom: 24px;
   }
 }
+
+.error {
+  color: var(--red) !important;
+
+  i {
+    color: var(--red) !important;
+  }
+}

projects/social_platform/src/app/office/features/detail/detail.component.html

@@ -63,38 +63,23 @@
         <ng-template #programTpl>
           @if (userType() !== undefined) { @if (!isUserMember && !isUserManager) { @if
           (info().name.includes("Кейс-чемпионат MIR")) {
-          <a href="https://case-champ.ru/corporate#rec1176757836">
-            <app-button
-              [disabled]="!!registerDateExpired"
-              [style.opacity]="registerDateExpired ? '0.5' : '1'"
-              appearance="outline"
-              size="medium"
-              customTypographyClass="text-body-12"
-            >
+          <a
+            (click)="checkPrograRegistrationEnded($event)"
+            href="https://case-champ.ru/corporate#rec1176757836"
+          >
+            <app-button appearance="outline" size="medium" customTypographyClass="text-body-12">
               зарегистрироваться
             </app-button>
           </a>
           } @else if (info().registrationLink) {
-          <a [href]="info().registrationLink">
-            <app-button
-              [disabled]="!!registerDateExpired"
-              [style.opacity]="registerDateExpired ? '0.5' : '1'"
-              appearance="outline"
-              size="medium"
-              customTypographyClass="text-body-12"
-            >
+          <a (click)="checkPrograRegistrationEnded($event)" [href]="info().registrationLink">
+            <app-button appearance="outline" size="medium" customTypographyClass="text-body-12">
               зарегистрироваться
             </app-button>
           </a>
           } @else {
-          <a [routerLink]="['/office/program', info().id, 'register']">
-            <app-button
-              [disabled]="!!registerDateExpired"
-              [style.opacity]="registerDateExpired ? '0.5' : '1'"
-              appearance="outline"
-              size="medium"
-              customTypographyClass="text-body-12"
-            >
+          <a (click)="checkPrograRegistrationEnded($event)">
+            <app-button appearance="outline" size="medium" customTypographyClass="text-body-12">
               зарегистрироваться
             </app-button>
           </a>
@@ -310,6 +295,19 @@
               </app-button>
             </div>
           </app-modal>
+
+          <app-modal
+            [open]="isProgramEndedModalOpen()"
+            (openChange)="isProgramEndedModalOpen.set(!isProgramEndedModalOpen())"
+          >
+            <div class="cancel" style="padding: 24px">
+              <div class="cancel__top">
+                <p class="cancel__title text-body-14">к сожалению, программа уже завершена!</p>
+              </div>
+
+              <i appIcon icon="sad-smile" appSquare="50" style="margin-top: 36px"></i>
+            </div>
+          </app-modal>
         </ng-template>
 
         <ng-template #projectTpl>

projects/social_platform/src/app/office/features/detail/detail.component.ts

@@ -103,6 +103,7 @@ export class DeatilComponent implements OnInit, OnDestroy {
   // Переменные для работы с модалками
   isAssignProjectToProgramModalOpen = signal(false);
   showSubmitProjectModal = signal(false);
+  isProgramEndedModalOpen = signal(false);
   isLeaveProjectModalOpen = false; // Флаг модального окна выхода
   isEditDisable = false; // Флаг недоступности редактирования
   isEditDisableModal = false; // Флаг недоступности редактирования для модалки
@@ -156,7 +157,9 @@ export class DeatilComponent implements OnInit, OnDestroy {
   }
 
   get isProjectAssigned() {
-    return !!this.memberProjects.find(project => project.leader === this.profile?.id);
+    return !!this.memberProjects.find(
+      project => project.leader === this.profile?.id && project.partnerProgram
+    );
   }
 
   // Методы для управления состоянием ошибок через сервис
@@ -369,6 +372,24 @@ export class DeatilComponent implements OnInit, OnDestroy {
     }
   }
 
+  /**
+   * Проверка завершения программы перед регистрацией
+   */
+  checkPrograRegistrationEnded(event: Event): void {
+    const program = this.info();
+
+    if (
+      program?.datetimeRegistrationEnds &&
+      Date.now() > Date.parse(program.datetimeRegistrationEnds)
+    ) {
+      event.preventDefault();
+      event.stopPropagation();
+      this.isProgramEndedModalOpen.set(true);
+    } else {
+      this.router.navigateByUrl("/office/program/" + this.info().id + "/register");
+    }
+  }
+
   /**
    * Обновляет состояния страниц на основе URL
    */

projects/social_platform/src/app/office/features/info-card/info-card.component.html

@@ -169,7 +169,16 @@
           }
         </p>
       </div>
-      } }
+      } } @else {
+      <app-button
+        [routerLink]="'/office/projects/' + info?.id"
+        customTypographyClass="text-body-6"
+        size="extra-small"
+        class="card__info--text"
+      >
+        проект
+      </app-button>
+      }
     </div>
     } @else if (type === 'members') { @if (leaderId === loggedUserId && loggedUserId !==
     info?.userId) {

projects/social_platform/src/app/office/features/news-card/news-card.component.html

@@ -7,7 +7,9 @@
         [src]="feedItem.imageAddress || placeholderUrl"
         [alt]="feedItem.name"
       />
-      <p class="card__name text-body-10">{{ feedItem.name }}</p>
+      <p class="card__name text-body-10">
+        {{ feedItem.name.length > 30 ? feedItem.name.slice(0, 26) + "..." : feedItem.name }}
+      </p>
     </a>
     @if (isOwner) {
     <div class="card__menu" (clickOutside)="onCloseMenu()">
@@ -28,7 +30,7 @@
   @if (feedItem.text) {
   <div class="card__text text-body-10">
     @if (!editMode) {
-    <p class="text-body-10" #newsTextEl [innerHTML]="feedItem.text | parseLinks"></p>
+    <p class="text-body-10" #newsTextEl [innerHTML]="feedItem.text | parseLinks | parseBreaks"></p>
     } @else { @if (editForm.get("text"); as text) {
     <app-textarea size="big" [formControl]="text | formControl"></app-textarea>
     } }

projects/social_platform/src/app/office/features/news-card/news-card.component.ts

@@ -14,7 +14,13 @@ import { FeedNews } from "@office/projects/models/project-news.model";
 import { SnackbarService } from "@ui/services/snackbar.service";
 import { ActivatedRoute, RouterLink } from "@angular/router";
 import { FormBuilder, FormGroup, ReactiveFormsModule, Validators } from "@angular/forms";
-import { DayjsPipe, FormControlPipe, ParseLinksPipe, ValidationService } from "projects/core";
+import {
+  DayjsPipe,
+  FormControlPipe,
+  ParseBreaksPipe,
+  ParseLinksPipe,
+  ValidationService,
+} from "projects/core";
 import { FileService } from "@core/services/file.service";
 import { nanoid } from "nanoid";
 import { expandElement } from "@utils/expand-element";
@@ -50,6 +56,7 @@ import { ImgCardComponent } from "@office/shared/img-card/img-card.component";
     DayjsPipe,
     FormControlPipe,
     ParseLinksPipe,
+    ParseBreaksPipe,
     CarouselComponent,
     ImgCardComponent,
   ],

projects/social_platform/src/app/office/feed/feed.component.html

@@ -2,8 +2,9 @@
 
 <div class="page">
   <app-feed-filter class="page__filter"></app-feed-filter>
-  <div #feedRoot class="page__feed">
-    @for (item of feedItems(); track item.content.id) { @if (item.typeModel === "vacancy") {
+  <div #feedRoot class="page__feed" [style.column-count]="feedItems().length > 0 ? '2' : '1'">
+    @if (feedItems().length > 0) { @for (item of feedItems(); track item.content.id) { @if
+    (item.typeModel === "vacancy") {
     <app-open-vacancy
       class="page__item"
       [attr.data-id]="item.content.id"
@@ -35,6 +36,11 @@
       [resourceLink]="['/office/projects', item.content.contentObject.id]"
       (like)="onLike($event)"
     ></app-news-card>
-    } } }
+    } } } } @else {
+    <div class="page__feed--no-items">
+      <i appIcon icon="empty-chat" appSquare="38"></i>
+      <p class="text-body-12">в данном разделе пока нет новостей</p>
+    </div>
+    }
   </div>
 </div>

projects/social_platform/src/app/office/feed/feed.component.scss

@@ -9,6 +9,20 @@
   &__feed {
     column-count: 2;
     column-gap: 20px;
+
+    &--no-items {
+      display: flex;
+      flex-direction: column;
+      gap: 20px;
+      align-items: center;
+      justify-content: center;
+      margin-top: 70px;
+
+      i,
+      p {
+        color: var(--grey-for-text);
+      }
+    }
   }
 
   &__item {

projects/social_platform/src/app/office/feed/feed.component.ts

@@ -23,16 +23,19 @@ import { ProfileNewsService } from "@office/profile/detail/services/profile-news
 import { FeedFilterComponent } from "@office/feed/filter/feed-filter.component";
 import { NewsCardComponent } from "@office/features/news-card/news-card.component";
 import { OpenVacancyComponent } from "./shared/open-vacancy/open-vacancy.component";
+import { IconComponent } from "@ui/components";
 
 @Component({
   selector: "app-feed",
   standalone: true,
   imports: [
     CommonModule,
+    IconComponent,
     NewProjectComponent,
     FeedFilterComponent,
     NewsCardComponent,
     OpenVacancyComponent,
+    IconComponent,
   ],
   changeDetection: ChangeDetectionStrategy.OnPush,
   templateUrl: "./feed.component.html",

projects/social_platform/src/app/office/feed/shared/new-project/new-project.component.html

@@ -11,7 +11,9 @@
 
     <div class="card__info">
       <div class="card__info--main">
-        <p class="text-body-12">{{ feedItem.name }}</p>
+        <p class="text-body-12">
+          {{ feedItem.name.length > 30 ? feedItem.name.slice(0, 26) + "..." : feedItem.name }}
+        </p>
         <!-- <p class="text-body-10">{{ feedItem.datetimeCreated | dayjs: "format":"DD MM YY" }}</p> -->
       </div>