diff --git a/.DS_Store b/.DS_Store index 84a8090..fd257a6 100644 Binary files a/.DS_Store and b/.DS_Store differ 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/.DS_Store b/src/.DS_Store index f609d3e..0b8a21b 100644 Binary files a/src/.DS_Store and b/src/.DS_Store differ diff --git a/src/app/.DS_Store b/src/app/.DS_Store index 294f89b..3974319 100644 Binary files a/src/app/.DS_Store and b/src/app/.DS_Store differ diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index ef223db..39e786f 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -13,16 +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: 'account', loadChildren: () => import('./features/account/account.module').then(m => m.AccountModule), @@ -43,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/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..6aea469 --- /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(){ + return this.http.get('http://192.168.4.18:8084/stock?vDateStart=20221030&vDateEnd=20221102') + } + +} 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/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 @@ +
+
+ + + + + + + + +
+ +
+ +
+
+
+ + Create an Account + + + Name + + + + Surname + + + + + Company + + Issuers + Users + Brokers + + + + Email + + + + Password + + + + +
+ Remember me + +
+ + +
+ + + + + +
+
\ 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 29058af..75a5f3c 100644 --- a/src/app/features/auth/login/login.component.html +++ b/src/app/features/auth/login/login.component.html @@ -1,7 +1,7 @@ -
+ +
+
+ + + + + + + + +
+ +
+ +
+
+
+ + Login to your Account + + + + + + + + Please enter a valid email address + + + Email is + required + + + + + + + + Password is + required + + + +
+ Remember me + +
+ + + +
+ +
+ Not Registered Yet? + +
+ + + + +
\ No newline at end of file diff --git a/src/app/features/auth/login/login.component.ts b/src/app/features/auth/login/login.component.ts index d68874b..3e725a7 100644 --- a/src/app/features/auth/login/login.component.ts +++ b/src/app/features/auth/login/login.component.ts @@ -22,7 +22,7 @@ export class LoginComponent implements OnInit { } ngOnInit() { - this.titleService.setTitle('angular-material-template - Login'); + this.titleService.setTitle('Admin-panel - Login'); this.authenticationService.logout(); this.createForm(); } @@ -64,4 +64,8 @@ export class LoginComponent implements OnInit { resetPassword() { this.router.navigate(['/auth/password-reset-request']); } + createAccount(){ + this.router.navigate(['/auth/login-create']) + } + } diff --git a/src/app/features/auth/password-reset-request/password-reset-request.component.ts b/src/app/features/auth/password-reset-request/password-reset-request.component.ts index bdf3568..8ac6127 100644 --- a/src/app/features/auth/password-reset-request/password-reset-request.component.ts +++ b/src/app/features/auth/password-reset-request/password-reset-request.component.ts @@ -23,7 +23,7 @@ export class PasswordResetRequestComponent implements OnInit { private router: Router) { } ngOnInit() { - this.titleService.setTitle('angular-material-template - Password Reset Request'); + this.titleService.setTitle('Admin-panel - Password Reset Request'); this.form = new UntypedFormGroup({ email: new UntypedFormControl('', [Validators.required, Validators.email]) diff --git a/src/app/features/auth/password-reset/password-reset.component.html b/src/app/features/auth/password-reset/password-reset.component.html index 4e95c66..072db7e 100644 --- a/src/app/features/auth/password-reset/password-reset.component.html +++ b/src/app/features/auth/password-reset/password-reset.component.html @@ -1,7 +1,7 @@
- angular-material-template + Admin-panel Reset your password diff --git a/src/app/features/auth/password-reset/password-reset.component.ts b/src/app/features/auth/password-reset/password-reset.component.ts index 3157e2e..96a7e0e 100644 --- a/src/app/features/auth/password-reset/password-reset.component.ts +++ b/src/app/features/auth/password-reset/password-reset.component.ts @@ -25,7 +25,7 @@ export class PasswordResetComponent implements OnInit { private notificationService: NotificationService, private titleService: Title) { - this.titleService.setTitle('angular-material-template - Password Reset'); + this.titleService.setTitle('admin-panel-template - Password Reset'); this.hideNewPassword = true; this.hideNewPasswordConfirm = true; } 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/cur-market/cur-market-list/cur-market-list.component.html b/src/app/features/cur-market/cur-market-list/cur-market-list.component.html new file mode 100644 index 0000000..db0ecef --- /dev/null +++ b/src/app/features/cur-market/cur-market-list/cur-market-list.component.html @@ -0,0 +1,101 @@ +
+
+

Информация по валютному рынку +

+ + + + Валюта + + + + + Вид счета + + + + + Данные по датам + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Код организации {{myData$.orgCode}} Дата {{myData$.dateTime}} Дебет {{myData$.debet}} + Кредит {{myData$.credit}} + Валюта + {{myData$.currency}} + Вид операции + {{myData$.operType}} + Вид счета + {{myData$.accountType}} +
+ + + + +
+
\ No newline at end of file diff --git a/src/app/features/cur-market/cur-market-list/cur-market-list.component.scss b/src/app/features/cur-market/cur-market-list/cur-market-list.component.scss new file mode 100644 index 0000000..b9e2e8e --- /dev/null +++ b/src/app/features/cur-market/cur-market-list/cur-market-list.component.scss @@ -0,0 +1,22 @@ +::ng-deep .mat-form-field-appearance-outline .mat-form-field-outline { + color: #038726; + margin: 0; + } + .search { + &__form { + display: flex; + flex-flow: row wrap; + justify-content: center; + + &_field { + width: 250px; + margin: 0 8px 16px 8px; + } + } + &__table { + margin: 0 18px 18px 18px; + } + } + h2{ + text-align: center; + } \ No newline at end of file diff --git a/src/app/features/cur-market/cur-market-list/cur-market-list.component.ts b/src/app/features/cur-market/cur-market-list/cur-market-list.component.ts new file mode 100644 index 0000000..2c27c2e --- /dev/null +++ b/src/app/features/cur-market/cur-market-list/cur-market-list.component.ts @@ -0,0 +1,73 @@ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { MatSort } from '@angular/material/sort'; +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 { MatTableDataSource } from '@angular/material/table'; +import { HttpClient } from '@angular/common/http'; +import { AbstractControl, FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; +import { DataSource } from '@angular/cdk/collections'; +@Component({ + selector: 'app-cur-market-list', + templateUrl: './cur-market-list.component.html', + styleUrls: ['./cur-market-list.component.scss'] +}) +export class CurMarketListComponent implements OnInit { + displayedColumns: string[] = ['code','date','debit','credit','currency','type-op','type_ac']; + dataSource = new MatTableDataSource(); +public search:FormGroup | undefined; +public date=''; +public currency=''; +public type_ac='' + + @ViewChild(MatSort, { static: true }) sort!: MatSort; +myData:any +myData$:any[] = []; + constructor( + private logger: NGXLogger, + private notificationService: NotificationService, + private titleService: Title, + private myDataService:HttpService, + private httpClient:HttpClient, + formBuilder: FormBuilder + ) { + + + } + filter(event: Event) { + const filter = (event.target as HTMLInputElement).value; + this.dataSource.filter = filter.trim().toLowerCase(); + } + ngOnInit() { + this.titleService.setTitle('draft - Issuers'); + this.logger.log('Issuers loaded'); + this.notificationService.openSnackBar('Issuers loaded'); + + this.httpClient.get('http://192.168.4.18:8084/currency?vDateStart=20221030&vDateEnd=20221102').subscribe((next: any) =>{ + //@ts-ignore + + + + next.forEach((element:any) =>{ + console.log(element) + this.myData$.push(element) + + }) + + console.log(this.myData$) + this.dataSource.data =this.myData$ + this.dataSource.sort = this.sort; + + + + } + + + ); + + +} + +} +; \ No newline at end of file diff --git a/src/app/features/cur-market/cur-market-routing.module.ts b/src/app/features/cur-market/cur-market-routing.module.ts new file mode 100644 index 0000000..7b7a65a --- /dev/null +++ b/src/app/features/cur-market/cur-market-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 {CurMarketListComponent } from './cur-market-list/cur-market-list.component'; + +const routes: Routes = [ + { + path: '', + component: LayoutComponent, + children: [ + { path: '', component: CurMarketListComponent}, + ] + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class ViewExRoutingModule { } diff --git a/src/app/features/cur-market/cur-market.ts b/src/app/features/cur-market/cur-market.ts new file mode 100644 index 0000000..d883664 --- /dev/null +++ b/src/app/features/cur-market/cur-market.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import {ViewExRoutingModule } from './cur-market-routing.module'; +import { SharedModule } from 'src/app/shared/shared.module'; +import {CurMarketListComponent } from './cur-market-list/cur-market-list.component'; + +@NgModule({ + imports: [ + CommonModule, + ViewExRoutingModule, + SharedModule + ], + declarations: [ + CurMarketListComponent + ] +}) +export class CurMarketModule { } 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/dashboard/dashboard-home/dashboard-home.component.ts b/src/app/features/dashboard/dashboard-home/dashboard-home.component.ts index ff74518..8066b4e 100644 --- a/src/app/features/dashboard/dashboard-home/dashboard-home.component.ts +++ b/src/app/features/dashboard/dashboard-home/dashboard-home.component.ts @@ -20,7 +20,8 @@ export class DashboardHomeComponent implements OnInit { ngOnInit() { this.currentUser = this.authService.getCurrentUser(); - this.titleService.setTitle('angular-material-template - Dashboard'); + this.titleService.setTitle('Admin-template'); + this.logger.log('Dashboard loaded'); setTimeout(() => { diff --git a/src/app/features/derivatives/derivative-list/derivative-list.component.html b/src/app/features/derivatives/derivative-list/derivative-list.component.html new file mode 100644 index 0000000..49e61dd --- /dev/null +++ b/src/app/features/derivatives/derivative-list/derivative-list.component.html @@ -0,0 +1,102 @@ +
+
+

Информация по рынку деривативов +

+
+ + + Валюта + + + + + Вид счета + + + + + Данные по датам + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Код организации {{myData$.orgCode}} Дата {{myData$.dateTime}} Дебет {{myData$.debet}} + Кредит {{myData$.credit}} + Валюта + {{myData$.currency}} + Вид операции + {{myData$.operType}} + Вид счета + {{myData$.accountType}} +
+ + + + +
+
\ No newline at end of file diff --git a/src/app/features/derivatives/derivative-list/derivative-list.component.scss b/src/app/features/derivatives/derivative-list/derivative-list.component.scss new file mode 100644 index 0000000..b9e2e8e --- /dev/null +++ b/src/app/features/derivatives/derivative-list/derivative-list.component.scss @@ -0,0 +1,22 @@ +::ng-deep .mat-form-field-appearance-outline .mat-form-field-outline { + color: #038726; + margin: 0; + } + .search { + &__form { + display: flex; + flex-flow: row wrap; + justify-content: center; + + &_field { + width: 250px; + margin: 0 8px 16px 8px; + } + } + &__table { + margin: 0 18px 18px 18px; + } + } + h2{ + text-align: center; + } \ No newline at end of file diff --git a/src/app/features/derivatives/derivative-list/derivative-list.component.ts b/src/app/features/derivatives/derivative-list/derivative-list.component.ts new file mode 100644 index 0000000..239254c --- /dev/null +++ b/src/app/features/derivatives/derivative-list/derivative-list.component.ts @@ -0,0 +1,61 @@ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { MatSort } from '@angular/material/sort'; +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 { MatTableDataSource } from '@angular/material/table'; +import { HttpClient } from '@angular/common/http'; +@Component({ + selector: 'app-derivative-list', + templateUrl: './derivative-list.component.html', + styleUrls: ['./derivative-list.component.scss'] +}) +export class DerivativeListComponent implements OnInit { + displayedColumns: string[] = ['code','date','debit','credit','currency','type-op','type-ac']; + currencyList: string[] = ['AUD', 'CAD', 'CHF','CNY','DEM','EUR','GBP','JPY','KZT','MYR','RUB','USD']; + dataSource: any; + filterValues={ + currency:[], + type:'' + + } + @ViewChild(MatSort, { static: true }) sort!: MatSort; +myData:any +myData$:any[] = []; + constructor( + private logger: NGXLogger, + private notificationService: NotificationService, + private titleService: Title, + private myDataService:HttpService, + private httpClient:HttpClient + ) { } + filter(event: Event) { + const filter = (event.target as HTMLInputElement).value; + this.dataSource.filter = filter.trim().toLowerCase(); + } + ngOnInit() { + this.titleService.setTitle('draft - Issuers'); + this.logger.log('Issuers loaded'); + this.notificationService.openSnackBar('Issuers loaded'); + this.httpClient.get('http://192.168.4.18:8084/currency?vDateStart=20221030&vDateEnd=20221102').subscribe((next: any) =>{ + //@ts-ignore + + + + next.forEach((element:any) =>{ + console.log(element) + this.myData$.push(element) + + }) + console.log(this.myData$) + this.dataSource = new MatTableDataSource(this.myData$) + this.dataSource.sort = this.sort; + + } + + ); + +} +} +; \ No newline at end of file diff --git a/src/app/features/derivatives/derivative-routing.module.ts b/src/app/features/derivatives/derivative-routing.module.ts new file mode 100644 index 0000000..5cb9b39 --- /dev/null +++ b/src/app/features/derivatives/derivative-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 {DerivativeListComponent } from './derivative-list/derivative-list.component'; + +const routes: Routes = [ + { + path: '', + component: LayoutComponent, + children: [ + { path: '', component: DerivativeListComponent}, + ] + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class ViewExRoutingModule { } diff --git a/src/app/features/derivatives/derivative.ts b/src/app/features/derivatives/derivative.ts new file mode 100644 index 0000000..e16e5a6 --- /dev/null +++ b/src/app/features/derivatives/derivative.ts @@ -0,0 +1,19 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import {ViewExRoutingModule } from './derivative-routing.module'; +import { SharedModule } from 'src/app/shared/shared.module'; +import {DerivativeListComponent } from './derivative-list/derivative-list.component'; +import { MatSortModule } from '@angular/material/sort'; + +@NgModule({ + imports: [ + CommonModule, + ViewExRoutingModule, + SharedModule, + MatSortModule, + ], + declarations: [ + DerivativeListComponent + ] +}) +export class DerivativeModule { } diff --git a/src/app/features/stok-market/filter/filter.component.css b/src/app/features/stok-market/filter/filter.component.css new file mode 100644 index 0000000..4bb277f --- /dev/null +++ b/src/app/features/stok-market/filter/filter.component.css @@ -0,0 +1,42 @@ +.f-main{ + display: flex; +flex-direction: column; +align-items: flex-start; +padding: 0px; +gap: 24px; +height: 322px; +} +.second{ + display: flex; +flex-direction: column; +align-items: flex-start; +padding: 8px 12px; +gap: 4px; +width: 492px; +height: 66px; +background: #FFFFFF; +box-shadow: 0px 1px 5px rgba(0, 0, 0, 0.05), 0px 1px 5px rgba(0, 0, 0, 0.15); +border-radius: 8px; +} +.container{ + display: flex; +flex-direction: row; +align-items: flex-start; +padding: 0px; +gap: 16px; + +width: 189px; +height: 29px; +}.card{ + box-sizing: border-box; +display: flex; +flex-direction: row; +align-items: center; +padding: 6px 12px; +gap: 12px; +height: 29px; +background: #FFFFFF; +border: 1px solid #D1D1D1; +box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.1), 0px 1px 2px rgba(0, 0, 0, 0.06); +border-radius: 50px; +} diff --git a/src/app/features/stok-market/filter/filter.component.html b/src/app/features/stok-market/filter/filter.component.html new file mode 100644 index 0000000..05e3e05 --- /dev/null +++ b/src/app/features/stok-market/filter/filter.component.html @@ -0,0 +1,37 @@ +

Фильтр

+
+
+ + Enter a date range + + + + + MM/DD/YYYY – MM/DD/YYYY + + + +
+
+ Вид счета +
+
CLTI
+
KASI
+
OWNI
+
+
+
Валюта +
+
AUD
+
CAD
+
CHF
+
CNY
+
DEM
+
EUR
+
GBP
+
+
+
+
+ +
diff --git a/src/app/features/stok-market/filter/filter.component.ts b/src/app/features/stok-market/filter/filter.component.ts new file mode 100644 index 0000000..cb332ba --- /dev/null +++ b/src/app/features/stok-market/filter/filter.component.ts @@ -0,0 +1,40 @@ +import {Component, Injectable} from '@angular/core'; +import {MatDialog} from '@angular/material/dialog'; +import { MatFormField } from '@angular/material/form-field'; +import { + MatDateRangeSelectionStrategy, + DateRange, + MAT_DATE_RANGE_SELECTION_STRATEGY, + } from '@angular/material/datepicker'; +import { DateAdapter } from '@angular/material/core'; +@Injectable() +export class FiveDayRangeSelectionStrategy implements MatDateRangeSelectionStrategy { + constructor(private _dateAdapter: DateAdapter) {} + + selectionFinished(date: D | null): DateRange { + return this._createFiveDayRange(date); + } + + createPreview(activeDate: D | null): DateRange { + return this._createFiveDayRange(activeDate); + } + + private _createFiveDayRange(date: D | null): DateRange { + if (date) { + const start = this._dateAdapter.addCalendarDays(date, -2); + const end = this._dateAdapter.addCalendarDays(date, 2); + return new DateRange(start, end); + } + + return new DateRange(null, null); + } +} + +@Component({ + selector: 'filter.component', + templateUrl: 'filter.component.html', + styleUrls: ['./filter.component.css'] + }) + export class FilterComponent { +reportField: any; +} \ No newline at end of file diff --git a/src/app/features/stok-market/stock-market-list/stock-market-list.component.css b/src/app/features/stok-market/stock-market-list/stock-market-list.component.css new file mode 100644 index 0000000..a37cc36 --- /dev/null +++ b/src/app/features/stok-market/stock-market-list/stock-market-list.component.css @@ -0,0 +1,19 @@ +.bl{ + color: #1E212B; +} +.dialog{ +color:white; +gap: 8px; + +width: 161px; +height: 36px; + + +background: #12BA3E; +border-radius: 8px; +} +.c{ + display: flex; + flex-direction: row; + justify-content: space-between; +} \ No newline at end of file diff --git a/src/app/features/stok-market/stock-market-list/stock-market-list.component.html b/src/app/features/stok-market/stock-market-list/stock-market-list.component.html new file mode 100644 index 0000000..337f1f5 --- /dev/null +++ b/src/app/features/stok-market/stock-market-list/stock-market-list.component.html @@ -0,0 +1,73 @@ +
+
+
+

Информация по фондовому рынку + +

+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Код организации {{myData$.orgCode}} Дата {{myData$.dateTime}} Дебет {{myData$.debet}} + Кредит {{myData$.credit}} + Валюта + {{myData$.currency}} + Вид операции + {{myData$.operType}} + Вид счета + {{myData$.accountType}} +
+ + + + +
+
\ No newline at end of file diff --git a/src/app/features/stok-market/stock-market-list/stock-market-list.component.ts b/src/app/features/stok-market/stock-market-list/stock-market-list.component.ts new file mode 100644 index 0000000..f6cb6eb --- /dev/null +++ b/src/app/features/stok-market/stock-market-list/stock-market-list.component.ts @@ -0,0 +1,64 @@ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { MatSort } from '@angular/material/sort'; +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 { MatTableDataSource } from '@angular/material/table'; +import { HttpClient } from '@angular/common/http'; +import { MatDialog } from '@angular/material/dialog'; +import { FilterComponent } from '../filter/filter.component'; +@Component({ + selector: 'app-stock-market-list', + templateUrl: './stock-market-list.component.html', + styleUrls: ['./stock-market-list.component.css'] +}) +export class StockMarketListComponent implements OnInit { + displayedColumns: string[] = ['code','date','debit','credit','currency','type-op','type-ac']; + dataSource: any; + +myData:any +myData$:any[] = []; + + constructor( + private logger: NGXLogger, + private notificationService: NotificationService, + private titleService: Title, + private myDataService:HttpService, + private httpClient:HttpClient, + public dialog: MatDialog + ) { } + openDialog() { + this.dialog.open(FilterComponent); + } + ngOnInit() { + this.titleService.setTitle('draft - Issuers'); + this.logger.log('Issuers loaded'); + this.notificationService.openSnackBar('Issuers loaded'); + this.httpClient.get('http://192.168.4.18:8084/stock?vDateStart=20221030&vDateEnd=20221102').subscribe((next: any) =>{ + //@ts-ignore + + + + next.forEach((element:any) =>{ + console.log(element) + + + this.myData$.push(element) + + }) + + + + console.log(this.myData$) + this.dataSource = new MatTableDataSource(this.myData$) + } + + + ); + + + +} +} +; diff --git a/src/app/features/stok-market/stock-market-routing.module.ts b/src/app/features/stok-market/stock-market-routing.module.ts new file mode 100644 index 0000000..0fbbb56 --- /dev/null +++ b/src/app/features/stok-market/stock-market-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 {StockMarketListComponent } from './stock-market-list/stock-market-list.component'; + +const routes: Routes = [ + { + path: '', + component: LayoutComponent, + children: [ + { path: '', component: StockMarketListComponent}, + ] + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class ViewExRoutingModule { } diff --git a/src/app/features/stok-market/stock-market.ts b/src/app/features/stok-market/stock-market.ts new file mode 100644 index 0000000..ed07e96 --- /dev/null +++ b/src/app/features/stok-market/stock-market.ts @@ -0,0 +1,29 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import {ViewExRoutingModule } from './stock-market-routing.module'; +import { SharedModule } from 'src/app/shared/shared.module'; +import { StockMarketListComponent } from './stock-market-list/stock-market-list.component'; +import { MatDatepickerModule } from '@angular/material/datepicker'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; +import { MatNativeDateModule } from '@angular/material/core'; +import { MAT_FORM_FIELD_DEFAULT_OPTIONS } from '@angular/material/form-field' +import { FilterComponent } from './filter/filter.component'; + +@NgModule({ + imports: [ + CommonModule, + ViewExRoutingModule, + SharedModule, + MatDatepickerModule, + MatInputModule, + MatFormFieldModule, + MatNativeDateModule, + + ], + declarations: [ + StockMarketListComponent, + FilterComponent + ] +}) +export class StockMarketModule { } 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..999fce2 100644 --- a/src/app/shared/layout/layout.component.css +++ b/src/app/shared/layout/layout.component.css @@ -4,11 +4,19 @@ .navbar { z-index: 2; -} - + background: rgb(255, 255, 255); + box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25); + height: 76px; +gap:12px;} .navbar-brand { text-decoration: none; - color: white; + + display:flex; + +} +.myImage{ + background-image: url("/assets/images/kase-logo.svg"); + } .navbar-container { @@ -20,7 +28,6 @@ left: 0; right: 0; } - .navbar-is-mobile .navbar { position: fixed; /* Make sure the toolbar will stay on top of the content as it scrolls past. */ @@ -31,6 +38,7 @@ /* When the sidenav is not fixed, stretch the sidenav container to fill the available space. This causes `` to act as our scrolling element for desktop layouts. */ flex: 1; + } .navbar-is-mobile .navbar-sidenav-container { @@ -42,7 +50,7 @@ /*Set sidenav width*/ mat-sidenav { - min-width: 180px !important; + max-width: 280px !important; border-right: 1px solid #eee; box-shadow: 6px 0 6px rgba(0, 0, 0, .1); /* background-color:rgb(63, 81, 181); */ @@ -56,9 +64,44 @@ mat-sidenav { a.mat-list-item.active { background: rgba(0, 0, 0, .04); + } #push-bottom { position: absolute; bottom: 0; +} +.header_inner-left { + display: flex; + gap: 16px; +} +.date{ + display:flex; + flex-direction: column; + font-size:13px +} + + h1{ + padding: 12px 0px 10px 10px + } + +.items{ + padding: 0px 10px 0px 16px; +} +.mat-h{ +padding-right: 20px; +} +.button{ + height:100% !important + ; + border-color: aqua; + padding: 15px 10px !important; +gap: 20px; +border-radius: 8px; +color: #343434; + +} + +.pl-18{ + padding-left: 18px; } \ No newline at end of file diff --git a/src/app/shared/layout/layout.component.html b/src/app/shared/layout/layout.component.html index a5cdab0..17ca3be 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}} +
+
+ @@ -33,7 +38,7 @@

@@ -59,41 +64,122 @@

[fixedInViewport]="mobileQuery.matches" fixedTopGap="56" class="sidenav"> -

Home

+

Home

+ - + dashboard -

Dashboard

- +

Dashboard

- - - business - -

Customers

- - - - people - -

Users

+ + + + business + + Эмитенты + + + + Корпоративные события + + + Счета и акты выполненных работ + + + Проспекты + + + Периодическая отчетность + + + Учредительные документы + + + Листинговые процедуры (официальный список Биржи) + + + Сектор "Нелистинговые ценные бумаги" (неофициальный список Биржи) + + + Прием в члены Биржи + + + Информационные сообщения + + + + + + + + + people + + Пользователи + + + + RTM + + + Платная подписка + + + + + + + + + + business_center + + Брокеры + + + + Единый пул + обеспечения + + + + Просмотр счетов + + + Фондовый рынок + + + Валютный рынок + + + Деривативы + + + + + + + IPO + + + person -

Account

+

Account

exit_to_app -

Log out

+

Log out

-

Resources

+ diff --git a/src/app/shared/layout/layout.component.ts b/src/app/shared/layout/layout.component.ts index 9f5094f..26113c2 100644 --- a/src/app/shared/layout/layout.component.ts +++ b/src/app/shared/layout/layout.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ChangeDetectorRef, OnDestroy, AfterViewInit } from '@angular/core'; +import { Component, OnInit, ChangeDetectorRef, OnDestroy, AfterViewInit, ViewChild } from '@angular/core'; import { MediaMatcher } from '@angular/cdk/layout'; import { timer } from 'rxjs'; import { Subscription } from 'rxjs'; @@ -6,7 +6,9 @@ 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'; +import {MatTreeFlatDataSource, MatTreeFlattener} from '@angular/material/tree'; +import { MatSidenav } from '@angular/material/sidenav'; @Component({ selector: 'app-layout', templateUrl: './layout.component.html', @@ -19,8 +21,16 @@ export class LayoutComponent implements OnInit, OnDestroy, AfterViewInit { showSpinner: boolean = false; userName: string = ""; isAdmin: boolean = false; - + public currentTime: string = '' + public currentDate: string = '' + @ViewChild('sidenav') sidenav: MatSidenav | undefined; + isExpanded = true; + showSubmenu: boolean = false; + isShowing = false; + showSubSubMenu: boolean = false; + private autoLogoutSubscription: Subscription = new Subscription; +snav: any; constructor(private changeDetectorRef: ChangeDetectorRef, private media: MediaMatcher, @@ -39,14 +49,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..561dc03 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -10,6 +10,7 @@ import { ContentPlaceholderAnimationComponent } from './content-placeholder-anim import { LocalDatePipe } from './pipes/local-date.pipe'; import { YesNoPipe } from './pipes/yes-no.pipe'; import { LayoutComponent } from './layout/layout.component'; +import { MatNativeDateModule } from '@angular/material/core'; @NgModule({ imports: [ @@ -18,6 +19,9 @@ import { LayoutComponent } from './layout/layout.component'; FormsModule, ReactiveFormsModule, FlexLayoutModule, + MatNativeDateModule, + + ], declarations: [ ConfirmDialogComponent, @@ -25,7 +29,8 @@ import { LayoutComponent } from './layout/layout.component'; LimitToPipe, LocalDatePipe, YesNoPipe, - LayoutComponent + LayoutComponent, + ], exports: [ FormsModule, diff --git a/src/assets/css/font-size.css b/src/assets/css/font-size.css new file mode 100644 index 0000000..4d80487 --- /dev/null +++ b/src/assets/css/font-size.css @@ -0,0 +1,80 @@ + + +.fs-60_72 { + font-size: 60px; + line-height: 72px; +} + +.fs-36_432 { + font-size: 36px; + line-height: 43.2px; +} + +.fs-28_336 { + font-size: 28px; + line-height: 33.6px; +} + +.fs-20_24 { + font-size: 20px; + line-height: 24px; +} + +.fs-16_24 { + font-size: 16px; + line-height: 24px; +} + +.fs-12_168 { + font-size: 12px; + line-height: 16.8px; +} + +.fs-14_168 { + font-size: 14px; + line-height: 16.8px; +} + +.fs-14_196 { + font-size: 14px; + line-height: 19.6px; +} + +.fs-16_224 { + font-size: 16px; + line-height: 22.4px; +} + +.fs-18_252 { + font-size: 18px; + line-height: 25.2px; +} + +.fs-16_19 { + font-size: 16px; + line-height: 19px; +} + +.fs-14_224 { + font-size: 14px; + line-height: 22.4px; +} +.fs-14_196 { + font-size: 14px; + line-height: 19.6px; +} + +.fs-12_192 { + font-size: 12px; + line-height: 19.2px; +} + +.fs-12_168 { + font-size: 12px; + line-height: 16.8px; +} + +.fs-10_16 { + font-size: 10px; + line-height: 16px; +} diff --git a/src/assets/css/fonts.css b/src/assets/css/fonts.css new file mode 100644 index 0000000..9f122a9 --- /dev/null +++ b/src/assets/css/fonts.css @@ -0,0 +1,84 @@ +@font-face { + font-family: "MuseoSansCyrl100"; + src: url("../fonts/MuseoSansCyrl100/MuseoSansCyrl100.eot"); + src: url("../fonts/MuseoSansCyrl100/MuseoSansCyrl100.eot?#iefix")format("embedded-opentype"), + url("../fonts/MuseoSansCyrl100/MuseoSansCyrl100.woff") format("woff"), + url("../fonts/MuseoSansCyrl100/MuseoSansCyrl100.ttf") format("truetype"); + font-style: normal; + font-weight: 100; + } + + @font-face { + font-family: "MuseoSansCyrl300"; + src: url("../fonts/MuseoSansCyrl300/MuseoSansCyrl300.eot"); + src: url("../fonts/MuseoSansCyrl300/MuseoSansCyrl300.eot?#iefix")format("embedded-opentype"), + url("../fonts/MuseoSansCyrl300/MuseoSansCyrl300.woff") format("woff"), + url("../fonts/MuseoSansCyrl300/MuseoSansCyrl300.ttf") format("truetype"); + font-style: normal; + font-weight: 300; + } + + @font-face { + font-family: "MuseoSansCyrl300Italic"; + src: url("../fonts/MuseoSansCyrl300/MuseoSansCyrl300.eot"); + src: url("../fonts/MuseoSansCyrl300/MuseoSansCyrl300.eot?#iefix")format("embedded-opentype"), + url("../fonts/MuseoSansCyrl300Italic/MuseoSansCyrl300Italic.woff") format("woff"), + url("../fonts/MuseoSansCyrl300Italic/MuseoSansCyrl300Italic.ttf") format("truetype"); + font-style: normal; + font-weight: 300; + } + + @font-face { + font-family: "MuseoSansCyrl500"; + src: url("../fonts/MuseoSansCyrl500/MuseoSansCyrl500.eot"); + src: url("../fonts/MuseoSansCyrl500/MuseoSansCyrl500.eot?#iefix")format("embedded-opentype"), + url("../fonts/MuseoSansCyrl500/MuseoSansCyrl500.woff") format("woff"), + url("../fonts/MuseoSansCyrl500/MuseoSansCyrl500.ttf") format("truetype"); + font-style: normal; + font-weight: 500; + } + + @font-face { + font-family: "MuseoSansCyrl700"; + src: url("../fonts/MuseoSansCyrl700/MuseoSansCyrl700.eot"); + src: url("../fonts/MuseoSansCyrl700/MuseoSansCyrl700.eot?#iefix")format("embedded-opentype"), + url("../fonts/MuseoSansCyrl700/MuseoSansCyrl700.woff") format("woff"), + url("../fonts/MuseoSansCyrl700/MuseoSansCyrl700.ttf") format("truetype"); + font-style: normal; + font-weight: 700; + } + + @font-face { + font-family: "MuseoSansCyrl900"; + src: url("../fonts/MuseoSansCyrl900/MuseoSansCyrl900.eot"); + src: url("../fonts/MuseoSansCyrl900/MuseoSansCyrl900.eot?#iefix")format("embedded-opentype"), + url("../fonts/MuseoSansCyrl900/MuseoSansCyrl900.woff") format("woff"), + url("../fonts/MuseoSansCyrl900/MuseoSansCyrl900.ttf") format("truetype"); + font-style: normal; + font-weight: 900; + } + + .font-100 { + font-family: MuseoSansCyrl100; + } + + .font-300, .font-300 > *, .font-300_all * { + font-family: MuseoSansCyrl300; + } + + .font-300-italic, .font-300-italic * { + font-family: MuseoSansCyrl300Italic; + } + .font-500, .font-500 > *, .font-500_all * { + font-family: MuseoSansCyrl500; + } + + .font-700, .font-700 > * { + font-family: MuseoSansCyrl700; + } + + .font-900, .font-900 > * { + font-family: MuseoSansCyrl900; + } + + \ No newline at end of file diff --git a/src/assets/favicon/android-icon-144x144.png b/src/assets/favicon/android-icon-144x144.png deleted file mode 100644 index e8bdb14..0000000 Binary files a/src/assets/favicon/android-icon-144x144.png and /dev/null differ diff --git a/src/assets/favicon/android-icon-192x192.png b/src/assets/favicon/android-icon-192x192.png deleted file mode 100644 index c382cd7..0000000 Binary files a/src/assets/favicon/android-icon-192x192.png and /dev/null differ diff --git a/src/assets/favicon/android-icon-36x36.png b/src/assets/favicon/android-icon-36x36.png deleted file mode 100644 index 49e0214..0000000 Binary files a/src/assets/favicon/android-icon-36x36.png and /dev/null differ diff --git a/src/assets/favicon/android-icon-48x48.png b/src/assets/favicon/android-icon-48x48.png deleted file mode 100644 index 571794a..0000000 Binary files a/src/assets/favicon/android-icon-48x48.png and /dev/null differ diff --git a/src/assets/favicon/android-icon-72x72.png b/src/assets/favicon/android-icon-72x72.png deleted file mode 100644 index ee9cda5..0000000 Binary files a/src/assets/favicon/android-icon-72x72.png and /dev/null differ diff --git a/src/assets/favicon/android-icon-96x96.png b/src/assets/favicon/android-icon-96x96.png deleted file mode 100644 index 8fde888..0000000 Binary files a/src/assets/favicon/android-icon-96x96.png and /dev/null differ diff --git a/src/assets/favicon/apple-icon-114x114.png b/src/assets/favicon/apple-icon-114x114.png deleted file mode 100644 index 8c0d929..0000000 Binary files a/src/assets/favicon/apple-icon-114x114.png and /dev/null differ diff --git a/src/assets/favicon/apple-icon-120x120.png b/src/assets/favicon/apple-icon-120x120.png deleted file mode 100644 index 17a78d9..0000000 Binary files a/src/assets/favicon/apple-icon-120x120.png and /dev/null differ diff --git a/src/assets/favicon/apple-icon-144x144.png b/src/assets/favicon/apple-icon-144x144.png deleted file mode 100644 index e8bdb14..0000000 Binary files a/src/assets/favicon/apple-icon-144x144.png and /dev/null differ diff --git a/src/assets/favicon/apple-icon-152x152.png b/src/assets/favicon/apple-icon-152x152.png deleted file mode 100644 index 88c69f6..0000000 Binary files a/src/assets/favicon/apple-icon-152x152.png and /dev/null differ diff --git a/src/assets/favicon/apple-icon-180x180.png b/src/assets/favicon/apple-icon-180x180.png deleted file mode 100644 index 1bf5881..0000000 Binary files a/src/assets/favicon/apple-icon-180x180.png and /dev/null differ diff --git a/src/assets/favicon/apple-icon-57x57.png b/src/assets/favicon/apple-icon-57x57.png deleted file mode 100644 index f21d170..0000000 Binary files a/src/assets/favicon/apple-icon-57x57.png and /dev/null differ diff --git a/src/assets/favicon/apple-icon-60x60.png b/src/assets/favicon/apple-icon-60x60.png deleted file mode 100644 index d1cac1f..0000000 Binary files a/src/assets/favicon/apple-icon-60x60.png and /dev/null differ diff --git a/src/assets/favicon/apple-icon-72x72.png b/src/assets/favicon/apple-icon-72x72.png deleted file mode 100644 index ee9cda5..0000000 Binary files a/src/assets/favicon/apple-icon-72x72.png and /dev/null differ diff --git a/src/assets/favicon/apple-icon-76x76.png b/src/assets/favicon/apple-icon-76x76.png deleted file mode 100644 index a02465d..0000000 Binary files a/src/assets/favicon/apple-icon-76x76.png and /dev/null differ diff --git a/src/assets/favicon/apple-icon-precomposed.png b/src/assets/favicon/apple-icon-precomposed.png deleted file mode 100644 index f63f71c..0000000 Binary files a/src/assets/favicon/apple-icon-precomposed.png and /dev/null differ diff --git a/src/assets/favicon/apple-icon.png b/src/assets/favicon/apple-icon.png deleted file mode 100644 index f63f71c..0000000 Binary files a/src/assets/favicon/apple-icon.png and /dev/null differ diff --git a/src/assets/favicon/browserconfig.xml b/src/assets/favicon/browserconfig.xml deleted file mode 100644 index c554148..0000000 --- a/src/assets/favicon/browserconfig.xml +++ /dev/null @@ -1,2 +0,0 @@ - -#ffffff \ No newline at end of file diff --git a/src/assets/favicon/favicon-16x16.png b/src/assets/favicon/favicon-16x16.png deleted file mode 100644 index 0bb09f1..0000000 Binary files a/src/assets/favicon/favicon-16x16.png and /dev/null differ diff --git a/src/assets/favicon/favicon-32x32.png b/src/assets/favicon/favicon-32x32.png deleted file mode 100644 index 6b7bb0b..0000000 Binary files a/src/assets/favicon/favicon-32x32.png and /dev/null differ diff --git a/src/assets/favicon/favicon-96x96.png b/src/assets/favicon/favicon-96x96.png deleted file mode 100644 index 8fde888..0000000 Binary files a/src/assets/favicon/favicon-96x96.png and /dev/null differ diff --git a/src/assets/favicon/favicon.ico b/src/assets/favicon/favicon.ico deleted file mode 100644 index bf14aa3..0000000 Binary files a/src/assets/favicon/favicon.ico and /dev/null differ diff --git a/src/assets/favicon/icon.svg b/src/assets/favicon/icon.svg new file mode 100644 index 0000000..77157bd --- /dev/null +++ b/src/assets/favicon/icon.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/assets/favicon/ms-icon-144x144.png b/src/assets/favicon/ms-icon-144x144.png deleted file mode 100644 index e8bdb14..0000000 Binary files a/src/assets/favicon/ms-icon-144x144.png and /dev/null differ diff --git a/src/assets/favicon/ms-icon-150x150.png b/src/assets/favicon/ms-icon-150x150.png deleted file mode 100644 index 5ffcf19..0000000 Binary files a/src/assets/favicon/ms-icon-150x150.png and /dev/null differ diff --git a/src/assets/favicon/ms-icon-310x310.png b/src/assets/favicon/ms-icon-310x310.png deleted file mode 100644 index 71094c7..0000000 Binary files a/src/assets/favicon/ms-icon-310x310.png and /dev/null differ diff --git a/src/assets/favicon/ms-icon-70x70.png b/src/assets/favicon/ms-icon-70x70.png deleted file mode 100644 index 11157b4..0000000 Binary files a/src/assets/favicon/ms-icon-70x70.png and /dev/null differ diff --git a/src/assets/fonts/MuseoSansCyrl100/MuseoSansCyrl100.eot b/src/assets/fonts/MuseoSansCyrl100/MuseoSansCyrl100.eot new file mode 100644 index 0000000..112f3f8 Binary files /dev/null and b/src/assets/fonts/MuseoSansCyrl100/MuseoSansCyrl100.eot differ diff --git a/src/assets/fonts/MuseoSansCyrl100/MuseoSansCyrl100.otf b/src/assets/fonts/MuseoSansCyrl100/MuseoSansCyrl100.otf new file mode 100644 index 0000000..d6d8266 Binary files /dev/null and b/src/assets/fonts/MuseoSansCyrl100/MuseoSansCyrl100.otf differ diff --git a/src/assets/fonts/MuseoSansCyrl100/MuseoSansCyrl100.ttf b/src/assets/fonts/MuseoSansCyrl100/MuseoSansCyrl100.ttf new file mode 100644 index 0000000..cfbf5d4 Binary files /dev/null and b/src/assets/fonts/MuseoSansCyrl100/MuseoSansCyrl100.ttf differ diff --git a/src/assets/fonts/MuseoSansCyrl100/MuseoSansCyrl100.woff b/src/assets/fonts/MuseoSansCyrl100/MuseoSansCyrl100.woff new file mode 100644 index 0000000..52a2028 Binary files /dev/null and b/src/assets/fonts/MuseoSansCyrl100/MuseoSansCyrl100.woff differ diff --git a/src/assets/fonts/MuseoSansCyrl100Italic/MuseoSansCyrl100Italic.otf b/src/assets/fonts/MuseoSansCyrl100Italic/MuseoSansCyrl100Italic.otf new file mode 100644 index 0000000..9036c12 Binary files /dev/null and b/src/assets/fonts/MuseoSansCyrl100Italic/MuseoSansCyrl100Italic.otf differ diff --git a/src/assets/fonts/MuseoSansCyrl100Italic/MuseoSansCyrl100Italic.ttf b/src/assets/fonts/MuseoSansCyrl100Italic/MuseoSansCyrl100Italic.ttf new file mode 100644 index 0000000..dbe3e18 Binary files /dev/null and b/src/assets/fonts/MuseoSansCyrl100Italic/MuseoSansCyrl100Italic.ttf differ diff --git a/src/assets/fonts/MuseoSansCyrl100Italic/MuseoSansCyrl100Italic.woff b/src/assets/fonts/MuseoSansCyrl100Italic/MuseoSansCyrl100Italic.woff new file mode 100644 index 0000000..e6d3354 Binary files /dev/null and b/src/assets/fonts/MuseoSansCyrl100Italic/MuseoSansCyrl100Italic.woff differ diff --git a/src/assets/fonts/MuseoSansCyrl300/MuseoSansCyrl300.eot b/src/assets/fonts/MuseoSansCyrl300/MuseoSansCyrl300.eot new file mode 100644 index 0000000..c0e209f Binary files /dev/null and b/src/assets/fonts/MuseoSansCyrl300/MuseoSansCyrl300.eot differ diff --git a/src/assets/fonts/MuseoSansCyrl300/MuseoSansCyrl300.otf b/src/assets/fonts/MuseoSansCyrl300/MuseoSansCyrl300.otf new file mode 100644 index 0000000..e81de65 Binary files /dev/null and b/src/assets/fonts/MuseoSansCyrl300/MuseoSansCyrl300.otf differ diff --git a/src/assets/fonts/MuseoSansCyrl300/MuseoSansCyrl300.ttf b/src/assets/fonts/MuseoSansCyrl300/MuseoSansCyrl300.ttf new file mode 100644 index 0000000..018e04a Binary files /dev/null and b/src/assets/fonts/MuseoSansCyrl300/MuseoSansCyrl300.ttf differ diff --git a/src/assets/fonts/MuseoSansCyrl300/MuseoSansCyrl300.woff b/src/assets/fonts/MuseoSansCyrl300/MuseoSansCyrl300.woff new file mode 100644 index 0000000..90a7490 Binary files /dev/null and b/src/assets/fonts/MuseoSansCyrl300/MuseoSansCyrl300.woff differ diff --git a/src/assets/fonts/MuseoSansCyrl300Italic/MuseoSansCyrl300Italic.otf b/src/assets/fonts/MuseoSansCyrl300Italic/MuseoSansCyrl300Italic.otf new file mode 100644 index 0000000..d893c9c Binary files /dev/null and b/src/assets/fonts/MuseoSansCyrl300Italic/MuseoSansCyrl300Italic.otf differ diff --git a/src/assets/fonts/MuseoSansCyrl300Italic/MuseoSansCyrl300Italic.ttf b/src/assets/fonts/MuseoSansCyrl300Italic/MuseoSansCyrl300Italic.ttf new file mode 100644 index 0000000..313e3e7 Binary files /dev/null and b/src/assets/fonts/MuseoSansCyrl300Italic/MuseoSansCyrl300Italic.ttf differ diff --git a/src/assets/fonts/MuseoSansCyrl300Italic/MuseoSansCyrl300Italic.woff b/src/assets/fonts/MuseoSansCyrl300Italic/MuseoSansCyrl300Italic.woff new file mode 100644 index 0000000..fd87829 Binary files /dev/null and b/src/assets/fonts/MuseoSansCyrl300Italic/MuseoSansCyrl300Italic.woff differ diff --git a/src/assets/fonts/MuseoSansCyrl500/MuseoSansCyrl500.eot b/src/assets/fonts/MuseoSansCyrl500/MuseoSansCyrl500.eot new file mode 100644 index 0000000..6bdcaf4 Binary files /dev/null and b/src/assets/fonts/MuseoSansCyrl500/MuseoSansCyrl500.eot differ diff --git a/src/assets/fonts/MuseoSansCyrl500/MuseoSansCyrl500.otf b/src/assets/fonts/MuseoSansCyrl500/MuseoSansCyrl500.otf new file mode 100644 index 0000000..a3a8af1 Binary files /dev/null and b/src/assets/fonts/MuseoSansCyrl500/MuseoSansCyrl500.otf differ diff --git a/src/assets/fonts/MuseoSansCyrl500/MuseoSansCyrl500.ttf b/src/assets/fonts/MuseoSansCyrl500/MuseoSansCyrl500.ttf new file mode 100644 index 0000000..475a649 Binary files /dev/null and b/src/assets/fonts/MuseoSansCyrl500/MuseoSansCyrl500.ttf differ diff --git a/src/assets/fonts/MuseoSansCyrl500/MuseoSansCyrl500.woff b/src/assets/fonts/MuseoSansCyrl500/MuseoSansCyrl500.woff new file mode 100644 index 0000000..a303f31 Binary files /dev/null and b/src/assets/fonts/MuseoSansCyrl500/MuseoSansCyrl500.woff differ diff --git a/src/assets/fonts/MuseoSansCyrl500Italic/MuseoSansCyrl500Italic.otf b/src/assets/fonts/MuseoSansCyrl500Italic/MuseoSansCyrl500Italic.otf new file mode 100644 index 0000000..0117fd0 Binary files /dev/null and b/src/assets/fonts/MuseoSansCyrl500Italic/MuseoSansCyrl500Italic.otf differ diff --git a/src/assets/fonts/MuseoSansCyrl500Italic/MuseoSansCyrl500Italic.ttf b/src/assets/fonts/MuseoSansCyrl500Italic/MuseoSansCyrl500Italic.ttf new file mode 100644 index 0000000..84b545a Binary files /dev/null and b/src/assets/fonts/MuseoSansCyrl500Italic/MuseoSansCyrl500Italic.ttf differ diff --git a/src/assets/fonts/MuseoSansCyrl500Italic/MuseoSansCyrl500Italic.woff b/src/assets/fonts/MuseoSansCyrl500Italic/MuseoSansCyrl500Italic.woff new file mode 100644 index 0000000..545bdaa Binary files /dev/null and b/src/assets/fonts/MuseoSansCyrl500Italic/MuseoSansCyrl500Italic.woff differ diff --git a/src/assets/fonts/MuseoSansCyrl700/MuseoSansCyrl700.eot b/src/assets/fonts/MuseoSansCyrl700/MuseoSansCyrl700.eot new file mode 100644 index 0000000..fe06530 Binary files /dev/null and b/src/assets/fonts/MuseoSansCyrl700/MuseoSansCyrl700.eot differ diff --git a/src/assets/fonts/MuseoSansCyrl700/MuseoSansCyrl700.otf b/src/assets/fonts/MuseoSansCyrl700/MuseoSansCyrl700.otf new file mode 100644 index 0000000..b7b2448 Binary files /dev/null and b/src/assets/fonts/MuseoSansCyrl700/MuseoSansCyrl700.otf differ diff --git a/src/assets/fonts/MuseoSansCyrl700/MuseoSansCyrl700.ttf b/src/assets/fonts/MuseoSansCyrl700/MuseoSansCyrl700.ttf new file mode 100644 index 0000000..ed1640e Binary files /dev/null and b/src/assets/fonts/MuseoSansCyrl700/MuseoSansCyrl700.ttf differ diff --git a/src/assets/fonts/MuseoSansCyrl700/MuseoSansCyrl700.woff b/src/assets/fonts/MuseoSansCyrl700/MuseoSansCyrl700.woff new file mode 100644 index 0000000..13c3f1a Binary files /dev/null and b/src/assets/fonts/MuseoSansCyrl700/MuseoSansCyrl700.woff differ diff --git a/src/assets/fonts/MuseoSansCyrl700Italic/MuseoSansCyrl700Italic.otf b/src/assets/fonts/MuseoSansCyrl700Italic/MuseoSansCyrl700Italic.otf new file mode 100644 index 0000000..1f32ec5 Binary files /dev/null and b/src/assets/fonts/MuseoSansCyrl700Italic/MuseoSansCyrl700Italic.otf differ diff --git a/src/assets/fonts/MuseoSansCyrl700Italic/MuseoSansCyrl700Italic.ttf b/src/assets/fonts/MuseoSansCyrl700Italic/MuseoSansCyrl700Italic.ttf new file mode 100644 index 0000000..e88fb35 Binary files /dev/null and b/src/assets/fonts/MuseoSansCyrl700Italic/MuseoSansCyrl700Italic.ttf differ diff --git a/src/assets/fonts/MuseoSansCyrl700Italic/MuseoSansCyrl700Italic.woff b/src/assets/fonts/MuseoSansCyrl700Italic/MuseoSansCyrl700Italic.woff new file mode 100644 index 0000000..404c59d Binary files /dev/null and b/src/assets/fonts/MuseoSansCyrl700Italic/MuseoSansCyrl700Italic.woff differ diff --git a/src/assets/fonts/MuseoSansCyrl900/MuseoSansCyrl900.eot b/src/assets/fonts/MuseoSansCyrl900/MuseoSansCyrl900.eot new file mode 100644 index 0000000..265eade Binary files /dev/null and b/src/assets/fonts/MuseoSansCyrl900/MuseoSansCyrl900.eot differ diff --git a/src/assets/fonts/MuseoSansCyrl900/MuseoSansCyrl900.otf b/src/assets/fonts/MuseoSansCyrl900/MuseoSansCyrl900.otf new file mode 100644 index 0000000..4317f64 Binary files /dev/null and b/src/assets/fonts/MuseoSansCyrl900/MuseoSansCyrl900.otf differ diff --git a/src/assets/fonts/MuseoSansCyrl900/MuseoSansCyrl900.ttf b/src/assets/fonts/MuseoSansCyrl900/MuseoSansCyrl900.ttf new file mode 100644 index 0000000..ff62cfe Binary files /dev/null and b/src/assets/fonts/MuseoSansCyrl900/MuseoSansCyrl900.ttf differ diff --git a/src/assets/fonts/MuseoSansCyrl900/MuseoSansCyrl900.woff b/src/assets/fonts/MuseoSansCyrl900/MuseoSansCyrl900.woff new file mode 100644 index 0000000..5df4aab Binary files /dev/null and b/src/assets/fonts/MuseoSansCyrl900/MuseoSansCyrl900.woff differ diff --git a/src/assets/fonts/MuseoSansCyrl900Italic/MuseoSansCyrl900Italic.otf b/src/assets/fonts/MuseoSansCyrl900Italic/MuseoSansCyrl900Italic.otf new file mode 100644 index 0000000..2267c8f Binary files /dev/null and b/src/assets/fonts/MuseoSansCyrl900Italic/MuseoSansCyrl900Italic.otf differ diff --git a/src/assets/fonts/MuseoSansCyrl900Italic/MuseoSansCyrl900Italic.ttf b/src/assets/fonts/MuseoSansCyrl900Italic/MuseoSansCyrl900Italic.ttf new file mode 100644 index 0000000..a801711 Binary files /dev/null and b/src/assets/fonts/MuseoSansCyrl900Italic/MuseoSansCyrl900Italic.ttf differ diff --git a/src/assets/fonts/MuseoSansCyrl900Italic/MuseoSansCyrl900Italic.woff b/src/assets/fonts/MuseoSansCyrl900Italic/MuseoSansCyrl900Italic.woff new file mode 100644 index 0000000..8e14df7 Binary files /dev/null and b/src/assets/fonts/MuseoSansCyrl900Italic/MuseoSansCyrl900Italic.woff differ 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/assets/images/log.jpg b/src/assets/images/log.jpg new file mode 100644 index 0000000..23a2691 Binary files /dev/null and b/src/assets/images/log.jpg differ diff --git a/src/assets/images/login.svg b/src/assets/images/login.svg new file mode 100644 index 0000000..6703878 --- /dev/null +++ b/src/assets/images/login.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/index.html b/src/index.html index ce2fba8..fe44872 100644 --- a/src/index.html +++ b/src/index.html @@ -3,28 +3,16 @@ - angular-material-template + admin - - - - - - - - - - - - - - + + - + 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 diff --git a/src/styles.css b/src/styles.css index b8ff878..23eb2ac 100644 --- a/src/styles.css +++ b/src/styles.css @@ -1,8 +1,9 @@ @import "~@angular/material/prebuilt-themes/indigo-pink.css"; - +@import "assets/css/fonts.css"; +@import "assets/css/font-size.css"; body { margin: 0; - font-family: Roboto, "Helvetica Neue", sans-serif; + font-family: Museo Sans Cyrl; font-size: 14px; }