From a97890f96db58604e5a10b1976e52dd7f869a83f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Romaszkin?= Date: Thu, 23 Apr 2020 21:49:02 +0200 Subject: [PATCH] Add proper styling, Add tutorial box with placeholders --- frontend/src/app/upload/upload.component.html | 81 +++++++++++++++---- frontend/src/app/upload/upload.component.scss | 25 ++++-- frontend/src/app/upload/upload.component.ts | 9 ++- frontend/src/app/upload/upload.module.ts | 2 + frontend/src/styles.scss | 4 - frontend/src/themes.scss | 1 - frontend/tsconfig.json | 3 +- 7 files changed, 94 insertions(+), 31 deletions(-) diff --git a/frontend/src/app/upload/upload.component.html b/frontend/src/app/upload/upload.component.html index 7e10f76..43ef03b 100644 --- a/frontend/src/app/upload/upload.component.html +++ b/frontend/src/app/upload/upload.component.html @@ -4,9 +4,15 @@

Narzędzie do komputerowej analizy dyskusji na forum

- +
-

Załaduj plik aby rozpocząć

-
-
+
+
@@ -29,9 +35,9 @@ wątków na forach platform e-learningowych, takich jak Moodle i Edumatic

-
+
-
+
@@ -40,9 +46,9 @@ System opiera się na przetwarzaniu języka naturalnego, które umożliwia coś tam

-
+ -
+
@@ -51,14 +57,59 @@ Dzięki ogromnej gamie możliwości wizualizacji danych, użytkownik może zrobić coś tam

-
+ + +
+
- +
+

Jak wyeksportować pliki XML?

+ + + +
Krok #1
+

+ Proin varius accumsan semper. Praesent consequat tincidunt + sagittis. Curabitur egestas sem a ipsum bibendum, sit amet + fringilla orci efficitur. Nam bibendum lectus ut viverra + tristique. Fusce eu pulvinar magna, quis viverra ex. Lorem ipsum + dolor sit amet, consectetur adipiscing elit. Praesent metus + turpis, commodo vel placerat quis, lobortis in ligula. +

+ + +
+ + +
Krok #2
+

+ Proin varius accumsan semper. Praesent consequat tincidunt + sagittis. Curabitur egestas sem a ipsum bibendum, sit amet + fringilla orci efficitur. Nam bibendum lectus ut viverra + tristique. Fusce eu pulvinar magna, quis viverra ex. Lorem ipsum + dolor sit amet, consectetur adipiscing elit. Praesent metus + turpis, commodo vel placerat quis, lobortis in ligula. +

+ + +
+ + +
Krok #3
+

+ Proin varius accumsan semper. Praesent consequat tincidunt + sagittis. Curabitur egestas sem a ipsum bibendum, sit amet + fringilla orci efficitur. Nam bibendum lectus ut viverra + tristique. Fusce eu pulvinar magna, quis viverra ex. Lorem ipsum + dolor sit amet, consectetur adipiscing elit. Praesent metus + turpis, commodo vel placerat quis, lobortis in ligula. +

+ + +
+
+
+
diff --git a/frontend/src/app/upload/upload.component.scss b/frontend/src/app/upload/upload.component.scss index 7b2ad27..9274858 100644 --- a/frontend/src/app/upload/upload.component.scss +++ b/frontend/src/app/upload/upload.component.scss @@ -7,7 +7,7 @@ .column { display: flex; flex-flow: column nowrap; - max-width: 80rem; + padding: 0 !important; margin: 0 auto; &__header { display: flex; @@ -17,10 +17,27 @@ width: 30rem; } } + + &__wave { + display: flex; + } + + &__instruction { + margin-top: -1px; + background-color: #3366ff; + display: flex; + flex-flow: column nowrap; + align-items: center; + } + + &__instruction-card { + max-width: 50%; + padding: 2.25rem; + } } .properties { - margin: 3rem 0; + margin: 4rem 3rem 0; display: flex; flex-flow: row; justify-content: center; @@ -42,7 +59,3 @@ text-align: center; } } - -.nb-theme-default nb-layout .layout { - background-image: url("../../assets/wave.svg"); -} diff --git a/frontend/src/app/upload/upload.component.ts b/frontend/src/app/upload/upload.component.ts index 3ebdc23..527d4ea 100644 --- a/frontend/src/app/upload/upload.component.ts +++ b/frontend/src/app/upload/upload.component.ts @@ -13,13 +13,14 @@ export class UploadComponent implements OnInit { public fileName: string; private file: File; - constructor(private sendService: SendDataService) { - this.file = {} as File; - this.fileName = ''; - } + constructor(private sendService: SendDataService) {} ngOnInit(): void {} + scrollTo(el: HTMLElement) { + el.scrollIntoView({ behavior: 'smooth' }); + } + parseFile(event: any) { this.file = event; } diff --git a/frontend/src/app/upload/upload.module.ts b/frontend/src/app/upload/upload.module.ts index 08aeda9..98a8163 100644 --- a/frontend/src/app/upload/upload.module.ts +++ b/frontend/src/app/upload/upload.module.ts @@ -7,6 +7,7 @@ import { NbCardModule, NbLayoutModule, NbIconModule, + NbStepperModule, } from '@nebular/theme'; import { DragAndDropComponent } from './drag-and-drop/drag-and-drop.component'; @@ -28,6 +29,7 @@ import { SendDataService } from './send-data.service'; NbButtonModule, NbCardModule, NbIconModule, + NbStepperModule, ], exports: [UploadComponent], providers: [SendDataService], diff --git a/frontend/src/styles.scss b/frontend/src/styles.scss index cc20a38..0f42b0f 100644 --- a/frontend/src/styles.scss +++ b/frontend/src/styles.scss @@ -6,7 +6,3 @@ @include nb-theme-global(); } /* You can add global styles to this file, and also import other style files */ - -.nb-theme-default nb-layout .layout { - background-image: url("./assets/wave.svg"); -} diff --git a/frontend/src/themes.scss b/frontend/src/themes.scss index cee9e78..3f27d80 100644 --- a/frontend/src/themes.scss +++ b/frontend/src/themes.scss @@ -13,7 +13,6 @@ $nb-themes: nb-register-theme( // color-primary-700: #1a34b8, // color-primary-800: #102694, // color-primary-900: #091c7a, - layout-bg: url("./assets/wave.svg") ), default, default diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json index 6994c8a..402891e 100644 --- a/frontend/tsconfig.json +++ b/frontend/tsconfig.json @@ -12,7 +12,8 @@ "importHelpers": true, "target": "es2015", "lib": ["es2018", "dom"], - "strict": true + "strict": true, + "strictPropertyInitialization": false }, "angularCompilerOptions": { "fullTemplateTypeCheck": true,