diff --git a/models/site.rb b/models/site.rb index aed76fbb..3fc817a3 100644 --- a/models/site.rb +++ b/models/site.rb @@ -78,8 +78,9 @@ class Site < Sequel::Model PLAN_FEATURES = { fatcat: { name: 'Fat Cat', - space: Filesize.from('100GB').to_i, - bandwidth: Filesize.from('2TB').to_i, + space: Filesize.from('50GB').to_i, + bandwidth: Filesize.from('3TB').to_i, + price: 10, custom_domains: true, custom_ssl_certificates: true, global_cdn: true, @@ -97,13 +98,15 @@ class Site < Sequel::Model PLAN_FEATURES[:catbus] = PLAN_FEATURES[:fatcat].merge( name: 'Cat Bus', space: Filesize.from('10GB').to_i, - bandwidth: Filesize.from('500GB').to_i + bandwidth: Filesize.from('1TB').to_i, + price: 5 ) PLAN_FEATURES[:supporter] = PLAN_FEATURES[:catbus].merge( name: 'Supporter', space: Filesize.from('1GB').to_i, - bandwidth: Filesize.from('100GB').to_i, + bandwidth: Filesize.from('0.5TB').to_i, + price: 2, unlimited_site_creation: false, custom_ssl_certificates: false, no_file_restrictions: false @@ -111,8 +114,9 @@ class Site < Sequel::Model PLAN_FEATURES[:free] = PLAN_FEATURES[:supporter].merge( name: 'Free', - space: Filesize.from('30MB').to_i, - bandwidth: Filesize.from('10GB').to_i, + space: Filesize.from('20MB').to_i, + bandwidth: Filesize.from('100GB').to_i, + price: 0, custom_domains: false, global_cdn: false, ddos_mitigation: false, diff --git a/views/index.erb b/views/index.erb index d0b78e57..8afdc97c 100644 --- a/views/index.erb +++ b/views/index.erb @@ -120,24 +120,23 @@
-

Introducing the New Neocities

-

Now’s a great time to join our community of over - <%= @sites_count.to_s.reverse.gsub(/...(?=.)/,'\&,').reverse %> websites! - You get <%= Site::FREE_MAXIMUM.to_space_pretty %> of free web space to make whatever you’d like. +

Make your own web site, and discover new ones.

+

+ Neocities is a community of over <%= @sites_count.to_s.reverse.gsub(/...(?=.)/,'\&,').reverse %> websites that are bringing back creative expression on the web. Anyone can make a site, only your imagination is required. You get <%= Site::FREE_MAXIMUM.to_space_pretty %> of free web space to make whatever you’d like. Join us!

@@ -236,26 +235,39 @@
-

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce dapibus semper magna id euismod. Vivamus rutrum ultricies.

+

Forget throwaway social network apps. Let's make the internet fun again. It's time to bring back web surfing!

-

You own your own site

-

We support custom domains (yoursite.com) for free. This means you always control the content on your site, and you can move it to/from Neocities whenever you want. And of course, all sites still get a subdomain (sitename.neocities.org) for free.

- -

Developer tools

-

We now have powerful APIs for developers building applications, and support for remote file uploading via command line tools. Using WebDAV, you can now mount your site to your computer, just like Dropbox.

+

You own your site

+

Sites hosted by Neocities are owned by you, not us. And we support custom domains (yoursite.com) for free. This means you always control the content on your site, and you can move it to/from Neocities whenever you want. And of course, all sites still get a subdomain (sitename.neocities.org) for free.

-
-

More space, more performance

-

Neocities now uses a distributed, globally-cached file system in tier-1 datacenters to serve your sites. It's a system that took us a year to build - and it's ready to serve your site with blazing speed, whether it's your personal home page, or your professional site. Go ahead, put your site on Neocities. We can handle it.

+

More space, more performance

+

Neocities now uses distributed, globally-cached web servers in datacenters all over the world to serve your site. It's a advanced system that took us a year to build - and it's ready to serve your site with blazing speed, whether it's your personal home page, or your professional site. Go ahead, put your site on Neocities. We can handle it.

- -
-

Encrypted everything

-

Neocities now secures serving all your content with Snowden-grade cryptography, by default, preventing snoops, whether they are hackers or rogue government agencies, from seeing what you browse. And we're working on letting you use your own SSL (HTTPS) certificates for custom domains. - Until January, Neocities will donate 5% of all Supporter plan proceeds to the Courage Foundation, an international organization that supports those who risk life or liberty to disclose privacy abuses online.

+
+

SSL encryption support

+

Neocities now serves all your content with Snowden-grade SSL cryptography, by default, preventing snoops from seeing what you browse. + + Until January, Neocities will donate 5% of all Supporter plan proceeds to the Courage Foundation, an international organization that supports those who risk life or liberty to disclose privacy abuses online.

+
+
+ +
+
+

Developer tools

+

We now have powerful APIs for developers building applications, and support for remote file uploading via command line tools. Using our new WebDAV support, you can mount your site to your computer, just like Dropbox.

+
+ +
+

Open Source, Open Company, Open Ethics

+

Neocities is a member of the Open Company Initative, working to help improve trust in tech startups. We publish the code that powers the site, and keep open records for everyone to inspect. And if someone sends a bad takedown request, we fight it. We want to win your trust - not lock you in.

+
+ +
+

No marketing or advertising, ever

+

Neocities does not sell your personal data, or put ads on your site. In fact, we're prohibited from doing that in our own Terms of Service. We want to make a living the old fashioned way - by helping you be awesome.

@@ -268,6 +280,10 @@
<%== erb :'plan/_pricing' %> + +
+

What are you waiting for? Start building your web site!

+