SKE-44 add logo

SystemKonkursow/4.2.1/angular/package-lock.json

@@ -8434,6 +8434,11 @@
         "tslib": "1.9.2"
       }
     },
+    "rxjs-compat": {
+      "version": "6.3.3",
+      "resolved": "https://registry.npmjs.org/rxjs-compat/-/rxjs-compat-6.3.3.tgz",
+      "integrity": "sha512-caGN7ixiabHpOofginKEquuHk7GgaCrC7UpUQ9ZqGp80tMc68msadOeP/2AKy2R4YJsT1+TX5GZCtxO82qWkyA=="
+    },
     "safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",

SystemKonkursow/4.2.1/angular/package.json

@@ -58,6 +58,7 @@
     "push.js": "1.0.4",
     "raphael": "^2.2.7",
     "rxjs": "^6.2.0",
+    "rxjs-compat": "^6.3.3",
     "simple-line-icons": "^2.4.1",
     "spin.js": "^2.3.2",
     "sweetalert": "^2.1.2",

SystemKonkursow/4.2.1/angular/src/app/categories-list/categories-list.component.html

@@ -1,4 +1,4 @@
-<div class="flex-container">
+<div class="flex-container" id="categories-list-area">
     <div class="flex-item" *ngFor="let category of competitionCategoriesList">
         {{ category.name }}
     </div>

SystemKonkursow/4.2.1/angular/src/app/categories-list/categories-list.component.ts

@@ -1,29 +1,45 @@
-import { Component, OnInit, Injector } from '@angular/core';
+import { Component, OnInit, Injector, OnDestroy } from '@angular/core';
 import { appModuleAnimation } from '@shared/animations/routerTransition';
 import { CompetitionCategoryServiceProxy, CompetitionCategoryDto } from '@shared/service-proxies/service-proxies';
 import { List } from 'lodash';
+import { AppComponentBase } from '@shared/app-component-base';
+import { Subscription } from 'rxjs/Rx';
+import { finalize } from 'rxjs/operators';
 
 @Component({
     templateUrl: './categories-list.component.html',
     styleUrls: ['./categories-list.component.css'],
     animations: [appModuleAnimation()]
 })
-export class CategoriesListComponent implements OnInit {
+export class CategoriesListComponent extends AppComponentBase implements OnInit, OnDestroy {
 
     public competitionCategoriesList: List<CompetitionCategoryDto> = [];
+    public categoriesListAreaId: string = 'categories-list-area';
+
+    private categoryListSubscription: Subscription;
 
     constructor(
         injector: Injector,
         private _competitionCategoryService: CompetitionCategoryServiceProxy
     ) {
+        super(injector);
     }
 
     public ngOnInit() {
         this.getCompetitionCategories();
     }
 
+    public ngOnDestroy() {
+        if (this.categoryListSubscription) {
+            this.categoryListSubscription.unsubscribe();
+        }
+    }
+
     private getCompetitionCategories(): void {
-        this._competitionCategoryService.getAllCompetitionCategories()
+        this.setBusy(this.categoriesListAreaId);
+
+        this.categoryListSubscription = this._competitionCategoryService.getAllCompetitionCategories()
+            .pipe(finalize(() => { this.clearBusy(this.categoriesListAreaId); }))
             .subscribe((result: List<CompetitionCategoryDto>) => {
                 this.competitionCategoriesList = result;
             });

SystemKonkursow/4.2.1/angular/src/app/layout/topbar.component.html

@@ -14,7 +14,7 @@
         <div class="navbar-header">
             <a href="javascript:void(0);" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse" aria-expanded="false"></a>
             <a href="javascript:void(0);" class="bars"></a>
-            <a routerLink="/app/home" class="navbar-brand"><i class="fa fa-cubes"></i> System Konkursów</a>
+            <a routerLink="/app/home" class="navbar-brand"><p style="margin-top: -10px;"><img src="{{logoUrl}}" style="height:50px; width: 50px;"> System Konkursów</p></a>
         </div>
         <div class="collapse navbar-collapse" id="navbar-collapse">
             <ul class="nav navbar-nav navbar-right">

SystemKonkursow/4.2.1/angular/src/app/layout/topbar.component.ts

@@ -8,6 +8,8 @@ import { AppComponentBase } from '@shared/app-component-base';
 })
 export class TopBarComponent extends AppComponentBase {
 
+    public logoUrl: string = '/assets/images/logo.png';
+
     constructor(
         injector: Injector
     ) {

SystemKonkursow/4.2.1/angular/src/shared/app-component-base.ts

@@ -35,6 +35,14 @@ export abstract class AppComponentBase {
         this.elementRef = injector.get(ElementRef);
     }
 
+    protected setBusy(htmlId: string): void {
+        abp.ui.setBusy('#' + htmlId);
+    }
+
+    protected clearBusy(htmlId: string): void {
+        abp.ui.clearBusy('#' + htmlId);
+    }
+
     l(key: string, ...args: any[]): string {
         let localizedText = this.localization.localize(key, this.localizationSourceName);
 

SystemKonkursow/4.2.1/angular/src/shared/core.less

@@ -40,7 +40,7 @@ topbar-languageswitch {
 
 @media (min-width: 850px) {
     .login-page {
-        background-image: url('/assets/images/login_page.png');
+        background-image: url('/assets/images/logo.png');
         background-repeat: no-repeat;
         background-size: 25%;
         background-position: 5% 50%;