fix design in onboarding & skills trajectory

Awakich · Awakich · commit 66bb77f6d3b7 · 2025-06-23T15:44:10.000+03:00
diff --git a/projects/skills/src/app/app.component.ts b/projects/skills/src/app/app.component.ts
@@ -37,10 +37,10 @@ export class AppComponent implements OnInit {
   title = "skills";
   navItems = [
     // { name: "Навыки", icon: "lib", link: "skills" },
+    { name: "Старт в карьеру", icon: "trackcar", link: "trackCar" },
+    { name: "Траектории", icon: "receipt", link: "subscription" },
     { name: "Рейтинг", icon: "growth", link: "rating" },
-    { name: "Подписка", icon: "receipt", link: "subscription" },
     // { name: "Траектория бизнеса", icon: "trackbuss", link: "trackBuss" },
-    { name: "Траектория карьеры", icon: "trackcar", link: "trackCar" },
     // { name: "Вебинары", icon: "webinars", link: "webinars" },
   ];
 
diff --git a/projects/skills/src/app/profile/shared/personal-skill-card/personal-skill-card.component.scss b/projects/skills/src/app/profile/shared/personal-skill-card/personal-skill-card.component.scss
@@ -22,7 +22,6 @@
 
   &__name {
     color: var(--black);
-    text-decoration: underline;
 
     @include typography.heading-4;
 
diff --git a/projects/skills/src/app/profile/shared/skills-block/skills-block.component.scss b/projects/skills/src/app/profile/shared/skills-block/skills-block.component.scss
@@ -4,7 +4,7 @@
 .skills {
   &__main {
     position: relative;
-    min-height: 235px;
+    min-height: 345px;
     padding: 20px;
     margin-bottom: 18px;
     background-color: var(--white);
diff --git a/projects/skills/src/app/trajectories/track-career/detail/info/info.component.scss b/projects/skills/src/app/trajectories/track-career/detail/info/info.component.scss
@@ -164,7 +164,7 @@
       flex-direction: column;
       align-items: center;
       justify-content: space-between;
-      padding: 10px;
+      padding: 10px 25px;
       background-color: var(--white);
       border: 1px solid var(--grey-button);
       border-radius: 15px;
diff --git a/projects/skills/src/app/trajectories/track-career/shared/trajectory/trajectory.component.html b/projects/skills/src/app/trajectories/track-career/shared/trajectory/trajectory.component.html
@@ -218,8 +218,8 @@ <h4 class="confirm__title text-heading-4">У вас уже есть активн
           customTypographyClass="text-body-12"
           [color]="'grey'"
           style="width: 100%"
-          (click)="activatedModalOpen.set(false)"
-          >Назад</app-button
+          (click)="onCloseModalActiveTrajectory()"
+          >Перейти</app-button
         >
       </div>
     </div>
diff --git a/projects/skills/src/app/trajectories/track-career/shared/trajectory/trajectory.component.ts b/projects/skills/src/app/trajectories/track-career/shared/trajectory/trajectory.component.ts
@@ -137,6 +137,11 @@ export class TrajectoryComponent implements AfterViewInit, OnInit {
     });
   }
 
+  onCloseModalActiveTrajectory() {
+    this.activatedModalOpen.set(false);
+    this.router.navigate(["/trackCar/my"]);
+  }
+
   onExpandDescription(elem: HTMLElement, expandedClass: string, isExpanded: boolean): void {
     expandElement(elem, expandedClass, isExpanded);
     this.readFullDescription = !isExpanded;
diff --git a/projects/social_platform/src/app/auth/register/register.component.html b/projects/social_platform/src/app/auth/register/register.component.html
@@ -10,7 +10,8 @@ <h3 class="auth__title auth__title--register">
       </ng-container>
       } @else if (step === "info") {
       <ng-container>
-        PROCOLLAB - это не только платформа, но и сообщество самых заряженных школьников и студентов
+        PROCOLLAB — твой путь к первой работе, давай начнем создавать твое первое резюме прямо
+        сейчас
       </ng-container>
       }
     </h3>
@@ -19,7 +20,7 @@ <h3 class="auth__title auth__title--register">
       <ng-container> Для регистрации введите данные </ng-container>
       } @else if (step === "info") {
       <ng-container>
-        Начни заполнять данные, которые в дальнейшем станут основой твоего резюме
+        <!-- Начни заполнять данные, которые в дальнейшем станут основой твоего резюме -->
       </ng-container>
       }
     </p>
@@ -253,7 +254,7 @@ <h3 class="auth__title auth__title--register">
     <app-button type="submit" class="auth__button" customTypographyClass="auth__button-typography">
       Далее
     </app-button>
-    } @else if ("info") {
+    } @else if (step === "info") {
     <app-button [loader]="registerIsSubmitting" type="submit" class="auth__button">
       Создать аккаунт
     </app-button>
diff --git a/projects/social_platform/src/app/office/onboarding/stage-one/stage-one.component.html b/projects/social_platform/src/app/office/onboarding/stage-one/stage-one.component.html
@@ -2,7 +2,7 @@
 
 <div class="page">
   <div class="auth__greeting">
-    <h3 class="auth__title">Заполни данные о своей специальности</h3>
+    <h3 class="auth__title">Кем хочешь работать?</h3>
     <!-- <p class="auth__info">
       Для того, чтобы участники понимали с кем общаются и платформа могла рекомендовать тебя на
       самые подходящие вакансии
diff --git a/projects/social_platform/src/app/office/onboarding/stage-two/stage-two.component.html b/projects/social_platform/src/app/office/onboarding/stage-two/stage-two.component.html
@@ -2,7 +2,7 @@
 
 <div class="page">
   <div class="auth__greeting">
-    <h3 class="auth__title">Заполни данные о своих навыках</h3>
+    <h3 class="auth__title">Расскажи, что умеешь</h3>
     <!-- <p class="auth__info">
       Для того, чтобы участники понимали с кем общаются и платформа могла рекомендовать тебя на
       самые подходящие вакансии
diff --git a/projects/social_platform/src/app/office/onboarding/stage-zero/stage-zero.component.html b/projects/social_platform/src/app/office/onboarding/stage-zero/stage-zero.component.html
@@ -3,13 +3,8 @@
 @if (profile) {
 <div class="page">
   <div class="auth__greeting">
-    <h3 class="auth__title">
-      Добро пожаловать, {{ profile.firstName }} {{ profile.lastName }}! ✌️
-    </h3>
-    <p class="auth__info">
-      Заполни уточняющие данные о себе, которые помогут сформировать сильное резюме и будут отражать
-      твой опыт.
-    </p>
+    <h3 class="auth__title">Привет, {{ profile.firstName }} {{ profile.lastName }}! ✌️</h3>
+    <p class="auth__info">Расскажи о себе, чтобы твое резюме было сильным и отражало твой опыт.</p>
   </div>
   <form [formGroup]="stageForm" class="page__form" (submit)="onSubmit()">
     <div class="page__first-row">
@@ -35,7 +30,7 @@ <h3 class="auth__title">
           id="city"
           [error]="city | controlError"
           type="text"
-          placeholder="Откуда ты"
+          placeholder="Где живешь?"
           formControlName="city"
         ></app-input>
         @if (city | controlError: "required") {
@@ -50,6 +45,25 @@ <h3 class="auth__title">
     <div class="page__first-row">
       <p class="text-bold-body-14">Образование</p>
 
+      @if (stageForm.get("educationLevel"); as educationLevel) {
+      <fieldset>
+        <label for="educationLevel" class="field-label">Уровень образования</label>
+        <app-select
+          [selectedId]="selectedEducationLevelId()"
+          formControlName="educationLevel"
+          placeholder="Высшее образование-магистратура"
+          [options]="educationLevelList"
+        >
+          <i appIcon icon="arrow-no-body" appSquare="32"></i>
+        </app-select>
+        @if (educationLevel | controlError: "required") {
+        <div class="text-body-14 error">
+          {{ errorMessage.VALIDATION_REQUIRED }}
+        </div>
+        }
+      </fieldset>
+      }
+
       <div class="page__years">
         @if (stageForm.get("entryYear"); as entryYear) {
         <fieldset class="years__left">
@@ -94,7 +108,7 @@ <h3 class="auth__title">
           id="organizationName"
           [error]="organizationName | controlError"
           type="text"
-          placeholder="вуз / коллежд / школа"
+          placeholder="вуз / колледж / школа"
           formControlName="organizationName"
         ></app-input>
         @if (organizationName | controlError: "required") {
@@ -103,23 +117,6 @@ <h3 class="auth__title">
         </div>
         }
       </fieldset>
-      } @if (stageForm.get("educationLevel"); as educationLevel) {
-      <fieldset>
-        <label for="educationLevel" class="field-label">Уровень образования</label>
-        <app-select
-          [selectedId]="selectedEducationLevelId()"
-          formControlName="educationLevel"
-          placeholder="Высшее образование-магистратура"
-          [options]="educationLevelList"
-        >
-          <i appIcon icon="arrow-no-body" appSquare="32"></i>
-        </app-select>
-        @if (educationLevel | controlError: "required") {
-        <div class="text-body-14 error">
-          {{ errorMessage.VALIDATION_REQUIRED }}
-        </div>
-        }
-      </fieldset>
       } @if (stageForm.get("educationStatus"); as educationStatus) {
       <fieldset>
         <label for="educationStatus" class="field-label">Должность</label>
@@ -139,7 +136,7 @@ <h3 class="auth__title">
       </fieldset>
       } @if (stageForm.get("description"); as description) {
       <fieldset class="page__field">
-        <label for="description" class="field-label">Краткое описание</label>
+        <label for="description" class="field-label">Профиль обучения</label>
         <app-input
           id="description"
           [error]="description | controlError"
@@ -203,6 +200,25 @@ <h3 class="auth__title">
 
     <div class="page__first-row">
       <p class="text-bold-body-14">Место работы</p>
+
+      @if (stageForm.get("organizationNameWork"); as organizationNameWork) {
+      <fieldset>
+        <label for="organizationNameWork" class="field-label">Название</label>
+        <app-input
+          id="organizationNameWork"
+          [error]="organizationNameWork | controlError"
+          type="text"
+          placeholder="Проколлаб"
+          formControlName="organizationNameWork"
+        ></app-input>
+        @if (organizationNameWork | controlError: "required") {
+        <div class="text-body-14 error">
+          {{ errorMessage.VALIDATION_REQUIRED }}
+        </div>
+        }
+      </fieldset>
+      }
+
       <div class="page__years">
         @if (stageForm.get("entryYearWork"); as entryYearWork) {
         <fieldset class="years__left">
@@ -243,23 +259,7 @@ <h3 class="auth__title">
         }
       </div>
 
-      @if (stageForm.get("organizationNameWork"); as organizationNameWork) {
-      <fieldset>
-        <label for="organizationNameWork" class="field-label">Название</label>
-        <app-input
-          id="organizationNameWork"
-          [error]="organizationNameWork | controlError"
-          type="text"
-          placeholder="Проколлаб"
-          formControlName="organizationNameWork"
-        ></app-input>
-        @if (organizationNameWork | controlError: "required") {
-        <div class="text-body-14 error">
-          {{ errorMessage.VALIDATION_REQUIRED }}
-        </div>
-        }
-      </fieldset>
-      } @if (stageForm.get("jobPosition"); as jobPosition) {
+      @if (stageForm.get("jobPosition"); as jobPosition) {
       <fieldset>
         <label for="jobPosition" class="field-label">Должность</label>
         <app-input
diff --git a/projects/social_platform/src/app/office/profile/edit/edit.component.html b/projects/social_platform/src/app/office/profile/edit/edit.component.html
@@ -485,7 +485,7 @@
         </fieldset>
         } @if (profileForm.get("descriptionWork"); as descriptionWork) {
         <fieldset>
-          <label for="descriptionWork" class="field-label">Краткое описание</label>
+          <label for="descriptionWork" class="field-label">Профиль обучения</label>
           <app-input
             id="descriptionWork"
             [error]="descriptionWork | controlError"
