Merge branch 'master' into kanban-board

Author: Awakich

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

@@ -239,17 +239,19 @@ <h3>Вы действительно хотите отписаться от пр
       <div class="unsubscribe-modal__buttons">
         <app-button
           color="red"
+          size="big"
           customTypographyClass="unsubscribe-modal-btn__typography"
           (click)="onUnsubscribe($event, info?.id!)"
           [disabled]="!info?.id"
         >
-          Отписаться
+          отписаться
         </app-button>
         <app-button
+          size="big"
           customTypographyClass="unsubscribe-modal-btn__typography"
           (click)="onCloseUnsubscribeModal()"
         >
-          Отменить
+          отменить
         </app-button>
       </div>
     </div>

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

@@ -118,7 +118,6 @@
   }
 
   &__name {
-    max-width: 120px;
     margin-bottom: 3px;
     overflow: hidden;
     color: var(--black);

projects/social_platform/src/app/office/features/project-rating/components/range-criterion-input/range-criterion-input.component.html

@@ -7,6 +7,7 @@
     [min]="0"
     [max]="max"
     [step]="1"
+    [disabled]="disabled"
     (input)="onInput($event)"
     (keydown)="onKeydown($event)"
     (blur)="onBlur()"

projects/social_platform/src/app/office/features/project-rating/project-rating.component.html

@@ -7,6 +7,7 @@
         class="rating__input"
         [max]="criterion.maxValue!"
         [formControlName]="criterion.id"
+        [disabled]="disabled"
       ></app-range-criterion-input>
       <label class="text-body-10">{{ criterion.name }}</label>
     </div>
@@ -15,6 +16,7 @@
       <app-boolean-criterion
         class="rating__input"
         [formControlName]="criterion.id"
+        [disabled]="disabled"
       ></app-boolean-criterion>
       <label class="text-body-10">{{ criterion.name }}</label>
     </div>

projects/social_platform/src/app/office/features/project-rating/project-rating.component.scss

@@ -11,7 +11,6 @@
   &__columns {
     display: flex;
     flex-direction: column;
-    align-items: center;
   }
 
   &__field {

projects/social_platform/src/app/office/features/project-rating/project-rating.component.ts

@@ -102,6 +102,8 @@ export class ProjectRatingComponent implements OnDestroy, ControlValueAccessor,
 
   private _disabled = false;
 
+  @Input() currentUserId!: number;
+
   /** Сигнал для хранения критериев оценки */
   _criteria = signal<ProjectRatingCriterion[]>([]);
 

projects/social_platform/src/app/office/program/detail/list/list.component.html

@@ -13,7 +13,7 @@
     </div>
 
     <div class="filter-toggle page__filter-toggle" (click)="isFilterOpen = !isFilterOpen">
-      <span>Фильтр</span>
+      <span>Фильтры</span>
       <i appIcon icon="filter" appSquare="34"></i>
     </div>
 
@@ -40,7 +40,7 @@
   @if (listType !== 'members') {
   <div class="page__create">
     <div class="page__left">
-      @if (listType === 'projects') {
+      @if (listType === 'projects' || listType === 'rating') {
       <div class="filter page__filter" [class.page__filter--open]="isFilterOpen">
         <div class="filter__overlay" (click)="isFilterOpen = false"></div>
         <div class="filter__body" #filterBody>
@@ -50,19 +50,13 @@
             (touchmove)="onSwipeMove($event)"
             (touchend)="onSwipeEnd($event)"
           ></div>
-          <app-projects-filter (closeFilter)="closeFilter()"></app-projects-filter>
+          <app-projects-filter
+            [listType]="listType"
+            (closeFilter)="closeFilter()"
+            (clear)="onClearFilters()"
+          ></app-projects-filter>
         </div>
       </div>
-      } @else {
-      <form class="filter__form" [formGroup]="filterForm">
-        <p class="text-body-12">фильтр</p>
-        <div class="filter__controls">
-          <label class="filter__tags" (click)="setValue($event)">
-            <app-checkbox [checked]="this.filterForm.get('filterTag')?.value"></app-checkbox>
-            <p class="text-body-12">проекты с оценкой</p>
-          </label>
-        </div>
-      </form>
       }
     </div>
   </div>

projects/social_platform/src/app/office/program/detail/list/list.component.scss

@@ -31,7 +31,6 @@
 
   &__list {
     display: grid;
-    flex-grow: 1;
     grid-template-columns: 1fr;
     row-gap: 50px;
     column-gap: 20px;
@@ -88,23 +87,6 @@
     }
   }
 
-  &__controls {
-    display: flex;
-    flex-direction: column;
-    gap: 14px;
-    margin-top: 18px;
-  }
-
-  &__tags {
-    display: flex;
-    gap: 12px;
-    align-items: center;
-
-    p {
-      color: var(--grey-for-text);
-    }
-  }
-
   &__bar {
     position: fixed;
     display: flex;