Merge branch 'master' of github.com:ZeusWPI/zeus.ugent.be into revamp-contact

This commit is contained in:
Lorin Werthen 2017-10-14 00:27:10 +02:00
commit 998ce957db
No known key found for this signature in database
GPG key ID: F11FFC921E0E08E0
8 changed files with 72 additions and 10 deletions

View file

@ -7,6 +7,10 @@ cache:
- output
- tmp
branches:
only:
- master
rvm:
- 2.3.1
notifications:
@ -23,4 +27,6 @@ script:
after_success:
- mv deploy_key ~/.ssh/id_rsa
- chmod 600 ~/.ssh/id_rsa
- '[[ $TRAVIS_PULL_REQUEST == "false" ]] && [[ $TRAVIS_BRANCH == "master" ]] && bundle exec nanoc --env=prod deploy public'
- chmod +x ./deploy.sh
- echo -e "Host $TRAVIS_PULL_REQUEST.zeus.werthen.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
- ./deploy.sh

View file

@ -10,16 +10,19 @@ description 'Fetch an event from facebook'
run do |_opts, args, _cmd|
fb_token = File.read('.fb_token')
uri = URI("https://graph.facebook.com/v2.10/#{args[0]}?fields=cover,name,description,start_time,place,end_time&access_token=#{fb_token}")
event_id = args[0]
uri = URI("https://graph.facebook.com/v2.10/#{event_id}?fields=cover,name,description,start_time,place,end_time&access_token=#{fb_token}")
o = JSON.parse(Net::HTTP.get(uri))
puts <<~EOS
---
title: "#{o['name']}"
description: #Fill in
time: #{o['start_time']}
location: #{o['place']['name']}
end: #{o['end_time']}
location: #{o['place']['name']}
banner: #{o['cover']['source']}
created_at: #Fill in
facebook: 'https://www.facebook.com/events/#{event_id}/'
---
#{o['description']}

View file

@ -12,16 +12,16 @@ narrow_page: true
</p>
<p>
We organize various tech related talks by experts (eg. professors, PhD's, Richard Stallman, Julia Roberts, ...), hands-on coding events and introductory lectures for cool technologies.
We organize various tech related talks by experts (eg. professors, PhD's, Richard Stallman, Julia Reda, ...), hands-on coding events and introductory lectures for cool technologies.
Together we build interesting applications for Ghent University students (<a href='https://hydra.ugent.be/'>Hydra</a>), for <a href='http://www.fkgent.be/'>FaculteitenKonvent</a> and <a href='https://12urenloop.be/'>12Urenloop</a>, and ofcourse for ourselves.
</p>
<p>
Be sure to check out the <a href='../../projects'>project-page</a>!
Be sure to check out the <a href='../../projects'>project page</a>!
</p>
<p>
Everybody is welcom at Zeus WPI, even if you don't study computer science. The only requirement is a healthy dose of motivation and some (toleration for) geekyness.
Everybody is welcome at Zeus WPI, even if you don't study computer science. The only requirement is a healthy dose of motivation and some (toleration for) geekyness.
</p>
<h2>The board</h2>
@ -56,9 +56,11 @@ narrow_page: true
<%= lid[:mail] %>
</td>
<td>
<% if lid[:mail] %>
<a href="mailto:<%= lid[:mail] %>">
<%= fa :envelope %>
</a>
<% end %>
</td>
</tr>
<% end %>

View file

@ -35,8 +35,16 @@ a.box {
.event-text {
display: inline-block;
font-size: 1.1em;
margin-left: 10px;
margin-right: 10px;
.event-time-loc {
margin-left: 10px;
margin-right: 10px;
}
}
.is-divider {
margin: 0.5em;
}

View file

@ -0,0 +1,32 @@
---
title: "Hydra Introsessie & Codenight"
time: 2017-10-16T18:00:00+0200
end: 2017-10-16T23:59:00+0200
location: Zeus WPI
description: Word een Hydra-held in no time
created_at: '13-10-2017'
color: '#3454b4'
---
Join het team van de coolste app van de UGent!
# Wat
Zin om mee te werken? Op de Hydra codenight wordt je persoonlijk begeleid en geholpen door de developers achter de app. Zo fix je in no-time je eerste issue leer je op 1 avond door de volledige codebase wandelen. We maken er samen een productieve maar ook plezante avond van, en wie weet ben jij tegen volgend jaar 1 van de core-devs!
# Waarom
- Een cool team
- Een relevant project voor jou en je vrienden
- Ideale intro tot app-development
- Ideale ervaring voor app-development
# Praktisch
We beginnen officieel om **18u**, maar je mag komen wanneer je wilt. Alles gebeurt in de **Zeus kelder**. Probeer het project al eens werkende te krijgen op voorhand, of installeer de relevante programma's toch al (Android Studio en XCode (voor iOS)).
Er wordt achter eten gegaan door Zeusleden.
[<i class="fa fa-github"></i> Android ](https://github.com/ZeusWPI/hydra-android/)
[<i class="fa fa-github"></i> iOS ](https://github.com/ZeusWPI/hydra-iOS/)
~~ We proberen productieve coders wat in de watten te leggen ~~

11
deploy.sh Executable file
View file

@ -0,0 +1,11 @@
#! /bin/bash
echo "Pull Request: $TRAVIS_PULL_REQUEST"
echo "Branch: $TRAVIS_BRANCH"
if [[ $TRAVIS_PULL_REQUEST == "false" ]]; then
if [[ $TRAVIS_BRANCH == "master" ]]; then
bundle exec nanoc --env=prod deploy public
fi
else
rsync -aglpPrtvz --delete output/ "deploy@$TRAVIS_PULL_REQUEST.zeus.werthen.com:/var/www/html/$TRAVIS_PULL_REQUEST/"
fi

View file

@ -19,7 +19,7 @@
<div class="is-divider"></div>
<div class="">
<div class="event-time-loc">
<%= fa :'clock-o' , fw: true %><%= @event[:time].strftime('%A %d %B, %H:%M') %>
<br>
<%= fa :'map-marker', fw: true %><%= @event[:location] %>

View file

@ -22,7 +22,7 @@ module EventsHelper
end
def academic_years_event_items
items.find_all('/events/*').map { |e| [e[:academic_year], e] }.sort_by(&:first)
items.find_all('/events/*').map { |e| [e[:academic_year], e] }.sort_by(&:first).reverse
end
def grouped_events