Cleaning up incubated/retired display

- Making a nicer display of the incubated and retired functionality - Made sure that most of the 'work' in the incubator is consistent
c4dt · Oct 11, 2024 · 13712d7 · 13712d7
1 parent 4c9e141
commit 13712d7
Show file tree

Hide file tree

Showing 14 changed files with 91 additions and 40 deletions.
diff --git a/README.md b/README.md
@@ -86,7 +86,6 @@ url_path:
         type: ( Demo | Hands-on | Pilot | App | OSS-participation)
         url: (https://...)
         title: (Description of this product)
-        code: (https:// of the code)
     date_updated: (YYYY-MM-DD)
 ```
 

diff --git a/data.py b/data.py
@@ -167,10 +167,9 @@
                     ]),
                 sy.Optional("products"): sy.Seq(
                     sy.Map({
-                        "type": sy.Enum(["Demo", "Hands-on", "Pilot", "App", "Library", "OSS-participation", "Archive"]),
+                        "type": sy.Enum(["Demo", "Demo-Code", "Hands-on", "Pilot", "App", "Library", "OSS-participation", "Archive"]),
                         "url": sy.Url(),
                         "title": sy.Str(),
-                        sy.Optional("code"): sy.Str(),
                         }),
                     )
                 }),

diff --git a/data/DCL/projects.yaml b/data/DCL/projects.yaml
@@ -31,13 +31,12 @@ projects:
     language: Python, Cuda, C++
     license: MIT
     incubator:
-      work: Created a demo for our website
-      type: retired_archived
+      work: 2021/09 - Created a demo for our website - archived in 2024/10
+      type: retired
       products:
-        - type: Demo
-          title: Garfield Demonstrator
-          url: https://factory.c4dt.org/incubator/garfield/demo/
-          code: https://github.com/c4dt/Garfield
+        - type: Demo-Code
+          title: Byzantine ML Code
+          url: https://github.com/c4dt/Garfield
     maturity: 1
     information:
       - type: Paper
@@ -148,13 +147,12 @@ projects:
     license: AGPL-3.0
     maturity: 1
     incubator:
-      work: Created a demonstrator for our website
-      type: retired_archived
+      work: 2021/04 - Created a demonstrator - archived in 2024/10
+      type: retired
       products:
-        - type: Demo
+        - type: Demo-Code
           title: AT2 Demonstrator
-          url: https://factory.c4dt.org/incubator/at2/demo
-          code: https://github.com/Distributed-EPFL/at2-web
+          url: https://github.com/Distributed-EPFL/at2-web
     tags:
       - Decentralized
       - Byzantine Resilience

diff --git a/data/DEDIS/projects.yaml b/data/DEDIS/projects.yaml
@@ -115,7 +115,7 @@ projects:
     incubator:
       type: retired_archived
       work: |
-        The C4DT created a demonstrator for Calypso, as well as a hands-on workshop.
+        2019/01 - The C4DT created a demonstrator for Calypso, as well as a hands-on workshop - retired in 2022/10
       products:
         - type: Demo
           title: "Calypso filesharing"

diff --git a/data/DSLAB/projects.yaml b/data/DSLAB/projects.yaml
@@ -480,8 +480,9 @@ projects:
     incubator:
       type: retired
       work: >
-        For this project we implemented extended Berkley Packet Filtering (eBPF) support,
-        so that the software verification can also be done for this type of code.
+        2021/09 - For this project we implemented extended Berkley Packet Filtering (eBPF) support,
+        so that the software verification can also be done for this type of code. - stopped
+        working on it in 2022/04
       products:
         - type: OSS-participation
           url: https://github.com/angr/angr-platforms/pull/55

diff --git a/data/HexHive/projects.yaml b/data/HexHive/projects.yaml
@@ -474,8 +474,8 @@ projects:
     license: MPL-2.0
     maturity: 1
     incubator:
-      type: retired
-      work: 2021/Q1 worked on improving and integrating with microG and published app
+      type: retired_archived
+      work: 2021/Q1 worked on improving and integrating with microG and published app - retired and archived in 2023/Q3
     date_added: 2020-10-05
     date_updated: 2024-04-12
 

diff --git a/data/LARA/projects.yaml b/data/LARA/projects.yaml
@@ -89,12 +89,11 @@ projects:
     license: Apache-2.0
     incubator:
       type: retired_archived
-      work: 2021/Q2 - updated demonstrator with more explanations
+      work: 2021/Q2 - updated demonstrator with more explanations - retired and archived in 2023/Q2
       products:
         - type: Demo
           title: Stainless-OmniLedger demonstrator
           url: https://github.com/c4dt/service-stainless
-          code: https://github.com/c4dt/service-stainless
     date_added: 2022-09-26
     date_updated: 2024-04-12
     maturity: 2

diff --git a/data/LDS/projects.yaml b/data/LDS/projects.yaml
@@ -134,12 +134,11 @@ projects:
     license: other
     incubator:
       type: retired_archived
-      work: 2020/Q1 created demonstrator for SwissRe
+      work: 2020/Q1 created demonstrator for SwissRe - retired and archived in 2022/Q1
       products:
         - type: Demo
           title: Decentralized Data Analysis
           url: https://github.com/c4dt/service-drynx
-          code: https://github.com/c4dt/service-drynx
     date_added: 2019-03-18
     date_updated: 2022-09-28
     maturity: 1
@@ -173,7 +172,7 @@ projects:
     license: other
     incubator:
       type: retired_archived
-      work: 2021/Q1 created Spindle demonstrator
+      work: 2021/Q1 created Spindle demonstrator - retired and archived in 2023/Q1
       products:
         - type: Demo
           title: SPINDLE demonstrator

diff --git a/data/MLO/projects.yaml b/data/MLO/projects.yaml
@@ -263,8 +263,8 @@ projects:
     language: TypeScript
     license: Apache-2.0
     incubator:
-      type: incubated
-      work: 2022/Q1 developing the project
+      type: retired
+      work: 2022/Q1 developing the project - handed over to lab 2023/Q1
       products:
         - type: Pilot
           title: "Disco"

diff --git a/data/SPRING/projects.yaml b/data/SPRING/projects.yaml
@@ -383,7 +383,7 @@ projects:
       url: https://github.com/C4DT/lightarti-rest
       date_last_commit: 2022-11-14
     incubator:
-      work: Created and updated a library for mobile
+      work: 2022/Q1 Created and updated a library for mobile - retired and archived in 2024/Q2
       type: retired_archived
       products:
         - type: Library

diff --git a/data/template.yaml b/data/template.yaml
@@ -49,5 +49,4 @@ projects:
         type: ( Demo | Hands-on | Pilot | App | OSS-participation)
         url: (https://...)
         title: (Description of this product)
-        code: (https:// of the code)
     date_updated: (YYYY-MM-DD)
diff --git a/resources/table.css b/resources/table.css
@@ -1,10 +1,14 @@
 :root {
   --category-row-color: #e0e0f0;
   --category-row-hover-color: #d0d0f0;
-  --incubated-odd-row-hover-color: #c0e8e0;
-  --incubated-odd-row-color: #e0f8f0;
-  --incubated-even-row-hover-color: #b8e8e0;
-  --incubated-even-row-color: #d8f8f0;
+  --incubated-odd-row-hover-color: #c0d8d0;
+  --incubated-odd-row-color: #e0e8e0;
+  --incubated-even-row-hover-color: #b8d8d0;
+  --incubated-even-row-color: #d8e8e0;
+  --prev-incubated-odd-row-hover-color: #c0e0e8;
+  --prev-incubated-odd-row-color: #e0f8f0;
+  --prev-incubated-even-row-hover-color: #b8e0e8;
+  --prev-incubated-even-row-color: #d8f0f8;
   --not-incubated-odd-row-hover-color: #f0f0f0;
   --not-incubated-odd-row-color: #fefefe;
   --not-incubated-even-row-hover-color: #eaeaea;
@@ -22,6 +26,10 @@
     --incubated-odd-row-color: #134c3b;
     --incubated-even-row-hover-color: #2b6453;
     --incubated-even-row-color: #1b5443;
+    --prev-incubated-odd-row-hover-color: #334b54;
+    --prev-incubated-odd-row-color: #233b44;
+    --prev-incubated-even-row-hover-color: #3b535c;
+    --prev-incubated-even-row-color: #2b434c;
     --not-incubated-odd-row-hover-color: #474747;
     --not-incubated-odd-row-color: #373737;
     --not-incubated-even-row-hover-color: #4f4f4f;
@@ -73,6 +81,8 @@ div.intro {
 
 div.color_legend {
   display: flex;
+  margin-top: 1em;
+  margin-bottom: 0.5em;
   margin-left: auto;
   margin-right: 1em;
   height: 2em;
@@ -91,7 +101,7 @@ div.layout-filter {
   align-items: center;
   margin-right: 5em;
   z-index: 1;
-  width: 80%;
+  width: 90%;
 }
 
 div.layout-filter div {
@@ -101,9 +111,8 @@ div.layout-filter div {
 div.layout-table {
   margin-top: -1em;
   margin-bottom: -1.5em;
-  flex-grow: 1;
   width: 100%;
-  height: 100%;
+  height: calc(100% - 2em);
 }
 
 input {
@@ -142,6 +151,14 @@ span.box {
   background-color: var(--incubated-odd-row-color);
 }
 
+.prev_incubated_even {
+  background-color: var(--prev-incubated-even-row-color);
+}
+
+.prev_incubated_odd {
+  background-color: var(--prev-incubated-odd-row-color);
+}
+
 .not_incubated_even {
   background-color: var(--not-incubated-even-row-color);
 }
@@ -214,6 +231,22 @@ table.dataTable.display tbody tr.incubated.even:hover > td {
   background-color: var(--incubated-even-row-hover-color);
 }
 
+table.dataTable.display tbody tr.prev_incubated.odd > td {
+  background-color: var(--prev-incubated-odd-row-color);
+}
+
+table.dataTable.display tbody tr.prev_incubated.even > td {
+  background-color: var(--prev-incubated-even-row-color);
+}
+
+table.dataTable.display tbody tr.prev_incubated.odd:hover > td {
+  background-color: var(--prev-incubated-odd-row-hover-color);
+}
+
+table.dataTable.display tbody tr.prev_incubated.even:hover > td {
+  background-color: var(--prev-incubated-even-row-hover-color);
+}
+
 table.dataTable.display tbody tr > td.category {
   text-align: center;
   font-size: 150%;

diff --git a/views/products/technical.tpl b/views/products/technical.tpl
@@ -89,13 +89,22 @@
 
         date_added = project.get('date_added')
         date_updated = project.get('date_updated', date_added)
+        c4dt_work = ""
+        if 'incubator' in project:
+            wt = project.get('incubator').get('type')
+            c4dt_work = "- C4DT work: " + {'incubated': "in incubator",
+                'incubated_market': "in incubator and market support",
+                'retired': "not supported anymore",
+                'retired_archived': "not supported anymore and archived"}.get(wt)
+        end
         %>
 
         <div class="header">Project status:</div> {{ status }}
         &mdash;
         entered showcase: {{ date_added.date() }}
         &mdash;
         entry updated: {{ date_updated.date() }}
+        {{ c4dt_work }}
     </div>
 
     % incubator = project.get('incubator')

diff --git a/views/projects.tpl b/views/projects.tpl
@@ -289,7 +289,7 @@ applications.update({ "Other": "Other" })
                 </select>
             </div>
 
-            <div class="form-group" style="display: flex; flex-direction: row; align-items: center">
+            <div style="display: flex; flex-direction: row; align-items: center">
                 <label class="sr-only">search:</label>
                 <input id="search" class="form-control" oninput="search_apply()">
                 <span onclick="search_set('')" class="clear_search">X</span>
@@ -421,13 +421,24 @@ applications.update({ "Other": "Other" })
 
                             active = is_active(project)
                             active_str = "project_active" if active else "inactive"
-                            incubated = project.get('incubator')
-                            incubator_str = f"project_{incubated['type']}" if incubated else "no support"
+                            incubator = project.get('incubator')
+                            incubator_str = "no support"
+                            incubated = "not_incubated"
+                            if incubator:
+                                incubator_str = f"project_{incubator['type']}"
+                                if incubator['type'].startswith("incubated"):
+                                    incubated = "incubated"
+                                else:
+                                    if incubator['type'].startswith("retired"):
+                                        incubated = "prev_incubated"
+                                    end
+                                end
+                            end
 
                             products = find_project_tabs(project_id)
                             maturity_order = maturity + 0.5 if active else maturity
                             %>
-                            <tr class="{{ 'incubated' if incubated else 'not_incubated' }} {{visibility}}">
+                            <tr class="{{ incubated }} {{visibility}}">
                                 <td class="proj_name"
                                     style="cursor: pointer">
                                     <a href="{{project_id}}"><div>
@@ -531,7 +542,11 @@ applications.update({ "Other": "Other" })
         <div class="color_legend">
             <span class="box incubated_even"></span>
             <span class="box incubated_odd"></span>
-            C4DT supported projects
+            Actively C4DT supported projects
+            <span style="width: 3em;"></span>
+            <span class="box prev_incubated_even"></span>
+            <span class="box prev_incubated_odd"></span>
+            Previously C4DT supported projects
             <span style="width: 3em;"></span>
             <span class="box not_incubated_even"></span>
             <span class="box not_incubated_odd"></span>