From 2ca9b07909ea8e6b3d063cd4c5628dc195b92a06 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Mon, 18 May 2020 00:24:30 +0000 Subject: [PATCH] Cleanup of server api home page --- .../AyaNova/Controllers/ApiRootController.cs | 66 +++++++------------ 1 file changed, 22 insertions(+), 44 deletions(-) diff --git a/server/AyaNova/Controllers/ApiRootController.cs b/server/AyaNova/Controllers/ApiRootController.cs index 022557b7..3eeee58a 100644 --- a/server/AyaNova/Controllers/ApiRootController.cs +++ b/server/AyaNova/Controllers/ApiRootController.cs @@ -2,10 +2,8 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; using System; using AyaNova.Util; -using AyaNova.Biz; using AyaNova.Api.ControllerHelpers; using Microsoft.AspNetCore.Authorization; -using System.Threading.Tasks; namespace AyaNova.Api.Controllers { @@ -41,11 +39,8 @@ namespace AyaNova.Api.Controllers public ContentResult Index() { var errorBlock = string.Empty; - if (serverState.IsSystemLocked) - { - errorBlock = $@"

SERVER ERROR

{serverState.Reason}

"; - } -//todo: remove excess whitespace + if (serverState.IsSystemLocked) + errorBlock = $@"

SERVER ERROR

{serverState.Reason}

"; var resp = $@" @@ -57,56 +52,39 @@ namespace AyaNova.Api.Controllers body {{ text-align: left; font-family: sans-serif; - background-color: black; - color: whitesmoke; + background-color: #282828; + color: #ffb000; }} a {{ - color: chartreuse; + color: #33ff33; text-decoration:none; - }} + }} + .error{{ + color: #D8000C; + padding-top:10px; + padding-bottom:10px; + }} - - -
- {errorBlock} -
-

{AyaNovaVersion.FullNameAndVersion}

-

AyaNova App

-

User and technical guide

-

Email technical support

-

API explorer for developers

- -
-
+ + {errorBlock} +
+

{AyaNovaVersion.FullNameAndVersion}

+

AyaNova App

+

User and technical guide

+

Contact technical support

+

API explorer for developers

+
"; - /* - - head had this: - -probably for signature page - -

{await TranslationBiz.GetDefaultTranslationAsync("HelpLicense")}

- 
{AyaNova.Core.License.LicenseInfo}
-

Schema version

- 
{AySchema.currentSchema.ToString()}
-

Active techs

- 
{await UserBiz.ActiveCountAsync()}
-

Server time

- 
{DateUtil.ServerDateTimeString(System.DateTime.UtcNow)}
- 
{TimeZoneInfo.Local.Id}
-

Server logs

- 
{ServerBootConfig.AYANOVA_LOG_PATH}
- */ - + System.Text.RegularExpressions.Regex reg = new System.Text.RegularExpressions.Regex(@"(?<=\s)\s+"); + resp = reg.Replace(resp, string.Empty).Replace("\n","").Replace("\t",""); return new ContentResult { ContentType = "text/html", StatusCode = 200, Content = resp }; - } #region sigtest script