Merge branch 'master' into kanban-board

Author: Awakich

projects/core/src/consts/filters/feed-filter.const.ts

@@ -4,7 +4,7 @@ export const feedFilter = [
   {
     id: 1,
     name: "новости проектов",
-    value: "projects",
+    value: "project",
     icon: "projects",
   },
   {

projects/skills/src/app/app.component.scss

@@ -4,6 +4,7 @@
 .app {
   display: flex;
   height: 100%;
+  padding: 20px;
   background-color: var(--light-gray);
 
   &__wrapper {

projects/skills/src/app/profile/profile.component.ts

@@ -7,6 +7,7 @@ import { InfoBlockComponent } from "./shared/info-block/info-block.component";
 import { toSignal } from "@angular/core/rxjs-interop";
 import { map } from "rxjs";
 import { BarComponent } from "@ui/components";
+import { BarNewComponent } from "@ui/components/bar-new/bar.component";
 
 /**
  * Основной компонент профиля пользователя
@@ -20,7 +21,7 @@ import { BarComponent } from "@ui/components";
 @Component({
   selector: "app-profile",
   standalone: true,
-  imports: [CommonModule, RouterOutlet, InfoBlockComponent, BarComponent],
+  imports: [CommonModule, RouterOutlet, InfoBlockComponent, BarComponent, BarNewComponent],
   templateUrl: "./profile.component.html",
   styleUrl: "./profile.component.scss",
 })

projects/skills/src/app/profile/shared/info-block/info-block.component.html

@@ -41,8 +41,8 @@ <h1 class="info__title">{{ userData.firstName }} {{ userData.lastName }}</h1>
     {{ userData.points }} {{ userData.points | pluralize: ["балл", "балла", "баллов"] }}
   </div>
   <a href="https://app.procollab.ru/office" class="info__return">
-    <app-button customTypographyClass="text-body-14" size="big"
-      >Вернуться на procollab.ru</app-button
+    <app-button customTypographyClass="text-body-12" size="big"
+      >вернуться на procollab.ru</app-button
     >
   </a>
 </div>

projects/skills/src/app/shared/task-card/task-card.component.html

@@ -15,7 +15,7 @@ <h4 class="task__title text-body-bold-18">{{ task.name }}</h4>
   </div>
   <div class="task__right">
     @if (!status?.isDone) {
-    <app-button class="task__button">
+    <app-button class="task__button" customTypographyClass="text-body-12" type="icon">
       <i appIcon icon="arrow-no-body" appSquare="20"></i>
     </app-button>
     } @else {

projects/skills/src/app/task/subtask/subtask.component.html

@@ -38,7 +38,7 @@
       } }
 
       <app-button size="big" (click)="onCloseModal()" [color]="'primary'" style="width: 100%"
-        >Продолжить</app-button
+        >продолжить</app-button
       >
       <img alt="wave" src="assets/images/task/wave_cropped.svg" class="cancel__wave" />
     </div>
@@ -75,7 +75,7 @@
       } }
 
       <app-button size="big" (click)="onCloseModal()" [color]="'primary'" style="width: 100%"
-        >Продолжить</app-button
+        >продолжить</app-button
       >
       <img alt="wave" src="assets/images/task/wave_cropped.svg" class="cancel__wave" />
     </div>
@@ -122,7 +122,7 @@
       } }
 
       <app-button size="big" (click)="onCloseModal()" [color]="'primary'" style="width: 100%"
-        >Продолжить</app-button
+        >продолжить</app-button
       >
       <img alt="wave" src="assets/images/task/wave_cropped.svg" class="cancel__wave" />
     </div>
@@ -169,7 +169,7 @@
       } }
 
       <app-button size="big" (click)="onCloseModal()" [color]="'primary'" style="width: 100%"
-        >Продолжить</app-button
+        >продолжить</app-button
       >
       <img alt="wave" src="assets/images/task/wave_cropped.svg" class="cancel__wave" />
     </div>
@@ -216,7 +216,7 @@
       } }
 
       <app-button size="big" (click)="onCloseModal()" [color]="'primary'" style="width: 100%"
-        >Продолжить</app-button
+        >продолжить</app-button
       >
       <img alt="wave" src="assets/images/task/wave_cropped.svg" class="cancel__wave" />
     </div>
@@ -226,13 +226,15 @@
   }
 
   <div class="action">
+    <app-button size="big" class="action__button" (click)="onNext()">продолжить</app-button>
+
     <div class="action__error action__badge" [class.action__badge--open]="anyError()">
-      Вышла неточность...
+      <p class="text-body-12">вышла неточность...</p>
     </div>
+
     <div class="action__success action__badge" [class.action__badge--open]="success()">
-      Всё верно! Так держать
+      <p class="text-body-12">всё верно! так держать</p>
     </div>
-    <app-button size="big" class="action__button" (click)="onNext()">Продолжить</app-button>
   </div>
 </div>
 }

projects/skills/src/app/task/subtask/subtask.component.scss

@@ -16,6 +16,7 @@
 
 .action {
   position: relative;
+  margin-top: 20px;
 
   &__button {
     position: relative;
@@ -29,13 +30,16 @@
     bottom: 0;
     left: 0;
     display: flex;
+    display: none;
     justify-content: center;
-    padding: 15px 10px 0;
+    padding: 12px 12px 35px;
+    text-align: center;
     border-radius: var(--rounded-xl);
     transition: all 0.2s;
     transform: translateY(0%);
 
     &--open {
+      display: block;
       transform: translateY(-80%);
     }
   }

projects/skills/src/app/webinars/shared/webinar/webinar.component.html

@@ -12,10 +12,10 @@ <h3 class="text-heading-3">{{ webinar.title }}</h3>
         ></p>
         @if (descriptionExpandable) {
         <div
-          class="read-more"
+          class="read-more text-body-10"
           (click)="onExpandDescription(descEl, 'expanded', readFullDescription)"
         >
-          {{ readFullDescription ? "Скрыть" : "Читать полностью" }}
+          {{ readFullDescription ? "скрыть" : "подробнее" }}
         </div>
         }
       </div>

projects/skills/src/styles/_colors.scss

@@ -17,6 +17,7 @@
 
   // GRAY
   --white: #fafafa;
+  --light-white: #fff;
   --black: #333;
   --dark-grey: #e7e7e7;
   --gray: #d3d3d3;
@@ -27,9 +28,9 @@
   --grey-for-text: #a59fb9;
 
   // FUNCTIONAL
-  --green: #88c9a1;
-  --light-green: #97ecb8;
-  --red: #d48a9e;
+  --green: #92e3a9;
+  --light-green: #e3f8e9;
+  --red: rgb(242 66 72 / 50%);
+  --light-red: #ffd2d2;
   --red-dark: #{color.adjust(#d48a9e, $blackness: 10%)};
-  --light-red: #e8a5b7;
 }

projects/skills/src/styles/_rounded.scss

@@ -5,4 +5,5 @@
   --rounded-md: 5px;
   --rounded-lg: 8px;
   --rounded-xl: 15px;
+  --rounded-xxl: 45px;
 }