diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 0545bc6..a5ca9e2 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -1,6 +1,6 @@ import {NgModule} from '@angular/core'; import {RouterModule, Routes} from '@angular/router'; - +import {AngularFireAuthGuard, redirectUnauthorizedTo} from '@angular/fire/auth-guard'; const routes: Routes = [ { @@ -10,7 +10,13 @@ const routes: Routes = [ }, { path: 'songs', - loadChildren: () => import('./songs/songs.module').then(m => m.SongsModule) + loadChildren: () => import('./modules/songs/songs.module').then(m => m.SongsModule), + canActivate: [AngularFireAuthGuard], + data: {authGuardPipe: () => redirectUnauthorizedTo(['user', 'login'])} + }, + { + path: 'user', + loadChildren: () => import('./modules/user/user.module').then(m => m.UserModule) } ]; diff --git a/src/app/app.module.ts b/src/app/app.module.ts index afb671d..1b6a943 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -6,11 +6,13 @@ import {AppComponent} from './app.component'; import {ServiceWorkerModule} from '@angular/service-worker'; import {environment} from '../environments/environment'; import {BrowserAnimationsModule} from '@angular/platform-browser/animations'; -import {ApplicationFrameModule} from './application-frame/application-frame.module'; +import {ApplicationFrameModule} from './widget-modules/application-frame/application-frame.module'; import {AngularFireModule} from '@angular/fire'; import {AngularFirestoreModule} from '@angular/fire/firestore'; import {AngularFireStorageModule} from '@angular/fire/storage'; import {AngularFireDatabaseModule} from '@angular/fire/database'; +import {AngularFireAuthModule} from '@angular/fire/auth'; +import {AngularFireAuthGuardModule} from '@angular/fire/auth-guard'; @NgModule({ declarations: [ @@ -29,7 +31,9 @@ import {AngularFireDatabaseModule} from '@angular/fire/database'; AngularFireModule.initializeApp(environment.firebase), AngularFirestoreModule.enablePersistence({synchronizeTabs: true}), AngularFireStorageModule, - AngularFireDatabaseModule + AngularFireDatabaseModule, + AngularFireAuthModule, + AngularFireAuthGuardModule, ], providers: [], diff --git a/src/app/application-frame/navigation/navigation.component.html b/src/app/application-frame/navigation/navigation.component.html deleted file mode 100644 index d8c1abf..0000000 --- a/src/app/application-frame/navigation/navigation.component.html +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/src/app/songs/models/song.ts b/src/app/modules/songs/models/song.ts similarity index 100% rename from src/app/songs/models/song.ts rename to src/app/modules/songs/models/song.ts diff --git a/src/app/songs/services/file-data.service.spec.ts b/src/app/modules/songs/services/file-data.service.spec.ts similarity index 100% rename from src/app/songs/services/file-data.service.spec.ts rename to src/app/modules/songs/services/file-data.service.spec.ts diff --git a/src/app/songs/services/file-data.service.ts b/src/app/modules/songs/services/file-data.service.ts similarity index 100% rename from src/app/songs/services/file-data.service.ts rename to src/app/modules/songs/services/file-data.service.ts diff --git a/src/app/songs/services/file.ts b/src/app/modules/songs/services/file.ts similarity index 100% rename from src/app/songs/services/file.ts rename to src/app/modules/songs/services/file.ts diff --git a/src/app/songs/services/fileBase.ts b/src/app/modules/songs/services/fileBase.ts similarity index 100% rename from src/app/songs/services/fileBase.ts rename to src/app/modules/songs/services/fileBase.ts diff --git a/src/app/songs/services/fileServer.ts b/src/app/modules/songs/services/fileServer.ts similarity index 100% rename from src/app/songs/services/fileServer.ts rename to src/app/modules/songs/services/fileServer.ts diff --git a/src/app/songs/services/song-data.service.spec.ts b/src/app/modules/songs/services/song-data.service.spec.ts similarity index 100% rename from src/app/songs/services/song-data.service.spec.ts rename to src/app/modules/songs/services/song-data.service.spec.ts diff --git a/src/app/songs/services/song-data.service.ts b/src/app/modules/songs/services/song-data.service.ts similarity index 100% rename from src/app/songs/services/song-data.service.ts rename to src/app/modules/songs/services/song-data.service.ts diff --git a/src/app/songs/services/song.service.spec.ts b/src/app/modules/songs/services/song.service.spec.ts similarity index 100% rename from src/app/songs/services/song.service.spec.ts rename to src/app/modules/songs/services/song.service.spec.ts diff --git a/src/app/songs/services/song.service.ts b/src/app/modules/songs/services/song.service.ts similarity index 100% rename from src/app/songs/services/song.service.ts rename to src/app/modules/songs/services/song.service.ts diff --git a/src/app/songs/services/text-rendering.service.spec.ts b/src/app/modules/songs/services/text-rendering.service.spec.ts similarity index 69% rename from src/app/songs/services/text-rendering.service.spec.ts rename to src/app/modules/songs/services/text-rendering.service.spec.ts index 9dd6063..88080fc 100644 --- a/src/app/songs/services/text-rendering.service.spec.ts +++ b/src/app/modules/songs/services/text-rendering.service.spec.ts @@ -1,6 +1,6 @@ -import { TestBed } from '@angular/core/testing'; +import {TestBed} from '@angular/core/testing'; -import { TextRenderingService } from './text-rendering.service'; +import {TextRenderingService} from './text-rendering.service'; describe('TextRenderingService', () => { beforeEach(() => TestBed.configureTestingModule({})); diff --git a/src/app/songs/services/text-rendering.service.ts b/src/app/modules/songs/services/text-rendering.service.ts similarity index 87% rename from src/app/songs/services/text-rendering.service.ts rename to src/app/modules/songs/services/text-rendering.service.ts index 5a26ef2..01ac4dc 100644 --- a/src/app/songs/services/text-rendering.service.ts +++ b/src/app/modules/songs/services/text-rendering.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import {Injectable} from '@angular/core'; export enum SectionType { Verse, @@ -29,11 +29,12 @@ export interface Section { }) export class TextRenderingService { - constructor() { } + constructor() { + } public render(text: string): Section[] { const lines = text.match(/[^\r\n]+/g); - + } diff --git a/src/app/songs/services/upload.service.spec.ts b/src/app/modules/songs/services/upload.service.spec.ts similarity index 100% rename from src/app/songs/services/upload.service.spec.ts rename to src/app/modules/songs/services/upload.service.spec.ts diff --git a/src/app/songs/services/upload.service.ts b/src/app/modules/songs/services/upload.service.ts similarity index 98% rename from src/app/songs/services/upload.service.ts rename to src/app/modules/songs/services/upload.service.ts index 27e1243..e5dbd33 100644 --- a/src/app/songs/services/upload.service.ts +++ b/src/app/modules/songs/services/upload.service.ts @@ -3,7 +3,6 @@ import {Upload} from './upload'; import {FileDataService} from './file-data.service'; import {AngularFireStorage} from '@angular/fire/storage'; import {finalize} from 'rxjs/operators'; -import {File} from './file'; import {FileBase} from './fileBase'; import {FileServer} from './fileServer'; diff --git a/src/app/songs/services/upload.ts b/src/app/modules/songs/services/upload.ts similarity index 100% rename from src/app/songs/services/upload.ts rename to src/app/modules/songs/services/upload.ts diff --git a/src/app/songs/song-list/list-item/list-item.component.html b/src/app/modules/songs/song-list/list-item/list-item.component.html similarity index 100% rename from src/app/songs/song-list/list-item/list-item.component.html rename to src/app/modules/songs/song-list/list-item/list-item.component.html diff --git a/src/app/songs/song-list/list-item/list-item.component.less b/src/app/modules/songs/song-list/list-item/list-item.component.less similarity index 88% rename from src/app/songs/song-list/list-item/list-item.component.less rename to src/app/modules/songs/song-list/list-item/list-item.component.less index 3d5a087..d7167c1 100644 --- a/src/app/songs/song-list/list-item/list-item.component.less +++ b/src/app/modules/songs/song-list/list-item/list-item.component.less @@ -1,4 +1,4 @@ -@import "../../../../styles/styles"; +@import "../../../../../styles/styles"; .list-item { padding: 5px 20px; diff --git a/src/app/songs/song-list/list-item/list-item.component.spec.ts b/src/app/modules/songs/song-list/list-item/list-item.component.spec.ts similarity index 100% rename from src/app/songs/song-list/list-item/list-item.component.spec.ts rename to src/app/modules/songs/song-list/list-item/list-item.component.spec.ts diff --git a/src/app/songs/song-list/list-item/list-item.component.ts b/src/app/modules/songs/song-list/list-item/list-item.component.ts similarity index 100% rename from src/app/songs/song-list/list-item/list-item.component.ts rename to src/app/modules/songs/song-list/list-item/list-item.component.ts diff --git a/src/app/songs/song-list/song-list.component.html b/src/app/modules/songs/song-list/song-list.component.html similarity index 100% rename from src/app/songs/song-list/song-list.component.html rename to src/app/modules/songs/song-list/song-list.component.html diff --git a/src/app/songs/song-list/song-list.component.less b/src/app/modules/songs/song-list/song-list.component.less similarity index 100% rename from src/app/songs/song-list/song-list.component.less rename to src/app/modules/songs/song-list/song-list.component.less diff --git a/src/app/songs/song-list/song-list.component.spec.ts b/src/app/modules/songs/song-list/song-list.component.spec.ts similarity index 100% rename from src/app/songs/song-list/song-list.component.spec.ts rename to src/app/modules/songs/song-list/song-list.component.spec.ts diff --git a/src/app/songs/song-list/song-list.component.ts b/src/app/modules/songs/song-list/song-list.component.ts similarity index 97% rename from src/app/songs/song-list/song-list.component.ts rename to src/app/modules/songs/song-list/song-list.component.ts index 1e223dc..538e9b3 100644 --- a/src/app/songs/song-list/song-list.component.ts +++ b/src/app/modules/songs/song-list/song-list.component.ts @@ -3,7 +3,7 @@ import {SongService} from '../services/song.service'; import {Song} from '../models/song'; import {debounceTime, map} from 'rxjs/operators'; import {combineLatest, Observable} from 'rxjs'; -import {fade} from '../../animations'; +import {fade} from '../../../animations'; import {ActivatedRoute} from '@angular/router'; @Component({ diff --git a/src/app/songs/song-list/song-list.module.ts b/src/app/modules/songs/song-list/song-list.module.ts similarity index 55% rename from src/app/songs/song-list/song-list.module.ts rename to src/app/modules/songs/song-list/song-list.module.ts index f5e796a..38343d9 100644 --- a/src/app/songs/song-list/song-list.module.ts +++ b/src/app/modules/songs/song-list/song-list.module.ts @@ -2,21 +2,21 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; import {SongListComponent} from './song-list.component'; import {ListItemComponent} from './list-item/list-item.component'; -import {CardModule} from '../../widget-modules/components/card/card.module'; +import {CardModule} from '../../../widget-modules/components/card/card.module'; import {RouterModule} from '@angular/router'; -import {LegalTypeTranslatorModule} from '../../widget-modules/pipes/legal-type-translator/legal-type-translator.module'; +import {LegalTypeTranslatorModule} from '../../../widget-modules/pipes/legal-type-translator/legal-type-translator.module'; @NgModule({ declarations: [SongListComponent, ListItemComponent], exports: [SongListComponent], - imports: [ - CommonModule, - RouterModule, + imports: [ + CommonModule, + RouterModule, - CardModule, - LegalTypeTranslatorModule - ] + CardModule, + LegalTypeTranslatorModule + ] }) export class SongListModule { } diff --git a/src/app/songs/song/edit/edit-file/edit-file.component.html b/src/app/modules/songs/song/edit/edit-file/edit-file.component.html similarity index 100% rename from src/app/songs/song/edit/edit-file/edit-file.component.html rename to src/app/modules/songs/song/edit/edit-file/edit-file.component.html diff --git a/src/app/songs/song/edit/edit-file/edit-file.component.less b/src/app/modules/songs/song/edit/edit-file/edit-file.component.less similarity index 100% rename from src/app/songs/song/edit/edit-file/edit-file.component.less rename to src/app/modules/songs/song/edit/edit-file/edit-file.component.less diff --git a/src/app/songs/song/edit/edit-file/edit-file.component.spec.ts b/src/app/modules/songs/song/edit/edit-file/edit-file.component.spec.ts similarity index 100% rename from src/app/songs/song/edit/edit-file/edit-file.component.spec.ts rename to src/app/modules/songs/song/edit/edit-file/edit-file.component.spec.ts diff --git a/src/app/songs/song/edit/edit-file/edit-file.component.ts b/src/app/modules/songs/song/edit/edit-file/edit-file.component.ts similarity index 100% rename from src/app/songs/song/edit/edit-file/edit-file.component.ts rename to src/app/modules/songs/song/edit/edit-file/edit-file.component.ts diff --git a/src/app/songs/song/edit/edit-file/file/file.component.html b/src/app/modules/songs/song/edit/edit-file/file/file.component.html similarity index 100% rename from src/app/songs/song/edit/edit-file/file/file.component.html rename to src/app/modules/songs/song/edit/edit-file/file/file.component.html diff --git a/src/app/songs/song/edit/edit-file/file/file.component.less b/src/app/modules/songs/song/edit/edit-file/file/file.component.less similarity index 100% rename from src/app/songs/song/edit/edit-file/file/file.component.less rename to src/app/modules/songs/song/edit/edit-file/file/file.component.less diff --git a/src/app/songs/song/edit/edit-file/file/file.component.spec.ts b/src/app/modules/songs/song/edit/edit-file/file/file.component.spec.ts similarity index 100% rename from src/app/songs/song/edit/edit-file/file/file.component.spec.ts rename to src/app/modules/songs/song/edit/edit-file/file/file.component.spec.ts diff --git a/src/app/songs/song/edit/edit-file/file/file.component.ts b/src/app/modules/songs/song/edit/edit-file/file/file.component.ts similarity index 100% rename from src/app/songs/song/edit/edit-file/file/file.component.ts rename to src/app/modules/songs/song/edit/edit-file/file/file.component.ts diff --git a/src/app/songs/song/edit/edit-song/edit-song.component.html b/src/app/modules/songs/song/edit/edit-song/edit-song.component.html similarity index 99% rename from src/app/songs/song/edit/edit-song/edit-song.component.html rename to src/app/modules/songs/song/edit/edit-song/edit-song.component.html index 82ecd5a..046d1c6 100644 --- a/src/app/songs/song/edit/edit-song/edit-song.component.html +++ b/src/app/modules/songs/song/edit/edit-song/edit-song.component.html @@ -36,7 +36,6 @@ - Rechtlicher Status diff --git a/src/app/songs/song/edit/edit-song/edit-song.component.less b/src/app/modules/songs/song/edit/edit-song/edit-song.component.less similarity index 100% rename from src/app/songs/song/edit/edit-song/edit-song.component.less rename to src/app/modules/songs/song/edit/edit-song/edit-song.component.less diff --git a/src/app/songs/song/edit/edit-song/edit-song.component.spec.ts b/src/app/modules/songs/song/edit/edit-song/edit-song.component.spec.ts similarity index 100% rename from src/app/songs/song/edit/edit-song/edit-song.component.spec.ts rename to src/app/modules/songs/song/edit/edit-song/edit-song.component.spec.ts diff --git a/src/app/songs/song/edit/edit-song/edit-song.component.ts b/src/app/modules/songs/song/edit/edit-song/edit-song.component.ts similarity index 100% rename from src/app/songs/song/edit/edit-song/edit-song.component.ts rename to src/app/modules/songs/song/edit/edit-song/edit-song.component.ts diff --git a/src/app/songs/song/edit/edit.component.html b/src/app/modules/songs/song/edit/edit.component.html similarity index 100% rename from src/app/songs/song/edit/edit.component.html rename to src/app/modules/songs/song/edit/edit.component.html diff --git a/src/app/songs/song/edit/edit.component.less b/src/app/modules/songs/song/edit/edit.component.less similarity index 100% rename from src/app/songs/song/edit/edit.component.less rename to src/app/modules/songs/song/edit/edit.component.less diff --git a/src/app/songs/song/edit/edit.component.spec.ts b/src/app/modules/songs/song/edit/edit.component.spec.ts similarity index 100% rename from src/app/songs/song/edit/edit.component.spec.ts rename to src/app/modules/songs/song/edit/edit.component.spec.ts diff --git a/src/app/songs/song/edit/edit.component.ts b/src/app/modules/songs/song/edit/edit.component.ts similarity index 100% rename from src/app/songs/song/edit/edit.component.ts rename to src/app/modules/songs/song/edit/edit.component.ts diff --git a/src/app/songs/song/edit/edit.module.ts b/src/app/modules/songs/song/edit/edit.module.ts similarity index 67% rename from src/app/songs/song/edit/edit.module.ts rename to src/app/modules/songs/song/edit/edit.module.ts index 9aa658e..0edb696 100644 --- a/src/app/songs/song/edit/edit.module.ts +++ b/src/app/modules/songs/song/edit/edit.module.ts @@ -1,21 +1,21 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; import {EditComponent} from './edit.component'; -import {CardModule} from '../../../widget-modules/components/card/card.module'; -import {SongTypeTranslaterModule} from '../../../widget-modules/pipes/song-type-translater/song-type-translater.module'; +import {CardModule} from '../../../../widget-modules/components/card/card.module'; +import {SongTypeTranslaterModule} from '../../../../widget-modules/pipes/song-type-translater/song-type-translater.module'; import {ReactiveFormsModule} from '@angular/forms'; import {MatInputModule} from '@angular/material/input'; import {MatCheckboxModule} from '@angular/material/checkbox'; import {MatSelectModule} from '@angular/material/select'; import {MatButtonModule} from '@angular/material/button'; -import {ButtonRowModule} from '../../../widget-modules/components/button-row/button-row.module'; +import {ButtonRowModule} from '../../../../widget-modules/components/button-row/button-row.module'; import {RouterModule} from '@angular/router'; import {EditSongComponent} from './edit-song/edit-song.component'; import {EditFileComponent} from './edit-file/edit-file.component'; import {MatIconModule} from '@angular/material/icon'; import {FileComponent} from './edit-file/file/file.component'; -import {LegalOwnerTranslatorModule} from '../../../widget-modules/pipes/legal-owner-translator/legal-owner-translator.module'; -import {LegalTypeTranslatorModule} from '../../../widget-modules/pipes/legal-type-translator/legal-type-translator.module'; +import {LegalOwnerTranslatorModule} from '../../../../widget-modules/pipes/legal-owner-translator/legal-owner-translator.module'; +import {LegalTypeTranslatorModule} from '../../../../widget-modules/pipes/legal-type-translator/legal-type-translator.module'; @NgModule({ diff --git a/src/app/songs/song/edit/edit.service.spec.ts b/src/app/modules/songs/song/edit/edit.service.spec.ts similarity index 100% rename from src/app/songs/song/edit/edit.service.spec.ts rename to src/app/modules/songs/song/edit/edit.service.spec.ts diff --git a/src/app/songs/song/edit/edit.service.ts b/src/app/modules/songs/song/edit/edit.service.ts similarity index 100% rename from src/app/songs/song/edit/edit.service.ts rename to src/app/modules/songs/song/edit/edit.service.ts diff --git a/src/app/songs/song/song.component.html b/src/app/modules/songs/song/song.component.html similarity index 100% rename from src/app/songs/song/song.component.html rename to src/app/modules/songs/song/song.component.html diff --git a/src/app/songs/song/song.component.less b/src/app/modules/songs/song/song.component.less similarity index 100% rename from src/app/songs/song/song.component.less rename to src/app/modules/songs/song/song.component.less diff --git a/src/app/songs/song/song.component.spec.ts b/src/app/modules/songs/song/song.component.spec.ts similarity index 100% rename from src/app/songs/song/song.component.spec.ts rename to src/app/modules/songs/song/song.component.spec.ts diff --git a/src/app/songs/song/song.component.ts b/src/app/modules/songs/song/song.component.ts similarity index 100% rename from src/app/songs/song/song.component.ts rename to src/app/modules/songs/song/song.component.ts diff --git a/src/app/modules/songs/song/song.module.ts b/src/app/modules/songs/song/song.module.ts new file mode 100644 index 0000000..f5b880f --- /dev/null +++ b/src/app/modules/songs/song/song.module.ts @@ -0,0 +1,27 @@ +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {SongComponent} from './song.component'; +import {CardModule} from '../../../widget-modules/components/card/card.module'; +import {SongTypeTranslaterModule} from '../../../widget-modules/pipes/song-type-translater/song-type-translater.module'; +import {MatButtonModule} from '@angular/material/button'; +import {ButtonRowModule} from '../../../widget-modules/components/button-row/button-row.module'; +import {RouterModule} from '@angular/router'; +import {LegalOwnerTranslatorModule} from '../../../widget-modules/pipes/legal-owner-translator/legal-owner-translator.module'; + + +@NgModule({ + declarations: [SongComponent], + exports: [SongComponent], + imports: [ + CommonModule, + CardModule, + RouterModule, + + SongTypeTranslaterModule, + MatButtonModule, + ButtonRowModule, + LegalOwnerTranslatorModule, + ] +}) +export class SongModule { +} diff --git a/src/app/songs/songs-routing.module.ts b/src/app/modules/songs/songs-routing.module.ts similarity index 100% rename from src/app/songs/songs-routing.module.ts rename to src/app/modules/songs/songs-routing.module.ts diff --git a/src/app/songs/songs.module.ts b/src/app/modules/songs/songs.module.ts similarity index 100% rename from src/app/songs/songs.module.ts rename to src/app/modules/songs/songs.module.ts diff --git a/src/app/modules/user/info/info.component.html b/src/app/modules/user/info/info.component.html new file mode 100644 index 0000000..5f30064 --- /dev/null +++ b/src/app/modules/user/info/info.component.html @@ -0,0 +1,7 @@ + +

Hallo {{user.name}}

+

{{user.role|role}}

+ + + + diff --git a/src/app/modules/user/info/info.component.less b/src/app/modules/user/info/info.component.less new file mode 100644 index 0000000..e69de29 diff --git a/src/app/modules/user/info/info.component.spec.ts b/src/app/modules/user/info/info.component.spec.ts new file mode 100644 index 0000000..c648774 --- /dev/null +++ b/src/app/modules/user/info/info.component.spec.ts @@ -0,0 +1,25 @@ +import {async, ComponentFixture, TestBed} from '@angular/core/testing'; + +import {InfoComponent} from './info.component'; + +describe('InfoComponent', () => { + let component: InfoComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [InfoComponent] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(InfoComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/modules/user/info/info.component.ts b/src/app/modules/user/info/info.component.ts new file mode 100644 index 0000000..82ed19b --- /dev/null +++ b/src/app/modules/user/info/info.component.ts @@ -0,0 +1,21 @@ +import {Component, OnInit} from '@angular/core'; +import {UserService} from '../../../services/user.service'; +import {Observable} from 'rxjs'; +import {User} from '../../../services/user'; + +@Component({ + selector: 'app-info', + templateUrl: './info.component.html', + styleUrls: ['./info.component.less'] +}) +export class InfoComponent implements OnInit { + public user$: Observable; + + constructor(private userService: UserService) { + } + + ngOnInit() { + this.user$ = this.userService.user$; + } + +} diff --git a/src/app/modules/user/info/role.pipe.spec.ts b/src/app/modules/user/info/role.pipe.spec.ts new file mode 100644 index 0000000..65acaa2 --- /dev/null +++ b/src/app/modules/user/info/role.pipe.spec.ts @@ -0,0 +1,8 @@ +import {RolePipe} from './role.pipe'; + +describe('RolePipe', () => { + it('create an instance', () => { + const pipe = new RolePipe(); + expect(pipe).toBeTruthy(); + }); +}); diff --git a/src/app/modules/user/info/role.pipe.ts b/src/app/modules/user/info/role.pipe.ts new file mode 100644 index 0000000..3202bb0 --- /dev/null +++ b/src/app/modules/user/info/role.pipe.ts @@ -0,0 +1,15 @@ +import {Pipe, PipeTransform} from '@angular/core'; + +@Pipe({ + name: 'role' +}) +export class RolePipe implements PipeTransform { + + transform(role: 'admin'): string { + switch (role) { + case 'admin': + return 'Administrator'; + } + } + +} diff --git a/src/app/modules/user/login/auth-message.pipe.spec.ts b/src/app/modules/user/login/auth-message.pipe.spec.ts new file mode 100644 index 0000000..09981a7 --- /dev/null +++ b/src/app/modules/user/login/auth-message.pipe.spec.ts @@ -0,0 +1,8 @@ +import {AuthMessagePipe} from './auth-message.pipe'; + +describe('AuthMessagePipe', () => { + it('create an instance', () => { + const pipe = new AuthMessagePipe(); + expect(pipe).toBeTruthy(); + }); +}); diff --git a/src/app/modules/user/login/auth-message.pipe.ts b/src/app/modules/user/login/auth-message.pipe.ts new file mode 100644 index 0000000..3bc1f46 --- /dev/null +++ b/src/app/modules/user/login/auth-message.pipe.ts @@ -0,0 +1,19 @@ +import {Pipe, PipeTransform} from '@angular/core'; + +@Pipe({ + name: 'authMessage' +}) +export class AuthMessagePipe implements PipeTransform { + + transform(code: string): string { + switch (code) { + case 'auth/user-not-found': + return 'Benutzer wurde nicht gefunden'; + case 'auth/wrong-password': + return 'Passwort ist falsch'; + default : + return code; + } + } + +} diff --git a/src/app/modules/user/login/login.component.html b/src/app/modules/user/login/login.component.html new file mode 100644 index 0000000..530c650 --- /dev/null +++ b/src/app/modules/user/login/login.component.html @@ -0,0 +1,19 @@ + +
+ + E-Mail Addresse + + + + + Passwort + + + + +

{{errorMessage|authMessage}}

+ + +
+ + diff --git a/src/app/modules/user/login/login.component.less b/src/app/modules/user/login/login.component.less new file mode 100644 index 0000000..54bc57f --- /dev/null +++ b/src/app/modules/user/login/login.component.less @@ -0,0 +1,8 @@ +.form { + display: grid; +} + +p.error { + margin: 8px 10px; + color: darkred; +} diff --git a/src/app/modules/user/login/login.component.spec.ts b/src/app/modules/user/login/login.component.spec.ts new file mode 100644 index 0000000..28a5704 --- /dev/null +++ b/src/app/modules/user/login/login.component.spec.ts @@ -0,0 +1,25 @@ +import {async, ComponentFixture, TestBed} from '@angular/core/testing'; + +import {LoginComponent} from './login.component'; + +describe('LoginComponent', () => { + let component: LoginComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [LoginComponent] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(LoginComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/modules/user/login/login.component.ts b/src/app/modules/user/login/login.component.ts new file mode 100644 index 0000000..a4dc39b --- /dev/null +++ b/src/app/modules/user/login/login.component.ts @@ -0,0 +1,36 @@ +import {Component, OnInit} from '@angular/core'; +import {FormControl, FormGroup, Validators} from '@angular/forms'; +import {AngularFireAuth} from '@angular/fire/auth'; +import {Router} from '@angular/router'; + +@Component({ + selector: 'app-login', + templateUrl: './login.component.html', + styleUrls: ['./login.component.less'] +}) +export class LoginComponent implements OnInit { + public form: FormGroup; + public errorMessage: string; + + constructor(public afAuth: AngularFireAuth, private router: Router) { + } + + ngOnInit() { + this.form = new FormGroup({ + user: new FormControl(null, [Validators.required, Validators.email]), + pass: new FormControl(null, [Validators.required]), + }); + } + + public async onLogin() { + this.form.updateValueAndValidity(); + if (this.form.valid) { + try { + await this.afAuth.auth.signInWithEmailAndPassword(this.form.value.user, this.form.value.pass); + await this.router.navigateByUrl('/'); + } catch (ex) { + this.errorMessage = ex.code; + } + } + } +} diff --git a/src/app/modules/user/logout/logout.component.html b/src/app/modules/user/logout/logout.component.html new file mode 100644 index 0000000..c6ae40e --- /dev/null +++ b/src/app/modules/user/logout/logout.component.html @@ -0,0 +1 @@ +

logout works!

diff --git a/src/app/modules/user/logout/logout.component.less b/src/app/modules/user/logout/logout.component.less new file mode 100644 index 0000000..e69de29 diff --git a/src/app/modules/user/logout/logout.component.spec.ts b/src/app/modules/user/logout/logout.component.spec.ts new file mode 100644 index 0000000..6b7c320 --- /dev/null +++ b/src/app/modules/user/logout/logout.component.spec.ts @@ -0,0 +1,25 @@ +import {async, ComponentFixture, TestBed} from '@angular/core/testing'; + +import {LogoutComponent} from './logout.component'; + +describe('LogoutComponent', () => { + let component: LogoutComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [LogoutComponent] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(LogoutComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/modules/user/logout/logout.component.ts b/src/app/modules/user/logout/logout.component.ts new file mode 100644 index 0000000..0acb371 --- /dev/null +++ b/src/app/modules/user/logout/logout.component.ts @@ -0,0 +1,18 @@ +import {AfterViewInit, Component} from '@angular/core'; +import {AngularFireAuth} from '@angular/fire/auth'; +import {Router} from '@angular/router'; + +@Component({ + selector: 'app-logout', + templateUrl: './logout.component.html', + styleUrls: ['./logout.component.less'] +}) +export class LogoutComponent implements AfterViewInit { + constructor(public afAuth: AngularFireAuth, private router: Router) { + } + + public async ngAfterViewInit() { + await this.afAuth.auth.signOut(); + await this.router.navigateByUrl('/'); + } +} diff --git a/src/app/modules/user/user-routing.module.ts b/src/app/modules/user/user-routing.module.ts new file mode 100644 index 0000000..a291237 --- /dev/null +++ b/src/app/modules/user/user-routing.module.ts @@ -0,0 +1,36 @@ +import {NgModule} from '@angular/core'; +import {RouterModule, Routes} from '@angular/router'; +import {LoginComponent} from './login/login.component'; +import {InfoComponent} from './info/info.component'; +import {LogoutComponent} from './logout/logout.component'; +import {AngularFireAuthGuard, redirectUnauthorizedTo} from '@angular/fire/auth-guard'; + + +const routes: Routes = [ + { + path: '', + redirectTo: 'info', + pathMatch: 'full' + }, + { + path: 'login', + component: LoginComponent + }, + { + path: 'logout', + component: LogoutComponent + }, + { + path: 'info', + component: InfoComponent, + canActivate: [AngularFireAuthGuard], + data: {authGuardPipe: () => redirectUnauthorizedTo(['user', 'login'])} + }, +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class UserRoutingModule { +} diff --git a/src/app/modules/user/user.module.ts b/src/app/modules/user/user.module.ts new file mode 100644 index 0000000..390e9fb --- /dev/null +++ b/src/app/modules/user/user.module.ts @@ -0,0 +1,33 @@ +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {LoginComponent} from './login/login.component'; +import {UserRoutingModule} from './user-routing.module'; +import {CardModule} from '../../widget-modules/components/card/card.module'; +import {MatFormFieldModule} from '@angular/material/form-field'; +import {ReactiveFormsModule} from '@angular/forms'; +import {MatInputModule} from '@angular/material/input'; +import {ButtonRowModule} from '../../widget-modules/components/button-row/button-row.module'; +import {MatButtonModule} from '@angular/material/button'; +import {AuthMessagePipe} from './login/auth-message.pipe'; +import {InfoComponent} from './info/info.component'; +import {LogoutComponent} from './logout/logout.component'; +import {RolePipe} from './info/role.pipe'; + + +@NgModule({ + declarations: [LoginComponent, AuthMessagePipe, InfoComponent, LogoutComponent, RolePipe], + imports: [ + CommonModule, + UserRoutingModule, + CardModule, + MatFormFieldModule, + ReactiveFormsModule, + MatInputModule, + ButtonRowModule, + MatButtonModule, + + + ] +}) +export class UserModule { +} diff --git a/src/app/services/user.service.spec.ts b/src/app/services/user.service.spec.ts new file mode 100644 index 0000000..e927575 --- /dev/null +++ b/src/app/services/user.service.spec.ts @@ -0,0 +1,12 @@ +import {TestBed} from '@angular/core/testing'; + +import {UserService} from './user.service'; + +describe('UserService', () => { + beforeEach(() => TestBed.configureTestingModule({})); + + it('should be created', () => { + const service: UserService = TestBed.get(UserService); + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/services/user.service.ts b/src/app/services/user.service.ts new file mode 100644 index 0000000..3fe19a0 --- /dev/null +++ b/src/app/services/user.service.ts @@ -0,0 +1,21 @@ +import {Injectable} from '@angular/core'; +import {AngularFireAuth} from '@angular/fire/auth'; +import {Observable} from 'rxjs'; +import {filter, switchMap} from 'rxjs/operators'; +import {User} from './user'; +import {AngularFirestore} from '@angular/fire/firestore'; + +@Injectable({ + providedIn: 'root' +}) +export class UserService { + constructor(private afAuth: AngularFireAuth, private afs: AngularFirestore) { + } + + public get user$(): Observable { + return this.afAuth.authState.pipe( + filter(_ => !!_), + switchMap(auth => this.afs.doc('user/' + auth.uid).valueChanges()) + ); + } +} diff --git a/src/app/services/user.ts b/src/app/services/user.ts new file mode 100644 index 0000000..321d437 --- /dev/null +++ b/src/app/services/user.ts @@ -0,0 +1,4 @@ +export interface User { + name: string; + role: 'admin'; +} diff --git a/src/app/songs/song/song.module.ts b/src/app/songs/song/song.module.ts deleted file mode 100644 index 6e92a7d..0000000 --- a/src/app/songs/song/song.module.ts +++ /dev/null @@ -1,27 +0,0 @@ -import {NgModule} from '@angular/core'; -import {CommonModule} from '@angular/common'; -import {SongComponent} from './song.component'; -import {CardModule} from '../../widget-modules/components/card/card.module'; -import {SongTypeTranslaterModule} from '../../widget-modules/pipes/song-type-translater/song-type-translater.module'; -import {MatButtonModule} from '@angular/material/button'; -import {ButtonRowModule} from '../../widget-modules/components/button-row/button-row.module'; -import {RouterModule} from '@angular/router'; -import {LegalOwnerTranslatorModule} from '../../widget-modules/pipes/legal-owner-translator/legal-owner-translator.module'; - - -@NgModule({ - declarations: [SongComponent], - exports: [SongComponent], - imports: [ - CommonModule, - CardModule, - RouterModule, - - SongTypeTranslaterModule, - MatButtonModule, - ButtonRowModule, - LegalOwnerTranslatorModule, - ] -}) -export class SongModule { -} diff --git a/src/app/application-frame/application-frame.module.ts b/src/app/widget-modules/application-frame/application-frame.module.ts similarity index 100% rename from src/app/application-frame/application-frame.module.ts rename to src/app/widget-modules/application-frame/application-frame.module.ts diff --git a/src/app/application-frame/navigation/filter/filter.component.html b/src/app/widget-modules/application-frame/navigation/filter/filter.component.html similarity index 98% rename from src/app/application-frame/navigation/filter/filter.component.html rename to src/app/widget-modules/application-frame/navigation/filter/filter.component.html index 6a98267..367b29e 100644 --- a/src/app/application-frame/navigation/filter/filter.component.html +++ b/src/app/widget-modules/application-frame/navigation/filter/filter.component.html @@ -1,2 +1 @@ - diff --git a/src/app/application-frame/navigation/filter/filter.component.less b/src/app/widget-modules/application-frame/navigation/filter/filter.component.less similarity index 86% rename from src/app/application-frame/navigation/filter/filter.component.less rename to src/app/widget-modules/application-frame/navigation/filter/filter.component.less index eb3e1f2..64d0138 100644 --- a/src/app/application-frame/navigation/filter/filter.component.less +++ b/src/app/widget-modules/application-frame/navigation/filter/filter.component.less @@ -1,4 +1,4 @@ -@import "../../../../styles/styles"; +@import "../../../../../styles/styles"; input { font-size: 16px; diff --git a/src/app/application-frame/navigation/filter/filter.component.spec.ts b/src/app/widget-modules/application-frame/navigation/filter/filter.component.spec.ts similarity index 100% rename from src/app/application-frame/navigation/filter/filter.component.spec.ts rename to src/app/widget-modules/application-frame/navigation/filter/filter.component.spec.ts diff --git a/src/app/application-frame/navigation/filter/filter.component.ts b/src/app/widget-modules/application-frame/navigation/filter/filter.component.ts similarity index 100% rename from src/app/application-frame/navigation/filter/filter.component.ts rename to src/app/widget-modules/application-frame/navigation/filter/filter.component.ts diff --git a/src/app/widget-modules/application-frame/navigation/navigation.component.html b/src/app/widget-modules/application-frame/navigation/navigation.component.html new file mode 100644 index 0000000..9a07b78 --- /dev/null +++ b/src/app/widget-modules/application-frame/navigation/navigation.component.html @@ -0,0 +1,11 @@ + + + diff --git a/src/app/application-frame/navigation/navigation.component.less b/src/app/widget-modules/application-frame/navigation/navigation.component.less similarity index 87% rename from src/app/application-frame/navigation/navigation.component.less rename to src/app/widget-modules/application-frame/navigation/navigation.component.less index d8e9201..b37bac6 100644 --- a/src/app/application-frame/navigation/navigation.component.less +++ b/src/app/widget-modules/application-frame/navigation/navigation.component.less @@ -1,5 +1,5 @@ -@import "../../../styles/styles"; -@import "../../../styles/shadow"; +@import "../../../../styles/styles"; +@import "../../../../styles/shadow"; nav { &.head { @@ -45,3 +45,8 @@ nav { height: 100%; align-items: center; } + + +.links { + display: flex; +} diff --git a/src/app/application-frame/navigation/navigation.component.spec.ts b/src/app/widget-modules/application-frame/navigation/navigation.component.spec.ts similarity index 100% rename from src/app/application-frame/navigation/navigation.component.spec.ts rename to src/app/widget-modules/application-frame/navigation/navigation.component.spec.ts diff --git a/src/app/application-frame/navigation/navigation.component.ts b/src/app/widget-modules/application-frame/navigation/navigation.component.ts similarity index 100% rename from src/app/application-frame/navigation/navigation.component.ts rename to src/app/widget-modules/application-frame/navigation/navigation.component.ts diff --git a/src/app/widget-modules/components/card/card.component.less b/src/app/widget-modules/components/card/card.component.less index e710fd2..3b977ca 100644 --- a/src/app/widget-modules/components/card/card.component.less +++ b/src/app/widget-modules/components/card/card.component.less @@ -6,7 +6,7 @@ border-radius: 8px; background: #fffe; overflow: hidden; - width: 800px; + width: 50vw; &.padding { padding: 20px; diff --git a/src/app/widget-modules/pipes/legal-owner-translator/legal-owner-translator.module.ts b/src/app/widget-modules/pipes/legal-owner-translator/legal-owner-translator.module.ts index 578f1ab..7210404 100644 --- a/src/app/widget-modules/pipes/legal-owner-translator/legal-owner-translator.module.ts +++ b/src/app/widget-modules/pipes/legal-owner-translator/legal-owner-translator.module.ts @@ -1,9 +1,8 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; import {LegalOwnerPipe} from './legal-owner.pipe'; - @NgModule({ declarations: [LegalOwnerPipe], exports: [ @@ -13,4 +12,5 @@ import {LegalOwnerPipe} from './legal-owner.pipe'; CommonModule ] }) -export class LegalOwnerTranslatorModule { } +export class LegalOwnerTranslatorModule { +} diff --git a/src/app/widget-modules/pipes/legal-owner-translator/legal-owner.pipe.spec.ts b/src/app/widget-modules/pipes/legal-owner-translator/legal-owner.pipe.spec.ts index 2a512d6..339df2b 100644 --- a/src/app/widget-modules/pipes/legal-owner-translator/legal-owner.pipe.spec.ts +++ b/src/app/widget-modules/pipes/legal-owner-translator/legal-owner.pipe.spec.ts @@ -1,4 +1,4 @@ -import { LegalOwnerPipe } from './legal-owner.pipe'; +import {LegalOwnerPipe} from './legal-owner.pipe'; describe('LegalOwnerPipe', () => { it('create an instance', () => { diff --git a/src/app/widget-modules/pipes/legal-owner-translator/legal-owner.pipe.ts b/src/app/widget-modules/pipes/legal-owner-translator/legal-owner.pipe.ts index 3256edb..fa65639 100644 --- a/src/app/widget-modules/pipes/legal-owner-translator/legal-owner.pipe.ts +++ b/src/app/widget-modules/pipes/legal-owner-translator/legal-owner.pipe.ts @@ -1,4 +1,4 @@ -import { Pipe, PipeTransform } from '@angular/core'; +import {Pipe, PipeTransform} from '@angular/core'; @Pipe({ name: 'legalOwner' diff --git a/src/app/widget-modules/pipes/legal-type-translator/legal-type-translator.module.ts b/src/app/widget-modules/pipes/legal-type-translator/legal-type-translator.module.ts index 97a07a1..7c06661 100644 --- a/src/app/widget-modules/pipes/legal-type-translator/legal-type-translator.module.ts +++ b/src/app/widget-modules/pipes/legal-type-translator/legal-type-translator.module.ts @@ -1,16 +1,16 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { LegalTypePipe } from './legal-type.pipe'; - +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {LegalTypePipe} from './legal-type.pipe'; @NgModule({ - declarations: [LegalTypePipe], - exports: [ - LegalTypePipe - ], - imports: [ - CommonModule - ] + declarations: [LegalTypePipe], + exports: [ + LegalTypePipe + ], + imports: [ + CommonModule + ] }) -export class LegalTypeTranslatorModule { } +export class LegalTypeTranslatorModule { +} diff --git a/src/app/widget-modules/pipes/legal-type-translator/legal-type.pipe.spec.ts b/src/app/widget-modules/pipes/legal-type-translator/legal-type.pipe.spec.ts index e5f5c45..11a444b 100644 --- a/src/app/widget-modules/pipes/legal-type-translator/legal-type.pipe.spec.ts +++ b/src/app/widget-modules/pipes/legal-type-translator/legal-type.pipe.spec.ts @@ -1,4 +1,4 @@ -import { LegalTypePipe } from './legal-type.pipe'; +import {LegalTypePipe} from './legal-type.pipe'; describe('LegalTypePipe', () => { it('create an instance', () => { diff --git a/src/app/widget-modules/pipes/legal-type-translator/legal-type.pipe.ts b/src/app/widget-modules/pipes/legal-type-translator/legal-type.pipe.ts index 0dd33a2..1f2264b 100644 --- a/src/app/widget-modules/pipes/legal-type-translator/legal-type.pipe.ts +++ b/src/app/widget-modules/pipes/legal-type-translator/legal-type.pipe.ts @@ -1,4 +1,4 @@ -import { Pipe, PipeTransform } from '@angular/core'; +import {Pipe, PipeTransform} from '@angular/core'; @Pipe({ name: 'legalType' diff --git a/src/index.html b/src/index.html index 1f37cae..5e3be70 100644 --- a/src/index.html +++ b/src/index.html @@ -14,7 +14,7 @@ - + diff --git a/src/main.ts b/src/main.ts index ead027e..484b5f3 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,4 +1,3 @@ - import {enableProdMode} from '@angular/core'; import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';