Browse Source

Changed Status to Stats

tags/3.0.0
Teknikode 1 year ago
parent
commit
0ea4d97db1
33 changed files with 124 additions and 122 deletions
  1. 1
    1
      ServerMaint/Program.cs
  2. 1
    1
      Teknik/Areas/About/Views/About/Index.cshtml
  3. 4
    2
      Teknik/Areas/Help/Views/Help/Index.cshtml
  4. 9
    9
      Teknik/Areas/Stats/Controllers/StatsController.cs
  5. 2
    2
      Teknik/Areas/Stats/Models/Bill.cs
  6. 2
    2
      Teknik/Areas/Stats/Models/Donation.cs
  7. 2
    2
      Teknik/Areas/Stats/Models/OneTime.cs
  8. 2
    2
      Teknik/Areas/Stats/Models/Takedown.cs
  9. 2
    2
      Teknik/Areas/Stats/Models/Transaction.cs
  10. 0
    0
      Teknik/Areas/Stats/Scripts/Stats.js
  11. 15
    15
      Teknik/Areas/Stats/StatsAreaRegistration.cs
  12. 3
    3
      Teknik/Areas/Stats/ViewModels/BillViewModel.cs
  13. 3
    3
      Teknik/Areas/Stats/ViewModels/DonationViewModel.cs
  14. 3
    3
      Teknik/Areas/Stats/ViewModels/OneTimeViewModel.cs
  15. 6
    6
      Teknik/Areas/Stats/ViewModels/StatsViewModel.cs
  16. 3
    3
      Teknik/Areas/Stats/ViewModels/TakedownViewModel.cs
  17. 4
    4
      Teknik/Areas/Stats/ViewModels/TransactionViewModel.cs
  18. 3
    3
      Teknik/Areas/Stats/ViewModels/TransactionsViewModel.cs
  19. 2
    2
      Teknik/Areas/Stats/Views/Stats/Bills.cshtml
  20. 2
    2
      Teknik/Areas/Stats/Views/Stats/Donations.cshtml
  21. 11
    11
      Teknik/Areas/Stats/Views/Stats/Index.cshtml
  22. 3
    3
      Teknik/Areas/Stats/Views/Stats/OneTimes.cshtml
  23. 3
    3
      Teknik/Areas/Stats/Views/Stats/Takedowns.cshtml
  24. 5
    5
      Teknik/Areas/Stats/Views/Stats/Transactions.cshtml
  25. 0
    0
      Teknik/Areas/Stats/Views/_ViewStart.cshtml
  26. 0
    0
      Teknik/Areas/Stats/Views/web.config
  27. 1
    1
      Teknik/Models/TeknikEntities.cs
  28. BIN
      Teknik/Scripts/_references.js
  29. 24
    24
      Teknik/Teknik.csproj
  30. 1
    1
      Teknik/Views/Shared/_Footer.cshtml
  31. 3
    3
      Utilities/Configuration/Config.cs
  32. 1
    1
      Utilities/Configuration/Configuration.csproj
  33. 3
    3
      Utilities/Configuration/StatsConfig.cs

+ 1
- 1
ServerMaint/Program.cs View File

@@ -8,7 +8,7 @@ using System.Net;
using System.Net.Mail;
using System.Reflection;
using System.Text;
using Teknik.Areas.Status.Models;
using Teknik.Areas.Stats.Models;
using Teknik.Areas.Upload.Models;
using Teknik.Areas.Users.Models;
using Teknik.Areas.Users.Utility;

+ 1
- 1
Teknik/Areas/About/Views/About/Index.cshtml View File

@@ -16,7 +16,7 @@
Teknik was created to provide our users free services that they can trust. All of our services are treated with the utmost care to provide you with the best experience possible, and the best security with your data that we can give.
</p>
<p>
You can view our complete activity and statistics by visiting the <a href="@Url.SubRouteUrl("status", "Status.Index")">status</a> page.
You can view our complete activity and statistics by visiting the <a href="@Url.SubRouteUrl("stats", "Stats.Index")">statistics</a> page.
</p>
<br />
<hr>

+ 4
- 2
Teknik/Areas/Help/Views/Help/Index.cshtml View File

@@ -9,10 +9,12 @@
<hr>
<h3 class="text-center">Important Links</h3>
<dl class="dl-horizontal">
<dt><a href="@Url.SubRouteUrl("status", "Status.Index")" target="_blank">System Status</a></dt>
<dd>The status page for all of Teknik's Services.</dd>
<dt><a href="@Url.SubRouteUrl("faq", "FAQ.Index")" target="_blank">FAQ</a></dt>
<dd>Some of the more commonly asked questions and some answers regarding them.</dd>
<dt><a href="@Url.SubRouteUrl("status", "Status.Index")" target="_blank">Site Statistics</a></dt>
<dd>Current status of the server, and all the site's statistics, transactions, and data effecting actions.</dd>
<dt><a href="@Url.SubRouteUrl("stats", "Stats.Index")" target="_blank">Site Statistics</a></dt>
<dd>Current resource usage of the server, and all the site's statistics, transactions, and data effecting actions.</dd>
<dt><a href="@Url.SubRouteUrl("privacy", "Privacy.Index")" target="_blank">Privacy Policy</a></dt>
<dd>Everything about how we handle your privacy.</dd>
<dt><a href="@Url.SubRouteUrl("tos", "TOS.Index")" target="_blank">Terms of Service</a></dt>

Teknik/Areas/Status/Controllers/StatusController.cs → Teknik/Areas/Stats/Controllers/StatsController.cs View File

@@ -1,12 +1,12 @@
using System;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Threading;
using System.Web;
using System.Web.Mvc;
using Teknik.Areas.Status.Models;
using Teknik.Areas.Status.ViewModels;
using Teknik.Areas.Stats.Models;
using Teknik.Areas.Stats.ViewModels;
using Teknik.Attributes;
using Teknik.Controllers;
using Teknik.Filters;
@@ -14,19 +14,19 @@ using Teknik.Models;
using Teknik.Piwik;
using Teknik.Utilities;

namespace Teknik.Areas.Status.Controllers
namespace Teknik.Areas.Stats.Controllers
{
[TeknikAuthorize]
public class StatusController : DefaultController
public class StatsController : DefaultController
{
[TrackPageView]
[AllowAnonymous]
public ActionResult Index()
{
ViewBag.Title = "System Status - " + Config.Title;
ViewBag.Description = "Current status information for the server and resources.";
ViewBag.Title = "System Statistics - " + Config.Title;
ViewBag.Description = "Current statistics for the services.";

StatusViewModel model = new StatusViewModel();
StatsViewModel model = new StatsViewModel();

using (TeknikEntities db = new TeknikEntities())
{
@@ -181,4 +181,4 @@ namespace Teknik.Areas.Status.Controllers
return Json(new { error = new { message = "Piwik not configured" } }, JsonRequestBehavior.AllowGet);
}
}
}
}

Teknik/Areas/Status/Models/Bill.cs → Teknik/Areas/Stats/Models/Bill.cs View File

@@ -1,10 +1,10 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace Teknik.Areas.Status.Models
namespace Teknik.Areas.Stats.Models
{
public class Bill : Transaction
{

Teknik/Areas/Status/Models/Donation.cs → Teknik/Areas/Stats/Models/Donation.cs View File

@@ -1,10 +1,10 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace Teknik.Areas.Status.Models
namespace Teknik.Areas.Stats.Models
{
public class Donation : Transaction
{

Teknik/Areas/Status/Models/OneTime.cs → Teknik/Areas/Stats/Models/OneTime.cs View File

@@ -1,10 +1,10 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace Teknik.Areas.Status.Models
namespace Teknik.Areas.Stats.Models
{
public class OneTime : Transaction
{

Teknik/Areas/Status/Models/Takedown.cs → Teknik/Areas/Stats/Models/Takedown.cs View File

@@ -1,10 +1,10 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace Teknik.Areas.Status.Models
namespace Teknik.Areas.Stats.Models
{
public class Takedown
{

Teknik/Areas/Status/Models/Transaction.cs → Teknik/Areas/Stats/Models/Transaction.cs View File

@@ -1,11 +1,11 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Teknik.Utilities;

namespace Teknik.Areas.Status.Models
namespace Teknik.Areas.Stats.Models
{
public class Transaction
{

Teknik/Areas/Status/Scripts/Status.js → Teknik/Areas/Stats/Scripts/Stats.js View File


Teknik/Areas/Status/StatusAreaRegistration.cs → Teknik/Areas/Stats/StatsAreaRegistration.cs View File

@@ -1,18 +1,18 @@
using System.Collections.Generic;
using System.Collections.Generic;
using System.Web.Mvc;
using System.Web.Optimization;
using Teknik.Configuration;
using Teknik.Utilities;

namespace Teknik.Areas.Status
namespace Teknik.Areas.Stats
{
public class StatusAreaRegistration : AreaRegistration
public class StatsAreaRegistration : AreaRegistration
{
public override string AreaName
{
get
{
return "Status";
return "Stats";
}
}

@@ -20,27 +20,27 @@ namespace Teknik.Areas.Status
{
Config config = Config.Load();
context.MapSubdomainRoute(
"Status.Index",
new List<string>() { "status" }, // Subdomains
"Stats.Index",
new List<string>() { "stats" }, // Subdomains
new List<string>() { config.Host }, // domains
"",
new { controller = "Status", action = "Index" },
new[] { typeof(Controllers.StatusController).Namespace }
new { controller = "Stats", action = "Index" },
new[] { typeof(Controllers.StatsController).Namespace }
);
context.MapSubdomainRoute(
"Status.Action",
new List<string>() { "status" }, // Subdomains
"Stats.Action",
new List<string>() { "stats" }, // Subdomains
new List<string>() { config.Host }, // domains
"Action/{controller}/{action}",
new { controller = "Status", action = "Index" },
new[] { typeof(Controllers.StatusController).Namespace }
new { controller = "Stats", action = "Index" },
new[] { typeof(Controllers.StatsController).Namespace }
);

// Register Script Bundle
BundleTable.Bundles.Add(new CdnScriptBundle("~/bundles/status", config.CdnHost).Include(
BundleTable.Bundles.Add(new CdnScriptBundle("~/bundles/stats", config.CdnHost).Include(
"~/Scripts/Highcharts/highcharts.js",
"~/Scripts/FileSize/filesize.min.js",
"~/Areas/Status/Scripts/Status.js"));
"~/Areas/Stats/Scripts/Stats.js"));
}
}
}
}

Teknik/Areas/Status/ViewModels/BillViewModel.cs → Teknik/Areas/Stats/ViewModels/BillViewModel.cs View File

@@ -1,13 +1,13 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using Teknik.ViewModels;

namespace Teknik.Areas.Status.ViewModels
namespace Teknik.Areas.Stats.ViewModels
{
public class BillViewModel : TransactionViewModel
{
public string Recipient { get; set; }
}
}
}

Teknik/Areas/Status/ViewModels/DonationViewModel.cs → Teknik/Areas/Stats/ViewModels/DonationViewModel.cs View File

@@ -1,13 +1,13 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using Teknik.ViewModels;

namespace Teknik.Areas.Status.ViewModels
namespace Teknik.Areas.Stats.ViewModels
{
public class DonationViewModel : TransactionViewModel
{
public string Sender { get; set; }
}
}
}

Teknik/Areas/Status/ViewModels/OneTimeViewModel.cs → Teknik/Areas/Stats/ViewModels/OneTimeViewModel.cs View File

@@ -1,13 +1,13 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using Teknik.ViewModels;

namespace Teknik.Areas.Status.ViewModels
namespace Teknik.Areas.Stats.ViewModels
{
public class OneTimeViewModel : TransactionViewModel
{
public string Recipient { get; set; }
}
}
}

Teknik/Areas/Status/ViewModels/StatusViewModel.cs → Teknik/Areas/Stats/ViewModels/StatsViewModel.cs View File

@@ -1,14 +1,14 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using Teknik.Areas.Status.Models;
using Teknik.Areas.Stats.Models;
using Teknik.Models;
using Teknik.ViewModels;

namespace Teknik.Areas.Status.ViewModels
namespace Teknik.Areas.Stats.ViewModels
{
public class StatusViewModel : ViewModelBase
public class StatsViewModel : ViewModelBase
{
public int UploadCount { get; set; }

@@ -26,7 +26,7 @@ namespace Teknik.Areas.Status.ViewModels

public List<TakedownViewModel> Takedowns { get; set; }

public StatusViewModel()
public StatsViewModel()
{
UploadCount = 0;
UploadSize = 0;
@@ -38,4 +38,4 @@ namespace Teknik.Areas.Status.ViewModels
Takedowns = new List<TakedownViewModel>();
}
}
}
}

Teknik/Areas/Status/ViewModels/TakedownViewModel.cs → Teknik/Areas/Stats/ViewModels/TakedownViewModel.cs View File

@@ -1,10 +1,10 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using Teknik.ViewModels;

namespace Teknik.Areas.Status.ViewModels
namespace Teknik.Areas.Stats.ViewModels
{
public class TakedownViewModel : ViewModelBase
{
@@ -22,4 +22,4 @@ namespace Teknik.Areas.Status.ViewModels

public virtual ICollection<Upload.Models.Upload> Attachments { get; set; }
}
}
}

Teknik/Areas/Status/ViewModels/TransactionViewModel.cs → Teknik/Areas/Stats/ViewModels/TransactionViewModel.cs View File

@@ -1,12 +1,12 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using Teknik.Areas.Status.Models;
using Teknik.Areas.Stats.Models;
using Teknik.Utilities;
using Teknik.ViewModels;

namespace Teknik.Areas.Status.ViewModels
namespace Teknik.Areas.Stats.ViewModels
{
public class TransactionViewModel : ViewModelBase
{
@@ -18,4 +18,4 @@ namespace Teknik.Areas.Status.ViewModels

public DateTime DateSent { get; set; }
}
}
}

Teknik/Areas/Status/ViewModels/TransactionsViewModel.cs → Teknik/Areas/Stats/ViewModels/TransactionsViewModel.cs View File

@@ -1,10 +1,10 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using Teknik.ViewModels;

namespace Teknik.Areas.Status.ViewModels
namespace Teknik.Areas.Stats.ViewModels
{
public class TransactionsViewModel : ViewModelBase
{
@@ -37,4 +37,4 @@ namespace Teknik.Areas.Status.ViewModels
Donations = new List<DonationViewModel>();
}
}
}
}

Teknik/Areas/Status/Views/Status/Bills.cshtml → Teknik/Areas/Stats/Views/Stats/Bills.cshtml View File

@@ -1,6 +1,6 @@
@model List<Teknik.Areas.Status.ViewModels.BillViewModel>
@model List<Teknik.Areas.Stats.ViewModels.BillViewModel>

@using Teknik.Areas.Status.ViewModels
@using Teknik.Areas.Stats.ViewModels

@if (Model != null && Model.Any())
{

Teknik/Areas/Status/Views/Status/Donations.cshtml → Teknik/Areas/Stats/Views/Stats/Donations.cshtml View File

@@ -1,6 +1,6 @@
@model List<Teknik.Areas.Status.ViewModels.DonationViewModel>
@model List<Teknik.Areas.Stats.ViewModels.DonationViewModel>

@using Teknik.Areas.Status.ViewModels
@using Teknik.Areas.Stats.ViewModels

@if (Model != null && Model.Any())
{

Teknik/Areas/Status/Views/Status/Index.cshtml → Teknik/Areas/Stats/Views/Stats/Index.cshtml View File

@@ -1,19 +1,19 @@
@model Teknik.Areas.Status.ViewModels.StatusViewModel
@model Teknik.Areas.Stats.ViewModels.StatsViewModel

@using Teknik.Utilities
@using Teknik.Areas.Status.Models
@using Teknik.Areas.Stats.Models

@Scripts.Render("~/bundles/signalr")
@Scripts.Render("~/signalr/hubs")
@Scripts.Render("~/bundles/status")
@Scripts.Render("~/bundles/stats")

<script nonce="@Context.Items[Constants.NONCE_KEY]">
var getVisitorDataURL = '@Url.SubRouteUrl("status", "Status.Action", new { action = "GetVisitorData" })';
var showWebCPU = @Model.Config.StatusConfig.ShowWebStatus.ToString().ToLower();
var showDatabaseCPU = @Model.Config.StatusConfig.ShowDatabaseStatus.ToString().ToLower();
var showNetworkUsage = @Model.Config.StatusConfig.ShowNetworkStatus.ToString().ToLower();
var getVisitorDataURL = '@Url.SubRouteUrl("stats", "Stats.Action", new { action = "GetVisitorData" })';
var showWebCPU = @Model.Config.StatsConfig.ShowWebStatus.ToString().ToLower();
var showDatabaseCPU = @Model.Config.StatsConfig.ShowDatabaseStatus.ToString().ToLower();
var showNetworkUsage = @Model.Config.StatsConfig.ShowNetworkStatus.ToString().ToLower();
var showVisitorStats = @Model.Config.PiwikConfig.Enabled.ToString().ToLower();
var totalMemory = @Model.Config.StatusConfig.TotalMemory;
var totalMemory = @Model.Config.StatsConfig.TotalMemory;
var tickInterval = totalMemory / 5;
</script>

@@ -86,10 +86,10 @@

</div>
<div role="tabpanel" class="tab-pane" id="transactions">
@Html.Partial("~/Areas/Status/Views/Status/Transactions.cshtml", Model.Transactions)
@Html.Partial("~/Areas/Stats/Views/Stats/Transactions.cshtml", Model.Transactions)
</div>
<div role="tabpanel" class="tab-pane" id="takedowns">
@Html.Partial("~/Areas/Status/Views/Status/Takedowns.cshtml", Model.Takedowns)
@Html.Partial("~/Areas/Stats/Views/Stats/Takedowns.cshtml", Model.Takedowns)
</div>
</div>
}
@@ -97,7 +97,7 @@
{
<div class="row">
<div class="col-sm-8 col-sm-offset-2 text-center">
<h3>Status Information has been disabled</h3>
<h3>Stats Information has been disabled</h3>
</div>
</div>
}

Teknik/Areas/Status/Views/Status/OneTimes.cshtml → Teknik/Areas/Stats/Views/Stats/OneTimes.cshtml View File

@@ -1,6 +1,6 @@
@model List<Teknik.Areas.Status.ViewModels.OneTimeViewModel>
@model List<Teknik.Areas.Stats.ViewModels.OneTimeViewModel>

@using Teknik.Areas.Status.ViewModels
@using Teknik.Areas.Stats.ViewModels

@if (Model != null && Model.Any())
{
@@ -32,4 +32,4 @@
</div>
</div>
</div>
}
}

Teknik/Areas/Status/Views/Status/Takedowns.cshtml → Teknik/Areas/Stats/Views/Stats/Takedowns.cshtml View File

@@ -1,6 +1,6 @@
@model List<Teknik.Areas.Status.ViewModels.TakedownViewModel>
@model List<Teknik.Areas.Stats.ViewModels.TakedownViewModel>

@using Teknik.Areas.Status.ViewModels
@using Teknik.Areas.Stats.ViewModels

@if (Model != null && Model.Any())
{
@@ -34,4 +34,4 @@
}
</div>
</div>
}
}

Teknik/Areas/Status/Views/Status/Transactions.cshtml → Teknik/Areas/Stats/Views/Stats/Transactions.cshtml View File

@@ -1,6 +1,6 @@
@model Teknik.Areas.Status.ViewModels.TransactionsViewModel
@model Teknik.Areas.Stats.ViewModels.TransactionsViewModel

@using Teknik.Areas.Status.ViewModels
@using Teknik.Areas.Stats.ViewModels

@{
decimal totalBills = Model.CurrentMonthBills;
@@ -55,6 +55,6 @@
</div>
</div>

@Html.Partial("~/Areas/Status/Views/Status/Bills.cshtml", Model.Bills)
@Html.Partial("~/Areas/Status/Views/Status/OneTimes.cshtml", Model.OneTimes)
@Html.Partial("~/Areas/Status/Views/Status/Donations.cshtml", Model.Donations)
@Html.Partial("~/Areas/Stats/Views/Stats/Bills.cshtml", Model.Bills)
@Html.Partial("~/Areas/Stats/Views/Stats/OneTimes.cshtml", Model.OneTimes)
@Html.Partial("~/Areas/Stats/Views/Stats/Donations.cshtml", Model.Donations)

Teknik/Areas/Status/Views/_ViewStart.cshtml → Teknik/Areas/Stats/Views/_ViewStart.cshtml View File


Teknik/Areas/Status/Views/web.config → Teknik/Areas/Stats/Views/web.config View File


+ 1
- 1
Teknik/Models/TeknikEntities.cs View File

@@ -8,7 +8,7 @@ using Teknik.Migrations;
using Teknik.Areas.Upload.Models;
using Teknik.Areas.Paste.Models;
using Teknik.Areas.Podcast.Models;
using Teknik.Areas.Status.Models;
using Teknik.Areas.Stats.Models;
using Teknik.Areas.Shortener.Models;
using Teknik.Attributes;
using System.Data.Entity.ModelConfiguration.Conventions;

BIN
Teknik/Scripts/_references.js View File


+ 24
- 24
Teknik/Teknik.csproj View File

@@ -273,20 +273,20 @@
<Compile Include="Areas\Privacy\Controllers\PrivacyController.cs" />
<Compile Include="Areas\Privacy\PrivacyAreaRegistration.cs" />
<Compile Include="Areas\Privacy\ViewModels\PrivacyViewModel.cs" />
<Compile Include="Areas\Status\Controllers\StatusController.cs" />
<Compile Include="Areas\Status\Models\Bill.cs" />
<Compile Include="Areas\Status\Models\Donation.cs" />
<Compile Include="Areas\Status\Models\OneTime.cs" />
<Compile Include="Areas\Status\Models\Takedown.cs" />
<Compile Include="Areas\Status\Models\Transaction.cs" />
<Compile Include="Areas\Status\StatusAreaRegistration.cs" />
<Compile Include="Areas\Status\ViewModels\OneTimeViewModel.cs" />
<Compile Include="Areas\Status\ViewModels\DonationViewModel.cs" />
<Compile Include="Areas\Status\ViewModels\StatusViewModel.cs" />
<Compile Include="Areas\Status\ViewModels\TakedownViewModel.cs" />
<Compile Include="Areas\Status\ViewModels\TransactionsViewModel.cs" />
<Compile Include="Areas\Status\ViewModels\BillViewModel.cs" />
<Compile Include="Areas\Status\ViewModels\TransactionViewModel.cs" />
<Compile Include="Areas\Stats\Controllers\StatsController.cs" />
<Compile Include="Areas\Stats\Models\Bill.cs" />
<Compile Include="Areas\Stats\Models\Donation.cs" />
<Compile Include="Areas\Stats\Models\OneTime.cs" />
<Compile Include="Areas\Stats\Models\Takedown.cs" />
<Compile Include="Areas\Stats\Models\Transaction.cs" />
<Compile Include="Areas\Stats\StatsAreaRegistration.cs" />
<Compile Include="Areas\Stats\ViewModels\OneTimeViewModel.cs" />
<Compile Include="Areas\Stats\ViewModels\DonationViewModel.cs" />
<Compile Include="Areas\Stats\ViewModels\StatsViewModel.cs" />
<Compile Include="Areas\Stats\ViewModels\TakedownViewModel.cs" />
<Compile Include="Areas\Stats\ViewModels\TransactionsViewModel.cs" />
<Compile Include="Areas\Stats\ViewModels\BillViewModel.cs" />
<Compile Include="Areas\Stats\ViewModels\TransactionViewModel.cs" />
<Compile Include="Areas\User\Controllers\UserController.cs" />
<Compile Include="Areas\User\Models\BlogSettings.cs" />
<Compile Include="Areas\User\Models\InviteCode.cs" />
@@ -416,7 +416,7 @@
<Content Include="Areas\Paste\Scripts\Paste.js" />
<Content Include="Areas\Podcast\Content\Podcast.css" />
<Content Include="Areas\Podcast\Scripts\Podcast.js" />
<Content Include="Areas\Status\Scripts\Status.js" />
<Content Include="Areas\Stats\Scripts\Stats.js" />
<Content Include="Areas\Upload\Content\Upload.css" />
<Content Include="Areas\User\Scripts\CheckAuthCode.js" />
<Content Include="Areas\User\Scripts\Profile.js" />
@@ -676,14 +676,14 @@
<Content Include="Areas\Vault\Views\Vault\ModifyVaultItem.cshtml" />
<Content Include="Areas\Vault\Views\Vault\PasteItem.cshtml" />
<Content Include="Areas\Vault\Views\Vault\UploadItem.cshtml" />
<Content Include="Areas\Status\Views\web.config" />
<Content Include="Areas\Status\Views\_ViewStart.cshtml" />
<Content Include="Areas\Status\Views\Status\Index.cshtml" />
<Content Include="Areas\Status\Views\Status\Transactions.cshtml" />
<Content Include="Areas\Status\Views\Status\Bills.cshtml" />
<Content Include="Areas\Status\Views\Status\OneTimes.cshtml" />
<Content Include="Areas\Status\Views\Status\Donations.cshtml" />
<Content Include="Areas\Status\Views\Status\Takedowns.cshtml" />
<Content Include="Areas\Stats\Views\web.config" />
<Content Include="Areas\Stats\Views\_ViewStart.cshtml" />
<Content Include="Areas\Stats\Views\Stats\Index.cshtml" />
<Content Include="Areas\Stats\Views\Stats\Transactions.cshtml" />
<Content Include="Areas\Stats\Views\Stats\Bills.cshtml" />
<Content Include="Areas\Stats\Views\Stats\OneTimes.cshtml" />
<Content Include="Areas\Stats\Views\Stats\Donations.cshtml" />
<Content Include="Areas\Stats\Views\Stats\Takedowns.cshtml" />
<Content Include="Areas\FAQ\Views\web.config" />
<Content Include="Areas\FAQ\Views\_ViewStart.cshtml" />
<Content Include="Areas\FAQ\Views\FAQ\Index.cshtml" />
@@ -808,7 +808,7 @@
<Folder Include="Areas\Privacy\Models\" />
<Folder Include="Areas\Privacy\Views\Shared\" />
<Folder Include="Areas\Shortener\Views\Shared\" />
<Folder Include="Areas\Status\Views\Shared\" />
<Folder Include="Areas\Stats\Views\Shared\" />
<Folder Include="Areas\Stream\Views\Shared\" />
<Folder Include="Areas\TOS\Models\" />
<Folder Include="Areas\TOS\Views\Shared\" />

+ 1
- 1
Teknik/Views/Shared/_Footer.cshtml View File

@@ -51,7 +51,7 @@
}
<div class="row">
<div class="col-sm-5 col-sm-offset-1 text-left text-muted">
&copy; Teknik 2013-2018 | <a href="@Url.SubRouteUrl("faq", "FAQ.Index")">FAQ</a> | <a href="@Url.SubRouteUrl("privacy", "Privacy.Index")">Privacy</a> | <a href="@Url.SubRouteUrl("tos", "TOS.Index")">TOS</a> | <a href="@Url.SubRouteUrl("abuse", "Abuse.Index")">Abuse</a> | <a href="@Url.SubRouteUrl("status", "Status.Index")">Status</a>
&copy; Teknik 2013-2018 | <a href="@Url.SubRouteUrl("faq", "FAQ.Index")">FAQ</a> | <a href="@Url.SubRouteUrl("privacy", "Privacy.Index")">Privacy</a> | <a href="@Url.SubRouteUrl("tos", "TOS.Index")">TOS</a> | <a href="@Url.SubRouteUrl("abuse", "Abuse.Index")">Abuse</a> | <a href="@Url.SubRouteUrl("stats", "Stats.Index")">Statistics</a>
</div>
<div class="col-sm-5 text-right text-muted">
<div id="pagetime" style="display:none;">

+ 3
- 3
Utilities/Configuration/Config.cs View File

@@ -44,7 +44,7 @@ namespace Teknik.Configuration
private StreamConfig _StreamConfig;
private ShortenerConfig _ShortenerConfig;
private VaultConfig _VaultConfig;
private StatusConfig _StatusConfig;
private StatsConfig _StatusConfig;
private LoggingConfig _LoggingConfig;
private PiwikConfig _PiwikConfig;
private IRCConfig _IRCConfig;
@@ -104,7 +104,7 @@ namespace Teknik.Configuration
public VaultConfig VaultConfig { get { return _VaultConfig; } set { _VaultConfig = value; } }

// Status Configuration
public StatusConfig StatusConfig { get { return _StatusConfig; } set { _StatusConfig = value; } }
public StatsConfig StatusConfig { get { return _StatusConfig; } set { _StatusConfig = value; } }

// Logging Configuration
public LoggingConfig LoggingConfig { get { return _LoggingConfig; } set { _LoggingConfig = value; } }
@@ -152,7 +152,7 @@ namespace Teknik.Configuration
StreamConfig = new StreamConfig();
ShortenerConfig = new ShortenerConfig();
VaultConfig = new VaultConfig();
StatusConfig = new StatusConfig();
StatusConfig = new StatsConfig();
LoggingConfig = new LoggingConfig();
PiwikConfig = new PiwikConfig();
IRCConfig = new IRCConfig();

+ 1
- 1
Utilities/Configuration/Configuration.csproj View File

@@ -60,7 +60,7 @@
<Compile Include="PiwikConfig.cs" />
<Compile Include="PodcastConfig.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="StatusConfig.cs" />
<Compile Include="StatsConfig.cs" />
<Compile Include="VaultConfig.cs" />
<Compile Include="ShortenerConfig.cs" />
<Compile Include="StreamConfig.cs" />

Utilities/Configuration/StatusConfig.cs → Utilities/Configuration/StatsConfig.cs View File

@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@@ -6,7 +6,7 @@ using System.Threading.Tasks;

namespace Teknik.Configuration
{
public class StatusConfig
public class StatsConfig
{
public bool Enabled { get; set; }

@@ -22,7 +22,7 @@ namespace Teknik.Configuration

public long TotalMemory { get; set; }

public StatusConfig()
public StatsConfig()
{
Enabled = false;
ShowWebStatus = false;

Loading…
Cancel
Save