code improvements

This commit is contained in:
VLE2FE
2020-09-03 15:51:53 +02:00
parent 1440e9a6fc
commit c38d0be457
73 changed files with 276 additions and 1686 deletions

View File

@ -13,7 +13,7 @@
</div>
<ng-template #normalView>
<p *ngIf="content.text; else defaultContent">
<p *ngIf="content.text; else defaultContent" class="content-text">
{{content.text}}
</p>
<ng-template #defaultContent>

View File

@ -1,3 +1,7 @@
.delete-btn {
float: right;
}
.content-text {
white-space: pre-line;
}

View File

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

View File

@ -12,9 +12,9 @@ import {LoginService} from '../services/login.service';
})
export class HelpComponent implements OnInit {
content: HelpModel = new HelpModel().deserialize({text: null, level: 'none'});
edit = false;
private route = '';
content: HelpModel = new HelpModel().deserialize({text: null, level: 'none'}); // help content
edit = false; // set true to change to edit mode
private route = ''; // URIComponent encoded route which serves as a key to fetch the help document
constructor(
private router: Router,
@ -24,8 +24,8 @@ export class HelpComponent implements OnInit {
) { }
ngOnInit(): void {
// remove ids from path
this.route = encodeURIComponent(this.router.url.replace(/\/[0-9a-f]{24}/, ''));
// remove ids from path and get help content
this.api.get<HelpModel>('/help/' + this.route, (data, err) => {
if (!err) { // content was found
this.content = new HelpModel().deserialize(data);
@ -33,7 +33,6 @@ export class HelpComponent implements OnInit {
else {
this.content.text = '';
}
console.log(this.content);
});
}