Change visibillity icons. Update libraries. Customize variables

2022-03-08 20:55:01 +02:00 · 2022-03-08 20:55:01 +02:00 · 885a57f47c
parent 8ede7a8db0
commit 885a57f47c
14 changed files with 50 additions and 4142 deletions
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@ -9,17 +9,17 @@ const routes: Routes = [
  {
    path: 'reload',
    loadChildren: () => import('./reload/libReload.module').then(m => m.LibReloadModule),
-    data: {hasSidebar: false, hasHeader: false}
+    data: {hasSidebar: false}
  },
  {
    path: 'user-info',
    loadChildren: () => import('./login/libUser.module').then(m => m.LibUserModule),
-    data: {hasSidebar: false, isFrontPage: true}
+    data: {hasSidebar: false}
  },
  {
    path: 'error',
    component: OpenaireErrorPageComponent,
-    data: {hasSidebar: false, isFrontPage: true}
+    data: {hasSidebar: false}
  },
  {
    path: 'admin',
@ -54,7 +54,7 @@ const routes: Routes = [
    path: '**',
    pathMatch: 'full',
    component: OpenaireErrorPageComponent,
-    data: {hasSidebar: false, hasAdminMenu: false, isFrontPage: true}
+    data: {hasSidebar: false}
  }
 ];

--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@ -17,7 +17,6 @@ import {Option} from "./openaireLibrary/sharedComponents/input/input.component";
 import {StakeholderUtils} from "./utils/indicator-utils";
 import {SmoothScroll} from "./openaireLibrary/utils/smooth-scroll";
 import {ConnectHelper} from "./openaireLibrary/connect/connectHelper";
-import {StringUtils} from "./openaireLibrary/utils/string-utils.class";


@Component({
@ -279,8 +278,8 @@ export class AppComponent implements OnInit, OnDestroy {
          route: "/" + this.stakeholder.alias,
          url: null,
          title: this.stakeholder.name,
-          logoUrl: StringUtils.getLogoUrl(this.stakeholder),
-          logoSmallUrl: StringUtils.getLogoUrl(this.stakeholder),
+          logoUrl: 'assets/common-assets/logo-services/monitor/small-inverted.svg',
+          logoSmallUrl: "assets/common-assets/logo-services/monitor/small-inverted.svg",
          position: 'center',
          badge: true,
          stickyAnimation: true,
--- a/src/app/manageStakeholders/manageStakeholders.module.ts
+++ b/src/app/manageStakeholders/manageStakeholders.module.ts
@ -11,7 +11,7 @@ import {ReactiveFormsModule} from "@angular/forms";
 import {EditStakeholderModule} from "../general/edit-stakeholder/edit-stakeholder.module";
 import {IconsModule} from "../openaireLibrary/utils/icons/icons.module";
 import {IconsService} from "../openaireLibrary/utils/icons/icons.service";
-import {add, bullet, earth, group, lock, search} from "../openaireLibrary/utils/icons/icons";
+import {add, bullet, earth, incognito, restricted, search} from "../openaireLibrary/utils/icons/icons";
 import {PageContentModule} from "../openaireLibrary/dashboard/sharedComponents/page-content/page-content.module";
 import {LogoUrlPipeModule} from "../openaireLibrary/utils/pipes/logoUrlPipe.module";
 import {SearchInputModule} from "../openaireLibrary/sharedComponents/search-input/search-input.module";
@ -39,6 +39,6 @@ import {SearchInputModule} from "../openaireLibrary/sharedComponents/search-inpu
 })
 export class ManageStakeholdersModule {
  constructor(private iconsService: IconsService) {
-    this.iconsService.registerIcons([bullet, search, earth, group, lock, add]);
+    this.iconsService.registerIcons([bullet, search, earth, incognito, restricted, add]);
  }
 }
--- a/src/app/openaireLibrary
+++ b/src/app/openaireLibrary
@ -1 +1 @@
-Subproject commit 6fb5cf54ba1f0739ff956650d52adb0c1e5242be
+Subproject commit 53a0cd733b074f967aa0b39749273762c6074e59
--- a/src/app/topic/topic.component.html
+++ b/src/app/topic/topic.component.html
@ -28,8 +28,8 @@
                  <span class="uk-invisible-hover color"
                        (click)="$event.stopPropagation();$event.preventDefault()">
                    <span class="uk-icon more" uk-icon="more-vertical"></span>
-                    <div #element uk-dropdown="mode: click; pos: bottom-right; offset: 5; delay-hide: 0; flip: false">
-                      <ul class="uk-nav uk-dropdown-nav uk-list">
+                    <div #element uk-dropdown="mode: click; pos: bottom-left; offset: 5; delay-hide: 0; flip: false">
+                      <ul class="uk-nav uk-dropdown-nav">
                        <li><a (click)="editTopicOpen(i); hide(element)">Edit</a></li>
                        <ng-template ngFor [ngForOf]="stakeholderUtils.visibility" let-v>
                          <li *ngIf="topic.visibility != v.value"><a (click)="changeTopicStatus(i, v.value);
@ -92,11 +92,6 @@
      </div>
    </div>
  </div>
-  <div *ngIf="!isSmallScreen" id="sidebar_switcher_toggle" class="clickable "
-       (click)="toggleOpen($event)">
-    <span class="uk-position-center" *ngIf="!open" uk-icon="icon:chevron-right; ratio: 1.5"></span>
-    <span class="uk-position-center" *ngIf="open" uk-icon="icon: chevron-left; ratio:1.5"></span>
-  </div>
 </aside>
 <div *ngIf="stakeholder && filters" page-content>
  <div header>
@ -162,13 +157,12 @@
                </ng-container>
              </span>
              <a (click)="chooseSubcategory(i);$event.preventDefault()"
-                 class="space">
+                 class="uk-margin-small-left">
                <span>{{subCategory.name}}</span>
              </a>
              <span class="uk-invisible-hover uk-position-center-right color"
                    (click)="$event.stopPropagation();$event.preventDefault()">
-                  <span class="clickable" uk-icon="more-vertical"></span>
-
+                  <a uk-icon="more-vertical"></a>
                  <div #element uk-dropdown="mode: click; pos: bottom-right; offset: 10; delay-hide: 0; flip: false">
                    <ul class="uk-nav uk-dropdown-nav">
                      <li><a (click)="editSubCategoryOpen(i); hide(element)">Edit</a></li>
@ -239,7 +233,6 @@
  </div>
  Are you sure you want to proceed?
 </modal-alert>
-
 <modal-alert #editModal (alertOutput)="saveElement()" [okDisabled]="form && (form.invalid || form.pristine)">
  <div *ngIf="form" class="uk-grid uk-padding uk-padding-remove-horizontal uk-child-width-1-1" [formGroup]="form"
       uk-grid>
@ -255,27 +248,15 @@
    </div>
  </div>
 </modal-alert>
-
-
 <ng-template #visibilityOptions let-type="type" let-i="i" let-visibility="visibility">
   <span class="uk-invisible-hover" (click)="$event.stopPropagation();$event.preventDefault()">
-      <span class="clickable visibility small">
-        <icon [name]="stakeholderUtils.visibilityIcon.get(visibility)" [ratio]="0.5"></icon>
-      </span>
+      <icon [name]="stakeholderUtils.visibilityIcon.get(visibility)"></icon>
      <div #element uk-dropdown="mode: click; pos: bottom-left; delay-hide: 0; flip: false">
        <ul class="uk-nav uk-dropdown-nav">
-          <li *ngFor="let v of stakeholderUtils.visibility">
-            <a *ngIf="visibility != v.value"
-               (click)="$event.stopPropagation();toggleStatusByIndex(i, v.value, type);hide(element);$event.preventDefault()">
+          <li *ngFor="let v of stakeholderUtils.visibility" [class.uk-active]="visibility == v.value">
+            <a (click)="$event.stopPropagation();toggleStatusByIndex(i, v.value, type);hide(element);$event.preventDefault()">
              <icon [name]="stakeholderUtils.visibilityIcon.get(v.value)" ratio="0.8"></icon>
-              <span> {{v.label}}</span>
-            </a>
-            <a *ngIf="visibility == v.value" class="uk-position-relative">
-              <icon [name]="stakeholderUtils.visibilityIcon.get(v.value)" [ratio]="0.8"></icon>
-              <span> {{v.label}}</span>
-              <span class="uk-position-center-right">
-                <icon customClass="uk-text-secondary" [ratio]="0.5" name="bullet"></icon>
-              </span>
+              <span class="uk-margin-small-left">{{v.label}}</span>
            </a>
          </li>
        </ul>
--- a/src/app/topic/topic.module.ts
+++ b/src/app/topic/topic.module.ts
@ -14,15 +14,17 @@ import {InputModule} from "../openaireLibrary/sharedComponents/input/input.modul
 import {ClickModule} from "../openaireLibrary/utils/click/click.module";
 import {IconsService} from "../openaireLibrary/utils/icons/icons.service";
 import {
-  preview,
-  bullet,
  add,
-  earth,
-  lock,
-  group,
-  refresh,
+  arrow_right,
+  bullet,
  close,
-  arrow_right, done, cloud_upload
+  cloud_upload,
+  done,
+  earth,
+  incognito,
+  preview,
+  refresh,
+  restricted
 } from "../openaireLibrary/utils/icons/icons";
 import {IconsModule} from "../openaireLibrary/utils/icons/icons.module";
 import {PageContentModule} from "../openaireLibrary/dashboard/sharedComponents/page-content/page-content.module";
@ -47,6 +49,6 @@ import {NotifyFormModule} from "../openaireLibrary/notifications/notify-form/not
 })
 export class TopicModule {
  constructor(private iconsService: IconsService) {
-    this.iconsService.registerIcons([preview, bullet, add, earth, lock, group, refresh, close, arrow_right, done, cloud_upload]);
+    this.iconsService.registerIcons([preview, bullet, add, earth, incognito, restricted, refresh, close, arrow_right, done, cloud_upload]);
  }
 }
--- a/src/app/utils/indicator-utils.ts
+++ b/src/app/utils/indicator-utils.ts
@ -28,16 +28,16 @@ export class StakeholderUtils {
  ];
  
  visibility: Option[] = [
-    {icon: 'world', value: "PUBLIC", label: 'Public'},
-    {icon: 'lock', value: "RESTRICTED", label: 'Restricted'},
-    {icon: 'users', value: "PRIVATE", label: 'Private'},
+    {icon: 'earth', value: "PUBLIC", label: 'Public'},
+    {icon: 'restricted', value: "RESTRICTED", label: 'Restricted'},
+    {icon: 'incognito', value: "PRIVATE", label: 'Private'},
  ];
  

  visibilityIcon: Map<Visibility, string> = new Map<Visibility, string> ([
    ["PUBLIC", 'earth'],
-    ["PRIVATE", 'lock'],
-    ["RESTRICTED", 'group']
+    ["PRIVATE", 'incognito'],
+    ["RESTRICTED", 'restricted']
  ]);
  
  getTypesByUserRoles(user, id:string = null):Option[]{
--- a/src/assets/banner.jpg
+++ b/src/assets/banner.jpg
--- a/src/assets/common-assets
+++ b/src/assets/common-assets
@ -1 +1 @@
-Subproject commit b5dcabf2668bb9230d6b0d77498e582834edbbab
+Subproject commit c63acdeb5aae5d89d83c4300d8a4059ac6812afd
--- a/src/assets/dashboard-theme
+++ b/src/assets/dashboard-theme
@ -1 +1 @@
-Subproject commit bf9be01a6c9e54a8c07353f32d8799696fdc24b3
+Subproject commit c02b70a5a2548f1fb5f87e90e565356af3541271
--- a/src/assets/develop.png
+++ b/src/assets/develop.png
--- a/src/assets/monitor-dashboard-custom.css
+++ b/src/assets/monitor-dashboard-custom.css
@ -2,12 +2,23 @@
 /*  --portal-main-color: #8DCA26;*/
 /*  --portal-main-contrast: white;*/
 /*  --portal-dark-color: #7c9144;*/
-/*}*/
-
 .stakeholderPage {
  /* Structure */
  --structure-background-color: #F1F1F1;

+  /* Navbar */
+  --navbar-background-image: url("~src/assets/banner.jpg");
+  --navbar-color: var(--muted-color);
+  --navbar-color-hover: var(--light-color);
+  --navbar-color-active: var(--light-color);
+  --navbar-decoration-active: underline;
+
+  /* Login */
+  --login-background-color: var(--light-color);
+  --login-background-color-hover: var(--light-color);
+  --login-color: var(--primary-color);
+  --login-color-hover: var(--secondary-color);
+
  /* Dashboard */
  --dashboard-primary-color: var(--monitor-color);
  --dashboard-primary-color-rgb: var(--monitor-color-rgb);
@ -37,6 +48,8 @@
  /* List */
  --list-disc-color: var(--monitor-color);
 }
+
+/*}*/
 /*!*Stakeholder Specific*!*/
 /*.publicationsSearchForm {*/
 /*  background-image: none;*/
--- a/src/assets/monitor-shapes-bg.svg
+++ b/src/assets/monitor-shapes-bg.svg
--- a/src/assets/openaire-theme
+++ b/src/assets/openaire-theme
@ -1 +1 @@
-Subproject commit f4123f0969a438df43c953b07b5db7d471c6be91
+Subproject commit a6fbd5fdba27493d9b5bd59d92b632f08c7dbb96