From 93018f0ab4817d56dc2ce0355ef151e1dad0c0eb Mon Sep 17 00:00:00 2001 From: gofnnp Date: Fri, 9 Sep 2022 01:17:25 +0400 Subject: [PATCH] =?UTF-8?q?dev=20#12401=20=D1=81=D0=B4=D0=B5=D0=BB=D0=B0?= =?UTF-8?q?=D0=BB=20=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86=D1=83=20?= =?UTF-8?q?=D1=81=20=D0=B0=D0=BD=D0=BA=D0=B5=D1=82=D0=BE=D0=B9=20=D0=B7?= =?UTF-8?q?=D0=B0=D0=BF=D0=BE=D0=BB=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B8?= =?UTF-8?q?=D0=BD=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=86=D0=B8=D0=B8=20=D0=B8?= =?UTF-8?q?=20=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=BF=D0=BE=20=D0=B4?= =?UTF-8?q?=D0=B8=D0=B7=D0=B0=D0=B9=D0=BD=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/app.constants.ts | 7 + src/app/app.module.ts | 5 +- src/app/interface/data.ts | 9 +- src/app/pages/account/account.component.html | 3 + .../bonus-program.component.html | 5 +- .../bonus-program.component.scss | 58 ++++++-- .../user-data/user-data.component.html | 33 +++++ .../user-data/user-data.component.scss | 131 ++++++++++++++++++ .../user-data/user-data.component.spec.ts | 23 +++ .../account/user-data/user-data.component.ts | 34 +++++ src/app/pages/main/main.component.ts | 2 +- src/assets/card-decorative-pattern.svg | 5 + src/assets/menu-icons/bonus-program.png | Bin 0 -> 992 bytes src/assets/menu-icons/user-data.png | Bin 0 -> 992 bytes 14 files changed, 297 insertions(+), 18 deletions(-) create mode 100644 src/app/pages/account/user-data/user-data.component.html create mode 100644 src/app/pages/account/user-data/user-data.component.scss create mode 100644 src/app/pages/account/user-data/user-data.component.spec.ts create mode 100644 src/app/pages/account/user-data/user-data.component.ts create mode 100644 src/assets/card-decorative-pattern.svg create mode 100644 src/assets/menu-icons/bonus-program.png create mode 100644 src/assets/menu-icons/user-data.png diff --git a/src/app/app.constants.ts b/src/app/app.constants.ts index 36bcd44..fec3e2c 100644 --- a/src/app/app.constants.ts +++ b/src/app/app.constants.ts @@ -36,6 +36,13 @@ export const PageListWithBonus: Page[] = [ resName: 'orders', onSideBar: true, }, + { + code: PageCode.UserData, + name: 'Заполнить анкету', + description: '', + resName: 'user-data', + onSideBar: true + }, { code: PageCode.RefSystem, name: 'Пригласить друга', diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 91f0198..13b9e67 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -10,7 +10,7 @@ import { CardComponent } from './components/card/card.component'; import {InputMaskModule} from "primeng/inputmask"; import { AuthComponent } from './pages/account/auth/auth.component'; import {ProgressSpinnerModule} from "primeng/progressspinner"; -import { FormsModule } from '@angular/forms'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { AccountComponent } from './pages/account/account.component'; import { ExitComponent } from './components/exit/exit.component'; import { HttpClientModule } from '@angular/common/http'; @@ -26,6 +26,7 @@ import { AngularFireMessagingModule } from '@angular/fire/compat/messaging'; import {ToastModule} from 'primeng/toast'; import { MessageService } from 'primeng/api'; import { FooterButtonsComponent } from './components/footer-buttons/footer-buttons.component'; +import { UserDataComponent } from './pages/account/user-data/user-data.component'; @NgModule({ declarations: [ @@ -40,6 +41,7 @@ import { FooterButtonsComponent } from './components/footer-buttons/footer-butto OrdersComponent, OrderInfoComponent, FooterButtonsComponent, + UserDataComponent, ], imports: [ BrowserModule, @@ -65,6 +67,7 @@ import { FooterButtonsComponent } from './components/footer-buttons/footer-butto AngularFireModule.initializeApp(environment.firebase), AngularFireMessagingModule, ToastModule, + ReactiveFormsModule ], providers: [DialogService, MessageService], bootstrap: [AppComponent] diff --git a/src/app/interface/data.ts b/src/app/interface/data.ts index 6694035..148721d 100644 --- a/src/app/interface/data.ts +++ b/src/app/interface/data.ts @@ -4,7 +4,8 @@ export enum PageCode { Auth, Orders, BonusProgram, - RefSystem + RefSystem, + UserData } export interface Page { @@ -17,6 +18,12 @@ export interface Page { onSideBar: boolean } +export interface UserDataForm { + name: string; + birthdate: string; + gender: string; +} + export interface BonusProgramAccount { BonusProgramName: string; BonusProgramTypeID: string; diff --git a/src/app/pages/account/account.component.html b/src/app/pages/account/account.component.html index 070faeb..71a8006 100644 --- a/src/app/pages/account/account.component.html +++ b/src/app/pages/account/account.component.html @@ -13,6 +13,9 @@ + + +