From 27d94f483968194ec95068bb07b0b1213841d1cd Mon Sep 17 00:00:00 2001
From: Matthew Stratford <hi@mstratford.net>
Date: Sun, 4 Oct 2020 16:19:33 +0100
Subject: [PATCH 1/2] Add customisable config for Youtube playlists.

---
 config.toml.example  | 16 +++++++++++++++-
 public/js/index.js   | 25 ++++++++++++++++---------
 structs/config.go    | 30 ++++++++++++++++++++++--------
 views/cin.tmpl       |  3 +--
 views/index.tmpl     | 16 ++++++++++------
 views/on_demand.tmpl | 30 +++++++++++++++++++++++-------
 6 files changed, 87 insertions(+), 33 deletions(-)

diff --git a/config.toml.example b/config.toml.example
index 8e46dd9c..f4c084a1 100644
--- a/config.toml.example
+++ b/config.toml.example
@@ -48,7 +48,21 @@
 
 	[pageContext.youtube]
 		APIKey = "AIzaSyCzI5Gvpq1hPlfjvB81EVc0vLv_11eW7NI"
-		sessionsPlaylistID = "PLsxUDJzU4VKDudlmlYb-ImFKreFKAfFln"
+		homepagePlaylistID = "PLsxUDJzU4VKDag-NVag4kMN1i5C7ZyP85"
+		homepageDescription = "Fresh music from fresh artists, something witty here..."
+		homepageTitle = "Q-Fest"
+		homepageBGColour = "#235660"
+		homepageColor = "#fff"
+		od1PlaylistID = "PLsxUDJzU4VKDudlmlYb-ImFKreFKAfFln"
+		od1Description = "Fresh music from fresh artists, something witty here..."
+		od1Title = "URY Sessions"
+		od1BGColor = "#53306a"
+		od1Color = "#fff"
+		od2PlaylistID = "PLsxUDJzU4VKDag-NVag4kMN1i5C7ZyP85"
+		od2Description = "Fresh music from fresh artists, something witty here..."
+		od2Title = "Q-Fest"
+		od2BGColor = "#235660"
+		od2Color = "#fff"
 		cinPlaylistID = "PLsxUDJzU4VKAAH1pOogbzJx7pZgd-2zOx"
 		channelURL = "//youtube.com/ury1350"
 
diff --git a/public/js/index.js b/public/js/index.js
index c1d08b2b..bc3a6a64 100644
--- a/public/js/index.js
+++ b/public/js/index.js
@@ -31,7 +31,7 @@ function getYoutubeFeed(playlistid, results, htmlid) {
             "</div>"
         );
       }
-      if (isIndex && htmlid === "#sessions-videos") {
+      if (htmlid === "#homepage-videos") {
         $(htmlid).append(
           '<div class="thumbnail-container col-10 col-sm-7 col-md-4 col-lg-3">' +
             "<a class=\"ury-card sessions link\" href='/ontap/'>" +
@@ -42,7 +42,7 @@ function getYoutubeFeed(playlistid, results, htmlid) {
             "</div>"
         );
       }
-      if (isOD && htmlid === "#sessions-videos") {
+      if (isOD && htmlid !== "#cin-videos") {
         $(htmlid).append(
           '<div class="thumbnail-container col-10 col-sm-7 col-md-4 col-lg-3">' +
             '<a class="ury-card sessions link" href="' +
@@ -66,7 +66,7 @@ function getYoutubeFeed(playlistid, results, htmlid) {
             "</div>"
         );
       }
-      if (isCIN && htmlid === "#cin-videos") {
+      if (!isCIN && htmlid === "#cin-videos") {
         $(htmlid).append(
           '<div class="thumbnail-container col-10 col-sm-7 col-md-4 col-lg-3">' +
             '<a class="ury-card cin link" href="' +
@@ -129,15 +129,22 @@ istorn2020Counter();
 //Youtube slideshow for index page
 function onGoogleLoad() {
   if (isIndex) {
-    getYoutubeFeed(youtubeSessionsPlaylistID, 7, "#sessions-videos");
+    if (youtubeHomepagePlaylistID) {
+      getYoutubeFeed(youtubeHomepagePlaylistID, 7, "#homepage-videos");
+    }
   }
   if (isOD) {
-    getYoutubeFeed(youtubeSessionsPlaylistID, 15, "#sessions-videos");
-  }
-  if (isIndex) {
-    getYoutubeFeed(youtubeCINPlaylistID, 7, "#cin-videos");
+    if (youtubeOD1PlaylistID) {
+      getYoutubeFeed(youtubeOD1PlaylistID, 15, "#od1-videos");
+    }
+    if (youtubeOD2PlaylistID) {
+      getYoutubeFeed(youtubeOD2PlaylistID, 15, "#od2-videos");
+    }
   }
-  if (isCIN) {
+  if (isOD && isCIN) {
     getYoutubeFeed(youtubeCINPlaylistID, 15, "#cin-videos");
   }
+  if (isIndex && isCIN) {
+    getYoutubeFeed(youtubeCINPlaylistID, 7, "#cin-videos");
+  }
 }
diff --git a/structs/config.go b/structs/config.go
index 4e25418a..5bcbf314 100644
--- a/structs/config.go
+++ b/structs/config.go
@@ -11,10 +11,10 @@ type Config struct {
 
 // Server is a structure containing server configuration.
 type Server struct {
-	Address     string `toml:"address"`
-	Port        int    `toml:"port"`
-	Timeout     int    `toml:"timeout"`
-	MyRadioAPI  string `toml:"myradio_api"`
+	Address    string `toml:"address"`
+	Port       int    `toml:"port"`
+	Timeout    int    `toml:"timeout"`
+	MyRadioAPI string `toml:"myradio_api"`
 }
 
 // PageContext is a structure containing static information to provide
@@ -63,10 +63,24 @@ type Page struct {
 }
 
 type youtube struct {
-	APIKey             string `toml:"apiKey"`
-	SessionsPlaylistID string `toml:"sessionsPlaylistID"`
-	CINPlaylistID      string `toml:"cinPlaylistID"`
-	ChannelURL         string `toml:"channelURL"`
+	APIKey              string `toml:"apiKey"`
+	HomepagePlaylistID  string `toml:"homepagePlaylistID"`
+	HomepageTitle       string `toml:"homepageTitle"`
+	HomepageDescription string `toml:"homepageDescription"`
+	HomepageBGColor     string `toml:"homepageBGColour"`
+	HomepageColor       string `toml:"homepageColor"`
+	OD1PlaylistID       string `toml:"od1PlaylistID"`
+	OD1Title            string `toml:"od1Title"`
+	OD1Description      string `toml:"od1Description"`
+	OD1BGColor          string `toml:"od1BGColor"`
+	OD1Color            string `toml:"od1Color"`
+	OD2PlaylistID       string `toml:"od2PlaylistID"`
+	OD2Title            string `toml:"od2Title"`
+	OD2Description      string `toml:"od2Description"`
+	OD2BGColor          string `toml:"od2BGColor"`
+	OD2Color            string `toml:"od2Color"`
+	CINPlaylistID       string `toml:"cinPlaylistID"`
+	ChannelURL          string `toml:"channelURL"`
 }
 
 type gmaps struct {
diff --git a/views/cin.tmpl b/views/cin.tmpl
index 13a9ca20..2fcc982b 100644
--- a/views/cin.tmpl
+++ b/views/cin.tmpl
@@ -45,8 +45,7 @@
 {{define "footer-scripts"}}
 <!-- Youtube slider script -->
 <script>
-var youtubeAPIKey = {{.PageContext.Youtube.APIKey}};
-var youtubeSessionsPlaylistID = "{{.PageContext.Youtube.SessionsPlaylistID}}";
+var youtubeAPIKey = "{{.PageContext.Youtube.APIKey}}";
 var youtubeCINPlaylistID = "{{.PageContext.Youtube.CINPlaylistID}}";
 var youtubeLink = "{{.PageContext.Youtube.ChannelURL}}";
 var isIndex = false;
diff --git a/views/index.tmpl b/views/index.tmpl
index d3511a07..fcacf704 100644
--- a/views/index.tmpl
+++ b/views/index.tmpl
@@ -51,7 +51,7 @@
   </div>
   {{end}}
   {{if .PageContext.CIN}}
-  <div id="index-videos" class="container-fluid container-padded pb-0 bg-cin">
+  <div id="index-cin" class="container-fluid container-padded pb-0 bg-cin">
     <h2 class="cin-text">URY Candidate Interview Night</h2>
     <div id="cin-videos" class="row scroll-horiz pb-3 custom-scrollbar-cin thumbnail-slider">
     </div>
@@ -87,9 +87,12 @@
     </div>
   </div>
   {{end}}
-  <div id="index-videos" class="container-fluid container-padded pb-0 bg-sessions">
-    <h2>URY Sessions</h2>
-    <div id="sessions-videos" class="row scroll-horiz pb-3 custom-scrollbar-music thumbnail-slider">
+  {{end}}
+  {{ if .PageContext.Youtube.HomepagePlaylistID }}
+  <div id="index-videos" class="container-fluid container-padded pb-0" style="background:{{.PageContext.Youtube.HomepageBGColor}};color:{{.PageContext.Youtube.HomepageColor}};">
+    <h2 class="d-inline">{{.PageContext.Youtube.HomepageTitle}}</h2>
+    <h3 class="d-inline ml-1">{{.PageContext.Youtube.HomepageDescription}}</h3>
+    <div id="homepage-videos" class="row scroll-horiz pb-3 custom-scrollbar-music thumbnail-slider">
     </div>
   </div>
   {{end}}
@@ -98,9 +101,10 @@
 {{define "footer-scripts"}}
 <!-- Youtube slider script -->
 <script>
-var youtubeAPIKey = {{.PageContext.Youtube.APIKey}};
-var youtubeSessionsPlaylistID = "{{.PageContext.Youtube.SessionsPlaylistID}}";
+var youtubeAPIKey = "{{.PageContext.Youtube.APIKey}}";
+var youtubeHomepagePlaylistID = "{{.PageContext.Youtube.HomepagePlaylistID}}";
 var youtubeCINPlaylistID = "{{.PageContext.Youtube.CINPlaylistID}}";
+var youtubeLink = "{{.PageContext.Youtube.ChannelURL}}";
 var isIndex = true;
 var isCIN = {{if .PageContext.CIN}}true{{else}}false{{end}};
 var isOD = false;
diff --git a/views/on_demand.tmpl b/views/on_demand.tmpl
index 7a659ec1..39d4dc97 100644
--- a/views/on_demand.tmpl
+++ b/views/on_demand.tmpl
@@ -53,7 +53,7 @@
   </div>
 </div>
 {{if .PageData.LatestPodcasts}}
-<div id="index-podcasts" class="container-fluid container-padded pb-0 bg-podcasts">
+<div class="container-fluid container-padded pb-0 bg-podcasts">
   <h2>Latest Podcasts</h2>
   <div class="row custom-scrollbar scroll-horiz thumbnail-slider">
     {{range .PageData.LatestPodcasts}}
@@ -77,23 +77,39 @@
   </div>
 </div>
 {{end}}
-<div id="index-videos" class="container-fluid container-padded bg-sessions">
+<!-- OD2 for current events (other than the regular sessions etc -->
+{{ if .PageContext.Youtube.OD2PlaylistID }}
+<div class="container-fluid container-padded" style="background:{{.PageContext.Youtube.OD2BGColor}};color:{{.PageContext.Youtube.OD2Color}};">
   <div class="row">
     <div class="col-12 col-md-8">
-      <a name="YouTube"></a><h2>URY Sessions</h2>
+      <h2 class="d-inline">{{.PageContext.Youtube.OD2Title}}</h2>
+      <h3 class="d-inline ml-1">{{.PageContext.Youtube.OD2Description}}</h3>
     </div>
   </div>
-  <div id="sessions-videos" class="row pb-3 thumbnail-grid">
+  <div id="od2-videos" class="row pb-3 thumbnail-grid">
   </div>
 </div>
 {{end}}
+{{ if .PageContext.Youtube.OD1PlaylistID }}
+<div class="container-fluid container-padded" style="background:{{.PageContext.Youtube.OD1BGColor}};color:{{.PageContext.Youtube.OD2Color}};">
+  <div class="row">
+    <div class="col-12 col-md-8">
+      <h2 class="d-inline">{{.PageContext.Youtube.OD1Title}}</h2>
+      <h3 class="d-inline ml-1">{{.PageContext.Youtube.OD1Description}}</h3>
+    </div>
+  </div>
+  <div id="od1-videos" class="row pb-3 thumbnail-grid">
+  </div>
+</div>
+{{end}}
+{{end}}
 
 {{define "footer-scripts"}}
 <!-- Youtube slider script -->
 <script>
-var youtubeAPIKey = {{.PageContext.Youtube.APIKey}};
-var youtubeSessionsPlaylistID = "{{.PageContext.Youtube.SessionsPlaylistID}}";
-var youtubeCINPlaylistID = "{{.PageContext.Youtube.CINPlaylistID}}";
+var youtubeAPIKey = "{{.PageContext.Youtube.APIKey}}";
+var youtubeOD1PlaylistID = "{{.PageContext.Youtube.OD1PlaylistID}}";
+var youtubeOD2PlaylistID = "{{.PageContext.Youtube.OD2PlaylistID}}";
 var youtubeLink = "{{.PageContext.Youtube.ChannelURL}}";
 var isIndex = false;
 var isCIN = false;

From 0a8e92a15c5ff2ce4ec70f3738b9ad57c878c676 Mon Sep 17 00:00:00 2001
From: Matthew Stratford <hi@mstratford.net>
Date: Sun, 4 Oct 2020 16:20:08 +0100
Subject: [PATCH 2/2] Fix a banner hard link while i'm here.

---
 views/elements/banner.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/elements/banner.tmpl b/views/elements/banner.tmpl
index 312411af..a4a0d594 100644
--- a/views/elements/banner.tmpl
+++ b/views/elements/banner.tmpl
@@ -12,7 +12,7 @@
       {{range $index, $Banners := .Banners}}
       <div class="carousel-item {{ if eq $index 0 }} active {{end}}">
         <a class="w-100" href="{{$Banners.Target}}">
-          <img class="d-block img-fluid" src="https://ury.org.uk{{$Banners.URL}}" alt="{{$Banners.Alt}}">
+          <img class="d-block img-fluid" src="{{$.PageContext.FullURL}}{{$Banners.URL}}" alt="{{$Banners.Alt}}">
         </a>
       </div>
       {{end}}