Browse Source

Changed Status to Stats

Teknikode 10 months 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;
8 8
 using System.Net.Mail;
9 9
 using System.Reflection;
10 10
 using System.Text;
11
-using Teknik.Areas.Status.Models;
11
+using Teknik.Areas.Stats.Models;
12 12
 using Teknik.Areas.Upload.Models;
13 13
 using Teknik.Areas.Users.Models;
14 14
 using Teknik.Areas.Users.Utility;

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

@@ -16,7 +16,7 @@
16 16
                 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.
17 17
             </p>
18 18
             <p>
19
-                You can view our complete activity and statistics by visiting the <a href="@Url.SubRouteUrl("status", "Status.Index")">status</a> page.
19
+                You can view our complete activity and statistics by visiting the <a href="@Url.SubRouteUrl("stats", "Stats.Index")">statistics</a> page.
20 20
             </p>
21 21
             <br />
22 22
             <hr>

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

@@ -9,10 +9,12 @@
9 9
             <hr>
10 10
             <h3 class="text-center">Important Links</h3>
11 11
             <dl class="dl-horizontal">
12
+                <dt><a href="@Url.SubRouteUrl("status", "Status.Index")" target="_blank">System Status</a></dt>
13
+                <dd>The status page for all of Teknik's Services.</dd>
12 14
                 <dt><a href="@Url.SubRouteUrl("faq", "FAQ.Index")" target="_blank">FAQ</a></dt>
13 15
                 <dd>Some of the more commonly asked questions and some answers regarding them.</dd>
14
-                <dt><a href="@Url.SubRouteUrl("status", "Status.Index")" target="_blank">Site Statistics</a></dt>
15
-                <dd>Current status of the server, and all the site's statistics, transactions, and data effecting actions.</dd>
16
+                <dt><a href="@Url.SubRouteUrl("stats", "Stats.Index")" target="_blank">Site Statistics</a></dt>
17
+                <dd>Current resource usage of the server, and all the site's statistics, transactions, and data effecting actions.</dd>
16 18
                 <dt><a href="@Url.SubRouteUrl("privacy", "Privacy.Index")" target="_blank">Privacy Policy</a></dt>
17 19
                 <dd>Everything about how we handle your privacy.</dd>
18 20
                 <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 @@
1
-using System;
1
+using System;
2 2
 using System.Collections.Generic;
3 3
 using System.Diagnostics;
4 4
 using System.Linq;
5 5
 using System.Threading;
6 6
 using System.Web;
7 7
 using System.Web.Mvc;
8
-using Teknik.Areas.Status.Models;
9
-using Teknik.Areas.Status.ViewModels;
8
+using Teknik.Areas.Stats.Models;
9
+using Teknik.Areas.Stats.ViewModels;
10 10
 using Teknik.Attributes;
11 11
 using Teknik.Controllers;
12 12
 using Teknik.Filters;
@@ -14,19 +14,19 @@ using Teknik.Models;
14 14
 using Teknik.Piwik;
15 15
 using Teknik.Utilities;
16 16
 
17
-namespace Teknik.Areas.Status.Controllers
17
+namespace Teknik.Areas.Stats.Controllers
18 18
 {
19 19
     [TeknikAuthorize]
20
-    public class StatusController : DefaultController
20
+    public class StatsController : DefaultController
21 21
     {
22 22
         [TrackPageView]
23 23
         [AllowAnonymous]
24 24
         public ActionResult Index()
25 25
         {
26
-            ViewBag.Title = "System Status - " + Config.Title;
27
-            ViewBag.Description = "Current status information for the server and resources.";
26
+            ViewBag.Title = "System Statistics - " + Config.Title;
27
+            ViewBag.Description = "Current statistics for the services.";
28 28
 
29
-            StatusViewModel model = new StatusViewModel();
29
+            StatsViewModel model = new StatsViewModel();
30 30
 
31 31
             using (TeknikEntities db = new TeknikEntities())
32 32
             {
@@ -181,4 +181,4 @@ namespace Teknik.Areas.Status.Controllers
181 181
             return Json(new { error = new { message = "Piwik not configured" } }, JsonRequestBehavior.AllowGet);
182 182
         }
183 183
     }
184
-}
184
+}

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

@@ -1,10 +1,10 @@
1
-using System;
1
+using System;
2 2
 using System.Collections.Generic;
3 3
 using System.Linq;
4 4
 using System.Text;
5 5
 using System.Threading.Tasks;
6 6
 
7
-namespace Teknik.Areas.Status.Models
7
+namespace Teknik.Areas.Stats.Models
8 8
 {
9 9
     public class Bill : Transaction
10 10
     {

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

@@ -1,10 +1,10 @@
1
-using System;
1
+using System;
2 2
 using System.Collections.Generic;
3 3
 using System.Linq;
4 4
 using System.Text;
5 5
 using System.Threading.Tasks;
6 6
 
7
-namespace Teknik.Areas.Status.Models
7
+namespace Teknik.Areas.Stats.Models
8 8
 {
9 9
     public class Donation : Transaction
10 10
     {

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

@@ -1,10 +1,10 @@
1
-using System;
1
+using System;
2 2
 using System.Collections.Generic;
3 3
 using System.Linq;
4 4
 using System.Text;
5 5
 using System.Threading.Tasks;
6 6
 
7
-namespace Teknik.Areas.Status.Models
7
+namespace Teknik.Areas.Stats.Models
8 8
 {
9 9
     public class OneTime : Transaction
10 10
     {

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

@@ -1,10 +1,10 @@
1
-using System;
1
+using System;
2 2
 using System.Collections.Generic;
3 3
 using System.Linq;
4 4
 using System.Text;
5 5
 using System.Threading.Tasks;
6 6
 
7
-namespace Teknik.Areas.Status.Models
7
+namespace Teknik.Areas.Stats.Models
8 8
 {
9 9
     public class Takedown
10 10
     {

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

@@ -1,11 +1,11 @@
1
-using System;
1
+using System;
2 2
 using System.Collections.Generic;
3 3
 using System.Linq;
4 4
 using System.Text;
5 5
 using System.Threading.Tasks;
6 6
 using Teknik.Utilities;
7 7
 
8
-namespace Teknik.Areas.Status.Models
8
+namespace Teknik.Areas.Stats.Models
9 9
 {
10 10
     public class Transaction
11 11
     {

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 @@
1
-using System.Collections.Generic;
1
+using System.Collections.Generic;
2 2
 using System.Web.Mvc;
3 3
 using System.Web.Optimization;
4 4
 using Teknik.Configuration;
5 5
 using Teknik.Utilities;
6 6
 
7
-namespace Teknik.Areas.Status
7
+namespace Teknik.Areas.Stats
8 8
 {
9
-    public class StatusAreaRegistration : AreaRegistration 
9
+    public class StatsAreaRegistration : AreaRegistration 
10 10
     {
11 11
         public override string AreaName 
12 12
         {
13 13
             get 
14 14
             {
15
-                return "Status";
15
+                return "Stats";
16 16
             }
17 17
         }
18 18
 
@@ -20,27 +20,27 @@ namespace Teknik.Areas.Status
20 20
         {
21 21
             Config config = Config.Load();
22 22
             context.MapSubdomainRoute(
23
-                 "Status.Index",
24
-                 new List<string>() { "status" }, // Subdomains
23
+                 "Stats.Index",
24
+                 new List<string>() { "stats" }, // Subdomains
25 25
                  new List<string>() { config.Host }, // domains
26 26
                  "",
27
-                 new { controller = "Status", action = "Index" },
28
-                 new[] { typeof(Controllers.StatusController).Namespace }
27
+                 new { controller = "Stats", action = "Index" },
28
+                 new[] { typeof(Controllers.StatsController).Namespace }
29 29
              );
30 30
             context.MapSubdomainRoute(
31
-                 "Status.Action",
32
-                 new List<string>() { "status" }, // Subdomains
31
+                 "Stats.Action",
32
+                 new List<string>() { "stats" }, // Subdomains
33 33
                  new List<string>() { config.Host }, // domains
34 34
                  "Action/{controller}/{action}",
35
-                 new { controller = "Status", action = "Index" },
36
-                 new[] { typeof(Controllers.StatusController).Namespace }
35
+                 new { controller = "Stats", action = "Index" },
36
+                 new[] { typeof(Controllers.StatsController).Namespace }
37 37
              );
38 38
 
39 39
             // Register Script Bundle
40
-            BundleTable.Bundles.Add(new CdnScriptBundle("~/bundles/status", config.CdnHost).Include(
40
+            BundleTable.Bundles.Add(new CdnScriptBundle("~/bundles/stats", config.CdnHost).Include(
41 41
                       "~/Scripts/Highcharts/highcharts.js",
42 42
                       "~/Scripts/FileSize/filesize.min.js",
43
-                      "~/Areas/Status/Scripts/Status.js"));
43
+                      "~/Areas/Stats/Scripts/Stats.js"));
44 44
         }
45 45
     }
46
-}
46
+}

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

@@ -1,13 +1,13 @@
1
-using System;
1
+using System;
2 2
 using System.Collections.Generic;
3 3
 using System.Linq;
4 4
 using System.Web;
5 5
 using Teknik.ViewModels;
6 6
 
7
-namespace Teknik.Areas.Status.ViewModels
7
+namespace Teknik.Areas.Stats.ViewModels
8 8
 {
9 9
     public class BillViewModel : TransactionViewModel
10 10
     {
11 11
         public string Recipient { get; set; }
12 12
     }
13
-}
13
+}

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

@@ -1,13 +1,13 @@
1
-using System;
1
+using System;
2 2
 using System.Collections.Generic;
3 3
 using System.Linq;
4 4
 using System.Web;
5 5
 using Teknik.ViewModels;
6 6
 
7
-namespace Teknik.Areas.Status.ViewModels
7
+namespace Teknik.Areas.Stats.ViewModels
8 8
 {
9 9
     public class DonationViewModel : TransactionViewModel
10 10
     {
11 11
         public string Sender { get; set; }
12 12
     }
13
-}
13
+}

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

@@ -1,13 +1,13 @@
1
-using System;
1
+using System;
2 2
 using System.Collections.Generic;
3 3
 using System.Linq;
4 4
 using System.Web;
5 5
 using Teknik.ViewModels;
6 6
 
7
-namespace Teknik.Areas.Status.ViewModels
7
+namespace Teknik.Areas.Stats.ViewModels
8 8
 {
9 9
     public class OneTimeViewModel : TransactionViewModel
10 10
     {
11 11
         public string Recipient { get; set; }
12 12
     }
13
-}
13
+}

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

@@ -1,14 +1,14 @@
1
-using System;
1
+using System;
2 2
 using System.Collections.Generic;
3 3
 using System.Linq;
4 4
 using System.Web;
5
-using Teknik.Areas.Status.Models;
5
+using Teknik.Areas.Stats.Models;
6 6
 using Teknik.Models;
7 7
 using Teknik.ViewModels;
8 8
 
9
-namespace Teknik.Areas.Status.ViewModels
9
+namespace Teknik.Areas.Stats.ViewModels
10 10
 {
11
-    public class StatusViewModel : ViewModelBase
11
+    public class StatsViewModel : ViewModelBase
12 12
     {
13 13
         public int UploadCount { get; set; }
14 14
 
@@ -26,7 +26,7 @@ namespace Teknik.Areas.Status.ViewModels
26 26
 
27 27
         public List<TakedownViewModel> Takedowns { get; set; }
28 28
 
29
-        public StatusViewModel()
29
+        public StatsViewModel()
30 30
         {
31 31
             UploadCount = 0;
32 32
             UploadSize = 0;
@@ -38,4 +38,4 @@ namespace Teknik.Areas.Status.ViewModels
38 38
             Takedowns = new List<TakedownViewModel>();
39 39
         }
40 40
     }
41
-}
41
+}

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

@@ -1,10 +1,10 @@
1
-using System;
1
+using System;
2 2
 using System.Collections.Generic;
3 3
 using System.Linq;
4 4
 using System.Web;
5 5
 using Teknik.ViewModels;
6 6
 
7
-namespace Teknik.Areas.Status.ViewModels
7
+namespace Teknik.Areas.Stats.ViewModels
8 8
 {
9 9
     public class TakedownViewModel : ViewModelBase
10 10
     {
@@ -22,4 +22,4 @@ namespace Teknik.Areas.Status.ViewModels
22 22
 
23 23
         public virtual ICollection<Upload.Models.Upload> Attachments { get; set; }
24 24
     }
25
-}
25
+}

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

@@ -1,12 +1,12 @@
1
-using System;
1
+using System;
2 2
 using System.Collections.Generic;
3 3
 using System.Linq;
4 4
 using System.Web;
5
-using Teknik.Areas.Status.Models;
5
+using Teknik.Areas.Stats.Models;
6 6
 using Teknik.Utilities;
7 7
 using Teknik.ViewModels;
8 8
 
9
-namespace Teknik.Areas.Status.ViewModels
9
+namespace Teknik.Areas.Stats.ViewModels
10 10
 {
11 11
     public class TransactionViewModel : ViewModelBase
12 12
     {
@@ -18,4 +18,4 @@ namespace Teknik.Areas.Status.ViewModels
18 18
 
19 19
         public DateTime DateSent { get; set; }
20 20
     }
21
-}
21
+}

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

@@ -1,10 +1,10 @@
1
-using System;
1
+using System;
2 2
 using System.Collections.Generic;
3 3
 using System.Linq;
4 4
 using System.Web;
5 5
 using Teknik.ViewModels;
6 6
 
7
-namespace Teknik.Areas.Status.ViewModels
7
+namespace Teknik.Areas.Stats.ViewModels
8 8
 {
9 9
     public class TransactionsViewModel : ViewModelBase
10 10
     {
@@ -37,4 +37,4 @@ namespace Teknik.Areas.Status.ViewModels
37 37
             Donations = new List<DonationViewModel>();
38 38
         }
39 39
     }
40
-}
40
+}

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

@@ -1,6 +1,6 @@
1
-@model List<Teknik.Areas.Status.ViewModels.BillViewModel>
1
+@model List<Teknik.Areas.Stats.ViewModels.BillViewModel>
2 2
 
3
-@using Teknik.Areas.Status.ViewModels
3
+@using Teknik.Areas.Stats.ViewModels
4 4
 
5 5
 @if (Model != null && Model.Any())
6 6
 {

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

@@ -1,6 +1,6 @@
1
-@model List<Teknik.Areas.Status.ViewModels.DonationViewModel>
1
+@model List<Teknik.Areas.Stats.ViewModels.DonationViewModel>
2 2
 
3
-@using Teknik.Areas.Status.ViewModels
3
+@using Teknik.Areas.Stats.ViewModels
4 4
 
5 5
 @if (Model != null && Model.Any())
6 6
 {

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

@@ -1,19 +1,19 @@
1
-@model Teknik.Areas.Status.ViewModels.StatusViewModel
1
+@model Teknik.Areas.Stats.ViewModels.StatsViewModel
2 2
 
3 3
 @using Teknik.Utilities
4
-@using Teknik.Areas.Status.Models
4
+@using Teknik.Areas.Stats.Models
5 5
 
6 6
 @Scripts.Render("~/bundles/signalr")
7 7
 @Scripts.Render("~/signalr/hubs")
8
-@Scripts.Render("~/bundles/status")
8
+@Scripts.Render("~/bundles/stats")
9 9
 
10 10
 <script nonce="@Context.Items[Constants.NONCE_KEY]">
11
-    var getVisitorDataURL = '@Url.SubRouteUrl("status", "Status.Action", new { action = "GetVisitorData" })';
12
-    var showWebCPU = @Model.Config.StatusConfig.ShowWebStatus.ToString().ToLower();
13
-    var showDatabaseCPU = @Model.Config.StatusConfig.ShowDatabaseStatus.ToString().ToLower();
14
-    var showNetworkUsage = @Model.Config.StatusConfig.ShowNetworkStatus.ToString().ToLower();
11
+    var getVisitorDataURL = '@Url.SubRouteUrl("stats", "Stats.Action", new { action = "GetVisitorData" })';
12
+    var showWebCPU = @Model.Config.StatsConfig.ShowWebStatus.ToString().ToLower();
13
+    var showDatabaseCPU = @Model.Config.StatsConfig.ShowDatabaseStatus.ToString().ToLower();
14
+    var showNetworkUsage = @Model.Config.StatsConfig.ShowNetworkStatus.ToString().ToLower();
15 15
     var showVisitorStats = @Model.Config.PiwikConfig.Enabled.ToString().ToLower();
16
-    var totalMemory = @Model.Config.StatusConfig.TotalMemory;
16
+    var totalMemory = @Model.Config.StatsConfig.TotalMemory;
17 17
     var tickInterval = totalMemory / 5;
18 18
 </script>
19 19
 
@@ -86,10 +86,10 @@
86 86
 
87 87
             </div>
88 88
             <div role="tabpanel" class="tab-pane" id="transactions">
89
-                @Html.Partial("~/Areas/Status/Views/Status/Transactions.cshtml", Model.Transactions)
89
+                @Html.Partial("~/Areas/Stats/Views/Stats/Transactions.cshtml", Model.Transactions)
90 90
             </div>
91 91
             <div role="tabpanel" class="tab-pane" id="takedowns">
92
-                @Html.Partial("~/Areas/Status/Views/Status/Takedowns.cshtml", Model.Takedowns)
92
+                @Html.Partial("~/Areas/Stats/Views/Stats/Takedowns.cshtml", Model.Takedowns)
93 93
             </div>
94 94
         </div>
95 95
     }
@@ -97,7 +97,7 @@
97 97
     {
98 98
         <div class="row">
99 99
             <div class="col-sm-8 col-sm-offset-2 text-center">
100
-                <h3>Status Information has been disabled</h3>
100
+                <h3>Stats Information has been disabled</h3>
101 101
             </div>
102 102
         </div>
103 103
     }

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

@@ -1,6 +1,6 @@
1
-@model List<Teknik.Areas.Status.ViewModels.OneTimeViewModel>
1
+@model List<Teknik.Areas.Stats.ViewModels.OneTimeViewModel>
2 2
 
3
-@using Teknik.Areas.Status.ViewModels
3
+@using Teknik.Areas.Stats.ViewModels
4 4
 
5 5
 @if (Model != null && Model.Any())
6 6
 {
@@ -32,4 +32,4 @@
32 32
             </div>
33 33
         </div>
34 34
     </div>
35
-}
35
+}

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

@@ -1,6 +1,6 @@
1
-@model List<Teknik.Areas.Status.ViewModels.TakedownViewModel>
1
+@model List<Teknik.Areas.Stats.ViewModels.TakedownViewModel>
2 2
 
3
-@using Teknik.Areas.Status.ViewModels
3
+@using Teknik.Areas.Stats.ViewModels
4 4
 
5 5
 @if (Model != null && Model.Any())
6 6
 {
@@ -34,4 +34,4 @@
34 34
             }
35 35
         </div>
36 36
     </div>
37
-}
37
+}

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

@@ -1,6 +1,6 @@
1
-@model Teknik.Areas.Status.ViewModels.TransactionsViewModel
1
+@model Teknik.Areas.Stats.ViewModels.TransactionsViewModel
2 2
 
3
-@using Teknik.Areas.Status.ViewModels
3
+@using Teknik.Areas.Stats.ViewModels
4 4
 
5 5
 @{ 
6 6
     decimal totalBills = Model.CurrentMonthBills;
@@ -55,6 +55,6 @@
55 55
     </div>
56 56
 </div>
57 57
 
58
-@Html.Partial("~/Areas/Status/Views/Status/Bills.cshtml", Model.Bills)
59
-@Html.Partial("~/Areas/Status/Views/Status/OneTimes.cshtml", Model.OneTimes)
60
-@Html.Partial("~/Areas/Status/Views/Status/Donations.cshtml", Model.Donations)
58
+@Html.Partial("~/Areas/Stats/Views/Stats/Bills.cshtml", Model.Bills)
59
+@Html.Partial("~/Areas/Stats/Views/Stats/OneTimes.cshtml", Model.OneTimes)
60
+@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;
8 8
 using Teknik.Areas.Upload.Models;
9 9
 using Teknik.Areas.Paste.Models;
10 10
 using Teknik.Areas.Podcast.Models;
11
-using Teknik.Areas.Status.Models;
11
+using Teknik.Areas.Stats.Models;
12 12
 using Teknik.Areas.Shortener.Models;
13 13
 using Teknik.Attributes;
14 14
 using System.Data.Entity.ModelConfiguration.Conventions;

BIN
Teknik/Scripts/_references.js View File


+ 24
- 24
Teknik/Teknik.csproj View File

@@ -273,20 +273,20 @@
273 273
     <Compile Include="Areas\Privacy\Controllers\PrivacyController.cs" />
274 274
     <Compile Include="Areas\Privacy\PrivacyAreaRegistration.cs" />
275 275
     <Compile Include="Areas\Privacy\ViewModels\PrivacyViewModel.cs" />
276
-    <Compile Include="Areas\Status\Controllers\StatusController.cs" />
277
-    <Compile Include="Areas\Status\Models\Bill.cs" />
278
-    <Compile Include="Areas\Status\Models\Donation.cs" />
279
-    <Compile Include="Areas\Status\Models\OneTime.cs" />
280
-    <Compile Include="Areas\Status\Models\Takedown.cs" />
281
-    <Compile Include="Areas\Status\Models\Transaction.cs" />
282
-    <Compile Include="Areas\Status\StatusAreaRegistration.cs" />
283
-    <Compile Include="Areas\Status\ViewModels\OneTimeViewModel.cs" />
284
-    <Compile Include="Areas\Status\ViewModels\DonationViewModel.cs" />
285
-    <Compile Include="Areas\Status\ViewModels\StatusViewModel.cs" />
286
-    <Compile Include="Areas\Status\ViewModels\TakedownViewModel.cs" />
287
-    <Compile Include="Areas\Status\ViewModels\TransactionsViewModel.cs" />
288
-    <Compile Include="Areas\Status\ViewModels\BillViewModel.cs" />
289
-    <Compile Include="Areas\Status\ViewModels\TransactionViewModel.cs" />
276
+    <Compile Include="Areas\Stats\Controllers\StatsController.cs" />
277
+    <Compile Include="Areas\Stats\Models\Bill.cs" />
278
+    <Compile Include="Areas\Stats\Models\Donation.cs" />
279
+    <Compile Include="Areas\Stats\Models\OneTime.cs" />
280
+    <Compile Include="Areas\Stats\Models\Takedown.cs" />
281
+    <Compile Include="Areas\Stats\Models\Transaction.cs" />
282
+    <Compile Include="Areas\Stats\StatsAreaRegistration.cs" />
283
+    <Compile Include="Areas\Stats\ViewModels\OneTimeViewModel.cs" />
284
+    <Compile Include="Areas\Stats\ViewModels\DonationViewModel.cs" />
285
+    <Compile Include="Areas\Stats\ViewModels\StatsViewModel.cs" />
286
+    <Compile Include="Areas\Stats\ViewModels\TakedownViewModel.cs" />
287
+    <Compile Include="Areas\Stats\ViewModels\TransactionsViewModel.cs" />
288
+    <Compile Include="Areas\Stats\ViewModels\BillViewModel.cs" />
289
+    <Compile Include="Areas\Stats\ViewModels\TransactionViewModel.cs" />
290 290
     <Compile Include="Areas\User\Controllers\UserController.cs" />
291 291
     <Compile Include="Areas\User\Models\BlogSettings.cs" />
292 292
     <Compile Include="Areas\User\Models\InviteCode.cs" />
@@ -416,7 +416,7 @@
416 416
     <Content Include="Areas\Paste\Scripts\Paste.js" />
417 417
     <Content Include="Areas\Podcast\Content\Podcast.css" />
418 418
     <Content Include="Areas\Podcast\Scripts\Podcast.js" />
419
-    <Content Include="Areas\Status\Scripts\Status.js" />
419
+    <Content Include="Areas\Stats\Scripts\Stats.js" />
420 420
     <Content Include="Areas\Upload\Content\Upload.css" />
421 421
     <Content Include="Areas\User\Scripts\CheckAuthCode.js" />
422 422
     <Content Include="Areas\User\Scripts\Profile.js" />
@@ -676,14 +676,14 @@
676 676
     <Content Include="Areas\Vault\Views\Vault\ModifyVaultItem.cshtml" />
677 677
     <Content Include="Areas\Vault\Views\Vault\PasteItem.cshtml" />
678 678
     <Content Include="Areas\Vault\Views\Vault\UploadItem.cshtml" />
679
-    <Content Include="Areas\Status\Views\web.config" />
680
-    <Content Include="Areas\Status\Views\_ViewStart.cshtml" />
681
-    <Content Include="Areas\Status\Views\Status\Index.cshtml" />
682
-    <Content Include="Areas\Status\Views\Status\Transactions.cshtml" />
683
-    <Content Include="Areas\Status\Views\Status\Bills.cshtml" />
684
-    <Content Include="Areas\Status\Views\Status\OneTimes.cshtml" />
685
-    <Content Include="Areas\Status\Views\Status\Donations.cshtml" />
686
-    <Content Include="Areas\Status\Views\Status\Takedowns.cshtml" />
679
+    <Content Include="Areas\Stats\Views\web.config" />
680
+    <Content Include="Areas\Stats\Views\_ViewStart.cshtml" />
681
+    <Content Include="Areas\Stats\Views\Stats\Index.cshtml" />
682
+    <Content Include="Areas\Stats\Views\Stats\Transactions.cshtml" />
683
+    <Content Include="Areas\Stats\Views\Stats\Bills.cshtml" />
684
+    <Content Include="Areas\Stats\Views\Stats\OneTimes.cshtml" />
685
+    <Content Include="Areas\Stats\Views\Stats\Donations.cshtml" />
686
+    <Content Include="Areas\Stats\Views\Stats\Takedowns.cshtml" />
687 687
     <Content Include="Areas\FAQ\Views\web.config" />
688 688
     <Content Include="Areas\FAQ\Views\_ViewStart.cshtml" />
689 689
     <Content Include="Areas\FAQ\Views\FAQ\Index.cshtml" />
@@ -808,7 +808,7 @@
808 808
     <Folder Include="Areas\Privacy\Models\" />
809 809
     <Folder Include="Areas\Privacy\Views\Shared\" />
810 810
     <Folder Include="Areas\Shortener\Views\Shared\" />
811
-    <Folder Include="Areas\Status\Views\Shared\" />
811
+    <Folder Include="Areas\Stats\Views\Shared\" />
812 812
     <Folder Include="Areas\Stream\Views\Shared\" />
813 813
     <Folder Include="Areas\TOS\Models\" />
814 814
     <Folder Include="Areas\TOS\Views\Shared\" />

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

@@ -51,7 +51,7 @@
51 51
         }
52 52
         <div class="row">
53 53
             <div class="col-sm-5 col-sm-offset-1 text-left text-muted">
54
-                &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>
54
+                &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>
55 55
             </div>
56 56
             <div class="col-sm-5 text-right text-muted">
57 57
                 <div id="pagetime" style="display:none;">

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

@@ -44,7 +44,7 @@ namespace Teknik.Configuration
44 44
         private StreamConfig        _StreamConfig;
45 45
         private ShortenerConfig     _ShortenerConfig;
46 46
         private VaultConfig         _VaultConfig;
47
-        private StatusConfig        _StatusConfig;
47
+        private StatsConfig        _StatusConfig;
48 48
         private LoggingConfig       _LoggingConfig;
49 49
         private PiwikConfig         _PiwikConfig;
50 50
         private IRCConfig           _IRCConfig;
@@ -104,7 +104,7 @@ namespace Teknik.Configuration
104 104
         public VaultConfig          VaultConfig         { get { return _VaultConfig; }          set { _VaultConfig = value; } }
105 105
 
106 106
         // Status Configuration
107
-        public StatusConfig         StatusConfig        { get { return _StatusConfig; }         set { _StatusConfig = value; } }
107
+        public StatsConfig         StatusConfig        { get { return _StatusConfig; }         set { _StatusConfig = value; } }
108 108
 
109 109
         // Logging Configuration
110 110
         public LoggingConfig        LoggingConfig       { get { return _LoggingConfig; }        set { _LoggingConfig = value; } }
@@ -152,7 +152,7 @@ namespace Teknik.Configuration
152 152
             StreamConfig            = new StreamConfig();
153 153
             ShortenerConfig         = new ShortenerConfig();
154 154
             VaultConfig             = new VaultConfig();
155
-            StatusConfig            = new StatusConfig();
155
+            StatusConfig            = new StatsConfig();
156 156
             LoggingConfig           = new LoggingConfig();
157 157
             PiwikConfig             = new PiwikConfig();
158 158
             IRCConfig               = new IRCConfig();

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

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

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

@@ -1,4 +1,4 @@
1
-using System;
1
+using System;
2 2
 using System.Collections.Generic;
3 3
 using System.Linq;
4 4
 using System.Text;
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
6 6
 
7 7
 namespace Teknik.Configuration
8 8
 {
9
-    public class StatusConfig
9
+    public class StatsConfig
10 10
     {
11 11
         public bool Enabled { get; set; }
12 12
 
@@ -22,7 +22,7 @@ namespace Teknik.Configuration
22 22
 
23 23
         public long TotalMemory { get; set; }
24 24
 
25
-        public StatusConfig()
25
+        public StatsConfig()
26 26
         {
27 27
             Enabled = false;
28 28
             ShowWebStatus = false;

Loading…
Cancel
Save