Commit 4a3bae8d authored by Sebastian's avatar Sebastian

merge

parents 67498d40 57da7b68
......@@ -42,3 +42,7 @@ Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protrac
## Further help
To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).
## Updates
After updates to the used packets or their dependencies it can be necessary to run `npm install` from within the project-directory.
\ No newline at end of file
......@@ -24,7 +24,8 @@
],
"styles": [
"src/styles.css",
"./node_modules/font-awesome/css/font-awesome.css"
"./node_modules/font-awesome/css/font-awesome.css",
"node_modules/angular-notifier/styles.css"
],
"scripts": []
},
......
This diff is collapsed.
{
"name": "geoportal-frontend",
"version": "0.0.0",
"scripts": {
"ng": "ng",
"start": "ng serve",
"build": "ng build",
"test": "ng test",
"lint": "ng lint",
"e2e": "ng e2e"
},
"private": true,
"dependencies": {
"@angular-devkit/core": "^0.6.5",
"@angular-devkit/schematics": "^0.6.5",
"@angular/animations": "^6.1.8",
"@angular/common": "^6.1.8",
"@angular/compiler": "^6.1.8",
"@angular/core": "^6.1.8",
"@angular/forms": "^6.1.8",
"@angular/http": "^6.1.8",
"@angular/platform-browser": "^6.1.8",
"@angular/platform-browser-dynamic": "^6.1.8",
"@angular/router": "^6.1.8",
"@ng-bootstrap/ng-bootstrap": "^3.3.0",
"@types/openlayers": "^4.6.12",
"angular-font-awesome": "^3.1.2",
"core-js": "^2.5.4",
"font-awesome": "^4.7.0",
"npm": "^6.4.1",
"ol": "^5.2.0",
"rxjs": "^6.3.2",
"tooltip.js": "^1.3.0",
"zone.js": "~0.8.26"
},
"devDependencies": {
"@angular-devkit/build-angular": "^0.7.5",
"@angular/cli": "^6.2.5",
"@angular/compiler-cli": "^6.1.8",
"@angular/language-service": "^6.1.8",
"@types/jasmine": "~2.8.6",
"@types/jasminewd2": "~2.0.3",
"@types/node": "~8.9.4",
"angular-ide": "^0.9.44",
"codelyzer": "~4.2.1",
"jasmine-core": "~2.99.1",
"jasmine-spec-reporter": "~4.2.1",
"karma": "~1.7.1",
"karma-chrome-launcher": "~2.2.0",
"karma-coverage-istanbul-reporter": "^2.0.4",
"karma-jasmine": "~1.1.1",
"karma-jasmine-html-reporter": "^0.2.2",
"ngx-spinner": "^6.1.2",
"protractor": "^5.4.1",
"ts-node": "~5.0.1",
"tslint": "~5.9.1",
"typescript": "~2.7.2"
}
}
{
"name": "geoportal-frontend",
"version": "0.9.12",
"scripts": {
"ng": "ng",
"start": "ng serve",
"build": "ng build",
"test": "ng test",
"lint": "ng lint",
"e2e": "ng e2e"
},
"private": true,
"dependencies": {
"@angular-devkit/core": "^0.6.5",
"@angular-devkit/schematics": "^0.6.5",
"@angular/animations": "^7.2.2",
"@angular/common": "^7.2.2",
"@angular/compiler": "^7.2.2",
"@angular/core": "^7.2.2",
"@angular/forms": "^7.2.2",
"@angular/http": "^7.2.2",
"@angular/platform-browser": "^7.2.2",
"@angular/platform-browser-dynamic": "^7.2.2",
"@angular/router": "^7.2.2",
"@ng-bootstrap/ng-bootstrap": "^4.0.1",
"@types/openlayers": "^4.6.12",
"angular-font-awesome": "^3.1.2",
"core-js": "^2.5.4",
"font-awesome": "^4.7.0",
"npm": "^6.4.1",
"ol": "^5.2.0",
"rxjs": "^6.3.3",
"tooltip.js": "^1.3.0",
"tslib": "^1.9.0",
"zone.js": "~0.8.29"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.12.0",
"@angular/cli": "^7.2.3",
"@angular/compiler-cli": "^7.2.2",
"@angular/language-service": "^7.2.2",
"@types/jasmine": "~2.8.6",
"@types/jasminewd2": "~2.0.3",
"@types/node": "~8.9.4",
"angular-ide": "^0.9.55",
"angular-notifier": "^4.1.1",
"codelyzer": "~4.5.0",
"jasmine-core": "~2.99.1",
"jasmine-spec-reporter": "~4.2.1",
"karma": "~1.7.1",
"karma-chrome-launcher": "~2.2.0",
"karma-coverage-istanbul-reporter": "^2.0.4",
"karma-jasmine": "~1.1.1",
"karma-jasmine-html-reporter": "^0.2.2",
"ngx-spinner": "^7.0.0",
"protractor": "^5.4.1",
"ts-node": "~5.0.1",
"tslint": "~5.12.1",
"typescript": "^3.2.4"
}
}
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { BliEditorComponent } from './bli-editor.component';
describe('BliEditorComponent', () => {
let component: BliEditorComponent;
let fixture: ComponentFixture<BliEditorComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ BliEditorComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(BliEditorComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-bli-editor',
templateUrl: './bli-editor.component.html',
styleUrls: ['./bli-editor.component.css']
})
export class BliEditorComponent implements OnInit {
constructor() { }
ngOnInit() {
}
}
......@@ -15,32 +15,39 @@ import { PrivacypolicyComponent } from './home/privacypolicy';
import { BliComponent } from './portal/bli/bli.component';
import { CategoryComponent } from './portal/category/category.component';
import { CreateEntryComponent } from './portal/create-entry/create-entry.component';
import { HelpComponent } from './portal/help/help.component';
import { ErrorComponent } from './error';
import { AutosuggestComponent } from './widget/autosuggest';
import { VersionInfoComponent } from './home/version-info/version-info.component';
const routes: Routes = [
{ path: 'autosuggest', component: AutosuggestComponent },
{ path: 'home', component: HomeComponent },
{ path: 'login', component: AuthComponent },
{ path: '#home', component: HomeComponent },
{ path: '#login', component: AuthComponent },
{ path: '#auth', component: AuthComponent },
{ path: '#error', component: ErrorComponent },
{ path: '#register', component: RegisterComponent },
{ path: '#messages', component: MessagingComponent },
{ path: '#search', component: SearchComponent },
{ path: '#imprint', component: ImprintComponent },
{ path: '#userconditions', component: UserconditionsComponent },
{ path: '#contact', component: ContactComponent },
{ path: '#privacypolicy', component: PrivacypolicyComponent },
{ path: '#userprofile', component: UserprofilComponent },
{ path: '#temp-dev', component: TempDevComponent },
{ path: '#bliDimensions', component: BliComponent},
{ path: '#categories', component: CategoryComponent},
{ path: '#createEntry', component: CreateEntryComponent },
{ path: '**', redirectTo: '#error'},
{ path: 'auth', component: AuthComponent },
{ path: 'help', component: HelpComponent },
{ path: 'error', component: ErrorComponent },
{ path: 'register', component: RegisterComponent },
{ path: 'messages', component: MessagingComponent },
{ path: 'search', component: SearchComponent },
{ path: 'imprint', component: ImprintComponent },
{ path: 'versionInfo', component: VersionInfoComponent },
{ path: 'userconditions', component: UserconditionsComponent },
{ path: 'contact', component: ContactComponent },
{ path: 'privacypolicy', component: PrivacypolicyComponent },
{ path: 'userprofile', component: UserprofilComponent },
{ path: 'temp-dev', component: TempDevComponent },
{ path: 'bliDimensions', component: BliComponent},
{ path: 'categories', component: CategoryComponent},
{ path: 'createEntry', component: CreateEntryComponent },
{ path: '', component: HomeComponent }, //startpage
];
{ path: '**', redirectTo: 'error'},
];
@NgModule({
imports: [ RouterModule.forRoot(routes) ],
imports: [ RouterModule.forRoot(routes, {useHash: true}) ],
exports: [ RouterModule ]
})
export class AppRoutingModule {}
......
......@@ -7,3 +7,4 @@
</div>
<app-footer-light *ngIf="footer=='light'" ></app-footer-light>
<app-footer *ngIf="footer!='light'" ></app-footer>
<notifier-container></notifier-container>
\ No newline at end of file
import { BrowserModule } from '@angular/platform-browser';
import { LOCALE_ID, NgModule } from '@angular/core';
import { LOCALE_ID, NgModule, enableProdMode } from '@angular/core';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { AppComponent } from './app.component';
import { LogService } from './services/log.service';
import { GeoportalApiService } from './services/geoportal-api.service';
import { HashLocationStrategy, Location, LocationStrategy } from '@angular/common';
import { HttpClientModule } from '@angular/common/http';
import { AuthComponent } from './auth/auth.component';
import { HomeComponent } from './home/home.component';
......@@ -37,9 +38,15 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
import { NgxSpinnerModule } from 'ngx-spinner';
import { ErrorComponent } from './error/error.component';
import { UserconditionsComponent } from './register/userconditions/userconditions.component';
import { NotifierModule } from 'angular-notifier';
import { NodeFilterPipe } from './pipes/node-filter.pipe';
import { BliEditorComponent } from './admin/bli-editor/bli-editor.component';
import { AutosuggestComponent } from './widget/autosuggest/autosuggest.component';
import { VersionInfoComponent } from './home/version-info/version-info.component';
import { HelpComponent } from './portal/help/help.component';
import { ModalsComponent } from './modals/modals.component';
enableProdMode();
@NgModule( {
declarations: [
......@@ -72,7 +79,12 @@ import { NodeFilterPipe } from './pipes/node-filter.pipe';
CreateEntryComponent,
ErrorComponent,
UserconditionsComponent,
NodeFilterPipe
NodeFilterPipe,
BliEditorComponent,
AutosuggestComponent,
VersionInfoComponent,
HelpComponent,
ModalsComponent
//MatAutocompleteModule,
],
imports: [
......@@ -82,7 +94,8 @@ import { NodeFilterPipe } from './pipes/node-filter.pipe';
HttpClientModule,
AppRoutingModule,
NgbModule,
NgxSpinnerModule
NgxSpinnerModule,
NotifierModule
],
providers: [
LogService,
......
<div *ngIf="!authService.loggedIn" class="widget-wrap">
<h4>Anmeldung</h4>
<div class="login_ex exclamation">
<i class="fa fa-exclamation-triangle fa-lg" aria-hidden="true">&nbsp;</i>
<p>Nur angemeldete Nutz*innen können Orte des Guten Lebens anlegen und bearbeiten.</p>
</div>
<form [formGroup]="loginForm" (ngSubmit)="login()">
<div class="form-group">
<label for="username">Benutzername</label> <input type="text"
......@@ -10,7 +14,7 @@
<div *ngIf="f.username.errors.required">Username is required</div>
</div>
</div>
<!--
<!--
<div class="form-group">
<label for="username">E-Mail</label> <input type="text"
formControlName="username" class="form-control"
......@@ -43,7 +47,7 @@
Neu beim Geoportal des Guten Lebens?
<br/><br/>
<button class="btn btn-secondary btn-sm" routerLink="/#register">Registrieren</button>
<button class="btn btn-secondary" routerLink="/register">Registrieren</button>
</div>
</form>
</div>
......
<div class="widget-wrap">
<div class="widget-wrap big-widget">
<h1><i class="fa fa-exclamation-triangle" aria-hidden="true"></i></h1>
<p>
Leider gab es ein Problem!
Leider gab es ein Problem!
</p>
<p>
Wir befinden noch in der Entwicklung des GeoPortals des guten Lebens. Möglicherweise stehen noch nicht alle Funktionen zur Verfügung.
</p>
<div>
<p>
Falls Du glaubst einen Bug gefunden zu haben, gib uns doch bitte ein Feedback.
Es wäre sehr hilfreich, wenn du folgende Informationen geben könntest:
</p>
<ul>
<li>Wodurch wurde der Fehler ausgelöst? (Hier gerne ausfühlich werden)</li>
<li>Mit welchem Browser wurde der Fehler ausgelöst?</li>
<li>Unter welchem Betriebssystem wurde der Fehler ausgelöst?</li>
<li>Warst Du eingeloggt?</li>
<li>Welche Version des Frontends hast du benutzt? (z.Z. <b>{{version}}</b> )</li>
<li>Weißt du, ob die Funktion schon einmal funktioniert hat?</li>
<li>Ein Screenshot wäre schön, insbesondere bei Darstellungsfehlern.</li>
</ul>
<p>
Bitte sende die Informationen an <a href="mailto:bugs@transformationsstadt.de">bugs@transformationsstadt.de</a> oder <a href="mailto:feedback@transformationsstadt.de">feedback@transformationsstadt.de</a>.
</p>
<p>
Vielen Dank,
</p>
<p>
Das <i>"Geoportal des guten Lebens"</i>-Team.
</p>
</div>
</div>
\ No newline at end of file
import { Component, OnInit } from '@angular/core';
import { environment } from '../../environments/environment';
@Component({
selector: 'app-error',
templateUrl: './error.component.html',
styleUrls: ['./error.component.css']
})
export class ErrorComponent implements OnInit {
public version: string = environment.VERSION;
constructor() { }
......
......@@ -4,7 +4,7 @@
<div class="row small align-items-center">
<div class="col-md-auto">
<div class="docs-footer-project">
<span class="support">ein Projekt von:</span>
<span class="support">Ein Projekt von:</span>
</div>
</div>
<div class="col-md-auto">
......@@ -40,10 +40,11 @@
</div>
<div class="col footerlinks">
<div class="float-right">
<button type="button" class="btn btn-link btn-sm" routerLink="#userconditions" href="#">Nutzungsbedingungen</button>
<button type="button" class="btn btn-link btn-sm" routerLink="#contact" href="#">Kontakt</button>
<button type="button" class="btn btn-link btn-sm" routerLink="#imprint" href="#">Impressum</button>
<button type="button" class="btn btn-link btn-sm" routerLink="#privacypolicy" href="#">Datenschutz</button>
<button type="button" class="btn btn-link btn-sm" routerLink="userconditions" href="#">Nutzungsbedingungen</button>
<button type="button" class="btn btn-link btn-sm" routerLink="contact" href="#">Kontakt</button>
<button type="button" class="btn btn-link btn-sm" routerLink="imprint" href="#">Impressum</button>
<button type="button" class="btn btn-link btn-sm" routerLink="privacypolicy" href="#">Datenschutz</button>
<button type="button" class="btn btn-link btn-sm" routerLink="versionInfo" href="#">?</button>
</div>
</div>
</div>
......
......@@ -7,6 +7,7 @@ import { Component, OnInit } from '@angular/core';
})
export class FooterLightComponent implements OnInit {
constructor() { }
ngOnInit() {
......
......@@ -71,9 +71,9 @@
</div>
<div class="col-md-auto">
<button type="button" class="btn btn-link btn-sm" routerLink="#contact" href="#">Kontakt</button>
<button type="button" class="btn btn-link btn-sm" routerLink="#imprint" href="#">Impressum</button>
<button type="button" class="btn btn-link btn-sm" routerLink="#privacypolicy" href="#">Datenschutz</button>
<button type="button" class="btn btn-link btn-sm" routerLink="contact" href="#">Kontakt</button>
<button type="button" class="btn btn-link btn-sm" routerLink="imprint" href="#">Impressum</button>
<button type="button" class="btn btn-link btn-sm" routerLink="privacypolicy" href="#">Datenschutz</button>
</div>
</div>
</div>
......
import { Component, OnInit } from '@angular/core';
import { environment } from '../../environments/environment';
@Component({
selector: 'app-footer',
......@@ -6,6 +7,7 @@ import { Component, OnInit } from '@angular/core';
styleUrls: ['./footer.component.css']
})
export class FooterComponent implements OnInit {
public version: string = environment.VERSION;
constructor() { }
......
<div class="widget-wrap">
<h4>Ein Ort des Guten Lebens!</h4>
<p>Wie kann das Gute Leben für alle sichtbar werden?</p>
<p>Mit BürgerInnen, WissenschaftlerInnen und VertreterInnen der Kommunen wollen wir diese Frage beantworten, indem wir ein GeoPortal – eine Online-Karte des Guten Lebens – gestalten, entwickeln und umsetzen.</p>
<p>Im GeoPortal des Guten Lebens werden Informationen zum Guten Leben aus Wissenschaft, Verwaltung und Bürgerschaft miteinander verbunden. So machen wir gemeinsam das Gute Leben sichtbar!</p>
<br>
<p>Mehr Informationen gibt es unter:</p>
<a href="http://www.transformationsstadt.de/geoportal/">http://www.transformationsstadt.de/geoportal/</a>
<div class="widget-wrap big-widget">
<div class="container contact">
<h4>Ein Ort des Guten Lebens!</h4>
<p>Wie kann das Gute Leben für alle sichtbar werden?</p>
<p>Mit BürgerInnen, WissenschaftlerInnen und VertreterInnen der Kommunen wollen wir diese Frage beantworten, indem wir ein GeoPortal – eine Online-Karte des Guten Lebens – gestalten, entwickeln und umsetzen.</p>
<p>Im GeoPortal des Guten Lebens werden Informationen zum Guten Leben aus Wissenschaft, Verwaltung und Bürgerschaft miteinander verbunden. So machen wir gemeinsam das Gute Leben sichtbar!</p>
<br>
<p>Mehr Informationen gibt es unter:</p>
<a href="http://www.transformationsstadt.de/geoportal/">http://www.transformationsstadt.de/geoportal/</a>
</div>
</div>
.big-widget {
width:600px;
max-width:90%;
margin:auto;
}
.versioninfo {
width: 400px;
}
\ No newline at end of file
<div class="widget-wrap big-widget">
<div class="container versioninfo">
<h1 class="entry-title">About this Software</h1>
<div>Version {{version}}</div>
<div>Bugreports: <a href="mailto:bugs@transformationsstadt.de">bugs@transformationsstadt.de</a></div>
<div>Feedback: <a href="mailto:feedback@transformationsstadt.de">feedback@transformationsstadt.de</a></div>
<div>Repositories: <a href="https://gitlab.transformationsstadt.de">gitlab.transformationsstadt.de</a></div>
<div>License: <a href="https://www.gnu.org/licenses/gpl-3.0.de.html">GPLv3</a></div>
</div>
</div>
\ No newline at end of file
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { VersionInfoComponent } from './version-info.component';
describe('VersionInfoComponent', () => {
let component: VersionInfoComponent;
let fixture: ComponentFixture<VersionInfoComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ VersionInfoComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(VersionInfoComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});
import { Component, OnInit } from '@angular/core';
import { environment } from '../../../environments/environment';
@Component({
selector: 'app-version-info',
templateUrl: './version-info.component.html',
styleUrls: ['./version-info.component.css']
})
export class VersionInfoComponent implements OnInit {
public version: string = environment.VERSION;
constructor() { }
ngOnInit() {
}
}
......@@ -10,4 +10,10 @@ ul.navbar-nav > li{
position: fixed;
width: 100%;
z-index:1000;
}
.nav-link {
}
a.nav-link.active {
border-bottom: 1px solid #fff;
}
\ No newline at end of file
<nav class="navbar navbar-expand-lg navbar-dark bg-dark">
<a class="navbar-brand" routerLink="#home" href="#"> GEO<b>PORTAL</b> DES <b>GUTEN
<a class="navbar-brand" routerLink="home" href="#"> GEO<b>PORTAL</b> DES <b>GUTEN
LEBENS</b>
</a>
<button class="navbar-toggler" type="button">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse">
<ul class="navbar-nav mr-auto">
<li class="nav-item"><a class="nav-link" routerLink="#home"
href="#">&Uuml;ber uns <i class="fa fa-angle-down" aria-hidden="true"></i><span class="caret"></span></a></li>
<li class="nav-item"><a class="nav-link" routerLink="home" routerLinkActive="active"
href="#">&Uuml;ber uns<span class="caret"></span></a></li>
<!--
<li class="nav-item"><a class="nav-link" routerLink="#discover"
<li class="nav-item"><a class="nav-link" routerLink="discover" routerLinkActive="active"
href="#">Entdecken<span class="caret"></span></a></li>
-->
<li class="nav-item"><a class="nav-link" routerLink="#search"
href="#">Suchen <i class="fa fa-angle-down" aria-hidden="true"></i><span class="caret"></span></a></li>
<li class="nav-item"><a class="nav-link" routerLink="#"
href="#">Export <i class="fa fa-angle-down" aria-hidden="true"></i><span class="caret"></span></a></li>
<li class="nav-item"><a class="nav-link" routerLink="help" routerLinkActive="active"
href="#">Hilfe<span class="caret"></span></a></li>
<li class="nav-item"><a class="nav-link"
href="{{apiService.apiURL}}/GeoElements/EdgeList">Daten<span class="caret"></span></a></li>
<li class="nav-item"><a class="nav-link" routerLink="search" routerLinkActive="active"
href="#">Karte<span class="caret"></span></a></li>
</ul>
<ul class="navbar-nav navbar-right">
<!--<li class="nav-item"><a class="nav-link" routerLink="#messages" href="#">Messages</a></li>-->
<!-- <li *ngIf="!authService.loggedIn"><button class="btn btn-light buttonicon message" routerLink="#messages" href="#" type="button">Messages</button></li> -->
<li *ngIf="!authService.loggedIn"><button type="button" routerLink="#login" class="btn btn-light buttonicon login">Anmelden | Registrieren</button></li>
<!--<li class="nav-item"><a class="nav-link" routerLink="messages" href="#">Messages</a></li>-->
<!-- <li *ngIf="!authService.loggedIn"><button class="btn btn-light buttonicon message" routerLink="messages" href="#" type="button">Messages</button></li> -->
<li *ngIf="!authService.loggedIn"><button type="button" routerLink="login" class="btn btn-light buttonicon login">Anmelden | Registrieren</button></li>
<div ngbDropdown class="dropdown" *ngIf="authService.loggedIn">
<button ngbDropdownToggle class="btn btn-light btn-sm buttonicon profile" type="button" id="profilMenuButton">{{authService.currentUser.username}}</button>
<button ngbDropdownToggle class="btn btn-light buttonicon profile" type="button" id="profilMenuButton">{{authService.currentUser.username}}</button>
<div ngbDropdownMenu class="dropdown-menu" aria-labelledby="profilMenuButton">
<a class="dropdown-item" href="#" routerLink="#userprofile">Mein Profil</a>
<a class="dropdown-item" href="#" routerLink="#messages">Nachrichten</a>
<a class="dropdown-item" href="#" routerLink="userprofile">Mein Profil</a>
<a class="dropdown-item" href="#" routerLink="messages">Nachrichten</a>
<a class="dropdown-item" (click)="logout()">Logout</a>
<!-- <a class="dropdown-item" href="#" routerlink="">Abmelden</a>-->
</div>
</div>
<li *ngIf="authService.loggedIn"><button type="button" routerLink="#createEntry" class="btn btn-light btn-sm buttonicon add_entry">Etwas Eintragen!</button></li>
<li *ngIf="authService.loggedIn"><button type="button" routerLink="createEntry" class="btn btn-light buttonicon add_entry">Etwas Eintragen!</button></li>
<!--<li *ngIf="!authService.loggedIn" class="nav-item"><a class="nav-link" routerLink="#login" href="#">Login</a></li>
<li *ngIf="authService.loggedIn" class="nav-item"><a class="nav-link" routerLink="#userprofile" href="#">Profil ({{authService.currentUser.username}})</a></li>
<li *ngIf="authService.loggedIn" class="nav-item"><a class="nav-link" routerLink="#createEntry" href="#">Eintragen</a></li>-->
<!--<li *ngIf="!authService.loggedIn" class="nav-item"><a class="nav-link" routerLink="login" href="#">Login</a></li>
<li *ngIf="authService.loggedIn" class="nav-item"><a class="nav-link" routerLink="userprofile" href="#">Profil ({{authService.currentUser.username}})</a></li>
<li *ngIf="authService.loggedIn" class="nav-item"><a class="nav-link" routerLink="createEntry" href="#">Eintragen</a></li>-->
</ul>
</div>
......
......@@ -2,6 +2,8 @@ import { Component, OnInit } from '@angular/core';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { User } from '../models/User';
import { AuthService } from '../services/auth.service';
import { LogService } from '../services/log.service';
import { GeoportalApiService } from '../services/geoportal-api.service';
@Component({
selector: 'app-menubar',
templateUrl: './menubar.component.html',
......@@ -9,10 +11,15 @@ import { AuthService } from '../services/auth.service';
})
export class MenubarComponent implements OnInit {
constructor(private authService: AuthService) {
constructor(private authService: AuthService, private apiService: GeoportalApiService, private logger:LogService) {
}
logout(){
if(this.authService.logout()){
this.logger.notify("info","Logged out.");
}
}
ngOnInit() {
}
......
......@@ -23,9 +23,11 @@ export class MessagingComponent implements OnInit {
this.currentUser = authService.currentUser;
this.currentView = 'inbox';
}
showSent() {
this.currentView = 'sent';
}
showInbox() {
this.currentView = 'inbox';
}
......
<div class="modal-wrap modal">
<div class="container">
<p>Test</p>
</div>
</div>
<!-- search partner -->
<div class="modal-wrap modal">
<div class="container">