root/Wonky.Client
root/Wonky.Client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

cosmetic

Browse source
This commit is contained in:
Frede Hundewadt 2023-06-20 11:24:22 +02:00
parent c128095937
commit a5a7c0893a
6 changed files with 95 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Wonky.Client/Components/AppSandbox.razor
View file

@ -18,7 +18,7 @@
@if (_app!.Sandbox) @if (_app!.Sandbox)
{ {
<div class="badge text-bg-danger mx-3 pt-2">DEMO SANDKASSE</div> <div class="badge text-bg-danger mx-3 pt-3 pb-2 pe-2 ps-2">DEMO SANDKASSE</div>
} }
@code @code
{ {

24
Wonky.Client/Components/AppVersion.razor
View file

@ -16,28 +16,15 @@
@using Wonky.Entity.Configuration @using Wonky.Entity.Configuration
@using Microsoft.Extensions.Options @using Microsoft.Extensions.Options
<div class="badge text-bg-success mx-3 pt-2">v@(_app?.Version)</div>
@if (_app!.Rc) @if (_app!.Rc)
{ {
<div class="badge text-bg-warning mx-2 pt-2">RC</div> <div class="badge text-bg-warning mx-2 pt-2">RC</div>
} }
@if (_production)
{
<div class="badge text-bg-success mx-3">v.@_app?.Version</div>
}
else
{
<div class="badge text-bg-info mx-3">v.@_app?.Version</div>
}
@if (_app!.Rc) <di class="badge text-bg-info mx-2 pt-2">@_app!.Sdk</di>
{
<div class="badge text-bg-warning mx-3">RC</div>
}
<div class="badge text-bg-info mx-2 pt-2">@_app!.Sdk</div>
@*@if (_app!.Sandbox)
{
<div class="badge text-bg-danger mx-3">EDU DEMO</div>
}*@
@code @code
{ {
[Inject] IOptions<AppInfo?>? AppInfo { get; set; } [Inject] IOptions<AppInfo?>? AppInfo { get; set; }
@ -47,8 +34,5 @@ else
protected override void OnInitialized() protected override void OnInitialized()
{ {
_app = AppInfo?.Value; _app = AppInfo?.Value;
// var revision = _app?.Version.Split(".");
// var x = Convert.ToInt32(revision?[^1]);
// _production = x % 2 == 0;
} }
} }

6
Wonky.Client/wwwroot/appsettings.json
View file

@ -1,7 +1,7 @@
{ {
"appInfo": { "appInfo": {
"name": "Wonky Online", "name": "Wonky Online",
"version": "171.0", "version": "173.0",
"rc": true, "rc": true,
"sandBox": true, "sandBox": true,
"image": "grumpy-coder.png", "image": "grumpy-coder.png",
@ -9,8 +9,8 @@
}, },
"Logging": { "Logging": {
"LogLevel": { "LogLevel": {
"Default": "None", "Default": "Debug",
"System": "None", "System": "Debug",
"Microsoft": "None" "Microsoft": "None"
}, },
"Debug": { "Debug": {

25
alpha-build.sh Normal file → Executable file
View file

@ -1,5 +1,26 @@
#/usr/bin/env bash #/usr/bin/env bash
if [[ -z $1 ]]; then
echo "no version"
exit 1
fi
FILE="$PWD/Wonky.Client/wwwroot/appsettings.json"
FOLDER="alpha-client"
sed -i "s|\"version\".*|\"version\": \"$1\",|g" "${FILE}"
sed -i 's|\"rc\".*|\"rc\": false,|g' "${FILE}"
sed -i 's|\"sandbox\".*|\"sandbox\": true,|g' "${FILE}"
sed -i 's|\"Default": \"None\",|\"Default": \"Debug\",|g' "${FILE}"
sed -i 's|\"System": \"None\",|\"System": \"Debug\",|g' "${FILE}"
sed -i 's|\"baseUrl\".*|\"baseUrl\": \"https://eta.innotec.dk\",|g' "${FILE}"
dotnet publish -c release dotnet publish -c release
rm -rf /a/projects/inno/version-sync/alpha-client/*
cp /a/projects/inno/a/Wonky.Client/Wonky.Client/bin/Release/net8.0/publish/* /a/projects/inno/version-sync/alpha-client/ -rn cp --recursive /a/projects/inno/a/Wonky.Client/Wonky.Client/bin/Release/net7.0/publish/* "/a/projects/inno/version-sync/${FOLDER}"
sed -i 's|\"rc\".*|\"rc\": true,|g' "${FILE}"
printf "\n==> done building: ${FOLDER} ${1}\n"

32
eta-build.sh Executable file
View file

@ -0,0 +1,32 @@
#!/usr/bin/env bash
if [[ -z $1 ]]; then
echo "no version"
exit 1
fi
FILE="$PWD/Wonky.Client/wwwroot/appsettings.json"
FOLDER="eta-${1}"
sed -i "s|\"version\".*|\"version\": \"${1}\",|g" "${FILE}"
sed -i 's|\"rc\".*|\"rc\": true,|g' "${FILE}"
sed -i 's|\"sandbox\".*|\"sandbox\": true,|g' "${FILE}"
sed -i 's|\"Default": \"Debug\",|\"Default": \"None\",|g' "${FILE}"
sed -i 's|\"System": \"Debug\",|\"System": \"None\",|g' "${FILE}"
sed -i 's|\"baseUrl\".*|\"baseUrl\": \"https://eta.innotec.dk\",|g' "${FILE}"
dotnet publish -c release
cp --recursive "/a/projects/inno/a/Wonky.Client/Wonky.Client/bin/Release/net7.0/publish" "/a/projects/inno/version-sync/client/${FOLDER}"
# RESET TO DEVELOPMENT
sed -i 's|\"sandbox\".*|\"sandbox\": true,|g' "${FILE}"
sed -i 's|\"Default": \"None\",|\"Default": \"Debug\",|g' "${FILE}"
sed -i 's|\"System": \"None\",|\"System": \"Debug\",|g' "${FILE}"
sed -i 's|\"baseUrl\".*|\"baseUrl\": \"https://eta.innotec.dk\",|g' "${FILE}"
printf "\n==> done building: ${FOLDER} EDU SANDBOX\n"

32
zeta-build.sh Executable file
View file

@ -0,0 +1,32 @@
#!/usr/bin/env bash
if [[ -z $1 ]]; then
echo "no version"
exit 1
fi
FILE="$PWD/Wonky.Client/wwwroot/appsettings.json"
FOLDER="zeta-${1}"
sed -i "s|\"version\":.*|\"version\": \"$1\",|g" "${FILE}"
sed -i 's|\"rc\":.*|\"rc\": true,|g' "${FILE}"
sed -i 's|\"sandbox\":.*|\"sandbox\": false,|g' "${FILE}"
sed -i 's|\"Default": \"Debug\",|\"Default": \"None\",|g' "${FILE}"
sed -i 's|\"System": \"Debug\",|\"System": \"None\",|g' "${FILE}"
sed -i 's|\"baseUrl\".*|\"baseUrl\": \"https://zeta.innotec.dk\",|g' "${FILE}"
dotnet publish -c release
cp --recursive "/a/projects/inno/a/Wonky.Client/Wonky.Client/bin/Release/net7.0/publish" "/a/projects/inno/version-sync/client/${FOLDER}"
# RESET TO DEVELOPMENT
sed -i 's|\"sandbox\".*|\"sandbox\": true,|g' "${FILE}"
sed -i 's|\"Default": \"None\",|\"Default": \"Debug\",|g' "${FILE}"
sed -i 's|\"System": \"None\",|\"System": \"Debug\",|g' "${FILE}"
sed -i 's|\"baseUrl\".*|\"baseUrl\": \"https://eta.innotec.dk\",|g' "${FILE}"
printf "\n==> done building: ${FOLDER} RC\n"