diff --git a/.travis.yml b/.travis.yml index ceec992a3..4ac000504 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,7 @@ install: - rvm use 2.4.4 --install --fuzzy - gem update --system - gem install sass -- gem install jekyll -v 3.8.1 +- gem install jekyll -v 3.8.4 script: git reset --hard HEAD; diff --git a/build.sbt b/build.sbt index 49d71d2f9..d30d2fd0e 100644 --- a/build.sbt +++ b/build.sbt @@ -2,14 +2,14 @@ import microsites._ name := "golf-clash-notebook" -scalaVersion in ThisBuild := "2.12.6" +scalaVersion in ThisBuild := "2.12.7" organization in ThisBuild := "golf-clash-notebook" organizationName in ThisBuild := "Golf Clash Notebook" //////////////////////////////////////////////////////////////////////////////// -val CatsV = "1.2.0" +val CatsV = "1.4.0" val CatsEffectV = "0.10.1" -val CirceV = "0.9.3" +val CirceV = "0.10.0" val MonixV = "3.0.0-RC1" val ScalaCheckV = "1.14.0" val ScalaTagsV = "0.6.7" diff --git a/modules/site/src/main/resources/microsite/_config.yml b/modules/site/src/main/resources/microsite/_config.yml index dbc96c779..36fa57a41 100644 --- a/modules/site/src/main/resources/microsite/_config.yml +++ b/modules/site/src/main/resources/microsite/_config.yml @@ -501,3 +501,11 @@ page_gen: extra: title-prefix: 'Metro Open Tournament - Hole ' tournament-name: 'Metro Open' + - index_files: true + data: 'tournaments.PlatinumResorts.holes' + template: '_includes/tournaments/hole-template.liquid' + name: 'number' + dir: 'tournaments/PlatinumResorts' + extra: + title-prefix: 'Platinum Resorts Tournament - Hole ' + tournament-name: 'Platinum Resorts' diff --git a/modules/site/src/main/resources/microsite/data/courses/GreenochPoint.yaml b/modules/site/src/main/resources/microsite/data/courses/GreenochPoint.yaml index aca8673e0..b46bd5486 100644 --- a/modules/site/src/main/resources/microsite/data/courses/GreenochPoint.yaml +++ b/modules/site/src/main/resources/microsite/data/courses/GreenochPoint.yaml @@ -238,6 +238,7 @@ holes: - id: 41fae3d6-5eb6-415f-8bff-1ad1d00463b4 + current-tournament: true course: Greenoch Point number: 3 par: 3 @@ -335,6 +336,7 @@ holes: - id: 6ea3d593-3acb-4552-821b-b784c19e0672 + current-tournament: true course: Greenoch Point number: 4 par: 4 @@ -656,6 +658,7 @@ holes: - id: af37d3ac-7089-4ff1-9568-64bcce20c496 + current-tournament: true course: Greenoch Point number: 7 par: 5 diff --git a/modules/site/src/main/resources/microsite/data/courses/SouthernPines.yaml b/modules/site/src/main/resources/microsite/data/courses/SouthernPines.yaml index 43c266250..f45fae44f 100644 --- a/modules/site/src/main/resources/microsite/data/courses/SouthernPines.yaml +++ b/modules/site/src/main/resources/microsite/data/courses/SouthernPines.yaml @@ -2,6 +2,7 @@ course-name: Southern Pines skinned: false holes: - id: 35b5f6cf-916c-404d-9a57-aeb2ec0a693c + current-tournament: true course: Southern Pines number: 1 par: 4 @@ -377,6 +378,7 @@ holes: - id: a0d9b22c-70e6-43c4-8022-27387295e9c1 + current-tournament: true course: Southern Pines number: 4 par: 5 @@ -632,6 +634,7 @@ holes: - id: 8b2a0801-dd19-4d25-a7e1-d7503c8fc7ae + current-tournament: true course: Southern Pines number: 6 par: 3 diff --git a/modules/site/src/main/resources/microsite/data/courses/TheMilano.yaml b/modules/site/src/main/resources/microsite/data/courses/TheMilano.yaml index c5d1e61ee..834d9cd32 100644 --- a/modules/site/src/main/resources/microsite/data/courses/TheMilano.yaml +++ b/modules/site/src/main/resources/microsite/data/courses/TheMilano.yaml @@ -282,6 +282,7 @@ holes: - id: 330d44fa-7e2d-4fda-bdb5-f96fa9c0258f + current-tournament: true course: The Milano number: 4 par: 3 @@ -561,6 +562,7 @@ holes: - title: Vegas - Masters url: https://youtu.be/cbFbXJo9SGo - id: 2c9f5304-fca6-4bd1-91dc-e61bd032da92 + current-tournament: true course: The Milano number: 8 par: 4 @@ -608,6 +610,7 @@ holes: - title: Vegas - Masters url: https://youtu.be/tZcd9xP2f1c - id: e848d24c-b050-49da-a898-83bee9ef0e97 + current-tournament: true course: The Milano number: 9 par: 5 diff --git a/modules/site/src/main/resources/microsite/data/news/2018-10-11-Platinum-Resorts.yaml b/modules/site/src/main/resources/microsite/data/news/2018-10-11-Platinum-Resorts.yaml new file mode 100644 index 000000000..27ec1143c --- /dev/null +++ b/modules/site/src/main/resources/microsite/data/news/2018-10-11-Platinum-Resorts.yaml @@ -0,0 +1,5 @@ +timestamp: 2018-10-11 +title: Platinum Resorts Tournament! +content: > + Platinum Resorts tournament holes and notesheets are now available! Check them out + here. diff --git a/modules/site/src/main/resources/microsite/data/tournaments/PlatinumResorts.yaml b/modules/site/src/main/resources/microsite/data/tournaments/PlatinumResorts.yaml new file mode 100644 index 000000000..39f4034dd --- /dev/null +++ b/modules/site/src/main/resources/microsite/data/tournaments/PlatinumResorts.yaml @@ -0,0 +1,22 @@ +tournament-name: Platinum Resorts +date: '2018-10-15' +resource-creators: +holes: + - number: 1 + id: af37d3ac-7089-4ff1-9568-64bcce20c496 + - number: 2 + id: 6ea3d593-3acb-4552-821b-b784c19e0672 + - number: 3 + id: 41fae3d6-5eb6-415f-8bff-1ad1d00463b4 + - number: 4 + id: 35b5f6cf-916c-404d-9a57-aeb2ec0a693c + - number: 5 + id: e848d24c-b050-49da-a898-83bee9ef0e97 + - number: 6 + id: 330d44fa-7e2d-4fda-bdb5-f96fa9c0258f + - number: 7 + id: 2c9f5304-fca6-4bd1-91dc-e61bd032da92 + - number: 8 + id: 8b2a0801-dd19-4d25-a7e1-d7503c8fc7ae + - number: 9 + id: a0d9b22c-70e6-43c4-8022-27387295e9c1 diff --git a/modules/site/src/main/resources/microsite/img/golfclash/tournaments/notesheets/PlatinumResorts.pdf b/modules/site/src/main/resources/microsite/img/golfclash/tournaments/notesheets/PlatinumResorts.pdf new file mode 100644 index 000000000..7ec440590 Binary files /dev/null and b/modules/site/src/main/resources/microsite/img/golfclash/tournaments/notesheets/PlatinumResorts.pdf differ diff --git a/modules/site/src/main/resources/microsite/img/golfclash/tournaments/titles/PlatinumResorts-550x200.png b/modules/site/src/main/resources/microsite/img/golfclash/tournaments/titles/PlatinumResorts-550x200.png new file mode 100644 index 000000000..472759238 Binary files /dev/null and b/modules/site/src/main/resources/microsite/img/golfclash/tournaments/titles/PlatinumResorts-550x200.png differ