From fac3e89d1c81e12f822e8b23fc547951cba01adb Mon Sep 17 00:00:00 2001
From: Mylloon <kennel.anri@tutanota.com>
Date: Wed, 12 Apr 2023 01:32:42 +0200
Subject: [PATCH] minor fixes

---
 src/routes/contrib.rs  | 10 ++++++++++
 templates/contrib.html | 12 ++++--------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/routes/contrib.rs b/src/routes/contrib.rs
index 8470e70..b1102cf 100644
--- a/src/routes/contrib.rs
+++ b/src/routes/contrib.rs
@@ -45,6 +45,8 @@ pub async fn get_page(config: Config) -> std::string::String {
     let data = match fetch_pr().await {
         Ok(projects) => {
             let mut data: Vec<Project> = Vec::new();
+
+            // Grouping PRs by projects
             let mut map: HashMap<&str, Vec<Pull>> = HashMap::new();
             projects.iter().for_each(|p| {
                 let project = Pull {
@@ -68,6 +70,7 @@ pub async fn get_page(config: Config) -> std::string::String {
                 }
             });
 
+            // Distributes each PR in the right vector
             data.iter_mut().for_each(|d| {
                 map.get(d.name.as_str()).unwrap().iter().for_each(|p| {
                     let state = p.state.into();
@@ -82,6 +85,13 @@ pub async fn get_page(config: Config) -> std::string::String {
                 d.name = name.into_iter().collect();
             });
 
+            // Ascending order
+            data.iter_mut().for_each(|d| {
+                d.pulls_closed.reverse();
+                d.pulls_merged.reverse();
+                d.pulls_open.reverse();
+            });
+
             PortfolioTemplate {
                 error: false,
                 projects: data
diff --git a/templates/contrib.html b/templates/contrib.html
index 7206729..70c6441 100644
--- a/templates/contrib.html
+++ b/templates/contrib.html
@@ -18,21 +18,17 @@
       </p>
       {{/projects}}
       <h1 class="subtitle">En attente</h1>
-      {{#waiting}}
       <p>
-        {{#pulls_open}}
+        {{#waiting}} {{#pulls_open}}
         <a href="{{url}}">{{name}}#{{id}}</a>
-        {{/pulls_open}}
+        {{/pulls_open}} {{/waiting}}
       </p>
-      {{/waiting}}
       <h1 class="subtitle">Non mergées</h1>
-      {{#closed}}
       <p>
-        {{#pulls_closed}}
+        {{#closed}} {{#pulls_closed}}
         <a href="{{url}}">{{name}}#{{id}}</a>
-        {{/pulls_closed}}
+        {{/pulls_closed}} {{/closed}}
       </p>
-      {{/closed}}
     </div>
     {{/error}} {{/data}} {{> footer.html }}
   </body>