merge resolved conflicts between branches & fix some components instead

Author: Awakich

projects/core/src/consts/lists/education-info-list.const.ts

@@ -44,4 +44,9 @@ export const educationUserLevel = [
     value: "Высшее образование – аспирантура",
     label: "высшее образование – аспирантура",
   },
+  // {
+  //   id: 5,
+  //   value: "Дополнительное профессиональное образования",
+  //   label: "дополнительное профессиональное образования"
+  // },
 ];

projects/social_platform/src/app/api/analytics/analytics.service.ts

@@ -0,0 +1,61 @@
+/** @format */
+
+import { Injectable } from "@angular/core";
+
+@Injectable({
+  providedIn: "root",
+})
+export class AnalyticsService {
+  private loaded = false;
+
+  loadAnalytics(): void {
+    if (this.loaded) return;
+    if (window.location.hostname !== "app.procollab.ru") return;
+
+    this.loaded = true;
+    this.loadYandexMetrika();
+    this.loadMailRuCounter("3622531");
+
+    if (window.location.href === "https://app.procollab.ru/auth/register") {
+      this.loadMailRuCounter("3543687");
+    }
+  }
+
+  private loadYandexMetrika(): void {
+    const w = window as any;
+    w.ym =
+      w.ym ||
+      function (...args: any[]) {
+        (w.ym.a = w.ym.a || []).push(args);
+      };
+    w.ym.l = new Date().getTime();
+
+    const script = document.createElement("script");
+    script.async = true;
+    script.src = "https://cdn.jsdelivr.net/npm/yandex-metrica-watch/tag.js";
+    document.head.appendChild(script);
+
+    w.ym(91871365, "init", {
+      clickmap: true,
+      trackLinks: true,
+      accurateTrackBounce: true,
+      webvisor: true,
+      trackHash: true,
+    });
+  }
+
+  private loadMailRuCounter(id: string): void {
+    const w = window as any;
+    const tmr = (w._tmr = w._tmr || []);
+    tmr.push({ id, type: "pageView", start: new Date().getTime() });
+
+    if (document.getElementById("tmr-code")) return;
+
+    const script = document.createElement("script");
+    script.type = "text/javascript";
+    script.async = true;
+    script.id = "tmr-code";
+    script.src = "https://top-fwz1.mail.ru/js/code.js";
+    document.head.appendChild(script);
+  }
+}

projects/social_platform/src/app/api/auth/facades/auth-register.service.ts

@@ -73,4 +73,11 @@ export class AuthRegisterService {
       )
       .subscribe(state => this.register$.set(state));
   }
+
+  downloadPolicy(): void {
+    const link = document.createElement("a");
+    link.href = "/assets/downloads/auth/shared/privacy_policy_2022.docx";
+    link.download = "Политика обработки персональных данных 2022.docx";
+    link.click();
+  }
 }

projects/social_platform/src/app/api/courses/facades/lesson-info.service.ts

@@ -33,6 +33,19 @@ export class LessonInfoService {
     this.lessonUIInfoService.answerBody.set(value);
   }
 
+  onSelectTask(task: Task): void {
+    if (!this.lessonUIInfoService.isClickable(task)) return;
+
+    this.lessonUIInfoService.currentTaskId.set(task.id);
+    this.lessonUIInfoService.answerBody.set(null);
+    this.lessonUIInfoService.success.set(false);
+    this.lessonUIInfoService.hasError.set(false);
+
+    if (this.lessonUIInfoService.isComplete()) {
+      this.router.navigate(["./"], { relativeTo: this.route });
+    }
+  }
+
   onSubmitAnswer(): void {
     const task = this.lessonUIInfoService.currentTask();
     if (!task) return;
@@ -86,6 +99,7 @@ export class LessonInfoService {
 
             if (nextId) {
               this.lessonUIInfoService.currentTaskId.set(nextId);
+              this.lessonUIInfoService.activeTaskId.set(nextId);
               this.lessonUIInfoService.success.set(false);
               this.lessonUIInfoService.answerBody.set(null);
             } else {
@@ -132,6 +146,7 @@ export class LessonInfoService {
 
           if (onResultsPage && !allCompleted) {
             this.lessonUIInfoService.currentTaskId.set(nextTaskId);
+            this.lessonUIInfoService.activeTaskId.set(nextTaskId);
             setTimeout(() => {
               this.lessonUIInfoService.loading.set(false);
               this.router.navigate(["./"], { relativeTo: this.route });
@@ -143,6 +158,7 @@ export class LessonInfoService {
             }, 500);
           } else {
             this.lessonUIInfoService.currentTaskId.set(nextTaskId);
+            this.lessonUIInfoService.activeTaskId.set(nextTaskId);
             setTimeout(() => this.lessonUIInfoService.loading.set(false), 500);
           }
         },

projects/social_platform/src/app/api/courses/facades/ui/lesson-ui-info.service.ts

@@ -1,11 +1,13 @@
 /** @format */
 
-import { computed, Injectable, signal } from "@angular/core";
+import { computed, inject, Injectable, signal } from "@angular/core";
 import { CourseLesson, Task } from "@domain/courses/courses.model";
 import { AsyncState, initial, isSuccess } from "@domain/shared/async-state";
+import { CourseDetailUIInfoService } from "./course-detail-ui-info.service";
 
 @Injectable()
 export class LessonUIInfoService {
+  private readonly courseDetailUIInfoService = inject(CourseDetailUIInfoService);
   readonly lesson$ = signal<AsyncState<CourseLesson>>(initial());
   readonly submitAnswer$ = signal<AsyncState<void>>(initial());
 
@@ -16,6 +18,7 @@ export class LessonUIInfoService {
 
   readonly isComplete = signal<boolean>(false);
   readonly currentTaskId = signal<number | null>(null);
+  readonly activeTaskId = signal<number | null>(null);
 
   /** Transition loading — управляется фасадом вручную (с setTimeout delay) */
   readonly loading = signal(false);
@@ -65,4 +68,25 @@ export class LessonUIInfoService {
   isDone(task: Task): boolean {
     return task.isCompleted || this.completedTaskIds().has(task.id);
   }
+
+  readonly isViewingCompleted = computed(() => {
+    const task = this.currentTask();
+    return task ? this.isDone(task) : false;
+  });
+
+  isClickable(task: Task): boolean {
+    return this.isDone(task) || task.id === this.activeTaskId();
+  }
+
+  readonly lessonOrder = computed<number | null>(() => {
+    const lesson = this.lessonInfo();
+    const structure = this.courseDetailUIInfoService.courseStructure();
+    if (!lesson || !structure) return null;
+
+    for (const mod of structure.modules) {
+      const found = mod.lessons.find(l => l.id === lesson.id);
+      if (found) return found.order;
+    }
+    return null;
+  });
 }

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

@@ -7,3 +7,4 @@
 >
 </mat-progress-bar>
 <router-outlet></router-outlet>
+<app-cookie-consent></app-cookie-consent>

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

@@ -15,11 +15,11 @@ import {
 } from "rxjs";
 import { MatProgressBarModule } from "@angular/material/progress-bar";
 import { AsyncPipe, NgIf } from "@angular/common";
-import { TokenService } from "@corelib";
+import { LoggerService, TokenService } from "@corelib";
+import { CookieConsentComponent } from "@ui/widgets/cookie-consent/cookie-consent.component";
+import { AuthRepositoryPort } from "@domain/auth/ports/auth.repository.port";
 import { LoadingService } from "@ui/services/loading/loading.service";
-import { LoggerService } from "@core/lib/services/logger/logger.service";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
-import { AuthRepositoryPort } from "@domain/auth/ports/auth.repository.port";
 import { AppRoutes } from "@api/paths/app-routes";
 
 /**
@@ -33,7 +33,7 @@ import { AppRoutes } from "@api/paths/app-routes";
   templateUrl: "./app.component.html",
   styleUrls: ["./app.component.scss"],
   standalone: true,
-  imports: [NgIf, MatProgressBarModule, RouterOutlet, AsyncPipe],
+  imports: [NgIf, MatProgressBarModule, RouterOutlet, AsyncPipe, CookieConsentComponent],
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class AppComponent implements OnInit {

projects/social_platform/src/app/domain/program/program.model.ts

@@ -59,6 +59,7 @@ export class Program {
   isUserMember!: boolean;
   publishProjectsAfterFinish!: boolean;
   courseId!: number | null;
+  courses!: { id: number; title: string; isAvailable: boolean }[];
 
   static default(): Program {
     return {
@@ -88,6 +89,7 @@ export class Program {
       isUserManager: false,
       publishProjectsAfterFinish: false,
       courseId: null,
+      courses: [],
     };
   }
 }

projects/social_platform/src/app/domain/vacancy/ports/vacancy.repository.port.ts

@@ -20,6 +20,7 @@ export abstract class VacancyRepositoryPort {
     salary?: string,
     searchValue?: string
   ): Observable<Vacancy[]>;
+
   abstract getMyVacancies(limit: number, offset: number): Observable<VacancyResponse[]>;
   abstract getOne(vacancyId: number): Observable<Vacancy>;
   abstract postVacancy(projectId: number, vacancy: CreateVacancyDto): Observable<Vacancy>;

projects/social_platform/src/app/ui/pages/auth/register/register.component.html

@@ -273,8 +273,8 @@
       <app-checkbox [(checked)]="registerAgreement"></app-checkbox>
       <span (click)="registerAgreement.set(!registerAgreement())">
         я прочитал соглашение и даю согласие на
-        <a href="/assets/downloads/auth/shared/Политика_обработки_перс_данных_2022.docx" download
-          >обработку персональных данных</a
+        <span class="register__policy-link" (click)="downloadPolicy($event)"
+          >обработку персональных данных</span
         >
       </span>
     </div>