joshua/dash-docs
1
0
Fork 0
mirror of https://github.com/seigler/dash-docs synced 2025-07-27 01:36:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #332 from bitcoin/meetups

Browse source 
Display meetups on the events map
This commit is contained in:
saivann 2014-03-02 09:33:39 -05:00
commit 4609ccd9aa
7 changed files with 151 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

1
_less/screen.less
View file

@ -1089,6 +1089,7 @@ h2 .rssicon{
.eventmap{
height:400px;
margin-bottom:25px;
}
.summary{

19
_plugins/contributors.rb
View file

@ -1,6 +1,6 @@
#contributors.rb fetches Bitcoin-Qt contributors list and set
#site.project.contributors array. This is later used to
#display the list of contributors on the "Development" page.
#site.contributors array. This is later used to display the
#list of contributors on the "Development" page.
require 'open-uri'
require 'json'
@ -40,19 +40,18 @@ module Jekyll
def generate(site)
class << site
attr_accessor :primary_devs, :contributors
attr_accessor :contributors
alias contrib_site_payload site_payload
def site_payload
result = super
result['site']['project'] = {
"primary_devs" => self.primary_devs,
"contributors" => self.contributors
}
result
h = contrib_site_payload
payload = h["site"]
payload["contributors"] = self.contributors
h["site"] = payload
h
end
end
site.primary_devs = JSON.parse(open("https://api.github.com/repos/bitcoin/bitcoin/collaborators","User-Agent"=>"Ruby/#{RUBY_VERSION}").read)
site.contributors = merge_contributors(fetch_contributors(), site.config['aliases']).sort_by{|c| - c['contributions']}
end

154
_plugins/events.rb
View file

@ -1,46 +1,140 @@
#events.rb generates blank hidden event pages using files
#in _events and assign them the 'event' category.
#This is later used to loop through site.pages in order
#to display the event's list in chronological order, both
#on the events RSS file and translated events pages.
#events.rb set site.conferences and site.meetups arrays based
#on events in _events/ and meetups on bitcoin.meetups.com .
#This is later used to populate the events map and display the
#list in chronological order, in the RSS file and events pages.
require 'open-uri'
require 'json'
require 'date'
require 'yaml'
require 'cgi'
module Jekyll
class EventPage < Page
def initialize(site, base, srcdir, src, dstdir, dst, date)
@site = site
@base = base
@dir = '/'+dstdir
@name = dst
self.process(dst)
self.read_yaml(File.join(base, srcdir), src)
self.data['date'] = date
self.data['category'] = 'event'
# Get longitude / latitude from Google Geocoding API
self.data['geoloc'] = 'false'
address = CGI::escape(self.data['address'] + ', ' +self.data['city'] + ', ' + self.data['country'])
geoloc = JSON.parse(open("https://maps.googleapis.com/maps/api/geocode/json?address=" + address + "&sensor=false","User-Agent"=>"Ruby/#{RUBY_VERSION}").read)
if geoloc['status'] == 'OK'
self.data['geoloc'] = geoloc['results'][0]['geometry']['location']['lat'].to_s + ", " + geoloc['results'][0]['geometry']['location']['lng'].to_s
end
end
end
class EventPageGenerator < Generator
def generate(site)
def meetups
meetups = []
# Call Meetup API with a key-signed request
begin
data = JSON.parse(open("http://api.meetup.com/2/open_events?omit=description&status=upcoming&radius=25.0&topic=bitcoin&and_text=False&limited_events=False&desc=False&offset=0&format=json&page=500&time=0m%2C3m&sig_id=133622112&sig=cd874bc2c84f96d989f823880889bda2f5e4cdc5","User-Agent"=>"Ruby/#{RUBY_VERSION}").read)
# Prevent any error to stop the build process, return an empty array instead
rescue
print 'Meetup API Call Failed!'
return meetups
end
if !data.is_a?(Hash) or !data.has_key?('results') or !data['results'].is_a?(Array)
print 'Meetup API Call Failed!'
return meetups
end
if data['results'].length > 1000
print 'Meetup API exceeding the 1000 results limit!'
return meetups
end
# Loop in returned results array
for m in data['results']
# Skip meetups with incomplete data
next if !m.has_key?('time') or ( !m['time'].is_a?(String) and !m['time'].is_a?(Integer) and !m['time'].is_a?(Float) )
next if !m.has_key?('group') or !m['group'].is_a?(Hash)
next if !m['group'].has_key?('name') or ( !m['group']['name'].is_a?(String) and !m['group']['name'].is_a?(Integer) and !m['group']['name'].is_a?(Float) )
next if !m.has_key?('venue') or !m['venue'].is_a?(Hash)
next if !m['venue'].has_key?('name') or ( !m['venue']['name'].is_a?(String) and !m['venue']['name'].is_a?(Integer) and !m['venue']['name'].is_a?(Float) )
next if !m['venue'].has_key?('address_1') or ( !m['venue']['address_1'].is_a?(String) and !m['venue']['address_1'].is_a?(Integer) and !m['venue']['address_1'].is_a?(Float) )
next if !m['venue'].has_key?('city') or ( !m['venue']['city'].is_a?(String) and !m['venue']['city'].is_a?(Integer) and !m['venue']['city'].is_a?(Float) )
next if !m['venue'].has_key?('country') or ( !m['venue']['country'].is_a?(String) and !m['venue']['country'].is_a?(Integer) and !m['venue']['country'].is_a?(Float) )
next if !m['venue'].has_key?('lat') or ( !m['venue']['lat'].is_a?(String) and !m['venue']['lat'].is_a?(Integer) and !m['venue']['lat'].is_a?(Float) )
next if !m['venue'].has_key?('lon') or ( !m['venue']['lon'].is_a?(String) and !m['venue']['lon'].is_a?(Integer) and !m['venue']['lon'].is_a?(Float) )
next if !m.has_key?('event_url') or ( !m['event_url'].is_a?(String) and !m['event_url'].is_a?(Integer) and !m['event_url'].is_a?(Float) )
# Assign variables
time = m['time'].to_s
title = m['group']['name'].to_s
venue = m['venue']['name'].to_s
address = m['venue']['address_1'].to_s
city = m['venue']['city'].to_s
country = m['venue']['country'].to_s
link = m['event_url'].to_s
lat = m['venue']['lat'].to_s
lon = m['venue']['lon'].to_s
# Skip meetups with malformed data
next if !/^[0-9]{1,15}$/.match(time)
next if !/^.{1,150}$/.match(title)
next if !/^.{1,150}$/.match(venue)
next if !/^.{1,150}$/.match(address)
next if !/^.{1,150}$/.match(city)
next if !/^[a-zA-Z]{2}$/.match(country)
next if !/^http:\/\/www.meetup.com\/.{1,150}$/.match(link)
next if !/^-?[0-9]{1,2}(\.[0-9]{1,15})?$/.match(lat) or ( lat.to_f < -90 and lat.to_f > 90 )
next if !/^-?[0-9]{1,3}(\.[0-9]{1,15})?$/.match(lon) or ( lon.to_f < -180 and lon.to_f > 180 )
next if lon.to_f == 0 and lat.to_f == 0
# Format variables
time = Time.at(time.to_i/1000)
date = time.year.to_s + '-' + time.month.to_s.rjust(2,'0') + '-' + time.day.to_s.rjust(2,'0')
country = country.upcase
geoloc = lat + ', ' + lon
# Use address_2 and state when available
if m['venue'].has_key?('address_2') and ( m['venue']['address_2'].is_a?(String) and m['venue']['address_2'].is_a?(Integer) and m['venue']['address_2'].is_a?(Float) ) and /^.{1,150}$/.match(m['venue']['address_2'].to_s)
address = address + ' ' + m['venue']['address_2'].to_s
end
if m['venue'].has_key?('state') and ( m['venue']['state'].is_a?(String) and m['venue']['state'].is_a?(Integer) and m['venue']['state'].is_a?(Float) ) and /^.{1,150}$/.match(m['venue']['state'].to_s)
city = city + ', ' + m['venue']['state'].to_s
end
# Populate meetups array
meetups.push({'date' => date, 'title' => title, 'venue' => venue, 'address' => address, 'city' => city, 'country' => country, 'link' => link, 'geoloc' => geoloc})
end
return meetups
end
def conferences
conferences = []
# Loop in _events/ files
Dir.foreach('_events') do |file|
# Skip events with malformed name
next if file == '.' or file == '..'
date = file.split('-')
next if date.length < 4
date = date[0] + '-' + date[1] + '-' + date[2]
next if !/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/.match(date)
site.pages << EventPage.new(site, site.source, '_events', file, 'event', file, date)
next if !/^[0-9]{4}$/.match(date[0])
next if !/^[0-9]{2}$/.match(date[1])
next if !/^[0-9]{2}$/.match(date[2])
# Skip event if not in the future
next if Time.new.to_i > Time.new(date[0].to_i,date[1].to_i,date[2].to_i).to_i
# Assign variables
data = YAML.load_file('_events/'+file)
data['date'] = date[0] + '-' + date[1] + '-' + date[2]
# Get geolocalisation data from Google Maps
begin
geoloc = JSON.parse(open("https://maps.googleapis.com/maps/api/geocode/json?address=" + CGI::escape(data['address'] + ', ' + data['city'] + ', ' + data['country']) + "&sensor=false","User-Agent"=>"Ruby/#{RUBY_VERSION}").read)
if geoloc['status'] == 'OK'
data['geoloc'] = geoloc['results'][0]['geometry']['location']['lat'].to_s + ", " + geoloc['results'][0]['geometry']['location']['lng'].to_s
end
rescue
print 'Google Maps API Call Failed!'
end
# Populate conferences array
conferences.push(data)
end
return conferences
end
def generate(site)
# Set site.meetups and site.conferences global variables for liquid/jekyll
class << site
attr_accessor :meetups, :conferences
alias event_site_payload site_payload
def site_payload
h = event_site_payload
payload = h["site"]
payload["meetups"] = self.meetups
payload["conferences"] = self.conferences
h["site"] = payload
h
end
end
# Populate site.conferences array
site.conferences = conferences()
# Populate site.meetups array
site.meetups = meetups()
end
end
end

2
_templates/development.html
View file

@ -65,7 +65,7 @@ id: development
<section id="contributors">
<h2>{% translate contributors %}</h2>
<p>{% translate contributorsorder %}</p>
<div class="contributors">{% for c in site.project.contributors %}
<div class="contributors">{% for c in site.contributors %}
<span>
{% if c.gravatar_id %}<img class="icon" height="16" width="16" src="https://secure.gravatar.com/avatar/{{c.gravatar_id}}?s=140&amp;d=http%3A%2F%2Fbitcoin.org%2Fimg%2Fgravatar-140.png" alt="icon" />{% else %}<img class="icon" height="16" width="16" src="http://i0.wp.com/bitcoin.org/img/gravatar-140.png" alt="icon" />{% endif %}
{% if c.login %}<a href="http://github.com/{{c.login}}">{{ c.name }} ({{ c.contributions }})</a>{% else %}{{ c.name }} ({{ c.contributions }}){% endif %}

16
_templates/events.html
View file

@ -15,21 +15,31 @@ id: events
<script>
var zoom=2;
if(/Android|webOS|iPhone|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent))zoom=0;
var map = L.map('eventmap').setView([20.00, 6.00], zoom);
var map = L.map('eventmap').setView([20.00, 10.00], zoom);
L.tileLayer('http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
attribution: 'Data &copy; by <a href="http://www.openstreetmap.org/copyright">OpenStreetMap contributors</a>.',
maxZoom: 18
}).addTo(map);
var markers = new L.MarkerClusterGroup({showCoverageOnHover: false, maxClusterRadius: 20});
{% filter_for p in site.pages sort_by:date category:event %}{% if p.geoloc != 'false' %}
{% filter_for p in site.conferences sort_by:date %}{% if p.geoloc != 'false' %}
L.marker([{{ p.geoloc }}]).bindPopup('<b><a href="{{ p.link | htmlescape }}">{{ p.title | htmlescape }}</a></b><br>{{ p.date }}<br>{{ p.venue | htmlescape }}<br>{{ p.address | htmlescape }}<br>{{ p.city | htmlescape }}, {{ p.country | htmlescape }}').addTo(markers);
{% endif %}{% endfilter_for %}
{% filter_for p in site.meetups sort_by:date %}{% if p.geoloc != 'false' %}
L.marker([{{ p.geoloc }}]).bindPopup('<b><a href="{{ p.link | htmlescape }}">{{ p.title | htmlescape }}</a></b><br>{{ p.date }}<br>{{ p.venue | htmlescape }}<br>{{ p.address | htmlescape }}<br>{{ p.city | htmlescape }}, {{ p.country | htmlescape }}').addTo(markers);
{% endif %}{% endfilter_for %}
map.addLayer(markers);
</script>
{% case page.lang %}
{% when 'ar' or 'bg' or 'de' or 'es' or 'fa' or 'fr' or 'id' or 'it' or 'nl' or 'pl' or 'ru' or 'tr' or 'zh_CN' or 'zh_TW' %}
{% else %}
<h2>{% translate upcoming %}</h2>
{% endcase %}
<ul>
{% filter_for p in site.pages sort_by:date category:event %}
{% filter_for p in site.conferences sort_by:date %}
<li>
{{ p.date | date:"%Y-%m-%d" }} - <a href="{{ p.link | htmlescape }}">{{ p.title | htmlescape }}</a> - {{ p.city | htmlescape }}, {{ p.country | htmlescape }}
</li>

3
_translations/en.yml
View file

@ -161,7 +161,8 @@ en:
events:
title: "Conferences and events - Bitcoin"
pagetitle: "Conferences and events"
pagedesc: "Find events and conferences held by different organizers all over the world."
pagedesc: "Find events, conferences and meetups all over the world."
upcoming: "Upcoming events and conferences"
meetupbitcointalk: "<a href=\"https://bitcointalk.org/index.php?board=86.0\">Bitcoin meetups on BitcoinTalk</a>"
meetupwiki: "<a href=\"https://en.bitcoin.it/wiki/Meetups\">Bitcoin meetups on the Wiki</a>"
meetupgroup: "<a href=\"http://bitcoin.meetup.com/\">Bitcoin meetup groups</a>"

2
en/rss/events.rss
View file

@ -10,7 +10,7 @@
<url>https://bitcoin.org/img/logo_rss.png</url>
<link>https://bitcoin.org/en/events</link>
</image>
{% filter_for p in site.pages sort_by:date category:event %}
{% filter_for p in site.conferences sort_by:date %}
<item>
<title>{{ p.title }}, {{ p.city }} - {{ p.country }}</title>
<link>{{ p.link }}</link>