add fixes of design & change service of get users

Awakich · Awakich · commit ed5bd39e7395 · 2025-06-03T13:33:06.000+03:00
diff --git a/projects/core/src/lib/pipes/capitalize.pipe.ts b/projects/core/src/lib/pipes/capitalize.pipe.ts
@@ -0,0 +1,13 @@
+/** @format */
+
+import { Pipe } from "@angular/core";
+
+@Pipe({
+  name: "capitalize",
+  standalone: true,
+})
+export class CapitalizePipe {
+  transform(value: string): string {
+    return value.charAt(0).toUpperCase() + value.slice(1);
+  }
+}
diff --git a/projects/skills/src/app/subscription/subscription.component.scss b/projects/skills/src/app/subscription/subscription.component.scss
@@ -121,7 +121,7 @@
     margin-bottom: 24px;
     color: var(--grey-for-text);
 
-    @include typography.heading-2;
+    @include typography.heading-1;
   }
 
   &__points {
diff --git a/projects/social_platform/src/app/auth/set-password/set-password.component.html b/projects/social_platform/src/app/auth/set-password/set-password.component.html
@@ -10,10 +10,34 @@ <h1 class="auth__title">Новый пароль</h1>
         class="set-password__password"
         [error]="password | controlError"
         id="password"
-        type="password"
+        [type]="showPassword ? 'text' : 'password'"
         formControlName="password"
         placeholder="Пароль"
-      ></app-input>
+      >
+        @if(showPassword) {
+        <i
+          appIcon
+          icon="eye"
+          appSquare="24"
+          appWidth="24"
+          appHeight="24"
+          appViewBox="0 0 24 24"
+          class="icon"
+          (click)="toggleShowPassword()"
+        ></i>
+        } @else {
+        <i
+          appIcon
+          icon="eye-off"
+          appSquare="24"
+          appWidth="24"
+          appHeight="24"
+          appViewBox="0 0 24 24"
+          class="icon"
+          (click)="toggleShowPassword()"
+        ></i>
+        }
+      </app-input>
       @if (password | controlError: "required") {
       <div class="text-body-14 error">
         {{ errorMessage.VALIDATION_REQUIRED }}
diff --git a/projects/social_platform/src/app/auth/set-password/set-password.component.ts b/projects/social_platform/src/app/auth/set-password/set-password.component.ts
@@ -37,8 +37,14 @@ export class SetPasswordComponent implements OnInit {
   errorMessage = ErrorMessage;
   errorRequest = false;
 
+  showPassword = false;
+
   ngOnInit(): void {}
 
+  toggleShowPassword() {
+    this.showPassword = !this.showPassword;
+  }
+
   onSubmit() {
     const token = this.route.snapshot.queryParamMap.get("token");
 
diff --git a/projects/social_platform/src/app/office/models/vacancy.model.ts b/projects/social_platform/src/app/office/models/vacancy.model.ts
@@ -9,10 +9,10 @@ export class Vacancy {
   project!: Project;
   requiredSkills!: Skill[];
   description!: string;
-  requiredExperience!: any;
-  workFormat!: any;
-  salary!: any;
-  workSchedule!: any;
+  requiredExperience!: string;
+  workFormat!: string;
+  salary!: string;
+  workSchedule!: string;
   datetimeCreated!: string;
   datetimeUpdated!: string;
 
diff --git a/projects/social_platform/src/app/office/profile/detail/profile-detail.component.scss b/projects/social_platform/src/app/office/profile/detail/profile-detail.component.scss
@@ -59,7 +59,7 @@ $detail-bar-mb: 12px;
   &__cover {
     position: relative;
     height: 230px;
-    background: url("/assets/images/office/profile/detail/cover-new.png");
+    background: url("/assets/images/office/profile/detail/cover.png");
     background-position: top;
     background-size: cover;
     border-radius: 15px 15px 0 0;
diff --git a/projects/social_platform/src/app/office/program/detail/main/main.component.html b/projects/social_platform/src/app/office/program/detail/main/main.component.html
@@ -5,7 +5,15 @@
   <section class="program__main">
     <div class="info program__section program__info">
       <div class="info__cover">
-        <img class="info__cover" [src]="program.coverImageAddress" alt="cover" />
+        <img
+          class="info__cover"
+          [src]="
+            program.coverImageAddress
+              ? program.coverImageAddress
+              : '/assets/images/office/profile/detail/cover.png'
+          "
+          alt="cover"
+        />
         <app-avatar
           class="info__avatar"
           [url]="program.imageAddress"
diff --git a/projects/social_platform/src/app/office/program/services/program.service.ts b/projects/social_platform/src/app/office/program/services/program.service.ts
@@ -57,7 +57,7 @@ export class ProgramService {
 
   getAllMembers(programId: number, skip: number, take: number): Observable<ApiPagination<User>> {
     return this.apiService.get(
-      "/auth/users/",
+      "/auth/public-users/",
       new HttpParams({ fromObject: { partner_program: programId, limit: take, offset: skip } })
     );
   }
diff --git a/projects/social_platform/src/app/office/projects/detail/info/info.component.html b/projects/social_platform/src/app/office/projects/detail/info/info.component.html
@@ -7,11 +7,7 @@
       <div class="info__cover">
         <img
           class="info__cover"
-          [src]="
-            project.coverImageAddress
-              ? project.coverImageAddress
-              : '/assets/images/office/profile/detail/cover.png'
-          "
+          [src]="'/assets/images/office/profile/detail/cover.png'"
           alt="cover"
         />
         <app-avatar
diff --git a/projects/social_platform/src/app/office/projects/edit/edit.component.ts b/projects/social_platform/src/app/office/projects/edit/edit.component.ts
@@ -52,7 +52,6 @@ import { Observable, Subscription, concatMap, distinctUntilChanged, filter, map,
 import { InviteCardComponent } from "../../shared/invite-card/invite-card.component";
 import { VacancyCardComponent } from "../../shared/vacancy-card/vacancy-card.component";
 import { LinkCardComponent } from "@office/shared/link-card/link-card.component";
-import { title } from "process";
 
 @Component({
   selector: "app-edit",
diff --git a/projects/social_platform/src/app/office/services/member.service.ts b/projects/social_platform/src/app/office/services/member.service.ts
@@ -22,12 +22,12 @@ export class MemberService {
     if (otherParams) {
       allParams = allParams.appendAll(otherParams);
     }
-    return this.apiService.get<ApiPagination<User>>("/auth/users/", allParams);
+    return this.apiService.get<ApiPagination<User>>("/auth/public-users/", allParams);
   }
 
   getMentors(skip: number, take: number): Observable<ApiPagination<User>> {
     return this.apiService.get<ApiPagination<User>>(
-      "/auth/users",
+      "/auth/public-users/",
       new HttpParams({ fromObject: { user_type: "2,3,4", limit: take, offset: skip } })
     );
   }
diff --git a/projects/social_platform/src/app/office/shared/project-card/project-card.component.html b/projects/social_platform/src/app/office/shared/project-card/project-card.component.html
@@ -40,9 +40,9 @@
         }
       </div>
 
-      <div class="card__views">
+      <!-- <div class="card__views">
         <i appIcon icon="eye" appSquare="22"></i> {{ project.viewsCount }}
-      </div>
+      </div> -->
     </div>
     <div class="card__bottom">
       @if (project.draft) {
diff --git a/projects/social_platform/src/app/office/vacancies/detail/info/info.component.html b/projects/social_platform/src/app/office/vacancies/detail/info/info.component.html
@@ -22,31 +22,33 @@ <h3 class="text-heading-3">{{ vacancy.role }}</h3>
           <div class="vacancy__info-element vacancy__region">
             @if (project.region) {
             <i appIcon icon="geo" appWidth="11" appHeight="14"></i>
-            <span>{{ project.region }}</span>
+            <span>{{ project.region | capitalize }}</span>
             } @else {
             <span>Не указано</span>
             }
           </div>
           <div class="vacancy__info-element">
-            {{ vacancy.workFormat ? vacancy.workFormat : "Формат работы не указан" }}
+            {{ vacancy.workFormat ? (vacancy.workFormat | capitalize) : "Формат работы не указан" }}
           </div>
           <div class="vacancy__info-element">
-            {{ vacancy.workSchedule ? vacancy.workSchedule : "График не указан" }}
+            {{ vacancy.workSchedule ? (vacancy.workSchedule | capitalize) : "График не указан" }}
           </div>
         </div>
 
         <div class="info__bottom">
           <div class="vacancy__info-element">
             {{
               vacancy.salary
-                ? (vacancy.salary | salaryTransform) + " " + "рублей"
+                ? (vacancy.salary | salaryTransform | capitalize) + " " + "рублей"
                 : "Зарплата  не указана"
             }}
           </div>
           <div class="vacancy__info-element">
             {{
               vacancy.requiredExperience
-                ? "Опыт" + " " + vacancy.requiredExperience
+                ? (vacancy.requiredExperience.toLowerCase().includes("без опыта")
+                    ? ""
+                    : "Опыт" + " ") + (vacancy.requiredExperience | capitalize)
                 : "Опыт не указан"
             }}
           </div>
diff --git a/projects/social_platform/src/app/office/vacancies/detail/info/info.component.ts b/projects/social_platform/src/app/office/vacancies/detail/info/info.component.ts
@@ -27,6 +27,7 @@ import { IconComponent, SubscriptionPlansComponent } from "@uilib";
 import { expandElement } from "@utils/expand-element";
 import { SalaryTransformPipe } from "projects/core/src/lib/pipes/salary-transform.pipe";
 import { map, Subscription } from "rxjs";
+import { CapitalizePipe } from "projects/core/src/lib/pipes/capitalize.pipe";
 
 @Component({
   selector: "app-detail",
@@ -41,6 +42,7 @@ import { map, Subscription } from "rxjs";
     ParseBreaksPipe,
     ParseLinksPipe,
     SalaryTransformPipe,
+    CapitalizePipe,
   ],
   templateUrl: "./info.component.html",
   styleUrl: "./info.component.scss",
diff --git a/projects/social_platform/src/assets/images/office/profile/detail/cover-new.png b/projects/social_platform/src/assets/images/office/profile/detail/cover-new.png
diff --git a/projects/social_platform/src/assets/images/office/profile/detail/cover.png b/projects/social_platform/src/assets/images/office/profile/detail/cover.png
diff --git a/projects/ui/src/lib/components/layout/sidebar/sidebar.component.scss b/projects/ui/src/lib/components/layout/sidebar/sidebar.component.scss
@@ -72,11 +72,11 @@
       margin-right: 12px;
     }
 
-    &:not(.sidebar-nav__item--active):hover {
-      color: var(--black);
-    }
+    // &:not(.sidebar-nav__item--active):hover {
+    //   color: var(--black);
+    // }
 
-    &--active {
+    &--active, &:hover {
       color: var(--accent);
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@`
`121`	`121`	`margin-bottom: 24px;`
`122`	`122`	`color: var(--grey-for-text);`
`123`	`123`
`124`		`- @include typography.heading-2;`
	`124`	`+ @include typography.heading-1;`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`&__points {`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ export class ProgramService {`
`57`	`57`
`58`	`58`	`getAllMembers(programId: number, skip: number, take: number): Observable<ApiPagination<User>> {`
`59`	`59`	`return this.apiService.get(`
`60`		`- "/auth/users/",`
	`60`	`+ "/auth/public-users/",`
`61`	`61`	`new HttpParams({ fromObject: { partner_program: programId, limit: take, offset: skip } })`
`62`	`62`	`);`
`63`	`63`	`}`