diff --git a/src/app/about/about.component.html b/src/app/about/about.component.html index 92ff253..1b1603d 100644 --- a/src/app/about/about.component.html +++ b/src/app/about/about.component.html @@ -4,9 +4,10 @@
​
- - - + + + +
diff --git a/src/app/about/about.component.ts b/src/app/about/about.component.ts index 37b0869..fe268e9 100644 --- a/src/app/about/about.component.ts +++ b/src/app/about/about.component.ts @@ -3,6 +3,7 @@ import { SEOService } from '../_services/seo.service'; import { RequestComponent } from '../request/request.component'; import { ReviewsComponent } from '../reviews/reviews.component'; import { NgFor } from '@angular/common'; +import { Router } from '@angular/router'; @Component({ selector: 'about', @@ -14,7 +15,7 @@ import { NgFor } from '@angular/common'; export class AboutComponent { - constructor(private seo:SEOService){} + constructor(private router:Router, private seo:SEOService){} public act: number = 1; @@ -62,4 +63,8 @@ export class AboutComponent { hide(i:number){ return i!=this.act } + + contacts(){ + this.router.navigate(['/contacts']).then() + } } diff --git a/src/app/app.component.html b/src/app/app.component.html index 0bc79f7..3413575 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -12,22 +12,22 @@ Разработка Проекты Контакты - Создай свой Qr-code + +7 (499) 490-04-65 - -
+ + - + +7 (499) 490-04-65 - + - + + + + @@ -67,7 +68,7 @@ Разработка Проекты Контакты - Создай свой Qr-code +

Контакты

@@ -93,14 +94,14 @@ - Напишите нам +
- +
- © ООО «НИР», 2016–{{dateNow | date:'YYYY'}} + © ООО «НИР», 2016–{{dateNow | date:'YYYY'}}
diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 1a64365..56a7133 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -30,4 +30,8 @@ export class AppComponent implements OnInit{ }); } + + contacts(){ + this.router.navigate(['/contacts']).then() + } } diff --git a/src/app/app.routes.ts b/src/app/app.routes.ts index 3ab6c5a..4234e19 100644 --- a/src/app/app.routes.ts +++ b/src/app/app.routes.ts @@ -18,18 +18,18 @@ import { NotFoundComponentComponent } from './not-found-component/not-found-comp export const routes: Routes = [ {path: "", component: HomeComponent}, - {path: "about", component: AboutComponent}, - {path: "automatization", component: AutomatizationComponent}, - {path: "development", component: DevelopmentComponent}, - {path: "contacts", component: ContactsComponent}, - {path: "sites", component: SitesComponent}, - {path: "projects", component: ProjectsComponent}, + {path: "about/", component: AboutComponent}, + {path: "automatization/", component: AutomatizationComponent}, + {path: "development/", component: DevelopmentComponent}, + {path: "contacts/", component: ContactsComponent}, + {path: "sites/", component: SitesComponent}, + {path: "projects/", component: ProjectsComponent}, {path:'projects/vniigaz', component: VniigazComponent}, {path:'projects/faufcs', component: FaufcsComponent}, {path:'projects/tk023', component: Tk023Component}, {path:'projects/tk465', component: Tk465Component}, {path:'projects/gazprom', component: ScvgComponent}, {path:'projects/pipe_prod', component: pipe_prodComponent}, - {path: 'qr-code', component: QrCodeComponent}, + // {path: 'qr-code', component: QrCodeComponent}, {path: '404', component: NotFoundComponentComponent}, ]; diff --git a/src/app/automatization/automatization.component.html b/src/app/automatization/automatization.component.html index 1a71d2d..5121d35 100644 --- a/src/app/automatization/automatization.component.html +++ b/src/app/automatization/automatization.component.html @@ -4,9 +4,10 @@
Забирает рутину, возвращает результат
- - - + + + +
@@ -38,7 +39,7 @@
  • Коммерческие компании с большим оборотом документов
    • - + @@ -68,7 +69,7 @@ - +

    Решения по автоматизации

    @@ -87,7 +88,7 @@
    - +
    diff --git a/src/app/automatization/automatization.component.ts b/src/app/automatization/automatization.component.ts index 087becf..04d9feb 100644 --- a/src/app/automatization/automatization.component.ts +++ b/src/app/automatization/automatization.component.ts @@ -16,12 +16,16 @@ import { ImgCaruselComponent } from '../img-carusel/img-carusel.component'; export class AutomatizationComponent { constructor( private router:Router, private seo:SEOService - ){} + ){} - anchorRouting(anchor:string){ + anchorRouting(anchor:string){ this.router.navigate([`/automatization`],{ fragment: anchor }) } + contacts(){ + this.router.navigate(['/contacts']).then() + } + images = [ 'assets/img/carusel/carusel-01.jpg', 'assets/img/carusel/carusel-02.jpg', diff --git a/src/app/contacts/contacts.component.html b/src/app/contacts/contacts.component.html index 53df47d..9b4509f 100644 --- a/src/app/contacts/contacts.component.html +++ b/src/app/contacts/contacts.component.html @@ -4,9 +4,9 @@
    ​
    - - - + + +
    diff --git a/src/app/development/development.component.html b/src/app/development/development.component.html index d51e85a..e878ac1 100644 --- a/src/app/development/development.component.html +++ b/src/app/development/development.component.html @@ -4,9 +4,10 @@
    Создадим ПО любой сложности под любые задачи
    - - - + + + +
    @@ -33,7 +34,7 @@
  • Межведомственные организации
  • Коммерческие компании
    • -
    + diff --git a/src/app/development/development.component.ts b/src/app/development/development.component.ts index 4809d25..29d90f3 100644 --- a/src/app/development/development.component.ts +++ b/src/app/development/development.component.ts @@ -13,7 +13,7 @@ import { ImgCaruselComponent } from '../img-carusel/img-carusel.component'; styleUrls: ['./development.component.scss'] }) export class DevelopmentComponent { - + constructor( private router:Router, private seo:SEOService ){} @@ -23,11 +23,15 @@ export class DevelopmentComponent { this.seo.updateDescription('Разработка ПО любой сложности под любые задачи. Помогаем автоматизировать бизнес-процессы, избавляем от рутинных задач, находим новые решения.'); this.seo.updateImage('assets/img/development.jpg') } - - anchorRouting(anchor:string){ + + anchorRouting(anchor:string){ this.router.navigate([`/development`],{ fragment: anchor }) } + contacts(){ + this.router.navigate(['/contacts']).then() + } + images = [ 'assets/img/carusel/carusel-10.jpg', 'assets/img/carusel/carusel-11.jpg', diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html index d09d337..c36718f 100644 --- a/src/app/home/home.component.html +++ b/src/app/home/home.component.html @@ -4,9 +4,10 @@
    ​
    - - - + + + +
    @@ -19,7 +20,7 @@
    ООО «НИР» — российская ИТ-компания, специализирующаяся на разработке импортонезависимого ПО и автоматизации сложных процессов. С 2016 года мы беремся за самые амбициозные проекты и выполняем их точно в срок. -
    +
    diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts index 31f19c5..5002176 100644 --- a/src/app/home/home.component.ts +++ b/src/app/home/home.component.ts @@ -3,6 +3,7 @@ import { Component, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { RequestComponent } from '../request/request.component'; import { ReviewsComponent } from '../reviews/reviews.component'; import { SEOService } from '../_services/seo.service'; +import {Router} from "@angular/router"; @Component({ selector: 'home', @@ -13,8 +14,8 @@ import { SEOService } from '../_services/seo.service'; schemas: [CUSTOM_ELEMENTS_SCHEMA] }) export class HomeComponent { - - constructor(private seo:SEOService){} + + constructor(private router:Router, private seo:SEOService){} public act: number = 1; @@ -62,4 +63,8 @@ export class HomeComponent { hide(i:number){ return i!=this.act } + + contacts(){ + this.router.navigate(['/contacts']).then() + } } diff --git a/src/app/projects/projects.component.html b/src/app/projects/projects.component.html index 459cd6c..b84d2b1 100644 --- a/src/app/projects/projects.component.html +++ b/src/app/projects/projects.component.html @@ -4,9 +4,10 @@
    ​
    - - - + + + +
    @@ -20,7 +21,7 @@
    Мы с уважением относимся к каждому клиенту и к себе. Поэтому мы работаем абсолютно прозрачно, четко укладываемся в оговоренные сроки и внимательно подходим к изучению стоящих перед Вами задач. Наша безупречная репутация сформирована восторженными отзывами клиентов. -
    +
    @@ -100,9 +101,9 @@
    - +
    -
    \ No newline at end of file + diff --git a/src/app/projects/projects.component.ts b/src/app/projects/projects.component.ts index 1771d5a..837e8fd 100644 --- a/src/app/projects/projects.component.ts +++ b/src/app/projects/projects.component.ts @@ -3,7 +3,7 @@ import { SEOService } from '../_services/seo.service'; import { ReviewsComponent } from '../reviews/reviews.component'; import { RequestComponent } from '../request/request.component'; import { ImgCaruselComponent } from '../img-carusel/img-carusel.component'; -import { RouterLink } from '@angular/router'; +import {Router, RouterLink} from '@angular/router'; @Component({ @@ -16,6 +16,9 @@ import { RouterLink } from '@angular/router'; export class ProjectsComponent { - constructor(private seo:SEOService){} + constructor(private router:Router, private seo:SEOService){} + contacts(){ + this.router.navigate(['/contacts']).then() + } } diff --git a/src/app/qr-code/img-input/img-input.component.ts b/src/app/qr-code/img-input/img-input.component.ts index 1e16430..345cb7a 100644 --- a/src/app/qr-code/img-input/img-input.component.ts +++ b/src/app/qr-code/img-input/img-input.component.ts @@ -12,7 +12,6 @@ import {HttpEventType, HttpResponse} from "@angular/common/http"; }) export class ImgInputComponent { public upload: any = {file: null, progress: 0}; - public asset: any; public value: any; @Output() change = new EventEmitter() diff --git a/src/app/qr-code/qr-code.component.html b/src/app/qr-code/qr-code.component.html index 0023949..215eb15 100644 --- a/src/app/qr-code/qr-code.component.html +++ b/src/app/qr-code/qr-code.component.html @@ -2,13 +2,12 @@
    -

    Данные

    +

    Данные или QR-Код

    + -

    Изображения

    -

    Цвета

    @@ -67,30 +66,33 @@
    - +
    - +
    -

    Битовый элемент

    +

    Битовый элементы

    +

    Ячейки

    -
    +

    Логотип

    +
    diff --git a/src/app/qr-code/qr-code.component.ts b/src/app/qr-code/qr-code.component.ts index 4c67e2b..4d4a38e 100644 --- a/src/app/qr-code/qr-code.component.ts +++ b/src/app/qr-code/qr-code.component.ts @@ -3,6 +3,7 @@ import {FormBuilder, FormGroup, FormsModule, ReactiveFormsModule} from "@angular import {JsonPipe, NgIf} from "@angular/common"; import {FormsService} from "../_services/forms.service"; import { ImgInputComponent } from './img-input/img-input.component'; +import {updateCacheConfig} from "@angular/cli/src/commands/cache/utilities"; @Component({ selector: 'qr-code', @@ -19,17 +20,18 @@ import { ImgInputComponent } from './img-input/img-input.component'; }) export class QrCodeComponent implements OnInit{ + @Input() public QrCodeForm: FormGroup; public dragOver = false; public upload: any = {file: null, progress: 0}; - + constructor(private formBuilder:FormBuilder, private formsService: FormsService){} ngOnInit() { this.QrCodeForm = this.formBuilder.group({ 'text' : [''], - 'format' : ['svg'], + 'format' : ['png'], 'size' : [350], 'foreground-color' : ['#000000'], 'background-color' : ['#ffffff'], @@ -40,13 +42,15 @@ export class QrCodeComponent implements OnInit{ 'custom-eye-color' : [false], 'outside-eye-color' : ['#000000'], 'inner-eye-color' : ['#000000'], - 'image' : [], - 'bit-type' : ['normal'] + logo_image : [], + data_image : [], + 'bit-type' : ['square'] }); } onSubmit(){ + console.log(this.QrCodeForm.controls['data_image'].value) this.QrCodeForm.markAllAsTouched(); if (this.QrCodeForm.valid) this.formsService.save('model', 'QrCode', null, this.QrCodeForm.value).subscribe(res => { @@ -61,19 +65,24 @@ export class QrCodeComponent implements OnInit{ return this.QrCodeForm.value['color-type'] } - get bitType(){ - return this.QrCodeForm.value['bit-type'] - } - get EyeType(){ return this.QrCodeForm.value['custom-eye-color'] } - setImgFile(value){ + setDataImgFile(value){ console.log(value) + if (value != null) + this.QrCodeForm.patchValue({data_image : value.id}) + else + this.QrCodeForm.patchValue({data_image : null}) + } - setPaternFile(value){ + setLogoFile(value){ console.log(value) + if (value != null) + this.QrCodeForm.patchValue({logo_image : value.id}) + else + this.QrCodeForm.patchValue({logo_image : null}) } diff --git a/src/app/sites/sites.component.html b/src/app/sites/sites.component.html index d86e282..089adde 100644 --- a/src/app/sites/sites.component.html +++ b/src/app/sites/sites.component.html @@ -4,9 +4,10 @@
    Удобный и безопасный сайт для работы с массивными данными и документами
    - - - + + + +
    @@ -14,7 +15,7 @@
    - О продукте + О продукте Особенности Функционал Обратная связь @@ -35,7 +36,7 @@
  • Межведомственные организации
  • Крупные и средние коммерческие компании
    • -
    + @@ -96,4 +97,4 @@ - \ No newline at end of file + diff --git a/src/app/sites/sites.component.ts b/src/app/sites/sites.component.ts index f4c476c..9c2bf57 100644 --- a/src/app/sites/sites.component.ts +++ b/src/app/sites/sites.component.ts @@ -22,6 +22,10 @@ export class SitesComponent { this.router.navigate([`/sites`],{ fragment: anchor }) } + contacts(){ + this.router.navigate(['/contacts']).then() + } + images = [ 'assets/img/carusel/carusel-05.jpg', 'assets/img/carusel/carusel-06.jpg', diff --git a/src/environments/environment.development.ts b/src/environments/environment.development.ts index 9d07f81..aa570f9 100644 --- a/src/environments/environment.development.ts +++ b/src/environments/environment.development.ts @@ -2,7 +2,7 @@ export const environment = { production: false, apiUrl: 'http://api.nirgroup.lc', clientId: 2, - clientSecret: 'YllFbaRHMP0kCJLb0UdCcOfpTzA23ea3AOdIfRMj', + clientSecret: '5J9yfkvwXCgghGzxg8Ee92XM9vxR4cruzIX9A34j', domenUrl: 'http://localhost:4200', googleAnalyticsId: 'G-B8183299MH', }; diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 141397d..9c1a841 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -1,8 +1,8 @@ export const environment = { production: true, - apiUrl: 'https://nirgroup.ru', + apiUrl: 'https://api-andrey-nirgroup.testnir.ru', clientId: 2, clientSecret: 'KIWaOS7ML1ZEUmgByFN5Cf9wf0pHFWjYJ5rmOboX', - domenUrl: 'https://nirgroup.ru', + domenUrl: 'https://andrey-nirgroup.testnir.ru', googleAnalyticsId: 'G-B8183299MH', };