Skip to content

Commit 322008e

Browse files
committed
fix deadline field in project & design issues for program & feed
1 parent 8e616ca commit 322008e

23 files changed

Lines changed: 55 additions & 103 deletions

File tree

projects/social_platform/src/app/auth/set-password/set-password.component.scss

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,11 @@
33
margin-bottom: 24px;
44
}
55
}
6+
7+
.error {
8+
color: var(--red) !important;
9+
10+
i {
11+
color: var(--red) !important;
12+
}
13+
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,9 @@ export class DeatilComponent implements OnInit, OnDestroy {
157157
}
158158

159159
get isProjectAssigned() {
160-
return !!this.memberProjects.find(project => project.leader === this.profile?.id);
160+
return !!this.memberProjects.find(
161+
project => project.leader === this.profile?.id && project.partnerProgram
162+
);
161163
}
162164

163165
// Методы для управления состоянием ошибок через сервис

projects/social_platform/src/app/office/features/info-card/info-card.component.html

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,16 @@
169169
}
170170
</p>
171171
</div>
172-
} }
172+
} } @else {
173+
<app-button
174+
[routerLink]="'/office/projects/' + info?.id"
175+
customTypographyClass="text-body-6"
176+
size="extra-small"
177+
class="card__info--text"
178+
>
179+
проект
180+
</app-button>
181+
}
173182
</div>
174183
} @else if (type === 'members') { @if (leaderId === loggedUserId && loggedUserId !==
175184
info?.userId) {

projects/social_platform/src/app/office/feed/shared/new-project/new-project.component.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@
1111

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

projects/social_platform/src/app/office/feed/shared/new-project/new-project.component.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@
5656

5757
&__description {
5858
margin-top: 7px;
59+
white-space: wrap;
60+
overflow-wrap: anywhere;
61+
word-break: break-word;
5962
color: var(--white);
6063
}
6164
}

projects/social_platform/src/app/office/onboarding/stage-zero/stage-zero.component.scss

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -192,11 +192,3 @@ i {
192192
text-align: center;
193193
}
194194
}
195-
196-
.error {
197-
color: var(--red) !important;
198-
199-
i {
200-
color: var(--red) !important;
201-
}
202-
}

projects/social_platform/src/app/office/profile/edit/edit.component.scss

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,9 @@
296296

297297
&__text {
298298
color: var(--grey-for-text);
299+
white-space: wrap;
300+
overflow-wrap: anywhere;
301+
word-break: break-word;
299302
}
300303
}
301304

@@ -378,7 +381,3 @@
378381
text-align: center;
379382
}
380383
}
381-
382-
.error {
383-
color: var(--red) !important;
384-
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ export class ProfileEditComponent implements OnInit, OnDestroy, AfterViewInit {
132132
organizationName: ["", Validators.max(100)],
133133
entryYear: [null],
134134
completionYear: [null],
135-
description: [null, Validators.max(1000)],
135+
description: [null, Validators.max(400)],
136136
educationLevel: [null],
137137
educationStatus: [""],
138138
isMospolytechStudent: [false],
@@ -155,17 +155,17 @@ export class ProfileEditComponent implements OnInit, OnDestroy, AfterViewInit {
155155
achievements: this.fb.array([]),
156156

157157
// work
158-
organization: ["", Validators.max(100)],
158+
organization: ["", Validators.maxLength(50)],
159159
entryYearWork: [null],
160160
completionYearWork: [null],
161-
descriptionWork: [null, Validators.max(1000)],
161+
descriptionWork: [null, Validators.maxLength(400)],
162162
jobPosition: [""],
163163

164164
// skills
165165
speciality: ["", [Validators.required]],
166166
skills: [[]],
167167
avatar: [""],
168-
aboutMe: [""],
168+
aboutMe: ["", Validators.maxLength(300)],
169169
typeSpecific: this.fb.group({}),
170170
});
171171
}
@@ -419,7 +419,7 @@ export class ProfileEditComponent implements OnInit, OnDestroy, AfterViewInit {
419419
| "settings";
420420
}
421421

422-
readonly yearListEducation = generateOptionsList(55, "years");
422+
readonly yearListEducation = generateOptionsList(55, "years").reverse();
423423

424424
readonly educationStatusList = educationUserType;
425425

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
}
1919
</fieldset>
2020
}
21-
<app-button size="medium" (click)="onSubmit()">Зарегистрироваться в программе</app-button>
21+
<app-button size="big" (click)="onSubmit()">Зарегистрироваться в программе</app-button>
2222
</form>
2323
}
2424
</div>

projects/social_platform/src/app/office/projects/edit/services/project-form.service.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ export class ProjectFormService {
4747
links: this.fb.array([]),
4848
link: ["", Validators.pattern(/^(https?:\/\/)/)],
4949
industryId: [undefined, [Validators.required]],
50-
description: ["", [Validators.required]],
50+
description: ["", [Validators.required, Validators.maxLength(800)]],
5151
presentationAddress: ["", [Validators.required]],
5252
coverImageAddress: ["", [Validators.required]],
53-
actuality: ["", [Validators.maxLength(1000)]],
54-
targetAudience: ["", [Validators.required, Validators.maxLength(500)]],
55-
problem: ["", [Validators.required, Validators.maxLength(1000)]],
53+
actuality: ["", [Validators.maxLength(400)]],
54+
targetAudience: ["", [Validators.required, Validators.maxLength(400)]],
55+
problem: ["", [Validators.required, Validators.maxLength(400)]],
5656
partnerProgramId: [null],
5757
achievements: this.fb.array([]),
5858
title: [""],

0 commit comments

Comments
 (0)