Add hardware information in instance config

This commit is contained in:
Chocobozzz
2019-09-05 09:43:35 +02:00
committed by Chocobozzz
parent 592c735c19
commit be04c6fdab
14 changed files with 62 additions and 4 deletions

View File

@@ -73,11 +73,21 @@
<div [innerHTML]="html.codeOfConduct"></div>
</div>
<div class="block terms" id="terms-section">
<div class="block terms">
<div i18n class="section-title">Terms</div>
<div [innerHTML]="html.terms"></div>
</div>
<div class="middle-title" *ngIf="html.hardwareInformation">
Other information
</div>
<div class="block hardware-information">
<div i18n class="section-title">Hardware information</div>
<div [innerHTML]="html.hardwareInformation"></div>
</div>
</div>
<div class="col-md-12 col-xl-6">

View File

@@ -22,7 +22,8 @@ export class AboutInstanceComponent implements OnInit {
terms: '',
codeOfConduct: '',
moderationInformation: '',
administrator: ''
administrator: '',
hardwareInformation: ''
}
creationReason = ''

View File

@@ -174,6 +174,20 @@
<div *ngIf="formErrors.instance.businessModel" class="form-error">{{ formErrors.instance.businessModel }}</div>
</div>
<div i18n class="inner-form-title">Other information</div>
<div class="form-group">
<label i18n for="instanceHardwareInformation">On what server/hardware the instance runs?</label>
<div class="label-small-info">2vCore 2GB RAM/or directly the link to the server you rent etc</div>
<my-markdown-textarea
id="instanceHardwareInformation" formControlName="hardwareInformation" textareaWidth="500px" textareaHeight="75px" [previewColumn]="true"
[classes]="{ 'input-error': formErrors['instance.hardwareInformation'] }"
></my-markdown-textarea>
<div *ngIf="formErrors.instance.hardwareInformation" class="form-error">{{ formErrors.instance.hardwareInformation }}</div>
</div>
</ng-container>
</ng-template>
</ngb-tab>

View File

@@ -107,6 +107,8 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit {
maintenanceLifetime: null,
businessModel: null,
hardwareInformation: null,
categories: null,
languages: null,

View File

@@ -46,10 +46,11 @@ export class InstanceService {
terms: '',
codeOfConduct: '',
moderationInformation: '',
administrator: ''
administrator: '',
hardwareInformation: ''
}
for (const key of [ 'description', 'terms', 'codeOfConduct', 'moderationInformation', 'administrator' ]) {
for (const key of Object.keys(html)) {
html[ key ] = await this.markdownService.textMarkdownToHTML(about.instance[ key ])
}