Rim/IW4M-Admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 30 Wiki Activity

cleaned up some namespace discrepancies

Browse Source 
fixed the coloring for custom groups translation
add reserved slots
add webhook project to show notifications in discord
This commit is contained in:
RaidMax
2018-08-07 13:43:09 -05:00
parent bbade07646
commit a0fafe5797
27 changed files with 301 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
WebfrontCore/Controllers/API/APIController.cs
View File

@ -1,4 +1,5 @@
using Microsoft.AspNetCore.Mvc;
using SharedLibraryCore;
using System;
using System.Collections.Generic;
using System.Linq;
@ -39,8 +40,8 @@ namespace WebfrontCore.Controllers.API
player.Ping,
State = player.State.ToString(),
player.ClientNumber,
ConnectionTime = (DateTime.UtcNow - player.ConnectionTime).TotalSeconds,
player.Level,
ConnectionTime = Math.Round((DateTime.UtcNow - player.ConnectionTime).TotalSeconds, 0),
Level = player.Level.ToLocalizedLevelName(),
})
});

1
WebfrontCore/ViewComponents/PenaltyListViewComponent.cs
View File

@ -21,6 +21,7 @@ namespace WebfrontCore.ViewComponents
PunisherId = p.PunisherId,
PunisherName = p.Punisher.Name,
PunisherLevel = p.Punisher.Level.ToLocalizedLevelName(),
PunisherLevelId = (int)p.Punisher.Level,
#if DEBUG
Offense = !string.IsNullOrEmpty(p.AutomatedOffense) ? p.AutomatedOffense : p.Offense,
#else

2
WebfrontCore/Views/Client/Find/Index.cshtml
View File

@ -16,7 +16,7 @@
{
<div class="row pt-2 pb-2 bg-dark">
<div class="col-5">@Html.ActionLink(client.Name, "ProfileAsync", "Client", new { id = client.ClientId })</div>
<div class="col-4 level-color-@client.Level.ToLower()">@client.Level</div>
<div class="col-4 level-color-@client.LevelInt">@client.Level</div>
<div class="col-3 text-right">@client.LastSeen @loc["WEBFRONT_PENALTY_TEMPLATE_AGO"]</div>
</div>
}

4
WebfrontCore/Views/Client/Profile/Index.cshtml
View File

@ -7,7 +7,7 @@
}
<div id="profile_wrapper" class="row d-flex d-sm-inline-flex justify-content-center justify-content-left pb-3">
<div class="mr-auto ml-auto ml-sm-0 mr-sm-0">
<div id="profile_avatar" class="mb-4 mb-md-0 text-center level-bgcolor-@Model.Level.ToLower()" style="background-image:url('@string.Format("https://gravatar.com/avatar/{0}?size=168&default=blank&rating=pg", gravatarUrl)">
<div id="profile_avatar" class="mb-4 mb-md-0 text-center level-bgcolor-@Model.LevelInt" style="background-image:url('@string.Format("https://gravatar.com/avatar/{0}?size=168&default=blank&rating=pg", gravatarUrl)">
@if (string.IsNullOrEmpty(gravatarUrl))
{
<span class="profile-shortcode">@shortCode</span>
@ -71,7 +71,7 @@
}
</div>
<div id="profile_level" class="text-muted mb-2">
<h5><span class="level-color-@Model.Level.ToLower()"><strong>@Model.Level</strong></span></h5>
<h5><span class="level-color-@Model.LevelInt"><strong>@Model.Level</strong></span></h5>
</div>
<div id="profile_time_played" class="text-muted">
@loc["WEBFRONT_PROFILE_PLAYER"] <span class="text-primary">@Model.TimePlayed</span> @loc["GLOBAL_TIME_HOURS"]

4
WebfrontCore/Views/Penalty/_Penalty.cshtml
View File

@ -29,7 +29,7 @@
<tr class="d-table-row d-md-none bg-dark">
<th scope="row" class="bg-primary">@loc["WEBFRONT_PENALTY_TEMPLATE_ADMIN"]</th>
<td>
@Html.ActionLink(Model.PunisherName, "ProfileAsync", "Client", new { id = Model.PunisherId }, new { @class = "level-color-" + Model.PunisherLevel.ToLower() })
@Html.ActionLink(Model.PunisherName, "ProfileAsync", "Client", new { id = Model.PunisherId }, new { @class = "level-color-" + Model.PunisherLevelId }) })
</td>
</tr>
@ -60,7 +60,7 @@
@Model.Offense
</td>
<td>
@Html.ActionLink(Model.PunisherName, "ProfileAsync", "Client", new { id = Model.PunisherId }, new { @class = "level-color-" + Model.PunisherLevel.ToLower() })
@Html.ActionLink(Model.PunisherName, "ProfileAsync", "Client", new { id = Model.PunisherId }, new { @class = "level-color-" + Model.PunisherLevelId }) })
</td>
<td class="text-right text-light">
@{

4
WebfrontCore/Views/Server/_ClientActivity.cshtml
View File

@ -36,7 +36,7 @@
@{
for (int i = 0; i < half; i++)
{
string levelColorClass = !ViewBag.Authorized ? "" : $"level-color-{Model.Players[i].Level.ToLower()}";
string levelColorClass = !ViewBag.Authorized ? "" : $"level-color-{Model.Players[i].LevelInt}";
<span>@Html.ActionLink(Model.Players[i].Name, "ProfileAsync", "Client", new { id = Model.Players[i].ClientId }, new { @class = levelColorClass })</span><br />
}
}
@ -45,7 +45,7 @@
@{
for (int i = half; i < Model.ClientCount; i++)
{
string levelColorClass = !ViewBag.Authorized ? "" : $"level-color-{Model.Players[i].Level.ToLower()}";
string levelColorClass = !ViewBag.Authorized ? "" : $"level-color-{Model.Players[i].LevelInt}";
<span>@Html.ActionLink(Model.Players[i].Name, "ProfileAsync", "Client", new { id = Model.Players[i].ClientId }, new { @class = levelColorClass })</span><br />
}
}

1
WebfrontCore/WebfrontCore.csproj
View File

@ -44,6 +44,7 @@
<None Include="wwwroot\css\global.min.css" CopyToPublishDirectory="Always" />
<None Include="wwwroot\js\global.min.js" CopyToPublishDirectory="Always" />
<None Include="wwwroot\images\icon.png" CopyToPublishDirectory="Always" />
<None Include="wwwroot\images\icons\**\*.png" CopyToPublishDirectory="Always"/>
<None Include="wwwroot\lib\open-iconic\font\fonts\open-iconic.ttf" CopyToPublishDirectory="Always" />
<None Include="wwwroot\lib\open-iconic\font\fonts\open-iconic.woff" CopyToPublishDirectory="Always" />
<None Include="wwwroot\lib\open-iconic\font\fonts\open-iconic.otf" CopyToPublishDirectory="Always" />

32
WebfrontCore/wwwroot/css/profile.css
View File

@ -2,81 +2,81 @@
background-color: grey;
}
.level-color-user, .level-color-guest {
.level-color-user, .level-color-guest, .level-color-0 {
color: #6c757d;
color: rgba(255, 255, 255, 0.68);
}
.level-bgcolor-user, .level-bgcolor-guest {
.level-bgcolor-user, .level-bgcolor-guest, .level-bgcolor-0 {
background-color: #6c757d;
background-color: rgba(255, 255, 255, 0.68);
}
.level-color-trusted {
.level-color-trusted, .level-color-2 {
color: #749363;
color: rgba(116,147,99,1);
}
.level-bgcolor-trusted {
.level-bgcolor-trusted, .level-bgcolor-2 {
background-color: #749363;
background-color: rgba(116,147,99,1);
}
.level-color-flagged {
.level-color-flagged, .level-color-1 {
color: #fd9c38;
color: rgba(253, 139, 22, 0.85);
}
.level-bgcolor-flagged {
.level-bgcolor-flagged, .level-bgcolor-1 {
background-color: #fd9c38;
background-color: rgba(253, 139, 22, 0.85);
}
.level-color-banned, .level-color-console {
.level-color-banned, .level-color-console, .level-color--1 {
color: #ff6060;
color: rgba(255, 69, 69, 0.85);
}
.level-bgcolor-banned {
.level-bgcolor-banned, .level-bgcolor--1 {
background-color: #ff6060;
background-color: rgba(255, 69, 69, 0.85);
}
.level-color-moderator {
.level-color-moderator, .level-color-3 {
color: #f0de8b;
color: rgba(235, 211, 101, 0.75);
}
.level-bgcolor-moderator {
.level-bgcolor-moderator, .level-bgcolor-3 {
background-color: #f0de8b;
background-color: rgba(235, 211, 101, 0.75);
}
.level-color-administrator {
.level-color-administrator, .level-color-4 {
color: #f1a8e8;
color: rgba(236, 130, 222, 0.69);
}
.level-bgcolor-administrator {
.level-bgcolor-administrator, .level.bgcolor-4 {
background-color: #f1a8e8;
background-color: rgba(236, 130, 222, 0.69);
}
.level-color-senioradmin {
.level-color-senioradmin, .level-color-5 {
color: #50bcc3;
color: rgba(50, 177, 185, 0.85);
}
.level-bgcolor-senioradmin {
.level-bgcolor-senioradmin, .level-bgcolor-5 {
background-color: #50bcc3;
background-color: rgba(50, 177, 185, 0.85);
}
.level-color-owner {
.level-color-owner, .level-color-6 {
color: rgb(0, 122, 204);
}
.level-bgcolor-owner {
.level-bgcolor-owner, .level-bgcolor-6 {
background-color: rgb(0, 122, 204);
}