Merge pull request #28 from dhlab-basel/wip/remove-googleapis

chore: Remove Google APIs and replaced by self-hosting fonts and icons

README.md

@@ -12,6 +12,8 @@ It's a system for annotation and linkage of sources in arts and humanities.
 This project was generated with
 [Angular CLI](https://github.com/angular/angular-cli) version 7.0.4.
 
+**Required version of Knora: [v8.0.0](https://github.com/dhlab-basel/Knora/releases/tag/v8.0.0)**
+
 Developed by the [DaSCH Team](https://dasch.swiss) in Basel.
 
 ## Development server

package.json

@@ -1,6 +1,6 @@
 {
   "name": "kuirl",
-  "version": "1.0.0",
+  "version": "1.2.0",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
@@ -38,6 +38,7 @@
     "jdnconvertiblecalendardateadapter": "^0.0.9",
     "json2typescript": "^1.0.6",
     "jsonld": "^1.1.0",
+    "material-icons": "^0.3.1",
     "moment": "^2.22.2",
     "openseadragon": "^2.4.0",
     "rxjs": "~6.4.0",
@@ -70,4 +71,4 @@
     "tslint": "~5.11.0",
     "typescript": "3.2.4"
   }
-}
+}

src/app/app-global.ts

@@ -35,10 +35,15 @@ export class AppGlobal {
             icon: 'dashboard'
         },
         */
+        {
+            label: 'Dashboard',
+            route: '/dashboard',
+            icon: 'dashboard'
+        },
         {
             label: 'Your Projects',
             route: '/projects',
-            icon: 'all_inbox'
+            icon: 'assignment'
         },
         {
             label: 'Your Collections',

src/app/main/main.component.html

@@ -58,7 +58,7 @@ <h4 class="mat-subheading-2">The tool is designed to work with qualitative data.
                         kind
                         of media with each other.</h4>
                     <mat-divider class="more-space-bottom"></mat-divider>
-                    <a mat-raised-button [color]="'accent'" href="https://wwww.dasch.swiss/team">Please contact us</a>
+                    <a mat-raised-button [color]="'accent'" href="https://dasch.swiss/team">Please contact us</a>
                 </div>
 
                 <div *ngSwitchCase="'quantitative'">
@@ -147,7 +147,7 @@ <h2 class="mat-title">Partner institutions</h2>
                 </p>
             </div>
             <div class="box contact">
-                <a mat-button href="https://www.dasch.swiss">Data and Service Center for the Humanities</a>
+                <a mat-button href="https://dasch.swiss">Data and Service Center for the Humanities</a>
                 <a mat-button href="https://www.google.com/maps/place/Bernoullistrasse+32%2C+4056+Basel">
                     <mat-icon>location_on</mat-icon> Bernoullistrasse 32, 4056 Basel
                 </a>
@@ -192,7 +192,7 @@ <h2 class="mat-title">Partner institutions</h2>
         <!-- copyright info -->
         <div class="panel no-padding">
             <p class="mat-caption">
-                <a href="http://www.dasch.swiss">DaSCH</a> @ <a href="https://unibas.ch">University of Basel</a> &copy;
+                <a href="https://dasch.swiss">DaSCH</a> @ <a href="https://unibas.ch">University of Basel</a> &copy;
                 2018 - {{currentYear.getFullYear()}}
             </p>
         </div>

src/app/system/projects/projects-list/projects-list.component.html

@@ -32,7 +32,7 @@ <h2 class="mat-title">{{list.length | i18nPlural: itemPluralMapping['title']}}</
             <!-- logo -->
             <td class="avatar-cell">
                 <mat-icon mat-list-icon>
-                    <span *ngIf="status">inbox</span>
+                    <span *ngIf="status">assignment</span>
                     <span *ngIf="!status">lock</span>
                 </mat-icon>
                 <!-- QUESTION: should we show the project logo

src/app/system/status/status.component.html

@@ -1,6 +1,9 @@
 <div>
-  - Connectio to knora <br>
-  - Connection to sipi
+  <h3>Not yet implemented! But this page will monitor some tools, showing the status...</h3>
 
+  <p>
+    - Connection to knora <br>
+    - Connection to sipi
+  </p>
 
 </div>

src/app/user/user-menu/user-menu.component.html

@@ -21,7 +21,8 @@
     <div class="menu-content">
 
         <mat-list class="navigation">
-            <mat-list-item *ngFor="let item of navigation; let i = index;" class="nav-item">
+            <mat-list-item *ngFor="let item of navigation; let i = index;" class="nav-item"
+                           [class.border-bottom]="i===0">
                 <button mat-button [routerLink]="item.route" routerLinkActive="active-link" class="nav-item button">
                     <mat-icon class="prefix">{{item.icon}}</mat-icon>
                     <span class="label">{{item.label}}</span>

src/app/user/user-menu/user-menu.component.ts

@@ -1,11 +1,11 @@
-import { Component, OnInit } from '@angular/core';
 import { Location } from '@angular/common';
+import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
 import { AuthenticationService } from '@knora/authentication';
-import { ApiServiceError, User, UsersService } from '@knora/core';
+import { User, UsersService, ApiServiceError } from '@knora/core';
 import { AppGlobal } from 'src/app/app-global';
 import { CacheService } from 'src/app/main/cache/cache.service';
 import { MenuItem } from '../../main/declarations/menu-item';
-import { ActivatedRoute, Router } from '@angular/router';
 
 @Component({
     selector: 'app-user-menu',
@@ -21,17 +21,28 @@ export class UserMenuComponent implements OnInit {
 
     navigation: MenuItem[];
 
-    constructor(
+    constructor (
         private _auth: AuthenticationService,
+        private _usersService: UsersService,
         private _cache: CacheService,
         private _location: Location,
         private _router: Router
-    ) {}
+    ) { }
 
     ngOnInit() {
         this.navigation = AppGlobal.userNav;
         this.username = JSON.parse(localStorage.getItem('session')).user.name;
         this.sysAdmin = JSON.parse(localStorage.getItem('session')).user.sysAdmin;
+
+        this._cache.get(this.username, this._usersService.getUserByUsername(this.username));
+        this._cache.get(this.username, this._usersService.getUserByUsername(this.username)).subscribe(
+            (result: User) => {
+                this.user = result;
+            },
+            (error: ApiServiceError) => {
+                console.error(error);
+            }
+        );
     }
 
     logout() {
@@ -41,9 +52,9 @@ export class UserMenuComponent implements OnInit {
         this._cache.destroy();
 
         // reload the page
-        this._router.navigateByUrl('/refresh', {skipLocationChange: true}).then(() => {
-                this._router.navigate([this._location.path()]);
-            }
+        this._router.navigateByUrl('/refresh', { skipLocationChange: true }).then(() => {
+            this._router.navigate([this._location.path()]);
+        }
         );
     }
 }

src/app/user/user.component.html

@@ -9,11 +9,13 @@
 
     <div class="content-container">
         <nav mat-tab-nav-bar mat-align-tabs="left" class="tab-bar" animationDuration="0ms">
-            <a mat-tab-link *ngFor="let link of navigation" [routerLink]="link.route" routerLinkActive="active-tab"
-               #rla="routerLinkActive" [active]="rla.isActive">
-                <mat-icon class="tab-icon">{{link.icon}}</mat-icon>
-                {{link.label}}
-            </a>
+            <span *ngFor="let link of navigation; let i = index">
+                <a mat-tab-link *ngIf="i > 0" [routerLink]="link.route" routerLinkActive="active-tab"
+                   #rla="routerLinkActive" [active]="rla.isActive">
+                    <mat-icon class="tab-icon">{{link.icon}}</mat-icon>
+                    {{link.label}}
+                </a>
+            </span>
         </nav>
 
         <!-- main content: router outlet -->