Merge pull request #267 from PROCOLLAB-github/fixes

Fixes

Author: Awakich

.github/workflows/deploy-dev.yml

@@ -0,0 +1,32 @@
+# @format
+
+name: Deploy to dev-stage
+
+on:
+  push:
+    branches: [dev]
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Use Node.js 18.x
+        uses: actions/setup-node@v4
+        with:
+          node-version: 18.13
+          cache: "npm"
+          cache-dependency-path: package-lock.json
+      - run: npm ci
+      - run: npm run format:check
+      - run: npm run lint:ts
+      - run: npm run build:pr
+      - name: Deploy to dev-stage
+        uses: burnett01/rsync-deployments@5.2.1
+        with:
+          switches: -avzr --delete
+          path: dist/social_platform/
+          remote_path: /home/front/app
+          remote_user: front
+          remote_key: ${{ secrets.DEPLOY_KEY_FRONT_DEV }}
+          remote_host: dev.procollab.ru

.github/workflows/pull_request.yml

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

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

@@ -6,6 +6,11 @@
 .register {
   height: 100vh;
 
+  &__policy-link {
+    color: var(--accent);
+    cursor: pointer;
+  }
+
   &__agreement {
     display: flex;
     align-items: center;

projects/social_platform/src/app/auth/register/register.component.scss

@@ -107,6 +107,14 @@ export class RegisterComponent implements OnInit {
     }
   }
 
+  downloadPolicy(event: Event): void {
+    event.stopPropagation();
+    const link = document.createElement("a");
+    link.href = "/assets/downloads/auth/shared/privacy_policy_2022.docx";
+    link.download = "Политика обработки персональных данных 2022.docx";
+    link.click();
+  }
+
   onSendForm(): void {
     if (!this.validationService.getFormValidation(this.registerForm)) {
       return;

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

@@ -68,7 +68,7 @@ export class CourseDetailComponent implements OnInit {
   }
 
   get isMobile(): boolean {
-    return this.appWidth < 920;
+    return this.appWidth < 1000;
   }
 
   get showCover(): boolean {

projects/social_platform/src/app/office/courses/detail/course-detail.component.ts

@@ -4,7 +4,7 @@
 <main class="trajectory">
   <section class="course__main">
     <div class="course__details">
-      @if (appWidth > 920) {
+      @if (appWidth > 1000) {
       <div class="course__left">
         <aside class="course__aside">
           <app-soon-card
@@ -34,7 +34,7 @@
         </div>
       </section>
 
-      @if (appWidth > 920) {
+      @if (appWidth > 1000) {
       <div class="course__right">
         <app-course-about [description]="courseDetail()!.description"></app-course-about>
       </div>

projects/social_platform/src/app/office/courses/detail/info/info.component.html

@@ -2,8 +2,8 @@
 
 @if (lessonInfo()) {
 <div class="task">
-  <div class="task__wrapper" [class.task__wrapper--mobile]="appWidth < 920">
-    @if (appWidth >= 920) {
+  <div class="task__wrapper" [class.task__wrapper--mobile]="appWidth < 1000">
+    @if (appWidth >= 1000) {
     <div class="task__tasks">
       <p class="task__name text-bold-body-14">модуль {{ lessonInfo()?.moduleOrder }}</p>
       <p class="task__lesson text-body-12">урок {{ lessonOrder() }}</p>

projects/social_platform/src/app/office/courses/lesson/lesson.component.html

@@ -5,7 +5,7 @@
     @if (info()) {
     <div class="info detail__section detail__info">
       <div class="info__cover" [class.info__cover--program]="listType === 'program'">
-        @if (appWidth > 920) {
+        @if (appWidth > 1000) {
         <img
           class="info__cover"
           [class.info__cover--program]="listType === 'program'"
@@ -24,7 +24,7 @@
           (click)="redirectDetailInfo()"
           [class.info__avatar--program]="listType === 'program'"
           [style.width]="
-            appWidth < 920
+            appWidth < 1000
               ? '105px'
               : listType === 'project' || listType === 'profile'
               ? '110px'
@@ -41,7 +41,7 @@
             [onlineBadgeBorder]="0"
             [onlineBadgeOffset]="8"
             [size]="
-              appWidth < 920 ? 105 : listType === 'project' || listType === 'profile' ? 110 : 123
+              appWidth < 1000 ? 105 : listType === 'project' || listType === 'profile' ? 110 : 123
             "
             [isOnline]="cache[info().id] !== undefined ? cache[info().id] : info().isOnline"
           ></app-avatar>
@@ -74,7 +74,7 @@
 
         <ng-template #programTpl>
           @if (userType() !== undefined) { @if ((isProjectsPage || isProjectsRatingPage) && appWidth
-          < 920) {
+          < 1000) {
           <a [routerLink]="'/office/program/' + info().id">
             <app-button
               appearance="outline"
@@ -134,7 +134,7 @@
             </a>
             } } @if (isUserMember && !isUserManager && !isUserExpert) {
             <app-button
-              [size]="appWidth > 920 ? 'medium' : 'big'"
+              [size]="appWidth > 1000 ? 'medium' : 'big'"
               [disabled]="!!submissionProjectDateExpired || isProjectAssigned"
               [appearance]="isProjectAssigned ? 'outline' : 'inline'"
               (click)="isProjectAssigned ? null : addNewProject()"
@@ -146,8 +146,8 @@
             } @if ((isUserManager || isUserExpert) && isUserMember) {
             <a [routerLink]="'/office/program/' + info().id + '/projects-rating'">
               <app-button
-                [appearance]="isProjectsRatingPage || appWidth < 920 ? 'inline' : 'outline'"
-                [size]="appWidth > 920 ? 'medium' : 'big'"
+                [appearance]="isProjectsRatingPage || appWidth < 1000 ? 'inline' : 'outline'"
+                [size]="appWidth > 1000 ? 'medium' : 'big'"
                 customTypographyClass="text-body-12"
               >
                 оценка проектов
@@ -160,18 +160,18 @@
             <app-button
               [disabled]="isUserManager"
               appearance="outline"
-              [size]="appWidth > 920 ? 'medium' : 'small'"
+              [size]="appWidth > 1000 ? 'medium' : 'small'"
               customTypographyClass="text-body-12"
             >
-              @if (appWidth > 920) {
+              @if (appWidth > 1000) {
               <span>{{
                 info().name.includes("Технолидеры Будущего")
                   ? "Каталог лучших стартапов 2022/23"
                   : isUserManager
                   ? "аналитика"
                   : "положение"
               }}</span>
-              } @if (isUserManager && appWidth > 920) {
+              } @if (isUserManager && appWidth > 1000) {
               <app-tooltip
                 [text]="'Скоро здесь будет аналитика по включенности участников и проектов'"
                 [isVisible]="isTooltipVisible"
@@ -185,16 +185,16 @@
               <i
                 appIcon
                 class="info__presentation-icon"
-                [icon]="appWidth > 920 ? 'arrow-down' : 'file'"
-                [appSquare]="appWidth > 920 ? '8' : '12'"
+                [icon]="appWidth > 1000 ? 'arrow-down' : 'file'"
+                [appSquare]="appWidth > 1000 ? '8' : '12'"
               ></i>
               }
             </app-button>
           </a>
 
-          @if (appWidth > 920) {
+          @if (appWidth > 1000) {
           <div class="info__divider"></div>
-          } @if (appWidth < 920) {
+          } @if (appWidth < 1000) {
           <app-button
             appearance="outline"
             size="small"
@@ -205,7 +205,7 @@
           >
             <i appIcon icon="phone" appSquare="12"></i>
           </app-button>
-          } @if (isUserManager || (isUserExpert && appWidth > 920)) {
+          } @if (isUserManager || (isUserExpert && appWidth > 1000)) {
           <a [routerLink]="'/office/program/' + info().id + '/projects'">
             <app-button
               [appearance]="isProjectsPage ? 'inline' : 'outline'"
@@ -216,7 +216,7 @@
               проекты-участники
             </app-button>
           </a>
-          } @if (!isUserManager && !isUserExpert && appWidth > 920) {
+          } @if (!isUserManager && !isUserExpert && appWidth > 1000) {
           <a class="info__more">
             <app-button
               appearance="outline"
@@ -227,7 +227,7 @@
               узнать подробнее
             </app-button>
           </a>
-          } @if (isUserManager || (isUserExpert && appWidth > 920)) {
+          } @if (isUserManager || (isUserExpert && appWidth > 1000)) {
           <a [routerLink]="'/office/program/' + info().id + '/members'" class="info__members">
             <app-button
               [appearance]="isMembersPage ? 'inline' : 'outline'"
@@ -238,7 +238,7 @@
               участники
             </app-button>
           </a>
-          } @if (appWidth < 920) {
+          } @if (appWidth < 1000) {
           <app-button
             appearance="outline"
             size="big"
@@ -259,10 +259,10 @@
             "
             appearance="outline"
             [disabled]="!info().courses?.length"
-            [size]="appWidth > 920 ? 'medium' : 'big'"
+            [size]="appWidth > 1000 ? 'medium' : 'big'"
             customTypographyClass="text-body-12"
           >
-            {{ appWidth > 920 ? "перейти в курс" : "курс" }}
+            {{ appWidth > 1000 ? "перейти в курс" : "курс" }}
           </app-button>
           }
 

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

@@ -539,8 +539,16 @@ export class DeatilComponent implements OnInit, OnDestroy {
         .subscribe({
           next: user => {
             this.info.set(user);
-            this.isProfileFill =
-              user.progress! < 100 ? (this.isProfileFill = true) : (this.isProfileFill = false);
+            if (
+              user.id !== undefined &&
+              user.progress! < 100 &&
+              !this.hasSeenProfileFillModal(user.id)
+            ) {
+              this.isProfileFill = true;
+              this.markSeenProfileFillModal(user.id);
+            } else {
+              this.isProfileFill = false;
+            }
           },
         });
 
@@ -556,6 +564,26 @@ export class DeatilComponent implements OnInit, OnDestroy {
     }
   }
 
+  private getProfileFillSeenKey(userId: number): string {
+    return `profile_${userId}_fill_modal_seen`;
+  }
+
+  private hasSeenProfileFillModal(userId: number): boolean {
+    try {
+      return !!localStorage.getItem(this.getProfileFillSeenKey(userId));
+    } catch (e) {
+      return false;
+    }
+  }
+
+  private markSeenProfileFillModal(userId: number): void {
+    try {
+      localStorage.setItem(this.getProfileFillSeenKey(userId), "1");
+    } catch (e) {
+      // ignore storage errors
+    }
+  }
+
   private isInProfileInfo(): void {
     const profileInfoSub$ = this.authService.profile.subscribe({
       next: profile => {