Fixes #652 (#655)

ironmansoftware · Feb 22, 2019 · 647440e · 647440e
1 parent b1a8f1d
commit 647440e
Show file tree

Hide file tree

Showing 3 changed files with 64 additions and 34 deletions.
diff --git a/src/UniversalDashboard.Materialize/package-lock.json b/src/UniversalDashboard.Materialize/package-lock.json
diff --git a/src/UniversalDashboard.UITest/Integration/Crossplatform.Tests.ps1 b/src/UniversalDashboard.UITest/Integration/Crossplatform.Tests.ps1
@@ -2,8 +2,8 @@ param(
     [Switch]$Release
 )
 
-if ($ENV:APPVEYOR) {
-    Write-Warning  "Cross platform tests do not work on AppVeyor."
+if ($ENV:AGENT_JOBSTATUS) {
+    Write-Warning  "Cross platform tests do not work on Azure Pipelines."
     return
 }
 
@@ -24,7 +24,7 @@ $Init = [ScriptBlock]::Create("Import-Module (Join-Path $Root `"Docker/Docker.ps
 Describe "Ubuntu" {
     Context "dashboard running" {
         Get-DockerContainer -All -Name "TestContainer" | Remove-DockerContainer -Force
-        New-DockerContainer -Name "TestContainer" -Repository "microsoft/powershell" -Tag "ubuntu-16.04" -Port 10001
+        New-DockerContainer -Name "TestContainer" -Repository "microsoft/powershell" -Tag "latest" -Port 10001
         Start-DockerContainer -Name "TestContainer"
         Invoke-DockerCommand -ContainerName "TestContainer" -ScriptBlock {
             New-Item UniversalDashboard -ItemType directory | Out-Null
@@ -33,7 +33,7 @@ Describe "Ubuntu" {
 
         Start-Job {
             Invoke-DockerCommand -ContainerName "TestContainer" -ScriptBlock {
-                Import-Module '/UniversalDashboard/output/UniversalDashboard.psd1'
+                Import-Module '/UniversalDashboard/output/UniversalDashboard.Community.psd1'
                 Enable-UDLogging
                 Start-UDDashboard -Port 10001 -Dashboard (New-UDDashboard -Title 'Hey' -Content {}) -Wait
             } 

diff --git a/src/UniversalDashboard/Controllers/DashboardController.cs b/src/UniversalDashboard/Controllers/DashboardController.cs
@@ -68,25 +68,27 @@ public Page Page()
         [ResponseCache(NoStore = true, Location = ResponseCacheLocation.None)]
         public IActionResult Theme()
 	    {
-            var materializeCss = Path.Combine(Path.GetDirectoryName(GetType().Assembly.Location), "styles", "materialize.min.css");
-            var siteCss = Path.Combine(Path.GetDirectoryName(GetType().Assembly.Location), "styles", "site.css");
+            try
+            {
+                var materializeCss = Path.Combine(Path.GetDirectoryName(GetType().Assembly.Location), "Styles", "materialize.min.css");
+                var siteCss = Path.Combine(Path.GetDirectoryName(GetType().Assembly.Location), "Styles", "site.css");
 
-            var css = System.IO.File.ReadAllText(materializeCss);
-            css += System.IO.File.ReadAllText(siteCss);
-            css += _dashboard?.Themes?.FirstOrDefault()?.RenderedContent;
+                var css = System.IO.File.ReadAllText(materializeCss);
+                css += System.IO.File.ReadAllText(siteCss);
+                css += _dashboard?.Themes?.FirstOrDefault()?.RenderedContent;
 
-            if (_dashboard?.Navigation != null)
-            {
-                css += Environment.NewLine;
-                css += $@"side-nav {{
+                if (_dashboard?.Navigation != null)
+                {
+                    css += Environment.NewLine;
+                    css += $@"side-nav {{
                             width: {_dashboard.Navigation.Width}px;
                         }}";
-            }
+                }
 
-            if (_dashboard?.Navigation?.Fixed == true)
-            {
-                css += Environment.NewLine;
-                css += $@"
+                if (_dashboard?.Navigation?.Fixed == true)
+                {
+                    css += Environment.NewLine;
+                    css += $@"
                         header, main, footer {{
                           padding-left: {_dashboard.Navigation.Width}px;
                         }}
@@ -96,13 +98,22 @@ @media only screen and (max-width : 992px) {{
                             padding-left: 0;
                           }}
                         }}";
-            }
+                }
 
-			return new ContentResult()
+                return new ContentResult()
+                {
+                    Content = css,
+                    ContentType = "text/css",
+                };
+            }
+            catch (Exception ex)
             {
-                Content = css,
-                ContentType = "text/css",
-            };
+                return new ContentResult()
+                {
+                    Content = ex.Message,
+                    ContentType = "text/css"
+                };
+             }
 	    }
 
         [Route("reload")]