use Icons.eml, fix up most mailing list links to point to public-faci…

…ng lists
ocaml · Jun 23, 2023 · 8644cc7 · 8644cc7
1 parent a23210b
commit 8644cc7
Show file tree

Hide file tree

Showing 9 changed files with 162 additions and 120 deletions.
diff --git a/asset/governance-icons/discord.svg b/asset/governance-icons/discord.svg
diff --git a/asset/governance-icons/email.svg b/asset/governance-icons/email.svg
diff --git a/asset/governance-icons/github.svg b/asset/governance-icons/github.svg
diff --git a/asset/governance-icons/slack.svg b/asset/governance-icons/slack.svg
diff --git a/data/governance.yml b/data/governance.yml
@@ -4,15 +4,15 @@ teams:
   description: The OCaml Compiler team, responsible for the development and maintenance
     of the language, the standard library and the compiler tools.
   contacts:
-  - name: Email
-    link: https://inbox.ocaml.org/caml-list/
-    icon: /governance-icons/email.svg
+  - name: Mailing List
+    link: https://sympa.inria.fr/sympa/subscribe/caml-list
+    kind: email
   - name: Discord
     link: https://discord.com/channels/436568060288172042/904141760052228116
-    icon: /governance-icons/discord.svg
+    kind: discord
   - name: GitHub
     link: https://github.com/ocaml/ocaml/issues
-    icon: /governance-icons/github.svg
+    kind: github
   members:
   - name: Damien Doligez
     github: damiendoligez
@@ -88,9 +88,9 @@ teams:
   description: The Platform team is responsible for the development and maintenance
     of the OCaml Platform, the official OCaml developer toolchain.
   contacts:
-  - name: Email
-    link: platform@lists.ocaml.org
-    icon: /governance-icons/email.svg
+  - name: Mailing List
+    link: https://lists.ocaml.org/listinfo/platform
+    kind: email
   members:
   - name: Anil Madhavapeddy
     github: avsm
@@ -100,9 +100,12 @@ teams:
     name: Dune
     description: The Dune development team
     contacts:
-    - name: Email
-      link: dune-dev@lists.ocaml.org
-      icon: /governance-icons/email.svg
+    - name: Mailing List
+      link: mailto:dune-dev@lists.ocaml.org
+      kind: email
+    - name: GitHub
+      link: https://github.com/ocaml/dune
+      kind: github
     members:
     - name: Rudi Grinberg
       github: rgrinberg
@@ -141,9 +144,12 @@ teams:
     name: Opam
     description: The Opam development team
     contacts:
-    - name: Email
-      link: opam-dev@lists.ocaml.org
-      icon: /governance-icons/email.svg
+    - name: Mailing List
+      link: https://lists.ocaml.org/listinfo/opam-devel
+      kind: email
+    - name: GitHub
+      link: https://github.com/ocaml/opam
+      kind: github
     members:
     - name: Louis Gesbert 
       github: AltGr
@@ -161,9 +167,12 @@ teams:
     name: Ocaml-lsp
     description: The Ocaml-lsp development team
     contacts:
-    - name: Email
-      link: ocaml-lsp-dev@lists.ocaml.org
-      icon: /governance-icons/email.svg
+    - name: Mailing List
+      link: mailto:ocaml-lsp-dev@lists.ocaml.org
+      kind: email
+    - name: GitHub
+      link: https://github.com/ocaml/ocaml-lsp
+      kind: github
     members:
     - name: Rudi Grinberg
       github: rgrinberg
@@ -181,9 +190,12 @@ teams:
     name: Merlin
     description: The merlin development team
     contacts:
-    - name: Email
-      link: merlin-dev@lists.ocaml.org
-      icon: /governance-icons/email.svg
+    - name: Mailing List
+      link: https://lists.ocaml.org/listinfo/merlin
+      kind: email
+    - name: GitHub
+      link: https://github.com/ocaml/merlin
+      kind: github
     members:
     - name: Ulysse Gérard
       github: voodoos
@@ -201,9 +213,12 @@ teams:
     name: Odoc
     description: The odoc development team
     contacts:
-    - name: Email
-      link: odoc-dev@lists.ocaml.org
-      icon: /governance-icons/email.svg
+    - name: Mailing List
+      link: mailto:odoc-dev@lists.ocaml.org
+      kind: email
+    - name: GitHub
+      link: https://github.com/ocaml/odoc
+      kind: github
     members:
     - name: Jon Ludlam
       github: jonludlam
@@ -233,9 +248,12 @@ teams:
     name: Ppxlib
     description: The ppxlib development team
     contacts:
-    - name: Email
-      link: ppxlib-dev@lists.ocaml.org
-      icon: /governance-icons/email.svg
+    - name: Mailing List
+      link: mailto:ppxlib-dev@lists.ocaml.org
+      kind: email
+    - name: GitHub
+      link: https://github.com/ocaml-ppx/ppxlib
+      kind: github
     dev-meeting:
       date: Every third Tuesday
       time: 6:00 PM CET
@@ -256,9 +274,12 @@ teams:
     name: Utop
     description: The Utop development team
     contacts:
-    - name: Email
-      link: utop-dev@lists.ocaml.org
-      icon: /governance-icons/email.svg
+    - name: Mailing List
+      link: mailto:utop-dev@lists.ocaml.org
+      kind: email
+    - name: GitHub
+      link: https://github.com/ocaml-community/utop
+      kind: github
     members:
     - name: Etienne Millon
       github: emillon
@@ -270,9 +291,12 @@ teams:
     name: Opam-publish
     description: The Opam-publish development team
     contacts:
-    - name: Email
-      link: opam-publish-dev@lists.ocaml.org
-      icon: /governance-icons/email.svg
+    - name: Mailing List
+      link: mailto:opam-publish-dev@lists.ocaml.org
+      kind: email
+    - name: GitHub
+      link: https://github.com/ocaml-opam/opam-publish
+      kind: github
     members:
     - name: Louis Gesbert
       github: AltGr
@@ -287,9 +311,12 @@ teams:
     name: Ocamlformat
     description: The Ocamlformat development team
     contacts:
-    - name: Email
-      link: ocamlformat-dev@lists.ocaml.org
-      icon: /governance-icons/email.svg
+    - name: Mailing List
+      link: https://lists.ocaml.org/listinfo/listinfo/ocamlformat-dev
+      kind: email
+    - name: GitHub
+      link: https://github.com/ocaml-ppx/ocamlformat
+      kind: github
     members:
     - name: Guillaume Petiot
       github: gpetiot
@@ -304,9 +331,12 @@ teams:
     name: Dune-release
     description: The Dune-release development team
     contacts:
-    - name: Email
-      link: dune-release-dev@lists.ocaml.org
-      icon: /governance-icons/email.svg
+    - name: Mailing List
+      link: mailto:dune-release-dev@lists.ocaml.org
+      kind: email
+    - name: GitHub
+      link: https://github.com/tarides/dune-release
+      kind: github
     members:
     - name: Etienne Millon
       github: emillon
@@ -318,9 +348,12 @@ teams:
     name: Mdx
     description: The Mdx development team
     contacts:
-    - name: Email
-      link: mdx-dev@lists.ocaml.org
-      icon: /governance-icons/email.svg
+    - name: Mailing List
+      link: mailto:mdx-dev@lists.ocaml.org
+      kind: email
+    - name: GitHub
+      link: https://github.com/realworldocaml/mdx
+      kind: github
     members:
     - name: Marek Kubica
       github: Leonidas-from-XIV
@@ -329,9 +362,12 @@ teams:
     name: Ocp-indent
     description: The Ocp-indent development team
     contacts:
-    - name: Email
-      link: ocp-indent-dev@lists.ocaml.org
-      icon: /governance-icons/email.svg
+    - name: Mailing List
+      link: mailto:ocp-indent-dev@lists.ocaml.org
+      kind: email
+    - name: GitHub
+      link: https://github.com/OCamlPro/ocp-indent
+      kind: github
     members:
     - name: Louis Gesbert 
       github: AltGr
@@ -340,9 +376,12 @@ teams:
     name: Ocamlfind
     description: The Ocamlfind development team
     contacts:
-    - name: Email
-      link: ocamlfind-dev@lists.ocaml.org
-      icon: /governance-icons/email.svg
+    - name: Mailing List
+      link: mailto:ocamlfind-dev@lists.ocaml.org
+      kind: email
+    - name: GitHub
+      link: https://github.com/ocaml/ocamlfind
+      kind: github
     members:
     - name: Gerd Stolpmann
       github: gerdstolpmann
@@ -354,9 +393,9 @@ teams:
     name: Omp
     description: The Omp development team
     contacts:
-    - name: Email
-      link: omp-dev@lists.ocaml.org
-      icon: /governance-icons/email.svg
+    - name: Mailing List
+      link: mailto:omp-dev@lists.ocaml.org
+      kind: email
     members:
     - name: Sonja Heinze
       github: pitag-ha
@@ -366,9 +405,9 @@ teams:
   description: The Packaging team is responsible to ensure the quality of the OCaml
     packages ecosystem, and in particular, to review submitions to the Opam repository.
   contacts:
-  - name: Email
-    link: packaging@lists.ocaml.org
-    icon: /governance-icons/email.svg
+  - name: Mailing List
+    link: mailto:packaging@lists.ocaml.org
+    kind: email
   members:
   - name: Anil Madhavapeddy
     github: avsm
@@ -385,12 +424,12 @@ teams:
     powering the official OCaml projects, including the servers for OCaml.org and
     the opam-repository CI.
   contacts:
-  - name: Email
-    link: infrastructure@lists.ocaml.org
-    icon: /governance-icons/email.svg
+  - name: Mailing List
+    link: https://lists.ocaml.org/listinfo/listinfo/infrastructure
+    kind: email
   - name: GitHub
     link: https://github.com/ocaml/infrastructure/issues
-    icon: /governance-icons/github.svg
+    kind: github
   members:
   - name: Anil Madhavapeddy
     github: avsm
@@ -409,9 +448,12 @@ teams:
   description: The Web team is responsible for the development and maintenance of
     the official OCaml websites, in particular OCaml.org and its subdomains.
   contacts:
-  - name: Email
-    link: web@lists.ocaml.org
-    icon: /governance-icons/email.svg
+  - name: Mailing List
+    link: mailto:web@lists.ocaml.org
+    kind: email
+  - name: GitHub
+    link: https://github.com/ocaml/ocaml.org
+    kind: github
   members:
   - name: Anil Madhavapeddy
     github: avsm
@@ -432,7 +474,7 @@ working-groups:
   contacts:
   - name: Matrix
     link: https://matrix.to/#/#eio:roscidus.com
-    icon: /governance-icons/email.svg
+    kind: chat
   dev-meeting:
     date: Bi-weekly on Mondays
     time: 10:00 AM BST

diff --git a/src/ocamlorg_data/data.mli b/src/ocamlorg_data/data.mli
@@ -404,7 +404,8 @@ module Governance : sig
     val compare : t -> t -> int
   end
 
-  type contact = { name : string; link : string; icon : string }
+  type contact_kind = GitHub | Email | Discord | Chat
+  type contact = { name : string; link : string; kind : contact_kind }
 
   type dev_meeting = {
     date : string;

diff --git a/src/ocamlorg_frontend/components/icons.eml b/src/ocamlorg_frontend/components/icons.eml
@@ -41,6 +41,11 @@ let changelog class_ =
       <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 12h6m-6 4h6m2 5H7a2 2 0 01-2-2V5a2 2 0 012-2h5.586a1 1 0 01.707.293l5.414 5.414a1 1 0 01.293.707V19a2 2 0 01-2 2z" />
   </svg>
 
+let chat class_ =
+  <svg xmlns="http://www.w3.org/2000/svg" class="<%s class_ %>" fill="none" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" aria-hidden="true">
+    <path stroke-linecap="round" stroke-linejoin="round" d="M20.25 8.511c.884.284 1.5 1.128 1.5 2.097v4.286c0 1.136-.847 2.1-1.98 2.193-.34.027-.68.052-1.02.072v3.091l-3-3c-1.354 0-2.694-.055-4.02-.163a2.115 2.115 0 01-.825-.242m9.345-8.334a2.126 2.126 0 00-.476-.095 48.64 48.64 0 00-8.048 0c-1.131.094-1.976 1.057-1.976 2.192v4.286c0 .837.46 1.58 1.155 1.951m9.345-8.334V6.637c0-1.621-1.152-3.026-2.76-3.235A48.455 48.455 0 0011.25 3c-2.115 0-4.198.137-6.24.402-1.608.209-2.76 1.614-2.76 3.235v6.226c0 1.621 1.152 3.026 2.76 3.235.577.075 1.157.14 1.74.194V21l4.155-4.155" />
+  </svg>
+
 let chevron_down class_ =
   <svg xmlns="http://www.w3.org/2000/svg" class="<%s class_ %>" fill="none" viewBox="0 0 24 24" stroke="currentColor" aria-hidden="true">
       <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 9l-7 7-7-7" />
@@ -117,6 +122,11 @@ let edit class_ =
     <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15.232 5.232l3.536 3.536m-2.036-5.036a2.5 2.5 0 113.536 3.536L6.5 21.036H3v-3.572L16.732 3.732z" />
   </svg>
 
+let email class_ =
+  <svg xmlns="http://www.w3.org/2000/svg" class="<%s class_ %>" fill="none" viewBox="0 0 24 24" stroke="currentColor" aria-hidden="true">
+    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M21.75 6.75v10.5a2.25 2.25 0 01-2.25 2.25h-15a2.25 2.25 0 01-2.25-2.25V6.75m19.5 0A2.25 2.25 0 0019.5 4.5h-15a2.25 2.25 0 00-2.25 2.25m19.5 0v.243a2.25 2.25 0 01-1.07 1.916l-7.5 4.615a2.25 2.25 0 01-2.36 0L3.32 8.91a2.25 2.25 0 01-1.07-1.916V6.75" />
+  </svg>
+
 let error class_ =
   <svg xmlns="http://www.w3.org/2000/svg" class="<%s class_ %>" fill="currentColor" viewBox="0 0 24 24" width="24px" aria-hidden="true">
     <path d="M0 0h24v24H0V0z" fill="none"/>