Merge branch 'main' into LuNeder-plantoes-new

gelos-icmc · Aug 20, 2024 · 59568ee · 59568ee · gelos-bot · Aug 20, 2024
2 parents 42b9aa3 + 9537d5b
commit 59568ee
Show file tree

Hide file tree

Showing 53 changed files with 171 additions and 84 deletions.
diff --git a/src/_data/project_states.yml b/src/_data/project_states.yml
@@ -1,4 +1,5 @@
-wip: Em concepção
-current: Em andamento
-suspended: Suspenso
-completed: Concluído
+permanent: Permanente 🌲
+in_progress: Em andamento ⏳
+wip: Em concepção 💭
+finished: Finalizado ✅
+suspended: Suspenso 🛑
diff --git a/src/_includes/listagem.html b/src/_includes/listagem.html
@@ -1,4 +1,4 @@
-<article class="listing">
+<article class="listing" id="{{ post.slug }}">
   <header>
     <{{ include.element | default: "h2" }}>
       <a href="{{ post.url | relative_url }}">{{ post.title }}</a>
@@ -13,7 +13,13 @@
       {% endif %}
 
       {% if post.author %}
-        | <strong>{{ post.author }}</strong>
+        | {% include person.html name=post.author %}
+      {% elsif post.authors %}
+        |
+        {% for author in post.authors %}
+          {% include person.html short=true name=author -%}
+          {%- unless forloop.last %}, {% endunless %}
+        {%- endfor -%}
       {% endif %}
     </p>
   </header>

diff --git a/src/_includes/person.html b/src/_includes/person.html
@@ -0,0 +1,14 @@
+{% assign slug = include.name | slugify: "latin" %}
+{% assign member = site.members | find: "slug",slug %}
+
+{%- if member -%}
+  <a href="{{ member.url }}">
+    {%- if member.nickname -%}
+      {{- member.nickname -}}
+    {%- else -%}
+      {{- member.title -}}
+    {%- endif -%}
+  </a>
+{%- else -%}
+  {{- include.name -}}
+{%- endif -%}
diff --git a/src/_layouts/article.html b/src/_layouts/article.html
@@ -8,22 +8,33 @@ <h1>{{ page.title }}</h1>
 
     <blockquote>
       {% if page.date and page.show_date %}
-        <p>Data: <strong>{{ page.date | date: "%d/%m/%y" }}</strong></p>
+        <p><strong>Data</strong>: {{ page.date | date: "%d/%m/%y" }}</p>
       {% endif %}
       {% if page.author %}
-        <p>Autor: <strong>{{ page.author }}</strong></p>
+        <p><strong>Autor</strong>:
+            {% include person.html name=page.author %}
+        </p>
+      {% elsif page.authors %}
+        <ul><strong>Autores</strong>:
+          {% for author in page.authors %}
+            <li>
+              {%- include person.html name=author -%}
+            </li>
+          {% endfor %}
+        </ul>
       {% endif %}
       {% if page.state %}
-        <p>Status:
-          <strong>{{ site.data.project_states[page.state] | default: "Desconhecido" }}</strong>
+        <p><strong>Status</strong>:
+          {{ site.data.project_states[page.state] | default: "Desconhecido" }}
         </p>
       {% endif %}
 
       {% if page.attendees %}
-      <ul class="attendance">
-        Presentes:
+      <ul><strong>Presentes</strong>:
         {% for attendee in page.attendees %}
-          <li>{{ attendee }}</li>
+          <li>
+            {%- include person.html name=attendee -%}
+          </li>
         {% endfor %}
       </ul>
       {% endif %}
@@ -35,3 +46,4 @@ <h1>{{ page.title }}</h1>
 
   {{ content }}
 </article>
+
diff --git a/src/_meetings/2021-10-20-ata.md b/src/_meetings/2021-10-20-ata.md
@@ -6,7 +6,7 @@ attendees:
     - Deandreson
     - Elisa
     - Gabriel
-    - Guilherme
+    - guip
     - Lucas Caetano
     - Tomieiro
     - Monaco

diff --git a/src/_meetings/2021-10-27-ata.md b/src/_meetings/2021-10-27-ata.md
@@ -8,7 +8,7 @@ attendees:
     - Deandreson
     - Elisa
     - Gabriel
-    - Guilherme
+    - guip
     - Lucas Caetano
     - Matheus Vieira
     - Monaco

diff --git a/src/_meetings/2021-11-17-ata.md b/src/_meetings/2021-11-17-ata.md
@@ -6,7 +6,7 @@ attendees:
     - Deandreson
     - Elisa
     - Gabriel
-    - Guilherme
+    - guip
     - Lucas Caetano
     - Matheus Vieira
     - Silmar

diff --git a/src/_meetings/2022-01-05-ata.md b/src/_meetings/2022-01-05-ata.md
@@ -5,7 +5,7 @@ attendees:
     - Gabriel
     - Matheus Vieira
     - Elisa
-    - Guilherme
+    - guip
     - Lucas Caetano
 ---
 

diff --git a/src/_meetings/2022-01-12-ata.md b/src/_meetings/2022-01-12-ata.md
@@ -7,7 +7,7 @@ attendees:
     - Elisa
     - Silmar
     - Monaco
-    - Guilherme
+    - guip
     - Matheus Vieira
     - Gabriel
 ---

diff --git a/src/_meetings/2022-03-09-ata.md b/src/_meetings/2022-03-09-ata.md
@@ -8,7 +8,7 @@ attendees:
     - Monaco
     - Charles
     - Lucas Caetano
-    - Guilherme
+    - guip
     - Tomieiro
     - Silmar
     - Fernando

diff --git a/src/_meetings/2022-04-11-ata.md b/src/_meetings/2022-04-11-ata.md
@@ -1,12 +1,12 @@
 ---
 title: Ata - Reunião 11/04/2022
-author: Guilherme
+author: guip
 attendees:
     - Deandreson
     - Elisa
     - Monaco
     - Gabriel
-    - Guilherme
+    - guip
     - Setembru
     - Lucas Caetano
     - Tomieiro

diff --git a/src/_meetings/2022-04-18-ata.md b/src/_meetings/2022-04-18-ata.md
@@ -6,7 +6,7 @@ attendees:
     - Elisa
     - Tomieiro
     - Lucas Caetano
-    - Guilherme
+    - guip
     - Deandreson
     - Setembru
     - João Paulo

diff --git a/src/_meetings/2022-04-27-ata.md b/src/_meetings/2022-04-27-ata.md
@@ -1,8 +1,8 @@
 ---
 title: Ata - Reunião 27/04/2022
-author: Guilherme
+author: guip
 attendees:
-    - Guilherme
+    - guip
     - Silmar
     - Deandreson
     - João Paulo

diff --git a/src/_meetings/2022-05-04-ata.md b/src/_meetings/2022-05-04-ata.md
@@ -3,7 +3,7 @@ title: Ata - Reunião 04/05/2022
 author: Setembru
 attendees:
     - Momoyo
-    - Guilherme
+    - guip
     - Silmar
     - Deandreson
     - Setembru
@@ -37,7 +37,7 @@ Ata da reunião do dia 04/05/2022
     - Disponibilidade (online, dia, horário);
     - Adicionar a opção de @ no Telegram;
     - Colocar nUSP como não obrigatório
-    - Guilherme
+    - guip
 
     - Alterar as frentes do GELOS (Setembru)
 - Falar com o STI (Guilherme e Arthur);

diff --git a/src/_meetings/2022-05-23-ata.md b/src/_meetings/2022-05-23-ata.md
@@ -5,7 +5,7 @@ attendees:
     - Elisa
     - Monaco
     - Gabriel
-    - Guilherme
+    - guip
     - Tomieiro
     - Setembru
     - Lucas Caetano

diff --git a/src/_meetings/2022-07-13-ata.md b/src/_meetings/2022-07-13-ata.md
@@ -5,7 +5,7 @@ attendees:
     - Trents
     - Deandreson
     - Silmar
-    - Guilherme
+    - guip
 ---
 
 Ata da reunião do Gelos dia 13/07/2022

diff --git a/src/_meetings/2022-08-24-ata.md b/src/_meetings/2022-08-24-ata.md
@@ -1,8 +1,8 @@
 ---
 title: Reunião GELOS - 24/08/2022
-author: Guilherme
+author: guip
 attendees:
-    - Guilherme
+    - guip
     - Gabriel
     - Deandreson
     - Julio

diff --git a/src/_meetings/2022-09-13-ata.md b/src/_meetings/2022-09-13-ata.md
@@ -8,7 +8,7 @@ attendees:
     - Deandreson
     - Carlos Melara
     - Júlio
-    - Guilherme
+    - guip
 ---
 
 Ata da reunião do dia 13/09/2022

diff --git a/src/_meetings/2022-09-20-ata.md b/src/_meetings/2022-09-20-ata.md
@@ -4,7 +4,7 @@ author: Deandreson
 attendees:
     - Júlio
     - Elisa
-    - Guilherme
+    - guip
     - Gabriel Fontes
     - Deandreson
 ---

diff --git a/src/_meetings/2022-09-21-ata.md b/src/_meetings/2022-09-21-ata.md
@@ -2,7 +2,7 @@
 title: Reunião CCOS/GELOS - 21/09/2022 (via Jitsi)
 author: Deandreson
 attendees:
-    - Guilherme
+    - guip
     - Marlon
     - Silmar
     - Júlio

diff --git a/src/_meetings/2022-09-24-ata.md b/src/_meetings/2022-09-24-ata.md
@@ -6,7 +6,7 @@ attendees:
     - Tarcísio
     - Silmar
     - Júlio
-    - Guilherme
+    - guip
     - Charles
     - Deandreson
 ---

diff --git a/src/_meetings/2022-10-04-ata.md b/src/_meetings/2022-10-04-ata.md
@@ -2,7 +2,7 @@
 title: Reunião CCOS/GELOS - 04/10/2022 (Via Jitsi)
 author: Deandreson
 attendees:
-    - Guilherme
+    - guip
     - Gabriel Fontes
     - Charles
     - Elisa

diff --git a/src/_meetings/2022-10-05-ata.md b/src/_meetings/2022-10-05-ata.md
@@ -3,7 +3,7 @@ title: Reunião GELOS - 05/10/2022 (Presencial e via Jitsi)
 author: Deandreson
 attendees:
     - Silmar
-    - Guilherme
+    - guip
     - Gabriel Fontes
     - Deandreson
 ---

diff --git a/src/_meetings/2022-10-10-ata.md b/src/_meetings/2022-10-10-ata.md
@@ -7,7 +7,7 @@ attendees:
     - Silmar
     - Deandreson
     - Grillo
-    - Guilherme
+    - guip
     - Charles
     - Tarcisio
 ---

diff --git a/src/_meetings/2022-10-25-ata.md b/src/_meetings/2022-10-25-ata.md
@@ -4,7 +4,7 @@ author: Deandreson
 attendees:
     - Charles
     - Deandreson
-    - Guilherme
+    - guip
     - Júlio
 ---
 

diff --git a/src/_meetings/2023-04-15-ata.md b/src/_meetings/2023-04-15-ata.md
@@ -2,7 +2,7 @@
 title: Ata - Reunião 15/04/2023
 author: Deandreson
 attendees:
-    - Guilherme
+    - guip
     - Júlio
     - Nicholas
     - Silmar

diff --git a/src/_meetings/2023-07-11-ata.md b/src/_meetings/2023-07-11-ata.md
@@ -1,6 +1,8 @@
 ---
 title: Ata - Reunião 11/07/2023
-author: Gabriel e Deandreson
+authors:
+    - Gabriel
+    - Deandreson
 ---
 
 - Camisetas

diff --git a/src/_meetings/2023-07-27-ata.md b/src/_meetings/2023-07-27-ata.md
@@ -6,7 +6,7 @@ attendees:
     - Ryan
     - Tarcísio
     - Deandreson
-    - Guilherme
+    - guip
     - Monaco
 ---
 

diff --git a/src/_meetings/2024-03-20-ata.md b/src/_meetings/2024-03-20-ata.md
@@ -4,12 +4,12 @@ author: Gabriel
 attendees:
     - Gabriel
     - Grillo
-    - Guilherme
-    - Lu
+    - guip
+    - Luana
     - Natan
     - Silmar
     - Vinícius
-    - Zé
+    - José
     - Tarcísio
     - Júlio
 lang: pt-BR

diff --git a/src/_meetings/2024-04-03-ata.md b/src/_meetings/2024-04-03-ata.md
@@ -1,10 +1,12 @@
 ---
 title: Ata - Reunião 03/04/2024 - via Jitsi
-author: Gabriel, Luana
+authors:
+    - Gabriel
+    - Luana
 attendees:
     - Gabriel
     - Maíra
-    - Lu
+    - Luana
     - Silmar
     - Vinícius
     - Deandreson

diff --git a/src/_members/deandreson.md b/src/_members/deandreson.md
@@ -0,0 +1,4 @@
+---
+title: Deandreson Alves
+draft: true
+---
diff --git a/src/_members/ryan.md b/src/_members/ryan.md
@@ -0,0 +1,5 @@
+---
+title: Ryan Souza Sá Teles
+site: ryan.dev.br
+draft: true
+---
diff --git a/src/_members/setembru.md b/src/_members/setembru.md
@@ -0,0 +1,6 @@
+---
+title: Aya "Setembru" Kuwahara
+nickname: Setembru
+site: setembru.dev.br
+draft: true
+---
diff --git a/src/_members/tomieiro.md b/src/_members/tomieiro.md
@@ -0,0 +1,4 @@
+---
+title: Matheus Tomieiro
+draft: true
+---
diff --git a/src/_posts/2022-06-03-apresentacao-bittorrent.md b/src/_posts/2022-06-03-apresentacao-bittorrent.md
@@ -1,8 +1,8 @@
 ---
 title: Apresentação BitTorrent
-author: Guilherme
+author: guip
 attendees:
-    - Guilherme
+    - guip
     - Gabriel
     - Tomieiro
     - Deandreson