From dadeb778c9f9a6aef2b347714b69174ca26f0551 Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Thu, 13 Oct 2016 20:18:40 -0500 Subject: [PATCH] Move mockups to subdir --- app/mockup.rb | 34 ++-- views/mockup/home.erb | 287 +++++++++++++++++++++++++++ views/mockup/profile.erb | 192 ++++++++++++++++++ views/mockup/stats.erb | 342 +++++++++++++++++++++++++++++++++ views/mockup/tutorial-c1p2.erb | 49 +++++ views/mockup/welcome.erb | 101 ++++++++++ 6 files changed, 988 insertions(+), 17 deletions(-) create mode 100644 views/mockup/home.erb create mode 100644 views/mockup/profile.erb create mode 100644 views/mockup/stats.erb create mode 100644 views/mockup/tutorial-c1p2.erb create mode 100644 views/mockup/welcome.erb diff --git a/app/mockup.rb b/app/mockup.rb index 5aab40b2..47e99936 100644 --- a/app/mockup.rb +++ b/app/mockup.rb @@ -1,37 +1,37 @@ # :nocov: -get '/home_mockup' do - erb :'home_mockup' +get '/mockup/home' do + erb :'mockup/home' end -get '/edit_mockup' do - erb :'edit_mockup' +get '/mockup/edit' do + erb :'mockup/edit' end -get '/profile_mockup' do +get '/mockup/profile' do require_login - erb :'profile_mockup', locals: {site: current_site} + erb :'mockup/profile', locals: {site: current_site} end -get '/browse_mockup' do - erb :'browse_mockup' +get '/mockup/browse' do + erb :'mockup/browse' end -get '/tips_mockup' do - erb :'tips_mockup' +get '/mockup/tips' do + erb :'mockup/tips' end -get '/welcome_mockup' do +get '/mockup/welcome' do require_login - erb :'welcome_mockup', locals: {site: current_site} + erb :'mockup/welcome', locals: {site: current_site} end -get '/stats_mockup' do +get '/mockup/stats' do require_login - erb :'stats_mockup', locals: {site: current_site} + erb :'mockup/stats', locals: {site: current_site} end -get '/tutorial_mockup_c1p2' do +get '/mockup/tutorial-c1p2' do require_login - erb :'tutorial_mockup_c1p2', locals: {site: current_site} + erb :'mockup/tutorial-c1p2', locals: {site: current_site} end -# :nocov: \ No newline at end of file +# :nocov: diff --git a/views/mockup/home.erb b/views/mockup/home.erb new file mode 100644 index 00000000..ae182b90 --- /dev/null +++ b/views/mockup/home.erb @@ -0,0 +1,287 @@ +
+
+
+

My Feed

+
All Activity Activity on your profile
+
+
+

My Website

+ Edit Site +
+
+
+ +
+
+
+ <% if false %> +
+

Welcome to your Neocities news feed!

+

You aren't following any websites yet! Once you do, updates will show up here and you can like and comment on them. Here are some website suggestions based on your tags, or check out all the sites on Neocities!

+
+ +
+
+ + + dragonquest + +
+ Games + Anime + Art + Cooking +
+ +
+
+ + + dragonquest + +
+ Games + Anime + Art +
+ +
+
+ + + dragonquest + +
+ Games + Anime +
+ +
+
+ + + dragonquest + +
+ Games +
+ +
+
+ + + dragonquest + +
+ Games + Anime +
+ +
+
+ + + dragonquest + +
+ Games +
+ <% end %> + + + + +
+
+
+ Foo commented on Derp's website: I really like your site, your graphics are awesome and... + 30m +
+
+
+
+
+ New sites in games3h +
+
+
+
+ + + dragonquest + +
+
+
+
+ + + dragonquest + +
+
+
+
+ + + dragonquest + +
+
+
+
+ + + dragonquest + +
+
+
+
+ + + +
+
+
+ You tipped Derp's website: Wow, great work here! Please keep updating :)Apr 23 +
+
+ +
+
+
+ Foo commented on Derp's website: I had a question - how did you make it so that the... + Apr 20 +
+
+ + + +
+
+
+ Derp made an update Apr 7 +
+
+
+
+
cssstyles.css
+
+
+
styles.css
+
+
+
jsstyles.css
+
+
+
cat.jpg
+
+
+
jsstyles.css
+
+
+
Like (1) Reply
+
+
+ +
+
+
+ Derpie + Apr 7 +
Your site is amazing. Very helpful information. Would love to see more updates if you have time. Your site is amazing. Very helpful information. Would love to see more updates if you have time.
+
+
+
Like (1) Reply
+
+
+ + victoria Indeed, it's great!Apr 7 +
Like (1)
+
+
+
+
+ +
+
+
+ Foo commented on Derp's website: I had a question - how did you make it so that the... + Apr 7 +
+
+ + + +
+
+
+ victoria tipped you .01 BTC + Apr 7 +
Hey, this looks great!
+
+
+
Like (1) Reply
+
+
+
+ +
+

http://<%= current_site.username %>.neocities.org

+
+
Last updated
<%= current_site.updated_at ? current_site.updated_at.ago : '' %>
+
+
<%= current_site.hits.to_s.reverse.gsub(/...(?=.)/,'\&,').reverse %> hits
+
24 followers
+
3 tips ($13.55)
+
+
+ + + +

Following

+
+ + + + + + + + + + + + + + +
+ +

Tags

+ Games + Anime + Art + Cooking + Games + Anime + Art + Cooking +
+
+
diff --git a/views/mockup/profile.erb b/views/mockup/profile.erb new file mode 100644 index 00000000..415b53bb --- /dev/null +++ b/views/mockup/profile.erb @@ -0,0 +1,192 @@ +
+
+ +
+

Derp's Website

+

http://<%= site.username %>.neocities.org

+
+
23.5K visitors
+
342 followers
+
7 tips
+
+
+ + Tip + +
+
+
+
+ +
+
+
+ +
+ + Post +
+ + + +
+
+
+ Derp tipped Foo's website: Wow, great work here! Please keep updating :)Apr 23 +
+
+ +
+
+
+ Derp commented on victoria's website: I had a question - how did you make it so that the... + Apr 20 +
+
+ + + +
+
+
+ Derp made an update Apr 7 +
+
+
+
+
cssstyles.css
+
+
+
styles.css
+
+
+
jsstyles.css
+
+
+
cat.jpg
+
+
+
jsstyles.css
+
+
+
Like (1) Reply
+
+
+ +
+
+
+ Foo + Apr 7 +
Your site is amazing. Very helpful information. Would love to see more updates if you have time. Your site is amazing. Very helpful information. Would love to see more updates if you have time.
+
+
+
Like (1) Reply
+
+
+ + victoria Indeed, it's great!Apr 7 +
Like (1)
+
+
+
+
+ +
+
+
+ Derp commented on Foo's website: I had a question - how did you make it so that the... + Apr 7 +
+
+ +
+
+
+ victoria tipped .01 BTC + Apr 7 +
Hey, this looks great!
+
+
+
Like (1) Reply
+
+
+ +
+ +
+

Website Stats

+
+
+ Last updated + + <% if site.updated_at.nil? %> + Just Created + <% else %> + <%= site.updated_at.ago.downcase %> + <% end %> + +
+
Total updates<%= site.changed_count %>
+
Created<%= site.created_at.strftime('%B %-d, %Y') %>
+
+ +

Archives

+
+ + + + + See all versions +
+ +

Following

+
+ + + + + + + + + + + + + + +
+ +

Tags

+ Games + Anime + Art + Cooking + Games + Anime + Art + Cooking + +
+ Report | Block +
+
+
+
\ No newline at end of file diff --git a/views/mockup/stats.erb b/views/mockup/stats.erb new file mode 100644 index 00000000..8c9a9c33 --- /dev/null +++ b/views/mockup/stats.erb @@ -0,0 +1,342 @@ + + +
+
+
+

Your Stats

+
+ <% if !@events.empty? && (site.followings_dataset.count > 0) %> + class="selected"<% end %>>All + class="selected"<% end %>>Profile Activity + <% end %> + Global Activity +
+
+
+

Your Site

+ Edit Site +
+
+
+ +
+
+
+
+
+ +
+

Latest Visitors

+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ San Francisco, CA + neocities.org + + 7:11PM + /index, /links, /art +
+ Portland, OR + Google search + + 7:11PM + /index +
+ London, UK + Twitter URL + + 7:11PM + /index, /about +
+ Hong Kong, China + Google search + + 7:11PM + /index, /links, /art, /music +
+ San Francisco, CA + Facebook URL + + 7:11PM - 4/27/15 + /index +
+ San Francisco, CA + neocities.org + + 7:11PM - 4/27/15 + /index, /links, /art, /music, /about +
+ Portland, OR + Google search + + 7:11PM - 4/27/15 + /index +
+ London, UK + Twitter URL + + 7:11PM - 4/27/15 + /index, /about +
+ Hong Kong, China + Google search + + 7:11PM - 4/27/15 + /index, /links, /art, /music, /tech, /about +
+ Hong Kong, China + Google search + + 7:11PM - 4/27/15 + /index, /links, /art, /music +
+
+
+ +

Last 7 Days

+

(Upgrade to see up to see stats for all time)

+ + + + +
+
+

Top Paths

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PathVisits
/130
/contact110
/art101
/about99
/links33
+ +

Top Locations

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
CityVisits
Portland, OR, USA22
Portland, OR, USA22
Portland, OR, USA22
Portland, OR, USA22
Portland, OR, USA22
+
+ +
+ +

Top Referrers

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ReferrerVisits
Google search22
Google search22
Google search22
Google search22
Google search22
+
+
+
+ +
+
+

<%= site.title %>

+
+
+ <% if site.updated_at %> + Last updated
<%= site.updated_at.ago %> + <% else %> + Your new website!
Start Building + <% end %> +
+
+
<%= site.views.format_large_number %> views
+ <% follows_count = site.follows_dataset.count %> +
<%= follows_count.format_large_number %> follower<%= follows_count == 1 ? '' : 's' %>
+
+
+
+ + + +
+ Profile + '> Share +
+ + <%== erb :'_follows', layout: false, locals: {site: site, is_current_site: site == current_site} %> + + <%== erb :'_tags', layout: false, locals: {site: site, is_current_site: site == current_site} %> +
+
+
+
+ + + + \ No newline at end of file diff --git a/views/mockup/tutorial-c1p2.erb b/views/mockup/tutorial-c1p2.erb new file mode 100644 index 00000000..bda3d8dd --- /dev/null +++ b/views/mockup/tutorial-c1p2.erb @@ -0,0 +1,49 @@ +
+
+
+

Chapter 1

+

Page 2/10

+
+
+ All you need to build your first site is a computer language called HTML. +
+
+ And here's some HTML, right in this box! Let's make a change. Replace Hello World with Victoria's Website, and click save! +
+
+ You'll see the results of your site here. +
+
+ Make sure to check the green boxes below for important bonus info! +
+
+ +
+

Opening and Closing Tags

+

HTML is just a bunch of tags. There's usually an opening tag and a closing tag, with content between them like this:

+ + 
tag Content visible on your site /tag
+ +

Don't worry if this seems confusing - you'll get the hang of it after a few more examples! If you ever get stuck, click the Help link below.

+
+
+ +
+ +

HTML

+ + +

Site Preview

+
+
+
+
+
\ No newline at end of file diff --git a/views/mockup/welcome.erb b/views/mockup/welcome.erb new file mode 100644 index 00000000..da47c389 --- /dev/null +++ b/views/mockup/welcome.erb @@ -0,0 +1,101 @@ +
+

Welcome to Neocities, <%= current_site.username %>!

+

Free accounts will always be free and ad-free. +You can support our quest to bring back the creative, independent web by upgrading to the Supporter Plan.

+ +
+
+
+
+

Free Plan

+
+
+
$<%= Site::PLAN_FEATURES[:free][:price] %>
+
per month
+ +
    +
  • <%= Site::PLAN_FEATURES[:free][:space].to_space_pretty %> storage
    • +
  • <%= Site::PLAN_FEATURES[:free][:bandwidth].to_space_pretty %> bandwidth
    • +
+
+
+
+ Continue +
+
+ +
+
+
+

Supporter Plan

+
+
+ <% if parent_site && parent_site.legacy_supporter? %> +
$<%= Site::LEGACY_SUPPORTER_PRICES[parent_site[:plan_type].to_sym] %>
+
per month, billed annually
+ <% else %> +
$<%= Site::PLAN_FEATURES[:supporter][:price] %>
+
per month
+ <% end %> + +
    +
  • <%= Site::PLAN_FEATURES[:supporter][:space].to_space_pretty %> storage
    • +
  • 1000 GB bandwidth
    • +
+ +
    +
  • No File Upload Type Restrictions
    • +
  • Unlimited Site Creation
    • +
  • Custom Domain Support
    • +
  • Remote Filesystem Support
    • +
  • Custom SSL Certs (coming soon)
    • +
+
+ +
+

To upgrade, enter your credit card info below:

+
+
+ +
+ +
+ Upgrade for + <% if parent_site && parent_site.legacy_supporter? %> + $<%= Site::LEGACY_SUPPORTER_PRICES[parent_site[:plan_type].to_sym] %> + <% else %> + $<%= Site::PLAN_FEATURES[:supporter][:price] %> + <% end %>/mo + + or pay with PayPal or Bitcoin +
+
+
+ +
+
+

Powered by supporters like you

+

Neocities will never sell your personal data or embed advertising on member sites. Instead, we are funded directly by our community through supporter plans and donations. This allows us to base all our decisions on making the best possible web building experience for you, rather than on appeasing ad companies.

+
+ + +
+

Risk-free and secure

+

You can downgrade back to a free account at any time on the plan page. If you do, we’ll refund the amount you didn’t use.

+ +

We use Stripe and PayPal for payments, and never store your credit card information directly.

+
+
+ +
+
+

Making a better web

+

Maybe something about our goals to 1. bring back the creative web and 2. give a diverse group of people a welcoming place to learn coding skills...

+
+ +
+

Giving back

+

Maybe something about open source...

+
+
+
\ No newline at end of file