This commit is contained in:
2020-04-25 23:33:37 +02:00
committed by smuddy
parent b773df88a1
commit 148621f358
8 changed files with 88 additions and 2 deletions

19
misc/logo_white.svg Normal file

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 13 KiB

View File

@@ -19,7 +19,7 @@ export class MonitorComponent implements OnInit {
public zoom: number; public zoom: number;
public index: number; public index: number;
private sections: Section[]; private sections: Section[];
private config$: Observable<Config>; public config$: Observable<Config>;
constructor( constructor(
private showService: ShowService, private showService: ShowService,

View File

@@ -7,12 +7,14 @@ import {FontAwesomeModule} from '@fortawesome/angular-fontawesome';
import {LinkComponent} from './navigation/link/link.component'; import {LinkComponent} from './navigation/link/link.component';
import {FormsModule} from '@angular/forms'; import {FormsModule} from '@angular/forms';
import {RoleModule} from '../../../services/user/role.module'; import {RoleModule} from '../../../services/user/role.module';
import {BrandComponent} from './navigation/brand/brand.component';
@NgModule({ @NgModule({
declarations: [ declarations: [
NavigationComponent, NavigationComponent,
FilterComponent, FilterComponent,
LinkComponent LinkComponent,
BrandComponent
], ],
imports: [ imports: [
CommonModule, CommonModule,

File diff suppressed because one or more lines are too long

View File

@@ -0,0 +1,4 @@
.brand {
opacity: 0.8;
margin: 10px 14px -10px;
}

View File

@@ -0,0 +1,25 @@
import {async, ComponentFixture, TestBed} from '@angular/core/testing';
import {BrandComponent} from './brand.component';
describe('BrandComponent', () => {
let component: BrandComponent;
let fixture: ComponentFixture<BrandComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [BrandComponent]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(BrandComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

View File

@@ -0,0 +1,16 @@
import {Component, OnInit} from '@angular/core';
@Component({
selector: 'app-brand',
templateUrl: './brand.component.html',
styleUrls: ['./brand.component.less']
})
export class BrandComponent implements OnInit {
constructor() {
}
ngOnInit(): void {
}
}

View File

@@ -1,5 +1,6 @@
<nav [class.hidden]="(windowScroll$|async)>60" class="head"> <nav [class.hidden]="(windowScroll$|async)>60" class="head">
<div class="links"> <div class="links">
<app-brand></app-brand>
<app-link *appRole="['user','presenter', 'leader']" [icon]="faSongs" link="/songs" text="Lieder"></app-link> <app-link *appRole="['user','presenter', 'leader']" [icon]="faSongs" link="/songs" text="Lieder"></app-link>
<app-link *appRole="['leader']" [icon]="faShows" link="/shows" text="Veranstaltungen"></app-link> <app-link *appRole="['leader']" [icon]="faShows" link="/shows" text="Veranstaltungen"></app-link>
<app-link *appRole="['presenter']" [icon]="faPresentation" link="/presentation" text="Präsentation"></app-link> <app-link *appRole="['presenter']" [icon]="faPresentation" link="/presentation" text="Präsentation"></app-link>