Merge pull request #334 from c4dt/add_screenshots

Retiring AT2 and Garfield

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)
 ```
 

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(),
                         }),
                     )
                 }),

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

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"

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

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
 

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

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

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"

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

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)

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%;

views/products/demo/at2.tpl

@@ -6,18 +6,68 @@
     source code of the project.
     If you're interested, please contact us, and we'll get you in contact
     with the original authors.</p>
+<p>Here are some screenshots of the demo:</p>
+<div class="columns">
+    <div class="click-zoom">
+        <label>
+            <input type="checkbox">
+            <img src="../../../resources/products/images/at2/at2-demo-1.png"
+                 alt="Welcome screen of the AT2 demo showing some text and an
+                  image representing data on a half-circle">
+            <br>The introduction of the demo with a short explanation of what
+            it is about.
+        </label>
+    </div>
+    <div class="click-zoom">
+        <label>
+            <input type="checkbox">
+            <img src="../../../resources/products/images/at2/at2-demo-2.png"
+                 alt="A short explanation of how to create an account, a field for
+                  choosing a name, and a button to update the username.">
+            <br>On the next screen it shows the account creation and the
+            network of the nodes.
+        </label>
+    </div>
+</div>
+<div class="columns">
+    <div class="click-zoom">
+        <label>
+            <input type="checkbox">
+            <img src="../../../resources/products/images/at2/at2-demo-3.png"
+                 alt="A simple form to send some of your assets over to network
+                  to another account.">
+            <br>Now you can transfer some assets to one of the other accounts
+            on the network. For this test you have 100k coins of whatever value
+            (currently 0US$ :)
+        </label>
+    </div>
+    <div class="click-zoom">
+        <label>
+            <input type="checkbox">
+            <img src="../../../resources/products/images/at2/at2-demo-4.png"
+                 alt="A form to choose a destination and how much transactions should be performed.
+                Below is a test-run which shows that AT2 managed to do around 900 transactions
+                per second.">
+            <br>To show the performance of AT2, you can perform a speedtest where
+            it tries to send the tokens as fast as possible over the network.
+            Once the tokens are sent, it waits for confirmation from the network, which
+            can take longer than the actual sending.
+        </label>
+    </div>
+</div>
+<h4>Former description</h4>
 <p>
-  The
-  <a href="https://factory.c4dt.org/incubator/at2/demo/">AT2 Demonstrator</a>
-  will show you the power lying behind this technology. In a tutorial approach,
-  you'll be taken through the creation of your account on the deployed test
-  network. Then, you'll be able to send some assets to other accounts already
-  registered there, as you would do on other distributed ledgers. To show that
-  indeed AT2 is blazingly fast, the last part is a speed test where you can send
-  as many transactions as you want and measure how well the network handles the
-  load.
+    The
+    <a href="https://factory.c4dt.org/incubator/at2/demo/">AT2 Demonstrator</a>
+    will show you the power lying behind this technology. In a tutorial approach,
+    you'll be taken through the creation of your account on the deployed test
+    network. Then, you'll be able to send some assets to other accounts already
+    registered there, as you would do on other distributed ledgers. To show that
+    indeed AT2 is blazingly fast, the last part is a speed test where you can send
+    as many transactions as you want and measure how well the network handles the
+    load.
 </p>
 
 <a href="https://factory.c4dt.org/incubator/at2/demo/" class="tab-link">
-  Take me to the demo!
+    Take me to the demo!
 </a>