feat(nix): Rework a bit

Signed-off-by: jemagius <jmg@dgnum.eu>

data/calendars.json

@@ -1,16 +1,18 @@
 {
   "tree": {
     "Rentrée": {
-      "Amphis de rentrée": {},
+      "Évènements pour les masteriens": {},
+      "Exchange and international students": {},
       "Départements": {},
-      "Visites de bibliothèque": {},
-      "Masters": {},
-      "Étudiants internationaux": {},
-      "Conférences de recherche": {}
+      "Amphis de rentrée": {},
+      "Divers rentrée": {},
+      "Associatif divers": {},
+      "Visites": {}
     },
+    "Délégation Générale Numérique": {},
     "COF": {
-      "Rentrée du COF": {},
       "Évènements (COF)": {},
+      "Rentrée du COF": {},
       "Assemblées Générales (COF)": {},
       "BdA": {
         "Évènements (BdA)": {},
@@ -38,6 +40,7 @@
       "Rentrée du BDS": {}
     },
     "Clubs BDS": {
+      "Valse": {},
       "Créneaux encadrés": {},
       "ENSelle": {}
     },
@@ -45,11 +48,20 @@
     "Délégation Générale": {},
     "K-Fêt": {},
     "Écocampus": {},
-    "La Psychédéliste":{},
+    "La Psychédéliste": {},
     "Ambassadeur·rice·s santé": {}
   },
-
   "sources": {
+    "dgnum-nc": {
+      "dmo7DgdmTnsMd8zo": {
+        "name": "Valse"
+      },
+      "eEPk6miCzozgPb42": {
+        "name": "Délégation Générale Numérique",
+        "short_name": "DGNum",
+        "color": "#27327a"
+      }
+    },
     "eleves-ens": {
       "qG6jpJPfK37Nw8ZC": {
         "name": "PLS"
@@ -69,7 +81,7 @@
       "w442JdS5AaQ6czrP": {
         "name": "Écriv'ENS"
       },
-      "QXGnDTA8GS6r876F": {
+      "aoazRGFcjHSe4LxG": {
         "name": "K-Fêt",
         "color": "#c63b52",
         "default_location": "K-Fêt"
@@ -126,7 +138,8 @@
         "name": "ENSelle"
       },
       "K6iGBG47WXaKWs3Q": {
-        "name": "Créneaux encadrés"
+        "name": "Créneaux encadrés",
+        "initial": false
       },
       "TFjE83ASCMK9rfRi": {
         "name": "BandarrêtdurgENS",
@@ -155,43 +168,46 @@
       "AYNpoC674yAjEmRy": {
         "name": "L'Hômonerie"
       },
-      "TcwNdrs6iyBRxFzk": {
-        "name": "Divers"
-      },
-      "G5ZRyTkMifXC2iHj": {
-        "name": "Amphis de rentrée",
-	"short_name": "Amphis"
-      },
-      "dJofECeczaGgNiKs": {
-        "name": "Rentrée du BDS",
-	"short_name": "BDS"
-      },
-      "7Rwd8JERwBsso7XG": {
-        "name": "Rentrée du COF",
-	"short_name": "COF"
-      },
-      "tiMsNcncqBxR4nL2": {
-        "name": "Départements",
-	"short_name": "Dpt"
-      },
-      "RpP773D6e2ReLfcY": {
-        "name": "Visites de bibliothèque",
-	"short_name": "Bibli"
-      },
-      "YRZ4A8imEEf8jnDE": {
-        "name": "Masters"
-      },
-      "8EDHX6kiPYcSrXXL": {
-        "name": "Étudiants internationaux",
-	"short_name": "Internationaux"
-      },
-      "TWgNxdri7zQSoiRf": {
-        "name": "Conférences de recherche",
-	"short_name": "Conf"
-      },
       "MJf2wnQafbLc2arS": {
         "name": "Arts pla'",
         "color": "#ffb969"
+      },
+      "qS7WJwyBaGRQFyX3": {
+        "name": "Exchange and international students",
+        "short_name": "Exchange"
+      },
+      "fGmpGCNZrHQkNt7L": {
+        "name": "Départements",
+        "short_name": "Dpt",
+        "initial": false
+      },
+      "W6qjeqEzEekNieWk": {
+        "name": "Évènements pour les masteriens",
+        "short_name": "Master"
+      },
+      "oDPMTBSma2bfo6WS": {
+        "name": "Amphis de rentrée",
+        "short_name": "Amphis",
+        "initial": false
+      },
+      "aPXtDmXDxmLxkERg": {
+        "name": "Divers rentrée",
+        "short_name": "Rentrée"
+      },
+      "fqK3nqqPtXLyo4Y4": {
+        "name": "Rentrée du COF",
+        "short_name": "COF"
+      },
+      "YQnfcozPDoRgNSBb": {
+        "name": "Rentrée du BDS",
+        "short_name": "BDS"
+      },
+      "tfA32kgc3GM2fH2C": {
+        "name": "Visites"
+      },
+      "KDNA4GrFMkkJrwNd": {
+        "name": "Associatif divers",
+        "short_name": "Asso"
       }
     }
   }

data/locations.json

@@ -6,7 +6,15 @@
     "Salle Jean Ibanes (Jourdan, R1-07)": "Salle Jean Ibanes (R1-07)",
     "Salle Madeleine Rebérioux (Jourdan, R2-02)": "Salle Madeleine Rebérioux (R2-02)",
     "Salle Marcel Roncayolo (Jourdan, R2-05)": "Salle Marcel Roncayolo (R2-05)",
-    "Cour des bibliothèques": "Cour du NIR"
+    "Cour des bibliothèques": "Cour du NIR",
+    "Salle Jaurès": "Amphithéâtre Jaurès",
+    "Jaurès": "Amphithéâtre Jaurès",
+    "Dussane": "Salle Dussane",
+    "Cour aux Ernest": "Cour aux Ernests",
+    "Restaurant": "Pôt",
+    "29 rue d'Ulm": "Bâtiment du 29",
+    "Gymnase": "Gymnase Jean Prévost",
+    "Pôt (Restaurant)": "Pôt"
   },
 
   "rooms": {
@@ -23,6 +31,10 @@
       "Salle Cartan",
       "Salle Noether",
       "Salle Bourbaki",
+      "Petite salle ECLA",
+      "Salle Reig ECLA",
+      "Salle Césaire ECLA",
+      "Salle Beckett",
       "Cour aux Ernests",
       "Cour du NIR",
       "Cour Pasteur",
@@ -31,11 +43,17 @@
       "Canopée",
       "K-Fêt",
       "Cave d'hackENS",
-      "Gymnase"
+      "Gymnase Jean Prévost",
+      "Salle d'expression artistique (SEA)",
+      "Locaux des départements lettres et sciences humaines et sociales"
     ],
     "24 rue Lhomond": ["Salle CONF IV"],
-    "29 rue d'Ulm": ["Bibliothèque des sciences expérimentales", "Salle Jaurès"],
+    "29 rue d'Ulm": [
+      "Bâtiment du 29",
+      "Bibliothèque des sciences expérimentales",
+      "Amphithéâtre Jaurès"],
     "Jourdan": [
+      "Campus de Jourdan",
       "Bibliothèque de Jourdan",
       "Salle Marcel Roncayolo (R2-05)",
       "Salle Madeleine Rebérioux (R2-02)",

default.nix

@@ -1,13 +1,44 @@
-{ pkgs ? import (import ./npins).nixpkgs {} }:
 {
-  production = pkgs.buildNpmPackage {
+  sources ? import ./npins,
+  pkgs ? import sources.nixpkgs { },
+}:
+
+let
+  inherit (pkgs.lib.fileset)
+    fileFilter
+    gitTrackedWith
+    intersection
+    toSource
+    ;
+in
+
+{
+  package = pkgs.buildNpmPackage {
     name = "metis";
-    src = ./.;
+
+    src = toSource {
+      root = ./.;
+      fileset = intersection (gitTrackedWith { } ./.) (
+        fileFilter ({ name, hasExt, ... }: !(hasExt "nix") && name != "npins") ./.
+      );
+    };
+
     npmDepsHash = "sha256-RbjWNVY8KlPP9ajQRnrsWhOZiiyyMGQSY39lmZnTC1I=";
+
     installPhase = ''
       cp -r public $out
     '';
   };
-  shell = import ./shell.nix { inherit pkgs; };
-  providers = import ./providers.nix;
+
+  devShell = pkgs.mkShell {
+    name = "metis.dev";
+
+    packages = [ pkgs.nodejs ];
+  };
+
+  providers = {
+    eleves-ens = "cloud.eleves.ens.fr";
+    frama-agenda = "framagenda.org";
+    dgnum-nc = "cloud.dgnum.eu";
+  };
 }

npins/sources.json

@@ -3,8 +3,8 @@
     "nixpkgs": {
       "type": "Channel",
       "name": "nixpkgs-unstable",
-      "url": "https://releases.nixos.org/nixpkgs/nixpkgs-23.11pre506449.f465da16626/nixexprs.tar.xz",
-      "hash": "14jsw1gv83qjz82384gfhn78sv9m14i1bs5l97xrab26vyi9b5ay"
+      "url": "https://releases.nixos.org/nixpkgs/nixpkgs-24.11pre696114.dfffb2e7a52d/nixexprs.tar.xz",
+      "hash": "15dj4hcx5wqcnxwfhh1gx2rpcwyip794bkmv0vpz4f01hibr7wd2"
     }
   },
   "version": 3

providers.nix

@@ -1,7 +0,0 @@
-let
-  providers = {
-    eleves-ens = "cloud.eleves.ens.fr";
-    frama-agenda = "framagenda.org";
-  };
-in
-  builtins.mapAttrs (name: value: "https://${value}/remote.php/dav/public-calendars/") providers

shell.nix

@@ -1,4 +1 @@
-{ pkgs ? import (import ./npins).nixpkgs {} }:
-pkgs.mkShell {
-  packages = [ pkgs.nodejs ];
-}
+(import ./. { }).devShell

src/App.svelte

@@ -102,6 +102,7 @@
         title: room
       }))
     ),
+    filterResourcesWithEvents: true,
     height: '100%',
     schedulerLicenseKey: 'CC-Attribution-NonCommercial-NoDerivatives',
     nowIndicator: true,
@@ -205,7 +206,11 @@
 
   <EventModal event={$event} open={openModal} {toggle} />
 
-  <script defer data-domain="calendrier.dgnum.eu" src="https://analytics.dgnum.eu/js/script.js"></script>
+  <script
+    defer
+    data-domain="calendrier.dgnum.eu"
+    src="https://analytics.dgnum.eu/js/script.js"
+  ></script>
 </div>
 
 <style>

src/calendar.js

@@ -190,14 +190,6 @@ function fcEventFromjCalEvent(cal) {
   }
 }
 
-function mkEventsFromCalendar(id, cal) {
-  return fetchCalendar(id, cal).then(calendar => {
-    if (calendar[0] !== 'vcalendar') return
-    const cal = new Calendar(id, calendar)
-    return cal.events.map(fcEventFromjCalEvent(cal))
-  })
-}
-
 export function mkSource(name) {
   const calendarId = calendarsByName[name]
   if (!calendarId) return null