diff --git a/Teknik/Areas/Contact/Controllers/ContactController.cs b/Teknik/Areas/Contact/Controllers/ContactController.cs index 9c39e46..1e46850 100644 --- a/Teknik/Areas/Contact/Controllers/ContactController.cs +++ b/Teknik/Areas/Contact/Controllers/ContactController.cs @@ -61,7 +61,6 @@ namespace Teknik.Areas.Contact.Controllers client.Port = _config.ContactConfig.EmailAccount.Port; client.EnableSsl = _config.ContactConfig.EmailAccount.SSL; client.DeliveryMethod = SmtpDeliveryMethod.Network; - //client.UseDefaultCredentials = true; client.Credentials = new System.Net.NetworkCredential(_config.ContactConfig.EmailAccount.Username, _config.ContactConfig.EmailAccount.Password); client.Timeout = 5000; diff --git a/Teknik/Areas/Error/Controllers/ErrorController.cs b/Teknik/Areas/Error/Controllers/ErrorController.cs index 8bfca55..ada4b0e 100644 --- a/Teknik/Areas/Error/Controllers/ErrorController.cs +++ b/Teknik/Areas/Error/Controllers/ErrorController.cs @@ -185,7 +185,6 @@ Stack Trace: client.Port = _config.ContactConfig.EmailAccount.Port; client.EnableSsl = _config.ContactConfig.EmailAccount.SSL; client.DeliveryMethod = SmtpDeliveryMethod.Network; - client.UseDefaultCredentials = true; client.Credentials = new System.Net.NetworkCredential(_config.ContactConfig.EmailAccount.Username, _config.ContactConfig.EmailAccount.Password); client.Timeout = 5000; diff --git a/Teknik/Areas/Help/Views/Help/Index.cshtml b/Teknik/Areas/Help/Views/Help/Index.cshtml index 22f9a03..1a87d22 100644 --- a/Teknik/Areas/Help/Views/Help/Index.cshtml +++ b/Teknik/Areas/Help/Views/Help/Index.cshtml @@ -27,14 +27,10 @@
Blogging platform available to the users and visible to the public.
Git Repositories
Unlimited public and private Git repositories.
-
IRC Network
-
IRC network that uses the Teknik userbase for nickname authentication.
Mail Server
Mail service featuring IMAP and POP3 support with 1 GB storage.
Markdown
Markdown syntax used throughout the site.
-
Mumble Chat Server
-
The public Mumble server and configuration settings needed.
RSS Feeds
Built-in RSS support for content updates.
Tools
diff --git a/Teknik/Areas/Help/Views/Help/Irc.cshtml b/Teknik/Areas/Help/Views/Help/Irc.cshtml deleted file mode 100644 index b5f9527..0000000 --- a/Teknik/Areas/Help/Views/Help/Irc.cshtml +++ /dev/null @@ -1,20 +0,0 @@ -@model Teknik.Areas.Help.ViewModels.HelpViewModel - -
-
    -
  1. Help Index
    2. -
  2. IRC Network
    3. -
-
-

IRC

-
-

IRC Server Info

-

- You can connect to the Teknik IRC using any RFC compliant client by connecting to irc.@Config.Host on port 6667. -

-

Channel Information

-

- The main channel for Teknik support is located at #teknik. -

-
-
diff --git a/Teknik/Areas/Help/Views/Help/Mumble.cshtml b/Teknik/Areas/Help/Views/Help/Mumble.cshtml deleted file mode 100644 index 37e2719..0000000 --- a/Teknik/Areas/Help/Views/Help/Mumble.cshtml +++ /dev/null @@ -1,16 +0,0 @@ -@model Teknik.Areas.Help.ViewModels.HelpViewModel - -
-
    -
  1. Help Index
    2. -
  2. Mumble Chat Server
    3. -
-
-

Mumble

-
-

Mumble Server Info

-

- You can connect to the Mumble server by connecting to mumble.@Config.Host on port 64738. -

-
-
diff --git a/Teknik/Areas/Stats/Models/Bill.cs b/Teknik/Areas/Stats/Models/Bill.cs deleted file mode 100644 index 98d9519..0000000 --- a/Teknik/Areas/Stats/Models/Bill.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Teknik.Areas.Stats.Models -{ - public class Bill : Transaction - { - public string Recipient { get; set; } - } -} diff --git a/Teknik/Areas/Stats/Models/Donation.cs b/Teknik/Areas/Stats/Models/Donation.cs deleted file mode 100644 index adeafb8..0000000 --- a/Teknik/Areas/Stats/Models/Donation.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Teknik.Areas.Stats.Models -{ - public class Donation : Transaction - { - public string Sender { get; set; } - } -} diff --git a/Teknik/Areas/Stats/Models/OneTime.cs b/Teknik/Areas/Stats/Models/OneTime.cs deleted file mode 100644 index fd52ec1..0000000 --- a/Teknik/Areas/Stats/Models/OneTime.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Teknik.Areas.Stats.Models -{ - public class OneTime : Transaction - { - public string Recipient { get; set; } - } -} diff --git a/Teknik/Areas/Stats/Models/Transaction.cs b/Teknik/Areas/Stats/Models/Transaction.cs deleted file mode 100644 index 542cda8..0000000 --- a/Teknik/Areas/Stats/Models/Transaction.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Teknik.Utilities; - -namespace Teknik.Areas.Stats.Models -{ - public class Transaction - { - public int TransactionId { get; set; } - - public decimal Amount { get; set; } - - public CurrencyType Currency { get; set; } - - public string Reason { get; set; } - - public DateTime DateSent { get; set; } - } -} diff --git a/Teknik/Areas/Stats/Views/Stats/Bills.cshtml b/Teknik/Areas/Stats/Views/Stats/Bills.cshtml deleted file mode 100644 index a0a4ea2..0000000 --- a/Teknik/Areas/Stats/Views/Stats/Bills.cshtml +++ /dev/null @@ -1,35 +0,0 @@ -@model List - -@using Teknik.Areas.Stats.ViewModels - -@if (Model != null && Model.Any()) -{ -
-
-

Bills

-
-
- -
-
-
-
- - - - - - - @foreach (BillViewModel bill in Model) - { - - - - - - } -
DateAmountDescription
@bill.DateSent.ToString("MMMM dd, yyyy")@bill.Amount @bill.Currency.ToString()@bill.Reason
-
-
-
-} diff --git a/Teknik/Areas/Stats/Views/Stats/Donations.cshtml b/Teknik/Areas/Stats/Views/Stats/Donations.cshtml deleted file mode 100644 index 889a284..0000000 --- a/Teknik/Areas/Stats/Views/Stats/Donations.cshtml +++ /dev/null @@ -1,37 +0,0 @@ -@model List - -@using Teknik.Areas.Stats.ViewModels - -@if (Model != null && Model.Any()) -{ -
-
-

Donations

-
-
- -
-
-
-
- - - - - - - - @foreach (DonationViewModel donation in Model) - { - - - - - - - } -
DateAmountDonorReason for Donation
@donation.DateSent.ToString("MMMM dd, yyyy")@donation.Amount @donation.Currency.ToString()@donation.Sender@donation.Reason
-
-
-
-} diff --git a/Teknik/Areas/Stats/Views/Stats/OneTimes.cshtml b/Teknik/Areas/Stats/Views/Stats/OneTimes.cshtml deleted file mode 100644 index d4ad173..0000000 --- a/Teknik/Areas/Stats/Views/Stats/OneTimes.cshtml +++ /dev/null @@ -1,35 +0,0 @@ -@model List - -@using Teknik.Areas.Stats.ViewModels - -@if (Model != null && Model.Any()) -{ -
-
-

One Time Payments

-
-
- -
-
-
-
- - - - - - - @foreach (OneTimeViewModel oneTime in Model) - { - - - - - - } -
DateAmountReason for Payment
@oneTime.DateSent.ToString("MMMM dd, yyyy")@oneTime.Amount @oneTime.Currency.ToString()@oneTime.Reason
-
-
-
-} diff --git a/Teknik/Areas/Stats/Views/Stats/Transactions.cshtml b/Teknik/Areas/Stats/Views/Stats/Transactions.cshtml deleted file mode 100644 index 62c88f5..0000000 --- a/Teknik/Areas/Stats/Views/Stats/Transactions.cshtml +++ /dev/null @@ -1,60 +0,0 @@ -@model Teknik.Areas.Stats.ViewModels.TransactionsViewModel - -@using Teknik.Areas.Stats.ViewModels - -@{ - decimal totalBills = Model.CurrentMonthBills; - decimal totalIncome = Model.CurrentMonthIncome; - int incomePercentage = 0; - if (totalIncome != 0 && totalBills != 0) - { - incomePercentage = (int)Math.Min(Math.Floor((totalIncome / totalBills) * 100), 100); - } - - string processStyle = "progress-bar progress-bar-success"; - if (incomePercentage < 100) - { - processStyle += " progress-bar-striped"; - } -} - -
-
-

Transactions

-
-
-
-

Monthly Donation Target

-
-
-
-
-
$@totalIncome Donated / $@totalBills Bills
-
-
-
-

Transaction Totals

-
-
-

Donations

-

$@Math.Round(Model.TotalDonations, 2)

-
-
-

Bills

-

$@Math.Round(Model.TotalBills, 2)

-
-
-

One-Time Payments

-

$@Math.Round(Model.TotalOneTimes, 2)

-
-
-

Net Profit

-

$@Math.Round(Model.TotalNet, 2)

-
-
-
-
- -@await Html.PartialAsync("~/Areas/Stats/Views/Stats/Bills.cshtml", Model.Bills) -@await Html.PartialAsync("~/Areas/Stats/Views/Stats/OneTimes.cshtml", Model.OneTimes) -@await Html.PartialAsync("~/Areas/Stats/Views/Stats/Donations.cshtml", Model.Donations) diff --git a/Teknik/Data/TeknikEntities.cs b/Teknik/Data/TeknikEntities.cs index 359a278..32f3681 100644 --- a/Teknik/Data/TeknikEntities.cs +++ b/Teknik/Data/TeknikEntities.cs @@ -46,7 +46,6 @@ namespace Teknik.Data public DbSet PodcastFiles { get; set; } public DbSet PodcastComments { get; set; } // Transparency - public DbSet Transactions { get; set; } public DbSet Takedowns { get; set; } // Url Shortener public DbSet ShortenedUrls { get; set; } @@ -115,9 +114,6 @@ namespace Teknik.Data // Takedowns modelBuilder.Entity().HasMany(t => t.Attachments).WithOne().HasForeignKey("Takedown_TakedownId"); // Legacy??? - // Transactions - modelBuilder.Entity().Property(t => t.Amount).HasColumnType("decimal(19, 5)"); - // Users modelBuilder.Entity().ToTable("Users"); modelBuilder.Entity().ToTable("InviteCodes"); @@ -152,7 +148,6 @@ namespace Teknik.Data modelBuilder.Entity().ToTable("PodcastComments"); modelBuilder.Entity().ToTable("PodcastTags"); // Transparency - modelBuilder.Entity().ToTable("Transactions"); modelBuilder.Entity().ToTable("Takedowns"); // Custom Attributes diff --git a/Teknik/Scripts/Error/Error.js b/Teknik/Scripts/Error/Error.js index 8eb908e..3082fbe 100644 --- a/Teknik/Scripts/Error/Error.js +++ b/Teknik/Scripts/Error/Error.js @@ -18,8 +18,7 @@ $(document).ready(function () { success: function(response) { if (response.result) { $("#top_msg").css('display', 'inline', 'important'); - $("#top_msg").html( - '
Thank you for your help! Feedback has been submitted.
'); + $("#top_msg").html('
Thank you for your help! Feedback has been submitted.
'); } else { $("#top_msg").css('display', 'inline', 'important'); $("#top_msg") diff --git a/Teknik/Views/Shared/_Navbar.cshtml b/Teknik/Views/Shared/_Navbar.cshtml index fab130c..96ae514 100644 --- a/Teknik/Views/Shared/_Navbar.cshtml +++ b/Teknik/Views/Shared/_Navbar.cshtml @@ -69,9 +69,6 @@
  •   Mail
    • -
  • -   Mumble -