ag-admin
/
OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cleanup and refractor code 

-combine the features of the two previous commits
-add prettier and pretty-quick
-more routing and logout button
This commit is contained in:
Sean Engelhardt 2018-06-19 16:55:50 +02:00 committed by FinnStutzenstein
parent 3f78ba1f3d
commit 42473e1a8a
95 changed files with 13559 additions and 11886 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/.editorconfig
View File

@ -4,7 +4,7 @@ root = true
[*] [*]
charset = utf-8 charset = utf-8
indent_style = space indent_style = space
indent_size = 2 indent_size = 4
insert_final_newline = true insert_final_newline = true
trim_trailing_whitespace = true trim_trailing_whitespace = true

8
client/.prettierrc Normal file
View File

@ -0,0 +1,8 @@
{
"printWidth": 120,
"singleQuote": true,
"useTabs": false,
"tabWidth": 4,
"semi": true,
"bracketSpacing": true
}

6
client/README.md
View File

@ -5,6 +5,8 @@ Prototype application for OpenSlides 3.0 (Client)
## Development server ## 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. 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 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`

223
client/angular.json
View File

@ -1,127 +1,110 @@
{ {
"$schema": "./node_modules/@angular/cli/lib/config/schema.json", "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"version": 1, "version": 1,
"newProjectRoot": "projects", "newProjectRoot": "projects",
"projects": { "projects": {
"client": { "client": {
"root": "", "root": "",
"sourceRoot": "src", "sourceRoot": "src",
"projectType": "application", "projectType": "application",
"prefix": "app", "prefix": "app",
"schematics": {}, "schematics": {},
"architect": { "architect": {
"build": { "build": {
"builder": "@angular-devkit/build-angular:browser", "builder": "@angular-devkit/build-angular:browser",
"options": { "options": {
"outputPath": "dist/client", "outputPath": "dist/client",
"index": "src/index.html", "index": "src/index.html",
"main": "src/main.ts", "main": "src/main.ts",
"polyfills": "src/polyfills.ts", "polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.app.json", "tsConfig": "src/tsconfig.app.json",
"assets": [ "assets": ["src/favicon.ico", "src/assets"],
"src/favicon.ico", "styles": ["src/styles.css"],
"src/assets" "scripts": []
], },
"styles": [ "configurations": {
"src/styles.css" "production": {
], "fileReplacements": [
"scripts": [] {
}, "replace": "src/environments/environment.ts",
"configurations": { "with": "src/environments/environment.prod.ts"
"production": { }
"fileReplacements": [ ],
{ "optimization": true,
"replace": "src/environments/environment.ts", "outputHashing": "all",
"with": "src/environments/environment.prod.ts" "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/**"]
}
} }
],
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true
} }
}
}, },
"serve": { "client-e2e": {
"builder": "@angular-devkit/build-angular:dev-server", "root": "e2e/",
"options": { "projectType": "application",
"browserTarget": "client:build" "architect": {
}, "e2e": {
"configurations": { "builder": "@angular-devkit/build-angular:protractor",
"production": { "options": {
"browserTarget": "client:build:production" "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/**"]
}
}
} }
}
},
"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": { "defaultProject": "client"
"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"
}

42
client/e2e/protractor.conf.js
View File

@ -4,25 +4,23 @@
const { SpecReporter } = require('jasmine-spec-reporter'); const { SpecReporter } = require('jasmine-spec-reporter');
exports.config = { exports.config = {
allScriptsTimeout: 11000, allScriptsTimeout: 11000,
specs: [ specs: ['./src/**/*.e2e-spec.ts'],
'./src/**/*.e2e-spec.ts' capabilities: {
], browserName: 'chrome'
capabilities: { },
'browserName': 'chrome' directConnect: true,
}, baseUrl: 'http://localhost:4200/',
directConnect: true, framework: 'jasmine',
baseUrl: 'http://localhost:4200/', jasmineNodeOpts: {
framework: 'jasmine', showColors: true,
jasmineNodeOpts: { defaultTimeoutInterval: 30000,
showColors: true, print: function() {}
defaultTimeoutInterval: 30000, },
print: function() {} onPrepare() {
}, require('ts-node').register({
onPrepare() { project: require('path').join(__dirname, './tsconfig.e2e.json')
require('ts-node').register({ });
project: require('path').join(__dirname, './tsconfig.e2e.json') jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
}); }
jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } })); };
}
};

20
client/e2e/tsconfig.e2e.json
View File

@ -1,13 +1,9 @@
{ {
"extends": "../tsconfig.json", "extends": "../tsconfig.json",
"compilerOptions": { "compilerOptions": {
"outDir": "../out-tsc/app", "outDir": "../out-tsc/app",
"module": "commonjs", "module": "commonjs",
"target": "es5", "target": "es5",
"types": [ "types": ["jasmine", "jasminewd2", "node"]
"jasmine", }
"jasminewd2", }
"node"
]
}
}

22370
client/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

106
client/package.json
View File

@ -1,52 +1,58 @@
{ {
"name": "client", "name": "OpenSlides3-Client",
"version": "0.0.0", "version": "0.0.0",
"scripts": { "scripts": {
"ng": "ng", "ng": "ng",
"start": "ng serve --proxy-config proxy.conf.json", "start": "ng serve --proxy-config proxy.conf.json",
"build": "ng build", "build": "ng build",
"test": "ng test", "test": "ng test",
"lint": "ng lint", "lint": "ng lint",
"e2e": "ng e2e" "e2e": "ng e2e",
}, "format:fix": "pretty-quick --staged",
"private": true, "precommit": "run-s format:fix lint"
"dependencies": { },
"@angular/animations": "^6.0.3", "private": true,
"@angular/common": "^6.0.3", "dependencies": {
"@angular/compiler": "^6.0.3", "@angular/animations": "^6.0.3",
"@angular/core": "^6.0.3", "@angular/common": "^6.0.3",
"@angular/forms": "^6.0.3", "@angular/compiler": "^6.0.3",
"@angular/http": "^6.0.3", "@angular/core": "^6.0.3",
"@angular/platform-browser": "^6.0.3", "@angular/forms": "^6.0.3",
"@angular/platform-browser-dynamic": "^6.0.3", "@angular/http": "^6.0.3",
"@angular/router": "^6.0.3", "@angular/platform-browser": "^6.0.3",
"@fortawesome/angular-fontawesome": "^0.1.0-10", "@angular/platform-browser-dynamic": "^6.0.3",
"@fortawesome/fontawesome-svg-core": "^1.2.0-11", "@angular/router": "^6.0.3",
"@fortawesome/free-solid-svg-icons": "^5.1.0-11", "@fortawesome/angular-fontawesome": "^0.1.0-10",
"bootstrap": "^3.3.7", "@fortawesome/fontawesome-svg-core": "^1.2.0-11",
"core-js": "^2.5.4", "@fortawesome/free-solid-svg-icons": "^5.1.0-11",
"rxjs": "^6.0.0", "bootstrap": "^3.3.7",
"zone.js": "^0.8.26" "core-js": "^2.5.4",
}, "rxjs": "^6.0.0",
"devDependencies": { "zone.js": "^0.8.26"
"@angular-devkit/build-angular": "~0.6.8", },
"@angular/cli": "~6.0.8", "devDependencies": {
"@angular/compiler-cli": "^6.0.3", "@angular-devkit/build-angular": "~0.6.8",
"@angular/language-service": "^6.0.3", "@angular/cli": "~6.0.8",
"@types/jasmine": "~2.8.6", "@angular/compiler-cli": "^6.0.3",
"@types/jasminewd2": "~2.0.3", "@angular/language-service": "^6.0.3",
"@types/node": "~8.9.4", "@types/jasmine": "~2.8.6",
"codelyzer": "~4.2.1", "@types/jasminewd2": "~2.0.3",
"jasmine-core": "~2.99.1", "@types/node": "~8.9.4",
"jasmine-spec-reporter": "~4.2.1", "codelyzer": "~4.2.1",
"karma": "~1.7.1", "husky": "^0.14.3",
"karma-chrome-launcher": "~2.2.0", "jasmine-core": "~2.99.1",
"karma-coverage-istanbul-reporter": "~2.0.0", "jasmine-spec-reporter": "~4.2.1",
"karma-jasmine": "~1.1.1", "karma": "^2.0.3",
"karma-jasmine-html-reporter": "^0.2.2", "karma-chrome-launcher": "~2.2.0",
"protractor": "~5.3.0", "karma-coverage-istanbul-reporter": "~2.0.0",
"ts-node": "~5.0.1", "karma-jasmine": "~1.1.1",
"tslint": "~5.9.1", "karma-jasmine-html-reporter": "^0.2.2",
"typescript": "~2.7.2" "npm-run-all": "^4.1.3",
} "prettier": "^1.13.5",
"pretty-quick": "^1.6.0",
"protractor": "~5.3.0",
"ts-node": "~5.0.1",
"tslint": "~5.9.1",
"typescript": "~2.7.2"
}
} }

25
client/src/app/agenda/agenda.component.spec.ts
View File

@ -1,25 +0,0 @@
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();
});
});

17
client/src/app/agenda/agenda.component.ts
View File

@ -1,17 +0,0 @@
import { Component, OnInit } from '@angular/core';
import { TitleService } from '../core/title.service';
@Component({
selector: 'app-agenda',
templateUrl: './agenda.component.html',
styleUrls: ['./agenda.component.css']
})
export class AgendaComponent implements OnInit {
constructor(private titleService: TitleService) {
}
ngOnInit() {
this.titleService.setTitle("Agenda");
}
}

14
client/src/app/app-routing.module.spec.ts
View File

@ -1,13 +1,13 @@
import { AppRoutingModule } from './app-routing.module'; import { AppRoutingModule } from './app-routing.module';
describe('AppRoutingModule', () => { describe('AppRoutingModule', () => {
let appRoutingModule: AppRoutingModule; let appRoutingModule: AppRoutingModule;
beforeEach(() => { beforeEach(() => {
appRoutingModule = new AppRoutingModule(); appRoutingModule = new AppRoutingModule();
}); });
it('should create an instance', () => { it('should create an instance', () => {
expect(appRoutingModule).toBeTruthy(); expect(appRoutingModule).toBeTruthy();
}); });
}); });

28
client/src/app/app-routing.module.ts
View File

@ -1,37 +1,35 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router'; import { RouterModule, Routes } from '@angular/router';
import { ProjectorComponent } from "./projector/projector.component"; import { LoginComponent } from './site/login/login.component';
import { ProjectorContainerComponent } from "./projector/projector-container.component"; import { ProjectorComponent } from './projector/projector.component';
import { StartComponent } from "./site/start.component"; import { ProjectorContainerComponent } from './projector/projector-container/projector-container.component';
import { AgendaComponent } from "./agenda/agenda.component"; import { SiteComponent } from './site/site.component';
import { MotionsComponent } from "./motions/motions.component"; import { StartComponent } from './site/start/start.component';
import { SiteComponent } from "./site/site.component"; import { AgendaComponent } from './site/agenda/agenda.component';
import { LoginComponent } from './users/login.component'; import { MotionsComponent } from './site/motions/motions.component';
import { RouterAuthGuard } from "./core/router-auth-guard.service"; import { AuthGuard } from './core/services/auth-guard.service';
const routes: Routes = [ const routes: Routes = [
{ path: 'projector/:id', component: ProjectorComponent }, { path: 'projector/:id', component: ProjectorComponent },
//{ path: 'projector', redirect: 'projector/1' }, // Test this
{ path: 'real-projector/:id', component: ProjectorContainerComponent }, { path: 'real-projector/:id', component: ProjectorContainerComponent },
//{ path: 'real-projector', redirect: 'real-projector/1' }, // this too { path: 'login', component: LoginComponent },
{ {
path: '', path: '',
component: SiteComponent, component: SiteComponent,
canActivate: [RouterAuthGuard], canActivate: [AuthGuard],
children: [ children: [
{ path: '', component: StartComponent }, { path: '', component: StartComponent },
{ path: 'login', component: LoginComponent },
{ path: 'agenda', component: AgendaComponent }, { path: 'agenda', component: AgendaComponent },
{ path: 'motions', component: MotionsComponent }, { path: 'motions', component: MotionsComponent }
] ]
}, },
{ path: '**', redirectTo: '' }, { path: '**', redirectTo: '' }
]; ];
@NgModule({ @NgModule({
imports: [RouterModule.forRoot(routes)], imports: [RouterModule.forRoot(routes)],
exports: [RouterModule] exports: [RouterModule]
}) })
export class AppRoutingModule { } export class AppRoutingModule {}

2
client/src/app/app.component.css
View File

@ -4,4 +4,4 @@
.login-logo { .login-logo {
width: 250px; width: 250px;
} }

2
client/src/app/app.component.html
View File

@ -1 +1 @@
<router-outlet></router-outlet> <router-outlet></router-outlet>

44
client/src/app/app.component.spec.ts
View File

@ -1,27 +1,25 @@
import { TestBed, async } from '@angular/core/testing'; import { TestBed, async } from '@angular/core/testing';
import { AppComponent } from './app.component'; import { AppComponent } from './app.component';
describe('AppComponent', () => { describe('AppComponent', () => {
beforeEach(async(() => { beforeEach(async(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
declarations: [ declarations: [AppComponent]
AppComponent }).compileComponents();
], }));
}).compileComponents(); it('should create the app', async(() => {
})); const fixture = TestBed.createComponent(AppComponent);
it('should create the app', async(() => { const app = fixture.debugElement.componentInstance;
const fixture = TestBed.createComponent(AppComponent); expect(app).toBeTruthy();
const app = fixture.debugElement.componentInstance; }));
expect(app).toBeTruthy(); it(`should have as title 'app'`, async(() => {
})); const fixture = TestBed.createComponent(AppComponent);
it(`should have as title 'app'`, async(() => { const app = fixture.debugElement.componentInstance;
const fixture = TestBed.createComponent(AppComponent); expect(app.title).toEqual('app');
const app = fixture.debugElement.componentInstance; }));
expect(app.title).toEqual('app'); it('should render title in a h1 tag', async(() => {
})); const fixture = TestBed.createComponent(AppComponent);
it('should render title in a h1 tag', async(() => { fixture.detectChanges();
const fixture = TestBed.createComponent(AppComponent); const compiled = fixture.debugElement.nativeElement;
fixture.detectChanges(); expect(compiled.querySelector('h1').textContent).toContain('Welcome to client!');
const compiled = fixture.debugElement.nativeElement; }));
expect(compiled.querySelector('h1').textContent).toContain('Welcome to client!');
}));
}); });

10
client/src/app/app.component.ts
View File

@ -1,13 +1,13 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { OpenSlidesService } from './core/openslides.service'; import { OpenslidesService } from './core/services/openslides.service';
@Component({ @Component({
selector: 'app-root', selector: 'app-root',
templateUrl: './app.component.html', templateUrl: './app.component.html',
styleUrls: ['./app.component.css'] styleUrls: ['./app.component.css']
}) })
export class AppComponent implements OnInit { export class AppComponent implements OnInit {
constructor(private openSlides: OpenSlidesService) { } constructor(private openSlides: OpenslidesService) {}
ngOnInit() { ngOnInit() {
this.openSlides.bootup(); this.openSlides.bootup();

77
client/src/app/app.module.ts
View File

@ -2,57 +2,52 @@ import { BrowserModule, Title } from '@angular/platform-browser';
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { FormsModule } from '@angular/forms'; // <-- NgModel lives here import { FormsModule } from '@angular/forms'; // <-- NgModel lives here
import { HttpClientModule, HttpClientXsrfModule } from '@angular/common/http'; import { HttpClientModule, HttpClientXsrfModule } from '@angular/common/http';
import { FontAwesomeModule } from '@fortawesome/angular-fontawesome' import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
import { library } from '@fortawesome/fontawesome-svg-core' import { library } from '@fortawesome/fontawesome-svg-core';
import { fas } from '@fortawesome/free-solid-svg-icons'; import { fas } from '@fortawesome/free-solid-svg-icons';
import { AppComponent } from './app.component'; import { AppComponent } from './app.component';
import { LoginComponent } from './users/login.component'; import { LoginComponent } from './site/login/login.component';
import { UsersComponent } from './users/users.component';
import { AppRoutingModule } from './app-routing.module'; import { AppRoutingModule } from './app-routing.module';
import { ProjectorComponent } from './projector/projector.component'; import { ProjectorComponent } from './projector/projector.component';
import { ProjectorContainerComponent } from './projector/projector-container.component'; import { MotionsComponent } from './site/motions/motions.component';
import { MotionsComponent } from './motions/motions.component'; import { AgendaComponent } from './site/agenda/agenda.component';
import { AgendaComponent } from './agenda/agenda.component';
import { SiteComponent } from './site/site.component'; import { SiteComponent } from './site/site.component';
import { StartComponent } from './site/start.component'; import { StartComponent } from './site/start/start.component';
import { AlertComponent } from './site/alert.component'; import { ToastComponent } from './core/directives/toast/toast.component';
import { AlertService } from './site/alert.service'; import { ToastService } from './core/services/toast.service';
import { ProjectorContainerComponent } from './projector/projector-container/projector-container.component';
import { AlertComponent } from './core/directives/alert/alert.component';
//add font-awesome icons to library. //add font-awesome icons to library.
//will blow up the code. //will blow up the code.
library.add(fas); library.add(fas);
@NgModule({ @NgModule({
declarations: [ declarations: [
AppComponent, AppComponent,
LoginComponent, LoginComponent,
UsersComponent, ProjectorComponent,
ProjectorComponent, MotionsComponent,
ProjectorContainerComponent, AgendaComponent,
MotionsComponent, SiteComponent,
AgendaComponent, StartComponent,
SiteComponent, ToastComponent,
StartComponent, ProjectorContainerComponent,
AlertComponent AlertComponent
], ],
imports: [ imports: [
BrowserModule, BrowserModule,
HttpClientModule, HttpClientModule,
HttpClientXsrfModule.withOptions({ HttpClientXsrfModule.withOptions({
cookieName: 'OpenSlidesCsrfToken', cookieName: 'OpenSlidesCsrfToken',
headerName: 'X-CSRFToken', headerName: 'X-CSRFToken'
}), }),
FormsModule, FormsModule,
FontAwesomeModule, FontAwesomeModule,
AppRoutingModule AppRoutingModule
], ],
providers: [ providers: [Title, ToastService],
Title, bootstrap: [AppComponent]
AlertService,
],
bootstrap: [
AppComponent
]
}) })
export class AppModule { } export class AppModule {}

12
client/src/app/base.component.ts Normal file
View File

@ -0,0 +1,12 @@
import { Title } from '@angular/platform-browser';
//provides functions that might be used by a lot of components
export abstract class BaseComponent {
private titleSuffix = ' - OpenSlides 3';
constructor(protected titleService: Title) {}
setTitle(prefix: string) {
this.titleService.setTitle(prefix + this.titleSuffix);
}
}

15
client/src/app/core/auth.service.spec.ts
View File

@ -1,15 +0,0 @@
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();
}));
});

81
client/src/app/core/auth.service.ts
View File

@ -1,81 +0,0 @@
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'
})
};
export interface LoginResponse {
user_id: number;
user: User;
}
export interface WhoAmIResponse extends LoginResponse {
guest_enabled: boolean;
}
@Injectable({
providedIn: 'root'
})
export class AuthService {
isLoggedIn: boolean = false;
// store the URL so we can redirect after logging in
redirectUrl: string;
constructor(private http: HttpClient) { }
// Initialize the service by querying the server
init(): Observable<WhoAmIResponse | {}> {
return this.http.get<WhoAmIResponse>('users/whoami', httpOptions)
.pipe(
catchError(this.handleError())
);
}
loginUser(user: User): Observable<LoginResponse | {}> {
return this.http.post<LoginResponse>('users/login', user, httpOptions)
.pipe(
tap(val => {
console.log(val)
}),
catchError(this.handleError())
);
}
//logout the user
//TODO reboot openslides
logout(): any {
console.log("logout");
// TODO Why isn't the request send??
let t = this.http.post('users/logout', undefined, httpOptions);
/*.pipe(
tap(val => {
console.log(val)
}),
catchError(this.handleError())
);*/
console.log(t);
}
//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/site/alert.component.css → client/src/app/core/directives/alert/alert.component.css
View File

4
client/src/app/core/directives/alert/alert.component.html Normal file
View File

@ -0,0 +1,4 @@
<div *ngIf="alert" [ngClass]="cssClass(alert)" class="alert-dismissable">
{{alert.message}}
<a class="close" (click)="removeAlert(alert)">&times;</a>
</div>

24
client/src/app/core/directives/alert/alert.component.spec.ts Normal file
View File

@ -0,0 +1,24 @@
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();
});
});

8
client/src/app/site/alert.component.ts → client/src/app/core/directives/alert/alert.component.ts
View File

@ -1,18 +1,18 @@
import { Component, OnInit, Input } from '@angular/core'; import { Component, OnInit, Input } from '@angular/core';
import { Alert, AlertType } from './alert'; import { Alert, AlertType } from 'app/core/models/alert';
@Component({ @Component({
selector: 'alert', selector: 'app-alert',
templateUrl: './alert.component.html', templateUrl: './alert.component.html',
styleUrls: ['./alert.component.css'] styleUrls: ['./alert.component.css']
}) })
export class AlertComponent implements OnInit { export class AlertComponent implements OnInit {
@Input() alert: Alert; @Input() alert: Alert;
constructor() { } constructor() {}
ngOnInit() { } ngOnInit() {}
removeAlert(alert: Alert) { removeAlert(alert: Alert) {
this.alert = undefined; this.alert = undefined;

0
client/src/app/agenda/agenda.component.css → client/src/app/core/directives/toast/toast.component.css
View File

4
client/src/app/core/directives/toast/toast.component.html Normal file
View File

@ -0,0 +1,4 @@
<div *ngFor="let toast of toasts" class="{{ cssClass(toast) }} alert-dismissable">
{{toast.message}}
<a class="close" (click)="removeAlert(toast)">&times;</a>
</div>

24
client/src/app/core/directives/toast/toast.component.spec.ts Normal file
View File

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

50
client/src/app/core/directives/toast/toast.component.ts Normal file
View File

@ -0,0 +1,50 @@
import { Component, OnInit } from '@angular/core';
import { Alert, AlertType } from 'app/core/models/alert';
import { ToastService } from 'app/core/services/toast.service';
@Component({
selector: 'app-toast',
templateUrl: './toast.component.html',
styleUrls: ['./toast.component.css']
})
export class ToastComponent implements OnInit {
toasts: Alert[] = [];
constructor(private toastService: ToastService) {}
ngOnInit() {
this.toastService.getToast().subscribe((alert: Alert) => {
if (!alert) {
// clear alerts when an empty alert is received
this.toasts = [];
return;
}
// add alert to array
this.toasts.push(alert);
});
}
removeAlert(alert: Alert) {
this.toasts = this.toasts.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';
}
}
}

4
client/src/app/site/alert.ts → client/src/app/core/models/alert.ts
View File

@ -2,10 +2,10 @@ export class Alert {
type: AlertType; type: AlertType;
message: string; message: string;
} }
export enum AlertType { export enum AlertType {
Success, Success,
Error, Error,
Info, Info,
Warning Warning
} }

4
client/src/app/core/models/user.ts Normal file
View File

@ -0,0 +1,4 @@
export class User {
username: string;
password: string;
}

40
client/src/app/core/router-auth-guard.service.ts
View File

@ -1,40 +0,0 @@
import { Injectable } from '@angular/core';
import {
CanActivate,
Router,
ActivatedRouteSnapshot,
RouterStateSnapshot
} from '@angular/router';
import { AuthService } from './auth.service';
@Injectable({
providedIn: 'root'
})
export class RouterAuthGuard implements CanActivate {
constructor(private authService: AuthService, private router: Router) { }
canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean {
return this.checkAccess(state.url);
}
checkAccess(url: string): boolean {
if (url === '/login') {
return true;
}
// Check base permission for the current state
let hasBasePermission = true; // TODO: get this from the current state...
if (!hasBasePermission) {
// Store the attempted URL for redirecting
this.authService.redirectUrl = url;
// Navigate to the login page with extras
this.router.navigate(['/login']);
return false;
}
return true;
}
}

15
client/src/app/core/services/alert.service.spec.ts Normal file
View 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();
}));
});

7
client/src/app/site/alert.service.ts → client/src/app/core/services/alert.service.ts
View File

@ -1,19 +1,20 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { Alert, AlertType } from './alert'; import { Alert, AlertType } from 'app/core/models/alert';
@Injectable({ @Injectable({
providedIn: 'root' providedIn: 'root'
}) })
export class AlertService { export class AlertService {
constructor() { } constructor() {}
success(message: string): Alert { success(message: string): Alert {
return this.alert(AlertType.Success, message); return this.alert(AlertType.Success, message);
} }
error(message: string): Alert { error(message: string): Alert {
// console.log('this.alert : ', this.alert());
// this.alert(AlertType.Error, message);
return this.alert(AlertType.Error, message); return this.alert(AlertType.Error, message);
} }

31
client/src/app/core/services/auth-guard.service.ts Normal file
View File

@ -0,0 +1,31 @@
import { Injectable } from '@angular/core';
import { CanActivate, Router, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
import { AuthService } from './auth.service';
@Injectable({
providedIn: 'root'
})
export class AuthGuard implements CanActivate {
constructor(private authService: AuthService, private router: Router) {}
canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean {
const url: string = state.url;
return this.checkLogin(url);
}
checkLogin(url: string): boolean {
//check if the user is already logged in.
//TODO: This is faked
if (this.authService.isLoggedIn) {
return true;
}
// Store the attempted URL for redirecting
this.authService.redirectUrl = url;
// Navigate to the login page with extras
this.router.navigate(['/login']);
return false;
}
}

15
client/src/app/core/services/auth.service.spec.ts Normal file
View File

@ -0,0 +1,15 @@
import { TestBed, inject } from '@angular/core/testing';
import { AuthService } from './auth.service';
describe('ConfigService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
providers: [AuthService]
});
});
it('should be created', inject([AuthService], (service: AuthService) => {
expect(service).toBeTruthy();
}));
});

74
client/src/app/core/services/auth.service.ts Normal file
View File

@ -0,0 +1,74 @@
import { Injectable } from '@angular/core';
import { HttpClient, HttpResponse, HttpErrorResponse, HttpHeaders } from '@angular/common/http';
import { Observable, of, throwError } from 'rxjs';
import { catchError, map, tap } from 'rxjs/operators';
import { User } from 'app/core/models/user';
const httpOptions = {
withCredentials: true,
headers: new HttpHeaders({
'Content-Type': 'application/json'
})
};
@Injectable({
providedIn: 'root'
})
export class AuthService {
isLoggedIn: boolean;
// 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;
}
}
// Initialize the service by querying the server
// Not sure if this makes sense, since a service is not supposed to init()
init(): Observable<any> {
return this.http.get('/users/whoami/', httpOptions).pipe(
tap(val => {
console.log('auth-init-whami : ', val);
}),
catchError(this.handleError())
);
}
//loggins a users. expects a user model
login(user: User): Observable<any> {
return this.http.post('/users/login/', 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
logout(): Observable<any> {
this.isLoggedIn = false;
localStorage.removeItem('username');
return this.http.post('/users/logout/', {}, httpOptions);
}
//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);
};
}
}

15
client/src/app/core/services/openslides.service.spec.ts Normal file
View File

@ -0,0 +1,15 @@
import { TestBed, inject } from '@angular/core/testing';
import { OpenslidesService } from './openslides.service';
describe('OpenslidesService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
providers: [OpenslidesService]
});
});
it('should be created', inject([OpenslidesService], (service: OpenslidesService) => {
expect(service).toBeTruthy();
}));
});

12
client/src/app/core/openslides.service.ts → client/src/app/core/services/openslides.service.ts
View File

@ -1,18 +1,18 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { AuthService, WhoAmIResponse } from './auth.service'; import { AuthService } from './auth.service';
//it seems that this service is useless
@Injectable({ @Injectable({
providedIn: 'root' providedIn: 'root'
}) })
export class OpenSlidesService { export class OpenslidesService {
constructor(private auth: AuthService, private router: Router) {}
constructor(private auth: AuthService, private router: Router) { } bootup() {
bootup () {
// TODO Lock the interface.. // TODO Lock the interface..
this.auth.init().subscribe((whoami: WhoAmIResponse) => { this.auth.init().subscribe(whoami => {
console.log(whoami); console.log(whoami);
if (!whoami.user && !whoami.guest_enabled) { if (!whoami.user && !whoami.guest_enabled) {
this.router.navigate(['/login']); this.router.navigate(['/login']);

15
client/src/app/core/services/toast.service.spec.ts Normal file
View File

@ -0,0 +1,15 @@
import { TestBed, inject } from '@angular/core/testing';
import { ToastService } from './toast.service';
describe('ToastService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
providers: [ToastService]
});
});
it('should be created', inject([ToastService], (service: ToastService) => {
expect(service).toBeTruthy();
}));
});

42
client/src/app/core/services/toast.service.ts Normal file
View File

@ -0,0 +1,42 @@
import { Injectable } from '@angular/core';
import { Observable, Subject } from 'rxjs';
import { Alert, AlertType } from 'app/core/models/alert';
@Injectable({
providedIn: 'root'
})
export class ToastService {
private subject = new Subject<Alert>();
constructor() {}
getToast(): 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();
}
}

16
client/src/app/core/title.service.ts
View File

@ -1,16 +0,0 @@
import { Injectable } from '@angular/core';
import { Title } from '@angular/platform-browser';
// Provides functionallity to set the webpage title
@Injectable({
providedIn: 'root'
})
export class TitleService {
private titleSuffix: string = " - OpenSlides 3";
constructor(protected titleService: Title) { }
setTitle(prefix: string) {
this.titleService.setTitle(prefix + this.titleSuffix);
}
}

25
client/src/app/motions/motions.component.spec.ts
View File

@ -1,25 +0,0 @@
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();
});
});

18
client/src/app/motions/motions.component.ts
View File

@ -1,18 +0,0 @@
import { Component, OnInit } from '@angular/core';
import { TitleService } from '../core/title.service';
@Component({
selector: 'app-motions',
templateUrl: './motions.component.html',
styleUrls: ['./motions.component.css']
})
export class MotionsComponent implements OnInit {
constructor(private titleService: TitleService) {
}
ngOnInit() {
this.titleService.setTitle("Motions");
}
}

0
client/src/app/projector/projector-container.component.css → client/src/app/projector/projector-container/projector-container.component.css
View File

2
client/src/app/projector/projector-container.component.html → client/src/app/projector/projector-container/projector-container.component.html
View File

@ -1,4 +1,4 @@
<p> <p>
projector container works! projector-container works!
Here an iframe with the real-projector is needed Here an iframe with the real-projector is needed
</p> </p>

5
client/src/app/projector/projector-container.component.spec.ts → client/src/app/projector/projector-container/projector-container.component.spec.ts
View File

@ -8,9 +8,8 @@ describe('ProjectorContainerComponent', () => {
beforeEach(async(() => { beforeEach(async(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
declarations: [ ProjectorContainerComponent ] declarations: [ProjectorContainerComponent]
}) }).compileComponents();
.compileComponents();
})); }));
beforeEach(() => { beforeEach(() => {

10
client/src/app/projector/projector-container.component.ts → client/src/app/projector/projector-container/projector-container.component.ts
View File

@ -1,5 +1,4 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { TitleService } from '../core/title.service';
@Component({ @Component({
selector: 'app-projector-container', selector: 'app-projector-container',
@ -7,12 +6,7 @@ import { TitleService } from '../core/title.service';
styleUrls: ['./projector-container.component.css'] styleUrls: ['./projector-container.component.css']
}) })
export class ProjectorContainerComponent implements OnInit { export class ProjectorContainerComponent implements OnInit {
constructor() {}
constructor(protected titleService: TitleService) { ngOnInit() {}
}
ngOnInit() {
this.titleService.setTitle('Projector');
}
} }

2
client/src/app/projector/projector.component.html
View File

@ -1,3 +1,3 @@
<p> <p>
projector works! projector works!
</p> </p>

5
client/src/app/projector/projector.component.spec.ts
View File

@ -8,9 +8,8 @@ describe('ProjectorComponent', () => {
beforeEach(async(() => { beforeEach(async(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
declarations: [ ProjectorComponent ] declarations: [ProjectorComponent]
}) }).compileComponents();
.compileComponents();
})); }));
beforeEach(() => { beforeEach(() => {

9
client/src/app/projector/projector.component.ts
View File

@ -1,15 +1,18 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { BaseComponent } from 'app/base.component';
import { Title } from '@angular/platform-browser';
@Component({ @Component({
selector: 'app-projector', selector: 'app-projector',
templateUrl: './projector.component.html', templateUrl: './projector.component.html',
styleUrls: ['./projector.component.css'] styleUrls: ['./projector.component.css']
}) })
export class ProjectorComponent implements OnInit { export class ProjectorComponent extends BaseComponent implements OnInit {
constructor(protected titleService: Title) {
constructor() { super(titleService);
} }
ngOnInit() { ngOnInit() {
super.setTitle('Projector');
} }
} }

0
client/src/app/motions/motions.component.css → client/src/app/site/agenda/agenda.component.css
View File

2
client/src/app/agenda/agenda.component.html → client/src/app/site/agenda/agenda.component.html
View File

@ -1,3 +1,3 @@
<p> <p>
agenda works! agenda works!
</p> </p>

24
client/src/app/site/agenda/agenda.component.spec.ts Normal file
View File

@ -0,0 +1,24 @@
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();
});
});

19
client/src/app/site/agenda/agenda.component.ts Normal file
View File

@ -0,0 +1,19 @@
import { Component, OnInit } from '@angular/core';
import { Title } from '@angular/platform-browser';
import { BaseComponent } from 'app/base.component';
@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');
}
}

4
client/src/app/site/alert.component.html
View File

@ -1,4 +0,0 @@
<div *ngIf="alert" [ngClass]="cssClass(alert)" class="alert-dismissable">
{{alert.message}}
<a class="close" (click)="removeAlert(alert)">&times;</a>
</div>

25
client/src/app/site/alert.component.spec.ts
View File

@ -1,25 +0,0 @@
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();
});
});

15
client/src/app/site/alert.service.spec.ts
View File

@ -1,15 +0,0 @@
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();
}));
});

2
client/src/app/users/login.component.css → client/src/app/site/login/login.component.css
View File

@ -6,4 +6,4 @@
width: auto; width: auto;
height: 100%; height: 100%;
flex-grow: 1; flex-grow: 1;
} }

8
client/src/app/users/login.component.html → client/src/app/site/login/login.component.html
View File

@ -4,15 +4,15 @@
<img src="/assets/img/openslides-logo.png" alt="OpenSlides" class="login-logo center-block"> <img src="/assets/img/openslides-logo.png" alt="OpenSlides" class="login-logo center-block">
</div> </div>
<div class="modal-body loginForm"> <div class="modal-body loginForm">
{{info}}
<!-- Instead of the original approach, user alert component --> <!-- Instead of the original approach, user alert component -->
<alert [alert]="alert"></alert> <app-alert [alert]="alert"></app-alert>
<div class="input-group form-group"> <div class="input-group form-group">
<div class="input-group-addon"> <div class="input-group-addon">
<fa-icon icon="user"></fa-icon> <fa-icon icon="user"></fa-icon>
</div> </div>
<input [(ngModel)]="user.username" os-focus-me="" type="text" <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"
class="form-control input-lg ng-valid ng-not-empty ng-dirty ng-valid-parse ng-touched"
placeholder="Username" name="username"> placeholder="Username" name="username">
</div> </div>
<div class="input-group form-group"> <div class="input-group form-group">
@ -30,4 +30,4 @@
</div> </div>
</div> </div>
</form> </form>
</div> </div>

24
client/src/app/site/login/login.component.spec.ts Normal file
View File

@ -0,0 +1,24 @@
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/site/login/login.component.ts Normal file
View 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 'app/base.component';
import { User } from 'app/core/models/user';
import { AuthService } from 'app/core/services/auth.service';
import { AlertService } from 'app/core/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 authService: AuthService,
private alertService: AlertService,
private router: Router
) {
super(titleService);
this.setInfo();
}
ngOnInit() {
//TODO translate
super.setTitle('Anmelden');
}
setInfo() {
this.info = 'Logged in? ' + (this.authService.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.authService.login(this.user).subscribe(res => {
if (res.status === 400) {
//TODO, add more errors here, use
console.log('error in login');
//todo alert seems to work differently than toast
this.alertService.error('Benutzername oder Passwort war nicht korrekt.');
} else {
this.alertService.success('Logged in! :)');
this.setInfo();
if (this.authService.isLoggedIn) {
localStorage.setItem('username', res.user.username);
// Get the redirect URL from our auth service
// If no redirect has been set, use the default
const redirect = this.authService.redirectUrl ? this.authService.redirectUrl : '/';
// Redirect the user
this.router.navigate([redirect]);
}
}
});
}
}

0
client/src/app/site/start.component.css → client/src/app/site/motions/motions.component.css
View File

2
client/src/app/motions/motions.component.html → client/src/app/site/motions/motions.component.html
View File

@ -1,3 +1,3 @@
<p> <p>
motions works! motions works!
</p> </p>

24
client/src/app/site/motions/motions.component.spec.ts Normal file
View File

@ -0,0 +1,24 @@
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();
});
});

18
client/src/app/site/motions/motions.component.ts Normal file
View File

@ -0,0 +1,18 @@
import { Component, OnInit } from '@angular/core';
import { Title } from '@angular/platform-browser';
import { BaseComponent } from 'app/base.component';
@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');
}
}

13
client/src/app/site/site.component.html
View File

@ -1,4 +1,11 @@
<h1>The actual OpenSldies Content!</h1> <h1> The actual OpenSlides Content! </h1>
<nav>A nav will be here</nav> <nav>
<a routerLink="/" routerLinkActive="active"> Home </a>
<a routerLink="/agenda" routerLinkActive="active"> Agenda </a>
<a routerLink="/motions" routerLinkActive="active"> Motions </a>
</nav>
<router-outlet></router-outlet> <router-outlet></router-outlet>
<footer>Footer</footer> <footer>
Footer
<button (click)="logOutButton()">LogOut</button>
</footer>

31
client/src/app/site/site.component.spec.ts
View File

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

12
client/src/app/site/site.component.ts
View File

@ -1,4 +1,7 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { Router } from '@angular/router';
import { AuthService } from 'app/core/services/auth.service';
@Component({ @Component({
selector: 'app-site', selector: 'app-site',
@ -6,8 +9,13 @@ import { Component, OnInit } from '@angular/core';
styleUrls: ['./site.component.css'] styleUrls: ['./site.component.css']
}) })
export class SiteComponent implements OnInit { export class SiteComponent implements OnInit {
constructor(private authService: AuthService, private router: Router) {}
constructor() { } ngOnInit() {}
ngOnInit() { } logOutButton() {
console.log('logout');
this.authService.logout().subscribe();
this.router.navigate(['/login']);
}
} }

7
client/src/app/site/start.component.html
View File

@ -1,7 +0,0 @@
<p>
start works!
Here the welcome text is displayed
</p>
<button type="button" (click)="logout()" class="btn btn-primary">
Logoff test!
</button>

25
client/src/app/site/start.component.spec.ts
View File

@ -1,25 +0,0 @@
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();
});
});

22
client/src/app/site/start.component.ts
View File

@ -1,22 +0,0 @@
import { Component, OnInit } from '@angular/core';
import { TitleService } from '../core/title.service';
import {AuthService } from '../core/auth.service';
@Component({
selector: 'app-start',
templateUrl: './start.component.html',
styleUrls: ['./start.component.css']
})
export class StartComponent implements OnInit {
constructor(private titleService: TitleService, private auth: AuthService) { }
ngOnInit() {
this.titleService.setTitle('Start page');
}
logout() {
this.auth.logout();
}
}

0
client/src/app/users/users.component.css → client/src/app/site/start/start.component.css
View File

3
client/src/app/site/start/start.component.html Normal file
View File

@ -0,0 +1,3 @@
<p>
start works!
</p>

24
client/src/app/site/start/start.component.spec.ts Normal file
View File

@ -0,0 +1,24 @@
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();
});
});

18
client/src/app/site/start/start.component.ts Normal file
View File

@ -0,0 +1,18 @@
import { Component, OnInit } from '@angular/core';
import { Title } from '@angular/platform-browser';
import { BaseComponent } from 'app/base.component';
@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');
}
}

25
client/src/app/users/login.component.spec.ts
View File

@ -1,25 +0,0 @@
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();
});
});

58
client/src/app/users/login.component.ts
View File

@ -1,58 +0,0 @@
import { Component, OnInit } from '@angular/core';
import { Router } from '@angular/router';
import { User } from '../users/user';
import { AuthService } from '../core/auth.service';
import { AlertService } from '../site/alert.service';
import { TitleService } from '../core/title.service';
@Component({
selector: 'app-login',
templateUrl: './login.component.html',
styleUrls: ['./login.component.css']
})
export class LoginComponent implements OnInit {
user: User = {
username: '',
password: ''
};
constructor(
private titleService: TitleService,
private authService: AuthService,
private alertService: AlertService,
private router: Router,
) { }
ngOnInit() {
//TODO translate
this.titleService.setTitle('Anmelden');
}
//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.authService.loginUser(this.user).subscribe(
res => {
// TODO an error is thrown here. Also all this stuff should the the auth service..
/*if (res.status === 400) {
// TODO Use the error that comes from the server
//this.alertService.error("Benutzername oder Passwort war nicht korrekt.");
} else {
if (this.authService.isLoggedIn) {
// Get the redirect URL from our auth service
// If no redirect has been set, use the default
let redirect = this.authService.redirectUrl ?
this.authService.redirectUrl : '/';
// TODO check, if there is a redirect url. Else redirect to /
// Redirect the user
this.router.navigate([redirect]);
}
}*/
}
);
}
}

4
client/src/app/users/user.ts
View File

@ -1,4 +0,0 @@
export class User {
username: string;
password: string;
}

3
client/src/app/users/users.component.html
View File

@ -1,3 +0,0 @@
<p>
users works!
</p>

25
client/src/app/users/users.component.spec.ts
View File

@ -1,25 +0,0 @@
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
View File

@ -1,15 +0,0 @@
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() {
}
}

2
client/src/environments/environment.prod.ts
View File

@ -1,3 +1,3 @@
export const environment = { export const environment = {
production: true production: true
}; };

2
client/src/environments/environment.ts
View File

@ -3,7 +3,7 @@
// The list of file replacements can be found in `angular.json`. // The list of file replacements can be found in `angular.json`.
export const environment = { export const environment = {
production: false production: false
}; };
/* /*

5
client/src/index.html
View File

@ -1,5 +1,6 @@
<!doctype html> <!doctype html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>OpenSlides 3</title> <title>OpenSlides 3</title>
@ -8,7 +9,9 @@
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" type="image/x-icon" href="assets/img/favicon.png"> <link rel="icon" type="image/x-icon" href="assets/img/favicon.png">
</head> </head>
<body> <body>
<app-root></app-root> <app-root></app-root>
</body> </body>
</html>
</html>

56
client/src/karma.conf.js
View File

@ -1,31 +1,31 @@
// Karma configuration file, see link for more information // Karma configuration file, see link for more information
// https://karma-runner.github.io/1.0/config/configuration-file.html // https://karma-runner.github.io/1.0/config/configuration-file.html
module.exports = function (config) { module.exports = function(config) {
config.set({ config.set({
basePath: '', basePath: '',
frameworks: ['jasmine', '@angular-devkit/build-angular'], frameworks: ['jasmine', '@angular-devkit/build-angular'],
plugins: [ plugins: [
require('karma-jasmine'), require('karma-jasmine'),
require('karma-chrome-launcher'), require('karma-chrome-launcher'),
require('karma-jasmine-html-reporter'), require('karma-jasmine-html-reporter'),
require('karma-coverage-istanbul-reporter'), require('karma-coverage-istanbul-reporter'),
require('@angular-devkit/build-angular/plugins/karma') require('@angular-devkit/build-angular/plugins/karma')
], ],
client: { client: {
clearContext: false // leave Jasmine Spec Runner output visible in browser clearContext: false // leave Jasmine Spec Runner output visible in browser
}, },
coverageIstanbulReporter: { coverageIstanbulReporter: {
dir: require('path').join(__dirname, '../coverage'), dir: require('path').join(__dirname, '../coverage'),
reports: ['html', 'lcovonly'], reports: ['html', 'lcovonly'],
fixWebpackSourcePaths: true fixWebpackSourcePaths: true
}, },
reporters: ['progress', 'kjhtml'], reporters: ['progress', 'kjhtml'],
port: 9876, port: 9876,
colors: true, colors: true,
logLevel: config.LOG_INFO, logLevel: config.LOG_INFO,
autoWatch: true, autoWatch: true,
browsers: ['Chrome'], browsers: ['Chrome'],
singleRun: false singleRun: false
}); });
}; };

7
client/src/main.ts
View File

@ -5,8 +5,9 @@ import { AppModule } from './app/app.module';
import { environment } from './environments/environment'; import { environment } from './environments/environment';
if (environment.production) { if (environment.production) {
enableProdMode(); enableProdMode();
} }
platformBrowserDynamic().bootstrapModule(AppModule) platformBrowserDynamic()
.catch(err => console.log(err)); .bootstrapModule(AppModule)
.catch(err => console.log(err));

14
client/src/polyfills.ts
View File

@ -40,12 +40,10 @@
/** IE10 and IE11 requires the following for the Reflect API. */ /** IE10 and IE11 requires the following for the Reflect API. */
// import 'core-js/es6/reflect'; // import 'core-js/es6/reflect';
/** Evergreen browsers require these. **/ /** Evergreen browsers require these. **/
// Used for reflect-metadata in JIT. If you use AOT (and only Angular decorators), you can remove. // Used for reflect-metadata in JIT. If you use AOT (and only Angular decorators), you can remove.
import 'core-js/es7/reflect'; import 'core-js/es7/reflect';
/** /**
* Web Animations `@angular/platform-browser/animations` * Web Animations `@angular/platform-browser/animations`
* Only required if AnimationBuilder is used within the application and using IE/Edge or Safari. * Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
@ -58,11 +56,11 @@ import 'core-js/es7/reflect';
* user can disable parts of macroTask/DomEvents patch by setting following flags * 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_requestAnimationFrame = true; // disable patch requestAnimationFrame
// (window as any).__Zone_disable_on_property = true; // disable patch onProperty such as onclick // (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 // (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 * 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 * with the following flag, it will bypass `zone.js` patch for IE/Edge
*/ */
@ -71,9 +69,7 @@ import 'core-js/es7/reflect';
/*************************************************************************************************** /***************************************************************************************************
* Zone JS is required by default for Angular itself. * Zone JS is required by default for Angular itself.
*/ */
import 'zone.js/dist/zone'; // Included with Angular CLI. import 'zone.js/dist/zone'; // Included with Angular CLI.
/*************************************************************************************************** /***************************************************************************************************
* APPLICATION IMPORTS * APPLICATION IMPORTS

2
client/src/styles.css
View File

@ -1 +1 @@
@import '~bootstrap/dist/css/bootstrap.min.css'; @import '~bootstrap/dist/css/bootstrap.min.css';

10
client/src/test.ts
View File

@ -2,18 +2,12 @@
import 'zone.js/dist/zone-testing'; import 'zone.js/dist/zone-testing';
import { getTestBed } from '@angular/core/testing'; import { getTestBed } from '@angular/core/testing';
import { import { BrowserDynamicTestingModule, platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing';
BrowserDynamicTestingModule,
platformBrowserDynamicTesting
} from '@angular/platform-browser-dynamic/testing';
declare const require: any; declare const require: any;
// First, initialize the Angular testing environment. // First, initialize the Angular testing environment.
getTestBed().initTestEnvironment( getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting());
BrowserDynamicTestingModule,
platformBrowserDynamicTesting()
);
// Then we find all the tests. // Then we find all the tests.
const context = require.context('./', true, /\.spec\.ts$/); const context = require.context('./', true, /\.spec\.ts$/);
// And load the modules. // And load the modules.

17
client/src/tsconfig.app.json
View File

@ -1,12 +1,9 @@
{ {
"extends": "../tsconfig.json", "extends": "../tsconfig.json",
"compilerOptions": { "compilerOptions": {
"outDir": "../out-tsc/app", "outDir": "../out-tsc/app",
"module": "es2015", "module": "es2015",
"types": [] "types": []
}, },
"exclude": [ "exclude": ["src/test.ts", "**/*.spec.ts"]
"src/test.ts",
"**/*.spec.ts"
]
} }

25
client/src/tsconfig.spec.json
View File

@ -1,19 +1,10 @@
{ {
"extends": "../tsconfig.json", "extends": "../tsconfig.json",
"compilerOptions": { "compilerOptions": {
"outDir": "../out-tsc/spec", "outDir": "../out-tsc/spec",
"module": "commonjs", "module": "commonjs",
"types": [ "types": ["jasmine", "node"]
"jasmine", },
"node" "files": ["test.ts", "polyfills.ts"],
] "include": ["**/*.spec.ts", "**/*.d.ts"]
},
"files": [
"test.ts",
"polyfills.ts"
],
"include": [
"**/*.spec.ts",
"**/*.d.ts"
]
} }

14
client/src/tslint.json
View File

@ -1,17 +1,7 @@
{ {
"extends": "../tslint.json", "extends": "../tslint.json",
"rules": { "rules": {
"directive-selector": [ "directive-selector": [true, "attribute", "app", "camelCase"],
true, "component-selector": [true, "element", "app", "kebab-case"]
"attribute",
"app",
"camelCase"
],
"component-selector": [
true,
"element",
"app",
"kebab-case"
]
} }
} }

31
client/tsconfig.json
View File

@ -1,20 +1,15 @@
{ {
"compileOnSave": false, "compileOnSave": false,
"compilerOptions": { "compilerOptions": {
"baseUrl": "./", "baseUrl": "./src",
"outDir": "./dist/out-tsc", "outDir": "./dist/out-tsc",
"sourceMap": true, "sourceMap": true,
"declaration": false, "declaration": false,
"moduleResolution": "node", "moduleResolution": "node",
"emitDecoratorMetadata": true, "emitDecoratorMetadata": true,
"experimentalDecorators": true, "experimentalDecorators": true,
"target": "es5", "target": "es5",
"typeRoots": [ "typeRoots": ["node_modules/@types"],
"node_modules/@types" "lib": ["es2017", "dom"]
], }
"lib": [
"es2017",
"dom"
]
}
} }

185
client/tslint.json
View File

@ -1,130 +1,59 @@
{ {
"rulesDirectory": [ "rulesDirectory": ["node_modules/codelyzer"],
"node_modules/codelyzer" "rules": {
], "arrow-return-shorthand": true,
"rules": { "callable-types": true,
"arrow-return-shorthand": true, "class-name": true,
"callable-types": true, "deprecation": {
"class-name": true, "severity": "warn"
"comment-format": [ },
true, "forin": true,
"check-space" "import-blacklist": [true, "rxjs/Rx"],
], "interface-over-type-literal": true,
"curly": true, "label-position": true,
"deprecation": { "member-access": false,
"severity": "warn" "member-ordering": [
}, true,
"eofline": true, {
"forin": true, "order": ["static-field", "instance-field", "static-method", "instance-method"]
"import-blacklist": [ }
true, ],
"rxjs/Rx" "no-arg": true,
], "no-bitwise": true,
"import-spacing": true, "no-console": [true, "debug", "info", "time", "timeEnd", "trace"],
"indent": [ "no-construct": true,
true, "no-debugger": true,
"spaces" "no-duplicate-super": true,
], "no-empty": false,
"interface-over-type-literal": true, "no-empty-interface": true,
"label-position": true, "no-eval": true,
"max-line-length": [ "no-inferrable-types": [true, "ignore-params"],
true, "no-misused-new": true,
140 "no-non-null-assertion": true,
], "no-shadowed-variable": true,
"member-access": false, "no-string-literal": false,
"member-ordering": [ "no-string-throw": true,
true, "no-switch-case-fall-through": true,
{ "no-unnecessary-initializer": true,
"order": [ "no-unused-expression": true,
"static-field", "no-use-before-declare": true,
"instance-field", "no-var-keyword": true,
"static-method", "object-literal-sort-keys": false,
"instance-method" "prefer-const": true,
] "radix": true,
} "triple-equals": [true, "allow-null-check"],
], "unified-signatures": true,
"no-arg": true, "variable-name": false,
"no-bitwise": true, "whitespace": [true, "check-branch", "check-decl", "check-operator", "check-separator", "check-type"],
"no-console": [ "no-output-on-prefix": true,
true, "use-input-property-decorator": true,
"debug", "use-output-property-decorator": true,
"info", "use-host-property-decorator": true,
"time", "no-input-rename": true,
"timeEnd", "no-output-rename": true,
"trace" "use-life-cycle-interface": true,
], "use-pipe-transform-interface": true,
"no-construct": true, "component-class-suffix": true,
"no-debugger": true, "directive-class-suffix": 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
}
} }

971
client/yarn.lock
View File

File diff suppressed because it is too large Load Diff