diff --git a/config/filters/index.js b/config/filters/index.js index 38e5f1c..d4b1f5e 100644 --- a/config/filters/index.js +++ b/config/filters/index.js @@ -88,7 +88,9 @@ export const filterCatalogueTags = (tags) => { export const limit = (collection, limit = 5) => collection.slice(0, limit); export const filterFavourites = (collection) => { - return collection.filter((item) => item.data.favourite); + return collection.filter( + (item) => item.data.favourite || item.data.isFavourite, + ); }; export const isOld = (dateArg) => { diff --git a/src/_includes/layouts/show.html b/src/_includes/layouts/show.html new file mode 100644 index 0000000..6d0e25b --- /dev/null +++ b/src/_includes/layouts/show.html @@ -0,0 +1,62 @@ +--- +layout: "layouts/base" +--- + +{% from "macros/date.njk" import format %} +{% from "macros/utils.njk" import stars %} + + {% include "svgs/arrow-left.svg" %} +Back to watching +
+
+ +
+
+
+

{{ title }}

+
+ {% if subtitle %}

{{ subtitle }}

{% endif %} + {% if director %} +

+ Directed by{{ director }} +

+ {% endif %} + {% if watchHistory %}

{{ format(watchHistory | last) }}

{% endif %} + {% if rating %}{{ stars(rating) }}{% endif %} + +
+
+{% if watchHistory.length > 1 %} +

+ {% include "svgs/circle-info.svg" %} + I've seen this movie {{ watchHistory.length }} {{ "time" | pluralize(watchHistory) }}! +

+{% endif %} +{% if favourite %} +

+ {% include "svgs/star.svg" %} + This is one of my favourite movies! +

+{% endif %} +{% if content %} +
+
+ {{ content | safe }} +
+{% endif %} diff --git a/src/pages/watching/favourites.html b/src/pages/watching/favourites/movies.html similarity index 87% rename from src/pages/watching/favourites.html rename to src/pages/watching/favourites/movies.html index 49bfeec..06949bb 100644 --- a/src/pages/watching/favourites.html +++ b/src/pages/watching/favourites/movies.html @@ -1,5 +1,5 @@ --- -permalink: "watching/favourites/index.html" +permalink: "watching/favourites/movies/index.html" --- {% from "macros/media-grid.njk" import grid %} diff --git a/src/pages/watching/favourites/shows.html b/src/pages/watching/favourites/shows.html new file mode 100644 index 0000000..416c06a --- /dev/null +++ b/src/pages/watching/favourites/shows.html @@ -0,0 +1,14 @@ +--- +permalink: "watching/favourites/shows/index.html" +--- + +{% from "macros/media-grid.njk" import grid %} +{% set data = collections.tv | filterFavourites | reverse %} + + {% include "svgs/arrow-left.svg" %} +Back to watching +
+

Favourite shows

+

A collection of my favourite shows!

+ {{ grid(data) }} +
diff --git a/src/pages/watching/index.html b/src/pages/watching/index.html index 457a828..b90c5b4 100644 --- a/src/pages/watching/index.html +++ b/src/pages/watching/index.html @@ -3,26 +3,28 @@ permalink: "watching/index.html" --- {% from "macros/media-grid.njk" import grid %} -{% set data = collections.movie | reverse | limit(5) %} -{% set favourites = collections.movie | filterFavourites | reverse | limit(5) %} +{% set movies = collections.movie | reverse | limit(5) %} +{% set shows = collections.tv | reverse | limit(5) %} +{% set favouriteMovies = collections.movie | filterFavourites | reverse | limit(5) %} +{% set favouriteShows = collections.tv | filterFavourites | reverse | limit(5) %} {% set yearsData = collections.moviesByYear | values | reverse %}

Watching

-

A collection of movies I've seen over the years.

-

Browse by year watched

- +

A collection of movies and shows I've seen.

- Latest movies + Latest movies

- {{ grid(data) }} + {{ grid(movies) }}

- Favourite movies + Latest shows

- {{ grid(favourites) }} + {{ grid(shows) }} +

+ Favourite movies +

+ {{ grid(favouriteMovies) }} +

+ Favourite shows +

+ {{ grid(favouriteShows) }}
diff --git a/src/pages/watching/recent.html b/src/pages/watching/recent/movies.html similarity index 80% rename from src/pages/watching/recent.html rename to src/pages/watching/recent/movies.html index e52f376..5ccefce 100644 --- a/src/pages/watching/recent.html +++ b/src/pages/watching/recent/movies.html @@ -1,5 +1,5 @@ --- -permalink: "watching/recent/index.html" +permalink: "watching/recent/movies/index.html" --- {% from "macros/media-grid.njk" import grid %} @@ -8,7 +8,7 @@ permalink: "watching/recent/index.html" {% include "svgs/arrow-left.svg" %} Back to watching
-

Recently watched

+

Recently movies

A collection of movies I've seen recently.

{{ grid(data) }}
diff --git a/src/pages/watching/recent/shows.html b/src/pages/watching/recent/shows.html new file mode 100644 index 0000000..3f0c61d --- /dev/null +++ b/src/pages/watching/recent/shows.html @@ -0,0 +1,14 @@ +--- +permalink: "watching/recent/shows/index.html" +--- + +{% from "macros/media-grid.njk" import grid %} +{% set data = collections.tv | reverse %} + + {% include "svgs/arrow-left.svg" %} +Back to watching +
+

Recently shows

+

A collection of shows I've seen recently.

+ {{ grid(data) }} +
diff --git a/src/pages/watching/year.html b/src/pages/watching/year.html deleted file mode 100644 index 2cfb0f7..0000000 --- a/src/pages/watching/year.html +++ /dev/null @@ -1,21 +0,0 @@ ---- -pagination: - data: collections.moviesByYear - size: 1 - alias: year - resolve: values -permalink: "movies/year/{{ year.value }}/index.html" ---- - -{% from "macros/media-grid.njk" import grid %} -{% set data = year.data | reverse %} -
- - {% include "svgs/arrow-left.svg" %} - Back to watching -

Watched in {{ year.value }}

-

- A collection of movies I saw in {{ year.value }}. -

- {{ grid(data) }} -
diff --git a/src/shows/2025-01-20-solo-leveling.md b/src/shows/2025-01-20-solo-leveling.md new file mode 100644 index 0000000..d5a6eb4 --- /dev/null +++ b/src/shows/2025-01-20-solo-leveling.md @@ -0,0 +1,22 @@ +--- +date: 2025-01-20 +title: Solo Leveling +releaseYear: 2024 +tags: + - anime + - drama + - action +image: https://cdn.wonderfulfrog.com/images/tv/solo-leveling-poster.jpg +pullquote: Going from the weakest to the strongest, by grinding mobs. +watchHistory: +rating: 5 +isFavourite: true +hasSpoilers: false +thetvdb: https://thetvdb.com/series/solo-leveling +--- + +It feels like I haven’t enjoyed an anime since around 2018 (besides occasionally following _One Piece_). This is the first in a long time where I felt invested and interested! + +I find the story engaging and paced well, each episode is progressing the overarching plot but with smaller stories in each episode. + +My only gripe would be that the violence and gore can be excessive. I know this is a common trope in anime - but even with that in mind it tends toward gratuitous at times. diff --git a/src/shows/shows.11tydata.js b/src/shows/shows.11tydata.js new file mode 100644 index 0000000..5d964b4 --- /dev/null +++ b/src/shows/shows.11tydata.js @@ -0,0 +1,5 @@ +export default { + layout: "layouts/show", + permalink: "shows/{{ page.fileSlug }}/index.html", + tags: "tv", +};