Commit a002c01e authored by Dinushe Jayasekera's avatar Dinushe Jayasekera

Merge branch 'Dinushe' into 'master'

Added audio navLink

See merge request 2021-005/2021-005!2
parents db51edf7 567b7b20
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router'; import { RouterModule, Routes } from '@angular/router';
import { AudioComponent } from './audio/audio.component';
import { DashboardComponent } from './dashboard/dashboard.component'; import { DashboardComponent } from './dashboard/dashboard.component';
import { HomeComponent } from './home/home.component'; import { HomeComponent } from './home/home.component';
const routes: Routes = [ const routes: Routes = [
{path:'',redirectTo:'home',pathMatch:'full'}, {path:'',redirectTo:'home',pathMatch:'full'},
{path:'home',component:HomeComponent}, {path:'home',component:HomeComponent},
{path:'dashboard',component:DashboardComponent} {path:'dashboard',component:DashboardComponent},
{path:'audio',component:AudioComponent}
]; ];
@NgModule({ @NgModule({
......
...@@ -14,6 +14,7 @@ import { MatMenuModule } from '@angular/material/menu'; ...@@ -14,6 +14,7 @@ import { MatMenuModule } from '@angular/material/menu';
import { MatIconModule } from '@angular/material/icon'; import { MatIconModule } from '@angular/material/icon';
import { MatDividerModule } from '@angular/material/divider'; import { MatDividerModule } from '@angular/material/divider';
import { MatListModule } from '@angular/material/list'; import { MatListModule } from '@angular/material/list';
import { AudioComponent } from './audio/audio.component';
@NgModule({ @NgModule({
declarations: [ declarations: [
...@@ -21,7 +22,8 @@ import { MatListModule } from '@angular/material/list'; ...@@ -21,7 +22,8 @@ import { MatListModule } from '@angular/material/list';
HeaderComponent, HeaderComponent,
SidenavComponent, SidenavComponent,
HomeComponent, HomeComponent,
DashboardComponent DashboardComponent,
AudioComponent
], ],
imports: [ imports: [
BrowserModule, BrowserModule,
......
@import url(../home/home.component.css);
\ No newline at end of file
<div class="container-fluid page">
<div class="d-flex page__box p-3 mt-2">Home</div>
<div class="page__content shadow p-3 position-relative">
<div class="page__content-data position-absolute">
Audio Content Goes Here
</div>
</div>
</div>
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { AudioComponent } from './audio.component';
describe('AudioComponent', () => {
let component: AudioComponent;
let fixture: ComponentFixture<AudioComponent>;
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [ AudioComponent ]
})
.compileComponents();
});
beforeEach(() => {
fixture = TestBed.createComponent(AudioComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-audio',
templateUrl: './audio.component.html',
styleUrls: ['./audio.component.css']
})
export class AudioComponent implements OnInit {
constructor() { }
ngOnInit(): void {
}
}
...@@ -10,7 +10,8 @@ ...@@ -10,7 +10,8 @@
<a mat-list-item routerLinkActive="list-item-active" routerLink="/dashboard"> <a mat-list-item routerLinkActive="list-item-active" routerLink="/dashboard">
<mat-icon>dashboard</mat-icon> Dashboard <mat-icon>dashboard</mat-icon> Dashboard
</a> </a>
<a mat-list-item> <mat-icon>edit</mat-icon> Link 3 </a> <a mat-list-item routerLinkActive="list-item-active" routerLink="/audio">
<mat-icon>mic</mat-icon> Audio Recognition </a>
<a mat-list-item> <mat-icon>edit</mat-icon> Link 4 </a> <a mat-list-item> <mat-icon>edit</mat-icon> Link 4 </a>
<a mat-list-item> <mat-icon>edit</mat-icon> Link 5 </a> <a mat-list-item> <mat-icon>edit</mat-icon> Link 5 </a>
<a mat-list-item> <mat-icon>edit</mat-icon> Link 6 </a> <a mat-list-item> <mat-icon>edit</mat-icon> Link 6 </a>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment