move some stuff for live radar for compiled views

add chat icon to send messages to servers on server view
2019-07-13 20:45:25 -05:00 · 2019-07-13 20:45:25 -05:00 · fc43e47874
commit fc43e47874
parent b0365a5a43
10 changed files with 105 additions and 38 deletions
--- a/Plugins/LiveRadar/LiveRadar.csproj
+++ b/Plugins/LiveRadar/LiveRadar.csproj
@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.Razor">

  <PropertyGroup>
    <TargetFramework>netcoreapp2.2</TargetFramework>
@ -6,21 +6,24 @@
    <RazorCompiledOnPublish Condition="'$(CONFIG)'!='Debug'">true</RazorCompiledOnPublish>
    <Version>0.1.0.0</Version>
    <Configurations>Debug;Release;Prerelease</Configurations>
+    <LangVersion>7.1</LangVersion>
  </PropertyGroup>

  <ItemGroup>
    <ProjectReference Include="..\..\SharedLibraryCore\SharedLibraryCore.csproj">
      <Private>false</Private>
    </ProjectReference>
-    <ProjectReference Include="..\..\WebfrontCore\WebfrontCore.csproj">
-      <Private>false</Private>
-    </ProjectReference>
+    <ProjectReference Include="..\..\WebfrontCore\WebfrontCore.csproj" />
  </ItemGroup>

  <ItemGroup>
    <Folder Include="Web\wwwroot\images\" />
  </ItemGroup>

+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
+  </ItemGroup>
+
  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
    <Exec Command="copy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)BUILD\Plugins&quot;" />
  </Target>
--- a/Plugins/LiveRadar/Web/Views/LiveRadar/Index.cshtml
+++ b/Plugins/LiveRadar/Web/Views/LiveRadar/Index.cshtml
--- a/SharedLibraryCore/Commands/NativeCommands.cs
+++ b/SharedLibraryCore/Commands/NativeCommands.cs
@ -167,6 +167,7 @@ namespace SharedLibraryCore.Commands
        public override Task ExecuteAsync(GameEvent E)
        {
            E.Owner.Broadcast($"{(E.Owner.GameName == Server.Game.IW4 ? "^:" : "")}{E.Origin.Name} - ^6{E.Data}^7", E.Origin);
+            E.Origin.Tell(Utilities.CurrentLocalization.LocalizationIndex["COMMANDS_SAY_SUCCESS"]);
            return Task.CompletedTask;
        }
    }
--- a/WebfrontCore/Controllers/ActionController.cs
+++ b/WebfrontCore/Controllers/ActionController.cs
@ -203,5 +203,43 @@ namespace WebfrontCore.Controllers
            var state = Manager.TokenAuthenticator.GenerateNextToken(Client.NetworkId);
            return string.Format(Utilities.CurrentLocalization.LocalizationIndex["COMMANDS_GENERATETOKEN_SUCCESS"], state.Token, $"{state.RemainingTime} {Utilities.CurrentLocalization.LocalizationIndex["GLOBAL_MINUTES"]}", Client.ClientId);
        }
+
+        public IActionResult ChatForm(long id)
+        {
+            var info = new ActionInfo()
+            {
+                ActionButtonLabel = Localization["WEBFRONT_ACTION_LABEL_SUBMIT_MESSAGE"],
+                Name = "Chat",
+                Inputs = new List<InputInfo>
+                {
+                    new InputInfo()
+                    {
+                        Name = "message",
+                        Type = "text",
+                        Label = Localization["WEBFRONT_ACTION_LABEL_MESSAGE"]
+                    },
+                    new InputInfo()
+                    {
+                        Name = "id",
+                        Value = id.ToString(),
+                        Type = "hidden"
+                    }
+                },
+                Action = "ChatAsync"
+            };
+
+            return View("_ActionForm", info);
+        }
+
+        public async Task<IActionResult> ChatAsync(long id, string message)
+        {
+            var server = Manager.GetServers().First(_server => _server.EndPoint == id);
+
+            return await Task.FromResult(RedirectToAction("ExecuteAsync", "Console", new
+            {
+                serverId = server.EndPoint,
+                command = $"!say {message}"
+            }));
+        }
    }
 }
--- a/WebfrontCore/Controllers/BaseController.cs
+++ b/WebfrontCore/Controllers/BaseController.cs
@ -72,7 +72,7 @@ namespace WebfrontCore.Controllers
                    if (clientId > 0)
                    {
                        Client.ClientId = clientId;
-                        Client.NetworkId = User.Claims.First(_claim => _claim.Type == ClaimTypes.PrimarySid).Value.ConvertGuidToLong();
+                        Client.NetworkId = clientId == 1 ? 0 : User.Claims.First(_claim => _claim.Type == ClaimTypes.PrimarySid).Value.ConvertGuidToLong();
                        Client.Level = (EFClient.Permission)Enum.Parse(typeof(EFClient.Permission), User.Claims.First(c => c.Type == ClaimTypes.Role).Value);
                        Client.CurrentAlias = new EFAlias() { Name = User.Claims.First(c => c.Type == ClaimTypes.NameIdentifier).Value };
                        Authorized = Client.ClientId >= 0;
--- a/WebfrontCore/Views/Action/_ActionForm.cshtml
+++ b/WebfrontCore/Views/Action/_ActionForm.cshtml
@ -4,17 +4,19 @@
 }
 <form class="action-form" action="/Action/@Model.Action">
    @foreach (var input in Model.Inputs)
+    {
+        string inputType = input.Type ?? "text";
+        string value = input.Value ?? "";
+
+        if (input.Type != "hidden")
        {
            <div class="input-group mb-3">

                <div class="input-group-prepend">
                    <span class="input-group-text" id="basic-addon-@input.Name">@input.Label</span>
                </div>
-        @{
-            string inputType = input.Type ?? "text";
-            string value = input.Value ?? "";

-            if (inputType == "select")
+                @if (inputType == "select")
                {
                    <select name="@input.Name" class="form-control" aria-label="@input.Name" aria-describedby="basic-addon-@input.Name">
                        @foreach (var item in input.Values)
@ -37,9 +39,13 @@
                {
                    <input type="@inputType" name="@input.Name" value="@value" class="form-control" placeholder="@input.Placeholder" aria-label="@input.Name" aria-describedby="basic-addon-@input.Name">
                }
-        }

            </div>
        }
+        else
+        {
+            <input type="@inputType" name="@input.Name" value="@value" hidden="hidden">
+        }
+    }
    <button type="submit" class="btn btn-block btn-primary">@Model.ActionButtonLabel</button>
 </form>
--- a/WebfrontCore/Views/Server/_Server.cshtml
+++ b/WebfrontCore/Views/Server/_Server.cshtml
@ -6,13 +6,25 @@
 <div class="row server-header pt-1 pb-1  bg-primary " id="server_header_@Model.ID">
    <div class="col-md-4 text-center text-md-left d-inline-flex justify-content-center justify-content-md-start">
        <span>@Model.Name</span>
-        <a href="@Model.ConnectProtocolUrl" class="ml-2 align-self-center d-none d-md-flex server-join-button" title="@SharedLibraryCore.Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_HOME_JOIN_DESC"]">
+        <a href="@Model.ConnectProtocolUrl" class="ml-2 mr-2 align-self-center d-none d-md-flex server-join-button" title="@SharedLibraryCore.Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_HOME_JOIN_DESC"]">
            <span class="oi oi-play-circle mr-2 align-self-center"></span>
            <span class="server-header-ip-address" style="display:none;">@Model.IPAddress</span>
        </a>
+        @if (ViewBag.Authorized)
+        {
+            <span class="oi oi-chat align-self-center profile-action d-none d-md-flex" data-action="chat" data-action-id="@Model.ID"></span>
+        }
    </div>
+
    <div class="text-center col-md-4">@Model.Map</div>
    <div class="text-center text-md-right col-md-4"><span class="server-clientcount">@Model.ClientCount</span>/<span class="server-maxclients">@Model.MaxClients</span></div>
+
+    @if (ViewBag.Authorized)
+    {
+        <div class="col-12 p-1">
+            <span class="oi oi-chat justify-content-center align-self-center profile-action d-flex d-md-none" data-action="chat" data-action-id="@Model.ID"></span>
+        </div>
+    }
 </div>

 <div id="server_clientactivity_@Model.ID" class="bg-dark row server-activity pt-2 pb-2">
--- a/WebfrontCore/WebfrontCore.csproj
+++ b/WebfrontCore/WebfrontCore.csproj
@ -80,7 +80,7 @@
    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.2.4" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.2.4">
      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+      <IncludeAssets>runtime; build; native; contentfiles;</IncludeAssets>
    </PackageReference>
    <PackageReference Update="Microsoft.NETCore.App" Version="2.2.2" />
    <PackageReference Update="Microsoft.AspNetCore" Version="2.2.0" />
--- a/WebfrontCore/wwwroot/js/action.js
+++ b/WebfrontCore/wwwroot/js/action.js
@ -32,7 +32,9 @@ $(document).ready(function () {
     */
    $('.profile-action').click(function (e) {
        const actionType = $(this).data('action');
-        $.get('/Action/' + actionType + 'Form')
+        const actionId = $(this).data('action-id');
+        const actionIdKey = actionId == undefined ? '' : '?id=' + actionId;
+        $.get('/Action/' + actionType + 'Form' + actionIdKey)
            .done(function (response) {
                $('#actionModal .modal-message').fadeOut('fast');
                $('#actionModal .modal-body-content').html(response);
--- a/version.txt
+++ b/version.txt
@ -1,6 +1,11 @@
+Version 2.4:
+-added "live radar" feature
+-added chat message to server on server list view
+
 Version 2.3:
 -added configuration option to ignore bots
 -updated anticheat slightly
+-lots more

 Version 2.2:
 -upgraded projects to .NET 2.1