zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-08-05 09:11:28 +02:00
Code Issues Projects Releases Packages Wiki Activity

wrangle between surf and browse context

Browse source
This commit is contained in:
Kyle Drake 2014-10-20 17:03:37 -07:00
parent 9d9c1c4495
commit f6a6df6c86
4 changed files with 84 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

26
app.rb
View file

@ -376,7 +376,7 @@ get '/tags/autocomplete/:name.json' do |name|
Tag.autocomplete(name).collect {|t| t[:name]}.to_json
end
get '/browse/?' do
def browse_sites_dataset
@current_page = params[:current_page]
@current_page = @current_page.to_i
@current_page = 1 if @current_page == 0
@ -397,13 +397,13 @@ get '/browse/?' do
case params[:sort_by]
when 'hits'
site_dataset.order!(:hits.desc)
site_dataset.order!(:hits.desc, :updated_at.desc)
when 'views'
site_dataset.order!(:views.desc)
site_dataset.order!(:views.desc, :updated_at.desc)
when 'newest'
site_dataset.order!(:created_at.desc)
site_dataset.order!(:created_at.desc, :views.desc)
when 'oldest'
site_dataset.order!(:created_at)
site_dataset.order!(:created_at, :views.desc)
when 'random'
site_dataset.where! 'random() < 0.01'
when 'last_updated'
@ -412,7 +412,7 @@ get '/browse/?' do
else
if params[:tag]
params[:sort_by] = 'views'
site_dataset.order!(:views.desc)
site_dataset.order!(:views.desc, :updated_at.desc)
else
params[:sort_by] = 'last_updated'
site_dataset.order!(:updated_at.desc, :views.desc)
@ -427,12 +427,26 @@ get '/browse/?' do
site_dataset.where! ['tags.is_nsfw = ?', (params[:is_nsfw] == 'true' ? true : false)]
end
site_dataset
end
get '/browse/?' do
site_dataset = browse_sites_dataset
site_dataset = site_dataset.paginate @current_page, 300
@page_count = site_dataset.page_count || 1
@sites = site_dataset.all
erb :browse
end
get '/surf/?' do
site_dataset = browse_sites_dataset
site_dataset = site_dataset.paginate @current_page, 1
@page_count = site_dataset.page_count || 1
@site = site_dataset.first
redirect "/browse?#{Rack::Utils.build_query params}" if @site.nil?
erb :'surf', layout: false
end
get '/surf/:username' do |username|
@site = Site.select(:id, :username, :title, :domain, :views).where(username: username).first
@title = @site.title