From df42a5f2439bfb44990151429118612120eee63a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Romaszkin?= <microm3@st.amu.edu.pl>
Date: Tue, 30 Jun 2020 23:34:22 +0200
Subject: [PATCH] Fix CommonJS import, add z-index for sticky subheader, change
 text in 'logout' tooltip

---
 frontend/angular.json                                        | 1 -
 .../discussion-viewer/discussion-viewer.component.scss       | 2 +-
 .../discussion-viewer/discussion-viewer.component.ts         | 4 ++--
 frontend/src/app/main-view/main-view.component.html          | 5 ++++-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/frontend/angular.json b/frontend/angular.json
index 0a951e5..3cc9f3a 100644
--- a/frontend/angular.json
+++ b/frontend/angular.json
@@ -17,7 +17,6 @@
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
-            "allowedCommonJsDependencies": ["papaparse"],
             "outputPath": "dist/nkadf",
             "index": "src/index.html",
             "main": "src/main.ts",
diff --git a/frontend/src/app/main-view/discussion-viewer/discussion-viewer.component.scss b/frontend/src/app/main-view/discussion-viewer/discussion-viewer.component.scss
index bc43c58..343b8b8 100644
--- a/frontend/src/app/main-view/discussion-viewer/discussion-viewer.component.scss
+++ b/frontend/src/app/main-view/discussion-viewer/discussion-viewer.component.scss
@@ -14,8 +14,8 @@
     display: flex;
     flex-flow: row nowrap;
     background-color: white;
-    z-index: 2000;
     box-shadow: 0px 10px 17px -15px rgba(0, 0, 0, 0.88);
+    z-index: 10;
     button {
       margin: 1rem 0rem 1rem 1rem;
     }
diff --git a/frontend/src/app/main-view/discussion-viewer/discussion-viewer.component.ts b/frontend/src/app/main-view/discussion-viewer/discussion-viewer.component.ts
index 5e88f98..183e0d4 100644
--- a/frontend/src/app/main-view/discussion-viewer/discussion-viewer.component.ts
+++ b/frontend/src/app/main-view/discussion-viewer/discussion-viewer.component.ts
@@ -10,7 +10,7 @@ import {
   NbLayoutScrollService,
   NbScrollPosition,
 } from '@nebular/theme';
-import * as Papa from 'papaparse';
+import { parse } from 'papaparse';
 
 @Component({
   selector: 'app-discussion-viewer',
@@ -102,7 +102,7 @@ export class DiscussionViewerComponent implements OnInit, OnDestroy {
 
   parseFile(file: File): Promise<{ id: number; name: string }[]> {
     return new Promise((resolve, _) => {
-      Papa.parse(file, {
+      parse(file, {
         header: true,
         skipEmptyLines: true,
         complete: (result) => {
diff --git a/frontend/src/app/main-view/main-view.component.html b/frontend/src/app/main-view/main-view.component.html
index 9da22d7..45cdd1f 100644
--- a/frontend/src/app/main-view/main-view.component.html
+++ b/frontend/src/app/main-view/main-view.component.html
@@ -10,7 +10,10 @@
         <nb-action>nkadf</nb-action>
       </nb-actions>
       <nb-actions>
-        <nb-action icon="power" (click)="logout()" nbTooltip="Wyloguj"
+        <nb-action
+          icon="power"
+          (click)="logout()"
+          nbTooltip="Wróć do strony początkowej"
           >Wyloguj</nb-action
         >
       </nb-actions>