Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,11 @@
margin-bottom: 24px;
}
}

.error {
color: var(--red) !important;

i {
color: var(--red) !important;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,9 @@ export class DeatilComponent implements OnInit, OnDestroy {
}

get isProjectAssigned() {
return !!this.memberProjects.find(project => project.leader === this.profile?.id);
return !!this.memberProjects.find(
project => project.leader === this.profile?.id && project.partnerProgram
);
}

// Методы для управления состоянием ошибок через сервис
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,16 @@
}
</p>
</div>
} }
} } @else {
<app-button
[routerLink]="'/office/projects/' + info?.id"
customTypographyClass="text-body-6"
size="extra-small"
class="card__info--text"
>
проект
</app-button>
}
</div>
} @else if (type === 'members') { @if (leaderId === loggedUserId && loggedUserId !==
info?.userId) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
[src]="feedItem.imageAddress || placeholderUrl"
[alt]="feedItem.name"
/>
<p class="card__name text-body-10">{{ feedItem.name }}</p>
<p class="card__name text-body-10">
{{ feedItem.name.length > 30 ? feedItem.name.slice(0, 26) + "..." : feedItem.name }}
</p>
</a>
@if (isOwner) {
<div class="card__menu" (clickOutside)="onCloseMenu()">
Expand All @@ -28,7 +30,7 @@
@if (feedItem.text) {
<div class="card__text text-body-10">
@if (!editMode) {
<p class="text-body-10" #newsTextEl [innerHTML]="feedItem.text | parseLinks"></p>
<p class="text-body-10" #newsTextEl [innerHTML]="feedItem.text | parseLinks | parseBreaks"></p>
} @else { @if (editForm.get("text"); as text) {
<app-textarea size="big" [formControl]="text | formControl"></app-textarea>
} }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,13 @@ import { FeedNews } from "@office/projects/models/project-news.model";
import { SnackbarService } from "@ui/services/snackbar.service";
import { ActivatedRoute, RouterLink } from "@angular/router";
import { FormBuilder, FormGroup, ReactiveFormsModule, Validators } from "@angular/forms";
import { DayjsPipe, FormControlPipe, ParseLinksPipe, ValidationService } from "projects/core";
import {
DayjsPipe,
FormControlPipe,
ParseBreaksPipe,
ParseLinksPipe,
ValidationService,
} from "projects/core";
import { FileService } from "@core/services/file.service";
import { nanoid } from "nanoid";
import { expandElement } from "@utils/expand-element";
Expand Down Expand Up @@ -50,6 +56,7 @@ import { ImgCardComponent } from "@office/shared/img-card/img-card.component";
DayjsPipe,
FormControlPipe,
ParseLinksPipe,
ParseBreaksPipe,
CarouselComponent,
ImgCardComponent,
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@

<div class="card__info">
<div class="card__info--main">
<p class="text-body-12">{{ feedItem.name }}</p>
<p class="text-body-12">
{{ feedItem.name.length > 30 ? feedItem.name.slice(0, 26) + "..." : feedItem.name }}
</p>
<!-- <p class="text-body-10">{{ feedItem.datetimeCreated | dayjs: "format":"DD MM YY" }}</p> -->
</div>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,8 @@
&__description {
margin-top: 7px;
color: var(--white);
word-break: break-word;
overflow-wrap: anywhere;
white-space: wrap;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@
alt="newsItem.name"
></app-avatar>

<p class="text-body-12">{{ project.name }}</p>
<p class="text-body-12">
{{ project.name.length > 30 ? project.name.slice(0, 26) + "..." : project.name }}
</p>

@if (industryService.industries | async; as industries) { @if
(industryService.getIndustry(industries, project.industry); as industry) {
Expand All @@ -29,7 +31,9 @@
} @if (feedItem; as vacancy) {
<div class="card__vacancy">
<div class="lists__section">
<h3 class="text-body-10 lists__title">{{ vacancy.role }}</h3>
<h3 class="text-body-10 lists__title">
{{ vacancy.role.length > 30 ? vacancy.role.slice(0, 26) + "..." : vacancy.role }}
</h3>
<p class="text-body-10">{{ vacancy.datetimeCreated | dayjs: "format":"DD MM YY" }}</p>
</div>

Expand Down Expand Up @@ -57,7 +61,7 @@ <h3 class="text-body-10 lists__title">{{ vacancy.role }}</h3>
</div>
} @if (skillsLength > 8) {
<div class="read-more text-body-10" (click)="readFullSkills = !readFullSkills">
{{ readFullSkills ? "cкрыть" : "xитать полностью" }}
{{ readFullSkills ? "cкрыть" : "подробнее" }}
</div>
} }
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,9 @@
}

&__description {
overflow-wrap: break-word;
white-space: pre-wrap;
word-break: break-word;
overflow-wrap: anywhere;
white-space: wrap;
}

&__project {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -192,11 +192,3 @@ i {
text-align: center;
}
}

.error {
color: var(--red) !important;

i {
color: var(--red) !important;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,9 @@

&__text {
color: var(--grey-for-text);
word-break: break-word;
overflow-wrap: anywhere;
white-space: wrap;
}
}

Expand Down Expand Up @@ -378,7 +381,3 @@
text-align: center;
}
}

.error {
color: var(--red) !important;
}
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ export class ProfileEditComponent implements OnInit, OnDestroy, AfterViewInit {
organizationName: ["", Validators.max(100)],
entryYear: [null],
completionYear: [null],
description: [null, Validators.max(1000)],
description: [null, Validators.max(400)],
educationLevel: [null],
educationStatus: [""],
isMospolytechStudent: [false],
Expand All @@ -155,17 +155,17 @@ export class ProfileEditComponent implements OnInit, OnDestroy, AfterViewInit {
achievements: this.fb.array([]),

// work
organization: ["", Validators.max(100)],
organization: ["", Validators.maxLength(50)],
entryYearWork: [null],
completionYearWork: [null],
descriptionWork: [null, Validators.max(1000)],
descriptionWork: [null, Validators.maxLength(400)],
jobPosition: [""],

// skills
speciality: ["", [Validators.required]],
skills: [[]],
avatar: [""],
aboutMe: [""],
aboutMe: ["", Validators.maxLength(300)],
typeSpecific: this.fb.group({}),
});
}
Expand Down Expand Up @@ -419,7 +419,7 @@ export class ProfileEditComponent implements OnInit, OnDestroy, AfterViewInit {
| "settings";
}

readonly yearListEducation = generateOptionsList(55, "years");
readonly yearListEducation = generateOptionsList(55, "years").reverse();

readonly educationStatusList = educationUserType;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
}
</fieldset>
}
<app-button size="medium" (click)="onSubmit()">Зарегистрироваться в программе</app-button>
<app-button size="big" (click)="onSubmit()">Зарегистрироваться в программе</app-button>
</form>
}
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@ export class ProjectFormService {
links: this.fb.array([]),
link: ["", Validators.pattern(/^(https?:\/\/)/)],
industryId: [undefined, [Validators.required]],
description: ["", [Validators.required]],
description: ["", [Validators.required, Validators.maxLength(800)]],
presentationAddress: ["", [Validators.required]],
coverImageAddress: ["", [Validators.required]],
actuality: ["", [Validators.maxLength(1000)]],
targetAudience: ["", [Validators.required, Validators.maxLength(500)]],
problem: ["", [Validators.required, Validators.maxLength(1000)]],
actuality: ["", [Validators.maxLength(400)]],
targetAudience: ["", [Validators.required, Validators.maxLength(400)]],
problem: ["", [Validators.required, Validators.maxLength(400)]],
partnerProgramId: [null],
achievements: this.fb.array([]),
title: [""],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,3 @@
}
}
}

.error {
i {
color: var(--red) !important;
}

color: var(--red) !important;
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { CommonModule } from "@angular/common";
import { Component, inject, Input } from "@angular/core";
import { FormArray, FormBuilder, FormGroup, ReactiveFormsModule, Validators } from "@angular/forms";
import { InputComponent, ButtonComponent } from "@ui/components";
import { LinkCardComponent } from "@office/shared/link-card/link-card.component";
import { ControlErrorPipe } from "@corelib";
import { ErrorMessage } from "@error/models/error-message";
import { ProjectFormService } from "../../services/project-form.service";
Expand All @@ -22,7 +21,6 @@ import { IconComponent } from "@uilib";
InputComponent,
ButtonComponent,
IconComponent,
LinkCardComponent,
ControlErrorPipe,
],
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -160,11 +160,3 @@
display: block;
}
}

.error {
i {
color: var(--red) !important;
}

color: var(--red) !important;
}
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@
<fieldset class="project__description">
<label for="description" class="field-label text-body-12">информация</label>
<app-textarea
[style.overflow-y]="description.value.length > 400 ? 'auto' : 'none'"
size="big"
id="description"
[haveHint]="true"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -134,14 +134,6 @@
}
}

.error {
i {
color: var(--red) !important;
}

color: var(--red) !important;
}

.cancel {
display: flex;
flex-direction: column;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
/** @format */

import {
Component,
Input,
Output,
EventEmitter,
inject,
OnInit,
OnDestroy,
signal,
} from "@angular/core";
import { Component, Input, inject, OnInit, OnDestroy, signal } from "@angular/core";
import {
FormArray,
FormBuilder,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,3 @@
display: block;
}
}

.error {
i {
color: var(--red) !important;
}

color: var(--red) !important;
}
Original file line number Diff line number Diff line change
Expand Up @@ -128,14 +128,6 @@
}
}

.error {
i {
color: var(--red) !important;
}

color: var(--red) !important;
}

.vacancy {
&__submit {
display: block;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,14 +93,6 @@
}
}

.error {
i {
color: var(--red) !important;
}

color: var(--red) !important;
}

.vacancies {
display: flex;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -306,11 +306,3 @@ $succeed-modal-width: 310px;
width: $succeed-modal-width;
}
}

.error {
color: var(--red);

i {
color: var(--red);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@

<div class="filter__salary">
<span class="text-body-12">заработная плата</span>
<li class="text-body-12 filter__checkbox">
<li class="text-body-12 filter__checkbox" style="cursor: not-allowed; opacity: 0.5">
<app-checkbox [checked]="currentSalary() === 'with-salary'"></app-checkbox>
с зарплатой
</li>
Expand Down
Loading
Loading