201623-site merge

.envrc

@@ -0,0 +1 @@
+use flake

.gitignore

@@ -30,3 +30,5 @@ public/css/*.scss.css
 .myradio.key
 config.toml
 public/css/*.scss.css.map
+
+.direnv/

Dockerfile

@@ -9,16 +9,15 @@ RUN set -e && \
     cp /usr/local/sassc-$SASS_VERSION/bin/sassc /usr/local/bin/sassc && \
     rm -rf /usr/local/sassc-$SASS_VERSION /usr/local/libsass-$SASS_VERSION
 
-RUN mkdir -p /go/src/github.com/UniversityRadioYork/2016-site
-WORKDIR /go/src/github.com/UniversityRadioYork/2016-site
+WORKDIR /usr/src/app
 
-COPY . /go/src/github.com/UniversityRadioYork/2016-site
+COPY . /usr/src/app/
 
-EXPOSE 3000
-
-RUN go get -d -v
+RUN go get
 
 ENV TZ "Europe/London"
 
+EXPOSE 3000
+
 ENTRYPOINT echo "\033[0;31mWARNING: \033[0mRunning with Docker will change \"localhost\" to \"0.0.0.0\" in your config. Remember to change it back!" && \
 sed -i 's/localhost/0.0.0.0/g' *.toml && make run

Makefile

@@ -20,10 +20,10 @@ build-sass: $(SASS_SRC)
 	$(SASS_COMPILER) $(MAIN_FILE) $(OUTPUT_FILE) -t compressed
 
 build-docker-image:
-	docker build -t 2016-site .
+	docker build -t 201623-site .
 
 docker:
-	docker run -it --rm -p 3000:3000 -v $$GOPATH/src/github.com/UniversityRadioYork/2016-site:/go/src/github.com/UniversityRadioYork/2016-site 2016-site
+	docker run -it --rm -p 3000:3000 -v .:/usr/src/app 201623-site
 
 clean:
 	rm -f $(OUTPUT_FILE) $(BINARY)

README.md

@@ -1,4 +1,4 @@
-# 2016-site #
+# 201623-site #
 
 ## How to install ##
 Full instructions for installation are available in the USING.md file.

USING.md

@@ -38,9 +38,9 @@ export GOPATH=~/go
 
 #### Pulling from git
 * Make sure GOPATH is set (`echo $GOPATH`)
-* `go get github.com/UniversityRadioYork/2016-site`
-    * This downloads 2016-site to ~/go/src/github.com/UniversityRadioYork/2016-site along with all necessary dependencies
-* To update your working copy of the repo, running `go get` in the 2016-site directory, but you can also checkout to a specific branch if required:
+* `go get github.com/UniversityRadioYork/201623-site`
+    * This downloads 201623-site to ~/go/src/github.com/UniversityRadioYork/201623-site along with all necessary dependencies
+* To update your working copy of the repo, running `go get` in the 201623-site directory, but you can also checkout to a specific branch if required:
     * `git checkout this-is-a-branch-name`
 
 #### Running the server =====
@@ -51,7 +51,7 @@ export GOPATH=~/go
 
 ### Editing files
 #### Ubuntu
-Trivial. Open a file editor and browse to ~/go/src/github.com/UniversityRadioYork/2016-site
+Trivial. Open a file editor and browse to ~/go/src/github.com/UniversityRadioYork/201623-site
 
 #### Windows
 * Windows likes to hide the actual files for the Ubuntu subsystem.

config.toml.example

@@ -64,7 +64,6 @@
 
 	[pageContext.youtube]
 		APIKey = "AIzaSyCzI5Gvpq1hPlfjvB81EVc0vLv_11eW7NI"
-		sessionsPlaylistID = "PLsxUDJzU4VKDudlmlYb-ImFKreFKAfFln"
 		cinPlaylistID = "PLsxUDJzU4VKAAH1pOogbzJx7pZgd-2zOx"
 		channelURL = "//youtube.com/ury1350"
 

controllers/about.go

@@ -0,0 +1,43 @@
+package controllers
+
+import (
+	"log"
+	"net/http"
+
+	"github.com/UniversityRadioYork/2016-site/models"
+	"github.com/UniversityRadioYork/2016-site/structs"
+	"github.com/UniversityRadioYork/2016-site/utils"
+	"github.com/UniversityRadioYork/myradio-go"
+)
+
+// AboutController is the controller for the about page.
+type AboutController struct {
+	Controller
+}
+
+// NewAboutController returns a new AboutController with the MyRadio session s
+// and configuration context c.
+func NewAboutController(s *myradio.Session, c *structs.Config) *AboutController {
+	return &AboutController{Controller{session: s, config: c}}
+}
+
+// Get handles the HTTP GET request r for the about us page, writing to w.
+func (aboutC *AboutController) Get(w http.ResponseWriter, r *http.Request) {
+	teamM := models.NewTeamModel(aboutC.session)
+	teams, err := teamM.GetAll()
+	if err != nil {
+		log.Println(err)
+		utils.RenderTemplate(w, aboutC.config.PageContext, nil, "404.tmpl")
+		return
+	}
+	data := struct {
+		Teams []myradio.Team
+	}{
+		Teams: teams,
+	}
+	err = utils.RenderTemplate(w, aboutC.config.PageContext, data, "about.tmpl")
+	if err != nil {
+		log.Println(err)
+		return
+	}
+}

controllers/index.go

@@ -19,7 +19,7 @@ type IndexController struct {
 type RenderData struct {
 	CurrentAndNext *myradio.CurrentAndNext
 	Banners        []myradio.Banner
-	Teams          []myradio.Team
+	Timeslots      []myradio.Timeslot
 	Podcasts       []myradio.Podcast
 	MsgBoxError    bool
 	ShowOnAir      bool
@@ -36,7 +36,7 @@ func (ic *IndexController) Get(w http.ResponseWriter, r *http.Request) {
 	// This is where any form params would be parsed
 	model := models.NewIndexModel(ic.session)
 
-	currentAndNext, banners, teams, podcasts, showOnAir, err := model.Get()
+	currentAndNext, banners, timeslots, podcasts, showOnAir, err := model.Get()
 
 	if err != nil {
 		log.Println(err)
@@ -46,7 +46,7 @@ func (ic *IndexController) Get(w http.ResponseWriter, r *http.Request) {
 	data := RenderData{
 		CurrentAndNext: currentAndNext,
 		Banners:        banners,
-		Teams:          teams,
+		Timeslots:      timeslots,
 		Podcasts:       podcasts,
 		ShowOnAir:      showOnAir,
 		MsgBoxError:    false,
@@ -64,7 +64,7 @@ func (ic *IndexController) Post(w http.ResponseWriter, r *http.Request) {
 	// Get all the data for the webpage
 	model := models.NewIndexModel(ic.session)
 
-	currentAndNext, banners, teams, podcasts, showOnAir, err := model.Get()
+	currentAndNext, banners, timeslots, podcasts, showOnAir, err := model.Get()
 
 	if err != nil {
 		log.Println(err)
@@ -74,7 +74,7 @@ func (ic *IndexController) Post(w http.ResponseWriter, r *http.Request) {
 	data := RenderData{
 		CurrentAndNext: currentAndNext,
 		Banners:        banners,
-		Teams:          teams,
+		Timeslots:      timeslots,
 		Podcasts:       podcasts,
 		ShowOnAir:      showOnAir,
 		MsgBoxError:    false,

controllers/static.go

@@ -19,15 +19,6 @@ func NewStaticController(c *structs.Config) *StaticController {
 	return &StaticController{Controller{config: c}}
 }
 
-// GetAbout handles the HTTP GET request r for the About page, writing to w.
-func (staticC *StaticController) GetAbout(w http.ResponseWriter, r *http.Request) {
-	err := utils.RenderTemplate(w, staticC.config.PageContext, nil, "about.tmpl")
-	if err != nil {
-		log.Println(err)
-		return
-	}
-}
-
 // GetContact handles the HTTP GET request r for the Contact page, writing to w.
 func (staticC *StaticController) GetContact(w http.ResponseWriter, r *http.Request) {
 	err := utils.RenderTemplate(w, staticC.config.PageContext, nil, "contact.tmpl")

controllers/team.go

@@ -51,24 +51,3 @@ func (teamC *TeamController) Get(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 }
-
-// GetAll handles the HTTP GET request r for the all teams page, writing to w.
-func (teamC *TeamController) GetAll(w http.ResponseWriter, r *http.Request) {
-	teamM := models.NewTeamModel(teamC.session)
-	teams, err := teamM.GetAll()
-	if err != nil {
-		log.Println(err)
-		utils.RenderTemplate(w, teamC.config.PageContext, nil, "404.tmpl")
-		return
-	}
-	data := struct {
-		Teams []myradio.Team
-	}{
-		Teams: teams,
-	}
-	err = utils.RenderTemplate(w, teamC.config.PageContext, data, "teams.tmpl")
-	if err != nil {
-		log.Println(err)
-		return
-	}
-}

flake.nix

@@ -0,0 +1,25 @@
+{
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+    flake-utils.url = "github:numtide/flake-utils";
+  };
+
+  outputs = { self, nixpkgs, flake-utils }:
+    flake-utils.lib.eachDefaultSystem(system:
+      let
+        pkgs = import nixpkgs {
+          inherit system;
+        };
+        inherit (pkgs) lib;
+      in
+      {
+        devShells.default = pkgs.mkShell {
+          nativeBuildInputs = with pkgs; [
+            sassc
+            gnumake
+            go
+          ];
+        };
+      }
+    );
+}

models/index.go

@@ -19,7 +19,7 @@ func NewIndexModel(s *myradio.Session) *IndexModel {
 //
 // On success, it returns the current and next show, and nil.
 // Otherwise, it returns undefined data and the error causing failure.
-func (m *IndexModel) Get() (currentAndNext *myradio.CurrentAndNext, banners []myradio.Banner, teams []myradio.Team, podcasts []myradio.Podcast, showOnAir bool, err error) {
+func (m *IndexModel) Get() (currentAndNext *myradio.CurrentAndNext, banners []myradio.Banner, timeslots []myradio.Timeslot, podcasts []myradio.Podcast, showOnAir bool, err error) {
 	currentAndNext, err = m.session.GetCurrentAndNext()
 	if err != nil {
 		return
@@ -28,12 +28,14 @@ func (m *IndexModel) Get() (currentAndNext *myradio.CurrentAndNext, banners []my
 	if err != nil {
 		return
 	}
-
-	teams, err = m.session.GetCurrentTeams()
+	timeslots, err = m.session.GetPreviousTimeslots(11)
 	if err != nil {
 		return
 	}
-
+	// If show currently on air, remove it from previous timeslots
+	if currentAndNext.Current.Id != 0 {
+		timeslots = timeslots[1:11]
+	}
 	//Get 10 podcasts from page 0 (the latest podcasts)
 	allpodcasts, err := m.session.GetAllPodcasts(10, 0, false)
 	if err != nil {

models/on_demand.go

@@ -24,12 +24,12 @@ func (m *OnDemandModel) GetLastMixcloudTimeslots() (timeslots []myradio.Timeslot
 	if err != nil {
 		return
 	}
-	currrentAndNext, err := m.session.GetCurrentAndNext()
+	currentAndNext, err := m.session.GetCurrentAndNext()
 	if err != nil {
 		return
 	}
 	// If show currently on air, remove it from previous timeslots
-	if currrentAndNext.Current.Id != 0 {
+	if currentAndNext.Current.Id != 0 {
 		timeslots = timeslots[1:11]
 	}
 	return