Add scaffold for angular 6 client
- basic client structure - authentication towards OS-server - access REST-Api - webpack proxy for convenient usage - fontawesome - twitter bootstrap 3.3.7 - login example (recreate login page) - routing - template for agenda and motions - dynamic content loading - custom alert component - add auth-guard - checks if a user is logged in and makes correct forwarding - authentification towards OS works - saving the log in information is WIP
41
.gitignore
vendored
@ -37,5 +37,42 @@ openslides_*
|
|||||||
# Mypy cache for typechecking
|
# Mypy cache for typechecking
|
||||||
.mypy_cache
|
.mypy_cache
|
||||||
|
|
||||||
# Development of a new client. Easier to switch branches with this entry
|
# OpenSlides 3 Client
|
||||||
client/*
|
|
||||||
|
# compiled output
|
||||||
|
client/dist
|
||||||
|
client/tmp
|
||||||
|
client/out-tsc
|
||||||
|
|
||||||
|
# dependencies
|
||||||
|
client/node_modules
|
||||||
|
|
||||||
|
# IDEs and editors
|
||||||
|
/.idea
|
||||||
|
.project
|
||||||
|
.classpath
|
||||||
|
.c9/
|
||||||
|
*.launch
|
||||||
|
.settings/
|
||||||
|
*.sublime-workspace
|
||||||
|
|
||||||
|
# IDE - VSCode
|
||||||
|
.vscode/*
|
||||||
|
!.vscode/settings.json
|
||||||
|
!.vscode/tasks.json
|
||||||
|
!.vscode/launch.json
|
||||||
|
!.vscode/extensions.json
|
||||||
|
|
||||||
|
# misc
|
||||||
|
client/.sass-cache
|
||||||
|
client/connect.lock
|
||||||
|
client/coverage
|
||||||
|
client/libpeerconnection.log
|
||||||
|
client/npm-debug.log
|
||||||
|
client/yarn-error.log
|
||||||
|
client/testem.log
|
||||||
|
client/typings
|
||||||
|
|
||||||
|
# System Files
|
||||||
|
client/.DS_Store
|
||||||
|
client/Thumbs.db
|
||||||
|
13
client/.editorconfig
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
# Editor configuration, see http://editorconfig.org
|
||||||
|
root = true
|
||||||
|
|
||||||
|
[*]
|
||||||
|
charset = utf-8
|
||||||
|
indent_style = space
|
||||||
|
indent_size = 2
|
||||||
|
insert_final_newline = true
|
||||||
|
trim_trailing_whitespace = true
|
||||||
|
|
||||||
|
[*.md]
|
||||||
|
max_line_length = off
|
||||||
|
trim_trailing_whitespace = false
|
10
client/README.md
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
# OpenSlides 3 Client
|
||||||
|
|
||||||
|
Prototype application for OpenSlides 3.0 (Client)
|
||||||
|
|
||||||
|
## Development server
|
||||||
|
|
||||||
|
Run `npm start` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
|
||||||
|
A running OpenSlides (2.2) instance is expected on port 8000
|
||||||
|
|
||||||
|
Start OpenSlides as usual using python manage.py start --no-browser --host 0.0.0.0
|
127
client/angular.json
Normal file
@ -0,0 +1,127 @@
|
|||||||
|
{
|
||||||
|
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
|
||||||
|
"version": 1,
|
||||||
|
"newProjectRoot": "projects",
|
||||||
|
"projects": {
|
||||||
|
"client": {
|
||||||
|
"root": "",
|
||||||
|
"sourceRoot": "src",
|
||||||
|
"projectType": "application",
|
||||||
|
"prefix": "app",
|
||||||
|
"schematics": {},
|
||||||
|
"architect": {
|
||||||
|
"build": {
|
||||||
|
"builder": "@angular-devkit/build-angular:browser",
|
||||||
|
"options": {
|
||||||
|
"outputPath": "dist/client",
|
||||||
|
"index": "src/index.html",
|
||||||
|
"main": "src/main.ts",
|
||||||
|
"polyfills": "src/polyfills.ts",
|
||||||
|
"tsConfig": "src/tsconfig.app.json",
|
||||||
|
"assets": [
|
||||||
|
"src/favicon.ico",
|
||||||
|
"src/assets"
|
||||||
|
],
|
||||||
|
"styles": [
|
||||||
|
"src/styles.css"
|
||||||
|
],
|
||||||
|
"scripts": []
|
||||||
|
},
|
||||||
|
"configurations": {
|
||||||
|
"production": {
|
||||||
|
"fileReplacements": [
|
||||||
|
{
|
||||||
|
"replace": "src/environments/environment.ts",
|
||||||
|
"with": "src/environments/environment.prod.ts"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"optimization": true,
|
||||||
|
"outputHashing": "all",
|
||||||
|
"sourceMap": false,
|
||||||
|
"extractCss": true,
|
||||||
|
"namedChunks": false,
|
||||||
|
"aot": true,
|
||||||
|
"extractLicenses": true,
|
||||||
|
"vendorChunk": false,
|
||||||
|
"buildOptimizer": true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"serve": {
|
||||||
|
"builder": "@angular-devkit/build-angular:dev-server",
|
||||||
|
"options": {
|
||||||
|
"browserTarget": "client:build"
|
||||||
|
},
|
||||||
|
"configurations": {
|
||||||
|
"production": {
|
||||||
|
"browserTarget": "client:build:production"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"extract-i18n": {
|
||||||
|
"builder": "@angular-devkit/build-angular:extract-i18n",
|
||||||
|
"options": {
|
||||||
|
"browserTarget": "client:build"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"test": {
|
||||||
|
"builder": "@angular-devkit/build-angular:karma",
|
||||||
|
"options": {
|
||||||
|
"main": "src/test.ts",
|
||||||
|
"polyfills": "src/polyfills.ts",
|
||||||
|
"tsConfig": "src/tsconfig.spec.json",
|
||||||
|
"karmaConfig": "src/karma.conf.js",
|
||||||
|
"styles": [
|
||||||
|
"src/styles.css"
|
||||||
|
],
|
||||||
|
"scripts": [],
|
||||||
|
"assets": [
|
||||||
|
"src/favicon.ico",
|
||||||
|
"src/assets"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"lint": {
|
||||||
|
"builder": "@angular-devkit/build-angular:tslint",
|
||||||
|
"options": {
|
||||||
|
"tsConfig": [
|
||||||
|
"src/tsconfig.app.json",
|
||||||
|
"src/tsconfig.spec.json"
|
||||||
|
],
|
||||||
|
"exclude": [
|
||||||
|
"**/node_modules/**"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"client-e2e": {
|
||||||
|
"root": "e2e/",
|
||||||
|
"projectType": "application",
|
||||||
|
"architect": {
|
||||||
|
"e2e": {
|
||||||
|
"builder": "@angular-devkit/build-angular:protractor",
|
||||||
|
"options": {
|
||||||
|
"protractorConfig": "e2e/protractor.conf.js",
|
||||||
|
"devServerTarget": "client:serve"
|
||||||
|
},
|
||||||
|
"configurations": {
|
||||||
|
"production": {
|
||||||
|
"devServerTarget": "client:serve:production"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"lint": {
|
||||||
|
"builder": "@angular-devkit/build-angular:tslint",
|
||||||
|
"options": {
|
||||||
|
"tsConfig": "e2e/tsconfig.e2e.json",
|
||||||
|
"exclude": [
|
||||||
|
"**/node_modules/**"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"defaultProject": "client"
|
||||||
|
}
|
28
client/e2e/protractor.conf.js
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
// Protractor configuration file, see link for more information
|
||||||
|
// https://github.com/angular/protractor/blob/master/lib/config.ts
|
||||||
|
|
||||||
|
const { SpecReporter } = require('jasmine-spec-reporter');
|
||||||
|
|
||||||
|
exports.config = {
|
||||||
|
allScriptsTimeout: 11000,
|
||||||
|
specs: [
|
||||||
|
'./src/**/*.e2e-spec.ts'
|
||||||
|
],
|
||||||
|
capabilities: {
|
||||||
|
'browserName': 'chrome'
|
||||||
|
},
|
||||||
|
directConnect: true,
|
||||||
|
baseUrl: 'http://localhost:4200/',
|
||||||
|
framework: 'jasmine',
|
||||||
|
jasmineNodeOpts: {
|
||||||
|
showColors: true,
|
||||||
|
defaultTimeoutInterval: 30000,
|
||||||
|
print: function() {}
|
||||||
|
},
|
||||||
|
onPrepare() {
|
||||||
|
require('ts-node').register({
|
||||||
|
project: require('path').join(__dirname, './tsconfig.e2e.json')
|
||||||
|
});
|
||||||
|
jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
|
||||||
|
}
|
||||||
|
};
|
14
client/e2e/src/app.e2e-spec.ts
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
import { AppPage } from './app.po';
|
||||||
|
|
||||||
|
describe('workspace-project App', () => {
|
||||||
|
let page: AppPage;
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
page = new AppPage();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should display welcome message', () => {
|
||||||
|
page.navigateTo();
|
||||||
|
expect(page.getParagraphText()).toEqual('Welcome to client!');
|
||||||
|
});
|
||||||
|
});
|
11
client/e2e/src/app.po.ts
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
import { browser, by, element } from 'protractor';
|
||||||
|
|
||||||
|
export class AppPage {
|
||||||
|
navigateTo() {
|
||||||
|
return browser.get('/');
|
||||||
|
}
|
||||||
|
|
||||||
|
getParagraphText() {
|
||||||
|
return element(by.css('app-root h1')).getText();
|
||||||
|
}
|
||||||
|
}
|
13
client/e2e/tsconfig.e2e.json
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
{
|
||||||
|
"extends": "../tsconfig.json",
|
||||||
|
"compilerOptions": {
|
||||||
|
"outDir": "../out-tsc/app",
|
||||||
|
"module": "commonjs",
|
||||||
|
"target": "es5",
|
||||||
|
"types": [
|
||||||
|
"jasmine",
|
||||||
|
"jasminewd2",
|
||||||
|
"node"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
10714
client/package-lock.json
generated
Normal file
52
client/package.json
Normal file
@ -0,0 +1,52 @@
|
|||||||
|
{
|
||||||
|
"name": "client",
|
||||||
|
"version": "0.0.0",
|
||||||
|
"scripts": {
|
||||||
|
"ng": "ng",
|
||||||
|
"start": "ng serve --proxy-config proxy.conf.json",
|
||||||
|
"build": "ng build",
|
||||||
|
"test": "ng test",
|
||||||
|
"lint": "ng lint",
|
||||||
|
"e2e": "ng e2e"
|
||||||
|
},
|
||||||
|
"private": true,
|
||||||
|
"dependencies": {
|
||||||
|
"@angular/animations": "^6.0.3",
|
||||||
|
"@angular/common": "^6.0.3",
|
||||||
|
"@angular/compiler": "^6.0.3",
|
||||||
|
"@angular/core": "^6.0.3",
|
||||||
|
"@angular/forms": "^6.0.3",
|
||||||
|
"@angular/http": "^6.0.3",
|
||||||
|
"@angular/platform-browser": "^6.0.3",
|
||||||
|
"@angular/platform-browser-dynamic": "^6.0.3",
|
||||||
|
"@angular/router": "^6.0.3",
|
||||||
|
"@fortawesome/angular-fontawesome": "^0.1.0-10",
|
||||||
|
"@fortawesome/fontawesome-svg-core": "^1.2.0-11",
|
||||||
|
"@fortawesome/free-solid-svg-icons": "^5.1.0-11",
|
||||||
|
"bootstrap": "^3.3.7",
|
||||||
|
"core-js": "^2.5.4",
|
||||||
|
"rxjs": "^6.0.0",
|
||||||
|
"zone.js": "^0.8.26"
|
||||||
|
},
|
||||||
|
"devDependencies": {
|
||||||
|
"@angular-devkit/build-angular": "~0.6.8",
|
||||||
|
"@angular/cli": "~6.0.8",
|
||||||
|
"@angular/compiler-cli": "^6.0.3",
|
||||||
|
"@angular/language-service": "^6.0.3",
|
||||||
|
"@types/jasmine": "~2.8.6",
|
||||||
|
"@types/jasminewd2": "~2.0.3",
|
||||||
|
"@types/node": "~8.9.4",
|
||||||
|
"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.0",
|
||||||
|
"karma-jasmine": "~1.1.1",
|
||||||
|
"karma-jasmine-html-reporter": "^0.2.2",
|
||||||
|
"protractor": "~5.3.0",
|
||||||
|
"ts-node": "~5.0.1",
|
||||||
|
"tslint": "~5.9.1",
|
||||||
|
"typescript": "~2.7.2"
|
||||||
|
}
|
||||||
|
}
|
10
client/proxy.conf.json
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
{
|
||||||
|
"/users/login": {
|
||||||
|
"target": "http://localhost:8000",
|
||||||
|
"secure": false
|
||||||
|
},
|
||||||
|
"/rest": {
|
||||||
|
"target": "http://localhost:8000",
|
||||||
|
"secure": false
|
||||||
|
}
|
||||||
|
}
|
4
client/src/app/_directives/alert/alert.component.html
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
<div *ngFor="let alert of alerts" class="{{ cssClass(alert) }} alert-dismissable">
|
||||||
|
{{alert.message}}
|
||||||
|
<a class="close" (click)="removeAlert(alert)">×</a>
|
||||||
|
</div>
|
25
client/src/app/_directives/alert/alert.component.spec.ts
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { AlertComponent } from './alert.component';
|
||||||
|
|
||||||
|
describe('AlertComponent', () => {
|
||||||
|
let component: AlertComponent;
|
||||||
|
let fixture: ComponentFixture<AlertComponent>;
|
||||||
|
|
||||||
|
beforeEach(async(() => {
|
||||||
|
TestBed.configureTestingModule({
|
||||||
|
declarations: [ AlertComponent ]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
}));
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
fixture = TestBed.createComponent(AlertComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
51
client/src/app/_directives/alert/alert.component.ts
Normal file
@ -0,0 +1,51 @@
|
|||||||
|
import { Component, OnInit } from '@angular/core';
|
||||||
|
|
||||||
|
import { Alert, AlertType } from '../../_models/alert';
|
||||||
|
import { AlertService } from '../../_services/alert.service';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'alert',
|
||||||
|
templateUrl: './alert.component.html',
|
||||||
|
styleUrls: ['./alert.component.css']
|
||||||
|
})
|
||||||
|
export class AlertComponent implements OnInit {
|
||||||
|
alerts: Alert[] = [];
|
||||||
|
|
||||||
|
constructor(private alertService: AlertService) { }
|
||||||
|
|
||||||
|
ngOnInit() {
|
||||||
|
this.alertService.getAlert().subscribe((alert: Alert) => {
|
||||||
|
if (!alert) {
|
||||||
|
// clear alerts when an empty alert is received
|
||||||
|
this.alerts = [];
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// add alert to array
|
||||||
|
this.alerts.push(alert);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
removeAlert(alert: Alert) {
|
||||||
|
this.alerts = this.alerts.filter(x => x !== alert);
|
||||||
|
}
|
||||||
|
|
||||||
|
cssClass(alert: Alert) {
|
||||||
|
if (!alert) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// return css class based on alert type
|
||||||
|
switch (alert.type) {
|
||||||
|
case AlertType.Success:
|
||||||
|
return 'alert alert-success';
|
||||||
|
case AlertType.Error:
|
||||||
|
return 'alert alert-danger';
|
||||||
|
case AlertType.Info:
|
||||||
|
return 'alert alert-info';
|
||||||
|
case AlertType.Warning:
|
||||||
|
return 'alert alert-warning';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
11
client/src/app/_models/alert.ts
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
export class Alert {
|
||||||
|
type: AlertType;
|
||||||
|
message: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export enum AlertType {
|
||||||
|
Success,
|
||||||
|
Error,
|
||||||
|
Info,
|
||||||
|
Warning
|
||||||
|
}
|
15
client/src/app/_services/alert.service.spec.ts
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
import { TestBed, inject } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { AlertService } from './alert.service';
|
||||||
|
|
||||||
|
describe('AlertService', () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
TestBed.configureTestingModule({
|
||||||
|
providers: [AlertService]
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should be created', inject([AlertService], (service: AlertService) => {
|
||||||
|
expect(service).toBeTruthy();
|
||||||
|
}));
|
||||||
|
});
|
45
client/src/app/_services/alert.service.ts
Normal file
@ -0,0 +1,45 @@
|
|||||||
|
import { Injectable } from '@angular/core';
|
||||||
|
import { Observable, Subject } from 'rxjs';
|
||||||
|
|
||||||
|
import { Alert, AlertType } from '../_models/alert';
|
||||||
|
|
||||||
|
|
||||||
|
@Injectable({
|
||||||
|
providedIn: 'root'
|
||||||
|
})
|
||||||
|
export class AlertService {
|
||||||
|
private subject = new Subject<Alert>();
|
||||||
|
|
||||||
|
constructor() { }
|
||||||
|
|
||||||
|
getAlert(): Observable<any> {
|
||||||
|
return this.subject.asObservable();
|
||||||
|
}
|
||||||
|
|
||||||
|
success(message: string) {
|
||||||
|
this.alert(AlertType.Success, message);
|
||||||
|
}
|
||||||
|
|
||||||
|
error(message: string) {
|
||||||
|
this.alert(AlertType.Error, message);
|
||||||
|
}
|
||||||
|
|
||||||
|
info(message: string) {
|
||||||
|
this.alert(AlertType.Info, message);
|
||||||
|
}
|
||||||
|
|
||||||
|
warn(message: string) {
|
||||||
|
this.alert(AlertType.Warning, message);
|
||||||
|
}
|
||||||
|
|
||||||
|
alert(type: AlertType, message: string) {
|
||||||
|
this.subject.next(<Alert>{ type: type, message: message });
|
||||||
|
}
|
||||||
|
|
||||||
|
clear() {
|
||||||
|
// clear alerts
|
||||||
|
this.subject.next();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
34
client/src/app/_services/auth-guard.service.ts
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
import { Injectable } from '@angular/core';
|
||||||
|
import {
|
||||||
|
CanActivate, Router,
|
||||||
|
ActivatedRouteSnapshot,
|
||||||
|
RouterStateSnapshot
|
||||||
|
} from '@angular/router';
|
||||||
|
|
||||||
|
import { AuthenticationService } from "./authentication.service";
|
||||||
|
|
||||||
|
@Injectable({
|
||||||
|
providedIn: 'root'
|
||||||
|
})
|
||||||
|
export class AuthGuard implements CanActivate {
|
||||||
|
|
||||||
|
constructor(private authenticationService: AuthenticationService, private router: Router) { }
|
||||||
|
|
||||||
|
canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean {
|
||||||
|
console.log('AuthGuard#canActivate called');
|
||||||
|
let url: string = state.url;
|
||||||
|
|
||||||
|
return this.checkLogin(url);
|
||||||
|
}
|
||||||
|
|
||||||
|
checkLogin(url: string): boolean {
|
||||||
|
if (this.authenticationService.isLoggedIn) { return true; }
|
||||||
|
|
||||||
|
// Store the attempted URL for redirecting
|
||||||
|
this.authenticationService.redirectUrl = url;
|
||||||
|
|
||||||
|
// Navigate to the login page with extras
|
||||||
|
this.router.navigate(['/login']);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
15
client/src/app/_services/authentication.service.spec.ts
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
import { TestBed, inject } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { AuthenticationService } from './authentication.service';
|
||||||
|
|
||||||
|
describe('ConfigService', () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
TestBed.configureTestingModule({
|
||||||
|
providers: [AuthenticationService]
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should be created', inject([AuthenticationService], (service: AuthenticationService) => {
|
||||||
|
expect(service).toBeTruthy();
|
||||||
|
}));
|
||||||
|
});
|
69
client/src/app/_services/authentication.service.ts
Normal file
@ -0,0 +1,69 @@
|
|||||||
|
import { Injectable } from '@angular/core';
|
||||||
|
import {
|
||||||
|
HttpClient, HttpResponse,
|
||||||
|
HttpErrorResponse, HttpHeaders
|
||||||
|
} from '@angular/common/http';
|
||||||
|
import { Observable, of, throwError } from 'rxjs';
|
||||||
|
import { catchError, map, tap, delay } from 'rxjs/operators';
|
||||||
|
|
||||||
|
import { User } from '../users/user';
|
||||||
|
|
||||||
|
const httpOptions = {
|
||||||
|
withCredentials: true,
|
||||||
|
headers: new HttpHeaders({
|
||||||
|
'Content-Type': 'application/json'
|
||||||
|
})
|
||||||
|
};
|
||||||
|
|
||||||
|
@Injectable({
|
||||||
|
providedIn: 'root'
|
||||||
|
})
|
||||||
|
export class AuthenticationService {
|
||||||
|
isLoggedIn: boolean;
|
||||||
|
loginURL: string = '/users/login/'
|
||||||
|
|
||||||
|
// store the URL so we can redirect after logging in
|
||||||
|
redirectUrl: string;
|
||||||
|
|
||||||
|
constructor(private http: HttpClient) {
|
||||||
|
|
||||||
|
//check for the cookie in local storrage
|
||||||
|
//TODO checks for username now since django does not seem to return a cookie
|
||||||
|
if(localStorage.getItem("username")) {
|
||||||
|
this.isLoggedIn = true;
|
||||||
|
} else {
|
||||||
|
this.isLoggedIn = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
//loggins a users. expects a user model
|
||||||
|
loginUser(user: User): Observable<any> {
|
||||||
|
return this.http.post(this.loginURL, user, httpOptions)
|
||||||
|
.pipe(
|
||||||
|
tap(val => {
|
||||||
|
this.isLoggedIn = true;
|
||||||
|
//Set the session cookie in local storrage.
|
||||||
|
//TODO needs validation
|
||||||
|
}),
|
||||||
|
catchError(this.handleError())
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
//logout the user
|
||||||
|
//TODO not yet used
|
||||||
|
logoutUser(): void {
|
||||||
|
this.isLoggedIn = false;
|
||||||
|
localStorage.removeItem("username");
|
||||||
|
}
|
||||||
|
|
||||||
|
//very generic error handling function.
|
||||||
|
//implicitly returns an observable that will display an error message
|
||||||
|
private handleError<T>() {
|
||||||
|
return (error: any): Observable<T> => {
|
||||||
|
console.error(error);
|
||||||
|
return of(error);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
0
client/src/app/agenda/agenda.component.css
Normal file
3
client/src/app/agenda/agenda.component.html
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
<p>
|
||||||
|
agenda works!
|
||||||
|
</p>
|
25
client/src/app/agenda/agenda.component.spec.ts
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { AgendaComponent } from './agenda.component';
|
||||||
|
|
||||||
|
describe('AgendaComponent', () => {
|
||||||
|
let component: AgendaComponent;
|
||||||
|
let fixture: ComponentFixture<AgendaComponent>;
|
||||||
|
|
||||||
|
beforeEach(async(() => {
|
||||||
|
TestBed.configureTestingModule({
|
||||||
|
declarations: [ AgendaComponent ]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
}));
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
fixture = TestBed.createComponent(AgendaComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
21
client/src/app/agenda/agenda.component.ts
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
import { Component, OnInit } from '@angular/core';
|
||||||
|
import { BaseComponent } from '../base.component';
|
||||||
|
import { Title } from '@angular/platform-browser';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-agenda',
|
||||||
|
templateUrl: './agenda.component.html',
|
||||||
|
styleUrls: ['./agenda.component.css']
|
||||||
|
})
|
||||||
|
export class AgendaComponent extends BaseComponent implements OnInit {
|
||||||
|
|
||||||
|
constructor(titleService: Title) {
|
||||||
|
super(titleService)
|
||||||
|
}
|
||||||
|
|
||||||
|
ngOnInit() {
|
||||||
|
//TODO translate
|
||||||
|
super.setTitle("Agenda");
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
13
client/src/app/app-routing.module.spec.ts
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
import { AppRoutingModule } from './app-routing.module';
|
||||||
|
|
||||||
|
describe('AppRoutingModule', () => {
|
||||||
|
let appRoutingModule: AppRoutingModule;
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
appRoutingModule = new AppRoutingModule();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create an instance', () => {
|
||||||
|
expect(appRoutingModule).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
33
client/src/app/app-routing.module.ts
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
import { NgModule } from '@angular/core';
|
||||||
|
import { RouterModule, Routes } from '@angular/router';
|
||||||
|
|
||||||
|
import { LoginComponent } from './login/login.component';
|
||||||
|
import { ProjectorComponent } from "./projector/projector.component";
|
||||||
|
import { StartComponent } from "./start/start.component";
|
||||||
|
import { AgendaComponent } from "./agenda/agenda.component";
|
||||||
|
import { MotionsComponent } from "./motions/motions.component";
|
||||||
|
import { SiteComponent } from "./site/site.component";
|
||||||
|
|
||||||
|
import { AuthGuard } from "./_services/auth-guard.service";
|
||||||
|
|
||||||
|
const routes: Routes = [
|
||||||
|
{ path: 'projector', component: ProjectorComponent },
|
||||||
|
{ path: 'login', component: LoginComponent },
|
||||||
|
{
|
||||||
|
path: '',
|
||||||
|
component: SiteComponent,
|
||||||
|
canActivate: [AuthGuard],
|
||||||
|
children: [
|
||||||
|
{ path: '', component: StartComponent },
|
||||||
|
{ path: 'agenda', component: AgendaComponent },
|
||||||
|
{ path: 'motions', component: MotionsComponent },
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{ path: '**', redirectTo: '' },
|
||||||
|
];
|
||||||
|
|
||||||
|
@NgModule({
|
||||||
|
imports: [RouterModule.forRoot(routes)],
|
||||||
|
exports: [RouterModule]
|
||||||
|
})
|
||||||
|
export class AppRoutingModule { }
|
7
client/src/app/app.component.css
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
.loginForm .input-group-addon i {
|
||||||
|
width: 15px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.login-logo {
|
||||||
|
width: 250px;
|
||||||
|
}
|
2
client/src/app/app.component.html
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
<router-outlet></router-outlet>
|
||||||
|
|
27
client/src/app/app.component.spec.ts
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
import { TestBed, async } from '@angular/core/testing';
|
||||||
|
import { AppComponent } from './app.component';
|
||||||
|
describe('AppComponent', () => {
|
||||||
|
beforeEach(async(() => {
|
||||||
|
TestBed.configureTestingModule({
|
||||||
|
declarations: [
|
||||||
|
AppComponent
|
||||||
|
],
|
||||||
|
}).compileComponents();
|
||||||
|
}));
|
||||||
|
it('should create the app', async(() => {
|
||||||
|
const fixture = TestBed.createComponent(AppComponent);
|
||||||
|
const app = fixture.debugElement.componentInstance;
|
||||||
|
expect(app).toBeTruthy();
|
||||||
|
}));
|
||||||
|
it(`should have as title 'app'`, async(() => {
|
||||||
|
const fixture = TestBed.createComponent(AppComponent);
|
||||||
|
const app = fixture.debugElement.componentInstance;
|
||||||
|
expect(app.title).toEqual('app');
|
||||||
|
}));
|
||||||
|
it('should render title in a h1 tag', async(() => {
|
||||||
|
const fixture = TestBed.createComponent(AppComponent);
|
||||||
|
fixture.detectChanges();
|
||||||
|
const compiled = fixture.debugElement.nativeElement;
|
||||||
|
expect(compiled.querySelector('h1').textContent).toContain('Welcome to client!');
|
||||||
|
}));
|
||||||
|
});
|
12
client/src/app/app.component.ts
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
import { Component } from '@angular/core';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-root',
|
||||||
|
templateUrl: './app.component.html',
|
||||||
|
styleUrls: ['./app.component.css']
|
||||||
|
})
|
||||||
|
export class AppComponent {
|
||||||
|
title = 'OpenSlides 3';
|
||||||
|
constructor() { }
|
||||||
|
|
||||||
|
}
|
56
client/src/app/app.module.ts
Normal file
@ -0,0 +1,56 @@
|
|||||||
|
import { BrowserModule, Title } from '@angular/platform-browser';
|
||||||
|
import { NgModule } from '@angular/core';
|
||||||
|
import { FormsModule } from '@angular/forms'; // <-- NgModel lives here
|
||||||
|
import { HttpClientModule, HttpClientXsrfModule } from '@angular/common/http';
|
||||||
|
import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'
|
||||||
|
import { library } from '@fortawesome/fontawesome-svg-core'
|
||||||
|
import { fas } from '@fortawesome/free-solid-svg-icons';
|
||||||
|
|
||||||
|
import { AppComponent } from './app.component';
|
||||||
|
import { LoginComponent } from './login/login.component';
|
||||||
|
import { UsersComponent } from './users/users.component';
|
||||||
|
import { AppRoutingModule } from './/app-routing.module';
|
||||||
|
import { ProjectorComponent } from './projector/projector.component';
|
||||||
|
import { MotionsComponent } from './motions/motions.component';
|
||||||
|
import { AgendaComponent } from './agenda/agenda.component';
|
||||||
|
import { SiteComponent } from './site/site.component';
|
||||||
|
import { StartComponent } from './start/start.component';
|
||||||
|
import { AlertComponent } from './_directives/alert/alert.component';
|
||||||
|
import { AlertService } from './_services/alert.service';
|
||||||
|
|
||||||
|
//add font-awesome icons to library.
|
||||||
|
//will blow up the code.
|
||||||
|
library.add(fas);
|
||||||
|
|
||||||
|
@NgModule({
|
||||||
|
declarations: [
|
||||||
|
AppComponent,
|
||||||
|
LoginComponent,
|
||||||
|
UsersComponent,
|
||||||
|
ProjectorComponent,
|
||||||
|
MotionsComponent,
|
||||||
|
AgendaComponent,
|
||||||
|
SiteComponent,
|
||||||
|
StartComponent,
|
||||||
|
AlertComponent
|
||||||
|
],
|
||||||
|
imports: [
|
||||||
|
BrowserModule,
|
||||||
|
HttpClientModule,
|
||||||
|
HttpClientXsrfModule.withOptions({
|
||||||
|
cookieName: 'OpenSlidesCsrfToken',
|
||||||
|
headerName: 'X-CSRFToken',
|
||||||
|
}),
|
||||||
|
FormsModule,
|
||||||
|
FontAwesomeModule,
|
||||||
|
AppRoutingModule
|
||||||
|
],
|
||||||
|
providers: [
|
||||||
|
Title,
|
||||||
|
AlertService,
|
||||||
|
],
|
||||||
|
bootstrap: [
|
||||||
|
AppComponent
|
||||||
|
]
|
||||||
|
})
|
||||||
|
export class AppModule { }
|
13
client/src/app/base.component.ts
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
import { Title } from '@angular/platform-browser';
|
||||||
|
|
||||||
|
//provides functions that might be used by a lot of components
|
||||||
|
export abstract class BaseComponent {
|
||||||
|
private titleSuffix: string = " - OpenSlides 3";
|
||||||
|
|
||||||
|
constructor(protected titleService: Title) { }
|
||||||
|
|
||||||
|
setTitle(prefix: string) {
|
||||||
|
this.titleService.setTitle( prefix + this.titleSuffix );
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
9
client/src/app/login/login.component.css
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
.ngdialog-content {
|
||||||
|
width: 200px;
|
||||||
|
margin: auto;
|
||||||
|
background: #f0f0f0f0;
|
||||||
|
padding: 10px;
|
||||||
|
width: auto;
|
||||||
|
height: 100%;
|
||||||
|
flex-grow: 1;
|
||||||
|
}
|
34
client/src/app/login/login.component.html
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
<div class="ngdialog-content" role="document">
|
||||||
|
<form (ngSubmit)="onSubmit()" ngNativeValidate class="ng-valid ng-dirty ng-valid-parse">
|
||||||
|
<div class="modal-header">
|
||||||
|
<img src="/assets/img/openslides-logo.png" alt="OpenSlides" class="login-logo center-block">
|
||||||
|
</div>
|
||||||
|
<div class="modal-body loginForm">
|
||||||
|
{{info}}
|
||||||
|
<!-- Instead of the original approach, user alert component -->
|
||||||
|
<alert></alert>
|
||||||
|
|
||||||
|
<div class="input-group form-group">
|
||||||
|
<div class="input-group-addon">
|
||||||
|
<fa-icon icon="user"></fa-icon>
|
||||||
|
</div>
|
||||||
|
<input [(ngModel)]="user.username" os-focus-me="" type="text"
|
||||||
|
class="form-control input-lg ng-valid ng-not-empty ng-dirty ng-valid-parse ng-touched"
|
||||||
|
placeholder="Username" name="username">
|
||||||
|
</div>
|
||||||
|
<div class="input-group form-group">
|
||||||
|
<div class="input-group-addon">
|
||||||
|
<fa-icon icon="key"></fa-icon>
|
||||||
|
</div>
|
||||||
|
<input [(ngModel)]="user.password" type="password" class="form-control
|
||||||
|
input-lg ng-valid ng-not-empty ng-dirty
|
||||||
|
ng-valid-parse ng-touched" placeholder="Passwort" name="password">
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<button type="submit" class="btn btn-primary" translate="">
|
||||||
|
<span class="ng-scope">Anmelden</span>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</div>
|
25
client/src/app/login/login.component.spec.ts
Normal file
@ -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<LoginComponent>;
|
||||||
|
|
||||||
|
beforeEach(async(() => {
|
||||||
|
TestBed.configureTestingModule({
|
||||||
|
declarations: [ LoginComponent ]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
}));
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
fixture = TestBed.createComponent(LoginComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
68
client/src/app/login/login.component.ts
Normal file
@ -0,0 +1,68 @@
|
|||||||
|
import { Component, OnInit } from '@angular/core';
|
||||||
|
import { Router } from '@angular/router';
|
||||||
|
import { Title } from '@angular/platform-browser';
|
||||||
|
|
||||||
|
import { BaseComponent } from '../base.component';
|
||||||
|
import { User } from '../users/user';
|
||||||
|
import { AuthenticationService } from '../_services/authentication.service';
|
||||||
|
import { AlertService } from '../_services/alert.service';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-login',
|
||||||
|
templateUrl: './login.component.html',
|
||||||
|
styleUrls: ['./login.component.css']
|
||||||
|
})
|
||||||
|
export class LoginComponent extends BaseComponent implements OnInit {
|
||||||
|
user: User = {
|
||||||
|
username: '',
|
||||||
|
password: ''
|
||||||
|
};
|
||||||
|
info: string;
|
||||||
|
|
||||||
|
constructor(
|
||||||
|
titleService: Title,
|
||||||
|
private authenticationService: AuthenticationService,
|
||||||
|
private alertService: AlertService,
|
||||||
|
private router: Router,
|
||||||
|
) {
|
||||||
|
super(titleService);
|
||||||
|
this.setInfo();
|
||||||
|
}
|
||||||
|
|
||||||
|
ngOnInit() {
|
||||||
|
//TODO translate
|
||||||
|
super.setTitle("Anmelden");
|
||||||
|
}
|
||||||
|
|
||||||
|
setInfo() {
|
||||||
|
this.info = 'Logged in? ' + (this.authenticationService.isLoggedIn ? 'in' : 'out');
|
||||||
|
}
|
||||||
|
|
||||||
|
//Todo: This serves as a prototype and need enhancement,
|
||||||
|
//like saving a "logged in state" and real checking the server
|
||||||
|
//if logIn was fine
|
||||||
|
onSubmit() {
|
||||||
|
this.authenticationService.loginUser(this.user).subscribe(
|
||||||
|
res => {
|
||||||
|
if (res.status === 400) {
|
||||||
|
//TODO, add more errors here, use translation
|
||||||
|
this.alertService.error("Benutzername oder Passwort war nicht korrekt.");
|
||||||
|
} else {
|
||||||
|
this.alertService.success("Logged in! :)");
|
||||||
|
this.setInfo();
|
||||||
|
if (this.authenticationService.isLoggedIn) {
|
||||||
|
localStorage.setItem("username", res.user.username);
|
||||||
|
|
||||||
|
// Get the redirect URL from our auth service
|
||||||
|
// If no redirect has been set, use the default
|
||||||
|
let redirect = this.authenticationService.redirectUrl ?
|
||||||
|
this.authenticationService.redirectUrl : '/';
|
||||||
|
|
||||||
|
// Redirect the user
|
||||||
|
this.router.navigate([redirect]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
0
client/src/app/motions/motions.component.css
Normal file
3
client/src/app/motions/motions.component.html
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
<p>
|
||||||
|
motions works!
|
||||||
|
</p>
|
25
client/src/app/motions/motions.component.spec.ts
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { MotionsComponent } from './motions.component';
|
||||||
|
|
||||||
|
describe('MotionsComponent', () => {
|
||||||
|
let component: MotionsComponent;
|
||||||
|
let fixture: ComponentFixture<MotionsComponent>;
|
||||||
|
|
||||||
|
beforeEach(async(() => {
|
||||||
|
TestBed.configureTestingModule({
|
||||||
|
declarations: [ MotionsComponent ]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
}));
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
fixture = TestBed.createComponent(MotionsComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
20
client/src/app/motions/motions.component.ts
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
import { Component, OnInit } from '@angular/core';
|
||||||
|
import { BaseComponent } from '../base.component';
|
||||||
|
import { Title } from '@angular/platform-browser';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-motions',
|
||||||
|
templateUrl: './motions.component.html',
|
||||||
|
styleUrls: ['./motions.component.css']
|
||||||
|
})
|
||||||
|
export class MotionsComponent extends BaseComponent implements OnInit {
|
||||||
|
|
||||||
|
constructor(titleService: Title) {
|
||||||
|
super(titleService)
|
||||||
|
}
|
||||||
|
|
||||||
|
ngOnInit() {
|
||||||
|
super.setTitle("Motions");
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
0
client/src/app/projector/projector.component.css
Normal file
3
client/src/app/projector/projector.component.html
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
<p>
|
||||||
|
projector works!
|
||||||
|
</p>
|
25
client/src/app/projector/projector.component.spec.ts
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { ProjectorComponent } from './projector.component';
|
||||||
|
|
||||||
|
describe('ProjectorComponent', () => {
|
||||||
|
let component: ProjectorComponent;
|
||||||
|
let fixture: ComponentFixture<ProjectorComponent>;
|
||||||
|
|
||||||
|
beforeEach(async(() => {
|
||||||
|
TestBed.configureTestingModule({
|
||||||
|
declarations: [ ProjectorComponent ]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
}));
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
fixture = TestBed.createComponent(ProjectorComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
20
client/src/app/projector/projector.component.ts
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
import { Component, OnInit } from '@angular/core';
|
||||||
|
import { BaseComponent } from '../base.component';
|
||||||
|
import { Title } from '@angular/platform-browser';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-projector',
|
||||||
|
templateUrl: './projector.component.html',
|
||||||
|
styleUrls: ['./projector.component.css']
|
||||||
|
})
|
||||||
|
export class ProjectorComponent extends BaseComponent implements OnInit {
|
||||||
|
|
||||||
|
constructor(protected titleService: Title) {
|
||||||
|
super(titleService)
|
||||||
|
}
|
||||||
|
|
||||||
|
ngOnInit() {
|
||||||
|
super.setTitle("Projector");
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
0
client/src/app/site/site.component.css
Normal file
3
client/src/app/site/site.component.html
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
<h1> The actual OpenSldies Content! <h2>
|
||||||
|
<router-outlet></router-outlet>
|
||||||
|
<footer>Footer</footer>
|
25
client/src/app/site/site.component.spec.ts
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { SiteComponent } from './site.component';
|
||||||
|
|
||||||
|
describe('SiteComponent', () => {
|
||||||
|
let component: SiteComponent;
|
||||||
|
let fixture: ComponentFixture<SiteComponent>;
|
||||||
|
|
||||||
|
beforeEach(async(() => {
|
||||||
|
TestBed.configureTestingModule({
|
||||||
|
declarations: [ SiteComponent ]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
}));
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
fixture = TestBed.createComponent(SiteComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
15
client/src/app/site/site.component.ts
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
import { Component, OnInit } from '@angular/core';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-site',
|
||||||
|
templateUrl: './site.component.html',
|
||||||
|
styleUrls: ['./site.component.css']
|
||||||
|
})
|
||||||
|
export class SiteComponent implements OnInit {
|
||||||
|
|
||||||
|
constructor() { }
|
||||||
|
|
||||||
|
ngOnInit() {
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
0
client/src/app/start/start.component.css
Normal file
3
client/src/app/start/start.component.html
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
<p>
|
||||||
|
start works!
|
||||||
|
</p>
|
25
client/src/app/start/start.component.spec.ts
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { StartComponent } from './start.component';
|
||||||
|
|
||||||
|
describe('StartComponent', () => {
|
||||||
|
let component: StartComponent;
|
||||||
|
let fixture: ComponentFixture<StartComponent>;
|
||||||
|
|
||||||
|
beforeEach(async(() => {
|
||||||
|
TestBed.configureTestingModule({
|
||||||
|
declarations: [ StartComponent ]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
}));
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
fixture = TestBed.createComponent(StartComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
20
client/src/app/start/start.component.ts
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
import { Component, OnInit } from '@angular/core';
|
||||||
|
import { BaseComponent } from '../base.component';
|
||||||
|
import { Title } from '@angular/platform-browser';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-start',
|
||||||
|
templateUrl: './start.component.html',
|
||||||
|
styleUrls: ['./start.component.css']
|
||||||
|
})
|
||||||
|
export class StartComponent extends BaseComponent implements OnInit {
|
||||||
|
|
||||||
|
constructor(titleService: Title) {
|
||||||
|
super(titleService)
|
||||||
|
}
|
||||||
|
|
||||||
|
ngOnInit() {
|
||||||
|
super.setTitle("Start page");
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
4
client/src/app/users/user.ts
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
export class User {
|
||||||
|
username: string;
|
||||||
|
password: string;
|
||||||
|
}
|
0
client/src/app/users/users.component.css
Normal file
3
client/src/app/users/users.component.html
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
<p>
|
||||||
|
users works!
|
||||||
|
</p>
|
25
client/src/app/users/users.component.spec.ts
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { UsersComponent } from './users.component';
|
||||||
|
|
||||||
|
describe('UsersComponent', () => {
|
||||||
|
let component: UsersComponent;
|
||||||
|
let fixture: ComponentFixture<UsersComponent>;
|
||||||
|
|
||||||
|
beforeEach(async(() => {
|
||||||
|
TestBed.configureTestingModule({
|
||||||
|
declarations: [ UsersComponent ]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
}));
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
fixture = TestBed.createComponent(UsersComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
15
client/src/app/users/users.component.ts
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
import { Component, OnInit } from '@angular/core';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-users',
|
||||||
|
templateUrl: './users.component.html',
|
||||||
|
styleUrls: ['./users.component.css']
|
||||||
|
})
|
||||||
|
export class UsersComponent implements OnInit {
|
||||||
|
|
||||||
|
constructor() { }
|
||||||
|
|
||||||
|
ngOnInit() {
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
0
client/src/assets/.gitkeep
Normal file
BIN
client/src/assets/img/favicon.png
Normal file
After Width: | Height: | Size: 581 B |
BIN
client/src/assets/img/logo-projector.png
Normal file
After Width: | Height: | Size: 2.9 KiB |
BIN
client/src/assets/img/nav_active.png
Normal file
After Width: | Height: | Size: 1.1 KiB |
BIN
client/src/assets/img/nav_dark-bg.png
Normal file
After Width: | Height: | Size: 925 B |
BIN
client/src/assets/img/nav_projector_sidebar_min.png
Normal file
After Width: | Height: | Size: 1.1 KiB |
BIN
client/src/assets/img/openslides-logo-dark.png
Normal file
After Width: | Height: | Size: 4.0 KiB |
BIN
client/src/assets/img/openslides-logo.png
Normal file
After Width: | Height: | Size: 6.0 KiB |
9
client/src/browserslist
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
# This file is currently used by autoprefixer to adjust CSS to support the below specified browsers
|
||||||
|
# For additional information regarding the format and rule options, please see:
|
||||||
|
# https://github.com/browserslist/browserslist#queries
|
||||||
|
# For IE 9-11 support, please uncomment the last line of the file and adjust as needed
|
||||||
|
> 0.5%
|
||||||
|
last 2 versions
|
||||||
|
Firefox ESR
|
||||||
|
not dead
|
||||||
|
# IE 9-11
|
3
client/src/environments/environment.prod.ts
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
export const environment = {
|
||||||
|
production: true
|
||||||
|
};
|
15
client/src/environments/environment.ts
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
// This file can be replaced during build by using the `fileReplacements` array.
|
||||||
|
// `ng build ---prod` replaces `environment.ts` with `environment.prod.ts`.
|
||||||
|
// The list of file replacements can be found in `angular.json`.
|
||||||
|
|
||||||
|
export const environment = {
|
||||||
|
production: false
|
||||||
|
};
|
||||||
|
|
||||||
|
/*
|
||||||
|
* In development mode, to ignore zone related error stack frames such as
|
||||||
|
* `zone.run`, `zoneDelegate.invokeTask` for easier debugging, you can
|
||||||
|
* import the following file, but please comment it out in production mode
|
||||||
|
* because it will have performance impact when throw error
|
||||||
|
*/
|
||||||
|
// import 'zone.js/dist/zone-error'; // Included with Angular CLI.
|
14
client/src/index.html
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
<!doctype html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<title>OpenSlides 3</title>
|
||||||
|
<base href="/">
|
||||||
|
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
<link rel="icon" type="image/x-icon" href="assets/img/favicon.png">
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<app-root></app-root>
|
||||||
|
</body>
|
||||||
|
</html>
|
31
client/src/karma.conf.js
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
// Karma configuration file, see link for more information
|
||||||
|
// https://karma-runner.github.io/1.0/config/configuration-file.html
|
||||||
|
|
||||||
|
module.exports = function (config) {
|
||||||
|
config.set({
|
||||||
|
basePath: '',
|
||||||
|
frameworks: ['jasmine', '@angular-devkit/build-angular'],
|
||||||
|
plugins: [
|
||||||
|
require('karma-jasmine'),
|
||||||
|
require('karma-chrome-launcher'),
|
||||||
|
require('karma-jasmine-html-reporter'),
|
||||||
|
require('karma-coverage-istanbul-reporter'),
|
||||||
|
require('@angular-devkit/build-angular/plugins/karma')
|
||||||
|
],
|
||||||
|
client: {
|
||||||
|
clearContext: false // leave Jasmine Spec Runner output visible in browser
|
||||||
|
},
|
||||||
|
coverageIstanbulReporter: {
|
||||||
|
dir: require('path').join(__dirname, '../coverage'),
|
||||||
|
reports: ['html', 'lcovonly'],
|
||||||
|
fixWebpackSourcePaths: true
|
||||||
|
},
|
||||||
|
reporters: ['progress', 'kjhtml'],
|
||||||
|
port: 9876,
|
||||||
|
colors: true,
|
||||||
|
logLevel: config.LOG_INFO,
|
||||||
|
autoWatch: true,
|
||||||
|
browsers: ['Chrome'],
|
||||||
|
singleRun: false
|
||||||
|
});
|
||||||
|
};
|
12
client/src/main.ts
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
import { enableProdMode } from '@angular/core';
|
||||||
|
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
|
||||||
|
|
||||||
|
import { AppModule } from './app/app.module';
|
||||||
|
import { environment } from './environments/environment';
|
||||||
|
|
||||||
|
if (environment.production) {
|
||||||
|
enableProdMode();
|
||||||
|
}
|
||||||
|
|
||||||
|
platformBrowserDynamic().bootstrapModule(AppModule)
|
||||||
|
.catch(err => console.log(err));
|
80
client/src/polyfills.ts
Normal file
@ -0,0 +1,80 @@
|
|||||||
|
/**
|
||||||
|
* This file includes polyfills needed by Angular and is loaded before the app.
|
||||||
|
* You can add your own extra polyfills to this file.
|
||||||
|
*
|
||||||
|
* This file is divided into 2 sections:
|
||||||
|
* 1. Browser polyfills. These are applied before loading ZoneJS and are sorted by browsers.
|
||||||
|
* 2. Application imports. Files imported after ZoneJS that should be loaded before your main
|
||||||
|
* file.
|
||||||
|
*
|
||||||
|
* The current setup is for so-called "evergreen" browsers; the last versions of browsers that
|
||||||
|
* automatically update themselves. This includes Safari >= 10, Chrome >= 55 (including Opera),
|
||||||
|
* Edge >= 13 on the desktop, and iOS 10 and Chrome on mobile.
|
||||||
|
*
|
||||||
|
* Learn more in https://angular.io/docs/ts/latest/guide/browser-support.html
|
||||||
|
*/
|
||||||
|
|
||||||
|
/***************************************************************************************************
|
||||||
|
* BROWSER POLYFILLS
|
||||||
|
*/
|
||||||
|
|
||||||
|
/** IE9, IE10 and IE11 requires all of the following polyfills. **/
|
||||||
|
// import 'core-js/es6/symbol';
|
||||||
|
// import 'core-js/es6/object';
|
||||||
|
// import 'core-js/es6/function';
|
||||||
|
// import 'core-js/es6/parse-int';
|
||||||
|
// import 'core-js/es6/parse-float';
|
||||||
|
// import 'core-js/es6/number';
|
||||||
|
// import 'core-js/es6/math';
|
||||||
|
// import 'core-js/es6/string';
|
||||||
|
// import 'core-js/es6/date';
|
||||||
|
// import 'core-js/es6/array';
|
||||||
|
// import 'core-js/es6/regexp';
|
||||||
|
// import 'core-js/es6/map';
|
||||||
|
// import 'core-js/es6/weak-map';
|
||||||
|
// import 'core-js/es6/set';
|
||||||
|
|
||||||
|
/** IE10 and IE11 requires the following for NgClass support on SVG elements */
|
||||||
|
// import 'classlist.js'; // Run `npm install --save classlist.js`.
|
||||||
|
|
||||||
|
/** IE10 and IE11 requires the following for the Reflect API. */
|
||||||
|
// import 'core-js/es6/reflect';
|
||||||
|
|
||||||
|
|
||||||
|
/** Evergreen browsers require these. **/
|
||||||
|
// Used for reflect-metadata in JIT. If you use AOT (and only Angular decorators), you can remove.
|
||||||
|
import 'core-js/es7/reflect';
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Web Animations `@angular/platform-browser/animations`
|
||||||
|
* Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
|
||||||
|
* Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0).
|
||||||
|
**/
|
||||||
|
// import 'web-animations-js'; // Run `npm install --save web-animations-js`.
|
||||||
|
|
||||||
|
/**
|
||||||
|
* By default, zone.js will patch all possible macroTask and DomEvents
|
||||||
|
* user can disable parts of macroTask/DomEvents patch by setting following flags
|
||||||
|
*/
|
||||||
|
|
||||||
|
// (window as any).__Zone_disable_requestAnimationFrame = true; // disable patch requestAnimationFrame
|
||||||
|
// (window as any).__Zone_disable_on_property = true; // disable patch onProperty such as onclick
|
||||||
|
// (window as any).__zone_symbol__BLACK_LISTED_EVENTS = ['scroll', 'mousemove']; // disable patch specified eventNames
|
||||||
|
|
||||||
|
/*
|
||||||
|
* in IE/Edge developer tools, the addEventListener will also be wrapped by zone.js
|
||||||
|
* with the following flag, it will bypass `zone.js` patch for IE/Edge
|
||||||
|
*/
|
||||||
|
// (window as any).__Zone_enable_cross_context_check = true;
|
||||||
|
|
||||||
|
/***************************************************************************************************
|
||||||
|
* Zone JS is required by default for Angular itself.
|
||||||
|
*/
|
||||||
|
import 'zone.js/dist/zone'; // Included with Angular CLI.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/***************************************************************************************************
|
||||||
|
* APPLICATION IMPORTS
|
||||||
|
*/
|
1
client/src/styles.css
Normal file
@ -0,0 +1 @@
|
|||||||
|
@import '~bootstrap/dist/css/bootstrap.min.css';
|
20
client/src/test.ts
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
// This file is required by karma.conf.js and loads recursively all the .spec and framework files
|
||||||
|
|
||||||
|
import 'zone.js/dist/zone-testing';
|
||||||
|
import { getTestBed } from '@angular/core/testing';
|
||||||
|
import {
|
||||||
|
BrowserDynamicTestingModule,
|
||||||
|
platformBrowserDynamicTesting
|
||||||
|
} from '@angular/platform-browser-dynamic/testing';
|
||||||
|
|
||||||
|
declare const require: any;
|
||||||
|
|
||||||
|
// First, initialize the Angular testing environment.
|
||||||
|
getTestBed().initTestEnvironment(
|
||||||
|
BrowserDynamicTestingModule,
|
||||||
|
platformBrowserDynamicTesting()
|
||||||
|
);
|
||||||
|
// Then we find all the tests.
|
||||||
|
const context = require.context('./', true, /\.spec\.ts$/);
|
||||||
|
// And load the modules.
|
||||||
|
context.keys().map(context);
|
12
client/src/tsconfig.app.json
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
{
|
||||||
|
"extends": "../tsconfig.json",
|
||||||
|
"compilerOptions": {
|
||||||
|
"outDir": "../out-tsc/app",
|
||||||
|
"module": "es2015",
|
||||||
|
"types": []
|
||||||
|
},
|
||||||
|
"exclude": [
|
||||||
|
"src/test.ts",
|
||||||
|
"**/*.spec.ts"
|
||||||
|
]
|
||||||
|
}
|
19
client/src/tsconfig.spec.json
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
{
|
||||||
|
"extends": "../tsconfig.json",
|
||||||
|
"compilerOptions": {
|
||||||
|
"outDir": "../out-tsc/spec",
|
||||||
|
"module": "commonjs",
|
||||||
|
"types": [
|
||||||
|
"jasmine",
|
||||||
|
"node"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"files": [
|
||||||
|
"test.ts",
|
||||||
|
"polyfills.ts"
|
||||||
|
],
|
||||||
|
"include": [
|
||||||
|
"**/*.spec.ts",
|
||||||
|
"**/*.d.ts"
|
||||||
|
]
|
||||||
|
}
|
17
client/src/tslint.json
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
{
|
||||||
|
"extends": "../tslint.json",
|
||||||
|
"rules": {
|
||||||
|
"directive-selector": [
|
||||||
|
true,
|
||||||
|
"attribute",
|
||||||
|
"app",
|
||||||
|
"camelCase"
|
||||||
|
],
|
||||||
|
"component-selector": [
|
||||||
|
true,
|
||||||
|
"element",
|
||||||
|
"app",
|
||||||
|
"kebab-case"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
20
client/tsconfig.json
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
{
|
||||||
|
"compileOnSave": false,
|
||||||
|
"compilerOptions": {
|
||||||
|
"baseUrl": "./",
|
||||||
|
"outDir": "./dist/out-tsc",
|
||||||
|
"sourceMap": true,
|
||||||
|
"declaration": false,
|
||||||
|
"moduleResolution": "node",
|
||||||
|
"emitDecoratorMetadata": true,
|
||||||
|
"experimentalDecorators": true,
|
||||||
|
"target": "es5",
|
||||||
|
"typeRoots": [
|
||||||
|
"node_modules/@types"
|
||||||
|
],
|
||||||
|
"lib": [
|
||||||
|
"es2017",
|
||||||
|
"dom"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
130
client/tslint.json
Normal file
@ -0,0 +1,130 @@
|
|||||||
|
{
|
||||||
|
"rulesDirectory": [
|
||||||
|
"node_modules/codelyzer"
|
||||||
|
],
|
||||||
|
"rules": {
|
||||||
|
"arrow-return-shorthand": true,
|
||||||
|
"callable-types": true,
|
||||||
|
"class-name": true,
|
||||||
|
"comment-format": [
|
||||||
|
true,
|
||||||
|
"check-space"
|
||||||
|
],
|
||||||
|
"curly": true,
|
||||||
|
"deprecation": {
|
||||||
|
"severity": "warn"
|
||||||
|
},
|
||||||
|
"eofline": true,
|
||||||
|
"forin": true,
|
||||||
|
"import-blacklist": [
|
||||||
|
true,
|
||||||
|
"rxjs/Rx"
|
||||||
|
],
|
||||||
|
"import-spacing": true,
|
||||||
|
"indent": [
|
||||||
|
true,
|
||||||
|
"spaces"
|
||||||
|
],
|
||||||
|
"interface-over-type-literal": true,
|
||||||
|
"label-position": true,
|
||||||
|
"max-line-length": [
|
||||||
|
true,
|
||||||
|
140
|
||||||
|
],
|
||||||
|
"member-access": false,
|
||||||
|
"member-ordering": [
|
||||||
|
true,
|
||||||
|
{
|
||||||
|
"order": [
|
||||||
|
"static-field",
|
||||||
|
"instance-field",
|
||||||
|
"static-method",
|
||||||
|
"instance-method"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"no-arg": true,
|
||||||
|
"no-bitwise": true,
|
||||||
|
"no-console": [
|
||||||
|
true,
|
||||||
|
"debug",
|
||||||
|
"info",
|
||||||
|
"time",
|
||||||
|
"timeEnd",
|
||||||
|
"trace"
|
||||||
|
],
|
||||||
|
"no-construct": true,
|
||||||
|
"no-debugger": true,
|
||||||
|
"no-duplicate-super": true,
|
||||||
|
"no-empty": false,
|
||||||
|
"no-empty-interface": true,
|
||||||
|
"no-eval": true,
|
||||||
|
"no-inferrable-types": [
|
||||||
|
true,
|
||||||
|
"ignore-params"
|
||||||
|
],
|
||||||
|
"no-misused-new": true,
|
||||||
|
"no-non-null-assertion": true,
|
||||||
|
"no-shadowed-variable": true,
|
||||||
|
"no-string-literal": false,
|
||||||
|
"no-string-throw": true,
|
||||||
|
"no-switch-case-fall-through": true,
|
||||||
|
"no-trailing-whitespace": true,
|
||||||
|
"no-unnecessary-initializer": true,
|
||||||
|
"no-unused-expression": true,
|
||||||
|
"no-use-before-declare": true,
|
||||||
|
"no-var-keyword": true,
|
||||||
|
"object-literal-sort-keys": false,
|
||||||
|
"one-line": [
|
||||||
|
true,
|
||||||
|
"check-open-brace",
|
||||||
|
"check-catch",
|
||||||
|
"check-else",
|
||||||
|
"check-whitespace"
|
||||||
|
],
|
||||||
|
"prefer-const": true,
|
||||||
|
"quotemark": [
|
||||||
|
true,
|
||||||
|
"single"
|
||||||
|
],
|
||||||
|
"radix": true,
|
||||||
|
"semicolon": [
|
||||||
|
true,
|
||||||
|
"always"
|
||||||
|
],
|
||||||
|
"triple-equals": [
|
||||||
|
true,
|
||||||
|
"allow-null-check"
|
||||||
|
],
|
||||||
|
"typedef-whitespace": [
|
||||||
|
true,
|
||||||
|
{
|
||||||
|
"call-signature": "nospace",
|
||||||
|
"index-signature": "nospace",
|
||||||
|
"parameter": "nospace",
|
||||||
|
"property-declaration": "nospace",
|
||||||
|
"variable-declaration": "nospace"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"unified-signatures": true,
|
||||||
|
"variable-name": false,
|
||||||
|
"whitespace": [
|
||||||
|
true,
|
||||||
|
"check-branch",
|
||||||
|
"check-decl",
|
||||||
|
"check-operator",
|
||||||
|
"check-separator",
|
||||||
|
"check-type"
|
||||||
|
],
|
||||||
|
"no-output-on-prefix": true,
|
||||||
|
"use-input-property-decorator": true,
|
||||||
|
"use-output-property-decorator": true,
|
||||||
|
"use-host-property-decorator": true,
|
||||||
|
"no-input-rename": true,
|
||||||
|
"no-output-rename": true,
|
||||||
|
"use-life-cycle-interface": true,
|
||||||
|
"use-pipe-transform-interface": true,
|
||||||
|
"component-class-suffix": true,
|
||||||
|
"directive-class-suffix": true
|
||||||
|
}
|
||||||
|
}
|