Browse Source

Modified Terms of Service and About page to include Premium Accounts

tags/2.0.6
Teknikode 3 years ago
parent
commit
5bab89b884

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

@@ -2,6 +2,11 @@

@using Teknik.Utilities

@{
string lifetimeAccount = "The account will not get deleted for inactivity as defined in the ToS";
string apiAccountAccess = "Passing user credentials allows linking for Uploads/Pastes/Shortened URLs and other account specific features";
}

<div class="container">
<div class="row">
<div class="col-ms-12">
@@ -13,27 +18,158 @@
<p>
You can view our complete activity and statistics by visiting the <a href="@Url.SubRouteUrl("transparency", "Transparency.Index")">Transparency</a> page.
</p>
<h2 class="text-center">What we Offer</h2>
<hr>
<h2 class="text-center">Comparison of Features</h2>
<br />
<div class="row">
<div class="col-sm-4 col-sm-offset-2 text-center">
<h4><a href="@Url.SubRouteUrl("paste", "Paste.Index")">Fast and Secure Pastebin</a></h4>
<h4><a href="@Url.SubRouteUrl("upload", "Upload.Index")">Encrypted File Uploads</a></h4>
<h4><a href="@Url.SubRouteUrl("help", "Help.Mail")">Free Email Address</a></h4>
<h4><a href="@Url.SubRouteUrl("help", "Help.API")">Easy to Use API</a></h4>
<h4><a href="@Url.SubRouteUrl("git", "Git.Index")">Personal Git Repositories</a></h4>
<div class="col-sm-10 col-sm-offset-1">
<table class="table table-bordered">
<!-- Heading -->
<tr>
<th class="text-center"></th>
<th class="text-center">Premium Account</th>
<th class="text-center">Basic Account</th>
<th class="text-center">No Account</th>
</tr>
<!-- Prices -->
<tr>
<td class="text-left"><b>Features</b></td>
<td class="text-center">$5 One-Time Fee</td>
<td class="text-center">Free</td>
<td class="text-center">Free</td>
</tr>
<!-- Premium Features -->
<tr>
<td class="text-left"><span data-toggle="tooltip" data-placement="top" title="@lifetimeAccount">Lifetime Account <small>*</small></span></td>
<td class="text-center"><i class="fa fa-check fa-2x text-success"></i></td>
<td class="text-center"><i class="fa fa-times fa-2x text-danger"></i></td>
<td class="text-center"><i class="fa fa-times fa-2x text-danger"></i></td>
</tr>
<tr>
<td class="text-left">Email Storage</td>
<td class="text-center">5GB Storage</td>
<td class="text-center">1GB Storage</td>
<td class="text-center"><i class="fa fa-times fa-2x text-danger"></i></td>
</tr>
<tr>
<td class="text-left">Outbound Emails</td>
<td class="text-center">Unlimited</td>
<td class="text-center">100 per Day</td>
<td class="text-center"><i class="fa fa-times fa-2x text-danger"></i></td>
</tr>
<tr>
<td class="text-left">Max Upload Filesize</td>
<td class="text-center">@StringHelper.GetBytesReadable(Model.Config.UploadConfig.MaxUploadSize * 2)</td>
<td class="text-center">@StringHelper.GetBytesReadable(Model.Config.UploadConfig.MaxUploadSize)</td>
<td class="text-center">@StringHelper.GetBytesReadable(Model.Config.UploadConfig.MaxUploadSize)</td>
</tr>
<!-- Basic Features -->
<tr>
<td class="text-left">Email Account</td>
<td class="text-center"><i class="fa fa-check fa-2x text-success"></i></td>
<td class="text-center"><i class="fa fa-check fa-2x text-success"></i></td>
<td class="text-center"><i class="fa fa-times fa-2x text-danger"></i></td>
</tr>
<tr>
<td class="text-left">Git Repositories</td>
<td class="text-center">Unlimited Public &amp; Private Repos</td>
<td class="text-center">Unlimited Public &amp; Private Repos</td>
<td class="text-center"><i class="fa fa-times fa-2x text-danger"></i></td>
</tr>
<tr>
<td class="text-left">Personal Blog</td>
<td class="text-center"><i class="fa fa-check fa-2x text-success"></i></td>
<td class="text-center"><i class="fa fa-check fa-2x text-success"></i></td>
<td class="text-center"><i class="fa fa-times fa-2x text-danger"></i></td>
</tr>
<tr>
<td class="text-left">Vault Editing</td>
<td class="text-center"><i class="fa fa-check fa-2x text-success"></i></td>
<td class="text-center"><i class="fa fa-check fa-2x text-success"></i></td>
<td class="text-center"><i class="fa fa-times fa-2x text-danger"></i></td>
</tr>
<tr>
<td class="text-left">
View Content History:
<br />
<ul>
<li>Pastes</li>
<li>Uploads</li>
<li>Shortened URLs</li>
<li>Vaults</li>
</ul>
</td>
<td class="text-center"><i class="fa fa-check fa-2x text-success"></i></td>
<td class="text-center"><i class="fa fa-check fa-2x text-success"></i></td>
<td class="text-center"><i class="fa fa-times fa-2x text-danger"></i></td>
</tr>
<!-- No Account Features -->
<tr>
<td class="text-left">Pastebin</td>
<td class="text-center"><i class="fa fa-check fa-2x text-success"></i></td>
<td class="text-center"><i class="fa fa-check fa-2x text-success"></i></td>
<td class="text-center"><i class="fa fa-check fa-2x text-success"></i></td>
</tr>
<tr>
<td class="text-left">File Uploads</td>
<td class="text-center"><i class="fa fa-check fa-2x text-success"></i></td>
<td class="text-center"><i class="fa fa-check fa-2x text-success"></i></td>
<td class="text-center"><i class="fa fa-check fa-2x text-success"></i></td>
</tr>
<tr>
<td class="text-left">Url Shortening</td>
<td class="text-center"><i class="fa fa-check fa-2x text-success"></i></td>
<td class="text-center"><i class="fa fa-check fa-2x text-success"></i></td>
<td class="text-center"><i class="fa fa-check fa-2x text-success"></i></td>
</tr>
<tr>
<td class="text-left">Vault Creation</td>
<td class="text-center"><i class="fa fa-check fa-2x text-success"></i></td>
<td class="text-center"><i class="fa fa-check fa-2x text-success"></i></td>
<td class="text-center"><i class="fa fa-check fa-2x text-success"></i></td>
</tr>
<tr>
<td class="text-left">Technical Podcasts</td>
<td class="text-center"><i class="fa fa-check fa-2x text-success"></i></td>
<td class="text-center"><i class="fa fa-check fa-2x text-success"></i></td>
<td class="text-center"><i class="fa fa-check fa-2x text-success"></i></td>
</tr>
<tr>
<td class="text-left">Mumble Server</td>
<td class="text-center"><i class="fa fa-check fa-2x text-success"></i></td>
<td class="text-center"><i class="fa fa-check fa-2x text-success"></i></td>
<td class="text-center"><i class="fa fa-check fa-2x text-success"></i></td>
</tr>
<tr>
<td class="text-left">IRC Server</td>
<td class="text-center"><i class="fa fa-check fa-2x text-success"></i></td>
<td class="text-center"><i class="fa fa-check fa-2x text-success"></i></td>
<td class="text-center"><i class="fa fa-check fa-2x text-success"></i></td>
</tr>
<tr>
<td class="text-left"><span data-toggle="tooltip" data-placement="top" title="@apiAccountAccess">Service API <small>**</small></span></td>
<td class="text-center"><i class="fa fa-check fa-2x text-success"></i></td>
<td class="text-center"><i class="fa fa-check fa-2x text-success"></i></td>
<td class="text-center"><i class="fa fa-check fa-2x text-success"></i></td>
</tr>
</table>
</div>
<div class="col-sm-4 text-center">
<h4><a href="@Url.SubRouteUrl("blog", "Blog.Blog")">Personal Blog</a></h4>
<h4><a href="@Url.SubRouteUrl("podcast", "Podcast.Index")">Entertaining Podcasts</a></h4>
<h4><a href="@Url.SubRouteUrl("help", "Help.Mumble")">Mumble Server</a></h4>
<h4><a href="@Url.SubRouteUrl("transparency", "Transparency.Index")">Full Transparency</a></h4>
<h4><a href="@Url.SubRouteUrl("git", "Git.Index", new { username = "Teknikode", repository = "Teknik" })">Completely Open Source</a></h4>
</div>
<div class="row">
<div class="col-sm-10 col-sm-offset-1">
<p>
<small>
* @lifetimeAccount
<br />
** @apiAccountAccess
</small>
</p>
</div>
</div>

<h2 class="text-center">How can I help?</h2>
<hr>
<h2 class="text-center">How can I help?</h2>
<br />
<p>
Teknik's source code can be located on our <a href="https://git.teknik.io/Teknikode/">Git Repository</a> as well as all our internal tools and projects.
<br />

+ 50
- 8
Teknik/Areas/TOS/Views/TOS/Index.cshtml View File

@@ -7,23 +7,65 @@
<p>
Below are the terms of service for the Teknik Services. By using our services, you agree to all of the below.
</p>
<h3>User Accounts</h3>
<ul>
<li>No illegal content as defined by United States law. If you are viewing content, be mindful of the laws in your region.</li>
<li>Any Malware uploads or otherwise hosted/linked content will be removed without notice.</li>
<li>Email is limited to a maximum of 100 outbound email messages per day. This is to prevent spam accounts. If your account is flagged as spamming, it will be deleted without notice.</li>
<li>Copyrighted content will be removed only after a valid DMCA is recieved and verified.</li>
<li>Inactive Accounts with no data will be deleted after 365 days (1 Year).
<li>You will not display or host links to Malware in your user profile</li>
<li>Inactive Basic Accounts with no data will be deleted after 365 days (1 Year)
<ul>
<li>Activity is defined as logging into the Teknik Website, into the Git website, into the mail service (Either through webmail or via another client), or Modifying/Adding a Git Repository.</li>
<li>Data is defined as Blog Posts/Comments, Podcast Comments, Emails, and Git Repositories.</li>
<li>Activity is defined as logging into the Teknik Website, into the Git website, into the mail service (Either through webmail or via another client), or Modifying/Adding a Git Repository</li>
<li>Data is defined as Blog Posts/Comments, Podcast Comments, Emails, and Git Repositories</li>
</ul>
</li>
</ul>
<h3>Premium Accounts</h3>
<ul>
<li>Puchasing a Premium Account will apply the benifits to a single account for the lifetime of the account</li>
<li>If benifits are added for purchasing a Premium Account, all existing Premium Accounts will inherit the new benifits</li>
<li>Premium Account benifits may change at any time</li>
<li>Any benifits applied to an account will stay for the lifetime of the account</li>
</ul>
<h3>Refund Policy</h3>
<ul>
<li>You may recieve a full refund within 10 days of purchase</li>
<li>You may only request a refund once per account</li>
<li>The price for a Premium Account can change at any time. You will not recieve a refund for the change in price</li>
<li>If the account is terminated for breaching the Terms of Service, no refund will be available</li>
<li>If a refund is given, all benifits for an account will be removed to match the current Basic Account level</li>
</ul>
<h3>Email</h3>
<ul>
<li>Email is limited to a maximum of 100 outbound email messages per day. This is to prevent spam accounts. If your account is flagged as spamming, it will be deleted without notice.</li>
<li>Premium Accounts are allowed unlimited outbound email messages, but need to follow the same policy of no spam.</li>
</ul>
<h3>Uploads</h3>
<ul>
<li>No illegal content as defined by United States law. If you are viewing content, be mindful of the laws in your region</li>
<li>Any Malware uploads will be removed without notice</li>
<li>Copyrighted content will be removed only after a valid DMCA is recieved and verified</li>
</ul>
<h3>Pastebin</h3>
<ul>
<li>Copyrighted content will be removed only after a valid DMCA is recieved and verified</li>
</ul>
<h3>Shortened URLs</h3>
<ul>
<li>No linking to Phishing Sites or Malware</li>
</ul>
</div>
</div>
<div class="row">
<div class="col-xs-10">
<p><i>Last Modified May 19, 2016</i></p>
@{
string gitHost = Model.Config.GitConfig.Host;
string gitFullUrl = string.Empty;
if (!string.IsNullOrEmpty(gitHost))
{
Uri gitUrl = new Uri(gitHost);
gitUrl = new Uri(gitUrl, "Teknikode/Teknik/commits/master/Teknik/Areas/TOS/Views/TOS/Index.cshtml");
gitFullUrl = gitUrl.ToString();
}
}
<p><i>Last Modified February 16, 2017 - <a href="@gitFullUrl">View History</a></i></p>
</div>
</div>
</div>

+ 3
- 0
Teknik/Scripts/Common.js View File

@@ -1,6 +1,9 @@
$(document).ready(function () {
$("#top_msg").css('display', 'none', 'important');

// Opt-in for tooltips
$('[data-toggle="tooltip"]').tooltip();

$('#loginButton').removeClass('hide');

$('#loginModal').on('shown.bs.modal', function (e) {

Loading…
Cancel
Save