Merge from master

This commit is contained in:
WithoutPants
2019-10-17 08:56:45 +11:00
246 changed files with 1409 additions and 35381 deletions

View File

@@ -22,7 +22,8 @@ func (r *queryResolver) Directories(ctx context.Context, path *string) ([]string
func makeConfigResult() *models.ConfigResult {
return &models.ConfigResult{
General: makeConfigGeneralResult(),
General: makeConfigGeneralResult(),
Interface: makeConfigInterfaceResult(),
}
}
@@ -35,3 +36,12 @@ func makeConfigGeneralResult() *models.ConfigGeneralResult {
Password: config.GetPasswordHash(),
}
}
func makeConfigInterfaceResult() *models.ConfigInterfaceResult {
css := config.GetCSS()
cssEnabled := config.GetCSSEnabled()
return &models.ConfigInterfaceResult{
CSS: &css,
CSSEnabled: &cssEnabled,
}
}