diff --git a/.vscode/settings.json b/.vscode/settings.json index 732713d..604ccae 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -3,10 +3,12 @@ "dotnet-test-explorer.runInParallel": false, "dotnet-test-explorer.showCodeLens": true, "dotnet-test-explorer.testArguments": "", - "nxunitExplorer.nunit": "${workspaceFolder}/packages/nunit3-console.1.0.0/lib/net20/nunit3-console.exe", - "nxunitExplorer.xunit": "${workspaceFolder}/packages/xunit.runner.console.2.4.1/tools/net472/xunit.console.exe", "nxunitExplorer.modules": [ - "test/**/bin/**/*.{dll,exe}" + "test/i*/bin/Debug/*/*.tests.dll" ], - "nxunitExplorer.logpanel": true + "nxunitExplorer.skippattern": "", + "dotnetCoreExplorer.runEnvVars": { + "ASPNETCORE_ENVIRONMENT": "Testing" + }, + "dotnetCoreExplorer.searchpatterns": "test/**/bin/**/*.tests.{dll,exe}" } \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json index e453c20..39254a1 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -50,13 +50,19 @@ ], "problemMatcher": "$msCompile" }, + { + "label": "copyTestConfig", + "command": "dotnet", + "type": "process", + "args": [ "build", "/t:CopyTestConfig" ] + }, { "label": "test", "command": "dotnet", "type": "process", "options": { "env": { - "ASPNETCORE_ENVIRONMENT": "Development" + "ASPNETCORE_ENVIRONMENT": "Testing" } }, "args": [ @@ -64,7 +70,8 @@ "/property:GenerateFullPaths=true", "/consoleloggerparameters:NoSummary" ], - "problemMatcher": "$msCompile" + "problemMatcher": "$msCompile", + "dependsOn": [ "build", "copyTestConfig"] }, { "label": "watch", diff --git a/src/isn/Program.Commands.cs b/src/isn/Program.Commands.cs index d0b684b..897d144 100644 --- a/src/isn/Program.Commands.cs +++ b/src/isn/Program.Commands.cs @@ -100,15 +100,17 @@ namespace isn { // une addition string ptd = Protector.Protect(apiKey); - var sUri = new Uri(source); Settings.Sources.Add(source, new SourceSettings { ApiKey = ptd }); } else return; - - FileInfo cfgSettingIf = new FileInfo(_configFileName); if (!cfgSettingIf.Directory.Exists) cfgSettingIf.Directory.Create(); - File.WriteAllText(cfgSettingIf.FullName, JsonConvert.SerializeObject(Program.Settings)); + File.WriteAllText( + cfgSettingIf.FullName, + JsonConvert.SerializeObject( + Settings, + Formatting.Indented + )); } public static void LoadConfig() diff --git a/src/isnd/Views/Shared/_LoginPartial.cshtml b/src/isnd/Views/Shared/_LoginPartial.cshtml index 1adde49..6498547 100644 --- a/src/isnd/Views/Shared/_LoginPartial.cshtml +++ b/src/isnd/Views/Shared/_LoginPartial.cshtml @@ -20,10 +20,10 @@ else { } diff --git a/src/isnd/wwwroot/css/site-g.css b/src/isnd/wwwroot/css/site-g.css index 35bc29b..dcf288e 100644 --- a/src/isnd/wwwroot/css/site-g.css +++ b/src/isnd/wwwroot/css/site-g.css @@ -54,7 +54,7 @@ body { font-size: 1rem; font-weight: 400; line-height: 1.5; - color: white; + color: #d6d6d6; text-align: left; background-color: #272727; } @@ -1318,7 +1318,7 @@ pre { .table { width: 100%; margin-bottom: 1rem; - color: white; } + color: #d6d6d6; } .table th, .table td { padding: 0.75rem; @@ -1353,7 +1353,7 @@ pre { background-color: rgba(0, 0, 0, 0.05); } .table-hover tbody tr:hover { - color: white; + color: #d6d6d6; background-color: rgba(0, 0, 0, 0.075); } .table-primary, @@ -1630,7 +1630,7 @@ select.form-control:focus::-ms-value { margin-bottom: 0; font-size: 1rem; line-height: 1.5; - color: white; + color: #d6d6d6; background-color: transparent; border: solid transparent; border-width: 1px 0; } @@ -1899,7 +1899,7 @@ textarea.form-control { .btn { display: inline-block; font-weight: 400; - color: white; + color: #d6d6d6; text-align: center; vertical-align: middle; cursor: pointer; @@ -1915,7 +1915,7 @@ textarea.form-control { .btn { transition: none; } } .btn:hover { - color: white; + color: #d6d6d6; text-decoration: none; } .btn:focus, .btn.focus { outline: 0; @@ -2359,7 +2359,7 @@ input[type="button"].btn-block { padding: 0.5rem 0; margin: 0.125rem 0 0; font-size: 1rem; - color: white; + color: #d6d6d6; text-align: left; list-style: none; background-color: #fff; @@ -3940,7 +3940,7 @@ input[type="button"].btn-block { text-decoration: none; background-color: #f8f9fa; } .list-group-item-action:active { - color: white; + color: #d6d6d6; background-color: #e9ecef; } .list-group-item { @@ -4562,7 +4562,7 @@ a.close.disabled { .popover-body { padding: 0.5rem 0.75rem; - color: white; } + color: #d6d6d6; } .carousel { position: relative; } @@ -7666,7 +7666,7 @@ a.text-dark:hover, a.text-dark:focus { color: #121416 !important; } .text-body { - color: white !important; } + color: #d6d6d6 !important; } .text-muted { color: #6c757d !important; } diff --git a/src/isnd/wwwroot/css/site.scss b/src/isnd/wwwroot/css/site.scss index fcb6f81..07996e3 100644 --- a/src/isnd/wwwroot/css/site.scss +++ b/src/isnd/wwwroot/css/site.scss @@ -1,6 +1,6 @@ // Your variable overrides $body-bg: rgb(39, 39, 39); -$body-color: rgb(255, 255, 255); +$body-color: rgb(214, 214, 214); @import "../lib/bootstrap/scss/bootstrap"; diff --git a/src/isnd/wwwroot/icon.jpg b/src/isnd/wwwroot/icon.jpg deleted file mode 100644 index e652502..0000000 Binary files a/src/isnd/wwwroot/icon.jpg and /dev/null differ diff --git a/src/isnd/wwwroot/icon.png b/src/isnd/wwwroot/icon.png index 0720a6b..214ed31 100644 Binary files a/src/isnd/wwwroot/icon.png and b/src/isnd/wwwroot/icon.png differ diff --git a/test/isnd.tests/isnd.tests.csproj b/test/isnd.tests/isnd.tests.csproj index 62b23cc..786d7e6 100644 --- a/test/isnd.tests/isnd.tests.csproj +++ b/test/isnd.tests/isnd.tests.csproj @@ -22,5 +22,13 @@ - + + + + + +