Skip to content

Commit b9abc6c

Browse files
committed
fix profile, members, skills, login, share logic
1 parent 8a7bf12 commit b9abc6c

35 files changed

Lines changed: 343 additions & 63 deletions

projects/skills/src/app/profile/shared/month-block/month-block.component.scss

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,17 @@
44
.month {
55
position: relative;
66
width: 100%;
7-
height: 100px;
7+
height: 130px;
88
padding: 50px 50px 50px 18px;
99
overflow: hidden;
1010
white-space: nowrap;
1111
background-color: var(--white);
1212
border-radius: 15px;
1313

14+
@include responsive.apply-desktop {
15+
height: 100px;
16+
}
17+
1418
&__item {
1519
opacity: 0.3;
1620

@@ -21,12 +25,17 @@
2125

2226
&__next {
2327
position: absolute;
24-
top: 40%;
25-
right: 15px;
28+
top: 65%;
29+
right: 40%;
2630
color: var(--grey-for-text);
2731
text-decoration: underline;
2832

2933
@include typography.bold-body-14;
34+
35+
@include responsive.apply-desktop {
36+
top: 40%;
37+
right: 15px;
38+
}
3039
}
3140

3241
&__block {
@@ -41,14 +50,19 @@
4150
z-index: 10;
4251
display: inline-block;
4352
width: 100%;
44-
max-width: 180px;
45-
height: 60px;
53+
max-width: 70px;
54+
height: 30px;
4655
margin: 0;
4756
margin-right: 0.8%;
4857
line-height: 45px;
4958
text-align: center;
5059
transition: all 0.8s;
5160

61+
@include responsive.apply-desktop {
62+
max-width: 180px;
63+
height: 60px;
64+
}
65+
5266
&::before,
5367
&::after {
5468
position: absolute;
@@ -88,11 +102,15 @@
88102
&__name {
89103
position: absolute;
90104
top: -18%;
91-
left: 55%;
105+
left: 42%;
92106
display: flex;
93107
gap: 5px;
94108
color: var(--white);
109+
@include typography.body-12;
95110

96-
@include typography.bold-body-14;
111+
@include responsive.apply-desktop {
112+
left: 55%;
113+
@include typography.bold-body-14;
114+
}
97115
}
98116
}

projects/skills/src/app/profile/shared/progress-block/progress-block.component.scss

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
}
2323

2424
&__info {
25-
margin-top: 200px;
25+
margin-top: 100px;
2626

2727
@include responsive.apply-desktop {
2828
margin-top: 0;
@@ -42,6 +42,7 @@
4242
width: 24px;
4343
height: 24px;
4444
cursor: pointer;
45+
z-index: 10;
4546

4647
&:hover {
4748
opacity: 1;
@@ -66,10 +67,12 @@
6667
border: 1px solid var(--dark-grey);
6768
border-radius: 15px 15px 0;
6869
opacity: 0;
70+
display: none;
6971
transition: opacity 0.3s ease-in-out;
7072

7173
&--visible {
7274
opacity: 1;
75+
display: block;
7376
}
7477
}
7578
}

projects/skills/src/app/profile/shared/skills-block/skills-block.component.scss

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
width: 24px;
3434
height: 24px;
3535
cursor: pointer;
36+
z-index: 10;
3637

3738
&:hover {
3839
opacity: 1;
@@ -48,19 +49,26 @@
4849
&__tooltip {
4950
position: absolute;
5051
bottom: 98%;
51-
left: 96%;
52+
left: 42%;
5253
z-index: 100;
5354
width: 200px;
5455
padding: 12px;
5556
color: var(--dark-grey);
5657
background-color: var(--white);
5758
border: 1px solid var(--dark-grey);
58-
border-radius: 15px 15px 15px 0;
59+
border-radius: 15px 15px 0px 15px;
5960
opacity: 0;
61+
display: none;
6062
transition: opacity 0.3s ease-in-out;
6163

6264
&--visible {
6365
opacity: 1;
66+
display: block;
67+
}
68+
69+
@include responsive.apply-desktop {
70+
left: 96%;
71+
border-radius: 15px 15px 15px 0;
6472
}
6573
}
6674

projects/skills/src/app/trajectories/track-bussiness/track-bussiness.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import { CommonModule } from "@angular/common";
44
import { Component } from "@angular/core";
5-
import { RouterModule } from "@angular/router";
5+
import { RouterLink, RouterModule } from "@angular/router";
66
import { BarComponent } from "@ui/components";
77

88
@Component({

projects/skills/src/app/trajectories/track-career/shared/trajectory/trajectory.component.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,8 @@
135135
&__image {
136136
width: 85px;
137137
height: 80px;
138+
border-radius: 50%;
139+
object-fit: cover;
138140

139141
@include responsive.apply-desktop {
140142
width: 150px;

projects/social_platform/src/app/auth/login/login.component.html

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,34 @@ <h1 class="auth__title">Вход</h1>
3030
<app-input
3131
[error]="password | controlError"
3232
id="password"
33-
type="password"
33+
[type]="showPassword ? 'text' : 'password'"
3434
formControlName="password"
3535
placeholder="Введите пароль"
36-
></app-input>
36+
>
37+
@if(showPassword) {
38+
<i
39+
appIcon
40+
icon="eye"
41+
appSquare="24"
42+
appWidth="24"
43+
appHeight="24"
44+
appViewBox="0 0 24 24"
45+
class="icon"
46+
(click)="toggleShowPassword()"
47+
></i>
48+
} @else {
49+
<i
50+
appIcon
51+
icon="eye-off"
52+
appSquare="24"
53+
appWidth="24"
54+
appHeight="24"
55+
appViewBox="0 0 24 24"
56+
class="icon"
57+
(click)="toggleShowPassword()"
58+
></i>
59+
}
60+
</app-input>
3761
@if (password | controlError: "required") {
3862
<div class="text-body-14 error">
3963
{{ errorMessage.VALIDATION_REQUIRED }}

projects/social_platform/src/app/auth/login/login.component.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,8 @@
2828
}
2929
}
3030
}
31+
32+
.icon {
33+
cursor: pointer;
34+
color: var(--dark-grey);
35+
}

projects/social_platform/src/app/auth/login/login.component.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,16 @@ export class LoginComponent implements OnInit {
4646

4747
errorMessage = ErrorMessage;
4848

49+
showPassword = false;
50+
4951
ngOnInit(): void {
5052
this.tokenService.clearTokens();
5153
}
5254

55+
toggleShowPassword() {
56+
this.showPassword = !this.showPassword;
57+
}
58+
5359
onSubmit() {
5460
const redirectType = this.route.snapshot.queryParams["redirect"];
5561

projects/social_platform/src/app/office/feed/feed.component.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
class="page__item"
2222
[attr.data-id]="item.content.id"
2323
[feedItem]="item.content"
24+
[contentId]="item.content.contentObject.id"
2425
[resourceLink]="['/office/profile', item.content.contentObject.id]"
2526
(like)="onLike($event)"
2627
></app-news-card>
@@ -30,6 +31,7 @@
3031
class="page__item"
3132
[attr.data-id]="item.content.id"
3233
[feedItem]="item.content"
34+
[contentId]="item.content.contentObject.id"
3335
[resourceLink]="['/office/projects', item.content.contentObject.id]"
3436
(like)="onLike($event)"
3537
></app-news-card>

projects/social_platform/src/app/office/profile/detail/main/main.component.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import {
44
AfterViewInit,
5+
ChangeDetectionStrategy,
56
ChangeDetectorRef,
67
Component,
78
computed,
@@ -51,6 +52,7 @@ import { Skill } from "@office/models/skill";
5152
PluralizePipe,
5253
AvatarComponent,
5354
],
55+
changeDetection: ChangeDetectionStrategy.OnPush,
5456
})
5557
export class ProfileMainComponent implements OnInit, AfterViewInit, OnDestroy {
5658
constructor(

0 commit comments

Comments
 (0)