From 05b66f6e7cebf6c05d6c51a77bec812c4b6fa772 Mon Sep 17 00:00:00 2001 From: Oleh Zasadnyy Date: Fri, 29 Aug 2014 17:57:46 +0300 Subject: [PATCH] Finished hackathon page, fixed some issues --- _config.yml | 29 ++++++++++-- _includes/about-hackathon.html | 44 ++++-------------- _includes/about.html | 2 +- _includes/hackathon-location.html | 26 +++++------ _includes/hero.html | 4 +- _includes/judges.html | 4 +- _includes/navigation.html | 1 + _includes/prizes.html | 20 ++++++++ _includes/rockstar-speakers.html | 2 +- _includes/schedule.html | 2 +- _includes/schema-event.html | 29 ++++++++++++ _includes/sessions-modals.html | 2 +- _includes/speakers-list-2.html | 2 +- _includes/speakers-list.html | 2 +- _includes/speakers-modals.html | 2 +- _includes/statistic.html | 2 +- _includes/subscribe.html | 2 +- _includes/team.html | 4 +- _includes/tickets-2.html | 2 +- _includes/top-section.html | 11 +++-- _includes/twitter-feed.html | 2 +- _layouts/default.html | 8 ++-- _sass/main.scss | 1 + _sass/partials/_hackathon-location.scss | 26 ++++++++++- _sass/partials/_helper.scss | 3 ++ _sass/partials/_hero.scss | 1 + _sass/partials/_navigation.scss | 12 +++-- _sass/partials/_prizes.scss | 18 +++++++ _sass/partials/_tickets.scss | 15 +++--- _sass/partials/_top-section.scss | 9 ++-- css/main.min.css | 4 +- hackathon.html | 2 + img/{ => about-section}/conference.jpg | Bin img/{ => about-section}/hackathon.jpg | Bin img/{ => about-section}/workshop.jpg | Bin img/hackathon-0.png | Bin 220456 -> 0 bytes img/hackathon-1.png | Bin 155550 -> 0 bytes img/hackathon-2.png | Bin 89641 -> 0 bytes img/hackathon/hackathon-0.png | Bin 0 -> 202954 bytes img/hackathon/hackathon-1.png | Bin 0 -> 136611 bytes img/hackathon/hackathon-2.png | Bin 0 -> 70980 bytes img/hackathon/prize-1.png | Bin 0 -> 41130 bytes img/hackathon/prize-2.png | Bin 0 -> 122334 bytes img/hackathon/prize-3.png | Bin 0 -> 98658 bytes img/{svg => other}/map-marker.svg | 0 img/{speakers => people}/DawidOstrowski.jpg | Bin img/{speakers => people}/DmytroDanylyk.jpg | Bin img/{speakers => people}/MateuszHerych.jpg | Bin img/{speakers => people}/OlehZasadnyy.jpg | Bin img/{speakers => people}/OstapAndrusiv.jpg | Bin img/{speakers => people}/RomanMazur.jpg | Bin img/{speakers => people}/Thumbs.db | Bin img/{speakers => people}/ValentynShybanov.jpg | Bin img/{speakers => people}/VitaliyZasadnyy.jpg | Bin .../direction-details.jpg | Bin img/{ => sections-background}/hero.jpg | Bin img/{ => sections-background}/judges.jpg | Bin .../rockstar-speakers.jpg | Bin img/{ => sections-background}/statistic.jpg | Bin img/{ => sections-background}/subscribe.jpg | Bin .../twitter-feed.jpg | Bin 61 files changed, 199 insertions(+), 94 deletions(-) create mode 100644 _includes/prizes.html create mode 100644 _sass/partials/_prizes.scss rename img/{ => about-section}/conference.jpg (100%) rename img/{ => about-section}/hackathon.jpg (100%) rename img/{ => about-section}/workshop.jpg (100%) delete mode 100644 img/hackathon-0.png delete mode 100644 img/hackathon-1.png delete mode 100644 img/hackathon-2.png create mode 100644 img/hackathon/hackathon-0.png create mode 100644 img/hackathon/hackathon-1.png create mode 100644 img/hackathon/hackathon-2.png create mode 100644 img/hackathon/prize-1.png create mode 100644 img/hackathon/prize-2.png create mode 100644 img/hackathon/prize-3.png rename img/{svg => other}/map-marker.svg (100%) rename img/{speakers => people}/DawidOstrowski.jpg (100%) rename img/{speakers => people}/DmytroDanylyk.jpg (100%) rename img/{speakers => people}/MateuszHerych.jpg (100%) rename img/{speakers => people}/OlehZasadnyy.jpg (100%) rename img/{speakers => people}/OstapAndrusiv.jpg (100%) rename img/{speakers => people}/RomanMazur.jpg (100%) rename img/{speakers => people}/Thumbs.db (100%) rename img/{speakers => people}/ValentynShybanov.jpg (100%) rename img/{speakers => people}/VitaliyZasadnyy.jpg (100%) rename img/{ => sections-background}/direction-details.jpg (100%) rename img/{ => sections-background}/hero.jpg (100%) rename img/{ => sections-background}/judges.jpg (100%) rename img/{ => sections-background}/rockstar-speakers.jpg (100%) rename img/{ => sections-background}/statistic.jpg (100%) rename img/{ => sections-background}/subscribe.jpg (100%) rename img/{ => sections-background}/twitter-feed.jpg (100%) diff --git a/_config.yml b/_config.yml index 69c96c8..4b2a00b 100644 --- a/_config.yml +++ b/_config.yml @@ -54,7 +54,8 @@ eventDate: "September - November, 2014" typeoutTextValues: '"", "Season", "Ukraine", "Germany", "USA"' typeoutFallback: "Season" heroButtons: - - {url: "http://bit.ly/dfua-c4p", text: "Become a speaker"} + - {link: "http://bit.ly/dfua-c4p", text: "Become a speaker"} + - {permalink: "/#tickets", text: "Buy tickets"} # About Block aboutTitle: "About GDG DevFest" @@ -123,6 +124,7 @@ ticketsOffers: price: "350" priceCurrency: "UAH" ticketsNumber: "150" + ribbon: "-5%" buyButtonLink: "http://dfua.ticketforevent.com/" buyButtonText: "Buy Now" ticketContentList: ["Lorem ipsum is simply", "Dummy text of the printing", "Typesetting industry"] @@ -181,7 +183,6 @@ discusShortName: "devfestua" # Speakers List Block showSessions: true -thumbnailsFolder: /img/speakers/ # Team Block teamBlockTitle: "About us" @@ -224,10 +225,28 @@ directionDetailsWideCards: - {link: "https://plus.google.com/b/102444623953913144164", text: "Westin Market Street"} - {link: "https://plus.google.com/b/102444623953913144164", text: "Hotel Adagio"} +# Hackathon +hackathonTitle: "Hackathon" +enableHackathon: true + +# Hackathon About Block +aboutHackathonTitle: "Meet our themes" +hackathonRows: + - {title: "Android Wear", image: "hackathon-0.png", details: "The front doors will be locked because this is after hours, please park behind the building and come to the door nearest the parking lot.

Our last meeting showed that there was a lot of interest in Android Wear so we decided to put on an Android Wear Hackathon to see what you could come up with! We realize that this is pretty short notice so we hope you can help us spread the word! There will be pizza, prizes and a great group of geeks to spend the evening coding with! Even if you don't have an app idea come on in and lend a hand to someone else or maybe find inspiration once you're here!"} + - {title: "Google Glass", image: "hackathon-1.png", details: "We love wearable computing especially Google Glass for which we want to gather the break up community in order to boost innovation.

Coding an app on Google Glass needs its Rockstar Dev : the team needs a fast learner with solid skills on Android. He knows his way around Android SDK, already checked the Glass Developement Kit (GDK) quick start guide allowing him to jump start developing an app for Glass.The Designer has the hard task to build the visual identity from the ground up, he has strong UX knowledge and a deep understanding of the new rules set by the Glass. His design skills give him the credibility to decide the most effective UI and the most compelling Glass experience."} + - {title: "Polymer", image: "hackathon-2.png", details: "Polymer is a library that introduces web components. Web components are small elements on a page that can be extended and incorporated in web applications. The result is an increase in productivity.

We used Polymer mainly to explore the concept of web components. The transition of Google to material design was also a factor.While the library was never touched by the team, it still was painless to wireframe the application. Later on we incorporated some Polymer components in the design. We didn’t use the full potential of Polymer because of the limited time."} + # Hackathon Judges Block judgesTitle: "Judges" -#Hackathon Location Block +# Hackathon Prizes Block +prizesTitle: "Prizes" +prizes: + - {title: "2nd Place", image: "prize-2.png", info: "Amazing Moto 360"} + - {title: "1nd Place", image: "prize-1.png", info: "Nexus 5 with pre-installed Android L"} + - {title: "3nd Place", image: "prize-3.png", info: "Useful Chromecast"} + +# Hackathon Location Block hackathonLocationBlockTitle: "Location" hackathonLocationName: "Communa" hackathonLocationLink: "http://communa.net.ua/" @@ -236,9 +255,11 @@ hackathonAddressLocality: "Lviv" hackathonAddressLocalityRegion: "Lvivska" hackathonPostalCode: "79000" hackathonAddressCountry: "Ukraine" +hackathonTimeTitle: "Hack through" hackathonStartTime: "2014-10-24T10:00" hackathonDoorTime: "09:00" hackathonEndTime: "2014-10-25T00:00" +viewOnMap: "View on Google Maps" hackathonPlaceCoordinates: "49.840999, 24.031144" hackathonMapCenterCoordinates: "49.840696, 24.028754" -hackathonMapMobileCenterCoordinates: "49.840291, 24.031248" \ No newline at end of file +hackathonMapMobileCenterCoordinates: "49.841639, 24.031182" \ No newline at end of file diff --git a/_includes/about-hackathon.html b/_includes/about-hackathon.html index 94c3ac6..358f7b3 100644 --- a/_includes/about-hackathon.html +++ b/_includes/about-hackathon.html @@ -2,43 +2,19 @@
-
-
- Hackathon +

{{ site.aboutHackathonTitle }}

+ {% for row in site.hackathonRows %} + {% assign check = forloop.index0 | modulo:2 %} +
+
+ Hackathon
-
-

Android Wear

-

- The front doors will be locked because this is after hours, please park behind the building and come to the door nearest the parking lot.

- Our last meeting showed that there was a lot of interest in Android Wear so we decided to put on an Android Wear Hackathon to see what you could come up with! We realize that this is pretty short notice so we hope you can help us spread the word! There will be pizza, prizes and a great group of geeks to spend the evening coding with! Even if you don't have an app idea come on in and lend a hand to someone else or maybe find inspiration once you're here! -

-
-
-
-
- Hackathon -
-
-

Google Glass

-

- We love wearable computing especially Google Glass for which we want to gather the break up community in order to boost innovation.

- Coding an app on Google Glass needs its Rockstar Dev : the team needs a fast learner with solid skills on Android. He knows his way around Android SDK, already checked the Glass Developement Kit (GDK) quick start guide allowing him to jump start developing an app for Glass.The Designer has the hard task to build the visual identity from the ground up, he has strong UX knowledge and a deep understanding of the new rules set by the Glass. His design skills give him the credibility to decide the most effective UI and the most compelling Glass experience. -

-
-
-
-
- Hackathon -
-
-

Polymer

-

- Polymer is a library that introduces web components. Web components are small elements on a page that can be extended and incorporated in web applications. The result is an increase in productivity.

- We used Polymer mainly to explore the concept of web components. The transition of Google to material design was also a factor. - While the library was never touched by the team, it still was painless to wireframe the application. Later on we incorporated some Polymer components in the design. We didn’t use the full potential of Polymer because of the limited time. -

+
+

{{ row.title }}

+

{{ row.details }}

+ {% endfor %}
diff --git a/_includes/about.html b/_includes/about.html index 75a743b..4f2a71e 100644 --- a/_includes/about.html +++ b/_includes/about.html @@ -10,7 +10,7 @@
{{ about.title }}
- {{ about.title }} + {{ about.title }}

{{ about.text }}

diff --git a/_includes/hackathon-location.html b/_includes/hackathon-location.html index ef77641..7889846 100644 --- a/_includes/hackathon-location.html +++ b/_includes/hackathon-location.html @@ -2,21 +2,19 @@
-
-
-

{{ site.hackathonLocationBlockTitle }}

-
    - {% if site.hackathonLocationName %}
  • {{ site.hackathonLocationName }}
    • {% endif %} -
  • {{ site.hackathonStreetAddress }}, {{ site.hackathonAddressLocality }}
    • -
  • {{ site.email }}
    • -
  • - {% assign startTime = site.hackathonStartTime | split: "T" %} - - - {% assign endTime = site.hackathonEndTime | split: "T" %} - -
    • -
+
+ {% if site.hackathonLocationName %} +
{{ site.hackathonLocationName }}
+ {% endif %} +

{{ site.hackathonStreetAddress }}, {{ site.hackathonAddressLocality }}

+
+ {{ site.hackathonTimeTitle }} + {% assign startTime = site.hackathonStartTime | split: "T" %} + - + {% assign endTime = site.hackathonEndTime | split: "T" %} +
+ {{ site.viewOnMap }}
diff --git a/_includes/hero.html b/_includes/hero.html index ed88f5f..280b466 100644 --- a/_includes/hero.html +++ b/_includes/hero.html @@ -1,5 +1,5 @@ -
+
{% include navigation.html %}
@@ -8,7 +8,7 @@

{{ heroText[0] }}{{ site.typeoutFallback }}{{ heroText[1] }}

{{ site.eventDate }}

{% for button in site.heroButtons %} - {{ button.text }} + {{ button.text }} {% endfor %}
diff --git a/_includes/judges.html b/_includes/judges.html index 1e643df..b98af12 100644 --- a/_includes/judges.html +++ b/_includes/judges.html @@ -1,5 +1,5 @@ -
+
@@ -8,7 +8,7 @@ {% assign animationDelay = 0 %} {% for judge in site.data.judges %} {% assign colWidth = 12 | divided_by: forloop.length %}
-
+

{{ judge.name }} {{ judge.surname }}

{{ judge.company }} {{ judge.title }} diff --git a/_includes/navigation.html b/_includes/navigation.html index 9c9c0b3..3860357 100644 --- a/_includes/navigation.html +++ b/_includes/navigation.html @@ -1,4 +1,5 @@
+
diff --git a/_includes/prizes.html b/_includes/prizes.html new file mode 100644 index 0000000..58cd1ea --- /dev/null +++ b/_includes/prizes.html @@ -0,0 +1,20 @@ + +
+
+
+

{{ site.prizesTitle }}

+ {% for prize in site.prizes %} + {% assign colWidth = 12 | divided_by: forloop.length %} + {% assign check = forloop.index | modulo:2 %} +
+

{{ prize.title }}

+
+ Hackathon +
+

{{ prize.info }}

+
+ {% endfor %} +
+
+
+ diff --git a/_includes/rockstar-speakers.html b/_includes/rockstar-speakers.html index 66c92a5..e875f8c 100644 --- a/_includes/rockstar-speakers.html +++ b/_includes/rockstar-speakers.html @@ -1,5 +1,5 @@ -
+
diff --git a/_includes/schedule.html b/_includes/schedule.html index c5df2c8..61ece5a 100644 --- a/_includes/schedule.html +++ b/_includes/schedule.html @@ -46,7 +46,7 @@ {% for speaker in site.data.speakers %} {% for session_speaker in session.speakers %} {% if session_speaker == speaker.id %} -
  • +

  • {{ speaker.name }} {{ speaker.surname }} {{ speaker.company }}

    diff --git a/_includes/schema-event.html b/_includes/schema-event.html index 907aee7..9ba6448 100644 --- a/_includes/schema-event.html +++ b/_includes/schema-event.html @@ -38,6 +38,35 @@ // "email" : "{{ site.organizerEmail }}", // "sameAs" : "{{ site.organizerLink }}" // }, + "subEvent" : { + "@type" : "Event", + "name" : "{{ site.hackathonTitle }}", + "description": "{{ site.hackathonRows[0].details }}", + "image" : "{{ site.socialImageSrcGooglePlus | prepend: site.baseurl | prepend: site.url }}", + "url" : "{{ site.url | append: site.baseurl }}/hackathon/", + "startDate" : "{{ site.hackathonStartTime }}", + "doorTime" : "{{ site.hackathonDoorTime }}", + "endDate" : "{{ site.hackathonEndTime }}", + "location" : { + "@type" : "Place", + "name" : "{{ site.hackathonLocationName }}", + "sameAs" : "{{ site.hackathonLocationLink }}", + "address" : { + "@type" : "PostalAddress", + "streetAddress" : "{{ site.hackathonStreetAddress }}", + "addressLocality" : "{{ site.hackathonAddressLocality }}", + "addressRegion" : "{{ site.hackathonAddressLocalityRegion }}", + "postalCode" : "{{ site.hackathonPostalCode }}", + "addressCountry" : "{{ site.hackathonAddressCountry }}" + }, + "geo" : { + "@type" : "GeoCoordinates", + {% assign hackathonCoordinates = site.hackathonPlaceCoordinates | split:"," %} + "latitude" : "{{ hackathonCoordinates[0] }}", + "longitude" : "{{ hackathonCoordinates[1] }}" + } + } + }, "offers" : [ {% for ticketsOffer in site.ticketsOffers %} { diff --git a/_includes/sessions-modals.html b/_includes/sessions-modals.html index 8140072..87211fb 100644 --- a/_includes/sessions-modals.html +++ b/_includes/sessions-modals.html @@ -22,7 +22,7 @@ {% if session_speaker == speaker.id %}
    -
    +

    {{ speaker.name }} {{ speaker.surname }} diff --git a/_includes/speakers-list-2.html b/_includes/speakers-list-2.html index 21e8d65..234b0ca 100644 --- a/_includes/speakers-list-2.html +++ b/_includes/speakers-list-2.html @@ -5,7 +5,7 @@ {% for speaker in site.data.speakers %}

    -
    +
    {% if speaker.ribbon != null %}