From 360d2ce4f2deb061dd68c9b2704115dec599ee58 Mon Sep 17 00:00:00 2001 From: Lorin Werthen Date: Thu, 12 Oct 2017 09:08:08 +0200 Subject: [PATCH 01/10] fix order of events --- lib/helpers/events.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/helpers/events.rb b/lib/helpers/events.rb index 4872a7c..db4ec84 100644 --- a/lib/helpers/events.rb +++ b/lib/helpers/events.rb @@ -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 From d4303c95407393bbadd5ddf602376ec78e980294 Mon Sep 17 00:00:00 2001 From: Wout Schellaert Date: Fri, 13 Oct 2017 11:23:58 +0200 Subject: [PATCH 02/10] Expand FB fetch script --- commands/fetch.rb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/commands/fetch.rb b/commands/fetch.rb index b63a3d2..eb4c6e3 100644 --- a/commands/fetch.rb +++ b/commands/fetch.rb @@ -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: #TODO time: #{o['start_time']} - location: #{o['place']['name']} end: #{o['end_time']} + location: #{o['place']['name']} banner: #{o['cover']['source']} + created_at: #TODO + facebook: 'https://www.facebook.com/events/#{event_id}/' --- #{o['description']} From eaa1ac514062d69cd0ee0203ce20dd10d26dc9fd Mon Sep 17 00:00:00 2001 From: Wout Schellaert Date: Fri, 13 Oct 2017 11:24:06 +0200 Subject: [PATCH 03/10] Add some margin to event-tile text --- content/assets/stylesheets/includes/tiles.scss | 8 ++++++++ layouts/partials/_events_tile.erb | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/content/assets/stylesheets/includes/tiles.scss b/content/assets/stylesheets/includes/tiles.scss index 1ff4c7f..6e35037 100644 --- a/content/assets/stylesheets/includes/tiles.scss +++ b/content/assets/stylesheets/includes/tiles.scss @@ -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; } diff --git a/layouts/partials/_events_tile.erb b/layouts/partials/_events_tile.erb index 42d6b11..971b1e3 100644 --- a/layouts/partials/_events_tile.erb +++ b/layouts/partials/_events_tile.erb @@ -19,7 +19,7 @@
-
+
<%= fa :'clock-o' , fw: true %><%= @event[:time].strftime('%A %d %B, %H:%M') %>
<%= fa :'map-marker', fw: true %><%= @event[:location] %> From 0ec897aa593f7c2f93920d46e22c082196a0ad9f Mon Sep 17 00:00:00 2001 From: Wout Schellaert Date: Fri, 13 Oct 2017 11:24:28 +0200 Subject: [PATCH 04/10] Add Hydra codenight event --- content/events/17-18/hydra-codenight.md | 28 +++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 content/events/17-18/hydra-codenight.md diff --git a/content/events/17-18/hydra-codenight.md b/content/events/17-18/hydra-codenight.md new file mode 100644 index 0000000..631d613 --- /dev/null +++ b/content/events/17-18/hydra-codenight.md @@ -0,0 +1,28 @@ +--- +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. +[ Android ](https://github.com/ZeusWPI/hydra-android/) +[ iOS ](https://github.com/ZeusWPI/hydra-iOS/) + +~~ We proberen productieve coders wat in de watten te leggen ~~ \ No newline at end of file From 240a6f594b7ac754c6a38d18fa2586e8a2c8b5ae Mon Sep 17 00:00:00 2001 From: Wout Schellaert Date: Fri, 13 Oct 2017 11:38:02 +0200 Subject: [PATCH 05/10] Fix style warnings --- commands/fetch.rb | 4 ++-- content/events/17-18/hydra-codenight.md | 16 ++++++++++------ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/commands/fetch.rb b/commands/fetch.rb index eb4c6e3..6e8d804 100644 --- a/commands/fetch.rb +++ b/commands/fetch.rb @@ -16,12 +16,12 @@ run do |_opts, args, _cmd| puts <<~EOS --- title: "#{o['name']}" - description: #TODO + description: #Fill in time: #{o['start_time']} end: #{o['end_time']} location: #{o['place']['name']} banner: #{o['cover']['source']} - created_at: #TODO + created_at: #Fill in facebook: 'https://www.facebook.com/events/#{event_id}/' --- diff --git a/content/events/17-18/hydra-codenight.md b/content/events/17-18/hydra-codenight.md index 631d613..10e7d29 100644 --- a/content/events/17-18/hydra-codenight.md +++ b/content/events/17-18/hydra-codenight.md @@ -11,18 +11,22 @@ 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 + +- 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. -[ Android ](https://github.com/ZeusWPI/hydra-android/) +Er wordt achter eten gegaan door Zeusleden. + +[ Android ](https://github.com/ZeusWPI/hydra-android/) + [ iOS ](https://github.com/ZeusWPI/hydra-iOS/) ~~ We proberen productieve coders wat in de watten te leggen ~~ \ No newline at end of file From ccb151ed907cdc6715d330c749d50ad0e96a73ae Mon Sep 17 00:00:00 2001 From: Lorin Werthen Date: Fri, 13 Oct 2017 22:12:34 +0200 Subject: [PATCH 06/10] small fixes --- content/about/about.erb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/content/about/about.erb b/content/about/about.erb index 694261a..18753ee 100644 --- a/content/about/about.erb +++ b/content/about/about.erb @@ -12,16 +12,16 @@ narrow_page: true

- 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 (Hydra), for FaculteitenKonvent and 12Urenloop, and ofcourse for ourselves.

- Be sure to check out the project-page! + Be sure to check out the project page!

- 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.

The board

@@ -53,13 +53,15 @@ narrow_page: true <%= lid[:mail] %> + <% if lid[:mail] %> <%= fa :envelope %> + <% end %> <% end %> -
\ No newline at end of file +
From 8eb1ab3a2d0348e865a29c9709658b6931dd50ed Mon Sep 17 00:00:00 2001 From: Lorin Werthen Date: Sat, 14 Oct 2017 00:07:12 +0200 Subject: [PATCH 07/10] deploy preview test --- .travis.yml | 3 ++- deploy.sh | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100755 deploy.sh diff --git a/.travis.yml b/.travis.yml index 2818a5f..649e26d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,4 +23,5 @@ 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 +- ./deploy.sh diff --git a/deploy.sh b/deploy.sh new file mode 100755 index 0000000..c7b3386 --- /dev/null +++ b/deploy.sh @@ -0,0 +1,8 @@ +#! /bin/bash +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 From 7d066425d6114049c88623ee2653ac783e38e4cd Mon Sep 17 00:00:00 2001 From: Lorin Werthen Date: Sat, 14 Oct 2017 00:11:40 +0200 Subject: [PATCH 08/10] debug --- deploy.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/deploy.sh b/deploy.sh index c7b3386..d9238e6 100755 --- a/deploy.sh +++ b/deploy.sh @@ -1,4 +1,6 @@ #! /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 From 81c2b25936d0943ad5b906edacaf0d9d6647b001 Mon Sep 17 00:00:00 2001 From: Lorin Werthen Date: Sat, 14 Oct 2017 00:17:12 +0200 Subject: [PATCH 09/10] test travis --- deploy.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/deploy.sh b/deploy.sh index d9238e6..373ba4e 100755 --- a/deploy.sh +++ b/deploy.sh @@ -1,6 +1,7 @@ #! /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 From de3de6b30c0acc7a5123c5c7d679eefb6c84b661 Mon Sep 17 00:00:00 2001 From: Lorin Werthen Date: Sat, 14 Oct 2017 00:21:07 +0200 Subject: [PATCH 10/10] no static host checking --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.travis.yml b/.travis.yml index 649e26d..2896159 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,10 @@ cache: - output - tmp +branches: + only: + - master + rvm: - 2.3.1 notifications: @@ -24,4 +28,5 @@ after_success: - mv deploy_key ~/.ssh/id_rsa - chmod 600 ~/.ssh/id_rsa - chmod +x ./deploy.sh +- echo -e "Host $TRAVIS_PULL_REQUEST.zeus.werthen.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config - ./deploy.sh