diff --git a/Wonky.Client.sln b/Wonky.Client.SDK8.sln similarity index 100% rename from Wonky.Client.sln rename to Wonky.Client.SDK8.sln diff --git a/Wonky.Client.sln.DotSettings b/Wonky.Client.SDK8.sln.DotSettings similarity index 100% rename from Wonky.Client.sln.DotSettings rename to Wonky.Client.SDK8.sln.DotSettings diff --git a/Wonky.Client/Components/AdvisorCustomerListComponent.razor b/Wonky.Client/Components/AdvisorCustomerListComponent.razor index 62b5cf61..fd811f77 100644 --- a/Wonky.Client/Components/AdvisorCustomerListComponent.razor +++ b/Wonky.Client/Components/AdvisorCustomerListComponent.razor @@ -21,9 +21,9 @@ - - - + + + diff --git a/Wonky.Client/Components/AppVersion.razor b/Wonky.Client/Components/AppVersion.razor index ba1b0efc..0e4f4d80 100644 --- a/Wonky.Client/Components/AppVersion.razor +++ b/Wonky.Client/Components/AppVersion.razor @@ -16,24 +16,29 @@ @using Wonky.Entity.Configuration @using Microsoft.Extensions.Options +@if (_app!.Rc) +{ +
RC
+} + @if (_production) { -
v.@_app?.Version
+
build v.@_app?.Version
} else { -
v.@_app?.Version
+
build v.@_app?.Version
} -@if (_app!.Rc) -{ -
RC
-} +
@_app!.Sdk
+@* @if (_app!.Sandbox) { -
EDU DEMO
+
EDU SANDKASSE
} +*@ + @code { [Inject] IOptions? AppInfo { get; set; } diff --git a/Wonky.Client/Components/InfoColorCustomerComponent.razor b/Wonky.Client/Components/InfoColorCustomerComponent.razor index 1c4c1122..3e191139 100644 --- a/Wonky.Client/Components/InfoColorCustomerComponent.razor +++ b/Wonky.Client/Components/InfoColorCustomerComponent.razor @@ -24,6 +24,22 @@ + + + + + + + +
Navn Konto Tlf
+ + + Besøg status +
+ + + Org. Nr. status +
diff --git a/Wonky.Client/Wonky.Client.csproj b/Wonky.Client/Wonky.Client.csproj index 69f4878c..798bad28 100644 --- a/Wonky.Client/Wonky.Client.csproj +++ b/Wonky.Client/Wonky.Client.csproj @@ -5,20 +5,20 @@ enable latestmajor Exe - net7.0 + net8.0 - - - - - - - - + + + + + + + + diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json index 9d50ad46..1793618a 100644 --- a/Wonky.Client/wwwroot/appsettings.json +++ b/Wonky.Client/wwwroot/appsettings.json @@ -4,12 +4,13 @@ "version": "171.0", "rc": true, "sandBox": true, - "image": "grumpy-coder.png" + "image": "grumpy-coder.png", + "sdk": "dotnet 8.0 LTS" }, "Logging": { "LogLevel": { - "Default": "None", - "System": "None", + "Default": "Debug", + "System": "Debug", "Microsoft": "None" }, "Debug": { @@ -19,7 +20,7 @@ } }, "apiConfig": { - "baseUrl": "https://dev.innotec.dk", + "baseUrl": "https://eta.innotec.dk", "catalog": "api/v2/catalog/country", "crmCustomers": "api/v2/crm/companies", "crmInventoryExt": "history/inventory", diff --git a/Wonky.Client/wwwroot/css/20230607.css b/Wonky.Client/wwwroot/css/20230607.css new file mode 100644 index 00000000..619127ef --- /dev/null +++ b/Wonky.Client/wwwroot/css/20230607.css @@ -0,0 +1,252 @@ +body { + font-size: 16px; +} + +.draft-expires-msg { + font-size: 0.8em; +} +.busy-signal { + float: right; + z-index: 100; + position: relative; + top: 1px; + right: 10px; +} +.workDate { + font-variant: small-caps; +} + +.action-link-element { + cursor: pointer; +} + +.i-larger { + font-size: 1.3rem; +} + +.btn.btn-edit { + color: #030303; + background-color: #a2a2ec; +} + +html, body { + font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; +} + +h1,h2:focus { + outline: none; +} + +a, .btn-link { + color: #0071c1; +} + +/*.btn-primary {*/ +/* color: #fff;*/ +/* background-color: #1b6ec2;*/ +/* border-color: #1861ac;*/ +/*}*/ + +.inno { + color: #ffaa00; +} + +.inno-display { + display: block; +} + +.inno-hidden { + display: none; +} + +.content { + padding-top: 1.1rem; +} + +.valid.modified:not([type=checkbox]) { + outline: 1px solid #26b050; +} + +.invalid { + outline: 1px solid red; +} + +.validation-message { + color: red; +} + +/* begin state elements */ +.state { + width: 16px; + height: 16px; + min-width: 16px; + min-height: 16px; +} +.the-good { + color: green; +} +.the-bad { + color: orange; +} +.the-ugly { + color: red; +} +.the-dead { + color: black; +} +.the-fast { + color: orange; +} +.the-draw { + color: mediumpurple; +} +.the-good-bg { + background-color: green; +} +.the-bad-bg { + background-color: orange; +} +.the-ugly-bg { + background-color: red; +} +.the-draw-bg { + background-color: mediumpurple; +} +.no-vat-bg { + background-color: lightskyblue; +} +.the-dead-bg { + background-color: black; +} +/* end state elements */ + +/* led elements */ +.led-box { + height: 24px; + width: 24px; + margin: auto; + float: left; +} + +.led-red { + margin: 5px; + width: 24px; + height: 24px; + background-color: #F00; + border-radius: 50%; + box-shadow: rgba(0, 0, 0, 0.2) 0 -1px 7px 1px, inset #441313 0 -1px 9px, rgba(255, 0, 0, 0.5) 0 2px 12px; + -webkit-animation: blinkRed 0.5s infinite; + -moz-animation: blinkRed 0.5s infinite; + -ms-animation: blinkRed 0.5s infinite; + -o-animation: blinkRed 0.5s infinite; + animation: blinkRed 0.5s infinite; + animation-iteration-count: infinite; +} + +@-webkit-keyframes blinkRed { + from { background-color: #F00; } + 50% { background-color: #A00; box-shadow: rgba(0, 0, 0, 0.2) 0 -1px 7px 1px, inset #441313 0 -1px 9px, rgba(255, 0, 0, 0.5) 0 2px 0;} + to { background-color: #F00; } +} +@-moz-keyframes blinkRed { + from { background-color: #F00; } + 50% { background-color: #A00; box-shadow: rgba(0, 0, 0, 0.2) 0 -1px 7px 1px, inset #441313 0 -1px 9px, rgba(255, 0, 0, 0.5) 0 2px 0;} + to { background-color: #F00; } +} +@-ms-keyframes blinkRed { + from { background-color: #F00; } + 50% { background-color: #A00; box-shadow: rgba(0, 0, 0, 0.2) 0 -1px 7px 1px, inset #441313 0 -1px 9px, rgba(255, 0, 0, 0.5) 0 2px 0;} + to { background-color: #F00; } +} +@-o-keyframes blinkRed { + from { background-color: #F00; } + 50% { background-color: #A00; box-shadow: rgba(0, 0, 0, 0.2) 0 -1px 7px 1px, inset #441313 0 -1px 9px, rgba(255, 0, 0, 0.5) 0 2px 0;} + to { background-color: #F00; } +} +@keyframes blinkRed { + from { background-color: #F00; } + 50% { background-color: #A00; box-shadow: rgba(0, 0, 0, 0.2) 0 -1px 7px 1px, inset #441313 0 -1px 9px, rgba(255, 0, 0, 0.5) 0 2px 0;} + to { background-color: #F00; } +} + +.led-yellow { + margin: 0 auto; + width: 24px; + height: 24px; + background-color: #FF0; + border-radius: 50%; + box-shadow: rgba(0, 0, 0, 0.2) 0 -1px 7px 1px, inset #808002 0 -1px 9px, #FF0 0 2px 12px; + -webkit-animation: blinkYellow 1s infinite; + -moz-animation: blinkYellow 1s infinite; + -ms-animation: blinkYellow 1s infinite; + -o-animation: blinkYellow 1s infinite; + animation: blinkYellow 1s infinite; +} + +@-webkit-keyframes blinkYellow { + from { background-color: #FF0; } + 50% { background-color: #AA0; box-shadow: rgba(0, 0, 0, 0.2) 0 -1px 7px 1px, inset #808002 0 -1px 9px, #FF0 0 2px 0; } + to { background-color: #FF0; } +} +@-moz-keyframes blinkYellow { + from { background-color: #FF0; } + 50% { background-color: #AA0; box-shadow: rgba(0, 0, 0, 0.2) 0 -1px 7px 1px, inset #808002 0 -1px 9px, #FF0 0 2px 0; } + to { background-color: #FF0; } +} +@-ms-keyframes blinkYellow { + from { background-color: #FF0; } + 50% { background-color: #AA0; box-shadow: rgba(0, 0, 0, 0.2) 0 -1px 7px 1px, inset #808002 0 -1px 9px, #FF0 0 2px 0; } + to { background-color: #FF0; } +} +@-o-keyframes blinkYellow { + from { background-color: #FF0; } + 50% { background-color: #AA0; box-shadow: rgba(0, 0, 0, 0.2) 0 -1px 7px 1px, inset #808002 0 -1px 9px, #FF0 0 2px 0; } + to { background-color: #FF0; } +} +@keyframes blinkYellow { + from { background-color: #FF0; } + 50% { background-color: #AA0; box-shadow: rgba(0, 0, 0, 0.2) 0 -1px 7px 1px, inset #808002 0 -1px 9px, #FF0 0 2px 0; } + to { background-color: #FF0; } +} + +.led-green { + margin: 0 auto; + width: 24px; + height: 24px; + background-color: #ABFF00; + border-radius: 50%; + box-shadow: rgba(0, 0, 0, 0.2) 0 -1px 7px 1px, inset #304701 0 -1px 9px, #89FF00 0 2px 12px; +} + +.led-blue { + margin: 0 auto; + width: 24px; + height: 24px; + background-color: #24E0FF; + border-radius: 50%; + box-shadow: rgba(0, 0, 0, 0.2) 0 -1px 7px 1px, inset #006 0 -1px 9px, #3F8CFF 0 2px 14px; +} +/* end led elements */ + +.footer { + border-top: 2px solid orange; + position: relative; + margin-top: -150px; + height: 150px; + width: 100%; + clear: both; + padding-top: 20px; +} + +footer.version { + display: block; + font-weight: bold; + padding: 0 10px 0 0; +} + +.back-to-top { + position: fixed; + bottom: 25px; + right: 25px; + display: none; +} diff --git a/Wonky.Entity/Configuration/AppInfo.cs b/Wonky.Entity/Configuration/AppInfo.cs index 6ca0e4df..48e3456c 100644 --- a/Wonky.Entity/Configuration/AppInfo.cs +++ b/Wonky.Entity/Configuration/AppInfo.cs @@ -42,4 +42,6 @@ public class AppInfo /// Sandbox version /// public bool Sandbox { get; set; } + + public string Sdk { get; set; } = ""; } \ No newline at end of file diff --git a/Wonky.Entity/Wonky.Entity.csproj b/Wonky.Entity/Wonky.Entity.csproj index cfadb03d..30402ac0 100644 --- a/Wonky.Entity/Wonky.Entity.csproj +++ b/Wonky.Entity/Wonky.Entity.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 enable enable diff --git a/global.json b/global.json index 36e1a9e9..dad2db5e 100644 --- a/global.json +++ b/global.json @@ -1,7 +1,7 @@ { "sdk": { - "version": "7.0.0", + "version": "8.0.0", "rollForward": "latestMajor", - "allowPrerelease": false + "allowPrerelease": true } } \ No newline at end of file