Skip to content

Commit 91f69ec

Browse files
AwakichAwakich
authored
Merge pull request #248 from PROCOLLAB-github/new-registration-design
New registration design
2 parents e3cbe2c + ad8f3d0 commit 91f69ec

44 files changed

Lines changed: 962 additions & 538 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎projects/skills/src/app/rating/general/general.component.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { SelectComponent } from "@ui/components";
1111
import { IconComponent } from "@uilib";
1212
import { FormBuilder, type FormGroup, ReactiveFormsModule } from "@angular/forms";
1313
import { RatingService } from "../services/rating.service";
14-
import { ratingFiltersList } from "projects/core/src/consts/filters/rating-filter.const";
14+
import { ratingFilters } from "projects/core/src/consts/filters/rating-filter.const";
1515

1616
/**
1717
* Компонент общего рейтинга пользователей
@@ -66,7 +66,7 @@ export class RatingGeneralComponent implements OnInit {
6666
ratingForm: FormGroup;
6767

6868
// Константы фильтров из конфигурации
69-
readonly filterParams = ratingFiltersList;
69+
readonly filterParams = ratingFilters;
7070

7171
/**
7272
* Инициализация компонента

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
padding: 0 15px;
1111

1212
@include responsive.apply-desktop {
13-
padding: 0 100px;
13+
padding: 0 200px;
1414
}
1515

1616
&__header {

‎projects/social_platform/src/app/auth/email-verification/email-verification.component.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!-- @format -->
22

33
<main class="auth verification">
4-
<img class="auth__logo" src="/assets/images/shared/logo.svg" alt="procollab" width="125px" />
4+
<img class="auth__logo" src="/assets/images/shared/logo.svg" alt="procollab" />
55
<div class="verification__inner">
66
<div class="verification__body">
77
<div class="auth__greeting">
@@ -22,6 +22,6 @@ <h3 class="auth__title">Мы отправили ссылку подтвержд
2222
</div>
2323
}
2424
</div>
25-
<img class="verification__img" src="/assets/images/auth/email.png" alt="email" />
25+
<img class="verification__img" src="/assets/images/auth/email.svg" alt="email" />
2626
</div>
2727
</main>

‎projects/social_platform/src/app/auth/email-verification/email-verification.component.scss‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,21 @@
2323

2424
@include responsive.apply-desktop {
2525
flex-direction: row;
26-
justify-content: space-between;
2726
}
2827
}
2928

3029
&__img {
31-
width: 335px;
32-
margin-top: 55px;
30+
position: fixed;
31+
top: 8%;
32+
right: 0%;
33+
bottom: 0%;
34+
left: -33%;
35+
min-width: 500px;
3336

3437
@include responsive.apply-desktop {
35-
width: 470px;
36-
margin-top: 0;
38+
bottom: 0%;
39+
left: 30%;
40+
min-width: 852px;
3741
}
3842
}
3943

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

Lines changed: 135 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -1,95 +1,141 @@
11
<!-- @format -->
22

3-
<form class="auth" [formGroup]="loginForm" (ngSubmit)="onSubmit()" (keyup.enter)="onSubmit()">
4-
<div class="auth__wrapper">
5-
<h1 class="auth__title">Вход</h1>
6-
<p class="login__reg">Нет аккаунта? <a routerLink="/auth/register">Зарегистрируйтесь</a></p>
7-
@if (loginForm.get("email"); as email) {
8-
<fieldset class="auth__field">
9-
<label for="email" class="field-label">Электронная почта</label>
10-
<app-input
11-
size="big"
12-
[error]="email | controlError"
13-
id="email"
14-
type="email"
15-
formControlName="email"
16-
placeholder="Введите почту"
17-
></app-input>
18-
@if (email | controlError: "email") {
19-
<div class="text-body-10 error">
20-
{{ errorMessage.VALIDATION_EMAIL }}
21-
</div>
22-
} @if (email | controlError: "required") {
23-
<div class="text-body-10 error">
24-
{{ errorMessage.VALIDATION_REQUIRED }}
25-
</div>
26-
}
27-
</fieldset>
28-
} @if (loginForm.get("password"); as password) {
29-
<fieldset class="auth__field">
30-
<div class="login__password">
31-
<label class="field-label" for="password">Пароль</label>
32-
<a routerLink="/auth/reset_password/send_email" class="login__forget"> Забыли пароль? </a>
33-
</div>
34-
<app-input
35-
size="big"
36-
[error]="password | controlError"
37-
id="password"
38-
[type]="showPassword ? 'text' : 'password'"
39-
formControlName="password"
40-
placeholder="Введите пароль"
41-
>
42-
@if(showPassword) {
43-
<i
44-
appIcon
45-
icon="eye"
46-
appSquare="24"
47-
appWidth="24"
48-
appHeight="24"
49-
appViewBox="0 0 24 24"
50-
class="icon"
51-
(click)="toggleShowPassword()"
52-
></i>
53-
} @else {
54-
<i
55-
appIcon
56-
icon="eye-off"
57-
appSquare="24"
58-
appWidth="24"
59-
appHeight="24"
60-
appViewBox="0 0 24 24"
61-
class="icon"
62-
(click)="toggleShowPassword()"
63-
></i>
3+
<div class="login">
4+
<div class="login__left">
5+
<!-- Центр -->
6+
<div class="login__left-content">
7+
<form class="auth" [formGroup]="loginForm" (ngSubmit)="onSubmit()" (keyup.enter)="onSubmit()">
8+
<div class="auth__wrapper">
9+
<img class="login__logo" src="/assets/images/shared/logo.svg" alt="logo" />
10+
11+
@if (loginForm.get("email"); as email) {
12+
<fieldset class="auth__field">
13+
<label for="email" class="field-label">почта*</label>
14+
<app-input
15+
size="big"
16+
[error]="email | controlError"
17+
id="email"
18+
type="email"
19+
formControlName="email"
20+
placeholder="example@example.com"
21+
></app-input>
22+
23+
@if (email | controlError: "email") {
24+
<div class="text-body-10 error">
25+
{{ errorMessage.VALIDATION_EMAIL }}
26+
</div>
27+
} @if (email | controlError: "required") {
28+
<div class="text-body-10 error">
29+
{{ errorMessage.VALIDATION_REQUIRED }}
30+
</div>
31+
}
32+
</fieldset>
33+
} @if (loginForm.get("password"); as password) {
34+
<fieldset class="auth__field">
35+
<div class="login__password">
36+
<label class="field-label" for="password">пароль</label>
37+
<a routerLink="/auth/reset_password/send_email" class="login__forget">
38+
забыли пароль?
39+
</a>
40+
</div>
41+
42+
<app-input
43+
size="big"
44+
[error]="password | controlError"
45+
id="password"
46+
[type]="showPassword ? 'text' : 'password'"
47+
formControlName="password"
48+
placeholder="GJiwoeuhbn120="
49+
>
50+
@if (showPassword) {
51+
<i appIcon icon="eye" appSquare="18" class="icon" (click)="toggleShowPassword()"></i>
52+
} @else {
53+
<i
54+
appIcon
55+
icon="eye-off"
56+
appSquare="18"
57+
class="icon"
58+
(click)="toggleShowPassword()"
59+
></i>
60+
}
61+
</app-input>
62+
63+
@if (password | controlError: "required") {
64+
<div class="text-body-10 error">
65+
{{ errorMessage.VALIDATION_REQUIRED }}
66+
</div>
67+
}
68+
</fieldset>
69+
} @if (errorWrongAuth) {
70+
<div class="text-body-10 error">
71+
{{ errorMessage.AUTH_WRONG_AUTH }}
72+
</div>
73+
}
74+
75+
<app-button
76+
size="big"
77+
[loader]="loginIsSubmitting"
78+
class="auth__button"
79+
customTypographyClass="auth__button-typography"
80+
type="submit"
81+
>
82+
войти
83+
<i
84+
class="auth__button-icon"
85+
appIcon
86+
icon="arrow-no-body"
87+
appWidth="12"
88+
appHeight="6"
89+
appViewBox="0 0 18 9"
90+
></i>
91+
</app-button>
92+
93+
<div class="login__additional">
94+
<p class="login__reg text-body-12">
95+
нет аккаунта?
96+
<a routerLink="/auth/register">зарегистрируйтесь</a>
97+
</p>
98+
99+
<hr />
100+
101+
<p class="text-body-12 login__external">
102+
*Если ты регистрировался через форму на сайте программы кейс-чемпионата, введи данные,
103+
которые ты указывал ранее
104+
</p>
105+
</div>
106+
</div>
107+
</form>
108+
</div>
109+
110+
<!-- Низ -->
111+
<div class="login__left-footer">
112+
<div class="tooltip">
113+
<app-tooltip
114+
color="grey"
115+
iconSize="40"
116+
(click)="$event.stopPropagation(); toggleTooltip()"
117+
></app-tooltip>
118+
119+
@if (isHintLoginVisible()) {
120+
<div class="tooltip__wrapper" (clickOutside)="toggleTooltip()">
121+
<p class="tooltip__text text-body-10">
122+
Если у тебя есть вопросы, напиши в наш телеграм-бот поддержки
123+
<a href="https://t.me/procollab_bot">{{ "@procollab_bot" }}</a>
124+
</p>
125+
126+
<br />
127+
128+
<p class="tooltip__text text-body-10">
129+
Если не нашел ответ в боте, напиши в техподдержку —
130+
<a href="https://t.me/procollab_support">{{ "@procollab_support" }}</a>
131+
</p>
132+
</div>
64133
}
65-
</app-input>
66-
@if (password | controlError: "required") {
67-
<div class="text-body-10 error">
68-
{{ errorMessage.VALIDATION_REQUIRED }}
69134
</div>
70-
}
71-
</fieldset>
72-
} @if (errorWrongAuth) {
73-
<div class="text-body-10 error">
74-
{{ errorMessage.AUTH_WRONG_AUTH }}
75135
</div>
76-
}
77-
<app-button
78-
size="big"
79-
[loader]="loginIsSubmitting"
80-
class="auth__button"
81-
customTypographyClass="auth__button-typography"
82-
type="submit"
83-
>
84-
Войти
85-
<i
86-
class="auth__button-icon"
87-
appIcon
88-
icon="arrow-no-body"
89-
appWidth="12"
90-
appHeight="6"
91-
appViewBox="0 0 18 9"
92-
></i>
93-
</app-button>
94136
</div>
95-
</form>
137+
138+
<div class="login__right">
139+
<img class="login__image" src="/assets/images/auth/login-img.png" alt="" />
140+
</div>
141+
</div>

0 commit comments

Comments
 (0)