Skip to content

Commit f51c1c3

Browse files
committed
change rate-project page to list page
1 parent 4d9c567 commit f51c1c3

16 files changed

Lines changed: 299 additions & 657 deletions

projects/social_platform/src/app/office/program/detail/detail/detail.component.html renamed to projects/social_platform/src/app/office/program/detail/detail.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123
</app-button>
124124
</a>
125125
} @if (!program.isUserManager) {
126-
<!-- добавить информацию с ссылок или чего-то в дизайне телефон но не у каждой программы есть телефон в контактах -->
126+
<!-- TODO: добавить информацию с ссылок или чего-то в дизайне телефон но не у каждой программы есть телефон в контактах -->
127127
<a class="info__contacts">
128128
<app-button
129129
[disabled]="true"

projects/social_platform/src/app/office/program/detail/detail/detail.component.scss renamed to projects/social_platform/src/app/office/program/detail/detail.component.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@
8282

8383
app-tooltip {
8484
position: absolute;
85-
right: -5%;
86-
bottom: 48%;
85+
right: -7%;
86+
bottom: 32%;
8787
z-index: 1000;
8888
}
8989
}

projects/social_platform/src/app/office/program/detail/detail/detail.component.spec.ts renamed to projects/social_platform/src/app/office/program/detail/detail.component.spec.ts

File renamed without changes.

projects/social_platform/src/app/office/program/detail/detail/detail.component.ts renamed to projects/social_platform/src/app/office/program/detail/detail.component.ts

File renamed without changes.

projects/social_platform/src/app/office/program/detail/detail/detail.resolver.spec.ts renamed to projects/social_platform/src/app/office/program/detail/detail.resolver.spec.ts

File renamed without changes.

projects/social_platform/src/app/office/program/detail/detail/detail.resolver.ts renamed to projects/social_platform/src/app/office/program/detail/detail.resolver.ts

File renamed without changes.

projects/social_platform/src/app/office/program/detail/detail.routes.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
/** @format */
22

33
import { Routes } from "@angular/router";
4-
import { ProgramDetailComponent } from "@office/program/detail/detail/detail.component";
5-
import { ProgramDetailResolver } from "@office/program/detail/detail/detail.resolver";
64
import { ProgramDetailMainComponent } from "@office/program/detail/main/main.component";
75
import { ProgramRegisterComponent } from "@office/program/detail/register/register.component";
86
import { ProgramRegisterResolver } from "@office/program/detail/register/register.resolver";
97
import { ProgramProjectsResolver } from "@office/program/detail/list/projects.resolver";
108
import { ProgramMembersResolver } from "@office/program/detail/list/members.resolver";
11-
import { RateProjectsComponent } from "./rate-projects/rate-projects.component";
129
import { ProgramListComponent } from "./list/list.component";
10+
import { ProgramDetailComponent } from "./detail.component";
11+
import { ProgramDetailResolver } from "./detail.resolver";
1312

1413
/**
1514
* Маршруты для детальной страницы программы
@@ -54,7 +53,8 @@ export const PROGRAM_DETAIL_ROUTES: Routes = [
5453
},
5554
{
5655
path: "projects-rating",
57-
component: RateProjectsComponent,
56+
component: ProgramListComponent,
57+
data: { listType: "rating" },
5858
},
5959
],
6060
},

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

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<i appIcon icon="filter" appSquare="34"></i>
1414
</div>
1515

16-
<ul class="page__list">
16+
<ul class="page__list" [class.page__list--rating]="listType === 'rating'">
1717
@for (listItem of searchedList; track listItem.id) {
1818
<li class="page__item">
1919
@if (listType === 'projects') {
@@ -24,10 +24,12 @@
2424
[project]="listItem"
2525
></app-project-card>
2626
</a>
27-
} @else {
27+
} @else if (listType === 'members') {
2828
<a [routerLink]="['/office/profile', listItem.id]">
2929
<app-member-card [user]="listItem"></app-member-card>
3030
</a>
31+
} @else {
32+
<app-rating-card [project]="listItem"></app-rating-card>
3133
}
3234
</li>
3335
}
@@ -36,6 +38,7 @@
3638

3739
<div class="page__create">
3840
<div class="page__left">
41+
@if (listType === 'projects') {
3942
<div class="filter page__filter" [class.page__filter--open]="isFilterOpen">
4043
<div class="filter__overlay" (click)="isFilterOpen = false"></div>
4144
<div class="filter__body" #filterBody>
@@ -48,6 +51,17 @@
4851
<app-projects-filter (closeFilter)="closeFilter()"></app-projects-filter>
4952
</div>
5053
</div>
54+
} @else {
55+
<form class="filter__form" [formGroup]="filterForm">
56+
<p class="text-body-12">фильтр</p>
57+
<div class="filter__controls">
58+
<label class="filter__tags" (click)="setValue($event)">
59+
<app-checkbox [checked]="this.filterForm.get('filterTag')?.value"></app-checkbox>
60+
<p class="text-body-12">проекты без оценки</p>
61+
</label>
62+
</div>
63+
</form>
64+
}
5165
</div>
5266
</div>
5367
</div>

projects/social_platform/src/app/office/program/detail/list/list.component.scss

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,12 @@
4545
@include responsive.apply-desktop {
4646
grid-template-columns: repeat(4, 2fr);
4747
}
48+
49+
&--rating {
50+
grid-template-columns: 1fr;
51+
row-gap: 20px;
52+
margin-top: 0;
53+
}
4854
}
4955

5056
&__create {
@@ -86,6 +92,23 @@
8692
}
8793
}
8894

95+
&__controls {
96+
display: flex;
97+
flex-direction: column;
98+
gap: 14px;
99+
margin-top: 18px;
100+
}
101+
102+
&__tags {
103+
display: flex;
104+
gap: 12px;
105+
align-items: center;
106+
107+
p {
108+
color: var(--grey-for-text);
109+
}
110+
}
111+
89112
&__bar {
90113
position: fixed;
91114
display: flex;

0 commit comments

Comments
 (0)