Skip to content
Snippets Groups Projects
Unverified Commit e5cfcac3 authored by Philipp F's avatar Philipp F Committed by GitHub
Browse files

Merge pull request #46 from iqb-berlin/prepare-admin

Prepare admin
parents d48138ba 37d98755
No related branches found
No related tags found
No related merge requests found
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router'; import { Routes, RouterModule } from '@angular/router';
import {WorkspaceComponent} from "./workspace.component"; import { WorkspaceComponent } from './workspace.component';
import {DummyComponent} from "./dummy/dummy.component"; import { DummyComponent } from './dummy/dummy.component';
const routes: Routes = [ const routes: Routes = [
......
import {Component, OnDestroy, OnInit} from '@angular/core'; import {Component, OnDestroy, OnInit} from '@angular/core';
import {MainDataService} from "../maindata.service"; import {MainDataService} from '../maindata.service';
import {ActivatedRoute} from "@angular/router"; import {ActivatedRoute} from '@angular/router';
import {Subscription} from "rxjs"; import {Subscription} from 'rxjs';
@Component({ @Component({
templateUrl: './workspace.component.html', templateUrl: './workspace.component.html',
......
...@@ -4,7 +4,7 @@ import { HttpClient } from '@angular/common/http'; ...@@ -4,7 +4,7 @@ import { HttpClient } from '@angular/common/http';
import { Observable, of } from 'rxjs'; import { Observable, of } from 'rxjs';
import {catchError, switchMap} from 'rxjs/operators'; import {catchError, switchMap} from 'rxjs/operators';
import { LoginData, BookletStatus, PersonTokenAndBookletDbId, KeyValuePair } from './app.interfaces'; import { LoginData, BookletStatus, PersonTokenAndBookletDbId, KeyValuePair } from './app.interfaces';
import {ErrorHandler, ServerError} from "iqb-components"; import {ErrorHandler, ServerError} from 'iqb-components';
// ============================================================================ // ============================================================================
@Injectable() @Injectable()
...@@ -31,20 +31,20 @@ export class BackendService { ...@@ -31,20 +31,20 @@ export class BackendService {
catchError(ErrorHandler.handle), catchError(ErrorHandler.handle),
switchMap(myLoginData => { switchMap(myLoginData => {
if (myLoginData instanceof ServerError) { if (myLoginData instanceof ServerError) {
if ((myLoginData as ServerError).code == 401) { if ((myLoginData as ServerError).code === 401) {
return this.http return this.http
.post<LoginData>(this.serverSlimUrl + 'login', {n: name, p: password}) .post<LoginData>(this.serverSlimUrl + 'login', {n: name, p: password})
.pipe( .pipe(
catchError(ErrorHandler.handle) catchError(ErrorHandler.handle)
); );
} else { } else {
return of(myLoginData) return of(myLoginData);
} }
} else { } else {
return of(myLoginData); return of(myLoginData);
} }
}) })
) );
} }
// BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB // BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
......
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router'; import { Routes, RouterModule } from '@angular/router';
import {SuperadminComponent} from "./superadmin.component"; import {SuperadminComponent} from './superadmin.component';
const routes: Routes = [ const routes: Routes = [
......
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import {MainDataService} from "../maindata.service"; import {MainDataService} from '../maindata.service';
@Component({ @Component({
templateUrl: './superadmin.component.html', templateUrl: './superadmin.component.html',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment