From 5b81b5fc973dd03a3fbb1accd413b51f05afdcaa Mon Sep 17 00:00:00 2001
From: Kyle Drake <kyle@kyledrake.net>
Date: Fri, 7 Jul 2017 13:05:43 -0700
Subject: [PATCH] raise supporter space to 50GB, BW to 3TB. Compare cleanups

---
 app/supporter.rb             |  4 ++--
 models/site.rb               | 11 +++++------
 views/supporter/_compare.erb | 15 +++++++++++----
 views/welcome.erb            | 10 +++++-----
 4 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/app/supporter.rb b/app/supporter.rb
index cc259344..7e959ba0 100644
--- a/app/supporter.rb
+++ b/app/supporter.rb
@@ -79,8 +79,8 @@ post '/supporter/update' do
         self, {
           username:   site.username,
           plan_name:  Site::PLAN_FEATURES[params[:plan_type].to_sym][:name],
-          plan_space: Site::PLAN_FEATURES[params[:plan_type].to_sym][:space].to_space_pretty,
-          plan_bw:    Site::PLAN_FEATURES[params[:plan_type].to_sym][:bandwidth].to_space_pretty
+          plan_space: Site::PLAN_FEATURES[params[:plan_type].to_sym][:space].pretty,
+          plan_bw:    Site::PLAN_FEATURES[params[:plan_type].to_sym][:bandwidth].pretty
       })
     )
   end
diff --git a/models/site.rb b/models/site.rb
index b009d81d..ace36768 100644
--- a/models/site.rb
+++ b/models/site.rb
@@ -103,8 +103,8 @@ class Site < Sequel::Model
 
   PLAN_FEATURES[:supporter] = {
     name: 'Supporter',
-    space: Filesize.from('20GB').to_i,
-    bandwidth: Filesize.from('2TB').to_i,
+    space: Filesize.from('50GB'),
+    bandwidth: Filesize.from('3TB'),
     price: 5,
     unlimited_site_creation: true,
     custom_ssl_certificates: true,
@@ -115,8 +115,8 @@ class Site < Sequel::Model
 
   PLAN_FEATURES[:free] = PLAN_FEATURES[:supporter].merge(
     name: 'Free',
-    space: Filesize.from('1GB').to_i,
-    bandwidth: Filesize.from('200GB').to_i,
+    space: Filesize.from('1GB'),
+    bandwidth: Filesize.from('200GB'),
     price: 0,
     unlimited_site_creation: false,
     custom_ssl_certificates: false,
@@ -789,7 +789,6 @@ class Site < Sequel::Model
 
       Dir.glob("#{base_files_path}/**/*").each do |path|
         relative_path = path.gsub(base_files_path+'/', '')
-        puts "adding #{relative_path}"
         if File.directory?(path)
           ar.add_dir(zip_name+'/'+relative_path)
         else
@@ -1173,7 +1172,7 @@ class Site < Sequel::Model
   end
 
   def maximum_space
-    plan_space = PLAN_FEATURES[(parent? ? self : parent).plan_type.to_sym][:space]
+    plan_space = PLAN_FEATURES[(parent? ? self : parent).plan_type.to_sym][:space].to_i
 
     return custom_max_space if custom_max_space > plan_space
 
diff --git a/views/supporter/_compare.erb b/views/supporter/_compare.erb
index ddb71755..fb33bcca 100644
--- a/views/supporter/_compare.erb
+++ b/views/supporter/_compare.erb
@@ -13,15 +13,15 @@
     <td class="feature-column">
       <span data-original-title="How much disk space you can use for your site. More space means you can upload more files.">Storage</span>
     </td>
-    <td><%= Site::PLAN_FEATURES[:free][:space].to_gigabytes_pretty %></td>
-    <td><%= (Site::PLAN_FEATURES[:supporter][:space]).to_gigabytes_pretty %></td>
+    <td><%= Site::PLAN_FEATURES[:free][:space].to_f('GB').round %> GB</td>
+    <td><%= Site::PLAN_FEATURES[:supporter][:space].to_f('GB').round %> GB</td>
   </tr>
   <tr>
     <td class="feature-column">
       <span data-original-title="How much content you can serve in one month. Don’t worry—these are soft limits. Temporary surges are fine, we won't take your site down automatically, and we're very flexible.">Bandwidth</span>
     </td>
-    <td><%= Site::PLAN_FEATURES[:free][:bandwidth].to_gigabytes_pretty %></td>
-    <td><%= Site::PLAN_FEATURES[:supporter][:bandwidth].to_gigabytes_pretty %></td>
+    <td><%= Site::PLAN_FEATURES[:free][:bandwidth].to_f('GB').round %> GB</td>
+    <td><%= Site::PLAN_FEATURES[:supporter][:bandwidth].to_f('GB').round %> GB</td>
   </tr>
   <tr>
     <td class="feature-column">
@@ -93,6 +93,13 @@
     <td><i class="fa fa-check"></i></td>
     <td><i class="fa fa-check"></i></td>
   </tr>
+  <tr>
+    <td class="feature-column">
+      <span data-original-title="Our command line tool allows you to easily upload sites from a console.">CLI tool</span>
+    </td>
+    <td><i class="fa fa-check"></i></td>
+    <td><i class="fa fa-check"></i></td>
+  </tr>
   <!--
   <tr>
     <td class="feature-column">Site Tipping (Coming Soon)</td>
diff --git a/views/welcome.erb b/views/welcome.erb
index 72c0a540..ce99dcf1 100644
--- a/views/welcome.erb
+++ b/views/welcome.erb
@@ -28,8 +28,8 @@
             <div class="price">$<%= Site::PLAN_FEATURES[:free][:price] %></div>
 
             <ul class="main-features">
-              <li><strong><%= Site::PLAN_FEATURES[:free][:space].to_space_pretty %></strong> <span data-original-title="How much space you have to upload files. The more space, the bigger your site can be.">storage</span></li>
-              <li><strong><%= Site::PLAN_FEATURES[:free][:bandwidth].to_space_pretty %></strong> <span data-original-title="How much traffic can visit your site. This is a soft limit. Temporary surges are fine, we won't take your site down automatically, and we're very flexible.">bandwidth</span></li>
+              <li><strong><%= Site::PLAN_FEATURES[:free][:space].to_f('GB').round %> GB</strong> <span data-original-title="How much space you have to upload files. The more space, the bigger your site can be.">storage</span></li>
+              <li><strong><%= Site::PLAN_FEATURES[:free][:bandwidth].to_f('GB').round %> GB</strong> <span data-original-title="How much traffic can visit your site. This is a soft limit. Temporary surges are fine, we won't take your site down automatically, and we're very flexible.">bandwidth</span></li>
             </ul>
           </div>
         </div>
@@ -55,13 +55,13 @@
             <% end %>
 
             <ul class="main-features">
-              <li><strong><%= (Site::PLAN_FEATURES[:supporter][:space] / (10**6)).to_comma_separated %> MB</strong> <span data-original-title="Much more disk space, so you can build a much bigger web site.">storage</span></li>
-              <li><strong><%= Site::PLAN_FEATURES[:supporter][:bandwidth].to_bytes_pretty %></strong> <span data-original-title="Tons of bandwidth to serve your site, powered by our high-quality network of servers. This is a soft limit. Temporary surges are fine, we won't take your site down automatically, and we're very flexible.">bandwidth</span></li>
+              <li><strong><%= Site::PLAN_FEATURES[:supporter][:space].to_f('GB').round %> GB</strong> <span data-original-title="Much more disk space, so you can build a much bigger web site.">storage</span></li>
+              <li><strong><%= Site::PLAN_FEATURES[:supporter][:bandwidth].to_f('GB').round %> GB</strong> <span data-original-title="Tons of bandwidth to serve your site, powered by our global Anycast CDN. This is a soft limit. Temporary surges are fine, we won't take your site down automatically, and we're very flexible.">bandwidth</span></li>
             </ul>
 
             <ul>
               <li><span data-original-title="Free plans don't allow uploading music, video, compressed, and executable files to prevent piracy. With a supporter plan, you can upload anything you want.">No File Upload Type Restrictions</span></li>
-              <li><span data-original-title="Make as many sites as you want with one account, and easily switch between them.">Unlimited Site Creation</span></li>
+              <li><span data-original-title="Make as many sites as you want, and control them with one account.">Multiple Site Creation</span></li>
               <li><span data-original-title="Add your domain name (yoursite.com) to your site!">Custom Domain Support</span></li>
               <li><span data-original-title="With WebDAV, you can mount your Neocities site to your computer as a hard drive, making it easy to update with your favorite HTML editor.">Remote Filesystem Support</span></li>
             </ul>