From 0ea4d97db13bd5fecf163f7419ab05f72f7696fc Mon Sep 17 00:00:00 2001 From: Uncled1023 Date: Thu, 10 May 2018 20:12:33 -0700 Subject: [PATCH] Changed Status to Stats --- ServerMaint/Program.cs | 2 +- Teknik/Areas/About/Views/About/Index.cshtml | 2 +- Teknik/Areas/Help/Views/Help/Index.cshtml | 6 ++- .../Controllers/StatsController.cs} | 18 +++---- Teknik/Areas/{Status => Stats}/Models/Bill.cs | 4 +- .../{Status => Stats}/Models/Donation.cs | 4 +- .../Areas/{Status => Stats}/Models/OneTime.cs | 4 +- .../{Status => Stats}/Models/Takedown.cs | 4 +- .../{Status => Stats}/Models/Transaction.cs | 4 +- .../Status.js => Stats/Scripts/Stats.js} | 0 .../StatsAreaRegistration.cs} | 30 +++++------ .../ViewModels/BillViewModel.cs | 6 +-- .../ViewModels/DonationViewModel.cs | 6 +-- .../ViewModels/OneTimeViewModel.cs | 6 +-- .../ViewModels/StatsViewModel.cs} | 12 ++--- .../ViewModels/TakedownViewModel.cs | 6 +-- .../ViewModels/TransactionViewModel.cs | 8 +-- .../ViewModels/TransactionsViewModel.cs | 6 +-- .../Status => Stats/Views/Stats}/Bills.cshtml | 4 +- .../Views/Stats}/Donations.cshtml | 4 +- .../Status => Stats/Views/Stats}/Index.cshtml | 22 ++++---- .../Views/Stats}/OneTimes.cshtml | 6 +-- .../Views/Stats}/Takedowns.cshtml | 6 +-- .../Views/Stats}/Transactions.cshtml | 10 ++-- .../{Status => Stats}/Views/_ViewStart.cshtml | 0 .../Areas/{Status => Stats}/Views/web.config | 0 Teknik/Models/TeknikEntities.cs | 2 +- Teknik/Scripts/_references.js | Bin 6350 -> 3172 bytes Teknik/Teknik.csproj | 48 +++++++++--------- Teknik/Views/Shared/_Footer.cshtml | 2 +- Utilities/Configuration/Config.cs | 6 +-- Utilities/Configuration/Configuration.csproj | 2 +- .../{StatusConfig.cs => StatsConfig.cs} | 6 +-- 33 files changed, 124 insertions(+), 122 deletions(-) rename Teknik/Areas/{Status/Controllers/StatusController.cs => Stats/Controllers/StatsController.cs} (95%) rename Teknik/Areas/{Status => Stats}/Models/Bill.cs (78%) rename Teknik/Areas/{Status => Stats}/Models/Donation.cs (78%) rename Teknik/Areas/{Status => Stats}/Models/OneTime.cs (79%) rename Teknik/Areas/{Status => Stats}/Models/Takedown.cs (91%) rename Teknik/Areas/{Status => Stats}/Models/Transaction.cs (88%) rename Teknik/Areas/{Status/Scripts/Status.js => Stats/Scripts/Stats.js} (100%) rename Teknik/Areas/{Status/StatusAreaRegistration.cs => Stats/StatsAreaRegistration.cs} (55%) rename Teknik/Areas/{Status => Stats}/ViewModels/BillViewModel.cs (78%) rename Teknik/Areas/{Status => Stats}/ViewModels/DonationViewModel.cs (78%) rename Teknik/Areas/{Status => Stats}/ViewModels/OneTimeViewModel.cs (78%) rename Teknik/Areas/{Status/ViewModels/StatusViewModel.cs => Stats/ViewModels/StatsViewModel.cs} (82%) rename Teknik/Areas/{Status => Stats}/ViewModels/TakedownViewModel.cs (90%) rename Teknik/Areas/{Status => Stats}/ViewModels/TransactionViewModel.cs (80%) rename Teknik/Areas/{Status => Stats}/ViewModels/TransactionsViewModel.cs (94%) rename Teknik/Areas/{Status/Views/Status => Stats/Views/Stats}/Bills.cshtml (92%) rename Teknik/Areas/{Status/Views/Status => Stats/Views/Stats}/Donations.cshtml (92%) rename Teknik/Areas/{Status/Views/Status => Stats/Views/Stats}/Index.cshtml (81%) rename Teknik/Areas/{Status/Views/Status => Stats/Views/Stats}/OneTimes.cshtml (92%) rename Teknik/Areas/{Status/Views/Status => Stats/Views/Stats}/Takedowns.cshtml (92%) rename Teknik/Areas/{Status/Views/Status => Stats/Views/Stats}/Transactions.cshtml (84%) rename Teknik/Areas/{Status => Stats}/Views/_ViewStart.cshtml (100%) rename Teknik/Areas/{Status => Stats}/Views/web.config (100%) rename Utilities/Configuration/{StatusConfig.cs => StatsConfig.cs} (91%) diff --git a/ServerMaint/Program.cs b/ServerMaint/Program.cs index 44c2bdc..cf16d14 100644 --- a/ServerMaint/Program.cs +++ b/ServerMaint/Program.cs @@ -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; diff --git a/Teknik/Areas/About/Views/About/Index.cshtml b/Teknik/Areas/About/Views/About/Index.cshtml index 96d0152..313d628 100644 --- a/Teknik/Areas/About/Views/About/Index.cshtml +++ b/Teknik/Areas/About/Views/About/Index.cshtml @@ -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.

- You can view our complete activity and statistics by visiting the status page. + You can view our complete activity and statistics by visiting the statistics page.


diff --git a/Teknik/Areas/Help/Views/Help/Index.cshtml b/Teknik/Areas/Help/Views/Help/Index.cshtml index 91a6b2d..f28cea2 100644 --- a/Teknik/Areas/Help/Views/Help/Index.cshtml +++ b/Teknik/Areas/Help/Views/Help/Index.cshtml @@ -9,10 +9,12 @@

Important Links

+
System Status
+
The status page for all of Teknik's Services.
FAQ
Some of the more commonly asked questions and some answers regarding them.
-
Site Statistics
-
Current status of the server, and all the site's statistics, transactions, and data effecting actions.
+
Site Statistics
+
Current resource usage of the server, and all the site's statistics, transactions, and data effecting actions.
Privacy Policy
Everything about how we handle your privacy.
Terms of Service
diff --git a/Teknik/Areas/Status/Controllers/StatusController.cs b/Teknik/Areas/Stats/Controllers/StatsController.cs similarity index 95% rename from Teknik/Areas/Status/Controllers/StatusController.cs rename to Teknik/Areas/Stats/Controllers/StatsController.cs index be10c3b..aa23abd 100644 --- a/Teknik/Areas/Status/Controllers/StatusController.cs +++ b/Teknik/Areas/Stats/Controllers/StatsController.cs @@ -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); } } -} \ No newline at end of file +} diff --git a/Teknik/Areas/Status/Models/Bill.cs b/Teknik/Areas/Stats/Models/Bill.cs similarity index 78% rename from Teknik/Areas/Status/Models/Bill.cs rename to Teknik/Areas/Stats/Models/Bill.cs index 0e5c0a6..98d9519 100644 --- a/Teknik/Areas/Status/Models/Bill.cs +++ b/Teknik/Areas/Stats/Models/Bill.cs @@ -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 { diff --git a/Teknik/Areas/Status/Models/Donation.cs b/Teknik/Areas/Stats/Models/Donation.cs similarity index 78% rename from Teknik/Areas/Status/Models/Donation.cs rename to Teknik/Areas/Stats/Models/Donation.cs index 7fc3981..adeafb8 100644 --- a/Teknik/Areas/Status/Models/Donation.cs +++ b/Teknik/Areas/Stats/Models/Donation.cs @@ -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 { diff --git a/Teknik/Areas/Status/Models/OneTime.cs b/Teknik/Areas/Stats/Models/OneTime.cs similarity index 79% rename from Teknik/Areas/Status/Models/OneTime.cs rename to Teknik/Areas/Stats/Models/OneTime.cs index dda070c..fd52ec1 100644 --- a/Teknik/Areas/Status/Models/OneTime.cs +++ b/Teknik/Areas/Stats/Models/OneTime.cs @@ -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 { diff --git a/Teknik/Areas/Status/Models/Takedown.cs b/Teknik/Areas/Stats/Models/Takedown.cs similarity index 91% rename from Teknik/Areas/Status/Models/Takedown.cs rename to Teknik/Areas/Stats/Models/Takedown.cs index 95dc8a3..b87d78e 100644 --- a/Teknik/Areas/Status/Models/Takedown.cs +++ b/Teknik/Areas/Stats/Models/Takedown.cs @@ -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 { diff --git a/Teknik/Areas/Status/Models/Transaction.cs b/Teknik/Areas/Stats/Models/Transaction.cs similarity index 88% rename from Teknik/Areas/Status/Models/Transaction.cs rename to Teknik/Areas/Stats/Models/Transaction.cs index 6236121..542cda8 100644 --- a/Teknik/Areas/Status/Models/Transaction.cs +++ b/Teknik/Areas/Stats/Models/Transaction.cs @@ -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 { diff --git a/Teknik/Areas/Status/Scripts/Status.js b/Teknik/Areas/Stats/Scripts/Stats.js similarity index 100% rename from Teknik/Areas/Status/Scripts/Status.js rename to Teknik/Areas/Stats/Scripts/Stats.js diff --git a/Teknik/Areas/Status/StatusAreaRegistration.cs b/Teknik/Areas/Stats/StatsAreaRegistration.cs similarity index 55% rename from Teknik/Areas/Status/StatusAreaRegistration.cs rename to Teknik/Areas/Stats/StatsAreaRegistration.cs index 58f52bf..11604ad 100644 --- a/Teknik/Areas/Status/StatusAreaRegistration.cs +++ b/Teknik/Areas/Stats/StatsAreaRegistration.cs @@ -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() { "status" }, // Subdomains + "Stats.Index", + new List() { "stats" }, // Subdomains new List() { 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() { "status" }, // Subdomains + "Stats.Action", + new List() { "stats" }, // Subdomains new List() { 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")); } } -} \ No newline at end of file +} diff --git a/Teknik/Areas/Status/ViewModels/BillViewModel.cs b/Teknik/Areas/Stats/ViewModels/BillViewModel.cs similarity index 78% rename from Teknik/Areas/Status/ViewModels/BillViewModel.cs rename to Teknik/Areas/Stats/ViewModels/BillViewModel.cs index a45bdd7..4270160 100644 --- a/Teknik/Areas/Status/ViewModels/BillViewModel.cs +++ b/Teknik/Areas/Stats/ViewModels/BillViewModel.cs @@ -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; } } -} \ No newline at end of file +} diff --git a/Teknik/Areas/Status/ViewModels/DonationViewModel.cs b/Teknik/Areas/Stats/ViewModels/DonationViewModel.cs similarity index 78% rename from Teknik/Areas/Status/ViewModels/DonationViewModel.cs rename to Teknik/Areas/Stats/ViewModels/DonationViewModel.cs index c5dffd7..2360c6e 100644 --- a/Teknik/Areas/Status/ViewModels/DonationViewModel.cs +++ b/Teknik/Areas/Stats/ViewModels/DonationViewModel.cs @@ -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; } } -} \ No newline at end of file +} diff --git a/Teknik/Areas/Status/ViewModels/OneTimeViewModel.cs b/Teknik/Areas/Stats/ViewModels/OneTimeViewModel.cs similarity index 78% rename from Teknik/Areas/Status/ViewModels/OneTimeViewModel.cs rename to Teknik/Areas/Stats/ViewModels/OneTimeViewModel.cs index 8144f84..70329c4 100644 --- a/Teknik/Areas/Status/ViewModels/OneTimeViewModel.cs +++ b/Teknik/Areas/Stats/ViewModels/OneTimeViewModel.cs @@ -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; } } -} \ No newline at end of file +} diff --git a/Teknik/Areas/Status/ViewModels/StatusViewModel.cs b/Teknik/Areas/Stats/ViewModels/StatsViewModel.cs similarity index 82% rename from Teknik/Areas/Status/ViewModels/StatusViewModel.cs rename to Teknik/Areas/Stats/ViewModels/StatsViewModel.cs index 746191a..08b68c1 100644 --- a/Teknik/Areas/Status/ViewModels/StatusViewModel.cs +++ b/Teknik/Areas/Stats/ViewModels/StatsViewModel.cs @@ -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 Takedowns { get; set; } - public StatusViewModel() + public StatsViewModel() { UploadCount = 0; UploadSize = 0; @@ -38,4 +38,4 @@ namespace Teknik.Areas.Status.ViewModels Takedowns = new List(); } } -} \ No newline at end of file +} diff --git a/Teknik/Areas/Status/ViewModels/TakedownViewModel.cs b/Teknik/Areas/Stats/ViewModels/TakedownViewModel.cs similarity index 90% rename from Teknik/Areas/Status/ViewModels/TakedownViewModel.cs rename to Teknik/Areas/Stats/ViewModels/TakedownViewModel.cs index 89c7e99..a8c5af4 100644 --- a/Teknik/Areas/Status/ViewModels/TakedownViewModel.cs +++ b/Teknik/Areas/Stats/ViewModels/TakedownViewModel.cs @@ -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 Attachments { get; set; } } -} \ No newline at end of file +} diff --git a/Teknik/Areas/Status/ViewModels/TransactionViewModel.cs b/Teknik/Areas/Stats/ViewModels/TransactionViewModel.cs similarity index 80% rename from Teknik/Areas/Status/ViewModels/TransactionViewModel.cs rename to Teknik/Areas/Stats/ViewModels/TransactionViewModel.cs index 08595e9..f7d17d7 100644 --- a/Teknik/Areas/Status/ViewModels/TransactionViewModel.cs +++ b/Teknik/Areas/Stats/ViewModels/TransactionViewModel.cs @@ -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; } } -} \ No newline at end of file +} diff --git a/Teknik/Areas/Status/ViewModels/TransactionsViewModel.cs b/Teknik/Areas/Stats/ViewModels/TransactionsViewModel.cs similarity index 94% rename from Teknik/Areas/Status/ViewModels/TransactionsViewModel.cs rename to Teknik/Areas/Stats/ViewModels/TransactionsViewModel.cs index 486b33d..09050fc 100644 --- a/Teknik/Areas/Status/ViewModels/TransactionsViewModel.cs +++ b/Teknik/Areas/Stats/ViewModels/TransactionsViewModel.cs @@ -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(); } } -} \ No newline at end of file +} diff --git a/Teknik/Areas/Status/Views/Status/Bills.cshtml b/Teknik/Areas/Stats/Views/Stats/Bills.cshtml similarity index 92% rename from Teknik/Areas/Status/Views/Status/Bills.cshtml rename to Teknik/Areas/Stats/Views/Stats/Bills.cshtml index 445ca52..a0a4ea2 100644 --- a/Teknik/Areas/Status/Views/Status/Bills.cshtml +++ b/Teknik/Areas/Stats/Views/Stats/Bills.cshtml @@ -1,6 +1,6 @@ -@model List +@model List -@using Teknik.Areas.Status.ViewModels +@using Teknik.Areas.Stats.ViewModels @if (Model != null && Model.Any()) { diff --git a/Teknik/Areas/Status/Views/Status/Donations.cshtml b/Teknik/Areas/Stats/Views/Stats/Donations.cshtml similarity index 92% rename from Teknik/Areas/Status/Views/Status/Donations.cshtml rename to Teknik/Areas/Stats/Views/Stats/Donations.cshtml index be87b83..889a284 100644 --- a/Teknik/Areas/Status/Views/Status/Donations.cshtml +++ b/Teknik/Areas/Stats/Views/Stats/Donations.cshtml @@ -1,6 +1,6 @@ -@model List +@model List -@using Teknik.Areas.Status.ViewModels +@using Teknik.Areas.Stats.ViewModels @if (Model != null && Model.Any()) { diff --git a/Teknik/Areas/Status/Views/Status/Index.cshtml b/Teknik/Areas/Stats/Views/Stats/Index.cshtml similarity index 81% rename from Teknik/Areas/Status/Views/Status/Index.cshtml rename to Teknik/Areas/Stats/Views/Stats/Index.cshtml index e97d9d9..5b81b22 100644 --- a/Teknik/Areas/Status/Views/Status/Index.cshtml +++ b/Teknik/Areas/Stats/Views/Stats/Index.cshtml @@ -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") @@ -86,10 +86,10 @@
- @Html.Partial("~/Areas/Status/Views/Status/Transactions.cshtml", Model.Transactions) + @Html.Partial("~/Areas/Stats/Views/Stats/Transactions.cshtml", Model.Transactions)
- @Html.Partial("~/Areas/Status/Views/Status/Takedowns.cshtml", Model.Takedowns) + @Html.Partial("~/Areas/Stats/Views/Stats/Takedowns.cshtml", Model.Takedowns)
} @@ -97,7 +97,7 @@ {
-

Status Information has been disabled

+

Stats Information has been disabled

} diff --git a/Teknik/Areas/Status/Views/Status/OneTimes.cshtml b/Teknik/Areas/Stats/Views/Stats/OneTimes.cshtml similarity index 92% rename from Teknik/Areas/Status/Views/Status/OneTimes.cshtml rename to Teknik/Areas/Stats/Views/Stats/OneTimes.cshtml index ae71dc2..d4ad173 100644 --- a/Teknik/Areas/Status/Views/Status/OneTimes.cshtml +++ b/Teknik/Areas/Stats/Views/Stats/OneTimes.cshtml @@ -1,6 +1,6 @@ -@model List +@model List -@using Teknik.Areas.Status.ViewModels +@using Teknik.Areas.Stats.ViewModels @if (Model != null && Model.Any()) { @@ -32,4 +32,4 @@ -} \ No newline at end of file +} diff --git a/Teknik/Areas/Status/Views/Status/Takedowns.cshtml b/Teknik/Areas/Stats/Views/Stats/Takedowns.cshtml similarity index 92% rename from Teknik/Areas/Status/Views/Status/Takedowns.cshtml rename to Teknik/Areas/Stats/Views/Stats/Takedowns.cshtml index 023c43a..410653a 100644 --- a/Teknik/Areas/Status/Views/Status/Takedowns.cshtml +++ b/Teknik/Areas/Stats/Views/Stats/Takedowns.cshtml @@ -1,6 +1,6 @@ -@model List +@model List -@using Teknik.Areas.Status.ViewModels +@using Teknik.Areas.Stats.ViewModels @if (Model != null && Model.Any()) { @@ -34,4 +34,4 @@ } -} \ No newline at end of file +} diff --git a/Teknik/Areas/Status/Views/Status/Transactions.cshtml b/Teknik/Areas/Stats/Views/Stats/Transactions.cshtml similarity index 84% rename from Teknik/Areas/Status/Views/Status/Transactions.cshtml rename to Teknik/Areas/Stats/Views/Stats/Transactions.cshtml index 876bb42..b9ae77b 100644 --- a/Teknik/Areas/Status/Views/Status/Transactions.cshtml +++ b/Teknik/Areas/Stats/Views/Stats/Transactions.cshtml @@ -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 @@ -@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) \ No newline at end of file +@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) diff --git a/Teknik/Areas/Status/Views/_ViewStart.cshtml b/Teknik/Areas/Stats/Views/_ViewStart.cshtml similarity index 100% rename from Teknik/Areas/Status/Views/_ViewStart.cshtml rename to Teknik/Areas/Stats/Views/_ViewStart.cshtml diff --git a/Teknik/Areas/Status/Views/web.config b/Teknik/Areas/Stats/Views/web.config similarity index 100% rename from Teknik/Areas/Status/Views/web.config rename to Teknik/Areas/Stats/Views/web.config diff --git a/Teknik/Models/TeknikEntities.cs b/Teknik/Models/TeknikEntities.cs index 7b21a53..bb183d9 100644 --- a/Teknik/Models/TeknikEntities.cs +++ b/Teknik/Models/TeknikEntities.cs @@ -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; diff --git a/Teknik/Scripts/_references.js b/Teknik/Scripts/_references.js index 631cb42cb0791eae55dba369f4f47c4c52fb5829..0b8018e8da4565a0f58c7b57c19ab8355f8962b4 100644 GIT binary patch literal 3172 zcmbtW!EW0y480H7KLowoLYtxJVI8pB?)w5-Vq!J6s8Mn<_v=U5iPNEjrDlgDV!%f} zQRI`9Qk$RJIK1O=wIP6f@@ z$DjfN>$ZLgABPUUBQXCHARt?}qr&V>NBf0$G752;Tm&5#=-JMqzfa}*K|QLU=V~P* zi<`@ASuYu7U5N4!A}+YeDn*jf0={BryAT~(;)o7;!7u-mMu?Ew>C#roDn!nGv_K7= zTxzV_(9-cd`e@0Wh!4oOMVTp;Vx^52_PRxVkl}1KnbKAn-UjeYJKNm^O>qi2A7SXO zy)s$rNEnPI-@zy;L_gM@WjLFR2T^S3w`%6!f{@}EB164>dYn+n@cAUOTb}VbysvuT zLu$do&{e<=bu9Ki*(h?G<)f+ZDZ^oEbgEuN(lIk@S67*js)2xyU)CxAjTqwY{;?F$ z*`|u4M+3|-7BlN*U@9Fm9em~G!Bmdq+gO*m3JjBfC5P&=Sl>#TzW~SFFimdu71d>t zKi1anTipVSQeKzqWUhX1Ak{V_kN-yX#2H~pxK2KCN;a)(5Bjjq@#WWmJk~Py`Y_lc z-&C^_l|6^HJBA)BnRyqyTvbImg55jlxO%7`>ihiRoKr>8b~hHgAEC1bB7Ph&IBMk4 z7VI%|C^NBYTW@6>t1q=1Jnzd(BMg#v=xkrQ+e+HuWX&FPuYrr~8bmJwl8>L{f}MR$ z$NMCeS*;7{^CKhie^3{59pqt;=_XJYZneA|MHOOB7~TWX*hm>=dyfj>Y!rdX02yT@ doT+<|tEHDzP>U#bR$h|wpvzZs!N0lI{{Vy?3}Qso`HvMl3W zn72FgX67xwe`UhYjeL?^_R>o$oxDmT1;#4;=CY7Au1a~3cbMPdt_oK-cw-3hW`a-YCO^FT!-g*Z-J*%dBWH= zQ1`%J!wX#5|5^cY>4^s3Y>oHMXtwe=<8MD>>+1q&4I-K&j{OYkcs?Hc%Ya>9fxUq* zGx;{*mY<2o8?w1pwuVf0ECu;4|*V?yVk1gJddT|Xu zhWk9t#b7c@rSgA#}d{X;J9m6%m!zM7^D*ZpuL~UPO8@FNQ`yg|2nMw z1-^;%%E?-d^>VG#5sPeH!K;s|7*@&`cj}!Rjq%K!y$q-!c7k3|M#Xr}>ff-)V!kJ^ z*c`6SG?J zxw3K5Od zP*b%_9Z(^EodU7ordJm`aFE^4XYc)yGw1V#Svst1nZ}hdxI^8Z&c?8vs)gS6XMzkh zXL?F-?;V|1U|z>5hJQiidZ_l<_b$CV>LA9C?_{W8;t<)VU6*LE2eOQ{kf#=Q67Gs8 XNvg(DnaES0e@kb<$q=7 - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -416,7 +416,7 @@ - + @@ -676,14 +676,14 @@ - - - - - - - - + + + + + + + + @@ -808,7 +808,7 @@ - + diff --git a/Teknik/Views/Shared/_Footer.cshtml b/Teknik/Views/Shared/_Footer.cshtml index 8303805..039e4c4 100644 --- a/Teknik/Views/Shared/_Footer.cshtml +++ b/Teknik/Views/Shared/_Footer.cshtml @@ -51,7 +51,7 @@ }
- © Teknik 2013-2018 | FAQ | Privacy | TOS | Abuse | Status + © Teknik 2013-2018 | FAQ | Privacy | TOS | Abuse | Statistics