Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion src/app/layout/masterpage/masterpage.component.html
Original file line number Diff line number Diff line change
@@ -1 +1,15 @@
<p>masterpage works!</p>
<header>
<nav>
<app-navbar></app-navbar>
</nav>
<section class="carousel-container">
carousel goes here...
</section>
</header>
<main>

</main>
<footer>
Footer goes here...
</footer>
<router-outlet/>
4 changes: 3 additions & 1 deletion src/app/layout/masterpage/masterpage.component.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import { Component } from '@angular/core';
import { NavbarComponent } from "../navbar/navbar.component";
import { RouterOutlet } from '@angular/router';

@Component({
selector: 'app-masterpage',
imports: [],
imports: [NavbarComponent, RouterOutlet],
templateUrl: './masterpage.component.html',
styleUrl: './masterpage.component.scss'
})
Expand Down
3 changes: 3 additions & 0 deletions src/app/layout/navbar/navbar.component.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<a routerLink="/">Home</a> |
<a routerLink="/about-us">About Us</a>
<router-outlet/>
Empty file.
23 changes: 23 additions & 0 deletions src/app/layout/navbar/navbar.component.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';

import { NavbarComponent } from './navbar.component';

describe('NavbarComponent', () => {
let component: NavbarComponent;
let fixture: ComponentFixture<NavbarComponent>;

beforeEach(async () => {
await TestBed.configureTestingModule({
imports: [NavbarComponent]
})
.compileComponents();

fixture = TestBed.createComponent(NavbarComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});

it('should create', () => {
expect(component).toBeTruthy();
});
});
12 changes: 12 additions & 0 deletions src/app/layout/navbar/navbar.component.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import { Component } from '@angular/core';
import { RouterLink, RouterOutlet } from '@angular/router';

@Component({
selector: 'app-navbar',
imports: [RouterLink, RouterOutlet ],
templateUrl: './navbar.component.html',
styleUrl: './navbar.component.scss'
})
export class NavbarComponent {

}