Merge pull request #61 from qJake/project-updates

1.0.3: More Hass.io Fixes
qJake · Feb 8, 2020 · f7571fa · f7571fa
2 parents 638aaeb + 7597f31
commit f7571fa
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 6 deletions.
diff --git a/Docker/BuildHaccContainers.ps1 b/Docker/BuildHaccContainers.ps1
@@ -1,4 +1,4 @@
-$version = '1.0.1'
+$version = '1.0.3'
 
 function Test-ExitCode ([int] $Expected = 0)
 {

diff --git a/HADotNet.CommandCenter/Controllers/AdminController.cs b/HADotNet.CommandCenter/Controllers/AdminController.cs
@@ -96,7 +96,14 @@ public async Task<IActionResult> Settings(SystemSettings newSettings)
             {
                 if (ModelState.IsValid)
                 {
-                    newSettings.BaseUri = newSettings.BaseUri.TrimEnd('/');
+                    if (newSettings.IsHassIo)
+                    {
+                        newSettings.BaseUri = "http://hassio/homeassistant";
+                    }
+                    else
+                    {
+                        newSettings.BaseUri = newSettings.BaseUri.TrimEnd('/');
+                    }
                     await ConfigStore.ManipulateConfig(c => c.Settings = newSettings);
 
                     TempData["check-settings"] = true;

diff --git a/HADotNet.CommandCenter/HADotNet.CommandCenter.csproj b/HADotNet.CommandCenter/HADotNet.CommandCenter.csproj
@@ -5,8 +5,8 @@
     <RuntimeIdentifiers>win10;alpine.3.10-x64;debian.10-arm</RuntimeIdentifiers>
     <TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <AssemblyVersion>1.0.2.0</AssemblyVersion>
-    <FileVersion>1.0.2.0</FileVersion>
+    <AssemblyVersion>1.0.3.0</AssemblyVersion>
+    <FileVersion>1.0.3.0</FileVersion>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <Deterministic>false</Deterministic>

diff --git a/HADotNet.CommandCenter/Middleware/HAClientInitialization.cs b/HADotNet.CommandCenter/Middleware/HAClientInitialization.cs
@@ -1,5 +1,6 @@
 using HADotNet.CommandCenter.Models.Config;
 using HADotNet.CommandCenter.Models.Config.Pages;
+using HADotNet.CommandCenter.Models.Config.Tiles;
 using HADotNet.CommandCenter.Services.Interfaces;
 using HADotNet.Core;
 using HADotNet.Core.Clients;
@@ -85,7 +86,7 @@ await ConfigStore.ManipulateConfig(c =>
 
             // Pages Migration
 
-            #pragma warning disable CS0612
+#pragma warning disable CS0612
             if ((config.TileLayout?.Count > 0 || config.Tiles?.Count > 0) && (config.Pages?.Count ?? 0) == 0)
             {
                 await ConfigStore.ManipulateConfig(config =>
@@ -106,7 +107,31 @@ await ConfigStore.ManipulateConfig(config =>
                 });
                 context.Response.Redirect("/admin/pageMigration");
             }
-            #pragma warning restore CS0612
+            else if (config.Pages.Count == 0)
+            {
+                await ConfigStore.ManipulateConfig(config =>
+                {
+                    config.Pages = new List<Page>
+                    {
+                        new Page
+                        {
+                            Name = "default",
+                            Description = "Default Page",
+                            IsDefaultPage = true,
+                            Tiles = new List<BaseTile>(),
+                            TileLayout = new List<TileLayout>(),
+                            LayoutSettings = new LayoutSettings
+                            {
+                                DeviceHeightPx = 1280,
+                                DeviceWidthPx = 720,
+                                BaseTileSizePx = 92,
+                                TileSpacingPx = 6,
+                            }
+                        }
+                    };
+                });
+            }
+#pragma warning restore CS0612
 
             await Next(context);
         }