Merge pull request #255 from PROCOLLAB-github/news-field-fix

News field fix

Author: Awakich

projects/social_platform/src/app/office/features/news-form/news-form.component.html

@@ -2,17 +2,16 @@
 
 <form class="form" [formGroup]="messageForm" (ngSubmit)="onSubmit()">
   <div class="form__row">
-    <app-input
+    <app-textarea
       size="big"
       formControlName="text"
-      [hasBorder]="false"
       class="form__input text-body-12"
       autosize
       placeholder="сегодня был хороший день"
       (paste)="onPaste($event)"
       (keydown.meta.enter)="onSubmit()"
       [maxLength]="15940"
-    ></app-input>
+    ></app-textarea>
     <i appIcon icon="send" appSquare="12" class="form__send" (click)="onSubmit()"></i>
   </div>
   <div class="form__images">

projects/social_platform/src/app/office/features/news-form/news-form.component.scss

@@ -8,11 +8,18 @@
     display: flex;
     align-items: center;
 
-    ::ng-deep app-input {
-      input {
+    ::ng-deep app-textarea {
+      textarea {
         width: 100%;
-        background-color: transparent;
-        border-bottom: 0.5px solid var(--medium-grey-for-outline);
+        min-height: 50px;
+        padding: 0 0 10px 8px;
+        background: transparent;
+        border: none;
+
+        &:focus {
+          border: none;
+          box-shadow: none;
+        }
       }
     }
 

projects/social_platform/src/app/office/features/news-form/news-form.component.ts

@@ -10,6 +10,7 @@ import { FileUploadItemComponent } from "@ui/components/file-upload-item/file-up
 import { IconComponent, InputComponent } from "@ui/components";
 import { AutosizeModule } from "ngx-autosize";
 import { ImgCardComponent } from "@office/shared/img-card/img-card.component";
+import { TextareaComponent } from "@ui/components/textarea/textarea.component";
 
 /**
  * Компонент формы создания новости
@@ -42,6 +43,7 @@ import { ImgCardComponent } from "@office/shared/img-card/img-card.component";
     FileUploadItemComponent,
     InputComponent,
     ImgCardComponent,
+    TextareaComponent,
   ],
 })
 export class NewsFormComponent implements OnInit {

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

@@ -78,7 +78,6 @@ export class OfficeComponent implements OnInit, OnDestroy {
   showRegisteredProgramModal = signal<boolean>(false);
 
   registeredProgramToShow?: Program | null = null;
-  private pendingRegisteredModalCheck = false;
 
   inviteErrorModal = false;
 
@@ -152,8 +151,6 @@ export class OfficeComponent implements OnInit, OnDestroy {
   onAcceptWaitVerification() {
     this.waitVerificationAccepted = true;
     localStorage.setItem("waitVerificationAccepted", "true");
-    this.pendingRegisteredModalCheck = true;
-    this.tryShowRegisteredProgramModal();
   }
 
   onRejectInvite(inviteId: number): void {
@@ -196,24 +193,17 @@ export class OfficeComponent implements OnInit, OnDestroy {
   }
 
   private tryShowRegisteredProgramModal(): void {
-    if (!this.pendingRegisteredModalCheck) return;
-
     const programs = this.programs();
     if (!programs || programs.length === 0) return;
 
     const memberProgram = programs.find(p => p.isUserMember);
-    if (!memberProgram) {
-      this.pendingRegisteredModalCheck = false;
-      return;
-    }
+    if (!memberProgram) return;
 
-    if (!this.hasSeenRegisteredProgramModal(memberProgram.id)) {
-      this.registeredProgramToShow = memberProgram;
-      this.showRegisteredProgramModal.set(true);
-      this.markSeenRegisteredProgramModal(memberProgram.id);
-    }
+    if (this.hasSeenRegisteredProgramModal(memberProgram.id)) return;
 
-    this.pendingRegisteredModalCheck = false;
+    this.registeredProgramToShow = memberProgram;
+    this.showRegisteredProgramModal.set(true);
+    this.markSeenRegisteredProgramModal(memberProgram.id);
   }
 
   private getRegisteredProgramSeenKey(programId: number): string {

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

@@ -169,7 +169,7 @@ <h3 class="links__title text-body-12">материалы</h3>
 <app-modal [open]="registeredProgramModal()" (openChange)="registeredProgramModal.set(false)">
   <div class="cancel" style="width: 605px; padding: 0px 24px">
     <div class="cancel__top">
-      <p class="cancel__title text-body-14">поздравляем, с регистрацией на программу! 🎉</p>
+      <p class="cancel__title text-body-14">поздравляем с регистрацией на программу! 🎉</p>
     </div>
 
     <div class="cancel__text-block">
@@ -193,8 +193,8 @@ <h3 class="links__title text-body-12">материалы</h3>
       </p>
 
       <p class="text-body-12">
-        Будьте внимательны: по истечению дедлайна, определенного организаторами, кнопка становится
-        не кликабельной 👻
+        Будьте внимательны: по истечению дедлайна определенного организаторами, кнопка становится
+        некликабельной 👻
       </p>
     </div>
 

projects/social_platform/src/styles.scss

@@ -25,7 +25,11 @@
 @import "styles/pages/project-detail.scss";
 
 :root {
-  --app-height: 100%;
+  --app-height: 100vh;
+}
+
+html {
+  scrollbar-gutter: stable;
 }
 
 html,

projects/ui/src/lib/components/layout/profile-control-panel/profile-control-panel.component.html

@@ -8,6 +8,9 @@
         <div class="attention"></div>
         }
         <i appIcon icon="bell" appWidth="15" appHeight="17" appViewBox="0 0 15 17"></i>
+        @if (invites.length) {
+        <div class="control-panel__bell--hasInvites"></div>
+        }
       </div>
     </div>
     @if (showNotifications) {

projects/ui/src/lib/components/layout/profile-control-panel/profile-control-panel.component.scss

@@ -31,4 +31,18 @@
     z-index: 20;
     margin-top: 10px;
   }
+
+  &__bell {
+    position: relative;
+
+    &--hasInvites {
+      position: absolute;
+      top: -5%;
+      left: 0%;
+      width: 6px;
+      height: 6px;
+      background-color: var(--red);
+      border-radius: 100%;
+    }
+  }
 }