From 91bae5fd6d22c04cbb74f981f0dada36e5a9ca49 Mon Sep 17 00:00:00 2001 From: Aruzhan Kordasheva <70699245+Aruq@users.noreply.github.com> Date: Tue, 15 Nov 2022 09:56:43 +0600 Subject: [PATCH 1/3] s --- angular.json | 1 + package.json | 2 +- src/app/app-routing.module.ts | 5 + src/app/app.module.ts | 3 + src/app/core/http/http.service.spec.ts | 0 src/app/core/http/http.service.ts | 17 +++ src/app/core/services/auth.service.ts | 12 +- .../features/auth/login/login.component.html | 2 +- .../broker-list/broker-list.component.css | 0 .../broker-list/broker-list.component.html | 51 +++++++ .../broker-list/broker-list.component.ts | 143 ++++++++++++++++++ .../features/brokers/broker-routing.module.ts | 21 +++ src/app/features/brokers/broker.module.ts | 17 +++ .../customer-list.component.html | 36 ++--- .../customer-list/customer-list.component.ts | 95 +++++++----- .../users/user-list/user-list.component.html | 41 ++++- .../users/user-list/user-list.component.ts | 77 ++++++++-- .../shared/layout/assets/images/kase-logo.svg | 8 + src/app/shared/layout/layout.component.css | 29 +++- src/app/shared/layout/layout.component.html | 29 ++-- src/app/shared/layout/layout.component.ts | 13 +- src/app/shared/shared.module.ts | 1 + src/assets/images/kase-logo.svg | 8 + src/proxy.conf.json | 8 + 24 files changed, 526 insertions(+), 93 deletions(-) create mode 100644 src/app/core/http/http.service.spec.ts create mode 100644 src/app/core/http/http.service.ts create mode 100644 src/app/features/brokers/broker-list/broker-list.component.css create mode 100644 src/app/features/brokers/broker-list/broker-list.component.html create mode 100644 src/app/features/brokers/broker-list/broker-list.component.ts create mode 100644 src/app/features/brokers/broker-routing.module.ts create mode 100644 src/app/features/brokers/broker.module.ts create mode 100644 src/app/shared/layout/assets/images/kase-logo.svg create mode 100644 src/assets/images/kase-logo.svg create mode 100644 src/proxy.conf.json diff --git a/angular.json b/angular.json index eedcb61..30d7834 100644 --- a/angular.json +++ b/angular.json @@ -112,6 +112,7 @@ } }, "cli": { + "analytics": "173eaed1-7bb5-40f9-98fd-6a7163045565", "schematicCollections": [ "@angular-eslint/schematics" ] diff --git a/package.json b/package.json index e290ca7..bc63ae1 100644 --- a/package.json +++ b/package.json @@ -13,10 +13,10 @@ "private": true, "dependencies": { "@angular/animations": "^14.2.1", + "@angular/cdk": "^14.2.1", "@angular/common": "^14.2.1", "@angular/compiler": "^14.2.1", "@angular/core": "^14.2.1", - "@angular/cdk": "^14.2.1", "@angular/flex-layout": "^14.0.0-beta.40", "@angular/forms": "^14.2.1", "@angular/material": "^14.2.1", diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index ef223db..4811aa3 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -23,6 +23,11 @@ const appRoutes: Routes = [ loadChildren: () => import('./features/users/users.module').then(m => m.UsersModule), canActivate: [AuthGuard] }, + { + path: 'brokers', + loadChildren: () => import('./features/brokers/broker.module').then(m => m.BrokersModule), + canActivate: [AuthGuard] + }, { path: 'account', loadChildren: () => import('./features/account/account.module').then(m => m.AccountModule), diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 027530c..9c2f3aa 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -9,6 +9,7 @@ import { CustomMaterialModule } from './custom-material/custom-material.module'; import { AppRoutingModule } from './app-routing.module'; import { LoggerModule } from 'ngx-logger'; import { environment } from '../environments/environment'; +import { HttpClientModule } from '@angular/common/http'; @NgModule({ declarations: [ @@ -20,7 +21,9 @@ import { environment } from '../environments/environment'; CoreModule, SharedModule, CustomMaterialModule.forRoot(), + AppRoutingModule, + HttpClientModule, LoggerModule.forRoot({ serverLoggingUrl: `http://my-api/logs`, level: environment.logLevel, diff --git a/src/app/core/http/http.service.spec.ts b/src/app/core/http/http.service.spec.ts new file mode 100644 index 0000000..e69de29 diff --git a/src/app/core/http/http.service.ts b/src/app/core/http/http.service.ts new file mode 100644 index 0000000..b0f2fde --- /dev/null +++ b/src/app/core/http/http.service.ts @@ -0,0 +1,17 @@ +import { Injectable } from '@angular/core'; +import {HttpClient} from "@angular/common/http"; +import {catchError, map, Observable} from "rxjs"; +import {environment} from "../../../environments/environment"; + +@Injectable({ + providedIn: 'root' +}) +export class HttpService { + + constructor(private http: HttpClient) { } + + getData(user: string){ + return this.http.get('http://192.168.4.18:8086/kase.kz/role?role=' + user) + } + +} diff --git a/src/app/core/services/auth.service.ts b/src/app/core/services/auth.service.ts index a26e264..0fb8416 100644 --- a/src/app/core/services/auth.service.ts +++ b/src/app/core/services/auth.service.ts @@ -27,11 +27,11 @@ export class AuthenticationService { this.localStorage.setItem('currentUser', JSON.stringify({ token: 'aisdnaksjdn,axmnczm', isAdmin: true, - email: 'john.doe@gmail.com', + email: 'roman@mail.ru', id: '12312323232', - alias: 'john.doe@gmail.com'.split('@')[0], + alias: 'roman@mail.ru'.split('@')[0], expiration: moment().add(1, 'days').toDate(), - fullName: 'John Doe' + fullName: 'Roman Dubrovskiy' })); return true; @@ -49,11 +49,11 @@ export class AuthenticationService { return { token: 'aisdnaksjdn,axmnczm', isAdmin: true, - email: 'john.doe@gmail.com', + email: 'roman@mail.ru', id: '12312323232', - alias: 'john.doe@gmail.com'.split('@')[0], + alias: 'roman@mail.ru'.split('@')[0], expiration: moment().add(1, 'days').toDate(), - fullName: 'John Doe' + fullName: 'Roman Dubrovskiy' }; } diff --git a/src/app/features/auth/login/login.component.html b/src/app/features/auth/login/login.component.html index 29058af..9b67329 100644 --- a/src/app/features/auth/login/login.component.html +++ b/src/app/features/auth/login/login.component.html @@ -1,7 +1,7 @@
- angular-material-template + Services Log in to your account diff --git a/src/app/features/brokers/broker-list/broker-list.component.css b/src/app/features/brokers/broker-list/broker-list.component.css new file mode 100644 index 0000000..e69de29 diff --git a/src/app/features/brokers/broker-list/broker-list.component.html b/src/app/features/brokers/broker-list/broker-list.component.html new file mode 100644 index 0000000..bc35c76 --- /dev/null +++ b/src/app/features/brokers/broker-list/broker-list.component.html @@ -0,0 +1,51 @@ +
+
+ + + +

Брокеры +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
No. {{i+1}} Брокеры {{myData$.role}} Услуга + +
+
+ {{r}} +
+ + +
+ + + + +
+
\ No newline at end of file diff --git a/src/app/features/brokers/broker-list/broker-list.component.ts b/src/app/features/brokers/broker-list/broker-list.component.ts new file mode 100644 index 0000000..b295456 --- /dev/null +++ b/src/app/features/brokers/broker-list/broker-list.component.ts @@ -0,0 +1,143 @@ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { MatSort } from '@angular/material/sort'; +import { MatTableDataSource } from '@angular/material/table'; +import { NGXLogger } from 'ngx-logger'; +import { Title } from '@angular/platform-browser'; +import { NotificationService } from 'src/app/core/services/notification.service'; +import { HttpService } from 'src/app/core/http/http.service'; + + + + +export interface PeriodicElement { + name: string; + position: number; + weight: number; + + } + + const ELEMENT_DATA: PeriodicElement[] = [ + + + ]; +export interface roles{ +roles:any +} +export interface test{ + id: number; + role: any; + service: any; + + +} +let i:number + +@Component({ + selector: 'app-broker-list', + templateUrl: './broker-list.component.html', + styleUrls: ['./broker-list.component.css'] +}) +export class BrokerListComponent implements OnInit { + displayedColumns: string[] = ['position', 'name', 'weight']; + dataSource: any; + + +myData:any +myData$:any[] = []; + constructor( + private logger: NGXLogger, + private notificationService: NotificationService, + private titleService: Title, + private myDataService:HttpService + ) { } + + ngOnInit() { + this.titleService.setTitle('angular-material-template - Customers'); + this.logger.log('Customers loaded'); + this.notificationService.openSnackBar('Customers loaded'); + + this.myDataService.getData('BROKER').subscribe((next: any) =>{ + //@ts-ignore + + const ob: roles = { + roles: undefined + }; + // for(let i=0; i<5;i++){ + // next.forEach((element: any)=> { + // console.log(element) + // // obj.role = next.roles[0] + + // obj.role = element.services[i].company; + + + + // const c: any[]=[] + // element.services[0].services.forEach((element2: any) =>{ + // console.log('---') + // console.log(element2.service_name ) + // b.push(element2.service_name); + // }) + + // obj.service = b + + + + // }); + + + + + + + // const a= this.myData$.push(obj) + // console.log(obj)} + + + + + + next.forEach((element:any) =>{ + //console.log(element) + element.services.forEach((el:any)=>{ + + //@ts-ignore + let obj: test = {} + let b: any[] = []; + obj.role = el.company + obj.id = el.id; + console.log(el.id) + //@ts-ignore + //b = []; + el.services.forEach((element2: any) =>{ + + // console.log(element2.service_name) + b.push(element2.service_name); + obj.service = []; + obj.service = b; + }) + + + + // console.log(obj) + this.myData$.push(obj) + }) + + + + }) + + + + console.log(this.myData$) + this.dataSource = new MatTableDataSource(this.myData$) + } + + + ); + + + + + } +} +; \ No newline at end of file diff --git a/src/app/features/brokers/broker-routing.module.ts b/src/app/features/brokers/broker-routing.module.ts new file mode 100644 index 0000000..18e9560 --- /dev/null +++ b/src/app/features/brokers/broker-routing.module.ts @@ -0,0 +1,21 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; +import { LayoutComponent } from 'src/app/shared/layout/layout.component'; + +import {BrokerListComponent } from './broker-list/broker-list.component'; + +const routes: Routes = [ + { + path: '', + component: LayoutComponent, + children: [ + { path: '', component: BrokerListComponent }, + ] + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class BrokerRoutingModule { } diff --git a/src/app/features/brokers/broker.module.ts b/src/app/features/brokers/broker.module.ts new file mode 100644 index 0000000..f47fd1e --- /dev/null +++ b/src/app/features/brokers/broker.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { BrokerRoutingModule } from './broker-routing.module'; +import { SharedModule } from 'src/app/shared/shared.module'; +import { BrokerListComponent } from './broker-list/broker-list.component'; + +@NgModule({ + imports: [ + CommonModule, + BrokerRoutingModule, + SharedModule + ], + declarations: [ + BrokerListComponent + ] +}) +export class BrokersModule { } diff --git a/src/app/features/customers/customer-list/customer-list.component.html b/src/app/features/customers/customer-list/customer-list.component.html index b6039cf..6df46bb 100644 --- a/src/app/features/customers/customer-list/customer-list.component.html +++ b/src/app/features/customers/customer-list/customer-list.component.html @@ -3,38 +3,40 @@ -

Customers

- - - +

Эмитенты +

+
+ - + - - - + + + - - - - - - - - + + +
No. {{element.position}} {{i+1}} Name {{element.name}} Эмитенты {{myData$.role}} Weight {{element.weight}} Symbol {{element.symbol}} Услуга + +
+
+ {{r}} +
+ + +
- diff --git a/src/app/features/customers/customer-list/customer-list.component.ts b/src/app/features/customers/customer-list/customer-list.component.ts index 80a00f9..11b2196 100644 --- a/src/app/features/customers/customer-list/customer-list.component.ts +++ b/src/app/features/customers/customer-list/customer-list.component.ts @@ -1,53 +1,78 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { MatSort } from '@angular/material/sort'; -import { MatTableDataSource } from '@angular/material/table'; import { NGXLogger } from 'ngx-logger'; import { Title } from '@angular/platform-browser'; import { NotificationService } from 'src/app/core/services/notification.service'; - -export interface PeriodicElement { - name: string; - position: number; - weight: number; - symbol: string; -} - -const ELEMENT_DATA: PeriodicElement[] = [ - { position: 1, name: 'Hydrogen', weight: 1.0079, symbol: 'H' }, - { position: 2, name: 'Helium', weight: 4.0026, symbol: 'He' }, - { position: 3, name: 'Lithium', weight: 6.941, symbol: 'Li' }, - { position: 4, name: 'Beryllium', weight: 9.0122, symbol: 'Be' }, - { position: 5, name: 'Boron', weight: 10.811, symbol: 'B' }, - { position: 6, name: 'Carbon', weight: 12.0107, symbol: 'C' }, - { position: 7, name: 'Nitrogen', weight: 14.0067, symbol: 'N' }, - { position: 8, name: 'Oxygen', weight: 15.9994, symbol: 'O' }, - { position: 9, name: 'Fluorine', weight: 18.9984, symbol: 'F' }, - { position: 10, name: 'Neon', weight: 20.1797, symbol: 'Ne' }, -]; - +import { HttpService } from 'src/app/core/http/http.service'; +import { MatTableDataSource } from '@angular/material/table'; @Component({ selector: 'app-customer-list', templateUrl: './customer-list.component.html', styleUrls: ['./customer-list.component.css'] }) export class CustomerListComponent implements OnInit { - displayedColumns: string[] = ['position', 'name', 'weight', 'symbol']; - dataSource = new MatTableDataSource(ELEMENT_DATA); - - @ViewChild(MatSort, { static: true }) - sort: MatSort = new MatSort; - + displayedColumns: string[] = ['position', 'name', 'weight']; + dataSource: any; + +myData:any +myData$:any[] = []; constructor( private logger: NGXLogger, private notificationService: NotificationService, - private titleService: Title + private titleService: Title, + private myDataService:HttpService ) { } - ngOnInit() { - this.titleService.setTitle('angular-material-template - Customers'); - this.logger.log('Customers loaded'); - this.notificationService.openSnackBar('Customers loaded'); - this.dataSource.sort = this.sort; + this.titleService.setTitle('draft - Issuers'); + this.logger.log('Issuers loaded'); + this.notificationService.openSnackBar('Issuers loaded'); + this.myDataService.getData('ISSUER').subscribe((next: any) =>{ + //@ts-ignore + + - } + next.forEach((element:any) =>{ + //console.log(element) + element.services.forEach((el:any)=>{ + + //@ts-ignore + let obj: test = {} + let b: any[] = []; + obj.role = el.company + obj.id = el.id; + console.log(el.id) + //@ts-ignore + //b = []; + el.services.forEach((element2: any) =>{ + + // console.log(element2.service_name) + b.push(element2.service_name); + obj.service = []; + obj.service = b; + }) + + + + // console.log(obj) + this.myData$.push(obj) + }) + + + + }) + + + + console.log(this.myData$) + this.dataSource = new MatTableDataSource(this.myData$) + } + + + ); + + + + +} } +; \ No newline at end of file diff --git a/src/app/features/users/user-list/user-list.component.html b/src/app/features/users/user-list/user-list.component.html index 88cb815..0a88771 100644 --- a/src/app/features/users/user-list/user-list.component.html +++ b/src/app/features/users/user-list/user-list.component.html @@ -3,17 +3,42 @@ -

Users

+

Пользователи +

+ + + + + + + + + + + + + + + + + + + + + + + +
No. {{i+1}} Пользователи {{myData$.role}} Услуга + +
+
+ {{r}} +
-
-
- people_outline -

No users exist.

-
- -
+
+ diff --git a/src/app/features/users/user-list/user-list.component.ts b/src/app/features/users/user-list/user-list.component.ts index 3e0b1fb..fae6ccc 100644 --- a/src/app/features/users/user-list/user-list.component.ts +++ b/src/app/features/users/user-list/user-list.component.ts @@ -1,24 +1,83 @@ -import { Component, OnInit } from '@angular/core'; -import { Title } from '@angular/platform-browser'; - +import { Component, OnInit, ViewChild } from '@angular/core'; +import { MatSort } from '@angular/material/sort'; +import { MatTableDataSource } from '@angular/material/table'; import { NGXLogger } from 'ngx-logger'; +import { Title } from '@angular/platform-browser'; import { NotificationService } from 'src/app/core/services/notification.service'; - +import { HttpService } from 'src/app/core/http/http.service'; +import { tap } from 'rxjs'; +export interface test{ + role: string; + service: any; + id:number +} @Component({ selector: 'app-user-list', templateUrl: './user-list.component.html', styleUrls: ['./user-list.component.css'] }) export class UserListComponent implements OnInit { - + displayedColumns: string[] = ['position', 'name', 'weight']; + dataSource:any; +myData:any +myData$:any[] = []; constructor( private logger: NGXLogger, private notificationService: NotificationService, - private titleService: Title + private titleService: Title, + private myDataService:HttpService ) { } - ngOnInit() { - this.titleService.setTitle('angular-material-template - Users'); + this.titleService.setTitle('draft-User'); this.logger.log('Users loaded'); - } + this.notificationService.openSnackBar('Users loaded'); + this.myDataService.getData('KASE').subscribe((next: any) =>{ + //@ts-ignore + + + + next.forEach((element:any) =>{ + //console.log(element) + element.services.forEach((el:any)=>{ + + //@ts-ignore + let obj: test = {} + let b: any[] = []; + obj.role = el.company + obj.id = el.id; + console.log(el.id) + //@ts-ignore + //b = []; + el.services.forEach((element2: any) =>{ + + // console.log(element2.service_name) + b.push(element2.service_name); + obj.service = []; + obj.service = b; + }) + + + + // console.log(obj) + this.myData$.push(obj) + }) + + + + }) + + + + console.log(this.myData$) + this.dataSource = new MatTableDataSource(this.myData$) + } + + + ); + + + + +} } +; \ No newline at end of file diff --git a/src/app/shared/layout/assets/images/kase-logo.svg b/src/app/shared/layout/assets/images/kase-logo.svg new file mode 100644 index 0000000..9426de8 --- /dev/null +++ b/src/app/shared/layout/assets/images/kase-logo.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/app/shared/layout/layout.component.css b/src/app/shared/layout/layout.component.css index 970e18a..c146cf7 100644 --- a/src/app/shared/layout/layout.component.css +++ b/src/app/shared/layout/layout.component.css @@ -4,13 +4,18 @@ .navbar { z-index: 2; -} - + background: rgba(22, 33, 25, 0.37); +gap:12px;} .navbar-brand { text-decoration: none; - color: white; -} + display:flex; + +} +.myImage{ + background-image: url("/assets/images/kase-logo.svg"); + +} .navbar-container { display: flex; flex-direction: column; @@ -61,4 +66,18 @@ a.mat-list-item.active { #push-bottom { position: absolute; bottom: 0; -} \ No newline at end of file +} +.header_inner-left { + display: flex; + gap: 16px; +} +.date{ + display:flex; + flex-direction: column; + font-size:13px +} + + h1{ + padding: 12px 0px 10px 10px + } + diff --git a/src/app/shared/layout/layout.component.html b/src/app/shared/layout/layout.component.html index a5cdab0..24959ab 100644 --- a/src/app/shared/layout/layout.component.html +++ b/src/app/shared/layout/layout.component.html @@ -1,17 +1,22 @@
- + -

- angular-material-template -

- + +
+ +
+ {{currentDate}} + {{currentTime}} +
+
+ @@ -72,13 +77,19 @@

Home

business -

Customers

+

Эмитенты

people -

Users

+

Пользователи

+ + + + business_center + +

Брокеры

@@ -93,7 +104,7 @@

Home

-

Resources

+ diff --git a/src/app/shared/layout/layout.component.ts b/src/app/shared/layout/layout.component.ts index 9f5094f..e9bde2e 100644 --- a/src/app/shared/layout/layout.component.ts +++ b/src/app/shared/layout/layout.component.ts @@ -6,6 +6,7 @@ import { Subscription } from 'rxjs'; import { AuthenticationService } from 'src/app/core/services/auth.service'; import { SpinnerService } from '../../core/services/spinner.service'; import { AuthGuard } from 'src/app/core/guards/auth.guard'; +import * as moment from 'moment'; @Component({ selector: 'app-layout', @@ -19,6 +20,8 @@ export class LayoutComponent implements OnInit, OnDestroy, AfterViewInit { showSpinner: boolean = false; userName: string = ""; isAdmin: boolean = false; + public currentTime: string = '' + public currentDate: string = '' private autoLogoutSubscription: Subscription = new Subscription; @@ -39,14 +42,20 @@ export class LayoutComponent implements OnInit, OnDestroy, AfterViewInit { this.isAdmin = user.isAdmin; this.userName = user.fullName; - + setInterval(() => { + this.currentTime = moment().format('HH:mm:ss'); + }, 800) + this.currentDate = moment().format('DD/MM/YYYY'); + // Auto log-out subscription const timer$ = timer(2000, 5000); this.autoLogoutSubscription = timer$.subscribe(() => { this.authGuard.canActivate(); }); } - + getCurrentTime() { + return this.currentTime; + } ngOnDestroy(): void { // tslint:disable-next-line: deprecation this.mobileQuery.removeListener(this._mobileQueryListener); diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index ca973cf..e0a4d79 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -18,6 +18,7 @@ import { LayoutComponent } from './layout/layout.component'; FormsModule, ReactiveFormsModule, FlexLayoutModule, + ], declarations: [ ConfirmDialogComponent, diff --git a/src/assets/images/kase-logo.svg b/src/assets/images/kase-logo.svg new file mode 100644 index 0000000..9426de8 --- /dev/null +++ b/src/assets/images/kase-logo.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/proxy.conf.json b/src/proxy.conf.json new file mode 100644 index 0000000..399a99d --- /dev/null +++ b/src/proxy.conf.json @@ -0,0 +1,8 @@ +{ + "/api/*": { + "target": "http://192.168.4.18:8086", + "secure": false, + "logLevel": "debug" + } + } + \ No newline at end of file From 2f7ad43d2ecbeefc4cede044951c8148dc3a7f63 Mon Sep 17 00:00:00 2001 From: Aruzhan Kordasheva <70699245+Aruq@users.noreply.github.com> Date: Wed, 16 Nov 2022 11:29:45 +0600 Subject: [PATCH 2/3] y hh --- .DS_Store | Bin 6148 -> 8196 bytes src/.DS_Store | Bin 6148 -> 8196 bytes src/app/.DS_Store | Bin 8196 -> 8196 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/.DS_Store b/.DS_Store index 84a80904f444da07ec457fa9b7fc88e1783d63ed..fd257a689029ce2834c65c7f25bd89a30466950b 100644 GIT binary patch literal 8196 zcmeHMJ8u&~5S~p!a#j*4yhIwLlW2o+9zsMkj^h-OfFg&W0Ay^RaZJv)md}n0%aThT zB|Sy{044Nv`~VvM1T7VOv%7)wT`o!$f!K+5XK#1D-P>>G?mQbJ5~aSsO0-Nw4hrj~ zc~mC|k8?@MlUFsSOzQumVv*40erJroQ&_j9<{Y) zz%uY(GQjT#7ln1v=&{!7)qzT-0MIk&R)RM20EKalE*d@7T0t?V&K`t;3X@_84ad04 z=Fml>$69MR2@NMI4M6(Aj?i`5}RvqkFVV+q6Ru$fKP}YjHhcy?}Wo z`P85awN;Dnv_Vk<_x7x~+92wfeSNHTf>zWk6uye7>6r_&bIzPI?>zJN<-qGzd;O?X z?LOhFhf)T$<94<7sMQ!$mac5euvcw`jjjT;{02;(K5m7+9F$}~^dp7!^njCda+RfP z!{O@2in~!*8?Cs*&9wsB>$gXvoOAWYt-E`bgPxO|0 zn>+!^Me4vob>*xkXuApWq`KAzH7Q4nA3((&y^xq812@Gh#&J2?gNwJQO!uMlaGpQu zG8IzqV<9z-gQG6h6IL8PCs@VY`03o;xI7$g-q~c|6;AOZ`w5ciM-ExD=b*Xj)n&V* z0JDcje@5D}TsGnAjE=s%d-d%zKZ*v|mi{TDo&DIX^WS-LgG)t858NL=#4WrI@`#!a z{xZC+9@Ds27AZXg9|Wf3i+3GIUOE98VdVzyCu?<%(bydJ`_HbmVi`C)1Jl}cne+dh z?DPM#PiQSI1D1h*jsY=K_R1yP_VKUHRwFhtum XV@0FKT4Mxa4+0bowz3SID+9j(wQ5SL delta 124 zcmZp1XfcprU|?W$DortDU=RQ@Ie-{MGqg`E6q~50D9Qq4GlIkngOl@f3qVo~Y!eIB z8CfQG3m0!Jwxd G!wdkwHxrQn diff --git a/src/.DS_Store b/src/.DS_Store index f609d3e4ce27815ac3b3a3759114663adc0ab4f8..0b8a21b84426176b677892245b8aefa97b031b77 100644 GIT binary patch literal 8196 zcmeHM&2AGh5FV##vi(6s;;#pgR^nQP6c8ff5<)m|B^4Y1h5WTi*{q}NrfF4G3S6k* z9SY(FxFR_64qSK=BqaF8HtlYV=Xa*A~Y0ILxo8(gvlL*hC^R6 z_G2wIoP^pL>zJK|$xwtzJ%p>wNtCp-t!2P6kYs>!_Zg~FpZfQ_SpI$+n*0w{6wFvP zMnT_X`5zj6uN#Dg!WWU6NzZ1oPS#m)o>V(>R1NFlFeujtk9f2yrPuh?uQwia+oM|U z>>cTc^{(F@C_uN>hRNfHUB4wqWjXX)fx=d`!kKgCYPqGIo#M^nvU~knVRzZxDPApb z|Hkg_oOAB-m0R~~&%B;5U+FM~c~sCTJw9k(qi3S=)>o=c+3PEvD1JKB^kk)C;&k@k zoY~v^`k5IqxSnhsqwRMhtIn#$4Q{hK@IC3TVcqx{EgV}8$G zT%BAi>ix&|^ng3s-0!k^0m^lv|Xi4o<2^Ui_>C->B$WWnoiSxP0JHm(#%U8EgTWr=~iMHS{)s$H`3i$mg*i`99CX zDg@F)WV~M!?c^Qg8z04Ffne+KDF29WY{c5dkZ*a($g!4u@9q0vkzgCkzzH%iqxW9o z{QvIs-~Uh0L%X$Qz%uZs84&48wNl0|`qiA=j&p4n^(iVBwi|1yAZXZx=T$lmdGHTI Z^j)JX89CMx8Wj6OfTF=RmVv*@z)!pkEa3nE delta 138 zcmZp1XfcprU|?W$DortDU=RQ@Ie-{MGjUEV6q~50D9Qtp2Z*(M%AF Mz+#)@dFC(!06--b>Hq)$ diff --git a/src/app/.DS_Store b/src/app/.DS_Store index 294f89b8681ddd5bdb87f880b3e6b816f8576589..39743193e8b6e778642e21f5c6f416eac706cf3c 100644 GIT binary patch delta 694 zcmaiy&r1SP5XWcJ+$SZND0nE4y4q$xh$INJQ>Va{2Xr z3A%L)LcH{s^rr-!YIc?IN6{>goq2CQ^WJ=!cCMYfJ4hq|fCGpE7{I^=3pAkJiwFMx zI@04wkhHvv1V~WFZ+SQiDj+}&DFrzlRE#Vz_jOj5btWT)MPV10@Z}qN-d?|w0A(a= zSd#%omLmHb|JoWW5cw(a&(++*7#Z}hG(a7FB6s^&o?clM%kJ~s&HNbgIZU`au|-#i zbz20^un`Fxu~8;T+0>SAJPk1szPQ@y7L`$-4 zGcOrMFFIsQmwms5fg~Sks#A)__ZYP#jjD!EXo`wCC&wC9n3HEVRZJfi`v)XU!lh`k z(a3IP)2WU1Of#KoWY;pDzu9btNn&YbyHGmUYm{~H;bljA6n;k&2rYslK&r%I!Gr`u2PTG^5_X^?OOhsPkditgWaxy44lpnY$n4|2^%g11%d)WfuKN8ASm!}D1bGaTccv# zH{Ngz3IqlIO9lA*Awp*xTbmlIzdCTxB>-#Hr-RSsPoM8mmJwrl}s34OO

TdtN_>Ub!t-iJJkI{!&3F{X z874WGYLw*jlKIrY2U<{H?q*#5;`&?;-|jxnI80;R>^{HDo0`0=!F}qOD z?fiO@=bifVS^NAl?`O_?3ffO-j2S01q$}ucocF-w9?k}m%{ksGni1i0yzud9#&Kp; z&iwFEay~K7=eU>;&toj-aQeF+x`FoOqbs*tl&xdd8+HT*Ylh=?tq=+bvf<5dy{bzi2Q!}5i);_1fk8T0t<%s3fKQw zWvll8=X7>~c2FQFa2N$tt+~-$2h!Hor5LWYBlH$JH^!yL>JS_l!q;^<4m0qSDYQ9M;16$Q(mwzI From c56576739e3f6c8ff90cf36c0a8e5da89d2b9b01 Mon Sep 17 00:00:00 2001 From: Aruzhan Kordasheva <70699245+Aruq@users.noreply.github.com> Date: Fri, 2 Dec 2022 17:55:35 +0600 Subject: [PATCH 3/3] New changes --- src/app/app-routing.module.ts | 28 ++-- src/app/core/http/http.service.ts | 4 +- src/app/features/auth/auth-routing.module.ts | 4 +- src/app/features/auth/auth.module.ts | 3 +- .../login-create/login-create.component.css | 31 +++++ .../login-create/login-create.component.html | 70 ++++++++++ .../login-create/login-create.component.ts | 35 +++++ .../features/auth/login/login.component.css | 31 +++++ .../features/auth/login/login.component.html | 71 +++++++++- .../features/auth/login/login.component.ts | 6 +- .../password-reset-request.component.ts | 2 +- .../password-reset.component.html | 2 +- .../password-reset.component.ts | 2 +- .../cur-market-list.component.html | 101 ++++++++++++++ .../cur-market-list.component.scss | 22 +++ .../cur-market-list.component.ts | 73 ++++++++++ .../cur-market/cur-market-routing.module.ts | 21 +++ src/app/features/cur-market/cur-market.ts | 17 +++ .../dashboard-home.component.ts | 3 +- .../derivative-list.component.html | 102 ++++++++++++++ .../derivative-list.component.scss | 22 +++ .../derivative-list.component.ts | 61 +++++++++ .../derivatives/derivative-routing.module.ts | 21 +++ src/app/features/derivatives/derivative.ts | 19 +++ .../stok-market/filter/filter.component.css | 42 ++++++ .../stok-market/filter/filter.component.html | 37 +++++ .../stok-market/filter/filter.component.ts | 40 ++++++ .../stock-market-list.component.css | 19 +++ .../stock-market-list.component.html | 73 ++++++++++ .../stock-market-list.component.ts | 64 +++++++++ .../stock-market-routing.module.ts | 21 +++ src/app/features/stok-market/stock-market.ts | 29 ++++ src/app/shared/layout/layout.component.css | 30 ++++- src/app/shared/layout/layout.component.html | 127 ++++++++++++++---- src/app/shared/layout/layout.component.ts | 13 +- src/app/shared/shared.module.ts | 6 +- src/assets/css/font-size.css | 80 +++++++++++ src/assets/css/fonts.css | 84 ++++++++++++ src/assets/favicon/android-icon-144x144.png | Bin 17055 -> 0 bytes src/assets/favicon/android-icon-192x192.png | Bin 23334 -> 0 bytes src/assets/favicon/android-icon-36x36.png | Bin 3256 -> 0 bytes src/assets/favicon/android-icon-48x48.png | Bin 4494 -> 0 bytes src/assets/favicon/android-icon-72x72.png | Bin 7088 -> 0 bytes src/assets/favicon/android-icon-96x96.png | Bin 10071 -> 0 bytes src/assets/favicon/apple-icon-114x114.png | Bin 12536 -> 0 bytes src/assets/favicon/apple-icon-120x120.png | Bin 13392 -> 0 bytes src/assets/favicon/apple-icon-144x144.png | Bin 17055 -> 0 bytes src/assets/favicon/apple-icon-152x152.png | Bin 18212 -> 0 bytes src/assets/favicon/apple-icon-180x180.png | Bin 23127 -> 0 bytes src/assets/favicon/apple-icon-57x57.png | Bin 5351 -> 0 bytes src/assets/favicon/apple-icon-60x60.png | Bin 5722 -> 0 bytes src/assets/favicon/apple-icon-72x72.png | Bin 7088 -> 0 bytes src/assets/favicon/apple-icon-76x76.png | Bin 7538 -> 0 bytes src/assets/favicon/apple-icon-precomposed.png | Bin 23908 -> 0 bytes src/assets/favicon/apple-icon.png | Bin 23908 -> 0 bytes src/assets/favicon/browserconfig.xml | 2 - src/assets/favicon/favicon-16x16.png | Bin 1641 -> 0 bytes src/assets/favicon/favicon-32x32.png | Bin 2831 -> 0 bytes src/assets/favicon/favicon-96x96.png | Bin 10071 -> 0 bytes src/assets/favicon/favicon.ico | Bin 1150 -> 0 bytes src/assets/favicon/icon.svg | 5 + src/assets/favicon/ms-icon-144x144.png | Bin 17055 -> 0 bytes src/assets/favicon/ms-icon-150x150.png | Bin 18042 -> 0 bytes src/assets/favicon/ms-icon-310x310.png | Bin 50250 -> 0 bytes src/assets/favicon/ms-icon-70x70.png | Bin 6823 -> 0 bytes .../MuseoSansCyrl100/MuseoSansCyrl100.eot | Bin 0 -> 166380 bytes .../MuseoSansCyrl100/MuseoSansCyrl100.otf | Bin 0 -> 159708 bytes .../MuseoSansCyrl100/MuseoSansCyrl100.ttf | Bin 0 -> 128888 bytes .../MuseoSansCyrl100/MuseoSansCyrl100.woff | Bin 0 -> 43796 bytes .../MuseoSansCyrl100Italic.otf | Bin 0 -> 163124 bytes .../MuseoSansCyrl100Italic.ttf | Bin 0 -> 134000 bytes .../MuseoSansCyrl100Italic.woff | Bin 0 -> 45788 bytes .../MuseoSansCyrl300/MuseoSansCyrl300.eot | Bin 0 -> 157784 bytes .../MuseoSansCyrl300/MuseoSansCyrl300.otf | Bin 0 -> 159740 bytes .../MuseoSansCyrl300/MuseoSansCyrl300.ttf | Bin 0 -> 129276 bytes .../MuseoSansCyrl300/MuseoSansCyrl300.woff | Bin 0 -> 44724 bytes .../MuseoSansCyrl300Italic.otf | Bin 0 -> 164652 bytes .../MuseoSansCyrl300Italic.ttf | Bin 0 -> 134516 bytes .../MuseoSansCyrl300Italic.woff | Bin 0 -> 47412 bytes .../MuseoSansCyrl500/MuseoSansCyrl500.eot | Bin 0 -> 154592 bytes .../MuseoSansCyrl500/MuseoSansCyrl500.otf | Bin 0 -> 158584 bytes .../MuseoSansCyrl500/MuseoSansCyrl500.ttf | Bin 0 -> 129100 bytes .../MuseoSansCyrl500/MuseoSansCyrl500.woff | Bin 0 -> 45156 bytes .../MuseoSansCyrl500Italic.otf | Bin 0 -> 164732 bytes .../MuseoSansCyrl500Italic.ttf | Bin 0 -> 134216 bytes .../MuseoSansCyrl500Italic.woff | Bin 0 -> 47788 bytes .../MuseoSansCyrl700/MuseoSansCyrl700.eot | Bin 0 -> 152828 bytes .../MuseoSansCyrl700/MuseoSansCyrl700.otf | Bin 0 -> 157248 bytes .../MuseoSansCyrl700/MuseoSansCyrl700.ttf | Bin 0 -> 128336 bytes .../MuseoSansCyrl700/MuseoSansCyrl700.woff | Bin 0 -> 45080 bytes .../MuseoSansCyrl700Italic.otf | Bin 0 -> 166432 bytes .../MuseoSansCyrl700Italic.ttf | Bin 0 -> 134316 bytes .../MuseoSansCyrl700Italic.woff | Bin 0 -> 47764 bytes .../MuseoSansCyrl900/MuseoSansCyrl900.eot | Bin 0 -> 145552 bytes .../MuseoSansCyrl900/MuseoSansCyrl900.otf | Bin 0 -> 152856 bytes .../MuseoSansCyrl900/MuseoSansCyrl900.ttf | Bin 0 -> 126948 bytes .../MuseoSansCyrl900/MuseoSansCyrl900.woff | Bin 0 -> 43780 bytes .../MuseoSansCyrl900Italic.otf | Bin 0 -> 159884 bytes .../MuseoSansCyrl900Italic.ttf | Bin 0 -> 133584 bytes .../MuseoSansCyrl900Italic.woff | Bin 0 -> 46784 bytes src/assets/images/log.jpg | Bin 0 -> 39794 bytes src/assets/images/login.svg | 9 ++ src/index.html | 20 +-- src/styles.css | 5 +- 104 files changed, 1379 insertions(+), 78 deletions(-) create mode 100644 src/app/features/auth/login-create/login-create.component.css create mode 100644 src/app/features/auth/login-create/login-create.component.html create mode 100644 src/app/features/auth/login-create/login-create.component.ts create mode 100644 src/app/features/cur-market/cur-market-list/cur-market-list.component.html create mode 100644 src/app/features/cur-market/cur-market-list/cur-market-list.component.scss create mode 100644 src/app/features/cur-market/cur-market-list/cur-market-list.component.ts create mode 100644 src/app/features/cur-market/cur-market-routing.module.ts create mode 100644 src/app/features/cur-market/cur-market.ts create mode 100644 src/app/features/derivatives/derivative-list/derivative-list.component.html create mode 100644 src/app/features/derivatives/derivative-list/derivative-list.component.scss create mode 100644 src/app/features/derivatives/derivative-list/derivative-list.component.ts create mode 100644 src/app/features/derivatives/derivative-routing.module.ts create mode 100644 src/app/features/derivatives/derivative.ts create mode 100644 src/app/features/stok-market/filter/filter.component.css create mode 100644 src/app/features/stok-market/filter/filter.component.html create mode 100644 src/app/features/stok-market/filter/filter.component.ts create mode 100644 src/app/features/stok-market/stock-market-list/stock-market-list.component.css create mode 100644 src/app/features/stok-market/stock-market-list/stock-market-list.component.html create mode 100644 src/app/features/stok-market/stock-market-list/stock-market-list.component.ts create mode 100644 src/app/features/stok-market/stock-market-routing.module.ts create mode 100644 src/app/features/stok-market/stock-market.ts create mode 100644 src/assets/css/font-size.css create mode 100644 src/assets/css/fonts.css delete mode 100644 src/assets/favicon/android-icon-144x144.png delete mode 100644 src/assets/favicon/android-icon-192x192.png delete mode 100644 src/assets/favicon/android-icon-36x36.png delete mode 100644 src/assets/favicon/android-icon-48x48.png delete mode 100644 src/assets/favicon/android-icon-72x72.png delete mode 100644 src/assets/favicon/android-icon-96x96.png delete mode 100644 src/assets/favicon/apple-icon-114x114.png delete mode 100644 src/assets/favicon/apple-icon-120x120.png delete mode 100644 src/assets/favicon/apple-icon-144x144.png delete mode 100644 src/assets/favicon/apple-icon-152x152.png delete mode 100644 src/assets/favicon/apple-icon-180x180.png delete mode 100644 src/assets/favicon/apple-icon-57x57.png delete mode 100644 src/assets/favicon/apple-icon-60x60.png delete mode 100644 src/assets/favicon/apple-icon-72x72.png delete mode 100644 src/assets/favicon/apple-icon-76x76.png delete mode 100644 src/assets/favicon/apple-icon-precomposed.png delete mode 100644 src/assets/favicon/apple-icon.png delete mode 100644 src/assets/favicon/browserconfig.xml delete mode 100644 src/assets/favicon/favicon-16x16.png delete mode 100644 src/assets/favicon/favicon-32x32.png delete mode 100644 src/assets/favicon/favicon-96x96.png delete mode 100644 src/assets/favicon/favicon.ico create mode 100644 src/assets/favicon/icon.svg delete mode 100644 src/assets/favicon/ms-icon-144x144.png delete mode 100644 src/assets/favicon/ms-icon-150x150.png delete mode 100644 src/assets/favicon/ms-icon-310x310.png delete mode 100644 src/assets/favicon/ms-icon-70x70.png create mode 100644 src/assets/fonts/MuseoSansCyrl100/MuseoSansCyrl100.eot create mode 100644 src/assets/fonts/MuseoSansCyrl100/MuseoSansCyrl100.otf create mode 100644 src/assets/fonts/MuseoSansCyrl100/MuseoSansCyrl100.ttf create mode 100644 src/assets/fonts/MuseoSansCyrl100/MuseoSansCyrl100.woff create mode 100644 src/assets/fonts/MuseoSansCyrl100Italic/MuseoSansCyrl100Italic.otf create mode 100644 src/assets/fonts/MuseoSansCyrl100Italic/MuseoSansCyrl100Italic.ttf create mode 100644 src/assets/fonts/MuseoSansCyrl100Italic/MuseoSansCyrl100Italic.woff create mode 100644 src/assets/fonts/MuseoSansCyrl300/MuseoSansCyrl300.eot create mode 100644 src/assets/fonts/MuseoSansCyrl300/MuseoSansCyrl300.otf create mode 100644 src/assets/fonts/MuseoSansCyrl300/MuseoSansCyrl300.ttf create mode 100644 src/assets/fonts/MuseoSansCyrl300/MuseoSansCyrl300.woff create mode 100644 src/assets/fonts/MuseoSansCyrl300Italic/MuseoSansCyrl300Italic.otf create mode 100644 src/assets/fonts/MuseoSansCyrl300Italic/MuseoSansCyrl300Italic.ttf create mode 100644 src/assets/fonts/MuseoSansCyrl300Italic/MuseoSansCyrl300Italic.woff create mode 100644 src/assets/fonts/MuseoSansCyrl500/MuseoSansCyrl500.eot create mode 100644 src/assets/fonts/MuseoSansCyrl500/MuseoSansCyrl500.otf create mode 100644 src/assets/fonts/MuseoSansCyrl500/MuseoSansCyrl500.ttf create mode 100644 src/assets/fonts/MuseoSansCyrl500/MuseoSansCyrl500.woff create mode 100644 src/assets/fonts/MuseoSansCyrl500Italic/MuseoSansCyrl500Italic.otf create mode 100644 src/assets/fonts/MuseoSansCyrl500Italic/MuseoSansCyrl500Italic.ttf create mode 100644 src/assets/fonts/MuseoSansCyrl500Italic/MuseoSansCyrl500Italic.woff create mode 100644 src/assets/fonts/MuseoSansCyrl700/MuseoSansCyrl700.eot create mode 100644 src/assets/fonts/MuseoSansCyrl700/MuseoSansCyrl700.otf create mode 100644 src/assets/fonts/MuseoSansCyrl700/MuseoSansCyrl700.ttf create mode 100644 src/assets/fonts/MuseoSansCyrl700/MuseoSansCyrl700.woff create mode 100644 src/assets/fonts/MuseoSansCyrl700Italic/MuseoSansCyrl700Italic.otf create mode 100644 src/assets/fonts/MuseoSansCyrl700Italic/MuseoSansCyrl700Italic.ttf create mode 100644 src/assets/fonts/MuseoSansCyrl700Italic/MuseoSansCyrl700Italic.woff create mode 100644 src/assets/fonts/MuseoSansCyrl900/MuseoSansCyrl900.eot create mode 100644 src/assets/fonts/MuseoSansCyrl900/MuseoSansCyrl900.otf create mode 100644 src/assets/fonts/MuseoSansCyrl900/MuseoSansCyrl900.ttf create mode 100644 src/assets/fonts/MuseoSansCyrl900/MuseoSansCyrl900.woff create mode 100644 src/assets/fonts/MuseoSansCyrl900Italic/MuseoSansCyrl900Italic.otf create mode 100644 src/assets/fonts/MuseoSansCyrl900Italic/MuseoSansCyrl900Italic.ttf create mode 100644 src/assets/fonts/MuseoSansCyrl900Italic/MuseoSansCyrl900Italic.woff create mode 100644 src/assets/images/log.jpg create mode 100644 src/assets/images/login.svg diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 4811aa3..39e786f 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -13,21 +13,7 @@ const appRoutes: Routes = [ loadChildren: () => import('./features/dashboard/dashboard.module').then(m => m.DashboardModule), canActivate: [AuthGuard] }, - { - path: 'customers', - loadChildren: () => import('./features/customers/customers.module').then(m => m.CustomersModule), - canActivate: [AuthGuard] - }, - { - path: 'users', - loadChildren: () => import('./features/users/users.module').then(m => m.UsersModule), - canActivate: [AuthGuard] - }, - { - path: 'brokers', - loadChildren: () => import('./features/brokers/broker.module').then(m => m.BrokersModule), - canActivate: [AuthGuard] - }, + { path: 'account', loadChildren: () => import('./features/account/account.module').then(m => m.AccountModule), @@ -48,6 +34,18 @@ const appRoutes: Routes = [ loadChildren: () => import('./features/about/about.module').then(m => m.AboutModule), canActivate: [AuthGuard] }, + {path:'stock-market', + loadChildren:()=>import('./features/stok-market/stock-market').then(m=>m.StockMarketModule), + canActivate:[AuthGuard] +}, +{path:'currency-market', +loadChildren:()=>import('./features/cur-market/cur-market').then(m=>m.CurMarketModule), +canActivate:[AuthGuard] +}, +{path:'derivative', +loadChildren:()=>import('./features/derivatives/derivative').then(m=>m.DerivativeModule), +canActivate:[AuthGuard] +}, { path: '**', redirectTo: 'dashboard', diff --git a/src/app/core/http/http.service.ts b/src/app/core/http/http.service.ts index b0f2fde..6aea469 100644 --- a/src/app/core/http/http.service.ts +++ b/src/app/core/http/http.service.ts @@ -10,8 +10,8 @@ export class HttpService { constructor(private http: HttpClient) { } - getData(user: string){ - return this.http.get('http://192.168.4.18:8086/kase.kz/role?role=' + user) + getData(){ + return this.http.get('http://192.168.4.18:8084/stock?vDateStart=20221030&vDateEnd=20221102') } } diff --git a/src/app/features/auth/auth-routing.module.ts b/src/app/features/auth/auth-routing.module.ts index 9a934db..b3b3698 100644 --- a/src/app/features/auth/auth-routing.module.ts +++ b/src/app/features/auth/auth-routing.module.ts @@ -1,5 +1,6 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; +import { LoginCreateComponent } from './login-create/login-create.component'; import { LoginComponent } from './login/login.component'; import { PasswordResetRequestComponent } from './password-reset-request/password-reset-request.component'; @@ -8,7 +9,8 @@ import { PasswordResetComponent } from './password-reset/password-reset.componen const routes: Routes = [ { path: 'login', component: LoginComponent }, { path: 'password-reset-request', component: PasswordResetRequestComponent }, - { path: 'password-reset', component: PasswordResetComponent } + { path: 'password-reset', component: PasswordResetComponent }, + { path: 'login-create', component: LoginCreateComponent } ]; @NgModule({ diff --git a/src/app/features/auth/auth.module.ts b/src/app/features/auth/auth.module.ts index 3ef111a..b886f1d 100644 --- a/src/app/features/auth/auth.module.ts +++ b/src/app/features/auth/auth.module.ts @@ -6,6 +6,7 @@ import { LoginComponent } from './login/login.component'; import { PasswordResetRequestComponent } from './password-reset-request/password-reset-request.component'; import { PasswordResetComponent } from './password-reset/password-reset.component'; import { SharedModule } from 'src/app/shared/shared.module'; +import { LoginCreateComponent } from './login-create/login-create.component'; @NgModule({ imports: [ @@ -13,6 +14,6 @@ import { SharedModule } from 'src/app/shared/shared.module'; SharedModule, AuthRoutingModule ], - declarations: [LoginComponent, PasswordResetRequestComponent, PasswordResetComponent] + declarations: [LoginComponent, PasswordResetRequestComponent, PasswordResetComponent,LoginCreateComponent] }) export class AuthModule { } diff --git a/src/app/features/auth/login-create/login-create.component.css b/src/app/features/auth/login-create/login-create.component.css new file mode 100644 index 0000000..a0d2ed6 --- /dev/null +++ b/src/app/features/auth/login-create/login-create.component.css @@ -0,0 +1,31 @@ +.a{ + background-color: white; + padding: 50px 0 50px 0; +}.bb{ + align-items: center; + display: flex; + justify-content: center; + padding-top: 100px; +padding-bottom: 100px; + +} +.d{ + flex-flow: column!important; +} +.c{ + color: #525252; +} + + .mat-card:not([class*=mat-elevation-z]) { + box-shadow: none!important + } +mat{ + background-color: green; +} +.mat-slide-toggle.mat-checked .mat-slide-toggle-bar { + background-color:none!important; +} +.mat-slide-toggle.mat-checked .mat-slide-toggle-thumb { + background-color: + none !important; +} diff --git a/src/app/features/auth/login-create/login-create.component.html b/src/app/features/auth/login-create/login-create.component.html new file mode 100644 index 0000000..c07ff3b --- /dev/null +++ b/src/app/features/auth/login-create/login-create.component.html @@ -0,0 +1,70 @@ +

 \ No newline at end of file diff --git a/src/app/features/auth/login-create/login-create.component.ts b/src/app/features/auth/login-create/login-create.component.ts new file mode 100644 index 0000000..c9a5725 --- /dev/null +++ b/src/app/features/auth/login-create/login-create.component.ts @@ -0,0 +1,35 @@ +import { Router } from '@angular/router'; +import { Component, OnInit } from '@angular/core'; +import { UntypedFormGroup, UntypedFormControl, Validators } from '@angular/forms'; +import { Title } from '@angular/platform-browser'; + +import { NotificationService } from 'src/app/core/services/notification.service'; +import { AuthenticationService } from 'src/app/core/services/auth.service'; + +@Component({ + selector: 'app-login-create', + templateUrl: './login-create.component.html', + styleUrls: ['./login-create.component.css'] +}) +export class LoginCreateComponent implements OnInit { +login() { +throw new Error('Method not implemented.'); +} + + + form!: UntypedFormGroup; + loading!: boolean; + + constructor( + private titleService: Title, + private router: Router) { } + + ngOnInit() { + this.titleService.setTitle('Admin-panel - Login create'); + + } + + cancel() { + this.router.navigate(['/']); + } +} diff --git a/src/app/features/auth/login/login.component.css b/src/app/features/auth/login/login.component.css index e69de29..a0d2ed6 100644 --- a/src/app/features/auth/login/login.component.css +++ b/src/app/features/auth/login/login.component.css @@ -0,0 +1,31 @@ +.a{ + background-color: white; + padding: 50px 0 50px 0; +}.bb{ + align-items: center; + display: flex; + justify-content: center; + padding-top: 100px; +padding-bottom: 100px; + +} +.d{ + flex-flow: column!important; +} +.c{ + color: #525252; +} + + .mat-card:not([class*=mat-elevation-z]) { + box-shadow: none!important + } +mat{ + background-color: green; +} +.mat-slide-toggle.mat-checked .mat-slide-toggle-bar { + background-color:none!important; +} +.mat-slide-toggle.mat-checked .mat-slide-toggle-thumb { + background-color: + none !important; +} diff --git a/src/app/features/auth/login/login.component.html b/src/app/features/auth/login/login.component.html index 9b67329..75a5f3c 100644 --- a/src/app/features/auth/login/login.component.html +++ b/src/app/features/auth/login/login.component.html @@ -1,4 +1,4 @@ -