New genre overview

components/genres.pixy

@@ -1,15 +1,20 @@
 component GenreOverview
+	// TODO: Add this to the stylus file later
+	style!= "h2{ text-align: center; } .light-button{ display: inline-block; }"
 	section
 		header
 			h2 Genres
 		
-		each genre in Genres
+		div
-			p
+			each genre in Genres
-				a(href="/genres/" + arn.FixGenre(genre))
+				a.light-button.ajax(href="/genres/" + arn.FixGenre(genre))
 					Icon(GenreIcons[genre])
 					span= genre
 
 component AnimeInGenre(genre string, animeList []*arn.Anime)
-	h2= genre
+	style!= "h2 { text-align: center; } .genre-anime-list{ display: flex; flex-flow: row wrap; float: none !important; justify-content: center; } .genre-anime-image{ width: 16vw; height: 9vw; min-width: 100px; min-height: 141px; max-width: 200px; max-height: 282px; object-fit: cover; } .genre-anime-link{ margin: 0.5em; flex-grow: 0; flex-shrink: 0; }"
-	each anime in animeList
+	h2= "#" + genre
-		p= anime.Title.Romaji + " (" + s(anime.Watching) + ")"
+	.genre-anime-list
+		each anime in animeList
+			a.genre-anime-link.ajax(href="/anime/" + s(anime.ID))
+				img.anime-image.genre-anime-image(src=anime.Image, alt=anime.Title.Romaji, title=anime.Title.Romaji + " (" + s(anime.Watching) + ")")

components/layout.pixy

@@ -5,20 +5,29 @@ component Layout(content string, css string)
 			style!= css
 		body
 			#container
-				#header-container
+				Header
-					#header.header-logged-in
+				Content(content)
-						nav#navigation
-							a.navigation-link.navigation-link-left.ajax(href="/")
-								.navigation-button
-									i.fa.fa-dashboard
-									span.navigation-text Dash
-				#content-container
-					main#content.fade!= content
 			
 			LoadingAnimation
 			
 			script(src="/scripts.js")
 
+component Header
+	#header-container
+		#header.header-logged-in
+			Navigation
+
+component Content(content string)
+	#content-container
+		main#content.fade!= content
+
+component Navigation
+	nav#navigation
+		a.navigation-link.navigation-link-left.ajax(href="/")
+			.navigation-button
+				i.fa.fa-dashboard
+				span.navigation-text Dash
+
 component LoadingAnimation
 	#loading-animation.sk-cube-grid.fade
 		.sk-cube.sk-cube1

helper.go

@@ -4,7 +4,7 @@ import "fmt"
 
 // Converts anything into a string
 func s(v interface{}) string {
-	return fmt.Sprintf("%v", v)
+	return fmt.Sprint(v)
 }
 
 // Contains ...

main.go

@@ -23,15 +23,71 @@ func main() {
 	scripts, _ := ioutil.ReadFile("scripts.js")
 	js := string(scripts)
 
-	app.Get("/", func(ctx *aero.Context) {
+	// Define layout
-		ctx.HTML(Render.Layout(Render.Dashboard(), css))
+	app.Layout = func(ctx *aero.Context, content string) string {
+		return Render.Layout(content, css)
+	}
+
+	app.Register("/", func(ctx *aero.Context) string {
+		return ctx.HTML(Render.Dashboard())
 	})
 
-	app.Get("/_/", func(ctx *aero.Context) {
+	app.Register("/genres", func(ctx *aero.Context) string {
-		ctx.HTML(Render.Dashboard())
+		return ctx.HTML(Render.GenreOverview())
 	})
 
-	app.Get("/all/anime", func(ctx *aero.Context) {
+	type GenreInfo struct {
+		Genre     string       `json:"genre"`
+		AnimeList []*arn.Anime `json:"animeList"`
+	}
+
+	app.Register("/genres/:name", func(ctx *aero.Context) string {
+		genreName := ctx.Params.ByName("name")
+		genreInfo := new(GenreInfo)
+
+		err := arn.GetObject("Genres", genreName, genreInfo)
+
+		if err != nil {
+			return err.Error()
+		}
+
+		return ctx.HTML(Render.AnimeInGenre(genreInfo.Genre, genreInfo.AnimeList))
+
+		// var animeList []*arn.Anime
+		// results := make(chan *arn.Anime)
+		// arn.Scan("Anime", results)
+
+		// for anime := range results {
+		// 	genres := Map(anime.Genres, arn.FixGenre)
+		// 	if Contains(genres, genreName) {
+		// 		animeList = append(animeList, anime)
+		// 	}
+		// }
+
+		// return ctx.HTML(Render.AnimeInGenre(genreName, animeList))
+	})
+
+	app.Register("/anime/:id", func(ctx *aero.Context) string {
+		id, _ := strconv.Atoi(ctx.Params.ByName("id"))
+		anime, err := arn.GetAnime(id)
+
+		if err != nil {
+			return ctx.Text("Anime not found")
+		}
+
+		return ctx.HTML(Render.Anime(anime))
+	})
+
+	// ---------------------------------------------------------------
+	// API
+	// ---------------------------------------------------------------
+
+	app.Get("/scripts.js", func(ctx *aero.Context) string {
+		ctx.SetHeader("Content-Type", "application/javascript")
+		return js
+	})
+
+	app.Get("/all/anime", func(ctx *aero.Context) string {
 		start := time.Now()
 		var titles []string
 
@@ -43,85 +99,29 @@ func main() {
 		}
 		sort.Strings(titles)
 
-		ctx.Text(s(len(titles)) + " anime fetched in " + s(time.Since(start)) + "\n\n" + strings.Join(titles, "\n"))
+		return ctx.Text(s(len(titles)) + " anime fetched in " + s(time.Since(start)) + "\n\n" + strings.Join(titles, "\n"))
 	})
 
-	app.Get("/anime/:id", func(ctx *aero.Context) {
+	app.Get("/api/anime/:id", func(ctx *aero.Context) string {
 		id, _ := strconv.Atoi(ctx.Params.ByName("id"))
 		anime, err := arn.GetAnime(id)
 
 		if err != nil {
-			ctx.Text("Anime not found")
+			return ctx.Text("Anime not found")
-			return
 		}
 
-		ctx.HTML(Render.Layout(Render.Anime(anime), css))
+		return ctx.JSON(anime)
 	})
 
-	app.Get("/_/anime/:id", func(ctx *aero.Context) {
+	app.Get("/api/users/:nick", func(ctx *aero.Context) string {
-		id, _ := strconv.Atoi(ctx.Params.ByName("id"))
-		anime, err := arn.GetAnime(id)
-
-		if err != nil {
-			ctx.Text("Anime not found")
-			return
-		}
-
-		ctx.HTML(Render.Anime(anime))
-	})
-
-	app.Get("/api/anime/:id", func(ctx *aero.Context) {
-		id, _ := strconv.Atoi(ctx.Params.ByName("id"))
-		anime, err := arn.GetAnime(id)
-
-		if err != nil {
-			ctx.Text("Anime not found")
-			return
-		}
-
-		ctx.JSON(anime)
-	})
-
-	app.Get("/api/users/:nick", func(ctx *aero.Context) {
 		nick := ctx.Params.ByName("nick")
 		user, err := arn.GetUserByNick(nick)
 
 		if err != nil {
-			ctx.Text("User not found")
+			return ctx.Text("User not found")
-			return
 		}
 
-		ctx.JSON(user)
+		return ctx.JSON(user)
-	})
-
-	app.Get("/genres", func(ctx *aero.Context) {
-		ctx.HTML(Render.Layout(Render.GenreOverview(), css))
-	})
-
-	app.Get("/_/genres", func(ctx *aero.Context) {
-		ctx.HTML(Render.GenreOverview())
-	})
-
-	app.Get("/genres/:name", func(ctx *aero.Context) {
-		genreName := ctx.Params.ByName("name")
-
-		var animeList []*arn.Anime
-		results := make(chan *arn.Anime)
-		arn.Scan("Anime", results)
-
-		for anime := range results {
-			genres := Map(anime.Genres, arn.FixGenre)
-			if Contains(genres, genreName) {
-				animeList = append(animeList, anime)
-			}
-		}
-
-		ctx.HTML(Render.Layout(Render.AnimeInGenre(genreName, animeList), css))
-	})
-
-	app.Get("/scripts.js", func(ctx *aero.Context) {
-		ctx.SetHeader("Content-Type", "application/javascript")
-		ctx.Respond(js)
 	})
 
 	app.Run()