Changeset 9e95498 for src/Clients/Angular/finki-chattery/src

Timestamp:

10/21/21 20:47:04 (3 years ago)

Author:

Sara Fazliu <67891916+sarafazliu@…>

Branches:

dev

Children:

0757d8f

Parents:

3bb1377

Message:

Added header component

Location:

src/Clients/Angular/finki-chattery/src

Files:

• app/app-routing.module.ts (modified) (2 diffs)
• app/app.component.html (modified) (1 diff)
• app/app.module.ts (modified) (1 diff)
• app/navigation/header/header.component.html (added)
• app/navigation/header/header.component.scss (added)
• app/navigation/header/header.component.ts (added)
• styles.scss (modified) (2 diffs)

src/Clients/Angular/finki-chattery/src/app/app-routing.module.ts

@@ -1 +1 @@
 import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
 import { Routes, RouterModule } from '@angular/router';
 import { AuthorizedGuard } from './core/guards/authorized.guard';
@@ -16 +17 @@
 
 @NgModule({
-  imports: [RouterModule.forRoot(routes)],
+  imports: [
+    CommonModule,
+    RouterModule.forRoot(routes)
+  ],
   exports: [RouterModule]
 })

src/Clients/Angular/finki-chattery/src/app/app.component.html

@@ -1 @@
-<main>
+
+  <mat-sidenav-container>
+    <mat-sidenav #sidenav role="navigation">
+      <!--this is a place for us to add side-nav code-->
+    </mat-sidenav>
+    <mat-sidenav-content>
+      <!--in here all the content must reside. We will add a navigation header as well-->
+      <app-header></app-header>
+      <main>
+        <router-outlet></router-outlet>
+      </main>
+    </mat-sidenav-content>
+  </mat-sidenav-container>
+
+
   <mat-progress-bar class="global-loader" [class.hidden]="!(loader.isLoading | async)" mode="indeterminate"></mat-progress-bar>
   <router-outlet></router-outlet>

src/Clients/Angular/finki-chattery/src/app/app.module.ts

@@ -11 +11 @@
 import { translateConfiguration, TranslateFromJsonService } from './shared-app/services';
 import { SharedMaterialModule } from './shared-material/shared-material.module';
+import { HeaderComponent } from './navigation/header/header.component';
 
 @NgModule({
-  declarations: [AppComponent],
+  declarations: [AppComponent, HeaderComponent],
   imports: [
     BrowserModule,

src/Clients/Angular/finki-chattery/src/styles.scss

@@ -1 +1 @@
 html,
 body {
+  margin: 0;
   height: 100%;
 }
+/*
 body {
-  margin: 0;
   font-family: Roboto, sans-serif;
 }
@@ -285 +286 @@
   z-index: 1100 !important;
 }
+*/