hide request-form

src/app/about/about.component.html

@@ -4,9 +4,10 @@
         <h5 class="jumb-slogan">
             &#8203;
         </h5>
-        <request>
+<!--        <request>-->
-            <button class="btn primary">Напишите нам</button>
+<!--            <button class="btn primary">Напишите нам</button>-->
-        </request>
+      <button class="btn primary" (click)="contacts()">Напишите нам</button>
+<!--        </request>-->
     </div>
     <div class="col-6">
         <img class="jumb-card" src="assets/img/about.jpg" alt="">

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()
+  }
 }

src/app/app.component.html

@@ -12,7 +12,7 @@
         <a href="/development/">Разработка</a>
         <a href="/projects/">Проекты</a>
         <a href="/contacts/">Контакты</a>
-        <a href routerLink="qr-code">Создай свой Qr-code</a>
+<!--        <a href routerLink="qr-code">Создай свой Qr-code</a>-->
         <a href="tel:+74994900465" class="right tel">
           <svg>
             <use href="assets/ico/call_24.svg#ico"></use>
@@ -45,9 +45,10 @@
       <div class="banner-text">
         <h2>Остались вопросы?</h2>
         <div>Мы с радостью на них ответим!</div>
-        <request>
+<!--        <request>-->
-          <button class="btn white">Напишите нам</button>
+<!--          <button class="btn white">Напишите нам</button>-->
-        </request>
+        <button class="btn primary" (click)="contacts()">Напишите нам</button>
+<!--        </request>-->
       </div>
       <div class="banner-img"></div>
     </div>
@@ -67,7 +68,7 @@
       <a href routerLink="development">Разработка</a>
       <a href routerLink="projects">Проекты</a>
       <a href routerLink="contacts">Контакты</a>
-      <a href routerLink="qr-code">Создай свой Qr-code</a>
+<!--      <a href routerLink="qr-code">Создай свой Qr-code</a>-->
     </div>
     <div class="footer-info">
       <h4>Контакты</h4>
@@ -93,7 +94,7 @@
         <svg>
           <use href="assets/ico/webpage_24.svg#ico"></use>
         </svg>
-        <request>Напишите нам</request>
+<!--        <request>Напишите нам</request>-->
       </a>
 
     </div>

src/app/app.component.ts

@@ -30,4 +30,8 @@ export class AppComponent implements OnInit{
       });
 
   }
+
+  contacts(){
+    this.router.navigate(['/contacts']).then()
+  }
 }

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: "about/", component: AboutComponent},
-    {path: "automatization", component: AutomatizationComponent},
+    {path: "automatization/", component: AutomatizationComponent},
-    {path: "development", component: DevelopmentComponent},
+    {path: "development/", component: DevelopmentComponent},
-    {path: "contacts", component: ContactsComponent},
+    {path: "contacts/", component: ContactsComponent},
-    {path: "sites", component: SitesComponent},
+    {path: "sites/", component: SitesComponent},
-    {path: "projects", component: ProjectsComponent},
+    {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},
 ];

src/app/automatization/automatization.component.html

@@ -4,9 +4,10 @@
         <h5 class="jumb-slogan">
             Забирает рутину, возвращает результат
         </h5>
-        <request>
+<!--        <request>-->
-            <button class="btn primary">Напишите нам</button>
+<!--            <button class="btn primary">Напишите нам</button>-->
-        </request>
+      <button class="btn primary" (click)="contacts()">Напишите нам</button>
+<!--        </request>-->
     </div>
     <div class="col-6">
         <img class="jumb-card" src="assets/img/automatization.jpg" alt="">

src/app/automatization/automatization.component.ts

@@ -22,6 +22,10 @@ export class AutomatizationComponent {
       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',

src/app/contacts/contacts.component.html

@@ -4,9 +4,9 @@
         <h5 class="jumb-slogan">
             &#8203;
         </h5>
-        <request>
+<!--        <request>-->
-          <button class="btn primary">Напишите нам</button>
+<!--          <button class="btn primary">Напишите нам</button>-->
-      </request>
+<!--      </request>-->
     </div>
     <div class="col-6">
         <img class="jumb-card" src="assets/img/contacts.jpg" alt="">

src/app/development/development.component.html

@@ -4,9 +4,10 @@
         <h5 class="jumb-slogan">
             Создадим ПО любой сложности под любые задачи
         </h5>
-        <request>
+<!--        <request>-->
-            <button class="btn primary">Напишите нам</button>
+<!--            <button class="btn primary">Напишите нам</button>-->
-        </request>
+            <button class="btn primary" (click)="contacts()">Напишите нам</button>
+<!--        </request>-->
     </div>
     <div class="col-6">
         <img class="jumb-card" src="assets/img/development.jpg" alt="">

src/app/development/development.component.ts

@@ -28,6 +28,10 @@ export class DevelopmentComponent {
       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',

src/app/home/home.component.html

@@ -4,9 +4,10 @@
         <h5 class="jumb-slogan">
             &#8203;
         </h5>
-        <request>
+<!--        <request>-->
-            <button class="btn primary">Напишите нам</button>
+<!--            <button class="btn primary">Напишите нам</button>-->
-        </request>
+      <button class="btn primary" (click)="contacts()">Напишите нам</button>
+<!--        </request>-->
     </div>
     <div class="col-6">
         <img class="jumb-card" src="assets/img/home.jpg" alt="">

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',
@@ -14,7 +15,7 @@ import { SEOService } from '../_services/seo.service';
 })
 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()
+  }
 }

src/app/projects/projects.component.html

@@ -4,9 +4,10 @@
         <h5 class="jumb-slogan">
             &#8203;
         </h5>
-        <request>
+<!--        <request>-->
-            <button class="btn primary">Напишите нам</button>
+<!--            <button class="btn primary">Напишите нам</button>-->
-        </request>
+      <button class="btn primary" (click)="contacts()">Напишите нам</button>
+<!--        </request>-->
     </div>
     <div class="col-6">
         <img class="jumb-card" src="assets/img/projects.jpg" alt="">

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()
+  }
 }

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()
 

src/app/qr-code/qr-code.component.html

@@ -2,13 +2,12 @@
   <div class="col-9 block-options" *ngIf="QrCodeForm">
     <div [formGroup]="QrCodeForm" class="form-group">
 
-      <h3>Данные</h3>
+      <h3>Данные или QR-Код</h3>
       <div>
         <textarea name="text" rows="3" class="form-control" formControlName="text" #text></textarea>
       </div>
+      <img-input (change)="setDataImgFile($event)"></img-input>
 
-      <h3>Изображения</h3>
-      <img-input (change)="setImgFile($event)"></img-input>
       <h3>Цвета</h3>
       <div class="colors">
         <div class="color-element">
@@ -67,30 +66,33 @@
           </label>
           <div class="input-color" *ngIf="EyeType">
             <input type="color" id="outside-eye-color" formControlName="outside-eye-color">
-            <label for="outside-eye-color">Внешняя часть</label>
+            <label for="outside-eye-color">Внутреняя часть</label>
           </div>
           <div class="input-color" *ngIf="EyeType">
             <input type="color" id="inner-eye-color" formControlName="inner-eye-color">
-            <label for="inner-eye-color">Внутреняя часть</label>
+            <label for="inner-eye-color">Внешняя часть</label>
           </div>
         </div>
       </div>
-      <h3>Битовый элемент</h3>
+      <h3>Битовый элементы</h3>
+      <h4>Ячейки</h4>
       <div class="bits">
         <label for="bit-type-normal">
-          <input class="" id="bit-type-normal" type="radio" name="bit-type" formControlName="bit-type" value="normal">
+          <input class="" id="bit-type-normal" type="radio" name="bit-type" formControlName="bit-type" value="square">
           Обычный
         </label>
         <label for="bit-type-round">
           <input class="" id="bit-type-round" type="radio" name="bit-type" formControlName="bit-type" value="round">
           Скругленные края
         </label>
-        <label for="bit-type-radio">
+        <label for="bit-type-dot">
-          <input class="" id="bit-type-radio" type="radio" name="bit-type" formControlName="bit-type" value="custom">
+          <input class="" id="bit-type-dot" type="radio" name="bit-type" formControlName="bit-type" value="dot">
-          Изображение
+          Точки
         </label>
-        <img-input *ngIf="bitType=='custom'" (change)="setPaternFile($event)"></img-input>
+
       </div>
+      <h3>Логотип</h3>
+      <img-input (change)="setLogoFile($event)"></img-input>
     </div>
   </div>
 

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,6 +20,7 @@ import { ImgInputComponent } from './img-input/img-input.component';
 })
 export class QrCodeComponent implements OnInit{
 
+  @Input()
   public QrCodeForm: FormGroup;
   public dragOver = false;
 
@@ -29,7 +31,7 @@ export class QrCodeComponent implements OnInit{
   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' : [],
+      logo_image : [],
-      'bit-type' : ['normal']
+      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})
   }
 
 

src/app/sites/sites.component.html

@@ -4,9 +4,10 @@
         <h5 class="jumb-slogan">
             Удобный и безопасный сайт для работы с массивными данными и документами
         </h5>
-        <request>
+<!--        <request>-->
-            <button class="btn primary">Напишите нам</button>
+<!--            <button class="btn primary">Напишите нам</button>-->
-        </request>
+      <button class="btn primary" (click)="contacts()">Напишите нам</button>
+<!--        </request>-->
     </div>
     <div class="col-6">
         <img class="jumb-card" src="assets/img/sites.jpg" alt="">

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',

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',
   };

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',
 };