hargata/lubelog
1
0
Fork 0
mirror of https://github.com/hargata/lubelog.git synced 2025-12-11 04:37:03 -06:00
Code Issues Packages Projects Releases 51 Wiki Activity

Allow users to skip overwriting credential environment variables.

Browse Source
This commit is contained in:
DESKTOP-T0O5CDB\DESK-555BD 2025-06-21 09:32:00 -06:00
parent 44dcd48a56
commit 055b183f2a
4 changed files with 44 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Helper/ConfigHelper.cs
View File

@ -191,19 +191,19 @@ namespace CarCareTracker.Helper
{ {
serverConfig.ServerURL = null; serverConfig.ServerURL = null;
} }
if (!serverConfig.CustomWidgetsEnabled.Value) if (serverConfig.CustomWidgetsEnabled.HasValue && !serverConfig.CustomWidgetsEnabled.Value)
{ {
serverConfig.CustomWidgetsEnabled = null; serverConfig.CustomWidgetsEnabled = null;
} }
if (!serverConfig.InvariantAPIEnabled.Value) if (serverConfig.InvariantAPIEnabled.HasValue && !serverConfig.InvariantAPIEnabled.Value)
{ {
serverConfig.InvariantAPIEnabled = null; serverConfig.InvariantAPIEnabled = null;
} }
if (string.IsNullOrWhiteSpace(serverConfig.SMTPConfig.EmailServer)) if (string.IsNullOrWhiteSpace(serverConfig.SMTPConfig?.EmailServer ?? string.Empty))
{ {
serverConfig.SMTPConfig = null; serverConfig.SMTPConfig = null;
} }
if (string.IsNullOrWhiteSpace(serverConfig.OIDCConfig.Name)) if (string.IsNullOrWhiteSpace(serverConfig.OIDCConfig?.Name ?? string.Empty))
{ {
serverConfig.OIDCConfig = null; serverConfig.OIDCConfig = null;
} }

27
Views/Home/Setup.cshtml
View File

@ -44,7 +44,16 @@
<form class="form-inline"> <form class="form-inline">
<div class="form-group"> <div class="form-group">
<label for="inputPostgres">@translator.Translate(userLanguage, "Postgres Connection")</label> <label for="inputPostgres">@translator.Translate(userLanguage, "Postgres Connection")</label>
<input type="text" id="inputPostgres" class="form-control" placeholder="@translator.Translate(userLanguage, "Not Configured")" value="@Model.PostgresConnection"> <div class="input-group">
<input type="text" id="inputPostgres" class="form-control" placeholder="@translator.Translate(userLanguage, "Not Configured")" value="@Model.PostgresConnection">
<div class="input-group-text">
<div class="form-check form-switch">
<input class="form-check-input" type="checkbox" role="switch" id="skipPostgres">
<label class="form-check-label" for="skipPostgres">@translator.Translate(userLanguage, "Skip")</label>
</div>
</div>
</div>
<small class="text-body-secondary">@translator.Translate(userLanguage, "Restart Required")</small> <small class="text-body-secondary">@translator.Translate(userLanguage, "Restart Required")</small>
</div> </div>
<div class="form-group"> <div class="form-group">
@ -88,7 +97,13 @@
</form> </form>
</div> </div>
<div class="setup-wizard-content" data-page="2" style="display:none;"> <div class="setup-wizard-content" data-page="2" style="display:none;">
<span class="display-5">@translator.Translate(userLanguage, "SMTP")</span> <div class="d-flex justify-content-between align-items-center">
<span class="display-5">@translator.Translate(userLanguage, "SMTP")</span>
<div class="form-check form-switch">
<input class="form-check-input" type="checkbox" onchange="nextOnSkip(this)" role="switch" id="skipSMTP">
<label class="form-check-label" for="skipSMTP">@translator.Translate(userLanguage, "Skip")</label>
</div>
</div>
<hr /> <hr />
<form class="form-inline"> <form class="form-inline">
<div class="form-group"> <div class="form-group">
@ -124,7 +139,13 @@
</form> </form>
</div> </div>
<div class="setup-wizard-content" data-page="3" style="display:none;"> <div class="setup-wizard-content" data-page="3" style="display:none;">
<span class="display-5">@translator.Translate(userLanguage, "Single Sign On")</span> <div class="d-flex justify-content-between align-items-center">
<span class="display-5">@translator.Translate(userLanguage, "Single Sign On")</span>
<div class="form-check form-switch">
<input class="form-check-input" type="checkbox" onchange="nextOnSkip(this)" role="switch" id="skipOIDC">
<label class="form-check-label" for="skipOIDC">@translator.Translate(userLanguage, "Skip")</label>
</div>
</div>
<hr /> <hr />
<form class="form-inline"> <form class="form-inline">
<div class="form-group"> <div class="form-group">

2
wwwroot/defaults/en_US.json
View File

File diff suppressed because one or more lines are too long

15
wwwroot/js/serversettings.js
View File

@ -97,6 +97,16 @@ function saveSetup() {
break; break;
} }
} }
//nullify skipped settings
if ($("#skipSMTP").is(":checked")) {
setupData["SMTPConfig"] = null;
}
if ($("#skipOIDC").is(":checked")) {
setupData["OIDCConfig"] = null;
}
if ($("#skipPostgres").is(":checked")) {
setupData["PostgresConnection"] = null;
}
let rootUserOIDC = $("#inputOIDCRootUser"); let rootUserOIDC = $("#inputOIDCRootUser");
if (rootUserOIDC.length > 0) { if (rootUserOIDC.length > 0) {
setupData["EnableRootUserOIDC"] = $("#inputOIDCRootUser").val(); setupData["EnableRootUserOIDC"] = $("#inputOIDCRootUser").val();
@ -142,4 +152,9 @@ function sendTestEmail() {
}); });
} }
}); });
}
function nextOnSkip(sender) {
if ($(sender).is(":checked")) {
nextSetupPage();
}
} }