From cf57f29f166e1b885740efb3d9b18dd66750aab9 Mon Sep 17 00:00:00 2001
From: Hugo Peixoto <hugo.peixoto@gmail.com>
Date: Thu, 6 Jan 2022 14:22:03 +0000
Subject: [PATCH] Organiza eventos no site de forma melhorzita

---
 themes/academic/layouts/eventos/list.html    | 53 ++++++--------------
 themes/academic/layouts/index.html           |  1 +
 themes/academic/layouts/partials/evento.html | 34 +++++++++++++
 3 files changed, 51 insertions(+), 37 deletions(-)
 create mode 100644 themes/academic/layouts/partials/evento.html

diff --git a/themes/academic/layouts/eventos/list.html b/themes/academic/layouts/eventos/list.html
index 081d2cb..dec086a 100644
--- a/themes/academic/layouts/eventos/list.html
+++ b/themes/academic/layouts/eventos/list.html
@@ -1,45 +1,24 @@
 {{- define "main" -}}
 
-<h1 class='events-list-title body-width'>Eventos</h1>
+<h1 class='events-list-title body-width'>Próximos eventos</h2>
 
+{{ $query := where site.RegularPages "Type" "eventos" }}
+{{ $query = where $query "Params.metadata.event.date.finish" ">=" (now.Format "2006-01-02") }}
+{{ $query = sort $query "Params.metadata.event.date.start" }}
 <ul class="events-list body-width">
-  {{ $paginator := .Paginate (.Data.Pages.ByParam "metadata.event.date.start").Reverse }}
+  {{ range $query }}
+    <li>{{ partial "evento" . }}</li>
+  {{ end }}
+</ul>
+
+<h1 class='events-list-title body-width'>Eventos antigos</h2>
+<ul class="events-list body-width">
+  {{ $query := where site.RegularPages "Type" "eventos" }}
+  {{ $query = where $query "Params.metadata.event.date.finish" "<" (now.Format "2006-01-02") }}
+  {{ $query = sort $query "Params.metadata.event.date.start" "desc" }}
+  {{ $paginator := .Paginate $query }}
   {{ range $paginator.Pages }}
-    <li>
-      <a class="img" href="{{ .Permalink }}">
-        {{ $cover := (index (.Resources.ByType "image") 0) }}
-        {{ if not $cover }}
-          {{ $cover = resources.Get "images/default-events-cover.png" }}
-        {{ end }}
-        <img class='event-cover' src="{{ $cover.Permalink }}" />
-      </a>
-      <div class="text">
-        <p class="headline">
-          <a class="title" href="{{ .Permalink }}">{{ .Title }}</a>
-        </p>
-        <p class="subheader">
-          <span class="date">
-            {{ with .Params.metadata.event.date }}
-              {{ if eq (time.Format "2 January 2006" .start) (time.Format "2 January 2006" .finish) }}
-                {{ if eq (time.Format "15:04" .start) (time.Format "15:04" .finish) }}
-                  {{ time.Format "2 de January de 2006" .start }}
-                {{ else }}
-                  {{ time.Format "2 de January de 2006" .start }} das
-                  {{ time.Format "15:04" .start }} às
-                  {{ time.Format "15:04" .finish }}
-                {{ end }}
-              {{ else if eq (time.Format "January 2006" .start) (time.Format "January 2006" .finish) }}
-                De {{ time.Format "2" .start }} a {{ time.Format "2 de January de 2006" .finish }}
-              {{ else }}
-                De {{ time.Format "2 de January de 2006" .start }} a {{ time.Format "2 de January de 2006" .finish }}
-              {{ end }}
-            {{ end }}
-          </span>
-          &mdash;
-          <span class='location'>{{ .Params.metadata.event.location }}</span>
-        </p>
-      </div>
-    </li>
+    <li>{{ partial "evento" . }}</li>
   {{ end }}
 
   {{ partial "pagination" . }}
diff --git a/themes/academic/layouts/index.html b/themes/academic/layouts/index.html
index 60cd79d..d7014ce 100644
--- a/themes/academic/layouts/index.html
+++ b/themes/academic/layouts/index.html
@@ -74,6 +74,7 @@
       <ul class='events-list body-width'>
         {{ $query := where site.RegularPages "Type" "eventos" }}
         {{ $query = where $query "Params.metadata.event.date.finish" ">=" (now.Format "2006-01-02") }}
+        {{ $query = sort $query "Params.metadata.event.date.start" }}
         {{ $query = first 3 $query }}
 
         {{ range $post := $query }}
diff --git a/themes/academic/layouts/partials/evento.html b/themes/academic/layouts/partials/evento.html
new file mode 100644
index 0000000..52be41d
--- /dev/null
+++ b/themes/academic/layouts/partials/evento.html
@@ -0,0 +1,34 @@
+<a class="img" href="{{ .Permalink }}">
+  {{ $cover := (index (.Resources.ByType "image") 0) }}
+  {{ if not $cover }}
+    {{ $cover = resources.Get "images/default-events-cover.png" }}
+  {{ end }}
+  <img class='event-cover' src="{{ $cover.Permalink }}" />
+</a>
+<div class="text">
+  <p class="headline">
+    <a class="title" href="{{ .Permalink }}">{{ .Title }}</a>
+  </p>
+  <p class="subheader">
+    <span class="date">
+      {{ with .Params.metadata.event.date }}
+        {{ if eq (time.Format "2 January 2006" .start) (time.Format "2 January 2006" .finish) }}
+          {{ if eq (time.Format "15:04" .start) (time.Format "15:04" .finish) }}
+            {{ time.Format "2 de January de 2006" .start }}
+          {{ else }}
+            {{ time.Format "2 de January de 2006" .start }} das
+            {{ time.Format "15:04" .start }} às
+            {{ time.Format "15:04" .finish }}
+          {{ end }}
+        {{ else if eq (time.Format "January 2006" .start) (time.Format "January 2006" .finish) }}
+          De {{ time.Format "2" .start }} a {{ time.Format "2 de January de 2006" .finish }}
+        {{ else }}
+          De {{ time.Format "2 de January de 2006" .start }} a {{ time.Format "2 de January de 2006" .finish }}
+        {{ end }}
+      {{ end }}
+    </span>
+    &mdash;
+    <span class='location'>{{ .Params.metadata.event.location }}</span>
+  </p>
+</div>
+