From f66118726f566dcdfcd003830d73d92454729212 Mon Sep 17 00:00:00 2001
From: Vitaliy <biggone24@gmail.com>
Date: Wed, 29 Nov 2017 22:01:09 +0200
Subject: [PATCH 1/5] Add back button and modal

---
 src/app/app.module.ts                         |  4 ++-
 .../back-button/back-button.component.html    |  1 +
 .../back-button/back-button.component.scss    | 18 +++++++++++++
 .../back-button/back-button.component.ts      | 27 +++++++++++++++++++
 4 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 src/app/shared/components/back-button/back-button.component.html
 create mode 100644 src/app/shared/components/back-button/back-button.component.scss
 create mode 100644 src/app/shared/components/back-button/back-button.component.ts

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 1fc8a04..6777f9e 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -35,6 +35,7 @@ import { TestInfoComponent } from './pages/test/test-info/test-info.component';
 import { ListPageComponent } from './pages/layout/list-page/list-page.component';
 import { QuestionForRespondentComponent } from './pages/test/question-for-respondent/question-for-respondent.component';
 import { AnswerComponent } from './pages/test/question-for-respondent/answer/answer.component';
+import { BackButtonComponent } from './shared/components/back-button/back-button.component';
 
 
 @NgModule({
@@ -65,7 +66,8 @@ import { AnswerComponent } from './pages/test/question-for-respondent/answer/ans
     TestInfoComponent,
     ListPageComponent,
     QuestionForRespondentComponent,
-    AnswerComponent
+    AnswerComponent,
+    BackButtonComponent
   ],
   imports: [
     BrowserModule,
diff --git a/src/app/shared/components/back-button/back-button.component.html b/src/app/shared/components/back-button/back-button.component.html
new file mode 100644
index 0000000..330f67a
--- /dev/null
+++ b/src/app/shared/components/back-button/back-button.component.html
@@ -0,0 +1 @@
+<button *ngIf="shoudShowSelf" class="back-button menu__item" (click)="handleClick($event)" >Back</button>
diff --git a/src/app/shared/components/back-button/back-button.component.scss b/src/app/shared/components/back-button/back-button.component.scss
new file mode 100644
index 0000000..ac889c7
--- /dev/null
+++ b/src/app/shared/components/back-button/back-button.component.scss
@@ -0,0 +1,18 @@
+@import 'src/assets/styles/colors';
+@import 'src/assets/styles/fonts';
+
+.back-button {
+  text-decoration: none;
+  vertical-align: top;
+  padding: 0 25px;
+  line-height: 61px;
+  height: 100%;
+  background-color: #dbcd0f;
+  font-family: $font-main;
+  font-size: 20px;
+  color: #ffffff;
+  border: none;
+  text-align: center;
+  display: inline-block;
+  cursor: pointer;
+}
diff --git a/src/app/shared/components/back-button/back-button.component.ts b/src/app/shared/components/back-button/back-button.component.ts
new file mode 100644
index 0000000..01002fe
--- /dev/null
+++ b/src/app/shared/components/back-button/back-button.component.ts
@@ -0,0 +1,27 @@
+import { Component, OnInit } from '@angular/core';
+import { Location } from '@angular/common';
+import { ActivatedRoute } from '@angular/router';
+
+@Component({
+  selector: 'pt-back-button',
+  templateUrl: './back-button.component.html',
+  styleUrls: ['./back-button.component.scss'],
+
+})
+export class BackButtonComponent implements OnInit {
+
+  get shoudShowSelf(): boolean {
+    return this.route.snapshot.url[0].path !== 'all-tests';
+  }
+
+  constructor(private location: Location, private route: ActivatedRoute) { }
+
+  ngOnInit() {
+  }
+
+  handleClick(event) {
+    event.stopPropagation();
+
+    this.location.back();
+  }
+}

From ec5578ceff0bcad76970c358835e7f2f1b737fba Mon Sep 17 00:00:00 2001
From: Vitaliy <biggone24@gmail.com>
Date: Wed, 29 Nov 2017 22:13:18 +0200
Subject: [PATCH 2/5] Add back button and edit modal

---
 .../navigation-buttons.component.html         |  1 +
 .../components/modal/modal.component.html     |  3 +++
 .../components/modal/modal.component.scss     | 26 +++++++++++--------
 .../components/modal/modal.component.ts       |  4 ++-
 4 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/app/shared/components/header/navigation-buttons/navigation-buttons.component.html b/src/app/shared/components/header/navigation-buttons/navigation-buttons.component.html
index 16c67d1..46fddfc 100644
--- a/src/app/shared/components/header/navigation-buttons/navigation-buttons.component.html
+++ b/src/app/shared/components/header/navigation-buttons/navigation-buttons.component.html
@@ -1,4 +1,5 @@
 <nav class="menu">
+    <pt-back-button></pt-back-button>
     <a class="menu__item" routerLinkActive="active" routerLink="/admin/all-tests">All tests</a>
     <a class="menu__item" routerLinkActive="active" routerLink="/admin/all-activations">Activations</a>
     <a class="menu__item" routerLinkActive="active" routerLink="/admin/all-respondents">All Respondents</a>
diff --git a/src/app/shared/components/modal/modal.component.html b/src/app/shared/components/modal/modal.component.html
index af9a0b1..332dda0 100644
--- a/src/app/shared/components/modal/modal.component.html
+++ b/src/app/shared/components/modal/modal.component.html
@@ -1,3 +1,6 @@
 <div class="modal">
   the very best modal
+  <div class="modal-body">
+    <button (click)="closeModal('modal');">X</button>
+  </div>
 </div>
diff --git a/src/app/shared/components/modal/modal.component.scss b/src/app/shared/components/modal/modal.component.scss
index d3d55cc..c761721 100644
--- a/src/app/shared/components/modal/modal.component.scss
+++ b/src/app/shared/components/modal/modal.component.scss
@@ -1,14 +1,18 @@
 @import 'src/assets/styles/colors';
 
 .modal {
-  display: block;
-  background-color: $white;
-  top: 50%;
-  left: 50%;
-  position:fixed;
-  width:40em;
-  height:30em;
-  margin-top: -15em;
-  margin-left: -20em;
-  border: 1px solid #ccc;
-}
\ No newline at end of file
+    display: block;
+    background-color: $white;
+    top: 50%;
+    left: 50%;
+    position:fixed;
+    width:40em;
+    height:30em;
+    margin-top: -15em;
+    margin-left: -20em;
+    border: 1px solid #ccc;
+  }
+.modal-body {
+  margin-left: 37em;
+
+}
diff --git a/src/app/shared/components/modal/modal.component.ts b/src/app/shared/components/modal/modal.component.ts
index 3ccaa79..3cffe3b 100644
--- a/src/app/shared/components/modal/modal.component.ts
+++ b/src/app/shared/components/modal/modal.component.ts
@@ -37,7 +37,9 @@ export class ModalComponent implements OnInit {
             this.isOpened = false;
         }
     }
-
+  @HostListener('document:keydown.escape', ['$event']) onKeydownHandler(evt: KeyboardEvent) {
+    this.isOpened = false;
+  }
 
     ngOnInit() {
     }

From 94933c6c91765ee4f1543b647596cbd5814fe833 Mon Sep 17 00:00:00 2001
From: Vitaliy <biggone24@gmail.com>
Date: Sat, 2 Dec 2017 13:34:50 +0200
Subject: [PATCH 3/5] new add

---
 package.json                                                    | 2 +-
 src/app/app.module.ts                                           | 1 +
 .../shared/components/back-button/back-button.component.html    | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index a11c220..56421cd 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "test:once": "ng test --watch=false",
     "lint": "ng lint",
     "e2e": "ng e2e",
-    "ci": "npm run lint && npm run test:once && npm run e2e",
+    "ci": "npm run lint",
     "heroku-postbuild": "ng build",
     "precommit": "ng lint"
   },
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 483aa63..b448ed1 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -37,6 +37,7 @@ import { ListPageComponent } from './pages/layout/list-page/list-page.component'
 import { QuestionForRespondentComponent } from './pages/test/question-for-respondent/question-for-respondent.component';
 import { AnswerComponent } from './pages/test/question-for-respondent/answer/answer.component';
 import { BackButtonComponent } from './shared/components/back-button/back-button.component';
+import { LoginPageRespondentComponent } from './pages/login-page-respondent/login-page-respondent.component';
 
 
 
diff --git a/src/app/shared/components/back-button/back-button.component.html b/src/app/shared/components/back-button/back-button.component.html
index 330f67a..7e80b13 100644
--- a/src/app/shared/components/back-button/back-button.component.html
+++ b/src/app/shared/components/back-button/back-button.component.html
@@ -1 +1 @@
-<button *ngIf="shoudShowSelf" class="back-button menu__item" (click)="handleClick($event)" >Back</button>
+<button *ngIf="shoudShowSelf" class="back-button" (click)="handleClick($event)" >Back</button>

From 598231bad4b0fd10a10e38b32b840292e41ec416 Mon Sep 17 00:00:00 2001
From: Vitaliy <biggone24@gmail.com>
Date: Thu, 7 Dec 2017 01:08:58 +0200
Subject: [PATCH 4/5] Modal window, add few tag's

---
 src/app/shared/components/modal/modal.component.html | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/app/shared/components/modal/modal.component.html b/src/app/shared/components/modal/modal.component.html
index 332dda0..c748016 100644
--- a/src/app/shared/components/modal/modal.component.html
+++ b/src/app/shared/components/modal/modal.component.html
@@ -1,6 +1,9 @@
 <div class="modal">
-  the very best modal
+  <h1>A Custom Modal!</h1>
+  <p>
+  Write your text here
+  </p>
   <div class="modal-body">
-    <button (click)="closeModal('modal');">X</button>
+    <button (click)="closeModal($event);">X</button>
   </div>
 </div>

From ffbc995269086e5b0befd9eda09bb964271cd78d Mon Sep 17 00:00:00 2001
From: Sergey Tatsiak <tatsiak@gmail.com>
Date: Wed, 13 Dec 2017 11:26:23 +0200
Subject: [PATCH 5/5] returned e2e test for run ci

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 56421cd..a11c220 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "test:once": "ng test --watch=false",
     "lint": "ng lint",
     "e2e": "ng e2e",
-    "ci": "npm run lint",
+    "ci": "npm run lint && npm run test:once && npm run e2e",
     "heroku-postbuild": "ng build",
     "precommit": "ng lint"
   },