X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-frontend%2Fsrc%2Fapp%2Fapp.component.html;h=fa5ddb3dcf2674f501776c70aee19de7324f236a;hb=5b686151904e2582ea9ce9d2f1c6abb7a400afa5;hp=cd5c10c25f31f28df4e93166d2d4e5929759e7b5;hpb=e2cbc4d0304646febf7e2cbe0dccdf9840189222;p=portal%2Fric-dashboard.git

diff --git a/webapp-frontend/src/app/app.component.html b/webapp-frontend/src/app/app.component.html
index cd5c10c2..fa5ddb3d 100644
--- a/webapp-frontend/src/app/app.component.html
+++ b/webapp-frontend/src/app/app.component.html
@@ -1,15 +1,15 @@
 <!--
   ========================LICENSE_START=================================
-  ORAN-OSC
+  O-RAN-SC
   %%
   Copyright (C) 2019 AT&T Intellectual Property and Nokia
   %%
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,18 +18,41 @@
   ========================LICENSE_END===================================
   -->
 <!-- Slide Menu-->
-<aside class="side-menu__container" [ngClass]="{'side-menu__container-active': showMenu}" (click)="toggleMenu()">
-    <nav class="slide-menu" [ngClass]="{'slide-menu-active': showMenu}" (click)="$event.stopImmediatePropagation();">
-    <section class="menu-header">
-      
-      <span class="greeting__text">RIC Dashboard</span>
+<mat-drawer-container autosize>
+  <mat-drawer #drawer mode="push">
+  <section class="menu-header">
+
+    <div class="left__section3Col" *ngIf="drawer.opened"  [ngClass]="{'menumargin-top': drawer.opened}">
+      <svg (click)="drawer.toggle()" class="hamburger__icon" id="Menu_Burger_Icon" data-name="Menu Burger Icon"
+           viewBox="31.5 30 49.9 32">
+        <rect id="Rectangle_9" width="49.9" height="4" [ngClass]="{'hamburger__icon__fill-dark': darkModeActive}"
+              class="hamburger__icon__fill" data-name="Rectangle 9" rx="2"
+              transform="translate(31.5 58)"/>
+        <rect id="Rectangle_10" width="49.9" height="4" [ngClass]="{'hamburger__icon__fill-dark': darkModeActive}"
+              class="hamburger__icon__fill" data-name="Rectangle 10" rx="2"
+              transform="translate(31.5 44)"/>
+        <rect id="Rectangle_11" width="49.9" height="4" [ngClass]="{'hamburger__icon__fill-dark': darkModeActive}"
+              class="hamburger__icon__fill" data-name="Rectangle 11" rx="2"
+              transform="translate(31.5 30)"/>
+      </svg>
+      <img src="../../assets/oran-logo.png" width="180%" height="100%" style="position: relative; z-index: 50"/>
+      <svg class="logo__icon" viewBox="150.3 22.2 313.7 42.8">
+        <text [ngClass]="{'logo__text-dark': darkModeActive}" class="logo__text" fill="#432c85"
+              font-size="30" font-weight="600"
+              letter-spacing=".1em" transform="translate(149 56)">
+          <tspan x="0" y="0">RIC Dashboard</tspan>
+        </text>
+      </svg>
+
+    </div>
+
       <div class="profile-image__container">
         <img src="assets/profile_default.png" alt="profile-image"
              class="profile__image">
       </div>
       <div class="account-details">
         <span class="name__text">Demo</span>
-        <span class="email__text">demo@onap.org</span>
+        <span class="email__text">demo@o-ran-sc.org</span>
       </div>
     </section>
     <section #sidenav class="menu-body">
@@ -38,15 +61,15 @@
     <section class="menu-footer">
 
     </section>
-  </nav>
-
-</aside>
+</mat-drawer>
 
+<mat-drawer-content>
 <div class="root__container">
+
   <header [ngClass]="{'main__header-dark': darkModeActive}" class="main__header">
 
-    <div class="left__section3Col">
-      <svg (click)="toggleMenu()" class="hamburger__icon" id="Menu_Burger_Icon" data-name="Menu Burger Icon"
+    <div class="left__section3Col" *ngIf="!drawer.opened">
+      <svg (click)="drawer.toggle()" class="hamburger__icon" id="Menu_Burger_Icon" data-name="Menu Burger Icon"
            viewBox="31.5 30 49.9 32">
         <rect id="Rectangle_9" width="49.9" height="4" [ngClass]="{'hamburger__icon__fill-dark': darkModeActive}"
               class="hamburger__icon__fill" data-name="Rectangle 9" rx="2"
@@ -60,9 +83,6 @@
       </svg>
       <img src="../../assets/oran-logo.png" width="180%" height="100%" style="position: relative; z-index: 50"/>
       <svg class="logo__icon" viewBox="150.3 22.2 313.7 42.8">
-        <!--<path fill="#00ff9b" d="M150.3 65V22.2L193 65z" data-name="Path 1"/>
-        <path fill="#003eff" d="M193.1 65h-42.8L193 22.2z" data-name="Path 2"/>-->
-        
         <text [ngClass]="{'logo__text-dark': darkModeActive}" class="logo__text" fill="#432c85"
               font-size="30" font-weight="600"
               letter-spacing=".1em" transform="translate(149 56)">
@@ -74,33 +94,32 @@
 
     <h3 class="date__text"></h3>
 
-
     <div class="mode-toggle__container">
       <span class="mode-toggle__text">Light</span>
-
       <label class="toggle-button__container">
         <input (click)="modeToggleSwitch()" type="checkbox" class="mode-toggle__input"/>
         <span [ngClass]="{'mode-toggle__bg-checked': darkModeActive}" class="mode-toggle__bg"></span>
         <span [ngClass]="{'mode-toggle__circle-checked': darkModeActive}" class="mode-toggle__circle"></span>
       </label>
-
-
       <span class="mode-toggle__text">Dark</span>
     </div>
 
   </header>
 
   <!-- Main Content -->
-
-  <!--<router-outlet></router-outlet>-->
   <main class="main__container">
-    <div class="main-container__bg" [ngClass]="{'main-container__bg-dark': darkModeActive}"></div>
-    <router-outlet></router-outlet>
+    <div class = main__container__body>
+      <div class="main-container__bg" [ngClass]="{'main-container__bg-dark': darkModeActive}"></div>
+      <router-outlet></router-outlet>
+    </div>
   </main>
 
   <!-- Footer -->
+  <footer class="main__footer">
+  	<div class="main-footer__bg" [ngClass]="{'main-footer__bg-dark': darkModeActive}"></div>
+    <app-footer></app-footer>
+  </footer>
 
-<!--   <footer class="main__footer">
-    <small class="copyright__text">© 2019 AT&T and Nokia. All rights reserved.</small>
-  </footer> -->
 </div>
+</mat-drawer-content>
+</mat-drawer-container>
\ No newline at end of file