Skip to content

Commit

Permalink
Features/theming (#725)
Browse files Browse the repository at this point in the history
* Integration of configurable AzureAd External Provider

* Documentation Updated for AzureAD Provider

* Configuration value added

* Integrate gulp task for theme copy

* Integration of bootswatch themes

* Configuration for bootswatch themes + customcsstheme

* replication of same system of STS

* Documentation for theming

Co-authored-by: Jan Škoruba <jan@skoruba.com>
  • Loading branch information
ioxFR and skoruba committed Oct 10, 2020
1 parent b701f5f commit 7e66ecd
Show file tree
Hide file tree
Showing 92 changed files with 1,080 additions and 9 deletions.
24 changes: 24 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,30 @@ services.AddAuditLogging(options => { options.Source = auditLoggingConfiguration
services.AddTransient<IAuditLogService, AuditLogService<TAuditLog>>();
```

### Admin Configuration

Admin and STS can be customized without editing code in `appsettings.json` under AdminConfiguration section

#### Themes

Ui can be customized using themes integrated from ("bootswatch")[https://bootswatch.com/]
By default, configuration value is null to use default theme. if you want to use a theme, just fill the lowercase theme name as configuration value of `Theme` key.

You can also use your custom theme by integrating it in your project or hosting css on your place to pass the url in `CustomThemeCss` key. (Note that custom theme override standard theme)

- Important Note: Theme can use external ressources which caused errors due to CSP. If you get errors, please make sure that you configured correctly CSP section in your `appsettings.json` with thrusted domains for ressources.

```json
"AdminConfiguration": {
"PageTitle": "Skoruba IdentityServer4",
"HomePageLogoUri": "~/images/skoruba-icon.png",
"FaviconUri": "~/favicon.ico",
"Theme": "united",
"CustomThemeCss": null,
...
},
```

### Audit Logging Configuration

In `appsettings.json` is following configuration:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,9 @@ public class AdminConfiguration
public string ClientSecret { get; set; }
public string OidcResponseType { get; set; }
public bool HideUIForMSSqlErrorLogging { get; set; }
public string Theme { get; set; }

public string CustomThemeCss { get; set; }

}
}
12 changes: 12 additions & 0 deletions src/Skoruba.IdentityServer4.Admin/Styles/themes/cerulean.min.css

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions src/Skoruba.IdentityServer4.Admin/Styles/themes/cosmo.min.css

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions src/Skoruba.IdentityServer4.Admin/Styles/themes/cyborg.min.css

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions src/Skoruba.IdentityServer4.Admin/Styles/themes/darkly.min.css

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions src/Skoruba.IdentityServer4.Admin/Styles/themes/flatly.min.css

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions src/Skoruba.IdentityServer4.Admin/Styles/themes/journal.min.css

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions src/Skoruba.IdentityServer4.Admin/Styles/themes/litera.min.css

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions src/Skoruba.IdentityServer4.Admin/Styles/themes/lumen.min.css

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions src/Skoruba.IdentityServer4.Admin/Styles/themes/lux.min.css

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions src/Skoruba.IdentityServer4.Admin/Styles/themes/materia.min.css

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions src/Skoruba.IdentityServer4.Admin/Styles/themes/minty.min.css

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions src/Skoruba.IdentityServer4.Admin/Styles/themes/pulse.min.css

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions src/Skoruba.IdentityServer4.Admin/Styles/themes/sandstone.min.css

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions src/Skoruba.IdentityServer4.Admin/Styles/themes/simplex.min.css

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions src/Skoruba.IdentityServer4.Admin/Styles/themes/sketchy.min.css

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions src/Skoruba.IdentityServer4.Admin/Styles/themes/slate.min.css

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions src/Skoruba.IdentityServer4.Admin/Styles/themes/solar.min.css

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions src/Skoruba.IdentityServer4.Admin/Styles/themes/spacelab.min.css

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions src/Skoruba.IdentityServer4.Admin/Styles/themes/superhero.min.css

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions src/Skoruba.IdentityServer4.Admin/Styles/themes/united.min.css

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions src/Skoruba.IdentityServer4.Admin/Styles/themes/yeti.min.css

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions src/Skoruba.IdentityServer4.Admin/Views/Shared/_Layout.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,15 @@
<link href="~/dist/css/bundle.min.css" asp-append-version="true" rel="stylesheet" />
<link href="~/dist/css/web.min.css" asp-append-version="true" rel="stylesheet" />
</environment>
@if (!string.IsNullOrEmpty(RootConfiguration.AdminConfiguration.Theme))
{
<link href="@string.Concat("~/dist/css/themes/",RootConfiguration.AdminConfiguration.Theme,".min.css")" asp-append-version="true" rel="stylesheet" />
}

@if (!string.IsNullOrEmpty(RootConfiguration.AdminConfiguration.CustomThemeCss))
{
<link href="@RootConfiguration.AdminConfiguration.CustomThemeCss" asp-append-version="true" rel="stylesheet" />
}

@await RenderSectionAsync("styles", required: false)
</head>
Expand Down
9 changes: 8 additions & 1 deletion src/Skoruba.IdentityServer4.Admin/gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ var del = require('del');
var distFolder = './wwwroot/dist/';
var jsFolder = `${distFolder}js/`;
var cssFolder = `${distFolder}css/`;
var cssThemeFolder = `${distFolder}css/themes/`;

function processClean() {
return del(`${distFolder}**`, { force: true });
Expand Down Expand Up @@ -92,7 +93,13 @@ function processStyles() {
.pipe(gulp.dest(cssFolder));
}

var buildStyles = gulp.series(processStyles, processSass, processSassMin);
function processTheme() {
return gulp
.src('Styles/themes/**')
.pipe(gulp.dest(cssThemeFolder));
}

var buildStyles = gulp.series(processStyles, processTheme, processSass, processSassMin);
var build = gulp.parallel(buildStyles, processScripts);

gulp.task('clean', processClean);
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,9 @@ public class AdminConfiguration
public string FaviconUri { get; set; }
public string IdentityAdminBaseUrl { get; set; }
public string AdministrationRole { get; set; }

public string Theme { get; set; }

public string CustomThemeCss { get; set; }
}
}

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions src/Skoruba.IdentityServer4.STS.Identity/Styles/themes/lux.min.css

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,16 @@
<link href="~/dist/css/web.min.css" asp-append-version="true" rel="stylesheet" />
</environment>

@if (!string.IsNullOrEmpty(RootConfiguration.AdminConfiguration.Theme))
{
<link href="@string.Concat("~/dist/css/themes/",RootConfiguration.AdminConfiguration.Theme,".min.css")" asp-append-version="true" rel="stylesheet" />
}

@if (!string.IsNullOrEmpty(RootConfiguration.AdminConfiguration.CustomThemeCss))
{
<link href="@RootConfiguration.AdminConfiguration.CustomThemeCss" asp-append-version="true" rel="stylesheet" />
}

@await RenderSectionAsync("styles", required: false)
</head>
<body>
Expand Down
12 changes: 5 additions & 7 deletions src/Skoruba.IdentityServer4.STS.Identity/appsettings.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,14 @@

"UseValidationCertificateThumbprint": false,
"ValidationCertificateThumbprint": "",

"UseSigningCertificateForAzureKeyVault": false,
"UseValidationCertificateForAzureKeyVault": false
},
"RegisterConfiguration": {
"Enabled": true
},

"ExternalProvidersConfiguration": {
"UseGitHubProvider": false,
"GitHubClientId": "",
Expand Down Expand Up @@ -64,6 +65,8 @@
"PageTitle": "Skoruba IdentityServer4",
"HomePageLogoUri": "~/images/skoruba-icon.png",
"FaviconUri": "~/favicon.ico",
"Theme": null,
"CustomThemeCss": null,
"IdentityAdminBaseUrl": "https://localhost:44303",
"AdministrationRole": "SkorubaIdentityAdminAdministrator"
},
Expand Down Expand Up @@ -91,12 +94,7 @@
"RequireConfirmedAccount": false
}
},
"User": {
"RequireUniqueEmail": true
},
"SignIn": {
"RequireConfirmedAccount": false
},

"DataProtectionConfiguration": {
"ProtectKeysWithAzureKeyVault": false
},
Expand Down
9 changes: 8 additions & 1 deletion src/Skoruba.IdentityServer4.STS.Identity/gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ var del = require('del');
var distFolder = './wwwroot/dist/';
var jsFolder = `${distFolder}js/`;
var cssFolder = `${distFolder}css/`;
var cssThemeFolder = `${distFolder}css/themes/`;

function processClean() {
return del(`${distFolder}**`, { force: true });
Expand Down Expand Up @@ -70,7 +71,13 @@ function processStyles() {
.pipe(gulp.dest(cssFolder));
}

var buildStyles = gulp.series(processStyles, processSass, processSassMin);
function processTheme() {
return gulp
.src('Styles/themes/**')
.pipe(gulp.dest(cssThemeFolder));
}

var buildStyles = gulp.series(processStyles, processTheme, processSass, processSassMin);
var build = gulp.parallel(buildStyles, processScripts);

gulp.task('clean', processClean);
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

0 comments on commit 7e66ecd

Please sign in to comment.