Skip to content

Commit

Permalink
Merge pull request #119 from spacenomads/update/links
Browse files Browse the repository at this point in the history
refactor: use the new vedeeo links and improve seasons block
  • Loading branch information
oneeyedman authored Jun 29, 2024
2 parents b9d4cb5 + d0da26d commit de7fa62
Show file tree
Hide file tree
Showing 8 changed files with 605 additions and 452 deletions.
933 changes: 541 additions & 392 deletions _src/_data/seasons.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion _src/_templates/partials/chuck/_header.njk
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<a href="https://www.twitch.tv/chuck_as_usual" class="social__link social__link--twitch">Canal en Twitch</a>
</li>
<li class="social__item">
<a href="https://www.youtube.com/playlist?list=PLO-mtrYE0827SRqJnPOOU1OQLbN_OZpT6" class="social__link social__link--youtube">Playlist en YoutTube</a>
<a href="https://veedeo.org/c/maquetando_con_chuck" class="social__link social__link--vedeeo">Canal en Vedeeo.org</a>
</li>
</ul>

Expand Down
16 changes: 16 additions & 0 deletions _src/_templates/partials/chuck/_playlist.njk
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<h3 class="chuck__readme-subtitle">{{ seasons[currentPlaylist].playList.name }}</h3>

<ol class="chuck__readme-videos">
{% for video in seasons[currentPlaylist].items %}
<li class="chuck__readme-video">
<div class="video">
<strong class="video__name">{{video.name}}</strong> |
{% for item in video.videos %}
<a href="{{item.link}}" class="video__link">Video{{' ' + loop.index if video.videos.length > 1 else ''}}
<time class="video__duration" datetime="{{item.time}}">{{item.duration}}</time>
</a>{{'' if loop.last else ', '}}
{% endfor %}
</div>
</li>
{% endfor %}
</ol>
51 changes: 9 additions & 42 deletions _src/_templates/partials/chuck/_readme.njk
Original file line number Diff line number Diff line change
Expand Up @@ -12,54 +12,21 @@

<div class="chuck__readme-block">
<h2 class="chuck__readme-subtitle">Sesiones</h2>
<p>Durante unos días los vídeos seguirán en el <a href="https://twitch.tv/chuck_as_usual">canal de Twitch</a> pero luego los dejaré subidos en <a href="https://www.youtube.com/c/chuck-as-usual">mi canal de Youtube</a>, recogidos además en <a href="https://www.youtube.com/playlist?list=PLO-mtrYE0827SRqJnPOOU1OQLbN_OZpT6">esta playlist</a>.</p>
<p>Durante unos días los vídeos seguirán en el <a href="https://twitch.tv/chuck_as_usual">canal de Twitch</a> pero luego los dejaré subidos en <a href="{{ seasons.channel.link }}">mi canal de {{ seasons.channel.platform.name }}</a>, recogidos además en <a href="{{ seasons.channel.playlists }}">estas playlists</a>.</p>

<p>Y todo el código estará en abierto en un <a href="https://github.com/oneeyedman/maquetando-con-chuck">repo de Github</a></p>
<p>Y todo el código estará en abierto en un <a href="https://github.com/oneeyedman/maquetando-con-chuck">repo de Github</a> (pronto lo moveré a Codeberg).</p>

<h3 class="chuck__readme-subtitle">Temporada 3</h3>
<p>De postre, en la temporada 3 hay una pequeña subserie de <a href="{{ seasons.s3emailResponsive.playList.link }}">maquetación de email responsive</a>.</p>

<ol class="chuck__readme-videos">
{% for video in seasons.s3 %}
<li class="chuck__readme-video">
<div class="video">
<strong class="video__name">{{video.name}}</strong> |
{% for item in video.videos %}
<a href="{{item.link}}" class="video__link">Video{{' ' + loop.index if video.videos.length > 1 else ''}} <time class="video__duration" datetime="{{item.time}}">{{item.duration}}</time></a>{{'' if loop.last else ', '}}
{% endfor %}
</div>
</li>
{% endfor %}
</ol>
{% set currentPlaylist = 's3'%}
{% include "partials/chuck/_playlist.njk" %}

<h3 class="chuck__readme-subtitle">Temporada 2</h3>
{% set currentPlaylist = 's2'%}
{% include "partials/chuck/_playlist.njk" %}

<ol class="chuck__readme-videos">
{% for video in seasons.s2 %}
<li class="chuck__readme-video">
<div class="video">
<strong class="video__name">{{video.name}}</strong> |
{% for item in video.videos %}
<a href="{{item.link}}" class="video__link">Video{{' ' + loop.index if video.videos.length > 1 else ''}} <time class="video__duration" datetime="{{item.time}}">{{item.duration}}</time></a>{{'' if loop.last else ', '}}
{% endfor %}
</div>
</li>
{% endfor %}
</ol>
{% set currentPlaylist = 's1'%}
{% include "partials/chuck/_playlist.njk" %}

<h3 class="chuck__readme-subtitle">Temporada 1</h3>

<ol class="chuck__readme-videos">
{% for video in seasons.s1 %}
<li class="chuck__readme-video">
<div class="video">
<strong class="video__name">{{video.name}}</strong> |
{% for item in video.videos %}
<a href="{{item.link}}" class="video__link">Video{{' ' + loop.index if video.videos.length > 1 else ''}} <time class="video__duration" datetime="{{item.time}}">{{item.duration}}</time></a>{{'' if loop.last else ', '}}
{% endfor %}
</div>
</li>
{% endfor %}
</ol>
</div>

<div class="chuck__readme-block">
Expand Down
6 changes: 4 additions & 2 deletions _src/assets/_scss/components/chuck/_social.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
}

.social__link {
background: img('sprite-social-header.svg', $chuck) left top no-repeat rgba($color-chuck, .05);
background: img('sprite-social-header-2.svg', $chuck) left top no-repeat rgba($color-chuck, .05);
background-size: auto rem(40);
border-radius: rem(3);
display: block;
height: rem(1);
Expand All @@ -32,6 +33,7 @@
background-position: rem(40 * -2) top;
}

.social__link--youtube {
.social__link--youtube,
.social__link--vedeeo {
background-position: rem(40 * -3) top;
}
30 changes: 16 additions & 14 deletions _src/assets/css/main.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion _src/assets/css/main.css.map

Large diffs are not rendered by default.

17 changes: 17 additions & 0 deletions _src/assets/img/maquetando-con-chuck/sprite-social-header-2.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit de7fa62

Please sign in to comment.