From 6fb5cf54ba1f0739ff956650d52adb0c1e5242be Mon Sep 17 00:00:00 2001
From: "k.triantafyllou" <k.triantafyllou@di.uoa.gr>
Date: Fri, 4 Mar 2022 17:31:09 +0200
Subject: [PATCH] Add graph as icon in library. Navigation bar remove uk-link
 from all links.

---
 sharedComponents/navigationBar.component.html | 40 +++++++++----------
 utils/icons/icons.ts                          |  5 +++
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/sharedComponents/navigationBar.component.html b/sharedComponents/navigationBar.component.html
index 1b12890a..5da75016 100644
--- a/sharedComponents/navigationBar.component.html
+++ b/sharedComponents/navigationBar.component.html
@@ -32,17 +32,16 @@
             <ng-container *ngIf="!onlyTop">
               <ng-container *ngFor="let menu of menuItems">
                 <li *ngIf="showHomeMenuItem && currentRoute.route !== '/'">
-                  <a routerLinkActive="uk-link" routerLink="/" (click)="closeCanvas(canvas)">Home</a>
+                  <a routerLink="/" (click)="closeCanvas(canvas)">Home</a>
                 </li>
                 <li [class.uk-active]="isTheActiveMenu(menu)"
                     *ngIf="isAtleastOneEnabled(menu.rootItem.entitiesRequired,showEntity) && isAtleastOneEnabled(menu.rootItem.routeRequired, showPage)">
-                  <!--a routerLinkActive="uk-link" routerLink="{{menu.rootItem.route}}"  [queryParams]=menu.rootItem.params class="uk-offcanvas-close custom-offcanvas-close">{{menu.rootItem.title}}</a-->
+                  <!--a routerLink="{{menu.rootItem.route}}"  [queryParams]=menu.rootItem.params class="uk-offcanvas-close custom-offcanvas-close">{{menu.rootItem.title}}</a-->
                   <a *ngIf="menu.rootItem.route.length > 0 && (isEnabled([menu.rootItem.route], showPage) || !menu.rootItem.routeRequired)"
-                     routerLinkActive="uk-link" routerLink="{{menu.rootItem.route}}"
-                     [routerLinkActiveOptions]="{exact: true}" (click)="closeCanvas(canvas)"
+                     routerLink="{{menu.rootItem.route}}" (click)="closeCanvas(canvas)"
                      [queryParams]="menu.rootItem.params" [fragment]="menu.rootItem.fragment">{{menu.rootItem.title}}</a>
                   <a *ngIf="menu.rootItem.route.length == 0 && menu.rootItem.url.length > 0"
-                     routerLinkActive="uk-link" href="{{menu.rootItem.url}}" (click)="closeCanvas(canvas)"
+                     href="{{menu.rootItem.url}}" (click)="closeCanvas(canvas)"
                      target="{{menu.rootItem.url.includes('http') ? '_blank' : '_self'}}">{{menu.rootItem.title}}</a>
                   <a *ngIf="(menu.rootItem.route.length == 0 && menu.rootItem.url.length == 0) ||
                     (menu.rootItem.route.length >0 && menu.rootItem.routeRequired && !isEnabled([menu.rootItem.route], showPage)
@@ -52,20 +51,20 @@
                       <li [class.uk-active]="isTheActiveMenuItem(submenu)"
                           *ngIf="isEnabled(submenu.entitiesRequired,showEntity) && isEnabled(submenu.routeRequired, showPage)  && (submenu.route.length > 0 || submenu.url.length > 0)"
                           [class.uk-parent]="submenu.items && submenu.items.length > 0">
-                        <a *ngIf="submenu.route.length > 0" routerLinkActive="uk-link" (click)="closeCanvas(canvas)"
+                        <a *ngIf="submenu.route.length > 0" (click)="closeCanvas(canvas)"
                            routerLink="{{submenu.route}}" [queryParams]=submenu.params
                            [fragment]="submenu.fragment">{{submenu.title}}</a>
-                        <a *ngIf="submenu.route.length == 0 && submenu.url.length > 0" routerLinkActive="uk-link"
+                        <a *ngIf="submenu.route.length == 0 && submenu.url.length > 0"
                            href="{{submenu.url}}" (click)="closeCanvas(canvas)"
                            target="{{submenu.url.includes('http') ? '_blank' : '_self'}}">{{submenu.title}}</a>
                         <ul *ngIf="submenu.items && submenu.items.length > 0" class="uk-nav-sub">
                           <ng-container *ngFor="let subsubmenu of submenu.items">
                             <li>
-                              <a *ngIf="subsubmenu.route.length > 0" routerLinkActive="uk-link"
+                              <a *ngIf="subsubmenu.route.length > 0"
                                  routerLink="{{subsubmenu.route}}" [queryParams]="subsubmenu.params"
                                  [fragment]="subsubmenu.fragment" (click)="closeCanvas(canvas)">{{subsubmenu.title}}</a>
                               <a *ngIf="subsubmenu.route.length == 0 && subsubmenu.url.length > 0"
-                                 routerLinkActive="uk-link" href="{{subsubmenu.url}}" (click)="closeCanvas(canvas)"
+                                 href="{{subsubmenu.url}}" (click)="closeCanvas(canvas)"
                                  target="_blank">{{subsubmenu.title}}</a>
                             </li>
                           </ng-container>
@@ -124,18 +123,17 @@
           <ng-template #mainMenu>
             <ul class="uk-navbar-nav" [class.uk-margin-right]="!userMenu">
               <li class="uk-parent" *ngIf="showHomeMenuItem && currentRoute.route !== '/'">
-                <a routerLinkActive="uk-link" routerLink="/">Home</a>
+                <a routerLink="/">Home</a>
               </li>
               <ng-container *ngFor="let menu of menuItems">
                 <li class="uk-parent" [class.uk-active]="isTheActiveMenu(menu)"
                     *ngIf="isAtleastOneEnabled(menu.rootItem.entitiesRequired,showEntity) && isAtleastOneEnabled(menu.rootItem.routeRequired, showPage)">
-                  <!--a routerLinkActive="uk-link" routerLink="{{menu.rootItem.route}}"   [queryParams]=menu.rootItem.params class="" aria-expanded="false">{{menu.rootItem.title}}</a-->
+                  <!--a routerLink="{{menu.rootItem.route}}"   [queryParams]=menu.rootItem.params class="" aria-expanded="false">{{menu.rootItem.title}}</a-->
                   <a *ngIf="menu.rootItem.route.length > 0 && (isEnabled([menu.rootItem.route], showPage) || !menu.rootItem.routeRequired )"
-                     routerLinkActive="uk-link" routerLink="{{menu.rootItem.route}}"
+                     routerLink="{{menu.rootItem.route}}"
                      [queryParams]="menu.rootItem.params"
                      [fragment]="menu.rootItem.fragment"> {{menu.rootItem.title}}</a>
                   <a *ngIf="menu.rootItem.route.length == 0 && menu.rootItem.url.length > 0"
-                     routerLinkActive="uk-link"
                      href="{{menu.rootItem.url}}" target="{{menu.rootItem.url.includes('http') ? '_blank' : '_self'}}"
                      aria-expanded="false">{{menu.rootItem.title}}</a>
                   <a *ngIf="(menu.rootItem.route.length == 0 && menu.rootItem.url.length == 0) || ( menu.rootItem.route.length >0 && menu.rootItem.routeRequired && !isEnabled([menu.rootItem.route], showPage) && isAtleastOneEnabled(menu.rootItem.routeRequired, showPage)) "
@@ -150,21 +148,19 @@
                             isEnabled(submenu.routeRequired, showPage) && (submenu.route.length > 0 ||
                             submenu.url.length > 0)" [class.uk-active]="isTheActiveMenuItem(submenu)"
                                 [class.uk-parent]="submenu.items && submenu.items.length > 0">
-                              <a *ngIf="submenu.route.length > 0" routerLinkActive="uk-link"
+                              <a *ngIf="submenu.route.length > 0"
                                  routerLink="{{submenu.route}}" [queryParams]="submenu.params"
                                  [fragment]="submenu.fragment">{{submenu.title}}</a>
                               <a *ngIf="submenu.route.length == 0 && submenu.url.length > 0"
-                                 routerLinkActive="uk-link"
                                  href="{{submenu.url}}"
                                  target="{{submenu.url.includes('http') ? '_blank' : '_self'}}">{{submenu.title}}</a>
                               <ul *ngIf="submenu.items && submenu.items.length > 0" class="uk-nav-sub">
                                 <ng-container *ngFor="let subsubmenu of submenu.items">
                                   <li>
-                                    <a *ngIf="subsubmenu.route.length > 0" routerLinkActive="uk-link"
+                                    <a *ngIf="subsubmenu.route.length > 0"
                                        routerLink="{{subsubmenu.route}}" [queryParams]="subsubmenu.params"
                                        [fragment]="subsubmenu.fragment">{{subsubmenu.title}}</a>
                                     <a *ngIf="subsubmenu.route.length == 0 && subsubmenu.url.length > 0"
-                                       routerLinkActive="uk-link"
                                        href="{{subsubmenu.url}}" target="_blank">{{subsubmenu.title}}</a>
                                   </li>
                                 </ng-container>
@@ -186,7 +182,7 @@
                 <ng-container *ngFor="let menu of additionalMenuItems">
                   <li class="uk-parent">
                     <!-- INTERNAL ROOT-->
-                    <a *ngIf="menu.type == 'internal' && menu.route && isEnabled([menu.route], showPage)" routerLinkActive="uk-link"
+                    <a *ngIf="menu.type == 'internal' && menu.route && isEnabled([menu.route], showPage)"
                        routerLink="{{menu.route}}"
                        [queryParams]="menu.params"
                        [fragment]="menu.fragment">
@@ -210,7 +206,7 @@
                             <ng-container *ngFor="let submenu of menu.items">
                               <li>
                                 <!-- INTERNAL CHILD -->
-                                <a *ngIf="submenu.type == 'internal' && submenu.route && isEnabled([submenu.route], showPage)" routerLinkActive="uk-link"
+                                <a *ngIf="submenu.type == 'internal' && submenu.route && isEnabled([submenu.route], showPage)"
                                    routerLink="{{submenu.route}}"
                                    [queryParams]="submenu.params"
                                    [fragment]="submenu.fragment"
@@ -218,7 +214,7 @@
                                   {{submenu.title}}
                                 </a>
                                 <!-- EXTERNAL CHILD -->
-                                <a *ngIf="submenu.type == 'external' && submenu.url" routerLinkActive="uk-link"
+                                <a *ngIf="submenu.type == 'external' && submenu.url"
                                    href="{{submenu.url}}"
                                    target="_blank">
                                   {{submenu.title}}
@@ -244,7 +240,7 @@
 					<ng-container *ngFor="let item of featuredMenuItems">
 						<li>
 							<!-- INTERNAL -->
-							<a *ngIf="item.type == 'internal' && item.route && isEnabled([item.route], showPage)" routerLinkActive="uk-link"
+							<a *ngIf="item.type == 'internal' && item.route && isEnabled([item.route], showPage)"
 							routerLink="{{item.route}}"
 							[queryParams]="item.params"
 							[fragment]="item.fragment"
@@ -252,7 +248,7 @@
 						{{item.title}}
 					</a>
 					<!-- EXTERNAL -->
-					<a *ngIf="item.type == 'external' && item.url" routerLinkActive="uk-link"
+					<a *ngIf="item.type == 'external' && item.url"
 							href="{{item.url}}"
 							target="_blank">
 						{{item.title}}
diff --git a/utils/icons/icons.ts b/utils/icons/icons.ts
index 6e6aadee..847782dd 100644
--- a/utils/icons/icons.ts
+++ b/utils/icons/icons.ts
@@ -158,3 +158,8 @@ export const restricted = {
   name: 'restricted',
   data: '<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20"><g id="noun-remove-file-3557544" transform="translate(-176.397 -106.4)"><path id="Path_104600" data-name="Path 104600" d="M181.881,274.166A5.485,5.485,0,1,0,178,272.559,5.484,5.484,0,0,0,181.881,274.166Zm-3.548-5.484a3.531,3.531,0,0,1,.452-1.729l4.839,4.839a3.548,3.548,0,0,1-5.29-3.11Zm7.1,0a3.527,3.527,0,0,1-.452,1.729l-4.839-4.839a3.548,3.548,0,0,1,5.29,3.11Z" transform="translate(0 -147.766)" fill="#4b4b4b"/><path id="Path_104601" data-name="Path 104601" d="M245.859,106.4a2.258,2.258,0,0,0-2.258,2.258v4.516h1.936v-4.516a.323.323,0,0,1,.323-.323h8.064v3.871h3.871v11.935a.323.323,0,0,1-.323.323h-5.484V126.4h5.484a2.259,2.259,0,0,0,2.258-2.258v-13.3l-4.439-4.439Z" transform="translate(-63.333)" fill="#4b4b4b"/></g></svg>'
 }
+
+export const graph = {
+  name: 'graph',
+  data: '<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 21.744"><g transform="translate(0)"><g transform="translate(0 0)"><path d="M18.772,15.578a2.718,2.718,0,0,0-.427-.368,3.629,3.629,0,0,0-3.291-.5,3.445,3.445,0,0,0-.962.5c-.07.051-.139.1-.2.161a2.335,2.335,0,0,0-.23.207.3.3,0,0,0-.047.051c-.011.013-.027.028-.036.042a1.611,1.611,0,0,0-.163.19L7.039,12.133a8.04,8.04,0,0,1,8.352-5.007h0a3.681,3.681,0,0,0,.93.133h.046a3.633,3.633,0,0,0,2.008-.605,3.57,3.57,0,0,0,.926-.9A3.63,3.63,0,1,0,13.368,1.57a3.491,3.491,0,0,0-.38.71,3.589,3.589,0,0,0-.26,1.35c0,.065,0,.125,0,.19a4.146,4.146,0,0,0,.051.459,3.721,3.721,0,0,0,.125.486L6.369,8.542a3.546,3.546,0,0,0-.649-.59,3.629,3.629,0,0,0-4.2,0,3.675,3.675,0,0,0-.894.9,3.483,3.483,0,0,0-.38.71,3.35,3.35,0,0,0-.137.41,3.563,3.563,0,0,0-.123.949v.19a3.57,3.57,0,0,0,.038.38.635.635,0,0,0,.013.08,3.641,3.641,0,0,0,.634,1.469h0a3.7,3.7,0,0,0,.934.894,3.606,3.606,0,0,0,2.008.607,3.732,3.732,0,0,0,.55-.038l-.044.036a8.037,8.037,0,0,1,8.6,4.556v-.021a3.606,3.606,0,0,0,2.836,2.61,3.472,3.472,0,0,0,1.26,0,3.629,3.629,0,0,0,2.879-2.58.228.228,0,0,0,0-.038,3.606,3.606,0,0,0-.6-3.111,2.769,2.769,0,0,0-.344-.393M14.129,3.515a2.19,2.19,0,0,1,.254-.928,2.323,2.323,0,0,1,.885-.907A2.24,2.24,0,0,1,16.359,1.4a2.206,2.206,0,0,1,1.1.285,2.234,2.234,0,0,1,.886.909,2.179,2.179,0,0,1,.252,1.038,2.213,2.213,0,0,1-.306,1.116,2.181,2.181,0,0,1-.949.888,2.255,2.255,0,0,1-.983.23h-.04a2.158,2.158,0,0,1-.949-.228,2.278,2.278,0,0,1-.569-.406,1.912,1.912,0,0,1-.156-.171,2.314,2.314,0,0,1-.224-.313.078.078,0,0,1-.015-.027,2.226,2.226,0,0,1-.287-1.091.76.76,0,0,1,0-.114M2.638,12.921a2.24,2.24,0,0,1-.731-.569,2.327,2.327,0,0,1-.22-.307,2.24,2.24,0,0,1-.3-1.118,1.122,1.122,0,0,1,0-.114,2.183,2.183,0,0,1,.258-.941,2.316,2.316,0,0,1,.885-.909,2.278,2.278,0,0,1,1.09-.283,2.232,2.232,0,0,1,1.5.59,2.19,2.19,0,0,1,.437.55.313.313,0,0,1,.038.059,2.1,2.1,0,0,1,.207.562,2.149,2.149,0,0,1,.053.484,2.056,2.056,0,0,1-.057.488,2.105,2.105,0,0,1-.226.6.277.277,0,0,1-.017.028,2.183,2.183,0,0,1-.435.535,2.158,2.158,0,0,1-.514.349,2.265,2.265,0,0,1-.985.23,2.23,2.23,0,0,1-.983-.23m15.8,5.44a2.219,2.219,0,0,1-.642,1.346,2.169,2.169,0,0,1-.22.19,2.261,2.261,0,0,1-.746.38,2.175,2.175,0,0,1-1.26-.019,2.12,2.12,0,0,1-.917-.549A2.185,2.185,0,0,1,14,18.1h0a.9.9,0,0,1,.015-.2c.015-.066,0-.076.015-.116a1.575,1.575,0,0,1,.055-.241,1.993,1.993,0,0,1,.2-.48c.011-.025.027-.049.04-.074a2.291,2.291,0,0,1,.321-.4h0c.034-.034.066-.063.1-.093a1.627,1.627,0,0,1,.142-.114,1.693,1.693,0,0,1,.2-.139,2.253,2.253,0,0,1,2.245,0,2.446,2.446,0,0,1,.45.345,2.371,2.371,0,0,1,.323.412,2.266,2.266,0,0,1,.319,1.388" transform="translate(0.01 0)"/><path d="M78.35,12.262a.338.338,0,0,0,.319.222h.8v.845a.2.2,0,0,0,.013.085.325.325,0,0,0,.173.216.268.268,0,0,0,.156.046.294.294,0,0,0,.1-.019.34.34,0,0,0,.245-.328v-.845h.9a.345.345,0,0,0,.347-.344.355.355,0,0,0-.156-.287.349.349,0,0,0-.19-.057h-.9v-.848a.325.325,0,0,0-.082-.216.305.305,0,0,0-.044-.042l-.038-.023-.068-.036a.237.237,0,0,0-.112-.023.3.3,0,0,0-.156.038.19.19,0,0,0-.055.036.323.323,0,0,0-.129.268V11.8h-.8a.363.363,0,0,0-.19.057.38.38,0,0,0-.123.167.247.247,0,0,0-.027.12.3.3,0,0,0,.011.084.315.315,0,0,0,.015.038" transform="translate(-63.459 -8.595)"/></g></g></svg>'
+}