s434776/PRI_2020-FE
2
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix CommonJS import, add z-index for sticky subheader, change text in 'logout' tooltip

Browse Source
This commit is contained in:
Michał Romaszkin 2020-06-30 23:34:22 +02:00
parent 88b91e9a37
commit df42a5f243
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/angular.json
View File

@ -17,7 +17,6 @@
"build": { "build": {
"builder": "@angular-devkit/build-angular:browser", "builder": "@angular-devkit/build-angular:browser",
"options": { "options": {
"allowedCommonJsDependencies": ["papaparse"],
"outputPath": "dist/nkadf", "outputPath": "dist/nkadf",
"index": "src/index.html", "index": "src/index.html",
"main": "src/main.ts", "main": "src/main.ts",

2
frontend/src/app/main-view/discussion-viewer/discussion-viewer.component.scss
View File

@ -14,8 +14,8 @@
display: flex; display: flex;
flex-flow: row nowrap; flex-flow: row nowrap;
background-color: white; background-color: white;
z-index: 2000;
box-shadow: 0px 10px 17px -15px rgba(0, 0, 0, 0.88); box-shadow: 0px 10px 17px -15px rgba(0, 0, 0, 0.88);
z-index: 10;
button { button {
margin: 1rem 0rem 1rem 1rem; margin: 1rem 0rem 1rem 1rem;
} }

4
frontend/src/app/main-view/discussion-viewer/discussion-viewer.component.ts
View File

@ -10,7 +10,7 @@ import {
NbLayoutScrollService, NbLayoutScrollService,
NbScrollPosition, NbScrollPosition,
} from '@nebular/theme'; } from '@nebular/theme';
import * as Papa from 'papaparse'; import { parse } from 'papaparse';
@Component({ @Component({
selector: 'app-discussion-viewer', selector: 'app-discussion-viewer',
@ -102,7 +102,7 @@ export class DiscussionViewerComponent implements OnInit, OnDestroy {
parseFile(file: File): Promise<{ id: number; name: string }[]> { parseFile(file: File): Promise<{ id: number; name: string }[]> {
return new Promise((resolve, _) => { return new Promise((resolve, _) => {
Papa.parse(file, { parse(file, {
header: true, header: true,
skipEmptyLines: true, skipEmptyLines: true,
complete: (result) => { complete: (result) => {

5
frontend/src/app/main-view/main-view.component.html
View File

@ -10,7 +10,10 @@
<nb-action>nkadf</nb-action> <nb-action>nkadf</nb-action>
</nb-actions> </nb-actions>
<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 >Wyloguj</nb-action
> >
</nb-actions> </nb-actions>