From b2d7c5b22c8b5f3b68f87de2eb5ffe618f3f756e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cintia=20S=C3=A1nchez=20Garc=C3=ADa?= <cynthiasg@icloud.com>
Date: Thu, 11 Apr 2024 08:01:08 +0200
Subject: [PATCH 01/55] Allow setting web application base path (#557)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Cintia Sanchez Garcia <cynthiasg@icloud.com>
Signed-off-by: Sergio Castaño Arteaga <tegioz@icloud.com>
Co-authored-by: Cintia Sanchez Garcia <cynthiasg@icloud.com>
Co-authored-by: Sergio Castaño Arteaga <tegioz@icloud.com>
---
 docs/config/settings.yml                      | 12 ++-
 embed/embed.html                              |  2 +-
 embed/package.json                            |  3 +-
 .../iframeResizer.contentWindow-v4.3.9.min.js |  0
 embed/src/App.tsx                             |  6 +-
 embed/src/types.ts                            |  1 +
 embed/src/utils/getUrl.tsx                    |  7 +-
 embed/vite.config.ts                          | 15 +--
 embed/yarn.lock                               | 95 +------------------
 src/build/datasets.rs                         |  7 +-
 src/build/settings.rs                         | 34 +++++++
 src/new/template/settings.yml                 | 30 +++---
 web/package.json                              |  3 +-
 web/{src/assets/js => public/assets}/gtm.js   |  0
 web/src/App.tsx                               | 21 ++--
 web/src/data.ts                               | 10 ++
 web/src/layout/common/Image.tsx               |  2 +-
 web/src/layout/explore/index.tsx              |  7 +-
 web/src/layout/guide/index.tsx                |  4 +-
 web/src/layout/navigation/EmbedModal.tsx      | 25 ++---
 web/src/layout/navigation/Header.tsx          | 28 +++---
 web/src/layout/navigation/MobileDropdown.tsx  |  7 +-
 web/src/layout/navigation/MobileHeader.tsx    |  8 +-
 web/src/layout/notFound/index.tsx             |  3 +-
 web/src/layout/stores/groupActive.tsx         | 11 +--
 web/src/types.ts                              |  1 +
 web/src/utils/getBasePath.ts                  |  5 +
 web/src/utils/isExploreSection.ts             |  7 ++
 web/src/window.d.ts                           |  1 +
 web/vite.config.ts                            | 11 +--
 web/yarn.lock                                 | 42 +-------
 31 files changed, 182 insertions(+), 226 deletions(-)
 rename embed/{src/assets/js => public/assets}/iframeResizer.contentWindow-v4.3.9.min.js (100%)
 rename web/{src/assets/js => public/assets}/gtm.js (100%)
 create mode 100644 web/src/utils/getBasePath.ts
 create mode 100644 web/src/utils/isExploreSection.ts

diff --git a/docs/config/settings.yml b/docs/config/settings.yml
index feff137f..88589661 100644
--- a/docs/config/settings.yml
+++ b/docs/config/settings.yml
@@ -28,6 +28,14 @@ url: https://landscape.cncf.io
 #   gtm:                            # Google Tag Manager configuration
 #     container_id: <CONTAINER_ID>  # Landscape web application container ID
 
+# Base path (optional)
+#
+# Base path where the landscape will be hosted. By default the generated
+# landscape is prepared to be hosted at the root of the domain. However, if the
+# landscape will be hosted in a subpath, this value must be set accordingly.
+#
+# base_path: /<BASE_PATH>
+
 # Categories (optional)
 #
 # Categories information is read from the `landscape.yml` data file. The way
@@ -303,8 +311,8 @@ tags:
     - category: "Wasm"
       subcategories:
         - "Packaging, Registries & Application Delivery"
-  contributor-strategy: []
-  environmental-sustainability: []
+  contributor-strategy: [ ]
+  environmental-sustainability: [ ]
   network:
     - category: "Orchestration & Management"
       subcategories:
diff --git a/embed/embed.html b/embed/embed.html
index f0845ace..c9588371 100644
--- a/embed/embed.html
+++ b/embed/embed.html
@@ -14,7 +14,7 @@
         const resizer = urlParams.get('iframe-resizer');
         if (typeof resizer !== null && resizer === 'true') {
           const script = document.createElement('script');
-          script.setAttribute('src', '/embed/assets/iframeResizer.contentWindow-v4.3.9.min.js');
+          script.setAttribute('src', './embed/assets/iframeResizer.contentWindow-v4.3.9.min.js');
           document.body.appendChild(script);
         }
       })();
diff --git a/embed/package.json b/embed/package.json
index 3e34c5ef..7cffc0d2 100644
--- a/embed/package.json
+++ b/embed/package.json
@@ -24,7 +24,6 @@
     "eslint-plugin-solid": "^0.13.1",
     "typescript": "^5.3.3",
     "vite": "^5.1.4",
-    "vite-plugin-solid": "^2.10.1",
-    "vite-plugin-static-copy": "^1.0.1"
+    "vite-plugin-solid": "^2.10.1"
   }
 }
diff --git a/embed/src/assets/js/iframeResizer.contentWindow-v4.3.9.min.js b/embed/public/assets/iframeResizer.contentWindow-v4.3.9.min.js
similarity index 100%
rename from embed/src/assets/js/iframeResizer.contentWindow-v4.3.9.min.js
rename to embed/public/assets/iframeResizer.contentWindow-v4.3.9.min.js
diff --git a/embed/src/App.tsx b/embed/src/App.tsx
index d61fb51e..51fbde72 100644
--- a/embed/src/App.tsx
+++ b/embed/src/App.tsx
@@ -7,6 +7,7 @@ import NoData from './common/NoData';
 import StyleView from './common/StyleView';
 import {
   Alignment,
+  BASE_PATH_PARAM,
   BaseItem,
   Data,
   DEFAULT_DISPLAY_CATEGORY_HEADER,
@@ -116,6 +117,7 @@ const SubcategoryTitle = styled('div')`
 `;
 
 const App = () => {
+  const [basePath, setBasePath] = createSignal<string>('');
   const [key, setKey] = createSignal<string>();
   const [data, setData] = createSignal<Data | null>();
   const [displayHeader, setDisplayHeader] = createSignal<boolean>(DEFAULT_DISPLAY_HEADER);
@@ -139,6 +141,7 @@ const App = () => {
 
   onMount(() => {
     const urlParams = new URLSearchParams(window.location.search);
+    const basePathParam = urlParams.get(BASE_PATH_PARAM);
     const keyParam = urlParams.get(KEY_PARAM);
     const displayHeaderParam = urlParams.get(DISPLAY_HEADER_PARAM);
     const styleParam = urlParams.get(ITEMS_STYLE_PARAM);
@@ -223,6 +226,7 @@ const App = () => {
         }
         // When size and style are not valid, we don´t save the key
         if (isValidSize && isValidStyle) {
+          setBasePath(basePathParam || '');
           setKey(keyParam);
         } else {
           setData(null);
@@ -240,7 +244,7 @@ const App = () => {
           fetch(
             import.meta.env.MODE === 'development'
               ? `http://localhost:8000/data/embed_${key()}.json`
-              : `../data/embed_${key()}.json`
+              : `${basePath()}/data/embed_${key()}.json`
           )
             .then((res) => {
               if (res.ok) {
diff --git a/embed/src/types.ts b/embed/src/types.ts
index 3c438776..fd1619c8 100644
--- a/embed/src/types.ts
+++ b/embed/src/types.ts
@@ -14,6 +14,7 @@ export const ITEMS_ALIGNMENT_PARAM = 'items-alignment';
 export const ITEMS_SPACING_PARAM = 'items-spacing';
 export const TITLE_BGCOLOR_PARAM = 'bg-color';
 export const TITLE_FGCOLOR_PARAM = 'fg-color';
+export const BASE_PATH_PARAM = 'base-path';
 
 export interface Data {
   category: Category;
diff --git a/embed/src/utils/getUrl.tsx b/embed/src/utils/getUrl.tsx
index 7574201b..d7d388d7 100644
--- a/embed/src/utils/getUrl.tsx
+++ b/embed/src/utils/getUrl.tsx
@@ -1,6 +1,9 @@
+import { BASE_PATH_PARAM } from '../types';
+
 const getUrl = (): string => {
-  const url = new URL(document.location.href);
-  return url.origin;
+  const urlParams = new URLSearchParams(location.search);
+  const basePathParam = urlParams.get(BASE_PATH_PARAM);
+  return `${location.origin}${basePathParam || ''}`;
 };
 
 export default getUrl;
diff --git a/embed/vite.config.ts b/embed/vite.config.ts
index fbd4a6a4..64b1fa3f 100644
--- a/embed/vite.config.ts
+++ b/embed/vite.config.ts
@@ -1,10 +1,8 @@
 import { defineConfig } from 'vite';
 import solid from 'vite-plugin-solid';
-import { viteStaticCopy } from 'vite-plugin-static-copy';
-
 
 export default defineConfig({
-  base: '/embed',
+  base: '',
   build: {
     rollupOptions: {
       input: {
@@ -12,14 +10,5 @@ export default defineConfig({
       },
     },
   },
-  plugins: [solid(),
-    viteStaticCopy({
-      targets: [
-        {
-          src: './src/assets/js/iframeResizer.contentWindow-v4.3.9.min.js',
-          dest: 'assets'
-        }
-      ]
-    })
-  ]
+  plugins: [solid()]
 });
diff --git a/embed/yarn.lock b/embed/yarn.lock
index 23c28c26..3ae4d173 100644
--- a/embed/yarn.lock
+++ b/embed/yarn.lock
@@ -728,14 +728,6 @@ ansi-styles@^4.1.0:
   dependencies:
     color-convert "^2.0.1"
 
-anymatch@~3.1.2:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"
-  integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==
-  dependencies:
-    normalize-path "^3.0.0"
-    picomatch "^2.0.4"
-
 argparse@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
@@ -769,11 +761,6 @@ balanced-match@^1.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
-binary-extensions@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
-  integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
-
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -789,7 +776,7 @@ brace-expansion@^2.0.1:
   dependencies:
     balanced-match "^1.0.0"
 
-braces@^3.0.2, braces@~3.0.2:
+braces@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
   integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
@@ -833,21 +820,6 @@ chalk@^4.0.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-chokidar@^3.5.3:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b"
-  integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==
-  dependencies:
-    anymatch "~3.1.2"
-    braces "~3.0.2"
-    glob-parent "~5.1.2"
-    is-binary-path "~2.1.0"
-    is-glob "~4.0.1"
-    normalize-path "~3.0.0"
-    readdirp "~3.6.0"
-  optionalDependencies:
-    fsevents "~2.3.2"
-
 color-convert@^1.9.0:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
@@ -1095,7 +1067,7 @@ fast-diff@^1.1.2:
   resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.3.0.tgz#ece407fa550a64d638536cd727e129c61616e0f0"
   integrity sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==
 
-fast-glob@^3.2.11, fast-glob@^3.2.9:
+fast-glob@^3.2.9:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129"
   integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==
@@ -1159,15 +1131,6 @@ flatted@^3.2.9:
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.1.tgz#21db470729a6734d4997002f439cb308987f567a"
   integrity sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==
 
-fs-extra@^11.1.0:
-  version "11.2.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.2.0.tgz#e70e17dfad64232287d01929399e0ea7c86b0e5b"
-  integrity sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==
-  dependencies:
-    graceful-fs "^4.2.0"
-    jsonfile "^6.0.1"
-    universalify "^2.0.0"
-
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
@@ -1183,7 +1146,7 @@ gensync@^1.0.0-beta.2:
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
   integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
 
-glob-parent@^5.1.2, glob-parent@~5.1.2:
+glob-parent@^5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
   integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
@@ -1238,11 +1201,6 @@ goober@^2.1.10:
   resolved "https://registry.yarnpkg.com/goober/-/goober-2.1.14.tgz#4a5c94fc34dc086a8e6035360ae1800005135acd"
   integrity sha512-4UpC0NdGyAFqLNPnhCT2iHpza2q+RAY3GV85a/mRPdzyPQMsj0KmMMuetdIkzWRbJ+Hgau1EZztq8ImmiMGhsg==
 
-graceful-fs@^4.1.6, graceful-fs@^4.2.0:
-  version "4.2.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
-  integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
-
 graphemer@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6"
@@ -1304,19 +1262,12 @@ inline-style-parser@0.1.1:
   resolved "https://registry.yarnpkg.com/inline-style-parser/-/inline-style-parser-0.1.1.tgz#ec8a3b429274e9c0a1f1c4ffa9453a7fef72cea1"
   integrity sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q==
 
-is-binary-path@~2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
-  integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
-  dependencies:
-    binary-extensions "^2.0.0"
-
 is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
   integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
 
-is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
+is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
   integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
@@ -1387,15 +1338,6 @@ json5@^2.2.3:
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
   integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
 
-jsonfile@^6.0.1:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
-  integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==
-  dependencies:
-    universalify "^2.0.0"
-  optionalDependencies:
-    graceful-fs "^4.1.6"
-
 kebab-case@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/kebab-case/-/kebab-case-1.0.2.tgz#5eac97d5d220acf606d40e3c0ecfea21f1f9e1eb"
@@ -1501,11 +1443,6 @@ node-releases@^2.0.14:
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.14.tgz#2ffb053bceb8b2be8495ece1ab6ce600c4461b0b"
   integrity sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==
 
-normalize-path@^3.0.0, normalize-path@~3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
-  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
-
 once@^1.3.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
@@ -1571,7 +1508,7 @@ picocolors@^1.0.0:
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
   integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
 
-picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1:
+picomatch@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
@@ -1607,13 +1544,6 @@ queue-microtask@^1.2.2:
   resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
   integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
 
-readdirp@~3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
-  integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==
-  dependencies:
-    picomatch "^2.2.1"
-
 resolve-from@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
@@ -1815,11 +1745,6 @@ typescript@^5.3.3:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.3.tgz#b3ce6ba258e72e6305ba66f5c9b452aaee3ffe37"
   integrity sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==
 
-universalify@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.1.tgz#168efc2180964e6386d061e094df61afe239b18d"
-  integrity sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==
-
 update-browserslist-db@^1.0.13:
   version "1.0.13"
   resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz#3c5e4f5c083661bd38ef64b6328c26ed6c8248c4"
@@ -1852,16 +1777,6 @@ vite-plugin-solid@^2.10.1:
     solid-refresh "^0.6.3"
     vitefu "^0.2.5"
 
-vite-plugin-static-copy@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/vite-plugin-static-copy/-/vite-plugin-static-copy-1.0.1.tgz#c8aa9871d920b0de9c8583caae5510669546cf8e"
-  integrity sha512-3eGL4mdZoPJMDBT68pv/XKIHR4MgVolStIxxv1gIBP4R8TpHn9C9EnaU0hesqlseJ4ycLGUxckFTu/jpuJXQlA==
-  dependencies:
-    chokidar "^3.5.3"
-    fast-glob "^3.2.11"
-    fs-extra "^11.1.0"
-    picocolors "^1.0.0"
-
 vite@^5.1.4:
   version "5.1.4"
   resolved "https://registry.yarnpkg.com/vite/-/vite-5.1.4.tgz#14e9d3e7a6e488f36284ef13cebe149f060bcfb6"
diff --git a/src/build/datasets.rs b/src/build/datasets.rs
index 76e98e24..8c0670a9 100644
--- a/src/build/datasets.rs
+++ b/src/build/datasets.rs
@@ -69,11 +69,15 @@ mod base {
 
     /// Base dataset information.
     #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
+    #[allow(clippy::struct_field_names)]
     pub(crate) struct Base {
         pub finances_available: bool,
         pub foundation: String,
         pub qr_code: String,
 
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub base_path: Option<String>,
+
         #[serde(skip_serializing_if = "Vec::is_empty")]
         pub categories: Vec<Category>,
 
@@ -123,7 +127,7 @@ mod base {
                 finances_available: false,
                 foundation: settings.foundation.clone(),
                 qr_code: qr_code.to_string(),
-                images: settings.images.clone(),
+                base_path: settings.base_path.clone(),
                 categories: landscape_data.categories.clone(),
                 categories_overridden: vec![],
                 colors: settings.colors.clone(),
@@ -132,6 +136,7 @@ mod base {
                 groups: settings.groups.clone().unwrap_or_default(),
                 guide_summary: BTreeMap::new(),
                 header: settings.header.clone(),
+                images: settings.images.clone(),
                 items: vec![],
                 members_category: settings.members_category.clone(),
                 upcoming_event: settings.upcoming_event.clone(),
diff --git a/src/build/settings.rs b/src/build/settings.rs
index 97f7888c..dd4b73b7 100644
--- a/src/build/settings.rs
+++ b/src/build/settings.rs
@@ -27,6 +27,9 @@ pub(crate) struct LandscapeSettings {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub analytics: Option<Analytics>,
 
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub base_path: Option<String>,
+
     #[serde(skip_serializing_if = "Option::is_none")]
     pub categories: Option<Vec<Category>>,
 
@@ -112,8 +115,10 @@ impl LandscapeSettings {
     /// Create a new landscape settings instance from the raw data provided.
     fn new_from_raw_data(raw_data: &str) -> Result<Self> {
         let mut settings: LandscapeSettings = serde_yaml::from_str(raw_data)?;
+
         settings.validate().context("the landscape settings file provided is not valid")?;
         settings.footer_text_to_html().context("error converting footer md text to html")?;
+        settings.remove_base_path_trailing_slash();
         settings.set_groups_normalized_name();
 
         Ok(settings)
@@ -131,6 +136,15 @@ impl LandscapeSettings {
         Ok(())
     }
 
+    /// Remove base_path trailing slash if present.
+    fn remove_base_path_trailing_slash(&mut self) {
+        if let Some(base_path) = &mut self.base_path {
+            if let Some(base_path_updated) = base_path.strip_suffix('/') {
+                *base_path = base_path_updated.to_string();
+            }
+        }
+    }
+
     /// Set the normalized name field of the provided groups.
     fn set_groups_normalized_name(&mut self) {
         if let Some(groups) = self.groups.as_mut() {
@@ -150,6 +164,7 @@ impl LandscapeSettings {
         // Check url is valid
         validate_url("landscape", &Some(self.url.clone()))?;
 
+        self.validate_base_path()?;
         self.validate_categories()?;
         self.validate_colors()?;
         self.validate_featured_items()?;
@@ -165,6 +180,25 @@ impl LandscapeSettings {
         Ok(())
     }
 
+    /// Check base path is valid.
+    fn validate_base_path(&self) -> Result<()> {
+        let Some(base_path) = &self.base_path else {
+            return Ok(());
+        };
+
+        // Check base path is not empty
+        if base_path.is_empty() {
+            bail!("base_path cannot be empty");
+        }
+
+        // Check base path starts with a slash
+        if !base_path.starts_with('/') {
+            bail!("base_path must start with a slash");
+        }
+
+        Ok(())
+    }
+
     /// Check categories are valid.
     fn validate_categories(&self) -> Result<()> {
         if let Some(categories) = &self.categories {
diff --git a/src/new/template/settings.yml b/src/new/template/settings.yml
index 0fefc3b6..703dbade 100644
--- a/src/new/template/settings.yml
+++ b/src/new/template/settings.yml
@@ -28,9 +28,17 @@ url: http://127.0.0.1:8000
 #   gtm:                            # Google Tag Manager configuration
 #     container_id: <CONTAINER_ID>  # Landscape web application container ID
 
+# Base path (optional)
+#
+# Base path where the landscape will be hosted. By default the generated
+# landscape is prepared to be hosted at the root of the domain. However, if the
+# landscape will be hosted in a subpath, this value must be set accordingly.
+#
+# base_path: /<BASE_PATH>
+
 # Categories (optional)
 #
-# Categories information is read from the `landscape.yml` data file. The way
+# Categories information is read from the `landscape.yml` data file. The way
 # categories are displayed in the web application is computed dynamically based
 # on the number of categories and subcategories, as well as the number of items
 # on each. Sometimes, however, we may want subcategories to be displayed in a
@@ -56,11 +64,11 @@ url: http://127.0.0.1:8000
 #
 # colors:
 #   color1: <COLOR1>  # Buttons, groups, links
-#   color2: <COLOR2>  # Some highlighted items like filters button, search icon
-#   color3: <COLOR3>  # Participation stats bars, spinners, modal titles
-#   color4: <COLOR4>  # Categories titles in filters, fieldset in filters modal
-#   color4: <COLOR5>  # Categories and subcategories frames (odd)
-#   color5: <COLOR6>  # Categories and subcategories frames (even)
+#   color2: <COLOR2>  # Some highlighted items like filters button, search icon
+#   color3: <COLOR3>  # Participation stats bars, spinners, modal titles
+#   color4: <COLOR4>  # Categories titles in filters, fieldset in filters modal
+#   color4: <COLOR5>  # Categories and subcategories frames (odd)
+#   color5: <COLOR6>  # Categories and subcategories frames (even)
 #
 colors:
   color1: "rgba(0, 107, 204, 1)"
@@ -138,7 +146,7 @@ footer:
 #
 # Defines the preferred size of the landscape items in the grid mode. When the
 # landscape contains many items, it is recommended to use the `small` size.
-# However, if there aren't many items, choosing `medium` or `large` may make
+# However, if there aren't many items, choosing `medium` or `large` may make
 # the landscape look nicer. Users will still be able to adjust the items size
 # from the UI using the zoom controls.
 #
@@ -185,7 +193,7 @@ header:
 
 # Images (optional)
 #
-# Urls of some images used in the landscape UI.
+# Urls of some images used in the landscape UI.
 #
 # images:
 #   favicon: <FAVICON_URL>
@@ -199,7 +207,7 @@ header:
 # but it is important that we define it here as there are some special
 # operations that depend on it.
 #
-# members_category: <CATEGORY_NAME>
+# members_category: <CATEGORY_NAME>
 #
 
 # Osano (optional)
@@ -233,7 +241,7 @@ screenshot_width: 1500
 # (by using the `tag` field in the `extra` item's section). However, sometimes
 # this information is not available at the item level. This configuration
 # section provides a mechanism to automatically asign a TAG to projects items
-# based on the categories and subcategories they belong to.
+# based on the categories and subcategories they belong to.
 #
 # For example, we can define that all projects in the category <CATEGORY1> are
 # owned by <TAG1>. When the items are processed, the corresponding TAG will be
@@ -265,4 +273,4 @@ screenshot_width: 1500
 #   start: <START_DATE>  # Start date: (required, format: YYYY-MM-DD)
 #   end: <END_DATE>      # End date: (required, format: YYYY-MM-DD)
 #   banner_url: <URL>    # Event banner image url (required, recommended dimensions: 2400x300)
-#   details_url: <URL>   # Event details URL (required)
+#   details_url: <URL>   # Event details URL (required)
diff --git a/web/package.json b/web/package.json
index 003d9fbf..aecc0d6e 100644
--- a/web/package.json
+++ b/web/package.json
@@ -37,8 +37,7 @@
     "typescript": "^5.3.3",
     "vite": "^5.1.5",
     "vite-plugin-ejs": "^1.7.0",
-    "vite-plugin-solid": "^2.10.1",
-    "vite-plugin-static-copy": "^1.0.1"
+    "vite-plugin-solid": "^2.10.1"
   },
   "description": "Landscape2 is a tool that generates interactive landscapes websites.",
   "license": "Apache-2.0"
diff --git a/web/src/assets/js/gtm.js b/web/public/assets/gtm.js
similarity index 100%
rename from web/src/assets/js/gtm.js
rename to web/public/assets/gtm.js
diff --git a/web/src/App.tsx b/web/src/App.tsx
index d894a734..0cde832d 100644
--- a/web/src/App.tsx
+++ b/web/src/App.tsx
@@ -3,6 +3,15 @@ import isUndefined from 'lodash/isUndefined';
 import range from 'lodash/range';
 import { createSignal, onMount } from 'solid-js';
 
+import {
+  EMBED_SETUP_PATH,
+  EXPLORE_PATH,
+  FINANCES_PATH,
+  GUIDE_PATH,
+  LOGOS_PREVIEW_PATH,
+  SCREENSHOTS_PATH,
+  STATS_PATH,
+} from './data';
 import Layout from './layout';
 import Explore from './layout/explore';
 import Finances from './layout/finances';
@@ -69,13 +78,13 @@ const App = () => {
 
   return (
     <Router root={Layout}>
-      <Route path={['/', '/embed-setup']} component={() => <Explore initialData={data()} />} />
-      <Route path="/guide" component={Guide} />
-      <Route path="/stats" component={Stats} />
-      <Route path="/finances" component={Finances} />
-      <Route path="/screenshot" component={() => <Screenshots initialData={data()} />} />
-      <Route path="/logos-preview" component={Logos} />
+      <Route path={[EXPLORE_PATH, EMBED_SETUP_PATH]} component={() => <Explore initialData={data()} />} />
+      <Route path={GUIDE_PATH} component={Guide} />
+      <Route path={STATS_PATH} component={Stats} />
+      <Route path={FINANCES_PATH} component={Finances} />
+      <Route path={LOGOS_PREVIEW_PATH} component={Logos} />
       <Route path="*" component={NotFound} />
+      <Route path={SCREENSHOTS_PATH} component={() => <Screenshots initialData={data()} />} />
     </Router>
   );
 };
diff --git a/web/src/data.ts b/web/src/data.ts
index 7bd72dd5..1116b2e5 100644
--- a/web/src/data.ts
+++ b/web/src/data.ts
@@ -13,8 +13,18 @@ import {
   ViewMode,
   ZoomLevelsPerSize,
 } from './types';
+import getBasePath from './utils/getBasePath';
 import getFoundationNameLabel from './utils/getFoundationNameLabel';
 
+export const BASE_PATH = getBasePath();
+export const EXPLORE_PATH = BASE_PATH === '' ? '/' : `${BASE_PATH}/`;
+export const EMBED_SETUP_PATH = `${BASE_PATH}/embed-setup`;
+export const STATS_PATH = `${BASE_PATH}/stats`;
+export const GUIDE_PATH = `${BASE_PATH}/guide`;
+export const FINANCES_PATH = `${BASE_PATH}/finances`;
+export const LOGOS_PREVIEW_PATH = `${BASE_PATH}/logos-preview`;
+export const SCREENSHOTS_PATH = '/screenshot';
+
 export const TAB_PARAM = 'tab';
 export const VIEW_MODE_PARAM = 'view-mode';
 export const GROUP_PARAM = 'group';
diff --git a/web/src/layout/common/Image.tsx b/web/src/layout/common/Image.tsx
index 73749ce1..d31f15c5 100644
--- a/web/src/layout/common/Image.tsx
+++ b/web/src/layout/common/Image.tsx
@@ -22,7 +22,7 @@ const Image = (props: Props) => {
         <img
           alt={`${props.name} logo`}
           class={props.class}
-          src={import.meta.env.MODE === 'development' ? `../../static/${props.logo}` : `${props.logo}`}
+          src={import.meta.env.MODE === 'development' ? `../../static/${props.logo}` : `./${props.logo}`}
           onError={() => setError(true)}
           loading={!isUndefined(props.enableLazyLoad) && props.enableLazyLoad ? 'lazy' : undefined}
           width="auto"
diff --git a/web/src/layout/explore/index.tsx b/web/src/layout/explore/index.tsx
index cf19c16f..455119c7 100644
--- a/web/src/layout/explore/index.tsx
+++ b/web/src/layout/explore/index.tsx
@@ -9,6 +9,7 @@ import { batch, createEffect, createSignal, For, Match, on, onCleanup, onMount,
 
 import {
   ALL_OPTION,
+  BASE_PATH,
   CLASSIFY_PARAM,
   DEFAULT_CLASSIFY,
   DEFAULT_SORT,
@@ -274,7 +275,7 @@ const Explore = (props: Props) => {
       }
     }
 
-    navigate(`${location.pathname}?${updatedSearchParams.toString()}${getHash()}`, {
+    navigate(`${BASE_PATH}/?${updatedSearchParams.toString()}${getHash()}`, {
       state: location.state,
       replace: true,
       scroll: true, // default
@@ -336,7 +337,7 @@ const Explore = (props: Props) => {
 
     const query = params.toString();
 
-    navigate(`${location.pathname}${query === '' ? '' : `?${query}`}${getHash()}`, {
+    navigate(`${BASE_PATH}/${query === '' ? '' : `?${query}`}${getHash()}`, {
       state: location.state,
       replace: true,
       scroll: true, // default
@@ -366,7 +367,7 @@ const Explore = (props: Props) => {
         });
 
         if (viewMode() === ViewMode.Card) {
-          navigate(`${location.pathname}${location.search}${location.hash !== '' ? location.hash : getHash()}`, {
+          navigate(`${BASE_PATH}/${location.search}${location.hash !== '' ? location.hash : getHash()}`, {
             state: location.state,
             replace: true,
             scroll: true, // default
diff --git a/web/src/layout/guide/index.tsx b/web/src/layout/guide/index.tsx
index 01bd8e96..ea0c5d25 100644
--- a/web/src/layout/guide/index.tsx
+++ b/web/src/layout/guide/index.tsx
@@ -2,7 +2,7 @@ import { useLocation, useNavigate } from '@solidjs/router';
 import isUndefined from 'lodash/isUndefined';
 import { createEffect, createMemo, createSignal, For, on, onMount, Show } from 'solid-js';
 
-import { SMALL_DEVICES_BREAKPOINTS } from '../../data';
+import { GUIDE_PATH, SMALL_DEVICES_BREAKPOINTS } from '../../data';
 import useBreakpointDetect from '../../hooks/useBreakpointDetect';
 import { CategoryGuide, Guide, StateContent, SubcategoryGuide, SVGIconKind, ToCTitle } from '../../types';
 import getNormalizedName from '../../utils/getNormalizedName';
@@ -133,7 +133,7 @@ const GuideIndex = () => {
   );
 
   const updateRoute = (title: string) => {
-    navigate(`${location.pathname}${location.search}#${title}`, {
+    navigate(`${GUIDE_PATH}${location.search}#${title}`, {
       replace: true,
       scroll: false,
       state: { fromMenu: true },
diff --git a/web/src/layout/navigation/EmbedModal.tsx b/web/src/layout/navigation/EmbedModal.tsx
index 25093427..d5b2bb20 100644
--- a/web/src/layout/navigation/EmbedModal.tsx
+++ b/web/src/layout/navigation/EmbedModal.tsx
@@ -1,7 +1,7 @@
 import { useLocation, useNavigate } from '@solidjs/router';
 import isUndefined from 'lodash/isUndefined';
 import sortBy from 'lodash/sortBy';
-import { batch, createEffect, createSignal, For, on, onMount, Show } from 'solid-js';
+import { batch, createEffect, createMemo, createSignal, For, on, onMount, Show } from 'solid-js';
 
 import {
   Alignment,
@@ -40,10 +40,11 @@ import {
   TITLE_SIZE_PARAM,
   UPPERCASE_TITLE_PARAM,
 } from '../../../../embed/src/types';
-import { SMALL_DEVICES_BREAKPOINTS } from '../../data';
+import { BASE_PATH, EMBED_SETUP_PATH, SMALL_DEVICES_BREAKPOINTS } from '../../data';
 import useBreakpointDetect from '../../hooks/useBreakpointDetect';
 import { Category, Subcategory, SVGIconKind } from '../../types';
 import capitalizeFirstLetter from '../../utils/capitalizeFirstLetter';
+import isExploreSection from '../../utils/isExploreSection';
 import rgba2hex from '../../utils/rgba2hex';
 import CheckBox from '../common/Checkbox';
 import CodeBlock from '../common/CodeBlock';
@@ -91,8 +92,8 @@ const EmbedModal = () => {
       ? rgba2hex(window.baseDS.colors.color5)
       : DEFAULT_TITLE_BG_COLOR;
   // Icon is only visible when Explore section is loaded
-  const isVisible = () => ['/', '/embed-setup'].includes(location.pathname);
-  const isEmbedSetupActive = () => location.pathname === '/embed-setup';
+  const isVisible = createMemo(() => isExploreSection(location.pathname));
+  const isEmbedSetupActive = () => location.pathname === EMBED_SETUP_PATH;
   const [visibleModal, setVisibleModal] = createSignal<boolean>(isEmbedSetupActive());
   const categoriesList = () => sortBy(window.baseDS.categories, ['name']);
   const [subcategoriesList, setSubcategoriesList] = createSignal<Subcategory[]>(
@@ -127,10 +128,10 @@ const EmbedModal = () => {
   const [prevHash, setPrevHash] = createSignal<string>('');
   const [prevSearch, setPrevSearch] = createSignal<string>('');
 
-  const getUrl = () => {
+  const getIFrameUrl = () => {
     return `${
       import.meta.env.MODE === 'development' ? 'http://localhost:8000' : window.location.origin
-    }/embed/embed.html?${KEY_PARAM}=${key() || categoriesList()[0].normalized_name}&${DISPLAY_HEADER_PARAM}=${
+    }${BASE_PATH}/embed/embed.html?${KEY_PARAM}=${key() || categoriesList()[0].normalized_name}&${DISPLAY_HEADER_PARAM}=${
       displayHeader() ? 'true' : 'false'
     }&${DISPLAY_HEADER_CATEGORY_PARAM}=${
       displayCategoryTitle() ? 'true' : 'false'
@@ -144,7 +145,7 @@ const EmbedModal = () => {
       itemsSpacingType() === SpacingType.Custom && !isUndefined(itemsSpacing())
         ? `&${ITEMS_SPACING_PARAM}=${itemsSpacing()}`
         : ''
-    }&${TITLE_BGCOLOR_PARAM}=${encodeURIComponent(bgColor())}&${TITLE_FGCOLOR_PARAM}=${encodeURIComponent(fgColor())}`;
+    }&${TITLE_BGCOLOR_PARAM}=${encodeURIComponent(bgColor())}&${TITLE_FGCOLOR_PARAM}=${encodeURIComponent(fgColor())}${!isUndefined(window.baseDS.base_path) ? `&base-path=${encodeURIComponent(window.baseDS.base_path)}` : ''}`;
   };
 
   const onUpdateSpacingType = (type: SpacingType) => {
@@ -224,7 +225,7 @@ const EmbedModal = () => {
   };
 
   const onClose = () => {
-    navigate(`/${prevSearch() !== '' ? prevSearch() : ''}${prevHash()}`, {
+    navigate(`${BASE_PATH}/${prevSearch() !== '' ? prevSearch() : ''}${prevHash()}`, {
       replace: true,
     });
     setVisibleModal(false);
@@ -256,11 +257,11 @@ const EmbedModal = () => {
   };
 
   onMount(() => {
-    setUrl(getUrl());
+    setUrl(getIFrameUrl());
   });
 
   createEffect(() => {
-    setUrl(getUrl());
+    setUrl(getIFrameUrl());
   });
 
   createEffect(
@@ -276,7 +277,7 @@ const EmbedModal = () => {
       if (visibleModal()) {
         setPrevSearch(location.search);
         setPrevHash(location.hash);
-        setUrl(getUrl());
+        setUrl(getIFrameUrl());
       }
     })
   );
@@ -291,7 +292,7 @@ const EmbedModal = () => {
             e.preventDefault();
             e.stopPropagation();
             setVisibleModal(true);
-            navigate('embed-setup', {
+            navigate(EMBED_SETUP_PATH, {
               replace: true,
             });
           }}
diff --git a/web/src/layout/navigation/Header.tsx b/web/src/layout/navigation/Header.tsx
index 494a9572..c815169f 100644
--- a/web/src/layout/navigation/Header.tsx
+++ b/web/src/layout/navigation/Header.tsx
@@ -1,10 +1,11 @@
 import { useLocation, useNavigate } from '@solidjs/router';
 import isEmpty from 'lodash/isEmpty';
 import isUndefined from 'lodash/isUndefined';
-import { Show } from 'solid-js';
+import { createMemo, Show } from 'solid-js';
 
-import { ALL_OPTION } from '../../data';
+import { ALL_OPTION, EXPLORE_PATH, GUIDE_PATH, SCREENSHOTS_PATH, STATS_PATH } from '../../data';
 import { SVGIconKind, ViewMode } from '../../types';
+import isExploreSection from '../../utils/isExploreSection';
 import scrollToTop from '../../utils/scrollToTop';
 import DownloadDropdown from '../common/DownloadDropdown';
 import ExternalLink from '../common/ExternalLink';
@@ -21,6 +22,7 @@ const Header = () => {
   const logo = () => (window.baseDS.header ? window.baseDS.header!.logo : undefined);
   const setViewMode = useSetViewMode();
   const setSelectedGroup = useSetGroupActive();
+  const isExploreActive = createMemo(() => isExploreSection(location.pathname));
 
   const isActive = (path: string) => {
     return path === location.pathname;
@@ -41,7 +43,7 @@ const Header = () => {
               class="btn btn-link p-0 pe-3 me-2 me-xl-5"
               onClick={() => {
                 resetDefaultExploreValues();
-                navigate('/', {
+                navigate(EXPLORE_PATH, {
                   state: { from: 'logo-header' },
                 });
                 scrollToTop(false);
@@ -59,7 +61,7 @@ const Header = () => {
         </Show>
 
         <Show
-          when={location.pathname !== '/screenshot'}
+          when={location.pathname !== SCREENSHOTS_PATH}
           fallback={
             <Show when={!isUndefined(window.baseDS.qr_code)}>
               <img
@@ -77,13 +79,13 @@ const Header = () => {
           <div class="d-flex align-items-center">
             <button
               class={`btn btn-link position-relative text-uppercase fw-bold text-decoration-none p-0 ${styles.link}`}
-              classList={{ activeLink: isActive('/') }}
+              classList={{ activeLink: isExploreActive() }}
               onClick={() => {
-                if (isActive('/')) {
+                if (isExploreActive()) {
                   scrollToTop(false);
                 } else {
                   resetDefaultExploreValues();
-                  navigate('/', {
+                  navigate(EXPLORE_PATH, {
                     state: { from: 'header' },
                   });
                   scrollToTop(false);
@@ -96,12 +98,12 @@ const Header = () => {
             <Show when={!isUndefined(window.baseDS.guide_summary) && !isEmpty(window.baseDS.guide_summary)}>
               <button
                 class={`btn btn-link position-relative text-uppercase fw-bold text-decoration-none p-0 ${styles.link}`}
-                classList={{ activeLink: isActive('/guide') }}
+                classList={{ activeLink: isActive(GUIDE_PATH) }}
                 onClick={() => {
-                  if (isActive('/guide')) {
+                  if (isActive(GUIDE_PATH)) {
                     scrollToTop(false);
                   } else {
-                    navigate('/guide', {
+                    navigate(GUIDE_PATH, {
                       state: { from: 'header' },
                     });
                     scrollToTop(false);
@@ -114,12 +116,12 @@ const Header = () => {
 
             <button
               class={`btn btn-link position-relative text-uppercase fw-bold text-decoration-none p-0 ${styles.link}`}
-              classList={{ activeLink: isActive('/stats') }}
+              classList={{ activeLink: isActive(STATS_PATH) }}
               onClick={() => {
-                if (isActive('/stats')) {
+                if (isActive(STATS_PATH)) {
                   scrollToTop(false);
                 } else {
-                  navigate('/stats', {
+                  navigate(STATS_PATH, {
                     state: { from: 'header' },
                   });
                   scrollToTop(false);
diff --git a/web/src/layout/navigation/MobileDropdown.tsx b/web/src/layout/navigation/MobileDropdown.tsx
index 89b9f54b..dc87e9cd 100644
--- a/web/src/layout/navigation/MobileDropdown.tsx
+++ b/web/src/layout/navigation/MobileDropdown.tsx
@@ -3,6 +3,7 @@ import isEmpty from 'lodash/isEmpty';
 import isUndefined from 'lodash/isUndefined';
 import { createSignal, Show } from 'solid-js';
 
+import { EXPLORE_PATH, GUIDE_PATH, STATS_PATH } from '../../data';
 import { useOutsideClick } from '../../hooks/useOutsideClick';
 import { SVGIconKind } from '../../types';
 import ExternalLink from '../common/ExternalLink';
@@ -43,7 +44,7 @@ const MobileDropdown = (props: Props) => {
           <A
             class={`btn btn-link position-relative text-uppercase w-100 text-start fw-semibold text-decoration-none p-0 ${styles.link}`}
             activeClass="activeLink"
-            href="/"
+            href={EXPLORE_PATH}
             onClick={closeDropdown}
             end
           >
@@ -54,7 +55,7 @@ const MobileDropdown = (props: Props) => {
           <div class="dropdown-item mb-2">
             <A
               class={`btn btn-link position-relative text-uppercase w-100 text-start fw-semibold text-decoration-none p-0 ${styles.link}`}
-              href="/guide"
+              href={GUIDE_PATH}
               activeClass="activeLink"
               state={{ from: 'mobileHeader' }}
               onClick={closeDropdown}
@@ -67,7 +68,7 @@ const MobileDropdown = (props: Props) => {
           <A
             class={`btn btn-link position-relative text-uppercase w-100 text-start fw-semibold text-decoration-none p-0 ${styles.link}`}
             activeClass="activeLink"
-            href="/stats"
+            href={STATS_PATH}
             onClick={closeDropdown}
           >
             Stats
diff --git a/web/src/layout/navigation/MobileHeader.tsx b/web/src/layout/navigation/MobileHeader.tsx
index b6931329..fa4bb23c 100644
--- a/web/src/layout/navigation/MobileHeader.tsx
+++ b/web/src/layout/navigation/MobileHeader.tsx
@@ -3,7 +3,7 @@ import { A, useLocation } from '@solidjs/router';
 import isUndefined from 'lodash/isUndefined';
 import { createEffect, createSignal, on, Show } from 'solid-js';
 
-import { SMALL_DEVICES_BREAKPOINTS } from '../../data';
+import { EXPLORE_PATH, SCREENSHOTS_PATH, SMALL_DEVICES_BREAKPOINTS, STATS_PATH } from '../../data';
 import useBreakpointDetect from '../../hooks/useBreakpointDetect';
 import { SVGIconKind } from '../../types';
 import scrollToTop from '../../utils/scrollToTop';
@@ -41,7 +41,7 @@ const MobileHeader = () => {
         classList={{ 'opacity-0': !sticky(), [styles.isSticky]: sticky() }}
       >
         <div class="d-flex flex-row align-items-center">
-          <Show when={location.pathname !== '/stats'}>
+          <Show when={location.pathname !== STATS_PATH}>
             <button
               title="Index"
               class={`position-relative btn btn-sm btn-secondary text-white btn-sm rounded-0 p-0 ${styles.mobileBtn}`}
@@ -72,7 +72,7 @@ const MobileHeader = () => {
         <div class="container-fluid d-flex flex-column flex-lg-row align-items-center p-3 p-lg-4 mainPadding">
           <div class={`d-flex flex-row justify-content-between align-items-center ${styles.logoWrapper}`}>
             <Show when={!isUndefined(logo())}>
-              <A href="/" class="me-4 me-xl-5">
+              <A href={EXPLORE_PATH} class="me-4 me-xl-5">
                 <img
                   class={styles.logo}
                   src={import.meta.env.MODE === 'development' ? `../../static/${logo()}` : `${logo()}`}
@@ -88,7 +88,7 @@ const MobileHeader = () => {
           </div>
 
           <Show
-            when={location.pathname !== '/screenshot'}
+            when={location.pathname !== SCREENSHOTS_PATH}
             fallback={
               <Show when={!isUndefined(window.baseDS.qr_code)}>
                 <img
diff --git a/web/src/layout/notFound/index.tsx b/web/src/layout/notFound/index.tsx
index 2f4041b9..542f6160 100644
--- a/web/src/layout/notFound/index.tsx
+++ b/web/src/layout/notFound/index.tsx
@@ -1,5 +1,6 @@
 import { A } from '@solidjs/router';
 
+import { EXPLORE_PATH } from '../../data';
 import { SVGIconKind } from '../../types';
 import SVGIcon from '../common/SVGIcon';
 import Footer from '../navigation/Footer';
@@ -17,7 +18,7 @@ const NotFound = () => {
         </div>
         <div class="h1 text-center mb-4">Error 404 - Page Not Found</div>
         <div class="h3 text-center mb-5">The page you were looking for wasn't found</div>
-        <A href="/" class="btn btn-primary rounded-0 text-white btn-lg text-decoration-none">
+        <A href={EXPLORE_PATH} class="btn btn-primary rounded-0 text-white btn-lg text-decoration-none">
           Back Home
         </A>
       </main>
diff --git a/web/src/layout/stores/groupActive.tsx b/web/src/layout/stores/groupActive.tsx
index 76787a0c..b99bcaa4 100644
--- a/web/src/layout/stores/groupActive.tsx
+++ b/web/src/layout/stores/groupActive.tsx
@@ -1,15 +1,14 @@
-import { useLocation, useNavigate, useSearchParams } from '@solidjs/router';
+import { useNavigate, useSearchParams } from '@solidjs/router';
 import isNull from 'lodash/isNull';
 import isUndefined from 'lodash/isUndefined';
 import { createContext, createSignal, ParentComponent, useContext } from 'solid-js';
 
-import { ALL_OPTION, GROUP_PARAM } from '../../data';
+import { ALL_OPTION, BASE_PATH, GROUP_PARAM } from '../../data';
 import { Group } from '../../types';
+import isExploreSection from '../../utils/isExploreSection';
 
 const getInitialGroupName = (groupParam: string | null): string | undefined => {
-  const location = useLocation();
   const navigate = useNavigate();
-  const isExplore = () => location.pathname === '/';
 
   if (isUndefined(window.baseDS.groups)) {
     return undefined;
@@ -22,8 +21,8 @@ const getInitialGroupName = (groupParam: string | null): string | undefined => {
       if (!isUndefined(selectedGroup) || groupParam === ALL_OPTION) {
         return groupParam;
       } else {
-        if (isExplore()) {
-          navigate(`${location.pathname}?group=${firstGroup}`, {
+        if (isExploreSection(location.pathname)) {
+          navigate(`${BASE_PATH}/?group=${firstGroup}`, {
             replace: true,
           });
         }
diff --git a/web/src/types.ts b/web/src/types.ts
index 68c12bba..7d9aef34 100644
--- a/web/src/types.ts
+++ b/web/src/types.ts
@@ -1,4 +1,5 @@
 export interface BaseData {
+  base_path?: string;
   finances_available: boolean;
   foundation: string;
   guide_summary?: GuideSummary;
diff --git a/web/src/utils/getBasePath.ts b/web/src/utils/getBasePath.ts
new file mode 100644
index 00000000..26906912
--- /dev/null
+++ b/web/src/utils/getBasePath.ts
@@ -0,0 +1,5 @@
+const getBasePath = () => {
+  return window.baseDS.base_path || '';
+};
+
+export default getBasePath;
diff --git a/web/src/utils/isExploreSection.ts b/web/src/utils/isExploreSection.ts
new file mode 100644
index 00000000..18debaf4
--- /dev/null
+++ b/web/src/utils/isExploreSection.ts
@@ -0,0 +1,7 @@
+import { EMBED_SETUP_PATH, EXPLORE_PATH } from '../data';
+
+const isExploreSection = (path: string): boolean => {
+  return path === EXPLORE_PATH || path === EMBED_SETUP_PATH;
+};
+
+export default isExploreSection;
diff --git a/web/src/window.d.ts b/web/src/window.d.ts
index 084d3595..7f50ef0d 100644
--- a/web/src/window.d.ts
+++ b/web/src/window.d.ts
@@ -4,6 +4,7 @@ declare global {
   interface Window {
     baseDS: BaseData;
     statsDS: Stats;
+    basePath?: string;
     Osano: { cm: { showDrawer: (t: string) => void; addEventListener: (t: string, f: unknown) => void } };
   }
 }
diff --git a/web/vite.config.ts b/web/vite.config.ts
index 1e2802d3..54e88948 100644
--- a/web/vite.config.ts
+++ b/web/vite.config.ts
@@ -3,7 +3,6 @@ import isUndefined from 'lodash/isUndefined';
 import { defineConfig } from 'vite'
 import { ViteEjsPlugin } from 'vite-plugin-ejs';
 import solid from 'vite-plugin-solid'
-import { viteStaticCopy } from 'vite-plugin-static-copy';
 
 const regex = /<link rel="stylesheet" crossorigin href="(.*?)">/g;
 
@@ -48,15 +47,7 @@ export default defineConfig({
         return html;
       }
     },
-  },
-  viteStaticCopy({
-    targets: [
-      {
-        src: './src/assets/js/gtm.js',
-        dest: 'assets'
-      }
-    ]
-  })],
+  }],
   preview: {
     port: 8000
   }
diff --git a/web/yarn.lock b/web/yarn.lock
index 7f874603..73c68e0a 100644
--- a/web/yarn.lock
+++ b/web/yarn.lock
@@ -921,7 +921,7 @@ chalk@^4.0.0, chalk@^4.0.2:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-"chokidar@>=3.0.0 <4.0.0", chokidar@^3.5.3:
+"chokidar@>=3.0.0 <4.0.0":
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b"
   integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==
@@ -1195,7 +1195,7 @@ fast-diff@^1.1.2:
   resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.3.0.tgz#ece407fa550a64d638536cd727e129c61616e0f0"
   integrity sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==
 
-fast-glob@^3.2.11, fast-glob@^3.2.9:
+fast-glob@^3.2.9:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129"
   integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==
@@ -1266,15 +1266,6 @@ flatted@^3.2.9:
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.1.tgz#21db470729a6734d4997002f439cb308987f567a"
   integrity sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==
 
-fs-extra@^11.1.0:
-  version "11.2.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.2.0.tgz#e70e17dfad64232287d01929399e0ea7c86b0e5b"
-  integrity sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==
-  dependencies:
-    graceful-fs "^4.2.0"
-    jsonfile "^6.0.1"
-    universalify "^2.0.0"
-
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
@@ -1340,11 +1331,6 @@ globby@^11.1.0:
     merge2 "^1.4.1"
     slash "^3.0.0"
 
-graceful-fs@^4.1.6, graceful-fs@^4.2.0:
-  version "4.2.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
-  integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
-
 graphemer@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6"
@@ -1504,15 +1490,6 @@ json5@^2.2.3:
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
   integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
 
-jsonfile@^6.0.1:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
-  integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==
-  dependencies:
-    universalify "^2.0.0"
-  optionalDependencies:
-    graceful-fs "^4.1.6"
-
 kebab-case@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/kebab-case/-/kebab-case-1.0.2.tgz#5eac97d5d220acf606d40e3c0ecfea21f1f9e1eb"
@@ -2017,11 +1994,6 @@ typescript@^5.3.3:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.3.tgz#b3ce6ba258e72e6305ba66f5c9b452aaee3ffe37"
   integrity sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==
 
-universalify@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.1.tgz#168efc2180964e6386d061e094df61afe239b18d"
-  integrity sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==
-
 update-browserslist-db@^1.0.13:
   version "1.0.13"
   resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz#3c5e4f5c083661bd38ef64b6328c26ed6c8248c4"
@@ -2061,16 +2033,6 @@ vite-plugin-solid@^2.10.1:
     solid-refresh "^0.6.3"
     vitefu "^0.2.5"
 
-vite-plugin-static-copy@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/vite-plugin-static-copy/-/vite-plugin-static-copy-1.0.1.tgz#c8aa9871d920b0de9c8583caae5510669546cf8e"
-  integrity sha512-3eGL4mdZoPJMDBT68pv/XKIHR4MgVolStIxxv1gIBP4R8TpHn9C9EnaU0hesqlseJ4ycLGUxckFTu/jpuJXQlA==
-  dependencies:
-    chokidar "^3.5.3"
-    fast-glob "^3.2.11"
-    fs-extra "^11.1.0"
-    picocolors "^1.0.0"
-
 vite@^5.1.5:
   version "5.1.5"
   resolved "https://registry.yarnpkg.com/vite/-/vite-5.1.5.tgz#bdbc2b15e8000d9cc5172f059201178f9c9de5fb"

From af5c5cd5a0a2a4695b9a09577b5f96848f71c6f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20Casta=C3=B1o=20Arteaga?= <tegioz@icloud.com>
Date: Thu, 11 Apr 2024 08:54:28 +0200
Subject: [PATCH 02/55] Update README (#560)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Sergio Castaño Arteaga <tegioz@icloud.com>
---
 README.md                     | 4 +++-
 docs/config/settings.yml      | 3 +++
 src/new/template/settings.yml | 5 ++++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 83c46d08..5beea149 100644
--- a/README.md
+++ b/README.md
@@ -176,8 +176,10 @@ INFO serve: landscape2::serve: http server running (press ctrl+c to stop)
 
 If you visit `http://127.0.0.1:8000` in your browser you should see the landscape you just created in action. Now you can iterate by editing the files in the `my-landscape` directory until your landscape is ready.
 
+One option to serve your landscape in production is to use a static site hosting service like [GitHub Pages](https://pages.github.com). In [this repository](https://github.com/tegioz/sample-landscape) you can find a full example of a landscape generated by the `landscape2 new` command that is automatically built and deployed to GitHub pages (using the `build` branch) on every commit to the `main` branch. Please note that the [sample workflow used to build and deploy](https://github.com/tegioz/sample-landscape/blob/main/.github/workflows/build.yml) requires **write** permissions.
+
 > [!NOTE]
-> The resulting website when building a landscape is a [single-page application](https://en.wikipedia.org/wiki/Single-page_application) that handles routing on the client side. This means that you'll need to configure your webserver to serve the `index.html` file for the SPA route paths (like '/guide', '/stats', etc). One way of doing this would be to serve that file when a non existent path is requested. The `serve` subcommand included in **landscape2** already handles this for us.
+> The resulting website when building a landscape is a [single-page application](https://en.wikipedia.org/wiki/Single-page_application) that handles routing on the client side. This means that you'll need to configure your webserver to serve the `index.html` file for the SPA route paths (like '/guide', '/stats', etc). One way of doing this would be to serve that file when a non existent path is requested. The `serve` subcommand included in **landscape2** already handles this for us. In the GitHub pages example mentioned above, this is achieved by copying the content of the `index.html` file to the `404.html` file, which will be served when a non existent path is requested.
 
 ### Validating data, settings and guide files
 
diff --git a/docs/config/settings.yml b/docs/config/settings.yml
index 88589661..6a8da576 100644
--- a/docs/config/settings.yml
+++ b/docs/config/settings.yml
@@ -27,6 +27,7 @@ url: https://landscape.cncf.io
 # analytics:
 #   gtm:                            # Google Tag Manager configuration
 #     container_id: <CONTAINER_ID>  # Landscape web application container ID
+#
 
 # Base path (optional)
 #
@@ -35,6 +36,7 @@ url: https://landscape.cncf.io
 # landscape will be hosted in a subpath, this value must be set accordingly.
 #
 # base_path: /<BASE_PATH>
+#
 
 # Categories (optional)
 #
@@ -373,6 +375,7 @@ tags:
 #   end: <END_DATE>      # End date: (required, format: YYYY-MM-DD)
 #   banner_url: <URL>    # Event banner image url (required, recommended dimensions: 2400x300)
 #   details_url: <URL>   # Event details URL (required)
+#
 upcoming_event:
   name: "KubeCon + CloudNativeCon EU 2024"
   start: "2024-03-19"
diff --git a/src/new/template/settings.yml b/src/new/template/settings.yml
index 703dbade..c8a033e2 100644
--- a/src/new/template/settings.yml
+++ b/src/new/template/settings.yml
@@ -27,6 +27,7 @@ url: http://127.0.0.1:8000
 # analytics:
 #   gtm:                            # Google Tag Manager configuration
 #     container_id: <CONTAINER_ID>  # Landscape web application container ID
+#
 
 # Base path (optional)
 #
@@ -35,6 +36,7 @@ url: http://127.0.0.1:8000
 # landscape will be hosted in a subpath, this value must be set accordingly.
 #
 # base_path: /<BASE_PATH>
+#
 
 # Categories (optional)
 #
@@ -169,7 +171,7 @@ grid_items_size: large
 #       - <CATEGORY2_NAME>
 #
 groups:
-  - name: All categories
+  - name: Some categories
     categories:
       - Category 1
       - Category 2
@@ -274,3 +276,4 @@ screenshot_width: 1500
 #   end: <END_DATE>      # End date: (required, format: YYYY-MM-DD)
 #   banner_url: <URL>    # Event banner image url (required, recommended dimensions: 2400x300)
 #   details_url: <URL>   # Event details URL (required)
+#

From f33b752683d66509c672dd06ec4b34f3cb721b12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cintia=20S=C3=A1nchez=20Garc=C3=ADa?= <cynthiasg@icloud.com>
Date: Thu, 11 Apr 2024 09:00:21 +0200
Subject: [PATCH 03/55] Add base path to some links (#561)

Add base path to some links

Signed-off-by: Cintia Sanchez Garcia <cynthiasg@icloud.com>
---
 web/src/layout/common/itemModal/BadgeModal.tsx | 5 +++--
 web/src/layout/explore/card/Content.tsx        | 6 +++---
 web/src/layout/explore/grid/Grid.tsx           | 4 ++--
 web/src/layout/stores/upcomingEventData.tsx    | 9 +++++----
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/web/src/layout/common/itemModal/BadgeModal.tsx b/web/src/layout/common/itemModal/BadgeModal.tsx
index a1272401..417a98c0 100644
--- a/web/src/layout/common/itemModal/BadgeModal.tsx
+++ b/web/src/layout/common/itemModal/BadgeModal.tsx
@@ -1,3 +1,4 @@
+import { BASE_PATH } from '../../../data';
 import { SVGIconKind } from '../../../types';
 import CodeBlock from '../CodeBlock';
 import Modal from '../Modal';
@@ -16,8 +17,8 @@ const BadgeModal = (props: Props) => {
   const origin = window.location.origin;
   const foundation = window.baseDS.foundation;
   const badgeImage = `https://img.shields.io/badge/${foundation}%20Landscape-5699C6`;
-  const markdownLink = () => `[![${foundation} Landscape](${badgeImage})](${origin}/?item=${itemId()})`;
-  const asciiLink = () => `${origin}/?item=${itemId()}[image:${badgeImage}[${foundation} LANDSCAPE]]`;
+  const markdownLink = () => `[![${foundation} Landscape](${badgeImage})](${origin}${BASE_PATH}/?item=${itemId()})`;
+  const asciiLink = () => `${origin}${BASE_PATH}/?item=${itemId()}[image:${badgeImage}[${foundation} LANDSCAPE]]`;
 
   return (
     <Modal
diff --git a/web/src/layout/explore/card/Content.tsx b/web/src/layout/explore/card/Content.tsx
index ded56947..432594b2 100644
--- a/web/src/layout/explore/card/Content.tsx
+++ b/web/src/layout/explore/card/Content.tsx
@@ -3,7 +3,7 @@ import intersection from 'lodash/intersection';
 import isUndefined from 'lodash/isUndefined';
 import { Accessor, For, Match, Show, Switch } from 'solid-js';
 
-import { COLORS } from '../../../data';
+import { COLORS, GUIDE_PATH } from '../../../data';
 import {
   BaseItem,
   Category,
@@ -134,7 +134,7 @@ const Content = (props: Props) => {
                                   <Show when={isSectionInGuide(title)}>
                                     <div>
                                       <A
-                                        href={`/guide#${getNormalizedName({ title: title })}`}
+                                        href={`${GUIDE_PATH}#${getNormalizedName({ title: title })}`}
                                         state={{ from: 'explore' }}
                                         class={`position-relative btn btn-link text-white p-0 pe-2 ${styles.btnIcon}`}
                                       >
@@ -152,7 +152,7 @@ const Content = (props: Props) => {
                                   <Show when={isSectionInGuide(title, subtitle)}>
                                     <div>
                                       <A
-                                        href={`/guide#${getNormalizedName({ title: title, subtitle: subtitle, grouped: true })}`}
+                                        href={`${GUIDE_PATH}#${getNormalizedName({ title: title, subtitle: subtitle, grouped: true })}`}
                                         state={{ from: 'explore' }}
                                         class={`position-relative btn btn-link p-0 pe-2 ${styles.btnIcon}`}
                                       >
diff --git a/web/src/layout/explore/grid/Grid.tsx b/web/src/layout/explore/grid/Grid.tsx
index 5fa326d7..7392fed0 100644
--- a/web/src/layout/explore/grid/Grid.tsx
+++ b/web/src/layout/explore/grid/Grid.tsx
@@ -3,7 +3,7 @@ import isEqual from 'lodash/isEqual';
 import isUndefined from 'lodash/isUndefined';
 import { createEffect, createSignal, For, on, Show } from 'solid-js';
 
-import { ZOOM_LEVELS } from '../../../data';
+import { GUIDE_PATH, ZOOM_LEVELS } from '../../../data';
 import { BaseItem, Item, SVGIconKind } from '../../../types';
 import calculateGridItemsPerRow from '../../../utils/calculateGridItemsPerRow';
 import getNormalizedName from '../../../utils/getNormalizedName';
@@ -148,7 +148,7 @@ const Grid = (props: Props) => {
                         <Show when={isSectionInGuide(props.categoryName, subcat.subcategoryName)}>
                           <div>
                             <A
-                              href={`/guide#${getNormalizedName({
+                              href={`${GUIDE_PATH}#${getNormalizedName({
                                 title: props.categoryName,
                                 subtitle: subcat.subcategoryName,
                                 grouped: true,
diff --git a/web/src/layout/stores/upcomingEventData.tsx b/web/src/layout/stores/upcomingEventData.tsx
index c88b0a99..afd51511 100644
--- a/web/src/layout/stores/upcomingEventData.tsx
+++ b/web/src/layout/stores/upcomingEventData.tsx
@@ -2,9 +2,10 @@ import { useLocation } from '@solidjs/router';
 import isNull from 'lodash/isNull';
 import isUndefined from 'lodash/isUndefined';
 import moment from 'moment';
-import { createContext, createEffect, createSignal, on, ParentComponent, useContext } from 'solid-js';
+import { createContext, createEffect, createMemo, createSignal, on, ParentComponent, useContext } from 'solid-js';
 
 import { Event } from '../../types';
+import isExploreSection from '../../utils/isExploreSection';
 
 const validateEvent = (): Event | null => {
   let validEvent: Event | null = null;
@@ -27,11 +28,11 @@ function useUpcomingEventProvider() {
   const [hiddenEvent, setHiddenEvent] = createSignal<boolean>(isNull(validEvent()));
   const location = useLocation();
   // Upcoming event is only visible on EXPLORE section
-  const inExploreSection = () => ['/', '/embed-setup'].includes(location.pathname);
+  const isExploreActive = createMemo(() => isExploreSection(location.pathname));
 
   createEffect(
-    on(inExploreSection, () => {
-      if (inExploreSection()) {
+    on(isExploreActive, () => {
+      if (isExploreActive()) {
         setEventVisible(true);
       } else {
         setEventVisible(false);

From 7b0a16121c9edf4a4cfa589c9d3192e1c35eeaa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cintia=20S=C3=A1nchez=20Garc=C3=ADa?= <cynthiasg@icloud.com>
Date: Thu, 11 Apr 2024 14:00:36 +0200
Subject: [PATCH 04/55] Fix issue processing additional categories (#562)

Signed-off-by: Cintia Sanchez Garcia <cynthiasg@icloud.com>
---
 web/src/layout/explore/filters/index.tsx |   3 +-
 web/src/utils/checkIfCategoryInGroup.ts  |  17 +++
 web/src/utils/itemsDataGetter.ts         | 163 ++++++++++++++++++-----
 web/src/utils/prepareFilters.ts          |  30 +++--
 4 files changed, 166 insertions(+), 47 deletions(-)
 create mode 100644 web/src/utils/checkIfCategoryInGroup.ts

diff --git a/web/src/layout/explore/filters/index.tsx b/web/src/layout/explore/filters/index.tsx
index bf963388..c895dda7 100644
--- a/web/src/layout/explore/filters/index.tsx
+++ b/web/src/layout/explore/filters/index.tsx
@@ -20,7 +20,6 @@ import {
   ViewMode,
 } from '../../../types';
 import getFoundationNameLabel from '../../../utils/getFoundationNameLabel';
-import itemsDataGetter from '../../../utils/itemsDataGetter';
 import getFiltersPerGroup, { FiltersPerGroup } from '../../../utils/prepareFilters';
 import Loading from '../../common/Loading';
 import Modal from '../../common/Modal';
@@ -78,7 +77,7 @@ const Filters = (props: Props) => {
     on(visibleFiltersModal, () => {
       if (visibleFiltersModal()) {
         if (filters().length === 0) {
-          const f = getFiltersPerGroup(itemsDataGetter.getGridData(true));
+          const f = getFiltersPerGroup();
           if (!isEmpty(f)) {
             setFiltersFromData(f);
             setFilters(f[props.initialSelectedGroup() || ALL_OPTION]);
diff --git a/web/src/utils/checkIfCategoryInGroup.ts b/web/src/utils/checkIfCategoryInGroup.ts
new file mode 100644
index 00000000..e6aa5234
--- /dev/null
+++ b/web/src/utils/checkIfCategoryInGroup.ts
@@ -0,0 +1,17 @@
+import { ALL_OPTION } from '../data';
+import { Group } from '../types';
+
+const checkIfCategoryInGroup = (category: string, group: string): boolean => {
+  if (window.baseDS.groups && group !== ALL_OPTION) {
+    const selectedGroup = window.baseDS.groups!.find((g: Group) => g.normalized_name === group);
+    if (selectedGroup) {
+      return selectedGroup.categories.includes(category);
+    } else {
+      return false;
+    }
+  } else {
+    return true;
+  }
+};
+
+export default checkIfCategoryInGroup;
diff --git a/web/src/utils/itemsDataGetter.ts b/web/src/utils/itemsDataGetter.ts
index 6f55c758..0f70d21f 100644
--- a/web/src/utils/itemsDataGetter.ts
+++ b/web/src/utils/itemsDataGetter.ts
@@ -1,11 +1,15 @@
+import { isEmpty } from 'lodash';
 import groupBy from 'lodash/groupBy';
 import intersection from 'lodash/intersection';
+import isEqual from 'lodash/isEqual';
 import isUndefined from 'lodash/isUndefined';
+import uniqWith from 'lodash/uniqWith';
 
 import { ALL_OPTION } from '../data';
 import {
   ActiveFilters,
   ActiveSection,
+  AdditionalCategory,
   BaseItem,
   CardMenu,
   Category,
@@ -20,8 +24,8 @@ import {
   Subcategory,
 } from '../types';
 import capitalizeFirstLetter from './capitalizeFirstLetter';
+import checkIfCategoryInGroup from './checkIfCategoryInGroup';
 import filterData from './filterData';
-import nestArray from './nestArray';
 import sortMenuOptions from './sortMenuOptions';
 
 export interface ItemsDataStatus {
@@ -152,31 +156,98 @@ export class ItemsDataGetter {
   // Group items
   private groupData(items: (BaseItem | Item)[]): { [key: string]: (Item | BaseItem)[] } {
     const gData = groupBy(items, 'category');
-    const groups: Group[] = window.baseDS.groups || [];
+    const additionalItems: { [key: string]: (Item | BaseItem)[] } = {};
+    const itemsWithAdditionalCategories = items.filter((i: BaseItem | Item) => !isUndefined(i.additional_categories));
+    itemsWithAdditionalCategories.forEach((item: BaseItem | Item) => {
+      if (item.additional_categories) {
+        item.additional_categories.forEach((x: AdditionalCategory) => {
+          if (additionalItems[x.category]) {
+            additionalItems[x.category].push(item);
+          } else {
+            additionalItems[x.category] = [item];
+          }
+        });
+      }
+    });
 
+    const groups: Group[] = window.baseDS.groups || [];
     const groupedItems: { [key: string]: (BaseItem | Item)[] } = {};
 
     for (const group of groups) {
-      groupedItems[group.normalized_name] = [];
+      const itemsTmp: (BaseItem | Item)[] = [];
       group.categories.forEach((c: string) => {
         const groupData = gData[c];
+        const additionalData = additionalItems[c];
         if (groupData) {
-          groupedItems[group.normalized_name].push(...groupData);
+          itemsTmp.push(...groupData);
+        }
+        if (additionalData) {
+          itemsTmp.push(...additionalData);
         }
       });
+      // Clean duplicates due to additional categories
+      groupedItems[group.normalized_name] = uniqWith(itemsTmp, isEqual);
     }
     groupedItems[ALL_OPTION] = [...items];
 
     return groupedItems;
   }
 
+  private classifyItemsByCatAndSub(
+    items: (BaseItem | Item)[],
+    group: string,
+    activeCategoryFilters?: string[]
+  ): { [key: string]: { [key: string]: (BaseItem | Item)[] } } {
+    const groupedItems: { [key: string]: { [key: string]: (BaseItem | Item)[] } } = {};
+
+    const addItem = (category: string, subcategory: string, item: BaseItem | Item) => {
+      if (groupedItems[category]) {
+        if (groupedItems[category][subcategory]) {
+          groupedItems[category][subcategory].push(item);
+        } else {
+          groupedItems[category][subcategory] = [item];
+        }
+      } else {
+        groupedItems[category] = { [subcategory]: [item] };
+      }
+    };
+
+    const validateCategory = (category: string): boolean => {
+      if (!checkIfCategoryInGroup(category, group)) return false;
+      if (activeCategoryFilters && activeCategoryFilters.length > 0) {
+        return activeCategoryFilters.includes(category);
+      }
+      return true;
+    };
+
+    for (const item of items) {
+      if (validateCategory(item.category)) {
+        addItem(item.category, item.subcategory, item);
+      }
+      if (item.additional_categories) {
+        item.additional_categories.forEach((ad: AdditionalCategory) => {
+          if (validateCategory(ad.category)) {
+            addItem(ad.category, ad.subcategory, item);
+          }
+        });
+      }
+    }
+
+    return groupedItems;
+  }
+
   // Classify items
-  public classifyItems(items: (BaseItem | Item)[], classify: ClassifyOption): unknown | undefined {
+  public classifyItems(
+    items: (BaseItem | Item)[],
+    classify: ClassifyOption,
+    group: string,
+    activeCategoryFilters?: string[]
+  ): unknown | undefined {
     switch (classify) {
       case ClassifyOption.None:
         return items;
       case ClassifyOption.Category:
-        return nestArray(items, ['category', 'subcategory']);
+        return this.classifyItemsByCatAndSub(items, group, activeCategoryFilters);
       case ClassifyOption.Maturity:
         return groupBy(items, 'maturity');
       case ClassifyOption.Tag:
@@ -185,7 +256,11 @@ export class ItemsDataGetter {
   }
 
   // Prepare grid data
-  private prepareGridData(grouped: { [key: string]: (Item | BaseItem)[] }, withAllOption = true) {
+  private prepareGridData(
+    grouped: { [key: string]: (Item | BaseItem)[] },
+    withAllOption: boolean,
+    activeCategoryFilters?: string[]
+  ) {
     const data: GroupData = {};
     if (!isUndefined(grouped)) {
       const groupedItems = { ...grouped };
@@ -193,32 +268,53 @@ export class ItemsDataGetter {
         delete groupedItems[ALL_OPTION];
       }
 
+      const addItem = (group: string, category: string, subcategory: string, item: Item | BaseItem) => {
+        if (data[group][category]) {
+          if (data[group][category][subcategory]) {
+            data[group][category][subcategory].items.push(item);
+            data[group][category][subcategory].itemsCount++;
+            if (item.featured) {
+              data[group][category][subcategory].itemsFeaturedCount++;
+            }
+          } else {
+            data[group][category][subcategory] = {
+              items: [item],
+              itemsCount: 1,
+              itemsFeaturedCount: item.featured ? 1 : 0,
+            };
+          }
+        } else {
+          data[group][category] = {
+            [subcategory]: {
+              items: [item],
+              itemsCount: 1,
+              itemsFeaturedCount: item.featured ? 1 : 0,
+            },
+          };
+        }
+      };
+
+      const validateCategory = (category: string, group: string): boolean => {
+        if (!checkIfCategoryInGroup(category, group)) return false;
+        if (activeCategoryFilters && activeCategoryFilters.length > 0) {
+          return activeCategoryFilters.includes(category);
+        }
+        return true;
+      };
+
       Object.keys(groupedItems).forEach((group: string) => {
         data[group] = {};
         const items = groupedItems![group];
         items.forEach((item: BaseItem | Item) => {
-          if (data[group][item.category]) {
-            if (data[group][item.category][item.subcategory]) {
-              data[group][item.category][item.subcategory].items.push(item);
-              data[group][item.category][item.subcategory].itemsCount++;
-              if (item.featured) {
-                data[group][item.category][item.subcategory].itemsFeaturedCount++;
+          if (validateCategory(item.category, group)) {
+            addItem(group, item.category, item.subcategory, item);
+          }
+          if (item.additional_categories) {
+            for (const ac of item.additional_categories) {
+              if (validateCategory(ac.category, group)) {
+                addItem(group, ac.category, ac.subcategory, item);
               }
-            } else {
-              data[group][item.category][item.subcategory] = {
-                items: [item],
-                itemsCount: 1,
-                itemsFeaturedCount: item.featured ? 1 : 0,
-              };
             }
-          } else {
-            data[group][item.category] = {
-              [item.subcategory]: {
-                items: [item],
-                itemsCount: 1,
-                itemsFeaturedCount: item.featured ? 1 : 0,
-              },
-            };
           }
         });
       });
@@ -242,13 +338,13 @@ export class ItemsDataGetter {
     const menuFullData: { [key: string]: CardMenu | undefined } = {};
     const numItems: { [key: string]: number } = {};
     Object.keys(groupedItemsList).forEach((group: string) => {
-      const classifyGroup = this.classifyItems(groupedItemsList[group], ClassifyOption.Category);
+      const classifyGroup = this.classifyItems(groupedItemsList[group], ClassifyOption.Category, group);
       classifyFullCardData[group] = classifyGroup;
       menuFullData[group] = this.getMenuOptions(classifyGroup, ClassifyOption.Category);
       numItems[group as string] = groupedItemsList[group].length;
     });
 
-    const fullGridData = this.prepareGridData(groupedItemsList);
+    const fullGridData = this.prepareGridData(groupedItemsList, true);
     const fullQuery = { grid: fullGridData, card: classifyFullCardData, menu: menuFullData, numItems: numItems };
     this.initialQuery = fullQuery;
   }
@@ -292,18 +388,23 @@ export class ItemsDataGetter {
     const items = this.ready ? this.getAll() : window.baseDS.items;
     const filteredItems = filterData(items, input);
     const groupedItems = this.groupData(filteredItems);
+    let activeCategoryFilters: string[] | undefined;
+    if (classify === ClassifyOption.Category && !isUndefined(input.category) && !isEmpty(input.category)) {
+      activeCategoryFilters = input.category;
+    }
+
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const classifyCardData: any = {};
     const menuData: { [key: string]: CardMenu | undefined } = {};
     const numItems: { [key: string]: number } = {};
     Object.keys(groupedItems).forEach((group: string) => {
-      const classifyGroup = this.classifyItems(groupedItems[group], classify);
+      const classifyGroup = this.classifyItems(groupedItems[group], classify, group, activeCategoryFilters);
       classifyCardData[group] = classifyGroup;
       menuData[group] = this.getMenuOptions(classifyGroup, classify);
       numItems[group] = groupedItems[group].length;
     });
 
-    const gridData = this.prepareGridData(groupedItems);
+    const gridData = this.prepareGridData(groupedItems, true, activeCategoryFilters);
     let currentQuery = { grid: gridData, card: classifyCardData, menu: menuData, numItems: numItems };
 
     if (!isUndefined(this.initialQuery)) {
diff --git a/web/src/utils/prepareFilters.ts b/web/src/utils/prepareFilters.ts
index bc10d674..bac86a92 100644
--- a/web/src/utils/prepareFilters.ts
+++ b/web/src/utils/prepareFilters.ts
@@ -1,7 +1,8 @@
 import { REGEX_DASH } from '../data';
 import { FilterCategory, FilterSection, Item, Repository } from '../types';
 import capitalizeFirstLetter from './capitalizeFirstLetter';
-import { GroupData } from './itemsDataGetter';
+import checkIfCategoryInGroup from './checkIfCategoryInGroup';
+import itemsDataGetter from './itemsDataGetter';
 
 const cleanValue = (t: string): string => {
   // return encodeURIComponent(t);
@@ -23,25 +24,18 @@ export interface FiltersPerGroup {
   [key: string]: FilterSection[];
 }
 
-const getFiltersPerGroup = (groupedData: GroupData) => {
+const getFiltersPerGroup = () => {
   const groups: FiltersPerGroup = {};
 
-  Object.keys(groupedData).forEach((g: string) => {
-    const items: Item[] = [];
-
-    Object.keys(groupedData[g]).forEach((cat: string) => {
-      Object.keys(groupedData[g][cat]).forEach((subcat: string) => {
-        items.push(...groupedData[g][cat][subcat].items);
-      });
-    });
-
-    groups[g] = prepareFilters(items);
+  const groupedItems = itemsDataGetter.getGroupedData();
+  Object.keys(groupedItems).forEach((group: string) => {
+    groups[group] = prepareFilters(groupedItems[group], group);
   });
 
   return groups;
 };
 
-const prepareFilters = (items: Item[]): FilterSection[] => {
+const prepareFilters = (items: Item[], group: string): FilterSection[] => {
   const filters: FilterSection[] = [];
 
   const maturityTypes: string[] = [];
@@ -67,10 +61,18 @@ const prepareFilters = (items: Item[]): FilterSection[] => {
       extraTypes.push('specification');
     }
 
-    if (i.category) {
+    if (i.category && checkIfCategoryInGroup(i.category, group)) {
       categories.push(i.category);
     }
 
+    if (i.additional_categories) {
+      i.additional_categories.forEach((ac) => {
+        if (checkIfCategoryInGroup(ac.category, group)) {
+          categories.push(ac.category);
+        }
+      });
+    }
+
     if (i.crunchbase_data) {
       if (i.crunchbase_data.name) {
         organizations.push(i.crunchbase_data.name);

From 89c289064462d52e0eb986d60a577cb8dcaf7e2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cintia=20S=C3=A1nchez=20Garc=C3=ADa?= <cynthiasg@icloud.com>
Date: Thu, 11 Apr 2024 14:28:22 +0200
Subject: [PATCH 05/55] Add LinkedIn link to item details view (#563)

Signed-off-by: Cintia Sanchez Garcia <cynthiasg@icloud.com>
---
 web/src/layout/common/itemModal/Content.tsx | 19 +++++++++++++++++++
 web/src/types.ts                            |  1 +
 2 files changed, 20 insertions(+)

diff --git a/web/src/layout/common/itemModal/Content.tsx b/web/src/layout/common/itemModal/Content.tsx
index c2dcabce..7ac7f0d1 100644
--- a/web/src/layout/common/itemModal/Content.tsx
+++ b/web/src/layout/common/itemModal/Content.tsx
@@ -80,6 +80,19 @@ const Content = (props: Props) => {
     })
   );
 
+  const getLinkedInUrl = (): string | null => {
+    if (itemInfo()) {
+      if (itemInfo()!.linkedin_url) {
+        return itemInfo()!.linkedin_url!;
+      } else {
+        if (itemInfo()!.crunchbase_data && itemInfo()!.crunchbase_data!.linkedin_url) {
+          return itemInfo()!.crunchbase_data!.linkedin_url!;
+        }
+      }
+    }
+    return null;
+  };
+
   return (
     <>
       <ItemDropdown itemId={itemInfo()!.id} />
@@ -184,6 +197,12 @@ const Content = (props: Props) => {
                     </ExternalLink>
                   </Show>
 
+                  <Show when={!isNull(getLinkedInUrl())}>
+                    <ExternalLink title="LinkedIn" class={`ms-3 ${styles.link}`} href={getLinkedInUrl()!}>
+                      <SVGIcon kind={SVGIconKind.LinkedIn} />
+                    </ExternalLink>
+                  </Show>
+
                   <Show when={!isUndefined(itemInfo()!.slack_url)}>
                     <ExternalLink title="Slack" class={`ms-3 ${styles.link}`} href={itemInfo()!.slack_url!}>
                       <SVGIcon kind={SVGIconKind.Slack} />
diff --git a/web/src/types.ts b/web/src/types.ts
index 7d9aef34..19d134f5 100644
--- a/web/src/types.ts
+++ b/web/src/types.ts
@@ -114,6 +114,7 @@ export interface Item extends BaseItem {
   twitter_url?: string;
   unnamed_organization?: boolean;
   youtube_url?: string;
+  linkedin_url?: string;
   audits?: SecurityAudit[];
 }
 

From c33591c5db17975d29ec256dd6debf8c7944fcfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20Casta=C3=B1o=20Arteaga?= <tegioz@icloud.com>
Date: Thu, 11 Apr 2024 16:14:57 +0200
Subject: [PATCH 06/55] Bump version to 0.8.0 (#564)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Sergio Castaño Arteaga <tegioz@icloud.com>
---
 CHANGELOG.md       | 23 +++++++++++++++++++++++
 Cargo.lock         |  2 +-
 Cargo.toml         |  2 +-
 README.md          |  4 ++--
 embed/package.json |  2 +-
 web/package.json   |  2 +-
 6 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 31f779c0..94cbbfb8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,29 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.8.0] - 2024-04-11
+
+### Added
+
+- Ability to classify cards by maturity, tag, or even not classify at all (#552)
+- Allow sorting cards by multiple criteria (#552)
+- New virtual group named `all`, that includes the cards from all groups (#552)
+- Categories / subcategories headers now show how many items are on each (#552)
+- Button to jump to the top of the page (#552)
+- Category filter (#552)
+- Display LinkedIn link in item details view (#548, #563)
+- Allow setting web application base path (#557)
+
+### Fixed
+
+- Issue processing additional categories (#562)
+
+### Changed
+
+- Do not cache logos during build (#549)
+- Minor refactoring and some improvements to instrumentation (#543, #547)
+- Upgrade CLI dependencies (#550)
+
 ## [0.7.0] - 2024-03-19
 
 ### Added
diff --git a/Cargo.lock b/Cargo.lock
index de2af730..caeb417d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1835,7 +1835,7 @@ dependencies = [
 
 [[package]]
 name = "landscape2"
-version = "0.7.0"
+version = "0.8.0"
 dependencies = [
  "anyhow",
  "askama",
diff --git a/Cargo.toml b/Cargo.toml
index b0e6c8e7..7a83babd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "landscape2"
 description = "Landscape2 CLI tool"
-version = "0.7.0"
+version = "0.8.0"
 license = "Apache-2.0"
 edition = "2021"
 rust-version = "1.70"
diff --git a/README.md b/README.md
index 5beea149..3b20026a 100644
--- a/README.md
+++ b/README.md
@@ -58,13 +58,13 @@ brew install cncf/landscape2/landscape2
 #### Install via shell script
 
 ```text
-curl --proto '=https' --tlsv1.2 -LsSf https://github.com/cncf/landscape2/releases/download/v0.7.0/landscape2-installer.sh | sh
+curl --proto '=https' --tlsv1.2 -LsSf https://github.com/cncf/landscape2/releases/download/v0.8.0/landscape2-installer.sh | sh
 ```
 
 #### Install via powershell script
 
 ```text
-irm https://github.com/cncf/landscape2/releases/download/v0.7.0/landscape2-installer.ps1 | iex
+irm https://github.com/cncf/landscape2/releases/download/v0.8.0/landscape2-installer.ps1 | iex
 ```
 
 ### Container image
diff --git a/embed/package.json b/embed/package.json
index 7cffc0d2..c535e837 100644
--- a/embed/package.json
+++ b/embed/package.json
@@ -1,7 +1,7 @@
 {
   "name": "embed",
   "private": true,
-  "version": "0.7.0",
+  "version": "0.8.0",
   "type": "module",
   "scripts": {
     "build": "tsc && vite build",
diff --git a/web/package.json b/web/package.json
index aecc0d6e..40ea41bd 100644
--- a/web/package.json
+++ b/web/package.json
@@ -1,7 +1,7 @@
 {
   "name": "landscape",
   "private": true,
-  "version": "0.7.0",
+  "version": "0.8.0",
   "type": "module",
   "scripts": {
     "build": "tsc && vite build",

From 4cac0aea04886e055a2b087fd96d649dcdac60d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cintia=20S=C3=A1nchez=20Garc=C3=ADa?= <cynthiasg@icloud.com>
Date: Thu, 11 Apr 2024 18:39:06 +0200
Subject: [PATCH 07/55] Fix iframe resizer script path issue (#566)

Signed-off-by: Cintia Sanchez Garcia <cynthiasg@icloud.com>
---
 embed/embed.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/embed/embed.html b/embed/embed.html
index c9588371..fcd7481f 100644
--- a/embed/embed.html
+++ b/embed/embed.html
@@ -14,7 +14,7 @@
         const resizer = urlParams.get('iframe-resizer');
         if (typeof resizer !== null && resizer === 'true') {
           const script = document.createElement('script');
-          script.setAttribute('src', './embed/assets/iframeResizer.contentWindow-v4.3.9.min.js');
+          script.setAttribute('src', './assets/iframeResizer.contentWindow-v4.3.9.min.js');
           document.body.appendChild(script);
         }
       })();

From 1e125d373d12c80f5cc24c61ab52af4ee5a329c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cintia=20S=C3=A1nchez=20Garc=C3=ADa?= <cynthiasg@icloud.com>
Date: Thu, 11 Apr 2024 19:11:44 +0200
Subject: [PATCH 08/55] Bump version to 0.8.1 (#567)

Signed-off-by: Cintia Sanchez Garcia <cynthiasg@icloud.com>
---
 CHANGELOG.md       | 6 ++++++
 Cargo.lock         | 2 +-
 Cargo.toml         | 2 +-
 README.md          | 4 ++--
 embed/package.json | 2 +-
 web/package.json   | 2 +-
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 94cbbfb8..85e80647 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.8.1] - 2024-04-11
+
+### Fixed
+
+- Fix iframe resizer script path issue (#566)
+
 ## [0.8.0] - 2024-04-11
 
 ### Added
diff --git a/Cargo.lock b/Cargo.lock
index caeb417d..e2229a4c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1835,7 +1835,7 @@ dependencies = [
 
 [[package]]
 name = "landscape2"
-version = "0.8.0"
+version = "0.8.1"
 dependencies = [
  "anyhow",
  "askama",
diff --git a/Cargo.toml b/Cargo.toml
index 7a83babd..d57e8b78 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "landscape2"
 description = "Landscape2 CLI tool"
-version = "0.8.0"
+version = "0.8.1"
 license = "Apache-2.0"
 edition = "2021"
 rust-version = "1.70"
diff --git a/README.md b/README.md
index 3b20026a..e4dd72e5 100644
--- a/README.md
+++ b/README.md
@@ -58,13 +58,13 @@ brew install cncf/landscape2/landscape2
 #### Install via shell script
 
 ```text
-curl --proto '=https' --tlsv1.2 -LsSf https://github.com/cncf/landscape2/releases/download/v0.8.0/landscape2-installer.sh | sh
+curl --proto '=https' --tlsv1.2 -LsSf https://github.com/cncf/landscape2/releases/download/v0.8.1/landscape2-installer.sh | sh
 ```
 
 #### Install via powershell script
 
 ```text
-irm https://github.com/cncf/landscape2/releases/download/v0.8.0/landscape2-installer.ps1 | iex
+irm https://github.com/cncf/landscape2/releases/download/v0.8.1/landscape2-installer.ps1 | iex
 ```
 
 ### Container image
diff --git a/embed/package.json b/embed/package.json
index c535e837..734fead3 100644
--- a/embed/package.json
+++ b/embed/package.json
@@ -1,7 +1,7 @@
 {
   "name": "embed",
   "private": true,
-  "version": "0.8.0",
+  "version": "0.8.1",
   "type": "module",
   "scripts": {
     "build": "tsc && vite build",
diff --git a/web/package.json b/web/package.json
index 40ea41bd..1d3351c4 100644
--- a/web/package.json
+++ b/web/package.json
@@ -1,7 +1,7 @@
 {
   "name": "landscape",
   "private": true,
-  "version": "0.8.0",
+  "version": "0.8.1",
   "type": "module",
   "scripts": {
     "build": "tsc && vite build",

From c2b8f781edd15423b37fc8afa912f3328515e3cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20Casta=C3=B1o=20Arteaga?= <tegioz@icloud.com>
Date: Fri, 12 Apr 2024 08:45:33 +0200
Subject: [PATCH 09/55] Add parent project field to item (#568)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Sergio Castaño Arteaga <tegioz@icloud.com>
---
 src/build/data.rs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/build/data.rs b/src/build/data.rs
index 131b85ab..081f3464 100644
--- a/src/build/data.rs
+++ b/src/build/data.rs
@@ -351,6 +351,7 @@ impl From<legacy::LandscapeData> for LandscapeData {
                         item.latest_annual_review_url = extra.annual_review_url;
                         item.linkedin_url = extra.linkedin_url;
                         item.mailing_list_url = extra.mailing_list_url;
+                        item.parent_project = extra.parent_project;
                         item.slack_url = extra.slack_url;
                         item.specification = extra.specification;
                         item.stack_overflow_url = extra.stack_overflow_url;
@@ -535,6 +536,9 @@ pub(crate) struct Item {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub oss: Option<bool>,
 
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub parent_project: Option<String>,
+
     #[serde(skip_serializing_if = "Option::is_none")]
     pub repositories: Option<Vec<Repository>>,
 
@@ -860,6 +864,7 @@ mod legacy {
         pub incubating: Option<NaiveDate>,
         pub linkedin_url: Option<String>,
         pub mailing_list_url: Option<String>,
+        pub parent_project: Option<String>,
         pub slack_url: Option<String>,
         pub specification: Option<bool>,
         pub stack_overflow_url: Option<String>,

From f3549cb9fc6da1b24535ce5151fb67cd17b1ec98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cintia=20S=C3=A1nchez=20Garc=C3=ADa?= <cynthiasg@icloud.com>
Date: Fri, 12 Apr 2024 08:55:15 +0200
Subject: [PATCH 10/55] Remove test timeout resetting filters (#569)

Signed-off-by: Cintia Sanchez Garcia <cynthiasg@icloud.com>
---
 web/src/layout/common/ActiveFiltersList.tsx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/web/src/layout/common/ActiveFiltersList.tsx b/web/src/layout/common/ActiveFiltersList.tsx
index 2e9d2fdf..a6cb40f5 100644
--- a/web/src/layout/common/ActiveFiltersList.tsx
+++ b/web/src/layout/common/ActiveFiltersList.tsx
@@ -25,9 +25,7 @@ const ActiveFiltersList = (props: Props) => {
 
   const onResetFilters = () => {
     setShowLoading(true);
-    setTimeout(() => {
-      props.resetFilters();
-    }, 200);
+    props.resetFilters();
   };
 
   createEffect(

From 56e948f8c2aa4b56a913659a2035e6baf3b97bd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cintia=20S=C3=A1nchez=20Garc=C3=ADa?= <cynthiasg@icloud.com>
Date: Fri, 12 Apr 2024 12:26:21 +0200
Subject: [PATCH 11/55] Display parent project in item's details view (#570)

Signed-off-by: Cintia Sanchez Garcia <cynthiasg@icloud.com>
---
 web/src/layout/common/itemModal/Content.tsx   |  8 +++
 .../layout/common/itemModal/MobileContent.tsx |  9 +++
 .../layout/common/itemModal/ParentProject.tsx | 64 +++++++++++++++++++
 .../common/itemModal/ProjectParent.module.css | 28 ++++++++
 web/src/types.ts                              |  1 +
 web/src/utils/itemsDataGetter.ts              |  7 ++
 6 files changed, 117 insertions(+)
 create mode 100644 web/src/layout/common/itemModal/ParentProject.tsx
 create mode 100644 web/src/layout/common/itemModal/ProjectParent.module.css

diff --git a/web/src/layout/common/itemModal/Content.tsx b/web/src/layout/common/itemModal/Content.tsx
index 7ac7f0d1..b57d3ce1 100644
--- a/web/src/layout/common/itemModal/Content.tsx
+++ b/web/src/layout/common/itemModal/Content.tsx
@@ -27,6 +27,7 @@ import FundingRoundsTable from './FundingRoundsTable';
 import ItemDropdown from './ItemDropdown';
 import LanguagesStats from './LanguagesStats';
 import MaturitySection from './MaturitySection';
+import ParentProject from './ParentProject';
 import ParticipationStats from './ParticipationStats';
 
 interface Props {
@@ -300,6 +301,13 @@ const Content = (props: Props) => {
             </For>
           </div>
         </Show>
+        {/* Parent project */}
+        <ParentProject
+          parent={itemInfo()!.parent_project}
+          projectName={itemInfo()!.name}
+          class={styles.fieldset}
+          mobileVersion={false}
+        />
         {/* Maturity */}
         <MaturitySection item={itemInfo()!} class={styles.fieldset} />
         {/* Repositories */}
diff --git a/web/src/layout/common/itemModal/MobileContent.tsx b/web/src/layout/common/itemModal/MobileContent.tsx
index d63337d3..eac4ed3a 100644
--- a/web/src/layout/common/itemModal/MobileContent.tsx
+++ b/web/src/layout/common/itemModal/MobileContent.tsx
@@ -24,6 +24,7 @@ import FundingRoundsTable from './FundingRoundsTable';
 import LanguagesStats from './LanguagesStats';
 import styles from './MobileContent.module.css';
 import MobileMaturitySection from './MobileMaturitySection';
+import ParentProject from './ParentProject';
 import ParticipationStats from './ParticipationStats';
 
 interface Props {
@@ -154,6 +155,14 @@ const MobileContent = (props: Props) => {
           </div>
         </Show>
 
+        {/* Parent project */}
+        <ParentProject
+          parent={itemInfo()!.parent_project}
+          projectName={itemInfo()!.name}
+          class={styles.sectionTitle}
+          mobileVersion
+        />
+
         {/* Maturity */}
         <MobileMaturitySection item={itemInfo()!} titleClass={styles.sectionTitle} />
 
diff --git a/web/src/layout/common/itemModal/ParentProject.tsx b/web/src/layout/common/itemModal/ParentProject.tsx
new file mode 100644
index 00000000..38776b8c
--- /dev/null
+++ b/web/src/layout/common/itemModal/ParentProject.tsx
@@ -0,0 +1,64 @@
+import isUndefined from 'lodash/isUndefined';
+import { createSignal, onMount, Show } from 'solid-js';
+
+import { Item } from '../../../types';
+import itemsDataGetter from '../../../utils/itemsDataGetter';
+import Image from '../Image';
+import styles from './ProjectParent.module.css';
+
+interface Props {
+  parent?: string;
+  projectName: string;
+  class: string;
+  mobileVersion: boolean;
+}
+
+const ParentProject = (props: Props) => {
+  const [parentInfo, setParentInfo] = createSignal<Item>();
+
+  const content = () => (
+    <>
+      <div class="d-flex flex-row align-items-center">
+        <div class={`d-flex align-items-center justify-content-center ${styles.logoWrapper}`}>
+          <Image name={parentInfo()!.name} class={`m-auto ${styles.logo}`} logo={parentInfo()!.logo} />
+        </div>
+        <div class={`ms-3 ${styles.content}`}>
+          <div class={`fw-semibold ${styles.parentTitle}`}>{parentInfo()!.name}</div>
+          <div class="text-truncate">
+            <small class="text-muted">
+              {props.projectName} is a subproject of {parentInfo()!.name}
+              <Show when={!isUndefined(parentInfo()!.maturity)} fallback={<>.</>}>
+                , a {window.baseDS.foundation} project.
+              </Show>
+            </small>
+          </div>
+        </div>
+      </div>
+    </>
+  );
+
+  onMount(() => {
+    if (!isUndefined(props.parent)) {
+      setParentInfo(itemsDataGetter.getItemByName(props.parent));
+    }
+  });
+
+  return (
+    <Show when={!isUndefined(parentInfo())}>
+      <Show
+        when={!isUndefined(props.mobileVersion) && props.mobileVersion}
+        fallback={
+          <div class={`position-relative border ${props.class}`}>
+            <div class={`position-absolute px-2 bg-white fw-semibold ${styles.fieldsetTitle}`}>Parent project</div>
+            {content()}
+          </div>
+        }
+      >
+        <div class={`text-uppercase mt-3 fw-semibold border-bottom ${props.class}`}>Parent project</div>
+        <div class="position-relative my-2">{content()}</div>
+      </Show>
+    </Show>
+  );
+};
+
+export default ParentProject;
diff --git a/web/src/layout/common/itemModal/ProjectParent.module.css b/web/src/layout/common/itemModal/ProjectParent.module.css
new file mode 100644
index 00000000..1c4cfce6
--- /dev/null
+++ b/web/src/layout/common/itemModal/ProjectParent.module.css
@@ -0,0 +1,28 @@
+.fieldsetTitle {
+  font-size: 0.8rem;
+  line-height: 0.8rem;
+  color: var(--color4);
+  top: -0.35rem;
+  left: 1rem;
+}
+
+.logoWrapper {
+  height: 50px;
+  width: 40px;
+  min-width: 40px;
+}
+
+.logo {
+  font-size: 3rem;
+  max-width: 100%;
+  max-height: 100%;
+  height: auto;
+}
+
+.parentTitle {
+  font-size: 1.15rem;
+}
+
+.content {
+  width: calc(100% - 40px - 1rem);
+}
diff --git a/web/src/types.ts b/web/src/types.ts
index 19d134f5..44ecd004 100644
--- a/web/src/types.ts
+++ b/web/src/types.ts
@@ -116,6 +116,7 @@ export interface Item extends BaseItem {
   youtube_url?: string;
   linkedin_url?: string;
   audits?: SecurityAudit[];
+  parent_project?: string;
 }
 
 export interface SecurityAudit {
diff --git a/web/src/utils/itemsDataGetter.ts b/web/src/utils/itemsDataGetter.ts
index 0f70d21f..8111ea47 100644
--- a/web/src/utils/itemsDataGetter.ts
+++ b/web/src/utils/itemsDataGetter.ts
@@ -425,6 +425,13 @@ export class ItemsDataGetter {
     }
   }
 
+  // Get item by name
+  public getItemByName(name: string): Item | undefined {
+    if (this.ready && this.landscapeData && this.landscapeData.items) {
+      return this.landscapeData.items.find((i: Item) => name === i.name);
+    }
+  }
+
   // Get items by section
   public getItemsBySection(activeSection: ActiveSection): Item[] | undefined {
     if (this.ready && this.landscapeData && this.landscapeData.items) {

From dba3321ec39b085ae5458093733d362347d2afef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cintia=20S=C3=A1nchez=20Garc=C3=ADa?= <cynthiasg@icloud.com>
Date: Fri, 12 Apr 2024 17:25:12 +0200
Subject: [PATCH 12/55] Improve how parent project message is displayed (#571)

Signed-off-by: Cintia Sanchez Garcia <cynthiasg@icloud.com>
---
 ...nt.module.css => ParentProject.module.css} | 19 +++++++++++++++++++
 .../layout/common/itemModal/ParentProject.tsx | 10 +++++-----
 2 files changed, 24 insertions(+), 5 deletions(-)
 rename web/src/layout/common/itemModal/{ProjectParent.module.css => ParentProject.module.css} (51%)

diff --git a/web/src/layout/common/itemModal/ProjectParent.module.css b/web/src/layout/common/itemModal/ParentProject.module.css
similarity index 51%
rename from web/src/layout/common/itemModal/ProjectParent.module.css
rename to web/src/layout/common/itemModal/ParentProject.module.css
index 1c4cfce6..2f117de1 100644
--- a/web/src/layout/common/itemModal/ProjectParent.module.css
+++ b/web/src/layout/common/itemModal/ParentProject.module.css
@@ -26,3 +26,22 @@
 .content {
   width: calc(100% - 40px - 1rem);
 }
+
+.legend {
+  overflow: hidden;
+  text-overflow: unset;
+  white-space: inherit;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+  word-wrap: normal;
+  max-height: 38px;
+  line-height: 1.15rem;
+}
+
+@media only screen and (max-width: 991.98px) {
+  .legend {
+    -webkit-line-clamp: 3;
+    max-height: 57px;
+  }
+}
diff --git a/web/src/layout/common/itemModal/ParentProject.tsx b/web/src/layout/common/itemModal/ParentProject.tsx
index 38776b8c..742e0517 100644
--- a/web/src/layout/common/itemModal/ParentProject.tsx
+++ b/web/src/layout/common/itemModal/ParentProject.tsx
@@ -4,7 +4,7 @@ import { createSignal, onMount, Show } from 'solid-js';
 import { Item } from '../../../types';
 import itemsDataGetter from '../../../utils/itemsDataGetter';
 import Image from '../Image';
-import styles from './ProjectParent.module.css';
+import styles from './ParentProject.module.css';
 
 interface Props {
   parent?: string;
@@ -18,13 +18,13 @@ const ParentProject = (props: Props) => {
 
   const content = () => (
     <>
-      <div class="d-flex flex-row align-items-center">
-        <div class={`d-flex align-items-center justify-content-center ${styles.logoWrapper}`}>
+      <div class="d-flex flex-row align-items-start">
+        <div class={`d-flex justify-content-center ${styles.logoWrapper}`}>
           <Image name={parentInfo()!.name} class={`m-auto ${styles.logo}`} logo={parentInfo()!.logo} />
         </div>
         <div class={`ms-3 ${styles.content}`}>
-          <div class={`fw-semibold ${styles.parentTitle}`}>{parentInfo()!.name}</div>
-          <div class="text-truncate">
+          <div class={`fw-semibold text-truncate ${styles.parentTitle}`}>{parentInfo()!.name}</div>
+          <div class={styles.legend}>
             <small class="text-muted">
               {props.projectName} is a subproject of {parentInfo()!.name}
               <Show when={!isUndefined(parentInfo()!.maturity)} fallback={<>.</>}>

From 1eedeffbaf26f0b1e5851d656fc0198364842383 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20Casta=C3=B1o=20Arteaga?= <tegioz@icloud.com>
Date: Mon, 15 Apr 2024 10:31:31 +0200
Subject: [PATCH 13/55] Add default view mode to settings (#572)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Sergio Castaño Arteaga <tegioz@icloud.com>
---
 docs/config/settings.yml      |  9 +++++++++
 src/build/datasets.rs         |  8 +++++++-
 src/build/settings.rs         | 11 +++++++++++
 src/new/template/settings.yml |  9 +++++++++
 4 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/docs/config/settings.yml b/docs/config/settings.yml
index 6a8da576..4b2bedea 100644
--- a/docs/config/settings.yml
+++ b/docs/config/settings.yml
@@ -382,3 +382,12 @@ upcoming_event:
   end: "2024-03-22"
   banner_url: "https://www.cncf.io/wp-content/uploads/2024/01/kceu24_promo_2400x300.png"
   details_url: "https://events.linuxfoundation.org/kubecon-cloudnativecon-europe/register/?utm_source=landscape&utm_medium=all&utm_campaign=kubeconeu24&utm_content=slim-banner"
+
+# View mode (optional)
+#
+# This section allows customizing the default view mode of the landscape web
+# application. The view mode can be set to either `grid` or `card`. When
+# omitted, the default view mode is `grid`.
+#
+# view_mode: <grid|card>
+#
diff --git a/src/build/datasets.rs b/src/build/datasets.rs
index 8c0670a9..8f94004d 100644
--- a/src/build/datasets.rs
+++ b/src/build/datasets.rs
@@ -62,7 +62,9 @@ mod base {
     use crate::build::{
         data::{self, AdditionalCategory, Category, CategoryName, ItemFeatured, LandscapeData},
         guide::LandscapeGuide,
-        settings::{Colors, Footer, GridItemsSize, Group, Header, Images, LandscapeSettings, UpcomingEvent},
+        settings::{
+            Colors, Footer, GridItemsSize, Group, Header, Images, LandscapeSettings, UpcomingEvent, ViewMode,
+        },
     };
     use serde::{Deserialize, Serialize};
     use std::collections::BTreeMap;
@@ -113,6 +115,9 @@ mod base {
 
         #[serde(skip_serializing_if = "Option::is_none")]
         pub upcoming_event: Option<UpcomingEvent>,
+
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub view_mode: Option<ViewMode>,
     }
 
     impl Base {
@@ -140,6 +145,7 @@ mod base {
                 items: vec![],
                 members_category: settings.members_category.clone(),
                 upcoming_event: settings.upcoming_event.clone(),
+                view_mode: settings.view_mode.clone(),
             };
 
             // Update categories overridden in settings
diff --git a/src/build/settings.rs b/src/build/settings.rs
index dd4b73b7..286fe00e 100644
--- a/src/build/settings.rs
+++ b/src/build/settings.rs
@@ -68,6 +68,9 @@ pub(crate) struct LandscapeSettings {
 
     #[serde(skip_serializing_if = "Option::is_none")]
     pub upcoming_event: Option<UpcomingEvent>,
+
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub view_mode: Option<ViewMode>,
 }
 
 impl LandscapeSettings {
@@ -630,3 +633,11 @@ pub(crate) struct UpcomingEvent {
     pub banner_url: String,
     pub details_url: String,
 }
+
+/// Default view mode used in the web application.
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "kebab-case")]
+pub(crate) enum ViewMode {
+    Grid,
+    Card,
+}
diff --git a/src/new/template/settings.yml b/src/new/template/settings.yml
index c8a033e2..5808712a 100644
--- a/src/new/template/settings.yml
+++ b/src/new/template/settings.yml
@@ -277,3 +277,12 @@ screenshot_width: 1500
 #   banner_url: <URL>    # Event banner image url (required, recommended dimensions: 2400x300)
 #   details_url: <URL>   # Event details URL (required)
 #
+
+# View mode (optional)
+#
+# This section allows customizing the default view mode of the landscape web
+# application. The view mode can be set to either `grid` or `card`. When
+# omitted, the default view mode is `grid`.
+#
+# view_mode: <grid|card>
+#

From 0c6163d822591e5cdc698d12badcf6afe9324346 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20Casta=C3=B1o=20Arteaga?= <tegioz@icloud.com>
Date: Mon, 15 Apr 2024 10:53:41 +0200
Subject: [PATCH 14/55] Do not raise errors detecting mime type on deploy
 (#573)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Sergio Castaño Arteaga <tegioz@icloud.com>
---
 src/deploy/s3.rs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/deploy/s3.rs b/src/deploy/s3.rs
index 70520265..dbac9d10 100644
--- a/src/deploy/s3.rs
+++ b/src/deploy/s3.rs
@@ -168,9 +168,7 @@ async fn upload_objects(
 
             // Prepare object's body and content type
             let body = ByteStream::from_path(file).await?;
-            let content_type = mime_guess::from_path(&key)
-                .first()
-                .ok_or(format_err!("cannot detect content type of key: {})", &key))?;
+            let content_type = mime_guess::from_path(&key).first().unwrap_or(mime::APPLICATION_OCTET_STREAM);
 
             // Upload file
             s3_client

From b765309cec50b4fb21e7f284a3520b150aea98bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cintia=20S=C3=A1nchez=20Garc=C3=ADa?= <cynthiasg@icloud.com>
Date: Mon, 15 Apr 2024 11:56:59 +0200
Subject: [PATCH 15/55] Use default view mode from settings (#574)

Signed-off-by: Cintia Sanchez Garcia <cynthiasg@icloud.com>
---
 web/src/data.ts                      | 2 +-
 web/src/layout/navigation/Header.tsx | 6 +++---
 web/src/types.ts                     | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/web/src/data.ts b/web/src/data.ts
index 1116b2e5..372edd97 100644
--- a/web/src/data.ts
+++ b/web/src/data.ts
@@ -57,7 +57,7 @@ export const SMALL_DEVICES_BREAKPOINTS: Breakpoint[] = [Breakpoint.XS, Breakpoin
 export const DEFAULT_STICKY_MOBILE_NAVBAR_HEIGHT = 50;
 export const DEFAULT_STICKY_NAVBAR_HEIGHT = 72;
 export const DEFAULT_TAB = Tab.Explore;
-export const DEFAULT_VIEW_MODE = ViewMode.Grid;
+export const DEFAULT_VIEW_MODE: ViewMode = window.baseDS.view_mode || ViewMode.Grid;
 export const DEFAULT_GRID_ITEMS_SIZE = GridItemsSize.Small;
 export const DEFAULT_FINANCES_KIND = FinancesKind.Funding;
 export const DEFAULT_CLASSIFY = ClassifyOption.Category;
diff --git a/web/src/layout/navigation/Header.tsx b/web/src/layout/navigation/Header.tsx
index c815169f..6c269ded 100644
--- a/web/src/layout/navigation/Header.tsx
+++ b/web/src/layout/navigation/Header.tsx
@@ -3,8 +3,8 @@ import isEmpty from 'lodash/isEmpty';
 import isUndefined from 'lodash/isUndefined';
 import { createMemo, Show } from 'solid-js';
 
-import { ALL_OPTION, EXPLORE_PATH, GUIDE_PATH, SCREENSHOTS_PATH, STATS_PATH } from '../../data';
-import { SVGIconKind, ViewMode } from '../../types';
+import { ALL_OPTION, DEFAULT_VIEW_MODE, EXPLORE_PATH, GUIDE_PATH, SCREENSHOTS_PATH, STATS_PATH } from '../../data';
+import { SVGIconKind } from '../../types';
 import isExploreSection from '../../utils/isExploreSection';
 import scrollToTop from '../../utils/scrollToTop';
 import DownloadDropdown from '../common/DownloadDropdown';
@@ -30,7 +30,7 @@ const Header = () => {
 
   const resetDefaultExploreValues = () => {
     const groups = window.baseDS.groups;
-    setViewMode(ViewMode.Grid);
+    setViewMode(DEFAULT_VIEW_MODE);
     setSelectedGroup(!isUndefined(groups) ? groups[0].normalized_name : ALL_OPTION);
   };
 
diff --git a/web/src/types.ts b/web/src/types.ts
index 44ecd004..20d77365 100644
--- a/web/src/types.ts
+++ b/web/src/types.ts
@@ -14,6 +14,7 @@ export interface BaseData {
   members_category?: string;
   qr_code?: string;
   upcoming_event?: Event;
+  view_mode?: ViewMode;
   header?: HeaderContent;
   footer?: FooterContent;
 }

From e4d09a6d665816cf1911957d9337f28fd7cd9d1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20Casta=C3=B1o=20Arteaga?= <tegioz@icloud.com>
Date: Tue, 16 Apr 2024 10:09:09 +0200
Subject: [PATCH 16/55] Make logos viewbox adjustments configurable (#577)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Sergio Castaño Arteaga <tegioz@icloud.com>
---
 docs/config/settings.yml      | 16 +++++++++++++
 src/build/logos.rs            | 27 +++++++++++++---------
 src/build/mod.rs              | 42 ++++++++++++++++++++++-------------
 src/build/settings.rs         | 19 ++++++++++++++++
 src/new/template/settings.yml | 16 +++++++++++++
 5 files changed, 93 insertions(+), 27 deletions(-)

diff --git a/docs/config/settings.yml b/docs/config/settings.yml
index 4b2bedea..9b4914dd 100644
--- a/docs/config/settings.yml
+++ b/docs/config/settings.yml
@@ -241,6 +241,22 @@ images:
   favicon: "https://raw.githubusercontent.com/cncf/artwork/master/other/cncf-landscape/icon/color/cncf-landscape-icon-color.png"
   open_graph: "https://landscape.cncf.io/images/social.jpg"
 
+# Logos viewbox (optional)
+#
+# In order to display the logos as large as possible in the landscape, during
+# the build process we try to update their viewbox if `adjust` is set to true
+# (by default it is when this setting is not provided). However, sometimes this
+# does not help and logos may not be displayed correctly. In those cases, it is
+# possible to exclude some of them from being adjusted by adding the logo(s)
+# file name to the `exclude` list.
+#
+# logos_viewbox:
+#   adjust: true
+#   exclude:
+#     - logo1.svg
+#     - logo2.svg
+#
+
 # Name of the members category (optional)
 #
 # Landscapes usually have a special category dedicated to the members of the
diff --git a/src/build/logos.rs b/src/build/logos.rs
index 9e629f5f..c455ef37 100644
--- a/src/build/logos.rs
+++ b/src/build/logos.rs
@@ -11,6 +11,8 @@ use sha2::{Digest, Sha256};
 use std::fs;
 use usvg::{NodeExt, Rect, TreeParsing};
 
+use super::settings::LogosViewbox;
+
 lazy_static! {
     /// Regular expression used to remove the SVG logos' title.
     static ref SVG_TITLE: Regex = Regex::new("<title>.*</title>",).expect("exprs in SVG_TITLE to be valid");
@@ -30,6 +32,7 @@ pub(crate) struct Logo {
 pub(crate) async fn prepare_logo(
     http_client: reqwest::Client,
     logos_source: &LogosSource,
+    logos_viewbox: &LogosViewbox,
     file_name: &str,
 ) -> Result<Logo> {
     // Get SVG logo from the source provided
@@ -40,17 +43,19 @@ pub(crate) async fn prepare_logo(
     svg_data = SVG_TITLE.replace(&svg_data, b"").into_owned();
 
     // Update viewbox to the smallest rectangle in which the object fits
-    if let Ok(Some(bounding_box)) = get_svg_bounding_box(&svg_data) {
-        if bounding_box.left() >= 0.0 && bounding_box.top() >= 0.0 {
-            let new_viewbox_bounds = format!(
-                "{} {} {} {}",
-                bounding_box.left(),
-                bounding_box.top(),
-                bounding_box.right() - bounding_box.left(),
-                bounding_box.bottom() - bounding_box.top()
-            );
-            let new_viewbox = format!(r#"viewBox="{new_viewbox_bounds}""#);
-            svg_data = SVG_VIEWBOX.replace(&svg_data, new_viewbox.as_bytes()).into_owned();
+    if logos_viewbox.adjust && !logos_viewbox.exclude.contains(&file_name.to_string()) {
+        if let Ok(Some(bounding_box)) = get_svg_bounding_box(&svg_data) {
+            if bounding_box.left() >= 0.0 && bounding_box.top() >= 0.0 {
+                let new_viewbox_bounds = format!(
+                    "{} {} {} {}",
+                    bounding_box.left(),
+                    bounding_box.top(),
+                    bounding_box.right() - bounding_box.left(),
+                    bounding_box.bottom() - bounding_box.top()
+                );
+                let new_viewbox = format!(r#"viewBox="{new_viewbox_bounds}""#);
+                svg_data = SVG_VIEWBOX.replace(&svg_data, new_viewbox.as_bytes()).into_owned();
+            }
         }
     }
 
diff --git a/src/build/mod.rs b/src/build/mod.rs
index 23d79a4d..83af8e87 100644
--- a/src/build/mod.rs
+++ b/src/build/mod.rs
@@ -8,7 +8,7 @@ use self::{
     github::collect_github_data,
     logos::prepare_logo,
     projects::{generate_projects_csv, Project, ProjectsMd},
-    settings::{Analytics, Osano},
+    settings::{Analytics, LogosViewbox, Osano},
 };
 use crate::{
     build::api::{Api, ApiSources},
@@ -127,7 +127,13 @@ pub(crate) async fn build(args: &BuildArgs) -> Result<()> {
     let guide = prepare_guide(&args.guide_source, &args.output_dir).await?;
 
     // Prepare items logos and copy them to the output directory
-    prepare_items_logos(&args.logos_source, &mut landscape_data, &args.output_dir).await?;
+    prepare_items_logos(
+        &args.logos_source,
+        &settings.logos_viewbox,
+        &mut landscape_data,
+        &args.output_dir,
+    )
+    .await?;
 
     // Collect CLOMonitor reports summaries and copy them to the output directory
     collect_clomonitor_reports(&cache, &mut landscape_data, &settings, &args.output_dir).await?;
@@ -461,6 +467,7 @@ async fn prepare_guide(guide_source: &GuideSource, output_dir: &Path) -> Result<
 #[instrument(skip_all, err)]
 async fn prepare_items_logos(
     logos_source: &LogosSource,
+    logos_viewbox: &LogosViewbox,
     landscape_data: &mut LandscapeData,
     output_dir: &Path,
 ) -> Result<()> {
@@ -473,26 +480,29 @@ async fn prepare_items_logos(
     }
     let http_client = reqwest::Client::new();
     let logos_source = Arc::new(logos_source.clone());
+    let logos_viewbox = Arc::new(logos_viewbox.clone());
     let logos: HashMap<String, Option<String>> = stream::iter(landscape_data.items.iter())
         .map(|item| async {
             // Prepare logo
             let http_client = http_client.clone();
             let logos_source = logos_source.clone();
+            let logos_viewbox = logos_viewbox.clone();
             let file_name = item.logo.clone();
-            let logo =
-                match tokio::spawn(async move { prepare_logo(http_client, &logos_source, &file_name).await })
-                    .await
-                {
-                    Ok(Ok(logo)) => logo,
-                    Ok(Err(err)) => {
-                        error!(?err, ?item.logo, "error preparing logo");
-                        return (item.id.clone(), None);
-                    }
-                    Err(err) => {
-                        error!(?err, ?item.logo, "error executing prepare_logo task");
-                        return (item.id.clone(), None);
-                    }
-                };
+            let logo = match tokio::spawn(async move {
+                prepare_logo(http_client, &logos_source, &logos_viewbox, &file_name).await
+            })
+            .await
+            {
+                Ok(Ok(logo)) => logo,
+                Ok(Err(err)) => {
+                    error!(?err, ?item.logo, "error preparing logo");
+                    return (item.id.clone(), None);
+                }
+                Err(err) => {
+                    error!(?err, ?item.logo, "error executing prepare_logo task");
+                    return (item.id.clone(), None);
+                }
+            };
 
             // Copy logo to output dir using the digest(+.svg) as filename
             let file_name = format!("{}.svg", logo.digest);
diff --git a/src/build/settings.rs b/src/build/settings.rs
index 286fe00e..7eef4666 100644
--- a/src/build/settings.rs
+++ b/src/build/settings.rs
@@ -54,6 +54,9 @@ pub(crate) struct LandscapeSettings {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub images: Option<Images>,
 
+    #[serde(default)]
+    pub logos_viewbox: LogosViewbox,
+
     #[serde(skip_serializing_if = "Option::is_none")]
     pub osano: Option<Osano>,
 
@@ -605,6 +608,22 @@ pub(crate) struct Images {
     pub open_graph: Option<String>,
 }
 
+/// Logos viewbox configuration.
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+pub(crate) struct LogosViewbox {
+    pub adjust: bool,
+    pub exclude: Vec<String>,
+}
+
+impl Default for LogosViewbox {
+    fn default() -> Self {
+        LogosViewbox {
+            adjust: true,
+            exclude: vec![],
+        }
+    }
+}
+
 /// Osano configuration.
 #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
 pub(crate) struct Osano {
diff --git a/src/new/template/settings.yml b/src/new/template/settings.yml
index 5808712a..ac0c387f 100644
--- a/src/new/template/settings.yml
+++ b/src/new/template/settings.yml
@@ -202,6 +202,22 @@ header:
 #   open_graph: <OPEN_GRAPH_IMAGE_URL>
 #
 
+# Logos viewbox (optional)
+#
+# In order to display the logos as large as possible in the landscape, during
+# the build process we try to update their viewbox if `adjust` is set to true
+# (by default it is when this setting is not provided). However, sometimes this
+# does not help and logos may not be displayed correctly. In those cases, it is
+# possible to exclude some of them from being adjusted by adding the logo(s)
+# file name to the `exclude` list.
+#
+# logos_viewbox:
+#   adjust: true
+#   exclude:
+#     - logo1.svg
+#     - logo2.svg
+#
+
 # Name of the members category (optional)
 #
 # Landscapes usually have a special category dedicated to the members of the

From 89bc57146eefd00b44cc6603bc37aea6ed9952d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20Casta=C3=B1o=20Arteaga?= <tegioz@icloud.com>
Date: Tue, 16 Apr 2024 12:52:19 +0200
Subject: [PATCH 17/55] Check logos checksum while deploying (#578)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Sergio Castaño Arteaga <tegioz@icloud.com>
---
 src/deploy/s3.rs | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/deploy/s3.rs b/src/deploy/s3.rs
index dbac9d10..adc9459e 100644
--- a/src/deploy/s3.rs
+++ b/src/deploy/s3.rs
@@ -19,9 +19,6 @@ use walkdir::WalkDir;
 /// File name of the index document.
 const INDEX_DOCUMENT: &str = "index.html";
 
-/// Prefix used in the logos objects keys in S3.
-const LOGOS_PREFIX: &str = "logos/";
-
 /// Number of files to upload concurrently.
 const UPLOAD_FILES_CONCURRENCY: usize = 50;
 
@@ -151,12 +148,6 @@ async fn upload_objects(
 
             // Skip objects that don't need to be uploaded again
             if deployed_objects.contains_key(&key) {
-                // Skip already deployed logos (logos filenames are based on
-                // their content, we don't need to upload again existing ones).
-                if key.starts_with(LOGOS_PREFIX) {
-                    return Ok(());
-                }
-
                 // Skip any other objects that haven't changed
                 let checksum = md5sum(file)?;
                 if let Some(remote_checksum) = deployed_objects.get(&key).expect("object to be present") {

From f1d87cc8d7fca3292f64e10f090c3b18344556b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cintia=20S=C3=A1nchez=20Garc=C3=ADa?= <cynthiasg@icloud.com>
Date: Wed, 17 Apr 2024 08:40:09 +0200
Subject: [PATCH 18/55] Display loading spinner in controls bar (#579)

Signed-off-by: Cintia Sanchez Garcia <cynthiasg@icloud.com>
---
 web/src/layout/common/ActiveFiltersList.tsx |  17 +--
 web/src/layout/explore/Explore.module.css   |  11 ++
 web/src/layout/explore/card/Content.tsx     |  19 ++-
 web/src/layout/explore/grid/index.tsx       |   7 +-
 web/src/layout/explore/index.tsx            | 159 ++++++++++++++------
 web/src/utils/getClassifyAndSortOptions.ts  |  55 -------
 web/src/utils/goToElement.ts                |  29 ++--
 web/src/utils/itemsDataGetter.ts            | 150 ++++++++++++------
 8 files changed, 256 insertions(+), 191 deletions(-)
 delete mode 100644 web/src/utils/getClassifyAndSortOptions.ts

diff --git a/web/src/layout/common/ActiveFiltersList.tsx b/web/src/layout/common/ActiveFiltersList.tsx
index a6cb40f5..b19e6ef9 100644
--- a/web/src/layout/common/ActiveFiltersList.tsx
+++ b/web/src/layout/common/ActiveFiltersList.tsx
@@ -1,7 +1,7 @@
 import isEmpty from 'lodash/isEmpty';
 import isUndefined from 'lodash/isUndefined';
 import startCase from 'lodash/startCase';
-import { createEffect, createSignal, For, Match, on, Show, Switch } from 'solid-js';
+import { For, Match, Show, Switch } from 'solid-js';
 
 import { REGEX_UNDERSCORE } from '../../data';
 import { ActiveFilters, FilterCategory, SVGIconKind } from '../../types';
@@ -21,21 +21,11 @@ interface Props {
 
 const ActiveFiltersList = (props: Props) => {
   const activeFilters = () => props.activeFilters;
-  const [showLoading, setShowLoading] = createSignal<boolean>(false);
 
   const onResetFilters = () => {
-    setShowLoading(true);
     props.resetFilters();
   };
 
-  createEffect(
-    on(activeFilters, () => {
-      if (showLoading() && isEmpty(activeFilters())) {
-        setShowLoading(false);
-      }
-    })
-  );
-
   return (
     <Show when={Object.keys(activeFilters()).length > 0}>
       <div class="d-flex flex-row align-items-start mb-3">
@@ -163,11 +153,6 @@ const ActiveFiltersList = (props: Props) => {
             }}
           </For>
         </div>
-        <Show when={showLoading()}>
-          <div class="spinner-border spinner-border-sm text-secondary mt-2" role="status">
-            <span class="visually-hidden">Loading...</span>
-          </div>
-        </Show>
       </div>
     </Show>
   );
diff --git a/web/src/layout/explore/Explore.module.css b/web/src/layout/explore/Explore.module.css
index e7e67180..3ec03a01 100644
--- a/web/src/layout/explore/Explore.module.css
+++ b/web/src/layout/explore/Explore.module.css
@@ -22,6 +22,10 @@
   min-width: 50px !important;
 }
 
+.active {
+  color: var(--bs-white) !important;
+}
+
 .btnSymbol {
   position: relative;
   font-size: 1.25rem;
@@ -78,6 +82,13 @@
   margin-top: -2px;
 }
 
+.spinner {
+  width: 1.5rem !important;
+  height: 1.5rem !important;
+  top: -2px;
+  position: relative;
+}
+
 @media (max-width: 1199.98px) {
   .desktopSelect {
     width: 210px;
diff --git a/web/src/layout/explore/card/Content.tsx b/web/src/layout/explore/card/Content.tsx
index 432594b2..66eed80e 100644
--- a/web/src/layout/explore/card/Content.tsx
+++ b/web/src/layout/explore/card/Content.tsx
@@ -93,6 +93,15 @@ const Content = (props: Props) => {
     return subtitles;
   };
 
+  const countItems = (content: { [key: string]: unknown }): number => {
+    let numItems: number = 0;
+    Object.keys(content).forEach((subtitle: string) => {
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      numItems += (content as any)[subtitle].length;
+    });
+    return numItems;
+  };
+
   return (
     <Show when={!isUndefined(data())}>
       <Switch>
@@ -104,13 +113,7 @@ const Content = (props: Props) => {
             {(title: string) => {
               // eslint-disable-next-line @typescript-eslint/no-explicit-any
               const content = () => (data() as any)[title] as { [key: string]: unknown } | (BaseItem | Item)[];
-              let numItems: number = 0;
-              if (props.classify === ClassifyOption.Category) {
-                Object.keys(content()).forEach((subtitle: string) => {
-                  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                  numItems += (content() as any)[subtitle].length;
-                });
-              }
+              const numItems = () => countItems(content() as { [key: string]: unknown });
 
               return (
                 <div>
@@ -143,7 +146,7 @@ const Content = (props: Props) => {
                                     </div>
                                   </Show>
                                   <div class="text-white text-nowrap text-truncate">
-                                    {title} ({numItems})
+                                    {title} ({numItems()})
                                   </div>
                                 </div>
                                 <div
diff --git a/web/src/layout/explore/grid/index.tsx b/web/src/layout/explore/grid/index.tsx
index 3df7a762..2132a765 100644
--- a/web/src/layout/explore/grid/index.tsx
+++ b/web/src/layout/explore/grid/index.tsx
@@ -1,5 +1,5 @@
 import isUndefined from 'lodash/isUndefined';
-import { createEffect, createSignal, For, on, onMount, Show } from 'solid-js';
+import { createEffect, createSignal, For, on, Show } from 'solid-js';
 
 import cutString from '../../../utils/cutString';
 import generateColorsArray from '../../../utils/generateColorsArray';
@@ -94,14 +94,11 @@ const GridCategory = (props: Props) => {
 
   createEffect(
     on(data, () => {
+      setColorsList(generateColorsArray(Object.keys(data()).length));
       setCatWithItems(getCategoriesWithItems(data()));
     })
   );
 
-  onMount(() => {
-    setColorsList(generateColorsArray(Object.keys(data()).length));
-  });
-
   return (
     <Show when={firstLoad()}>
       <For each={catWithItems()}>
diff --git a/web/src/layout/explore/index.tsx b/web/src/layout/explore/index.tsx
index 455119c7..265c4f3c 100644
--- a/web/src/layout/explore/index.tsx
+++ b/web/src/layout/explore/index.tsx
@@ -37,12 +37,12 @@ import {
   SVGIconKind,
   ViewMode,
 } from '../../types';
-import getClassifyAndSortOptions, { ClassifyAndSortOptions } from '../../utils/getClassifyAndSortOptions';
 import getFoundationNameLabel from '../../utils/getFoundationNameLabel';
 import getNormalizedName from '../../utils/getNormalizedName';
-import itemsDataGetter, { GroupData } from '../../utils/itemsDataGetter';
+import itemsDataGetter, { ClassifyAndSortOptions, GroupData } from '../../utils/itemsDataGetter';
 import scrollToTop from '../../utils/scrollToTop';
 import ActiveFiltersList from '../common/ActiveFiltersList';
+import Loading from '../common/Loading';
 import NoData from '../common/NoData';
 import SVGIcon from '../common/SVGIcon';
 import Footer from '../navigation/Footer';
@@ -63,9 +63,10 @@ interface Props {
 }
 
 const TITLE_GAP = 40;
-const CONTROLS_WIDTH = 102 + 49 + 160 + 101 + 24; // Filters + Group legend + View Mode + Zoom + Right margin
+const CONTROLS_WIDTH = 102 + 49 + 160 + 101 + 24 + 32; // Filters + Group legend + View Mode + Zoom + Right margin + Loading
 const CONTROLS_CARD_WIDTH = CONTROLS_WIDTH + 0 + 435 - 101; // + Classify/Sort - Zoom
 const EXTRA_FILTERS = ['specification'];
+const DELAY_ACTIONS = 40;
 
 const Explore = (props: Props) => {
   const navigate = useNavigate();
@@ -85,6 +86,7 @@ const Explore = (props: Props) => {
   const updateContainerGridWidth = useSetGridWidth();
 
   const [readyData, setReadyData] = createSignal<boolean>(true);
+  const [visibleLoading, setVisibleLoading] = createSignal<boolean>(false);
   const [containerRef, setContainerRef] = createSignal<HTMLDivElement>();
   const [controlsGroupWrapper, setControlsGroupWrapper] = createSignal<HTMLDivElement>();
   const [controlsGroupWrapperWidth, setControlsGroupWrapperWidth] = createSignal<number>(0);
@@ -115,18 +117,22 @@ const Explore = (props: Props) => {
   const [numItems, setNumItems] = createSignal<{ [key: string]: number }>({});
 
   const checkIfFullDataRequired = (): boolean => {
-    const activeFiltersKeys = Object.keys(activeFilters());
-    if (!isEmpty(activeFilters())) {
-      const filtersInBase = [FilterCategory.Maturity, FilterCategory.TAG];
-      // If base data is enough for active filters
-      if (activeFiltersKeys.every((f) => filtersInBase.includes(f as FilterCategory))) {
-        return false;
-      } else {
-        return true;
+    if (viewMode() === ViewMode.Card) {
+      return true;
+    } else {
+      const activeFiltersKeys = Object.keys(activeFilters());
+      if (!isEmpty(activeFilters())) {
+        const filtersInBase = [FilterCategory.Maturity, FilterCategory.TAG];
+        // If base data is enough for active filters
+        if (activeFiltersKeys.every((f) => filtersInBase.includes(f as FilterCategory))) {
+          return false;
+        } else {
+          return true;
+        }
       }
-    }
 
-    return false;
+      return false;
+    }
   };
 
   const getMaturityOptions = () => {
@@ -210,6 +216,12 @@ const Explore = (props: Props) => {
     setMenuTOCFromHeader(false);
   };
 
+  const hideVisibleLoading = () => {
+    setTimeout(() => {
+      setVisibleLoading(false);
+    });
+  };
+
   const updateQueryString = (param: string, value: string) => {
     const updatedSearchParams = new URLSearchParams(location.search);
     const currentGroup = param === GROUP_PARAM ? value : selectedGroup() || ALL_OPTION;
@@ -227,6 +239,10 @@ const Explore = (props: Props) => {
         updatedSearchParams.delete(f);
       });
 
+      if (param === GROUP_PARAM) {
+        setActiveFilters({});
+      }
+
       batch(() => {
         setClassify(classifyOption);
         setSorted(sortOption);
@@ -239,7 +255,11 @@ const Explore = (props: Props) => {
           resetFilters();
           scrollToTop(false);
         }
+
+        hideVisibleLoading();
       });
+    } else {
+      hideVisibleLoading();
     }
 
     if (param === 'sort') {
@@ -342,13 +362,15 @@ const Explore = (props: Props) => {
       replace: true,
       scroll: true, // default
     });
+
+    hideVisibleLoading();
   };
 
   async function fetchItems() {
     try {
       const fullData = await itemsDataGetter.getAll();
       setLandscapeData(fullData);
-      const options = getClassifyAndSortOptions();
+      const options = itemsDataGetter.getClassifyAndSortOptions();
       setClassifyAndSortOptions(options);
       setClassifyOptions(options[selectedGroup() || ALL_OPTION].classify);
       setSortOptions(options[selectedGroup() || ALL_OPTION].sort);
@@ -460,20 +482,24 @@ const Explore = (props: Props) => {
   };
 
   const applyFilters = (newFilters: ActiveFilters) => {
-    batch(() => {
-      setActiveFilters(newFilters);
-      const data = itemsDataGetter.queryItems(newFilters, selectedGroup() || ALL_OPTION, classify()!);
-      checkVisibleItemsNumber(data.numItems);
-      setGroupsData(data.grid);
-      setCardData(data.card);
-      setCardMenu(data.menu);
-    });
+    setVisibleLoading(true);
 
-    updateFiltersQueryString(newFilters);
+    setTimeout(() => {
+      batch(() => {
+        setActiveFilters(newFilters);
+        const data = itemsDataGetter.queryItems(newFilters, selectedGroup() || ALL_OPTION, classify()!);
+        checkVisibleItemsNumber(data.numItems);
+        setGroupsData(data.grid);
+        setCardData(data.card);
+        setCardMenu(data.menu);
+      });
 
-    if (!isUndefined(landscapeData())) {
-      setFullDataApplied(true);
-    }
+      updateFiltersQueryString(newFilters);
+
+      if (!isUndefined(landscapeData())) {
+        setFullDataApplied(true);
+      }
+    }, DELAY_ACTIONS);
   };
 
   const handler = () => {
@@ -545,7 +571,7 @@ const Explore = (props: Props) => {
     <Show when={!isUndefined(groupsData())}>
       <main class="flex-grow-1 container-fluid px-3 px-lg-4 mainPadding position-relative">
         <div class="d-flex flex-column flex-lg-row my-2 my-md-3 py-1">
-          <div class="d-flex flex-row align-items-center mb-1 mb-md-0">
+          <div class="d-flex flex-row align-items-center mb-1 mb-md-0 w-100">
             <div class="d-block d-lg-none ms-0 ms-lg-4">
               <button
                 title="Index"
@@ -574,6 +600,14 @@ const Explore = (props: Props) => {
               sortOptions={sortOptions()}
             />
 
+            <Show when={visibleLoading()}>
+              <div class="d-flex d-lg-none ms-3">
+                <div class={`spinner-border text-secondary ms-3 mt-1 ${styles.spinner}`} role="status">
+                  <span class="visually-hidden">Loading...</span>
+                </div>
+              </div>
+            </Show>
+
             <div class="d-none d-lg-flex align-items-center">
               <Show when={!isUndefined(props.initialData.groups)}>
                 <div class={styles.btnGroupLegend}>
@@ -591,12 +625,16 @@ const Explore = (props: Props) => {
                             title={`Group: ${group.name}`}
                             class={`btn btn-outline-primary btn-sm rounded-0 fw-semibold text-nowrap ${styles.navLink}`}
                             classList={{
-                              [`active text-white ${styles.active}`]:
+                              [`active ${styles.active}`]:
                                 !isUndefined(selectedGroup()) && group.normalized_name === selectedGroup(),
                             }}
                             onClick={() => {
+                              setVisibleLoading(true);
                               setSelectedGroup(group.normalized_name);
-                              updateQueryString(GROUP_PARAM, group.normalized_name);
+
+                              setTimeout(() => {
+                                updateQueryString(GROUP_PARAM, group.normalized_name);
+                              }, DELAY_ACTIONS);
                             }}
                           >
                             {group.name}
@@ -609,12 +647,15 @@ const Explore = (props: Props) => {
                         title="All"
                         class={`btn btn-outline-primary btn-sm rounded-0 fw-semibold text-nowrap ${styles.navLink}`}
                         classList={{
-                          [`active text-white ${styles.active}`]:
-                            !isUndefined(selectedGroup()) && ALL_OPTION === selectedGroup(),
+                          [`active ${styles.active}`]: !isUndefined(selectedGroup()) && ALL_OPTION === selectedGroup(),
                         }}
                         onClick={() => {
+                          setVisibleLoading(true);
                           setSelectedGroup(ALL_OPTION);
-                          updateQueryString(GROUP_PARAM, ALL_OPTION);
+
+                          setTimeout(() => {
+                            updateQueryString(GROUP_PARAM, ALL_OPTION);
+                          }, DELAY_ACTIONS);
                         }}
                       >
                         All
@@ -630,9 +671,13 @@ const Explore = (props: Props) => {
                     value={selectedGroup() || props.initialData.groups![0].normalized_name}
                     aria-label="Group"
                     onChange={(e) => {
+                      setVisibleLoading(true);
                       const group = e.currentTarget.value;
                       setSelectedGroup(group);
-                      updateQueryString(GROUP_PARAM, group);
+
+                      setTimeout(() => {
+                        updateQueryString(GROUP_PARAM, group);
+                      }, DELAY_ACTIONS);
                     }}
                   >
                     <For each={props.initialData.groups}>
@@ -666,12 +711,16 @@ const Explore = (props: Props) => {
                       type="button"
                       class="btn btn-outline-primary rounded-0 fw-semibold"
                       classList={{
-                        'active text-white': value === viewMode(),
+                        [`active ${styles.active}`]: value === viewMode(),
                       }}
                       onClick={() => {
                         if (!(value === viewMode())) {
-                          setViewMode(value);
-                          updateQueryString(VIEW_MODE_PARAM, value);
+                          setVisibleLoading(true);
+
+                          setTimeout(() => {
+                            setViewMode(value);
+                            updateQueryString(VIEW_MODE_PARAM, value);
+                          }, DELAY_ACTIONS);
                         }
                       }}
                     >
@@ -722,9 +771,13 @@ const Explore = (props: Props) => {
                     value={classify()}
                     aria-label="Classify"
                     onChange={(e) => {
+                      setVisibleLoading(true);
                       const classifyOpt = e.currentTarget.value as ClassifyOption;
-                      setClassify(classifyOpt);
-                      updateQueryString(CLASSIFY_PARAM, classifyOpt);
+
+                      setTimeout(() => {
+                        setClassify(classifyOpt);
+                        updateQueryString(CLASSIFY_PARAM, classifyOpt);
+                      }, DELAY_ACTIONS);
                     }}
                   >
                     <For each={classifyOptions()}>
@@ -743,14 +796,17 @@ const Explore = (props: Props) => {
                     value={`${sorted()}_${sortDirection()}`}
                     aria-label="Sort"
                     onChange={(e) => {
+                      setVisibleLoading(true);
                       const sortValue = e.currentTarget.value;
                       const sortOpt = sortValue.split('_');
 
-                      batch(() => {
-                        setSorted(sortOpt[0] as SortOption);
-                        setSortDirection(sortOpt[1] as SortDirection);
-                      });
-                      updateQueryString('sort', sortValue);
+                      setTimeout(() => {
+                        batch(() => {
+                          setSorted(sortOpt[0] as SortOption);
+                          setSortDirection(sortOpt[1] as SortDirection);
+                        });
+                        updateQueryString('sort', sortValue);
+                      }, DELAY_ACTIONS);
                     }}
                   >
                     <For each={sortOptions()}>
@@ -772,6 +828,13 @@ const Explore = (props: Props) => {
                 </Match>
               </Switch>
             </div>
+            <Show when={visibleLoading()}>
+              <div class="d-none d-lg-flex ms-auto">
+                <div class={`spinner-border text-secondary ms-3 mt-1 ${styles.spinner}`} role="status">
+                  <span class="visually-hidden">Loading...</span>
+                </div>
+              </div>
+            </Show>
           </div>
           <Show when={!isUndefined(props.initialData.groups)}>
             <div class="d-flex d-lg-none align-items-center mt-3 mt-md-4 mt-lg-0 mb-2 mb-md-3 mb-lg-0">
@@ -784,9 +847,13 @@ const Explore = (props: Props) => {
                 value={selectedGroup() || props.initialData.groups![0].normalized_name}
                 aria-label="Group"
                 onChange={(e) => {
+                  setVisibleLoading(true);
                   const group = e.currentTarget.value;
                   setSelectedGroup(group);
-                  updateQueryString(GROUP_PARAM, group);
+
+                  setTimeout(() => {
+                    updateQueryString(GROUP_PARAM, group);
+                  }, DELAY_ACTIONS);
                 }}
               >
                 {/* Do not display All option for mobile */}
@@ -810,6 +877,10 @@ const Explore = (props: Props) => {
           />
         </div>
 
+        <Show when={!readyData()}>
+          <Loading spinnerClass="position-fixed top-50 start-50" transparentBg />
+        </Show>
+
         <Show when={numVisibleItems() === 0 && readyData()}>
           <div class="pt-5">
             <NoData>
diff --git a/web/src/utils/getClassifyAndSortOptions.ts b/web/src/utils/getClassifyAndSortOptions.ts
deleted file mode 100644
index 39f0f0c7..00000000
--- a/web/src/utils/getClassifyAndSortOptions.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import isUndefined from 'lodash/isUndefined';
-import some from 'lodash/some';
-
-import { BaseItem, ClassifyOption, Item, SortOption } from '../types';
-import itemsDataGetter from './itemsDataGetter';
-
-export interface ClassifyAndSortOptions {
-  classify: ClassifyOption[];
-  sort: SortOption[];
-}
-
-const getOptions = (items: (BaseItem | Item)[]): ClassifyAndSortOptions => {
-  const classify: ClassifyOption[] = [ClassifyOption.None, ClassifyOption.Category];
-  const sort: SortOption[] = [SortOption.Name];
-
-  if (some(items, (i: Item) => !isUndefined(i.maturity))) {
-    classify.push(ClassifyOption.Maturity);
-  }
-  if (some(items, (i: Item) => !isUndefined(i.tag))) {
-    classify.push(ClassifyOption.Tag);
-  }
-
-  if (some(items, (i: Item) => !isUndefined(i.repositories))) {
-    sort.push(SortOption.Stars);
-    sort.push(SortOption.FirstCommit);
-    sort.push(SortOption.LatestCommit);
-    sort.push(SortOption.Contributors);
-  }
-
-  if (some(items, (i: Item) => !isUndefined(i.accepted_at) || !isUndefined(i.joined_at))) {
-    sort.push(SortOption.DateAdded);
-  }
-
-  if (some(items, (i: Item) => !isUndefined(i.crunchbase_data))) {
-    sort.push(SortOption.Funding);
-  }
-
-  return {
-    classify,
-    sort,
-  };
-};
-
-const getClassifyAndSortOptions = (): { [key: string]: ClassifyAndSortOptions } => {
-  const options: { [key: string]: ClassifyAndSortOptions } = {};
-
-  const groupedItems = itemsDataGetter.getGroupedData();
-  Object.keys(groupedItems).forEach((group: string) => {
-    options[group] = getOptions(groupedItems[group]);
-  });
-
-  return options;
-};
-
-export default getClassifyAndSortOptions;
diff --git a/web/src/utils/goToElement.ts b/web/src/utils/goToElement.ts
index 2166e7cb..c223b626 100644
--- a/web/src/utils/goToElement.ts
+++ b/web/src/utils/goToElement.ts
@@ -1,6 +1,6 @@
 import { DEFAULT_STICKY_MOBILE_NAVBAR_HEIGHT, DEFAULT_STICKY_NAVBAR_HEIGHT } from '../data';
 
-const goToElement = (onWindow: boolean, id: string, offset?: number): boolean => {
+const goToElement = (onWindow: boolean, id: string, offset?: number) => {
   const target = window.document.getElementById(id);
   if (target) {
     const elementPosition = target.getBoundingClientRect().top;
@@ -13,20 +13,19 @@ const goToElement = (onWindow: boolean, id: string, offset?: number): boolean =>
         : DEFAULT_STICKY_NAVBAR_HEIGHT;
     const offsetPosition = elementPosition - (offset || 0) - extraOffset;
 
-    if (onWindow) {
-      window.scrollBy({
-        top: offsetPosition,
-        behavior: 'instant',
-      });
-    } else {
-      document.getElementById('landscape')!.scrollBy({
-        top: offsetPosition,
-        behavior: 'instant',
-      });
-    }
-    return true;
-  } else {
-    return false;
+    setTimeout(() => {
+      if (onWindow) {
+        window.scrollBy({
+          top: offsetPosition,
+          behavior: 'instant',
+        });
+      } else {
+        document.getElementById('landscape')!.scrollBy({
+          top: offsetPosition,
+          behavior: 'instant',
+        });
+      }
+    });
   }
 };
 
diff --git a/web/src/utils/itemsDataGetter.ts b/web/src/utils/itemsDataGetter.ts
index 8111ea47..13291973 100644
--- a/web/src/utils/itemsDataGetter.ts
+++ b/web/src/utils/itemsDataGetter.ts
@@ -1,11 +1,12 @@
-import { isEmpty } from 'lodash';
 import groupBy from 'lodash/groupBy';
 import intersection from 'lodash/intersection';
+import isEmpty from 'lodash/isEmpty';
 import isEqual from 'lodash/isEqual';
 import isUndefined from 'lodash/isUndefined';
+import some from 'lodash/some';
 import uniqWith from 'lodash/uniqWith';
 
-import { ALL_OPTION } from '../data';
+import { ALL_OPTION, DEFAULT_CLASSIFY } from '../data';
 import {
   ActiveFilters,
   ActiveSection,
@@ -21,6 +22,7 @@ import {
   Item,
   LandscapeData,
   Repository,
+  SortOption,
   Subcategory,
 } from '../types';
 import capitalizeFirstLetter from './capitalizeFirstLetter';
@@ -66,17 +68,17 @@ interface CategoryOpt {
   [key: string]: string[];
 }
 
+export interface ClassifyAndSortOptions {
+  classify: ClassifyOption[];
+  sort: SortOption[];
+}
+
 export class ItemsDataGetter {
   private updateStatus?: ItemsDataStatus;
   private ready = false;
   private landscapeData?: LandscapeData;
-  private initialQuery?: {
-    grid: GroupData;
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    card: any;
-    menu: { [key: string]: CardMenu | undefined };
-    numItems: { [key: string]: number };
-  };
+  private classifyAndSortOptions: { [key: string]: ClassifyAndSortOptions } | undefined;
+  private allDataGrouped: { [key: string]: (Item | BaseItem)[] } | undefined;
 
   // Subscribe to the updateStatus
   public subscribe(updateStatus: ItemsDataStatus) {
@@ -98,7 +100,7 @@ export class ItemsDataGetter {
           if (this.updateStatus) {
             this.updateStatus.updateStatus(true);
           }
-          this.saveInitialData();
+          this.saveData();
         });
     }
   }
@@ -193,6 +195,52 @@ export class ItemsDataGetter {
     return groupedItems;
   }
 
+  private getClassifyAndSortOptionsPerGroup = (items: (BaseItem | Item)[]): ClassifyAndSortOptions => {
+    const classify: ClassifyOption[] = [ClassifyOption.None, ClassifyOption.Category];
+    const sort: SortOption[] = [SortOption.Name];
+
+    if (some(items, (i: Item) => !isUndefined(i.maturity))) {
+      classify.push(ClassifyOption.Maturity);
+    }
+    if (some(items, (i: Item) => !isUndefined(i.tag))) {
+      classify.push(ClassifyOption.Tag);
+    }
+
+    if (some(items, (i: Item) => !isUndefined(i.repositories))) {
+      sort.push(SortOption.Stars);
+      sort.push(SortOption.FirstCommit);
+      sort.push(SortOption.LatestCommit);
+      sort.push(SortOption.Contributors);
+    }
+
+    if (some(items, (i: Item) => !isUndefined(i.accepted_at) || !isUndefined(i.joined_at))) {
+      sort.push(SortOption.DateAdded);
+    }
+
+    if (some(items, (i: Item) => !isUndefined(i.crunchbase_data))) {
+      sort.push(SortOption.Funding);
+    }
+
+    return {
+      classify,
+      sort,
+    };
+  };
+
+  private prepareClassifyAndSortOptions(groupedItems: { [key: string]: (Item | BaseItem)[] }): void {
+    const options: { [key: string]: ClassifyAndSortOptions } = {};
+
+    Object.keys(groupedItems).forEach((group: string) => {
+      options[group] = this.getClassifyAndSortOptionsPerGroup(groupedItems[group]);
+    });
+
+    this.classifyAndSortOptions = options;
+  }
+
+  public getClassifyAndSortOptions(): { [key: string]: ClassifyAndSortOptions } {
+    return this.classifyAndSortOptions || {};
+  }
+
   private classifyItemsByCatAndSub(
     items: (BaseItem | Item)[],
     group: string,
@@ -327,26 +375,20 @@ export class ItemsDataGetter {
   }
 
   public getGroupedData(): { [key: string]: (Item | BaseItem)[] } {
-    return this.groupData(this.ready ? this.getAll() : window.baseDS.items);
+    if (this.allDataGrouped) {
+      return this.allDataGrouped;
+    } else {
+      const grouped = this.groupData(this.ready ? this.getAll() : window.baseDS.items);
+      if (this.ready) {
+        this.allDataGrouped = grouped;
+      }
+      return grouped;
+    }
   }
 
-  private saveInitialData() {
-    const items = this.ready ? this.getAll() : window.baseDS.items;
-    const groupedItemsList = this.groupData(items);
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const classifyFullCardData: any = {};
-    const menuFullData: { [key: string]: CardMenu | undefined } = {};
-    const numItems: { [key: string]: number } = {};
-    Object.keys(groupedItemsList).forEach((group: string) => {
-      const classifyGroup = this.classifyItems(groupedItemsList[group], ClassifyOption.Category, group);
-      classifyFullCardData[group] = classifyGroup;
-      menuFullData[group] = this.getMenuOptions(classifyGroup, ClassifyOption.Category);
-      numItems[group as string] = groupedItemsList[group].length;
-    });
-
-    const fullGridData = this.prepareGridData(groupedItemsList, true);
-    const fullQuery = { grid: fullGridData, card: classifyFullCardData, menu: menuFullData, numItems: numItems };
-    this.initialQuery = fullQuery;
+  private saveData() {
+    const groupedItemsList = this.getGroupedData();
+    this.prepareClassifyAndSortOptions(groupedItemsList);
   }
 
   // Prepare menu options
@@ -384,38 +426,50 @@ export class ItemsDataGetter {
   };
 
   // Query items
-  public queryItems(input: ActiveFilters, group: string, classify: ClassifyOption) {
-    const items = this.ready ? this.getAll() : window.baseDS.items;
-    const filteredItems = filterData(items, input);
-    const groupedItems = this.groupData(filteredItems);
+  public queryItems(input: ActiveFilters, activeGroup: string, classify: ClassifyOption) {
+    const allGroupedItems = this.getGroupedData();
+    // Filter only the active group
+    const filteredItems = !isEmpty(input)
+      ? filterData(allGroupedItems[activeGroup], input)
+      : allGroupedItems[activeGroup];
+    const groupedItems = { ...allGroupedItems, [activeGroup]: filteredItems };
+
     let activeCategoryFilters: string[] | undefined;
     if (classify === ClassifyOption.Category && !isUndefined(input.category) && !isEmpty(input.category)) {
       activeCategoryFilters = input.category;
     }
 
+    const gridData = this.prepareGridData(groupedItems, true, activeCategoryFilters);
+
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const classifyCardData: any = {};
     const menuData: { [key: string]: CardMenu | undefined } = {};
     const numItems: { [key: string]: number } = {};
+
     Object.keys(groupedItems).forEach((group: string) => {
-      const classifyGroup = this.classifyItems(groupedItems[group], classify, group, activeCategoryFilters);
-      classifyCardData[group] = classifyGroup;
-      menuData[group] = this.getMenuOptions(classifyGroup, classify);
-      numItems[group] = groupedItems[group].length;
+      if (group === activeGroup) {
+        // Update group active data
+        const classifyGroup = this.classifyItems(
+          groupedItems[activeGroup],
+          classify,
+          activeGroup,
+          activeCategoryFilters
+        );
+        classifyCardData[activeGroup] = classifyGroup;
+        menuData[activeGroup] = this.getMenuOptions(classifyGroup, classify);
+        numItems[activeGroup] = groupedItems[activeGroup].length;
+      } else {
+        const classifiedOption =
+          !isUndefined(this.classifyAndSortOptions) && this.classifyAndSortOptions[group].classify.includes(classify)
+            ? classify
+            : DEFAULT_CLASSIFY;
+        const classifiedGroup = this.classifyItems(allGroupedItems[group], classifiedOption, group);
+        classifyCardData[group] = classifiedGroup;
+        menuData[group] = this.getMenuOptions(classifiedGroup, classifiedOption);
+      }
     });
 
-    const gridData = this.prepareGridData(groupedItems, true, activeCategoryFilters);
-    let currentQuery = { grid: gridData, card: classifyCardData, menu: menuData, numItems: numItems };
-
-    if (!isUndefined(this.initialQuery)) {
-      currentQuery = {
-        grid: { ...this.initialQuery.grid, [group]: gridData[group] },
-        card: { ...this.initialQuery.card, [group]: classifyCardData[group] },
-        menu: { ...this.initialQuery.menu, [group]: menuData[group] },
-        numItems: { ...this.initialQuery.numItems, [group]: numItems[group] },
-      };
-    }
-    return currentQuery;
+    return { grid: gridData, card: classifyCardData, menu: menuData, numItems: numItems };
   }
 
   // Get item by id

From 10c33fc08ce73f7b0382c4841ecc3fd25a8376a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cintia=20S=C3=A1nchez=20Garc=C3=ADa?= <cynthiasg@icloud.com>
Date: Wed, 17 Apr 2024 10:02:28 +0200
Subject: [PATCH 19/55] Fix regression updating selected group (#580)

Signed-off-by: Cintia Sanchez Garcia <cynthiasg@icloud.com>
---
 web/src/layout/explore/index.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/src/layout/explore/index.tsx b/web/src/layout/explore/index.tsx
index 265c4f3c..667c5b5e 100644
--- a/web/src/layout/explore/index.tsx
+++ b/web/src/layout/explore/index.tsx
@@ -630,9 +630,9 @@ const Explore = (props: Props) => {
                             }}
                             onClick={() => {
                               setVisibleLoading(true);
-                              setSelectedGroup(group.normalized_name);
 
                               setTimeout(() => {
+                                setSelectedGroup(group.normalized_name);
                                 updateQueryString(GROUP_PARAM, group.normalized_name);
                               }, DELAY_ACTIONS);
                             }}
@@ -651,9 +651,9 @@ const Explore = (props: Props) => {
                         }}
                         onClick={() => {
                           setVisibleLoading(true);
-                          setSelectedGroup(ALL_OPTION);
 
                           setTimeout(() => {
+                            setSelectedGroup(ALL_OPTION);
                             updateQueryString(GROUP_PARAM, ALL_OPTION);
                           }, DELAY_ACTIONS);
                         }}
@@ -673,9 +673,9 @@ const Explore = (props: Props) => {
                     onChange={(e) => {
                       setVisibleLoading(true);
                       const group = e.currentTarget.value;
-                      setSelectedGroup(group);
 
                       setTimeout(() => {
+                        setSelectedGroup(group);
                         updateQueryString(GROUP_PARAM, group);
                       }, DELAY_ACTIONS);
                     }}
@@ -849,9 +849,9 @@ const Explore = (props: Props) => {
                 onChange={(e) => {
                   setVisibleLoading(true);
                   const group = e.currentTarget.value;
-                  setSelectedGroup(group);
 
                   setTimeout(() => {
+                    setSelectedGroup(group);
                     updateQueryString(GROUP_PARAM, group);
                   }, DELAY_ACTIONS);
                 }}

From 9e8308f9873c4cc716cf33d2c6bfb678ccad29f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cintia=20S=C3=A1nchez=20Garc=C3=ADa?= <cynthiasg@icloud.com>
Date: Mon, 22 Apr 2024 07:45:25 +0200
Subject: [PATCH 20/55] Add repository selector to item details view (#581)

Signed-off-by: Cintia Sanchez Garcia <cynthiasg@icloud.com>
---
 web/src/layout/common/ExternalLink.tsx        |   4 +-
 web/src/layout/common/SVGIcon.tsx             |  32 ++-
 web/src/layout/common/itemModal/Content.tsx   | 131 +------------
 .../layout/common/itemModal/MobileContent.tsx |  96 +--------
 .../itemModal/RepositoriesSection.module.css  |  56 ++++++
 .../common/itemModal/RepositoriesSection.tsx  | 184 ++++++++++++++++++
 web/src/layout/explore/index.tsx              |   4 +-
 web/src/types.ts                              |   1 +
 8 files changed, 281 insertions(+), 227 deletions(-)
 create mode 100644 web/src/layout/common/itemModal/RepositoriesSection.module.css
 create mode 100644 web/src/layout/common/itemModal/RepositoriesSection.tsx

diff --git a/web/src/layout/common/ExternalLink.tsx b/web/src/layout/common/ExternalLink.tsx
index d33a03da..85e55dd9 100644
--- a/web/src/layout/common/ExternalLink.tsx
+++ b/web/src/layout/common/ExternalLink.tsx
@@ -27,9 +27,9 @@ const ExternalLink = (props: Props) => {
     return (
       <>
         {!isUndefined(props.visibleExternalIcon) && props.visibleExternalIcon ? (
-          <div class="d-flex flex-row align-items-baseline">
+          <div class="d-flex flex-row align-items-center">
             {props.children}
-            <SVGIcon kind={SVGIconKind.Link} class={`ms-2 icon ${props.externalIconClassName}`} />
+            <SVGIcon kind={SVGIconKind.ExternalLink} class={`ms-2 icon ${props.externalIconClassName}`} />
           </div>
         ) : (
           <>{props.children}</>
diff --git a/web/src/layout/common/SVGIcon.tsx b/web/src/layout/common/SVGIcon.tsx
index ea05b4dd..7c68f9fd 100644
--- a/web/src/layout/common/SVGIcon.tsx
+++ b/web/src/layout/common/SVGIcon.tsx
@@ -354,6 +354,25 @@ const Embed = (props: IconProps) => (
   </svg>
 );
 
+const ExternalLink = (props: IconProps) => (
+  <svg
+    class={props.class}
+    stroke="currentColor"
+    fill="none"
+    stroke-width="2"
+    viewBox="0 0 24 24"
+    stroke-linecap="round"
+    stroke-linejoin="round"
+    height="1em"
+    width="1em"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path d="M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6" />
+    <polyline points="15 3 21 3 21 9" />
+    <line x1="10" y1="14" x2="21" y2="3" />
+  </svg>
+);
+
 const Facebook = (props: IconProps) => (
   <svg
     class={props.class}
@@ -467,18 +486,14 @@ const Link = (props: IconProps) => (
   <svg
     class={props.class}
     stroke="currentColor"
-    fill="none"
-    stroke-width="2"
-    viewBox="0 0 24 24"
-    stroke-linecap="round"
-    stroke-linejoin="round"
+    fill="currentColor"
+    stroke-width="0"
+    viewBox="0 0 640 512"
     height="1em"
     width="1em"
     xmlns="http://www.w3.org/2000/svg"
   >
-    <path d="M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6" />
-    <polyline points="15 3 21 3 21 9" />
-    <line x1="10" y1="14" x2="21" y2="3" />
+    <path d="M579.8 267.7c56.5-56.5 56.5-148 0-204.5c-50-50-128.8-56.5-186.3-15.4l-1.6 1.1c-14.4 10.3-17.7 30.3-7.4 44.6s30.3 17.7 44.6 7.4l1.6-1.1c32.1-22.9 76-19.3 103.8 8.6c31.5 31.5 31.5 82.5 0 114L422.3 334.8c-31.5 31.5-82.5 31.5-114 0c-27.9-27.9-31.5-71.8-8.6-103.8l1.1-1.6c10.3-14.4 6.9-34.4-7.4-44.6s-34.4-6.9-44.6 7.4l-1.1 1.6C206.5 251.2 213 330 263 380c56.5 56.5 148 56.5 204.5 0L579.8 267.7zM60.2 244.3c-56.5 56.5-56.5 148 0 204.5c50 50 128.8 56.5 186.3 15.4l1.6-1.1c14.4-10.3 17.7-30.3 7.4-44.6s-30.3-17.7-44.6-7.4l-1.6 1.1c-32.1 22.9-76 19.3-103.8-8.6C74 372 74 321 105.5 289.5L217.7 177.2c31.5-31.5 82.5-31.5 114 0c27.9 27.9 31.5 71.8 8.6 103.9l-1.1 1.6c-10.3 14.4-6.9 34.4 7.4 44.6s34.4 6.9 44.6-7.4l1.1-1.6C433.5 260.8 427 182 377 132c-56.5-56.5-148-56.5-204.5 0L60.2 244.3z" />
   </svg>
 );
 
@@ -908,6 +923,7 @@ const icons: ValidComponent[] = [
   Documentation,
   Download,
   Embed,
+  ExternalLink,
   Facebook,
   Filters,
   Flickr,
diff --git a/web/src/layout/common/itemModal/Content.tsx b/web/src/layout/common/itemModal/Content.tsx
index b57d3ce1..04b42c1a 100644
--- a/web/src/layout/common/itemModal/Content.tsx
+++ b/web/src/layout/common/itemModal/Content.tsx
@@ -3,7 +3,6 @@ import isEmpty from 'lodash/isEmpty';
 import isNull from 'lodash/isNull';
 import isUndefined from 'lodash/isUndefined';
 import sortBy from 'lodash/sortBy';
-import moment from 'moment';
 import { createEffect, createSignal, For, Match, on, Show, Switch } from 'solid-js';
 
 import { AdditionalCategory, Item, Repository, SecurityAudit, SVGIconKind } from '../../../types';
@@ -11,7 +10,6 @@ import formatProfitLabel from '../../../utils/formatLabelProfit';
 import getItemDescription from '../../../utils/getItemDescription';
 import { formatTAGName } from '../../../utils/prepareFilters';
 import prettifyNumber from '../../../utils/prettifyNumber';
-import sortObjectByValue from '../../../utils/sortObjectByValue';
 import { useUpdateActiveItemId } from '../../stores/activeItem';
 import Badge from '../Badge';
 import CollapsableText from '../CollapsableText';
@@ -25,10 +23,9 @@ import Box from './Box';
 import styles from './Content.module.css';
 import FundingRoundsTable from './FundingRoundsTable';
 import ItemDropdown from './ItemDropdown';
-import LanguagesStats from './LanguagesStats';
 import MaturitySection from './MaturitySection';
 import ParentProject from './ParentProject';
-import ParticipationStats from './ParticipationStats';
+import RepositoriesSection from './RepositoriesSection';
 
 interface Props {
   item?: Item | null;
@@ -41,10 +38,6 @@ const Content = (props: Props) => {
   const [mainRepo, setMainRepo] = createSignal<Repository>();
   const [websiteUrl, setWebsiteUrl] = createSignal<string>();
 
-  const formatDate = (date: string): string => {
-    return moment(date).format("MMM 'YY");
-  };
-
   createEffect(
     on(itemInfo, () => {
       if (!isUndefined(itemInfo()) && !isNull(itemInfo())) {
@@ -311,123 +304,11 @@ const Content = (props: Props) => {
         {/* Maturity */}
         <MaturitySection item={itemInfo()!} class={styles.fieldset} />
         {/* Repositories */}
-        <Show when={!isUndefined(itemInfo()!.repositories)}>
-          <div class={`position-relative border ${styles.fieldset}`}>
-            <div class={`position-absolute px-2 bg-white fw-semibold ${styles.fieldsetTitle}`}>Repositories</div>
-            <Show when={!isUndefined(mainRepo())}>
-              <div class={`fw-bold text-uppercase mt-2 mb-3 ${styles.titleInSection}`}>Primary repository</div>
-              <div class="d-flex flex-row align-items-center my-2">
-                <ExternalLink class="text-reset p-0 align-baseline fw-semibold" href={mainRepo()!.url}>
-                  {mainRepo()!.url}
-                </ExternalLink>
-                <Show when={!isUndefined(mainRepo()!.github_data)}>
-                  <div class={`ms-3 badge border rounded-0 ${styles.badgeOutlineDark} ${styles.miniBadge}`}>
-                    {mainRepo()!.github_data!.license}
-                  </div>
-                </Show>
-              </div>
-              <Show when={!isUndefined(mainRepo()!.github_data)}>
-                <div class="row g-4 my-0 mb-2">
-                  <Box value={prettifyNumber(mainRepo()!.github_data!.stars, 1)} legend="Stars" />
-
-                  <Box value={prettifyNumber(mainRepo()!.github_data!.contributors.count)} legend="Contributors" />
-
-                  <Box value={formatDate(mainRepo()!.github_data!.first_commit.ts)} legend="First commit" />
-
-                  <Box value={formatDate(mainRepo()!.github_data!.latest_commit.ts)} legend="Latest commit" />
-
-                  <Box
-                    value={
-                      !isUndefined(mainRepo()!.github_data!.latest_release)
-                        ? formatDate(mainRepo()!.github_data!.latest_release!.ts)
-                        : '-'
-                    }
-                    legend="Latest release"
-                  />
-                </div>
-
-                <Show when={!isUndefined(mainRepo()!.github_data!.participation_stats)}>
-                  <div class="mt-4">
-                    <div class={`fw-semibold ${styles.subtitleInSection}`}>Participation stats</div>
-                    <ParticipationStats initialStats={mainRepo()!.github_data!.participation_stats} />
-                  </div>
-                </Show>
-
-                <Show
-                  when={
-                    !isUndefined(mainRepo()!.github_data!.languages) && !isEmpty(mainRepo()!.github_data!.languages)
-                  }
-                >
-                  <div class="mt-4">
-                    <div class={`fw-semibold ${styles.subtitleInSection}`}>Languages</div>
-                    <LanguagesStats initialLanguages={mainRepo()!.github_data!.languages!} />
-                  </div>
-                </Show>
-              </Show>
-            </Show>
-            <Show when={!isUndefined(itemInfo()!.repositories) && itemInfo()!.repositories!.length > 1}>
-              <div class="mt-4">
-                <div class={`fw-bold text-uppercase ${styles.titleInSection}`}>Other repositories</div>
-                <table class={`table table-sm table-striped table-bordered mt-3 ${styles.tableLayout}`}>
-                  <thead class={`text-uppercase text-muted ${styles.thead}`}>
-                    <tr>
-                      <th class="text-center" scope="col">
-                        URL
-                      </th>
-                      <th class={`text-center ${styles.reposCol}`} scope="col">
-                        Language
-                      </th>
-                      <th class={`text-center text-nowrap ${styles.reposCol}`} scope="col">
-                        Latest commit
-                      </th>
-                      <th class={`text-center ${styles.reposCol}`} scope="col">
-                        Stars
-                      </th>
-                    </tr>
-                  </thead>
-                  <tbody>
-                    <For each={itemInfo()!.repositories}>
-                      {(repo: Repository) => {
-                        const languages =
-                          repo.github_data && repo.github_data.languages
-                            ? sortObjectByValue(repo.github_data.languages)
-                            : undefined;
-
-                        return (
-                          <Show when={!repo.primary}>
-                            <tr class={styles.tableContent}>
-                              <td class="px-3">
-                                <ExternalLink
-                                  class={`text-muted text-truncate d-block ${styles.tableLink}`}
-                                  href={repo.url}
-                                >
-                                  {repo.url}
-                                </ExternalLink>
-                              </td>
-                              <td class="px-3 text-center text-nowrap">
-                                {!isUndefined(languages) && languages.length > 0 ? languages[0] : '-'}
-                              </td>
-                              <td class="px-3 text-center text-nowrap">
-                                {repo.github_data && repo.github_data.latest_commit
-                                  ? formatDate(repo.github_data!.latest_commit!.ts)
-                                  : '-'}
-                              </td>
-                              <td class="px-3 text-center text-nowrap">
-                                {repo.github_data && repo.github_data.stars
-                                  ? prettifyNumber(repo.github_data.stars)
-                                  : '-'}
-                              </td>
-                            </tr>
-                          </Show>
-                        );
-                      }}
-                    </For>
-                  </tbody>
-                </table>
-              </div>
-            </Show>
-          </div>
-        </Show>
+        <RepositoriesSection
+          repositories={itemInfo()!.repositories}
+          class={`border ${styles.fieldset}`}
+          titleClass={`position-absolute px-2 bg-white fw-semibold ${styles.fieldsetTitle}`}
+        />
         {/* Security audits */}
         <Show when={!isUndefined(itemInfo()!.audits) && !isEmpty(itemInfo()!.audits)}>
           <div class={`position-relative border ${styles.fieldset}`}>
diff --git a/web/src/layout/common/itemModal/MobileContent.tsx b/web/src/layout/common/itemModal/MobileContent.tsx
index eac4ed3a..e6b999cd 100644
--- a/web/src/layout/common/itemModal/MobileContent.tsx
+++ b/web/src/layout/common/itemModal/MobileContent.tsx
@@ -3,7 +3,6 @@ import isEmpty from 'lodash/isEmpty';
 import isNull from 'lodash/isNull';
 import isUndefined from 'lodash/isUndefined';
 import sortBy from 'lodash/sortBy';
-import moment from 'moment';
 import { createEffect, createSignal, For, Match, on, Show, Switch } from 'solid-js';
 
 import { AdditionalCategory, Item, Repository, SecurityAudit, SVGIconKind } from '../../../types';
@@ -21,11 +20,10 @@ import SVGIcon from '../SVGIcon';
 import AcquisitionsTable from './AcquisitionsTable';
 import Box from './Box';
 import FundingRoundsTable from './FundingRoundsTable';
-import LanguagesStats from './LanguagesStats';
 import styles from './MobileContent.module.css';
 import MobileMaturitySection from './MobileMaturitySection';
 import ParentProject from './ParentProject';
-import ParticipationStats from './ParticipationStats';
+import RepositoriesSection from './RepositoriesSection';
 
 interface Props {
   item?: Item | null;
@@ -35,13 +33,7 @@ const MobileContent = (props: Props) => {
   const itemInfo = () => props.item;
   const updateActiveItemId = useUpdateActiveItemId();
   const [description, setDescription] = createSignal<string>();
-  const [mainRepo, setMainRepo] = createSignal<Repository>();
   const [websiteUrl, setWebsiteUrl] = createSignal<string>();
-  const [mainRepoUrl, setMainRepoUrl] = createSignal<string>();
-
-  const formatDate = (date: string): string => {
-    return moment(date).format("MMM 'YY");
-  };
 
   createEffect(
     on(itemInfo, () => {
@@ -56,11 +48,6 @@ const MobileContent = (props: Props) => {
               mainRepoTmp = repo;
             }
           });
-
-          if (mainRepoTmp) {
-            setMainRepo(mainRepoTmp);
-            setMainRepoUrl(new URL(mainRepoTmp.url).pathname);
-          }
         }
 
         // If homepage_url is undefined or is equal to main repository url
@@ -72,7 +59,6 @@ const MobileContent = (props: Props) => {
           }
         }
       } else {
-        setMainRepo(undefined);
         setDescription(undefined);
         setWebsiteUrl(undefined);
         updateActiveItemId(); // Close modal
@@ -167,81 +153,11 @@ const MobileContent = (props: Props) => {
         <MobileMaturitySection item={itemInfo()!} titleClass={styles.sectionTitle} />
 
         {/* Repositories */}
-        <Show when={!isUndefined(itemInfo()!.repositories)}>
-          <div class={`text-uppercase mt-3 fw-semibold border-bottom ${styles.sectionTitle}`}>Repositories</div>
-          <Show when={!isUndefined(mainRepo())}>
-            <div class={`fw-bold text-uppercase my-2 ${styles.titleInSection}`}>Primary repository</div>
-
-            <ExternalLink
-              class={`p-0 align-baseline fw-semibold text-truncate my-2 ${styles.text}`}
-              href={mainRepo()!.url}
-            >
-              <div class="d-flex flex-row align-items-center">
-                <SVGIcon kind={SVGIconKind.GitHub} class="me-1" />
-                <div class="text-truncate">{mainRepoUrl()!.slice(1)}</div>
-              </div>
-            </ExternalLink>
-            <Show when={!isUndefined(mainRepo()!.github_data)}>
-              <div class="mb-2">
-                <div class={`badge border rounded-0 ${styles.badgeOutlineDark} ${styles.miniBadge}`}>
-                  {mainRepo()!.github_data!.license}
-                </div>
-              </div>
-            </Show>
-
-            <Show when={!isUndefined(mainRepo()!.github_data)}>
-              <div class="row g-4 my-0 mx-1 mb-2 justify-content-center">
-                <Box class="col-6" value={prettifyNumber(mainRepo()!.github_data!.stars, 1)} legend="Stars" />
-
-                <Box
-                  class="col-6"
-                  value={prettifyNumber(mainRepo()!.github_data!.contributors.count)}
-                  legend="Contributors"
-                />
-
-                <Box class="col-6" value={formatDate(mainRepo()!.github_data!.first_commit.ts)} legend="First commit" />
-
-                <Box
-                  class="col-6"
-                  value={formatDate(mainRepo()!.github_data!.latest_commit.ts)}
-                  legend="Latest commit"
-                />
-
-                <Box
-                  class="col-6"
-                  value={
-                    !isUndefined(mainRepo()!.github_data!.latest_release)
-                      ? formatDate(mainRepo()!.github_data!.latest_release!.ts)
-                      : '-'
-                  }
-                  legend="Latest release"
-                />
-              </div>
-
-              <Show when={!isUndefined(mainRepo()!.github_data!.participation_stats)}>
-                <div class="mt-4">
-                  <div class={`fw-semibold ${styles.subtitleInSection}`}>Participation stats</div>
-                  <div class="mx-2">
-                    <ParticipationStats initialStats={mainRepo()!.github_data!.participation_stats} />
-                  </div>
-                </div>
-              </Show>
-
-              <Show
-                when={!isUndefined(mainRepo()!.github_data!.languages) && !isEmpty(mainRepo()!.github_data!.languages)}
-              >
-                <div class="mt-4">
-                  <div class={`fw-semibold ${styles.subtitleInSection}`}>Languages</div>
-                  <LanguagesStats
-                    initialLanguages={mainRepo()!.github_data!.languages!}
-                    boxClass="col-6"
-                    class="mx-1"
-                  />
-                </div>
-              </Show>
-            </Show>
-          </Show>
-        </Show>
+        <RepositoriesSection
+          repositories={itemInfo()!.repositories}
+          titleClass={`text-uppercase mt-3 mb-4 fw-semibold border-bottom ${styles.sectionTitle}`}
+          boxClass="col-6"
+        />
 
         {/* Security audits */}
         <Show when={!isUndefined(itemInfo()!.audits) && !isEmpty(itemInfo()!.audits)}>
diff --git a/web/src/layout/common/itemModal/RepositoriesSection.module.css b/web/src/layout/common/itemModal/RepositoriesSection.module.css
new file mode 100644
index 00000000..57db4cea
--- /dev/null
+++ b/web/src/layout/common/itemModal/RepositoriesSection.module.css
@@ -0,0 +1,56 @@
+.fieldsetTitle {
+  font-size: 0.8rem;
+  line-height: 0.8rem;
+  color: var(--color4);
+  top: -0.35rem;
+  left: 1rem;
+}
+
+.titleInSection {
+  font-size: 0.8rem;
+  opacity: 0.5;
+}
+
+.subtitleInSection {
+  font-size: 0.8rem;
+  opacity: 0.5;
+}
+
+.badgeOutlineDark {
+  border-color: var(--bs-gray-700) !important;
+  color: var(--bs-gray-700);
+}
+
+.miniBadge {
+  font-size: 0.65rem;
+}
+
+.select {
+  width: 500px;
+  max-width: calc(100% - 0.4rem);
+  box-shadow: 0 0 0 0.2rem var(--bs-gray-200);
+  margin: 0 0.2rem;
+  font-size: 0.8rem;
+}
+
+.select:focus {
+  box-shadow: 0 0 0 0.2rem var(--bs-gray-200) !important;
+}
+
+.externalIcon,
+.repoIcon {
+  min-width: 24px;
+}
+
+.linkWrapper {
+  max-width: 100%;
+}
+
+.truncateWrapper {
+  min-width: 0;
+  max-width: 100%;
+}
+
+.linkContentWrapper {
+  max-width: calc(100% - 1.5rem);
+}
diff --git a/web/src/layout/common/itemModal/RepositoriesSection.tsx b/web/src/layout/common/itemModal/RepositoriesSection.tsx
new file mode 100644
index 00000000..f9d04c53
--- /dev/null
+++ b/web/src/layout/common/itemModal/RepositoriesSection.tsx
@@ -0,0 +1,184 @@
+import isEmpty from 'lodash/isEmpty';
+import isUndefined from 'lodash/isUndefined';
+import orderBy from 'lodash/orderBy';
+import moment from 'moment';
+import { createSignal, For, onMount, Show } from 'solid-js';
+
+import { Repository, SVGIconKind } from '../../../types';
+import prettifyNumber from '../../../utils/prettifyNumber';
+import ExternalLink from '../ExternalLink';
+import SVGIcon from '../SVGIcon';
+import Box from './Box';
+import LanguagesStats from './LanguagesStats';
+import ParticipationStats from './ParticipationStats';
+import styles from './RepositoriesSection.module.css';
+
+interface Props {
+  repositories?: Repository[];
+  class?: string;
+  titleClass?: string;
+  boxClass?: string;
+}
+
+interface RepoProps {
+  repository: Repository;
+  boxClass?: string;
+}
+
+const formatRepoUrl = (url: string): string => {
+  const repoUrl = new URL(url);
+  return repoUrl.pathname.slice(1);
+};
+
+const RepositoryInfo = (props: RepoProps) => {
+  const formatDate = (date: string): string => {
+    return moment(date).format("MMM 'YY");
+  };
+
+  return (
+    <>
+      <div class="d-flex flex-row align-items-start mt-4">
+        <div
+          class={`d-flex flex-column flex-md-row align-items-start align-items-md-center my-2 ${styles.linkWrapper}`}
+        >
+          <ExternalLink
+            class={`text-reset p-0 align-items-center fw-semibold me-3 ${styles.truncateWrapper}`}
+            href={props.repository.url}
+            externalIconClassName={styles.externalIcon}
+            visibleExternalIcon
+          >
+            <div class={`d-none d-md-flex ${styles.linkContentWrapper}`}>
+              <div class="text-truncate">{props.repository.url}</div>
+            </div>
+            <div class="d-flex d-md-none flex-row align-items-center text-truncate">
+              <SVGIcon kind={SVGIconKind.GitHub} class={`me-1 ${styles.repoIcon}`} />
+              <div class="text-truncate">{formatRepoUrl(props.repository.url)}</div>
+            </div>
+          </ExternalLink>
+          <Show when={props.repository.primary || !isUndefined(props.repository.github_data)}>
+            <div class="d-flex align-items-center mt-2 mt-md-0">
+              <Show when={props.repository.primary}>
+                <div
+                  class={`me-2 badge border rounded-0 text-uppercase ${styles.badgeOutlineDark} ${styles.miniBadge}`}
+                >
+                  Primary
+                </div>
+              </Show>
+              <Show when={!isUndefined(props.repository.github_data)}>
+                <div class={`badge border rounded-0 ${styles.badgeOutlineDark} ${styles.miniBadge}`}>
+                  {props.repository.github_data!.license}
+                </div>
+              </Show>
+            </div>
+          </Show>
+        </div>
+      </div>
+      <Show when={!isUndefined(props.repository.github_data)}>
+        <div class="row g-4 my-0 mb-2 justify-content-center justify-md-content-start">
+          <Box class={props.boxClass} value={prettifyNumber(props.repository.github_data!.stars, 1)} legend="Stars" />
+
+          <Box
+            class={props.boxClass}
+            value={prettifyNumber(props.repository.github_data!.contributors.count)}
+            legend="Contributors"
+          />
+
+          <Box
+            class={props.boxClass}
+            value={formatDate(props.repository.github_data!.first_commit.ts)}
+            legend="First commit"
+          />
+
+          <Box
+            class={props.boxClass}
+            value={formatDate(props.repository.github_data!.latest_commit.ts)}
+            legend="Latest commit"
+          />
+
+          <Box
+            class={props.boxClass}
+            value={
+              !isUndefined(props.repository.github_data!.latest_release)
+                ? formatDate(props.repository.github_data!.latest_release!.ts)
+                : '-'
+            }
+            legend="Latest release"
+          />
+        </div>
+
+        <Show when={!isUndefined(props.repository.github_data!.participation_stats)}>
+          <div class="mt-4">
+            <div class={`fw-semibold ${styles.subtitleInSection}`}>Participation stats</div>
+            <div class="mx-2 mx-md-0">
+              <ParticipationStats initialStats={props.repository.github_data!.participation_stats} />
+            </div>
+          </div>
+        </Show>
+
+        <Show
+          when={
+            !isUndefined(props.repository.github_data!.languages) && !isEmpty(props.repository.github_data!.languages)
+          }
+        >
+          <div class="mt-4">
+            <div class={`fw-semibold ${styles.subtitleInSection}`}>Languages</div>
+            <LanguagesStats initialLanguages={props.repository.github_data!.languages!} boxClass={props.boxClass} />
+          </div>
+        </Show>
+      </Show>
+    </>
+  );
+};
+
+const RepositoriesSection = (props: Props) => {
+  const [selectedRepo, setSelectedRepo] = createSignal<Repository | undefined>(undefined);
+  const [repositoriesList, setRepositoriesList] = createSignal<Repository[]>([]);
+
+  onMount(() => {
+    if (props.repositories && props.repositories.length > 0) {
+      const sortedRepos = orderBy(
+        props.repositories,
+        [(r: Repository) => (r.primary === true ? 0 : 1), 'url'],
+        ['asc']
+      );
+      setRepositoriesList(sortedRepos);
+      setSelectedRepo(sortedRepos[0]);
+    }
+  });
+
+  return (
+    <Show when={repositoriesList().length > 0}>
+      <div class={`position-relative ${props.class}`}>
+        <div class={` ${props.titleClass}`}>Repositories</div>
+
+        <select
+          id="repo-select"
+          class={`form-select form-select-md border-0 rounded-0 my-3 ${styles.select}`}
+          value={selectedRepo() ? selectedRepo()!.url : undefined}
+          aria-label="Repository select"
+          onChange={(e) => {
+            const repo = repositoriesList().find((r) => r.url === e.currentTarget.value);
+            setSelectedRepo(repo);
+          }}
+        >
+          <For each={repositoriesList()}>
+            {(repo: Repository) => {
+              return (
+                <option value={repo.url}>
+                  {formatRepoUrl(repo.url)}
+                  <Show when={repo.primary}> (primary)</Show>
+                </option>
+              );
+            }}
+          </For>
+        </select>
+
+        <Show when={!isUndefined(selectedRepo())}>
+          <RepositoryInfo repository={selectedRepo()!} boxClass={props.boxClass} />
+        </Show>
+      </div>
+    </Show>
+  );
+};
+
+export default RepositoriesSection;
diff --git a/web/src/layout/explore/index.tsx b/web/src/layout/explore/index.tsx
index 667c5b5e..8c64854e 100644
--- a/web/src/layout/explore/index.tsx
+++ b/web/src/layout/explore/index.tsx
@@ -601,8 +601,8 @@ const Explore = (props: Props) => {
             />
 
             <Show when={visibleLoading()}>
-              <div class="d-flex d-lg-none ms-3">
-                <div class={`spinner-border text-secondary ms-3 mt-1 ${styles.spinner}`} role="status">
+              <div class="d-flex d-lg-none ms-2">
+                <div class={`spinner-border text-secondary mt-1 ${styles.spinner}`} role="status">
                   <span class="visually-hidden">Loading...</span>
                 </div>
               </div>
diff --git a/web/src/types.ts b/web/src/types.ts
index 20d77365..185498db 100644
--- a/web/src/types.ts
+++ b/web/src/types.ts
@@ -420,6 +420,7 @@ export enum SVGIconKind {
   Documentation,
   Download,
   Embed,
+  ExternalLink,
   Facebook,
   Filters,
   Flickr,

From 5e6959dc80c9471a00ff16a33299eac761db93d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cintia=20S=C3=A1nchez=20Garc=C3=ADa?= <cynthiasg@icloud.com>
Date: Mon, 22 Apr 2024 08:48:05 +0200
Subject: [PATCH 21/55] Add repositories good first issues link (#582)

Signed-off-by: Cintia Sanchez Garcia <cynthiasg@icloud.com>
---
 web/src/layout/common/ExternalLink.tsx             |  2 +-
 .../itemModal/RepositoriesSection.module.css       |  8 ++++++++
 .../common/itemModal/RepositoriesSection.tsx       | 14 ++++++++++++--
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/web/src/layout/common/ExternalLink.tsx b/web/src/layout/common/ExternalLink.tsx
index 85e55dd9..3160327d 100644
--- a/web/src/layout/common/ExternalLink.tsx
+++ b/web/src/layout/common/ExternalLink.tsx
@@ -29,7 +29,7 @@ const ExternalLink = (props: Props) => {
         {!isUndefined(props.visibleExternalIcon) && props.visibleExternalIcon ? (
           <div class="d-flex flex-row align-items-center">
             {props.children}
-            <SVGIcon kind={SVGIconKind.ExternalLink} class={`ms-2 icon ${props.externalIconClassName}`} />
+            <SVGIcon kind={SVGIconKind.ExternalLink} class={`ms-1 icon ${props.externalIconClassName}`} />
           </div>
         ) : (
           <>{props.children}</>
diff --git a/web/src/layout/common/itemModal/RepositoriesSection.module.css b/web/src/layout/common/itemModal/RepositoriesSection.module.css
index 57db4cea..61083ac9 100644
--- a/web/src/layout/common/itemModal/RepositoriesSection.module.css
+++ b/web/src/layout/common/itemModal/RepositoriesSection.module.css
@@ -54,3 +54,11 @@
 .linkContentWrapper {
   max-width: calc(100% - 1.5rem);
 }
+
+.goodFirstBadge img {
+  margin-top: -3px;
+}
+
+.badges {
+  row-gap: 0.5rem;
+}
diff --git a/web/src/layout/common/itemModal/RepositoriesSection.tsx b/web/src/layout/common/itemModal/RepositoriesSection.tsx
index f9d04c53..5ebb13c3 100644
--- a/web/src/layout/common/itemModal/RepositoriesSection.tsx
+++ b/web/src/layout/common/itemModal/RepositoriesSection.tsx
@@ -56,7 +56,7 @@ const RepositoryInfo = (props: RepoProps) => {
             </div>
           </ExternalLink>
           <Show when={props.repository.primary || !isUndefined(props.repository.github_data)}>
-            <div class="d-flex align-items-center mt-2 mt-md-0">
+            <div class={`d-flex align-items-center flex-wrap flex-md-nowrap mt-2 mt-md-0 ${styles.badges}`}>
               <Show when={props.repository.primary}>
                 <div
                   class={`me-2 badge border rounded-0 text-uppercase ${styles.badgeOutlineDark} ${styles.miniBadge}`}
@@ -65,10 +65,20 @@ const RepositoryInfo = (props: RepoProps) => {
                 </div>
               </Show>
               <Show when={!isUndefined(props.repository.github_data)}>
-                <div class={`badge border rounded-0 ${styles.badgeOutlineDark} ${styles.miniBadge}`}>
+                <div class={`badge border rounded-0 me-2 ${styles.badgeOutlineDark} ${styles.miniBadge}`}>
                   {props.repository.github_data!.license}
                 </div>
               </Show>
+              <div class="d-none d-md-flex">
+                <ExternalLink
+                  class={styles.goodFirstBadge}
+                  href={`https://github.com/${formatRepoUrl(props.repository.url)}/issues?q=is%3Aopen+is%3Aissue+label%3A"good+first+issue"`}
+                >
+                  <img
+                    src={`https://img.shields.io/github/issues/${formatRepoUrl(props.repository.url)}/good%20first%20issue.svg?style=flat-square`}
+                  />
+                </ExternalLink>
+              </div>
             </div>
           </Show>
         </div>

From bf9153c81fb465b8eea6b3eff9d21da7a38725e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cintia=20S=C3=A1nchez=20Garc=C3=ADa?= <cynthiasg@icloud.com>
Date: Mon, 22 Apr 2024 13:43:09 +0200
Subject: [PATCH 22/55] Add not open source filter (#583)

Signed-off-by: Cintia Sanchez Garcia <cynthiasg@icloud.com>
---
 web/src/data.ts                               |  19 +-
 web/src/layout/common/ActiveFiltersList.tsx   | 252 +++++++++++-------
 web/src/layout/common/Section.tsx             |  15 +-
 .../itemModal/RepositoriesSection.module.css  |   7 +-
 .../common/itemModal/RepositoriesSection.tsx  |   4 +-
 .../layout/explore/filters/Filters.module.css |   5 +
 .../explore/filters/SearchbarSection.tsx      |  38 ++-
 web/src/layout/explore/filters/index.tsx      |  34 ++-
 web/src/layout/explore/index.tsx              |  53 ++--
 web/src/utils/filterData.ts                   |  28 +-
 web/src/utils/formatLabelProfit.ts            |   3 +-
 web/src/utils/itemsDataGetter.ts              |  27 ++
 12 files changed, 312 insertions(+), 173 deletions(-)

diff --git a/web/src/data.ts b/web/src/data.ts
index 372edd97..0ce9a80a 100644
--- a/web/src/data.ts
+++ b/web/src/data.ts
@@ -126,7 +126,22 @@ export const FILTERS: FilterSection[] = [
       },
       {
         value: `non-${getFoundationNameLabel()}`,
-        name: `Non ${FOUNDATION} Projects`,
+        name: `Not ${FOUNDATION} Projects`,
+      },
+    ],
+  },
+  {
+    value: FilterCategory.License,
+    title: 'License',
+    options: [
+      {
+        value: 'non-oss',
+        name: 'Not Open Source',
+      },
+      {
+        value: 'oss',
+        name: 'Open Source',
+        suboptions: [],
       },
     ],
   },
@@ -140,7 +155,7 @@ export const FILTERS: FilterSection[] = [
       },
       {
         value: 'non_profit',
-        name: 'Non profit',
+        name: 'Not profit',
       },
     ],
   },
diff --git a/web/src/layout/common/ActiveFiltersList.tsx b/web/src/layout/common/ActiveFiltersList.tsx
index b19e6ef9..16614996 100644
--- a/web/src/layout/common/ActiveFiltersList.tsx
+++ b/web/src/layout/common/ActiveFiltersList.tsx
@@ -1,7 +1,7 @@
 import isEmpty from 'lodash/isEmpty';
 import isUndefined from 'lodash/isUndefined';
 import startCase from 'lodash/startCase';
-import { For, Match, Show, Switch } from 'solid-js';
+import { batch, createEffect, createSignal, For, Match, on, Show, Switch } from 'solid-js';
 
 import { REGEX_UNDERSCORE } from '../../data';
 import { ActiveFilters, FilterCategory, SVGIconKind } from '../../types';
@@ -14,17 +14,30 @@ import SVGIcon from './SVGIcon';
 interface Props {
   activeFilters: ActiveFilters;
   maturityOptions?: string[];
+  licenseOptions?: string[];
   resetFilters: () => void;
-  resetFilter?: (name: FilterCategory) => void;
   removeFilter: (name: FilterCategory, value: string) => void;
 }
 
 const ActiveFiltersList = (props: Props) => {
-  const activeFilters = () => props.activeFilters;
+  const initialActiveFilters = () => props.activeFilters;
+  const [activeFilters, setActiveFilters] = createSignal<ActiveFilters>({});
+  const [activeFiltersKeys, setActiveFiltersKeys] = createSignal<FilterCategory[]>([]);
+  const licenseOptions = () => props.licenseOptions;
 
-  const onResetFilters = () => {
-    props.resetFilters();
-  };
+  createEffect(
+    on(initialActiveFilters, () => {
+      const keys: FilterCategory[] = [];
+      Object.keys(initialActiveFilters()).forEach((key) => {
+        if (!isEmpty(initialActiveFilters()[key as FilterCategory])) keys.push(key as FilterCategory);
+      });
+
+      batch(() => {
+        setActiveFilters(initialActiveFilters());
+        setActiveFiltersKeys(keys);
+      });
+    })
+  );
 
   return (
     <Show when={Object.keys(activeFilters()).length > 0}>
@@ -33,13 +46,16 @@ const ActiveFiltersList = (props: Props) => {
           class={`d-flex flex-row align-items-center text-nowrap text-muted text-uppercase me-3 mt-2 ${styles.btnLegend}`}
         >
           <small>Filters applied</small>
-          <button class={`btn btn-link btn-sm text-muted p-0 ps-1 ${styles.btnReset}`} onClick={onResetFilters}>
+          <button
+            class={`btn btn-link btn-sm text-muted p-0 ps-1 ${styles.btnReset}`}
+            onClick={() => props.resetFilters()}
+          >
             (reset all)
           </button>
           <small>:</small>
         </div>
         <div class="d-flex flex-row flex-wrap">
-          <For each={Object.keys(activeFilters())}>
+          <For each={activeFiltersKeys()}>
             {(f: string) => {
               const activeFiltersPerCategory = () => activeFilters()[f as FilterCategory];
               if (isUndefined(activeFiltersPerCategory()) || isEmpty(activeFiltersPerCategory())) return null;
@@ -48,107 +64,147 @@ const ActiveFiltersList = (props: Props) => {
                 !isUndefined(props.maturityOptions) &&
                 f === FilterCategory.Maturity &&
                 props.maturityOptions.every((element) => activeFiltersPerCategory()!.includes(element));
+
+              const allLicensesSelected = () =>
+                !isUndefined(licenseOptions()) &&
+                licenseOptions()!.length > 0 &&
+                f === FilterCategory.License &&
+                licenseOptions()!.every((element) => activeFiltersPerCategory()!.includes(element));
+
               const foundationLabel = getFoundationNameLabel();
 
               return (
-                <Switch>
-                  <Match when={allMaturitySelected()}>
-                    <span
-                      role="listitem"
-                      class={`badge badge-sm border rounded-0 me-3 my-1 d-flex flex-row align-items-center ${styles.filterBadge}`}
-                    >
-                      <div class="d-flex flex-row align-items-baseline">
-                        <div>
-                          <small class="text-uppercase fw-normal me-2">{f}:</small>
-                          <span class="text-uppercase">{foundationLabel}</span>
+                <>
+                  <Switch>
+                    <Match when={allMaturitySelected()}>
+                      <span
+                        role="listitem"
+                        class={`badge badge-sm border rounded-0 me-3 my-1 d-flex flex-row align-items-center ${styles.filterBadge}`}
+                      >
+                        <div class="d-flex flex-row align-items-baseline">
+                          <div>
+                            <small class="text-uppercase fw-normal me-2">{f}:</small>
+                            <span class="text-uppercase">{foundationLabel}</span>
+                          </div>
+                          <button
+                            class="btn btn-link btn-sm text-reset lh-1 p-0 ps-2"
+                            onClick={() => props.removeFilter(f as FilterCategory, foundationLabel)}
+                            aria-label={`Remove ${foundationLabel} filter`}
+                            title={`Remove ${foundationLabel} filter`}
+                          >
+                            <SVGIcon kind={SVGIconKind.ClearCircle} />
+                          </button>
                         </div>
-                        <button
-                          class="btn btn-link btn-sm text-reset lh-1 p-0 ps-2"
-                          onClick={() =>
-                            !isUndefined(props.resetFilter) ? props.resetFilter(f as FilterCategory) : null
-                          }
-                          aria-label={`Remove ${foundationLabel} filter`}
-                          title={`Remove ${foundationLabel} filter`}
-                        >
-                          <SVGIcon kind={SVGIconKind.ClearCircle} />
-                        </button>
-                      </div>
-                    </span>
-                  </Match>
+                      </span>
+                    </Match>
 
-                  <Match when={f === FilterCategory.Extra}>
-                    <For each={activeFiltersPerCategory()}>
-                      {(c: string) => {
-                        return (
-                          <span
-                            role="listitem"
-                            class={`badge badge-sm border rounded-0 me-3 my-1 d-flex flex-row align-items-center ${styles.filterBadge}`}
+                    <Match when={allLicensesSelected()}>
+                      <span
+                        role="listitem"
+                        class={`badge badge-sm border rounded-0 me-3 my-1 d-flex flex-row align-items-center ${styles.filterBadge}`}
+                      >
+                        <div class="d-flex flex-row align-items-baseline">
+                          <div>
+                            <small class="text-uppercase fw-normal me-2">{f}:</small>
+                            <span class="text-uppercase">Open Source</span>
+                          </div>
+                          <button
+                            class="btn btn-link btn-sm text-reset lh-1 p-0 ps-2"
+                            onClick={() => props.removeFilter(f as FilterCategory, 'oss')}
+                            aria-label={`Remove open source filter`}
+                            title={`Remove open source filter`}
                           >
-                            <div class="d-flex flex-row align-items-baseline">
-                              <div>
-                                <span class="text-uppercase">{c}</span>
-                              </div>
-                              <button
-                                class="btn btn-link btn-sm text-reset lh-1 p-0 ps-2"
-                                onClick={() => props.removeFilter(f as FilterCategory, c)}
-                                aria-label={`Remove ${c} filter`}
-                                title={`Remove ${c} filter`}
-                              >
-                                <SVGIcon kind={SVGIconKind.ClearCircle} />
-                              </button>
-                            </div>
-                          </span>
-                        );
-                      }}
-                    </For>
-                  </Match>
+                            <SVGIcon kind={SVGIconKind.ClearCircle} />
+                          </button>
+                        </div>
+                      </span>
+                    </Match>
 
-                  <Match when={!allMaturitySelected()}>
-                    <For each={activeFiltersPerCategory()}>
-                      {(c: string) => {
-                        return (
-                          <span
-                            role="listitem"
-                            class={`badge badge-sm border rounded-0 me-3 my-1 d-flex flex-row align-items-center ${styles.filterBadge}`}
-                          >
-                            <div class="d-flex flex-row align-items-baseline">
-                              <div>
-                                <small class="text-uppercase fw-normal me-2">{f}:</small>
-                                <span
-                                  class={
-                                    [FilterCategory.Maturity, FilterCategory.OrgType].includes(f as FilterCategory)
-                                      ? 'text-uppercase'
-                                      : ''
-                                  }
+                    <Match when={f === FilterCategory.Extra}>
+                      <For each={activeFiltersPerCategory()}>
+                        {(c: string) => {
+                          return (
+                            <span
+                              role="listitem"
+                              class={`badge badge-sm border rounded-0 me-3 my-1 d-flex flex-row align-items-center ${styles.filterBadge}`}
+                            >
+                              <div class="d-flex flex-row align-items-baseline">
+                                <div>
+                                  <span class="text-uppercase">{c}</span>
+                                </div>
+                                <button
+                                  class="btn btn-link btn-sm text-reset lh-1 p-0 ps-2"
+                                  onClick={() => props.removeFilter(f as FilterCategory, c)}
+                                  aria-label={`Remove ${c} filter`}
+                                  title={`Remove ${c} filter`}
                                 >
-                                  <Switch fallback={<>{c}</>}>
-                                    <Match when={f === FilterCategory.OrgType}>
-                                      <>{formatProfitLabel(c)}</>
-                                    </Match>
-                                    <Match when={f === FilterCategory.TAG}>
-                                      <span class="text-uppercase">{formatTAGName(c)}</span>
-                                    </Match>
-                                    <Match when={f === FilterCategory.InvestmentType}>
-                                      <>{startCase(c.replace(REGEX_UNDERSCORE, ' '))}</>
-                                    </Match>
-                                  </Switch>
-                                </span>
+                                  <SVGIcon kind={SVGIconKind.ClearCircle} />
+                                </button>
                               </div>
-                              <button
-                                class="btn btn-link btn-sm text-reset lh-1 p-0 ps-2"
-                                onClick={() => props.removeFilter(f as FilterCategory, c)}
-                                aria-label={`Remove ${c} filter`}
-                                title={`Remove ${c} filter`}
+                            </span>
+                          );
+                        }}
+                      </For>
+                    </Match>
+                  </Switch>
+                  <For each={activeFiltersPerCategory()}>
+                    {(c: string) => {
+                      if (
+                        (allMaturitySelected() && c !== `non-${getFoundationNameLabel()}`) ||
+                        (allLicensesSelected() && c !== 'non-oss')
+                      )
+                        return null;
+
+                      return (
+                        <span
+                          role="listitem"
+                          class={`badge badge-sm border rounded-0 me-3 my-1 d-flex flex-row align-items-center ${styles.filterBadge}`}
+                        >
+                          <div class="d-flex flex-row align-items-baseline">
+                            <div>
+                              <small class="text-uppercase fw-normal me-2">{f}:</small>
+                              <span
+                                class={
+                                  [FilterCategory.Maturity, FilterCategory.OrgType].includes(f as FilterCategory)
+                                    ? 'text-uppercase'
+                                    : ''
+                                }
                               >
-                                <SVGIcon kind={SVGIconKind.ClearCircle} />
-                              </button>
+                                <Switch fallback={<>{c}</>}>
+                                  <Match when={f === FilterCategory.OrgType}>
+                                    <>{formatProfitLabel(c)}</>
+                                  </Match>
+                                  <Match when={f === FilterCategory.TAG}>
+                                    <span class="text-uppercase">{formatTAGName(c)}</span>
+                                  </Match>
+                                  <Match when={f === FilterCategory.InvestmentType}>
+                                    <>{startCase(c.replace(REGEX_UNDERSCORE, ' '))}</>
+                                  </Match>
+                                  <Match when={f === FilterCategory.License && c === 'non-oss'}>
+                                    <span class="text-uppercase">Not open source</span>
+                                  </Match>
+                                  <Match
+                                    when={f === FilterCategory.Maturity && c === `non-${getFoundationNameLabel()}`}
+                                  >
+                                    <span class="text-uppercase">Not {getFoundationNameLabel()} project</span>
+                                  </Match>
+                                </Switch>
+                              </span>
                             </div>
-                          </span>
-                        );
-                      }}
-                    </For>
-                  </Match>
-                </Switch>
+                            <button
+                              class="btn btn-link btn-sm text-reset lh-1 p-0 ps-2"
+                              onClick={() => props.removeFilter(f as FilterCategory, c)}
+                              aria-label={`Remove ${c} filter`}
+                              title={`Remove ${c} filter`}
+                            >
+                              <SVGIcon kind={SVGIconKind.ClearCircle} />
+                            </button>
+                          </div>
+                        </span>
+                      );
+                    }}
+                  </For>
+                </>
               );
             }}
           </For>
diff --git a/web/src/layout/common/Section.tsx b/web/src/layout/common/Section.tsx
index 7f90601d..5aac6f88 100644
--- a/web/src/layout/common/Section.tsx
+++ b/web/src/layout/common/Section.tsx
@@ -3,13 +3,12 @@ import isUndefined from 'lodash/isUndefined';
 import { For, Show } from 'solid-js';
 
 import { FilterCategory, FilterOption, FilterSection } from '../../types';
-import getFoundationNameLabel from '../../utils/getFoundationNameLabel';
 import CheckBox from './Checkbox';
 import styles from './Section.module.css';
 
 interface Props {
   section?: FilterSection;
-  extraMaturity?: FilterSection;
+  extraOptions?: { [key: string]: FilterSection | undefined };
   activeFilters?: string[];
   colClass?: string;
   title?: string;
@@ -45,7 +44,7 @@ const Section = (props: Props) => {
     if (isUndefined(props.section)) {
       return false;
     }
-    if (props.section.value === FilterCategory.Maturity && isUndefined(props.extraMaturity)) {
+    if (props.section.value === FilterCategory.Maturity && isUndefined(props.extraOptions)) {
       return false;
     }
     return true;
@@ -56,13 +55,9 @@ const Section = (props: Props) => {
       {(opt: FilterOption) => {
         let subOpts: string[] | undefined;
         let suboptions = opt.suboptions;
-        if (
-          opt.value === getFoundationNameLabel() &&
-          props.section?.value === FilterCategory.Maturity &&
-          !isUndefined(props.extraMaturity)
-        ) {
-          suboptions = props.extraMaturity.options;
-          subOpts = props.extraMaturity.options.map((subOpt: FilterOption) => subOpt.value);
+        if (!isUndefined(props.extraOptions) && !isUndefined(props.extraOptions[opt.value])) {
+          suboptions = props.extraOptions[opt.value]!.options;
+          subOpts = props.extraOptions[opt.value]!.options.map((subOpt: FilterOption) => subOpt.value);
         } else if (opt.suboptions) {
           subOpts = opt.suboptions.map((subOpt: FilterOption) => subOpt.value);
         }
diff --git a/web/src/layout/common/itemModal/RepositoriesSection.module.css b/web/src/layout/common/itemModal/RepositoriesSection.module.css
index 61083ac9..d3fbfc6f 100644
--- a/web/src/layout/common/itemModal/RepositoriesSection.module.css
+++ b/web/src/layout/common/itemModal/RepositoriesSection.module.css
@@ -55,8 +55,13 @@
   max-width: calc(100% - 1.5rem);
 }
 
+.goodFirstBadge {
+  height: 19px;
+}
+
 .goodFirstBadge img {
-  margin-top: -3px;
+  border: 1px solid var(--bs-gray-700);
+  max-height: 100%;
 }
 
 .badges {
diff --git a/web/src/layout/common/itemModal/RepositoriesSection.tsx b/web/src/layout/common/itemModal/RepositoriesSection.tsx
index 5ebb13c3..8207ef89 100644
--- a/web/src/layout/common/itemModal/RepositoriesSection.tsx
+++ b/web/src/layout/common/itemModal/RepositoriesSection.tsx
@@ -71,11 +71,11 @@ const RepositoryInfo = (props: RepoProps) => {
               </Show>
               <div class="d-none d-md-flex">
                 <ExternalLink
-                  class={styles.goodFirstBadge}
+                  class={`d-flex ${styles.goodFirstBadge}`}
                   href={`https://github.com/${formatRepoUrl(props.repository.url)}/issues?q=is%3Aopen+is%3Aissue+label%3A"good+first+issue"`}
                 >
                   <img
-                    src={`https://img.shields.io/github/issues/${formatRepoUrl(props.repository.url)}/good%20first%20issue.svg?style=flat-square`}
+                    src={`https://img.shields.io/github/issues/${formatRepoUrl(props.repository.url)}/good%20first%20issue.svg?style=flat-square&label=good%20first%20issues&labelColor=ffffff&color=6c757d`}
                   />
                 </ExternalLink>
               </div>
diff --git a/web/src/layout/explore/filters/Filters.module.css b/web/src/layout/explore/filters/Filters.module.css
index f355d8be..e49e0b4c 100644
--- a/web/src/layout/explore/filters/Filters.module.css
+++ b/web/src/layout/explore/filters/Filters.module.css
@@ -41,6 +41,11 @@
   color: var(--color4);
 }
 
+.section {
+  max-height: 235px;
+  overscroll-behavior: contain;
+}
+
 @media (max-width: 1199.98px) {
   .modal {
     width: 90%;
diff --git a/web/src/layout/explore/filters/SearchbarSection.tsx b/web/src/layout/explore/filters/SearchbarSection.tsx
index 09a63a02..3c164362 100644
--- a/web/src/layout/explore/filters/SearchbarSection.tsx
+++ b/web/src/layout/explore/filters/SearchbarSection.tsx
@@ -12,6 +12,7 @@ export interface Props {
   title?: string;
   placeholder?: string;
   section?: FilterSection;
+  extraOptions?: { [key: string]: FilterSection };
   initialActiveFilters: Accessor<ActiveFilters>;
   updateActiveFilters: (value: FilterCategory, options: string[]) => void;
   resetFilter: (value: FilterCategory) => void;
@@ -200,15 +201,34 @@ const SearchbarSection = (props: Props) => {
                   <For each={visibleOptions()}>
                     {(opt: FilterOption) => {
                       return (
-                        <CheckBox
-                          name={props.section?.value as string}
-                          value={opt.value}
-                          labelClass={`mw-100 text-muted ${styles.label}`}
-                          class="my-1"
-                          label={opt.name}
-                          checked={activeFilters().includes(opt.value)}
-                          onChange={(value: string, checked: boolean) => onChange(value, checked)}
-                        />
+                        <>
+                          <CheckBox
+                            name={props.section?.value as string}
+                            value={opt.value}
+                            labelClass={`mw-100 text-muted ${styles.label}`}
+                            class="my-1"
+                            label={opt.name}
+                            checked={activeFilters().includes(opt.value)}
+                            onChange={(value: string, checked: boolean) => onChange(value, checked)}
+                          />
+                          <Show when={!isUndefined(props.extraOptions) && props.extraOptions[opt.value]}>
+                            <div class="ms-3">
+                              <For each={props.extraOptions![opt.value].options}>
+                                {(subOpt: FilterOption) => (
+                                  <CheckBox
+                                    name={props.extraOptions![opt.value].value}
+                                    value={subOpt.value}
+                                    labelClass={`mw-100 text-muted ${styles.label}`}
+                                    class="my-1"
+                                    label={subOpt.name}
+                                    checked={activeFilters().includes(subOpt.value)}
+                                    onChange={(value: string, checked: boolean) => onChange(value, checked)}
+                                  />
+                                )}
+                              </For>
+                            </div>
+                          </Show>
+                        </>
                       );
                     }}
                   </For>
diff --git a/web/src/layout/explore/filters/index.tsx b/web/src/layout/explore/filters/index.tsx
index c895dda7..8f154668 100644
--- a/web/src/layout/explore/filters/index.tsx
+++ b/web/src/layout/explore/filters/index.tsx
@@ -67,6 +67,9 @@ const Filters = (props: Props) => {
         if (filter === FilterCategory.Maturity) {
           opts.push(`non-${getFoundationNameLabel()}`);
         }
+        if (filter === FilterCategory.License) {
+          opts.push('non-oss');
+        }
         cleanFilters[filter] = intersection(opts, props.initialActiveFilters()[filter]);
       }
     });
@@ -305,11 +308,11 @@ const Filters = (props: Props) => {
                 <Section
                   title="Status"
                   section={getSectionInPredefinedFilters(FilterCategory.Maturity)}
-                  extraMaturity={getSection(FilterCategory.Maturity)}
+                  extraOptions={{ [getFoundationNameLabel()]: getSection(FilterCategory.Maturity) }}
                   activeFilters={{ ...tmpActiveFilters() }[FilterCategory.Maturity]}
                   updateActiveFilters={updateActiveFilters}
                   resetFilter={resetFilter}
-                  sectionClass={styles.section}
+                  sectionClass={`overflow-auto visibleScroll ${styles.section}`}
                 />
                 <Section
                   title="TAG"
@@ -317,23 +320,26 @@ const Filters = (props: Props) => {
                   activeFilters={{ ...tmpActiveFilters() }[FilterCategory.TAG]}
                   updateActiveFilters={updateActiveFilters}
                   resetFilter={resetFilter}
-                  sectionClass={styles.section}
-                />
-                <SearchbarSection
-                  title="License"
-                  placeholder="Search license"
-                  section={getSection(FilterCategory.License)}
-                  initialActiveFilters={tmpActiveFilters}
-                  updateActiveFilters={updateActiveFilters}
-                  resetFilter={resetFilter}
+                  sectionClass={`overflow-auto visibleScroll ${styles.section}`}
                 />
+                <Show when={!isUndefined(getSection(FilterCategory.License))}>
+                  <Section
+                    title="License"
+                    section={getSectionInPredefinedFilters(FilterCategory.License)}
+                    extraOptions={{ oss: getSection(FilterCategory.License)! }}
+                    activeFilters={{ ...tmpActiveFilters() }[FilterCategory.License]}
+                    updateActiveFilters={updateActiveFilters}
+                    resetFilter={resetFilter}
+                    sectionClass={`overflow-auto visibleScroll ${styles.section}`}
+                  />
+                </Show>
                 <Section
                   title="Category"
                   section={getSection(FilterCategory.Category)}
                   activeFilters={{ ...tmpActiveFilters() }[FilterCategory.Category]}
                   updateActiveFilters={updateActiveFilters}
                   resetFilter={resetFilter}
-                  sectionClass={styles.section}
+                  sectionClass={`overflow-auto visibleScroll ${styles.section}`}
                 />
                 <Section
                   title="Extra"
@@ -341,7 +347,7 @@ const Filters = (props: Props) => {
                   activeFilters={{ ...tmpActiveFilters() }[FilterCategory.Extra]}
                   updateActiveFilters={updateActiveFilters}
                   resetFilter={resetFilter}
-                  sectionClass={styles.section}
+                  sectionClass={`overflow-auto visibleScroll ${styles.section}`}
                 />
               </div>
             </Show>
@@ -373,7 +379,7 @@ const Filters = (props: Props) => {
                   activeFilters={{ ...tmpActiveFilters() }[FilterCategory.OrgType]}
                   updateActiveFilters={updateActiveFilters}
                   resetFilter={resetFilter}
-                  sectionClass={styles.section}
+                  sectionClass={`overflow-auto visibleScroll ${styles.section}`}
                 />
 
                 <SearchbarSection
diff --git a/web/src/layout/explore/index.tsx b/web/src/layout/explore/index.tsx
index 8c64854e..68043170 100644
--- a/web/src/layout/explore/index.tsx
+++ b/web/src/layout/explore/index.tsx
@@ -1,10 +1,8 @@
 import { useLocation, useNavigate, useSearchParams } from '@solidjs/router';
-import compact from 'lodash/compact';
+import difference from 'lodash/difference';
 import isEmpty from 'lodash/isEmpty';
-import isEqual from 'lodash/isEqual';
 import isUndefined from 'lodash/isUndefined';
 import throttle from 'lodash/throttle';
-import uniq from 'lodash/uniq';
 import { batch, createEffect, createSignal, For, Match, on, onCleanup, onMount, Show, Switch } from 'solid-js';
 
 import {
@@ -115,6 +113,7 @@ const Explore = (props: Props) => {
   const [classifyOptions, setClassifyOptions] = createSignal<ClassifyOption[]>(Object.values(ClassifyOption));
   const [sortOptions, setSortOptions] = createSignal<SortOption[]>(Object.values(SortOption));
   const [numItems, setNumItems] = createSignal<{ [key: string]: number }>({});
+  const [licenseOptions, setLicenseOptions] = createSignal<string[]>([]);
 
   const checkIfFullDataRequired = (): boolean => {
     if (viewMode() === ViewMode.Card) {
@@ -135,17 +134,12 @@ const Explore = (props: Props) => {
     }
   };
 
-  const getMaturityOptions = () => {
-    const maturity = props.initialData.items.map((i: Item) => i.maturity);
-    return uniq(compact(maturity)) || [];
-  };
-
   const checkVisibleItemsNumber = (numItemsPerGroup: { [key: string]: number }) => {
     setNumItems(numItemsPerGroup);
     setNumVisibleItems(numItemsPerGroup[selectedGroup() || ALL_OPTION]);
   };
 
-  const maturityOptions = getMaturityOptions();
+  const maturityOptions = itemsDataGetter.getMaturityOptions();
 
   const getActiveFiltersFromUrl = (): ActiveFilters => {
     const currentFilters: ActiveFilters = {};
@@ -156,6 +150,8 @@ const Explore = (props: Props) => {
       if (Object.values(FilterCategory).includes(f)) {
         if (f === FilterCategory.Maturity && value === getFoundationNameLabel()) {
           currentFilters[f] = maturityOptions;
+        } else if (f === FilterCategory.License && value === 'oss') {
+          currentFilters[f] = licenseOptions();
         } else {
           if (currentFilters[f]) {
             currentFilters[f] = [...currentFilters[f]!, value];
@@ -231,15 +227,15 @@ const Explore = (props: Props) => {
 
     // Reset classify and sort when view mode or group changes
     if ([VIEW_MODE_PARAM, GROUP_PARAM].includes(param)) {
-      // Remove all filters from current searchparams
-      Object.values(FilterCategory).forEach((f: string) => {
-        updatedSearchParams.delete(f);
-      });
-      EXTRA_FILTERS.forEach((f: string) => {
-        updatedSearchParams.delete(f);
-      });
-
       if (param === GROUP_PARAM) {
+        // Remove all filters from current searchparams
+        Object.values(FilterCategory).forEach((f: string) => {
+          updatedSearchParams.delete(f);
+        });
+        EXTRA_FILTERS.forEach((f: string) => {
+          updatedSearchParams.delete(f);
+        });
+
         setActiveFilters({});
       }
 
@@ -313,6 +309,11 @@ const Explore = (props: Props) => {
           maturityOptions.every((element) => f![filterId as FilterCategory]!.includes(element))
         ) {
           return params.append(filterId as string, foundation);
+        } else if (
+          filterId === FilterCategory.License &&
+          licenseOptions().every((element) => f![filterId as FilterCategory]!.includes(element))
+        ) {
+          return params.append(filterId, 'oss');
         } else {
           return f![filterId as FilterCategory]!.forEach((id: string) => {
             if (id.toString() !== foundation) {
@@ -374,6 +375,8 @@ const Explore = (props: Props) => {
       setClassifyAndSortOptions(options);
       setClassifyOptions(options[selectedGroup() || ALL_OPTION].classify);
       setSortOptions(options[selectedGroup() || ALL_OPTION].sort);
+      setLicenseOptions(itemsDataGetter.getLicenseOptionsPerGroup(selectedGroup() || ALL_OPTION));
+
       // Full data is only applied when card view is active or filters are not empty to avoid re-render grid
       // After this when filters are applied or view mode changes, we use fullData if available
       if (viewMode() === ViewMode.Card || checkIfFullDataRequired()) {
@@ -383,6 +386,7 @@ const Explore = (props: Props) => {
           setGroupsData(data.grid);
           setCardData(data.card);
           setCardMenu(data.menu);
+          setActiveFilters(getActiveFiltersFromUrl());
 
           setFullDataApplied(true);
           setReadyData(true);
@@ -413,6 +417,7 @@ const Explore = (props: Props) => {
     on(selectedGroup, () => {
       if (groupsData()) {
         setNumVisibleItems(numItems()[selectedGroup() || ALL_OPTION]);
+        setLicenseOptions(itemsDataGetter.getLicenseOptionsPerGroup(selectedGroup() || ALL_OPTION));
       }
     })
   );
@@ -455,10 +460,10 @@ const Explore = (props: Props) => {
 
   const removeFilter = (name: FilterCategory, value: string) => {
     let tmpActiveFilters: string[] = ({ ...activeFilters() }[name] || []).filter((f: string) => f !== value);
-    if (name === FilterCategory.Maturity) {
-      if (isEqual(tmpActiveFilters, [window.baseDS.foundation.toLowerCase()])) {
-        tmpActiveFilters = [];
-      }
+    if (name === FilterCategory.Maturity && value === getFoundationNameLabel()) {
+      tmpActiveFilters = difference(tmpActiveFilters, maturityOptions);
+    } else if (name === FilterCategory.License && value === 'oss') {
+      tmpActiveFilters = difference(tmpActiveFilters, licenseOptions());
     }
     updateActiveFilters(name, tmpActiveFilters);
   };
@@ -477,10 +482,6 @@ const Explore = (props: Props) => {
     applyFilters({});
   };
 
-  const resetFilter = (name: FilterCategory) => {
-    updateActiveFilters(name, []);
-  };
-
   const applyFilters = (newFilters: ActiveFilters) => {
     setVisibleLoading(true);
 
@@ -871,7 +872,7 @@ const Explore = (props: Props) => {
           <ActiveFiltersList
             activeFilters={activeFilters()}
             maturityOptions={maturityOptions}
-            resetFilter={resetFilter}
+            licenseOptions={licenseOptions()}
             resetFilters={resetFilters}
             removeFilter={removeFilter}
           />
diff --git a/web/src/utils/filterData.ts b/web/src/utils/filterData.ts
index c5f9069c..cc468e1e 100644
--- a/web/src/utils/filterData.ts
+++ b/web/src/utils/filterData.ts
@@ -56,17 +56,23 @@ const filterData = (items: Item[], activeFilters: ActiveFilters): Item[] => {
 
       // License License
       if (activeFilters[FilterCategory.License]) {
-        if (isUndefined(item.repositories)) {
+        if (isUndefined(item.oss) && !activeFilters[FilterCategory.License].includes('non-oss')) {
           return false;
         } else {
-          const licenses: string[] = [];
-          item.repositories.forEach((repo: Repository) => {
-            if (repo.github_data && repo.github_data.license) {
-              licenses.push(repo.github_data.license);
+          if (!isUndefined(item.oss)) {
+            if (isUndefined(item.repositories)) {
+              return false;
+            } else {
+              const licenses: string[] = [];
+              item.repositories.forEach((repo: Repository) => {
+                if (repo.github_data && repo.github_data.license) {
+                  licenses.push(repo.github_data.license);
+                }
+              });
+              if (!licenses.some((l: string) => activeFilters[FilterCategory.License]?.includes(l))) {
+                return false;
+              }
             }
-          });
-          if (!licenses.some((l: string) => activeFilters[FilterCategory.License]?.includes(l))) {
-            return false;
           }
         }
       }
@@ -97,8 +103,10 @@ const filterData = (items: Item[], activeFilters: ActiveFilters): Item[] => {
         ) {
           return false;
         } else {
-          if (!isUndefined(item.maturity) && !activeFilters[FilterCategory.Maturity].includes(item.maturity)) {
-            return false;
+          if (!isUndefined(item.maturity)) {
+            if (!activeFilters[FilterCategory.Maturity].includes(item.maturity)) {
+              return false;
+            }
           }
         }
       }
diff --git a/web/src/utils/formatLabelProfit.ts b/web/src/utils/formatLabelProfit.ts
index 75dcb481..78c40c12 100644
--- a/web/src/utils/formatLabelProfit.ts
+++ b/web/src/utils/formatLabelProfit.ts
@@ -1,7 +1,8 @@
 import { REGEX_UNDERSCORE } from '../data';
+const REGEX_NON = /non/g;
 
 const formatProfitLabel = (text: string): string => {
-  return text.replace(REGEX_UNDERSCORE, ' ');
+  return text.replace(REGEX_UNDERSCORE, ' ').replace(REGEX_NON, 'not');
 };
 
 export default formatProfitLabel;
diff --git a/web/src/utils/itemsDataGetter.ts b/web/src/utils/itemsDataGetter.ts
index 13291973..c12121ca 100644
--- a/web/src/utils/itemsDataGetter.ts
+++ b/web/src/utils/itemsDataGetter.ts
@@ -1,9 +1,11 @@
+import compact from 'lodash/compact';
 import groupBy from 'lodash/groupBy';
 import intersection from 'lodash/intersection';
 import isEmpty from 'lodash/isEmpty';
 import isEqual from 'lodash/isEqual';
 import isUndefined from 'lodash/isUndefined';
 import some from 'lodash/some';
+import uniq from 'lodash/uniq';
 import uniqWith from 'lodash/uniqWith';
 
 import { ALL_OPTION, DEFAULT_CLASSIFY } from '../data';
@@ -509,6 +511,31 @@ export class ItemsDataGetter {
     }
   }
 
+  // Get maturity options
+  public getMaturityOptions(): string[] {
+    const maturity = window.baseDS.items.map((i: Item) => i.maturity);
+    return uniq(compact(maturity)) || [];
+  }
+
+  // Get license options
+  public getLicenseOptionsPerGroup(group: string): string[] {
+    if (this.ready && this.landscapeData && this.landscapeData.items) {
+      const allGroupedItems = this.getGroupedData();
+      const options: string[] = [];
+      allGroupedItems[group].forEach((i: Item) => {
+        if (i.repositories) {
+          i.repositories.forEach((r: Repository) => {
+            if (r.github_data) {
+              options.push(r.github_data!.license);
+            }
+          });
+        }
+      });
+      return uniq(compact(options));
+    }
+    return [];
+  }
+
   // Prepare logos options
   public prepareLogosOptions(): LogosOptionsGroup[] {
     const options: LogosOptionsGroup[] = [];

From f43f8901fdc0c0f5d1972133657ea9abaf2253d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cintia=20S=C3=A1nchez=20Garc=C3=ADa?= <cynthiasg@icloud.com>
Date: Mon, 22 Apr 2024 15:34:55 +0200
Subject: [PATCH 23/55] Remove open issues label border (#584)

Signed-off-by: Cintia Sanchez Garcia <cynthiasg@icloud.com>
---
 web/src/layout/common/itemModal/RepositoriesSection.module.css | 3 +--
 web/src/layout/common/itemModal/RepositoriesSection.tsx        | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/web/src/layout/common/itemModal/RepositoriesSection.module.css b/web/src/layout/common/itemModal/RepositoriesSection.module.css
index d3fbfc6f..2169edbf 100644
--- a/web/src/layout/common/itemModal/RepositoriesSection.module.css
+++ b/web/src/layout/common/itemModal/RepositoriesSection.module.css
@@ -56,11 +56,10 @@
 }
 
 .goodFirstBadge {
-  height: 19px;
+  height: 20px;
 }
 
 .goodFirstBadge img {
-  border: 1px solid var(--bs-gray-700);
   max-height: 100%;
 }
 
diff --git a/web/src/layout/common/itemModal/RepositoriesSection.tsx b/web/src/layout/common/itemModal/RepositoriesSection.tsx
index 8207ef89..7bcfec1a 100644
--- a/web/src/layout/common/itemModal/RepositoriesSection.tsx
+++ b/web/src/layout/common/itemModal/RepositoriesSection.tsx
@@ -75,7 +75,7 @@ const RepositoryInfo = (props: RepoProps) => {
                   href={`https://github.com/${formatRepoUrl(props.repository.url)}/issues?q=is%3Aopen+is%3Aissue+label%3A"good+first+issue"`}
                 >
                   <img
-                    src={`https://img.shields.io/github/issues/${formatRepoUrl(props.repository.url)}/good%20first%20issue.svg?style=flat-square&label=good%20first%20issues&labelColor=ffffff&color=6c757d`}
+                    src={`https://img.shields.io/github/issues/${formatRepoUrl(props.repository.url)}/good%20first%20issue.svg?style=flat-square&label=good%20first%20issues&labelColor=e9ecef&color=6c757d`}
                   />
                 </ExternalLink>
               </div>

From c0831bbf7876ea1954381f8b85e57928e5db7326 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20Casta=C3=B1o=20Arteaga?= <tegioz@icloud.com>
Date: Fri, 26 Apr 2024 13:45:56 +0200
Subject: [PATCH 24/55] Add experimental overlay feature (#587)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Sergio Castaño Arteaga <tegioz@icloud.com>
Signed-off-by: Cintia Sanchez Garcia <cynthiasg@icloud.com>
Co-authored-by: Sergio Castaño Arteaga <tegioz@icloud.com>
Co-authored-by: Cintia Sanchez Garcia <cynthiasg@icloud.com>
---
 .github/dependabot.yml                        |   2 +-
 .github/workflows/build-images.yml            |   2 +-
 .github/workflows/ci.yml                      |  12 +-
 .github/workflows/release.yml                 |  31 +-
 .gitignore                                    |  18 +-
 Cargo.lock                                    |  82 ++-
 Cargo.toml                                    |  35 +-
 README.md                                     |   2 +-
 askama.toml                                   |   2 -
 build.rs                                      |  51 --
 crates/cli/Cargo.toml                         |  61 ++
 Dockerfile => crates/cli/Dockerfile           |  12 +-
 crates/cli/askama.toml                        |   2 +
 crates/cli/build.rs                           | 112 ++++
 {src => crates/cli/src}/build/api.rs          |   0
 {src => crates/cli/src}/build/cache.rs        |   0
 {src => crates/cli/src}/build/clomonitor.rs   |   0
 {src => crates/cli/src}/build/crunchbase.rs   | 284 +++------
 {src => crates/cli/src}/build/export.rs       |   0
 {src => crates/cli/src}/build/github.rs       | 180 ++----
 {src => crates/cli/src}/build/logos.rs        |  20 +-
 {src => crates/cli/src}/build/mod.rs          | 199 ++++---
 crates/cli/src/build/projects.rs              | 122 ++++
 crates/cli/src/deploy/mod.rs                  |  21 +
 {src => crates/cli/src}/deploy/s3.rs          |  15 +-
 crates/cli/src/lib.rs                         |  12 +
 crates/cli/src/main.rs                        |  82 +++
 {src => crates/cli/src}/new/mod.rs            |  13 +-
 {src => crates/cli/src}/new/template/data.yml |   0
 .../cli/src}/new/template/guide.yml           |   0
 .../cli/src}/new/template/logos/cncf.svg      |   0
 .../cli/src}/new/template/settings.yml        |   0
 {src => crates/cli/src}/serve/mod.rs          |  28 +-
 {src => crates/cli/src}/validate/mod.rs       |  38 +-
 .../cli/templates}/projects.md                |   0
 crates/core/Cargo.toml                        |  25 +
 {src/build => crates/core/src}/data.rs        | 548 +++++++-----------
 crates/core/src/data/legacy.rs                | 232 ++++++++
 {src/build => crates/core/src}/datasets.rs    |  62 +-
 {src/build => crates/core/src}/guide.rs       |  41 +-
 crates/core/src/lib.rs                        |  13 +
 {src/build => crates/core/src}/settings.rs    |  81 ++-
 {src/build => crates/core/src}/stats.rs       |  82 +--
 crates/core/src/util.rs                       |  85 +++
 crates/wasm/overlay/Cargo.toml                |  24 +
 crates/wasm/overlay/overlay-test.html         |  22 +
 crates/wasm/overlay/src/lib.rs                | 159 +++++
 src/build/projects.rs                         | 124 ----
 src/deploy/mod.rs                             |   3 -
 src/main.rs                                   | 243 --------
 {embed => ui/embed}/.eslintrc                 |   0
 {embed => ui/embed}/.prettierignore           |   0
 {embed => ui/embed}/.prettierrc               |   0
 {embed => ui/embed}/embed.html                |   0
 {embed => ui/embed}/env.d.ts                  |   0
 {embed => ui/embed}/package.json              |   0
 .../iframeResizer.contentWindow-v4.3.9.min.js |   0
 {embed => ui/embed}/src/App.tsx               |   0
 .../embed}/src/common/ExternalLink.tsx        |   0
 {embed => ui/embed}/src/common/GridItem.tsx   |   0
 {embed => ui/embed}/src/common/Image.tsx      |   0
 {embed => ui/embed}/src/common/Loading.tsx    |   0
 {embed => ui/embed}/src/common/NoData.tsx     |   0
 {embed => ui/embed}/src/common/StyleView.tsx  |   0
 {embed => ui/embed}/src/index.tsx             |   0
 {embed => ui/embed}/src/types.ts              |   0
 {embed => ui/embed}/src/utils/getUrl.tsx      |   0
 {embed => ui/embed}/src/vite-env.d.ts         |   0
 {embed => ui/embed}/src/window.d.ts           |   0
 {embed => ui/embed}/tsconfig.json             |   0
 {embed => ui/embed}/tsconfig.node.json        |   0
 {embed => ui/embed}/vite.config.ts            |   0
 {embed => ui/embed}/yarn.lock                 |   0
 {web => ui/webapp}/.eslintrc                  |   0
 {web => ui/webapp}/.gitignore                 |   0
 {web => ui/webapp}/.prettierrc                |   0
 {web => ui/webapp}/index.html                 |   0
 {web => ui/webapp}/package.json               |   0
 {web => ui/webapp}/public/assets/gtm.js       |   0
 {web => ui/webapp}/src/App.css                |   4 +
 ui/webapp/src/App.module.css                  |  49 ++
 ui/webapp/src/App.tsx                         | 170 ++++++
 {web => ui/webapp}/src/data.ts                |  83 ++-
 {web => ui/webapp}/src/env.d.ts               |   0
 {web => ui/webapp}/src/hooks/useBodyScroll.ts |   0
 .../webapp}/src/hooks/useBreakpointDetect.tsx |   0
 .../webapp}/src/hooks/useOutsideClick.ts      |   0
 {web => ui/webapp}/src/index.tsx              |   0
 ui/webapp/src/layout/Layout.module.css        |   7 +
 .../common/ActiveFiltersList.module.css       |   0
 .../src/layout/common/ActiveFiltersList.tsx   |   0
 .../src/layout/common/Badge.module.css        |   0
 .../webapp}/src/layout/common/Badge.tsx       |   0
 .../common/ButtonCopyToClipboard.module.css   |   0
 .../layout/common/ButtonCopyToClipboard.tsx   |   0
 .../common/ButtonToTopScroll.module.css       |   0
 .../src/layout/common/ButtonToTopScroll.tsx   |   0
 .../src/layout/common/Checkbox.module.css     |   0
 .../webapp}/src/layout/common/Checkbox.tsx    |   0
 .../src/layout/common/CodeBlock.module.css    |   0
 .../webapp}/src/layout/common/CodeBlock.tsx   |   0
 .../layout/common/CollapsableText.module.css  |   0
 .../src/layout/common/CollapsableText.tsx     |   0
 .../layout/common/DownloadDropdown.module.css |   0
 .../src/layout/common/DownloadDropdown.tsx    |   0
 .../src/layout/common/ExternalLink.module.css |   0
 .../src/layout/common/ExternalLink.tsx        |   0
 .../layout/common/FiltersInLine.module.css    |   0
 .../src/layout/common/FiltersInLine.tsx       |   0
 .../src/layout/common/FoundationBadge.tsx     |   4 +-
 .../layout/common/FullScreenModal.module.css  |   0
 .../src/layout/common/FullScreenModal.tsx     |   0
 .../src/layout/common/HoverableItem.tsx       |   0
 .../webapp}/src/layout/common/Image.tsx       |  24 +-
 .../src/layout/common/Loading.module.css      |   0
 .../webapp}/src/layout/common/Loading.tsx     |  11 +-
 .../layout/common/MaturityBadge.module.css    |   0
 .../src/layout/common/MaturityBadge.tsx       |   0
 .../src/layout/common/Modal.module.css        |   0
 .../webapp}/src/layout/common/Modal.tsx       |   0
 .../src/layout/common/NoData.module.css       |   0
 .../webapp}/src/layout/common/NoData.tsx      |   2 +-
 .../src/layout/common/Pagination.module.css   |   0
 .../webapp}/src/layout/common/Pagination.tsx  |   0
 .../webapp}/src/layout/common/SVGIcon.tsx     |   2 +-
 .../src/layout/common/Searchbar.module.css    |   0
 .../webapp}/src/layout/common/Searchbar.tsx   |   8 +-
 .../src/layout/common/Section.module.css      |   0
 .../webapp}/src/layout/common/Section.tsx     |   0
 .../src/layout/common/Sidebar.module.css      |   0
 .../webapp}/src/layout/common/Sidebar.tsx     |   0
 .../webapp}/src/layout/common/Tabs.module.css |   0
 {web => ui/webapp}/src/layout/common/Tabs.tsx |   0
 .../itemModal/AcquisitionsTable.module.css    |   0
 .../common/itemModal/AcquisitionsTable.tsx    |   0
 .../layout/common/itemModal/BadgeModal.tsx    |   4 +-
 .../layout/common/itemModal/Box.module.css    |   0
 .../src/layout/common/itemModal/Box.tsx       |   0
 .../common/itemModal/Content.module.css       |   0
 .../src/layout/common/itemModal/Content.tsx   |   6 +-
 .../itemModal/FundingRoundsTable.module.css   |   0
 .../common/itemModal/FundingRoundsTable.tsx   |   0
 .../common/itemModal/ItemDropdown.module.css  |   0
 .../layout/common/itemModal/ItemDropdown.tsx  |   0
 .../common/itemModal/ItemModal.module.css     |   0
 .../itemModal/LanguagesStats.module.css       |   0
 .../common/itemModal/LanguagesStats.tsx       |   0
 .../itemModal/MaturitySection.module.css      |   0
 .../common/itemModal/MaturitySection.tsx      |   0
 .../common/itemModal/MobileContent.module.css |   0
 .../layout/common/itemModal/MobileContent.tsx |   4 +-
 .../MobileMaturitySection.module.css          |   0
 .../itemModal/MobileMaturitySection.tsx       |   0
 .../common/itemModal/ParentProject.module.css |   0
 .../layout/common/itemModal/ParentProject.tsx |   3 +-
 .../itemModal/ParticipationStats.module.css   |   0
 .../common/itemModal/ParticipationStats.tsx   |   0
 .../itemModal/RepositoriesSection.module.css  |   0
 .../common/itemModal/RepositoriesSection.tsx  |   0
 .../src/layout/common/itemModal/index.tsx     |   0
 .../common/zoomModal/ZoomModal.module.css     |   0
 .../src/layout/common/zoomModal/index.tsx     |   0
 .../webapp}/src/layout/explore/Content.tsx    |   0
 .../src/layout/explore/Explore.module.css     |   0
 .../src/layout/explore/card/Card.module.css   |   0
 .../webapp}/src/layout/explore/card/Card.tsx  |   0
 .../explore/card/CardCategory.module.css      |   0
 .../layout/explore/card/CardTitle.module.css  |   0
 .../src/layout/explore/card/CardTitle.tsx     |   0
 .../layout/explore/card/Content.module.css    |   0
 .../src/layout/explore/card/Content.tsx       |   0
 .../src/layout/explore/card/Menu.module.css   |   0
 .../webapp}/src/layout/explore/card/Menu.tsx  |   0
 .../webapp}/src/layout/explore/card/index.tsx |   0
 .../layout/explore/filters/Filters.module.css |   0
 .../filters/SearchbarSection.module.css       |   0
 .../explore/filters/SearchbarSection.tsx      |   0
 .../src/layout/explore/filters/index.tsx      |   0
 .../src/layout/explore/grid/Grid.module.css   |   0
 .../webapp}/src/layout/explore/grid/Grid.tsx  |   4 +-
 .../explore/grid/GridCategory.module.css      |   0
 .../layout/explore/grid/GridItem.module.css   |   0
 .../src/layout/explore/grid/GridItem.tsx      |   0
 .../webapp}/src/layout/explore/grid/index.tsx |   6 +-
 .../webapp}/src/layout/explore/index.tsx      |   0
 .../src/layout/explore/mobile/Card.module.css |   0
 .../src/layout/explore/mobile/Card.tsx        |   0
 .../mobile/ExploreMobileIndex.module.css      |   0
 .../explore/mobile/ExploreMobileIndex.tsx     |   0
 .../explore/mobile/MobileGrid.module.css      |   0
 .../src/layout/explore/mobile/MobileGrid.tsx  |   0
 .../src/layout/finances/Finances.module.css   |   0
 .../layout/finances/MobileFilters.module.css  |   0
 .../src/layout/finances/MobileFilters.tsx     |   0
 .../webapp}/src/layout/finances/index.tsx     |   3 +-
 .../webapp}/src/layout/guide/Guide.module.css |   0
 .../guide/SubcategoryExtended.module.css      |   0
 .../src/layout/guide/SubcategoryExtended.tsx  |   3 +-
 .../layout/guide/SubcategoryGrid.module.css   |   0
 .../src/layout/guide/SubcategoryGrid.tsx      |   0
 .../webapp}/src/layout/guide/ToC.module.css   |   0
 {web => ui/webapp}/src/layout/guide/ToC.tsx   |   0
 {web => ui/webapp}/src/layout/guide/index.tsx |  20 +-
 {web => ui/webapp}/src/layout/index.tsx       |   0
 .../webapp}/src/layout/logos/Logos.module.css |   0
 {web => ui/webapp}/src/layout/logos/index.tsx |   0
 .../layout/navigation/EmbedModal.module.css   |   0
 .../src/layout/navigation/EmbedModal.tsx      |   3 +-
 .../src/layout/navigation/Footer.module.css   |   0
 .../webapp}/src/layout/navigation/Footer.tsx  |  24 +-
 .../src/layout/navigation/Header.module.css   |   5 +
 .../webapp}/src/layout/navigation/Header.tsx  |  30 +-
 .../src/layout/navigation/MiniFooter.tsx      |   0
 .../navigation/MobileDropdown.module.css      |   0
 .../src/layout/navigation/MobileDropdown.tsx  |   0
 .../layout/navigation/MobileHeader.module.css |   4 +
 .../src/layout/navigation/MobileHeader.tsx    |  27 +-
 .../src/layout/notFound/NotFound.module.css   |   0
 .../webapp}/src/layout/notFound/index.tsx     |   0
 .../src/layout/screenshots/Grid.module.css    |   0
 .../webapp}/src/layout/screenshots/Grid.tsx   |   0
 .../layout/screenshots/Screenshots.module.css |   0
 .../webapp}/src/layout/screenshots/index.tsx  |   0
 .../webapp}/src/layout/stats/Box.module.css   |   0
 {web => ui/webapp}/src/layout/stats/Box.tsx   |   0
 .../webapp}/src/layout/stats/ChartsGroup.tsx  |   0
 .../layout/stats/CollapsableTable.module.css  |   0
 .../src/layout/stats/CollapsableTable.tsx     |   0
 .../webapp}/src/layout/stats/Content.tsx      |   0
 .../webapp}/src/layout/stats/HeatMapChart.tsx |   0
 .../stats/HorizontalBarChart.module.css       |   0
 .../src/layout/stats/HorizontalBarChart.tsx   |   0
 .../webapp}/src/layout/stats/Stats.module.css |   0
 .../src/layout/stats/TimestampLineChart.tsx   |   0
 .../layout/stats/VerticalBarChart.module.css  |   0
 .../src/layout/stats/VerticalBarChart.tsx     |   0
 {web => ui/webapp}/src/layout/stats/index.tsx |   0
 .../webapp}/src/layout/stores/activeItem.tsx  |   0
 .../src/layout/stores/financesData.tsx        |   0
 .../webapp}/src/layout/stores/fullData.tsx    |   2 +-
 .../webapp}/src/layout/stores/gridWidth.tsx   |   0
 .../webapp}/src/layout/stores/groupActive.tsx |   3 +-
 .../webapp}/src/layout/stores/guideFile.tsx   |   0
 .../webapp}/src/layout/stores/mobileTOC.tsx   |   0
 .../src/layout/stores/upcomingEventData.tsx   |   0
 .../webapp}/src/layout/stores/viewMode.tsx    |   0
 .../src/layout/stores/visibleZoomSection.tsx  |   0
 {web => ui/webapp}/src/layout/stores/zoom.tsx |   0
 .../upcomingEvents/UpcomingEvents.module.css  |   0
 .../src/layout/upcomingEvents/index.tsx       |   0
 {web => ui/webapp}/src/styles/cookies.css     |   0
 {web => ui/webapp}/src/styles/default.scss    |   2 +-
 {web => ui/webapp}/src/styles/light.scss      |   3 +-
 {web => ui/webapp}/src/styles/mixins.scss     |   0
 {web => ui/webapp}/src/types.ts               |   0
 .../webapp}/src/utils/calculateAxisValues.ts  |   0
 .../src/utils/calculateGridItemsPerRow.ts     |   0
 .../src/utils/calculateGridWidthInPx.ts       |   0
 .../src/utils/capitalizeFirstLetter.ts        |   0
 .../src/utils/checkIfCategoryInGroup.ts       |   0
 ui/webapp/src/utils/checkQueryStringValue.ts  |  11 +
 {web => ui/webapp}/src/utils/cleanEmojis.ts   |   0
 .../webapp}/src/utils/countVisibleItems.tsx   |   0
 {web => ui/webapp}/src/utils/cutString.ts     |   0
 {web => ui/webapp}/src/utils/filterData.ts    |   0
 .../webapp}/src/utils/formatLabelProfit.ts    |   0
 .../webapp}/src/utils/generateColorsArray.ts  |   0
 ui/webapp/src/utils/getBasePath.ts            |   5 +
 .../src/utils/getCategoriesWithItems.ts       |   0
 ui/webapp/src/utils/getFoundationNameLabel.ts |   8 +
 {web => ui/webapp}/src/utils/getGroupName.ts  |   0
 .../webapp}/src/utils/getItemDescription.ts   |   0
 {web => ui/webapp}/src/utils/getName.ts       |   0
 .../webapp}/src/utils/getNormalizedName.ts    |   0
 {web => ui/webapp}/src/utils/goToElement.ts   |   0
 .../webapp}/src/utils/gridCategoryLayout.ts   |   0
 .../webapp}/src/utils/isElementInView.ts      |   0
 .../webapp}/src/utils/isExploreSection.ts     |   0
 .../webapp}/src/utils/isSectionInGuide.ts     |   0
 .../webapp}/src/utils/itemsDataGetter.ts      | 140 +++--
 .../webapp}/src/utils/itemsIterator.tsx       |   0
 {web => ui/webapp}/src/utils/nestArray.ts     |   0
 ui/webapp/src/utils/overlayData.ts            | 148 +++++
 .../webapp}/src/utils/prepareFilters.ts       |   0
 .../webapp}/src/utils/prepareFinances.tsx     |   0
 ui/webapp/src/utils/prepareLink.ts            |  13 +
 {web => ui/webapp}/src/utils/prepareMenu.ts   |   0
 {web => ui/webapp}/src/utils/prettifyBytes.ts |   0
 .../webapp}/src/utils/prettifyNumber.ts       |   0
 {web => ui/webapp}/src/utils/rgba2hex.ts      |   0
 {web => ui/webapp}/src/utils/scrollToTop.ts   |   0
 {web => ui/webapp}/src/utils/sortItems.ts     |   0
 .../src/utils/sortItemsByOrderValue.ts        |   0
 .../webapp}/src/utils/sortMenuOptions.ts      |   0
 .../webapp}/src/utils/sortObjectByValue.ts    |   0
 {web => ui/webapp}/src/utils/sumValues.ts     |   0
 .../webapp}/src/utils/updateAlphaInColor.ts   |   0
 {web => ui/webapp}/src/vite-env.d.ts          |   0
 {web => ui/webapp}/src/window.d.ts            |   3 +-
 {web => ui/webapp}/tsconfig.json              |   2 +-
 {web => ui/webapp}/tsconfig.node.json         |   0
 {web => ui/webapp}/vite.config.ts             |   0
 {web => ui/webapp}/yarn.lock                  |   0
 web/src/App.tsx                               |  92 ---
 web/src/layout/Layout.module.css              |   3 -
 web/src/utils/getBasePath.ts                  |   5 -
 web/src/utils/getFoundationNameLabel.ts       |   8 -
 307 files changed, 2510 insertions(+), 1630 deletions(-)
 delete mode 100644 askama.toml
 delete mode 100644 build.rs
 create mode 100644 crates/cli/Cargo.toml
 rename Dockerfile => crates/cli/Dockerfile (77%)
 create mode 100644 crates/cli/askama.toml
 create mode 100644 crates/cli/build.rs
 rename {src => crates/cli/src}/build/api.rs (100%)
 rename {src => crates/cli/src}/build/cache.rs (100%)
 rename {src => crates/cli/src}/build/clomonitor.rs (100%)
 rename {src => crates/cli/src}/build/crunchbase.rs (58%)
 rename {src => crates/cli/src}/build/export.rs (100%)
 rename {src => crates/cli/src}/build/github.rs (73%)
 rename {src => crates/cli/src}/build/logos.rs (90%)
 rename {src => crates/cli/src}/build/mod.rs (86%)
 create mode 100644 crates/cli/src/build/projects.rs
 create mode 100644 crates/cli/src/deploy/mod.rs
 rename {src => crates/cli/src}/deploy/s3.rs (95%)
 create mode 100644 crates/cli/src/lib.rs
 create mode 100644 crates/cli/src/main.rs
 rename {src => crates/cli/src}/new/mod.rs (88%)
 rename {src => crates/cli/src}/new/template/data.yml (100%)
 rename {src => crates/cli/src}/new/template/guide.yml (100%)
 rename {src => crates/cli/src}/new/template/logos/cncf.svg (100%)
 rename {src => crates/cli/src}/new/template/settings.yml (100%)
 rename {src => crates/cli/src}/serve/mod.rs (77%)
 rename {src => crates/cli/src}/validate/mod.rs (50%)
 rename {templates => crates/cli/templates}/projects.md (100%)
 create mode 100644 crates/core/Cargo.toml
 rename {src/build => crates/core/src}/data.rs (63%)
 create mode 100644 crates/core/src/data/legacy.rs
 rename {src/build => crates/core/src}/datasets.rs (92%)
 rename {src/build => crates/core/src}/guide.rs (88%)
 create mode 100644 crates/core/src/lib.rs
 rename {src/build => crates/core/src}/settings.rs (93%)
 rename {src/build => crates/core/src}/stats.rs (90%)
 create mode 100644 crates/core/src/util.rs
 create mode 100644 crates/wasm/overlay/Cargo.toml
 create mode 100644 crates/wasm/overlay/overlay-test.html
 create mode 100644 crates/wasm/overlay/src/lib.rs
 delete mode 100644 src/build/projects.rs
 delete mode 100644 src/deploy/mod.rs
 delete mode 100644 src/main.rs
 rename {embed => ui/embed}/.eslintrc (100%)
 rename {embed => ui/embed}/.prettierignore (100%)
 rename {embed => ui/embed}/.prettierrc (100%)
 rename {embed => ui/embed}/embed.html (100%)
 rename {embed => ui/embed}/env.d.ts (100%)
 rename {embed => ui/embed}/package.json (100%)
 rename {embed => ui/embed}/public/assets/iframeResizer.contentWindow-v4.3.9.min.js (100%)
 rename {embed => ui/embed}/src/App.tsx (100%)
 rename {embed => ui/embed}/src/common/ExternalLink.tsx (100%)
 rename {embed => ui/embed}/src/common/GridItem.tsx (100%)
 rename {embed => ui/embed}/src/common/Image.tsx (100%)
 rename {embed => ui/embed}/src/common/Loading.tsx (100%)
 rename {embed => ui/embed}/src/common/NoData.tsx (100%)
 rename {embed => ui/embed}/src/common/StyleView.tsx (100%)
 rename {embed => ui/embed}/src/index.tsx (100%)
 rename {embed => ui/embed}/src/types.ts (100%)
 rename {embed => ui/embed}/src/utils/getUrl.tsx (100%)
 rename {embed => ui/embed}/src/vite-env.d.ts (100%)
 rename {embed => ui/embed}/src/window.d.ts (100%)
 rename {embed => ui/embed}/tsconfig.json (100%)
 rename {embed => ui/embed}/tsconfig.node.json (100%)
 rename {embed => ui/embed}/vite.config.ts (100%)
 rename {embed => ui/embed}/yarn.lock (100%)
 rename {web => ui/webapp}/.eslintrc (100%)
 rename {web => ui/webapp}/.gitignore (100%)
 rename {web => ui/webapp}/.prettierrc (100%)
 rename {web => ui/webapp}/index.html (100%)
 rename {web => ui/webapp}/package.json (100%)
 rename {web => ui/webapp}/public/assets/gtm.js (100%)
 rename {web => ui/webapp}/src/App.css (97%)
 create mode 100644 ui/webapp/src/App.module.css
 create mode 100644 ui/webapp/src/App.tsx
 rename {web => ui/webapp}/src/data.ts (75%)
 rename {web => ui/webapp}/src/env.d.ts (100%)
 rename {web => ui/webapp}/src/hooks/useBodyScroll.ts (100%)
 rename {web => ui/webapp}/src/hooks/useBreakpointDetect.tsx (100%)
 rename {web => ui/webapp}/src/hooks/useOutsideClick.ts (100%)
 rename {web => ui/webapp}/src/index.tsx (100%)
 create mode 100644 ui/webapp/src/layout/Layout.module.css
 rename {web => ui/webapp}/src/layout/common/ActiveFiltersList.module.css (100%)
 rename {web => ui/webapp}/src/layout/common/ActiveFiltersList.tsx (100%)
 rename {web => ui/webapp}/src/layout/common/Badge.module.css (100%)
 rename {web => ui/webapp}/src/layout/common/Badge.tsx (100%)
 rename {web => ui/webapp}/src/layout/common/ButtonCopyToClipboard.module.css (100%)
 rename {web => ui/webapp}/src/layout/common/ButtonCopyToClipboard.tsx (100%)
 rename {web => ui/webapp}/src/layout/common/ButtonToTopScroll.module.css (100%)
 rename {web => ui/webapp}/src/layout/common/ButtonToTopScroll.tsx (100%)
 rename {web => ui/webapp}/src/layout/common/Checkbox.module.css (100%)
 rename {web => ui/webapp}/src/layout/common/Checkbox.tsx (100%)
 rename {web => ui/webapp}/src/layout/common/CodeBlock.module.css (100%)
 rename {web => ui/webapp}/src/layout/common/CodeBlock.tsx (100%)
 rename {web => ui/webapp}/src/layout/common/CollapsableText.module.css (100%)
 rename {web => ui/webapp}/src/layout/common/CollapsableText.tsx (100%)
 rename {web => ui/webapp}/src/layout/common/DownloadDropdown.module.css (100%)
 rename {web => ui/webapp}/src/layout/common/DownloadDropdown.tsx (100%)
 rename {web => ui/webapp}/src/layout/common/ExternalLink.module.css (100%)
 rename {web => ui/webapp}/src/layout/common/ExternalLink.tsx (100%)
 rename {web => ui/webapp}/src/layout/common/FiltersInLine.module.css (100%)
 rename {web => ui/webapp}/src/layout/common/FiltersInLine.tsx (100%)
 rename {web => ui/webapp}/src/layout/common/FoundationBadge.tsx (76%)
 rename {web => ui/webapp}/src/layout/common/FullScreenModal.module.css (100%)
 rename {web => ui/webapp}/src/layout/common/FullScreenModal.tsx (100%)
 rename {web => ui/webapp}/src/layout/common/HoverableItem.tsx (100%)
 rename {web => ui/webapp}/src/layout/common/Image.tsx (55%)
 rename {web => ui/webapp}/src/layout/common/Loading.module.css (100%)
 rename {web => ui/webapp}/src/layout/common/Loading.tsx (75%)
 rename {web => ui/webapp}/src/layout/common/MaturityBadge.module.css (100%)
 rename {web => ui/webapp}/src/layout/common/MaturityBadge.tsx (100%)
 rename {web => ui/webapp}/src/layout/common/Modal.module.css (100%)
 rename {web => ui/webapp}/src/layout/common/Modal.tsx (100%)
 rename {web => ui/webapp}/src/layout/common/NoData.module.css (100%)
 rename {web => ui/webapp}/src/layout/common/NoData.tsx (70%)
 rename {web => ui/webapp}/src/layout/common/Pagination.module.css (100%)
 rename {web => ui/webapp}/src/layout/common/Pagination.tsx (100%)
 rename {web => ui/webapp}/src/layout/common/SVGIcon.tsx (99%)
 rename {web => ui/webapp}/src/layout/common/Searchbar.module.css (100%)
 rename {web => ui/webapp}/src/layout/common/Searchbar.tsx (96%)
 rename {web => ui/webapp}/src/layout/common/Section.module.css (100%)
 rename {web => ui/webapp}/src/layout/common/Section.tsx (100%)
 rename {web => ui/webapp}/src/layout/common/Sidebar.module.css (100%)
 rename {web => ui/webapp}/src/layout/common/Sidebar.tsx (100%)
 rename {web => ui/webapp}/src/layout/common/Tabs.module.css (100%)
 rename {web => ui/webapp}/src/layout/common/Tabs.tsx (100%)
 rename {web => ui/webapp}/src/layout/common/itemModal/AcquisitionsTable.module.css (100%)
 rename {web => ui/webapp}/src/layout/common/itemModal/AcquisitionsTable.tsx (100%)
 rename {web => ui/webapp}/src/layout/common/itemModal/BadgeModal.tsx (96%)
 rename {web => ui/webapp}/src/layout/common/itemModal/Box.module.css (100%)
 rename {web => ui/webapp}/src/layout/common/itemModal/Box.tsx (100%)
 rename {web => ui/webapp}/src/layout/common/itemModal/Content.module.css (100%)
 rename {web => ui/webapp}/src/layout/common/itemModal/Content.tsx (98%)
 rename {web => ui/webapp}/src/layout/common/itemModal/FundingRoundsTable.module.css (100%)
 rename {web => ui/webapp}/src/layout/common/itemModal/FundingRoundsTable.tsx (100%)
 rename {web => ui/webapp}/src/layout/common/itemModal/ItemDropdown.module.css (100%)
 rename {web => ui/webapp}/src/layout/common/itemModal/ItemDropdown.tsx (100%)
 rename {web => ui/webapp}/src/layout/common/itemModal/ItemModal.module.css (100%)
 rename {web => ui/webapp}/src/layout/common/itemModal/LanguagesStats.module.css (100%)
 rename {web => ui/webapp}/src/layout/common/itemModal/LanguagesStats.tsx (100%)
 rename {web => ui/webapp}/src/layout/common/itemModal/MaturitySection.module.css (100%)
 rename {web => ui/webapp}/src/layout/common/itemModal/MaturitySection.tsx (100%)
 rename {web => ui/webapp}/src/layout/common/itemModal/MobileContent.module.css (100%)
 rename {web => ui/webapp}/src/layout/common/itemModal/MobileContent.tsx (99%)
 rename {web => ui/webapp}/src/layout/common/itemModal/MobileMaturitySection.module.css (100%)
 rename {web => ui/webapp}/src/layout/common/itemModal/MobileMaturitySection.tsx (100%)
 rename {web => ui/webapp}/src/layout/common/itemModal/ParentProject.module.css (100%)
 rename {web => ui/webapp}/src/layout/common/itemModal/ParentProject.tsx (95%)
 rename {web => ui/webapp}/src/layout/common/itemModal/ParticipationStats.module.css (100%)
 rename {web => ui/webapp}/src/layout/common/itemModal/ParticipationStats.tsx (100%)
 rename {web => ui/webapp}/src/layout/common/itemModal/RepositoriesSection.module.css (100%)
 rename {web => ui/webapp}/src/layout/common/itemModal/RepositoriesSection.tsx (100%)
 rename {web => ui/webapp}/src/layout/common/itemModal/index.tsx (100%)
 rename {web => ui/webapp}/src/layout/common/zoomModal/ZoomModal.module.css (100%)
 rename {web => ui/webapp}/src/layout/common/zoomModal/index.tsx (100%)
 rename {web => ui/webapp}/src/layout/explore/Content.tsx (100%)
 rename {web => ui/webapp}/src/layout/explore/Explore.module.css (100%)
 rename {web => ui/webapp}/src/layout/explore/card/Card.module.css (100%)
 rename {web => ui/webapp}/src/layout/explore/card/Card.tsx (100%)
 rename {web => ui/webapp}/src/layout/explore/card/CardCategory.module.css (100%)
 rename {web => ui/webapp}/src/layout/explore/card/CardTitle.module.css (100%)
 rename {web => ui/webapp}/src/layout/explore/card/CardTitle.tsx (100%)
 rename {web => ui/webapp}/src/layout/explore/card/Content.module.css (100%)
 rename {web => ui/webapp}/src/layout/explore/card/Content.tsx (100%)
 rename {web => ui/webapp}/src/layout/explore/card/Menu.module.css (100%)
 rename {web => ui/webapp}/src/layout/explore/card/Menu.tsx (100%)
 rename {web => ui/webapp}/src/layout/explore/card/index.tsx (100%)
 rename {web => ui/webapp}/src/layout/explore/filters/Filters.module.css (100%)
 rename {web => ui/webapp}/src/layout/explore/filters/SearchbarSection.module.css (100%)
 rename {web => ui/webapp}/src/layout/explore/filters/SearchbarSection.tsx (100%)
 rename {web => ui/webapp}/src/layout/explore/filters/index.tsx (100%)
 rename {web => ui/webapp}/src/layout/explore/grid/Grid.module.css (100%)
 rename {web => ui/webapp}/src/layout/explore/grid/Grid.tsx (98%)
 rename {web => ui/webapp}/src/layout/explore/grid/GridCategory.module.css (100%)
 rename {web => ui/webapp}/src/layout/explore/grid/GridItem.module.css (100%)
 rename {web => ui/webapp}/src/layout/explore/grid/GridItem.tsx (100%)
 rename {web => ui/webapp}/src/layout/explore/grid/index.tsx (95%)
 rename {web => ui/webapp}/src/layout/explore/index.tsx (100%)
 rename {web => ui/webapp}/src/layout/explore/mobile/Card.module.css (100%)
 rename {web => ui/webapp}/src/layout/explore/mobile/Card.tsx (100%)
 rename {web => ui/webapp}/src/layout/explore/mobile/ExploreMobileIndex.module.css (100%)
 rename {web => ui/webapp}/src/layout/explore/mobile/ExploreMobileIndex.tsx (100%)
 rename {web => ui/webapp}/src/layout/explore/mobile/MobileGrid.module.css (100%)
 rename {web => ui/webapp}/src/layout/explore/mobile/MobileGrid.tsx (100%)
 rename {web => ui/webapp}/src/layout/finances/Finances.module.css (100%)
 rename {web => ui/webapp}/src/layout/finances/MobileFilters.module.css (100%)
 rename {web => ui/webapp}/src/layout/finances/MobileFilters.tsx (100%)
 rename {web => ui/webapp}/src/layout/finances/index.tsx (99%)
 rename {web => ui/webapp}/src/layout/guide/Guide.module.css (100%)
 rename {web => ui/webapp}/src/layout/guide/SubcategoryExtended.module.css (100%)
 rename {web => ui/webapp}/src/layout/guide/SubcategoryExtended.tsx (97%)
 rename {web => ui/webapp}/src/layout/guide/SubcategoryGrid.module.css (100%)
 rename {web => ui/webapp}/src/layout/guide/SubcategoryGrid.tsx (100%)
 rename {web => ui/webapp}/src/layout/guide/ToC.module.css (100%)
 rename {web => ui/webapp}/src/layout/guide/ToC.tsx (100%)
 rename {web => ui/webapp}/src/layout/guide/index.tsx (95%)
 rename {web => ui/webapp}/src/layout/index.tsx (100%)
 rename {web => ui/webapp}/src/layout/logos/Logos.module.css (100%)
 rename {web => ui/webapp}/src/layout/logos/index.tsx (100%)
 rename {web => ui/webapp}/src/layout/navigation/EmbedModal.module.css (100%)
 rename {web => ui/webapp}/src/layout/navigation/EmbedModal.tsx (99%)
 rename {web => ui/webapp}/src/layout/navigation/Footer.module.css (100%)
 rename {web => ui/webapp}/src/layout/navigation/Footer.tsx (87%)
 rename {web => ui/webapp}/src/layout/navigation/Header.module.css (93%)
 rename {web => ui/webapp}/src/layout/navigation/Header.tsx (87%)
 rename {web => ui/webapp}/src/layout/navigation/MiniFooter.tsx (100%)
 rename {web => ui/webapp}/src/layout/navigation/MobileDropdown.module.css (100%)
 rename {web => ui/webapp}/src/layout/navigation/MobileDropdown.tsx (100%)
 rename {web => ui/webapp}/src/layout/navigation/MobileHeader.module.css (95%)
 rename {web => ui/webapp}/src/layout/navigation/MobileHeader.tsx (82%)
 rename {web => ui/webapp}/src/layout/notFound/NotFound.module.css (100%)
 rename {web => ui/webapp}/src/layout/notFound/index.tsx (100%)
 rename {web => ui/webapp}/src/layout/screenshots/Grid.module.css (100%)
 rename {web => ui/webapp}/src/layout/screenshots/Grid.tsx (100%)
 rename {web => ui/webapp}/src/layout/screenshots/Screenshots.module.css (100%)
 rename {web => ui/webapp}/src/layout/screenshots/index.tsx (100%)
 rename {web => ui/webapp}/src/layout/stats/Box.module.css (100%)
 rename {web => ui/webapp}/src/layout/stats/Box.tsx (100%)
 rename {web => ui/webapp}/src/layout/stats/ChartsGroup.tsx (100%)
 rename {web => ui/webapp}/src/layout/stats/CollapsableTable.module.css (100%)
 rename {web => ui/webapp}/src/layout/stats/CollapsableTable.tsx (100%)
 rename {web => ui/webapp}/src/layout/stats/Content.tsx (100%)
 rename {web => ui/webapp}/src/layout/stats/HeatMapChart.tsx (100%)
 rename {web => ui/webapp}/src/layout/stats/HorizontalBarChart.module.css (100%)
 rename {web => ui/webapp}/src/layout/stats/HorizontalBarChart.tsx (100%)
 rename {web => ui/webapp}/src/layout/stats/Stats.module.css (100%)
 rename {web => ui/webapp}/src/layout/stats/TimestampLineChart.tsx (100%)
 rename {web => ui/webapp}/src/layout/stats/VerticalBarChart.module.css (100%)
 rename {web => ui/webapp}/src/layout/stats/VerticalBarChart.tsx (100%)
 rename {web => ui/webapp}/src/layout/stats/index.tsx (100%)
 rename {web => ui/webapp}/src/layout/stores/activeItem.tsx (100%)
 rename {web => ui/webapp}/src/layout/stores/financesData.tsx (100%)
 rename {web => ui/webapp}/src/layout/stores/fullData.tsx (92%)
 rename {web => ui/webapp}/src/layout/stores/gridWidth.tsx (100%)
 rename {web => ui/webapp}/src/layout/stores/groupActive.tsx (94%)
 rename {web => ui/webapp}/src/layout/stores/guideFile.tsx (100%)
 rename {web => ui/webapp}/src/layout/stores/mobileTOC.tsx (100%)
 rename {web => ui/webapp}/src/layout/stores/upcomingEventData.tsx (100%)
 rename {web => ui/webapp}/src/layout/stores/viewMode.tsx (100%)
 rename {web => ui/webapp}/src/layout/stores/visibleZoomSection.tsx (100%)
 rename {web => ui/webapp}/src/layout/stores/zoom.tsx (100%)
 rename {web => ui/webapp}/src/layout/upcomingEvents/UpcomingEvents.module.css (100%)
 rename {web => ui/webapp}/src/layout/upcomingEvents/index.tsx (100%)
 rename {web => ui/webapp}/src/styles/cookies.css (100%)
 rename {web => ui/webapp}/src/styles/default.scss (98%)
 rename {web => ui/webapp}/src/styles/light.scss (97%)
 rename {web => ui/webapp}/src/styles/mixins.scss (100%)
 rename {web => ui/webapp}/src/types.ts (100%)
 rename {web => ui/webapp}/src/utils/calculateAxisValues.ts (100%)
 rename {web => ui/webapp}/src/utils/calculateGridItemsPerRow.ts (100%)
 rename {web => ui/webapp}/src/utils/calculateGridWidthInPx.ts (100%)
 rename {web => ui/webapp}/src/utils/capitalizeFirstLetter.ts (100%)
 rename {web => ui/webapp}/src/utils/checkIfCategoryInGroup.ts (100%)
 create mode 100644 ui/webapp/src/utils/checkQueryStringValue.ts
 rename {web => ui/webapp}/src/utils/cleanEmojis.ts (100%)
 rename {web => ui/webapp}/src/utils/countVisibleItems.tsx (100%)
 rename {web => ui/webapp}/src/utils/cutString.ts (100%)
 rename {web => ui/webapp}/src/utils/filterData.ts (100%)
 rename {web => ui/webapp}/src/utils/formatLabelProfit.ts (100%)
 rename {web => ui/webapp}/src/utils/generateColorsArray.ts (100%)
 create mode 100644 ui/webapp/src/utils/getBasePath.ts
 rename {web => ui/webapp}/src/utils/getCategoriesWithItems.ts (100%)
 create mode 100644 ui/webapp/src/utils/getFoundationNameLabel.ts
 rename {web => ui/webapp}/src/utils/getGroupName.ts (100%)
 rename {web => ui/webapp}/src/utils/getItemDescription.ts (100%)
 rename {web => ui/webapp}/src/utils/getName.ts (100%)
 rename {web => ui/webapp}/src/utils/getNormalizedName.ts (100%)
 rename {web => ui/webapp}/src/utils/goToElement.ts (100%)
 rename {web => ui/webapp}/src/utils/gridCategoryLayout.ts (100%)
 rename {web => ui/webapp}/src/utils/isElementInView.ts (100%)
 rename {web => ui/webapp}/src/utils/isExploreSection.ts (100%)
 rename {web => ui/webapp}/src/utils/isSectionInGuide.ts (100%)
 rename {web => ui/webapp}/src/utils/itemsDataGetter.ts (86%)
 rename {web => ui/webapp}/src/utils/itemsIterator.tsx (100%)
 rename {web => ui/webapp}/src/utils/nestArray.ts (100%)
 create mode 100644 ui/webapp/src/utils/overlayData.ts
 rename {web => ui/webapp}/src/utils/prepareFilters.ts (100%)
 rename {web => ui/webapp}/src/utils/prepareFinances.tsx (100%)
 create mode 100644 ui/webapp/src/utils/prepareLink.ts
 rename {web => ui/webapp}/src/utils/prepareMenu.ts (100%)
 rename {web => ui/webapp}/src/utils/prettifyBytes.ts (100%)
 rename {web => ui/webapp}/src/utils/prettifyNumber.ts (100%)
 rename {web => ui/webapp}/src/utils/rgba2hex.ts (100%)
 rename {web => ui/webapp}/src/utils/scrollToTop.ts (100%)
 rename {web => ui/webapp}/src/utils/sortItems.ts (100%)
 rename {web => ui/webapp}/src/utils/sortItemsByOrderValue.ts (100%)
 rename {web => ui/webapp}/src/utils/sortMenuOptions.ts (100%)
 rename {web => ui/webapp}/src/utils/sortObjectByValue.ts (100%)
 rename {web => ui/webapp}/src/utils/sumValues.ts (100%)
 rename {web => ui/webapp}/src/utils/updateAlphaInColor.ts (100%)
 rename {web => ui/webapp}/src/vite-env.d.ts (100%)
 rename {web => ui/webapp}/src/window.d.ts (75%)
 rename {web => ui/webapp}/tsconfig.json (94%)
 rename {web => ui/webapp}/tsconfig.node.json (100%)
 rename {web => ui/webapp}/vite.config.ts (100%)
 rename {web => ui/webapp}/yarn.lock (100%)
 delete mode 100644 web/src/App.tsx
 delete mode 100644 web/src/layout/Layout.module.css
 delete mode 100644 web/src/utils/getBasePath.ts
 delete mode 100644 web/src/utils/getFoundationNameLabel.ts

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 6b7b16b7..93bb337a 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -16,7 +16,7 @@ updates:
           - "patch"
 
   - package-ecosystem: "npm"
-    directory: "/web"
+    directory: "/ui"
     schedule:
       interval: "weekly"
     groups:
diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml
index 0a177860..4926cb1d 100644
--- a/.github/workflows/build-images.yml
+++ b/.github/workflows/build-images.yml
@@ -21,5 +21,5 @@ jobs:
           password: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
       - name: Build and push image
         run: |
-          docker build -f Dockerfile -t public.ecr.aws/g6m3a0y9/landscape2:latest .
+          docker build -f crates/cli/Dockerfile -t public.ecr.aws/g6m3a0y9/landscape2:latest .
           docker push public.ecr.aws/g6m3a0y9/landscape2:latest
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9625aeb2..1bc90fe8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,8 +16,10 @@ jobs:
       - name: Setup Rust
         uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: 1.76.0
+          toolchain: 1.77.0
           components: clippy, rustfmt
+      - name: Install wasm-pack
+        run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
       - name: Run clippy
         run: cargo clippy --all-targets --all-features -- --deny warnings
       - name: Run rustfmt
@@ -36,16 +38,16 @@ jobs:
       - name: Cache node modules
         uses: actions/cache@v4
         with:
-          path: ./web/node_modules
+          path: ./ui/webapp/node_modules
           key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
           restore-keys: |
             ${{ runner.os }}-yarn-
       - name: Install dependencies
-        working-directory: ./web
+        working-directory: ./ui/webapp
         run: yarn install --network-concurrency 1
       - name: Run prettier
-        working-directory: ./web
+        working-directory: ./ui/webapp
         run: yarn format:diff
       - name: Run eslint
-        working-directory: ./web
+        working-directory: ./ui/webapp
         run: yarn lint
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 09a4cd9d..72d4dfc0 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,4 +1,4 @@
-# Copyright 2022-2023, axodotdev
+# Copyright 2022-2024, axodotdev
 # SPDX-License-Identifier: MIT or Apache-2.0
 #
 # CI that:
@@ -6,9 +6,9 @@
 # * checks for a Git Tag that looks like a release
 # * builds artifacts with cargo-dist (archives, installers, hashes)
 # * uploads those artifacts to temporary workflow zip
-# * on success, uploads the artifacts to a Github Release
+# * on success, uploads the artifacts to a GitHub Release
 #
-# Note that the Github Release will be created with a generated
+# Note that the GitHub Release will be created with a generated
 # title/body based on your changelogs.
 
 name: Release
@@ -31,7 +31,7 @@ permissions:
 # packages versioned/released in lockstep).
 #
 # If you push multiple tags at once, separate instances of this workflow will
-# spin up, creating an independent announcement for each one. However Github
+# spin up, creating an independent announcement for each one. However, GitHub
 # will hard limit this to 3 tags per commit, as it will assume more tags is a
 # mistake.
 #
@@ -61,7 +61,7 @@ jobs:
         # we specify bash to get pipefail; it guards against the `curl` command
         # failing. otherwise `sh` won't catch that `curl` returned non-0
         shell: bash
-        run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.12.2/cargo-dist-installer.sh | sh"
+        run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.13.3/cargo-dist-installer.sh | sh"
       # sure would be cool if github gave us proper conditionals...
       # so here's a doubly-nested ternary-via-truthiness to try to provide the best possible
       # functionality based on whether this is a pull_request, and whether it's from a fork.
@@ -104,10 +104,15 @@ jobs:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       BUILD_MANIFEST_NAME: target/distrib/${{ join(matrix.targets, '-') }}-dist-manifest.json
     steps:
+      - name: enable windows longpaths
+        run: |
+          git config --global core.longpaths true
       - uses: actions/checkout@v4
         with:
           submodules: recursive
       - uses: swatinem/rust-cache@v2
+        with:
+          key: ${{ join(matrix.targets, '-') }}
       - name: Install cargo-dist
         run: ${{ matrix.install_dist }}
       # Get the dist-manifest
@@ -134,7 +139,7 @@ jobs:
         run: |
           # Parse out what we just built and upload it to scratch storage
           echo "paths<<EOF" >> "$GITHUB_OUTPUT"
-          jq --raw-output ".artifacts[]?.path | select( . != null )" dist-manifest.json >> "$GITHUB_OUTPUT"
+          jq --raw-output ".upload_files[]" dist-manifest.json >> "$GITHUB_OUTPUT"
           echo "EOF" >> "$GITHUB_OUTPUT"
 
           cp dist-manifest.json "$BUILD_MANIFEST_NAME"
@@ -161,7 +166,7 @@ jobs:
           submodules: recursive
       - name: Install cargo-dist
         shell: bash
-        run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.12.2/cargo-dist-installer.sh | sh"
+        run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.13.3/cargo-dist-installer.sh | sh"
       # Get all the local artifacts for the global tasks to use (for e.g. checksums)
       - name: Fetch local artifacts
         uses: actions/download-artifact@v4
@@ -177,7 +182,7 @@ jobs:
 
           # Parse out what we just built and upload it to scratch storage
           echo "paths<<EOF" >> "$GITHUB_OUTPUT"
-          jq --raw-output ".artifacts[]?.path | select( . != null )" dist-manifest.json >> "$GITHUB_OUTPUT"
+          jq --raw-output ".upload_files[]" dist-manifest.json >> "$GITHUB_OUTPUT"
           echo "EOF" >> "$GITHUB_OUTPUT"
 
           cp dist-manifest.json "$BUILD_MANIFEST_NAME"
@@ -206,7 +211,7 @@ jobs:
         with:
           submodules: recursive
       - name: Install cargo-dist
-        run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.12.2/cargo-dist-installer.sh | sh"
+        run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.13.3/cargo-dist-installer.sh | sh"
       # Fetch artifacts from scratch-storage
       - name: Fetch artifacts
         uses: actions/download-artifact@v4
@@ -214,7 +219,7 @@ jobs:
           pattern: artifacts-*
           path: target/distrib/
           merge-multiple: true
-      # This is a harmless no-op for Github Releases, hosting for that happens in "announce"
+      # This is a harmless no-op for GitHub Releases, hosting for that happens in "announce"
       - id: host
         shell: bash
         run: |
@@ -269,7 +274,7 @@ jobs:
           done
           git push
 
-  # Create a Github Release while uploading all files to it
+  # Create a GitHub Release while uploading all files to it
   announce:
     needs:
       - plan
@@ -286,7 +291,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: recursive
-      - name: "Download Github Artifacts"
+      - name: "Download GitHub Artifacts"
         uses: actions/download-artifact@v4
         with:
           pattern: artifacts-*
@@ -296,7 +301,7 @@ jobs:
         run: |
           # Remove the granular manifests
           rm -f artifacts/*-dist-manifest.json
-      - name: Create Github Release
+      - name: Create GitHub Release
         uses: ncipollo/release-action@v1
         with:
           tag: ${{ needs.plan.outputs.tag }}
diff --git a/.gitignore b/.gitignore
index 13c4d0ba..f2e4eb07 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,17 @@
 .DS_Store
 .idea
 .vscode
+crates/wasm/overlay/data
+crates/wasm/overlay/dist
+crates/wasm/overlay/sources
 npm-debug.log*
+target
+target-wasm
+ui/embed/dist
+ui/embed/node_modules
+ui/embed/static/*
+ui/webapp/dist
+ui/webapp/node_modules
+ui/webapp/static/*
 yarn-debug.log*
 yarn-error.log*
-target
-web/node_modules
-web/dist
-web/static/*
-embed/node_modules
-embed/dist
-embed/static/*
diff --git a/Cargo.lock b/Cargo.lock
index e2229a4c..43a75199 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1803,9 +1803,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
 [[package]]
 name = "js-sys"
-version = "0.3.68"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee"
+checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -1855,9 +1855,9 @@ dependencies = [
  "hex",
  "imagesize",
  "itertools 0.12.1",
+ "landscape2-core",
  "lazy_static",
  "leaky-bucket",
- "markdown",
  "md-5",
  "mime_guess",
  "mockall",
@@ -1870,7 +1870,6 @@ dependencies = [
  "rust-embed",
  "serde",
  "serde_json",
- "serde_yaml",
  "sha2",
  "tokio",
  "tower",
@@ -1883,6 +1882,38 @@ dependencies = [
  "which 6.0.1",
 ]
 
+[[package]]
+name = "landscape2-core"
+version = "0.8.1"
+dependencies = [
+ "anyhow",
+ "chrono",
+ "clap",
+ "itertools 0.12.1",
+ "lazy_static",
+ "markdown",
+ "regex",
+ "reqwest 0.12.2",
+ "serde",
+ "serde_yaml",
+ "tracing",
+ "url",
+]
+
+[[package]]
+name = "landscape2-overlay"
+version = "0.8.1"
+dependencies = [
+ "anyhow",
+ "landscape2-core",
+ "reqwest 0.12.2",
+ "serde",
+ "serde-wasm-bindgen",
+ "serde_json",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+]
+
 [[package]]
 name = "lazy_static"
 version = "1.4.0"
@@ -2220,9 +2251,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-src"
-version = "300.1.6+3.1.4"
+version = "300.2.3+3.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "439fac53e092cd7442a3660c85dde4643ab3b5bd39040912388dcdabf6b88085"
+checksum = "5cff92b6f71555b61bb9315f7c64da3ca43d87531622120fea0195fc761b4843"
 dependencies = [
  "cc",
 ]
@@ -3027,6 +3058,17 @@ dependencies = [
  "serde_derive",
 ]
 
+[[package]]
+name = "serde-wasm-bindgen"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8302e169f0eddcc139c70f139d19d6467353af16f9fce27e8c30158036a1e16b"
+dependencies = [
+ "js-sys",
+ "serde",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "serde_derive"
 version = "1.0.197"
@@ -3915,9 +3957,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.91"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f"
+checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
 dependencies = [
  "cfg-if",
  "wasm-bindgen-macro",
@@ -3925,9 +3967,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.91"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b"
+checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
 dependencies = [
  "bumpalo",
  "log",
@@ -3940,9 +3982,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.41"
+version = "0.4.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97"
+checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -3952,9 +3994,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.91"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed"
+checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -3962,9 +4004,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.91"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66"
+checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3975,9 +4017,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.91"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838"
+checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
 
 [[package]]
 name = "wasm-timer"
@@ -3996,9 +4038,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.68"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446"
+checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
diff --git a/Cargo.toml b/Cargo.toml
index d57e8b78..325901c3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,15 +1,20 @@
-[package]
-name = "landscape2"
-description = "Landscape2 CLI tool"
+[workspace]
+resolver = "2"
+members = [
+    "crates/cli",
+    "crates/core",
+    "crates/wasm/overlay"
+]
+
+[workspace.package]
 version = "0.8.1"
 license = "Apache-2.0"
 edition = "2021"
-rust-version = "1.70"
-repository = "https://github.com/cncf/landscape2"
-readme = "README.md"
+rust-version = "1.77"
 authors = ["Sergio Castaño Arteaga", "Cintia Sanchez Garcia"]
+homepage = "https://github.com/cncf/landscape2"
 
-[dependencies]
+[workspace.dependencies]
 anyhow = "1.0.81"
 askama = { version = "0.12.1", features = ["serde-json"] }
 askama_escape = { version = "0.10.3", features = ["json"] }
@@ -33,6 +38,7 @@ leaky-bucket = "1.0.1"
 markdown = "1.0.0-alpha.16"
 md-5 = "0.10.6"
 mime_guess = "2.0.4"
+mockall = "0.12.1"
 num_cpus = "1.16.0"
 octorust = "0.7.0"
 parse_link_header = "0.3.3"
@@ -42,6 +48,7 @@ reqwest = { version = "0.12.2", features = ["json", "native-tls-vendored"] }
 rust-embed = "8.3.0"
 serde = { version = "1.0.197", features = ["derive"] }
 serde_json = "1.0.115"
+serde-wasm-bindgen = "0.6.5"
 serde_yaml = "0.9.34"
 sha2 = "0.10.8"
 tokio = { version = "1.37.0", features = [
@@ -58,14 +65,14 @@ tower-http = { version = "0.5.2", features = ["fs", "set-header"] }
 url = "2.5.0"
 usvg = "0.37.0"
 walkdir = "2.5.0"
-
-[dev-dependencies]
-mockall = "0.12.1"
-
-[build-dependencies]
-anyhow = "1.0.81"
+wasm-bindgen = "0.2.92"
+wasm-bindgen-futures = "0.4.42"
+web-sys = { version = "0.3.69", features = ["console"] }
 which = "6.0.1"
 
+[profile.release]
+lto = true
+
 # The profile that 'cargo dist' will build with
 [profile.dist]
 inherits = "release"
@@ -74,7 +81,7 @@ lto = "thin"
 # Config for 'cargo dist'
 [workspace.metadata.dist]
 # The preferred cargo-dist version to use in CI (Cargo.toml SemVer syntax)
-cargo-dist-version = "0.12.2"
+cargo-dist-version = "0.13.3"
 # CI backends to support
 ci = ["github"]
 # The installers to generate for each app
diff --git a/README.md b/README.md
index e4dd72e5..99302327 100644
--- a/README.md
+++ b/README.md
@@ -73,7 +73,7 @@ The landscape2 CLI tool is also distributed in a [container image](https://galle
 
 ### Building from source
 
-You can build **landscape2** from the source by using [Cargo](https://rustup.rs), the Rust package manager. [yarn](https://classic.yarnpkg.com/lang/en/docs/install/) is required during the installation process to build the web application, which will be embedded into the `landscape2` binary as part of the build process.
+You can build **landscape2** from the source by using [Cargo](https://rustup.rs), the Rust package manager. [wasm-pack](https://rustwasm.github.io/wasm-pack/installer/) is required to build the wasm modules. [yarn](https://classic.yarnpkg.com/lang/en/docs/install/) is also required during the installation process to build the web application, which will be embedded into the `landscape2` binary as part of the build process.
 
 ```text
 cargo install --git https://github.com/cncf/landscape2
diff --git a/askama.toml b/askama.toml
deleted file mode 100644
index 11ed5625..00000000
--- a/askama.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-[general]
-dirs = ["templates", "web/dist"]
diff --git a/build.rs b/build.rs
deleted file mode 100644
index 1bbac29e..00000000
--- a/build.rs
+++ /dev/null
@@ -1,51 +0,0 @@
-use anyhow::{bail, Result};
-use std::process::Command;
-use which::which;
-
-fn main() -> Result<()> {
-    // Tell Cargo to rerun this build script if the source changes
-    println!("cargo:rerun-if-changed=embed/src");
-    println!("cargo:rerun-if-changed=embed/embed.html");
-    println!("cargo:rerun-if-changed=web/src");
-    println!("cargo:rerun-if-changed=web/static");
-    println!("cargo:rerun-if-changed=web/index.html");
-
-    // Check if required external tools are available
-    if which("yarn").is_err() {
-        bail!("yarn not found in PATH (it is required to build the web application)");
-    }
-
-    // Build embeddable views
-    yarn(&["--cwd", "embed", "install"])?;
-    yarn(&["--cwd", "embed", "build"])?;
-
-    // Build web application
-    yarn(&["--cwd", "web", "install"])?;
-    yarn(&["--cwd", "web", "build"])?;
-
-    Ok(())
-}
-
-/// Run yarn command with the provided arguments.
-fn yarn(args: &[&str]) -> Result<()> {
-    // Setup command based on the target OS
-    let mut cmd;
-    if cfg!(target_os = "windows") {
-        cmd = Command::new("cmd");
-        cmd.args(["/C", "yarn"]);
-    } else {
-        cmd = Command::new("yarn");
-    }
-    cmd.args(args);
-
-    // Run command and check output
-    let output = cmd.output()?;
-    if !output.status.success() {
-        bail!(
-            "\n\n> {cmd:?} (stderr)\n{}\n> {cmd:?} (stdout)\n{}\n",
-            String::from_utf8(output.stderr)?,
-            String::from_utf8(output.stdout)?
-        );
-    }
-    Ok(())
-}
diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml
new file mode 100644
index 00000000..b8a9a3fa
--- /dev/null
+++ b/crates/cli/Cargo.toml
@@ -0,0 +1,61 @@
+[package]
+name = "landscape2"
+description = "Landscape2 CLI tool"
+repository = "https://github.com/cncf/landscape2"
+readme = "../../README.md"
+version.workspace = true
+license.workspace = true
+edition.workspace = true
+rust-version.workspace = true
+authors.workspace = true
+homepage.workspace = true
+
+[dependencies]
+anyhow = { workspace = true }
+askama = { workspace = true }
+askama_escape = { workspace = true }
+async-trait = { workspace = true }
+aws-config = { workspace = true }
+aws-sdk-s3 = { workspace = true }
+axum = { workspace = true }
+base64 = { workspace = true }
+chrono = { workspace = true }
+clap = { workspace = true }
+csv = { workspace = true }
+deadpool = { workspace = true }
+dirs = { workspace = true }
+futures = { workspace = true }
+headless_chrome = { workspace = true }
+hex = { workspace = true }
+imagesize = { workspace = true }
+itertools = { workspace = true }
+landscape2-core = { path = "../core" }
+lazy_static = { workspace = true }
+leaky-bucket = { workspace = true }
+md-5 = { workspace = true }
+mime_guess = { workspace = true }
+num_cpus = { workspace = true }
+octorust = { workspace = true }
+parse_link_header = { workspace = true }
+qrcode = { workspace = true }
+regex = { workspace = true }
+reqwest = { workspace = true }
+rust-embed = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+sha2 = { workspace = true }
+tokio = { workspace = true }
+tracing = { workspace = true }
+tracing-subscriber = { workspace = true }
+tower = { workspace = true }
+tower-http = { workspace = true }
+url = { workspace = true }
+usvg = { workspace = true }
+walkdir = { workspace = true }
+
+[dev-dependencies]
+mockall = { workspace = true }
+
+[build-dependencies]
+anyhow = { workspace = true }
+which = { workspace = true }
diff --git a/Dockerfile b/crates/cli/Dockerfile
similarity index 77%
rename from Dockerfile
rename to crates/cli/Dockerfile
index fcc85b3f..649e3c62 100644
--- a/Dockerfile
+++ b/crates/cli/Dockerfile
@@ -1,15 +1,11 @@
 # Build CLI tool
 FROM rust:1-alpine3.19 as builder
-RUN apk --no-cache add musl-dev perl make libconfig-dev openssl-dev yarn
+RUN apk --no-cache add musl-dev perl make libconfig-dev openssl-dev yarn wasm-pack binaryen
 WORKDIR /landscape2
-COPY embed embed
-COPY src src
-COPY templates templates
-COPY web web
-COPY build.rs ./
-COPY askama.toml ./
+COPY crates crates
+COPY ui ui
 COPY Cargo.* ./
-WORKDIR /landscape2/src
+WORKDIR /landscape2/crates/cli
 RUN cargo build --release
 
 # Final stage
diff --git a/crates/cli/askama.toml b/crates/cli/askama.toml
new file mode 100644
index 00000000..3472fb03
--- /dev/null
+++ b/crates/cli/askama.toml
@@ -0,0 +1,2 @@
+[general]
+dirs = ["templates", "../../ui/webapp/dist"]
diff --git a/crates/cli/build.rs b/crates/cli/build.rs
new file mode 100644
index 00000000..d0312aad
--- /dev/null
+++ b/crates/cli/build.rs
@@ -0,0 +1,112 @@
+use anyhow::{bail, Result};
+use std::{
+    path::{Path, PathBuf},
+    process::Command,
+};
+use which::which;
+
+fn main() -> Result<()> {
+    // Tell Cargo to rerun this build script if the source changes
+    println!("cargo:rerun-if-changed=../wasm/overlay");
+    println!("cargo:rerun-if-changed=../../ui/embed/src");
+    println!("cargo:rerun-if-changed=../../ui/embed/embed.html");
+    println!("cargo:rerun-if-changed=../../ui/webapp/src");
+    println!("cargo:rerun-if-changed=../../ui/webapp/static");
+    println!("cargo:rerun-if-changed=../../ui/webapp/index.html");
+
+    // Check if required external tools are available
+    if which("cargo").is_err() {
+        bail!("cargo not found in PATH (required)");
+    }
+    if which("wasm-pack").is_err() {
+        bail!("wasm-pack not found in PATH (required to build the wasm modules)");
+    }
+    if which("yarn").is_err() {
+        bail!("yarn not found in PATH (required to build the web application)");
+    }
+
+    // Build overlay wasm module
+    let mut wasm_profile = "--dev";
+    if let Ok(profile) = std::env::var("PROFILE") {
+        if profile == "release" {
+            wasm_profile = "--release";
+        }
+    };
+    let wasm_target_dir = workspace_dir()?.join("target-wasm").to_string_lossy().to_string();
+    run(
+        "wasm-pack",
+        &[
+            "build",
+            "--target",
+            "web",
+            "--out-dir",
+            "../../../ui/webapp/wasm/overlay",
+            wasm_profile,
+            "../wasm/overlay",
+            "--target-dir",
+            &wasm_target_dir,
+        ],
+    )?;
+
+    // Build embed
+    run("yarn", &["--cwd", "../../ui/embed", "install"])?;
+    run("yarn", &["--cwd", "../../ui/embed", "build"])?;
+
+    // Build web application
+    run("yarn", &["--cwd", "../../ui/webapp", "install"])?;
+    run("yarn", &["--cwd", "../../ui/webapp", "build"])?;
+
+    Ok(())
+}
+
+/// Return workspace directory.
+fn workspace_dir() -> Result<PathBuf> {
+    // Run `cargo locate-project` command to get workspace directory
+    let mut cmd = new_cmd("cargo");
+    cmd.args(["locate-project", "--workspace", "--message-format=plain"]);
+    let output = cmd.output()?;
+    if !output.status.success() {
+        bail!(
+            "error getting workspace directory: {}",
+            String::from_utf8(output.stderr)?
+        );
+    }
+
+    // Extract workspace directory from `cargo locate-project` output
+    let workspace_dir = Path::new(String::from_utf8(output.stdout)?.trim())
+        .parent()
+        .expect("parent to exist")
+        .to_path_buf();
+
+    Ok(workspace_dir)
+}
+
+/// Helper function to run a command.
+fn run(program: &str, args: &[&str]) -> Result<()> {
+    // Setup command
+    let mut cmd = new_cmd(program);
+    cmd.args(args);
+
+    // Execute it and check output
+    let output = cmd.output()?;
+    if !output.status.success() {
+        bail!(
+            "\n\n> {cmd:?} (stderr)\n{}\n> {cmd:?} (stdout)\n{}\n",
+            String::from_utf8(output.stderr)?,
+            String::from_utf8(output.stdout)?
+        );
+    }
+
+    Ok(())
+}
+
+/// Helper function to setup a command based on the target OS.
+fn new_cmd(program: &str) -> Command {
+    if cfg!(target_os = "windows") {
+        let mut cmd = Command::new("cmd");
+        cmd.args(["/C", program]);
+        cmd
+    } else {
+        Command::new(program)
+    }
+}
diff --git a/src/build/api.rs b/crates/cli/src/build/api.rs
similarity index 100%
rename from src/build/api.rs
rename to crates/cli/src/build/api.rs
diff --git a/src/build/cache.rs b/crates/cli/src/build/cache.rs
similarity index 100%
rename from src/build/cache.rs
rename to crates/cli/src/build/cache.rs
diff --git a/src/build/clomonitor.rs b/crates/cli/src/build/clomonitor.rs
similarity index 100%
rename from src/build/clomonitor.rs
rename to crates/cli/src/build/clomonitor.rs
diff --git a/src/build/crunchbase.rs b/crates/cli/src/build/crunchbase.rs
similarity index 58%
rename from src/build/crunchbase.rs
rename to crates/cli/src/build/crunchbase.rs
index 6a1d1bc3..a508c6dc 100644
--- a/src/build/crunchbase.rs
+++ b/crates/cli/src/build/crunchbase.rs
@@ -5,8 +5,9 @@
 use super::{cache::Cache, LandscapeData};
 use anyhow::{bail, format_err, Result};
 use async_trait::async_trait;
-use chrono::{DateTime, Datelike, NaiveDate, Utc};
+use chrono::{Datelike, NaiveDate, Utc};
 use futures::stream::{self, StreamExt};
+use landscape2_core::data::{Acquisition, CrunchbaseData, FundingRound, Organization};
 use lazy_static::lazy_static;
 use leaky_bucket::RateLimiter;
 #[cfg(test)]
@@ -92,7 +93,7 @@ pub(crate) async fn collect_crunchbase_data(
             // Otherwise we pull it from Crunchbase if a key was provided
             else if let Some(cb) = cb.clone() {
                 limiter.acquire_one().await;
-                (url.clone(), Organization::new(cb, &url).await)
+                (url.clone(), collect_organization_data(cb, &url).await)
             } else {
                 (url.clone(), Err(format_err!("no api key provided")))
             }
@@ -120,198 +121,80 @@ pub(crate) async fn collect_crunchbase_data(
     Ok(crunchbase_data)
 }
 
-/// Type alias to represent some organizations' Crunchbase data.
-pub(crate) type CrunchbaseData = BTreeMap<CrunchbaseUrl, Organization>;
-
-/// Type alias to represent a crunchbase url.
-type CrunchbaseUrl = String;
-
-/// Organization information collected from Crunchbase.
-#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
-pub(crate) struct Organization {
-    pub generated_at: DateTime<Utc>,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub acquisitions: Option<Vec<Acquisition>>,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub city: Option<String>,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub company_type: Option<String>,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub country: Option<String>,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub description: Option<String>,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub funding: Option<i64>,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub funding_rounds: Option<Vec<FundingRound>>,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub homepage_url: Option<String>,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub categories: Option<Vec<String>>,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub kind: Option<String>,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub linkedin_url: Option<String>,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub name: Option<String>,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub num_employees_max: Option<i64>,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub num_employees_min: Option<i64>,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub region: Option<String>,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub stock_exchange: Option<String>,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub ticker: Option<String>,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub twitter_url: Option<String>,
-}
-
-impl Organization {
-    /// Create a new Organization instance from information obtained from the
-    /// Crunchbase API.
-    async fn new(cb: DynCB, cb_url: &str) -> Result<Self> {
-        // Collect some information from Crunchbase
-        let permalink = get_permalink(cb_url)?;
-        let cb_org = cb.get_organization(&permalink).await?;
-
-        // Prepare acquisitions
-        let acquisitions = cb_org
-            .cards
-            .acquiree_acquisitions
-            .map(|cb_acquisitions| {
-                cb_acquisitions
-                    .into_iter()
-                    .map(Into::into)
-                    .filter(|a: &Acquisition| {
-                        if let Some(announced_on) = a.announced_on {
-                            // Only acquisitions done in the last 6 years
-                            if Utc::now().year() - announced_on.year() < 6 {
-                                return true;
-                            }
+/// Collect organization data from Crunchbase.
+#[instrument(skip_all, err)]
+async fn collect_organization_data(cb: DynCB, cb_url: &str) -> Result<Organization> {
+    // Collect some information from Crunchbase
+    let permalink = get_permalink(cb_url)?;
+    let cb_org = cb.get_organization(&permalink).await?;
+
+    // Prepare acquisitions
+    let acquisitions = cb_org
+        .cards
+        .acquiree_acquisitions
+        .map(|cb_acquisitions| {
+            cb_acquisitions
+                .into_iter()
+                .map(new_acquisition_from)
+                .filter(|a: &Acquisition| {
+                    if let Some(announced_on) = a.announced_on {
+                        // Only acquisitions done in the last 6 years
+                        if Utc::now().year() - announced_on.year() < 6 {
+                            return true;
                         }
-                        false
-                    })
-                    .collect()
-            })
-            .filter(|vec: &Vec<Acquisition>| !vec.is_empty());
-
-        // Prepare funding rounds
-        let funding_rounds = cb_org
-            .cards
-            .raised_funding_rounds
-            .map(|cb_funding_rounds| cb_funding_rounds.into_iter().map(Into::into).collect())
-            .filter(|vec: &Vec<FundingRound>| !vec.is_empty());
-
-        // Prepare number of employees
-        let (num_employees_min, num_employees_max) = match cb_org.properties.num_employees_enum {
-            Some(value) => match value.as_str() {
-                "c_00001_00010" => (Some(1), Some(10)),
-                "c_00011_00050" => (Some(11), Some(50)),
-                "c_00051_00100" => (Some(51), Some(100)),
-                "c_00101_00250" => (Some(101), Some(250)),
-                "c_00251_00500" => (Some(251), Some(500)),
-                "c_00501_01000" => (Some(501), Some(1000)),
-                "c_01001_05000" => (Some(1001), Some(5000)),
-                "c_05001_10000" => (Some(5001), Some(10000)),
-                "c_10001_max" => (Some(10001), None),
-                _ => (None, None),
-            },
-            None => (None, None),
-        };
-
-        // Prepare organization instance using the information collected
-        Ok(Organization {
-            generated_at: Utc::now(),
-            acquisitions,
-            city: get_location_value(&cb_org.cards.headquarters_address, "city"),
-            company_type: cb_org.properties.company_type,
-            country: get_location_value(&cb_org.cards.headquarters_address, "country"),
-            description: cb_org.properties.short_description,
-            funding: cb_org.properties.funding_total.as_ref().and_then(|f| f.value_usd),
-            funding_rounds,
-            homepage_url: cb_org.properties.website.and_then(|v| v.value),
-            categories: cb_org.properties.categories.and_then(|c| c.into_iter().map(|c| c.value).collect()),
-            kind: cb_org.properties.funding_total.map(|_| "funding".to_string()),
-            linkedin_url: cb_org.properties.linkedin.and_then(|v| v.value),
-            name: cb_org.properties.name,
-            num_employees_max,
-            num_employees_min,
-            region: get_location_value(&cb_org.cards.headquarters_address, "region"),
-            stock_exchange: cb_org.properties.stock_exchange_symbol,
-            ticker: cb_org.properties.stock_symbol.and_then(|v| v.value),
-            twitter_url: cb_org.properties.twitter.and_then(|v| v.value),
+                    }
+                    false
+                })
+                .collect()
         })
-    }
-}
-
-/// Acquisition details collected from Crunchbase.
-#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
-pub(crate) struct Acquisition {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub acquiree_cb_permalink: Option<String>,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub acquiree_name: Option<String>,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub announced_on: Option<NaiveDate>,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub price: Option<u64>,
-}
-
-impl From<CBAcquisition> for Acquisition {
-    fn from(cba: CBAcquisition) -> Self {
-        Acquisition {
-            acquiree_cb_permalink: cba.acquiree_identifier.as_ref().and_then(|i| i.permalink.clone()),
-            acquiree_name: cba.acquiree_identifier.and_then(|i| i.value.clone()),
-            announced_on: cba.announced_on.and_then(|a| a.value),
-            price: cba.price.and_then(|p| p.value_usd),
-        }
-    }
-}
-
-/// FundingRound details collected from Crunchbase.
-#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
-pub(crate) struct FundingRound {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub amount: Option<u64>,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub announced_on: Option<NaiveDate>,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub kind: Option<String>,
-}
+        .filter(|vec: &Vec<Acquisition>| !vec.is_empty());
+
+    // Prepare funding rounds
+    let funding_rounds = cb_org
+        .cards
+        .raised_funding_rounds
+        .map(|cb_funding_rounds| cb_funding_rounds.into_iter().map(new_funding_round_from).collect())
+        .filter(|vec: &Vec<FundingRound>| !vec.is_empty());
+
+    // Prepare number of employees
+    let (num_employees_min, num_employees_max) = match cb_org.properties.num_employees_enum {
+        Some(value) => match value.as_str() {
+            "c_00001_00010" => (Some(1), Some(10)),
+            "c_00011_00050" => (Some(11), Some(50)),
+            "c_00051_00100" => (Some(51), Some(100)),
+            "c_00101_00250" => (Some(101), Some(250)),
+            "c_00251_00500" => (Some(251), Some(500)),
+            "c_00501_01000" => (Some(501), Some(1000)),
+            "c_01001_05000" => (Some(1001), Some(5000)),
+            "c_05001_10000" => (Some(5001), Some(10000)),
+            "c_10001_max" => (Some(10001), None),
+            _ => (None, None),
+        },
+        None => (None, None),
+    };
 
-impl From<CBFundingRound> for FundingRound {
-    fn from(cbfr: CBFundingRound) -> Self {
-        FundingRound {
-            amount: cbfr.money_raised.and_then(|p| p.value_usd),
-            announced_on: cbfr.announced_on,
-            kind: cbfr.investment_type,
-        }
-    }
+    // Prepare organization instance using the information collected
+    Ok(Organization {
+        generated_at: Utc::now(),
+        acquisitions,
+        city: get_location_value(&cb_org.cards.headquarters_address, "city"),
+        company_type: cb_org.properties.company_type,
+        country: get_location_value(&cb_org.cards.headquarters_address, "country"),
+        description: cb_org.properties.short_description,
+        funding: cb_org.properties.funding_total.as_ref().and_then(|f| f.value_usd),
+        funding_rounds,
+        homepage_url: cb_org.properties.website.and_then(|v| v.value),
+        categories: cb_org.properties.categories.and_then(|c| c.into_iter().map(|c| c.value).collect()),
+        kind: cb_org.properties.funding_total.map(|_| "funding".to_string()),
+        linkedin_url: cb_org.properties.linkedin.and_then(|v| v.value),
+        name: cb_org.properties.name,
+        num_employees_max,
+        num_employees_min,
+        region: get_location_value(&cb_org.cards.headquarters_address, "region"),
+        stock_exchange: cb_org.properties.stock_exchange_symbol,
+        ticker: cb_org.properties.stock_symbol.and_then(|v| v.value),
+        twitter_url: cb_org.properties.twitter.and_then(|v| v.value),
+    })
 }
 
 /// Crunchbase API base url.
@@ -499,3 +382,22 @@ fn get_permalink(cb_url: &str) -> Result<String> {
     let c = CRUNCHBASE_URL.captures(cb_url).ok_or_else(|| format_err!("invalid crunchbase url"))?;
     Ok(c["permalink"].to_string())
 }
+
+/// Create a new Acquisition instance from the Crunchbase data provided.
+fn new_acquisition_from(cba: CBAcquisition) -> Acquisition {
+    Acquisition {
+        acquiree_cb_permalink: cba.acquiree_identifier.as_ref().and_then(|i| i.permalink.clone()),
+        acquiree_name: cba.acquiree_identifier.and_then(|i| i.value.clone()),
+        announced_on: cba.announced_on.and_then(|a| a.value),
+        price: cba.price.and_then(|p| p.value_usd),
+    }
+}
+
+/// Create a new FundingRound instance from the Crunchbase data provided.
+fn new_funding_round_from(cbfr: CBFundingRound) -> FundingRound {
+    FundingRound {
+        amount: cbfr.money_raised.and_then(|p| p.value_usd),
+        announced_on: cbfr.announced_on,
+        kind: cbfr.investment_type,
+    }
+}
diff --git a/src/build/export.rs b/crates/cli/src/build/export.rs
similarity index 100%
rename from src/build/export.rs
rename to crates/cli/src/build/export.rs
diff --git a/src/build/github.rs b/crates/cli/src/build/github.rs
similarity index 73%
rename from src/build/github.rs
rename to crates/cli/src/build/github.rs
index 07f0d798..c9a844b1 100644
--- a/src/build/github.rs
+++ b/crates/cli/src/build/github.rs
@@ -8,6 +8,7 @@ use async_trait::async_trait;
 use chrono::{DateTime, Utc};
 use deadpool::unmanaged::{Object, Pool};
 use futures::stream::{self, StreamExt};
+use landscape2_core::data::{Commit, Contributors, GithubData, Release, RepositoryGithubData};
 use lazy_static::lazy_static;
 #[cfg(test)]
 use mockall::automock;
@@ -15,7 +16,6 @@ use octorust::auth::Credentials;
 use octorust::types::{FullRepository, ParticipationStats};
 use regex::Regex;
 use reqwest::header::{self, HeaderMap, HeaderValue};
-use serde::{Deserialize, Serialize};
 use std::collections::BTreeMap;
 use std::env;
 use tracing::{debug, instrument, warn};
@@ -102,13 +102,13 @@ pub(crate) async fn collect_github_data(cache: &Cache, landscape_data: &Landscap
             // Otherwise we pull it from GitHub if any tokens were provided
             else if let Some(gh_pool) = &gh_pool {
                 let gh = gh_pool.get().await.expect("token -when available-");
-                (url.clone(), Repository::new(gh, &url).await)
+                (url.clone(), collect_repository_data(gh, &url).await)
             } else {
                 (url.clone(), Err(format_err!("no tokens provided")))
             }
         })
         .buffer_unordered(concurrency)
-        .collect::<BTreeMap<String, Result<Repository>>>()
+        .collect::<BTreeMap<String, Result<RepositoryGithubData>>>()
         .await
         .into_iter()
         .filter_map(|(url, result)| {
@@ -127,116 +127,42 @@ pub(crate) async fn collect_github_data(cache: &Cache, landscape_data: &Landscap
     Ok(github_data)
 }
 
-/// Type alias to represent some repositories' GitHub data.
-pub(crate) type GithubData = BTreeMap<RepositoryUrl, Repository>;
-
-/// Type alias to represent a GitHub repository url.
-pub(crate) type RepositoryUrl = String;
-
-/// Repository information collected from GitHub.
-#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
-pub(crate) struct Repository {
-    pub contributors: Contributors,
-    pub description: String,
-    pub generated_at: DateTime<Utc>,
-    pub latest_commit: Commit,
-    pub participation_stats: Vec<i64>,
-    pub stars: i64,
-    pub url: String,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub first_commit: Option<Commit>,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub languages: Option<BTreeMap<String, i64>>,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub latest_release: Option<Release>,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub license: Option<String>,
-}
-
-impl Repository {
-    /// Create a new Repository instance from information available on GitHub.
-    async fn new(gh: Object<DynGH>, repo_url: &str) -> Result<Self> {
-        // Collect some information from GitHub
-        let (owner, repo) = get_owner_and_repo(repo_url)?;
-        let gh_repo = gh.get_repository(&owner, &repo).await?;
-        let contributors_count = gh.get_contributors_count(&owner, &repo).await?;
-        let first_commit = gh.get_first_commit(&owner, &repo, &gh_repo.default_branch).await?;
-        let languages = gh.get_languages(&owner, &repo).await?;
-        let latest_commit = gh.get_latest_commit(&owner, &repo, &gh_repo.default_branch).await?;
-        let latest_release = gh.get_latest_release(&owner, &repo).await?;
-        let participation_stats = gh.get_participation_stats(&owner, &repo).await?.all;
-
-        // Prepare repository instance using the information collected
-        Ok(Repository {
-            generated_at: Utc::now(),
-            contributors: Contributors {
-                count: contributors_count,
-                url: format!("https://github.com/{owner}/{repo}/graphs/contributors"),
-            },
-            description: gh_repo.description,
-            first_commit,
-            languages,
-            latest_commit,
-            latest_release,
-            license: gh_repo.license.and_then(|l| {
-                if l.name == "NOASSERTION" {
-                    None
-                } else {
-                    Some(l.name)
-                }
-            }),
-            participation_stats,
-            stars: gh_repo.stargazers_count,
-            url: gh_repo.html_url,
-        })
-    }
-}
-
-/// Commit information.
-#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
-pub(crate) struct Commit {
-    pub ts: Option<DateTime<Utc>>,
-    pub url: String,
-}
-
-impl From<octorust::types::CommitDataType> for Commit {
-    fn from(value: octorust::types::CommitDataType) -> Self {
-        let mut commit = Commit {
-            url: value.html_url,
-            ts: None,
-        };
-        if let Some(author) = value.commit.author {
-            commit.ts = Some(DateTime::parse_from_rfc3339(&author.date).expect("date to be valid").into());
-        }
-        commit
-    }
-}
-
-/// Contributors information.
-#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
-pub(crate) struct Contributors {
-    pub count: usize,
-    pub url: String,
-}
-
-/// Release information.
-#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
-pub(crate) struct Release {
-    pub ts: Option<DateTime<Utc>>,
-    pub url: String,
-}
-
-impl From<octorust::types::Release> for Release {
-    fn from(value: octorust::types::Release) -> Self {
-        Self {
-            ts: value.published_at,
-            url: value.html_url,
-        }
-    }
+/// Collect repository data from GitHub.
+#[instrument(skip_all, err)]
+async fn collect_repository_data(gh: Object<DynGH>, repo_url: &str) -> Result<RepositoryGithubData> {
+    // Collect some information from GitHub
+    let (owner, repo) = get_owner_and_repo(repo_url)?;
+    let gh_repo = gh.get_repository(&owner, &repo).await?;
+    let contributors_count = gh.get_contributors_count(&owner, &repo).await?;
+    let first_commit = gh.get_first_commit(&owner, &repo, &gh_repo.default_branch).await?;
+    let languages = gh.get_languages(&owner, &repo).await?;
+    let latest_commit = gh.get_latest_commit(&owner, &repo, &gh_repo.default_branch).await?;
+    let latest_release = gh.get_latest_release(&owner, &repo).await?;
+    let participation_stats = gh.get_participation_stats(&owner, &repo).await?.all;
+
+    // Prepare repository instance using the information collected
+    Ok(RepositoryGithubData {
+        generated_at: Utc::now(),
+        contributors: Contributors {
+            count: contributors_count,
+            url: format!("https://github.com/{owner}/{repo}/graphs/contributors"),
+        },
+        description: gh_repo.description,
+        first_commit,
+        languages,
+        latest_commit,
+        latest_release,
+        license: gh_repo.license.and_then(|l| {
+            if l.name == "NOASSERTION" {
+                None
+            } else {
+                Some(l.name)
+            }
+        }),
+        participation_stats,
+        stars: gh_repo.stargazers_count,
+        url: gh_repo.html_url,
+    })
 }
 
 /// GitHub API base url.
@@ -321,8 +247,8 @@ impl GH for GHApi {
     }
 
     /// [GH::get_first_commit]
-    #[instrument(skip(self), err)]
     #[allow(clippy::cast_possible_wrap)]
+    #[instrument(skip(self), err)]
     async fn get_first_commit(&self, owner: &str, repo: &str, ref_: &str) -> Result<Option<Commit>> {
         // Get last commits page
         let url = format!("{GITHUB_API_URL}/repos/{owner}/{repo}/commits?sha={ref_}&per_page=1");
@@ -338,7 +264,7 @@ impl GH for GHApi {
             .body
             .pop()
         {
-            return Ok(Some(Commit::from(commit)));
+            return Ok(Some(new_commit_from(commit)));
         }
         Ok(None)
     }
@@ -355,14 +281,14 @@ impl GH for GHApi {
     #[instrument(skip(self), err)]
     async fn get_latest_commit(&self, owner: &str, repo: &str, ref_: &str) -> Result<Commit> {
         let response = self.gh_client.repos().get_commit(owner, repo, 1, 1, ref_).await?;
-        Ok(response.body.into())
+        Ok(new_commit_from(response.body))
     }
 
     /// [GH::get_latest_release]
     #[instrument(skip(self), err)]
     async fn get_latest_release(&self, owner: &str, repo: &str) -> Result<Option<Release>> {
         match self.gh_client.repos().get_latest_release(owner, repo).await {
-            Ok(response) => Ok(Some(response.body.into())),
+            Ok(response) => Ok(Some(new_release_from(response.body))),
             Err(err) => {
                 if err.to_string().to_lowercase().contains("not found") {
                     return Ok(None);
@@ -412,3 +338,23 @@ fn get_owner_and_repo(repo_url: &str) -> Result<(String, String)> {
     let c = GITHUB_REPO_URL.captures(repo_url).ok_or_else(|| format_err!("invalid repository url"))?;
     Ok((c["owner"].to_string(), c["repo"].to_string()))
 }
+
+/// Create a new commit instance from the octorust commit data provided.
+fn new_commit_from(value: octorust::types::CommitDataType) -> Commit {
+    let mut commit = Commit {
+        url: value.html_url,
+        ts: None,
+    };
+    if let Some(author) = value.commit.author {
+        commit.ts = Some(DateTime::parse_from_rfc3339(&author.date).expect("date to be valid").into());
+    }
+    commit
+}
+
+/// Create a new release instance from the octorust release data provided.
+fn new_release_from(value: octorust::types::Release) -> Release {
+    Release {
+        ts: value.published_at,
+        url: value.html_url,
+    }
+}
diff --git a/src/build/logos.rs b/crates/cli/src/build/logos.rs
similarity index 90%
rename from src/build/logos.rs
rename to crates/cli/src/build/logos.rs
index c455ef37..bb2aab57 100644
--- a/src/build/logos.rs
+++ b/crates/cli/src/build/logos.rs
@@ -1,18 +1,17 @@
 //! This module provides some helper functions to prepare logos to be displayed
 //! on the landscape web application.
 
-use crate::LogosSource;
+use super::settings::LogosViewbox;
 use anyhow::{bail, Result};
+use clap::Args;
 use lazy_static::lazy_static;
 use regex::bytes::Regex;
 use reqwest::StatusCode;
 use serde::{Deserialize, Serialize};
 use sha2::{Digest, Sha256};
-use std::fs;
+use std::{fs, path::PathBuf};
 use usvg::{NodeExt, Rect, TreeParsing};
 
-use super::settings::LogosViewbox;
-
 lazy_static! {
     /// Regular expression used to remove the SVG logos' title.
     static ref SVG_TITLE: Regex = Regex::new("<title>.*</title>",).expect("exprs in SVG_TITLE to be valid");
@@ -21,6 +20,19 @@ lazy_static! {
     static ref SVG_VIEWBOX: Regex = Regex::new(r#"viewBox="[0-9. ]*""#).expect("expr in SVG_VIEWBOX to be valid");
 }
 
+/// Landscape logos source.
+#[derive(Args, Clone, Default)]
+#[group(required = true, multiple = false)]
+pub struct LogosSource {
+    /// Local path where the logos are stored.
+    #[arg(long)]
+    pub logos_path: Option<PathBuf>,
+
+    /// Base URL where the logos are hosted.
+    #[arg(long)]
+    pub logos_url: Option<String>,
+}
+
 /// Represents some information about an item's logo.
 #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
 pub(crate) struct Logo {
diff --git a/src/build/mod.rs b/crates/cli/src/build/mod.rs
similarity index 86%
rename from src/build/mod.rs
rename to crates/cli/src/build/mod.rs
index 83af8e87..b6d36025 100644
--- a/src/build/mod.rs
+++ b/crates/cli/src/build/mod.rs
@@ -3,33 +3,37 @@
 use self::{
     cache::Cache,
     crunchbase::collect_crunchbase_data,
-    datasets::{Datasets, NewDatasetsInput},
     export::generate_items_csv,
     github::collect_github_data,
-    logos::prepare_logo,
-    projects::{generate_projects_csv, Project, ProjectsMd},
-    settings::{Analytics, LogosViewbox, Osano},
+    logos::{prepare_logo, LogosSource},
+    projects::{generate_projects_csv, ProjectsMd},
 };
 use crate::{
-    build::api::{Api, ApiSources},
-    serve, BuildArgs, GuideSource, LogosSource, ServeArgs,
+    build::{
+        api::{Api, ApiSources},
+        projects::collect_projects,
+    },
+    serve::{self, serve},
 };
 use anyhow::{bail, Context, Result};
 use askama::Template;
 use base64::{engine::general_purpose::STANDARD as b64, Engine as _};
-pub(crate) use data::LandscapeData;
 use futures::stream::{self, StreamExt};
-pub(crate) use guide::LandscapeGuide;
 use headless_chrome::{
     browser,
     protocol::cdp::Page::{self, CaptureScreenshotFormatOption},
     types::PrintToPdfOptions,
     Browser, LaunchOptions,
 };
+use landscape2_core::{
+    data::{self, DataSource, LandscapeData},
+    datasets::{Datasets, NewDatasetsInput},
+    guide::{GuideSource, LandscapeGuide},
+    settings::{self, Analytics, LandscapeSettings, LogosViewbox, Osano, SettingsSource},
+};
 use qrcode::render::svg;
 use reqwest::StatusCode;
 use rust_embed::RustEmbed;
-pub(crate) use settings::LandscapeSettings;
 use std::{
     collections::HashMap,
     ffi::OsStr,
@@ -48,15 +52,10 @@ mod api;
 mod cache;
 mod clomonitor;
 mod crunchbase;
-mod data;
-mod datasets;
 mod export;
 mod github;
-mod guide;
 mod logos;
 mod projects;
-mod settings;
-mod stats;
 
 /// Maximum number of CLOMonitor reports summaries to fetch concurrently.
 const CLOMONITOR_MAX_CONCURRENCY: usize = 10;
@@ -79,24 +78,55 @@ const IMAGES_PATH: &str = "images";
 /// Path where the item logos will be written to in the output directory.
 const LOGOS_PATH: &str = "logos";
 
+/// Path where the data sources files will be written to in the output dir.
+const SOURCES_PATH: &str = "sources";
+
 /// Maximum number of logos to prepare concurrently.
 const PREPARE_LOGOS_MAX_CONCURRENCY: usize = 20;
 
 /// Embed landscape embeddable views assets into binary.
 /// (these assets will be built automatically from the build script)
 #[derive(RustEmbed)]
-#[folder = "embed/dist"]
+#[folder = "../../ui/embed/dist"]
 struct EmbedAssets;
 
 /// Embed web application assets into binary.
 /// (these assets will be built automatically from the build script)
 #[derive(RustEmbed)]
-#[folder = "web/dist"]
-struct WebAssets;
+#[folder = "../../ui/webapp/dist"]
+struct WebappAssets;
+
+/// Build arguments.
+#[derive(clap::Args)]
+pub struct BuildArgs {
+    /// Cache directory.
+    #[arg(long)]
+    pub cache_dir: Option<PathBuf>,
+
+    /// Data source.
+    #[command(flatten)]
+    pub data_source: DataSource,
+
+    /// Guide source.
+    #[command(flatten)]
+    pub guide_source: GuideSource,
+
+    /// Logos source.
+    #[command(flatten)]
+    pub logos_source: LogosSource,
+
+    /// Output directory to write files to.
+    #[arg(long)]
+    pub output_dir: PathBuf,
+
+    /// Settings source.
+    #[command(flatten)]
+    pub settings_source: SettingsSource,
+}
 
 /// Build landscape website.
 #[instrument(skip_all)]
-pub(crate) async fn build(args: &BuildArgs) -> Result<()> {
+pub async fn build(args: &BuildArgs) -> Result<()> {
     info!("building landscape website..");
     let start = Instant::now();
 
@@ -115,14 +145,6 @@ pub(crate) async fn build(args: &BuildArgs) -> Result<()> {
     // Get landscape settings from the source provided
     let mut settings = LandscapeSettings::new(&args.settings_source).await?;
 
-    // Add some extra information to the landscape based on the settings
-    landscape_data.add_featured_items_data(&settings)?;
-    landscape_data.add_member_subcategory(&settings.members_category);
-    landscape_data.add_tags(&settings);
-
-    // Fetch some settings images and update their urls to the local copy
-    prepare_settings_images(&mut settings, &args.output_dir).await?;
-
     // Prepare guide and copy it to the output directory
     let guide = prepare_guide(&args.guide_source, &args.output_dir).await?;
 
@@ -135,8 +157,8 @@ pub(crate) async fn build(args: &BuildArgs) -> Result<()> {
     )
     .await?;
 
-    // Collect CLOMonitor reports summaries and copy them to the output directory
-    collect_clomonitor_reports(&cache, &mut landscape_data, &settings, &args.output_dir).await?;
+    // Fetch some settings images and update their urls to the local copy
+    prepare_settings_images(&mut settings, &args.output_dir).await?;
 
     // Collect data from external services
     let (crunchbase_data, github_data) = tokio::try_join!(
@@ -144,9 +166,16 @@ pub(crate) async fn build(args: &BuildArgs) -> Result<()> {
         collect_github_data(&cache, &landscape_data)
     )?;
 
-    // Add data collected from external services to the landscape data
-    landscape_data.add_crunchbase_data(&crunchbase_data)?;
-    landscape_data.add_github_data(&github_data)?;
+    // Enrich landscape data with some extra information from the settings and
+    // external services
+    landscape_data.add_crunchbase_data(&crunchbase_data);
+    landscape_data.add_featured_items_data(&settings);
+    landscape_data.add_github_data(&github_data);
+    landscape_data.add_member_subcategory(&settings.members_category);
+    landscape_data.add_tags(&settings);
+
+    // Collect CLOMonitor reports summaries and copy them to the output directory
+    collect_clomonitor_reports(&cache, &mut landscape_data, &settings, &args.output_dir).await?;
 
     // Generate API data files
     generate_api(
@@ -176,9 +205,9 @@ pub(crate) async fn build(args: &BuildArgs) -> Result<()> {
     // Render index file and write it to the output directory
     render_index(&settings.analytics, &datasets, &settings.osano, &args.output_dir)?;
 
-    // Copy embed and web assets files to the output directory
+    // Copy embed and web application assets files to the output directory
     copy_embed_assets(&args.output_dir)?;
-    copy_web_assets(&args.output_dir)?;
+    copy_webapp_assets(&args.output_dir)?;
 
     // Generate items.csv file
     generate_items_csv_file(&landscape_data, &args.output_dir)?;
@@ -191,6 +220,9 @@ pub(crate) async fn build(args: &BuildArgs) -> Result<()> {
         prepare_screenshot(*width, &args.output_dir).await?;
     }
 
+    // Copy data sources files to the output directory
+    copy_data_sources_files(args, &args.output_dir).await?;
+
     let duration = start.elapsed().as_secs_f64();
     info!("landscape website built! (took: {:.3}s)", duration);
     display_success_msg(&args.output_dir.to_string_lossy());
@@ -203,7 +235,7 @@ pub(crate) async fn build(args: &BuildArgs) -> Result<()> {
 fn check_web_assets() -> Result<()> {
     debug!("checking web assets are present");
 
-    if !WebAssets::iter().any(|path| path.starts_with("assets/")) {
+    if !WebappAssets::iter().any(|path| path.starts_with("assets/")) {
         bail!("web assets not found, please make sure they have been built");
     }
 
@@ -280,6 +312,52 @@ async fn collect_clomonitor_reports(
     Ok(())
 }
 
+/// Copy data sources files to the output directory.
+#[instrument(skip_all, err)]
+async fn copy_data_sources_files(args: &BuildArgs, output_dir: &Path) -> Result<()> {
+    // Helper function to copy the data source file provided
+    async fn copy(src_file: &Option<PathBuf>, src_url: &Option<String>, dst_file: PathBuf) -> Result<()> {
+        if let Some(src_file) = src_file {
+            fs::copy(src_file, dst_file)?;
+        } else if let Some(src_url) = src_url {
+            let data = reqwest::get(src_url).await?.bytes().await?;
+            fs::write(dst_file, data)?;
+        }
+        Ok(())
+    }
+
+    debug!("copying data sources files to output directory");
+
+    // Landscape data
+    let landscape_data_file = output_dir.join(SOURCES_PATH).join("data.yml");
+    copy(
+        &args.data_source.data_file,
+        &args.data_source.data_url,
+        landscape_data_file,
+    )
+    .await?;
+
+    // Settings
+    let settings_file = output_dir.join(SOURCES_PATH).join("settings.yml");
+    copy(
+        &args.settings_source.settings_file,
+        &args.settings_source.settings_url,
+        settings_file,
+    )
+    .await?;
+
+    // Guide
+    let guide_file = output_dir.join(SOURCES_PATH).join("guide.yml");
+    copy(
+        &args.guide_source.guide_file,
+        &args.guide_source.guide_url,
+        guide_file,
+    )
+    .await?;
+
+    Ok(())
+}
+
 /// Copy embed assets files to the output directory.
 #[instrument(skip_all, err)]
 fn copy_embed_assets(output_dir: &Path) -> Result<()> {
@@ -299,19 +377,19 @@ fn copy_embed_assets(output_dir: &Path) -> Result<()> {
     Ok(())
 }
 
-/// Copy web assets files to the output directory.
+/// Copy web application assets files to the output directory.
 #[instrument(skip_all, err)]
-fn copy_web_assets(output_dir: &Path) -> Result<()> {
-    debug!("copying web assets to output directory");
+fn copy_webapp_assets(output_dir: &Path) -> Result<()> {
+    debug!("copying web application assets to output directory");
 
-    for asset_path in WebAssets::iter() {
+    for asset_path in WebappAssets::iter() {
         // The index document is a template that we'll render, so we don't want
         // to copy it as is.
         if asset_path == "index.html" || asset_path == ".keep" {
             continue;
         }
 
-        if let Some(embedded_file) = WebAssets::get(&asset_path) {
+        if let Some(embedded_file) = WebappAssets::get(&asset_path) {
             if let Some(parent_path) = Path::new(asset_path.as_ref()).parent() {
                 fs::create_dir_all(output_dir.join(parent_path))?;
             }
@@ -371,7 +449,7 @@ fn generate_api(input: &ApiSources, output_dir: &Path) -> Result<()> {
 fn generate_datasets(input: &NewDatasetsInput, output_dir: &Path) -> Result<Datasets> {
     debug!("generating datasets");
 
-    let datasets = Datasets::new(input)?;
+    let datasets = Datasets::new(input);
     let datasets_path = output_dir.join(DATASETS_PATH);
 
     // Base
@@ -412,7 +490,7 @@ fn generate_items_csv_file(landscape_data: &LandscapeData, output_dir: &Path) ->
 fn generate_projects_files(landscape_data: &LandscapeData, output_dir: &Path) -> Result<()> {
     debug!("generating projects files");
 
-    let projects: Vec<Project> = landscape_data.into();
+    let projects = collect_projects(landscape_data);
 
     // projects.md
     let projects_md = ProjectsMd { projects: &projects }.render()?;
@@ -537,8 +615,8 @@ async fn prepare_items_logos(
 }
 
 /// Prepare landscape screenshot (in PNG and PDF formats).
-#[instrument(skip(output_dir), err)]
 #[allow(clippy::cast_precision_loss, clippy::items_after_statements)]
+#[instrument(skip(output_dir), err)]
 async fn prepare_screenshot(width: u32, output_dir: &Path) -> Result<()> {
     debug!("preparing screenshot");
 
@@ -556,7 +634,7 @@ async fn prepare_screenshot(width: u32, output_dir: &Path) -> Result<()> {
     let svr_addr_copy = svr_addr.clone();
     let landscape_dir = Some(PathBuf::from(&output_dir));
     let server = tokio::spawn(async {
-        let args = ServeArgs {
+        let args = serve::ServeArgs {
             addr: svr_addr_copy,
             graceful_shutdown: false,
             landscape_dir,
@@ -712,29 +790,18 @@ fn setup_output_dir(output_dir: &Path) -> Result<()> {
         fs::create_dir_all(output_dir)?;
     }
 
-    let api_path = output_dir.join(API_PATH);
-    if !api_path.exists() {
-        fs::create_dir(api_path)?;
-    }
-
-    let datasets_path = output_dir.join(DATASETS_PATH);
-    if !datasets_path.exists() {
-        fs::create_dir(datasets_path)?;
-    }
-
-    let docs_path = output_dir.join(DOCS_PATH);
-    if !docs_path.exists() {
-        fs::create_dir(docs_path)?;
-    }
-
-    let images_path = output_dir.join(IMAGES_PATH);
-    if !images_path.exists() {
-        fs::create_dir(images_path)?;
-    }
-
-    let logos_path = output_dir.join(LOGOS_PATH);
-    if !logos_path.exists() {
-        fs::create_dir(logos_path)?;
+    for path in &[
+        API_PATH,
+        DATASETS_PATH,
+        DOCS_PATH,
+        IMAGES_PATH,
+        LOGOS_PATH,
+        SOURCES_PATH,
+    ] {
+        let path = output_dir.join(path);
+        if !path.exists() {
+            fs::create_dir(path)?;
+        }
     }
 
     Ok(())
diff --git a/crates/cli/src/build/projects.rs b/crates/cli/src/build/projects.rs
new file mode 100644
index 00000000..2aaaa0fe
--- /dev/null
+++ b/crates/cli/src/build/projects.rs
@@ -0,0 +1,122 @@
+//! This module defines the functionality to generate the `projects.md` and
+//! `projects.csv` files from the information available in the landscape.
+
+use anyhow::Result;
+use askama::Template;
+use chrono::NaiveDate;
+use landscape2_core::data::{LandscapeData, DATE_FORMAT};
+use serde::{Deserialize, Serialize};
+use std::fs::File;
+
+/// Project information used to generate the projects.md and projects.csv files.
+#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
+pub(crate) struct Project {
+    pub accepted_at: String,
+    pub archived_at: String,
+    pub graduated_at: String,
+    pub homepage_url: String,
+    pub incubating_at: String,
+    pub last_security_audit: String,
+    pub maturity: String,
+    pub name: String,
+    pub num_security_audits: String,
+    pub sandbox_at: String,
+    pub tag: String,
+}
+
+/// Collect projects from the landscape data.
+pub(crate) fn collect_projects(landscape_data: &LandscapeData) -> Vec<Project> {
+    // Helper closure to format dates
+    let fmt_date = |date: &Option<NaiveDate>| {
+        let Some(date) = date else {
+            return String::new();
+        };
+        date.format(DATE_FORMAT).to_string()
+    };
+
+    let mut projects: Vec<Project> = landscape_data
+        .items
+        .iter()
+        .cloned()
+        .filter_map(|item| {
+            // Prepare maturity and tag
+            let maturity = item.maturity?;
+            let tag = item.tag?;
+
+            // Prepare sandbox date
+            let sandbox_at = if item.accepted_at == item.incubating_at {
+                None
+            } else {
+                item.accepted_at
+            };
+
+            // Prepare security audits info
+            let last_security_audit = item.audits.as_ref().and_then(|a| a.last().map(|a| a.date));
+            let num_security_audits = item.audits.as_ref().map(Vec::len);
+
+            // Create project instance and return it
+            let project = Project {
+                accepted_at: fmt_date(&item.accepted_at),
+                archived_at: fmt_date(&item.archived_at),
+                graduated_at: fmt_date(&item.graduated_at),
+                homepage_url: item.homepage_url,
+                incubating_at: fmt_date(&item.incubating_at),
+                maturity: maturity.to_string(),
+                name: item.name.to_lowercase(),
+                num_security_audits: num_security_audits.unwrap_or_default().to_string(),
+                last_security_audit: fmt_date(&last_security_audit),
+                sandbox_at: fmt_date(&sandbox_at),
+                tag: tag.to_string(),
+            };
+            Some(project)
+        })
+        .collect();
+
+    // Sort projects
+    projects.sort_by(|a, b| a.name.cmp(&b.name));
+
+    projects
+}
+
+/// Template for the projects.md file.
+#[derive(Debug, Clone, Template)]
+#[template(path = "projects.md")]
+pub(crate) struct ProjectsMd<'a> {
+    pub projects: &'a [Project],
+}
+
+/// Generate CSV file with some information about each project.
+pub(crate) fn generate_projects_csv(mut w: csv::Writer<File>, projects: &[Project]) -> Result<()> {
+    // Write headers
+    w.write_record([
+        "project_name",
+        "maturity",
+        "tag",
+        "accepted_date",
+        "sandbox_date",
+        "incubating_date",
+        "graduated_date",
+        "archived_date",
+        "num_security_audits",
+        "last_security_audit_date",
+    ])?;
+
+    // Write one record for each project
+    for p in projects {
+        w.write_record([
+            &p.name,
+            &p.maturity,
+            &p.tag,
+            &p.accepted_at,
+            &p.sandbox_at,
+            &p.incubating_at,
+            &p.graduated_at,
+            &p.archived_at,
+            &p.num_security_audits,
+            &p.last_security_audit,
+        ])?;
+    }
+
+    w.flush()?;
+    Ok(())
+}
diff --git a/crates/cli/src/deploy/mod.rs b/crates/cli/src/deploy/mod.rs
new file mode 100644
index 00000000..f5975386
--- /dev/null
+++ b/crates/cli/src/deploy/mod.rs
@@ -0,0 +1,21 @@
+//! This module defines the functionality of the deploy CLI subcommand.
+
+use clap::Subcommand;
+
+pub mod s3;
+
+/// Deploy command arguments.
+#[derive(clap::Args)]
+#[command(args_conflicts_with_subcommands = true)]
+pub struct DeployArgs {
+    /// Provider used to deploy the landscape website.
+    #[command(subcommand)]
+    pub provider: Provider,
+}
+
+/// Provider used to deploy the landscape website.
+#[derive(Subcommand)]
+pub enum Provider {
+    /// Deploy landscape website to AWS S3.
+    S3(s3::Args),
+}
diff --git a/src/deploy/s3.rs b/crates/cli/src/deploy/s3.rs
similarity index 95%
rename from src/deploy/s3.rs
rename to crates/cli/src/deploy/s3.rs
index adc9459e..94d1524e 100644
--- a/src/deploy/s3.rs
+++ b/crates/cli/src/deploy/s3.rs
@@ -1,7 +1,6 @@
 //! This module defines the functionality of the deploy CLI subcommand for the
 //! AWS S3 provider.
 
-use crate::S3Args;
 use anyhow::{bail, format_err, Context, Result};
 use aws_sdk_s3::primitives::ByteStream;
 use futures::stream::{self, StreamExt};
@@ -28,9 +27,21 @@ type Checksum = String;
 /// Type alias to represent an object's key.
 type Key = String;
 
+/// AWS S3 provider arguments.
+#[derive(clap::Args)]
+pub struct Args {
+    /// Bucket to copy the landscape website files to.
+    #[arg(long)]
+    pub bucket: String,
+
+    /// Location of the landscape website files (build subcommand output).
+    #[arg(long)]
+    pub landscape_dir: PathBuf,
+}
+
 /// Deploy landscape website to AWS S3.
 #[instrument(skip_all, err)]
-pub(crate) async fn deploy(args: &S3Args) -> Result<()> {
+pub async fn deploy(args: &Args) -> Result<()> {
     info!("deploying landscape website..");
     let start = Instant::now();
 
diff --git a/crates/cli/src/lib.rs b/crates/cli/src/lib.rs
new file mode 100644
index 00000000..ba43dcd7
--- /dev/null
+++ b/crates/cli/src/lib.rs
@@ -0,0 +1,12 @@
+#![warn(clippy::all, clippy::pedantic)]
+#![allow(
+    clippy::doc_markdown,
+    clippy::blocks_in_conditions,
+    clippy::module_name_repetitions
+)]
+
+pub mod build;
+pub mod deploy;
+pub mod new;
+pub mod serve;
+pub mod validate;
diff --git a/crates/cli/src/main.rs b/crates/cli/src/main.rs
new file mode 100644
index 00000000..91f9579a
--- /dev/null
+++ b/crates/cli/src/main.rs
@@ -0,0 +1,82 @@
+#![warn(clippy::all, clippy::pedantic)]
+#![allow(
+    clippy::doc_markdown,
+    clippy::blocks_in_conditions,
+    clippy::module_name_repetitions
+)]
+
+use anyhow::Result;
+use clap::{Parser, Subcommand};
+use landscape2::build::{build, BuildArgs};
+use landscape2::deploy::s3::{self};
+use landscape2::deploy::{DeployArgs, Provider};
+use landscape2::new::{new, NewArgs};
+use landscape2::serve::{serve, ServeArgs};
+use landscape2::validate::{validate_data, validate_guide, validate_settings, Target, ValidateArgs};
+
+/// CLI arguments.
+#[derive(Parser)]
+#[command(
+    version,
+    about = "Landscape2 CLI tool
+
+https://github.com/cncf/landscape2#usage"
+)]
+struct Cli {
+    #[command(subcommand)]
+    command: Command,
+}
+
+/// Commands available.
+#[derive(Subcommand)]
+enum Command {
+    /// Build landscape website.
+    Build(BuildArgs),
+
+    /// Deploy landscape website (experimental).
+    Deploy(DeployArgs),
+
+    /// Create a new landscape from the built-in template.
+    New(NewArgs),
+
+    /// Serve landscape website.
+    Serve(ServeArgs),
+
+    /// Validate landscape data sources files.
+    Validate(ValidateArgs),
+}
+
+#[tokio::main]
+async fn main() -> Result<()> {
+    let cli = Cli::parse();
+
+    // Setup logging
+    match &cli.command {
+        Command::Build(_) | Command::Deploy(_) | Command::New(_) | Command::Serve(_) => {
+            if std::env::var_os("RUST_LOG").is_none() {
+                std::env::set_var("RUST_LOG", "landscape2=debug");
+            }
+            tracing_subscriber::fmt::init();
+        }
+        Command::Validate(_) => {}
+    }
+
+    // Run command
+    match &cli.command {
+        Command::Build(args) => build(args).await?,
+        Command::Deploy(args) => {
+            match &args.provider {
+                Provider::S3(args) => s3::deploy(args).await?,
+            };
+        }
+        Command::New(args) => new(args)?,
+        Command::Serve(args) => serve(args).await?,
+        Command::Validate(args) => match &args.target {
+            Target::Data(src) => validate_data(src).await?,
+            Target::Guide(src) => validate_guide(src).await?,
+            Target::Settings(src) => validate_settings(src).await?,
+        },
+    }
+
+    Ok(())
+}
diff --git a/src/new/mod.rs b/crates/cli/src/new/mod.rs
similarity index 88%
rename from src/new/mod.rs
rename to crates/cli/src/new/mod.rs
index fc27bb24..a2fbb103 100644
--- a/src/new/mod.rs
+++ b/crates/cli/src/new/mod.rs
@@ -1,12 +1,11 @@
 //! This module defines the functionality of the create CLI subcommand.
 
-use crate::NewArgs;
 use anyhow::Result;
 use rust_embed::RustEmbed;
 use std::{
     fs::{self, File},
     io::Write,
-    path::Path,
+    path::{Path, PathBuf},
     time::Instant,
 };
 use tracing::{info, instrument};
@@ -16,9 +15,17 @@ use tracing::{info, instrument};
 #[folder = "src/new/template"]
 struct TemplateFiles;
 
+/// New arguments.
+#[derive(clap::Args)]
+pub struct NewArgs {
+    /// Output directory to write files to.
+    #[arg(long)]
+    output_dir: PathBuf,
+}
+
 /// Create a new landscape from the built-in template.
 #[instrument(skip_all)]
-pub(crate) fn new(args: &NewArgs) -> Result<()> {
+pub fn new(args: &NewArgs) -> Result<()> {
     info!("creating new landscape from the built-in template..");
     let start = Instant::now();
 
diff --git a/src/new/template/data.yml b/crates/cli/src/new/template/data.yml
similarity index 100%
rename from src/new/template/data.yml
rename to crates/cli/src/new/template/data.yml
diff --git a/src/new/template/guide.yml b/crates/cli/src/new/template/guide.yml
similarity index 100%
rename from src/new/template/guide.yml
rename to crates/cli/src/new/template/guide.yml
diff --git a/src/new/template/logos/cncf.svg b/crates/cli/src/new/template/logos/cncf.svg
similarity index 100%
rename from src/new/template/logos/cncf.svg
rename to crates/cli/src/new/template/logos/cncf.svg
diff --git a/src/new/template/settings.yml b/crates/cli/src/new/template/settings.yml
similarity index 100%
rename from src/new/template/settings.yml
rename to crates/cli/src/new/template/settings.yml
diff --git a/src/serve/mod.rs b/crates/cli/src/serve/mod.rs
similarity index 77%
rename from src/serve/mod.rs
rename to crates/cli/src/serve/mod.rs
index 70b7b617..37aca082 100644
--- a/src/serve/mod.rs
+++ b/crates/cli/src/serve/mod.rs
@@ -1,6 +1,5 @@
 //! This module defines the functionality of the serve CLI subcommand.
 
-use crate::ServeArgs;
 use anyhow::Result;
 use axum::{
     extract::Request,
@@ -9,14 +8,35 @@ use axum::{
     response::IntoResponse,
     Router,
 };
-use std::{env, net::SocketAddr};
+use std::{env, net::SocketAddr, path::PathBuf};
 use tokio::{net::TcpListener, signal};
 use tower_http::services::{ServeDir, ServeFile};
 use tracing::{info, instrument};
 
+/// Serve arguments.
+#[derive(clap::Args)]
+pub struct ServeArgs {
+    /// Address the web server will listen on.
+    #[arg(long, default_value = "127.0.0.1:8000")]
+    pub addr: String,
+
+    /// Whether the server should stop gracefully or not.
+    #[arg(long, default_value_t = false)]
+    pub graceful_shutdown: bool,
+
+    /// Location of the landscape website files (build subcommand output).
+    /// The current path will be used when none is provided.
+    #[arg(long)]
+    pub landscape_dir: Option<PathBuf>,
+
+    /// Enable silent mode.
+    #[arg(long, default_value_t = false)]
+    pub silent: bool,
+}
+
 /// Serve landscape website.
 #[instrument(skip_all)]
-pub(crate) async fn serve(args: &ServeArgs) -> Result<()> {
+pub async fn serve(args: &ServeArgs) -> Result<()> {
     // Setup router
     let landscape_dir = args.landscape_dir.clone().unwrap_or(env::current_dir()?);
     let index_path = landscape_dir.join("index.html");
@@ -45,7 +65,7 @@ pub(crate) async fn serve(args: &ServeArgs) -> Result<()> {
 }
 
 /// Middleware that sets the cache control header in the response.
-pub(crate) async fn set_cache_control_header(req: Request, next: Next) -> impl IntoResponse {
+async fn set_cache_control_header(req: Request, next: Next) -> impl IntoResponse {
     // Prepare header value (based on the request uri)
     let cache_control = match req.uri().to_string() {
         u if u.starts_with("/assets/") => "max-age=31536000",
diff --git a/src/validate/mod.rs b/crates/cli/src/validate/mod.rs
similarity index 50%
rename from src/validate/mod.rs
rename to crates/cli/src/validate/mod.rs
index a00598ee..b5a61604 100644
--- a/src/validate/mod.rs
+++ b/crates/cli/src/validate/mod.rs
@@ -1,15 +1,39 @@
 //! This module defines the functionality of the validate CLI subcommand.
 
-use crate::{
-    build::{LandscapeData, LandscapeGuide, LandscapeSettings},
-    DataSource, GuideSource, SettingsSource,
-};
 use anyhow::{Context, Result};
+use clap::Subcommand;
+use landscape2_core::{
+    data::{DataSource, LandscapeData},
+    guide::{GuideSource, LandscapeGuide},
+    settings::{LandscapeSettings, SettingsSource},
+};
 use tracing::instrument;
 
+/// Validate command arguments.
+#[derive(clap::Args)]
+#[command(args_conflicts_with_subcommands = true)]
+pub struct ValidateArgs {
+    /// Landscape file to validate.
+    #[command(subcommand)]
+    pub target: Target,
+}
+
+/// Landscape file to validate.
+#[derive(Subcommand)]
+pub enum Target {
+    /// Validate landscape data file.
+    Data(DataSource),
+
+    /// Validate landscape guide file.
+    Guide(GuideSource),
+
+    /// Validate landscape settings file.
+    Settings(SettingsSource),
+}
+
 /// Validate landscape data file.
 #[instrument(skip_all)]
-pub(crate) async fn validate_data(data_source: &DataSource) -> Result<()> {
+pub async fn validate_data(data_source: &DataSource) -> Result<()> {
     LandscapeData::new(data_source)
         .await
         .context("the landscape data file provided is not valid")?;
@@ -20,7 +44,7 @@ pub(crate) async fn validate_data(data_source: &DataSource) -> Result<()> {
 
 /// Validate landscape settings file.
 #[instrument(skip_all)]
-pub(crate) async fn validate_settings(settings_source: &SettingsSource) -> Result<()> {
+pub async fn validate_settings(settings_source: &SettingsSource) -> Result<()> {
     LandscapeSettings::new(settings_source)
         .await
         .context("the landscape settings file provided is not valid")?;
@@ -31,7 +55,7 @@ pub(crate) async fn validate_settings(settings_source: &SettingsSource) -> Resul
 
 /// Validate landscape guide file.
 #[instrument(skip_all)]
-pub(crate) async fn validate_guide(guide_source: &GuideSource) -> Result<()> {
+pub async fn validate_guide(guide_source: &GuideSource) -> Result<()> {
     LandscapeGuide::new(guide_source)
         .await
         .context("the landscape guide file provided is not valid")?;
diff --git a/templates/projects.md b/crates/cli/templates/projects.md
similarity index 100%
rename from templates/projects.md
rename to crates/cli/templates/projects.md
diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml
new file mode 100644
index 00000000..fd58dbfe
--- /dev/null
+++ b/crates/core/Cargo.toml
@@ -0,0 +1,25 @@
+[package]
+name = "landscape2-core"
+description = "Landscape2 core functionality"
+repository = "https://github.com/cncf/landscape2"
+readme = "../../README.md"
+version.workspace = true
+license.workspace = true
+edition.workspace = true
+rust-version.workspace = true
+authors.workspace = true
+homepage.workspace = true
+
+[dependencies]
+anyhow = { workspace = true }
+chrono = { workspace = true }
+clap = { workspace = true }
+itertools = { workspace = true }
+lazy_static = { workspace = true }
+markdown = { workspace = true }
+regex = { workspace = true }
+reqwest = { workspace = true }
+serde = { workspace = true }
+serde_yaml = { workspace = true }
+tracing = { workspace = true }
+url = { workspace = true }
diff --git a/src/build/data.rs b/crates/core/src/data.rs
similarity index 63%
rename from src/build/data.rs
rename to crates/core/src/data.rs
index 081f3464..73749170 100644
--- a/src/build/data.rs
+++ b/crates/core/src/data.rs
@@ -7,28 +7,71 @@
 //! backwards compatibility, this module provides a `legacy` submodule that
 //! allows parsing the legacy format and convert it to the new one.
 
-use super::{
-    crunchbase::{CrunchbaseData, Organization, CRUNCHBASE_URL},
-    github::{self, GithubData},
-    settings::{self, LandscapeSettings},
-};
-use crate::DataSource;
-use anyhow::{bail, Result};
-use chrono::NaiveDate;
-use lazy_static::lazy_static;
-use regex::Regex;
+use super::settings::{self, LandscapeSettings};
+use crate::util::normalize_name;
+use anyhow::{bail, Context, Result};
+use chrono::{DateTime, NaiveDate, Utc};
+use clap::Args;
 use reqwest::StatusCode;
 use serde::{Deserialize, Serialize};
-use std::{collections::HashMap, fs, path::Path};
+use std::{
+    collections::{BTreeMap, HashMap},
+    fs,
+    path::{Path, PathBuf},
+};
 use tracing::{debug, instrument, warn};
-use url::Url;
+
+mod legacy;
 
 /// Format used for dates across the landscape data file.
+#[allow(dead_code)]
 pub const DATE_FORMAT: &str = "%Y-%m-%d";
 
+/// Type alias to represent a category name.
+pub type CategoryName = String;
+
+/// Type alias to represent some organizations' Crunchbase data.
+pub type CrunchbaseData = BTreeMap<CrunchbaseUrl, Organization>;
+
+/// Type alias to represent a crunchbase url.
+pub type CrunchbaseUrl = String;
+
+/// Type alias to represent some repositories' GitHub data.
+pub type GithubData = BTreeMap<RepositoryUrl, RepositoryGithubData>;
+
+/// Type alias to represent a GitHub repository url.
+pub type RepositoryUrl = String;
+
+/// Type alias to represent a subcategory name.
+pub type SubCategoryName = String;
+
+/// Landscape data source.
+#[derive(Args, Default)]
+#[group(required = true, multiple = false)]
+pub struct DataSource {
+    /// Landscape data file local path.
+    #[arg(long)]
+    pub data_file: Option<PathBuf>,
+
+    /// Landscape data file url.
+    #[arg(long)]
+    pub data_url: Option<String>,
+}
+
+impl DataSource {
+    /// Create a new data source from the url provided.
+    #[must_use]
+    pub fn new_from_url(url: String) -> Self {
+        Self {
+            data_file: None,
+            data_url: Some(url),
+        }
+    }
+}
+
 /// Landscape data.
 #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
-pub(crate) struct LandscapeData {
+pub struct LandscapeData {
     pub categories: Vec<Category>,
     pub items: Vec<Item>,
 }
@@ -36,7 +79,7 @@ pub(crate) struct LandscapeData {
 impl LandscapeData {
     /// Create a new landscape data instance from the source provided.
     #[instrument(skip_all, err)]
-    pub(crate) async fn new(src: &DataSource) -> Result<Self> {
+    pub async fn new(src: &DataSource) -> Result<Self> {
         // Try from file
         if let Some(file) = &src.data_file {
             debug!(?file, "getting landscape data from file");
@@ -55,10 +98,9 @@ impl LandscapeData {
     /// Create a new landscape data instance from the file provided.
     fn new_from_file(file: &Path) -> Result<Self> {
         let raw_data = fs::read_to_string(file)?;
-        let legacy_data: legacy::LandscapeData = serde_yaml::from_str(&raw_data)?;
-        legacy_data.validate()?;
+        let landscape_data = LandscapeData::new_from_raw_data(&raw_data)?;
 
-        Ok(LandscapeData::from(legacy_data))
+        Ok(landscape_data)
     }
 
     /// Create a new landscape data instance from the url provided.
@@ -71,15 +113,24 @@ impl LandscapeData {
             );
         }
         let raw_data = resp.text().await?;
-        let legacy_data: legacy::LandscapeData = serde_yaml::from_str(&raw_data)?;
+        let landscape_data = LandscapeData::new_from_raw_data(&raw_data)?;
+
+        Ok(landscape_data)
+    }
+
+    /// Create a new landscape data instance from the raw legacy data provided.
+    fn new_from_raw_data(raw_data: &str) -> Result<Self> {
+        let legacy_data: legacy::LandscapeData =
+            serde_yaml::from_str(raw_data).context("invalid yaml file")?;
         legacy_data.validate()?;
+        let landscape_data = LandscapeData::from(legacy_data);
 
-        Ok(LandscapeData::from(legacy_data))
+        Ok(landscape_data)
     }
 
     /// Add items Crunchbase data.
-    #[instrument(skip_all, err)]
-    pub(crate) fn add_crunchbase_data(&mut self, crunchbase_data: &CrunchbaseData) -> Result<()> {
+    #[instrument(skip_all)]
+    pub fn add_crunchbase_data(&mut self, crunchbase_data: &CrunchbaseData) {
         for item in &mut self.items {
             if let Some(crunchbase_url) = item.crunchbase_url.as_ref() {
                 if let Some(org_crunchbase_data) = crunchbase_data.get(crunchbase_url) {
@@ -87,16 +138,15 @@ impl LandscapeData {
                 }
             }
         }
-        Ok(())
     }
 
     /// Add featured items information to the landscape data based on the
     /// settings provided (i.e. graduated and incubating projects must be
     /// featured and the former displayed first).
-    #[instrument(skip_all, err)]
-    pub(crate) fn add_featured_items_data(&mut self, settings: &LandscapeSettings) -> Result<()> {
+    #[instrument(skip_all)]
+    pub fn add_featured_items_data(&mut self, settings: &LandscapeSettings) {
         let Some(rules) = &settings.featured_items else {
-            return Ok(());
+            return;
         };
 
         for rule in rules {
@@ -126,13 +176,11 @@ impl LandscapeData {
                 _ => {}
             }
         }
-
-        Ok(())
     }
 
     /// Add items repositories GitHub data.
-    #[instrument(skip_all, err)]
-    pub(crate) fn add_github_data(&mut self, github_data: &GithubData) -> Result<()> {
+    #[instrument(skip_all)]
+    pub fn add_github_data(&mut self, github_data: &GithubData) {
         for item in &mut self.items {
             // Add GH data to each of the items repositories
             if item.repositories.is_some() {
@@ -156,13 +204,11 @@ impl LandscapeData {
                 item.oss = Some(true);
             }
         }
-
-        Ok(())
     }
 
     /// Add items member subcategory.
-    #[instrument(skip_all)]
-    pub(crate) fn add_member_subcategory(&mut self, members_category: &Option<String>) {
+    #[cfg_attr(feature = "instrument", instrument(skip_all))]
+    pub fn add_member_subcategory(&mut self, members_category: &Option<String>) {
         let Some(members_category) = members_category else {
             return;
         };
@@ -186,8 +232,8 @@ impl LandscapeData {
     }
 
     /// Add projects items TAG based on the TAGs settings.
-    #[instrument(skip_all)]
-    pub(crate) fn add_tags(&mut self, settings: &LandscapeSettings) {
+    #[cfg_attr(feature = "instrument", instrument(skip_all))]
+    pub fn add_tags(&mut self, settings: &LandscapeSettings) {
         let Some(tags) = &settings.tags else {
             return;
         };
@@ -400,7 +446,7 @@ impl From<legacy::LandscapeData> for LandscapeData {
 
 /// Landscape category.
 #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
-pub(crate) struct Category {
+pub struct Category {
     pub name: CategoryName,
     pub normalized_name: CategoryName,
     pub subcategories: Vec<SubCategory>,
@@ -423,22 +469,16 @@ impl From<&settings::Category> for Category {
     }
 }
 
-/// Type alias to represent a category name.
-pub(crate) type CategoryName = String;
-
 /// Landscape subcategory.
 #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
-pub(crate) struct SubCategory {
+pub struct SubCategory {
     pub name: SubCategoryName,
     pub normalized_name: SubCategoryName,
 }
 
-/// Type alias to represent a subcategory name.
-pub(crate) type SubCategoryName = String;
-
 /// Landscape item (project, product, member, etc).
 #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
-pub(crate) struct Item {
+pub struct Item {
     pub category: String,
     pub homepage_url: String,
     pub id: String,
@@ -575,13 +615,14 @@ pub(crate) struct Item {
 
 impl Item {
     /// Get item's description.
-    #[allow(dead_code)]
-    pub(crate) fn description(&self) -> Option<&String> {
+    #[allow(clippy::missing_panics_doc)]
+    #[must_use]
+    pub fn description(&self) -> Option<&String> {
         // Use item's description if available
         let mut description = self.description.as_ref();
 
         // Otherwise, use primary repository description if available
-        if description.is_none() || description.unwrap().is_empty() {
+        if description.is_none() || description.expect("it to be present").is_empty() {
             description =
                 self.primary_repository().and_then(|r| r.github_data.as_ref().map(|gh| &gh.description));
         }
@@ -595,8 +636,8 @@ impl Item {
     }
 
     /// Get primary repository if available.
-    #[allow(dead_code)]
-    pub(crate) fn primary_repository(&self) -> Option<&Repository> {
+    #[must_use]
+    pub fn primary_repository(&self) -> Option<&Repository> {
         self.repositories
             .as_ref()
             .and_then(|repos| repos.iter().find(|r| r.primary.unwrap_or_default()))
@@ -613,16 +654,59 @@ impl Item {
     }
 }
 
+/// Crunchbase acquisition details.
+#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
+pub struct Acquisition {
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub acquiree_cb_permalink: Option<String>,
+
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub acquiree_name: Option<String>,
+
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub announced_on: Option<NaiveDate>,
+
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub price: Option<u64>,
+}
+
 /// Additional category/subcategory an item can belong to.
 #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
-pub(crate) struct AdditionalCategory {
+pub struct AdditionalCategory {
     pub category: CategoryName,
     pub subcategory: SubCategoryName,
 }
 
+/// Commit information.
+#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
+pub struct Commit {
+    pub ts: Option<DateTime<Utc>>,
+    pub url: String,
+}
+
+/// Contributors information.
+#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
+pub struct Contributors {
+    pub count: usize,
+    pub url: String,
+}
+
+/// Crunchbase funding round details.
+#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
+pub struct FundingRound {
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub amount: Option<u64>,
+
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub announced_on: Option<NaiveDate>,
+
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub kind: Option<String>,
+}
+
 /// Landscape item audit information.
 #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
-pub(crate) struct ItemAudit {
+pub struct ItemAudit {
     pub date: NaiveDate,
     #[serde(rename = "type")]
     pub kind: String,
@@ -632,7 +716,7 @@ pub(crate) struct ItemAudit {
 
 /// Landscape item featured information.
 #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
-pub(crate) struct ItemFeatured {
+pub struct ItemFeatured {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub label: Option<String>,
 
@@ -642,7 +726,7 @@ pub(crate) struct ItemFeatured {
 
 /// Landscape item summary.
 #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
-pub(crate) struct ItemSummary {
+pub struct ItemSummary {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub business_use_case: Option<String>,
 
@@ -668,322 +752,108 @@ pub(crate) struct ItemSummary {
     pub use_case: Option<String>,
 }
 
-/// Repository information.
+/// Organization information collected from Crunchbase.
 #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
-pub(crate) struct Repository {
-    pub url: String,
+pub struct Organization {
+    pub generated_at: DateTime<Utc>,
 
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub branch: Option<String>,
-
-    #[serde(skip_serializing)]
-    pub github_data: Option<github::Repository>,
+    pub acquisitions: Option<Vec<Acquisition>>,
 
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub primary: Option<bool>,
-}
-
-lazy_static! {
-    static ref VALID_CHARS: Regex = Regex::new(r"[a-z0-9\-\ \+]").expect("exprs in VALID_CHARS to be valid");
-    static ref MULTIPLE_HYPHENS: Regex = Regex::new(r"-{2,}").expect("exprs in MULTIPLE_HYPHENS to be valid");
-}
-
-/// Normalize category, subcategory and item name.
-pub(crate) fn normalize_name(value: &str) -> String {
-    let mut normalized_name = value
-        .to_lowercase()
-        .replace(' ', "-")
-        .chars()
-        .map(|c| {
-            if VALID_CHARS.is_match(&c.to_string()) {
-                c
-            } else {
-                '-'
-            }
-        })
-        .collect::<String>();
-    normalized_name = MULTIPLE_HYPHENS.replace(&normalized_name, "-").to_string();
-    if let Some(normalized_name_without_suffix) = normalized_name.strip_suffix('-') {
-        normalized_name = normalized_name_without_suffix.to_string();
-    }
-    normalized_name
-}
+    pub city: Option<String>,
 
-mod legacy {
-    //! This module defines some types used to parse the landscape data file in
-    //! legacy format and convert it to the new one.
-
-    use super::{validate_url, ItemAudit};
-    use anyhow::{bail, format_err, Context, Result};
-    use chrono::NaiveDate;
-    use lazy_static::lazy_static;
-    use regex::Regex;
-    use serde::{Deserialize, Serialize};
-
-    /// Landscape data (legacy format).
-    #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
-    pub(crate) struct LandscapeData {
-        pub landscape: Vec<Category>,
-    }
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub company_type: Option<String>,
 
-    impl LandscapeData {
-        /// Validate landscape data.
-        pub(crate) fn validate(&self) -> Result<()> {
-            for (category_index, category) in self.landscape.iter().enumerate() {
-                // Check category name
-                if category.name.is_empty() {
-                    bail!("category [{category_index}] name is required");
-                }
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub country: Option<String>,
 
-                for (subcategory_index, subcategory) in category.subcategories.iter().enumerate() {
-                    // Used to check for duplicate items within this subcategory
-                    let mut items_seen = Vec::new();
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub description: Option<String>,
 
-                    // Check subcategory name
-                    if subcategory.name.is_empty() {
-                        bail!(
-                            "subcategory [{subcategory_index}] name is required (category: [{}]) ",
-                            category.name
-                        );
-                    }
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub funding: Option<i64>,
 
-                    for (item_index, item) in subcategory.items.iter().enumerate() {
-                        // Prepare context for errors
-                        let item_id = if item.name.is_empty() {
-                            format!("{item_index}")
-                        } else {
-                            item.name.clone()
-                        };
-                        let ctx = format!(
-                            "item [{}] is not valid (category: [{}] | subcategory: [{}])",
-                            item_id, category.name, subcategory.name
-                        );
-
-                        // Check name
-                        if item.name.is_empty() {
-                            return Err(format_err!("name is required")).context(ctx);
-                        }
-                        if items_seen.contains(&item.name) {
-                            return Err(format_err!("duplicate item name")).context(ctx);
-                        }
-                        items_seen.push(item.name.clone());
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub funding_rounds: Option<Vec<FundingRound>>,
 
-                        // Check homepage
-                        if item.homepage_url.is_empty() {
-                            return Err(format_err!("hompage_url is required")).context(ctx);
-                        }
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub homepage_url: Option<String>,
 
-                        // Check logo
-                        if item.logo.is_empty() {
-                            return Err(format_err!("logo is required")).context(ctx);
-                        }
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub categories: Option<Vec<String>>,
 
-                        // Check some values in extra
-                        if let Some(extra) = &item.extra {
-                            // Check tag name
-                            if let Some(tag) = &extra.tag {
-                                if !TAG_NAME.is_match(tag) {
-                                    return Err(format_err!(
-                                        "invalid tag (must use only lowercase letters and hyphens)"
-                                    ))
-                                    .context(ctx);
-                                }
-                            }
-                        }
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub kind: Option<String>,
 
-                        // Check urls
-                        validate_urls(item).context(ctx)?;
-                    }
-                }
-            }
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub linkedin_url: Option<String>,
 
-            Ok(())
-        }
-    }
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub name: Option<String>,
 
-    /// Landscape category.
-    #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
-    pub(crate) struct Category {
-        pub name: String,
-        pub subcategories: Vec<SubCategory>,
-    }
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub num_employees_max: Option<i64>,
 
-    /// Landscape subcategory.
-    #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
-    pub(crate) struct SubCategory {
-        pub name: String,
-        pub items: Vec<Item>,
-    }
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub num_employees_min: Option<i64>,
 
-    /// Landscape item (project, product, member, etc).
-    #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
-    pub(crate) struct Item {
-        pub name: String,
-        pub homepage_url: String,
-        pub logo: String,
-        pub additional_repos: Option<Vec<Repository>>,
-        pub branch: Option<String>,
-        pub crunchbase: Option<String>,
-        pub description: Option<String>,
-        pub enduser: Option<bool>,
-        pub extra: Option<ItemExtra>,
-        pub joined: Option<NaiveDate>,
-        pub project: Option<String>,
-        pub repo_url: Option<String>,
-        pub second_path: Option<Vec<String>>,
-        pub twitter: Option<String>,
-        pub url_for_bestpractices: Option<String>,
-        pub unnamed_organization: Option<bool>,
-    }
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub region: Option<String>,
 
-    /// Landscape item repository.
-    #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
-    pub(crate) struct Repository {
-        pub repo_url: String,
-        pub branch: Option<String>,
-    }
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub stock_exchange: Option<String>,
 
-    /// Extra information for a landscape item.
-    #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
-    pub(crate) struct ItemExtra {
-        pub accepted: Option<NaiveDate>,
-        pub archived: Option<NaiveDate>,
-        pub audits: Option<Vec<ItemAudit>>,
-        pub annual_review_date: Option<NaiveDate>,
-        pub annual_review_url: Option<String>,
-        pub artwork_url: Option<String>,
-        pub blog_url: Option<String>,
-        pub chat_channel: Option<String>,
-        pub clomonitor_name: Option<String>,
-        pub dev_stats_url: Option<String>,
-        pub discord_url: Option<String>,
-        pub docker_url: Option<String>,
-        pub github_discussions_url: Option<String>,
-        pub gitter_url: Option<String>,
-        pub graduated: Option<NaiveDate>,
-        pub incubating: Option<NaiveDate>,
-        pub linkedin_url: Option<String>,
-        pub mailing_list_url: Option<String>,
-        pub parent_project: Option<String>,
-        pub slack_url: Option<String>,
-        pub specification: Option<bool>,
-        pub stack_overflow_url: Option<String>,
-        pub summary_business_use_case: Option<String>,
-        pub summary_integration: Option<String>,
-        pub summary_integrations: Option<String>,
-        pub summary_intro_url: Option<String>,
-        pub summary_use_case: Option<String>,
-        pub summary_personas: Option<String>,
-        pub summary_release_rate: Option<String>,
-        pub summary_tags: Option<String>,
-        pub tag: Option<String>,
-        pub training_certifications: Option<String>,
-        pub training_type: Option<String>,
-        pub youtube_url: Option<String>,
-    }
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub ticker: Option<String>,
 
-    /// Validate the urls of the item provided.
-    fn validate_urls(item: &Item) -> Result<()> {
-        // Check urls in item
-        let homepage_url = Some(item.homepage_url.clone());
-        let urls = [
-            ("best_practices", &item.url_for_bestpractices),
-            ("crunchbase", &item.crunchbase),
-            ("homepage", &homepage_url),
-            ("repository", &item.repo_url),
-            ("twitter", &item.twitter),
-        ];
-        for (name, url) in urls {
-            validate_url(name, url)?;
-        }
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub twitter_url: Option<String>,
+}
 
-        // Check additional repositories
-        if let Some(additional_repos) = &item.additional_repos {
-            for r in additional_repos {
-                let repo_url = Some(r.repo_url.clone());
-                validate_url("additional_repository", &repo_url)?;
-            }
-        }
+/// Release information.
+#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
+pub struct Release {
+    pub ts: Option<DateTime<Utc>>,
+    pub url: String,
+}
 
-        // Check urls in item extra
-        if let Some(extra) = &item.extra {
-            let urls = [
-                ("annual_review", &extra.annual_review_url),
-                ("artwork", &extra.artwork_url),
-                ("blog", &extra.blog_url),
-                ("dev_stats", &extra.dev_stats_url),
-                ("discord", &extra.discord_url),
-                ("docker", &extra.docker_url),
-                ("github_discussions", &extra.github_discussions_url),
-                ("linkedin", &extra.linkedin_url),
-                ("mailing_list", &extra.mailing_list_url),
-                ("slack", &extra.slack_url),
-                ("stack_overflow", &extra.stack_overflow_url),
-                ("youtube", &extra.youtube_url),
-            ];
-            for (name, url) in urls {
-                validate_url(name, url)?;
-            }
+/// Repository information.
+#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
+pub struct Repository {
+    pub url: String,
 
-            // Check audits urls
-            if let Some(audits) = &extra.audits {
-                for a in audits {
-                    let audit_url = Some(a.url.clone());
-                    validate_url("audit", &audit_url)?;
-                }
-            }
-        };
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub branch: Option<String>,
 
-        Ok(())
-    }
+    #[serde(skip_serializing)]
+    pub github_data: Option<RepositoryGithubData>,
 
-    lazy_static! {
-        /// TAG name regular expression.
-        pub(crate) static ref TAG_NAME: Regex = Regex::new(r"^[a-z\-]+$").expect("exprs in TAG_NAME to be valid");
-    }
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub primary: Option<bool>,
 }
 
-/// Validate the url provided.
-pub(crate) fn validate_url(kind: &str, url: &Option<String>) -> Result<()> {
-    if let Some(url) = url {
-        let invalid_url = |reason: &str| bail!("invalid {kind} url: {reason}");
+/// Repository information collected from GitHub.
+#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
+pub struct RepositoryGithubData {
+    pub contributors: Contributors,
+    pub description: String,
+    pub generated_at: DateTime<Utc>,
+    pub latest_commit: Commit,
+    pub participation_stats: Vec<i64>,
+    pub stars: i64,
+    pub url: String,
 
-        // Parse url
-        let url = match Url::parse(url) {
-            Ok(url) => url,
-            Err(err) => return invalid_url(&err.to_string()),
-        };
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub first_commit: Option<Commit>,
 
-        // Check scheme
-        if url.scheme() != "http" && url.scheme() != "https" {
-            return invalid_url("invalid scheme");
-        }
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub languages: Option<BTreeMap<String, i64>>,
 
-        // Some checks specific to the url kind provided
-        let check_domain = |domain: &str| {
-            if url.host_str().is_some_and(|host| !host.ends_with(domain)) {
-                return invalid_url(&format!("expecting https://{domain}/..."));
-            }
-            Ok(())
-        };
-        match kind {
-            "crunchbase" => {
-                if !CRUNCHBASE_URL.is_match(url.as_str()) {
-                    return invalid_url(&format!("expecting: {}", CRUNCHBASE_URL.as_str()));
-                }
-            }
-            "facebook" => return check_domain("facebook.com"),
-            "flickr" => return check_domain("flickr.com"),
-            "github" => return check_domain("github.com"),
-            "instagram" => return check_domain("instagram.com"),
-            "linkedin" => return check_domain("linkedin.com"),
-            "stack_overflow" => return check_domain("stackoverflow.com"),
-            "twitch" => return check_domain("twitch.tv"),
-            "twitter" => return check_domain("twitter.com"),
-            "youtube" => return check_domain("youtube.com"),
-            _ => {}
-        }
-    }
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub latest_release: Option<Release>,
 
-    Ok(())
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub license: Option<String>,
 }
diff --git a/crates/core/src/data/legacy.rs b/crates/core/src/data/legacy.rs
new file mode 100644
index 00000000..10b5cb6e
--- /dev/null
+++ b/crates/core/src/data/legacy.rs
@@ -0,0 +1,232 @@
+//! This module defines some types used to parse the landscape data file in
+//! legacy format and convert it to the new one.
+
+use super::ItemAudit;
+use crate::util::validate_url;
+use anyhow::{bail, format_err, Context, Result};
+use chrono::NaiveDate;
+use lazy_static::lazy_static;
+use regex::Regex;
+use serde::{Deserialize, Serialize};
+
+lazy_static! {
+    /// TAG name regular expression.
+    static ref TAG_NAME: Regex = Regex::new(r"^[a-z\-]+$").expect("exprs in TAG_NAME to be valid");
+}
+
+/// Landscape data (legacy format).
+#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
+pub(super) struct LandscapeData {
+    pub landscape: Vec<Category>,
+}
+
+impl LandscapeData {
+    /// Validate landscape data.
+    pub fn validate(&self) -> Result<()> {
+        for (category_index, category) in self.landscape.iter().enumerate() {
+            // Check category name
+            if category.name.is_empty() {
+                bail!("category [{category_index}] name is required");
+            }
+
+            for (subcategory_index, subcategory) in category.subcategories.iter().enumerate() {
+                // Used to check for duplicate items within this subcategory
+                let mut items_seen = Vec::new();
+
+                // Check subcategory name
+                if subcategory.name.is_empty() {
+                    bail!(
+                        "subcategory [{subcategory_index}] name is required (category: [{}]) ",
+                        category.name
+                    );
+                }
+
+                for (item_index, item) in subcategory.items.iter().enumerate() {
+                    // Prepare context for errors
+                    let item_id = if item.name.is_empty() {
+                        format!("{item_index}")
+                    } else {
+                        item.name.clone()
+                    };
+                    let ctx = format!(
+                        "item [{}] is not valid (category: [{}] | subcategory: [{}])",
+                        item_id, category.name, subcategory.name
+                    );
+
+                    // Check name
+                    if item.name.is_empty() {
+                        return Err(format_err!("name is required")).context(ctx);
+                    }
+                    if items_seen.contains(&item.name) {
+                        return Err(format_err!("duplicate item name")).context(ctx);
+                    }
+                    items_seen.push(item.name.clone());
+
+                    // Check homepage
+                    if item.homepage_url.is_empty() {
+                        return Err(format_err!("hompage_url is required")).context(ctx);
+                    }
+
+                    // Check logo
+                    if item.logo.is_empty() {
+                        return Err(format_err!("logo is required")).context(ctx);
+                    }
+
+                    // Check some values in extra
+                    if let Some(extra) = &item.extra {
+                        // Check tag name
+                        if let Some(tag) = &extra.tag {
+                            if !TAG_NAME.is_match(tag) {
+                                return Err(format_err!(
+                                    "invalid tag (must use only lowercase letters and hyphens)"
+                                ))
+                                .context(ctx);
+                            }
+                        }
+                    }
+
+                    // Check urls
+                    validate_urls(item).context(ctx)?;
+                }
+            }
+        }
+
+        Ok(())
+    }
+}
+
+/// Landscape category.
+#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
+pub(super) struct Category {
+    pub name: String,
+    pub subcategories: Vec<SubCategory>,
+}
+
+/// Landscape subcategory.
+#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
+pub(super) struct SubCategory {
+    pub name: String,
+    pub items: Vec<Item>,
+}
+
+/// Landscape item (project, product, member, etc).
+#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
+pub(super) struct Item {
+    pub name: String,
+    pub homepage_url: String,
+    pub logo: String,
+    pub additional_repos: Option<Vec<Repository>>,
+    pub branch: Option<String>,
+    pub crunchbase: Option<String>,
+    pub description: Option<String>,
+    pub enduser: Option<bool>,
+    pub extra: Option<ItemExtra>,
+    pub joined: Option<NaiveDate>,
+    pub project: Option<String>,
+    pub repo_url: Option<String>,
+    pub second_path: Option<Vec<String>>,
+    pub twitter: Option<String>,
+    pub url_for_bestpractices: Option<String>,
+    pub unnamed_organization: Option<bool>,
+}
+
+/// Extra information for a landscape item.
+#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
+pub(super) struct ItemExtra {
+    pub accepted: Option<NaiveDate>,
+    pub archived: Option<NaiveDate>,
+    pub audits: Option<Vec<ItemAudit>>,
+    pub annual_review_date: Option<NaiveDate>,
+    pub annual_review_url: Option<String>,
+    pub artwork_url: Option<String>,
+    pub blog_url: Option<String>,
+    pub chat_channel: Option<String>,
+    pub clomonitor_name: Option<String>,
+    pub dev_stats_url: Option<String>,
+    pub discord_url: Option<String>,
+    pub docker_url: Option<String>,
+    pub github_discussions_url: Option<String>,
+    pub gitter_url: Option<String>,
+    pub graduated: Option<NaiveDate>,
+    pub incubating: Option<NaiveDate>,
+    pub linkedin_url: Option<String>,
+    pub mailing_list_url: Option<String>,
+    pub parent_project: Option<String>,
+    pub slack_url: Option<String>,
+    pub specification: Option<bool>,
+    pub stack_overflow_url: Option<String>,
+    pub summary_business_use_case: Option<String>,
+    pub summary_integration: Option<String>,
+    pub summary_integrations: Option<String>,
+    pub summary_intro_url: Option<String>,
+    pub summary_use_case: Option<String>,
+    pub summary_personas: Option<String>,
+    pub summary_release_rate: Option<String>,
+    pub summary_tags: Option<String>,
+    pub tag: Option<String>,
+    pub training_certifications: Option<String>,
+    pub training_type: Option<String>,
+    pub youtube_url: Option<String>,
+}
+
+/// Landscape item repository.
+#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
+pub(super) struct Repository {
+    pub repo_url: String,
+    pub branch: Option<String>,
+}
+
+/// Validate the urls of the item provided.
+fn validate_urls(item: &Item) -> Result<()> {
+    // Check urls in item
+    let homepage_url = Some(item.homepage_url.clone());
+    let urls = [
+        ("best_practices", &item.url_for_bestpractices),
+        ("crunchbase", &item.crunchbase),
+        ("homepage", &homepage_url),
+        ("repository", &item.repo_url),
+        ("twitter", &item.twitter),
+    ];
+    for (name, url) in urls {
+        validate_url(name, url)?;
+    }
+
+    // Check additional repositories
+    if let Some(additional_repos) = &item.additional_repos {
+        for r in additional_repos {
+            let repo_url = Some(r.repo_url.clone());
+            validate_url("additional_repository", &repo_url)?;
+        }
+    }
+
+    // Check urls in item extra
+    if let Some(extra) = &item.extra {
+        let urls = [
+            ("annual_review", &extra.annual_review_url),
+            ("artwork", &extra.artwork_url),
+            ("blog", &extra.blog_url),
+            ("dev_stats", &extra.dev_stats_url),
+            ("discord", &extra.discord_url),
+            ("docker", &extra.docker_url),
+            ("github_discussions", &extra.github_discussions_url),
+            ("linkedin", &extra.linkedin_url),
+            ("mailing_list", &extra.mailing_list_url),
+            ("slack", &extra.slack_url),
+            ("stack_overflow", &extra.stack_overflow_url),
+            ("youtube", &extra.youtube_url),
+        ];
+        for (name, url) in urls {
+            validate_url(name, url)?;
+        }
+
+        // Check audits urls
+        if let Some(audits) = &extra.audits {
+            for a in audits {
+                let audit_url = Some(a.url.clone());
+                validate_url("audit", &audit_url)?;
+            }
+        }
+    };
+
+    Ok(())
+}
diff --git a/src/build/datasets.rs b/crates/core/src/datasets.rs
similarity index 92%
rename from src/build/datasets.rs
rename to crates/core/src/datasets.rs
index 8f94004d..4e88c055 100644
--- a/src/build/datasets.rs
+++ b/crates/core/src/datasets.rs
@@ -7,15 +7,16 @@
 //! consumed by other applications, as they can change at any time.
 
 use self::{base::Base, embed::Embed, full::Full};
-use super::{
-    crunchbase::CrunchbaseData, github::GithubData, guide::LandscapeGuide, settings::LandscapeSettings,
-    stats::Stats, LandscapeData,
+use crate::{
+    data::{CrunchbaseData, GithubData, LandscapeData},
+    guide::LandscapeGuide,
+    settings::LandscapeSettings,
+    stats::Stats,
 };
-use anyhow::{Ok, Result};
 
 /// Datasets collection.
 #[derive(Debug, Clone)]
-pub(crate) struct Datasets {
+pub struct Datasets {
     /// #[base]
     pub base: Base,
 
@@ -25,27 +26,26 @@ pub(crate) struct Datasets {
     /// #[full]
     pub full: Full,
 
-    /// #[crate::build::stats]
+    /// #[crate::stats]
     pub stats: Stats,
 }
 
 impl Datasets {
     /// Create a new datasets instance.
-    pub(crate) fn new(i: &NewDatasetsInput) -> Result<Self> {
-        let datasets = Datasets {
+    #[must_use]
+    pub fn new(i: &NewDatasetsInput) -> Self {
+        Datasets {
             base: Base::new(i.landscape_data, i.settings, i.guide, i.qr_code),
             embed: Embed::new(i.landscape_data),
             full: Full::new(i.crunchbase_data, i.github_data, i.landscape_data),
             stats: Stats::new(i.landscape_data, i.settings, i.crunchbase_data),
-        };
-
-        Ok(datasets)
+        }
     }
 }
 
 /// Input used to create a new Datasets instance.
 #[derive(Debug, Clone)]
-pub(crate) struct NewDatasetsInput<'a> {
+pub struct NewDatasetsInput<'a> {
     pub crunchbase_data: &'a CrunchbaseData,
     pub github_data: &'a GithubData,
     pub guide: &'a Option<LandscapeGuide>,
@@ -58,8 +58,8 @@ pub(crate) struct NewDatasetsInput<'a> {
 ///
 /// This dataset contains the minimal data the web application needs to render
 /// the initial page and power the features available on it.
-mod base {
-    use crate::build::{
+pub mod base {
+    use crate::{
         data::{self, AdditionalCategory, Category, CategoryName, ItemFeatured, LandscapeData},
         guide::LandscapeGuide,
         settings::{
@@ -70,9 +70,9 @@ mod base {
     use std::collections::BTreeMap;
 
     /// Base dataset information.
-    #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
     #[allow(clippy::struct_field_names)]
-    pub(crate) struct Base {
+    #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
+    pub struct Base {
         pub finances_available: bool,
         pub foundation: String,
         pub qr_code: String,
@@ -122,7 +122,8 @@ mod base {
 
     impl Base {
         /// Create a new Base instance from the data and settings provided.
-        pub(crate) fn new(
+        #[must_use]
+        pub fn new(
             landscape_data: &LandscapeData,
             settings: &LandscapeSettings,
             guide: &Option<LandscapeGuide>,
@@ -202,7 +203,7 @@ mod base {
 
     /// Base dataset item information.
     #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
-    pub(crate) struct Item {
+    pub struct Item {
         pub category: String,
         pub id: String,
         pub name: String,
@@ -250,22 +251,22 @@ mod base {
 ///
 /// This dataset contains some information about all the embeddable views that
 /// can be generated from the information available in the landscape data.
-mod embed {
+pub mod embed {
     use super::base::Item;
-    use crate::build::{data::Category, LandscapeData};
+    use crate::data::{Category, LandscapeData};
     use serde::{Deserialize, Serialize};
     use std::collections::HashMap;
 
     /// Embed dataset information.
     #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
-    pub(crate) struct Embed {
+    pub struct Embed {
         #[serde(flatten, skip_serializing_if = "HashMap::is_empty")]
         pub views: HashMap<EmbedKey, EmbedView>,
     }
 
     impl Embed {
         /// Create a new Embed instance from the data provided.
-        pub(crate) fn new(landscape_data: &LandscapeData) -> Self {
+        pub fn new(landscape_data: &LandscapeData) -> Self {
             let mut views = HashMap::new();
 
             for category in &landscape_data.categories {
@@ -307,11 +308,11 @@ mod embed {
     }
 
     /// Type alias to represent a embed key.
-    pub(crate) type EmbedKey = String;
+    pub type EmbedKey = String;
 
     /// Embed view information.
     #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
-    pub(crate) struct EmbedView {
+    pub struct EmbedView {
         pub category: Category,
 
         #[serde(skip_serializing_if = "Vec::is_empty")]
@@ -324,18 +325,14 @@ mod embed {
 /// This dataset contains all the information available for the landscape. This
 /// information is used by the web application to power features that require
 /// some extra data not available in the base dataset.
-mod full {
-    use crate::build::{
-        crunchbase::CrunchbaseData,
-        data::{Item, LandscapeData},
-        github::GithubData,
-    };
+pub mod full {
+    use crate::data::{CrunchbaseData, GithubData, Item, LandscapeData};
     use serde::{Deserialize, Serialize};
     use std::collections::BTreeMap;
 
     /// Full dataset information.
     #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
-    pub(crate) struct Full {
+    pub struct Full {
         #[serde(skip_serializing_if = "BTreeMap::is_empty")]
         pub crunchbase_data: CrunchbaseData,
 
@@ -348,7 +345,8 @@ mod full {
 
     impl Full {
         /// Create a new Full instance from the landscape data provided.
-        pub(crate) fn new(
+        #[must_use]
+        pub fn new(
             crunchbase_data: &CrunchbaseData,
             github_data: &GithubData,
             landscape_data: &LandscapeData,
diff --git a/src/build/guide.rs b/crates/core/src/guide.rs
similarity index 88%
rename from src/build/guide.rs
rename to crates/core/src/guide.rs
index 4f05c686..dacdb13a 100644
--- a/src/build/guide.rs
+++ b/crates/core/src/guide.rs
@@ -1,16 +1,43 @@
 //! This module defines the types used to represent the landscape guide content
 //! that must be provided from a YAML file (guide.yml).
 
-use crate::GuideSource;
 use anyhow::{bail, format_err, Context, Result};
+use clap::Args;
 use reqwest::StatusCode;
 use serde::{Deserialize, Serialize};
-use std::{fs, path::Path};
+use std::{
+    fs,
+    path::{Path, PathBuf},
+};
 use tracing::{debug, instrument};
 
+/// Landscape guide source.
+#[derive(Args, Default)]
+#[group(required = false, multiple = false)]
+pub struct GuideSource {
+    /// Landscape guide file local path.
+    #[arg(long)]
+    pub guide_file: Option<PathBuf>,
+
+    /// Landscape guide file url.
+    #[arg(long)]
+    pub guide_url: Option<String>,
+}
+
+impl GuideSource {
+    /// Create a new guide source from the url provided.
+    #[must_use]
+    pub fn new_from_url(url: String) -> Self {
+        Self {
+            guide_file: None,
+            guide_url: Some(url),
+        }
+    }
+}
+
 /// Landscape guide content.
 #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
-pub(crate) struct LandscapeGuide {
+pub struct LandscapeGuide {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub categories: Option<Vec<Category>>,
 }
@@ -18,7 +45,7 @@ pub(crate) struct LandscapeGuide {
 impl LandscapeGuide {
     /// Create a new landscape guide instance from the source provided.
     #[instrument(skip_all, err)]
-    pub(crate) async fn new(src: &GuideSource) -> Result<Option<Self>> {
+    pub async fn new(src: &GuideSource) -> Result<Option<Self>> {
         // Try from file
         if let Some(file) = &src.guide_file {
             debug!(?file, "getting landscape guide from file");
@@ -60,7 +87,7 @@ impl LandscapeGuide {
     /// Create a new landscape guide instance from the YAML string provided.
     fn new_from_yaml(s: &str) -> Result<Self> {
         // Parse YAML string and validate guide
-        let mut guide: LandscapeGuide = serde_yaml::from_str(s)?;
+        let mut guide: LandscapeGuide = serde_yaml::from_str(s).context("invalid yaml file")?;
         guide.validate().context("the landscape guide file provided is not valid")?;
 
         // Convert content fields from markdown to HTML
@@ -156,7 +183,7 @@ impl LandscapeGuide {
 
 /// Guide category.
 #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
-pub(crate) struct Category {
+pub struct Category {
     #[allow(clippy::struct_field_names)]
     pub category: String,
 
@@ -172,7 +199,7 @@ pub(crate) struct Category {
 
 /// Guide subcategory.
 #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
-pub(crate) struct Subcategory {
+pub struct Subcategory {
     #[allow(clippy::struct_field_names)]
     pub subcategory: String,
 
diff --git a/crates/core/src/lib.rs b/crates/core/src/lib.rs
new file mode 100644
index 00000000..d387a987
--- /dev/null
+++ b/crates/core/src/lib.rs
@@ -0,0 +1,13 @@
+#![warn(clippy::all, clippy::pedantic)]
+#![allow(
+    clippy::doc_markdown,
+    clippy::blocks_in_conditions,
+    clippy::module_name_repetitions
+)]
+
+pub mod data;
+pub mod datasets;
+pub mod guide;
+pub mod settings;
+pub mod stats;
+mod util;
diff --git a/src/build/settings.rs b/crates/core/src/settings.rs
similarity index 93%
rename from src/build/settings.rs
rename to crates/core/src/settings.rs
index 7eef4666..9f2d1d4d 100644
--- a/src/build/settings.rs
+++ b/crates/core/src/settings.rs
@@ -7,20 +7,49 @@
 //! NOTE: the landscape settings file uses a new format that is not backwards
 //! compatible with the legacy settings file used by existing landscapes.
 
-use super::data::{normalize_name, validate_url, CategoryName, SubCategoryName};
-use crate::SettingsSource;
+use super::data::{CategoryName, SubCategoryName};
+use crate::util::{normalize_name, validate_url};
 use anyhow::{bail, format_err, Context, Result};
 use chrono::NaiveDate;
+use clap::Args;
 use lazy_static::lazy_static;
 use regex::Regex;
 use reqwest::StatusCode;
 use serde::{Deserialize, Serialize};
-use std::{collections::BTreeMap, fs, path::Path};
+use std::{
+    collections::BTreeMap,
+    fs,
+    path::{Path, PathBuf},
+};
 use tracing::{debug, instrument};
 
+/// Landscape settings location.
+#[derive(Args, Default)]
+#[group(required = true, multiple = false)]
+pub struct SettingsSource {
+    /// Landscape settings file local path.
+    #[arg(long)]
+    pub settings_file: Option<PathBuf>,
+
+    /// Landscape settings file url.
+    #[arg(long)]
+    pub settings_url: Option<String>,
+}
+
+impl SettingsSource {
+    /// Create a new settings source from the url provided.
+    #[must_use]
+    pub fn new_from_url(url: String) -> Self {
+        Self {
+            settings_file: None,
+            settings_url: Some(url),
+        }
+    }
+}
+
 /// Landscape settings.
 #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
-pub(crate) struct LandscapeSettings {
+pub struct LandscapeSettings {
     pub foundation: String,
     pub url: String,
 
@@ -79,7 +108,7 @@ pub(crate) struct LandscapeSettings {
 impl LandscapeSettings {
     /// Create a new landscape settings instance from the source provided.
     #[instrument(skip_all, err)]
-    pub(crate) async fn new(src: &SettingsSource) -> Result<Self> {
+    pub async fn new(src: &SettingsSource) -> Result<Self> {
         // Try from file
         if let Some(file) = &src.settings_file {
             debug!(?file, "getting landscape settings from file");
@@ -120,7 +149,7 @@ impl LandscapeSettings {
 
     /// Create a new landscape settings instance from the raw data provided.
     fn new_from_raw_data(raw_data: &str) -> Result<Self> {
-        let mut settings: LandscapeSettings = serde_yaml::from_str(raw_data)?;
+        let mut settings: LandscapeSettings = serde_yaml::from_str(raw_data).context("invalid yaml file")?;
 
         settings.validate().context("the landscape settings file provided is not valid")?;
         settings.footer_text_to_html().context("error converting footer md text to html")?;
@@ -455,28 +484,28 @@ impl LandscapeSettings {
 
 /// Landscape analytics providers.
 #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
-pub(crate) struct Analytics {
+pub struct Analytics {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub gtm: Option<GoogleTagManager>,
 }
 
 /// Landscape category.
 #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
-pub(crate) struct Category {
+pub struct Category {
     pub name: CategoryName,
     pub subcategories: Vec<SubCategoryName>,
 }
 
 lazy_static! {
     /// RGBA regular expression.
-    pub(crate) static ref RGBA: Regex =
+    static ref RGBA: Regex =
         Regex::new(r"rgba?\(((25[0-5]|2[0-4]\d|1\d{1,2}|\d\d?)\s*,\s*?){2}(25[0-5]|2[0-4]\d|1\d{1,2}|\d\d?)\s*,?\s*([01]\.?\d*?)\)")
             .expect("exprs in RGBA to be valid");
 }
 
 /// Colors used across the landscape UI.
 #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
-pub(crate) struct Colors {
+pub struct Colors {
     pub color1: String,
     pub color2: String,
     pub color3: String,
@@ -489,14 +518,14 @@ pub(crate) struct Colors {
 /// the web application, usually making it larger with some special styling.
 /// These rules are used to decide which items should be featured.
 #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
-pub(crate) struct FeaturedItemRule {
+pub struct FeaturedItemRule {
     pub field: String,
     pub options: Vec<FeaturedItemRuleOption>,
 }
 
 /// Featured item rule option.
 #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
-pub(crate) struct FeaturedItemRuleOption {
+pub struct FeaturedItemRuleOption {
     pub value: String,
 
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -508,7 +537,7 @@ pub(crate) struct FeaturedItemRuleOption {
 
 /// Footer configuration.
 #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
-pub(crate) struct Footer {
+pub struct Footer {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub links: Option<FooterLinks>,
 
@@ -521,7 +550,7 @@ pub(crate) struct Footer {
 
 /// Footer links.
 #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
-pub(crate) struct FooterLinks {
+pub struct FooterLinks {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub facebook: Option<String>,
 
@@ -558,7 +587,7 @@ pub(crate) struct FooterLinks {
 
 /// Google Tag Manager configuration.
 #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
-pub(crate) struct GoogleTagManager {
+pub struct GoogleTagManager {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub container_id: Option<String>,
 }
@@ -566,7 +595,7 @@ pub(crate) struct GoogleTagManager {
 /// Grid items size.
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "kebab-case")]
-pub(crate) enum GridItemsSize {
+pub enum GridItemsSize {
     Small,
     Medium,
     Large,
@@ -575,7 +604,7 @@ pub(crate) enum GridItemsSize {
 /// Landscape group. A group provides a mechanism to organize sets of
 /// categories in the web application.
 #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
-pub(crate) struct Group {
+pub struct Group {
     pub name: String,
     pub normalized_name: Option<String>,
     pub categories: Vec<CategoryName>,
@@ -583,7 +612,7 @@ pub(crate) struct Group {
 
 /// Header configuration.
 #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
-pub(crate) struct Header {
+pub struct Header {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub links: Option<HeaderLinks>,
 
@@ -593,14 +622,14 @@ pub(crate) struct Header {
 
 /// Header links.
 #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
-pub(crate) struct HeaderLinks {
+pub struct HeaderLinks {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub github: Option<String>,
 }
 
 /// Images urls.
 #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
-pub(crate) struct Images {
+pub struct Images {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub favicon: Option<String>,
 
@@ -610,7 +639,7 @@ pub(crate) struct Images {
 
 /// Logos viewbox configuration.
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
-pub(crate) struct LogosViewbox {
+pub struct LogosViewbox {
     pub adjust: bool,
     pub exclude: Vec<String>,
 }
@@ -626,17 +655,17 @@ impl Default for LogosViewbox {
 
 /// Osano configuration.
 #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
-pub(crate) struct Osano {
+pub struct Osano {
     pub customer_id: String,
     pub customer_configuration_id: String,
 }
 
 /// Type alias to represent a TAG name.
-pub(crate) type TagName = String;
+pub type TagName = String;
 
 /// TAG rule used to set the TAG that owns a project automatically.
 #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
-pub(crate) struct TagRule {
+pub struct TagRule {
     pub category: CategoryName,
 
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -645,7 +674,7 @@ pub(crate) struct TagRule {
 
 /// Upcoming event details.
 #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
-pub(crate) struct UpcomingEvent {
+pub struct UpcomingEvent {
     pub name: String,
     pub start: NaiveDate,
     pub end: NaiveDate,
@@ -656,7 +685,7 @@ pub(crate) struct UpcomingEvent {
 /// Default view mode used in the web application.
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "kebab-case")]
-pub(crate) enum ViewMode {
+pub enum ViewMode {
     Grid,
     Card,
 }
diff --git a/src/build/stats.rs b/crates/core/src/stats.rs
similarity index 90%
rename from src/build/stats.rs
rename to crates/core/src/stats.rs
index 6865981e..6968f8d3 100644
--- a/src/build/stats.rs
+++ b/crates/core/src/stats.rs
@@ -2,11 +2,10 @@
 //! as well as the functionality used to prepare them.
 
 use super::{
-    crunchbase::CrunchbaseData,
     data::{CategoryName, SubCategoryName},
     settings::{LandscapeSettings, TagName},
-    LandscapeData,
 };
+use crate::data::{CrunchbaseData, LandscapeData};
 use chrono::{Datelike, Utc};
 use itertools::Itertools;
 use serde::{Deserialize, Serialize};
@@ -23,28 +22,29 @@ type YearMonth = String;
 
 /// Landscape stats.
 #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
-pub(crate) struct Stats {
+pub struct Stats {
     /// Foundation members stats.
     #[serde(skip_serializing_if = "Option::is_none")]
-    members: Option<MembersStats>,
+    pub members: Option<MembersStats>,
 
     /// Foundation organizations stats.
     #[serde(skip_serializing_if = "Option::is_none")]
-    organizations: Option<OrganizationsStats>,
+    pub organizations: Option<OrganizationsStats>,
 
     /// Foundation projects stats.
     #[serde(skip_serializing_if = "Option::is_none")]
-    projects: Option<ProjectsStats>,
+    pub projects: Option<ProjectsStats>,
 
     /// Repositories stats.
     #[serde(skip_serializing_if = "Option::is_none")]
-    repositories: Option<RepositoriesStats>,
+    pub repositories: Option<RepositoriesStats>,
 }
 
 impl Stats {
     /// Create a new Stats instance from the information available in the
     /// landscape.
-    pub(crate) fn new(
+    #[must_use]
+    pub fn new(
         landscape_data: &LandscapeData,
         settings: &LandscapeSettings,
         crunchbase_data: &CrunchbaseData,
@@ -60,21 +60,21 @@ impl Stats {
 
 /// Some stats about the foundation's members.
 #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
-pub(crate) struct MembersStats {
+pub struct MembersStats {
     /// Number of members joined per year-month.
     #[serde(skip_serializing_if = "BTreeMap::is_empty")]
-    joined_at: BTreeMap<YearMonth, u64>,
+    pub joined_at: BTreeMap<YearMonth, u64>,
 
     /// Running total of number of members joined per year-month.
     #[serde(skip_serializing_if = "BTreeMap::is_empty")]
-    joined_at_rt: BTreeMap<YearMonth, u64>,
+    pub joined_at_rt: BTreeMap<YearMonth, u64>,
 
     /// Total number of members.
-    members: u64,
+    pub members: u64,
 
     /// Number of members per subcategory.
     #[serde(skip_serializing_if = "BTreeMap::is_empty")]
-    subcategories: BTreeMap<String, u64>,
+    pub subcategories: BTreeMap<String, u64>,
 }
 
 impl MembersStats {
@@ -113,22 +113,22 @@ impl MembersStats {
 
 /// Some stats about the organizations in the landscape.
 #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
-pub(crate) struct OrganizationsStats {
+pub struct OrganizationsStats {
     /// Total number of acquisitions per year across all organizations.
     #[serde(skip_serializing_if = "BTreeMap::is_empty")]
-    acquisitions: BTreeMap<Year, u64>,
+    pub acquisitions: BTreeMap<Year, u64>,
 
     /// Total acquisitions price per year across all organizations.
     #[serde(skip_serializing_if = "BTreeMap::is_empty")]
-    acquisitions_price: BTreeMap<Year, u64>,
+    pub acquisitions_price: BTreeMap<Year, u64>,
 
     /// Total number of funding rounds per year across all organizations.
     #[serde(skip_serializing_if = "BTreeMap::is_empty")]
-    funding_rounds: BTreeMap<Year, u64>,
+    pub funding_rounds: BTreeMap<Year, u64>,
 
     /// Total money raised on funding rounds per year across all organizations.
     #[serde(skip_serializing_if = "BTreeMap::is_empty")]
-    funding_rounds_money_raised: BTreeMap<Year, u64>,
+    pub funding_rounds_money_raised: BTreeMap<Year, u64>,
 }
 
 impl OrganizationsStats {
@@ -185,45 +185,45 @@ impl OrganizationsStats {
 
 /// Some stats about the landscape projects.
 #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
-pub(crate) struct ProjectsStats {
+pub struct ProjectsStats {
     /// Number of projects accepted per year-month.
     #[serde(skip_serializing_if = "BTreeMap::is_empty")]
-    accepted_at: BTreeMap<YearMonth, u64>,
+    pub accepted_at: BTreeMap<YearMonth, u64>,
 
     /// Running total of number of projects accepted per year-month.
     #[serde(skip_serializing_if = "BTreeMap::is_empty")]
-    accepted_at_rt: BTreeMap<YearMonth, u64>,
+    pub accepted_at_rt: BTreeMap<YearMonth, u64>,
 
     /// Number of security audits per year-month.
     #[serde(skip_serializing_if = "BTreeMap::is_empty")]
-    audits: BTreeMap<YearMonth, u64>,
+    pub audits: BTreeMap<YearMonth, u64>,
 
     /// Running total of number of security audits per year-month.
     #[serde(skip_serializing_if = "BTreeMap::is_empty")]
-    audits_rt: BTreeMap<YearMonth, u64>,
+    pub audits_rt: BTreeMap<YearMonth, u64>,
 
     /// Number of projects per category and subcategory.
     #[serde(skip_serializing_if = "BTreeMap::is_empty")]
-    category: BTreeMap<CategoryName, CategoryProjectsStats>,
+    pub category: BTreeMap<CategoryName, CategoryProjectsStats>,
 
     /// Promotions from incubating to graduated per year-month.
     #[serde(skip_serializing_if = "BTreeMap::is_empty")]
-    incubating_to_graduated: BTreeMap<YearMonth, u64>,
+    pub incubating_to_graduated: BTreeMap<YearMonth, u64>,
 
     /// Number of projects per maturity.
     #[serde(skip_serializing_if = "BTreeMap::is_empty")]
-    maturity: BTreeMap<String, u64>,
+    pub maturity: BTreeMap<String, u64>,
 
     /// Total number of projects.
-    projects: u64,
+    pub projects: u64,
 
     /// Promotions from sandbox to incubating per year-month.
     #[serde(skip_serializing_if = "BTreeMap::is_empty")]
-    sandbox_to_incubating: BTreeMap<YearMonth, u64>,
+    pub sandbox_to_incubating: BTreeMap<YearMonth, u64>,
 
     /// Number of projects per TAG.
     #[serde(skip_serializing_if = "BTreeMap::is_empty")]
-    tag: BTreeMap<TagName, u64>,
+    pub tag: BTreeMap<TagName, u64>,
 }
 
 impl ProjectsStats {
@@ -312,45 +312,45 @@ impl ProjectsStats {
 
 /// Some stats about the projects in a category and its subcategories.
 #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
-pub(crate) struct CategoryProjectsStats {
+pub struct CategoryProjectsStats {
     /// Number of projects in the category.
-    projects: u64,
+    pub projects: u64,
 
     /// Number of projects per subcategory.
     #[serde(skip_serializing_if = "BTreeMap::is_empty")]
-    subcategories: BTreeMap<SubCategoryName, u64>,
+    pub subcategories: BTreeMap<SubCategoryName, u64>,
 }
 
 /// Some stats about the repositories listed in the landscape.
 #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
-pub(crate) struct RepositoriesStats {
+pub struct RepositoriesStats {
     /// Source code bytes.
-    bytes: u64,
+    pub bytes: u64,
 
     /// Number of contributors.
-    contributors: u64,
+    pub contributors: u64,
 
     /// Number of repositories where each language is used.
     #[serde(skip_serializing_if = "BTreeMap::is_empty")]
-    languages: BTreeMap<String, u64>,
+    pub languages: BTreeMap<String, u64>,
 
     /// Source code bytes written on each language.
     #[serde(skip_serializing_if = "BTreeMap::is_empty")]
-    languages_bytes: BTreeMap<String, u64>,
+    pub languages_bytes: BTreeMap<String, u64>,
 
     /// Number of repositories where each license is used.
     #[serde(skip_serializing_if = "BTreeMap::is_empty")]
-    licenses: BTreeMap<String, u64>,
+    pub licenses: BTreeMap<String, u64>,
 
     /// Number of commits per week over the last year.
     #[serde(skip_serializing_if = "Vec::is_empty")]
-    participation_stats: Vec<i64>,
+    pub participation_stats: Vec<i64>,
 
     /// Number of repositories.
-    repositories: u64,
+    pub repositories: u64,
 
     /// Number of stars.
-    stars: u64,
+    pub stars: u64,
 }
 
 impl RepositoriesStats {
diff --git a/crates/core/src/util.rs b/crates/core/src/util.rs
new file mode 100644
index 00000000..8d494f41
--- /dev/null
+++ b/crates/core/src/util.rs
@@ -0,0 +1,85 @@
+//! This module provides some utility functions.
+
+use anyhow::{bail, Result};
+use lazy_static::lazy_static;
+use regex::Regex;
+use url::Url;
+
+lazy_static! {
+    /// Crunchbase url regular expression.
+    static ref CRUNCHBASE_URL: Regex =
+        Regex::new("^https://www.crunchbase.com/organization/(?P<permalink>[^/]+)/?$")
+            .expect("exprs in CRUNCHBASE_URL to be valid");
+
+    /// Regular expression to match multiple hyphens.
+    static ref MULTIPLE_HYPHENS: Regex = Regex::new(r"-{2,}").expect("exprs in MULTIPLE_HYPHENS to be valid");
+
+    /// Characters allowed in normalized names.
+    static ref VALID_CHARS: Regex = Regex::new(r"[a-z0-9\-\ \+]").expect("exprs in VALID_CHARS to be valid");
+}
+
+/// Normalize category, subcategory and item name.
+pub(crate) fn normalize_name(value: &str) -> String {
+    let mut normalized_name = value
+        .to_lowercase()
+        .replace(' ', "-")
+        .chars()
+        .map(|c| {
+            if VALID_CHARS.is_match(&c.to_string()) {
+                c
+            } else {
+                '-'
+            }
+        })
+        .collect::<String>();
+    normalized_name = MULTIPLE_HYPHENS.replace(&normalized_name, "-").to_string();
+    if let Some(normalized_name_without_suffix) = normalized_name.strip_suffix('-') {
+        normalized_name = normalized_name_without_suffix.to_string();
+    }
+    normalized_name
+}
+
+/// Validate the url provided.
+pub(crate) fn validate_url(kind: &str, url: &Option<String>) -> Result<()> {
+    if let Some(url) = url {
+        let invalid_url = |reason: &str| bail!("invalid {kind} url: {reason}");
+
+        // Parse url
+        let url = match Url::parse(url) {
+            Ok(url) => url,
+            Err(err) => return invalid_url(&err.to_string()),
+        };
+
+        // Check scheme
+        if url.scheme() != "http" && url.scheme() != "https" {
+            return invalid_url("invalid scheme");
+        }
+
+        // Some checks specific to the url kind provided
+        let check_domain = |domain: &str| {
+            if url.host_str().is_some_and(|host| !host.ends_with(domain)) {
+                return invalid_url(&format!("expecting https://{domain}/..."));
+            }
+            Ok(())
+        };
+        match kind {
+            "crunchbase" => {
+                if !CRUNCHBASE_URL.is_match(url.as_str()) {
+                    return invalid_url(&format!("expecting: {}", CRUNCHBASE_URL.as_str()));
+                }
+            }
+            "facebook" => return check_domain("facebook.com"),
+            "flickr" => return check_domain("flickr.com"),
+            "github" => return check_domain("github.com"),
+            "instagram" => return check_domain("instagram.com"),
+            "linkedin" => return check_domain("linkedin.com"),
+            "stack_overflow" => return check_domain("stackoverflow.com"),
+            "twitch" => return check_domain("twitch.tv"),
+            "twitter" => return check_domain("twitter.com"),
+            "youtube" => return check_domain("youtube.com"),
+            _ => {}
+        }
+    }
+
+    Ok(())
+}
diff --git a/crates/wasm/overlay/Cargo.toml b/crates/wasm/overlay/Cargo.toml
new file mode 100644
index 00000000..a4cb49a9
--- /dev/null
+++ b/crates/wasm/overlay/Cargo.toml
@@ -0,0 +1,24 @@
+[package]
+name = "landscape2-overlay"
+description = "Landscape2 overlay data provider"
+repository = "https://github.com/cncf/landscape2"
+readme = "../../../README.md"
+version.workspace = true
+license.workspace = true
+edition.workspace = true
+rust-version.workspace = true
+authors.workspace = true
+homepage.workspace = true
+
+[lib]
+crate-type = ["cdylib"]
+
+[dependencies]
+anyhow = { workspace = true }
+landscape2-core = { path = "../../core" }
+reqwest = { workspace = true, features = ["json"] }
+serde = { workspace = true }
+serde_json = { workspace = true }
+serde-wasm-bindgen = { workspace = true }
+wasm-bindgen = { workspace = true }
+wasm-bindgen-futures = { workspace = true }
diff --git a/crates/wasm/overlay/overlay-test.html b/crates/wasm/overlay/overlay-test.html
new file mode 100644
index 00000000..1399c8f6
--- /dev/null
+++ b/crates/wasm/overlay/overlay-test.html
@@ -0,0 +1,22 @@
+<html>
+  <head>
+    <meta content="text/html;charset=utf-8" http-equiv="Content-Type"/>
+  </head>
+  <body>
+    <script type="module">
+      import init, { get_overlay_data } from './dist/landscape2_overlay.js';
+
+      async function run() {
+        await init();
+
+        const input = {
+          landscape_url: "http://localhost:8000",
+        };
+        const overlay_data = await get_overlay_data(input);
+        console.log(JSON.parse(overlay_data));
+      }
+
+      run();
+    </script>
+  </body>
+</html>
diff --git a/crates/wasm/overlay/src/lib.rs b/crates/wasm/overlay/src/lib.rs
new file mode 100644
index 00000000..24e99257
--- /dev/null
+++ b/crates/wasm/overlay/src/lib.rs
@@ -0,0 +1,159 @@
+//! This module is in charge of preparing the overlay data.
+
+use anyhow::{bail, Context, Result};
+use landscape2_core::{
+    data::{DataSource, Item, LandscapeData},
+    datasets::{base::Base, full::Full},
+    guide::{GuideSource, LandscapeGuide},
+    settings::{LandscapeSettings, SettingsSource},
+    stats::Stats,
+};
+use reqwest::StatusCode;
+use serde::{Deserialize, Serialize};
+use wasm_bindgen::prelude::*;
+
+/// Path of the deployed full dataset file.
+const FULL_DATASET_PATH: &str = "data/full.json";
+
+/// Path of the default data file.
+const DEFAULT_DATA_PATH: &str = "sources/data.yml";
+
+/// Path of the default settings file.
+const DEFAULT_SETTINGS_PATH: &str = "sources/settings.yml";
+
+/// Path of the default guide file.
+const DEFAULT_GUIDE_PATH: &str = "sources/guide.yml";
+
+/// Input data for the get_overlay_data function.
+#[derive(Deserialize)]
+struct GetOverlayDataInput {
+    landscape_url: String,
+
+    data_url: Option<String>,
+    guide_url: Option<String>,
+    logos_url: Option<String>,
+    settings_url: Option<String>,
+}
+
+/// Overlay data.
+#[derive(Serialize)]
+struct OverlayData {
+    datasets: Datasets,
+    guide: Option<LandscapeGuide>,
+}
+
+/// Datasets included in the overlay data.
+#[derive(Serialize)]
+struct Datasets {
+    base: Base,
+    full: Full,
+    stats: Stats,
+}
+
+/// Prepare and return the overlay data.
+#[wasm_bindgen]
+pub async fn get_overlay_data(input: JsValue) -> Result<String, String> {
+    // Parse input data
+    let mut input: GetOverlayDataInput = serde_wasm_bindgen::from_value(input).map_err(to_str)?;
+    input.landscape_url = input.landscape_url.trim_end_matches('/').to_string();
+
+    // Get landscape data
+    let default_data_url = format!("{}/{}", input.landscape_url, DEFAULT_DATA_PATH);
+    let data_url = input.data_url.unwrap_or(default_data_url);
+    let landscape_data_src = DataSource::new_from_url(data_url);
+    let mut landscape_data = LandscapeData::new(&landscape_data_src)
+        .await
+        .context("error fetching landscape data")
+        .map_err(to_str)?;
+
+    // Get landscape settings
+    let default_settings_url = format!("{}/{}", input.landscape_url, DEFAULT_SETTINGS_PATH);
+    let settings_url = input.settings_url.unwrap_or(default_settings_url);
+    let settings_src = SettingsSource::new_from_url(settings_url);
+    let settings = LandscapeSettings::new(&settings_src)
+        .await
+        .context("error fetching settings")
+        .map_err(to_str)?;
+
+    // Get landscape guide
+    let default_guide_url = format!("{}/{}", input.landscape_url, DEFAULT_GUIDE_PATH);
+    let guide_url = input.guide_url.unwrap_or(default_guide_url);
+    let guide_src = GuideSource::new_from_url(guide_url);
+    let guide = LandscapeGuide::new(&guide_src).await.context("error fetching guide").map_err(to_str)?;
+
+    // Get Crunchbase and GitHub data from deployed full dataset
+    let deployed_full_dataset = get_full_dataset(&input.landscape_url).await.map_err(to_str)?;
+    let deployed_items = deployed_full_dataset.items;
+    let crunchbase_data = deployed_full_dataset.crunchbase_data;
+    let github_data = deployed_full_dataset.github_data;
+
+    // Enrich landscape data with some extra information
+    landscape_data.add_crunchbase_data(&crunchbase_data);
+    landscape_data.add_featured_items_data(&settings);
+    landscape_data.add_github_data(&github_data);
+    landscape_data.add_member_subcategory(&settings.members_category);
+    landscape_data.add_tags(&settings);
+    set_clomonitor_report_summary(&mut landscape_data, &deployed_items);
+    set_logos_url(&mut landscape_data, input.logos_url, &deployed_items);
+
+    // Prepare datasets
+    let qr_code = String::new();
+    let datasets = Datasets {
+        base: Base::new(&landscape_data, &settings, &guide, &qr_code),
+        full: Full::new(&crunchbase_data, &github_data, &landscape_data),
+        stats: Stats::new(&landscape_data, &settings, &crunchbase_data),
+    };
+
+    // Prepare overlay data and return it
+    let overlay_data = OverlayData { datasets, guide };
+    let overlay_data_json = serde_json::to_string(&overlay_data).map_err(to_str)?;
+
+    Ok(overlay_data_json)
+}
+
+/// Get landscape currently deployed full dataset.
+async fn get_full_dataset(landscape_url: &str) -> Result<Full> {
+    let url = format!("{}/{}", landscape_url, FULL_DATASET_PATH);
+    let resp = reqwest::get(&url).await.context("error getting full dataset")?;
+    if resp.status() != StatusCode::OK {
+        bail!("unexpected status code getting full dataset: {}", resp.status());
+    }
+    let full: Full = resp.json().await?;
+    Ok(full)
+}
+
+/// Set logos url for all items in the landscape based on the base logos url
+/// provided.
+fn set_clomonitor_report_summary(landscape_data: &mut LandscapeData, deployed_items: &[Item]) {
+    for item in &mut landscape_data.items {
+        item.clomonitor_report_summary = deployed_items
+            .iter()
+            .find(|x| x.id == item.id)
+            .and_then(|x| x.clomonitor_report_summary.clone());
+    }
+}
+
+/// Set logos url for all items in the landscape.
+///
+/// If a logos url is provided, it will be used to set the logo url for all
+/// items. Otherwise, we'll use the current logo url from the deployed items.
+fn set_logos_url(landscape_data: &mut LandscapeData, logos_url: Option<String>, deployed_items: &[Item]) {
+    if let Some(logos_url) = logos_url {
+        for item in &mut landscape_data.items {
+            item.logo = format!("{}/{}", logos_url.trim_end_matches('/'), item.logo);
+        }
+    } else {
+        for item in &mut landscape_data.items {
+            item.logo = deployed_items
+                .iter()
+                .find(|x| x.id == item.id)
+                .map(|x| x.logo.clone())
+                .unwrap_or_default();
+        }
+    }
+}
+
+/// Helper function to convert an error to a string.
+fn to_str<E: std::fmt::Debug>(err: E) -> String {
+    format!("{:?}", err)
+}
diff --git a/src/build/projects.rs b/src/build/projects.rs
deleted file mode 100644
index 1a0b8c14..00000000
--- a/src/build/projects.rs
+++ /dev/null
@@ -1,124 +0,0 @@
-//! This module defines the functionality to generate the `projects.md` and
-//! `projects.csv` files from the information available in the landscape.
-
-use super::{data::DATE_FORMAT, LandscapeData};
-use anyhow::Result;
-use askama::Template;
-use chrono::NaiveDate;
-use serde::{Deserialize, Serialize};
-use std::fs::File;
-
-/// Project information used to generate the projects.md and projects.csv files.
-#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
-pub(crate) struct Project {
-    pub accepted_at: String,
-    pub archived_at: String,
-    pub graduated_at: String,
-    pub homepage_url: String,
-    pub incubating_at: String,
-    pub last_security_audit: String,
-    pub maturity: String,
-    pub name: String,
-    pub num_security_audits: String,
-    pub sandbox_at: String,
-    pub tag: String,
-}
-
-impl From<&LandscapeData> for Vec<Project> {
-    fn from(landscape_data: &LandscapeData) -> Self {
-        // Helper closure to format dates
-        let fmt_date = |date: &Option<NaiveDate>| {
-            let Some(date) = date else {
-                return String::new();
-            };
-            date.format(DATE_FORMAT).to_string()
-        };
-
-        // Collect projects from landscape data
-        let mut projects: Vec<Project> = landscape_data
-            .items
-            .iter()
-            .cloned()
-            .filter_map(|item| {
-                // Prepare maturity and tag
-                let maturity = item.maturity?;
-                let tag = item.tag?;
-
-                // Prepare sandbox date
-                let sandbox_at = if item.accepted_at == item.incubating_at {
-                    None
-                } else {
-                    item.accepted_at
-                };
-
-                // Prepare security audits info
-                let last_security_audit = item.audits.as_ref().and_then(|a| a.last().map(|a| a.date));
-                let num_security_audits = item.audits.as_ref().map(Vec::len);
-
-                // Create project instance and return it
-                let project = Project {
-                    accepted_at: fmt_date(&item.accepted_at),
-                    archived_at: fmt_date(&item.archived_at),
-                    graduated_at: fmt_date(&item.graduated_at),
-                    homepage_url: item.homepage_url,
-                    incubating_at: fmt_date(&item.incubating_at),
-                    maturity: maturity.to_string(),
-                    name: item.name.to_lowercase(),
-                    num_security_audits: num_security_audits.unwrap_or_default().to_string(),
-                    last_security_audit: fmt_date(&last_security_audit),
-                    sandbox_at: fmt_date(&sandbox_at),
-                    tag: tag.to_string(),
-                };
-                Some(project)
-            })
-            .collect();
-
-        // Sort projects
-        projects.sort_by(|a, b| a.name.cmp(&b.name));
-
-        projects
-    }
-}
-
-/// Template for the projects.md file.
-#[derive(Debug, Clone, Template)]
-#[template(path = "projects.md")]
-pub(crate) struct ProjectsMd<'a> {
-    pub projects: &'a [Project],
-}
-
-/// Generate CSV file with some information about each project.
-pub(crate) fn generate_projects_csv(mut w: csv::Writer<File>, projects: &[Project]) -> Result<()> {
-    // Write headers
-    w.write_record([
-        "project_name",
-        "maturity",
-        "tag",
-        "accepted_date",
-        "sandbox_date",
-        "incubating_date",
-        "graduated_date",
-        "archived_date",
-        "num_security_audits",
-        "last_security_audit_date",
-    ])?;
-
-    // Write one record for each project
-    for p in projects {
-        w.write_record([
-            &p.name,
-            &p.maturity,
-            &p.tag,
-            &p.accepted_at,
-            &p.sandbox_at,
-            &p.incubating_at,
-            &p.graduated_at,
-            &p.archived_at,
-            &p.num_security_audits,
-            &p.last_security_audit,
-        ])?;
-    }
-
-    w.flush()?;
-    Ok(())
-}
diff --git a/src/deploy/mod.rs b/src/deploy/mod.rs
deleted file mode 100644
index 76b4117f..00000000
--- a/src/deploy/mod.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-//! This module defines the functionality of the deploy CLI subcommand.
-
-pub(crate) mod s3;
diff --git a/src/main.rs b/src/main.rs
deleted file mode 100644
index 6b02f23a..00000000
--- a/src/main.rs
+++ /dev/null
@@ -1,243 +0,0 @@
-#![warn(clippy::all, clippy::pedantic)]
-#![allow(clippy::doc_markdown, clippy::blocks_in_conditions)]
-
-use anyhow::Result;
-use build::build;
-use clap::{Args, Parser, Subcommand};
-use deploy::s3;
-use new::new;
-use serve::serve;
-use std::path::PathBuf;
-use validate::{validate_data, validate_guide, validate_settings};
-
-mod build;
-mod deploy;
-mod new;
-mod serve;
-mod validate;
-
-/// CLI arguments.
-#[derive(Parser)]
-#[command(
-    version,
-    about = "Landscape2 CLI tool
-
-https://github.com/cncf/landscape2#usage"
-)]
-struct Cli {
-    #[command(subcommand)]
-    command: Command,
-}
-
-/// Commands available.
-#[derive(Subcommand)]
-enum Command {
-    /// Build landscape website.
-    Build(BuildArgs),
-
-    /// Deploy landscape website (experimental).
-    Deploy(DeployArgs),
-
-    /// Create a new landscape from the built-in template.
-    New(NewArgs),
-
-    /// Serve landscape website.
-    Serve(ServeArgs),
-
-    /// Validate landscape data sources files.
-    Validate(ValidateArgs),
-}
-
-/// Build command arguments.
-#[derive(Args)]
-struct BuildArgs {
-    /// Cache directory.
-    #[arg(long)]
-    cache_dir: Option<PathBuf>,
-
-    /// Data source.
-    #[command(flatten)]
-    data_source: DataSource,
-
-    /// Guide source.
-    #[command(flatten)]
-    guide_source: GuideSource,
-
-    /// Logos source.
-    #[command(flatten)]
-    logos_source: LogosSource,
-
-    /// Output directory to write files to.
-    #[arg(long)]
-    output_dir: PathBuf,
-
-    /// Settings source.
-    #[command(flatten)]
-    settings_source: SettingsSource,
-}
-
-/// Landscape data location.
-#[derive(Args)]
-#[group(required = true, multiple = false)]
-struct DataSource {
-    /// Landscape data file local path.
-    #[arg(long)]
-    data_file: Option<PathBuf>,
-
-    /// Landscape data file url.
-    #[arg(long)]
-    data_url: Option<String>,
-}
-
-/// Landscape guide location.
-#[derive(Args)]
-#[group(required = false, multiple = false)]
-struct GuideSource {
-    /// Landscape guide file local path.
-    #[arg(long)]
-    guide_file: Option<PathBuf>,
-
-    /// Landscape guide file url.
-    #[arg(long)]
-    guide_url: Option<String>,
-}
-
-/// Landscape logos location.
-#[derive(Args, Clone)]
-#[group(required = true, multiple = false)]
-struct LogosSource {
-    /// Local path where the logos are stored.
-    #[arg(long)]
-    logos_path: Option<PathBuf>,
-
-    /// Base URL where the logos are hosted.
-    #[arg(long)]
-    logos_url: Option<String>,
-}
-
-/// Landscape settings location.
-#[derive(Args)]
-#[group(required = true, multiple = false)]
-struct SettingsSource {
-    /// Landscape settings file local path.
-    #[arg(long)]
-    settings_file: Option<PathBuf>,
-
-    /// Landscape settings file url.
-    #[arg(long)]
-    settings_url: Option<String>,
-}
-
-/// Deploy command arguments.
-#[derive(Args)]
-#[command(args_conflicts_with_subcommands = true)]
-struct DeployArgs {
-    /// Provider used to deploy the landscape website.
-    #[command(subcommand)]
-    provider: Provider,
-}
-
-/// Provider used to deploy the landscape website.
-#[derive(Subcommand)]
-enum Provider {
-    /// Deploy landscape website to AWS S3.
-    S3(S3Args),
-}
-
-/// AWS S3 provider arguments.
-#[derive(Args)]
-struct S3Args {
-    /// Bucket to copy the landscape website files to.
-    #[arg(long)]
-    bucket: String,
-
-    /// Location of the landscape website files (build subcommand output).
-    #[arg(long)]
-    landscape_dir: PathBuf,
-}
-
-/// New command arguments.
-#[derive(Args)]
-struct NewArgs {
-    /// Output directory to write files to.
-    #[arg(long)]
-    output_dir: PathBuf,
-}
-
-/// Serve command arguments.
-#[derive(Args)]
-struct ServeArgs {
-    /// Address the web server will listen on.
-    #[arg(long, default_value = "127.0.0.1:8000")]
-    addr: String,
-
-    /// Whether the server should stop gracefully or not.
-    #[arg(long, default_value_t = false)]
-    graceful_shutdown: bool,
-
-    /// Location of the landscape website files (build subcommand output).
-    /// The current path will be used when none is provided.
-    #[arg(long)]
-    landscape_dir: Option<PathBuf>,
-
-    /// Enable silent mode.
-    #[arg(long, default_value_t = false)]
-    silent: bool,
-}
-
-/// Validate command arguments.
-#[derive(Args)]
-#[command(args_conflicts_with_subcommands = true)]
-struct ValidateArgs {
-    /// Landscape file to validate.
-    #[command(subcommand)]
-    target: ValidateTarget,
-}
-
-/// Landscape file to validate.
-#[derive(Subcommand)]
-enum ValidateTarget {
-    /// Validate landscape data file.
-    Data(DataSource),
-
-    /// Validate landscape guide file.
-    Guide(GuideSource),
-
-    /// Validate landscape settings file.
-    Settings(SettingsSource),
-}
-
-#[tokio::main]
-async fn main() -> Result<()> {
-    let cli = Cli::parse();
-
-    // Setup logging
-    match &cli.command {
-        Command::Build(_) | Command::Deploy(_) | Command::New(_) | Command::Serve(_) => {
-            if std::env::var_os("RUST_LOG").is_none() {
-                std::env::set_var("RUST_LOG", "landscape2=debug");
-            }
-            tracing_subscriber::fmt::init();
-        }
-        Command::Validate(_) => {}
-    }
-
-    // Run command
-    match &cli.command {
-        Command::Build(args) => build(args).await?,
-        Command::Deploy(args) => {
-            match &args.provider {
-                Provider::S3(args) => s3::deploy(args).await?,
-            };
-        }
-        Command::New(args) => new(args)?,
-        Command::Serve(args) => serve(args).await?,
-        Command::Validate(args) => match &args.target {
-            ValidateTarget::Data(src) => validate_data(src).await?,
-            ValidateTarget::Guide(src) => validate_guide(src).await?,
-            ValidateTarget::Settings(src) => validate_settings(src).await?,
-        },
-    }
-
-    Ok(())
-}
diff --git a/embed/.eslintrc b/ui/embed/.eslintrc
similarity index 100%
rename from embed/.eslintrc
rename to ui/embed/.eslintrc
diff --git a/embed/.prettierignore b/ui/embed/.prettierignore
similarity index 100%
rename from embed/.prettierignore
rename to ui/embed/.prettierignore
diff --git a/embed/.prettierrc b/ui/embed/.prettierrc
similarity index 100%
rename from embed/.prettierrc
rename to ui/embed/.prettierrc
diff --git a/embed/embed.html b/ui/embed/embed.html
similarity index 100%
rename from embed/embed.html
rename to ui/embed/embed.html
diff --git a/embed/env.d.ts b/ui/embed/env.d.ts
similarity index 100%
rename from embed/env.d.ts
rename to ui/embed/env.d.ts
diff --git a/embed/package.json b/ui/embed/package.json
similarity index 100%
rename from embed/package.json
rename to ui/embed/package.json
diff --git a/embed/public/assets/iframeResizer.contentWindow-v4.3.9.min.js b/ui/embed/public/assets/iframeResizer.contentWindow-v4.3.9.min.js
similarity index 100%
rename from embed/public/assets/iframeResizer.contentWindow-v4.3.9.min.js
rename to ui/embed/public/assets/iframeResizer.contentWindow-v4.3.9.min.js
diff --git a/embed/src/App.tsx b/ui/embed/src/App.tsx
similarity index 100%
rename from embed/src/App.tsx
rename to ui/embed/src/App.tsx
diff --git a/embed/src/common/ExternalLink.tsx b/ui/embed/src/common/ExternalLink.tsx
similarity index 100%
rename from embed/src/common/ExternalLink.tsx
rename to ui/embed/src/common/ExternalLink.tsx
diff --git a/embed/src/common/GridItem.tsx b/ui/embed/src/common/GridItem.tsx
similarity index 100%
rename from embed/src/common/GridItem.tsx
rename to ui/embed/src/common/GridItem.tsx
diff --git a/embed/src/common/Image.tsx b/ui/embed/src/common/Image.tsx
similarity index 100%
rename from embed/src/common/Image.tsx
rename to ui/embed/src/common/Image.tsx
diff --git a/embed/src/common/Loading.tsx b/ui/embed/src/common/Loading.tsx
similarity index 100%
rename from embed/src/common/Loading.tsx
rename to ui/embed/src/common/Loading.tsx
diff --git a/embed/src/common/NoData.tsx b/ui/embed/src/common/NoData.tsx
similarity index 100%
rename from embed/src/common/NoData.tsx
rename to ui/embed/src/common/NoData.tsx
diff --git a/embed/src/common/StyleView.tsx b/ui/embed/src/common/StyleView.tsx
similarity index 100%
rename from embed/src/common/StyleView.tsx
rename to ui/embed/src/common/StyleView.tsx
diff --git a/embed/src/index.tsx b/ui/embed/src/index.tsx
similarity index 100%
rename from embed/src/index.tsx
rename to ui/embed/src/index.tsx
diff --git a/embed/src/types.ts b/ui/embed/src/types.ts
similarity index 100%
rename from embed/src/types.ts
rename to ui/embed/src/types.ts
diff --git a/embed/src/utils/getUrl.tsx b/ui/embed/src/utils/getUrl.tsx
similarity index 100%
rename from embed/src/utils/getUrl.tsx
rename to ui/embed/src/utils/getUrl.tsx
diff --git a/embed/src/vite-env.d.ts b/ui/embed/src/vite-env.d.ts
similarity index 100%
rename from embed/src/vite-env.d.ts
rename to ui/embed/src/vite-env.d.ts
diff --git a/embed/src/window.d.ts b/ui/embed/src/window.d.ts
similarity index 100%
rename from embed/src/window.d.ts
rename to ui/embed/src/window.d.ts
diff --git a/embed/tsconfig.json b/ui/embed/tsconfig.json
similarity index 100%
rename from embed/tsconfig.json
rename to ui/embed/tsconfig.json
diff --git a/embed/tsconfig.node.json b/ui/embed/tsconfig.node.json
similarity index 100%
rename from embed/tsconfig.node.json
rename to ui/embed/tsconfig.node.json
diff --git a/embed/vite.config.ts b/ui/embed/vite.config.ts
similarity index 100%
rename from embed/vite.config.ts
rename to ui/embed/vite.config.ts
diff --git a/embed/yarn.lock b/ui/embed/yarn.lock
similarity index 100%
rename from embed/yarn.lock
rename to ui/embed/yarn.lock
diff --git a/web/.eslintrc b/ui/webapp/.eslintrc
similarity index 100%
rename from web/.eslintrc
rename to ui/webapp/.eslintrc
diff --git a/web/.gitignore b/ui/webapp/.gitignore
similarity index 100%
rename from web/.gitignore
rename to ui/webapp/.gitignore
diff --git a/web/.prettierrc b/ui/webapp/.prettierrc
similarity index 100%
rename from web/.prettierrc
rename to ui/webapp/.prettierrc
diff --git a/web/index.html b/ui/webapp/index.html
similarity index 100%
rename from web/index.html
rename to ui/webapp/index.html
diff --git a/web/package.json b/ui/webapp/package.json
similarity index 100%
rename from web/package.json
rename to ui/webapp/package.json
diff --git a/web/public/assets/gtm.js b/ui/webapp/public/assets/gtm.js
similarity index 100%
rename from web/public/assets/gtm.js
rename to ui/webapp/public/assets/gtm.js
diff --git a/web/src/App.css b/ui/webapp/src/App.css
similarity index 97%
rename from web/src/App.css
rename to ui/webapp/src/App.css
index 5ba13344..ba102aa5 100644
--- a/web/src/App.css
+++ b/ui/webapp/src/App.css
@@ -91,6 +91,10 @@ a,
     overflow: auto;
   }
 
+  .overlay-active #landscape {
+    height: 100%;
+  }
+
   .noScroll-sidebar,
   .noScroll-modal,
   .noScroll-loading,
diff --git a/ui/webapp/src/App.module.css b/ui/webapp/src/App.module.css
new file mode 100644
index 00000000..4fd6f155
--- /dev/null
+++ b/ui/webapp/src/App.module.css
@@ -0,0 +1,49 @@
+.alertWrapper {
+  z-index: 1040;
+}
+
+.alert {
+  font-size: 0.8rem;
+  border: 0;
+  border: 1px solid var(--bs-warning-border-subtle);
+  border-width: 1px 0 1px 0;
+  height: var(--overlay-alert-height);
+  cursor: none;
+}
+
+.legend {
+  font-size: 2.5rem;
+  margin-top: 2rem !important;
+}
+
+.errorAlert {
+  width: 800px;
+  max-width: 90%;
+  max-height: 80%;
+  height: 500px;
+  margin-top: var(--overlay-alert-height);
+}
+
+.errorAlertHeading {
+  font-size: 1.5rem;
+}
+
+.preWrapper {
+  margin-top: 2.5rem;
+  max-height: calc(100% - 9rem);
+}
+
+.pre {
+  background-color: rgba(0, 0, 0, 0.85);
+  font-size: 0.8rem;
+}
+
+@media only screen and (max-width: 767.98px) {
+  .errorAlertHeading {
+    font-size: 1.2rem;
+  }
+
+  .legend {
+    font-size: 1.5rem;
+  }
+}
diff --git a/ui/webapp/src/App.tsx b/ui/webapp/src/App.tsx
new file mode 100644
index 00000000..709165f4
--- /dev/null
+++ b/ui/webapp/src/App.tsx
@@ -0,0 +1,170 @@
+import { Route, Router } from '@solidjs/router';
+import isUndefined from 'lodash/isUndefined';
+import range from 'lodash/range';
+import { batch, createEffect, createSignal, on, onMount, Show } from 'solid-js';
+
+import styles from './App.module.css';
+import {
+  EMBED_SETUP_PATH,
+  EXPLORE_PATH,
+  FINANCES_PATH,
+  GUIDE_PATH,
+  LOGOS_PREVIEW_PATH,
+  SCREENSHOTS_PATH,
+  STATS_PATH,
+} from './data';
+import Layout from './layout';
+import Loading from './layout/common/Loading';
+import Explore from './layout/explore';
+import Finances from './layout/finances';
+import Guide from './layout/guide';
+import Logos from './layout/logos';
+import NotFound from './layout/notFound';
+import Screenshots from './layout/screenshots';
+import Stats from './layout/stats';
+import { BaseData } from './types';
+import itemsDataGetter from './utils/itemsDataGetter';
+import overlayData from './utils/overlayData';
+import updateAlphaInColor from './utils/updateAlphaInColor';
+
+// Colors
+let COLOR_1 = 'rgba(0, 107, 204, 1)';
+let COLOR_1_HOVER = 'rgba(0, 107, 204, 0.75)';
+let COLOR_2 = 'rgba(255, 0, 170, 1)';
+let COLOR_3 = 'rgba(96, 149, 214, 1)';
+let COLOR_4 = 'rgba(0, 42, 81, 0.7)';
+let COLOR_5 = 'rgba(1, 107, 204, 0.7)';
+let COLOR_6 = 'rgba(0, 42, 81, 0.7)';
+
+const App = () => {
+  const [isOverlay, setIsOverlay] = createSignal<boolean | undefined>();
+  const [data, setData] = createSignal<BaseData>();
+  const [loadingOverlay, setLoadingOverlay] = createSignal<boolean>(false);
+  const [error, setError] = createSignal<string | undefined>();
+
+  async function fetchOverlayData() {
+    try {
+      const data = await overlayData.getOverlayBaseData();
+      if (data) {
+        loadColors();
+        setData(data);
+      } else {
+        setError('No data found.');
+      }
+    } catch (e) {
+      setError(e as string);
+    }
+    setLoadingOverlay(false);
+  }
+
+  const loadColors = () => {
+    if (!isUndefined(window.baseDS) && !isUndefined(window.baseDS.colors)) {
+      if (!isUndefined(window.baseDS.colors?.color1)) {
+        COLOR_1 = window.baseDS.colors?.color1;
+        COLOR_1_HOVER = updateAlphaInColor(COLOR_1, 0.75);
+      }
+      if (!isUndefined(window.baseDS.colors?.color2)) {
+        COLOR_2 = window.baseDS.colors?.color2;
+      }
+      if (!isUndefined(window.baseDS.colors?.color3)) {
+        COLOR_3 = window.baseDS.colors?.color3;
+      }
+      if (!isUndefined(window.baseDS.colors?.color4)) {
+        COLOR_4 = window.baseDS.colors?.color4;
+      }
+      if (!isUndefined(window.baseDS.colors?.color5)) {
+        COLOR_5 = window.baseDS.colors?.color5;
+      }
+      if (!isUndefined(window.baseDS.colors?.color6)) {
+        COLOR_6 = window.baseDS.colors?.color6;
+      }
+
+      const colors = [COLOR_1, COLOR_2, COLOR_3, COLOR_4, COLOR_5, COLOR_6];
+
+      range(colors.length).forEach((i: number) => {
+        document.documentElement.style.setProperty(`--color${i + 1}`, colors[i]);
+      });
+      document.documentElement.style.setProperty('--color1-hover', COLOR_1_HOVER);
+    }
+  };
+
+  createEffect(
+    on(isOverlay, () => {
+      if (!isUndefined(isOverlay())) {
+        if (!isOverlay()) {
+          itemsDataGetter.init();
+        } else {
+          fetchOverlayData();
+        }
+      }
+    })
+  );
+
+  onMount(() => {
+    const isOverlayActive = overlayData.checkIfOverlayInQuery();
+    if (!isOverlayActive) {
+      setData(window.baseDS);
+    } else {
+      setLoadingOverlay(true);
+    }
+
+    batch(() => {
+      setIsOverlay(isOverlayActive);
+      loadColors();
+    });
+
+    if (window.Osano) {
+      window.Osano.cm.addEventListener('osano-cm-initialized', () => {
+        document.body.classList.add('osano-loaded');
+      });
+    }
+  });
+
+  return (
+    <>
+      {/* Overlay alert */}
+      <Show when={isOverlay() && !isUndefined(error)}>
+        <div class={`position-fixed top-0 start-0 end-0 ${styles.alertWrapper}`}>
+          <div
+            class={`alert alert-warning w-100 d-flex align-items-center justify-content-center rounded-0 m-0 px-3 py-0 lh-base text-uppercase fw-semibold ${styles.alert}`}
+          >
+            Landscape overlay enabled
+          </div>
+        </div>
+      </Show>
+      <Show when={loadingOverlay()}>
+        <Loading legend="Setting up landscape overlay..." legendClass={`fw-semibold ${styles.legend}`} />
+      </Show>
+      <Show when={!isUndefined(error())}>
+        <div class="d-flex align-items-center justify-content-center w-100 h-100">
+          <div class={`alert alert-danger py-4 px-5 rounded-0 d-flex flex-column ${styles.errorAlert}`} role="alert">
+            <div class={`alert-heading text-center ${styles.errorAlertHeading}`}>
+              Error setting up landscape overlay
+            </div>
+            <hr />
+            <div class={`flex-grow-1 ${styles.preWrapper}`}>
+              <code>
+                <pre class={`overflow-auto p-2 border border-dark text-light font-monospace mb-0 h-100 ${styles.pre}`}>
+                  {error()}
+                </pre>
+              </code>
+            </div>
+          </div>
+        </div>
+      </Show>
+      <Show when={!isUndefined(data())}>
+        <Router root={Layout}>
+          <Route path={[EXPLORE_PATH, EMBED_SETUP_PATH]} component={() => <Explore initialData={data()!} />} />
+          <Route path={GUIDE_PATH} component={Guide} />
+          <Route path={STATS_PATH} component={Stats} />
+          <Route path={FINANCES_PATH} component={Finances} />
+          <Route path={LOGOS_PREVIEW_PATH} component={Logos} />
+          <Route path="*" component={NotFound} />
+          <Route path={SCREENSHOTS_PATH} component={() => <Screenshots initialData={data()!} />} />
+        </Router>
+      </Show>
+    </>
+  );
+};
+
+export default App;
diff --git a/web/src/data.ts b/ui/webapp/src/data.ts
similarity index 75%
rename from web/src/data.ts
rename to ui/webapp/src/data.ts
index 0ce9a80a..c7cb56b8 100644
--- a/web/src/data.ts
+++ b/ui/webapp/src/data.ts
@@ -38,10 +38,17 @@ export const CLASSIFY_PARAM = 'classify';
 export const SORT_BY_PARAM = 'sort-by';
 export const SORT_DIRECTION_PARAM = 'sort-direction';
 
+// Overlay
+export const OVERLAY_DATA_PARAM = 'overlay-data';
+export const OVERLAY_SETTINGS_PARAM = 'overlay-settings';
+export const OVERLAY_GUIDE_PARAM = 'overlay-guide';
+export const OVERLAY_LOGOS_PATH_PARAM = 'overlay-logos';
+
 export const REGEX_SPACE = / /g;
 export const REGEX_PLUS = /\+/g;
 export const REGEX_DASH = /-/g;
 export const REGEX_UNDERSCORE = /_/g;
+export const REGEX_URL = /^https?:\/\//;
 
 export const DEFAULT_ZOOM_LEVELS = {
   [Breakpoint.XXXL]: 5,
@@ -57,7 +64,7 @@ export const SMALL_DEVICES_BREAKPOINTS: Breakpoint[] = [Breakpoint.XS, Breakpoin
 export const DEFAULT_STICKY_MOBILE_NAVBAR_HEIGHT = 50;
 export const DEFAULT_STICKY_NAVBAR_HEIGHT = 72;
 export const DEFAULT_TAB = Tab.Explore;
-export const DEFAULT_VIEW_MODE: ViewMode = window.baseDS.view_mode || ViewMode.Grid;
+export let DEFAULT_VIEW_MODE: ViewMode = window.baseDS ? window.baseDS.view_mode || ViewMode.Grid : ViewMode.Grid;
 export const DEFAULT_GRID_ITEMS_SIZE = GridItemsSize.Small;
 export const DEFAULT_FINANCES_KIND = FinancesKind.Funding;
 export const DEFAULT_CLASSIFY = ClassifyOption.Category;
@@ -65,8 +72,10 @@ export const DEFAULT_SORT = SortOption.Name;
 export const DEFAULT_SORT_DIRECTION = SortDirection.Asc;
 export const ALL_OPTION = 'all';
 
-const FOUNDATION = window.baseDS.foundation;
-const GRID_SIZE = window.baseDS.grid_items_size || DEFAULT_GRID_ITEMS_SIZE;
+export let FOUNDATION = window.baseDS ? window.baseDS.foundation : '';
+export let GRID_SIZE = window.baseDS
+  ? window.baseDS.grid_items_size || DEFAULT_GRID_ITEMS_SIZE
+  : DEFAULT_GRID_ITEMS_SIZE;
 
 export const ZOOM_LEVELS_PER_SIZE: ZoomLevelsPerSize = {
   [GridItemsSize.Small]: [
@@ -110,26 +119,11 @@ export const ZOOM_LEVELS_PER_SIZE: ZoomLevelsPerSize = {
   ],
 };
 
-export const ZOOM_LEVELS = ZOOM_LEVELS_PER_SIZE[GRID_SIZE as GridItemsSize];
+export let ZOOM_LEVELS = ZOOM_LEVELS_PER_SIZE[GRID_SIZE as GridItemsSize];
 
 export const COLORS: string[] = ['var(--color5)', 'var(--color6)'];
 
-export const FILTERS: FilterSection[] = [
-  {
-    value: FilterCategory.Maturity,
-    title: 'Project',
-    options: [
-      {
-        value: getFoundationNameLabel(),
-        name: `${FOUNDATION} Projects`,
-        suboptions: [],
-      },
-      {
-        value: `non-${getFoundationNameLabel()}`,
-        name: `Not ${FOUNDATION} Projects`,
-      },
-    ],
-  },
+export const COMMON_FILTERS: FilterSection[] = [
   {
     value: FilterCategory.License,
     title: 'License',
@@ -170,6 +164,24 @@ export const FILTERS: FilterSection[] = [
     ],
   },
 ];
+export let FILTERS: FilterSection[] = [
+  {
+    value: FilterCategory.Maturity,
+    title: 'Project',
+    options: [
+      {
+        value: getFoundationNameLabel(),
+        name: `${FOUNDATION} Projects`,
+        suboptions: [],
+      },
+      {
+        value: `non-${getFoundationNameLabel()}`,
+        name: `Not ${FOUNDATION} Projects`,
+      },
+    ],
+  },
+  ...COMMON_FILTERS,
+];
 
 export const FILTER_CATEGORIES_PER_TITLE: FilterCategoriesPerTitle = {
   [FilterTitle.Project]: [FilterCategory.Maturity, FilterCategory.TAG, FilterCategory.License, FilterCategory.Extra],
@@ -192,3 +204,34 @@ export const SORT_OPTION_LABEL = {
   [SortOption.LatestCommit]: 'Latest commit',
   [SortOption.Funding]: 'Funding',
 };
+
+interface SettingsValue {
+  foundationName: string;
+  gridSize: GridItemsSize;
+  viewMode: ViewMode;
+}
+
+export const overrideSettings = (values: SettingsValue) => {
+  FOUNDATION = values.foundationName;
+  GRID_SIZE = values.gridSize;
+  DEFAULT_VIEW_MODE = values.viewMode;
+  ZOOM_LEVELS = ZOOM_LEVELS_PER_SIZE[values.gridSize];
+  FILTERS = [
+    {
+      value: FilterCategory.Maturity,
+      title: 'Project',
+      options: [
+        {
+          value: getFoundationNameLabel(),
+          name: `${FOUNDATION} Projects`,
+          suboptions: [],
+        },
+        {
+          value: `non-${getFoundationNameLabel()}`,
+          name: `Not ${FOUNDATION} Projects`,
+        },
+      ],
+    },
+    ...COMMON_FILTERS,
+  ];
+};
diff --git a/web/src/env.d.ts b/ui/webapp/src/env.d.ts
similarity index 100%
rename from web/src/env.d.ts
rename to ui/webapp/src/env.d.ts
diff --git a/web/src/hooks/useBodyScroll.ts b/ui/webapp/src/hooks/useBodyScroll.ts
similarity index 100%
rename from web/src/hooks/useBodyScroll.ts
rename to ui/webapp/src/hooks/useBodyScroll.ts
diff --git a/web/src/hooks/useBreakpointDetect.tsx b/ui/webapp/src/hooks/useBreakpointDetect.tsx
similarity index 100%
rename from web/src/hooks/useBreakpointDetect.tsx
rename to ui/webapp/src/hooks/useBreakpointDetect.tsx
diff --git a/web/src/hooks/useOutsideClick.ts b/ui/webapp/src/hooks/useOutsideClick.ts
similarity index 100%
rename from web/src/hooks/useOutsideClick.ts
rename to ui/webapp/src/hooks/useOutsideClick.ts
diff --git a/web/src/index.tsx b/ui/webapp/src/index.tsx
similarity index 100%
rename from web/src/index.tsx
rename to ui/webapp/src/index.tsx
diff --git a/ui/webapp/src/layout/Layout.module.css b/ui/webapp/src/layout/Layout.module.css
new file mode 100644
index 00000000..bc0d07cd
--- /dev/null
+++ b/ui/webapp/src/layout/Layout.module.css
@@ -0,0 +1,7 @@
+.container {
+  min-height: 100vh;
+}
+
+:global(.overlay-active) .container {
+  margin-top: var(--overlay-alert-height);
+}
diff --git a/web/src/layout/common/ActiveFiltersList.module.css b/ui/webapp/src/layout/common/ActiveFiltersList.module.css
similarity index 100%
rename from web/src/layout/common/ActiveFiltersList.module.css
rename to ui/webapp/src/layout/common/ActiveFiltersList.module.css
diff --git a/web/src/layout/common/ActiveFiltersList.tsx b/ui/webapp/src/layout/common/ActiveFiltersList.tsx
similarity index 100%
rename from web/src/layout/common/ActiveFiltersList.tsx
rename to ui/webapp/src/layout/common/ActiveFiltersList.tsx
diff --git a/web/src/layout/common/Badge.module.css b/ui/webapp/src/layout/common/Badge.module.css
similarity index 100%
rename from web/src/layout/common/Badge.module.css
rename to ui/webapp/src/layout/common/Badge.module.css
diff --git a/web/src/layout/common/Badge.tsx b/ui/webapp/src/layout/common/Badge.tsx
similarity index 100%
rename from web/src/layout/common/Badge.tsx
rename to ui/webapp/src/layout/common/Badge.tsx
diff --git a/web/src/layout/common/ButtonCopyToClipboard.module.css b/ui/webapp/src/layout/common/ButtonCopyToClipboard.module.css
similarity index 100%
rename from web/src/layout/common/ButtonCopyToClipboard.module.css
rename to ui/webapp/src/layout/common/ButtonCopyToClipboard.module.css
diff --git a/web/src/layout/common/ButtonCopyToClipboard.tsx b/ui/webapp/src/layout/common/ButtonCopyToClipboard.tsx
similarity index 100%
rename from web/src/layout/common/ButtonCopyToClipboard.tsx
rename to ui/webapp/src/layout/common/ButtonCopyToClipboard.tsx
diff --git a/web/src/layout/common/ButtonToTopScroll.module.css b/ui/webapp/src/layout/common/ButtonToTopScroll.module.css
similarity index 100%
rename from web/src/layout/common/ButtonToTopScroll.module.css
rename to ui/webapp/src/layout/common/ButtonToTopScroll.module.css
diff --git a/web/src/layout/common/ButtonToTopScroll.tsx b/ui/webapp/src/layout/common/ButtonToTopScroll.tsx
similarity index 100%
rename from web/src/layout/common/ButtonToTopScroll.tsx
rename to ui/webapp/src/layout/common/ButtonToTopScroll.tsx
diff --git a/web/src/layout/common/Checkbox.module.css b/ui/webapp/src/layout/common/Checkbox.module.css
similarity index 100%
rename from web/src/layout/common/Checkbox.module.css
rename to ui/webapp/src/layout/common/Checkbox.module.css
diff --git a/web/src/layout/common/Checkbox.tsx b/ui/webapp/src/layout/common/Checkbox.tsx
similarity index 100%
rename from web/src/layout/common/Checkbox.tsx
rename to ui/webapp/src/layout/common/Checkbox.tsx
diff --git a/web/src/layout/common/CodeBlock.module.css b/ui/webapp/src/layout/common/CodeBlock.module.css
similarity index 100%
rename from web/src/layout/common/CodeBlock.module.css
rename to ui/webapp/src/layout/common/CodeBlock.module.css
diff --git a/web/src/layout/common/CodeBlock.tsx b/ui/webapp/src/layout/common/CodeBlock.tsx
similarity index 100%
rename from web/src/layout/common/CodeBlock.tsx
rename to ui/webapp/src/layout/common/CodeBlock.tsx
diff --git a/web/src/layout/common/CollapsableText.module.css b/ui/webapp/src/layout/common/CollapsableText.module.css
similarity index 100%
rename from web/src/layout/common/CollapsableText.module.css
rename to ui/webapp/src/layout/common/CollapsableText.module.css
diff --git a/web/src/layout/common/CollapsableText.tsx b/ui/webapp/src/layout/common/CollapsableText.tsx
similarity index 100%
rename from web/src/layout/common/CollapsableText.tsx
rename to ui/webapp/src/layout/common/CollapsableText.tsx
diff --git a/web/src/layout/common/DownloadDropdown.module.css b/ui/webapp/src/layout/common/DownloadDropdown.module.css
similarity index 100%
rename from web/src/layout/common/DownloadDropdown.module.css
rename to ui/webapp/src/layout/common/DownloadDropdown.module.css
diff --git a/web/src/layout/common/DownloadDropdown.tsx b/ui/webapp/src/layout/common/DownloadDropdown.tsx
similarity index 100%
rename from web/src/layout/common/DownloadDropdown.tsx
rename to ui/webapp/src/layout/common/DownloadDropdown.tsx
diff --git a/web/src/layout/common/ExternalLink.module.css b/ui/webapp/src/layout/common/ExternalLink.module.css
similarity index 100%
rename from web/src/layout/common/ExternalLink.module.css
rename to ui/webapp/src/layout/common/ExternalLink.module.css
diff --git a/web/src/layout/common/ExternalLink.tsx b/ui/webapp/src/layout/common/ExternalLink.tsx
similarity index 100%
rename from web/src/layout/common/ExternalLink.tsx
rename to ui/webapp/src/layout/common/ExternalLink.tsx
diff --git a/web/src/layout/common/FiltersInLine.module.css b/ui/webapp/src/layout/common/FiltersInLine.module.css
similarity index 100%
rename from web/src/layout/common/FiltersInLine.module.css
rename to ui/webapp/src/layout/common/FiltersInLine.module.css
diff --git a/web/src/layout/common/FiltersInLine.tsx b/ui/webapp/src/layout/common/FiltersInLine.tsx
similarity index 100%
rename from web/src/layout/common/FiltersInLine.tsx
rename to ui/webapp/src/layout/common/FiltersInLine.tsx
diff --git a/web/src/layout/common/FoundationBadge.tsx b/ui/webapp/src/layout/common/FoundationBadge.tsx
similarity index 76%
rename from web/src/layout/common/FoundationBadge.tsx
rename to ui/webapp/src/layout/common/FoundationBadge.tsx
index d304ef58..94f4476d 100644
--- a/web/src/layout/common/FoundationBadge.tsx
+++ b/ui/webapp/src/layout/common/FoundationBadge.tsx
@@ -1,8 +1,10 @@
+import { FOUNDATION } from '../../data';
+
 interface Props {
   class?: string;
 }
 const FoundationBadge = (props: Props) => {
-  const foundation = window.baseDS.foundation;
+  const foundation = FOUNDATION;
 
   return (
     <div title={foundation} class={`badge rounded-0 bg-primary ${props.class}`}>
diff --git a/web/src/layout/common/FullScreenModal.module.css b/ui/webapp/src/layout/common/FullScreenModal.module.css
similarity index 100%
rename from web/src/layout/common/FullScreenModal.module.css
rename to ui/webapp/src/layout/common/FullScreenModal.module.css
diff --git a/web/src/layout/common/FullScreenModal.tsx b/ui/webapp/src/layout/common/FullScreenModal.tsx
similarity index 100%
rename from web/src/layout/common/FullScreenModal.tsx
rename to ui/webapp/src/layout/common/FullScreenModal.tsx
diff --git a/web/src/layout/common/HoverableItem.tsx b/ui/webapp/src/layout/common/HoverableItem.tsx
similarity index 100%
rename from web/src/layout/common/HoverableItem.tsx
rename to ui/webapp/src/layout/common/HoverableItem.tsx
diff --git a/web/src/layout/common/Image.tsx b/ui/webapp/src/layout/common/Image.tsx
similarity index 55%
rename from web/src/layout/common/Image.tsx
rename to ui/webapp/src/layout/common/Image.tsx
index d31f15c5..efa6413f 100644
--- a/web/src/layout/common/Image.tsx
+++ b/ui/webapp/src/layout/common/Image.tsx
@@ -1,6 +1,7 @@
 import isUndefined from 'lodash/isUndefined';
-import { createSignal } from 'solid-js';
+import { createSignal, onMount, Show } from 'solid-js';
 
+import { REGEX_URL } from '../../data';
 import { SVGIconKind } from '../../types';
 import SVGIcon from './SVGIcon';
 
@@ -9,27 +10,38 @@ interface Props {
   logo: string;
   class?: string;
   enableLazyLoad?: boolean;
+  width?: string | number;
+  height?: string | number;
 }
 
 const Image = (props: Props) => {
   const [error, setError] = createSignal(false);
+  const [url, setUrl] = createSignal<string>();
+
+  onMount(() => {
+    if (REGEX_URL.test(props.logo)) {
+      setUrl(props.logo);
+    } else {
+      setUrl(import.meta.env.MODE === 'development' ? `../../static/${props.logo}` : `./${props.logo}`);
+    }
+  });
 
   return (
-    <>
+    <Show when={!isUndefined(url())}>
       {error() ? (
         <SVGIcon kind={SVGIconKind.NotImage} class={`opacity-25 ${props.class}`} />
       ) : (
         <img
           alt={`${props.name} logo`}
           class={props.class}
-          src={import.meta.env.MODE === 'development' ? `../../static/${props.logo}` : `./${props.logo}`}
+          src={url()}
           onError={() => setError(true)}
           loading={!isUndefined(props.enableLazyLoad) && props.enableLazyLoad ? 'lazy' : undefined}
-          width="auto"
-          height="auto"
+          width={props.width || 'auto'}
+          height={props.height || 'auto'}
         />
       )}
-    </>
+    </Show>
   );
 };
 
diff --git a/web/src/layout/common/Loading.module.css b/ui/webapp/src/layout/common/Loading.module.css
similarity index 100%
rename from web/src/layout/common/Loading.module.css
rename to ui/webapp/src/layout/common/Loading.module.css
diff --git a/web/src/layout/common/Loading.tsx b/ui/webapp/src/layout/common/Loading.tsx
similarity index 75%
rename from web/src/layout/common/Loading.tsx
rename to ui/webapp/src/layout/common/Loading.tsx
index ce919e47..0e23b817 100644
--- a/web/src/layout/common/Loading.tsx
+++ b/ui/webapp/src/layout/common/Loading.tsx
@@ -10,6 +10,8 @@ interface Props {
   position?: 'fixed' | 'absolute' | 'relative';
   transparentBg?: boolean;
   noWrapper?: boolean;
+  legend?: string;
+  legendClass?: string;
 }
 
 const Loading = (props: Props) => {
@@ -38,8 +40,13 @@ const Loading = (props: Props) => {
           [styles.transparentBg]: !isUndefined(props.transparentBg) && props.transparentBg,
         }}
       >
-        <div class={props.spinnerClass || 'd-flex flex-row align-items-center justify-content-center w-100 h-100'}>
-          {getSpinner()}
+        <div class="d-flex flex-column justify-content-center w-100 h-100">
+          <div class={props.spinnerClass || 'd-flex flex-row align-items-center justify-content-center'}>
+            {getSpinner()}
+          </div>
+          <Show when={!isUndefined(props.legend)}>
+            <div class={`text-center mt-5 ${props.legendClass}`}>{props.legend}</div>
+          </Show>
         </div>
       </div>
     </Show>
diff --git a/web/src/layout/common/MaturityBadge.module.css b/ui/webapp/src/layout/common/MaturityBadge.module.css
similarity index 100%
rename from web/src/layout/common/MaturityBadge.module.css
rename to ui/webapp/src/layout/common/MaturityBadge.module.css
diff --git a/web/src/layout/common/MaturityBadge.tsx b/ui/webapp/src/layout/common/MaturityBadge.tsx
similarity index 100%
rename from web/src/layout/common/MaturityBadge.tsx
rename to ui/webapp/src/layout/common/MaturityBadge.tsx
diff --git a/web/src/layout/common/Modal.module.css b/ui/webapp/src/layout/common/Modal.module.css
similarity index 100%
rename from web/src/layout/common/Modal.module.css
rename to ui/webapp/src/layout/common/Modal.module.css
diff --git a/web/src/layout/common/Modal.tsx b/ui/webapp/src/layout/common/Modal.tsx
similarity index 100%
rename from web/src/layout/common/Modal.tsx
rename to ui/webapp/src/layout/common/Modal.tsx
diff --git a/web/src/layout/common/NoData.module.css b/ui/webapp/src/layout/common/NoData.module.css
similarity index 100%
rename from web/src/layout/common/NoData.module.css
rename to ui/webapp/src/layout/common/NoData.module.css
diff --git a/web/src/layout/common/NoData.tsx b/ui/webapp/src/layout/common/NoData.tsx
similarity index 70%
rename from web/src/layout/common/NoData.tsx
rename to ui/webapp/src/layout/common/NoData.tsx
index fea7c601..957d9d66 100644
--- a/web/src/layout/common/NoData.tsx
+++ b/ui/webapp/src/layout/common/NoData.tsx
@@ -10,7 +10,7 @@ interface Props {
 const NoData = (props: Props) => (
   <div
     role="alert"
-    class={`alert alert-primary mx-auto my-5 text-center p-4 p-sm-5 border border-1 ${styles.wrapper} ${props.class}`}
+    class={`alert mx-auto my-5 text-center p-4 p-sm-5 border border-1 rounded-0 ${styles.wrapper} ${props.class}`}
   >
     <div>{props.children}</div>
   </div>
diff --git a/web/src/layout/common/Pagination.module.css b/ui/webapp/src/layout/common/Pagination.module.css
similarity index 100%
rename from web/src/layout/common/Pagination.module.css
rename to ui/webapp/src/layout/common/Pagination.module.css
diff --git a/web/src/layout/common/Pagination.tsx b/ui/webapp/src/layout/common/Pagination.tsx
similarity index 100%
rename from web/src/layout/common/Pagination.tsx
rename to ui/webapp/src/layout/common/Pagination.tsx
diff --git a/web/src/layout/common/SVGIcon.tsx b/ui/webapp/src/layout/common/SVGIcon.tsx
similarity index 99%
rename from web/src/layout/common/SVGIcon.tsx
rename to ui/webapp/src/layout/common/SVGIcon.tsx
index 7c68f9fd..70f8eb27 100644
--- a/web/src/layout/common/SVGIcon.tsx
+++ b/ui/webapp/src/layout/common/SVGIcon.tsx
@@ -1,7 +1,7 @@
 import { ValidComponent } from 'solid-js';
 import { Dynamic } from 'solid-js/web';
 
-import { SVGIconKind } from '../../../../web/src/types';
+import { SVGIconKind } from '../../types';
 
 interface Props {
   class?: string;
diff --git a/web/src/layout/common/Searchbar.module.css b/ui/webapp/src/layout/common/Searchbar.module.css
similarity index 100%
rename from web/src/layout/common/Searchbar.module.css
rename to ui/webapp/src/layout/common/Searchbar.module.css
diff --git a/web/src/layout/common/Searchbar.tsx b/ui/webapp/src/layout/common/Searchbar.tsx
similarity index 96%
rename from web/src/layout/common/Searchbar.tsx
rename to ui/webapp/src/layout/common/Searchbar.tsx
index 5eb8d015..d97ba3e2 100644
--- a/web/src/layout/common/Searchbar.tsx
+++ b/ui/webapp/src/layout/common/Searchbar.tsx
@@ -266,13 +266,7 @@ const Searchbar = (props: Props) => {
                           <div
                             class={`d-flex align-items-center justify-content-center me-3 ${styles.miniImageWrapper}`}
                           >
-                            <Image
-                              name={item.name}
-                              class={`m-auto ${styles.logo}`}
-                              logo={
-                                import.meta.env.MODE === 'development' ? `../../static/${item.logo}` : `${item.logo}`
-                              }
-                            />
+                            <Image name={item.name} class={`m-auto ${styles.logo}`} logo={item.logo} />
                           </div>
                           <div
                             class={`flex-grow-1 d-flex flex-column text-start justify-content-between h-100 ${styles.truncateWrapper}`}
diff --git a/web/src/layout/common/Section.module.css b/ui/webapp/src/layout/common/Section.module.css
similarity index 100%
rename from web/src/layout/common/Section.module.css
rename to ui/webapp/src/layout/common/Section.module.css
diff --git a/web/src/layout/common/Section.tsx b/ui/webapp/src/layout/common/Section.tsx
similarity index 100%
rename from web/src/layout/common/Section.tsx
rename to ui/webapp/src/layout/common/Section.tsx
diff --git a/web/src/layout/common/Sidebar.module.css b/ui/webapp/src/layout/common/Sidebar.module.css
similarity index 100%
rename from web/src/layout/common/Sidebar.module.css
rename to ui/webapp/src/layout/common/Sidebar.module.css
diff --git a/web/src/layout/common/Sidebar.tsx b/ui/webapp/src/layout/common/Sidebar.tsx
similarity index 100%
rename from web/src/layout/common/Sidebar.tsx
rename to ui/webapp/src/layout/common/Sidebar.tsx
diff --git a/web/src/layout/common/Tabs.module.css b/ui/webapp/src/layout/common/Tabs.module.css
similarity index 100%
rename from web/src/layout/common/Tabs.module.css
rename to ui/webapp/src/layout/common/Tabs.module.css
diff --git a/web/src/layout/common/Tabs.tsx b/ui/webapp/src/layout/common/Tabs.tsx
similarity index 100%
rename from web/src/layout/common/Tabs.tsx
rename to ui/webapp/src/layout/common/Tabs.tsx
diff --git a/web/src/layout/common/itemModal/AcquisitionsTable.module.css b/ui/webapp/src/layout/common/itemModal/AcquisitionsTable.module.css
similarity index 100%
rename from web/src/layout/common/itemModal/AcquisitionsTable.module.css
rename to ui/webapp/src/layout/common/itemModal/AcquisitionsTable.module.css
diff --git a/web/src/layout/common/itemModal/AcquisitionsTable.tsx b/ui/webapp/src/layout/common/itemModal/AcquisitionsTable.tsx
similarity index 100%
rename from web/src/layout/common/itemModal/AcquisitionsTable.tsx
rename to ui/webapp/src/layout/common/itemModal/AcquisitionsTable.tsx
diff --git a/web/src/layout/common/itemModal/BadgeModal.tsx b/ui/webapp/src/layout/common/itemModal/BadgeModal.tsx
similarity index 96%
rename from web/src/layout/common/itemModal/BadgeModal.tsx
rename to ui/webapp/src/layout/common/itemModal/BadgeModal.tsx
index 417a98c0..a701636a 100644
--- a/web/src/layout/common/itemModal/BadgeModal.tsx
+++ b/ui/webapp/src/layout/common/itemModal/BadgeModal.tsx
@@ -1,4 +1,4 @@
-import { BASE_PATH } from '../../../data';
+import { BASE_PATH, FOUNDATION } from '../../../data';
 import { SVGIconKind } from '../../../types';
 import CodeBlock from '../CodeBlock';
 import Modal from '../Modal';
@@ -15,7 +15,7 @@ const BadgeModal = (props: Props) => {
   const itemId = () => props.itemId;
   const openStatus = () => props.openStatus;
   const origin = window.location.origin;
-  const foundation = window.baseDS.foundation;
+  const foundation = FOUNDATION;
   const badgeImage = `https://img.shields.io/badge/${foundation}%20Landscape-5699C6`;
   const markdownLink = () => `[![${foundation} Landscape](${badgeImage})](${origin}${BASE_PATH}/?item=${itemId()})`;
   const asciiLink = () => `${origin}${BASE_PATH}/?item=${itemId()}[image:${badgeImage}[${foundation} LANDSCAPE]]`;
diff --git a/web/src/layout/common/itemModal/Box.module.css b/ui/webapp/src/layout/common/itemModal/Box.module.css
similarity index 100%
rename from web/src/layout/common/itemModal/Box.module.css
rename to ui/webapp/src/layout/common/itemModal/Box.module.css
diff --git a/web/src/layout/common/itemModal/Box.tsx b/ui/webapp/src/layout/common/itemModal/Box.tsx
similarity index 100%
rename from web/src/layout/common/itemModal/Box.tsx
rename to ui/webapp/src/layout/common/itemModal/Box.tsx
diff --git a/web/src/layout/common/itemModal/Content.module.css b/ui/webapp/src/layout/common/itemModal/Content.module.css
similarity index 100%
rename from web/src/layout/common/itemModal/Content.module.css
rename to ui/webapp/src/layout/common/itemModal/Content.module.css
diff --git a/web/src/layout/common/itemModal/Content.tsx b/ui/webapp/src/layout/common/itemModal/Content.tsx
similarity index 98%
rename from web/src/layout/common/itemModal/Content.tsx
rename to ui/webapp/src/layout/common/itemModal/Content.tsx
index 04b42c1a..9f73b9f9 100644
--- a/web/src/layout/common/itemModal/Content.tsx
+++ b/ui/webapp/src/layout/common/itemModal/Content.tsx
@@ -5,6 +5,7 @@ import isUndefined from 'lodash/isUndefined';
 import sortBy from 'lodash/sortBy';
 import { createEffect, createSignal, For, Match, on, Show, Switch } from 'solid-js';
 
+import { FOUNDATION } from '../../../data';
 import { AdditionalCategory, Item, Repository, SecurityAudit, SVGIconKind } from '../../../types';
 import formatProfitLabel from '../../../utils/formatLabelProfit';
 import getItemDescription from '../../../utils/getItemDescription';
@@ -579,15 +580,14 @@ const Content = (props: Props) => {
         </Show>
 
         {/* CLOMonitor */}
-        <Show when={!isUndefined(itemInfo()!.clomonitor_name)}>
+        <Show when={!isUndefined(itemInfo()!.clomonitor_name) && !isUndefined(itemInfo()!.clomonitor_report_summary)}>
           <div class={`position-relative border ${styles.fieldset}`}>
             <div class={`position-absolute px-2 bg-white fw-semibold ${styles.fieldsetTitle}`}>
               CLOMonitor report summary
             </div>
             <div class="my-2 d-flex justify-content-center w-100 align-items-center">
               <ExternalLink
-                href={`https://clomonitor.io/projects/${window.baseDS.foundation.toLowerCase()}/${itemInfo()!
-                  .clomonitor_name!}`}
+                href={`https://clomonitor.io/projects/${FOUNDATION.toLowerCase()}/${itemInfo()!.clomonitor_name!}`}
               >
                 <Image
                   name={`CLOMonitor report summary for ${itemInfo()!.name}`}
diff --git a/web/src/layout/common/itemModal/FundingRoundsTable.module.css b/ui/webapp/src/layout/common/itemModal/FundingRoundsTable.module.css
similarity index 100%
rename from web/src/layout/common/itemModal/FundingRoundsTable.module.css
rename to ui/webapp/src/layout/common/itemModal/FundingRoundsTable.module.css
diff --git a/web/src/layout/common/itemModal/FundingRoundsTable.tsx b/ui/webapp/src/layout/common/itemModal/FundingRoundsTable.tsx
similarity index 100%
rename from web/src/layout/common/itemModal/FundingRoundsTable.tsx
rename to ui/webapp/src/layout/common/itemModal/FundingRoundsTable.tsx
diff --git a/web/src/layout/common/itemModal/ItemDropdown.module.css b/ui/webapp/src/layout/common/itemModal/ItemDropdown.module.css
similarity index 100%
rename from web/src/layout/common/itemModal/ItemDropdown.module.css
rename to ui/webapp/src/layout/common/itemModal/ItemDropdown.module.css
diff --git a/web/src/layout/common/itemModal/ItemDropdown.tsx b/ui/webapp/src/layout/common/itemModal/ItemDropdown.tsx
similarity index 100%
rename from web/src/layout/common/itemModal/ItemDropdown.tsx
rename to ui/webapp/src/layout/common/itemModal/ItemDropdown.tsx
diff --git a/web/src/layout/common/itemModal/ItemModal.module.css b/ui/webapp/src/layout/common/itemModal/ItemModal.module.css
similarity index 100%
rename from web/src/layout/common/itemModal/ItemModal.module.css
rename to ui/webapp/src/layout/common/itemModal/ItemModal.module.css
diff --git a/web/src/layout/common/itemModal/LanguagesStats.module.css b/ui/webapp/src/layout/common/itemModal/LanguagesStats.module.css
similarity index 100%
rename from web/src/layout/common/itemModal/LanguagesStats.module.css
rename to ui/webapp/src/layout/common/itemModal/LanguagesStats.module.css
diff --git a/web/src/layout/common/itemModal/LanguagesStats.tsx b/ui/webapp/src/layout/common/itemModal/LanguagesStats.tsx
similarity index 100%
rename from web/src/layout/common/itemModal/LanguagesStats.tsx
rename to ui/webapp/src/layout/common/itemModal/LanguagesStats.tsx
diff --git a/web/src/layout/common/itemModal/MaturitySection.module.css b/ui/webapp/src/layout/common/itemModal/MaturitySection.module.css
similarity index 100%
rename from web/src/layout/common/itemModal/MaturitySection.module.css
rename to ui/webapp/src/layout/common/itemModal/MaturitySection.module.css
diff --git a/web/src/layout/common/itemModal/MaturitySection.tsx b/ui/webapp/src/layout/common/itemModal/MaturitySection.tsx
similarity index 100%
rename from web/src/layout/common/itemModal/MaturitySection.tsx
rename to ui/webapp/src/layout/common/itemModal/MaturitySection.tsx
diff --git a/web/src/layout/common/itemModal/MobileContent.module.css b/ui/webapp/src/layout/common/itemModal/MobileContent.module.css
similarity index 100%
rename from web/src/layout/common/itemModal/MobileContent.module.css
rename to ui/webapp/src/layout/common/itemModal/MobileContent.module.css
diff --git a/web/src/layout/common/itemModal/MobileContent.tsx b/ui/webapp/src/layout/common/itemModal/MobileContent.tsx
similarity index 99%
rename from web/src/layout/common/itemModal/MobileContent.tsx
rename to ui/webapp/src/layout/common/itemModal/MobileContent.tsx
index e6b999cd..354228a7 100644
--- a/web/src/layout/common/itemModal/MobileContent.tsx
+++ b/ui/webapp/src/layout/common/itemModal/MobileContent.tsx
@@ -5,6 +5,7 @@ import isUndefined from 'lodash/isUndefined';
 import sortBy from 'lodash/sortBy';
 import { createEffect, createSignal, For, Match, on, Show, Switch } from 'solid-js';
 
+import { FOUNDATION } from '../../../data';
 import { AdditionalCategory, Item, Repository, SecurityAudit, SVGIconKind } from '../../../types';
 import cutString from '../../../utils/cutString';
 import formatProfitLabel from '../../../utils/formatLabelProfit';
@@ -410,8 +411,7 @@ const MobileContent = (props: Props) => {
 
           <div class="my-2 d-flex justify-content-center w-100 align-items-center">
             <ExternalLink
-              href={`https://clomonitor.io/projects/${window.baseDS.foundation.toLowerCase()}/${itemInfo()!
-                .clomonitor_name!}`}
+              href={`https://clomonitor.io/projects/${FOUNDATION.toLowerCase()}/${itemInfo()!.clomonitor_name!}`}
             >
               <Image
                 name={`CLOMonitor report summary for ${itemInfo()!.name}`}
diff --git a/web/src/layout/common/itemModal/MobileMaturitySection.module.css b/ui/webapp/src/layout/common/itemModal/MobileMaturitySection.module.css
similarity index 100%
rename from web/src/layout/common/itemModal/MobileMaturitySection.module.css
rename to ui/webapp/src/layout/common/itemModal/MobileMaturitySection.module.css
diff --git a/web/src/layout/common/itemModal/MobileMaturitySection.tsx b/ui/webapp/src/layout/common/itemModal/MobileMaturitySection.tsx
similarity index 100%
rename from web/src/layout/common/itemModal/MobileMaturitySection.tsx
rename to ui/webapp/src/layout/common/itemModal/MobileMaturitySection.tsx
diff --git a/web/src/layout/common/itemModal/ParentProject.module.css b/ui/webapp/src/layout/common/itemModal/ParentProject.module.css
similarity index 100%
rename from web/src/layout/common/itemModal/ParentProject.module.css
rename to ui/webapp/src/layout/common/itemModal/ParentProject.module.css
diff --git a/web/src/layout/common/itemModal/ParentProject.tsx b/ui/webapp/src/layout/common/itemModal/ParentProject.tsx
similarity index 95%
rename from web/src/layout/common/itemModal/ParentProject.tsx
rename to ui/webapp/src/layout/common/itemModal/ParentProject.tsx
index 742e0517..7bf50cca 100644
--- a/web/src/layout/common/itemModal/ParentProject.tsx
+++ b/ui/webapp/src/layout/common/itemModal/ParentProject.tsx
@@ -1,6 +1,7 @@
 import isUndefined from 'lodash/isUndefined';
 import { createSignal, onMount, Show } from 'solid-js';
 
+import { FOUNDATION } from '../../../data';
 import { Item } from '../../../types';
 import itemsDataGetter from '../../../utils/itemsDataGetter';
 import Image from '../Image';
@@ -28,7 +29,7 @@ const ParentProject = (props: Props) => {
             <small class="text-muted">
               {props.projectName} is a subproject of {parentInfo()!.name}
               <Show when={!isUndefined(parentInfo()!.maturity)} fallback={<>.</>}>
-                , a {window.baseDS.foundation} project.
+                , a {FOUNDATION} project.
               </Show>
             </small>
           </div>
diff --git a/web/src/layout/common/itemModal/ParticipationStats.module.css b/ui/webapp/src/layout/common/itemModal/ParticipationStats.module.css
similarity index 100%
rename from web/src/layout/common/itemModal/ParticipationStats.module.css
rename to ui/webapp/src/layout/common/itemModal/ParticipationStats.module.css
diff --git a/web/src/layout/common/itemModal/ParticipationStats.tsx b/ui/webapp/src/layout/common/itemModal/ParticipationStats.tsx
similarity index 100%
rename from web/src/layout/common/itemModal/ParticipationStats.tsx
rename to ui/webapp/src/layout/common/itemModal/ParticipationStats.tsx
diff --git a/web/src/layout/common/itemModal/RepositoriesSection.module.css b/ui/webapp/src/layout/common/itemModal/RepositoriesSection.module.css
similarity index 100%
rename from web/src/layout/common/itemModal/RepositoriesSection.module.css
rename to ui/webapp/src/layout/common/itemModal/RepositoriesSection.module.css
diff --git a/web/src/layout/common/itemModal/RepositoriesSection.tsx b/ui/webapp/src/layout/common/itemModal/RepositoriesSection.tsx
similarity index 100%
rename from web/src/layout/common/itemModal/RepositoriesSection.tsx
rename to ui/webapp/src/layout/common/itemModal/RepositoriesSection.tsx
diff --git a/web/src/layout/common/itemModal/index.tsx b/ui/webapp/src/layout/common/itemModal/index.tsx
similarity index 100%
rename from web/src/layout/common/itemModal/index.tsx
rename to ui/webapp/src/layout/common/itemModal/index.tsx
diff --git a/web/src/layout/common/zoomModal/ZoomModal.module.css b/ui/webapp/src/layout/common/zoomModal/ZoomModal.module.css
similarity index 100%
rename from web/src/layout/common/zoomModal/ZoomModal.module.css
rename to ui/webapp/src/layout/common/zoomModal/ZoomModal.module.css
diff --git a/web/src/layout/common/zoomModal/index.tsx b/ui/webapp/src/layout/common/zoomModal/index.tsx
similarity index 100%
rename from web/src/layout/common/zoomModal/index.tsx
rename to ui/webapp/src/layout/common/zoomModal/index.tsx
diff --git a/web/src/layout/explore/Content.tsx b/ui/webapp/src/layout/explore/Content.tsx
similarity index 100%
rename from web/src/layout/explore/Content.tsx
rename to ui/webapp/src/layout/explore/Content.tsx
diff --git a/web/src/layout/explore/Explore.module.css b/ui/webapp/src/layout/explore/Explore.module.css
similarity index 100%
rename from web/src/layout/explore/Explore.module.css
rename to ui/webapp/src/layout/explore/Explore.module.css
diff --git a/web/src/layout/explore/card/Card.module.css b/ui/webapp/src/layout/explore/card/Card.module.css
similarity index 100%
rename from web/src/layout/explore/card/Card.module.css
rename to ui/webapp/src/layout/explore/card/Card.module.css
diff --git a/web/src/layout/explore/card/Card.tsx b/ui/webapp/src/layout/explore/card/Card.tsx
similarity index 100%
rename from web/src/layout/explore/card/Card.tsx
rename to ui/webapp/src/layout/explore/card/Card.tsx
diff --git a/web/src/layout/explore/card/CardCategory.module.css b/ui/webapp/src/layout/explore/card/CardCategory.module.css
similarity index 100%
rename from web/src/layout/explore/card/CardCategory.module.css
rename to ui/webapp/src/layout/explore/card/CardCategory.module.css
diff --git a/web/src/layout/explore/card/CardTitle.module.css b/ui/webapp/src/layout/explore/card/CardTitle.module.css
similarity index 100%
rename from web/src/layout/explore/card/CardTitle.module.css
rename to ui/webapp/src/layout/explore/card/CardTitle.module.css
diff --git a/web/src/layout/explore/card/CardTitle.tsx b/ui/webapp/src/layout/explore/card/CardTitle.tsx
similarity index 100%
rename from web/src/layout/explore/card/CardTitle.tsx
rename to ui/webapp/src/layout/explore/card/CardTitle.tsx
diff --git a/web/src/layout/explore/card/Content.module.css b/ui/webapp/src/layout/explore/card/Content.module.css
similarity index 100%
rename from web/src/layout/explore/card/Content.module.css
rename to ui/webapp/src/layout/explore/card/Content.module.css
diff --git a/web/src/layout/explore/card/Content.tsx b/ui/webapp/src/layout/explore/card/Content.tsx
similarity index 100%
rename from web/src/layout/explore/card/Content.tsx
rename to ui/webapp/src/layout/explore/card/Content.tsx
diff --git a/web/src/layout/explore/card/Menu.module.css b/ui/webapp/src/layout/explore/card/Menu.module.css
similarity index 100%
rename from web/src/layout/explore/card/Menu.module.css
rename to ui/webapp/src/layout/explore/card/Menu.module.css
diff --git a/web/src/layout/explore/card/Menu.tsx b/ui/webapp/src/layout/explore/card/Menu.tsx
similarity index 100%
rename from web/src/layout/explore/card/Menu.tsx
rename to ui/webapp/src/layout/explore/card/Menu.tsx
diff --git a/web/src/layout/explore/card/index.tsx b/ui/webapp/src/layout/explore/card/index.tsx
similarity index 100%
rename from web/src/layout/explore/card/index.tsx
rename to ui/webapp/src/layout/explore/card/index.tsx
diff --git a/web/src/layout/explore/filters/Filters.module.css b/ui/webapp/src/layout/explore/filters/Filters.module.css
similarity index 100%
rename from web/src/layout/explore/filters/Filters.module.css
rename to ui/webapp/src/layout/explore/filters/Filters.module.css
diff --git a/web/src/layout/explore/filters/SearchbarSection.module.css b/ui/webapp/src/layout/explore/filters/SearchbarSection.module.css
similarity index 100%
rename from web/src/layout/explore/filters/SearchbarSection.module.css
rename to ui/webapp/src/layout/explore/filters/SearchbarSection.module.css
diff --git a/web/src/layout/explore/filters/SearchbarSection.tsx b/ui/webapp/src/layout/explore/filters/SearchbarSection.tsx
similarity index 100%
rename from web/src/layout/explore/filters/SearchbarSection.tsx
rename to ui/webapp/src/layout/explore/filters/SearchbarSection.tsx
diff --git a/web/src/layout/explore/filters/index.tsx b/ui/webapp/src/layout/explore/filters/index.tsx
similarity index 100%
rename from web/src/layout/explore/filters/index.tsx
rename to ui/webapp/src/layout/explore/filters/index.tsx
diff --git a/web/src/layout/explore/grid/Grid.module.css b/ui/webapp/src/layout/explore/grid/Grid.module.css
similarity index 100%
rename from web/src/layout/explore/grid/Grid.module.css
rename to ui/webapp/src/layout/explore/grid/Grid.module.css
diff --git a/web/src/layout/explore/grid/Grid.tsx b/ui/webapp/src/layout/explore/grid/Grid.tsx
similarity index 98%
rename from web/src/layout/explore/grid/Grid.tsx
rename to ui/webapp/src/layout/explore/grid/Grid.tsx
index 7392fed0..30722c34 100644
--- a/web/src/layout/explore/grid/Grid.tsx
+++ b/ui/webapp/src/layout/explore/grid/Grid.tsx
@@ -3,7 +3,7 @@ import isEqual from 'lodash/isEqual';
 import isUndefined from 'lodash/isUndefined';
 import { createEffect, createSignal, For, on, Show } from 'solid-js';
 
-import { GUIDE_PATH, ZOOM_LEVELS } from '../../../data';
+import { GRID_SIZE, GUIDE_PATH, ZOOM_LEVELS } from '../../../data';
 import { BaseItem, Item, SVGIconKind } from '../../../types';
 import calculateGridItemsPerRow from '../../../utils/calculateGridItemsPerRow';
 import getNormalizedName from '../../../utils/getNormalizedName';
@@ -88,7 +88,7 @@ export const ItemsList = (props: ItemsListProps) => {
 };
 
 const Grid = (props: Props) => {
-  const gridItemsSize = window.baseDS.grid_items_size;
+  const gridItemsSize = GRID_SIZE;
   const zoom = useZoomLevel();
   const updateActiveSection = useSetVisibleZoom();
   const [grid, setGrid] = createSignal<GridCategoryLayout | undefined>();
diff --git a/web/src/layout/explore/grid/GridCategory.module.css b/ui/webapp/src/layout/explore/grid/GridCategory.module.css
similarity index 100%
rename from web/src/layout/explore/grid/GridCategory.module.css
rename to ui/webapp/src/layout/explore/grid/GridCategory.module.css
diff --git a/web/src/layout/explore/grid/GridItem.module.css b/ui/webapp/src/layout/explore/grid/GridItem.module.css
similarity index 100%
rename from web/src/layout/explore/grid/GridItem.module.css
rename to ui/webapp/src/layout/explore/grid/GridItem.module.css
diff --git a/web/src/layout/explore/grid/GridItem.tsx b/ui/webapp/src/layout/explore/grid/GridItem.tsx
similarity index 100%
rename from web/src/layout/explore/grid/GridItem.tsx
rename to ui/webapp/src/layout/explore/grid/GridItem.tsx
diff --git a/web/src/layout/explore/grid/index.tsx b/ui/webapp/src/layout/explore/grid/index.tsx
similarity index 95%
rename from web/src/layout/explore/grid/index.tsx
rename to ui/webapp/src/layout/explore/grid/index.tsx
index 2132a765..7bf71c92 100644
--- a/web/src/layout/explore/grid/index.tsx
+++ b/ui/webapp/src/layout/explore/grid/index.tsx
@@ -94,8 +94,10 @@ const GridCategory = (props: Props) => {
 
   createEffect(
     on(data, () => {
-      setColorsList(generateColorsArray(Object.keys(data()).length));
-      setCatWithItems(getCategoriesWithItems(data()));
+      if (!isUndefined(data())) {
+        setColorsList(generateColorsArray(Object.keys(data()).length));
+        setCatWithItems(getCategoriesWithItems(data()));
+      }
     })
   );
 
diff --git a/web/src/layout/explore/index.tsx b/ui/webapp/src/layout/explore/index.tsx
similarity index 100%
rename from web/src/layout/explore/index.tsx
rename to ui/webapp/src/layout/explore/index.tsx
diff --git a/web/src/layout/explore/mobile/Card.module.css b/ui/webapp/src/layout/explore/mobile/Card.module.css
similarity index 100%
rename from web/src/layout/explore/mobile/Card.module.css
rename to ui/webapp/src/layout/explore/mobile/Card.module.css
diff --git a/web/src/layout/explore/mobile/Card.tsx b/ui/webapp/src/layout/explore/mobile/Card.tsx
similarity index 100%
rename from web/src/layout/explore/mobile/Card.tsx
rename to ui/webapp/src/layout/explore/mobile/Card.tsx
diff --git a/web/src/layout/explore/mobile/ExploreMobileIndex.module.css b/ui/webapp/src/layout/explore/mobile/ExploreMobileIndex.module.css
similarity index 100%
rename from web/src/layout/explore/mobile/ExploreMobileIndex.module.css
rename to ui/webapp/src/layout/explore/mobile/ExploreMobileIndex.module.css
diff --git a/web/src/layout/explore/mobile/ExploreMobileIndex.tsx b/ui/webapp/src/layout/explore/mobile/ExploreMobileIndex.tsx
similarity index 100%
rename from web/src/layout/explore/mobile/ExploreMobileIndex.tsx
rename to ui/webapp/src/layout/explore/mobile/ExploreMobileIndex.tsx
diff --git a/web/src/layout/explore/mobile/MobileGrid.module.css b/ui/webapp/src/layout/explore/mobile/MobileGrid.module.css
similarity index 100%
rename from web/src/layout/explore/mobile/MobileGrid.module.css
rename to ui/webapp/src/layout/explore/mobile/MobileGrid.module.css
diff --git a/web/src/layout/explore/mobile/MobileGrid.tsx b/ui/webapp/src/layout/explore/mobile/MobileGrid.tsx
similarity index 100%
rename from web/src/layout/explore/mobile/MobileGrid.tsx
rename to ui/webapp/src/layout/explore/mobile/MobileGrid.tsx
diff --git a/web/src/layout/finances/Finances.module.css b/ui/webapp/src/layout/finances/Finances.module.css
similarity index 100%
rename from web/src/layout/finances/Finances.module.css
rename to ui/webapp/src/layout/finances/Finances.module.css
diff --git a/web/src/layout/finances/MobileFilters.module.css b/ui/webapp/src/layout/finances/MobileFilters.module.css
similarity index 100%
rename from web/src/layout/finances/MobileFilters.module.css
rename to ui/webapp/src/layout/finances/MobileFilters.module.css
diff --git a/web/src/layout/finances/MobileFilters.tsx b/ui/webapp/src/layout/finances/MobileFilters.tsx
similarity index 100%
rename from web/src/layout/finances/MobileFilters.tsx
rename to ui/webapp/src/layout/finances/MobileFilters.tsx
diff --git a/web/src/layout/finances/index.tsx b/ui/webapp/src/layout/finances/index.tsx
similarity index 99%
rename from web/src/layout/finances/index.tsx
rename to ui/webapp/src/layout/finances/index.tsx
index 4b3b20d3..0f66f9c4 100644
--- a/web/src/layout/finances/index.tsx
+++ b/ui/webapp/src/layout/finances/index.tsx
@@ -10,6 +10,7 @@ import { batch, createEffect, createSignal, For, Match, on, onMount, Show, Switc
 import {
   DEFAULT_FINANCES_KIND,
   FINANCES_KIND_PARAM,
+  FOUNDATION,
   PAGE_PARAM,
   REGEX_UNDERSCORE,
   SMALL_DEVICES_BREAKPOINTS,
@@ -264,7 +265,7 @@ const Finances = () => {
   const removeFilter = (name: FilterCategory, value: string) => {
     let tmpActiveFilters: string[] = ({ ...activeFilters() }[name] || []).filter((f: string) => f !== value);
     if (name === FilterCategory.Maturity) {
-      if (isEqual(tmpActiveFilters, [window.baseDS.foundation.toLowerCase()])) {
+      if (isEqual(tmpActiveFilters, [FOUNDATION.toLowerCase()])) {
         tmpActiveFilters = [];
       }
     }
diff --git a/web/src/layout/guide/Guide.module.css b/ui/webapp/src/layout/guide/Guide.module.css
similarity index 100%
rename from web/src/layout/guide/Guide.module.css
rename to ui/webapp/src/layout/guide/Guide.module.css
diff --git a/web/src/layout/guide/SubcategoryExtended.module.css b/ui/webapp/src/layout/guide/SubcategoryExtended.module.css
similarity index 100%
rename from web/src/layout/guide/SubcategoryExtended.module.css
rename to ui/webapp/src/layout/guide/SubcategoryExtended.module.css
diff --git a/web/src/layout/guide/SubcategoryExtended.tsx b/ui/webapp/src/layout/guide/SubcategoryExtended.tsx
similarity index 97%
rename from web/src/layout/guide/SubcategoryExtended.tsx
rename to ui/webapp/src/layout/guide/SubcategoryExtended.tsx
index e03b9ab0..86b4d41c 100644
--- a/web/src/layout/guide/SubcategoryExtended.tsx
+++ b/ui/webapp/src/layout/guide/SubcategoryExtended.tsx
@@ -2,6 +2,7 @@ import isUndefined from 'lodash/isUndefined';
 import trim from 'lodash/trim';
 import { createSignal, For, onMount, Show } from 'solid-js';
 
+import { FOUNDATION } from '../../data';
 import { BaseItem, Item } from '../../types';
 import sortItemsByOrderValue from '../../utils/sortItemsByOrderValue';
 import styles from './SubcategoryExtended.module.css';
@@ -14,7 +15,7 @@ interface Props {
 }
 
 const SubcategoryExtended = (props: Props) => {
-  const foundation = window.baseDS.foundation;
+  const foundation = FOUNDATION;
   const [items, setItems] = createSignal<(BaseItem | Item)[]>();
   const [itemsInTable, setItemsInTable] = createSignal<(BaseItem | Item)[]>();
 
diff --git a/web/src/layout/guide/SubcategoryGrid.module.css b/ui/webapp/src/layout/guide/SubcategoryGrid.module.css
similarity index 100%
rename from web/src/layout/guide/SubcategoryGrid.module.css
rename to ui/webapp/src/layout/guide/SubcategoryGrid.module.css
diff --git a/web/src/layout/guide/SubcategoryGrid.tsx b/ui/webapp/src/layout/guide/SubcategoryGrid.tsx
similarity index 100%
rename from web/src/layout/guide/SubcategoryGrid.tsx
rename to ui/webapp/src/layout/guide/SubcategoryGrid.tsx
diff --git a/web/src/layout/guide/ToC.module.css b/ui/webapp/src/layout/guide/ToC.module.css
similarity index 100%
rename from web/src/layout/guide/ToC.module.css
rename to ui/webapp/src/layout/guide/ToC.module.css
diff --git a/web/src/layout/guide/ToC.tsx b/ui/webapp/src/layout/guide/ToC.tsx
similarity index 100%
rename from web/src/layout/guide/ToC.tsx
rename to ui/webapp/src/layout/guide/ToC.tsx
diff --git a/web/src/layout/guide/index.tsx b/ui/webapp/src/layout/guide/index.tsx
similarity index 95%
rename from web/src/layout/guide/index.tsx
rename to ui/webapp/src/layout/guide/index.tsx
index ea0c5d25..2dc763be 100644
--- a/web/src/layout/guide/index.tsx
+++ b/ui/webapp/src/layout/guide/index.tsx
@@ -70,13 +70,19 @@ const GuideIndex = () => {
   onMount(() => {
     async function fetchGuide() {
       try {
-        fetch(import.meta.env.MODE === 'development' ? '../../static/data/guide.json' : './data/guide.json')
-          .then((res) => res.json())
-          .then((data) => {
-            setGuide(data);
-            prepareToC(data);
-            setGuideContent(data);
-          });
+        if (!isUndefined(window.guide)) {
+          setGuide(window.guide);
+          prepareToC(window.guide);
+          setGuideContent(window.guide);
+        } else {
+          fetch(import.meta.env.MODE === 'development' ? '../../static/data/guide.json' : './data/guide.json')
+            .then((res) => res.json())
+            .then((data) => {
+              setGuide(data);
+              prepareToC(data);
+              setGuideContent(data);
+            });
+        }
       } catch {
         setGuide(null);
       }
diff --git a/web/src/layout/index.tsx b/ui/webapp/src/layout/index.tsx
similarity index 100%
rename from web/src/layout/index.tsx
rename to ui/webapp/src/layout/index.tsx
diff --git a/web/src/layout/logos/Logos.module.css b/ui/webapp/src/layout/logos/Logos.module.css
similarity index 100%
rename from web/src/layout/logos/Logos.module.css
rename to ui/webapp/src/layout/logos/Logos.module.css
diff --git a/web/src/layout/logos/index.tsx b/ui/webapp/src/layout/logos/index.tsx
similarity index 100%
rename from web/src/layout/logos/index.tsx
rename to ui/webapp/src/layout/logos/index.tsx
diff --git a/web/src/layout/navigation/EmbedModal.module.css b/ui/webapp/src/layout/navigation/EmbedModal.module.css
similarity index 100%
rename from web/src/layout/navigation/EmbedModal.module.css
rename to ui/webapp/src/layout/navigation/EmbedModal.module.css
diff --git a/web/src/layout/navigation/EmbedModal.tsx b/ui/webapp/src/layout/navigation/EmbedModal.tsx
similarity index 99%
rename from web/src/layout/navigation/EmbedModal.tsx
rename to ui/webapp/src/layout/navigation/EmbedModal.tsx
index d5b2bb20..49111875 100644
--- a/web/src/layout/navigation/EmbedModal.tsx
+++ b/ui/webapp/src/layout/navigation/EmbedModal.tsx
@@ -45,6 +45,7 @@ import useBreakpointDetect from '../../hooks/useBreakpointDetect';
 import { Category, Subcategory, SVGIconKind } from '../../types';
 import capitalizeFirstLetter from '../../utils/capitalizeFirstLetter';
 import isExploreSection from '../../utils/isExploreSection';
+import prepareLink from '../../utils/prepareLink';
 import rgba2hex from '../../utils/rgba2hex';
 import CheckBox from '../common/Checkbox';
 import CodeBlock from '../common/CodeBlock';
@@ -292,7 +293,7 @@ const EmbedModal = () => {
             e.preventDefault();
             e.stopPropagation();
             setVisibleModal(true);
-            navigate(EMBED_SETUP_PATH, {
+            navigate(prepareLink(EMBED_SETUP_PATH), {
               replace: true,
             });
           }}
diff --git a/web/src/layout/navigation/Footer.module.css b/ui/webapp/src/layout/navigation/Footer.module.css
similarity index 100%
rename from web/src/layout/navigation/Footer.module.css
rename to ui/webapp/src/layout/navigation/Footer.module.css
diff --git a/web/src/layout/navigation/Footer.tsx b/ui/webapp/src/layout/navigation/Footer.tsx
similarity index 87%
rename from web/src/layout/navigation/Footer.tsx
rename to ui/webapp/src/layout/navigation/Footer.tsx
index 72a32f7f..7f8a143e 100644
--- a/web/src/layout/navigation/Footer.tsx
+++ b/ui/webapp/src/layout/navigation/Footer.tsx
@@ -4,6 +4,7 @@ import { JSXElement, Show } from 'solid-js';
 
 import { SVGIconKind } from '../../types';
 import ExternalLink from '../common/ExternalLink';
+import Image from '../common/Image';
 import SVGIcon from '../common/SVGIcon';
 import styles from './Footer.module.css';
 
@@ -94,32 +95,17 @@ const Footer = () => {
                         when={!isUndefined(foundationLink())}
                         fallback={
                           <div class={styles.logoWrapper}>
-                            <img
-                              class={styles.logo}
-                              alt="Logo"
-                              src={
-                                import.meta.env.MODE === 'development'
-                                  ? `../../static/${window.baseDS.footer!.logo}`
-                                  : `${window.baseDS.footer!.logo}`
-                              }
-                              height={34}
-                              width="auto"
-                            />
+                            <Image class={styles.logo} name="Logo" logo={window.baseDS.footer!.logo!} height={34} />
                           </div>
                         }
                       >
                         <ExternalLink href={foundationLink()!}>
                           <div class={styles.logoWrapper}>
-                            <img
+                            <Image
                               class={`pe-none ${styles.logo}`}
-                              alt="Logo"
-                              src={
-                                import.meta.env.MODE === 'development'
-                                  ? `../../static/${window.baseDS.footer!.logo}`
-                                  : `${window.baseDS.footer!.logo}`
-                              }
+                              name="Logo"
+                              logo={window.baseDS.footer!.logo!}
                               height={34}
-                              width="auto"
                             />
                           </div>
                         </ExternalLink>
diff --git a/web/src/layout/navigation/Header.module.css b/ui/webapp/src/layout/navigation/Header.module.css
similarity index 93%
rename from web/src/layout/navigation/Header.module.css
rename to ui/webapp/src/layout/navigation/Header.module.css
index 686861c5..7f5a6dec 100644
--- a/web/src/layout/navigation/Header.module.css
+++ b/ui/webapp/src/layout/navigation/Header.module.css
@@ -4,6 +4,11 @@
   height: 72px;
   min-height: 72px;
   position: sticky;
+  top: 0;
+}
+
+:global(.overlay-active) .navbar {
+  top: var(--overlay-alert-height);
 }
 
 .logo {
diff --git a/web/src/layout/navigation/Header.tsx b/ui/webapp/src/layout/navigation/Header.tsx
similarity index 87%
rename from web/src/layout/navigation/Header.tsx
rename to ui/webapp/src/layout/navigation/Header.tsx
index 6c269ded..ddc0b17b 100644
--- a/web/src/layout/navigation/Header.tsx
+++ b/ui/webapp/src/layout/navigation/Header.tsx
@@ -6,9 +6,11 @@ import { createMemo, Show } from 'solid-js';
 import { ALL_OPTION, DEFAULT_VIEW_MODE, EXPLORE_PATH, GUIDE_PATH, SCREENSHOTS_PATH, STATS_PATH } from '../../data';
 import { SVGIconKind } from '../../types';
 import isExploreSection from '../../utils/isExploreSection';
+import prepareLink from '../../utils/prepareLink';
 import scrollToTop from '../../utils/scrollToTop';
 import DownloadDropdown from '../common/DownloadDropdown';
 import ExternalLink from '../common/ExternalLink';
+import Image from '../common/Image';
 import Searchbar from '../common/Searchbar';
 import SVGIcon from '../common/SVGIcon';
 import { useSetGroupActive } from '../stores/groupActive';
@@ -35,7 +37,7 @@ const Header = () => {
   };
 
   return (
-    <header class={`d-none d-lg-flex navbar navbar-expand mb-2 border-bottom shadow-sm top-0 ${styles.navbar}`}>
+    <header class={`d-none d-lg-flex navbar navbar-expand mb-2 border-bottom shadow-sm ${styles.navbar}`}>
       <div class="container-fluid d-flex flex-row align-items-center px-3 px-lg-4 mainPadding">
         <Show when={!isUndefined(logo())}>
           <div class={`d-flex flex-row justify-content-between align-items-center me-3 ${styles.logoWrapper}`}>
@@ -43,19 +45,13 @@ const Header = () => {
               class="btn btn-link p-0 pe-3 me-2 me-xl-5"
               onClick={() => {
                 resetDefaultExploreValues();
-                navigate(EXPLORE_PATH, {
+                navigate(prepareLink(EXPLORE_PATH), {
                   state: { from: 'logo-header' },
                 });
                 scrollToTop(false);
               }}
             >
-              <img
-                class={`${styles.logo}`}
-                src={import.meta.env.MODE === 'development' ? `../../static/${logo()}` : `${logo()}`}
-                alt="Landscape logo"
-                width="auto"
-                height={48}
-              />
+              <Image class={styles.logo} logo={logo()!} name="Landscape logo" height={48} />
             </button>
           </div>
         </Show>
@@ -64,15 +60,7 @@ const Header = () => {
           when={location.pathname !== SCREENSHOTS_PATH}
           fallback={
             <Show when={!isUndefined(window.baseDS.qr_code)}>
-              <img
-                class={styles.qr}
-                alt="QR code"
-                src={
-                  import.meta.env.MODE === 'development'
-                    ? `../../static/${window.baseDS.qr_code}`
-                    : window.baseDS.qr_code
-                }
-              />
+              <Image class={styles.qr} logo={window.baseDS.qr_code!} name="QR code" />
             </Show>
           }
         >
@@ -85,7 +73,7 @@ const Header = () => {
                   scrollToTop(false);
                 } else {
                   resetDefaultExploreValues();
-                  navigate(EXPLORE_PATH, {
+                  navigate(prepareLink(EXPLORE_PATH), {
                     state: { from: 'header' },
                   });
                   scrollToTop(false);
@@ -103,7 +91,7 @@ const Header = () => {
                   if (isActive(GUIDE_PATH)) {
                     scrollToTop(false);
                   } else {
-                    navigate(GUIDE_PATH, {
+                    navigate(prepareLink(GUIDE_PATH), {
                       state: { from: 'header' },
                     });
                     scrollToTop(false);
@@ -121,7 +109,7 @@ const Header = () => {
                 if (isActive(STATS_PATH)) {
                   scrollToTop(false);
                 } else {
-                  navigate(STATS_PATH, {
+                  navigate(prepareLink(STATS_PATH), {
                     state: { from: 'header' },
                   });
                   scrollToTop(false);
diff --git a/web/src/layout/navigation/MiniFooter.tsx b/ui/webapp/src/layout/navigation/MiniFooter.tsx
similarity index 100%
rename from web/src/layout/navigation/MiniFooter.tsx
rename to ui/webapp/src/layout/navigation/MiniFooter.tsx
diff --git a/web/src/layout/navigation/MobileDropdown.module.css b/ui/webapp/src/layout/navigation/MobileDropdown.module.css
similarity index 100%
rename from web/src/layout/navigation/MobileDropdown.module.css
rename to ui/webapp/src/layout/navigation/MobileDropdown.module.css
diff --git a/web/src/layout/navigation/MobileDropdown.tsx b/ui/webapp/src/layout/navigation/MobileDropdown.tsx
similarity index 100%
rename from web/src/layout/navigation/MobileDropdown.tsx
rename to ui/webapp/src/layout/navigation/MobileDropdown.tsx
diff --git a/web/src/layout/navigation/MobileHeader.module.css b/ui/webapp/src/layout/navigation/MobileHeader.module.css
similarity index 95%
rename from web/src/layout/navigation/MobileHeader.module.css
rename to ui/webapp/src/layout/navigation/MobileHeader.module.css
index 465eab6f..e6bdd216 100644
--- a/web/src/layout/navigation/MobileHeader.module.css
+++ b/ui/webapp/src/layout/navigation/MobileHeader.module.css
@@ -93,6 +93,10 @@
   top: 0px;
 }
 
+:global(.overlay-active) .isSticky {
+  top: var(--overlay-alert-height);
+}
+
 .mobileBtn {
   width: 28px !important;
   height: 28px !important;
diff --git a/web/src/layout/navigation/MobileHeader.tsx b/ui/webapp/src/layout/navigation/MobileHeader.tsx
similarity index 82%
rename from web/src/layout/navigation/MobileHeader.tsx
rename to ui/webapp/src/layout/navigation/MobileHeader.tsx
index fa4bb23c..0643f9eb 100644
--- a/web/src/layout/navigation/MobileHeader.tsx
+++ b/ui/webapp/src/layout/navigation/MobileHeader.tsx
@@ -9,6 +9,7 @@ import { SVGIconKind } from '../../types';
 import scrollToTop from '../../utils/scrollToTop';
 import DownloadDropdown from '../common/DownloadDropdown';
 import ExternalLink from '../common/ExternalLink';
+import Image from '../common/Image';
 import Searchbar from '../common/Searchbar';
 import SVGIcon from '../common/SVGIcon';
 import { useSetMobileTOCStatus } from '../stores/mobileTOC';
@@ -54,13 +55,7 @@ const MobileHeader = () => {
         <div>
           <Show when={!isUndefined(logo())}>
             <button class="btn btn-link" onClick={() => scrollToTop(true)}>
-              <img
-                src={import.meta.env.MODE === 'development' ? `../../static/${logo()}` : `${logo()}`}
-                class={styles.stickyLogo}
-                alt="Landscape logo"
-                width="auto"
-                height={35}
-              />
+              <Image logo={logo()!} class={styles.stickyLogo} name="Landscape logo" height={35} />
             </button>
           </Show>
         </div>
@@ -73,13 +68,7 @@ const MobileHeader = () => {
           <div class={`d-flex flex-row justify-content-between align-items-center ${styles.logoWrapper}`}>
             <Show when={!isUndefined(logo())}>
               <A href={EXPLORE_PATH} class="me-4 me-xl-5">
-                <img
-                  class={styles.logo}
-                  src={import.meta.env.MODE === 'development' ? `../../static/${logo()}` : `${logo()}`}
-                  alt="Landscape logo"
-                  width="auto"
-                  height={48}
-                />
+                <Image class={styles.logo} logo={logo()!} name="Landscape logo" height={48} />
               </A>
             </Show>
             <div class="ms-auto d-flex d-lg-none">
@@ -91,15 +80,7 @@ const MobileHeader = () => {
             when={location.pathname !== SCREENSHOTS_PATH}
             fallback={
               <Show when={!isUndefined(window.baseDS.qr_code)}>
-                <img
-                  class={styles.qr}
-                  alt="QR code"
-                  src={
-                    import.meta.env.MODE === 'development'
-                      ? `../../static/${window.baseDS.qr_code}`
-                      : window.baseDS.qr_code
-                  }
-                />
+                <Image class={styles.qr} name="QR code" logo={window.baseDS.qr_code!} />
               </Show>
             }
           >
diff --git a/web/src/layout/notFound/NotFound.module.css b/ui/webapp/src/layout/notFound/NotFound.module.css
similarity index 100%
rename from web/src/layout/notFound/NotFound.module.css
rename to ui/webapp/src/layout/notFound/NotFound.module.css
diff --git a/web/src/layout/notFound/index.tsx b/ui/webapp/src/layout/notFound/index.tsx
similarity index 100%
rename from web/src/layout/notFound/index.tsx
rename to ui/webapp/src/layout/notFound/index.tsx
diff --git a/web/src/layout/screenshots/Grid.module.css b/ui/webapp/src/layout/screenshots/Grid.module.css
similarity index 100%
rename from web/src/layout/screenshots/Grid.module.css
rename to ui/webapp/src/layout/screenshots/Grid.module.css
diff --git a/web/src/layout/screenshots/Grid.tsx b/ui/webapp/src/layout/screenshots/Grid.tsx
similarity index 100%
rename from web/src/layout/screenshots/Grid.tsx
rename to ui/webapp/src/layout/screenshots/Grid.tsx
diff --git a/web/src/layout/screenshots/Screenshots.module.css b/ui/webapp/src/layout/screenshots/Screenshots.module.css
similarity index 100%
rename from web/src/layout/screenshots/Screenshots.module.css
rename to ui/webapp/src/layout/screenshots/Screenshots.module.css
diff --git a/web/src/layout/screenshots/index.tsx b/ui/webapp/src/layout/screenshots/index.tsx
similarity index 100%
rename from web/src/layout/screenshots/index.tsx
rename to ui/webapp/src/layout/screenshots/index.tsx
diff --git a/web/src/layout/stats/Box.module.css b/ui/webapp/src/layout/stats/Box.module.css
similarity index 100%
rename from web/src/layout/stats/Box.module.css
rename to ui/webapp/src/layout/stats/Box.module.css
diff --git a/web/src/layout/stats/Box.tsx b/ui/webapp/src/layout/stats/Box.tsx
similarity index 100%
rename from web/src/layout/stats/Box.tsx
rename to ui/webapp/src/layout/stats/Box.tsx
diff --git a/web/src/layout/stats/ChartsGroup.tsx b/ui/webapp/src/layout/stats/ChartsGroup.tsx
similarity index 100%
rename from web/src/layout/stats/ChartsGroup.tsx
rename to ui/webapp/src/layout/stats/ChartsGroup.tsx
diff --git a/web/src/layout/stats/CollapsableTable.module.css b/ui/webapp/src/layout/stats/CollapsableTable.module.css
similarity index 100%
rename from web/src/layout/stats/CollapsableTable.module.css
rename to ui/webapp/src/layout/stats/CollapsableTable.module.css
diff --git a/web/src/layout/stats/CollapsableTable.tsx b/ui/webapp/src/layout/stats/CollapsableTable.tsx
similarity index 100%
rename from web/src/layout/stats/CollapsableTable.tsx
rename to ui/webapp/src/layout/stats/CollapsableTable.tsx
diff --git a/web/src/layout/stats/Content.tsx b/ui/webapp/src/layout/stats/Content.tsx
similarity index 100%
rename from web/src/layout/stats/Content.tsx
rename to ui/webapp/src/layout/stats/Content.tsx
diff --git a/web/src/layout/stats/HeatMapChart.tsx b/ui/webapp/src/layout/stats/HeatMapChart.tsx
similarity index 100%
rename from web/src/layout/stats/HeatMapChart.tsx
rename to ui/webapp/src/layout/stats/HeatMapChart.tsx
diff --git a/web/src/layout/stats/HorizontalBarChart.module.css b/ui/webapp/src/layout/stats/HorizontalBarChart.module.css
similarity index 100%
rename from web/src/layout/stats/HorizontalBarChart.module.css
rename to ui/webapp/src/layout/stats/HorizontalBarChart.module.css
diff --git a/web/src/layout/stats/HorizontalBarChart.tsx b/ui/webapp/src/layout/stats/HorizontalBarChart.tsx
similarity index 100%
rename from web/src/layout/stats/HorizontalBarChart.tsx
rename to ui/webapp/src/layout/stats/HorizontalBarChart.tsx
diff --git a/web/src/layout/stats/Stats.module.css b/ui/webapp/src/layout/stats/Stats.module.css
similarity index 100%
rename from web/src/layout/stats/Stats.module.css
rename to ui/webapp/src/layout/stats/Stats.module.css
diff --git a/web/src/layout/stats/TimestampLineChart.tsx b/ui/webapp/src/layout/stats/TimestampLineChart.tsx
similarity index 100%
rename from web/src/layout/stats/TimestampLineChart.tsx
rename to ui/webapp/src/layout/stats/TimestampLineChart.tsx
diff --git a/web/src/layout/stats/VerticalBarChart.module.css b/ui/webapp/src/layout/stats/VerticalBarChart.module.css
similarity index 100%
rename from web/src/layout/stats/VerticalBarChart.module.css
rename to ui/webapp/src/layout/stats/VerticalBarChart.module.css
diff --git a/web/src/layout/stats/VerticalBarChart.tsx b/ui/webapp/src/layout/stats/VerticalBarChart.tsx
similarity index 100%
rename from web/src/layout/stats/VerticalBarChart.tsx
rename to ui/webapp/src/layout/stats/VerticalBarChart.tsx
diff --git a/web/src/layout/stats/index.tsx b/ui/webapp/src/layout/stats/index.tsx
similarity index 100%
rename from web/src/layout/stats/index.tsx
rename to ui/webapp/src/layout/stats/index.tsx
diff --git a/web/src/layout/stores/activeItem.tsx b/ui/webapp/src/layout/stores/activeItem.tsx
similarity index 100%
rename from web/src/layout/stores/activeItem.tsx
rename to ui/webapp/src/layout/stores/activeItem.tsx
diff --git a/web/src/layout/stores/financesData.tsx b/ui/webapp/src/layout/stores/financesData.tsx
similarity index 100%
rename from web/src/layout/stores/financesData.tsx
rename to ui/webapp/src/layout/stores/financesData.tsx
diff --git a/web/src/layout/stores/fullData.tsx b/ui/webapp/src/layout/stores/fullData.tsx
similarity index 92%
rename from web/src/layout/stores/fullData.tsx
rename to ui/webapp/src/layout/stores/fullData.tsx
index 90bf5edd..681d8333 100644
--- a/web/src/layout/stores/fullData.tsx
+++ b/ui/webapp/src/layout/stores/fullData.tsx
@@ -3,7 +3,7 @@ import { createContext, createEffect, createSignal, ParentComponent, useContext
 import itemsDataGetter from '../../utils/itemsDataGetter';
 
 function useFullDataProvider() {
-  const [fullDataReady, setFullDataReady] = createSignal(false);
+  const [fullDataReady, setFullDataReady] = createSignal(itemsDataGetter.isReady());
 
   createEffect(() => {
     itemsDataGetter.subscribe({
diff --git a/web/src/layout/stores/gridWidth.tsx b/ui/webapp/src/layout/stores/gridWidth.tsx
similarity index 100%
rename from web/src/layout/stores/gridWidth.tsx
rename to ui/webapp/src/layout/stores/gridWidth.tsx
diff --git a/web/src/layout/stores/groupActive.tsx b/ui/webapp/src/layout/stores/groupActive.tsx
similarity index 94%
rename from web/src/layout/stores/groupActive.tsx
rename to ui/webapp/src/layout/stores/groupActive.tsx
index b99bcaa4..23b23da5 100644
--- a/web/src/layout/stores/groupActive.tsx
+++ b/ui/webapp/src/layout/stores/groupActive.tsx
@@ -6,6 +6,7 @@ import { createContext, createSignal, ParentComponent, useContext } from 'solid-
 import { ALL_OPTION, BASE_PATH, GROUP_PARAM } from '../../data';
 import { Group } from '../../types';
 import isExploreSection from '../../utils/isExploreSection';
+import prepareLink from '../../utils/prepareLink';
 
 const getInitialGroupName = (groupParam: string | null): string | undefined => {
   const navigate = useNavigate();
@@ -22,7 +23,7 @@ const getInitialGroupName = (groupParam: string | null): string | undefined => {
         return groupParam;
       } else {
         if (isExploreSection(location.pathname)) {
-          navigate(`${BASE_PATH}/?group=${firstGroup}`, {
+          navigate(prepareLink(BASE_PATH, `group=${firstGroup}`), {
             replace: true,
           });
         }
diff --git a/web/src/layout/stores/guideFile.tsx b/ui/webapp/src/layout/stores/guideFile.tsx
similarity index 100%
rename from web/src/layout/stores/guideFile.tsx
rename to ui/webapp/src/layout/stores/guideFile.tsx
diff --git a/web/src/layout/stores/mobileTOC.tsx b/ui/webapp/src/layout/stores/mobileTOC.tsx
similarity index 100%
rename from web/src/layout/stores/mobileTOC.tsx
rename to ui/webapp/src/layout/stores/mobileTOC.tsx
diff --git a/web/src/layout/stores/upcomingEventData.tsx b/ui/webapp/src/layout/stores/upcomingEventData.tsx
similarity index 100%
rename from web/src/layout/stores/upcomingEventData.tsx
rename to ui/webapp/src/layout/stores/upcomingEventData.tsx
diff --git a/web/src/layout/stores/viewMode.tsx b/ui/webapp/src/layout/stores/viewMode.tsx
similarity index 100%
rename from web/src/layout/stores/viewMode.tsx
rename to ui/webapp/src/layout/stores/viewMode.tsx
diff --git a/web/src/layout/stores/visibleZoomSection.tsx b/ui/webapp/src/layout/stores/visibleZoomSection.tsx
similarity index 100%
rename from web/src/layout/stores/visibleZoomSection.tsx
rename to ui/webapp/src/layout/stores/visibleZoomSection.tsx
diff --git a/web/src/layout/stores/zoom.tsx b/ui/webapp/src/layout/stores/zoom.tsx
similarity index 100%
rename from web/src/layout/stores/zoom.tsx
rename to ui/webapp/src/layout/stores/zoom.tsx
diff --git a/web/src/layout/upcomingEvents/UpcomingEvents.module.css b/ui/webapp/src/layout/upcomingEvents/UpcomingEvents.module.css
similarity index 100%
rename from web/src/layout/upcomingEvents/UpcomingEvents.module.css
rename to ui/webapp/src/layout/upcomingEvents/UpcomingEvents.module.css
diff --git a/web/src/layout/upcomingEvents/index.tsx b/ui/webapp/src/layout/upcomingEvents/index.tsx
similarity index 100%
rename from web/src/layout/upcomingEvents/index.tsx
rename to ui/webapp/src/layout/upcomingEvents/index.tsx
diff --git a/web/src/styles/cookies.css b/ui/webapp/src/styles/cookies.css
similarity index 100%
rename from web/src/styles/cookies.css
rename to ui/webapp/src/styles/cookies.css
diff --git a/web/src/styles/default.scss b/ui/webapp/src/styles/default.scss
similarity index 98%
rename from web/src/styles/default.scss
rename to ui/webapp/src/styles/default.scss
index 82ab4457..887fbde2 100644
--- a/web/src/styles/default.scss
+++ b/ui/webapp/src/styles/default.scss
@@ -73,7 +73,7 @@ $font-family-sans-serif:
 // @import "../node_modules/bootstrap/scss/breadcrumb";
 @import '../node_modules/bootstrap/scss/pagination';
 @import '../node_modules/bootstrap/scss/badge';
-// @import "../node_modules/bootstrap/scss/alert";
+@import '../node_modules/bootstrap/scss/alert';
 // @import "../node_modules/bootstrap/scss/progress";
 // @import "../node_modules/bootstrap/scss/list-group";
 @import '../node_modules/bootstrap/scss/close';
diff --git a/web/src/styles/light.scss b/ui/webapp/src/styles/light.scss
similarity index 97%
rename from web/src/styles/light.scss
rename to ui/webapp/src/styles/light.scss
index 414b65b8..d661c92e 100644
--- a/web/src/styles/light.scss
+++ b/ui/webapp/src/styles/light.scss
@@ -2,9 +2,10 @@
   --bs-primary: var(--color1);
   --bs-secondary: var(--color2);
   --color-font: #38383f;
-
   --color-stats-1: var(--color1);
 
+  --overlay-alert-height: 33px;
+
   .modal-dialog-scrollable .modal-body {
     overscroll-behavior: contain;
     overflow-x: hidden;
diff --git a/web/src/styles/mixins.scss b/ui/webapp/src/styles/mixins.scss
similarity index 100%
rename from web/src/styles/mixins.scss
rename to ui/webapp/src/styles/mixins.scss
diff --git a/web/src/types.ts b/ui/webapp/src/types.ts
similarity index 100%
rename from web/src/types.ts
rename to ui/webapp/src/types.ts
diff --git a/web/src/utils/calculateAxisValues.ts b/ui/webapp/src/utils/calculateAxisValues.ts
similarity index 100%
rename from web/src/utils/calculateAxisValues.ts
rename to ui/webapp/src/utils/calculateAxisValues.ts
diff --git a/web/src/utils/calculateGridItemsPerRow.ts b/ui/webapp/src/utils/calculateGridItemsPerRow.ts
similarity index 100%
rename from web/src/utils/calculateGridItemsPerRow.ts
rename to ui/webapp/src/utils/calculateGridItemsPerRow.ts
diff --git a/web/src/utils/calculateGridWidthInPx.ts b/ui/webapp/src/utils/calculateGridWidthInPx.ts
similarity index 100%
rename from web/src/utils/calculateGridWidthInPx.ts
rename to ui/webapp/src/utils/calculateGridWidthInPx.ts
diff --git a/web/src/utils/capitalizeFirstLetter.ts b/ui/webapp/src/utils/capitalizeFirstLetter.ts
similarity index 100%
rename from web/src/utils/capitalizeFirstLetter.ts
rename to ui/webapp/src/utils/capitalizeFirstLetter.ts
diff --git a/web/src/utils/checkIfCategoryInGroup.ts b/ui/webapp/src/utils/checkIfCategoryInGroup.ts
similarity index 100%
rename from web/src/utils/checkIfCategoryInGroup.ts
rename to ui/webapp/src/utils/checkIfCategoryInGroup.ts
diff --git a/ui/webapp/src/utils/checkQueryStringValue.ts b/ui/webapp/src/utils/checkQueryStringValue.ts
new file mode 100644
index 00000000..6eb67ebf
--- /dev/null
+++ b/ui/webapp/src/utils/checkQueryStringValue.ts
@@ -0,0 +1,11 @@
+const checkQueryStringValue = (query: string, value: string): boolean => {
+  const url = new URL(window.location.href);
+
+  if (url.searchParams.has(query)) {
+    return url.searchParams.get(query) === value;
+  } else {
+    return false;
+  }
+};
+
+export default checkQueryStringValue;
diff --git a/web/src/utils/cleanEmojis.ts b/ui/webapp/src/utils/cleanEmojis.ts
similarity index 100%
rename from web/src/utils/cleanEmojis.ts
rename to ui/webapp/src/utils/cleanEmojis.ts
diff --git a/web/src/utils/countVisibleItems.tsx b/ui/webapp/src/utils/countVisibleItems.tsx
similarity index 100%
rename from web/src/utils/countVisibleItems.tsx
rename to ui/webapp/src/utils/countVisibleItems.tsx
diff --git a/web/src/utils/cutString.ts b/ui/webapp/src/utils/cutString.ts
similarity index 100%
rename from web/src/utils/cutString.ts
rename to ui/webapp/src/utils/cutString.ts
diff --git a/web/src/utils/filterData.ts b/ui/webapp/src/utils/filterData.ts
similarity index 100%
rename from web/src/utils/filterData.ts
rename to ui/webapp/src/utils/filterData.ts
diff --git a/web/src/utils/formatLabelProfit.ts b/ui/webapp/src/utils/formatLabelProfit.ts
similarity index 100%
rename from web/src/utils/formatLabelProfit.ts
rename to ui/webapp/src/utils/formatLabelProfit.ts
diff --git a/web/src/utils/generateColorsArray.ts b/ui/webapp/src/utils/generateColorsArray.ts
similarity index 100%
rename from web/src/utils/generateColorsArray.ts
rename to ui/webapp/src/utils/generateColorsArray.ts
diff --git a/ui/webapp/src/utils/getBasePath.ts b/ui/webapp/src/utils/getBasePath.ts
new file mode 100644
index 00000000..7ec7e99a
--- /dev/null
+++ b/ui/webapp/src/utils/getBasePath.ts
@@ -0,0 +1,5 @@
+const getBasePath = () => {
+  return window.baseDS ? window.baseDS.base_path || '' : '';
+};
+
+export default getBasePath;
diff --git a/web/src/utils/getCategoriesWithItems.ts b/ui/webapp/src/utils/getCategoriesWithItems.ts
similarity index 100%
rename from web/src/utils/getCategoriesWithItems.ts
rename to ui/webapp/src/utils/getCategoriesWithItems.ts
diff --git a/ui/webapp/src/utils/getFoundationNameLabel.ts b/ui/webapp/src/utils/getFoundationNameLabel.ts
new file mode 100644
index 00000000..e18d6f4c
--- /dev/null
+++ b/ui/webapp/src/utils/getFoundationNameLabel.ts
@@ -0,0 +1,8 @@
+import { FOUNDATION, REGEX_SPACE } from '../data';
+
+const getFoundationNameLabel = (): string => {
+  const foundation: string = FOUNDATION;
+  return foundation.toLowerCase().replace(REGEX_SPACE, '');
+};
+
+export default getFoundationNameLabel;
diff --git a/web/src/utils/getGroupName.ts b/ui/webapp/src/utils/getGroupName.ts
similarity index 100%
rename from web/src/utils/getGroupName.ts
rename to ui/webapp/src/utils/getGroupName.ts
diff --git a/web/src/utils/getItemDescription.ts b/ui/webapp/src/utils/getItemDescription.ts
similarity index 100%
rename from web/src/utils/getItemDescription.ts
rename to ui/webapp/src/utils/getItemDescription.ts
diff --git a/web/src/utils/getName.ts b/ui/webapp/src/utils/getName.ts
similarity index 100%
rename from web/src/utils/getName.ts
rename to ui/webapp/src/utils/getName.ts
diff --git a/web/src/utils/getNormalizedName.ts b/ui/webapp/src/utils/getNormalizedName.ts
similarity index 100%
rename from web/src/utils/getNormalizedName.ts
rename to ui/webapp/src/utils/getNormalizedName.ts
diff --git a/web/src/utils/goToElement.ts b/ui/webapp/src/utils/goToElement.ts
similarity index 100%
rename from web/src/utils/goToElement.ts
rename to ui/webapp/src/utils/goToElement.ts
diff --git a/web/src/utils/gridCategoryLayout.ts b/ui/webapp/src/utils/gridCategoryLayout.ts
similarity index 100%
rename from web/src/utils/gridCategoryLayout.ts
rename to ui/webapp/src/utils/gridCategoryLayout.ts
diff --git a/web/src/utils/isElementInView.ts b/ui/webapp/src/utils/isElementInView.ts
similarity index 100%
rename from web/src/utils/isElementInView.ts
rename to ui/webapp/src/utils/isElementInView.ts
diff --git a/web/src/utils/isExploreSection.ts b/ui/webapp/src/utils/isExploreSection.ts
similarity index 100%
rename from web/src/utils/isExploreSection.ts
rename to ui/webapp/src/utils/isExploreSection.ts
diff --git a/web/src/utils/isSectionInGuide.ts b/ui/webapp/src/utils/isSectionInGuide.ts
similarity index 100%
rename from web/src/utils/isSectionInGuide.ts
rename to ui/webapp/src/utils/isSectionInGuide.ts
diff --git a/web/src/utils/itemsDataGetter.ts b/ui/webapp/src/utils/itemsDataGetter.ts
similarity index 86%
rename from web/src/utils/itemsDataGetter.ts
rename to ui/webapp/src/utils/itemsDataGetter.ts
index c12121ca..79f53a85 100644
--- a/web/src/utils/itemsDataGetter.ts
+++ b/ui/webapp/src/utils/itemsDataGetter.ts
@@ -88,25 +88,37 @@ export class ItemsDataGetter {
   }
 
   // Initialize the data
-  public init() {
+  public init(landscapeData?: LandscapeData) {
     if (!this.ready) {
-      fetch(import.meta.env.MODE === 'development' ? '../../static/data/full.json' : './data/full.json')
-        .then((res) => res.json())
-        .then((data: LandscapeData) => {
-          const extendedItems = this.extendItemsData(data.items, data.crunchbase_data, data.github_data);
-          this.landscapeData = {
-            ...data,
-            items: extendedItems,
-          };
-          this.ready = true;
-          if (this.updateStatus) {
-            this.updateStatus.updateStatus(true);
-          }
-          this.saveData();
-        });
+      if (landscapeData) {
+        this.initialDataPreparation(landscapeData);
+      } else {
+        fetch(import.meta.env.MODE === 'development' ? '../../static/data/full.json' : './data/full.json')
+          .then((res) => res.json())
+          .then((data: LandscapeData) => {
+            this.initialDataPreparation(data);
+          });
+      }
     }
   }
 
+  private initialDataPreparation(data: LandscapeData) {
+    const extendedItems = this.extendItemsData(data.items, data.crunchbase_data, data.github_data);
+    this.landscapeData = {
+      ...data,
+      items: extendedItems,
+    };
+    this.ready = true;
+    if (this.updateStatus) {
+      this.updateStatus.updateStatus(true);
+    }
+    this.saveData();
+  }
+
+  public isReady(): boolean {
+    return this.ready;
+  }
+
   // Get all items
   public getAll(): Item[] {
     if (this.ready && this.landscapeData && this.landscapeData.items) {
@@ -250,36 +262,38 @@ export class ItemsDataGetter {
   ): { [key: string]: { [key: string]: (BaseItem | Item)[] } } {
     const groupedItems: { [key: string]: { [key: string]: (BaseItem | Item)[] } } = {};
 
-    const addItem = (category: string, subcategory: string, item: BaseItem | Item) => {
-      if (groupedItems[category]) {
-        if (groupedItems[category][subcategory]) {
-          groupedItems[category][subcategory].push(item);
+    if (items && items.length > 0) {
+      const addItem = (category: string, subcategory: string, item: BaseItem | Item) => {
+        if (groupedItems[category]) {
+          if (groupedItems[category][subcategory]) {
+            groupedItems[category][subcategory].push(item);
+          } else {
+            groupedItems[category][subcategory] = [item];
+          }
         } else {
-          groupedItems[category][subcategory] = [item];
+          groupedItems[category] = { [subcategory]: [item] };
         }
-      } else {
-        groupedItems[category] = { [subcategory]: [item] };
-      }
-    };
+      };
 
-    const validateCategory = (category: string): boolean => {
-      if (!checkIfCategoryInGroup(category, group)) return false;
-      if (activeCategoryFilters && activeCategoryFilters.length > 0) {
-        return activeCategoryFilters.includes(category);
-      }
-      return true;
-    };
+      const validateCategory = (category: string): boolean => {
+        if (!checkIfCategoryInGroup(category, group)) return false;
+        if (activeCategoryFilters && activeCategoryFilters.length > 0) {
+          return activeCategoryFilters.includes(category);
+        }
+        return true;
+      };
 
-    for (const item of items) {
-      if (validateCategory(item.category)) {
-        addItem(item.category, item.subcategory, item);
-      }
-      if (item.additional_categories) {
-        item.additional_categories.forEach((ad: AdditionalCategory) => {
-          if (validateCategory(ad.category)) {
-            addItem(ad.category, ad.subcategory, item);
-          }
-        });
+      for (const item of items) {
+        if (validateCategory(item.category)) {
+          addItem(item.category, item.subcategory, item);
+        }
+        if (item.additional_categories) {
+          item.additional_categories.forEach((ad: AdditionalCategory) => {
+            if (validateCategory(ad.category)) {
+              addItem(ad.category, ad.subcategory, item);
+            }
+          });
+        }
       }
     }
 
@@ -355,18 +369,20 @@ export class ItemsDataGetter {
       Object.keys(groupedItems).forEach((group: string) => {
         data[group] = {};
         const items = groupedItems![group];
-        items.forEach((item: BaseItem | Item) => {
-          if (validateCategory(item.category, group)) {
-            addItem(group, item.category, item.subcategory, item);
-          }
-          if (item.additional_categories) {
-            for (const ac of item.additional_categories) {
-              if (validateCategory(ac.category, group)) {
-                addItem(group, ac.category, ac.subcategory, item);
+        if (!isUndefined(items)) {
+          items.forEach((item: BaseItem | Item) => {
+            if (validateCategory(item.category, group)) {
+              addItem(group, item.category, item.subcategory, item);
+            }
+            if (item.additional_categories) {
+              for (const ac of item.additional_categories) {
+                if (validateCategory(ac.category, group)) {
+                  addItem(group, ac.category, ac.subcategory, item);
+                }
               }
             }
-          }
-        });
+          });
+        }
       });
     }
     return data;
@@ -459,7 +475,7 @@ export class ItemsDataGetter {
         );
         classifyCardData[activeGroup] = classifyGroup;
         menuData[activeGroup] = this.getMenuOptions(classifyGroup, classify);
-        numItems[activeGroup] = groupedItems[activeGroup].length;
+        numItems[activeGroup] = groupedItems[activeGroup] ? groupedItems[activeGroup].length : 0;
       } else {
         const classifiedOption =
           !isUndefined(this.classifyAndSortOptions) && this.classifyAndSortOptions[group].classify.includes(classify)
@@ -522,15 +538,17 @@ export class ItemsDataGetter {
     if (this.ready && this.landscapeData && this.landscapeData.items) {
       const allGroupedItems = this.getGroupedData();
       const options: string[] = [];
-      allGroupedItems[group].forEach((i: Item) => {
-        if (i.repositories) {
-          i.repositories.forEach((r: Repository) => {
-            if (r.github_data) {
-              options.push(r.github_data!.license);
-            }
-          });
-        }
-      });
+      if (!isUndefined(allGroupedItems[group])) {
+        allGroupedItems[group].forEach((i: Item) => {
+          if (i.repositories) {
+            i.repositories.forEach((r: Repository) => {
+              if (r.github_data) {
+                options.push(r.github_data!.license);
+              }
+            });
+          }
+        });
+      }
       return uniq(compact(options));
     }
     return [];
diff --git a/web/src/utils/itemsIterator.tsx b/ui/webapp/src/utils/itemsIterator.tsx
similarity index 100%
rename from web/src/utils/itemsIterator.tsx
rename to ui/webapp/src/utils/itemsIterator.tsx
diff --git a/web/src/utils/nestArray.ts b/ui/webapp/src/utils/nestArray.ts
similarity index 100%
rename from web/src/utils/nestArray.ts
rename to ui/webapp/src/utils/nestArray.ts
diff --git a/ui/webapp/src/utils/overlayData.ts b/ui/webapp/src/utils/overlayData.ts
new file mode 100644
index 00000000..a7c09522
--- /dev/null
+++ b/ui/webapp/src/utils/overlayData.ts
@@ -0,0 +1,148 @@
+import isEmpty from 'lodash/isEmpty';
+
+import {
+  BASE_PATH,
+  DEFAULT_GRID_ITEMS_SIZE,
+  DEFAULT_VIEW_MODE,
+  OVERLAY_DATA_PARAM,
+  OVERLAY_GUIDE_PARAM,
+  OVERLAY_LOGOS_PATH_PARAM,
+  OVERLAY_SETTINGS_PARAM,
+  overrideSettings,
+} from '../data';
+import itemsDataGetter from './itemsDataGetter';
+
+interface OverlayParams {
+  data?: string;
+  settings?: string;
+  guide?: string;
+  logosPath?: string;
+}
+
+interface OverlayInput {
+  landscape_url: string;
+  data_url?: string;
+  settings_url?: string;
+  guide_url?: string;
+  logos_url?: string;
+}
+
+export class OverlayData {
+  private isActive: boolean = false;
+  private params: OverlayParams | undefined = undefined;
+  private query: URLSearchParams = new URLSearchParams();
+
+  public checkIfOverlayInQuery() {
+    const searchParams = new URLSearchParams(window.location.search);
+    for (const [key] of searchParams.entries()) {
+      if (key.startsWith('overlay-')) {
+        this.init();
+        return true;
+      }
+    }
+    return false;
+  }
+
+  public init() {
+    this.isActive = true;
+    document.body.classList.add('overlay-active');
+    this.saveUrlParams();
+  }
+
+  private saveUrlParams() {
+    const currentSearch = new URLSearchParams(window.location.search);
+    const dataUrl = currentSearch.get(OVERLAY_DATA_PARAM);
+    const settingsUrl = currentSearch.get(OVERLAY_SETTINGS_PARAM);
+    const guideUrl = currentSearch.get(OVERLAY_GUIDE_PARAM);
+    const logosPathUrl = currentSearch.get(OVERLAY_LOGOS_PATH_PARAM);
+
+    this.params = {};
+
+    // save url params
+    if (dataUrl) {
+      this.params.data = dataUrl;
+      this.query.set(OVERLAY_DATA_PARAM, dataUrl || '');
+    }
+    if (settingsUrl) {
+      this.params.settings = settingsUrl;
+      this.query.set(OVERLAY_SETTINGS_PARAM, settingsUrl);
+    }
+    if (guideUrl) {
+      this.params.guide = guideUrl;
+      this.query.set(OVERLAY_GUIDE_PARAM, guideUrl);
+    }
+    if (logosPathUrl) {
+      this.params.logosPath = logosPathUrl;
+      this.query.set(OVERLAY_LOGOS_PATH_PARAM, logosPathUrl);
+    }
+  }
+
+  public isActiveOverlay() {
+    return this.isActive;
+  }
+
+  public getUrlParams() {
+    return this.isActive ? this.query.toString() : '';
+  }
+
+  private isWasmSupported() {
+    if (typeof WebAssembly !== 'undefined') {
+      // WebAssembly is supported
+      return true;
+    } else {
+      // WebAssembly is not supported
+      return false;
+    }
+  }
+
+  public async getOverlayBaseData() {
+    if (!this.isWasmSupported()) {
+      return Promise.reject('WebAssembly is not supported in this browser');
+    } else {
+      return import('../../wasm/overlay/landscape2_overlay')
+        .then(async (obj) => {
+          await obj.default();
+
+          const input: OverlayInput = {
+            landscape_url: `${import.meta.env.MODE === 'development' ? 'http://localhost:8000' : window.location.origin}${BASE_PATH}`,
+          };
+
+          if (!isEmpty(this.params)) {
+            if (this.params.data) {
+              input.data_url = this.params.data;
+            }
+            if (this.params.settings) {
+              input.settings_url = this.params.settings;
+            }
+            if (this.params.guide) {
+              input.guide_url = this.params.guide;
+            }
+            if (this.params.logosPath) {
+              input.logos_url = this.params.logosPath;
+            }
+          }
+
+          const overlayData = await obj.get_overlay_data(input);
+
+          const data = JSON.parse(overlayData);
+          window.baseDS = data.datasets.base;
+          window.statsDS = data.datasets.stats;
+          window.guide = data.guide;
+          itemsDataGetter.init(data.datasets.full);
+          overrideSettings({
+            foundationName: data.datasets.base.foundation || '',
+            gridSize: data.datasets.base.grid_items_size || DEFAULT_GRID_ITEMS_SIZE,
+            viewMode: data.datasets.base.view_mode || DEFAULT_VIEW_MODE,
+          });
+
+          return data.datasets.base;
+        })
+        .catch((err) => {
+          return Promise.reject(err);
+        });
+    }
+  }
+}
+
+const overlayData = new OverlayData();
+export default overlayData;
diff --git a/web/src/utils/prepareFilters.ts b/ui/webapp/src/utils/prepareFilters.ts
similarity index 100%
rename from web/src/utils/prepareFilters.ts
rename to ui/webapp/src/utils/prepareFilters.ts
diff --git a/web/src/utils/prepareFinances.tsx b/ui/webapp/src/utils/prepareFinances.tsx
similarity index 100%
rename from web/src/utils/prepareFinances.tsx
rename to ui/webapp/src/utils/prepareFinances.tsx
diff --git a/ui/webapp/src/utils/prepareLink.ts b/ui/webapp/src/utils/prepareLink.ts
new file mode 100644
index 00000000..480ce2ad
--- /dev/null
+++ b/ui/webapp/src/utils/prepareLink.ts
@@ -0,0 +1,13 @@
+import { isUndefined } from 'lodash';
+
+import overlayData from './overlayData';
+
+const prepareLink = (path: string, extraQuery?: string): string => {
+  if (overlayData.isActiveOverlay()) {
+    return `${path}?${overlayData.getUrlParams()}${!isUndefined(extraQuery) ? `&${extraQuery}` : ''}`;
+  } else {
+    return `${path}${!isUndefined(extraQuery) ? `/?${extraQuery}` : ''}`;
+  }
+};
+
+export default prepareLink;
diff --git a/web/src/utils/prepareMenu.ts b/ui/webapp/src/utils/prepareMenu.ts
similarity index 100%
rename from web/src/utils/prepareMenu.ts
rename to ui/webapp/src/utils/prepareMenu.ts
diff --git a/web/src/utils/prettifyBytes.ts b/ui/webapp/src/utils/prettifyBytes.ts
similarity index 100%
rename from web/src/utils/prettifyBytes.ts
rename to ui/webapp/src/utils/prettifyBytes.ts
diff --git a/web/src/utils/prettifyNumber.ts b/ui/webapp/src/utils/prettifyNumber.ts
similarity index 100%
rename from web/src/utils/prettifyNumber.ts
rename to ui/webapp/src/utils/prettifyNumber.ts
diff --git a/web/src/utils/rgba2hex.ts b/ui/webapp/src/utils/rgba2hex.ts
similarity index 100%
rename from web/src/utils/rgba2hex.ts
rename to ui/webapp/src/utils/rgba2hex.ts
diff --git a/web/src/utils/scrollToTop.ts b/ui/webapp/src/utils/scrollToTop.ts
similarity index 100%
rename from web/src/utils/scrollToTop.ts
rename to ui/webapp/src/utils/scrollToTop.ts
diff --git a/web/src/utils/sortItems.ts b/ui/webapp/src/utils/sortItems.ts
similarity index 100%
rename from web/src/utils/sortItems.ts
rename to ui/webapp/src/utils/sortItems.ts
diff --git a/web/src/utils/sortItemsByOrderValue.ts b/ui/webapp/src/utils/sortItemsByOrderValue.ts
similarity index 100%
rename from web/src/utils/sortItemsByOrderValue.ts
rename to ui/webapp/src/utils/sortItemsByOrderValue.ts
diff --git a/web/src/utils/sortMenuOptions.ts b/ui/webapp/src/utils/sortMenuOptions.ts
similarity index 100%
rename from web/src/utils/sortMenuOptions.ts
rename to ui/webapp/src/utils/sortMenuOptions.ts
diff --git a/web/src/utils/sortObjectByValue.ts b/ui/webapp/src/utils/sortObjectByValue.ts
similarity index 100%
rename from web/src/utils/sortObjectByValue.ts
rename to ui/webapp/src/utils/sortObjectByValue.ts
diff --git a/web/src/utils/sumValues.ts b/ui/webapp/src/utils/sumValues.ts
similarity index 100%
rename from web/src/utils/sumValues.ts
rename to ui/webapp/src/utils/sumValues.ts
diff --git a/web/src/utils/updateAlphaInColor.ts b/ui/webapp/src/utils/updateAlphaInColor.ts
similarity index 100%
rename from web/src/utils/updateAlphaInColor.ts
rename to ui/webapp/src/utils/updateAlphaInColor.ts
diff --git a/web/src/vite-env.d.ts b/ui/webapp/src/vite-env.d.ts
similarity index 100%
rename from web/src/vite-env.d.ts
rename to ui/webapp/src/vite-env.d.ts
diff --git a/web/src/window.d.ts b/ui/webapp/src/window.d.ts
similarity index 75%
rename from web/src/window.d.ts
rename to ui/webapp/src/window.d.ts
index 7f50ef0d..320bd966 100644
--- a/web/src/window.d.ts
+++ b/ui/webapp/src/window.d.ts
@@ -1,9 +1,10 @@
-import { BaseData, Stats } from './types';
+import { BaseData, Guide, Stats } from './types';
 
 declare global {
   interface Window {
     baseDS: BaseData;
     statsDS: Stats;
+    guide?: Guide;
     basePath?: string;
     Osano: { cm: { showDrawer: (t: string) => void; addEventListener: (t: string, f: unknown) => void } };
   }
diff --git a/web/tsconfig.json b/ui/webapp/tsconfig.json
similarity index 94%
rename from web/tsconfig.json
rename to ui/webapp/tsconfig.json
index 39999584..af666a77 100644
--- a/web/tsconfig.json
+++ b/ui/webapp/tsconfig.json
@@ -21,6 +21,6 @@
     "noUnusedParameters": true,
     "noFallthroughCasesInSwitch": true
   },
-  "include": ["src"],
+  "include": ["src", "wasm/overlay"],
   "references": [{ "path": "./tsconfig.node.json" }]
 }
diff --git a/web/tsconfig.node.json b/ui/webapp/tsconfig.node.json
similarity index 100%
rename from web/tsconfig.node.json
rename to ui/webapp/tsconfig.node.json
diff --git a/web/vite.config.ts b/ui/webapp/vite.config.ts
similarity index 100%
rename from web/vite.config.ts
rename to ui/webapp/vite.config.ts
diff --git a/web/yarn.lock b/ui/webapp/yarn.lock
similarity index 100%
rename from web/yarn.lock
rename to ui/webapp/yarn.lock
diff --git a/web/src/App.tsx b/web/src/App.tsx
deleted file mode 100644
index 0cde832d..00000000
--- a/web/src/App.tsx
+++ /dev/null
@@ -1,92 +0,0 @@
-import { Route, Router } from '@solidjs/router';
-import isUndefined from 'lodash/isUndefined';
-import range from 'lodash/range';
-import { createSignal, onMount } from 'solid-js';
-
-import {
-  EMBED_SETUP_PATH,
-  EXPLORE_PATH,
-  FINANCES_PATH,
-  GUIDE_PATH,
-  LOGOS_PREVIEW_PATH,
-  SCREENSHOTS_PATH,
-  STATS_PATH,
-} from './data';
-import Layout from './layout';
-import Explore from './layout/explore';
-import Finances from './layout/finances';
-import Guide from './layout/guide';
-import Logos from './layout/logos';
-import NotFound from './layout/notFound';
-import Screenshots from './layout/screenshots';
-import Stats from './layout/stats';
-import itemsDataGetter from './utils/itemsDataGetter';
-import updateAlphaInColor from './utils/updateAlphaInColor';
-
-// Colors
-let COLOR_1 = 'rgba(0, 107, 204, 1)';
-let COLOR_1_HOVER = 'rgba(0, 107, 204, 0.75)';
-let COLOR_2 = 'rgba(255, 0, 170, 1)';
-let COLOR_3 = 'rgba(96, 149, 214, 1)';
-let COLOR_4 = 'rgba(0, 42, 81, 0.7)';
-let COLOR_5 = 'rgba(1, 107, 204, 0.7)';
-let COLOR_6 = 'rgba(0, 42, 81, 0.7)';
-
-const App = () => {
-  const [data] = createSignal(window.baseDS);
-
-  onMount(() => {
-    if (!isUndefined(window.baseDS.colors)) {
-      if (!isUndefined(window.baseDS.colors?.color1)) {
-        COLOR_1 = window.baseDS.colors?.color1;
-        COLOR_1_HOVER = updateAlphaInColor(COLOR_1, 0.75);
-      }
-      if (!isUndefined(window.baseDS.colors?.color2)) {
-        COLOR_2 = window.baseDS.colors?.color2;
-      }
-      if (!isUndefined(window.baseDS.colors?.color3)) {
-        COLOR_3 = window.baseDS.colors?.color3;
-      }
-      if (!isUndefined(window.baseDS.colors?.color4)) {
-        COLOR_4 = window.baseDS.colors?.color4;
-      }
-      if (!isUndefined(window.baseDS.colors?.color5)) {
-        COLOR_5 = window.baseDS.colors?.color5;
-      }
-      if (!isUndefined(window.baseDS.colors?.color6)) {
-        COLOR_6 = window.baseDS.colors?.color6;
-      }
-    }
-
-    const loadColors = () => {
-      const colors = [COLOR_1, COLOR_2, COLOR_3, COLOR_4, COLOR_5, COLOR_6];
-      range(colors.length).forEach((i: number) => {
-        document.documentElement.style.setProperty(`--color${i + 1}`, colors[i]);
-      });
-      document.documentElement.style.setProperty('--color1-hover', COLOR_1_HOVER);
-    };
-
-    loadColors();
-    itemsDataGetter.init();
-
-    if (window.Osano) {
-      window.Osano.cm.addEventListener('osano-cm-initialized', () => {
-        document.body.classList.add('osano-loaded');
-      });
-    }
-  });
-
-  return (
-    <Router root={Layout}>
-      <Route path={[EXPLORE_PATH, EMBED_SETUP_PATH]} component={() => <Explore initialData={data()} />} />
-      <Route path={GUIDE_PATH} component={Guide} />
-      <Route path={STATS_PATH} component={Stats} />
-      <Route path={FINANCES_PATH} component={Finances} />
-      <Route path={LOGOS_PREVIEW_PATH} component={Logos} />
-      <Route path="*" component={NotFound} />
-      <Route path={SCREENSHOTS_PATH} component={() => <Screenshots initialData={data()} />} />
-    </Router>
-  );
-};
-
-export default App;
diff --git a/web/src/layout/Layout.module.css b/web/src/layout/Layout.module.css
deleted file mode 100644
index d44174da..00000000
--- a/web/src/layout/Layout.module.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.container {
-  min-height: 100vh;
-}
diff --git a/web/src/utils/getBasePath.ts b/web/src/utils/getBasePath.ts
deleted file mode 100644
index 26906912..00000000
--- a/web/src/utils/getBasePath.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-const getBasePath = () => {
-  return window.baseDS.base_path || '';
-};
-
-export default getBasePath;
diff --git a/web/src/utils/getFoundationNameLabel.ts b/web/src/utils/getFoundationNameLabel.ts
deleted file mode 100644
index 490d6f4b..00000000
--- a/web/src/utils/getFoundationNameLabel.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { REGEX_SPACE } from '../data';
-
-const getFoundationNameLabel = (): string => {
-  const FOUNDATION: string = window.baseDS.foundation;
-  return FOUNDATION.toLowerCase().replace(REGEX_SPACE, '');
-};
-
-export default getFoundationNameLabel;

From a3f5046ead492de2cfb336e019d120fbb2db35af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20Casta=C3=B1o=20Arteaga?= <tegioz@icloud.com>
Date: Mon, 29 Apr 2024 09:26:05 +0200
Subject: [PATCH 25/55] Provide defaults for some fields in full dataset (#588)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Sergio Castaño Arteaga <tegioz@icloud.com>
---
 crates/core/src/datasets.rs    | 8 ++++----
 crates/wasm/overlay/src/lib.rs | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/crates/core/src/datasets.rs b/crates/core/src/datasets.rs
index 4e88c055..72ae51e5 100644
--- a/crates/core/src/datasets.rs
+++ b/crates/core/src/datasets.rs
@@ -37,7 +37,7 @@ impl Datasets {
         Datasets {
             base: Base::new(i.landscape_data, i.settings, i.guide, i.qr_code),
             embed: Embed::new(i.landscape_data),
-            full: Full::new(i.crunchbase_data, i.github_data, i.landscape_data),
+            full: Full::new(i.landscape_data, i.crunchbase_data, i.github_data),
             stats: Stats::new(i.landscape_data, i.settings, i.crunchbase_data),
         }
     }
@@ -333,10 +333,10 @@ pub mod full {
     /// Full dataset information.
     #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
     pub struct Full {
-        #[serde(skip_serializing_if = "BTreeMap::is_empty")]
+        #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
         pub crunchbase_data: CrunchbaseData,
 
-        #[serde(skip_serializing_if = "BTreeMap::is_empty")]
+        #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
         pub github_data: GithubData,
 
         #[serde(skip_serializing_if = "Vec::is_empty")]
@@ -347,9 +347,9 @@ pub mod full {
         /// Create a new Full instance from the landscape data provided.
         #[must_use]
         pub fn new(
+            landscape_data: &LandscapeData,
             crunchbase_data: &CrunchbaseData,
             github_data: &GithubData,
-            landscape_data: &LandscapeData,
         ) -> Self {
             Full {
                 crunchbase_data: crunchbase_data.clone(),
diff --git a/crates/wasm/overlay/src/lib.rs b/crates/wasm/overlay/src/lib.rs
index 24e99257..f890fdf3 100644
--- a/crates/wasm/overlay/src/lib.rs
+++ b/crates/wasm/overlay/src/lib.rs
@@ -100,7 +100,7 @@ pub async fn get_overlay_data(input: JsValue) -> Result<String, String> {
     let qr_code = String::new();
     let datasets = Datasets {
         base: Base::new(&landscape_data, &settings, &guide, &qr_code),
-        full: Full::new(&crunchbase_data, &github_data, &landscape_data),
+        full: Full::new(&landscape_data, &crunchbase_data, &github_data),
         stats: Stats::new(&landscape_data, &settings, &crunchbase_data),
     };
 

From 5565ca083336ac36b3c282d4a4f025c210462a2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20Casta=C3=B1o=20Arteaga?= <tegioz@icloud.com>
Date: Mon, 29 Apr 2024 09:53:06 +0200
Subject: [PATCH 26/55] Use only orgs in data file when processing stats (#589)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Sergio Castaño Arteaga <tegioz@icloud.com>
---
 crates/core/src/datasets.rs    |  2 +-
 crates/core/src/stats.rs       | 29 ++++++++++++++++++-----------
 crates/wasm/overlay/src/lib.rs |  2 +-
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/crates/core/src/datasets.rs b/crates/core/src/datasets.rs
index 72ae51e5..6143b24e 100644
--- a/crates/core/src/datasets.rs
+++ b/crates/core/src/datasets.rs
@@ -38,7 +38,7 @@ impl Datasets {
             base: Base::new(i.landscape_data, i.settings, i.guide, i.qr_code),
             embed: Embed::new(i.landscape_data),
             full: Full::new(i.landscape_data, i.crunchbase_data, i.github_data),
-            stats: Stats::new(i.landscape_data, i.settings, i.crunchbase_data),
+            stats: Stats::new(i.landscape_data, i.settings),
         }
     }
 }
diff --git a/crates/core/src/stats.rs b/crates/core/src/stats.rs
index 6968f8d3..5015fd61 100644
--- a/crates/core/src/stats.rs
+++ b/crates/core/src/stats.rs
@@ -5,7 +5,7 @@ use super::{
     data::{CategoryName, SubCategoryName},
     settings::{LandscapeSettings, TagName},
 };
-use crate::data::{CrunchbaseData, LandscapeData};
+use crate::data::LandscapeData;
 use chrono::{Datelike, Utc};
 use itertools::Itertools;
 use serde::{Deserialize, Serialize};
@@ -44,14 +44,10 @@ impl Stats {
     /// Create a new Stats instance from the information available in the
     /// landscape.
     #[must_use]
-    pub fn new(
-        landscape_data: &LandscapeData,
-        settings: &LandscapeSettings,
-        crunchbase_data: &CrunchbaseData,
-    ) -> Self {
+    pub fn new(landscape_data: &LandscapeData, settings: &LandscapeSettings) -> Self {
         Self {
             members: MembersStats::new(landscape_data, settings),
-            organizations: OrganizationsStats::new(crunchbase_data),
+            organizations: OrganizationsStats::new(landscape_data),
             projects: ProjectsStats::new(landscape_data),
             repositories: RepositoriesStats::new(landscape_data),
         }
@@ -134,13 +130,22 @@ pub struct OrganizationsStats {
 impl OrganizationsStats {
     /// Create a new OrganizationsStats instance from the information available
     /// in the landscape.
-    fn new(crunchbase_data: &CrunchbaseData) -> Option<Self> {
+    fn new(landscape_data: &LandscapeData) -> Option<Self> {
         let mut stats = OrganizationsStats::default();
+        let mut crunchbase_data_processed = HashSet::new();
 
         // Collect stats from landscape items
-        for org in crunchbase_data.values() {
+        for item in &landscape_data.items {
+            // Check if this crunchbase data has already been processed
+            if let Some(url) = item.crunchbase_url.as_ref() {
+                if crunchbase_data_processed.contains(url) {
+                    continue;
+                }
+                crunchbase_data_processed.insert(url);
+            }
+
             // Acquisitions
-            if let Some(acquisitions) = org.acquisitions.as_ref() {
+            if let Some(acquisitions) = item.crunchbase_data.as_ref().and_then(|d| d.acquisitions.as_ref()) {
                 for acq in acquisitions {
                     if let Some(announced_on) = acq.announced_on {
                         let year = announced_on.format("%Y").to_string();
@@ -155,7 +160,9 @@ impl OrganizationsStats {
             }
 
             // Funding rounds
-            if let Some(funding_rounds) = org.funding_rounds.as_ref() {
+            if let Some(funding_rounds) =
+                item.crunchbase_data.as_ref().and_then(|d| d.funding_rounds.as_ref())
+            {
                 for fr in funding_rounds {
                     if let Some(announced_on) = fr.announced_on {
                         // Only funding rounds in the last 5 years
diff --git a/crates/wasm/overlay/src/lib.rs b/crates/wasm/overlay/src/lib.rs
index f890fdf3..e2f0eabd 100644
--- a/crates/wasm/overlay/src/lib.rs
+++ b/crates/wasm/overlay/src/lib.rs
@@ -101,7 +101,7 @@ pub async fn get_overlay_data(input: JsValue) -> Result<String, String> {
     let datasets = Datasets {
         base: Base::new(&landscape_data, &settings, &guide, &qr_code),
         full: Full::new(&landscape_data, &crunchbase_data, &github_data),
-        stats: Stats::new(&landscape_data, &settings, &crunchbase_data),
+        stats: Stats::new(&landscape_data, &settings),
     };
 
     // Prepare overlay data and return it

From 6dc7274fb7246c520683f8976bff3172fa4904c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20Casta=C3=B1o=20Arteaga?= <tegioz@icloud.com>
Date: Mon, 29 Apr 2024 10:35:57 +0200
Subject: [PATCH 27/55] Collect repositories topics from GitHub (#590)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Sergio Castaño Arteaga <tegioz@icloud.com>
---
 crates/cli/src/build/github.rs | 1 +
 crates/core/src/data.rs        | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/crates/cli/src/build/github.rs b/crates/cli/src/build/github.rs
index c9a844b1..d2a638d3 100644
--- a/crates/cli/src/build/github.rs
+++ b/crates/cli/src/build/github.rs
@@ -161,6 +161,7 @@ async fn collect_repository_data(gh: Object<DynGH>, repo_url: &str) -> Result<Re
         }),
         participation_stats,
         stars: gh_repo.stargazers_count,
+        topics: gh_repo.topics,
         url: gh_repo.html_url,
     })
 }
diff --git a/crates/core/src/data.rs b/crates/core/src/data.rs
index 73749170..a8dbf2b8 100644
--- a/crates/core/src/data.rs
+++ b/crates/core/src/data.rs
@@ -843,6 +843,8 @@ pub struct RepositoryGithubData {
     pub latest_commit: Commit,
     pub participation_stats: Vec<i64>,
     pub stars: i64,
+    #[serde(skip_serializing_if = "Vec::is_empty")]
+    pub topics: Vec<String>,
     pub url: String,
 
     #[serde(skip_serializing_if = "Option::is_none")]

From 48f58cf8c4dbf301c8fe1d40be1d94c526446f79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20Casta=C3=B1o=20Arteaga?= <tegioz@icloud.com>
Date: Mon, 29 Apr 2024 13:11:33 +0200
Subject: [PATCH 28/55] Add package manager url field (#592)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Sergio Castaño Arteaga <tegioz@icloud.com>
---
 crates/core/src/data.rs        | 4 ++++
 crates/core/src/data/legacy.rs | 1 +
 2 files changed, 5 insertions(+)

diff --git a/crates/core/src/data.rs b/crates/core/src/data.rs
index a8dbf2b8..4143a7f3 100644
--- a/crates/core/src/data.rs
+++ b/crates/core/src/data.rs
@@ -397,6 +397,7 @@ impl From<legacy::LandscapeData> for LandscapeData {
                         item.latest_annual_review_url = extra.annual_review_url;
                         item.linkedin_url = extra.linkedin_url;
                         item.mailing_list_url = extra.mailing_list_url;
+                        item.package_manager_url = extra.package_manager_url;
                         item.parent_project = extra.parent_project;
                         item.slack_url = extra.slack_url;
                         item.specification = extra.specification;
@@ -576,6 +577,9 @@ pub struct Item {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub oss: Option<bool>,
 
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub package_manager_url: Option<String>,
+
     #[serde(skip_serializing_if = "Option::is_none")]
     pub parent_project: Option<String>,
 
diff --git a/crates/core/src/data/legacy.rs b/crates/core/src/data/legacy.rs
index 10b5cb6e..fe0a7b21 100644
--- a/crates/core/src/data/legacy.rs
+++ b/crates/core/src/data/legacy.rs
@@ -151,6 +151,7 @@ pub(super) struct ItemExtra {
     pub incubating: Option<NaiveDate>,
     pub linkedin_url: Option<String>,
     pub mailing_list_url: Option<String>,
+    pub package_manager_url: Option<String>,
     pub parent_project: Option<String>,
     pub slack_url: Option<String>,
     pub specification: Option<bool>,

From ad84e3eeb693b33006031f627a641c60051a81fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cintia=20S=C3=A1nchez=20Garc=C3=ADa?= <cynthiasg@icloud.com>
Date: Mon, 29 Apr 2024 13:33:08 +0200
Subject: [PATCH 29/55] Fix some issues with filters modal (#593)

Signed-off-by: Cintia Sanchez Garcia <cynthiasg@icloud.com>
---
 ui/webapp/src/data.ts                          |  8 +++++++-
 ui/webapp/src/layout/explore/filters/index.tsx | 13 ++++++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/ui/webapp/src/data.ts b/ui/webapp/src/data.ts
index c7cb56b8..a143460a 100644
--- a/ui/webapp/src/data.ts
+++ b/ui/webapp/src/data.ts
@@ -184,7 +184,13 @@ export let FILTERS: FilterSection[] = [
 ];
 
 export const FILTER_CATEGORIES_PER_TITLE: FilterCategoriesPerTitle = {
-  [FilterTitle.Project]: [FilterCategory.Maturity, FilterCategory.TAG, FilterCategory.License, FilterCategory.Extra],
+  [FilterTitle.Project]: [
+    FilterCategory.Maturity,
+    FilterCategory.TAG,
+    FilterCategory.License,
+    FilterCategory.Category,
+    FilterCategory.Extra,
+  ],
   [FilterTitle.Organization]: [
     FilterCategory.Organization,
     FilterCategory.OrgType,
diff --git a/ui/webapp/src/layout/explore/filters/index.tsx b/ui/webapp/src/layout/explore/filters/index.tsx
index 8f154668..2391f65e 100644
--- a/ui/webapp/src/layout/explore/filters/index.tsx
+++ b/ui/webapp/src/layout/explore/filters/index.tsx
@@ -23,6 +23,7 @@ import getFoundationNameLabel from '../../../utils/getFoundationNameLabel';
 import getFiltersPerGroup, { FiltersPerGroup } from '../../../utils/prepareFilters';
 import Loading from '../../common/Loading';
 import Modal from '../../common/Modal';
+import NoData from '../../common/NoData';
 import Section from '../../common/Section';
 import SVGIcon from '../../common/SVGIcon';
 import { useViewMode } from '../../stores/viewMode';
@@ -142,7 +143,14 @@ const Filters = (props: Props) => {
 
   const getSectionInPredefinedFilters = (id: FilterCategory): FilterSection | undefined => {
     const section = FILTERS.find((sec: FilterSection) => sec.value === id);
-    if (section) {
+    let availableExtraOptions: boolean = true;
+    if ([FilterCategory.Maturity, FilterCategory.OrgType, FilterCategory.License].includes(id)) {
+      const activeOpts = getSection(id);
+      if (isUndefined(activeOpts)) {
+        availableExtraOptions = false;
+      }
+    }
+    if (section && availableExtraOptions) {
       return section;
     }
     return;
@@ -301,6 +309,9 @@ const Filters = (props: Props) => {
                 </div>
               </Show>
             </div>
+            <Show when={isEmpty(visibleTitles())}>
+              <NoData>There are no filters available that can be applied to the current set of items</NoData>
+            </Show>
             <Show when={visibleTitles().includes(FilterTitle.Project)}>
               <div class={`border-bottom text-uppercase fw-semibold ${styles.title}`}>{FilterTitle.Project}</div>
 

From 371cebb4c08dfee34b98af04bfd41f88a17c9940 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cintia=20S=C3=A1nchez=20Garc=C3=ADa?= <cynthiasg@icloud.com>
Date: Mon, 29 Apr 2024 13:49:40 +0200
Subject: [PATCH 30/55] Add some more options to logos preview (#594)

Add some more options to logos preview

Closes #526 and #506

Signed-off-by: Cintia Sanchez Garcia <cynthiasg@icloud.com>
---
 ui/webapp/src/layout/logos/Logos.module.css |  2 +-
 ui/webapp/src/layout/logos/index.tsx        | 46 ++++++++++++++++++++-
 ui/webapp/src/utils/itemsDataGetter.ts      | 14 +++++++
 3 files changed, 60 insertions(+), 2 deletions(-)

diff --git a/ui/webapp/src/layout/logos/Logos.module.css b/ui/webapp/src/layout/logos/Logos.module.css
index 72bead7e..f242e3db 100644
--- a/ui/webapp/src/layout/logos/Logos.module.css
+++ b/ui/webapp/src/layout/logos/Logos.module.css
@@ -4,7 +4,7 @@
 
 .select {
   box-shadow: 0 0 0 0.2rem var(--bs-gray-200);
-  margin: 0 0.2rem;
+  margin: 0.5rem 0.2rem 0 0.2rem;
 }
 
 .select:focus {
diff --git a/ui/webapp/src/layout/logos/index.tsx b/ui/webapp/src/layout/logos/index.tsx
index a73045f3..e3168e2d 100644
--- a/ui/webapp/src/layout/logos/index.tsx
+++ b/ui/webapp/src/layout/logos/index.tsx
@@ -18,6 +18,7 @@ const Logos = () => {
   const [selectedSuboptionValue, setSelectedSuboptionValue] = createSignal<string>();
   const [suboptions, setSuboptions] = createSignal<Option[]>();
   const [items, setItems] = createSignal<Item[]>();
+  const [hiddenNonPublicOrgs, setHiddenNonPublicOrgs] = createSignal<boolean>(false);
 
   const cleanDuplicatedItems = (itemsList: Item[]): Item[] => {
     const result: Item[] = [];
@@ -35,6 +36,18 @@ const Logos = () => {
     return result;
   };
 
+  const cleanItems = (itemsList: Item[]): Item[] => {
+    let result = cleanDuplicatedItems(itemsList);
+
+    const items = cleanDuplicatedItems(itemsList);
+    if (hiddenNonPublicOrgs()) {
+      const nonPublicOrgs = items.filter((item) => !item.name.startsWith('Non-Public Organization'));
+      result = nonPublicOrgs;
+    }
+
+    return result;
+  };
+
   const filterItems = () => {
     let list: Item[] = [];
     if (!isUndefined(selectedGroup())) {
@@ -62,6 +75,10 @@ const Logos = () => {
                 list = itemsDataGetter.getItemsByEndUser() || [];
                 break;
 
+              case 'allenduser':
+                list = itemsDataGetter.getAllEndUserItems() || [];
+                break;
+
               default:
                 break;
             }
@@ -72,7 +89,7 @@ const Logos = () => {
           break;
       }
     }
-    setItems(cleanDuplicatedItems(list));
+    setItems(cleanItems(list));
   };
 
   const getOptions = (): FilterOption[] => {
@@ -107,6 +124,14 @@ const Logos = () => {
     })
   );
 
+  createEffect(
+    on(hiddenNonPublicOrgs, () => {
+      if (!isUndefined(items())) {
+        filterItems();
+      }
+    })
+  );
+
   return (
     <>
       <main class="flex-grow-1 container-fluid px-3 px-lg-4 mainPadding position-relative">
@@ -116,6 +141,10 @@ const Logos = () => {
           <div class="position-relative mt-3">
             <Show when={!isUndefined(options())} fallback={<Loading />}>
               <div class="d-flex flex-column">
+                <div class={`text-uppercase text-muted fw-semibold mb-1 ${styles.labelSelect}`}>
+                  Select items to display
+                </div>
+
                 <div class="d-flex flex-row">
                   <For each={options()}>
                     {(option) => (
@@ -208,6 +237,21 @@ const Logos = () => {
                     </Show>
                   </div>
                 </Show>
+                <div class="mt-4">
+                  <div class="form-check form-switch">
+                    <input
+                      onInput={() => setHiddenNonPublicOrgs(!hiddenNonPublicOrgs())}
+                      checked={hiddenNonPublicOrgs()}
+                      class="form-check-input"
+                      type="checkbox"
+                      role="switch"
+                      id="visibleNonPublicOrgs"
+                    />
+                    <label class="form-check-label" for="visibleNonPublicOrgs">
+                      Hide non-public organizations
+                    </label>
+                  </div>
+                </div>
                 <div class="position-relative mt-5">
                   <Show when={!isUndefined(items())}>
                     <div class={styles.grid}>
diff --git a/ui/webapp/src/utils/itemsDataGetter.ts b/ui/webapp/src/utils/itemsDataGetter.ts
index 79f53a85..0fd81924 100644
--- a/ui/webapp/src/utils/itemsDataGetter.ts
+++ b/ui/webapp/src/utils/itemsDataGetter.ts
@@ -527,6 +527,16 @@ export class ItemsDataGetter {
     }
   }
 
+  // Get all end users
+  public getAllEndUserItems(): Item[] | undefined {
+    if (this.ready && this.landscapeData && this.landscapeData.items) {
+      return this.landscapeData.items.filter(
+        (i: Item) =>
+          (i.enduser && window.baseDS.members_category === i.category) || i.subcategory === 'End User Supporter'
+      );
+    }
+  }
+
   // Get maturity options
   public getMaturityOptions(): string[] {
     const maturity = window.baseDS.items.map((i: Item) => i.maturity);
@@ -613,6 +623,10 @@ export class ItemsDataGetter {
             value: 'enduser',
             name: 'End user members',
           },
+          {
+            value: 'allenduser',
+            name: 'All end users',
+          },
         ],
       });
     }

From ff63207d570e110f5324b6afe840ecf1f492cbfd Mon Sep 17 00:00:00 2001
From: Benjamin Granados <40007659+benjagm@users.noreply.github.com>
Date: Mon, 29 Apr 2024 17:53:38 +0200
Subject: [PATCH 31/55] Add JSON Schema as adopter (#599)

Signed-off-by: Benjamin Granados <benjamin.granadosm@gmail.com>
---
 ADOPTERS.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ADOPTERS.md b/ADOPTERS.md
index 0d795831..b6a1910a 100644
--- a/ADOPTERS.md
+++ b/ADOPTERS.md
@@ -10,6 +10,7 @@ If you are using **Landscape2**, please consider adding your landscape to this l
 - [Continuous Delivery Foundation](https://cdf.landscape2.io)
 - [GraphQL](https://graphql.landscape2.io)
 - [Hyperledger Foundation](https://dlt.landscape2.io)
+- [JSON Schema](https://landscape.json-schema.org)
 - [LF AI & DATA](https://lfai.landscape2.io)
 - [LF Energy](https://lfenergy.landscape2.io)
 - [LF Networking](https://lfnetworking.landscape2.io)

From 5afb0589414453d67714eecd113e21c32e26b022 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20Casta=C3=B1o=20Arteaga?= <tegioz@icloud.com>
Date: Mon, 29 Apr 2024 18:17:43 +0200
Subject: [PATCH 32/55] Do not skip repository topics serialization (#600)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Sergio Castaño Arteaga <tegioz@icloud.com>
---
 crates/core/src/data.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/crates/core/src/data.rs b/crates/core/src/data.rs
index 4143a7f3..8c862938 100644
--- a/crates/core/src/data.rs
+++ b/crates/core/src/data.rs
@@ -847,7 +847,6 @@ pub struct RepositoryGithubData {
     pub latest_commit: Commit,
     pub participation_stats: Vec<i64>,
     pub stars: i64,
-    #[serde(skip_serializing_if = "Vec::is_empty")]
     pub topics: Vec<String>,
     pub url: String,
 

From 8db5bfa5c6a68bbc6add2a5b943943960174019a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20Casta=C3=B1o=20Arteaga?= <tegioz@icloud.com>
Date: Tue, 30 Apr 2024 09:16:13 +0200
Subject: [PATCH 33/55] Add overlay section to README file (#602)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Sergio Castaño Arteaga <tegioz@icloud.com>
---
 README.md | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/README.md b/README.md
index 99302327..db241016 100644
--- a/README.md
+++ b/README.md
@@ -208,6 +208,27 @@ Some operations like collecting data from external sources or processing a lot o
 > [!NOTE]
 > In addition to the customization options available in the embed setup view, it's also possible to embed views using [iframe-resizer](https://github.com/davidjbradshaw/iframe-resizer). This feature can be enabled by adding `iframe-resizer=true` to the embed url ([demo](https://codepen.io/cynthiasg/pen/WNmQjje)).
 
+### Overlay
+
+**Landscape2** supports applying one or more data source files to an existing landscape at runtime. Any of those files can -and often will- be different than the ones used originally to build the landscape. This feature aims to be the building blocks of a preview system.
+
+Some examples of it in action (live demos!):
+
+- [Preview some changes in the settings file (like a Christmas edition theme)](https://landscape.cncf.io/?overlay-settings=https://raw.githubusercontent.com/tegioz/landscape2-overlay-tests/main/settings-christmas.yml)
+- [Check out how the CNCF landscape would look like using a 5 years old `landscape.yml` file (Helm was still in incubating!)](https://landscape.cncf.io/?overlay-data=https://raw.githubusercontent.com/cncf/landscape/6ff062c72b7229bbe60fee3aca5f8999624459f2/landscape.yml&overlay-logos=https://raw.githubusercontent.com/cncf/landscape/6ff062c72b7229bbe60fee3aca5f8999624459f2/hosted_logos&overlay-settings=https://raw.githubusercontent.com/tegioz/landscape2-overlay-tests/main/settings-5-years-ago.yml)
+
+To achieve this, the overlay redoes part of the landscape build process in the browser, reusing the same codebase packed as a WASM module.
+
+The overlay can be enabled by providing any of the following query parameters to the landscape url:
+
+- `overlay-data`: *data file url*
+- `overlay-settings`: *settings file url*
+- `overlay-guide`: *guide file url*
+- `overlay-logos`: *logos base url*
+
+> [!WARNING]
+> The overlay feature is still experimental and may not work as expected in all cases. Please report any issues you find!
+
 ## Adopters
 
 A list of landscapes built using **landscape2** is available at [ADOPTERS.md](./ADOPTERS.md). Please consider adding yours!

From 0d77e4bac29c032b332b9f3067f5eff718b2acf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20Casta=C3=B1o=20Arteaga?= <tegioz@icloud.com>
Date: Tue, 30 Apr 2024 10:57:25 +0200
Subject: [PATCH 34/55] Use default value when deserializing some fields (#604)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Sergio Castaño Arteaga <tegioz@icloud.com>
---
 crates/core/src/data.rs     |  1 +
 crates/core/src/datasets.rs | 16 +++++++-------
 crates/core/src/stats.rs    | 42 ++++++++++++++++++-------------------
 3 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/crates/core/src/data.rs b/crates/core/src/data.rs
index 8c862938..406f1776 100644
--- a/crates/core/src/data.rs
+++ b/crates/core/src/data.rs
@@ -847,6 +847,7 @@ pub struct RepositoryGithubData {
     pub latest_commit: Commit,
     pub participation_stats: Vec<i64>,
     pub stars: i64,
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
     pub topics: Vec<String>,
     pub url: String,
 
diff --git a/crates/core/src/datasets.rs b/crates/core/src/datasets.rs
index 6143b24e..20131ba7 100644
--- a/crates/core/src/datasets.rs
+++ b/crates/core/src/datasets.rs
@@ -80,10 +80,10 @@ pub mod base {
         #[serde(skip_serializing_if = "Option::is_none")]
         pub base_path: Option<String>,
 
-        #[serde(skip_serializing_if = "Vec::is_empty")]
+        #[serde(default, skip_serializing_if = "Vec::is_empty")]
         pub categories: Vec<Category>,
 
-        #[serde(skip_serializing_if = "Vec::is_empty")]
+        #[serde(default, skip_serializing_if = "Vec::is_empty")]
         pub categories_overridden: Vec<CategoryName>,
 
         #[serde(skip_serializing_if = "Option::is_none")]
@@ -95,10 +95,10 @@ pub mod base {
         #[serde(skip_serializing_if = "Option::is_none")]
         pub grid_items_size: Option<GridItemsSize>,
 
-        #[serde(skip_serializing_if = "Vec::is_empty")]
+        #[serde(default, skip_serializing_if = "Vec::is_empty")]
         pub groups: Vec<Group>,
 
-        #[serde(skip_serializing_if = "BTreeMap::is_empty")]
+        #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
         pub guide_summary: GuideSummary,
 
         #[serde(skip_serializing_if = "Option::is_none")]
@@ -107,7 +107,7 @@ pub mod base {
         #[serde(skip_serializing_if = "Option::is_none")]
         pub images: Option<Images>,
 
-        #[serde(skip_serializing_if = "Vec::is_empty")]
+        #[serde(default, skip_serializing_if = "Vec::is_empty")]
         pub items: Vec<Item>,
 
         #[serde(skip_serializing_if = "Option::is_none")]
@@ -260,7 +260,7 @@ pub mod embed {
     /// Embed dataset information.
     #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
     pub struct Embed {
-        #[serde(flatten, skip_serializing_if = "HashMap::is_empty")]
+        #[serde(default, flatten, skip_serializing_if = "HashMap::is_empty")]
         pub views: HashMap<EmbedKey, EmbedView>,
     }
 
@@ -315,7 +315,7 @@ pub mod embed {
     pub struct EmbedView {
         pub category: Category,
 
-        #[serde(skip_serializing_if = "Vec::is_empty")]
+        #[serde(default, skip_serializing_if = "Vec::is_empty")]
         pub items: Vec<Item>,
     }
 }
@@ -339,7 +339,7 @@ pub mod full {
         #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
         pub github_data: GithubData,
 
-        #[serde(skip_serializing_if = "Vec::is_empty")]
+        #[serde(default, skip_serializing_if = "Vec::is_empty")]
         pub items: Vec<Item>,
     }
 
diff --git a/crates/core/src/stats.rs b/crates/core/src/stats.rs
index 5015fd61..449377b7 100644
--- a/crates/core/src/stats.rs
+++ b/crates/core/src/stats.rs
@@ -58,18 +58,18 @@ impl Stats {
 #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
 pub struct MembersStats {
     /// Number of members joined per year-month.
-    #[serde(skip_serializing_if = "BTreeMap::is_empty")]
+    #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
     pub joined_at: BTreeMap<YearMonth, u64>,
 
     /// Running total of number of members joined per year-month.
-    #[serde(skip_serializing_if = "BTreeMap::is_empty")]
+    #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
     pub joined_at_rt: BTreeMap<YearMonth, u64>,
 
     /// Total number of members.
     pub members: u64,
 
     /// Number of members per subcategory.
-    #[serde(skip_serializing_if = "BTreeMap::is_empty")]
+    #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
     pub subcategories: BTreeMap<String, u64>,
 }
 
@@ -111,19 +111,19 @@ impl MembersStats {
 #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
 pub struct OrganizationsStats {
     /// Total number of acquisitions per year across all organizations.
-    #[serde(skip_serializing_if = "BTreeMap::is_empty")]
+    #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
     pub acquisitions: BTreeMap<Year, u64>,
 
     /// Total acquisitions price per year across all organizations.
-    #[serde(skip_serializing_if = "BTreeMap::is_empty")]
+    #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
     pub acquisitions_price: BTreeMap<Year, u64>,
 
     /// Total number of funding rounds per year across all organizations.
-    #[serde(skip_serializing_if = "BTreeMap::is_empty")]
+    #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
     pub funding_rounds: BTreeMap<Year, u64>,
 
     /// Total money raised on funding rounds per year across all organizations.
-    #[serde(skip_serializing_if = "BTreeMap::is_empty")]
+    #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
     pub funding_rounds_money_raised: BTreeMap<Year, u64>,
 }
 
@@ -194,42 +194,42 @@ impl OrganizationsStats {
 #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
 pub struct ProjectsStats {
     /// Number of projects accepted per year-month.
-    #[serde(skip_serializing_if = "BTreeMap::is_empty")]
+    #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
     pub accepted_at: BTreeMap<YearMonth, u64>,
 
     /// Running total of number of projects accepted per year-month.
-    #[serde(skip_serializing_if = "BTreeMap::is_empty")]
+    #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
     pub accepted_at_rt: BTreeMap<YearMonth, u64>,
 
     /// Number of security audits per year-month.
-    #[serde(skip_serializing_if = "BTreeMap::is_empty")]
+    #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
     pub audits: BTreeMap<YearMonth, u64>,
 
     /// Running total of number of security audits per year-month.
-    #[serde(skip_serializing_if = "BTreeMap::is_empty")]
+    #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
     pub audits_rt: BTreeMap<YearMonth, u64>,
 
     /// Number of projects per category and subcategory.
-    #[serde(skip_serializing_if = "BTreeMap::is_empty")]
+    #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
     pub category: BTreeMap<CategoryName, CategoryProjectsStats>,
 
     /// Promotions from incubating to graduated per year-month.
-    #[serde(skip_serializing_if = "BTreeMap::is_empty")]
+    #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
     pub incubating_to_graduated: BTreeMap<YearMonth, u64>,
 
     /// Number of projects per maturity.
-    #[serde(skip_serializing_if = "BTreeMap::is_empty")]
+    #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
     pub maturity: BTreeMap<String, u64>,
 
     /// Total number of projects.
     pub projects: u64,
 
     /// Promotions from sandbox to incubating per year-month.
-    #[serde(skip_serializing_if = "BTreeMap::is_empty")]
+    #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
     pub sandbox_to_incubating: BTreeMap<YearMonth, u64>,
 
     /// Number of projects per TAG.
-    #[serde(skip_serializing_if = "BTreeMap::is_empty")]
+    #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
     pub tag: BTreeMap<TagName, u64>,
 }
 
@@ -324,7 +324,7 @@ pub struct CategoryProjectsStats {
     pub projects: u64,
 
     /// Number of projects per subcategory.
-    #[serde(skip_serializing_if = "BTreeMap::is_empty")]
+    #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
     pub subcategories: BTreeMap<SubCategoryName, u64>,
 }
 
@@ -338,19 +338,19 @@ pub struct RepositoriesStats {
     pub contributors: u64,
 
     /// Number of repositories where each language is used.
-    #[serde(skip_serializing_if = "BTreeMap::is_empty")]
+    #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
     pub languages: BTreeMap<String, u64>,
 
     /// Source code bytes written on each language.
-    #[serde(skip_serializing_if = "BTreeMap::is_empty")]
+    #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
     pub languages_bytes: BTreeMap<String, u64>,
 
     /// Number of repositories where each license is used.
-    #[serde(skip_serializing_if = "BTreeMap::is_empty")]
+    #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
     pub licenses: BTreeMap<String, u64>,
 
     /// Number of commits per week over the last year.
-    #[serde(skip_serializing_if = "Vec::is_empty")]
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
     pub participation_stats: Vec<i64>,
 
     /// Number of repositories.

From f053576e72426eefa30bee93eadfd052ee8c8ef7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20Casta=C3=B1o=20Arteaga?= <tegioz@icloud.com>
Date: Tue, 30 Apr 2024 11:17:30 +0200
Subject: [PATCH 35/55] Upgrade CLI tool dependencies (#605)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Sergio Castaño Arteaga <tegioz@icloud.com>
---
 Cargo.lock | 147 +++++++++++++++++++++++++----------------------------
 Cargo.toml |  20 ++++----
 README.md  |   2 +-
 3 files changed, 79 insertions(+), 90 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 43a75199..a0746ccc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -24,7 +24,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
 dependencies = [
  "cfg-if",
- "getrandom",
  "once_cell",
  "version_check",
  "zerocopy",
@@ -110,9 +109,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.81"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247"
+checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519"
 
 [[package]]
 name = "arrayref"
@@ -185,9 +184,9 @@ dependencies = [
 
 [[package]]
 name = "async-trait"
-version = "0.1.79"
+version = "0.1.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681"
+checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -216,9 +215,9 @@ checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "aws-config"
-version = "1.1.9"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "297b64446175a73987cedc3c438d79b2a654d0fff96f65ff530fbe039347644c"
+checksum = "b2a4707646259764ab59fd9a50e9de2e92c637b28b36285d6f6fa030e915fbd9"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -247,9 +246,9 @@ dependencies = [
 
 [[package]]
 name = "aws-credential-types"
-version = "1.1.8"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa8587ae17c8e967e4b05a62d495be2fb7701bec52a97f7acfe8a29f938384c8"
+checksum = "e16838e6c9e12125face1c1eff1343c75e3ff540de98ff7ebd61874a89bcfeb9"
 dependencies = [
  "aws-smithy-async",
  "aws-smithy-runtime-api",
@@ -259,9 +258,9 @@ dependencies = [
 
 [[package]]
 name = "aws-runtime"
-version = "1.1.8"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b13dc54b4b49f8288532334bba8f87386a40571c47c37b1304979b556dc613c8"
+checksum = "f4963ac9ff2d33a4231b3806c1c69f578f221a9cabb89ad2bde62ce2b442c8a7"
 dependencies = [
  "aws-credential-types",
  "aws-sigv4",
@@ -283,9 +282,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-s3"
-version = "1.21.0"
+version = "1.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc075ffee2a40cb1590bed35d7ec953589a564e768fa91947c565425cd569269"
+checksum = "7f522b68eb0294c59f7beb0defa30e84fed24ebc50ee219e111d6c33eaea96a8"
 dependencies = [
  "ahash",
  "aws-credential-types",
@@ -318,9 +317,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-sso"
-version = "1.18.0"
+version = "1.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "019a07902c43b03167ea5df0182f0cb63fae89f9a9682c44d18cf2e4a042cb34"
+checksum = "3d70fb493f4183f5102d8a8d0cc9b57aec29a762f55c0e7bf527e0f7177bb408"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -340,9 +339,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-ssooidc"
-version = "1.18.0"
+version = "1.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04c46ee08a48a7f4eaa4ad201dcc1dd537b49c50859d14d4510e00ad9d3f9af2"
+checksum = "de3f37549b3e38b7ea5efd419d4d7add6ea1e55223506eb0b4fef9d25e7cc90d"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -362,9 +361,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-sts"
-version = "1.18.0"
+version = "1.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f752ac730125ca6017f72f9db5ec1772c9ecc664f87aa7507a7d81b023c23713"
+checksum = "3b2ff219a5d4b795cd33251c19dbe9c4b401f2b2cbe513e07c76ada644eaf34e"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -385,9 +384,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sigv4"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11d6f29688a4be9895c0ba8bef861ad0c0dac5c15e9618b9b7a6c233990fc263"
+checksum = "58b56f1cbe6fd4d0c2573df72868f20ab1c125ca9c9dbce17927a463433a2e57"
 dependencies = [
  "aws-credential-types",
  "aws-smithy-eventstream",
@@ -457,9 +456,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-http"
-version = "0.60.7"
+version = "0.60.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f10fa66956f01540051b0aa7ad54574640f748f9839e843442d99b970d3aff9"
+checksum = "4a7de001a1b9a25601016d8057ea16e31a45fdca3751304c8edf4ad72e706c08"
 dependencies = [
  "aws-smithy-eventstream",
  "aws-smithy-runtime-api",
@@ -497,9 +496,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-runtime"
-version = "1.2.1"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c53572b4cd934ee5e8461ad53caa36e9d246aaef42166e3ac539e206a925d330"
+checksum = "44e7945379821074549168917e89e60630647e186a69243248f08c6d168b975a"
 dependencies = [
  "aws-smithy-async",
  "aws-smithy-http",
@@ -523,9 +522,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-runtime-api"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccb2b3a7030dc9a3c9a08ce0b25decea5130e9db19619d4dffbbff34f75fe850"
+checksum = "4cc56a5c96ec741de6c5e6bf1ce6948be969d6506dfa9c39cffc284e31e4979b"
 dependencies = [
  "aws-smithy-async",
  "aws-smithy-types",
@@ -566,18 +565,18 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-xml"
-version = "0.60.7"
+version = "0.60.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "872c68cf019c0e4afc5de7753c4f7288ce4b71663212771bf5e4542eb9346ca9"
+checksum = "d123fbc2a4adc3c301652ba8e149bf4bc1d1725affb9784eb20c953ace06bf55"
 dependencies = [
  "xmlparser",
 ]
 
 [[package]]
 name = "aws-types"
-version = "1.1.8"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dbf2f3da841a8930f159163175cf6a3d16ddde517c1b0fba7aa776822800f40"
+checksum = "5a43b56df2c529fe44cb4d92bd64d0479883fb9608ff62daede4df5405381814"
 dependencies = [
  "aws-credential-types",
  "aws-smithy-async",
@@ -779,9 +778,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chrono"
-version = "0.4.37"
+version = "0.4.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e"
+checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
@@ -838,19 +837,6 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
 
-[[package]]
-name = "console"
-version = "0.15.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb"
-dependencies = [
- "encode_unicode",
- "lazy_static",
- "libc",
- "unicode-width",
- "windows-sys 0.52.0",
-]
-
 [[package]]
 name = "const-oid"
 version = "0.9.6"
@@ -1008,11 +994,10 @@ checksum = "41b319d1b62ffbd002e057f36bebd1f42b9f97927c9577461d855f3513c4289f"
 
 [[package]]
 name = "deadpool"
-version = "0.11.0"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c380a837cb8cb747898b1be7fa5ba5b871eb1210f8881d6512946c132617f80"
+checksum = "ff0fc28638c21092aba483136debc6e177fff3dace8c835d715866923b03323e"
 dependencies = [
- "console",
  "deadpool-runtime",
  "num_cpus",
  "tokio",
@@ -1156,12 +1141,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "encode_unicode"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
-
 [[package]]
 name = "encoding_rs"
 version = "0.8.33"
@@ -1866,7 +1845,7 @@ dependencies = [
  "parse_link_header",
  "qrcode",
  "regex",
- "reqwest 0.12.2",
+ "reqwest 0.12.4",
  "rust-embed",
  "serde",
  "serde_json",
@@ -1893,7 +1872,7 @@ dependencies = [
  "lazy_static",
  "markdown",
  "regex",
- "reqwest 0.12.2",
+ "reqwest 0.12.4",
  "serde",
  "serde_yaml",
  "tracing",
@@ -1906,7 +1885,7 @@ version = "0.8.1"
 dependencies = [
  "anyhow",
  "landscape2-core",
- "reqwest 0.12.2",
+ "reqwest 0.12.4",
  "serde",
  "serde-wasm-bindgen",
  "serde_json",
@@ -1979,9 +1958,9 @@ dependencies = [
 
 [[package]]
 name = "markdown"
-version = "1.0.0-alpha.16"
+version = "1.0.0-alpha.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b0f0025e8c0d89b84d6dc63e859475e40e8e82ab1a08be0a93ad5731513a508"
+checksum = "21e27d6220ce21f80ce5c4201f23a37c6f1ad037c72c9d1ff215c2919605a5d6"
 dependencies = [
  "unicode-id",
 ]
@@ -2619,7 +2598,7 @@ dependencies = [
  "percent-encoding",
  "pin-project-lite",
  "rustls",
- "rustls-pemfile",
+ "rustls-pemfile 1.0.4",
  "serde",
  "serde_json",
  "serde_urlencoded",
@@ -2638,11 +2617,11 @@ dependencies = [
 
 [[package]]
 name = "reqwest"
-version = "0.12.2"
+version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d66674f2b6fb864665eea7a3c1ac4e3dfacd2fda83cf6f935a612e01b0e3338"
+checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10"
 dependencies = [
- "base64 0.21.7",
+ "base64 0.22.0",
  "bytes",
  "encoding_rs",
  "futures-core",
@@ -2662,7 +2641,7 @@ dependencies = [
  "once_cell",
  "percent-encoding",
  "pin-project-lite",
- "rustls-pemfile",
+ "rustls-pemfile 2.1.2",
  "serde",
  "serde_json",
  "serde_urlencoded",
@@ -2675,7 +2654,7 @@ dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
- "winreg 0.50.0",
+ "winreg 0.52.0",
 ]
 
 [[package]]
@@ -2892,7 +2871,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00"
 dependencies = [
  "openssl-probe",
- "rustls-pemfile",
+ "rustls-pemfile 1.0.4",
  "schannel",
  "security-framework",
 ]
@@ -2906,6 +2885,22 @@ dependencies = [
  "base64 0.21.7",
 ]
 
+[[package]]
+name = "rustls-pemfile"
+version = "2.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d"
+dependencies = [
+ "base64 0.22.0",
+ "rustls-pki-types",
+]
+
+[[package]]
+name = "rustls-pki-types"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "beb461507cee2c2ff151784c52762cf4d9ff6a61f3e80968600ed24fa837fa54"
+
 [[package]]
 name = "rustls-webpki"
 version = "0.101.7"
@@ -3051,9 +3046,9 @@ checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca"
 
 [[package]]
 name = "serde"
-version = "1.0.197"
+version = "1.0.199"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
+checksum = "0c9f6e76df036c77cd94996771fb40db98187f096dd0b9af39c6c6e452ba966a"
 dependencies = [
  "serde_derive",
 ]
@@ -3071,9 +3066,9 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.197"
+version = "1.0.199"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
+checksum = "11bd257a6541e141e42ca6d24ae26f7714887b47e89aa739099104c7e4d3b7fc"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3093,9 +3088,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.115"
+version = "1.0.116"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd"
+checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813"
 dependencies = [
  "itoa",
  "ryu",
@@ -3764,12 +3759,6 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94"
 
-[[package]]
-name = "unicode-width"
-version = "0.1.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
-
 [[package]]
 name = "unsafe-libyaml"
 version = "0.2.11"
diff --git a/Cargo.toml b/Cargo.toml
index 325901c3..620eb8e2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,18 +15,18 @@ authors = ["Sergio Castaño Arteaga", "Cintia Sanchez Garcia"]
 homepage = "https://github.com/cncf/landscape2"
 
 [workspace.dependencies]
-anyhow = "1.0.81"
+anyhow = "1.0.82"
 askama = { version = "0.12.1", features = ["serde-json"] }
 askama_escape = { version = "0.10.3", features = ["json"] }
-async-trait = "0.1.79"
-aws-config = "1.1.9"
-aws-sdk-s3 = "1.21.0"
+async-trait = "0.1.80"
+aws-config = "1.2.1"
+aws-sdk-s3 = "1.24.0"
 axum = "0.7.5"
 base64 = "0.22.0"
-chrono = { version = "0.4.37", features = ["serde"] }
+chrono = { version = "0.4.38", features = ["serde"] }
 clap = { version = "4.5.4", features = ["derive"] }
 csv = "1.3.0"
-deadpool = "0.11.0"
+deadpool = "0.11.2"
 dirs = "5.0.1"
 futures = "0.3.30"
 headless_chrome = { git = "https://github.com/rust-headless-chrome/rust-headless-chrome", rev = "973ebea" }
@@ -35,7 +35,7 @@ imagesize = "0.12.0"
 itertools = "0.12.1"
 lazy_static = "1.4.0"
 leaky-bucket = "1.0.1"
-markdown = "1.0.0-alpha.16"
+markdown = "1.0.0-alpha.17"
 md-5 = "0.10.6"
 mime_guess = "2.0.4"
 mockall = "0.12.1"
@@ -44,10 +44,10 @@ octorust = "0.7.0"
 parse_link_header = "0.3.3"
 qrcode = "0.14.0"
 regex = "1.10.4"
-reqwest = { version = "0.12.2", features = ["json", "native-tls-vendored"] }
+reqwest = { version = "0.12.4", features = ["json", "native-tls-vendored"] }
 rust-embed = "8.3.0"
-serde = { version = "1.0.197", features = ["derive"] }
-serde_json = "1.0.115"
+serde = { version = "1.0.199", features = ["derive"] }
+serde_json = "1.0.116"
 serde-wasm-bindgen = "0.6.5"
 serde_yaml = "0.9.34"
 sha2 = "0.10.8"
diff --git a/README.md b/README.md
index db241016..710ff63e 100644
--- a/README.md
+++ b/README.md
@@ -219,7 +219,7 @@ Some examples of it in action (live demos!):
 
 To achieve this, the overlay redoes part of the landscape build process in the browser, reusing the same codebase packed as a WASM module.
 
-The overlay can be enabled by providing any of the following query parameters to the landscape url:
+The overlay can be enabled by providing any of the following query parameters to the landscape url (they can be combined if needed):
 
 - `overlay-data`: *data file url*
 - `overlay-settings`: *settings file url*

From 2babe7573e85615945a6ae3440b4a314f972dcc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cintia=20S=C3=A1nchez=20Garc=C3=ADa?= <cynthiasg@icloud.com>
Date: Tue, 30 Apr 2024 12:24:35 +0200
Subject: [PATCH 36/55] Do not display empty groups in group selector (#606)

Signed-off-by: Cintia Sanchez Garcia <cynthiasg@icloud.com>
---
 ui/webapp/src/App.tsx                       |  1 +
 ui/webapp/src/layout/explore/index.tsx      | 15 ++++--
 ui/webapp/src/layout/navigation/Header.tsx  |  5 +-
 ui/webapp/src/layout/screenshots/index.tsx  |  4 +-
 ui/webapp/src/layout/stores/groupActive.tsx | 13 ++---
 ui/webapp/src/utils/itemsDataGetter.ts      | 54 ++++++++++++++++-----
 6 files changed, 66 insertions(+), 26 deletions(-)

diff --git a/ui/webapp/src/App.tsx b/ui/webapp/src/App.tsx
index 709165f4..5d8fc7b7 100644
--- a/ui/webapp/src/App.tsx
+++ b/ui/webapp/src/App.tsx
@@ -103,6 +103,7 @@ const App = () => {
   onMount(() => {
     const isOverlayActive = overlayData.checkIfOverlayInQuery();
     if (!isOverlayActive) {
+      itemsDataGetter.prepareGroups();
       setData(window.baseDS);
     } else {
       setLoadingOverlay(true);
diff --git a/ui/webapp/src/layout/explore/index.tsx b/ui/webapp/src/layout/explore/index.tsx
index 68043170..4e3865a7 100644
--- a/ui/webapp/src/layout/explore/index.tsx
+++ b/ui/webapp/src/layout/explore/index.tsx
@@ -114,6 +114,7 @@ const Explore = (props: Props) => {
   const [sortOptions, setSortOptions] = createSignal<SortOption[]>(Object.values(SortOption));
   const [numItems, setNumItems] = createSignal<{ [key: string]: number }>({});
   const [licenseOptions, setLicenseOptions] = createSignal<string[]>([]);
+  const activeGroups = () => itemsDataGetter.getGroups();
 
   const checkIfFullDataRequired = (): boolean => {
     if (viewMode() === ViewMode.Card) {
@@ -279,8 +280,8 @@ const Explore = (props: Props) => {
         updatedSearchParams.delete(CLASSIFY_PARAM);
         updatedSearchParams.delete(SORT_BY_PARAM);
         updatedSearchParams.delete(SORT_DIRECTION_PARAM);
-        if (selectedGroup() === ALL_OPTION && !isUndefined(window.baseDS.groups)) {
-          const firstGroup = props.initialData.groups![0].normalized_name;
+        if (selectedGroup() === ALL_OPTION && !isUndefined(activeGroups())) {
+          const firstGroup = activeGroups()![0];
           updatedSearchParams.set(GROUP_PARAM, firstGroup);
           setSelectedGroup(firstGroup);
         }
@@ -610,7 +611,7 @@ const Explore = (props: Props) => {
             </Show>
 
             <div class="d-none d-lg-flex align-items-center">
-              <Show when={!isUndefined(props.initialData.groups)}>
+              <Show when={props.initialData.groups}>
                 <div class={styles.btnGroupLegend}>
                   <small class="text-muted me-2">GROUP:</small>
                 </div>
@@ -621,6 +622,8 @@ const Explore = (props: Props) => {
                   <div class={`btn-group btn-group-sm me-4 ${styles.btnGroup}`}>
                     <For each={props.initialData.groups}>
                       {(group: Group) => {
+                        if (!isUndefined(activeGroups()) && !activeGroups()!.includes(group.normalized_name))
+                          return null;
                         return (
                           <button
                             title={`Group: ${group.name}`}
@@ -669,7 +672,7 @@ const Explore = (props: Props) => {
                   <select
                     id="desktop-group"
                     class={`form-select form-select-sm border-primary text-primary rounded-0 me-4 ${styles.desktopSelect}`}
-                    value={selectedGroup() || props.initialData.groups![0].normalized_name}
+                    value={selectedGroup()}
                     aria-label="Group"
                     onChange={(e) => {
                       setVisibleLoading(true);
@@ -683,6 +686,8 @@ const Explore = (props: Props) => {
                   >
                     <For each={props.initialData.groups}>
                       {(group: Group) => {
+                        if (!isUndefined(activeGroups()) && !activeGroups()!.includes(group.normalized_name))
+                          return null;
                         return <option value={group.normalized_name}>{group.name}</option>;
                       }}
                     </For>
@@ -860,6 +865,8 @@ const Explore = (props: Props) => {
                 {/* Do not display All option for mobile */}
                 <For each={props.initialData.groups}>
                   {(group: Group) => {
+                    if (!isUndefined(activeGroups()) && !activeGroups()!.includes(group.normalized_name)) return null;
+
                     return <option value={group.normalized_name}>{group.name}</option>;
                   }}
                 </For>
diff --git a/ui/webapp/src/layout/navigation/Header.tsx b/ui/webapp/src/layout/navigation/Header.tsx
index ddc0b17b..b3fe0e7b 100644
--- a/ui/webapp/src/layout/navigation/Header.tsx
+++ b/ui/webapp/src/layout/navigation/Header.tsx
@@ -6,6 +6,7 @@ import { createMemo, Show } from 'solid-js';
 import { ALL_OPTION, DEFAULT_VIEW_MODE, EXPLORE_PATH, GUIDE_PATH, SCREENSHOTS_PATH, STATS_PATH } from '../../data';
 import { SVGIconKind } from '../../types';
 import isExploreSection from '../../utils/isExploreSection';
+import itemsDataGetter from '../../utils/itemsDataGetter';
 import prepareLink from '../../utils/prepareLink';
 import scrollToTop from '../../utils/scrollToTop';
 import DownloadDropdown from '../common/DownloadDropdown';
@@ -31,9 +32,9 @@ const Header = () => {
   };
 
   const resetDefaultExploreValues = () => {
-    const groups = window.baseDS.groups;
+    const groups = itemsDataGetter.getGroups();
     setViewMode(DEFAULT_VIEW_MODE);
-    setSelectedGroup(!isUndefined(groups) ? groups[0].normalized_name : ALL_OPTION);
+    setSelectedGroup(!isUndefined(groups) ? groups[0] : ALL_OPTION);
   };
 
   return (
diff --git a/ui/webapp/src/layout/screenshots/index.tsx b/ui/webapp/src/layout/screenshots/index.tsx
index bc9dd28e..af232c9a 100644
--- a/ui/webapp/src/layout/screenshots/index.tsx
+++ b/ui/webapp/src/layout/screenshots/index.tsx
@@ -38,13 +38,15 @@ const Screenshots = (props: Props) => {
         <Show when={!isUndefined(groupsData())}>
           <For each={groups()}>
             {(group) => {
+              const activeGroups = itemsDataGetter.getGroups();
+              if (activeGroups && !activeGroups.includes(group.normalized_name)) return null;
               const colorsList = () => generateColorsArray(group.categories.length);
               const groupData = groupsData()![group.normalized_name];
               const categories = getCategoriesWithItems(groupData);
 
               return (
                 <div class={styles.group}>
-                  <Show when={!isUndefined(props.initialData.groups)}>
+                  <Show when={!isUndefined(activeGroups)}>
                     <div class={`fw-bold text-uppercase ${styles.title}`}>{group.name}</div>
                   </Show>
                   <For each={categories}>
diff --git a/ui/webapp/src/layout/stores/groupActive.tsx b/ui/webapp/src/layout/stores/groupActive.tsx
index 23b23da5..576e81b7 100644
--- a/ui/webapp/src/layout/stores/groupActive.tsx
+++ b/ui/webapp/src/layout/stores/groupActive.tsx
@@ -4,22 +4,23 @@ import isUndefined from 'lodash/isUndefined';
 import { createContext, createSignal, ParentComponent, useContext } from 'solid-js';
 
 import { ALL_OPTION, BASE_PATH, GROUP_PARAM } from '../../data';
-import { Group } from '../../types';
 import isExploreSection from '../../utils/isExploreSection';
+import itemsDataGetter from '../../utils/itemsDataGetter';
 import prepareLink from '../../utils/prepareLink';
 
 const getInitialGroupName = (groupParam: string | null): string | undefined => {
   const navigate = useNavigate();
+  const groups = itemsDataGetter.getGroups();
 
-  if (isUndefined(window.baseDS.groups)) {
+  if (isUndefined(groups)) {
     return undefined;
   } else {
-    const firstGroup = window.baseDS.groups[0].normalized_name;
+    const firstGroup = groups[0];
     if (isNull(groupParam)) {
       return firstGroup;
     } else {
-      const selectedGroup = window.baseDS.groups.find((group: Group) => group.normalized_name === groupParam);
-      if (!isUndefined(selectedGroup) || groupParam === ALL_OPTION) {
+      const isValidGroup = groups.includes(groupParam);
+      if (isValidGroup || groupParam === ALL_OPTION) {
         return groupParam;
       } else {
         if (isExploreSection(location.pathname)) {
@@ -57,7 +58,7 @@ export function useGroupA() {
 }
 
 export function useGroupActive() {
-  return useGroupA().group || 'default';
+  return useGroupA().group || ALL_OPTION;
 }
 
 export function useSetGroupActive() {
diff --git a/ui/webapp/src/utils/itemsDataGetter.ts b/ui/webapp/src/utils/itemsDataGetter.ts
index 0fd81924..d2a00146 100644
--- a/ui/webapp/src/utils/itemsDataGetter.ts
+++ b/ui/webapp/src/utils/itemsDataGetter.ts
@@ -78,6 +78,7 @@ export interface ClassifyAndSortOptions {
 export class ItemsDataGetter {
   private updateStatus?: ItemsDataStatus;
   private ready = false;
+  private groups: string[] | undefined;
   private landscapeData?: LandscapeData;
   private classifyAndSortOptions: { [key: string]: ClassifyAndSortOptions } | undefined;
   private allDataGrouped: { [key: string]: (Item | BaseItem)[] } | undefined;
@@ -91,6 +92,7 @@ export class ItemsDataGetter {
   public init(landscapeData?: LandscapeData) {
     if (!this.ready) {
       if (landscapeData) {
+        this.prepareGroups();
         this.initialDataPreparation(landscapeData);
       } else {
         fetch(import.meta.env.MODE === 'development' ? '../../static/data/full.json' : './data/full.json')
@@ -102,6 +104,29 @@ export class ItemsDataGetter {
     }
   }
 
+  public prepareGroups() {
+    const groups: string[] = [];
+
+    if (window.baseDS && window.baseDS.groups) {
+      const categories: string[] = [];
+      if (window.baseDS.categories) {
+        window.baseDS.categories.forEach((c: Category) => {
+          categories.push(c.name);
+        });
+      }
+      window.baseDS.groups.forEach((g: Group) => {
+        if (intersection(categories, g.categories).length > 0) {
+          groups.push(g.normalized_name);
+        }
+      });
+      this.groups = groups;
+    }
+  }
+
+  public getGroups(): string[] | undefined {
+    return this.groups;
+  }
+
   private initialDataPreparation(data: LandscapeData) {
     const extendedItems = this.extendItemsData(data.items, data.crunchbase_data, data.github_data);
     this.landscapeData = {
@@ -190,19 +215,22 @@ export class ItemsDataGetter {
     const groupedItems: { [key: string]: (BaseItem | Item)[] } = {};
 
     for (const group of groups) {
-      const itemsTmp: (BaseItem | Item)[] = [];
-      group.categories.forEach((c: string) => {
-        const groupData = gData[c];
-        const additionalData = additionalItems[c];
-        if (groupData) {
-          itemsTmp.push(...groupData);
-        }
-        if (additionalData) {
-          itemsTmp.push(...additionalData);
-        }
-      });
-      // Clean duplicates due to additional categories
-      groupedItems[group.normalized_name] = uniqWith(itemsTmp, isEqual);
+      // Check if the group is in the list of valid groups
+      if (this.groups && this.groups.includes(group.normalized_name)) {
+        const itemsTmp: (BaseItem | Item)[] = [];
+        group.categories.forEach((c: string) => {
+          const groupData = gData[c];
+          const additionalData = additionalItems[c];
+          if (groupData) {
+            itemsTmp.push(...groupData);
+          }
+          if (additionalData) {
+            itemsTmp.push(...additionalData);
+          }
+        });
+        // Clean duplicates due to additional categories
+        groupedItems[group.normalized_name] = uniqWith(itemsTmp, isEqual);
+      }
     }
     groupedItems[ALL_OPTION] = [...items];
 

From e836175ec6a953f303eb6389c371fd56e6f1581b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cintia=20S=C3=A1nchez=20Garc=C3=ADa?= <cynthiasg@icloud.com>
Date: Tue, 30 Apr 2024 12:38:59 +0200
Subject: [PATCH 37/55] Hide stats link when there are no stats available
 (#607)

Closes #591

Signed-off-by: Cintia Sanchez Garcia <cynthiasg@icloud.com>
---
 ui/webapp/src/layout/index.tsx                | 16 ++++++--
 ui/webapp/src/layout/navigation/Header.tsx    | 40 +++++++++++--------
 .../src/layout/navigation/MobileDropdown.tsx  | 23 ++++++-----
 .../src/layout/navigation/MobileHeader.tsx    | 10 +++--
 4 files changed, 56 insertions(+), 33 deletions(-)

diff --git a/ui/webapp/src/layout/index.tsx b/ui/webapp/src/layout/index.tsx
index 21dbec22..81d01896 100644
--- a/ui/webapp/src/layout/index.tsx
+++ b/ui/webapp/src/layout/index.tsx
@@ -1,4 +1,5 @@
-import { JSXElement } from 'solid-js';
+import isEmpty from 'lodash/isEmpty';
+import { createSignal, JSXElement, onMount } from 'solid-js';
 
 import ItemModal from './common/itemModal';
 import ZoomModal from './common/zoomModal';
@@ -23,6 +24,15 @@ interface Props {
 }
 
 const Layout = (props: Props) => {
+  const [statsVisible, setStatsVisible] = createSignal<boolean>(true);
+
+  onMount(() => {
+    // Check if statsDS is empty, if so, hide the stats link
+    if (isEmpty(window.statsDS)) {
+      setStatsVisible(false);
+    }
+  });
+
   return (
     <FullDataProvider>
       <ActiveItemProvider>
@@ -36,8 +46,8 @@ const Layout = (props: Props) => {
                       <FinancesDataProvider>
                         <EventsProvider>
                           <div class={`d-flex flex-column ${styles.container}`}>
-                            <MobileHeader />
-                            <Header />
+                            <MobileHeader statsVisible={statsVisible()} />
+                            <Header statsVisible={statsVisible()} />
                             <div class="d-flex flex-column flex-grow-1">{props.children}</div>
                           </div>
                           <ItemModal />
diff --git a/ui/webapp/src/layout/navigation/Header.tsx b/ui/webapp/src/layout/navigation/Header.tsx
index b3fe0e7b..d0e1d757 100644
--- a/ui/webapp/src/layout/navigation/Header.tsx
+++ b/ui/webapp/src/layout/navigation/Header.tsx
@@ -19,7 +19,11 @@ import { useSetViewMode } from '../stores/viewMode';
 import EmbedModal from './EmbedModal';
 import styles from './Header.module.css';
 
-const Header = () => {
+interface Props {
+  statsVisible: boolean;
+}
+
+const Header = (props: Props) => {
   const location = useLocation();
   const navigate = useNavigate();
   const logo = () => (window.baseDS.header ? window.baseDS.header!.logo : undefined);
@@ -103,22 +107,24 @@ const Header = () => {
               </button>
             </Show>
 
-            <button
-              class={`btn btn-link position-relative text-uppercase fw-bold text-decoration-none p-0 ${styles.link}`}
-              classList={{ activeLink: isActive(STATS_PATH) }}
-              onClick={() => {
-                if (isActive(STATS_PATH)) {
-                  scrollToTop(false);
-                } else {
-                  navigate(prepareLink(STATS_PATH), {
-                    state: { from: 'header' },
-                  });
-                  scrollToTop(false);
-                }
-              }}
-            >
-              Stats
-            </button>
+            <Show when={props.statsVisible}>
+              <button
+                class={`btn btn-link position-relative text-uppercase fw-bold text-decoration-none p-0 ${styles.link}`}
+                classList={{ activeLink: isActive(STATS_PATH) }}
+                onClick={() => {
+                  if (isActive(STATS_PATH)) {
+                    scrollToTop(false);
+                  } else {
+                    navigate(prepareLink(STATS_PATH), {
+                      state: { from: 'header' },
+                    });
+                    scrollToTop(false);
+                  }
+                }}
+              >
+                Stats
+              </button>
+            </Show>
           </div>
 
           <div class={`d-flex flex-row align-items-center ms-auto mt-0 ${styles.searchWrapper}`}>
diff --git a/ui/webapp/src/layout/navigation/MobileDropdown.tsx b/ui/webapp/src/layout/navigation/MobileDropdown.tsx
index dc87e9cd..1be29eb1 100644
--- a/ui/webapp/src/layout/navigation/MobileDropdown.tsx
+++ b/ui/webapp/src/layout/navigation/MobileDropdown.tsx
@@ -11,6 +11,7 @@ import SVGIcon from '../common/SVGIcon';
 import styles from './MobileDropdown.module.css';
 
 interface Props {
+  statsVisible: boolean;
   inSticky?: boolean;
 }
 
@@ -64,16 +65,18 @@ const MobileDropdown = (props: Props) => {
             </A>
           </div>
         </Show>
-        <div class="dropdown-item mb-2">
-          <A
-            class={`btn btn-link position-relative text-uppercase w-100 text-start fw-semibold text-decoration-none p-0 ${styles.link}`}
-            activeClass="activeLink"
-            href={STATS_PATH}
-            onClick={closeDropdown}
-          >
-            Stats
-          </A>
-        </div>
+        <Show when={props.statsVisible}>
+          <div class="dropdown-item mb-2">
+            <A
+              class={`btn btn-link position-relative text-uppercase w-100 text-start fw-semibold text-decoration-none p-0 ${styles.link}`}
+              activeClass="activeLink"
+              href={STATS_PATH}
+              onClick={closeDropdown}
+            >
+              Stats
+            </A>
+          </div>
+        </Show>
         <Show
           when={
             !isUndefined(window.baseDS.header) &&
diff --git a/ui/webapp/src/layout/navigation/MobileHeader.tsx b/ui/webapp/src/layout/navigation/MobileHeader.tsx
index 0643f9eb..51fa38f0 100644
--- a/ui/webapp/src/layout/navigation/MobileHeader.tsx
+++ b/ui/webapp/src/layout/navigation/MobileHeader.tsx
@@ -18,7 +18,11 @@ import styles from './MobileHeader.module.css';
 
 const NAV_HEIGHT = 121;
 
-const MobileHeader = () => {
+interface Props {
+  statsVisible: boolean;
+}
+
+const MobileHeader = (props: Props) => {
   const location = useLocation();
   const openMenu = useSetMobileTOCStatus();
   const logo = () => (window.baseDS.header ? window.baseDS.header!.logo : undefined);
@@ -60,7 +64,7 @@ const MobileHeader = () => {
           </Show>
         </div>
         <div>
-          <MobileDropdown inSticky />
+          <MobileDropdown statsVisible={props.statsVisible} inSticky />
         </div>
       </div>
       <header class="d-block d-lg-none navbar navbar-expand p-0 mb-2 border-bottom shadow-sm">
@@ -72,7 +76,7 @@ const MobileHeader = () => {
               </A>
             </Show>
             <div class="ms-auto d-flex d-lg-none">
-              <MobileDropdown />
+              <MobileDropdown statsVisible={props.statsVisible} />
             </div>
           </div>
 

From d11df7c3ee15e3e587472578fd6187ae0bdc250a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cintia=20S=C3=A1nchez=20Garc=C3=ADa?= <cynthiasg@icloud.com>
Date: Tue, 30 Apr 2024 13:20:11 +0200
Subject: [PATCH 38/55] Fix badge url issue (#608)

Closes #603

Signed-off-by: Cintia Sanchez Garcia <cynthiasg@icloud.com>
---
 ui/webapp/src/layout/common/itemModal/BadgeModal.tsx |  3 ++-
 ui/webapp/src/utils/formatShieldsBadgeContent.ts     | 10 ++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 ui/webapp/src/utils/formatShieldsBadgeContent.ts

diff --git a/ui/webapp/src/layout/common/itemModal/BadgeModal.tsx b/ui/webapp/src/layout/common/itemModal/BadgeModal.tsx
index a701636a..85ffd85c 100644
--- a/ui/webapp/src/layout/common/itemModal/BadgeModal.tsx
+++ b/ui/webapp/src/layout/common/itemModal/BadgeModal.tsx
@@ -1,5 +1,6 @@
 import { BASE_PATH, FOUNDATION } from '../../../data';
 import { SVGIconKind } from '../../../types';
+import formatShieldsBadgeContent from '../../../utils/formatShieldsBadgeContent';
 import CodeBlock from '../CodeBlock';
 import Modal from '../Modal';
 import SVGIcon from '../SVGIcon';
@@ -16,7 +17,7 @@ const BadgeModal = (props: Props) => {
   const openStatus = () => props.openStatus;
   const origin = window.location.origin;
   const foundation = FOUNDATION;
-  const badgeImage = `https://img.shields.io/badge/${foundation}%20Landscape-5699C6`;
+  const badgeImage = `https://img.shields.io/badge/${formatShieldsBadgeContent(foundation)}%20Landscape-5699C6`;
   const markdownLink = () => `[![${foundation} Landscape](${badgeImage})](${origin}${BASE_PATH}/?item=${itemId()})`;
   const asciiLink = () => `${origin}${BASE_PATH}/?item=${itemId()}[image:${badgeImage}[${foundation} LANDSCAPE]]`;
 
diff --git a/ui/webapp/src/utils/formatShieldsBadgeContent.ts b/ui/webapp/src/utils/formatShieldsBadgeContent.ts
new file mode 100644
index 00000000..63f10863
--- /dev/null
+++ b/ui/webapp/src/utils/formatShieldsBadgeContent.ts
@@ -0,0 +1,10 @@
+import { REGEX_DASH } from '../data';
+
+// `badgeContent` message needs double dash instead of single dash,
+// due to single dash being used as a separator by shields.io
+// https://shields.io/badges/static-badge
+const formatShieldsBadgeContent = (n: string): string => {
+  return n.replace(REGEX_DASH, '--');
+};
+
+export default formatShieldsBadgeContent;

From 27e7f2e6f16e5983fd1721df707d32f495b6650f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cintia=20S=C3=A1nchez=20Garc=C3=ADa?= <cynthiasg@icloud.com>
Date: Wed, 1 May 2024 17:58:36 +0200
Subject: [PATCH 39/55] Display package manager link in item details view
 (#609)

Signed-off-by: Cintia Sanchez Garcia <cynthiasg@icloud.com>
---
 ui/webapp/src/layout/common/SVGIcon.tsx       | 193 ++++++++++++++++++
 .../src/layout/common/itemModal/Content.tsx   |  42 ++++
 ui/webapp/src/types.ts                        |  13 ++
 3 files changed, 248 insertions(+)

diff --git a/ui/webapp/src/layout/common/SVGIcon.tsx b/ui/webapp/src/layout/common/SVGIcon.tsx
index 70f8eb27..47d7fbf9 100644
--- a/ui/webapp/src/layout/common/SVGIcon.tsx
+++ b/ui/webapp/src/layout/common/SVGIcon.tsx
@@ -199,6 +199,21 @@ const Close = (props: IconProps) => (
   </svg>
 );
 
+const Cocoapods = (props: IconProps) => (
+  <svg
+    class={props.class}
+    stroke="currentColor"
+    fill="currentColor"
+    stroke-width="0"
+    viewBox="0 0 24 24"
+    height="1em"
+    width="1em"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path d="M8.812 17.176c-2.968 0-4.956-2.308-4.956-5.176 0-2.705 1.776-5.176 4.91-5.176 2.407 0 3.856 1.445 4.207 3.357h3.95C16.479 6.427 13.51 3.42 8.718 3.42 3.131 3.42 0 7.523 0 12c0 4.57 3.295 8.58 8.766 8.58 4.58 0 7.549-2.822 8.18-6.272h-4.02c-.467 1.609-1.916 2.868-4.114 2.868zM24 12.068l-3.466 8.055-2.38-1.022 2.992-7.055-3.01-7.096 2.433-1.042Z" />
+  </svg>
+);
+
 const Copy = (props: IconProps) => (
   <svg
     class={props.class}
@@ -354,6 +369,21 @@ const Embed = (props: IconProps) => (
   </svg>
 );
 
+const Erlang = (props: IconProps) => (
+  <svg
+    class={props.class}
+    stroke="currentColor"
+    fill="currentColor"
+    stroke-width="0"
+    viewBox="0 0 24 24"
+    height="1em"
+    width="1em"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path d="M8.859 7.889c.154-1.863 1.623-3.115 3.344-3.119 1.734.004 2.986 1.256 3.029 3.119zm12.11 11.707c.802-.86 1.52-1.872 2.172-3.03l-3.616-1.807c-1.27 2.064-3.127 3.965-5.694 3.977-3.738-.012-5.206-3.208-5.198-7.322h13.966c.019-.464.019-.68 0-.904.091-2.447-.558-4.504-1.737-6.106l-.007.005H24v15.186h-3.039zm-17.206-.001C1.901 17.62.811 14.894.813 11.64c-.002-2.877.902-5.35 2.456-7.232H0v15.187h3.761Z" />
+  </svg>
+);
+
 const ExternalLink = (props: IconProps) => (
   <svg
     class={props.class}
@@ -418,6 +448,21 @@ const Flickr = (props: IconProps) => (
   </svg>
 );
 
+const Flutter = (props: IconProps) => (
+  <svg
+    class={props.class}
+    stroke="currentColor"
+    fill="currentColor"
+    stroke-width="0"
+    viewBox="0 0 24 24"
+    height="1em"
+    width="1em"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path d="M14.314 0L2.3 12 6 15.7 21.684.013h-7.357zm.014 11.072L7.857 17.53l6.47 6.47H21.7l-6.46-6.468 6.46-6.46h-7.37z" />
+  </svg>
+);
+
 const GitHub = (props: IconProps) => (
   <svg
     class={props.class}
@@ -542,6 +587,21 @@ const MailingList = (props: IconProps) => (
   </svg>
 );
 
+const MavenApache = (props: IconProps) => (
+  <svg
+    class={props.class}
+    stroke="currentColor"
+    fill="currentColor"
+    stroke-width="0"
+    viewBox="0 0 24 24"
+    height="1em"
+    width="1em"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path d="M4.237.001c-.312-.013-.665.072-.828.457-.158.374-.283 1.188-.34 2.276l1.223.591c-.02-.737.007-1.43.076-2.066-.026.299-.056.96.006 2.039.019.342.049.725.088 1.15.002.024.002.047.007.069a45.485 45.485 0 0 0 .309 2.412c.057.368.126.752.195 1.16l-.01.01c.014.01.015.018.014.023l.03.16c.03.162.06.328.093.494l.108.553.056.289a61.72 61.72 0 0 0 .457 2.068c.09.382.186.78.287 1.186.098.386.199.783.309 1.193.096.362.199.735.303 1.117.003.018.012.036.015.055a145.826 145.826 0 0 0 .34 1.185l.049.174c.078.261.158.533.242.805a4.2 4.2 0 0 1-.293-.135l-.19-.654c-.02-.077-.042-.148-.062-.225l-.002-.004-.004-.002c-.087-.3-.17-.607-.257-.916-.023-.087-.044-.173-.069-.263l-.314-1.178c-.1-.381-.194-.765-.29-1.154-.094-.39-.185-.78-.277-1.172-.093-.401-.181-.8-.265-1.203-.085-.396-.161-.798-.24-1.193a50.315 50.315 0 0 1-.211-1.17c-.004-.013-.006-.03-.01-.041l.004-.002c-.057-.386-.116-.77-.174-1.15a60.905 60.905 0 0 1-.154-1.204 27.447 27.447 0 0 1-.172-2.41l-1.22-.59c-.004.074-.01.15-.013.23-.012.294-.02.605-.023.93a45.3 45.3 0 0 0 .006 1.157c.009.37.025.755.045 1.148.02.336.042.675.07 1.022l.002.039.006.004c.003.023.007.05.006.076.033.368.064.739.107 1.115a34.493 34.493 0 0 0 .303 2.125c.01.064.024.131.035.195a23.418 23.418 0 0 0 .547 2.32c.07.237.14.464.21.68.063.182.13.365.194.545.155.422.327.832.512 1.232l.006.004a.318.318 0 0 0 .02.05c.225.485.475.95.755 1.395.01.013.02.033.03.047-.455-.183-1.259-.098-1.253-.097.83.288 1.557.64 2.016 1.175-.183.2-.523.352-.953.477.594.064.924-.039 1.045-.092-.31.26-.483.732-.635 1.24.35-.57.696-.949 1.033-1.094.078.258.162.524.244.788A147.532 147.532 0 0 0 5.157 24a.56.56 0 0 0 .43-.312c.13-.282.83-1.775 1.908-3.875.413 1.303.88 2.679 1.386 4.109a.494.494 0 0 0 .076-.465 103.735 103.735 0 0 1-1.308-3.945c.154-.299.316-.612.484-.932.125.04.255.094.389.155.203.186.352.491.482.84a1.515 1.515 0 0 0-.334-1.098c1.335.258 2.547.09 3.287-.81a3.97 3.97 0 0 0 .192-.258c-.325.304-.682.404-1.313.273.996-.281 1.523-.617 2.035-1.22.12-.145.244-.303.371-.48-.943.722-1.927.822-2.9.493l-.045-.018c.914.02 2.203-.474 3.092-1.189.41-.33.796-.73 1.17-1.21.28-.359.55-.76.82-1.216.234-.393.468-.824.7-1.293a2.83 2.83 0 0 1-.74.137l-.144.008c-.048.002-.093 0-.146.002.885-.198 1.5-.74 1.994-1.447-.24.117-.628.262-1.07.297-.058.006-.12.006-.182.006-.013-.002-.028 0-.047-.002.306-.078.574-.178.81-.309a3.363 3.363 0 0 0 .358-.236c.044-.037.088-.07.13-.106.099-.086.193-.18.28-.287.028-.034.056-.063.08-.098.036-.05.073-.098.104-.146a8.388 8.388 0 0 0 .51-.828c.015-.031.032-.057.046-.088.04-.084.08-.16.11-.227.042-.099.074-.179.092-.238a.515.515 0 0 1-.108.051c-.273.112-.727.187-1.086.201-.004 0-.008 0-.013.004h-.067c.72-.214 1.067-.45 1.422-.818a13.883 13.883 0 0 0 1.154-1.428c.264-.37.505-.738.692-1.072a6.5 6.5 0 0 0 .298-.592c.066-.157.122-.305.172-.45-.466.01-.986.011-1.48 0 .495.01 1.015.007 1.484-.005.5-1.485.063-2.262.063-2.262s-.526-1.212-1.4-.851c-.426.175-1.172.73-2.083 1.56l.514 1.45a17.561 17.561 0 0 1 1.703-1.602c-.257.22-.807.726-1.615 1.644-.256.29-.537.624-.844.997-.017.02-.035.038-.047.06a51.435 51.435 0 0 0-1.666 2.187c-.248.34-.498.704-.765 1.088h-.016c.002.02-.004.028-.01.032l-.101.152c-.104.155-.213.31-.318.47l-.352.534c-.061.09-.124.181-.186.277-.184.282-.367.573-.558.873a97.351 97.351 0 0 0-1.428 2.338 96.866 96.866 0 0 0-1.341 2.343c-.012.017-.02.04-.034.057a197.256 197.256 0 0 0-.668 1.223l-.097.181c-.17.318-.346.642-.52.979 0 .004-.005.008-.006.013-.026.048-.05.093-.072.141-.117.222-.218.424-.45.87a1.352 1.352 0 0 0-.233-.182l.345-.65c.047-.089.096-.177.143-.27l.04-.077.546-1.001.13-.233v-.006l-.001-.006c.169-.31.345-.62.52-.94.051-.087.102-.173.153-.265.224-.395.454-.794.684-1.197a91.685 91.685 0 0 1 2.135-3.504c.247-.386.503-.77.754-1.152.092-.138.182-.272.279-.41a72.9 72.9 0 0 1 .48-.701c.007-.012.019-.024.026-.037h.006c.26-.356.517-.713.773-1.065.278-.373.554-.735.83-1.09a31.075 31.075 0 0 1 1.777-2.075l-.515-1.446c-.06.057-.126.116-.192.178a32.37 32.37 0 0 0-.758.729c-.295.294-.597.606-.912.935a46.032 46.032 0 0 0-1.632 1.838l-.03.033.002.008c-.017.02-.033.044-.054.064-.266.323-.538.649-.801.985a39.105 39.105 0 0 0-1.445 1.95c-.043.06-.085.126-.127.186a26.458 26.458 0 0 0-1.403 2.303c-.13.247-.256.485-.37.715-.096.195-.187.395-.278.591-.21.463-.398.93-.566 1.399l.002.006a.36.36 0 0 0-.026.058c-.108.303-.203.608-.29.914-.14.174-.302.325-.483.46a3.505 3.505 0 0 0-.131-.153 5.148 5.148 0 0 0 .824-2.211 6.4 6.4 0 0 0-.016-1.488c-.046-.4-.126-.82-.238-1.274-.097-.393-.217-.81-.363-1.248-.091.185-.22.367-.379.545l-.086.094c-.029.032-.06.06-.092.094.434-.674.486-1.397.358-2.148a2.722 2.722 0 0 1-.49.85c-.033.038-.072.077-.11.116-.01.007-.019.018-.033.028.144-.24.25-.467.318-.698a1.29 1.29 0 0 0 .04-.146 2.85 2.85 0 0 0 .038-.225l.018-.146a2.11 2.11 0 0 0-.002-.354c-.003-.04-.004-.076-.01-.113-.01-.055-.016-.105-.027-.154a7.416 7.416 0 0 0-.193-.84c-.01-.028-.015-.056-.026-.084-.027-.079-.048-.149-.072-.209a2.1 2.1 0 0 0-.09-.209.455.455 0 0 1-.035.1c-.102.24-.34.57-.557.8-.003.003-.007.005-.007.01l-.04.043c.318-.58.39-.946.385-1.398a12.274 12.274 0 0 0-.16-1.615 10.68 10.68 0 0 0-.232-1.104 5.853 5.853 0 0 0-.18-.558 6.337 6.337 0 0 0-.172-.391 26.18 26.18 0 0 0 .002-.004C5.576.341 4.82.124 4.82.124s-.27-.11-.582-.123zm3.38 15.783l.032.082v.002c-.06.033-.116.067-.178.097-.012.004-.024.012-.039.018a2.41 2.41 0 0 0 .186-.2zm-.603 1.626c.13.136.25.242.354.32l.07.227a1.866 1.866 0 0 0-.246.053l-.03-.098c-.024-.084-.048-.17-.076-.257l-.021-.073zm.26.875a2.34 2.34 0 0 1 .271.01l.07.229a.778.778 0 0 1 .247-.004l-.326.627a127.643 127.643 0 0 1-.262-.862z" />
+  </svg>
+);
+
 const Menu = (props: IconProps) => (
   <svg
     class={props.class}
@@ -608,6 +668,36 @@ const NotImage = (props: IconProps) => (
   </svg>
 );
 
+const NPM = (props: IconProps) => (
+  <svg
+    class={props.class}
+    stroke="currentColor"
+    fill="currentColor"
+    stroke-width="0"
+    viewBox="0 0 24 24"
+    height="1em"
+    width="1em"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path d="M1.763 0C.786 0 0 .786 0 1.763v20.474C0 23.214.786 24 1.763 24h20.474c.977 0 1.763-.786 1.763-1.763V1.763C24 .786 23.214 0 22.237 0zM5.13 5.323l13.837.019-.009 13.836h-3.464l.01-10.382h-3.456L12.04 19.17H5.113z" />
+  </svg>
+);
+
+const Nuget = (props: IconProps) => (
+  <svg
+    class={props.class}
+    stroke="currentColor"
+    fill="currentColor"
+    stroke-width="0"
+    viewBox="0 0 24 24"
+    height="1em"
+    width="1em"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path d="M1.998.342a1.997 1.997 0 1 0 0 3.995 1.997 1.997 0 0 0 0-3.995zm9.18 4.34a6.156 6.156 0 0 0-6.153 6.155v6.667c0 3.4 2.756 6.154 6.154 6.154h6.667c3.4 0 6.154-2.755 6.154-6.154v-6.667a6.154 6.154 0 0 0-6.154-6.155zm-1.477 2.8a2.496 2.496 0 1 1 0 4.993 2.496 2.496 0 0 1 0-4.993zm7.968 6.16a3.996 3.996 0 1 1-.002 7.992 3.996 3.996 0 0 1 .002-7.992z" />
+  </svg>
+);
+
 const OpenssfBestPractices = (props: IconProps) => (
   <svg
     class={props.class}
@@ -640,6 +730,37 @@ const OsanoCookie = (props: IconProps) => (
   </svg>
 );
 
+const PackageManager = (props: IconProps) => (
+  <svg
+    class={props.class}
+    stroke="currentColor"
+    fill="currentColor"
+    stroke-width="0"
+    viewBox="0 0 256 256"
+    height="1em"
+    width="1em"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path d="M128,129.09V232a8,8,0,0,1-3.84-1l-88-48.18a8,8,0,0,1-4.16-7V80.18a8,8,0,0,1,.7-3.25Z" opacity="0.2" />
+    <path d="M223.68,66.15,135.68,18a15.88,15.88,0,0,0-15.36,0l-88,48.17a16,16,0,0,0-8.32,14v95.64a16,16,0,0,0,8.32,14l88,48.17a15.88,15.88,0,0,0,15.36,0l88-48.17a16,16,0,0,0,8.32-14V80.18A16,16,0,0,0,223.68,66.15ZM128,32l80.34,44-29.77,16.3-80.35-44ZM128,120,47.66,76l33.9-18.56,80.34,44ZM40,90l80,43.78v85.79L40,175.82Zm176,85.78h0l-80,43.79V133.82l32-17.51V152a8,8,0,0,0,16,0V107.55L216,90v85.77Z" />
+  </svg>
+);
+
+const Packagist = (props: IconProps) => (
+  <svg
+    class={props.class}
+    stroke="currentColor"
+    fill="currentColor"
+    stroke-width="0"
+    viewBox="0 0 24 24"
+    height="1em"
+    width="1em"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path d="M13.214 23.975c-.098-.053-.329-.062-1.615-.062h-1.26l-.017-.088-.096-.431a3.622 3.622 0 0 1-.07-.354c.005-.007-.012-.056-.038-.107l-.048-.094-.547.085c-.301.046-.598.1-.659.116-.1.03-.11.03-.103.004.038-.14.044-.201.028-.266-.018-.07-.017-.072.238-.645.276-.622.266-.594.237-.634-.018-.025-.042-.02-.307.07-.159.05-.294.093-.301.09a16.82 16.82 0 0 1 .414-.732c.451-.773.566-.976.566-1.003 0-.01-.12-.146-.271-.304-.15-.157-.311-.329-.357-.384a.584.584 0 0 0-.112-.11c-.05-.017-.264-.231-.738-.734a16.196 16.196 0 0 0-.525-.542c-.062-.05-.077-.074-.107-.175a6.511 6.511 0 0 0-.291-.714l-.096-.201v-.178c0-.271-.056-.542-.277-1.331l-.054-.191-.087-.01c-.193-.017-.283-.123-.431-.504a6.231 6.231 0 0 0-.231-.472c-.1-.191-.221-.428-.271-.532l-.086-.185-.08-.01a.72.72 0 0 0-.361.05c-.12.05-.345.063-.618.037l-.399-.038-.199-.02-.107-.191c-.161-.284-.161-.285-.238-.324-.09-.046-.161-.046-.572 0l-.325.035-.245-.035c-.645-.094-.797-.166-.797-.375 0-.042-.045-.261-.102-.489-.13-.528-.218-1.126-.195-1.332.034-.294.273-.996.636-1.87l.142-.341.023-.547c.142-3.274.178-3.76.284-3.951.035-.062.468-.431.644-.552.335-.224 1.503-.8 2.802-1.379l.384-.171.195-.012.193-.01.522.329.521.329.423-.2.658-.308c.235-.108.236-.11.367-.253.184-.201.492-.566.592-.703.118-.161.395-.388.816-.672.147-.098.185-.116.569-.264l.231-.09h.49c.451 0 .502.003.655.037.358.078.652.193.686.267.022.05.07.08.187.12.14.048.311.168 1.224.863.489.373.472.366 1.539.719l.298.1.176.211c.201.241.358.404.404.419.07.022.485-.08 1.009-.249.266-.085.303-.093.351-.077.03.01.175.02.321.02.271.005.514.034 1.117.137.153.027.281.048.283.048.002 0 .244.419.537.933.293.512.61 1.048.705 1.192.167.249.174.264.189.375.026.191.08 1.008.09 1.309l.023.896c.02.843.036 1.04.09 1.154.093.199.276.747.572 1.719l.12.401.008.930-.14.728-.158.813-.016.083-.439.264-.441.265-.321-.016c-.179-.01-.335-.016-.349-.016-.03 0-.066.113-.135.411-.04.176-.042.178-.092.187l-.666.106c-.92.145-1.037.181-1.341.424-.264.211-.264.208-.556 1.681a16.97 16.97 0 0 1-.185.856c-.105.317-.941 1.708-1.246 2.074l-.165.199.064.228c.035.126.073.265.083.309.016.07.314 1.206.421 1.609l.038.14-.201-.084-.328-.136a.549.549 0 0 0-.13-.046c-.003.004.033.15.08.327.08.288.187.763.177.773-.003 0-.15-.008-.331-.022a6.185 6.185 0 0 0-.381-.02l-.055.005-.181.662c-.1.363-.184.664-.187.667-.01.007-.536-.02-1.005-.05-.54-.035-.7-.032-.836.017-.125.045-.241.05-.306.014l.002-.001zm1.957-.348c0-.026.023-.181.05-.345.027-.165.05-.337.05-.383 0-.056.013-.116.04-.175.02-.05.036-.09.033-.093-.002-.002-.368-.03-.813-.062-.637-.046-.86-.067-1.053-.103l-.244-.046-.58.072c-.414.05-.588.078-.607.095-.02.02-.201.042-.712.094-.376.038-.717.075-.756.083l-.072.013.004.083c.003.065.02.115.083.231.06.113.088.191.12.331.02.1.042.184.046.188.003.003.973.014 2.157.023 2.034.016 2.154.018 2.191.045.046.035.064.02.064-.05l-.001-.001zm-4.782-1.179c.873-.123 1.226-.168 1.572-.194.387-.028.897-.087 1.259-.143.057-.01.248-.02.424-.026l.321-.01.377.097.379.098.682.04c.377.023.687.04.69.036a2.93 2.93 0 0 0-.07-.229c-.042-.122-.11-.333-.155-.468l-.077-.244-.231-.072-.231-.073-.156.066-.156.065-1.776.057-1.774.058-.118-.06-.118-.057H9.8l-.269.597c-.148.328-.271.602-.276.609-.008.016-.124.03 1.134-.147zm6.127-1.036c0-.017-.431-1.435-.444-1.457-.007-.012-.05.024-.115.096l-.105.115.154.568.153.568.169.06c.181.064.191.067.191.05zm-6.788-.713l.191-.355-.057-.083c-.032-.046-.063-.08-.068-.073-.007.006-.142.238-.303.515s-.297.511-.302.517c-.004.01.072-.026.171-.075l.176-.09.192-.356zm2.957-.072c.106-.306.193-.562.193-.57a.856.856 0 0 0-.198-.075 3.495 3.495 0 0 1-.201-.066.578.578 0 0 1 .063-.11l.068-.104.405-.02c.706-.033 1.114-.155 1.51-.451.15-.11.214-.128.296-.085.07.04.12.128.106.191-.01.042-.028.056-.241.197-.201.13-.876.428-1.114.492-.136.035-.289.12-.323.181-.04.066-.159.92-.132.947.006.006 1.148-.04 1.33-.056.11-.008.117-.01.161-.067.024-.032.13-.153.238-.267.106-.113.301-.333.431-.488.13-.154.328-.381.437-.502.171-.189.263-.318.619-.857.878-1.324.937-1.441 1.003-1.969.045-.375.067-.447.214-.697.146-.249.294-.965.213-1.033-.072-.06-.153-.032-.427.15-.512.341-1.039.841-1.114 1.053-.034.095-.223.373-.285.418l-.519.369c-.582.414-.52.349-.849.879l-.11.174-.327.173-.328.171-.616.015c-1.23.028-1.288.022-1.943-.207l-.431-.153-.344-.303c-.191-.168-.53-.47-.754-.672l-.407-.368-.142-.321a28.99 28.99 0 0 1-.497-1.15c-.084-.226-.09-.231-.275-.428-.341-.361-.529-.757-.757-1.612-.045-.165-.078-.259-.1-.281-.018-.016-.028-.022-.023-.012.006.01 0 .046-.012.082-.157.441-.209.768-.249 1.559-.02.359-.02.351.096.983.225 1.226.296 1.5.409 1.565.04.024.165.146.291.286.341.376.448.485.604.61.285.231.735.71.901.961.04.06.102.14.135.177.15.163.462.6.899 1.259l.314.475.13-.007c.09-.006.329.012.74.054.336.035.635.064.665.065h.056l.191-.555zm-2.276.455a1.103 1.103 0 0 0-.122-.201c-.075-.107-.14-.195-.15-.191-.01.003-.138.268-.181.374-.01.031.341.044.453.018zm2.766-2.758c.046-.033.127-.055.376-.105.311-.06.375-.083.628-.211a.309.309 0 0 0 .092-.11.74.74 0 0 1 .11-.138c.04-.036.055-.062.055-.098 0-.078.227-.275 1.091-.946a.9.9 0 0 0 .245-.268c.074-.11.158-.211.263-.309.085-.08.291-.284.459-.451.168-.171.391-.376.497-.462a3.44 3.44 0 0 0 .241-.204c.03-.032.157-.106.335-.196.159-.08.295-.156.301-.168.018-.03.09-.06.508-.217.889-.331 1.479-.492 1.79-.492.08 0 .096-.052.067-.219-.068-.395-.296-.552-.808-.552h-.181l-.063-.067c-.06-.065-.067-.087-.124-.325-.115-.485-.185-.532-.742-.516-.435.013-.552.06-1.754.718-.602.331-1.035.702-1.543 1.33a.964.964 0 0 1-.11.123c-.311-.002-.303-.472.017-.949l.106-.157-.084-.035c-.236-.107-.532-.123-.74-.04-.291.116-1.023.525-1.117.622-.098.103-.187.106-.187.007 0-.122.114-.285.289-.411.04-.032.11-.088.153-.127a1.63 1.63 0 0 1 .435-.261c.147-.06.142-.052.09-.15-.14-.255-.525-.546-.915-.689-.05-.02-.169-.07-.263-.112-.221-.102-.331-.124-.672-.136-.244-.01-.283-.014-.267-.033.074-.09.311-.133.79-.144l.384-.01.248.11c.697.301.963.462 1.074.645.076.128.084.133.194.112.266-.05.518.032.765.249.135.12.184.13.274.063a.773.773 0 0 0 .273-.502c.035-.271-.06-1.136-.153-1.385-.07-.188-.057-.196.087-.046.171.178.171.178.326-.11.04-.076.103-.176.138-.221.291-.367.281-1.047-.017-1.347-.15-.15-.404-.291-.815-.446-.403-.155-.47-.211-.77-.628-.361-.506-.425-.567-.724-.708-.617-.293-2.101-.562-2.57-.467-.441.09-1.04.447-1.32.789-.175.213-.63.377-1.274.462-.84.108-1.254.828-1.041 1.806.04.191.038.189.165.034.405-.505 1.209-.976 1.93-1.13.575-.12 1.475-.126 2.01-.01l.096.022h-.144c-.75.01-1.904.257-2.722.584l-.176.07-.016.087c-.015.083-.022.093-.281.351-.536.539-.69.796-.775 1.286-.04.239.036.589.15.678.027.022.047.05.042.06a2.825 2.825 0 0 0-.026.225c-.076.845.323 1.866.96 2.453l.144.133.108-.09c.317-.259.859-.614.888-.582.043.05.034.09-.033.155-.085.082-.196.226-.496.642l-.259.361.007.104c.01.13.076.337.147.451.03.046.09.15.136.229.167.284.321.52.424.642.096.117.184.241.284.401.028.046.05.064.07.06.04-.01.09.026.279.204.186.171.083.122.845.408.823.309 1.131.369 1.465.286.09-.022.097-.022.168.015.09.047.09.047.163-.002v.005zm-6.348-3.82c.003-.003.02-.103.037-.225.017-.12.053-.286.08-.367l.193-.644c.177-.602.159-.55.178-.52.025.042.015-.01-.016-.074a1.69 1.69 0 0 1-.066-.171l-.034-.108.034-.588.034-.589-.055-.397a6.234 6.234 0 0 0-.064-.406c-.032-.032-.464.145-.599.245-.175.13-.401.679-.492 1.194-.12.694-.008 1.647.226 1.916.07.08.226.378.357.68l.034.077.075-.01a.347.347 0 0 0 .078-.013zm14.775-1.31c.126-.088.238-.177.246-.196.015-.037.213-1.099.281-1.507l.042-.257-.042-.447-.042-.446-.125-.48c-.124-.475-.128-.484-.264-.755-.216-.431-.194-.236-.379-3.358l-.035-.578-.053-.055c-.07-.075-.337-.458-.963-1.388a14.255 14.255 0 0 0-.546-.781 16.04 16.04 0 0 0-.821-.146c-.395-.055-.736-.025-1.055.094-.128.048-.14.05-.201.03-.138-.047-.293-.003-.569.164l-.145.087-.166-.221c-.191-.251-.194-.255-.57-.502-.64-.416-.716-.449-1.632-.692-.353-.094-.311-.062-.993-.742l-.535-.532-.585.008c-.989.015-1.482.06-1.6.142-.712.508-1.094.888-1.538 1.531l-.103.15-.386.184c-.422.203-1.034.392-1.201.369-.092-.012-.421-.18-.658-.341-.438-.291-.739-.326-1.088-.124-.284.163-.483.269-1.286.675-.861.437-.965.496-1.246.705l-.164.123-.143.288c-.311.626-.305.602-.321 1.415-.03 1.52-.035 2.008-.016 2.122.03.179.036.374.016.505-.028.171-.387 1.387-.585 1.977-.066.199-.135.52-.159.736-.01.07 0 .175.036.391.026.164.07.451.097.64.066.464.12.562.358.64.209.07.309.063.732-.045.793-.203.813-.197 1.134.378.078.137.112.184.143.193.105.03.725.01.866-.027l.194-.05.056-.015-.02-.096a2.414 2.414 0 0 1-.023-.624c.024-.268.064-.506.153-.889.004-.017-.006-.004-.022.03l-.03.06-.035-.157a1.876 1.876 0 0 0-.291-.672 6.435 6.435 0 0 1-.421-.87l-.093-.231.01-.161c.05-.718.224-1.186.597-1.595.227-.248.293-.351.325-.522.025-.13.106-.807.171-1.395l.057-.547.241-.715c.13-.394.231-.722.225-.728a9.003 9.003 0 0 0-.693-.321c-.124-.035-.412-.023-.632.027-.705.161-1.224.532-1.25.893-.007.08-.362.827-.395.828-.02 0-.074-.098-.093-.169-.02-.074-.012-.115.073-.351.032-.088.097-.307.145-.487.12-.443.14-.477.405-.599l.467-.221c.675-.325 1.657-.578 1.899-.49.143.05.359.226.552.446l.092.104-.09.246c-.458 1.266-.575 1.617-.606 1.823-.071.458-.066 1.465.008 1.695.058.188.054.195-.223.377-.477.316-.953.919-.973 1.233-.013.211.09.634.221.888.052.105.589.913.606.913.006 0 .03-.04.057-.09a1.9 1.9 0 0 1 .704-.773c.316-.204.317-.204.341-.313.161-.725.425-1.144.88-1.385l.197-.105-.095-.035c-.145-.053-.271-.143-.428-.308-.697-.733-.966-1.566-.688-2.127.02-.04.052-.122.072-.184.245-.755.931-1.164 1.842-1.101.896.063 1.294.296 1.618.94.311.624.294 1.191-.055 1.751l-.066.106.06-.058c.068-.063.766-.374.946-.421.268-.07.659-.03 1.894.193.499.09.584.125.823.341.05.048.09.076.09.064s-.01-.104-.025-.206c-.083-.617.034-1.401.269-1.786.284-.466 1.375-.883 1.974-.754.301.065.769.355 1.021.635.032.036.06.056.06.045 0-.01-.02-.325-.04-.699a11.12 11.12 0 0 1-.03-.689c.008-.006.144-.084.306-.174l.293-.161.052.04c.044.032.169.063.78.191l.763.164c.027.006.085.09.216.307.097.164.271.448.388.632.425.68.502.856.411.941-.093.087-.108.086-.169-.007-.03-.045-.201-.314-.379-.595a16.068 16.068 0 0 0-.351-.539c-.02-.02-.998-.346-1.487-.497-.239-.073-.492 1.151-.434 2.099.02.319.02.321.291.57.169.156.858 1.126.993 1.397l.067.136-.006.826-.005.825-.105.177c-.441.742-.694 1.021-.985 1.096-.161.04-.339.175-.324.241.005.022.013.154.02.291.006.167.016.253.027.253.01 0 .073-.01.14-.023.455-.087.958-.057 1.261.073.11.047.116.064.128.344.017.375.042.407.353.457.348.055.468.114.695.344l.128.13.462.002.462.002.245-.168zM9.954 3.808a13.19 13.19 0 0 0-.833-.494c-.338-.171-.351-.201-.117-.309.341-.157.474-.11.908.315.168.165.369.349.448.411.156.118.328.275.328.297 0 .027-.115.14-.14.14a8.7 8.7 0 0 1-.594-.36zm3.987.19a.518.518 0 0 1-.235-.191l-.042-.07.03-.068c.04-.095.076-.13.231-.231.074-.05.159-.11.188-.134.159-.14 1.179-.558 1.358-.558.1 0 .13.02.176.125a.63.63 0 0 0 .065.12c.05.056-.06.115-.341.179-.15.034-.502.176-.818.328l-.258.125-.148.201c-.08.11-.15.201-.15.201L13.94 4l.001-.002zm2.25 8.609c.117-.103.612-.334.898-.418.104-.03.171-.307.171-.72v-.234l-.092-.191c-.097-.201-.203-.378-.221-.371-.006.002-.203.251-.437.556l-.427.552.01.249.01.444c0 .225-.006.218.09.134l-.002-.001zm1.639-1.799l.344-.132.112-.169c.391-.592.512-.901.529-1.379l.01-.308-.228-.361c-.386-.607-.636-1.018-.722-1.187a.36.36 0 0 0-.062-.1c-.062-.04-.245.12-.458.401-.15.201-.226.254-.674.478-.592.295-.876.341-1.292.213a7.003 7.003 0 0 0-.552-.156c-.042 0 .133.206.294.347.126.11.221.161.346.181.191.03.547.231 1.094.612.303.214.261.133.291.55l.027.351.08.078c.1.098.214.251.381.51.07.112.13.205.132.205l.348-.134zm-1.719-3.119c.446-.164.704-.665.527-1.023-.194-.391-.634-.702-.998-.702-.425 0-.979.482-.979.853 0 .008.058-.038.127-.104.329-.311.692-.346 1.05-.105.385.258.469.77.173 1.064-.078.08-.067.08.1.02v-.003zm-7.704-.16a.963.963 0 0 1-.026-.396c.145-.778 1.09-1.005 1.51-.364l.064.1-.009-.129c-.069-.971-1.094-1.234-1.726-.443-.356.447-.299 1.13.105 1.274.103.036.107.034.08-.042h.002zm8.86-.527c.261-.439.226-1.053-.088-1.53-.421-.642-1.084-.841-1.806-.542-.559.231-.776.517-.825 1.081-.022.251-.012.281.058.176.238-.354.644-.547 1.094-.522.712.038 1.24.539 1.385 1.316l.034.183.008.04.04-.05a1.56 1.56 0 0 0 .1-.154v.002zm-1.431.09a.125.125 0 0 0 .04-.096.127.127 0 0 0-.04-.095.128.128 0 0 0-.096-.04c-.04 0-.07.013-.097.04a.13.13 0 0 0-.038.096c0 .123.146.185.233.098l-.002-.003zm-8.218-.209c.138-.773.732-1.289 1.48-1.289.485 0 .838.274 1.043.809.054.14.06.143.087.035.07-.274-.01-.848-.163-1.149-.26-.518-1.032-.779-1.751-.591-.415.106-.9.64-.997 1.097-.1.468-.038.849.191 1.167.077.108.077.108.11-.08v.001zm1.928 0a.128.128 0 0 0 .04-.096c0-.04-.013-.07-.04-.097-.027-.028-.056-.041-.096-.041s-.07.013-.096.04a.128.128 0 0 0-.04.097.136.136 0 0 0 .232.097z" />
+  </svg>
+);
+
 const PDF = (props: IconProps) => (
   <svg
     class={props.class}
@@ -655,6 +776,21 @@ const PDF = (props: IconProps) => (
   </svg>
 );
 
+const Perl = (props: IconProps) => (
+  <svg
+    class={props.class}
+    stroke="currentColor"
+    fill="currentColor"
+    stroke-width="0"
+    viewBox="0 0 24 24"
+    height="1em"
+    width="1em"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path d="M11.638 0c-.148 0-.207.689-.252 2.925-.058 2.86-.07 2.949-.51 3.914-.36.793-1.623 2.676-2.037 3.04-.373.328-1.183 1.56-1.58 2.401-.71 1.504-.659 3.52-.04 5.047.518 1.194 1.262 2.156 2.46 3.182.94.805 1.23.919 1.375.544.049-.128-.162-.572-.483-1.018-.313-.436-.843-1.362-1.178-2.059-1.382-2.926-.7-5.357.902-8.045.89-1.393 1.403-2.642 1.579-3.852.22-1.515.043-6.079-.236-6.079zm-.757 1.215c-.186 0-.228.26-.228 1.422 0 .782-.08 1.654-.177 1.938-.312.914-1.154 1.737-3.482 3.404-1.684 1.205-3.096 2.652-3.64 3.732-1.666 3.299-.195 7.311 3.42 9.333 1.613.902 2.966 1.253 2.966.768 0-.126-.054-.228-.121-.228s-.632-.332-1.254-.738c-2.69-1.755-3.947-3.927-3.747-6.482.15-1.91.873-3.08 3.796-6.135 2.522-2.636 2.69-2.97 2.693-5.304.001-1.42-.036-1.71-.226-1.71zm1.508.632c-.103.017-.14.905-.142 2.903l-.004 2.926-.744 2.812c-.83 2.54-.954 5.133-.345 7.725.558 2.202.796 2.638 1.567 2.857.343.098.89.355 1.216.572.736.49 1.395.435 2.715-.232 1.92-.97 3.209-2.222 4.067-3.953.745-1.648.856-3.71.068-5.35-.7-1.414-1.882-2.554-4.358-4.197-2.162-1.436-2.617-1.82-3.15-2.652-.322-.503-.369-.724-.308-1.444.04-.468.126-.978.192-1.134.101-.239.069-.268-.202-.182-.26.082-.34.027-.42-.286-.061-.245-.112-.372-.152-.365zm.714 4.586c.034-.007.135.113.252.306.144.237 1.022 1 1.952 1.697 2.888 2.189 5.27 4.378 4.087 8.2-.405 1.146-.99 2.07-1.963 3.098-.544.575-1.266 1.09-1.53 1.09-.047 0 .252-.43.664-.954 1.337-1.7 1.972-3.718 1.79-5.674-.168-1.796-1.557-3.975-3.753-5.89-.912-.796-1.518-1.536-1.512-1.846 0-.016.005-.025.013-.027zm-1.089 15.492c-.208-.006-.297.349-.297 1.121 0 .94.018.988.342.942.302-.042.347-.15.387-.899.032-.613-.019-.902-.183-1.039-.097-.08-.18-.123-.249-.125zm-1.052.28c-.124-.002-.226.14-.327.43-.085.245-.253.481-.373.527-.322.124-.264.55.075.55.162 0 .402-.109.534-.24.441-.442.579-.824.382-1.062-.111-.134-.206-.203-.29-.205zm2.074.063c-.312 0-.28.61.053 1.034.309.392.908.567.908.264 0-.252-.775-1.298-.961-1.298z" />
+  </svg>
+);
+
 const PNG = (props: IconProps) => (
   <svg
     class={props.class}
@@ -671,6 +807,51 @@ const PNG = (props: IconProps) => (
   </svg>
 );
 
+const PyPi = (props: IconProps) => (
+  <svg
+    class={props.class}
+    stroke="currentColor"
+    fill="currentColor"
+    stroke-width="0"
+    viewBox="0 0 24 24"
+    height="1em"
+    width="1em"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path d="M23.922 13.58v3.912L20.55 18.72l-.078.055.052.037 3.45-1.256.026-.036v-3.997l-.053-.036-.025.092z M23.621 5.618l-3.04 1.107v3.912l3.339-1.215V5.509zM23.92 13.457V9.544l-3.336 1.215v3.913zM20.47 14.71V10.8L17.17 12v3.913zM17.034 19.996v-3.912l-3.313 1.206v3.912zM17.17 16.057v3.868l3.314-1.206V14.85l-3.314 1.206zm2.093 1.882c-.367.134-.663-.074-.663-.463s.296-.814.663-.947c.365-.133.662.075.662.464s-.297.814-.662.946z M13.225 9.315l.365-.132-3.285-1.197-3.323 1.21.102.037 3.184 1.16zM20.507 10.664V6.751L17.17 7.965v3.913zM17.058 11.918V8.005l-3.302 1.202v3.912zM13.643 9.246l-3.336 1.215v3.913l3.336-1.215zM6.907 13.165l3.322 1.209v-3.913L6.907 9.252z M10.34 7.873l3.281 1.193V5.198l-3.28-1.193zM20.507 2.715L17.19 3.922v3.913l3.317-1.207zM16.95 3.903L13.724 2.73l-3.269 1.19 3.225 1.174zM15.365 4.606l-1.624.592v3.868l3.317-1.207V3.991l-1.693.615zm-.391 2.778c-.367.134-.662-.074-.662-.464s.295-.813.662-.946c.366-.133.663.074.663.464s-.297.813-.663.946z M10.229 18.41v-3.914l-3.322-1.209V17.2zM13.678 17.182v-3.913l-3.371 1.227v3.913z M13.756 17.154l3.3-1.2V12.04l-3.3 1.2zM13.678 21.217l-3.371 1.227v-3.912h-.078v3.912l-3.322-1.209v-3.913l-.053-.058-.025-.06-3.336-1.21v-3.948l.034.013 3.287 1.196.015-.078-3.261-1.187 3.26-1.187v-.109L3.876 9.62l-.307-.112 3.26-1.188v.877l.079-.055V6.769l3.257 1.185.058-.061L7.084 6.75l-.102-.037 3.24-1.179v-.083L6.854 6.677v.018l-.025.018v1.523L3.44 9.47v.02l-.025.017v4.007l-3.39 1.233v.019L0 14.784v3.995l.025.037 3.4 1.237.008-.006.007.01 3.4 1.238.008-.006.006.01 3.4 1.237.014-.009.012.01 3.45-1.256.026-.037-.078-.027zM3.493 9.563l3.257 1.185-3.257 1.187V9.562zM3.4 19.96L.078 18.752v-3.913l2.361.86.96.349v3.913zm.015-3.99L.335 14.85l-.182-.066 3.262-1.187v2.374zm3.399 5.231l-3.321-1.209v-3.912l3.321 1.209v3.912zM23.791 5.434l-3.21-1.17v2.338zM20.387 2.643l-3.24-1.18-3.27 1.19 3.247 1.182z" />
+  </svg>
+);
+
+const RubyGems = (props: IconProps) => (
+  <svg
+    class={props.class}
+    stroke="currentColor"
+    fill="currentColor"
+    stroke-width="0"
+    viewBox="0 0 24 24"
+    height="1em"
+    width="1em"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path d="M7.81 7.9l-2.97 2.95 7.19 7.18 2.96-2.95 4.22-4.23-2.96-2.96v-.01H7.8zM12 0L1.53 6v12L12 24l10.47-6V6L12 0zm8.47 16.85L12 21.73l-8.47-4.88V7.12L12 2.24l8.47 4.88v9.73z" />
+  </svg>
+);
+
+const Rust = (props: IconProps) => (
+  <svg
+    class={props.class}
+    stroke="currentColor"
+    fill="currentColor"
+    stroke-width="0"
+    viewBox="0 0 512 512"
+    height="1em"
+    width="1em"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path d="M508.52,249.75,486.7,236.24c-.17-2-.34-3.93-.55-5.88l18.72-17.5a7.35,7.35,0,0,0-2.44-12.25l-24-9c-.54-1.88-1.08-3.78-1.67-5.64l15-20.83a7.35,7.35,0,0,0-4.79-11.54l-25.42-4.15c-.9-1.73-1.79-3.45-2.73-5.15l10.68-23.42a7.35,7.35,0,0,0-6.95-10.39l-25.82.91q-1.79-2.22-3.61-4.4L439,81.84A7.36,7.36,0,0,0,430.16,73L405,78.93q-2.17-1.83-4.4-3.61l.91-25.82a7.35,7.35,0,0,0-10.39-7L367.7,53.23c-1.7-.94-3.43-1.84-5.15-2.73L358.4,25.08a7.35,7.35,0,0,0-11.54-4.79L326,35.26c-1.86-.59-3.75-1.13-5.64-1.67l-9-24a7.35,7.35,0,0,0-12.25-2.44l-17.5,18.72c-1.95-.21-3.91-.38-5.88-.55L262.25,3.48a7.35,7.35,0,0,0-12.5,0L236.24,25.3c-2,.17-3.93.34-5.88.55L212.86,7.13a7.35,7.35,0,0,0-12.25,2.44l-9,24c-1.89.55-3.79,1.08-5.66,1.68l-20.82-15a7.35,7.35,0,0,0-11.54,4.79l-4.15,25.41c-1.73.9-3.45,1.79-5.16,2.73L120.88,42.55a7.35,7.35,0,0,0-10.39,7l.92,25.81c-1.49,1.19-3,2.39-4.42,3.61L81.84,73A7.36,7.36,0,0,0,73,81.84L78.93,107c-1.23,1.45-2.43,2.93-3.62,4.41l-25.81-.91a7.42,7.42,0,0,0-6.37,3.26,7.35,7.35,0,0,0-.57,7.13l10.66,23.41c-.94,1.7-1.83,3.43-2.73,5.16L25.08,153.6a7.35,7.35,0,0,0-4.79,11.54l15,20.82c-.59,1.87-1.13,3.77-1.68,5.66l-24,9a7.35,7.35,0,0,0-2.44,12.25l18.72,17.5c-.21,1.95-.38,3.91-.55,5.88L3.48,249.75a7.35,7.35,0,0,0,0,12.5L25.3,275.76c.17,2,.34,3.92.55,5.87L7.13,299.13a7.35,7.35,0,0,0,2.44,12.25l24,9c.55,1.89,1.08,3.78,1.68,5.65l-15,20.83a7.35,7.35,0,0,0,4.79,11.54l25.42,4.15c.9,1.72,1.79,3.45,2.73,5.14L42.56,391.12a7.35,7.35,0,0,0,.57,7.13,7.13,7.13,0,0,0,6.37,3.26l25.83-.91q1.77,2.22,3.6,4.4L73,430.16A7.36,7.36,0,0,0,81.84,439L107,433.07q2.18,1.83,4.41,3.61l-.92,25.82a7.35,7.35,0,0,0,10.39,6.95l23.43-10.68c1.69.94,3.42,1.83,5.14,2.73l4.15,25.42a7.34,7.34,0,0,0,11.54,4.78l20.83-15c1.86.6,3.76,1.13,5.65,1.68l9,24a7.36,7.36,0,0,0,12.25,2.44l17.5-18.72c1.95.21,3.92.38,5.88.55l13.51,21.82a7.35,7.35,0,0,0,12.5,0l13.51-21.82c2-.17,3.93-.34,5.88-.56l17.5,18.73a7.36,7.36,0,0,0,12.25-2.44l9-24c1.89-.55,3.78-1.08,5.65-1.68l20.82,15a7.34,7.34,0,0,0,11.54-4.78l4.15-25.42c1.72-.9,3.45-1.79,5.15-2.73l23.42,10.68a7.35,7.35,0,0,0,10.39-6.95l-.91-25.82q2.22-1.79,4.4-3.61L430.16,439a7.36,7.36,0,0,0,8.84-8.84L433.07,405q1.83-2.17,3.61-4.4l25.82.91a7.23,7.23,0,0,0,6.37-3.26,7.35,7.35,0,0,0,.58-7.13L458.77,367.7c.94-1.7,1.83-3.43,2.73-5.15l25.42-4.15a7.35,7.35,0,0,0,4.79-11.54l-15-20.83c.59-1.87,1.13-3.76,1.67-5.65l24-9a7.35,7.35,0,0,0,2.44-12.25l-18.72-17.5c.21-1.95.38-3.91.55-5.87l21.82-13.51a7.35,7.35,0,0,0,0-12.5Zm-151,129.08A13.91,13.91,0,0,0,341,389.51l-7.64,35.67A187.51,187.51,0,0,1,177,424.44l-7.64-35.66a13.87,13.87,0,0,0-16.46-10.68l-31.51,6.76a187.38,187.38,0,0,1-16.26-19.21H258.3c1.72,0,2.89-.29,2.89-1.91V309.55c0-1.57-1.17-1.91-2.89-1.91H213.47l.05-34.35H262c4.41,0,23.66,1.28,29.79,25.87,1.91,7.55,6.17,32.14,9.06,40,2.89,8.82,14.6,26.46,27.1,26.46H407a187.3,187.3,0,0,1-17.34,20.09Zm25.77,34.49A15.24,15.24,0,1,1,368,398.08h.44A15.23,15.23,0,0,1,383.24,413.32Zm-225.62-.68a15.24,15.24,0,1,1-15.25-15.25h.45A15.25,15.25,0,0,1,157.62,412.64ZM69.57,234.15l32.83-14.6a13.88,13.88,0,0,0,7.06-18.33L102.69,186h26.56V305.73H75.65A187.65,187.65,0,0,1,69.57,234.15ZM58.31,198.09a15.24,15.24,0,0,1,15.23-15.25H74a15.24,15.24,0,1,1-15.67,15.24Zm155.16,24.49.05-35.32h63.26c3.28,0,23.07,3.77,23.07,18.62,0,12.29-15.19,16.7-27.68,16.7ZM399,306.71c-9.8,1.13-20.63-4.12-22-10.09-5.78-32.49-15.39-39.4-30.57-51.4,18.86-11.95,38.46-29.64,38.46-53.26,0-25.52-17.49-41.59-29.4-49.48-16.76-11-35.28-13.23-40.27-13.23H116.32A187.49,187.49,0,0,1,221.21,70.06l23.47,24.6a13.82,13.82,0,0,0,19.6.44l26.26-25a187.51,187.51,0,0,1,128.37,91.43l-18,40.57A14,14,0,0,0,408,220.43l34.59,15.33a187.12,187.12,0,0,1,.4,32.54H423.71c-1.91,0-2.69,1.27-2.69,3.13v8.82C421,301,409.31,305.58,399,306.71ZM240,60.21A15.24,15.24,0,0,1,255.21,45h.45A15.24,15.24,0,1,1,240,60.21ZM436.84,214a15.24,15.24,0,1,1,0-30.48h.44a15.24,15.24,0,0,1-.44,30.48Z" />
+  </svg>
+);
+
 const Search = (props: IconProps) => (
   <svg
     class={props.class}
@@ -914,6 +1095,7 @@ const icons: ValidComponent[] = [
   Clear,
   ClearCircle,
   Close,
+  Cocoapods,
   Copy,
   Crunchbase,
   CSV,
@@ -923,10 +1105,12 @@ const icons: ValidComponent[] = [
   Documentation,
   Download,
   Embed,
+  Erlang,
   ExternalLink,
   Facebook,
   Filters,
   Flickr,
+  Flutter,
   GitHub,
   GitHubCircle,
   Guide,
@@ -935,12 +1119,21 @@ const icons: ValidComponent[] = [
   LinkedIn,
   MagnifyingGlass,
   MailingList,
+  MavenApache,
   Menu,
   NotImage,
+  NPM,
+  Nuget,
   OpenssfBestPractices,
   OsanoCookie,
+  PackageManager,
+  Packagist,
   PDF,
+  Perl,
   PNG,
+  PyPi,
+  RubyGems,
+  Rust,
   Search,
   Security,
   Slack,
diff --git a/ui/webapp/src/layout/common/itemModal/Content.tsx b/ui/webapp/src/layout/common/itemModal/Content.tsx
index 9f73b9f9..0b7049ac 100644
--- a/ui/webapp/src/layout/common/itemModal/Content.tsx
+++ b/ui/webapp/src/layout/common/itemModal/Content.tsx
@@ -32,6 +32,38 @@ interface Props {
   item?: Item | null;
 }
 
+const getPackageManagerIcon = (url: string): SVGIconKind => {
+  const icon = SVGIconKind.PackageManager;
+  const pkgManagerUrl = new URL(url);
+  const pkgManagerHostname = pkgManagerUrl.hostname;
+
+  if (pkgManagerHostname.includes('npmjs.com')) {
+    return SVGIconKind.NPM;
+  } else if (pkgManagerHostname.includes('pypi.org')) {
+    return SVGIconKind.PyPi;
+  } else if (pkgManagerHostname.includes('crates.io')) {
+    return SVGIconKind.Rust;
+  } else if (pkgManagerHostname.includes('cpan.org')) {
+    return SVGIconKind.Perl;
+  } else if (pkgManagerHostname.includes('rubygems.org')) {
+    return SVGIconKind.RubyGems;
+  } else if (pkgManagerHostname.includes('maven.apache.org')) {
+    return SVGIconKind.MavenApache;
+  } else if (pkgManagerHostname.includes('packagist.org')) {
+    return SVGIconKind.Packagist;
+  } else if (pkgManagerHostname.includes('cocoapods.org')) {
+    return SVGIconKind.Cocoapods;
+  } else if (pkgManagerHostname.includes('nuget.org')) {
+    return SVGIconKind.Nuget;
+  } else if (pkgManagerHostname.includes('pub.dev')) {
+    return SVGIconKind.Flutter;
+  } else if (pkgManagerHostname.includes('hex.pm')) {
+    return SVGIconKind.Erlang;
+  }
+
+  return icon;
+};
+
 const Content = (props: Props) => {
   const itemInfo = () => props.item;
   const updateActiveItemId = useUpdateActiveItemId();
@@ -273,6 +305,16 @@ const Content = (props: Props) => {
                       <SVGIcon kind={SVGIconKind.Discussions} />
                     </ExternalLink>
                   </Show>
+
+                  <Show when={!isUndefined(itemInfo()!.package_manager_url)}>
+                    <ExternalLink
+                      title="Package manager"
+                      class={`ms-3 ${styles.link}`}
+                      href={itemInfo()!.package_manager_url!}
+                    >
+                      <SVGIcon kind={getPackageManagerIcon(itemInfo()!.package_manager_url!)} />
+                    </ExternalLink>
+                  </Show>
                 </div>
               </div>
             </div>
diff --git a/ui/webapp/src/types.ts b/ui/webapp/src/types.ts
index 185498db..358cf1d7 100644
--- a/ui/webapp/src/types.ts
+++ b/ui/webapp/src/types.ts
@@ -104,6 +104,7 @@ export interface Item extends BaseItem {
   incubating_at?: string;
   joined_at?: string;
   mailing_list_url?: string;
+  package_manager_url?: string;
   latest_annual_review_at?: string;
   latest_annual_review_url?: string;
   openssf_best_practices_url?: string;
@@ -411,6 +412,7 @@ export enum SVGIconKind {
   Clear,
   ClearCircle,
   Close,
+  Cocoapods,
   Copy,
   Crunchbase,
   CSV,
@@ -420,10 +422,12 @@ export enum SVGIconKind {
   Documentation,
   Download,
   Embed,
+  Erlang,
   ExternalLink,
   Facebook,
   Filters,
   Flickr,
+  Flutter,
   GitHub,
   GitHubCircle,
   Guide,
@@ -432,12 +436,21 @@ export enum SVGIconKind {
   LinkedIn,
   MagnifyingGlass,
   MailingList,
+  MavenApache,
   Menu,
   NotImage,
+  NPM,
+  Nuget,
   OpenssfBestPractices,
   OsanoCookie,
+  PackageManager,
+  Packagist,
   PDF,
+  Perl,
   PNG,
+  PyPi,
+  RubyGems,
+  Rust,
   Search,
   Security,
   Slack,

From 3b31cb4a4de71ac58e682a3585a3699a0ac15161 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cintia=20S=C3=A1nchez=20Garc=C3=ADa?= <cynthiasg@icloud.com>
Date: Thu, 2 May 2024 10:55:39 +0200
Subject: [PATCH 40/55] Upgrade web application and embed dependencies (#610)

Signed-off-by: Cintia Sanchez Garcia <cynthiasg@icloud.com>
---
 ui/embed/.eslintrc                     |   14 -
 ui/embed/eslint.config.js              |   39 +
 ui/embed/package.json                  |   20 +-
 ui/embed/yarn.lock                     | 1263 ++++++++++------------
 ui/webapp/.eslintrc                    |   14 -
 ui/webapp/eslint.config.js             |   40 +
 ui/webapp/package.json                 |   34 +-
 ui/webapp/src/layout/explore/index.tsx |    2 +-
 ui/webapp/yarn.lock                    | 1369 +++++++++++-------------
 9 files changed, 1336 insertions(+), 1459 deletions(-)
 delete mode 100644 ui/embed/.eslintrc
 create mode 100644 ui/embed/eslint.config.js
 delete mode 100644 ui/webapp/.eslintrc
 create mode 100644 ui/webapp/eslint.config.js

diff --git a/ui/embed/.eslintrc b/ui/embed/.eslintrc
deleted file mode 100644
index e075b959..00000000
--- a/ui/embed/.eslintrc
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "env": { "browser": true, "es2020": true },
-  "parser": "@typescript-eslint/parser",
-  "parserOptions": { "ecmaVersion": "latest", "sourceType": "module" },
-  "plugins": ["solid", "simple-import-sort"],
-  "extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended", "plugin:solid/typescript"],
-  "rules": {
-    "simple-import-sort/imports": "error",
-    "simple-import-sort/exports": "error",
-    "solid/no-innerhtml": [1, {
-      "allowStatic": true
-    }]
-  }
-}
diff --git a/ui/embed/eslint.config.js b/ui/embed/eslint.config.js
new file mode 100644
index 00000000..71950753
--- /dev/null
+++ b/ui/embed/eslint.config.js
@@ -0,0 +1,39 @@
+// eslint.config.js
+
+import js from '@eslint/js';
+import simpleImportSort from 'eslint-plugin-simple-import-sort';
+import solidPlugin from 'eslint-plugin-solid';
+import tseslint from 'typescript-eslint';
+
+export default [
+  js.configs.recommended,
+  ...tseslint.configs.recommended,
+  solidPlugin.configs['flat/recommended'],
+  {
+    linterOptions: {
+      reportUnusedDisableDirectives: 'error',
+    },
+    plugins: {
+      '@typescript-eslint': tseslint.plugin,
+      'eslint-plugin-solid': solidPlugin.configs['flat/typescript'],
+      'simple-import-sort': simpleImportSort,
+    },
+    rules: {
+      'simple-import-sort/imports': 'error',
+      'simple-import-sort/exports': 'error',
+      'solid/no-innerhtml': [
+        1,
+        {
+          allowStatic: true,
+        },
+      ],
+    },
+    languageOptions: {
+      parser: tseslint.parser,
+      parserOptions: {
+        ecmaVersion: 'latest',
+        sourceType: 'module',
+      },
+    },
+  },
+];
diff --git a/ui/embed/package.json b/ui/embed/package.json
index 734fead3..e3bc6572 100644
--- a/ui/embed/package.json
+++ b/ui/embed/package.json
@@ -8,22 +8,22 @@
     "dev": "vite",
     "format": "prettier --write \"src/**/*.{js,jsx,ts,tsx,json,css,scss,md}\"",
     "format:diff": "prettier --list-different \"src/**/*.{js,jsx,ts,tsx,json,css,scss,md}\"",
-    "lint": "eslint src --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
+    "lint": "eslint src --max-warnings 0",
+    "lint:fix": "eslint src --max-warnings 0 --fix",
     "preview": "vite preview"
   },
   "dependencies": {
-    "solid-js": "^1.8.15",
+    "solid-js": "^1.8.17",
     "solid-styled-components": "^0.28.5"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^7.1.1",
-    "@typescript-eslint/parser": "^7.1.1",
-    "eslint": "^8.57.0",
+    "eslint": "^9.1.1",
     "eslint-plugin-prettier": "^5.1.3",
-    "eslint-plugin-simple-import-sort": "^12.0.0",
-    "eslint-plugin-solid": "^0.13.1",
-    "typescript": "^5.3.3",
-    "vite": "^5.1.4",
-    "vite-plugin-solid": "^2.10.1"
+    "eslint-plugin-simple-import-sort": "^12.1.0",
+    "eslint-plugin-solid": "^0.14.0",
+    "typescript": "^5.4.5",
+    "typescript-eslint": "^7.8.0",
+    "vite": "^5.2.10",
+    "vite-plugin-solid": "^2.10.2"
   }
 }
diff --git a/ui/embed/yarn.lock b/ui/embed/yarn.lock
index 3ae4d173..567fe628 100644
--- a/ui/embed/yarn.lock
+++ b/ui/embed/yarn.lock
@@ -2,11 +2,6 @@
 # yarn lockfile v1
 
 
-"@aashutoshrathi/word-wrap@^1.2.3":
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf"
-  integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==
-
 "@ampproject/remapping@^2.2.0":
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.3.0.tgz#ed441b6fa600072520ce18b43d2c8cc8caecc7f4"
@@ -15,48 +10,48 @@
     "@jridgewell/gen-mapping" "^0.3.5"
     "@jridgewell/trace-mapping" "^0.3.24"
 
-"@babel/code-frame@^7.23.5":
-  version "7.23.5"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.23.5.tgz#9009b69a8c602293476ad598ff53e4562e15c244"
-  integrity sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==
+"@babel/code-frame@^7.23.5", "@babel/code-frame@^7.24.2":
+  version "7.24.2"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.24.2.tgz#718b4b19841809a58b29b68cde80bc5e1aa6d9ae"
+  integrity sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ==
   dependencies:
-    "@babel/highlight" "^7.23.4"
-    chalk "^2.4.2"
+    "@babel/highlight" "^7.24.2"
+    picocolors "^1.0.0"
 
 "@babel/compat-data@^7.23.5":
-  version "7.23.5"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.23.5.tgz#ffb878728bb6bdcb6f4510aa51b1be9afb8cfd98"
-  integrity sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==
+  version "7.24.4"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.24.4.tgz#6f102372e9094f25d908ca0d34fc74c74606059a"
+  integrity sha512-vg8Gih2MLK+kOkHJp4gBEIkyaIi00jgWot2D9QOmmfLC8jINSOzmCLta6Bvz/JSBCqnegV0L80jhxkol5GWNfQ==
 
 "@babel/core@^7.23.3":
-  version "7.24.0"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.24.0.tgz#56cbda6b185ae9d9bed369816a8f4423c5f2ff1b"
-  integrity sha512-fQfkg0Gjkza3nf0c7/w6Xf34BW4YvzNfACRLmmb7XRLa6XHdR+K9AlJlxneFfWYf6uhOzuzZVTjF/8KfndZANw==
+  version "7.24.5"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.24.5.tgz#15ab5b98e101972d171aeef92ac70d8d6718f06a"
+  integrity sha512-tVQRucExLQ02Boi4vdPp49svNGcfL2GhdTCT9aldhXgCJVAI21EtRfBettiuLUwce/7r6bFdgs6JFkcdTiFttA==
   dependencies:
     "@ampproject/remapping" "^2.2.0"
-    "@babel/code-frame" "^7.23.5"
-    "@babel/generator" "^7.23.6"
+    "@babel/code-frame" "^7.24.2"
+    "@babel/generator" "^7.24.5"
     "@babel/helper-compilation-targets" "^7.23.6"
-    "@babel/helper-module-transforms" "^7.23.3"
-    "@babel/helpers" "^7.24.0"
-    "@babel/parser" "^7.24.0"
+    "@babel/helper-module-transforms" "^7.24.5"
+    "@babel/helpers" "^7.24.5"
+    "@babel/parser" "^7.24.5"
     "@babel/template" "^7.24.0"
-    "@babel/traverse" "^7.24.0"
-    "@babel/types" "^7.24.0"
+    "@babel/traverse" "^7.24.5"
+    "@babel/types" "^7.24.5"
     convert-source-map "^2.0.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
     json5 "^2.2.3"
     semver "^6.3.1"
 
-"@babel/generator@^7.23.6":
-  version "7.23.6"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.6.tgz#9e1fca4811c77a10580d17d26b57b036133f3c2e"
-  integrity sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==
+"@babel/generator@^7.23.6", "@babel/generator@^7.24.5":
+  version "7.24.5"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.24.5.tgz#e5afc068f932f05616b66713e28d0f04e99daeb3"
+  integrity sha512-x32i4hEXvr+iI0NEoEfDKzlemF8AmtOP8CcrRaEcpzysWuoEb1KknpcvMsHKPONoKZiDuItklgWhB18xEhr9PA==
   dependencies:
-    "@babel/types" "^7.23.6"
-    "@jridgewell/gen-mapping" "^0.3.2"
-    "@jridgewell/trace-mapping" "^0.3.17"
+    "@babel/types" "^7.24.5"
+    "@jridgewell/gen-mapping" "^0.3.5"
+    "@jridgewell/trace-mapping" "^0.3.25"
     jsesc "^2.5.1"
 
 "@babel/helper-compilation-targets@^7.23.6":
@@ -97,87 +92,88 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-module-imports@^7.22.15":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz#16146307acdc40cc00c3b2c647713076464bdbf0"
-  integrity sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==
+"@babel/helper-module-imports@^7.22.15", "@babel/helper-module-imports@^7.24.3":
+  version "7.24.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.24.3.tgz#6ac476e6d168c7c23ff3ba3cf4f7841d46ac8128"
+  integrity sha512-viKb0F9f2s0BCS22QSF308z/+1YWKV/76mwt61NBzS5izMzDPwdq1pTrzf+Li3npBWX9KdQbkeCt1jSAM7lZqg==
   dependencies:
-    "@babel/types" "^7.22.15"
+    "@babel/types" "^7.24.0"
 
-"@babel/helper-module-transforms@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz#d7d12c3c5d30af5b3c0fcab2a6d5217773e2d0f1"
-  integrity sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==
+"@babel/helper-module-transforms@^7.24.5":
+  version "7.24.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.24.5.tgz#ea6c5e33f7b262a0ae762fd5986355c45f54a545"
+  integrity sha512-9GxeY8c2d2mdQUP1Dye0ks3VDyIMS98kt/llQ2nUId8IsWqTF0l1LkSX0/uP7l7MCDrzXS009Hyhe2gzTiGW8A==
   dependencies:
     "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-module-imports" "^7.22.15"
-    "@babel/helper-simple-access" "^7.22.5"
-    "@babel/helper-split-export-declaration" "^7.22.6"
-    "@babel/helper-validator-identifier" "^7.22.20"
+    "@babel/helper-module-imports" "^7.24.3"
+    "@babel/helper-simple-access" "^7.24.5"
+    "@babel/helper-split-export-declaration" "^7.24.5"
+    "@babel/helper-validator-identifier" "^7.24.5"
 
-"@babel/helper-plugin-utils@^7.22.5":
-  version "7.24.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.0.tgz#945681931a52f15ce879fd5b86ce2dae6d3d7f2a"
-  integrity sha512-9cUznXMG0+FxRuJfvL82QlTqIzhVW9sL0KjMPHhAOOvpQGL8QtdxnBKILjBqxlHyliz0yCa1G903ZXI/FuHy2w==
+"@babel/helper-plugin-utils@^7.24.0":
+  version "7.24.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.5.tgz#a924607dd254a65695e5bd209b98b902b3b2f11a"
+  integrity sha512-xjNLDopRzW2o6ba0gKbkZq5YWEBaK3PCyTOY1K2P/O07LGMhMqlMXPxwN4S5/RhWuCobT8z0jrlKGlYmeR1OhQ==
 
-"@babel/helper-simple-access@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz#4938357dc7d782b80ed6dbb03a0fba3d22b1d5de"
-  integrity sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==
+"@babel/helper-simple-access@^7.24.5":
+  version "7.24.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.24.5.tgz#50da5b72f58c16b07fbd992810be6049478e85ba"
+  integrity sha512-uH3Hmf5q5n7n8mz7arjUlDOCbttY/DW4DYhE6FUsjKJ/oYC1kQQUvwEQWxRwUpX9qQKRXeqLwWxrqilMrf32sQ==
   dependencies:
-    "@babel/types" "^7.22.5"
+    "@babel/types" "^7.24.5"
 
-"@babel/helper-split-export-declaration@^7.22.6":
-  version "7.22.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c"
-  integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==
+"@babel/helper-split-export-declaration@^7.24.5":
+  version "7.24.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.5.tgz#b9a67f06a46b0b339323617c8c6213b9055a78b6"
+  integrity sha512-5CHncttXohrHk8GWOFCcCl4oRD9fKosWlIRgWm4ql9VYioKm52Mk2xsmoohvm7f3JoiLSM5ZgJuRaf5QZZYd3Q==
   dependencies:
-    "@babel/types" "^7.22.5"
+    "@babel/types" "^7.24.5"
 
-"@babel/helper-string-parser@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz#9478c707febcbbe1ddb38a3d91a2e054ae622d83"
-  integrity sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==
+"@babel/helper-string-parser@^7.24.1":
+  version "7.24.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.24.1.tgz#f99c36d3593db9540705d0739a1f10b5e20c696e"
+  integrity sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ==
 
-"@babel/helper-validator-identifier@^7.22.20":
-  version "7.22.20"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0"
-  integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==
+"@babel/helper-validator-identifier@^7.24.5":
+  version "7.24.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.5.tgz#918b1a7fa23056603506370089bd990d8720db62"
+  integrity sha512-3q93SSKX2TWCG30M2G2kwaKeTYgEUp5Snjuj8qm729SObL6nbtUldAi37qbxkD5gg3xnBio+f9nqpSepGZMvxA==
 
 "@babel/helper-validator-option@^7.23.5":
   version "7.23.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz#907a3fbd4523426285365d1206c423c4c5520307"
   integrity sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==
 
-"@babel/helpers@^7.24.0":
-  version "7.24.0"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.24.0.tgz#a3dd462b41769c95db8091e49cfe019389a9409b"
-  integrity sha512-ulDZdc0Aj5uLc5nETsa7EPx2L7rM0YJM8r7ck7U73AXi7qOV44IHHRAYZHY6iU1rr3C5N4NtTmMRUJP6kwCWeA==
+"@babel/helpers@^7.24.5":
+  version "7.24.5"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.24.5.tgz#fedeb87eeafa62b621160402181ad8585a22a40a"
+  integrity sha512-CiQmBMMpMQHwM5m01YnrM6imUG1ebgYJ+fAIW4FZe6m4qHTPaRHti+R8cggAwkdz4oXhtO4/K9JWlh+8hIfR2Q==
   dependencies:
     "@babel/template" "^7.24.0"
-    "@babel/traverse" "^7.24.0"
-    "@babel/types" "^7.24.0"
+    "@babel/traverse" "^7.24.5"
+    "@babel/types" "^7.24.5"
 
-"@babel/highlight@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.23.4.tgz#edaadf4d8232e1a961432db785091207ead0621b"
-  integrity sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==
+"@babel/highlight@^7.24.2":
+  version "7.24.5"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.24.5.tgz#bc0613f98e1dd0720e99b2a9ee3760194a704b6e"
+  integrity sha512-8lLmua6AVh/8SLJRRVD6V8p73Hir9w5mJrhE+IPpILG31KKlI9iz5zmBYKcWPS59qSfgP9RaSBQSHHE81WKuEw==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.22.20"
+    "@babel/helper-validator-identifier" "^7.24.5"
     chalk "^2.4.2"
     js-tokens "^4.0.0"
+    picocolors "^1.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.20.7", "@babel/parser@^7.24.0":
-  version "7.24.0"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.24.0.tgz#26a3d1ff49031c53a97d03b604375f028746a9ac"
-  integrity sha512-QuP/FxEAzMSjXygs8v4N9dvdXzEHN4W1oF3PxuWAtPo08UdM17u89RDMgjLn/mlc56iM0HlLmVkO/wgR+rDgHg==
+"@babel/parser@^7.1.0", "@babel/parser@^7.20.7", "@babel/parser@^7.24.0", "@babel/parser@^7.24.5":
+  version "7.24.5"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.24.5.tgz#4a4d5ab4315579e5398a82dcf636ca80c3392790"
+  integrity sha512-EOv5IK8arwh3LI47dz1b0tKUb/1uhHAnHJOrjgtQMIpu1uXd9mlFrJg9IUgGUgZ41Ch0K8REPTYpO7B76b4vJg==
 
 "@babel/plugin-syntax-jsx@^7.18.6":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.23.3.tgz#8f2e4f8a9b5f9aa16067e142c1ac9cd9f810f473"
-  integrity sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg==
+  version "7.24.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.1.tgz#3f6ca04b8c841811dbc3c5c5f837934e0d626c10"
+  integrity sha512-2eCtxZXf+kbkMIsXS4poTvT4Yu5rXiRa+9xGVT56raghjmBTKMpFNc9R4IDiB4emao9eO22Ox7CxuJG7BgExqA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.0"
 
 "@babel/template@^7.22.15", "@babel/template@^7.24.0":
   version "7.24.0"
@@ -188,145 +184,145 @@
     "@babel/parser" "^7.24.0"
     "@babel/types" "^7.24.0"
 
-"@babel/traverse@^7.24.0":
-  version "7.24.0"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.24.0.tgz#4a408fbf364ff73135c714a2ab46a5eab2831b1e"
-  integrity sha512-HfuJlI8qq3dEDmNU5ChzzpZRWq+oxCZQyMzIMEqLho+AQnhMnKQUzH6ydo3RBl/YjPCuk68Y6s0Gx0AeyULiWw==
+"@babel/traverse@^7.24.5":
+  version "7.24.5"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.24.5.tgz#972aa0bc45f16983bf64aa1f877b2dd0eea7e6f8"
+  integrity sha512-7aaBLeDQ4zYcUFDUD41lJc1fG8+5IU9DaNSJAgal866FGvmD5EbWQgnEC6kO1gGLsX0esNkfnJSndbTXA3r7UA==
   dependencies:
-    "@babel/code-frame" "^7.23.5"
-    "@babel/generator" "^7.23.6"
+    "@babel/code-frame" "^7.24.2"
+    "@babel/generator" "^7.24.5"
     "@babel/helper-environment-visitor" "^7.22.20"
     "@babel/helper-function-name" "^7.23.0"
     "@babel/helper-hoist-variables" "^7.22.5"
-    "@babel/helper-split-export-declaration" "^7.22.6"
-    "@babel/parser" "^7.24.0"
-    "@babel/types" "^7.24.0"
+    "@babel/helper-split-export-declaration" "^7.24.5"
+    "@babel/parser" "^7.24.5"
+    "@babel/types" "^7.24.5"
     debug "^4.3.1"
     globals "^11.1.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.18.6", "@babel/types@^7.20.7", "@babel/types@^7.22.15", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.6", "@babel/types@^7.24.0":
-  version "7.24.0"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.24.0.tgz#3b951f435a92e7333eba05b7566fd297960ea1bf"
-  integrity sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==
+"@babel/types@^7.0.0", "@babel/types@^7.18.6", "@babel/types@^7.20.7", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.6", "@babel/types@^7.24.0", "@babel/types@^7.24.5":
+  version "7.24.5"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.24.5.tgz#7661930afc638a5383eb0c4aee59b74f38db84d7"
+  integrity sha512-6mQNsaLeXTw0nxYUYu+NSa4Hx4BlF1x1x8/PMFbiR+GBSr+2DkECc69b8hgy2frEodNcvPffeH8YfWd3LI6jhQ==
   dependencies:
-    "@babel/helper-string-parser" "^7.23.4"
-    "@babel/helper-validator-identifier" "^7.22.20"
+    "@babel/helper-string-parser" "^7.24.1"
+    "@babel/helper-validator-identifier" "^7.24.5"
     to-fast-properties "^2.0.0"
 
-"@esbuild/aix-ppc64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.19.12.tgz#d1bc06aedb6936b3b6d313bf809a5a40387d2b7f"
-  integrity sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==
-
-"@esbuild/android-arm64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.19.12.tgz#7ad65a36cfdb7e0d429c353e00f680d737c2aed4"
-  integrity sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==
-
-"@esbuild/android-arm@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.19.12.tgz#b0c26536f37776162ca8bde25e42040c203f2824"
-  integrity sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==
-
-"@esbuild/android-x64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.19.12.tgz#cb13e2211282012194d89bf3bfe7721273473b3d"
-  integrity sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==
-
-"@esbuild/darwin-arm64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.19.12.tgz#cbee41e988020d4b516e9d9e44dd29200996275e"
-  integrity sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==
-
-"@esbuild/darwin-x64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.19.12.tgz#e37d9633246d52aecf491ee916ece709f9d5f4cd"
-  integrity sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==
-
-"@esbuild/freebsd-arm64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.12.tgz#1ee4d8b682ed363b08af74d1ea2b2b4dbba76487"
-  integrity sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==
-
-"@esbuild/freebsd-x64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.19.12.tgz#37a693553d42ff77cd7126764b535fb6cc28a11c"
-  integrity sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==
-
-"@esbuild/linux-arm64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.19.12.tgz#be9b145985ec6c57470e0e051d887b09dddb2d4b"
-  integrity sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==
-
-"@esbuild/linux-arm@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.19.12.tgz#207ecd982a8db95f7b5279207d0ff2331acf5eef"
-  integrity sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==
-
-"@esbuild/linux-ia32@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.19.12.tgz#d0d86b5ca1562523dc284a6723293a52d5860601"
-  integrity sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==
-
-"@esbuild/linux-loong64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.19.12.tgz#9a37f87fec4b8408e682b528391fa22afd952299"
-  integrity sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==
-
-"@esbuild/linux-mips64el@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.19.12.tgz#4ddebd4e6eeba20b509d8e74c8e30d8ace0b89ec"
-  integrity sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==
-
-"@esbuild/linux-ppc64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.19.12.tgz#adb67dadb73656849f63cd522f5ecb351dd8dee8"
-  integrity sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==
-
-"@esbuild/linux-riscv64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.19.12.tgz#11bc0698bf0a2abf8727f1c7ace2112612c15adf"
-  integrity sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==
-
-"@esbuild/linux-s390x@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.19.12.tgz#e86fb8ffba7c5c92ba91fc3b27ed5a70196c3cc8"
-  integrity sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==
-
-"@esbuild/linux-x64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.19.12.tgz#5f37cfdc705aea687dfe5dfbec086a05acfe9c78"
-  integrity sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==
-
-"@esbuild/netbsd-x64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.19.12.tgz#29da566a75324e0d0dd7e47519ba2f7ef168657b"
-  integrity sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==
-
-"@esbuild/openbsd-x64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.19.12.tgz#306c0acbdb5a99c95be98bdd1d47c916e7dc3ff0"
-  integrity sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==
-
-"@esbuild/sunos-x64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.19.12.tgz#0933eaab9af8b9b2c930236f62aae3fc593faf30"
-  integrity sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==
-
-"@esbuild/win32-arm64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.19.12.tgz#773bdbaa1971b36db2f6560088639ccd1e6773ae"
-  integrity sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==
-
-"@esbuild/win32-ia32@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.19.12.tgz#000516cad06354cc84a73f0943a4aa690ef6fd67"
-  integrity sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==
-
-"@esbuild/win32-x64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.19.12.tgz#c57c8afbb4054a3ab8317591a0b7320360b444ae"
-  integrity sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==
+"@esbuild/aix-ppc64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz#a70f4ac11c6a1dfc18b8bbb13284155d933b9537"
+  integrity sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==
+
+"@esbuild/android-arm64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.20.2.tgz#db1c9202a5bc92ea04c7b6840f1bbe09ebf9e6b9"
+  integrity sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==
+
+"@esbuild/android-arm@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.20.2.tgz#3b488c49aee9d491c2c8f98a909b785870d6e995"
+  integrity sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==
+
+"@esbuild/android-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.20.2.tgz#3b1628029e5576249d2b2d766696e50768449f98"
+  integrity sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==
+
+"@esbuild/darwin-arm64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz#6e8517a045ddd86ae30c6608c8475ebc0c4000bb"
+  integrity sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==
+
+"@esbuild/darwin-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz#90ed098e1f9dd8a9381695b207e1cff45540a0d0"
+  integrity sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==
+
+"@esbuild/freebsd-arm64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.2.tgz#d71502d1ee89a1130327e890364666c760a2a911"
+  integrity sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==
+
+"@esbuild/freebsd-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.20.2.tgz#aa5ea58d9c1dd9af688b8b6f63ef0d3d60cea53c"
+  integrity sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==
+
+"@esbuild/linux-arm64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.20.2.tgz#055b63725df678379b0f6db9d0fa85463755b2e5"
+  integrity sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==
+
+"@esbuild/linux-arm@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.20.2.tgz#76b3b98cb1f87936fbc37f073efabad49dcd889c"
+  integrity sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==
+
+"@esbuild/linux-ia32@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.20.2.tgz#c0e5e787c285264e5dfc7a79f04b8b4eefdad7fa"
+  integrity sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==
+
+"@esbuild/linux-loong64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.20.2.tgz#a6184e62bd7cdc63e0c0448b83801001653219c5"
+  integrity sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==
+
+"@esbuild/linux-mips64el@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.20.2.tgz#d08e39ce86f45ef8fc88549d29c62b8acf5649aa"
+  integrity sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==
+
+"@esbuild/linux-ppc64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.20.2.tgz#8d252f0b7756ffd6d1cbde5ea67ff8fd20437f20"
+  integrity sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==
+
+"@esbuild/linux-riscv64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.20.2.tgz#19f6dcdb14409dae607f66ca1181dd4e9db81300"
+  integrity sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==
+
+"@esbuild/linux-s390x@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.20.2.tgz#3c830c90f1a5d7dd1473d5595ea4ebb920988685"
+  integrity sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==
+
+"@esbuild/linux-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz#86eca35203afc0d9de0694c64ec0ab0a378f6fff"
+  integrity sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==
+
+"@esbuild/netbsd-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.20.2.tgz#e771c8eb0e0f6e1877ffd4220036b98aed5915e6"
+  integrity sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==
+
+"@esbuild/openbsd-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.20.2.tgz#9a795ae4b4e37e674f0f4d716f3e226dd7c39baf"
+  integrity sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==
+
+"@esbuild/sunos-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.20.2.tgz#7df23b61a497b8ac189def6e25a95673caedb03f"
+  integrity sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==
+
+"@esbuild/win32-arm64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.20.2.tgz#f1ae5abf9ca052ae11c1bc806fb4c0f519bacf90"
+  integrity sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==
+
+"@esbuild/win32-ia32@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.20.2.tgz#241fe62c34d8e8461cd708277813e1d0ba55ce23"
+  integrity sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==
+
+"@esbuild/win32-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz#9c907b21e30a52db959ba4f80bb01a0cc403d5cc"
+  integrity sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==
 
 "@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0":
   version "4.4.0"
@@ -335,37 +331,37 @@
   dependencies:
     eslint-visitor-keys "^3.3.0"
 
-"@eslint-community/regexpp@^4.5.1", "@eslint-community/regexpp@^4.6.1":
+"@eslint-community/regexpp@^4.10.0", "@eslint-community/regexpp@^4.6.1":
   version "4.10.0"
   resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.10.0.tgz#548f6de556857c8bb73bbee70c35dc82a2e74d63"
   integrity sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==
 
-"@eslint/eslintrc@^2.1.4":
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.4.tgz#388a269f0f25c1b6adc317b5a2c55714894c70ad"
-  integrity sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==
+"@eslint/eslintrc@^3.0.2":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-3.0.2.tgz#36180f8e85bf34d2fe3ccc2261e8e204a411ab4e"
+  integrity sha512-wV19ZEGEMAC1eHgrS7UQPqsdEiCIbTKTasEfcXAigzoXICcqZSjBZEHlZwNVvKg6UBCjSlos84XiLqsRJnIcIg==
   dependencies:
     ajv "^6.12.4"
     debug "^4.3.2"
-    espree "^9.6.0"
-    globals "^13.19.0"
+    espree "^10.0.1"
+    globals "^14.0.0"
     ignore "^5.2.0"
     import-fresh "^3.2.1"
     js-yaml "^4.1.0"
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@eslint/js@8.57.0":
-  version "8.57.0"
-  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.0.tgz#a5417ae8427873f1dd08b70b3574b453e67b5f7f"
-  integrity sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==
+"@eslint/js@9.1.1":
+  version "9.1.1"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.1.1.tgz#eb0f82461d12779bbafc1b5045cde3143d350a8a"
+  integrity sha512-5WoDz3Y19Bg2BnErkZTp0en+c/i9PvgFS7MBe1+m60HjFr0hrphlAGp4yzI7pxpt4xShln4ZyYp4neJm8hmOkQ==
 
-"@humanwhocodes/config-array@^0.11.14":
-  version "0.11.14"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.14.tgz#d78e481a039f7566ecc9660b4ea7fe6b1fec442b"
-  integrity sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==
+"@humanwhocodes/config-array@^0.13.0":
+  version "0.13.0"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.13.0.tgz#fb907624df3256d04b9aa2df50d7aa97ec648748"
+  integrity sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==
   dependencies:
-    "@humanwhocodes/object-schema" "^2.0.2"
+    "@humanwhocodes/object-schema" "^2.0.3"
     debug "^4.3.1"
     minimatch "^3.0.5"
 
@@ -374,12 +370,17 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
   integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
 
-"@humanwhocodes/object-schema@^2.0.2":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz#d9fae00a2d5cb40f92cfe64b47ad749fbc38f917"
-  integrity sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==
+"@humanwhocodes/object-schema@^2.0.3":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz#4a2868d75d6d6963e423bcf90b7fd1be343409d3"
+  integrity sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==
+
+"@humanwhocodes/retry@^0.2.3":
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/retry/-/retry-0.2.3.tgz#c9aa036d1afa643f1250e83150f39efb3a15a631"
+  integrity sha512-X38nUbachlb01YMlvPFojKoiXq+LzZvuSce70KPMPdeM1Rj03k4dR7lDslhbqXn3Ang4EU3+EAmwEAsbrjHW3g==
 
-"@jridgewell/gen-mapping@^0.3.2", "@jridgewell/gen-mapping@^0.3.5":
+"@jridgewell/gen-mapping@^0.3.5":
   version "0.3.5"
   resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz#dcce6aff74bdf6dad1a95802b69b04a2fcb1fb36"
   integrity sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==
@@ -403,7 +404,7 @@
   resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32"
   integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
 
-"@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.24":
+"@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25":
   version "0.3.25"
   resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz#15f190e98895f3fc23276ee14bc76b675c2e50f0"
   integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==
@@ -437,70 +438,85 @@
   resolved "https://registry.yarnpkg.com/@pkgr/core/-/core-0.1.1.tgz#1ec17e2edbec25c8306d424ecfbf13c7de1aaa31"
   integrity sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==
 
-"@rollup/rollup-android-arm-eabi@4.12.0":
-  version "4.12.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.12.0.tgz#38c3abd1955a3c21d492af6b1a1dca4bb1d894d6"
-  integrity sha512-+ac02NL/2TCKRrJu2wffk1kZ+RyqxVUlbjSagNgPm94frxtr+XDL12E5Ll1enWskLrtrZ2r8L3wED1orIibV/w==
-
-"@rollup/rollup-android-arm64@4.12.0":
-  version "4.12.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.12.0.tgz#3822e929f415627609e53b11cec9a4be806de0e2"
-  integrity sha512-OBqcX2BMe6nvjQ0Nyp7cC90cnumt8PXmO7Dp3gfAju/6YwG0Tj74z1vKrfRz7qAv23nBcYM8BCbhrsWqO7PzQQ==
-
-"@rollup/rollup-darwin-arm64@4.12.0":
-  version "4.12.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.12.0.tgz#6c082de71f481f57df6cfa3701ab2a7afde96f69"
-  integrity sha512-X64tZd8dRE/QTrBIEs63kaOBG0b5GVEd3ccoLtyf6IdXtHdh8h+I56C2yC3PtC9Ucnv0CpNFJLqKFVgCYe0lOQ==
-
-"@rollup/rollup-darwin-x64@4.12.0":
-  version "4.12.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.12.0.tgz#c34ca0d31f3c46a22c9afa0e944403eea0edcfd8"
-  integrity sha512-cc71KUZoVbUJmGP2cOuiZ9HSOP14AzBAThn3OU+9LcA1+IUqswJyR1cAJj3Mg55HbjZP6OLAIscbQsQLrpgTOg==
-
-"@rollup/rollup-linux-arm-gnueabihf@4.12.0":
-  version "4.12.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.12.0.tgz#48e899c1e438629c072889b824a98787a7c2362d"
-  integrity sha512-a6w/Y3hyyO6GlpKL2xJ4IOh/7d+APaqLYdMf86xnczU3nurFTaVN9s9jOXQg97BE4nYm/7Ga51rjec5nfRdrvA==
-
-"@rollup/rollup-linux-arm64-gnu@4.12.0":
-  version "4.12.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.12.0.tgz#788c2698a119dc229062d40da6ada8a090a73a68"
-  integrity sha512-0fZBq27b+D7Ar5CQMofVN8sggOVhEtzFUwOwPppQt0k+VR+7UHMZZY4y+64WJ06XOhBTKXtQB/Sv0NwQMXyNAA==
-
-"@rollup/rollup-linux-arm64-musl@4.12.0":
-  version "4.12.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.12.0.tgz#3882a4e3a564af9e55804beeb67076857b035ab7"
-  integrity sha512-eTvzUS3hhhlgeAv6bfigekzWZjaEX9xP9HhxB0Dvrdbkk5w/b+1Sxct2ZuDxNJKzsRStSq1EaEkVSEe7A7ipgQ==
-
-"@rollup/rollup-linux-riscv64-gnu@4.12.0":
-  version "4.12.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.12.0.tgz#0c6ad792e1195c12bfae634425a3d2aa0fe93ab7"
-  integrity sha512-ix+qAB9qmrCRiaO71VFfY8rkiAZJL8zQRXveS27HS+pKdjwUfEhqo2+YF2oI+H/22Xsiski+qqwIBxVewLK7sw==
-
-"@rollup/rollup-linux-x64-gnu@4.12.0":
-  version "4.12.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.12.0.tgz#9d62485ea0f18d8674033b57aa14fb758f6ec6e3"
-  integrity sha512-TenQhZVOtw/3qKOPa7d+QgkeM6xY0LtwzR8OplmyL5LrgTWIXpTQg2Q2ycBf8jm+SFW2Wt/DTn1gf7nFp3ssVA==
-
-"@rollup/rollup-linux-x64-musl@4.12.0":
-  version "4.12.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.12.0.tgz#50e8167e28b33c977c1f813def2b2074d1435e05"
-  integrity sha512-LfFdRhNnW0zdMvdCb5FNuWlls2WbbSridJvxOvYWgSBOYZtgBfW9UGNJG//rwMqTX1xQE9BAodvMH9tAusKDUw==
-
-"@rollup/rollup-win32-arm64-msvc@4.12.0":
-  version "4.12.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.12.0.tgz#68d233272a2004429124494121a42c4aebdc5b8e"
-  integrity sha512-JPDxovheWNp6d7AHCgsUlkuCKvtu3RB55iNEkaQcf0ttsDU/JZF+iQnYcQJSk/7PtT4mjjVG8N1kpwnI9SLYaw==
-
-"@rollup/rollup-win32-ia32-msvc@4.12.0":
-  version "4.12.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.12.0.tgz#366ca62221d1689e3b55a03f4ae12ae9ba595d40"
-  integrity sha512-fjtuvMWRGJn1oZacG8IPnzIV6GF2/XG+h71FKn76OYFqySXInJtseAqdprVTDTyqPxQOG9Exak5/E9Z3+EJ8ZA==
-
-"@rollup/rollup-win32-x64-msvc@4.12.0":
-  version "4.12.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.12.0.tgz#9ffdf9ed133a7464f4ae187eb9e1294413fab235"
-  integrity sha512-ZYmr5mS2wd4Dew/JjT0Fqi2NPB/ZhZ2VvPp7SmvPZb4Y1CG/LRcS6tcRo2cYU7zLK5A7cdbhWnnWmUjoI4qapg==
+"@rollup/rollup-android-arm-eabi@4.17.2":
+  version "4.17.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.17.2.tgz#1a32112822660ee104c5dd3a7c595e26100d4c2d"
+  integrity sha512-NM0jFxY8bB8QLkoKxIQeObCaDlJKewVlIEkuyYKm5An1tdVZ966w2+MPQ2l8LBZLjR+SgyV+nRkTIunzOYBMLQ==
+
+"@rollup/rollup-android-arm64@4.17.2":
+  version "4.17.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.17.2.tgz#5aeef206d65ff4db423f3a93f71af91b28662c5b"
+  integrity sha512-yeX/Usk7daNIVwkq2uGoq2BYJKZY1JfyLTaHO/jaiSwi/lsf8fTFoQW/n6IdAsx5tx+iotu2zCJwz8MxI6D/Bw==
+
+"@rollup/rollup-darwin-arm64@4.17.2":
+  version "4.17.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.17.2.tgz#6b66aaf003c70454c292cd5f0236ebdc6ffbdf1a"
+  integrity sha512-kcMLpE6uCwls023+kknm71ug7MZOrtXo+y5p/tsg6jltpDtgQY1Eq5sGfHcQfb+lfuKwhBmEURDga9N0ol4YPw==
+
+"@rollup/rollup-darwin-x64@4.17.2":
+  version "4.17.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.17.2.tgz#f64fc51ed12b19f883131ccbcea59fc68cbd6c0b"
+  integrity sha512-AtKwD0VEx0zWkL0ZjixEkp5tbNLzX+FCqGG1SvOu993HnSz4qDI6S4kGzubrEJAljpVkhRSlg5bzpV//E6ysTQ==
+
+"@rollup/rollup-linux-arm-gnueabihf@4.17.2":
+  version "4.17.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.17.2.tgz#1a7641111be67c10111f7122d1e375d1226cbf14"
+  integrity sha512-3reX2fUHqN7sffBNqmEyMQVj/CKhIHZd4y631duy0hZqI8Qoqf6lTtmAKvJFYa6bhU95B1D0WgzHkmTg33In0A==
+
+"@rollup/rollup-linux-arm-musleabihf@4.17.2":
+  version "4.17.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.17.2.tgz#c93fd632923e0fee25aacd2ae414288d0b7455bb"
+  integrity sha512-uSqpsp91mheRgw96xtyAGP9FW5ChctTFEoXP0r5FAzj/3ZRv3Uxjtc7taRQSaQM/q85KEKjKsZuiZM3GyUivRg==
+
+"@rollup/rollup-linux-arm64-gnu@4.17.2":
+  version "4.17.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.17.2.tgz#fa531425dd21d058a630947527b4612d9d0b4a4a"
+  integrity sha512-EMMPHkiCRtE8Wdk3Qhtciq6BndLtstqZIroHiiGzB3C5LDJmIZcSzVtLRbwuXuUft1Cnv+9fxuDtDxz3k3EW2A==
+
+"@rollup/rollup-linux-arm64-musl@4.17.2":
+  version "4.17.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.17.2.tgz#8acc16f095ceea5854caf7b07e73f7d1802ac5af"
+  integrity sha512-NMPylUUZ1i0z/xJUIx6VUhISZDRT+uTWpBcjdv0/zkp7b/bQDF+NfnfdzuTiB1G6HTodgoFa93hp0O1xl+/UbA==
+
+"@rollup/rollup-linux-powerpc64le-gnu@4.17.2":
+  version "4.17.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.17.2.tgz#94e69a8499b5cf368911b83a44bb230782aeb571"
+  integrity sha512-T19My13y8uYXPw/L/k0JYaX1fJKFT/PWdXiHr8mTbXWxjVF1t+8Xl31DgBBvEKclw+1b00Chg0hxE2O7bTG7GQ==
+
+"@rollup/rollup-linux-riscv64-gnu@4.17.2":
+  version "4.17.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.17.2.tgz#7ef1c781c7e59e85a6ce261cc95d7f1e0b56db0f"
+  integrity sha512-BOaNfthf3X3fOWAB+IJ9kxTgPmMqPPH5f5k2DcCsRrBIbWnaJCgX2ll77dV1TdSy9SaXTR5iDXRL8n7AnoP5cg==
+
+"@rollup/rollup-linux-s390x-gnu@4.17.2":
+  version "4.17.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.17.2.tgz#f15775841c3232fca9b78cd25a7a0512c694b354"
+  integrity sha512-W0UP/x7bnn3xN2eYMql2T/+wpASLE5SjObXILTMPUBDB/Fg/FxC+gX4nvCfPBCbNhz51C+HcqQp2qQ4u25ok6g==
+
+"@rollup/rollup-linux-x64-gnu@4.17.2":
+  version "4.17.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.17.2.tgz#b521d271798d037ad70c9f85dd97d25f8a52e811"
+  integrity sha512-Hy7pLwByUOuyaFC6mAr7m+oMC+V7qyifzs/nW2OJfC8H4hbCzOX07Ov0VFk/zP3kBsELWNFi7rJtgbKYsav9QQ==
+
+"@rollup/rollup-linux-x64-musl@4.17.2":
+  version "4.17.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.17.2.tgz#9254019cc4baac35800991315d133cc9fd1bf385"
+  integrity sha512-h1+yTWeYbRdAyJ/jMiVw0l6fOOm/0D1vNLui9iPuqgRGnXA0u21gAqOyB5iHjlM9MMfNOm9RHCQ7zLIzT0x11Q==
+
+"@rollup/rollup-win32-arm64-msvc@4.17.2":
+  version "4.17.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.17.2.tgz#27f65a89f6f52ee9426ec11e3571038e4671790f"
+  integrity sha512-tmdtXMfKAjy5+IQsVtDiCfqbynAQE/TQRpWdVataHmhMb9DCoJxp9vLcCBjEQWMiUYxO1QprH/HbY9ragCEFLA==
+
+"@rollup/rollup-win32-ia32-msvc@4.17.2":
+  version "4.17.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.17.2.tgz#a2fbf8246ed0bb014f078ca34ae6b377a90cb411"
+  integrity sha512-7II/QCSTAHuE5vdZaQEwJq2ZACkBpQDOmQsE6D6XUbnBHW8IAhm4eTufL6msLJorzrHDFv3CF8oCA/hSIRuZeQ==
+
+"@rollup/rollup-win32-x64-msvc@4.17.2":
+  version "4.17.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.17.2.tgz#5a2d08b81e8064b34242d5cc9973ef8dd1e60503"
+  integrity sha512-TGGO7v7qOq4CYmSBVEYpI1Y5xDuCEnbVC5Vth8mOsW0gDSzxNrVERPc790IGHsrT2dQSimgMr9Ub3Y1Jci5/8w==
 
 "@types/babel__core@^7.20.4":
   version "7.20.5"
@@ -540,161 +556,108 @@
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
   integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==
 
-"@types/json-schema@^7.0.12":
+"@types/json-schema@^7.0.15":
   version "7.0.15"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
   integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
 
-"@types/semver@^7.5.0":
+"@types/semver@^7.5.8":
   version "7.5.8"
   resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.8.tgz#8268a8c57a3e4abd25c165ecd36237db7948a55e"
   integrity sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==
 
-"@typescript-eslint/eslint-plugin@^7.1.1":
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.1.1.tgz#dd71fc5c7ecec745ca26ece506d84d203a205c0e"
-  integrity sha512-zioDz623d0RHNhvx0eesUmGfIjzrk18nSBC8xewepKXbBvN/7c1qImV7Hg8TI1URTxKax7/zxfxj3Uph8Chcuw==
+"@typescript-eslint/eslint-plugin@7.8.0":
+  version "7.8.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.8.0.tgz#c78e309fe967cb4de05b85cdc876fb95f8e01b6f"
+  integrity sha512-gFTT+ezJmkwutUPmB0skOj3GZJtlEGnlssems4AjkVweUPGj7jRwwqg0Hhg7++kPGJqKtTYx+R05Ftww372aIg==
   dependencies:
-    "@eslint-community/regexpp" "^4.5.1"
-    "@typescript-eslint/scope-manager" "7.1.1"
-    "@typescript-eslint/type-utils" "7.1.1"
-    "@typescript-eslint/utils" "7.1.1"
-    "@typescript-eslint/visitor-keys" "7.1.1"
+    "@eslint-community/regexpp" "^4.10.0"
+    "@typescript-eslint/scope-manager" "7.8.0"
+    "@typescript-eslint/type-utils" "7.8.0"
+    "@typescript-eslint/utils" "7.8.0"
+    "@typescript-eslint/visitor-keys" "7.8.0"
     debug "^4.3.4"
     graphemer "^1.4.0"
-    ignore "^5.2.4"
+    ignore "^5.3.1"
     natural-compare "^1.4.0"
-    semver "^7.5.4"
-    ts-api-utils "^1.0.1"
-
-"@typescript-eslint/parser@^7.1.1":
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.1.1.tgz#6a9d0a5c9ccdf5dbd3cb8c949728c64e24e07d1f"
-  integrity sha512-ZWUFyL0z04R1nAEgr9e79YtV5LbafdOtN7yapNbn1ansMyaegl2D4bL7vHoJ4HPSc4CaLwuCVas8CVuneKzplQ==
-  dependencies:
-    "@typescript-eslint/scope-manager" "7.1.1"
-    "@typescript-eslint/types" "7.1.1"
-    "@typescript-eslint/typescript-estree" "7.1.1"
-    "@typescript-eslint/visitor-keys" "7.1.1"
+    semver "^7.6.0"
+    ts-api-utils "^1.3.0"
+
+"@typescript-eslint/parser@7.8.0":
+  version "7.8.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.8.0.tgz#1e1db30c8ab832caffee5f37e677dbcb9357ddc8"
+  integrity sha512-KgKQly1pv0l4ltcftP59uQZCi4HUYswCLbTqVZEJu7uLX8CTLyswqMLqLN+2QFz4jCptqWVV4SB7vdxcH2+0kQ==
+  dependencies:
+    "@typescript-eslint/scope-manager" "7.8.0"
+    "@typescript-eslint/types" "7.8.0"
+    "@typescript-eslint/typescript-estree" "7.8.0"
+    "@typescript-eslint/visitor-keys" "7.8.0"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@6.21.0":
-  version "6.21.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.21.0.tgz#ea8a9bfc8f1504a6ac5d59a6df308d3a0630a2b1"
-  integrity sha512-OwLUIWZJry80O99zvqXVEioyniJMa+d2GrqpUTqi5/v5D5rOrppJVBPa0yKCblcigC0/aYAzxxqQ1B+DS2RYsg==
+"@typescript-eslint/scope-manager@7.8.0":
+  version "7.8.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.8.0.tgz#bb19096d11ec6b87fb6640d921df19b813e02047"
+  integrity sha512-viEmZ1LmwsGcnr85gIq+FCYI7nO90DVbE37/ll51hjv9aG+YZMb4WDE2fyWpUR4O/UrhGRpYXK/XajcGTk2B8g==
   dependencies:
-    "@typescript-eslint/types" "6.21.0"
-    "@typescript-eslint/visitor-keys" "6.21.0"
+    "@typescript-eslint/types" "7.8.0"
+    "@typescript-eslint/visitor-keys" "7.8.0"
 
-"@typescript-eslint/scope-manager@7.1.1":
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.1.1.tgz#9e301803ff8e21a74f50c6f89a4baccad9a48f93"
-  integrity sha512-cirZpA8bJMRb4WZ+rO6+mnOJrGFDd38WoXCEI57+CYBqta8Yc8aJym2i7vyqLL1vVYljgw0X27axkUXz32T8TA==
+"@typescript-eslint/type-utils@7.8.0":
+  version "7.8.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-7.8.0.tgz#9de166f182a6e4d1c5da76e94880e91831e3e26f"
+  integrity sha512-H70R3AefQDQpz9mGv13Uhi121FNMh+WEaRqcXTX09YEDky21km4dV1ZXJIp8QjXc4ZaVkXVdohvWDzbnbHDS+A==
   dependencies:
-    "@typescript-eslint/types" "7.1.1"
-    "@typescript-eslint/visitor-keys" "7.1.1"
-
-"@typescript-eslint/type-utils@7.1.1":
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-7.1.1.tgz#aee820d5bedd39b83c18585a526cc520ddb7a226"
-  integrity sha512-5r4RKze6XHEEhlZnJtR3GYeCh1IueUHdbrukV2KSlLXaTjuSfeVF8mZUVPLovidCuZfbVjfhi4c0DNSa/Rdg5g==
-  dependencies:
-    "@typescript-eslint/typescript-estree" "7.1.1"
-    "@typescript-eslint/utils" "7.1.1"
+    "@typescript-eslint/typescript-estree" "7.8.0"
+    "@typescript-eslint/utils" "7.8.0"
     debug "^4.3.4"
-    ts-api-utils "^1.0.1"
-
-"@typescript-eslint/types@6.21.0":
-  version "6.21.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.21.0.tgz#205724c5123a8fef7ecd195075fa6e85bac3436d"
-  integrity sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg==
+    ts-api-utils "^1.3.0"
 
-"@typescript-eslint/types@7.1.1":
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.1.1.tgz#ca33ba7cf58224fb46a84fea62593c2c53cd795f"
-  integrity sha512-KhewzrlRMrgeKm1U9bh2z5aoL4s7K3tK5DwHDn8MHv0yQfWFz/0ZR6trrIHHa5CsF83j/GgHqzdbzCXJ3crx0Q==
+"@typescript-eslint/types@7.8.0":
+  version "7.8.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.8.0.tgz#1fd2577b3ad883b769546e2d1ef379f929a7091d"
+  integrity sha512-wf0peJ+ZGlcH+2ZS23aJbOv+ztjeeP8uQ9GgwMJGVLx/Nj9CJt17GWgWWoSmoRVKAX2X+7fzEnAjxdvK2gqCLw==
 
-"@typescript-eslint/typescript-estree@6.21.0":
-  version "6.21.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.21.0.tgz#c47ae7901db3b8bddc3ecd73daff2d0895688c46"
-  integrity sha512-6npJTkZcO+y2/kr+z0hc4HwNfrrP4kNYh57ek7yCNlrBjWQ1Y0OS7jiZTkgumrvkX5HkEKXFZkkdFNkaW2wmUQ==
+"@typescript-eslint/typescript-estree@7.8.0":
+  version "7.8.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.8.0.tgz#b028a9226860b66e623c1ee55cc2464b95d2987c"
+  integrity sha512-5pfUCOwK5yjPaJQNy44prjCwtr981dO8Qo9J9PwYXZ0MosgAbfEMB008dJ5sNo3+/BN6ytBPuSvXUg9SAqB0dg==
   dependencies:
-    "@typescript-eslint/types" "6.21.0"
-    "@typescript-eslint/visitor-keys" "6.21.0"
+    "@typescript-eslint/types" "7.8.0"
+    "@typescript-eslint/visitor-keys" "7.8.0"
     debug "^4.3.4"
     globby "^11.1.0"
     is-glob "^4.0.3"
-    minimatch "9.0.3"
-    semver "^7.5.4"
-    ts-api-utils "^1.0.1"
+    minimatch "^9.0.4"
+    semver "^7.6.0"
+    ts-api-utils "^1.3.0"
 
-"@typescript-eslint/typescript-estree@7.1.1":
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.1.1.tgz#09c54af0151a1b05d0875c0fc7fe2ec7a2476ece"
-  integrity sha512-9ZOncVSfr+sMXVxxca2OJOPagRwT0u/UHikM2Rd6L/aB+kL/QAuTnsv6MeXtjzCJYb8PzrXarypSGIPx3Jemxw==
-  dependencies:
-    "@typescript-eslint/types" "7.1.1"
-    "@typescript-eslint/visitor-keys" "7.1.1"
-    debug "^4.3.4"
-    globby "^11.1.0"
-    is-glob "^4.0.3"
-    minimatch "9.0.3"
-    semver "^7.5.4"
-    ts-api-utils "^1.0.1"
-
-"@typescript-eslint/utils@7.1.1":
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.1.1.tgz#bdeeb789eee4af5d3fb5400a69566d4dbf97ff3b"
-  integrity sha512-thOXM89xA03xAE0lW7alstvnyoBUbBX38YtY+zAUcpRPcq9EIhXPuJ0YTv948MbzmKh6e1AUszn5cBFK49Umqg==
+"@typescript-eslint/utils@7.8.0", "@typescript-eslint/utils@^7.6.0":
+  version "7.8.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.8.0.tgz#57a79f9c0c0740ead2f622e444cfaeeb9fd047cd"
+  integrity sha512-L0yFqOCflVqXxiZyXrDr80lnahQfSOfc9ELAAZ75sqicqp2i36kEZZGuUymHNFoYOqxRT05up760b4iGsl02nQ==
   dependencies:
     "@eslint-community/eslint-utils" "^4.4.0"
-    "@types/json-schema" "^7.0.12"
-    "@types/semver" "^7.5.0"
-    "@typescript-eslint/scope-manager" "7.1.1"
-    "@typescript-eslint/types" "7.1.1"
-    "@typescript-eslint/typescript-estree" "7.1.1"
-    semver "^7.5.4"
-
-"@typescript-eslint/utils@^6.4.0":
-  version "6.21.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.21.0.tgz#4714e7a6b39e773c1c8e97ec587f520840cd8134"
-  integrity sha512-NfWVaC8HP9T8cbKQxHcsJBY5YE1O33+jpMwN45qzWWaPDZgLIbo12toGMWnmhvCpd3sIxkpDw3Wv1B3dYrbDQQ==
-  dependencies:
-    "@eslint-community/eslint-utils" "^4.4.0"
-    "@types/json-schema" "^7.0.12"
-    "@types/semver" "^7.5.0"
-    "@typescript-eslint/scope-manager" "6.21.0"
-    "@typescript-eslint/types" "6.21.0"
-    "@typescript-eslint/typescript-estree" "6.21.0"
-    semver "^7.5.4"
-
-"@typescript-eslint/visitor-keys@6.21.0":
-  version "6.21.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.21.0.tgz#87a99d077aa507e20e238b11d56cc26ade45fe47"
-  integrity sha512-JJtkDduxLi9bivAB+cYOVMtbkqdPOhZ+ZI5LC47MIRrDV4Yn2o+ZnW10Nkmr28xRpSpdJ6Sm42Hjf2+REYXm0A==
-  dependencies:
-    "@typescript-eslint/types" "6.21.0"
-    eslint-visitor-keys "^3.4.1"
-
-"@typescript-eslint/visitor-keys@7.1.1":
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.1.1.tgz#e6538a58c9b157f03bcbb29e3b6a92fe39a6ab0d"
-  integrity sha512-yTdHDQxY7cSoCcAtiBzVzxleJhkGB9NncSIyMYe2+OGON1ZsP9zOPws/Pqgopa65jvknOjlk/w7ulPlZ78PiLQ==
-  dependencies:
-    "@typescript-eslint/types" "7.1.1"
-    eslint-visitor-keys "^3.4.1"
-
-"@ungap/structured-clone@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"
-  integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==
+    "@types/json-schema" "^7.0.15"
+    "@types/semver" "^7.5.8"
+    "@typescript-eslint/scope-manager" "7.8.0"
+    "@typescript-eslint/types" "7.8.0"
+    "@typescript-eslint/typescript-estree" "7.8.0"
+    semver "^7.6.0"
+
+"@typescript-eslint/visitor-keys@7.8.0":
+  version "7.8.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.8.0.tgz#7285aab991da8bee411a42edbd5db760d22fdd91"
+  integrity sha512-q4/gibTNBQNA0lGyYQCmWRS5D15n8rXh4QjK3KV+MBPlTYHpfBUT3D3PaPR/HeNiI9W6R7FvlkcGhNyAoP+caA==
+  dependencies:
+    "@typescript-eslint/types" "7.8.0"
+    eslint-visitor-keys "^3.4.3"
 
 acorn-jsx@^5.3.2:
   version "5.3.2"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
-acorn@^8.9.0:
+acorn@^8.11.3:
   version "8.11.3"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.3.tgz#71e0b14e13a4ec160724b38fb7b0f233b1b81d7a"
   integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==
@@ -738,10 +701,10 @@ array-union@^2.1.0:
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
   integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
 
-babel-plugin-jsx-dom-expressions@^0.37.17:
-  version "0.37.17"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jsx-dom-expressions/-/babel-plugin-jsx-dom-expressions-0.37.17.tgz#3bf0a756e2701e0ea830a95b4f8d7e5b617aabaf"
-  integrity sha512-1bv8rOTzs6TR3DVyVZ7ElxyPEhnS556FMWRIsB3gBPfkn/cSKaLvXLGk+X1lvI+SzcUo4G+UcmJrn3vr1ig8mQ==
+babel-plugin-jsx-dom-expressions@^0.37.20:
+  version "0.37.20"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jsx-dom-expressions/-/babel-plugin-jsx-dom-expressions-0.37.20.tgz#506fd0302d6740bdea957d5f7b18eccb117342ca"
+  integrity sha512-0L3aC5EFyvCgIlEYIqJb4Ym29s1IDI/U5SntZ1ZK054xe0MqBmBi2GLK3f9AOklhdY7kCC3GsHD0bILh6u0Qsg==
   dependencies:
     "@babel/helper-module-imports" "7.18.6"
     "@babel/plugin-syntax-jsx" "^7.18.6"
@@ -750,11 +713,11 @@ babel-plugin-jsx-dom-expressions@^0.37.17:
     validate-html-nesting "^1.2.1"
 
 babel-preset-solid@^1.8.4:
-  version "1.8.15"
-  resolved "https://registry.yarnpkg.com/babel-preset-solid/-/babel-preset-solid-1.8.15.tgz#59a80e7048a6ab7142768de6f7f1f887cfc5fdcc"
-  integrity sha512-P2yOQbB7Hn/m4YvpXV6ExHIMcgNWXWXcvY4kJzG3yqAB3hKS58OZRsvJ7RObsZWqXRvZTITBIwnpK0BMGu+ZIQ==
+  version "1.8.17"
+  resolved "https://registry.yarnpkg.com/babel-preset-solid/-/babel-preset-solid-1.8.17.tgz#8d55e8e2ee800be85527425e7943534f984dc815"
+  integrity sha512-s/FfTZOeds0hYxYqce90Jb+0ycN2lrzC7VP1k1JIn3wBqcaexDKdYi6xjB+hMNkL+Q6HobKbwsriqPloasR9LA==
   dependencies:
-    babel-plugin-jsx-dom-expressions "^0.37.17"
+    babel-plugin-jsx-dom-expressions "^0.37.20"
 
 balanced-match@^1.0.0:
   version "1.0.2"
@@ -799,9 +762,9 @@ callsites@^3.0.0:
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
 caniuse-lite@^1.0.30001587:
-  version "1.0.30001593"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001593.tgz#7cda1d9e5b0cad6ebab4133b1f239d4ea44fe659"
-  integrity sha512-UWM1zlo3cZfkpBysd7AS+z+v007q9G1+fLTUU42rQnY6t2axoogPW/xol6T7juU5EUoOhML4WgBIdG+9yYqAjQ==
+  version "1.0.30001615"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001615.tgz#7c2c8772db681b6dee74d81d6550db68f2d28842"
+  integrity sha512-1IpazM5G3r38meiae0bHRnPhz+CBQ3ZLqbQMtrg+AsTPKAXgW38JNsXkyZ+v8waCsDmPq87lmfun5Q2AGysNEQ==
 
 chalk@^2.4.2:
   version "2.4.2"
@@ -887,48 +850,41 @@ dir-glob@^3.0.1:
   dependencies:
     path-type "^4.0.0"
 
-doctrine@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
-  integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==
-  dependencies:
-    esutils "^2.0.2"
-
 electron-to-chromium@^1.4.668:
-  version "1.4.690"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.690.tgz#dd5145d45c49c08a9a6f7454127e660bdf9a3fa7"
-  integrity sha512-+2OAGjUx68xElQhydpcbqH50hE8Vs2K6TkAeLhICYfndb67CVH0UsZaijmRUE3rHlIxU1u0jxwhgVe6fK3YANA==
-
-esbuild@^0.19.3:
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.19.12.tgz#dc82ee5dc79e82f5a5c3b4323a2a641827db3e04"
-  integrity sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==
+  version "1.4.754"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.754.tgz#20a9f3cc80e0fb6a804b86605e55da16918a58b0"
+  integrity sha512-7Kr5jUdns5rL/M9wFFmMZAgFDuL2YOnanFH4OI4iFzUqyh3XOL7nAGbSlSMZdzKMIyyTpNSbqZsWG9odwLeKvA==
+
+esbuild@^0.20.1:
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.20.2.tgz#9d6b2386561766ee6b5a55196c6d766d28c87ea1"
+  integrity sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==
   optionalDependencies:
-    "@esbuild/aix-ppc64" "0.19.12"
-    "@esbuild/android-arm" "0.19.12"
-    "@esbuild/android-arm64" "0.19.12"
-    "@esbuild/android-x64" "0.19.12"
-    "@esbuild/darwin-arm64" "0.19.12"
-    "@esbuild/darwin-x64" "0.19.12"
-    "@esbuild/freebsd-arm64" "0.19.12"
-    "@esbuild/freebsd-x64" "0.19.12"
-    "@esbuild/linux-arm" "0.19.12"
-    "@esbuild/linux-arm64" "0.19.12"
-    "@esbuild/linux-ia32" "0.19.12"
-    "@esbuild/linux-loong64" "0.19.12"
-    "@esbuild/linux-mips64el" "0.19.12"
-    "@esbuild/linux-ppc64" "0.19.12"
-    "@esbuild/linux-riscv64" "0.19.12"
-    "@esbuild/linux-s390x" "0.19.12"
-    "@esbuild/linux-x64" "0.19.12"
-    "@esbuild/netbsd-x64" "0.19.12"
-    "@esbuild/openbsd-x64" "0.19.12"
-    "@esbuild/sunos-x64" "0.19.12"
-    "@esbuild/win32-arm64" "0.19.12"
-    "@esbuild/win32-ia32" "0.19.12"
-    "@esbuild/win32-x64" "0.19.12"
-
-escalade@^3.1.1:
+    "@esbuild/aix-ppc64" "0.20.2"
+    "@esbuild/android-arm" "0.20.2"
+    "@esbuild/android-arm64" "0.20.2"
+    "@esbuild/android-x64" "0.20.2"
+    "@esbuild/darwin-arm64" "0.20.2"
+    "@esbuild/darwin-x64" "0.20.2"
+    "@esbuild/freebsd-arm64" "0.20.2"
+    "@esbuild/freebsd-x64" "0.20.2"
+    "@esbuild/linux-arm" "0.20.2"
+    "@esbuild/linux-arm64" "0.20.2"
+    "@esbuild/linux-ia32" "0.20.2"
+    "@esbuild/linux-loong64" "0.20.2"
+    "@esbuild/linux-mips64el" "0.20.2"
+    "@esbuild/linux-ppc64" "0.20.2"
+    "@esbuild/linux-riscv64" "0.20.2"
+    "@esbuild/linux-s390x" "0.20.2"
+    "@esbuild/linux-x64" "0.20.2"
+    "@esbuild/netbsd-x64" "0.20.2"
+    "@esbuild/openbsd-x64" "0.20.2"
+    "@esbuild/sunos-x64" "0.20.2"
+    "@esbuild/win32-arm64" "0.20.2"
+    "@esbuild/win32-ia32" "0.20.2"
+    "@esbuild/win32-x64" "0.20.2"
+
+escalade@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.2.tgz#54076e9ab29ea5bf3d8f1ed62acffbb88272df27"
   integrity sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==
@@ -951,70 +907,72 @@ eslint-plugin-prettier@^5.1.3:
     prettier-linter-helpers "^1.0.0"
     synckit "^0.8.6"
 
-eslint-plugin-simple-import-sort@^12.0.0:
-  version "12.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-12.0.0.tgz#3cfa05d74509bd4dc329a956938823812194dbb6"
-  integrity sha512-8o0dVEdAkYap0Cn5kNeklaKcT1nUsa3LITWEuFk3nJifOoD+5JQGoyDUW2W/iPWwBsNBJpyJS9y4je/BgxLcyQ==
+eslint-plugin-simple-import-sort@^12.1.0:
+  version "12.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-12.1.0.tgz#8186ad55474d2f5c986a2f1bf70625a981e30d05"
+  integrity sha512-Y2fqAfC11TcG/WP3TrI1Gi3p3nc8XJyEOJYHyEPEGI/UAgNx6akxxlX74p7SbAQdLcgASKhj8M0GKvH3vq/+ig==
 
-eslint-plugin-solid@^0.13.1:
-  version "0.13.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-solid/-/eslint-plugin-solid-0.13.1.tgz#608b8afd981b0f981ee97fa18a8acfe1efc0a9c4"
-  integrity sha512-PdNrAylFzeh/SbnLc2pQ432l+bXFGzXj/qNqkh5QNVZCoWIdSs0CJA2D7hqW0DloztwUrzkVZCDWFWc3iRAm/Q==
+eslint-plugin-solid@^0.14.0:
+  version "0.14.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-solid/-/eslint-plugin-solid-0.14.0.tgz#f700d0763641a6ef999cce7f507f2910347cf396"
+  integrity sha512-EY0GJLOZdLynAyBM39WBLJH2bUftGI0KekyzpfxQEhCTuOhXkIRf648P97mQjME3TDaQQbY+ObVXeE2mjfs4FQ==
   dependencies:
-    "@typescript-eslint/utils" "^6.4.0"
+    "@typescript-eslint/utils" "^7.6.0"
+    estraverse "^5.3.0"
     is-html "^2.0.0"
     kebab-case "^1.0.2"
-    known-css-properties "^0.24.0"
-    style-to-object "^0.3.0"
+    known-css-properties "^0.30.0"
+    style-to-object "^1.0.6"
 
-eslint-scope@^7.2.2:
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f"
-  integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==
+eslint-scope@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-8.0.1.tgz#a9601e4b81a0b9171657c343fb13111688963cfc"
+  integrity sha512-pL8XjgP4ZOmmwfFE8mEhSxA7ZY4C+LWyqjQ3o4yWkkmD0qcMT9kkW3zWHOczhWcjTSgqycYAgwSlXvZltv65og==
   dependencies:
     esrecurse "^4.3.0"
     estraverse "^5.2.0"
 
-eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3:
+eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.3:
   version "3.4.3"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
   integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
 
-eslint@^8.57.0:
-  version "8.57.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.57.0.tgz#c786a6fd0e0b68941aaf624596fb987089195668"
-  integrity sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==
+eslint-visitor-keys@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz#e3adc021aa038a2a8e0b2f8b0ce8f66b9483b1fb"
+  integrity sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==
+
+eslint@^9.1.1:
+  version "9.1.1"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.1.1.tgz#39ec657ccd12813cb4a1dab2f9229dcc6e468271"
+  integrity sha512-b4cRQ0BeZcSEzPpY2PjFY70VbO32K7BStTGtBsnIGdTSEEQzBi8hPBcGQmTG2zUvFr9uLe0TK42bw8YszuHEqg==
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
     "@eslint-community/regexpp" "^4.6.1"
-    "@eslint/eslintrc" "^2.1.4"
-    "@eslint/js" "8.57.0"
-    "@humanwhocodes/config-array" "^0.11.14"
+    "@eslint/eslintrc" "^3.0.2"
+    "@eslint/js" "9.1.1"
+    "@humanwhocodes/config-array" "^0.13.0"
     "@humanwhocodes/module-importer" "^1.0.1"
+    "@humanwhocodes/retry" "^0.2.3"
     "@nodelib/fs.walk" "^1.2.8"
-    "@ungap/structured-clone" "^1.2.0"
     ajv "^6.12.4"
     chalk "^4.0.0"
     cross-spawn "^7.0.2"
     debug "^4.3.2"
-    doctrine "^3.0.0"
     escape-string-regexp "^4.0.0"
-    eslint-scope "^7.2.2"
-    eslint-visitor-keys "^3.4.3"
-    espree "^9.6.1"
+    eslint-scope "^8.0.1"
+    eslint-visitor-keys "^4.0.0"
+    espree "^10.0.1"
     esquery "^1.4.2"
     esutils "^2.0.2"
     fast-deep-equal "^3.1.3"
-    file-entry-cache "^6.0.1"
+    file-entry-cache "^8.0.0"
     find-up "^5.0.0"
     glob-parent "^6.0.2"
-    globals "^13.19.0"
-    graphemer "^1.4.0"
     ignore "^5.2.0"
     imurmurhash "^0.1.4"
     is-glob "^4.0.0"
     is-path-inside "^3.0.3"
-    js-yaml "^4.1.0"
     json-stable-stringify-without-jsonify "^1.0.1"
     levn "^0.4.1"
     lodash.merge "^4.6.2"
@@ -1024,14 +982,14 @@ eslint@^8.57.0:
     strip-ansi "^6.0.1"
     text-table "^0.2.0"
 
-espree@^9.6.0, espree@^9.6.1:
-  version "9.6.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f"
-  integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==
+espree@^10.0.1:
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-10.0.1.tgz#600e60404157412751ba4a6f3a2ee1a42433139f"
+  integrity sha512-MWkrWZbJsL2UwnjxTX3gG8FneachS/Mwg7tdGXce011sJd5b0JG54vat5KHnfSBODZ3Wvzd2WnjxyzsRoVv+ww==
   dependencies:
-    acorn "^8.9.0"
+    acorn "^8.11.3"
     acorn-jsx "^5.3.2"
-    eslint-visitor-keys "^3.4.1"
+    eslint-visitor-keys "^4.0.0"
 
 esquery@^1.4.2:
   version "1.5.0"
@@ -1047,7 +1005,7 @@ esrecurse@^4.3.0:
   dependencies:
     estraverse "^5.2.0"
 
-estraverse@^5.1.0, estraverse@^5.2.0:
+estraverse@^5.1.0, estraverse@^5.2.0, estraverse@^5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
   integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
@@ -1095,12 +1053,12 @@ fastq@^1.6.0:
   dependencies:
     reusify "^1.0.4"
 
-file-entry-cache@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
-  integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==
+file-entry-cache@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-8.0.0.tgz#7787bddcf1131bffb92636c69457bbc0edd6d81f"
+  integrity sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==
   dependencies:
-    flat-cache "^3.0.4"
+    flat-cache "^4.0.0"
 
 fill-range@^7.0.1:
   version "7.0.1"
@@ -1117,25 +1075,19 @@ find-up@^5.0.0:
     locate-path "^6.0.0"
     path-exists "^4.0.0"
 
-flat-cache@^3.0.4:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.2.0.tgz#2c0c2d5040c99b1632771a9d105725c0115363ee"
-  integrity sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==
+flat-cache@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-4.0.1.tgz#0ece39fcb14ee012f4b0410bd33dd9c1f011127c"
+  integrity sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==
   dependencies:
     flatted "^3.2.9"
-    keyv "^4.5.3"
-    rimraf "^3.0.2"
+    keyv "^4.5.4"
 
 flatted@^3.2.9:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.1.tgz#21db470729a6734d4997002f439cb308987f567a"
   integrity sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==
 
-fs.realpath@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
-
 fsevents@~2.3.2, fsevents@~2.3.3:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
@@ -1160,29 +1112,15 @@ glob-parent@^6.0.2:
   dependencies:
     is-glob "^4.0.3"
 
-glob@^7.1.3:
-  version "7.2.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
-  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.1.1"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
 globals@^11.1.0:
   version "11.12.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
-globals@^13.19.0:
-  version "13.24.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-13.24.0.tgz#8432a19d78ce0c1e833949c36adb345400bb1171"
-  integrity sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==
-  dependencies:
-    type-fest "^0.20.2"
+globals@^14.0.0:
+  version "14.0.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-14.0.0.tgz#898d7413c29babcf6bafe56fcadded858ada724e"
+  integrity sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==
 
 globby@^11.1.0:
   version "11.1.0"
@@ -1226,7 +1164,7 @@ html-tags@^3.0.0:
   resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.3.1.tgz#a04026a18c882e4bba8a01a3d39cfe465d40b5ce"
   integrity sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==
 
-ignore@^5.2.0, ignore@^5.2.4:
+ignore@^5.2.0, ignore@^5.3.1:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.1.tgz#5073e554cd42c5b33b394375f538b8593e34d4ef"
   integrity sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==
@@ -1244,23 +1182,10 @@ imurmurhash@^0.1.4:
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
   integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==
 
-inflight@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
-  dependencies:
-    once "^1.3.0"
-    wrappy "1"
-
-inherits@2:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
-  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
-
-inline-style-parser@0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/inline-style-parser/-/inline-style-parser-0.1.1.tgz#ec8a3b429274e9c0a1f1c4ffa9453a7fef72cea1"
-  integrity sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q==
+inline-style-parser@0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/inline-style-parser/-/inline-style-parser-0.2.3.tgz#e35c5fb45f3a83ed7849fe487336eb7efa25971c"
+  integrity sha512-qlD8YNDqyTKTyuITrDOffsl6Tdhv+UC4hcdAVuQsK4IMQ99nSgd1MIA/Q+jQYoh9r3hVUXhYh7urSRmXPkW04g==
 
 is-extglob@^2.1.1:
   version "2.1.1"
@@ -1343,17 +1268,17 @@ kebab-case@^1.0.2:
   resolved "https://registry.yarnpkg.com/kebab-case/-/kebab-case-1.0.2.tgz#5eac97d5d220acf606d40e3c0ecfea21f1f9e1eb"
   integrity sha512-7n6wXq4gNgBELfDCpzKc+mRrZFs7D+wgfF5WRFLNAr4DA/qtr9Js8uOAVAfHhuLMfAcQ0pRKqbpjx+TcJVdE1Q==
 
-keyv@^4.5.3:
+keyv@^4.5.4:
   version "4.5.4"
   resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93"
   integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==
   dependencies:
     json-buffer "3.0.1"
 
-known-css-properties@^0.24.0:
-  version "0.24.0"
-  resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.24.0.tgz#19aefd85003ae5698a5560d2b55135bf5432155c"
-  integrity sha512-RTSoaUAfLvpR357vWzAz/50Q/BmHfmE6ETSWfutT0AJiw10e6CmcdYRQJlLRd95B53D0Y2aD1jSxD3V3ySF+PA==
+known-css-properties@^0.30.0:
+  version "0.30.0"
+  resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.30.0.tgz#34dd1f39c805c65a6dfa6ea76206b20dc523dd96"
+  integrity sha512-VSWXYUnsPu9+WYKkfmJyLKtIvaRJi1kXUqVmBACORXZQxT5oZDsoZ2vQP+bQFDnWtpI/4eq3MLoRMjI2fnLzTQ==
 
 levn@^0.4.1:
   version "0.4.1"
@@ -1409,20 +1334,20 @@ micromatch@^4.0.4:
     braces "^3.0.2"
     picomatch "^2.3.1"
 
-minimatch@9.0.3:
-  version "9.0.3"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825"
-  integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==
-  dependencies:
-    brace-expansion "^2.0.1"
-
-minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
+minimatch@^3.0.5, minimatch@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
   integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
   dependencies:
     brace-expansion "^1.1.7"
 
+minimatch@^9.0.4:
+  version "9.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.4.tgz#8e49c731d1749cbec05050ee5145147b32496a51"
+  integrity sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==
+  dependencies:
+    brace-expansion "^2.0.1"
+
 ms@2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
@@ -1443,24 +1368,17 @@ node-releases@^2.0.14:
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.14.tgz#2ffb053bceb8b2be8495ece1ab6ce600c4461b0b"
   integrity sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==
 
-once@^1.3.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
-  dependencies:
-    wrappy "1"
-
 optionator@^0.9.3:
-  version "0.9.3"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.3.tgz#007397d44ed1872fdc6ed31360190f81814e2c64"
-  integrity sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==
+  version "0.9.4"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.4.tgz#7ea1c1a5d91d764fb282139c88fe11e182a3a734"
+  integrity sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==
   dependencies:
-    "@aashutoshrathi/word-wrap" "^1.2.3"
     deep-is "^0.1.3"
     fast-levenshtein "^2.0.6"
     levn "^0.4.1"
     prelude-ls "^1.2.1"
     type-check "^0.4.0"
+    word-wrap "^1.2.5"
 
 p-limit@^3.0.2:
   version "3.1.0"
@@ -1488,11 +1406,6 @@ path-exists@^4.0.0:
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
   integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
 
-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
-
 path-key@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
@@ -1513,14 +1426,14 @@ picomatch@^2.3.1:
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
 
-postcss@^8.4.35:
-  version "8.4.35"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.35.tgz#60997775689ce09011edf083a549cea44aabe2f7"
-  integrity sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA==
+postcss@^8.4.38:
+  version "8.4.38"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.38.tgz#b387d533baf2054288e337066d81c6bee9db9e0e"
+  integrity sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==
   dependencies:
     nanoid "^3.3.7"
     picocolors "^1.0.0"
-    source-map-js "^1.0.2"
+    source-map-js "^1.2.0"
 
 prelude-ls@^1.2.1:
   version "1.2.1"
@@ -1554,33 +1467,29 @@ reusify@^1.0.4:
   resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
   integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
 
-rimraf@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
-  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
-  dependencies:
-    glob "^7.1.3"
-
-rollup@^4.2.0:
-  version "4.12.0"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.12.0.tgz#0b6d1e5f3d46bbcf244deec41a7421dc54cc45b5"
-  integrity sha512-wz66wn4t1OHIJw3+XU7mJJQV/2NAfw5OAk6G6Hoo3zcvz/XOfQ52Vgi+AN4Uxoxi0KBBwk2g8zPrTDA4btSB/Q==
+rollup@^4.13.0:
+  version "4.17.2"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.17.2.tgz#26d1785d0144122277fdb20ab3a24729ae68301f"
+  integrity sha512-/9ClTJPByC0U4zNLowV1tMBe8yMEAxewtR3cUNX5BoEpGH3dQEWpJLr6CLp0fPdYRF/fzVOgvDb1zXuakwF5kQ==
   dependencies:
     "@types/estree" "1.0.5"
   optionalDependencies:
-    "@rollup/rollup-android-arm-eabi" "4.12.0"
-    "@rollup/rollup-android-arm64" "4.12.0"
-    "@rollup/rollup-darwin-arm64" "4.12.0"
-    "@rollup/rollup-darwin-x64" "4.12.0"
-    "@rollup/rollup-linux-arm-gnueabihf" "4.12.0"
-    "@rollup/rollup-linux-arm64-gnu" "4.12.0"
-    "@rollup/rollup-linux-arm64-musl" "4.12.0"
-    "@rollup/rollup-linux-riscv64-gnu" "4.12.0"
-    "@rollup/rollup-linux-x64-gnu" "4.12.0"
-    "@rollup/rollup-linux-x64-musl" "4.12.0"
-    "@rollup/rollup-win32-arm64-msvc" "4.12.0"
-    "@rollup/rollup-win32-ia32-msvc" "4.12.0"
-    "@rollup/rollup-win32-x64-msvc" "4.12.0"
+    "@rollup/rollup-android-arm-eabi" "4.17.2"
+    "@rollup/rollup-android-arm64" "4.17.2"
+    "@rollup/rollup-darwin-arm64" "4.17.2"
+    "@rollup/rollup-darwin-x64" "4.17.2"
+    "@rollup/rollup-linux-arm-gnueabihf" "4.17.2"
+    "@rollup/rollup-linux-arm-musleabihf" "4.17.2"
+    "@rollup/rollup-linux-arm64-gnu" "4.17.2"
+    "@rollup/rollup-linux-arm64-musl" "4.17.2"
+    "@rollup/rollup-linux-powerpc64le-gnu" "4.17.2"
+    "@rollup/rollup-linux-riscv64-gnu" "4.17.2"
+    "@rollup/rollup-linux-s390x-gnu" "4.17.2"
+    "@rollup/rollup-linux-x64-gnu" "4.17.2"
+    "@rollup/rollup-linux-x64-musl" "4.17.2"
+    "@rollup/rollup-win32-arm64-msvc" "4.17.2"
+    "@rollup/rollup-win32-ia32-msvc" "4.17.2"
+    "@rollup/rollup-win32-x64-msvc" "4.17.2"
     fsevents "~2.3.2"
 
 run-parallel@^1.1.9:
@@ -1595,7 +1504,7 @@ semver@^6.3.1:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.5.4:
+semver@^7.6.0:
   version "7.6.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d"
   integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==
@@ -1603,14 +1512,14 @@ semver@^7.5.4:
     lru-cache "^6.0.0"
 
 seroval-plugins@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/seroval-plugins/-/seroval-plugins-1.0.4.tgz#917d2cd103525f0238433a49479def0ce65a56e4"
-  integrity sha512-DQ2IK6oQVvy8k+c2V5x5YCtUa/GGGsUwUBNN9UqohrZ0rWdUapBFpNMYP1bCyRHoxOJjdKGl+dieacFIpU/i1A==
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/seroval-plugins/-/seroval-plugins-1.0.5.tgz#eeded50d736d5e1dba142a72b0188df9f4e42b6d"
+  integrity sha512-8+pDC1vOedPXjKG7oz8o+iiHrtF2WswaMQJ7CKFpccvSYfrzmvKY9zOJWCg+881722wIHfwkdnRmiiDm9ym+zQ==
 
-seroval@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/seroval/-/seroval-1.0.4.tgz#0400d24a48b1f6f44b8a3d55af0476a1c5e8643f"
-  integrity sha512-qQs/N+KfJu83rmszFQaTxcoJoPn6KNUruX4KmnmyD0oZkUoiNvJ1rpdYKDf4YHM05k+HOgCxa3yvf15QbVijGg==
+seroval@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/seroval/-/seroval-1.0.5.tgz#d71ee540d936babaed92f56eda3e52d8e2a3deed"
+  integrity sha512-TM+Z11tHHvQVQKeNlOUonOWnsNM+2IBwZ4vwoi4j3zKzIpc5IDw8WPwCfcc8F17wy6cBcJGbZbFOR0UCuTZHQA==
 
 shebang-command@^2.0.0:
   version "2.0.0"
@@ -1629,13 +1538,13 @@ slash@^3.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
   integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
-solid-js@^1.8.15:
-  version "1.8.15"
-  resolved "https://registry.yarnpkg.com/solid-js/-/solid-js-1.8.15.tgz#af4eef7203203efefb605613f3c244b5bcdb63bc"
-  integrity sha512-d0QP/efr3UVcwGgWVPveQQ0IHOH6iU7yUhc2piy8arNG8wxKmvUy1kFxyF8owpmfCWGB87usDKMaVnsNYZm+Vw==
+solid-js@^1.8.17:
+  version "1.8.17"
+  resolved "https://registry.yarnpkg.com/solid-js/-/solid-js-1.8.17.tgz#780ed6f0fd8633009d1b3c29d56bf6b6bb33bd50"
+  integrity sha512-E0FkUgv9sG/gEBWkHr/2XkBluHb1fkrHywUgA6o6XolPDCJ4g1HaLmQufcBBhiF36ee40q+HpG/vCZu7fLpI3Q==
   dependencies:
     csstype "^3.1.0"
-    seroval "^1.0.3"
+    seroval "^1.0.4"
     seroval-plugins "^1.0.3"
 
 solid-refresh@^0.6.3:
@@ -1655,10 +1564,10 @@ solid-styled-components@^0.28.5:
     csstype "^3.1.0"
     goober "^2.1.10"
 
-source-map-js@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
-  integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
+source-map-js@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af"
+  integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==
 
 strip-ansi@^6.0.1:
   version "6.0.1"
@@ -1672,12 +1581,12 @@ strip-json-comments@^3.1.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
 
-style-to-object@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/style-to-object/-/style-to-object-0.3.0.tgz#b1b790d205991cc783801967214979ee19a76e46"
-  integrity sha512-CzFnRRXhzWIdItT3OmF8SQfWyahHhjq3HwcMNCNLn+N7klOOqPjMeG/4JSu77D7ypZdGvSzvkrbyeTMizz2VrA==
+style-to-object@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/style-to-object/-/style-to-object-1.0.6.tgz#0c28aed8be1813d166c60d962719b2907c26547b"
+  integrity sha512-khxq+Qm3xEyZfKd/y9L3oIWQimxuc4STrQKtQn8aSDRHb8mFgpukgX1hdzfrMEW6JCjyJ8p89x+IUMVnCBI1PA==
   dependencies:
-    inline-style-parser "0.1.1"
+    inline-style-parser "0.2.3"
 
 supports-color@^5.3.0:
   version "5.5.0"
@@ -1718,10 +1627,10 @@ to-regex-range@^5.0.1:
   dependencies:
     is-number "^7.0.0"
 
-ts-api-utils@^1.0.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.2.1.tgz#f716c7e027494629485b21c0df6180f4d08f5e8b"
-  integrity sha512-RIYA36cJn2WiH9Hy77hdF9r7oEwxAtB/TS9/S4Qd90Ap4z5FSiin5zEiTL44OII1Y3IIlEvxwxFUVgrHSZ/UpA==
+ts-api-utils@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.3.0.tgz#4b490e27129f1e8e686b45cc4ab63714dc60eea1"
+  integrity sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==
 
 tslib@^2.6.2:
   version "2.6.2"
@@ -1735,22 +1644,26 @@ type-check@^0.4.0, type-check@~0.4.0:
   dependencies:
     prelude-ls "^1.2.1"
 
-type-fest@^0.20.2:
-  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
-  integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
+typescript-eslint@^7.8.0:
+  version "7.8.0"
+  resolved "https://registry.yarnpkg.com/typescript-eslint/-/typescript-eslint-7.8.0.tgz#d2a73d4caac35d4d9825bfdfac06a9bf2ba175e4"
+  integrity sha512-sheFG+/D8N/L7gC3WT0Q8sB97Nm573Yfr+vZFzl/4nBdYcmviBPtwGSX9TJ7wpVg28ocerKVOt+k2eGmHzcgVA==
+  dependencies:
+    "@typescript-eslint/eslint-plugin" "7.8.0"
+    "@typescript-eslint/parser" "7.8.0"
+    "@typescript-eslint/utils" "7.8.0"
 
-typescript@^5.3.3:
-  version "5.3.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.3.tgz#b3ce6ba258e72e6305ba66f5c9b452aaee3ffe37"
-  integrity sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==
+typescript@^5.4.5:
+  version "5.4.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.5.tgz#42ccef2c571fdbd0f6718b1d1f5e6e5ef006f611"
+  integrity sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==
 
 update-browserslist-db@^1.0.13:
-  version "1.0.13"
-  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz#3c5e4f5c083661bd38ef64b6328c26ed6c8248c4"
-  integrity sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==
+  version "1.0.14"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.14.tgz#46a9367c323f8ade9a9dddb7f3ae7814b3a0b31c"
+  integrity sha512-JixKH8GR2pWYshIPUg/NujK3JO7JiqEEUiNArE86NQyrgUuZeTlZQN3xuS/yiV5Kb48ev9K6RqNkaJjXsdg7Jw==
   dependencies:
-    escalade "^3.1.1"
+    escalade "^3.1.2"
     picocolors "^1.0.0"
 
 uri-js@^4.2.2:
@@ -1765,10 +1678,10 @@ validate-html-nesting@^1.2.1:
   resolved "https://registry.yarnpkg.com/validate-html-nesting/-/validate-html-nesting-1.2.2.tgz#2d74de14b598a0de671fad01bd71deabb93b8aca"
   integrity sha512-hGdgQozCsQJMyfK5urgFcWEqsSSrK63Awe0t/IMR0bZ0QMtnuaiHzThW81guu3qx9abLi99NEuiaN6P9gVYsNg==
 
-vite-plugin-solid@^2.10.1:
-  version "2.10.1"
-  resolved "https://registry.yarnpkg.com/vite-plugin-solid/-/vite-plugin-solid-2.10.1.tgz#f09a353c6b9414c62b258422ddeb73f9d320dd92"
-  integrity sha512-kfVdNLWaJqaJVL52U6iCCKNW/nXE7bS1VVGOWPGllOkJfcNILymVSY0LCBLSnyy0iYnRtrXpiHm14rMuzeC7CA==
+vite-plugin-solid@^2.10.2:
+  version "2.10.2"
+  resolved "https://registry.yarnpkg.com/vite-plugin-solid/-/vite-plugin-solid-2.10.2.tgz#180f5ec9d8ac03d19160dd5728b313fe9b62ee0d"
+  integrity sha512-AOEtwMe2baBSXMXdo+BUwECC8IFHcKS6WQV/1NEd+Q7vHPap5fmIhLcAzr+DUJ04/KHx/1UBU0l1/GWP+rMAPQ==
   dependencies:
     "@babel/core" "^7.23.3"
     "@types/babel__core" "^7.20.4"
@@ -1777,14 +1690,14 @@ vite-plugin-solid@^2.10.1:
     solid-refresh "^0.6.3"
     vitefu "^0.2.5"
 
-vite@^5.1.4:
-  version "5.1.4"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-5.1.4.tgz#14e9d3e7a6e488f36284ef13cebe149f060bcfb6"
-  integrity sha512-n+MPqzq+d9nMVTKyewqw6kSt+R3CkvF9QAKY8obiQn8g1fwTscKxyfaYnC632HtBXAQGc1Yjomphwn1dtwGAHg==
+vite@^5.2.10:
+  version "5.2.10"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-5.2.10.tgz#2ac927c91e99d51b376a5c73c0e4b059705f5bd7"
+  integrity sha512-PAzgUZbP7msvQvqdSD+ErD5qGnSFiGOoWmV5yAKUEI0kdhjbH6nMWVyZQC/hSc4aXwc0oJ9aEdIiF9Oje0JFCw==
   dependencies:
-    esbuild "^0.19.3"
-    postcss "^8.4.35"
-    rollup "^4.2.0"
+    esbuild "^0.20.1"
+    postcss "^8.4.38"
+    rollup "^4.13.0"
   optionalDependencies:
     fsevents "~2.3.3"
 
@@ -1800,10 +1713,10 @@ which@^2.0.1:
   dependencies:
     isexe "^2.0.0"
 
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
+word-wrap@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"
+  integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==
 
 yallist@^3.0.2:
   version "3.1.1"
diff --git a/ui/webapp/.eslintrc b/ui/webapp/.eslintrc
deleted file mode 100644
index e075b959..00000000
--- a/ui/webapp/.eslintrc
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "env": { "browser": true, "es2020": true },
-  "parser": "@typescript-eslint/parser",
-  "parserOptions": { "ecmaVersion": "latest", "sourceType": "module" },
-  "plugins": ["solid", "simple-import-sort"],
-  "extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended", "plugin:solid/typescript"],
-  "rules": {
-    "simple-import-sort/imports": "error",
-    "simple-import-sort/exports": "error",
-    "solid/no-innerhtml": [1, {
-      "allowStatic": true
-    }]
-  }
-}
diff --git a/ui/webapp/eslint.config.js b/ui/webapp/eslint.config.js
new file mode 100644
index 00000000..8bbc9e3d
--- /dev/null
+++ b/ui/webapp/eslint.config.js
@@ -0,0 +1,40 @@
+// eslint.config.js
+
+import js from '@eslint/js';
+import simpleImportSort from 'eslint-plugin-simple-import-sort';
+import solidPlugin from 'eslint-plugin-solid';
+import tseslint from 'typescript-eslint';
+
+export default [
+  js.configs.recommended,
+  ...tseslint.configs.recommended,
+  solidPlugin.configs['flat/recommended'],
+  {
+    ignores: ['*.css'],
+    linterOptions: {
+      reportUnusedDisableDirectives: 'error',
+    },
+    plugins: {
+      '@typescript-eslint': tseslint.plugin,
+      'eslint-plugin-solid': solidPlugin.configs['flat/typescript'],
+      'simple-import-sort': simpleImportSort,
+    },
+    rules: {
+      'simple-import-sort/imports': 'error',
+      'simple-import-sort/exports': 'error',
+      'solid/no-innerhtml': [
+        1,
+        {
+          allowStatic: true,
+        },
+      ],
+    },
+    languageOptions: {
+      parser: tseslint.parser,
+      parserOptions: {
+        ecmaVersion: 'latest',
+        sourceType: 'module',
+      },
+    },
+  },
+];
diff --git a/ui/webapp/package.json b/ui/webapp/package.json
index 1d3351c4..86e2d787 100644
--- a/ui/webapp/package.json
+++ b/ui/webapp/package.json
@@ -8,36 +8,36 @@
     "dev": "vite --host",
     "format": "prettier --write \"src/**/*.{js,jsx,ts,tsx,json,css,scss,md}\"",
     "format:diff": "prettier --list-different \"src/**/*.{js,jsx,ts,tsx,json,css,scss,md}\"",
-    "lint": "eslint src --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
+    "lint": "eslint src --max-warnings 0",
+    "lint:fix": "eslint src --max-warnings 0 --fix",
     "preview": "vite preview"
   },
   "dependencies": {
-    "@solid-primitives/resize-observer": "^2.0.23",
-    "@solid-primitives/scroll": "^2.0.21",
-    "@solidjs/router": "^0.13.1",
+    "@solid-primitives/resize-observer": "^2.0.25",
+    "@solid-primitives/scroll": "^2.0.23",
+    "@solidjs/router": "^0.13.3",
     "add": "^2.0.6",
-    "apexcharts": "^3.46.0",
+    "apexcharts": "^3.49.0",
     "bootstrap": "^5.3.3",
     "lodash": "^4.17.21",
     "moment": "^2.30.1",
     "solid-apexcharts": "^0.3.4",
-    "solid-js": "^1.8.15",
-    "yarn": "^1.22.21"
+    "solid-js": "^1.8.16",
+    "yarn": "^1.22.22"
   },
   "devDependencies": {
-    "@types/lodash": "^4.14.202",
-    "@typescript-eslint/eslint-plugin": "^7.1.1",
-    "@typescript-eslint/parser": "^7.1.1",
-    "eslint": "^8.57.0",
+    "@types/lodash": "^4.17.0",
+    "eslint": "^9.1.1",
     "eslint-plugin-prettier": "^5.1.3",
-    "eslint-plugin-simple-import-sort": "^12.0.0",
-    "eslint-plugin-solid": "^0.13.1",
+    "eslint-plugin-simple-import-sort": "^12.1.0",
+    "eslint-plugin-solid": "^0.14.0",
     "prettier": "^3.2.5",
-    "sass": "^1.71.1",
-    "typescript": "^5.3.3",
-    "vite": "^5.1.5",
+    "sass": "^1.75.0",
+    "typescript": "^5.4.5",
+    "typescript-eslint": "^7.8.0",
+    "vite": "^5.2.10",
     "vite-plugin-ejs": "^1.7.0",
-    "vite-plugin-solid": "^2.10.1"
+    "vite-plugin-solid": "^2.10.2"
   },
   "description": "Landscape2 is a tool that generates interactive landscapes websites.",
   "license": "Apache-2.0"
diff --git a/ui/webapp/src/layout/explore/index.tsx b/ui/webapp/src/layout/explore/index.tsx
index 4e3865a7..9cf36592 100644
--- a/ui/webapp/src/layout/explore/index.tsx
+++ b/ui/webapp/src/layout/explore/index.tsx
@@ -182,7 +182,7 @@ const Explore = (props: Props) => {
     return currentFilters;
   };
 
-  // eslint-disable-next-line solid/reactivity
+  {/* prettier-ignore */}
   const [activeFilters, setActiveFilters] = createSignal<ActiveFilters>(getActiveFiltersFromUrl());
 
   const getHash = (): string | undefined => {
diff --git a/ui/webapp/yarn.lock b/ui/webapp/yarn.lock
index 73c68e0a..d140e17e 100644
--- a/ui/webapp/yarn.lock
+++ b/ui/webapp/yarn.lock
@@ -2,11 +2,6 @@
 # yarn lockfile v1
 
 
-"@aashutoshrathi/word-wrap@^1.2.3":
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf"
-  integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==
-
 "@ampproject/remapping@^2.2.0":
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.3.0.tgz#ed441b6fa600072520ce18b43d2c8cc8caecc7f4"
@@ -15,48 +10,48 @@
     "@jridgewell/gen-mapping" "^0.3.5"
     "@jridgewell/trace-mapping" "^0.3.24"
 
-"@babel/code-frame@^7.23.5":
-  version "7.23.5"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.23.5.tgz#9009b69a8c602293476ad598ff53e4562e15c244"
-  integrity sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==
+"@babel/code-frame@^7.23.5", "@babel/code-frame@^7.24.2":
+  version "7.24.2"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.24.2.tgz#718b4b19841809a58b29b68cde80bc5e1aa6d9ae"
+  integrity sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ==
   dependencies:
-    "@babel/highlight" "^7.23.4"
-    chalk "^2.4.2"
+    "@babel/highlight" "^7.24.2"
+    picocolors "^1.0.0"
 
 "@babel/compat-data@^7.23.5":
-  version "7.23.5"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.23.5.tgz#ffb878728bb6bdcb6f4510aa51b1be9afb8cfd98"
-  integrity sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==
+  version "7.24.4"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.24.4.tgz#6f102372e9094f25d908ca0d34fc74c74606059a"
+  integrity sha512-vg8Gih2MLK+kOkHJp4gBEIkyaIi00jgWot2D9QOmmfLC8jINSOzmCLta6Bvz/JSBCqnegV0L80jhxkol5GWNfQ==
 
 "@babel/core@^7.23.3":
-  version "7.24.0"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.24.0.tgz#56cbda6b185ae9d9bed369816a8f4423c5f2ff1b"
-  integrity sha512-fQfkg0Gjkza3nf0c7/w6Xf34BW4YvzNfACRLmmb7XRLa6XHdR+K9AlJlxneFfWYf6uhOzuzZVTjF/8KfndZANw==
+  version "7.24.5"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.24.5.tgz#15ab5b98e101972d171aeef92ac70d8d6718f06a"
+  integrity sha512-tVQRucExLQ02Boi4vdPp49svNGcfL2GhdTCT9aldhXgCJVAI21EtRfBettiuLUwce/7r6bFdgs6JFkcdTiFttA==
   dependencies:
     "@ampproject/remapping" "^2.2.0"
-    "@babel/code-frame" "^7.23.5"
-    "@babel/generator" "^7.23.6"
+    "@babel/code-frame" "^7.24.2"
+    "@babel/generator" "^7.24.5"
     "@babel/helper-compilation-targets" "^7.23.6"
-    "@babel/helper-module-transforms" "^7.23.3"
-    "@babel/helpers" "^7.24.0"
-    "@babel/parser" "^7.24.0"
+    "@babel/helper-module-transforms" "^7.24.5"
+    "@babel/helpers" "^7.24.5"
+    "@babel/parser" "^7.24.5"
     "@babel/template" "^7.24.0"
-    "@babel/traverse" "^7.24.0"
-    "@babel/types" "^7.24.0"
+    "@babel/traverse" "^7.24.5"
+    "@babel/types" "^7.24.5"
     convert-source-map "^2.0.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
     json5 "^2.2.3"
     semver "^6.3.1"
 
-"@babel/generator@^7.23.6":
-  version "7.23.6"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.6.tgz#9e1fca4811c77a10580d17d26b57b036133f3c2e"
-  integrity sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==
+"@babel/generator@^7.23.6", "@babel/generator@^7.24.5":
+  version "7.24.5"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.24.5.tgz#e5afc068f932f05616b66713e28d0f04e99daeb3"
+  integrity sha512-x32i4hEXvr+iI0NEoEfDKzlemF8AmtOP8CcrRaEcpzysWuoEb1KknpcvMsHKPONoKZiDuItklgWhB18xEhr9PA==
   dependencies:
-    "@babel/types" "^7.23.6"
-    "@jridgewell/gen-mapping" "^0.3.2"
-    "@jridgewell/trace-mapping" "^0.3.17"
+    "@babel/types" "^7.24.5"
+    "@jridgewell/gen-mapping" "^0.3.5"
+    "@jridgewell/trace-mapping" "^0.3.25"
     jsesc "^2.5.1"
 
 "@babel/helper-compilation-targets@^7.23.6":
@@ -97,87 +92,88 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-module-imports@^7.22.15":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz#16146307acdc40cc00c3b2c647713076464bdbf0"
-  integrity sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==
+"@babel/helper-module-imports@^7.22.15", "@babel/helper-module-imports@^7.24.3":
+  version "7.24.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.24.3.tgz#6ac476e6d168c7c23ff3ba3cf4f7841d46ac8128"
+  integrity sha512-viKb0F9f2s0BCS22QSF308z/+1YWKV/76mwt61NBzS5izMzDPwdq1pTrzf+Li3npBWX9KdQbkeCt1jSAM7lZqg==
   dependencies:
-    "@babel/types" "^7.22.15"
+    "@babel/types" "^7.24.0"
 
-"@babel/helper-module-transforms@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz#d7d12c3c5d30af5b3c0fcab2a6d5217773e2d0f1"
-  integrity sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==
+"@babel/helper-module-transforms@^7.24.5":
+  version "7.24.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.24.5.tgz#ea6c5e33f7b262a0ae762fd5986355c45f54a545"
+  integrity sha512-9GxeY8c2d2mdQUP1Dye0ks3VDyIMS98kt/llQ2nUId8IsWqTF0l1LkSX0/uP7l7MCDrzXS009Hyhe2gzTiGW8A==
   dependencies:
     "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-module-imports" "^7.22.15"
-    "@babel/helper-simple-access" "^7.22.5"
-    "@babel/helper-split-export-declaration" "^7.22.6"
-    "@babel/helper-validator-identifier" "^7.22.20"
+    "@babel/helper-module-imports" "^7.24.3"
+    "@babel/helper-simple-access" "^7.24.5"
+    "@babel/helper-split-export-declaration" "^7.24.5"
+    "@babel/helper-validator-identifier" "^7.24.5"
 
-"@babel/helper-plugin-utils@^7.22.5":
-  version "7.24.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.0.tgz#945681931a52f15ce879fd5b86ce2dae6d3d7f2a"
-  integrity sha512-9cUznXMG0+FxRuJfvL82QlTqIzhVW9sL0KjMPHhAOOvpQGL8QtdxnBKILjBqxlHyliz0yCa1G903ZXI/FuHy2w==
+"@babel/helper-plugin-utils@^7.24.0":
+  version "7.24.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.5.tgz#a924607dd254a65695e5bd209b98b902b3b2f11a"
+  integrity sha512-xjNLDopRzW2o6ba0gKbkZq5YWEBaK3PCyTOY1K2P/O07LGMhMqlMXPxwN4S5/RhWuCobT8z0jrlKGlYmeR1OhQ==
 
-"@babel/helper-simple-access@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz#4938357dc7d782b80ed6dbb03a0fba3d22b1d5de"
-  integrity sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==
+"@babel/helper-simple-access@^7.24.5":
+  version "7.24.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.24.5.tgz#50da5b72f58c16b07fbd992810be6049478e85ba"
+  integrity sha512-uH3Hmf5q5n7n8mz7arjUlDOCbttY/DW4DYhE6FUsjKJ/oYC1kQQUvwEQWxRwUpX9qQKRXeqLwWxrqilMrf32sQ==
   dependencies:
-    "@babel/types" "^7.22.5"
+    "@babel/types" "^7.24.5"
 
-"@babel/helper-split-export-declaration@^7.22.6":
-  version "7.22.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c"
-  integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==
+"@babel/helper-split-export-declaration@^7.24.5":
+  version "7.24.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.5.tgz#b9a67f06a46b0b339323617c8c6213b9055a78b6"
+  integrity sha512-5CHncttXohrHk8GWOFCcCl4oRD9fKosWlIRgWm4ql9VYioKm52Mk2xsmoohvm7f3JoiLSM5ZgJuRaf5QZZYd3Q==
   dependencies:
-    "@babel/types" "^7.22.5"
+    "@babel/types" "^7.24.5"
 
-"@babel/helper-string-parser@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz#9478c707febcbbe1ddb38a3d91a2e054ae622d83"
-  integrity sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==
+"@babel/helper-string-parser@^7.24.1":
+  version "7.24.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.24.1.tgz#f99c36d3593db9540705d0739a1f10b5e20c696e"
+  integrity sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ==
 
-"@babel/helper-validator-identifier@^7.22.20":
-  version "7.22.20"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0"
-  integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==
+"@babel/helper-validator-identifier@^7.24.5":
+  version "7.24.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.5.tgz#918b1a7fa23056603506370089bd990d8720db62"
+  integrity sha512-3q93SSKX2TWCG30M2G2kwaKeTYgEUp5Snjuj8qm729SObL6nbtUldAi37qbxkD5gg3xnBio+f9nqpSepGZMvxA==
 
 "@babel/helper-validator-option@^7.23.5":
   version "7.23.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz#907a3fbd4523426285365d1206c423c4c5520307"
   integrity sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==
 
-"@babel/helpers@^7.24.0":
-  version "7.24.0"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.24.0.tgz#a3dd462b41769c95db8091e49cfe019389a9409b"
-  integrity sha512-ulDZdc0Aj5uLc5nETsa7EPx2L7rM0YJM8r7ck7U73AXi7qOV44IHHRAYZHY6iU1rr3C5N4NtTmMRUJP6kwCWeA==
+"@babel/helpers@^7.24.5":
+  version "7.24.5"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.24.5.tgz#fedeb87eeafa62b621160402181ad8585a22a40a"
+  integrity sha512-CiQmBMMpMQHwM5m01YnrM6imUG1ebgYJ+fAIW4FZe6m4qHTPaRHti+R8cggAwkdz4oXhtO4/K9JWlh+8hIfR2Q==
   dependencies:
     "@babel/template" "^7.24.0"
-    "@babel/traverse" "^7.24.0"
-    "@babel/types" "^7.24.0"
+    "@babel/traverse" "^7.24.5"
+    "@babel/types" "^7.24.5"
 
-"@babel/highlight@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.23.4.tgz#edaadf4d8232e1a961432db785091207ead0621b"
-  integrity sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==
+"@babel/highlight@^7.24.2":
+  version "7.24.5"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.24.5.tgz#bc0613f98e1dd0720e99b2a9ee3760194a704b6e"
+  integrity sha512-8lLmua6AVh/8SLJRRVD6V8p73Hir9w5mJrhE+IPpILG31KKlI9iz5zmBYKcWPS59qSfgP9RaSBQSHHE81WKuEw==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.22.20"
+    "@babel/helper-validator-identifier" "^7.24.5"
     chalk "^2.4.2"
     js-tokens "^4.0.0"
+    picocolors "^1.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.20.7", "@babel/parser@^7.24.0":
-  version "7.24.0"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.24.0.tgz#26a3d1ff49031c53a97d03b604375f028746a9ac"
-  integrity sha512-QuP/FxEAzMSjXygs8v4N9dvdXzEHN4W1oF3PxuWAtPo08UdM17u89RDMgjLn/mlc56iM0HlLmVkO/wgR+rDgHg==
+"@babel/parser@^7.1.0", "@babel/parser@^7.20.7", "@babel/parser@^7.24.0", "@babel/parser@^7.24.5":
+  version "7.24.5"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.24.5.tgz#4a4d5ab4315579e5398a82dcf636ca80c3392790"
+  integrity sha512-EOv5IK8arwh3LI47dz1b0tKUb/1uhHAnHJOrjgtQMIpu1uXd9mlFrJg9IUgGUgZ41Ch0K8REPTYpO7B76b4vJg==
 
 "@babel/plugin-syntax-jsx@^7.18.6":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.23.3.tgz#8f2e4f8a9b5f9aa16067e142c1ac9cd9f810f473"
-  integrity sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg==
+  version "7.24.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.1.tgz#3f6ca04b8c841811dbc3c5c5f837934e0d626c10"
+  integrity sha512-2eCtxZXf+kbkMIsXS4poTvT4Yu5rXiRa+9xGVT56raghjmBTKMpFNc9R4IDiB4emao9eO22Ox7CxuJG7BgExqA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.0"
 
 "@babel/template@^7.22.15", "@babel/template@^7.24.0":
   version "7.24.0"
@@ -188,145 +184,145 @@
     "@babel/parser" "^7.24.0"
     "@babel/types" "^7.24.0"
 
-"@babel/traverse@^7.24.0":
-  version "7.24.0"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.24.0.tgz#4a408fbf364ff73135c714a2ab46a5eab2831b1e"
-  integrity sha512-HfuJlI8qq3dEDmNU5ChzzpZRWq+oxCZQyMzIMEqLho+AQnhMnKQUzH6ydo3RBl/YjPCuk68Y6s0Gx0AeyULiWw==
+"@babel/traverse@^7.24.5":
+  version "7.24.5"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.24.5.tgz#972aa0bc45f16983bf64aa1f877b2dd0eea7e6f8"
+  integrity sha512-7aaBLeDQ4zYcUFDUD41lJc1fG8+5IU9DaNSJAgal866FGvmD5EbWQgnEC6kO1gGLsX0esNkfnJSndbTXA3r7UA==
   dependencies:
-    "@babel/code-frame" "^7.23.5"
-    "@babel/generator" "^7.23.6"
+    "@babel/code-frame" "^7.24.2"
+    "@babel/generator" "^7.24.5"
     "@babel/helper-environment-visitor" "^7.22.20"
     "@babel/helper-function-name" "^7.23.0"
     "@babel/helper-hoist-variables" "^7.22.5"
-    "@babel/helper-split-export-declaration" "^7.22.6"
-    "@babel/parser" "^7.24.0"
-    "@babel/types" "^7.24.0"
+    "@babel/helper-split-export-declaration" "^7.24.5"
+    "@babel/parser" "^7.24.5"
+    "@babel/types" "^7.24.5"
     debug "^4.3.1"
     globals "^11.1.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.18.6", "@babel/types@^7.20.7", "@babel/types@^7.22.15", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.6", "@babel/types@^7.24.0":
-  version "7.24.0"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.24.0.tgz#3b951f435a92e7333eba05b7566fd297960ea1bf"
-  integrity sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==
+"@babel/types@^7.0.0", "@babel/types@^7.18.6", "@babel/types@^7.20.7", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.6", "@babel/types@^7.24.0", "@babel/types@^7.24.5":
+  version "7.24.5"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.24.5.tgz#7661930afc638a5383eb0c4aee59b74f38db84d7"
+  integrity sha512-6mQNsaLeXTw0nxYUYu+NSa4Hx4BlF1x1x8/PMFbiR+GBSr+2DkECc69b8hgy2frEodNcvPffeH8YfWd3LI6jhQ==
   dependencies:
-    "@babel/helper-string-parser" "^7.23.4"
-    "@babel/helper-validator-identifier" "^7.22.20"
+    "@babel/helper-string-parser" "^7.24.1"
+    "@babel/helper-validator-identifier" "^7.24.5"
     to-fast-properties "^2.0.0"
 
-"@esbuild/aix-ppc64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.19.12.tgz#d1bc06aedb6936b3b6d313bf809a5a40387d2b7f"
-  integrity sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==
-
-"@esbuild/android-arm64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.19.12.tgz#7ad65a36cfdb7e0d429c353e00f680d737c2aed4"
-  integrity sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==
-
-"@esbuild/android-arm@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.19.12.tgz#b0c26536f37776162ca8bde25e42040c203f2824"
-  integrity sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==
-
-"@esbuild/android-x64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.19.12.tgz#cb13e2211282012194d89bf3bfe7721273473b3d"
-  integrity sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==
-
-"@esbuild/darwin-arm64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.19.12.tgz#cbee41e988020d4b516e9d9e44dd29200996275e"
-  integrity sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==
-
-"@esbuild/darwin-x64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.19.12.tgz#e37d9633246d52aecf491ee916ece709f9d5f4cd"
-  integrity sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==
-
-"@esbuild/freebsd-arm64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.12.tgz#1ee4d8b682ed363b08af74d1ea2b2b4dbba76487"
-  integrity sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==
-
-"@esbuild/freebsd-x64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.19.12.tgz#37a693553d42ff77cd7126764b535fb6cc28a11c"
-  integrity sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==
-
-"@esbuild/linux-arm64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.19.12.tgz#be9b145985ec6c57470e0e051d887b09dddb2d4b"
-  integrity sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==
-
-"@esbuild/linux-arm@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.19.12.tgz#207ecd982a8db95f7b5279207d0ff2331acf5eef"
-  integrity sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==
-
-"@esbuild/linux-ia32@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.19.12.tgz#d0d86b5ca1562523dc284a6723293a52d5860601"
-  integrity sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==
-
-"@esbuild/linux-loong64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.19.12.tgz#9a37f87fec4b8408e682b528391fa22afd952299"
-  integrity sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==
-
-"@esbuild/linux-mips64el@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.19.12.tgz#4ddebd4e6eeba20b509d8e74c8e30d8ace0b89ec"
-  integrity sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==
-
-"@esbuild/linux-ppc64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.19.12.tgz#adb67dadb73656849f63cd522f5ecb351dd8dee8"
-  integrity sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==
-
-"@esbuild/linux-riscv64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.19.12.tgz#11bc0698bf0a2abf8727f1c7ace2112612c15adf"
-  integrity sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==
-
-"@esbuild/linux-s390x@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.19.12.tgz#e86fb8ffba7c5c92ba91fc3b27ed5a70196c3cc8"
-  integrity sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==
-
-"@esbuild/linux-x64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.19.12.tgz#5f37cfdc705aea687dfe5dfbec086a05acfe9c78"
-  integrity sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==
-
-"@esbuild/netbsd-x64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.19.12.tgz#29da566a75324e0d0dd7e47519ba2f7ef168657b"
-  integrity sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==
-
-"@esbuild/openbsd-x64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.19.12.tgz#306c0acbdb5a99c95be98bdd1d47c916e7dc3ff0"
-  integrity sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==
-
-"@esbuild/sunos-x64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.19.12.tgz#0933eaab9af8b9b2c930236f62aae3fc593faf30"
-  integrity sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==
-
-"@esbuild/win32-arm64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.19.12.tgz#773bdbaa1971b36db2f6560088639ccd1e6773ae"
-  integrity sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==
-
-"@esbuild/win32-ia32@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.19.12.tgz#000516cad06354cc84a73f0943a4aa690ef6fd67"
-  integrity sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==
-
-"@esbuild/win32-x64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.19.12.tgz#c57c8afbb4054a3ab8317591a0b7320360b444ae"
-  integrity sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==
+"@esbuild/aix-ppc64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz#a70f4ac11c6a1dfc18b8bbb13284155d933b9537"
+  integrity sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==
+
+"@esbuild/android-arm64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.20.2.tgz#db1c9202a5bc92ea04c7b6840f1bbe09ebf9e6b9"
+  integrity sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==
+
+"@esbuild/android-arm@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.20.2.tgz#3b488c49aee9d491c2c8f98a909b785870d6e995"
+  integrity sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==
+
+"@esbuild/android-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.20.2.tgz#3b1628029e5576249d2b2d766696e50768449f98"
+  integrity sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==
+
+"@esbuild/darwin-arm64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz#6e8517a045ddd86ae30c6608c8475ebc0c4000bb"
+  integrity sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==
+
+"@esbuild/darwin-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz#90ed098e1f9dd8a9381695b207e1cff45540a0d0"
+  integrity sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==
+
+"@esbuild/freebsd-arm64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.2.tgz#d71502d1ee89a1130327e890364666c760a2a911"
+  integrity sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==
+
+"@esbuild/freebsd-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.20.2.tgz#aa5ea58d9c1dd9af688b8b6f63ef0d3d60cea53c"
+  integrity sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==
+
+"@esbuild/linux-arm64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.20.2.tgz#055b63725df678379b0f6db9d0fa85463755b2e5"
+  integrity sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==
+
+"@esbuild/linux-arm@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.20.2.tgz#76b3b98cb1f87936fbc37f073efabad49dcd889c"
+  integrity sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==
+
+"@esbuild/linux-ia32@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.20.2.tgz#c0e5e787c285264e5dfc7a79f04b8b4eefdad7fa"
+  integrity sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==
+
+"@esbuild/linux-loong64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.20.2.tgz#a6184e62bd7cdc63e0c0448b83801001653219c5"
+  integrity sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==
+
+"@esbuild/linux-mips64el@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.20.2.tgz#d08e39ce86f45ef8fc88549d29c62b8acf5649aa"
+  integrity sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==
+
+"@esbuild/linux-ppc64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.20.2.tgz#8d252f0b7756ffd6d1cbde5ea67ff8fd20437f20"
+  integrity sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==
+
+"@esbuild/linux-riscv64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.20.2.tgz#19f6dcdb14409dae607f66ca1181dd4e9db81300"
+  integrity sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==
+
+"@esbuild/linux-s390x@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.20.2.tgz#3c830c90f1a5d7dd1473d5595ea4ebb920988685"
+  integrity sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==
+
+"@esbuild/linux-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz#86eca35203afc0d9de0694c64ec0ab0a378f6fff"
+  integrity sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==
+
+"@esbuild/netbsd-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.20.2.tgz#e771c8eb0e0f6e1877ffd4220036b98aed5915e6"
+  integrity sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==
+
+"@esbuild/openbsd-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.20.2.tgz#9a795ae4b4e37e674f0f4d716f3e226dd7c39baf"
+  integrity sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==
+
+"@esbuild/sunos-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.20.2.tgz#7df23b61a497b8ac189def6e25a95673caedb03f"
+  integrity sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==
+
+"@esbuild/win32-arm64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.20.2.tgz#f1ae5abf9ca052ae11c1bc806fb4c0f519bacf90"
+  integrity sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==
+
+"@esbuild/win32-ia32@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.20.2.tgz#241fe62c34d8e8461cd708277813e1d0ba55ce23"
+  integrity sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==
+
+"@esbuild/win32-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz#9c907b21e30a52db959ba4f80bb01a0cc403d5cc"
+  integrity sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==
 
 "@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0":
   version "4.4.0"
@@ -335,37 +331,37 @@
   dependencies:
     eslint-visitor-keys "^3.3.0"
 
-"@eslint-community/regexpp@^4.5.1", "@eslint-community/regexpp@^4.6.1":
+"@eslint-community/regexpp@^4.10.0", "@eslint-community/regexpp@^4.6.1":
   version "4.10.0"
   resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.10.0.tgz#548f6de556857c8bb73bbee70c35dc82a2e74d63"
   integrity sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==
 
-"@eslint/eslintrc@^2.1.4":
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.4.tgz#388a269f0f25c1b6adc317b5a2c55714894c70ad"
-  integrity sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==
+"@eslint/eslintrc@^3.0.2":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-3.0.2.tgz#36180f8e85bf34d2fe3ccc2261e8e204a411ab4e"
+  integrity sha512-wV19ZEGEMAC1eHgrS7UQPqsdEiCIbTKTasEfcXAigzoXICcqZSjBZEHlZwNVvKg6UBCjSlos84XiLqsRJnIcIg==
   dependencies:
     ajv "^6.12.4"
     debug "^4.3.2"
-    espree "^9.6.0"
-    globals "^13.19.0"
+    espree "^10.0.1"
+    globals "^14.0.0"
     ignore "^5.2.0"
     import-fresh "^3.2.1"
     js-yaml "^4.1.0"
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@eslint/js@8.57.0":
-  version "8.57.0"
-  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.0.tgz#a5417ae8427873f1dd08b70b3574b453e67b5f7f"
-  integrity sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==
+"@eslint/js@9.1.1":
+  version "9.1.1"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.1.1.tgz#eb0f82461d12779bbafc1b5045cde3143d350a8a"
+  integrity sha512-5WoDz3Y19Bg2BnErkZTp0en+c/i9PvgFS7MBe1+m60HjFr0hrphlAGp4yzI7pxpt4xShln4ZyYp4neJm8hmOkQ==
 
-"@humanwhocodes/config-array@^0.11.14":
-  version "0.11.14"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.14.tgz#d78e481a039f7566ecc9660b4ea7fe6b1fec442b"
-  integrity sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==
+"@humanwhocodes/config-array@^0.13.0":
+  version "0.13.0"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.13.0.tgz#fb907624df3256d04b9aa2df50d7aa97ec648748"
+  integrity sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==
   dependencies:
-    "@humanwhocodes/object-schema" "^2.0.2"
+    "@humanwhocodes/object-schema" "^2.0.3"
     debug "^4.3.1"
     minimatch "^3.0.5"
 
@@ -374,12 +370,17 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
   integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
 
-"@humanwhocodes/object-schema@^2.0.2":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz#d9fae00a2d5cb40f92cfe64b47ad749fbc38f917"
-  integrity sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==
+"@humanwhocodes/object-schema@^2.0.3":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz#4a2868d75d6d6963e423bcf90b7fd1be343409d3"
+  integrity sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==
 
-"@jridgewell/gen-mapping@^0.3.2", "@jridgewell/gen-mapping@^0.3.5":
+"@humanwhocodes/retry@^0.2.3":
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/retry/-/retry-0.2.3.tgz#c9aa036d1afa643f1250e83150f39efb3a15a631"
+  integrity sha512-X38nUbachlb01YMlvPFojKoiXq+LzZvuSce70KPMPdeM1Rj03k4dR7lDslhbqXn3Ang4EU3+EAmwEAsbrjHW3g==
+
+"@jridgewell/gen-mapping@^0.3.5":
   version "0.3.5"
   resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz#dcce6aff74bdf6dad1a95802b69b04a2fcb1fb36"
   integrity sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==
@@ -403,7 +404,7 @@
   resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32"
   integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
 
-"@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.24":
+"@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25":
   version "0.3.25"
   resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz#15f190e98895f3fc23276ee14bc76b675c2e50f0"
   integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==
@@ -437,108 +438,123 @@
   resolved "https://registry.yarnpkg.com/@pkgr/core/-/core-0.1.1.tgz#1ec17e2edbec25c8306d424ecfbf13c7de1aaa31"
   integrity sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==
 
-"@rollup/rollup-android-arm-eabi@4.12.0":
-  version "4.12.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.12.0.tgz#38c3abd1955a3c21d492af6b1a1dca4bb1d894d6"
-  integrity sha512-+ac02NL/2TCKRrJu2wffk1kZ+RyqxVUlbjSagNgPm94frxtr+XDL12E5Ll1enWskLrtrZ2r8L3wED1orIibV/w==
-
-"@rollup/rollup-android-arm64@4.12.0":
-  version "4.12.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.12.0.tgz#3822e929f415627609e53b11cec9a4be806de0e2"
-  integrity sha512-OBqcX2BMe6nvjQ0Nyp7cC90cnumt8PXmO7Dp3gfAju/6YwG0Tj74z1vKrfRz7qAv23nBcYM8BCbhrsWqO7PzQQ==
-
-"@rollup/rollup-darwin-arm64@4.12.0":
-  version "4.12.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.12.0.tgz#6c082de71f481f57df6cfa3701ab2a7afde96f69"
-  integrity sha512-X64tZd8dRE/QTrBIEs63kaOBG0b5GVEd3ccoLtyf6IdXtHdh8h+I56C2yC3PtC9Ucnv0CpNFJLqKFVgCYe0lOQ==
-
-"@rollup/rollup-darwin-x64@4.12.0":
-  version "4.12.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.12.0.tgz#c34ca0d31f3c46a22c9afa0e944403eea0edcfd8"
-  integrity sha512-cc71KUZoVbUJmGP2cOuiZ9HSOP14AzBAThn3OU+9LcA1+IUqswJyR1cAJj3Mg55HbjZP6OLAIscbQsQLrpgTOg==
-
-"@rollup/rollup-linux-arm-gnueabihf@4.12.0":
-  version "4.12.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.12.0.tgz#48e899c1e438629c072889b824a98787a7c2362d"
-  integrity sha512-a6w/Y3hyyO6GlpKL2xJ4IOh/7d+APaqLYdMf86xnczU3nurFTaVN9s9jOXQg97BE4nYm/7Ga51rjec5nfRdrvA==
-
-"@rollup/rollup-linux-arm64-gnu@4.12.0":
-  version "4.12.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.12.0.tgz#788c2698a119dc229062d40da6ada8a090a73a68"
-  integrity sha512-0fZBq27b+D7Ar5CQMofVN8sggOVhEtzFUwOwPppQt0k+VR+7UHMZZY4y+64WJ06XOhBTKXtQB/Sv0NwQMXyNAA==
-
-"@rollup/rollup-linux-arm64-musl@4.12.0":
-  version "4.12.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.12.0.tgz#3882a4e3a564af9e55804beeb67076857b035ab7"
-  integrity sha512-eTvzUS3hhhlgeAv6bfigekzWZjaEX9xP9HhxB0Dvrdbkk5w/b+1Sxct2ZuDxNJKzsRStSq1EaEkVSEe7A7ipgQ==
-
-"@rollup/rollup-linux-riscv64-gnu@4.12.0":
-  version "4.12.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.12.0.tgz#0c6ad792e1195c12bfae634425a3d2aa0fe93ab7"
-  integrity sha512-ix+qAB9qmrCRiaO71VFfY8rkiAZJL8zQRXveS27HS+pKdjwUfEhqo2+YF2oI+H/22Xsiski+qqwIBxVewLK7sw==
-
-"@rollup/rollup-linux-x64-gnu@4.12.0":
-  version "4.12.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.12.0.tgz#9d62485ea0f18d8674033b57aa14fb758f6ec6e3"
-  integrity sha512-TenQhZVOtw/3qKOPa7d+QgkeM6xY0LtwzR8OplmyL5LrgTWIXpTQg2Q2ycBf8jm+SFW2Wt/DTn1gf7nFp3ssVA==
-
-"@rollup/rollup-linux-x64-musl@4.12.0":
-  version "4.12.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.12.0.tgz#50e8167e28b33c977c1f813def2b2074d1435e05"
-  integrity sha512-LfFdRhNnW0zdMvdCb5FNuWlls2WbbSridJvxOvYWgSBOYZtgBfW9UGNJG//rwMqTX1xQE9BAodvMH9tAusKDUw==
-
-"@rollup/rollup-win32-arm64-msvc@4.12.0":
-  version "4.12.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.12.0.tgz#68d233272a2004429124494121a42c4aebdc5b8e"
-  integrity sha512-JPDxovheWNp6d7AHCgsUlkuCKvtu3RB55iNEkaQcf0ttsDU/JZF+iQnYcQJSk/7PtT4mjjVG8N1kpwnI9SLYaw==
-
-"@rollup/rollup-win32-ia32-msvc@4.12.0":
-  version "4.12.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.12.0.tgz#366ca62221d1689e3b55a03f4ae12ae9ba595d40"
-  integrity sha512-fjtuvMWRGJn1oZacG8IPnzIV6GF2/XG+h71FKn76OYFqySXInJtseAqdprVTDTyqPxQOG9Exak5/E9Z3+EJ8ZA==
-
-"@rollup/rollup-win32-x64-msvc@4.12.0":
-  version "4.12.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.12.0.tgz#9ffdf9ed133a7464f4ae187eb9e1294413fab235"
-  integrity sha512-ZYmr5mS2wd4Dew/JjT0Fqi2NPB/ZhZ2VvPp7SmvPZb4Y1CG/LRcS6tcRo2cYU7zLK5A7cdbhWnnWmUjoI4qapg==
-
-"@solid-primitives/event-listener@^2.3.2":
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/@solid-primitives/event-listener/-/event-listener-2.3.2.tgz#55e07c5f88f560a981fb5d9914318cb855591d58"
-  integrity sha512-YPyArtF3PkrwEsleD3Mr7Bl196f6EzKF/3LqCT1fBd/6hgYaXJ0pMpjkshXL13DEdc7qLZHtkPChomcpZXjkig==
+"@rollup/rollup-android-arm-eabi@4.17.2":
+  version "4.17.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.17.2.tgz#1a32112822660ee104c5dd3a7c595e26100d4c2d"
+  integrity sha512-NM0jFxY8bB8QLkoKxIQeObCaDlJKewVlIEkuyYKm5An1tdVZ966w2+MPQ2l8LBZLjR+SgyV+nRkTIunzOYBMLQ==
+
+"@rollup/rollup-android-arm64@4.17.2":
+  version "4.17.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.17.2.tgz#5aeef206d65ff4db423f3a93f71af91b28662c5b"
+  integrity sha512-yeX/Usk7daNIVwkq2uGoq2BYJKZY1JfyLTaHO/jaiSwi/lsf8fTFoQW/n6IdAsx5tx+iotu2zCJwz8MxI6D/Bw==
+
+"@rollup/rollup-darwin-arm64@4.17.2":
+  version "4.17.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.17.2.tgz#6b66aaf003c70454c292cd5f0236ebdc6ffbdf1a"
+  integrity sha512-kcMLpE6uCwls023+kknm71ug7MZOrtXo+y5p/tsg6jltpDtgQY1Eq5sGfHcQfb+lfuKwhBmEURDga9N0ol4YPw==
+
+"@rollup/rollup-darwin-x64@4.17.2":
+  version "4.17.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.17.2.tgz#f64fc51ed12b19f883131ccbcea59fc68cbd6c0b"
+  integrity sha512-AtKwD0VEx0zWkL0ZjixEkp5tbNLzX+FCqGG1SvOu993HnSz4qDI6S4kGzubrEJAljpVkhRSlg5bzpV//E6ysTQ==
+
+"@rollup/rollup-linux-arm-gnueabihf@4.17.2":
+  version "4.17.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.17.2.tgz#1a7641111be67c10111f7122d1e375d1226cbf14"
+  integrity sha512-3reX2fUHqN7sffBNqmEyMQVj/CKhIHZd4y631duy0hZqI8Qoqf6lTtmAKvJFYa6bhU95B1D0WgzHkmTg33In0A==
+
+"@rollup/rollup-linux-arm-musleabihf@4.17.2":
+  version "4.17.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.17.2.tgz#c93fd632923e0fee25aacd2ae414288d0b7455bb"
+  integrity sha512-uSqpsp91mheRgw96xtyAGP9FW5ChctTFEoXP0r5FAzj/3ZRv3Uxjtc7taRQSaQM/q85KEKjKsZuiZM3GyUivRg==
+
+"@rollup/rollup-linux-arm64-gnu@4.17.2":
+  version "4.17.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.17.2.tgz#fa531425dd21d058a630947527b4612d9d0b4a4a"
+  integrity sha512-EMMPHkiCRtE8Wdk3Qhtciq6BndLtstqZIroHiiGzB3C5LDJmIZcSzVtLRbwuXuUft1Cnv+9fxuDtDxz3k3EW2A==
+
+"@rollup/rollup-linux-arm64-musl@4.17.2":
+  version "4.17.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.17.2.tgz#8acc16f095ceea5854caf7b07e73f7d1802ac5af"
+  integrity sha512-NMPylUUZ1i0z/xJUIx6VUhISZDRT+uTWpBcjdv0/zkp7b/bQDF+NfnfdzuTiB1G6HTodgoFa93hp0O1xl+/UbA==
+
+"@rollup/rollup-linux-powerpc64le-gnu@4.17.2":
+  version "4.17.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.17.2.tgz#94e69a8499b5cf368911b83a44bb230782aeb571"
+  integrity sha512-T19My13y8uYXPw/L/k0JYaX1fJKFT/PWdXiHr8mTbXWxjVF1t+8Xl31DgBBvEKclw+1b00Chg0hxE2O7bTG7GQ==
+
+"@rollup/rollup-linux-riscv64-gnu@4.17.2":
+  version "4.17.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.17.2.tgz#7ef1c781c7e59e85a6ce261cc95d7f1e0b56db0f"
+  integrity sha512-BOaNfthf3X3fOWAB+IJ9kxTgPmMqPPH5f5k2DcCsRrBIbWnaJCgX2ll77dV1TdSy9SaXTR5iDXRL8n7AnoP5cg==
+
+"@rollup/rollup-linux-s390x-gnu@4.17.2":
+  version "4.17.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.17.2.tgz#f15775841c3232fca9b78cd25a7a0512c694b354"
+  integrity sha512-W0UP/x7bnn3xN2eYMql2T/+wpASLE5SjObXILTMPUBDB/Fg/FxC+gX4nvCfPBCbNhz51C+HcqQp2qQ4u25ok6g==
+
+"@rollup/rollup-linux-x64-gnu@4.17.2":
+  version "4.17.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.17.2.tgz#b521d271798d037ad70c9f85dd97d25f8a52e811"
+  integrity sha512-Hy7pLwByUOuyaFC6mAr7m+oMC+V7qyifzs/nW2OJfC8H4hbCzOX07Ov0VFk/zP3kBsELWNFi7rJtgbKYsav9QQ==
+
+"@rollup/rollup-linux-x64-musl@4.17.2":
+  version "4.17.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.17.2.tgz#9254019cc4baac35800991315d133cc9fd1bf385"
+  integrity sha512-h1+yTWeYbRdAyJ/jMiVw0l6fOOm/0D1vNLui9iPuqgRGnXA0u21gAqOyB5iHjlM9MMfNOm9RHCQ7zLIzT0x11Q==
+
+"@rollup/rollup-win32-arm64-msvc@4.17.2":
+  version "4.17.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.17.2.tgz#27f65a89f6f52ee9426ec11e3571038e4671790f"
+  integrity sha512-tmdtXMfKAjy5+IQsVtDiCfqbynAQE/TQRpWdVataHmhMb9DCoJxp9vLcCBjEQWMiUYxO1QprH/HbY9ragCEFLA==
+
+"@rollup/rollup-win32-ia32-msvc@4.17.2":
+  version "4.17.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.17.2.tgz#a2fbf8246ed0bb014f078ca34ae6b377a90cb411"
+  integrity sha512-7II/QCSTAHuE5vdZaQEwJq2ZACkBpQDOmQsE6D6XUbnBHW8IAhm4eTufL6msLJorzrHDFv3CF8oCA/hSIRuZeQ==
+
+"@rollup/rollup-win32-x64-msvc@4.17.2":
+  version "4.17.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.17.2.tgz#5a2d08b81e8064b34242d5cc9973ef8dd1e60503"
+  integrity sha512-TGGO7v7qOq4CYmSBVEYpI1Y5xDuCEnbVC5Vth8mOsW0gDSzxNrVERPc790IGHsrT2dQSimgMr9Ub3Y1Jci5/8w==
+
+"@solid-primitives/event-listener@^2.3.3":
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/@solid-primitives/event-listener/-/event-listener-2.3.3.tgz#ab28c8627aa7d6234617867d8b02c80e1b8f0948"
+  integrity sha512-DAJbl+F0wrFW2xmcV8dKMBhk9QLVLuBSW+TR4JmIfTaObxd13PuL7nqaXnaYKDWOYa6otB00qcCUIGbuIhSUgQ==
   dependencies:
     "@solid-primitives/utils" "^6.2.3"
 
-"@solid-primitives/resize-observer@^2.0.23":
-  version "2.0.24"
-  resolved "https://registry.yarnpkg.com/@solid-primitives/resize-observer/-/resize-observer-2.0.24.tgz#93e3f385ac3eb480483d5bf242f89387ee55941e"
-  integrity sha512-Ib3nqgqXWpSju/SPQQr2klf/AX1gJT7Un/U90RPGGFyLuvJ5FqUtpn/7Zyg/8S3fe+wmNF1WAFHQVPX64+85Jw==
+"@solid-primitives/resize-observer@^2.0.25":
+  version "2.0.25"
+  resolved "https://registry.yarnpkg.com/@solid-primitives/resize-observer/-/resize-observer-2.0.25.tgz#c97a01193fe9b2c08bc240d096b92888ab44bda0"
+  integrity sha512-jVDXkt2MiriYRaz4DYs62185d+6jQ+1DCsR+v7f6XMsIJJuf963qdBRFjtZtKXBaxdPNMyuPeDgf5XQe3EoDJg==
   dependencies:
-    "@solid-primitives/event-listener" "^2.3.2"
-    "@solid-primitives/rootless" "^1.4.4"
-    "@solid-primitives/static-store" "^0.0.7"
+    "@solid-primitives/event-listener" "^2.3.3"
+    "@solid-primitives/rootless" "^1.4.5"
+    "@solid-primitives/static-store" "^0.0.8"
     "@solid-primitives/utils" "^6.2.3"
 
-"@solid-primitives/rootless@^1.4.4":
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/@solid-primitives/rootless/-/rootless-1.4.4.tgz#26d82fa64f4a57ec7f7b1a83a17e3ac5feaa84c8"
-  integrity sha512-RVbVwZtVKo1UNhusjJSEXyFoGgpLZCWfGOYug3mlzUsJwAqwox2IE+it/w0PfaHCKZ1xqXvfyrZC2z0jEZS6Ow==
+"@solid-primitives/rootless@^1.4.5":
+  version "1.4.5"
+  resolved "https://registry.yarnpkg.com/@solid-primitives/rootless/-/rootless-1.4.5.tgz#120244fd5e02d9ea111ed2236fedcef572010be4"
+  integrity sha512-GFJE9GC3ojx0aUKqAUZmQPyU8fOVMtnVNrkdk2yS4kd17WqVSpXpoTmo9CnOwA+PG7FTzdIkogvfLQSLs4lrww==
   dependencies:
     "@solid-primitives/utils" "^6.2.3"
 
-"@solid-primitives/scroll@^2.0.21":
-  version "2.0.22"
-  resolved "https://registry.yarnpkg.com/@solid-primitives/scroll/-/scroll-2.0.22.tgz#fe86dea8552781109cc853104c1bdfba4e0b3494"
-  integrity sha512-I52uw1I1ExS0GtqwoHT/xWgwvEId2bAbFq005gxwk6zCUirQk86FIPaE3J4N1OFA/nV/HxcPDSM1oJQBOI2H1A==
+"@solid-primitives/scroll@^2.0.23":
+  version "2.0.23"
+  resolved "https://registry.yarnpkg.com/@solid-primitives/scroll/-/scroll-2.0.23.tgz#caef4a1189174ad3411ba7fe3c87fa712813c6be"
+  integrity sha512-kO0YpXKEUHaAnHp3zIsHYmxxuKXO3/LxVhZQHHmhqsmUY6A5IBObkSkoQ/ChIPl/WMKE7ynxEq40OgRmhvyUSw==
   dependencies:
-    "@solid-primitives/event-listener" "^2.3.2"
-    "@solid-primitives/rootless" "^1.4.4"
-    "@solid-primitives/static-store" "^0.0.7"
+    "@solid-primitives/event-listener" "^2.3.3"
+    "@solid-primitives/rootless" "^1.4.5"
+    "@solid-primitives/static-store" "^0.0.8"
 
-"@solid-primitives/static-store@^0.0.7":
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/@solid-primitives/static-store/-/static-store-0.0.7.tgz#91716c7958a0d9354d860d0f702debe77cba2580"
-  integrity sha512-G7+ifh6Bw7JD6iKXhyvpB8kYusXjigiZ+cBYCNrRakjRF/Gh6fDopGuzC0x11h2pXu2gltRcF9Ph7PgBjj7ayg==
+"@solid-primitives/static-store@^0.0.8":
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/@solid-primitives/static-store/-/static-store-0.0.8.tgz#a4d7a93a254bf89d3c5c5f27a031d1a46c34f5c5"
+  integrity sha512-ZecE4BqY0oBk0YG00nzaAWO5Mjcny8Fc06CdbXadH9T9lzq/9GefqcSe/5AtdXqjvY/DtJ5C6CkcjPZO0o/eqg==
   dependencies:
     "@solid-primitives/utils" "^6.2.3"
 
@@ -547,10 +563,10 @@
   resolved "https://registry.yarnpkg.com/@solid-primitives/utils/-/utils-6.2.3.tgz#1abed4c74a2696e08bd2e49cf2b86fc8b87a32bd"
   integrity sha512-CqAwKb2T5Vi72+rhebSsqNZ9o67buYRdEJrIFzRXz3U59QqezuuxPsyzTSVCacwS5Pf109VRsgCJQoxKRoECZQ==
 
-"@solidjs/router@^0.13.1":
-  version "0.13.1"
-  resolved "https://registry.yarnpkg.com/@solidjs/router/-/router-0.13.1.tgz#91894f1f3d2458fd5dfeb2ca80898b8d4de13cb4"
-  integrity sha512-Rz5Lf0ssWMuN+Wm2GFO0vwZoO/KSwYFSuCUzWrRAvje5M0ZYZrMk5FZxuzdJT+zg8KuqWJQlRALks5E0r+FjAA==
+"@solidjs/router@^0.13.3":
+  version "0.13.3"
+  resolved "https://registry.yarnpkg.com/@solidjs/router/-/router-0.13.3.tgz#f520362d716a58c0416a33372ae9e5ed1a26be9a"
+  integrity sha512-p8zznlvnN3KySMXqT8irhubgDNTETNa/guaGHU/cZl7kuiPO3PmkWNYfoNCygtEpoxLmLpf62/ZKeyhFdZexsw==
 
 "@types/babel__core@^7.20.4":
   version "7.20.5"
@@ -590,159 +606,106 @@
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
   integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==
 
-"@types/json-schema@^7.0.12":
+"@types/json-schema@^7.0.15":
   version "7.0.15"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
   integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
 
-"@types/lodash@^4.14.202":
-  version "4.14.202"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.202.tgz#f09dbd2fb082d507178b2f2a5c7e74bd72ff98f8"
-  integrity sha512-OvlIYQK9tNneDlS0VN54LLd5uiPCBOp7gS5Z0f1mjoJYBrtStzgmJBxONW3U6OZqdtNzZPmn9BS/7WI7BFFcFQ==
+"@types/lodash@^4.17.0":
+  version "4.17.0"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.0.tgz#d774355e41f372d5350a4d0714abb48194a489c3"
+  integrity sha512-t7dhREVv6dbNj0q17X12j7yDG4bD/DHYX7o5/DbDxobP0HnGPgpRz2Ej77aL7TZT3DSw13fqUTj8J4mMnqa7WA==
 
-"@types/semver@^7.5.0":
+"@types/semver@^7.5.8":
   version "7.5.8"
   resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.8.tgz#8268a8c57a3e4abd25c165ecd36237db7948a55e"
   integrity sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==
 
-"@typescript-eslint/eslint-plugin@^7.1.1":
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.1.1.tgz#dd71fc5c7ecec745ca26ece506d84d203a205c0e"
-  integrity sha512-zioDz623d0RHNhvx0eesUmGfIjzrk18nSBC8xewepKXbBvN/7c1qImV7Hg8TI1URTxKax7/zxfxj3Uph8Chcuw==
+"@typescript-eslint/eslint-plugin@7.8.0":
+  version "7.8.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.8.0.tgz#c78e309fe967cb4de05b85cdc876fb95f8e01b6f"
+  integrity sha512-gFTT+ezJmkwutUPmB0skOj3GZJtlEGnlssems4AjkVweUPGj7jRwwqg0Hhg7++kPGJqKtTYx+R05Ftww372aIg==
   dependencies:
-    "@eslint-community/regexpp" "^4.5.1"
-    "@typescript-eslint/scope-manager" "7.1.1"
-    "@typescript-eslint/type-utils" "7.1.1"
-    "@typescript-eslint/utils" "7.1.1"
-    "@typescript-eslint/visitor-keys" "7.1.1"
+    "@eslint-community/regexpp" "^4.10.0"
+    "@typescript-eslint/scope-manager" "7.8.0"
+    "@typescript-eslint/type-utils" "7.8.0"
+    "@typescript-eslint/utils" "7.8.0"
+    "@typescript-eslint/visitor-keys" "7.8.0"
     debug "^4.3.4"
     graphemer "^1.4.0"
-    ignore "^5.2.4"
+    ignore "^5.3.1"
     natural-compare "^1.4.0"
-    semver "^7.5.4"
-    ts-api-utils "^1.0.1"
-
-"@typescript-eslint/parser@^7.1.1":
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.1.1.tgz#6a9d0a5c9ccdf5dbd3cb8c949728c64e24e07d1f"
-  integrity sha512-ZWUFyL0z04R1nAEgr9e79YtV5LbafdOtN7yapNbn1ansMyaegl2D4bL7vHoJ4HPSc4CaLwuCVas8CVuneKzplQ==
-  dependencies:
-    "@typescript-eslint/scope-manager" "7.1.1"
-    "@typescript-eslint/types" "7.1.1"
-    "@typescript-eslint/typescript-estree" "7.1.1"
-    "@typescript-eslint/visitor-keys" "7.1.1"
+    semver "^7.6.0"
+    ts-api-utils "^1.3.0"
+
+"@typescript-eslint/parser@7.8.0":
+  version "7.8.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.8.0.tgz#1e1db30c8ab832caffee5f37e677dbcb9357ddc8"
+  integrity sha512-KgKQly1pv0l4ltcftP59uQZCi4HUYswCLbTqVZEJu7uLX8CTLyswqMLqLN+2QFz4jCptqWVV4SB7vdxcH2+0kQ==
+  dependencies:
+    "@typescript-eslint/scope-manager" "7.8.0"
+    "@typescript-eslint/types" "7.8.0"
+    "@typescript-eslint/typescript-estree" "7.8.0"
+    "@typescript-eslint/visitor-keys" "7.8.0"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@6.21.0":
-  version "6.21.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.21.0.tgz#ea8a9bfc8f1504a6ac5d59a6df308d3a0630a2b1"
-  integrity sha512-OwLUIWZJry80O99zvqXVEioyniJMa+d2GrqpUTqi5/v5D5rOrppJVBPa0yKCblcigC0/aYAzxxqQ1B+DS2RYsg==
+"@typescript-eslint/scope-manager@7.8.0":
+  version "7.8.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.8.0.tgz#bb19096d11ec6b87fb6640d921df19b813e02047"
+  integrity sha512-viEmZ1LmwsGcnr85gIq+FCYI7nO90DVbE37/ll51hjv9aG+YZMb4WDE2fyWpUR4O/UrhGRpYXK/XajcGTk2B8g==
   dependencies:
-    "@typescript-eslint/types" "6.21.0"
-    "@typescript-eslint/visitor-keys" "6.21.0"
+    "@typescript-eslint/types" "7.8.0"
+    "@typescript-eslint/visitor-keys" "7.8.0"
 
-"@typescript-eslint/scope-manager@7.1.1":
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.1.1.tgz#9e301803ff8e21a74f50c6f89a4baccad9a48f93"
-  integrity sha512-cirZpA8bJMRb4WZ+rO6+mnOJrGFDd38WoXCEI57+CYBqta8Yc8aJym2i7vyqLL1vVYljgw0X27axkUXz32T8TA==
+"@typescript-eslint/type-utils@7.8.0":
+  version "7.8.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-7.8.0.tgz#9de166f182a6e4d1c5da76e94880e91831e3e26f"
+  integrity sha512-H70R3AefQDQpz9mGv13Uhi121FNMh+WEaRqcXTX09YEDky21km4dV1ZXJIp8QjXc4ZaVkXVdohvWDzbnbHDS+A==
   dependencies:
-    "@typescript-eslint/types" "7.1.1"
-    "@typescript-eslint/visitor-keys" "7.1.1"
-
-"@typescript-eslint/type-utils@7.1.1":
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-7.1.1.tgz#aee820d5bedd39b83c18585a526cc520ddb7a226"
-  integrity sha512-5r4RKze6XHEEhlZnJtR3GYeCh1IueUHdbrukV2KSlLXaTjuSfeVF8mZUVPLovidCuZfbVjfhi4c0DNSa/Rdg5g==
-  dependencies:
-    "@typescript-eslint/typescript-estree" "7.1.1"
-    "@typescript-eslint/utils" "7.1.1"
+    "@typescript-eslint/typescript-estree" "7.8.0"
+    "@typescript-eslint/utils" "7.8.0"
     debug "^4.3.4"
-    ts-api-utils "^1.0.1"
-
-"@typescript-eslint/types@6.21.0":
-  version "6.21.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.21.0.tgz#205724c5123a8fef7ecd195075fa6e85bac3436d"
-  integrity sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg==
+    ts-api-utils "^1.3.0"
 
-"@typescript-eslint/types@7.1.1":
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.1.1.tgz#ca33ba7cf58224fb46a84fea62593c2c53cd795f"
-  integrity sha512-KhewzrlRMrgeKm1U9bh2z5aoL4s7K3tK5DwHDn8MHv0yQfWFz/0ZR6trrIHHa5CsF83j/GgHqzdbzCXJ3crx0Q==
+"@typescript-eslint/types@7.8.0":
+  version "7.8.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.8.0.tgz#1fd2577b3ad883b769546e2d1ef379f929a7091d"
+  integrity sha512-wf0peJ+ZGlcH+2ZS23aJbOv+ztjeeP8uQ9GgwMJGVLx/Nj9CJt17GWgWWoSmoRVKAX2X+7fzEnAjxdvK2gqCLw==
 
-"@typescript-eslint/typescript-estree@6.21.0":
-  version "6.21.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.21.0.tgz#c47ae7901db3b8bddc3ecd73daff2d0895688c46"
-  integrity sha512-6npJTkZcO+y2/kr+z0hc4HwNfrrP4kNYh57ek7yCNlrBjWQ1Y0OS7jiZTkgumrvkX5HkEKXFZkkdFNkaW2wmUQ==
+"@typescript-eslint/typescript-estree@7.8.0":
+  version "7.8.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.8.0.tgz#b028a9226860b66e623c1ee55cc2464b95d2987c"
+  integrity sha512-5pfUCOwK5yjPaJQNy44prjCwtr981dO8Qo9J9PwYXZ0MosgAbfEMB008dJ5sNo3+/BN6ytBPuSvXUg9SAqB0dg==
   dependencies:
-    "@typescript-eslint/types" "6.21.0"
-    "@typescript-eslint/visitor-keys" "6.21.0"
+    "@typescript-eslint/types" "7.8.0"
+    "@typescript-eslint/visitor-keys" "7.8.0"
     debug "^4.3.4"
     globby "^11.1.0"
     is-glob "^4.0.3"
-    minimatch "9.0.3"
-    semver "^7.5.4"
-    ts-api-utils "^1.0.1"
+    minimatch "^9.0.4"
+    semver "^7.6.0"
+    ts-api-utils "^1.3.0"
 
-"@typescript-eslint/typescript-estree@7.1.1":
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.1.1.tgz#09c54af0151a1b05d0875c0fc7fe2ec7a2476ece"
-  integrity sha512-9ZOncVSfr+sMXVxxca2OJOPagRwT0u/UHikM2Rd6L/aB+kL/QAuTnsv6MeXtjzCJYb8PzrXarypSGIPx3Jemxw==
-  dependencies:
-    "@typescript-eslint/types" "7.1.1"
-    "@typescript-eslint/visitor-keys" "7.1.1"
-    debug "^4.3.4"
-    globby "^11.1.0"
-    is-glob "^4.0.3"
-    minimatch "9.0.3"
-    semver "^7.5.4"
-    ts-api-utils "^1.0.1"
-
-"@typescript-eslint/utils@7.1.1":
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.1.1.tgz#bdeeb789eee4af5d3fb5400a69566d4dbf97ff3b"
-  integrity sha512-thOXM89xA03xAE0lW7alstvnyoBUbBX38YtY+zAUcpRPcq9EIhXPuJ0YTv948MbzmKh6e1AUszn5cBFK49Umqg==
-  dependencies:
-    "@eslint-community/eslint-utils" "^4.4.0"
-    "@types/json-schema" "^7.0.12"
-    "@types/semver" "^7.5.0"
-    "@typescript-eslint/scope-manager" "7.1.1"
-    "@typescript-eslint/types" "7.1.1"
-    "@typescript-eslint/typescript-estree" "7.1.1"
-    semver "^7.5.4"
-
-"@typescript-eslint/utils@^6.4.0":
-  version "6.21.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.21.0.tgz#4714e7a6b39e773c1c8e97ec587f520840cd8134"
-  integrity sha512-NfWVaC8HP9T8cbKQxHcsJBY5YE1O33+jpMwN45qzWWaPDZgLIbo12toGMWnmhvCpd3sIxkpDw3Wv1B3dYrbDQQ==
+"@typescript-eslint/utils@7.8.0", "@typescript-eslint/utils@^7.6.0":
+  version "7.8.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.8.0.tgz#57a79f9c0c0740ead2f622e444cfaeeb9fd047cd"
+  integrity sha512-L0yFqOCflVqXxiZyXrDr80lnahQfSOfc9ELAAZ75sqicqp2i36kEZZGuUymHNFoYOqxRT05up760b4iGsl02nQ==
   dependencies:
     "@eslint-community/eslint-utils" "^4.4.0"
-    "@types/json-schema" "^7.0.12"
-    "@types/semver" "^7.5.0"
-    "@typescript-eslint/scope-manager" "6.21.0"
-    "@typescript-eslint/types" "6.21.0"
-    "@typescript-eslint/typescript-estree" "6.21.0"
-    semver "^7.5.4"
-
-"@typescript-eslint/visitor-keys@6.21.0":
-  version "6.21.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.21.0.tgz#87a99d077aa507e20e238b11d56cc26ade45fe47"
-  integrity sha512-JJtkDduxLi9bivAB+cYOVMtbkqdPOhZ+ZI5LC47MIRrDV4Yn2o+ZnW10Nkmr28xRpSpdJ6Sm42Hjf2+REYXm0A==
-  dependencies:
-    "@typescript-eslint/types" "6.21.0"
-    eslint-visitor-keys "^3.4.1"
-
-"@typescript-eslint/visitor-keys@7.1.1":
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.1.1.tgz#e6538a58c9b157f03bcbb29e3b6a92fe39a6ab0d"
-  integrity sha512-yTdHDQxY7cSoCcAtiBzVzxleJhkGB9NncSIyMYe2+OGON1ZsP9zOPws/Pqgopa65jvknOjlk/w7ulPlZ78PiLQ==
-  dependencies:
-    "@typescript-eslint/types" "7.1.1"
-    eslint-visitor-keys "^3.4.1"
-
-"@ungap/structured-clone@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"
-  integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==
+    "@types/json-schema" "^7.0.15"
+    "@types/semver" "^7.5.8"
+    "@typescript-eslint/scope-manager" "7.8.0"
+    "@typescript-eslint/types" "7.8.0"
+    "@typescript-eslint/typescript-estree" "7.8.0"
+    semver "^7.6.0"
+
+"@typescript-eslint/visitor-keys@7.8.0":
+  version "7.8.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.8.0.tgz#7285aab991da8bee411a42edbd5db760d22fdd91"
+  integrity sha512-q4/gibTNBQNA0lGyYQCmWRS5D15n8rXh4QjK3KV+MBPlTYHpfBUT3D3PaPR/HeNiI9W6R7FvlkcGhNyAoP+caA==
+  dependencies:
+    "@typescript-eslint/types" "7.8.0"
+    eslint-visitor-keys "^3.4.3"
 
 "@yr/monotone-cubic-spline@^1.0.3":
   version "1.0.3"
@@ -754,7 +717,7 @@ acorn-jsx@^5.3.2:
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
-acorn@^8.9.0:
+acorn@^8.11.3:
   version "8.11.3"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.3.tgz#71e0b14e13a4ec160724b38fb7b0f233b1b81d7a"
   integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==
@@ -801,10 +764,10 @@ anymatch@~3.1.2:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
-apexcharts@^3.46.0:
-  version "3.46.0"
-  resolved "https://registry.yarnpkg.com/apexcharts/-/apexcharts-3.46.0.tgz#ee0afd44a7df94e038c4cc0160ece21a0da387f5"
-  integrity sha512-ELAY6vj8JQD7QLktKasTzwm9Wt0qxqfQSo+3QWS7G7I774iK8HCkG1toGsqJH0mkK6PtYBtnSIe66uUcwoCw1w==
+apexcharts@^3.49.0:
+  version "3.49.0"
+  resolved "https://registry.yarnpkg.com/apexcharts/-/apexcharts-3.49.0.tgz#b359fc9be8ffe45de3e8b553ebdcf18ad2a67e7e"
+  integrity sha512-2T9HnbQFLCuYRPndQLmh+bEQFoz0meUbvASaGgiSKDuYhWcLBodJtIpKql2aOtMx4B/sHrWW0dm90HsW4+h2PQ==
   dependencies:
     "@yr/monotone-cubic-spline" "^1.0.3"
     svg.draggable.js "^2.2.2"
@@ -829,10 +792,10 @@ async@^3.2.3:
   resolved "https://registry.yarnpkg.com/async/-/async-3.2.5.tgz#ebd52a8fdaf7a2289a24df399f8d8485c8a46b66"
   integrity sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==
 
-babel-plugin-jsx-dom-expressions@^0.37.17:
-  version "0.37.17"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jsx-dom-expressions/-/babel-plugin-jsx-dom-expressions-0.37.17.tgz#3bf0a756e2701e0ea830a95b4f8d7e5b617aabaf"
-  integrity sha512-1bv8rOTzs6TR3DVyVZ7ElxyPEhnS556FMWRIsB3gBPfkn/cSKaLvXLGk+X1lvI+SzcUo4G+UcmJrn3vr1ig8mQ==
+babel-plugin-jsx-dom-expressions@^0.37.20:
+  version "0.37.20"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jsx-dom-expressions/-/babel-plugin-jsx-dom-expressions-0.37.20.tgz#506fd0302d6740bdea957d5f7b18eccb117342ca"
+  integrity sha512-0L3aC5EFyvCgIlEYIqJb4Ym29s1IDI/U5SntZ1ZK054xe0MqBmBi2GLK3f9AOklhdY7kCC3GsHD0bILh6u0Qsg==
   dependencies:
     "@babel/helper-module-imports" "7.18.6"
     "@babel/plugin-syntax-jsx" "^7.18.6"
@@ -841,11 +804,11 @@ babel-plugin-jsx-dom-expressions@^0.37.17:
     validate-html-nesting "^1.2.1"
 
 babel-preset-solid@^1.8.4:
-  version "1.8.15"
-  resolved "https://registry.yarnpkg.com/babel-preset-solid/-/babel-preset-solid-1.8.15.tgz#59a80e7048a6ab7142768de6f7f1f887cfc5fdcc"
-  integrity sha512-P2yOQbB7Hn/m4YvpXV6ExHIMcgNWXWXcvY4kJzG3yqAB3hKS58OZRsvJ7RObsZWqXRvZTITBIwnpK0BMGu+ZIQ==
+  version "1.8.17"
+  resolved "https://registry.yarnpkg.com/babel-preset-solid/-/babel-preset-solid-1.8.17.tgz#8d55e8e2ee800be85527425e7943534f984dc815"
+  integrity sha512-s/FfTZOeds0hYxYqce90Jb+0ycN2lrzC7VP1k1JIn3wBqcaexDKdYi6xjB+hMNkL+Q6HobKbwsriqPloasR9LA==
   dependencies:
-    babel-plugin-jsx-dom-expressions "^0.37.17"
+    babel-plugin-jsx-dom-expressions "^0.37.20"
 
 balanced-match@^1.0.0:
   version "1.0.2"
@@ -853,9 +816,9 @@ balanced-match@^1.0.0:
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
 binary-extensions@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
-  integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.3.0.tgz#f6e14a97858d327252200242d4ccfe522c445522"
+  integrity sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==
 
 bootstrap@^5.3.3:
   version "5.3.3"
@@ -900,9 +863,9 @@ callsites@^3.0.0:
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
 caniuse-lite@^1.0.30001587:
-  version "1.0.30001593"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001593.tgz#7cda1d9e5b0cad6ebab4133b1f239d4ea44fe659"
-  integrity sha512-UWM1zlo3cZfkpBysd7AS+z+v007q9G1+fLTUU42rQnY6t2axoogPW/xol6T7juU5EUoOhML4WgBIdG+9yYqAjQ==
+  version "1.0.30001615"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001615.tgz#7c2c8772db681b6dee74d81d6550db68f2d28842"
+  integrity sha512-1IpazM5G3r38meiae0bHRnPhz+CBQ3ZLqbQMtrg+AsTPKAXgW38JNsXkyZ+v8waCsDmPq87lmfun5Q2AGysNEQ==
 
 chalk@^2.4.2:
   version "2.4.2"
@@ -1008,55 +971,48 @@ dir-glob@^3.0.1:
   dependencies:
     path-type "^4.0.0"
 
-doctrine@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
-  integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==
-  dependencies:
-    esutils "^2.0.2"
-
 ejs@^3.1.9:
-  version "3.1.9"
-  resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.9.tgz#03c9e8777fe12686a9effcef22303ca3d8eeb361"
-  integrity sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==
+  version "3.1.10"
+  resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.10.tgz#69ab8358b14e896f80cc39e62087b88500c3ac3b"
+  integrity sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==
   dependencies:
     jake "^10.8.5"
 
 electron-to-chromium@^1.4.668:
-  version "1.4.690"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.690.tgz#dd5145d45c49c08a9a6f7454127e660bdf9a3fa7"
-  integrity sha512-+2OAGjUx68xElQhydpcbqH50hE8Vs2K6TkAeLhICYfndb67CVH0UsZaijmRUE3rHlIxU1u0jxwhgVe6fK3YANA==
-
-esbuild@^0.19.3:
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.19.12.tgz#dc82ee5dc79e82f5a5c3b4323a2a641827db3e04"
-  integrity sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==
+  version "1.4.754"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.754.tgz#20a9f3cc80e0fb6a804b86605e55da16918a58b0"
+  integrity sha512-7Kr5jUdns5rL/M9wFFmMZAgFDuL2YOnanFH4OI4iFzUqyh3XOL7nAGbSlSMZdzKMIyyTpNSbqZsWG9odwLeKvA==
+
+esbuild@^0.20.1:
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.20.2.tgz#9d6b2386561766ee6b5a55196c6d766d28c87ea1"
+  integrity sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==
   optionalDependencies:
-    "@esbuild/aix-ppc64" "0.19.12"
-    "@esbuild/android-arm" "0.19.12"
-    "@esbuild/android-arm64" "0.19.12"
-    "@esbuild/android-x64" "0.19.12"
-    "@esbuild/darwin-arm64" "0.19.12"
-    "@esbuild/darwin-x64" "0.19.12"
-    "@esbuild/freebsd-arm64" "0.19.12"
-    "@esbuild/freebsd-x64" "0.19.12"
-    "@esbuild/linux-arm" "0.19.12"
-    "@esbuild/linux-arm64" "0.19.12"
-    "@esbuild/linux-ia32" "0.19.12"
-    "@esbuild/linux-loong64" "0.19.12"
-    "@esbuild/linux-mips64el" "0.19.12"
-    "@esbuild/linux-ppc64" "0.19.12"
-    "@esbuild/linux-riscv64" "0.19.12"
-    "@esbuild/linux-s390x" "0.19.12"
-    "@esbuild/linux-x64" "0.19.12"
-    "@esbuild/netbsd-x64" "0.19.12"
-    "@esbuild/openbsd-x64" "0.19.12"
-    "@esbuild/sunos-x64" "0.19.12"
-    "@esbuild/win32-arm64" "0.19.12"
-    "@esbuild/win32-ia32" "0.19.12"
-    "@esbuild/win32-x64" "0.19.12"
-
-escalade@^3.1.1:
+    "@esbuild/aix-ppc64" "0.20.2"
+    "@esbuild/android-arm" "0.20.2"
+    "@esbuild/android-arm64" "0.20.2"
+    "@esbuild/android-x64" "0.20.2"
+    "@esbuild/darwin-arm64" "0.20.2"
+    "@esbuild/darwin-x64" "0.20.2"
+    "@esbuild/freebsd-arm64" "0.20.2"
+    "@esbuild/freebsd-x64" "0.20.2"
+    "@esbuild/linux-arm" "0.20.2"
+    "@esbuild/linux-arm64" "0.20.2"
+    "@esbuild/linux-ia32" "0.20.2"
+    "@esbuild/linux-loong64" "0.20.2"
+    "@esbuild/linux-mips64el" "0.20.2"
+    "@esbuild/linux-ppc64" "0.20.2"
+    "@esbuild/linux-riscv64" "0.20.2"
+    "@esbuild/linux-s390x" "0.20.2"
+    "@esbuild/linux-x64" "0.20.2"
+    "@esbuild/netbsd-x64" "0.20.2"
+    "@esbuild/openbsd-x64" "0.20.2"
+    "@esbuild/sunos-x64" "0.20.2"
+    "@esbuild/win32-arm64" "0.20.2"
+    "@esbuild/win32-ia32" "0.20.2"
+    "@esbuild/win32-x64" "0.20.2"
+
+escalade@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.2.tgz#54076e9ab29ea5bf3d8f1ed62acffbb88272df27"
   integrity sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==
@@ -1079,70 +1035,72 @@ eslint-plugin-prettier@^5.1.3:
     prettier-linter-helpers "^1.0.0"
     synckit "^0.8.6"
 
-eslint-plugin-simple-import-sort@^12.0.0:
-  version "12.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-12.0.0.tgz#3cfa05d74509bd4dc329a956938823812194dbb6"
-  integrity sha512-8o0dVEdAkYap0Cn5kNeklaKcT1nUsa3LITWEuFk3nJifOoD+5JQGoyDUW2W/iPWwBsNBJpyJS9y4je/BgxLcyQ==
+eslint-plugin-simple-import-sort@^12.1.0:
+  version "12.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-12.1.0.tgz#8186ad55474d2f5c986a2f1bf70625a981e30d05"
+  integrity sha512-Y2fqAfC11TcG/WP3TrI1Gi3p3nc8XJyEOJYHyEPEGI/UAgNx6akxxlX74p7SbAQdLcgASKhj8M0GKvH3vq/+ig==
 
-eslint-plugin-solid@^0.13.1:
-  version "0.13.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-solid/-/eslint-plugin-solid-0.13.1.tgz#608b8afd981b0f981ee97fa18a8acfe1efc0a9c4"
-  integrity sha512-PdNrAylFzeh/SbnLc2pQ432l+bXFGzXj/qNqkh5QNVZCoWIdSs0CJA2D7hqW0DloztwUrzkVZCDWFWc3iRAm/Q==
+eslint-plugin-solid@^0.14.0:
+  version "0.14.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-solid/-/eslint-plugin-solid-0.14.0.tgz#f700d0763641a6ef999cce7f507f2910347cf396"
+  integrity sha512-EY0GJLOZdLynAyBM39WBLJH2bUftGI0KekyzpfxQEhCTuOhXkIRf648P97mQjME3TDaQQbY+ObVXeE2mjfs4FQ==
   dependencies:
-    "@typescript-eslint/utils" "^6.4.0"
+    "@typescript-eslint/utils" "^7.6.0"
+    estraverse "^5.3.0"
     is-html "^2.0.0"
     kebab-case "^1.0.2"
-    known-css-properties "^0.24.0"
-    style-to-object "^0.3.0"
+    known-css-properties "^0.30.0"
+    style-to-object "^1.0.6"
 
-eslint-scope@^7.2.2:
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f"
-  integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==
+eslint-scope@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-8.0.1.tgz#a9601e4b81a0b9171657c343fb13111688963cfc"
+  integrity sha512-pL8XjgP4ZOmmwfFE8mEhSxA7ZY4C+LWyqjQ3o4yWkkmD0qcMT9kkW3zWHOczhWcjTSgqycYAgwSlXvZltv65og==
   dependencies:
     esrecurse "^4.3.0"
     estraverse "^5.2.0"
 
-eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3:
+eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.3:
   version "3.4.3"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
   integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
 
-eslint@^8.57.0:
-  version "8.57.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.57.0.tgz#c786a6fd0e0b68941aaf624596fb987089195668"
-  integrity sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==
+eslint-visitor-keys@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz#e3adc021aa038a2a8e0b2f8b0ce8f66b9483b1fb"
+  integrity sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==
+
+eslint@^9.1.1:
+  version "9.1.1"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.1.1.tgz#39ec657ccd12813cb4a1dab2f9229dcc6e468271"
+  integrity sha512-b4cRQ0BeZcSEzPpY2PjFY70VbO32K7BStTGtBsnIGdTSEEQzBi8hPBcGQmTG2zUvFr9uLe0TK42bw8YszuHEqg==
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
     "@eslint-community/regexpp" "^4.6.1"
-    "@eslint/eslintrc" "^2.1.4"
-    "@eslint/js" "8.57.0"
-    "@humanwhocodes/config-array" "^0.11.14"
+    "@eslint/eslintrc" "^3.0.2"
+    "@eslint/js" "9.1.1"
+    "@humanwhocodes/config-array" "^0.13.0"
     "@humanwhocodes/module-importer" "^1.0.1"
+    "@humanwhocodes/retry" "^0.2.3"
     "@nodelib/fs.walk" "^1.2.8"
-    "@ungap/structured-clone" "^1.2.0"
     ajv "^6.12.4"
     chalk "^4.0.0"
     cross-spawn "^7.0.2"
     debug "^4.3.2"
-    doctrine "^3.0.0"
     escape-string-regexp "^4.0.0"
-    eslint-scope "^7.2.2"
-    eslint-visitor-keys "^3.4.3"
-    espree "^9.6.1"
+    eslint-scope "^8.0.1"
+    eslint-visitor-keys "^4.0.0"
+    espree "^10.0.1"
     esquery "^1.4.2"
     esutils "^2.0.2"
     fast-deep-equal "^3.1.3"
-    file-entry-cache "^6.0.1"
+    file-entry-cache "^8.0.0"
     find-up "^5.0.0"
     glob-parent "^6.0.2"
-    globals "^13.19.0"
-    graphemer "^1.4.0"
     ignore "^5.2.0"
     imurmurhash "^0.1.4"
     is-glob "^4.0.0"
     is-path-inside "^3.0.3"
-    js-yaml "^4.1.0"
     json-stable-stringify-without-jsonify "^1.0.1"
     levn "^0.4.1"
     lodash.merge "^4.6.2"
@@ -1152,14 +1110,14 @@ eslint@^8.57.0:
     strip-ansi "^6.0.1"
     text-table "^0.2.0"
 
-espree@^9.6.0, espree@^9.6.1:
-  version "9.6.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f"
-  integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==
+espree@^10.0.1:
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-10.0.1.tgz#600e60404157412751ba4a6f3a2ee1a42433139f"
+  integrity sha512-MWkrWZbJsL2UwnjxTX3gG8FneachS/Mwg7tdGXce011sJd5b0JG54vat5KHnfSBODZ3Wvzd2WnjxyzsRoVv+ww==
   dependencies:
-    acorn "^8.9.0"
+    acorn "^8.11.3"
     acorn-jsx "^5.3.2"
-    eslint-visitor-keys "^3.4.1"
+    eslint-visitor-keys "^4.0.0"
 
 esquery@^1.4.2:
   version "1.5.0"
@@ -1175,7 +1133,7 @@ esrecurse@^4.3.0:
   dependencies:
     estraverse "^5.2.0"
 
-estraverse@^5.1.0, estraverse@^5.2.0:
+estraverse@^5.1.0, estraverse@^5.2.0, estraverse@^5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
   integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
@@ -1223,12 +1181,12 @@ fastq@^1.6.0:
   dependencies:
     reusify "^1.0.4"
 
-file-entry-cache@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
-  integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==
+file-entry-cache@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-8.0.0.tgz#7787bddcf1131bffb92636c69457bbc0edd6d81f"
+  integrity sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==
   dependencies:
-    flat-cache "^3.0.4"
+    flat-cache "^4.0.0"
 
 filelist@^1.0.4:
   version "1.0.4"
@@ -1252,25 +1210,19 @@ find-up@^5.0.0:
     locate-path "^6.0.0"
     path-exists "^4.0.0"
 
-flat-cache@^3.0.4:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.2.0.tgz#2c0c2d5040c99b1632771a9d105725c0115363ee"
-  integrity sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==
+flat-cache@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-4.0.1.tgz#0ece39fcb14ee012f4b0410bd33dd9c1f011127c"
+  integrity sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==
   dependencies:
     flatted "^3.2.9"
-    keyv "^4.5.3"
-    rimraf "^3.0.2"
+    keyv "^4.5.4"
 
 flatted@^3.2.9:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.1.tgz#21db470729a6734d4997002f439cb308987f567a"
   integrity sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==
 
-fs.realpath@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
-
 fsevents@~2.3.2, fsevents@~2.3.3:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
@@ -1295,29 +1247,15 @@ glob-parent@^6.0.2:
   dependencies:
     is-glob "^4.0.3"
 
-glob@^7.1.3:
-  version "7.2.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
-  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.1.1"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
 globals@^11.1.0:
   version "11.12.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
-globals@^13.19.0:
-  version "13.24.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-13.24.0.tgz#8432a19d78ce0c1e833949c36adb345400bb1171"
-  integrity sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==
-  dependencies:
-    type-fest "^0.20.2"
+globals@^14.0.0:
+  version "14.0.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-14.0.0.tgz#898d7413c29babcf6bafe56fcadded858ada724e"
+  integrity sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==
 
 globby@^11.1.0:
   version "11.1.0"
@@ -1356,7 +1294,7 @@ html-tags@^3.0.0:
   resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.3.1.tgz#a04026a18c882e4bba8a01a3d39cfe465d40b5ce"
   integrity sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==
 
-ignore@^5.2.0, ignore@^5.2.4:
+ignore@^5.2.0, ignore@^5.3.1:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.1.tgz#5073e554cd42c5b33b394375f538b8593e34d4ef"
   integrity sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==
@@ -1379,23 +1317,10 @@ imurmurhash@^0.1.4:
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
   integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==
 
-inflight@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
-  dependencies:
-    once "^1.3.0"
-    wrappy "1"
-
-inherits@2:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
-  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
-
-inline-style-parser@0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/inline-style-parser/-/inline-style-parser-0.1.1.tgz#ec8a3b429274e9c0a1f1c4ffa9453a7fef72cea1"
-  integrity sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q==
+inline-style-parser@0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/inline-style-parser/-/inline-style-parser-0.2.3.tgz#e35c5fb45f3a83ed7849fe487336eb7efa25971c"
+  integrity sha512-qlD8YNDqyTKTyuITrDOffsl6Tdhv+UC4hcdAVuQsK4IMQ99nSgd1MIA/Q+jQYoh9r3hVUXhYh7urSRmXPkW04g==
 
 is-binary-path@~2.1.0:
   version "2.1.0"
@@ -1495,17 +1420,17 @@ kebab-case@^1.0.2:
   resolved "https://registry.yarnpkg.com/kebab-case/-/kebab-case-1.0.2.tgz#5eac97d5d220acf606d40e3c0ecfea21f1f9e1eb"
   integrity sha512-7n6wXq4gNgBELfDCpzKc+mRrZFs7D+wgfF5WRFLNAr4DA/qtr9Js8uOAVAfHhuLMfAcQ0pRKqbpjx+TcJVdE1Q==
 
-keyv@^4.5.3:
+keyv@^4.5.4:
   version "4.5.4"
   resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93"
   integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==
   dependencies:
     json-buffer "3.0.1"
 
-known-css-properties@^0.24.0:
-  version "0.24.0"
-  resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.24.0.tgz#19aefd85003ae5698a5560d2b55135bf5432155c"
-  integrity sha512-RTSoaUAfLvpR357vWzAz/50Q/BmHfmE6ETSWfutT0AJiw10e6CmcdYRQJlLRd95B53D0Y2aD1jSxD3V3ySF+PA==
+known-css-properties@^0.30.0:
+  version "0.30.0"
+  resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.30.0.tgz#34dd1f39c805c65a6dfa6ea76206b20dc523dd96"
+  integrity sha512-VSWXYUnsPu9+WYKkfmJyLKtIvaRJi1kXUqVmBACORXZQxT5oZDsoZ2vQP+bQFDnWtpI/4eq3MLoRMjI2fnLzTQ==
 
 levn@^0.4.1:
   version "0.4.1"
@@ -1566,14 +1491,7 @@ micromatch@^4.0.4:
     braces "^3.0.2"
     picomatch "^2.3.1"
 
-minimatch@9.0.3:
-  version "9.0.3"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825"
-  integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==
-  dependencies:
-    brace-expansion "^2.0.1"
-
-minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
+minimatch@^3.0.5, minimatch@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
   integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
@@ -1587,6 +1505,13 @@ minimatch@^5.0.1:
   dependencies:
     brace-expansion "^2.0.1"
 
+minimatch@^9.0.4:
+  version "9.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.4.tgz#8e49c731d1749cbec05050ee5145147b32496a51"
+  integrity sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==
+  dependencies:
+    brace-expansion "^2.0.1"
+
 moment@^2.30.1:
   version "2.30.1"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.30.1.tgz#f8c91c07b7a786e30c59926df530b4eac96974ae"
@@ -1617,24 +1542,17 @@ normalize-path@^3.0.0, normalize-path@~3.0.0:
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
   integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
 
-once@^1.3.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
-  dependencies:
-    wrappy "1"
-
 optionator@^0.9.3:
-  version "0.9.3"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.3.tgz#007397d44ed1872fdc6ed31360190f81814e2c64"
-  integrity sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==
+  version "0.9.4"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.4.tgz#7ea1c1a5d91d764fb282139c88fe11e182a3a734"
+  integrity sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==
   dependencies:
-    "@aashutoshrathi/word-wrap" "^1.2.3"
     deep-is "^0.1.3"
     fast-levenshtein "^2.0.6"
     levn "^0.4.1"
     prelude-ls "^1.2.1"
     type-check "^0.4.0"
+    word-wrap "^1.2.5"
 
 p-limit@^3.0.2:
   version "3.1.0"
@@ -1662,11 +1580,6 @@ path-exists@^4.0.0:
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
   integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
 
-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
-
 path-key@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
@@ -1687,14 +1600,14 @@ picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1:
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
 
-postcss@^8.4.35:
-  version "8.4.35"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.35.tgz#60997775689ce09011edf083a549cea44aabe2f7"
-  integrity sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA==
+postcss@^8.4.38:
+  version "8.4.38"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.38.tgz#b387d533baf2054288e337066d81c6bee9db9e0e"
+  integrity sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==
   dependencies:
     nanoid "^3.3.7"
     picocolors "^1.0.0"
-    source-map-js "^1.0.2"
+    source-map-js "^1.2.0"
 
 prelude-ls@^1.2.1:
   version "1.2.1"
@@ -1740,33 +1653,29 @@ reusify@^1.0.4:
   resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
   integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
 
-rimraf@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
-  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
-  dependencies:
-    glob "^7.1.3"
-
-rollup@^4.2.0:
-  version "4.12.0"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.12.0.tgz#0b6d1e5f3d46bbcf244deec41a7421dc54cc45b5"
-  integrity sha512-wz66wn4t1OHIJw3+XU7mJJQV/2NAfw5OAk6G6Hoo3zcvz/XOfQ52Vgi+AN4Uxoxi0KBBwk2g8zPrTDA4btSB/Q==
+rollup@^4.13.0:
+  version "4.17.2"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.17.2.tgz#26d1785d0144122277fdb20ab3a24729ae68301f"
+  integrity sha512-/9ClTJPByC0U4zNLowV1tMBe8yMEAxewtR3cUNX5BoEpGH3dQEWpJLr6CLp0fPdYRF/fzVOgvDb1zXuakwF5kQ==
   dependencies:
     "@types/estree" "1.0.5"
   optionalDependencies:
-    "@rollup/rollup-android-arm-eabi" "4.12.0"
-    "@rollup/rollup-android-arm64" "4.12.0"
-    "@rollup/rollup-darwin-arm64" "4.12.0"
-    "@rollup/rollup-darwin-x64" "4.12.0"
-    "@rollup/rollup-linux-arm-gnueabihf" "4.12.0"
-    "@rollup/rollup-linux-arm64-gnu" "4.12.0"
-    "@rollup/rollup-linux-arm64-musl" "4.12.0"
-    "@rollup/rollup-linux-riscv64-gnu" "4.12.0"
-    "@rollup/rollup-linux-x64-gnu" "4.12.0"
-    "@rollup/rollup-linux-x64-musl" "4.12.0"
-    "@rollup/rollup-win32-arm64-msvc" "4.12.0"
-    "@rollup/rollup-win32-ia32-msvc" "4.12.0"
-    "@rollup/rollup-win32-x64-msvc" "4.12.0"
+    "@rollup/rollup-android-arm-eabi" "4.17.2"
+    "@rollup/rollup-android-arm64" "4.17.2"
+    "@rollup/rollup-darwin-arm64" "4.17.2"
+    "@rollup/rollup-darwin-x64" "4.17.2"
+    "@rollup/rollup-linux-arm-gnueabihf" "4.17.2"
+    "@rollup/rollup-linux-arm-musleabihf" "4.17.2"
+    "@rollup/rollup-linux-arm64-gnu" "4.17.2"
+    "@rollup/rollup-linux-arm64-musl" "4.17.2"
+    "@rollup/rollup-linux-powerpc64le-gnu" "4.17.2"
+    "@rollup/rollup-linux-riscv64-gnu" "4.17.2"
+    "@rollup/rollup-linux-s390x-gnu" "4.17.2"
+    "@rollup/rollup-linux-x64-gnu" "4.17.2"
+    "@rollup/rollup-linux-x64-musl" "4.17.2"
+    "@rollup/rollup-win32-arm64-msvc" "4.17.2"
+    "@rollup/rollup-win32-ia32-msvc" "4.17.2"
+    "@rollup/rollup-win32-x64-msvc" "4.17.2"
     fsevents "~2.3.2"
 
 run-parallel@^1.1.9:
@@ -1776,10 +1685,10 @@ run-parallel@^1.1.9:
   dependencies:
     queue-microtask "^1.2.2"
 
-sass@^1.71.1:
-  version "1.71.1"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.71.1.tgz#dfb09c63ce63f89353777bbd4a88c0a38386ee54"
-  integrity sha512-wovtnV2PxzteLlfNzbgm1tFXPLoZILYAMJtvoXXkD7/+1uP41eKkIt1ypWq5/q2uT94qHjXehEYfmjKOvjL9sg==
+sass@^1.75.0:
+  version "1.76.0"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.76.0.tgz#fe15909500735ac154f0dc7386d656b62b03987d"
+  integrity sha512-nc3LeqvF2FNW5xGF1zxZifdW3ffIz5aBb7I7tSvOoNu7z1RQ6pFt9MBuiPtjgaI62YWrM/txjWlOCFiGtf2xpw==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
     immutable "^4.0.0"
@@ -1790,7 +1699,7 @@ semver@^6.3.1:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.5.4:
+semver@^7.6.0:
   version "7.6.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d"
   integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==
@@ -1798,14 +1707,14 @@ semver@^7.5.4:
     lru-cache "^6.0.0"
 
 seroval-plugins@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/seroval-plugins/-/seroval-plugins-1.0.4.tgz#917d2cd103525f0238433a49479def0ce65a56e4"
-  integrity sha512-DQ2IK6oQVvy8k+c2V5x5YCtUa/GGGsUwUBNN9UqohrZ0rWdUapBFpNMYP1bCyRHoxOJjdKGl+dieacFIpU/i1A==
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/seroval-plugins/-/seroval-plugins-1.0.5.tgz#eeded50d736d5e1dba142a72b0188df9f4e42b6d"
+  integrity sha512-8+pDC1vOedPXjKG7oz8o+iiHrtF2WswaMQJ7CKFpccvSYfrzmvKY9zOJWCg+881722wIHfwkdnRmiiDm9ym+zQ==
 
-seroval@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/seroval/-/seroval-1.0.4.tgz#0400d24a48b1f6f44b8a3d55af0476a1c5e8643f"
-  integrity sha512-qQs/N+KfJu83rmszFQaTxcoJoPn6KNUruX4KmnmyD0oZkUoiNvJ1rpdYKDf4YHM05k+HOgCxa3yvf15QbVijGg==
+seroval@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/seroval/-/seroval-1.0.5.tgz#d71ee540d936babaed92f56eda3e52d8e2a3deed"
+  integrity sha512-TM+Z11tHHvQVQKeNlOUonOWnsNM+2IBwZ4vwoi4j3zKzIpc5IDw8WPwCfcc8F17wy6cBcJGbZbFOR0UCuTZHQA==
 
 shebang-command@^2.0.0:
   version "2.0.0"
@@ -1831,13 +1740,13 @@ solid-apexcharts@^0.3.4:
   dependencies:
     defu "^6.1.4"
 
-solid-js@^1.8.15:
-  version "1.8.15"
-  resolved "https://registry.yarnpkg.com/solid-js/-/solid-js-1.8.15.tgz#af4eef7203203efefb605613f3c244b5bcdb63bc"
-  integrity sha512-d0QP/efr3UVcwGgWVPveQQ0IHOH6iU7yUhc2piy8arNG8wxKmvUy1kFxyF8owpmfCWGB87usDKMaVnsNYZm+Vw==
+solid-js@^1.8.16:
+  version "1.8.17"
+  resolved "https://registry.yarnpkg.com/solid-js/-/solid-js-1.8.17.tgz#780ed6f0fd8633009d1b3c29d56bf6b6bb33bd50"
+  integrity sha512-E0FkUgv9sG/gEBWkHr/2XkBluHb1fkrHywUgA6o6XolPDCJ4g1HaLmQufcBBhiF36ee40q+HpG/vCZu7fLpI3Q==
   dependencies:
     csstype "^3.1.0"
-    seroval "^1.0.3"
+    seroval "^1.0.4"
     seroval-plugins "^1.0.3"
 
 solid-refresh@^0.6.3:
@@ -1849,10 +1758,10 @@ solid-refresh@^0.6.3:
     "@babel/helper-module-imports" "^7.22.15"
     "@babel/types" "^7.23.6"
 
-"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
-  integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
+"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af"
+  integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==
 
 strip-ansi@^6.0.1:
   version "6.0.1"
@@ -1866,12 +1775,12 @@ strip-json-comments@^3.1.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
 
-style-to-object@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/style-to-object/-/style-to-object-0.3.0.tgz#b1b790d205991cc783801967214979ee19a76e46"
-  integrity sha512-CzFnRRXhzWIdItT3OmF8SQfWyahHhjq3HwcMNCNLn+N7klOOqPjMeG/4JSu77D7ypZdGvSzvkrbyeTMizz2VrA==
+style-to-object@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/style-to-object/-/style-to-object-1.0.6.tgz#0c28aed8be1813d166c60d962719b2907c26547b"
+  integrity sha512-khxq+Qm3xEyZfKd/y9L3oIWQimxuc4STrQKtQn8aSDRHb8mFgpukgX1hdzfrMEW6JCjyJ8p89x+IUMVnCBI1PA==
   dependencies:
-    inline-style-parser "0.1.1"
+    inline-style-parser "0.2.3"
 
 supports-color@^5.3.0:
   version "5.5.0"
@@ -1967,10 +1876,10 @@ to-regex-range@^5.0.1:
   dependencies:
     is-number "^7.0.0"
 
-ts-api-utils@^1.0.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.2.1.tgz#f716c7e027494629485b21c0df6180f4d08f5e8b"
-  integrity sha512-RIYA36cJn2WiH9Hy77hdF9r7oEwxAtB/TS9/S4Qd90Ap4z5FSiin5zEiTL44OII1Y3IIlEvxwxFUVgrHSZ/UpA==
+ts-api-utils@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.3.0.tgz#4b490e27129f1e8e686b45cc4ab63714dc60eea1"
+  integrity sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==
 
 tslib@^2.6.2:
   version "2.6.2"
@@ -1984,22 +1893,26 @@ type-check@^0.4.0, type-check@~0.4.0:
   dependencies:
     prelude-ls "^1.2.1"
 
-type-fest@^0.20.2:
-  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
-  integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
+typescript-eslint@^7.8.0:
+  version "7.8.0"
+  resolved "https://registry.yarnpkg.com/typescript-eslint/-/typescript-eslint-7.8.0.tgz#d2a73d4caac35d4d9825bfdfac06a9bf2ba175e4"
+  integrity sha512-sheFG+/D8N/L7gC3WT0Q8sB97Nm573Yfr+vZFzl/4nBdYcmviBPtwGSX9TJ7wpVg28ocerKVOt+k2eGmHzcgVA==
+  dependencies:
+    "@typescript-eslint/eslint-plugin" "7.8.0"
+    "@typescript-eslint/parser" "7.8.0"
+    "@typescript-eslint/utils" "7.8.0"
 
-typescript@^5.3.3:
-  version "5.3.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.3.tgz#b3ce6ba258e72e6305ba66f5c9b452aaee3ffe37"
-  integrity sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==
+typescript@^5.4.5:
+  version "5.4.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.5.tgz#42ccef2c571fdbd0f6718b1d1f5e6e5ef006f611"
+  integrity sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==
 
 update-browserslist-db@^1.0.13:
-  version "1.0.13"
-  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz#3c5e4f5c083661bd38ef64b6328c26ed6c8248c4"
-  integrity sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==
+  version "1.0.14"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.14.tgz#46a9367c323f8ade9a9dddb7f3ae7814b3a0b31c"
+  integrity sha512-JixKH8GR2pWYshIPUg/NujK3JO7JiqEEUiNArE86NQyrgUuZeTlZQN3xuS/yiV5Kb48ev9K6RqNkaJjXsdg7Jw==
   dependencies:
-    escalade "^3.1.1"
+    escalade "^3.1.2"
     picocolors "^1.0.0"
 
 uri-js@^4.2.2:
@@ -2021,10 +1934,10 @@ vite-plugin-ejs@^1.7.0:
   dependencies:
     ejs "^3.1.9"
 
-vite-plugin-solid@^2.10.1:
-  version "2.10.1"
-  resolved "https://registry.yarnpkg.com/vite-plugin-solid/-/vite-plugin-solid-2.10.1.tgz#f09a353c6b9414c62b258422ddeb73f9d320dd92"
-  integrity sha512-kfVdNLWaJqaJVL52U6iCCKNW/nXE7bS1VVGOWPGllOkJfcNILymVSY0LCBLSnyy0iYnRtrXpiHm14rMuzeC7CA==
+vite-plugin-solid@^2.10.2:
+  version "2.10.2"
+  resolved "https://registry.yarnpkg.com/vite-plugin-solid/-/vite-plugin-solid-2.10.2.tgz#180f5ec9d8ac03d19160dd5728b313fe9b62ee0d"
+  integrity sha512-AOEtwMe2baBSXMXdo+BUwECC8IFHcKS6WQV/1NEd+Q7vHPap5fmIhLcAzr+DUJ04/KHx/1UBU0l1/GWP+rMAPQ==
   dependencies:
     "@babel/core" "^7.23.3"
     "@types/babel__core" "^7.20.4"
@@ -2033,14 +1946,14 @@ vite-plugin-solid@^2.10.1:
     solid-refresh "^0.6.3"
     vitefu "^0.2.5"
 
-vite@^5.1.5:
-  version "5.1.5"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-5.1.5.tgz#bdbc2b15e8000d9cc5172f059201178f9c9de5fb"
-  integrity sha512-BdN1xh0Of/oQafhU+FvopafUp6WaYenLU/NFoL5WyJL++GxkNfieKzBhM24H3HVsPQrlAqB7iJYTHabzaRed5Q==
+vite@^5.2.10:
+  version "5.2.10"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-5.2.10.tgz#2ac927c91e99d51b376a5c73c0e4b059705f5bd7"
+  integrity sha512-PAzgUZbP7msvQvqdSD+ErD5qGnSFiGOoWmV5yAKUEI0kdhjbH6nMWVyZQC/hSc4aXwc0oJ9aEdIiF9Oje0JFCw==
   dependencies:
-    esbuild "^0.19.3"
-    postcss "^8.4.35"
-    rollup "^4.2.0"
+    esbuild "^0.20.1"
+    postcss "^8.4.38"
+    rollup "^4.13.0"
   optionalDependencies:
     fsevents "~2.3.3"
 
@@ -2056,10 +1969,10 @@ which@^2.0.1:
   dependencies:
     isexe "^2.0.0"
 
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
+word-wrap@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"
+  integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==
 
 yallist@^3.0.2:
   version "3.1.1"
@@ -2071,10 +1984,10 @@ yallist@^4.0.0:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
-yarn@^1.22.21:
-  version "1.22.21"
-  resolved "https://registry.yarnpkg.com/yarn/-/yarn-1.22.21.tgz#1959a18351b811cdeedbd484a8f86c3cc3bbaf72"
-  integrity sha512-ynXaJsADJ9JiZ84zU25XkPGOvVMmZ5b7tmTSpKURYwgELdjucAOydqIOrOfTxVYcNXe91xvLZwcRh68SR3liCg==
+yarn@^1.22.22:
+  version "1.22.22"
+  resolved "https://registry.yarnpkg.com/yarn/-/yarn-1.22.22.tgz#ac34549e6aa8e7ead463a7407e1c7390f61a6610"
+  integrity sha512-prL3kGtyG7o9Z9Sv8IPfBNrWTDmXB4Qbes8A9rEzt6wkJV8mUvoirjU0Mp3GGAU06Y0XQyA3/2/RQFVuK7MTfg==
 
 yocto-queue@^0.1.0:
   version "0.1.0"

From 53a81ecc37ba9e306c30d567790e049bf795c8ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cintia=20S=C3=A1nchez=20Garc=C3=ADa?= <cynthiasg@icloud.com>
Date: Thu, 2 May 2024 11:18:36 +0200
Subject: [PATCH 41/55] Add lint-and-test-embed  to CI (#611)

Signed-off-by: Cintia Sanchez Garcia <cynthiasg@icloud.com>
---
 .github/workflows/ci.yml | 25 +++++++++++++++++++++++++
 ui/embed/package.json    |  1 +
 ui/embed/yarn.lock       | 11 ++++++++---
 3 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1bc90fe8..ee65278b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -51,3 +51,28 @@ jobs:
       - name: Run eslint
         working-directory: ./ui/webapp
         run: yarn lint
+
+  lint-and-test-embed:
+    runs-on:
+      labels: ubuntu-latest-8-cores
+    env:
+      NODE_OPTIONS: --max_old_space_size=4096
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - name: Cache node modules
+        uses: actions/cache@v4
+        with:
+          path: ./ui/embed/node_modules
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+      - name: Install dependencies
+        working-directory: ./ui/embed
+        run: yarn install --network-concurrency 1
+      - name: Run prettier
+        working-directory: ./ui/embed
+        run: yarn format:diff
+      - name: Run eslint
+        working-directory: ./ui/embed
+        run: yarn lint
diff --git a/ui/embed/package.json b/ui/embed/package.json
index e3bc6572..ad9d2f55 100644
--- a/ui/embed/package.json
+++ b/ui/embed/package.json
@@ -21,6 +21,7 @@
     "eslint-plugin-prettier": "^5.1.3",
     "eslint-plugin-simple-import-sort": "^12.1.0",
     "eslint-plugin-solid": "^0.14.0",
+    "prettier": "^3.2.5",
     "typescript": "^5.4.5",
     "typescript-eslint": "^7.8.0",
     "vite": "^5.2.10",
diff --git a/ui/embed/yarn.lock b/ui/embed/yarn.lock
index 567fe628..c83f591e 100644
--- a/ui/embed/yarn.lock
+++ b/ui/embed/yarn.lock
@@ -1447,6 +1447,11 @@ prettier-linter-helpers@^1.0.0:
   dependencies:
     fast-diff "^1.1.2"
 
+prettier@^3.2.5:
+  version "3.2.5"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.2.5.tgz#e52bc3090586e824964a8813b09aba6233b28368"
+  integrity sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==
+
 punycode@^2.1.0:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5"
@@ -1691,9 +1696,9 @@ vite-plugin-solid@^2.10.2:
     vitefu "^0.2.5"
 
 vite@^5.2.10:
-  version "5.2.10"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-5.2.10.tgz#2ac927c91e99d51b376a5c73c0e4b059705f5bd7"
-  integrity sha512-PAzgUZbP7msvQvqdSD+ErD5qGnSFiGOoWmV5yAKUEI0kdhjbH6nMWVyZQC/hSc4aXwc0oJ9aEdIiF9Oje0JFCw==
+  version "5.2.11"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-5.2.11.tgz#726ec05555431735853417c3c0bfb36003ca0cbd"
+  integrity sha512-HndV31LWW05i1BLPMUCE1B9E9GFbOu1MbenhS58FuK6owSO5qHm7GiCotrNY1YE5rMeQSFBGmT5ZaLEjFizgiQ==
   dependencies:
     esbuild "^0.20.1"
     postcss "^8.4.38"

From e4115ea4556e7399800703cbcec73fe9dffbe207 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cintia=20S=C3=A1nchez=20Garc=C3=ADa?= <cynthiasg@icloud.com>
Date: Fri, 3 May 2024 14:05:41 +0200
Subject: [PATCH 42/55] Fix some issues in mobile devices (#612)

Signed-off-by: Cintia Sanchez Garcia <cynthiasg@icloud.com>
---
 ui/webapp/src/App.css                         | 25 ++++++----
 ui/webapp/src/App.tsx                         | 10 ++++
 ui/webapp/src/layout/Layout.module.css        |  2 +
 .../layout/common/itemModal/MobileContent.tsx |  6 ++-
 .../common/itemModal/ParticipationStats.tsx   |  4 +-
 .../src/layout/explore/Explore.module.css     |  2 +-
 .../layout/explore/card/Content.module.css    |  9 +++-
 ui/webapp/src/layout/explore/card/Content.tsx |  4 +-
 .../src/layout/explore/card/Menu.module.css   |  4 +-
 ui/webapp/src/layout/explore/card/Menu.tsx    |  3 +-
 ui/webapp/src/layout/explore/card/index.tsx   |  4 +-
 ui/webapp/src/layout/explore/grid/Grid.tsx    | 46 ++++++++++++++-----
 .../explore/grid/GridCategory.module.css      |  2 +-
 .../src/layout/explore/grid/GridItem.tsx      |  6 ++-
 ui/webapp/src/layout/explore/index.tsx        | 12 +++--
 .../mobile/ExploreMobileIndex.module.css      |  4 ++
 .../explore/mobile/ExploreMobileIndex.tsx     |  9 ++--
 ui/webapp/src/layout/guide/Guide.module.css   | 12 ++++-
 ui/webapp/src/layout/guide/ToC.module.css     |  4 +-
 ui/webapp/src/layout/guide/index.tsx          | 17 +++----
 .../layout/navigation/EmbedModal.module.css   |  1 +
 .../src/layout/navigation/MobileHeader.tsx    |  2 +-
 ui/webapp/src/layout/stats/Stats.module.css   |  2 +-
 .../upcomingEvents/UpcomingEvents.module.css  |  1 +
 ui/webapp/src/utils/goToElement.ts            | 27 ++---------
 ui/webapp/src/utils/isTouchDevice.ts          |  5 ++
 26 files changed, 139 insertions(+), 84 deletions(-)
 create mode 100644 ui/webapp/src/utils/isTouchDevice.ts

diff --git a/ui/webapp/src/App.css b/ui/webapp/src/App.css
index ba102aa5..ba8a5f13 100644
--- a/ui/webapp/src/App.css
+++ b/ui/webapp/src/App.css
@@ -1,17 +1,11 @@
-html,
-body {
-  height: 100%;
-  height: 100vh;
-  margin: 0;
-  padding: 0;
-}
-
 :root {
+  --app-height: 100%;
   --card-size-width: 50px;
   --card-size-height: 45px;
   --card-gap: 5px;
   --mobile-card-size-width: 50px;
   --mobile-card-size-height: 50px;
+
   --color1: rgba(0, 107, 204, 1);
   --color2: rgba(255, 0, 170, 1);
   --color3: rgba(96, 149, 214, 1);
@@ -20,6 +14,15 @@ body {
   --color6: rgba(80, 142, 191, 0.7);
 }
 
+html,
+body {
+  height: 100vh;
+  height: 100%;
+  height: var(--app-height);
+  margin: 0;
+  padding: 0;
+}
+
 button:focus,
 a:focus,
 input:not([type='color']):not(.withShadow):focus,
@@ -86,8 +89,9 @@ a,
   }
 
   body {
-    min-height: 100%;
     min-height: 100vh;
+    min-height: 100%;
+    min-height: var(--app-height);
     overflow: auto;
   }
 
@@ -107,8 +111,9 @@ a,
 
 @media only screen and (min-width: 992px) {
   #landscape {
-    height: 100%;
     height: 100vh;
+    height: 100%;
+    height: var(--app-height);
   }
 
   /* Lazy loading for images are not working properly on body - desktop */
diff --git a/ui/webapp/src/App.tsx b/ui/webapp/src/App.tsx
index 5d8fc7b7..442c2657 100644
--- a/ui/webapp/src/App.tsx
+++ b/ui/webapp/src/App.tsx
@@ -1,3 +1,4 @@
+import { createWindowSize } from '@solid-primitives/resize-observer';
 import { Route, Router } from '@solidjs/router';
 import isUndefined from 'lodash/isUndefined';
 import range from 'lodash/range';
@@ -41,6 +42,8 @@ const App = () => {
   const [data, setData] = createSignal<BaseData>();
   const [loadingOverlay, setLoadingOverlay] = createSignal<boolean>(false);
   const [error, setError] = createSignal<string | undefined>();
+  const size = createWindowSize();
+  const height = () => size.height;
 
   async function fetchOverlayData() {
     try {
@@ -57,6 +60,10 @@ const App = () => {
     setLoadingOverlay(false);
   }
 
+  const updateAppHeight = () => {
+    document.documentElement.style.setProperty('--app-height', `${window.innerHeight}px`);
+  };
+
   const loadColors = () => {
     if (!isUndefined(window.baseDS) && !isUndefined(window.baseDS.colors)) {
       if (!isUndefined(window.baseDS.colors?.color1)) {
@@ -100,6 +107,8 @@ const App = () => {
     })
   );
 
+  createEffect(on(height, updateAppHeight));
+
   onMount(() => {
     const isOverlayActive = overlayData.checkIfOverlayInQuery();
     if (!isOverlayActive) {
@@ -110,6 +119,7 @@ const App = () => {
     }
 
     batch(() => {
+      updateAppHeight();
       setIsOverlay(isOverlayActive);
       loadColors();
     });
diff --git a/ui/webapp/src/layout/Layout.module.css b/ui/webapp/src/layout/Layout.module.css
index bc0d07cd..020fb747 100644
--- a/ui/webapp/src/layout/Layout.module.css
+++ b/ui/webapp/src/layout/Layout.module.css
@@ -1,5 +1,7 @@
 .container {
   min-height: 100vh;
+  min-height: 100%;
+  min-height: var(--app-height);
 }
 
 :global(.overlay-active) .container {
diff --git a/ui/webapp/src/layout/common/itemModal/MobileContent.tsx b/ui/webapp/src/layout/common/itemModal/MobileContent.tsx
index 354228a7..1339b9b1 100644
--- a/ui/webapp/src/layout/common/itemModal/MobileContent.tsx
+++ b/ui/webapp/src/layout/common/itemModal/MobileContent.tsx
@@ -129,11 +129,13 @@ const MobileContent = (props: Props) => {
         {/* Additional categories */}
         <Show when={!isUndefined(itemInfo()!.additional_categories) && !isEmpty(itemInfo()!.additional_categories)}>
           <div class={`fw-bold text-uppercase my-3 ${styles.titleInSection}`}>Additional categories</div>
-          <div class="d-flex flex-column align-items-start mb-1">
+          <div class="d-flex flex-column flex-sm-row align-items-start mb-1">
             <For each={itemInfo()!.additional_categories}>
               {(additional: AdditionalCategory) => {
                 return (
-                  <div class={`badge border rounded-0 text-truncate mb-2 mw-100 ${styles.badgeOutlineDark}`}>
+                  <div
+                    class={`badge border rounded-0 text-truncate mb-2 me-2 me-sm-2 mw-100 ${styles.badgeOutlineDark}`}
+                  >
                     {additional.category} / {additional.subcategory}
                   </div>
                 );
diff --git a/ui/webapp/src/layout/common/itemModal/ParticipationStats.tsx b/ui/webapp/src/layout/common/itemModal/ParticipationStats.tsx
index 04f4fc6f..7bfbc359 100644
--- a/ui/webapp/src/layout/common/itemModal/ParticipationStats.tsx
+++ b/ui/webapp/src/layout/common/itemModal/ParticipationStats.tsx
@@ -36,9 +36,7 @@ const ParticipationStats = (props: Props) => {
             <Show
               when={!isAllZero()}
               fallback={
-                <div
-                  class={`alert alert-primary text-muted mx-auto mb-4 px-5 py-2 text-center border ${styles.message}`}
-                >
+                <div class={`alert rounded-0 text-muted mx-auto mb-4 px-5 py-2 text-center border ${styles.message}`}>
                   No activity in the last year
                 </div>
               }
diff --git a/ui/webapp/src/layout/explore/Explore.module.css b/ui/webapp/src/layout/explore/Explore.module.css
index 3ec03a01..5a9bd928 100644
--- a/ui/webapp/src/layout/explore/Explore.module.css
+++ b/ui/webapp/src/layout/explore/Explore.module.css
@@ -42,7 +42,7 @@
 }
 
 .loadingContent {
-  min-height: calc(100vh - 92px - 36px);
+  min-height: calc(var(--app-height) - 92px - 36px);
 }
 
 .mobileMenuBtn {
diff --git a/ui/webapp/src/layout/explore/card/Content.module.css b/ui/webapp/src/layout/explore/card/Content.module.css
index 34aeabbe..8f4bf6cb 100644
--- a/ui/webapp/src/layout/explore/card/Content.module.css
+++ b/ui/webapp/src/layout/explore/card/Content.module.css
@@ -3,6 +3,10 @@
   min-width: 0;
 }
 
+.section {
+  scroll-margin: 5.5rem;
+}
+
 .categoryTitle {
   max-width: 50%;
 }
@@ -31,7 +35,10 @@
 }
 
 .card :global(.badge:not(.tagBadge)) {
-  font-size: 65%;
+  font-size: 0.6rem;
+  border: 1px solid transparent;
+  line-height: 1;
+  height: 18px;
 }
 
 .card :global(.accepted-date) {
diff --git a/ui/webapp/src/layout/explore/card/Content.tsx b/ui/webapp/src/layout/explore/card/Content.tsx
index 66eed80e..c4e2126e 100644
--- a/ui/webapp/src/layout/explore/card/Content.tsx
+++ b/ui/webapp/src/layout/explore/card/Content.tsx
@@ -128,7 +128,7 @@ const Content = (props: Props) => {
                           const id = getNormalizedName({ title: title, subtitle: subtitle, grouped: true });
 
                           return (
-                            <div id={`card_${id}`} class="mb-3">
+                            <div id={`card_${id}`} class={`mb-3 ${styles.section}`}>
                               <div class={`d-flex flex-row fw-semibold mb-4 ${styles.title}`}>
                                 <div
                                   class={`d-flex flex-row align-items-center p-2 ${styles.categoryTitle}`}
@@ -180,7 +180,7 @@ const Content = (props: Props) => {
                       </For>
                     </Match>
                     <Match when={Array.isArray(content())}>
-                      <div id={`card_${props.classify}--${title}`} class="mb-3">
+                      <div id={`card_${props.classify}--${title}`} class={`mb-3 ${styles.section}`}>
                         <div class={`d-flex flex-row fw-semibold mb-4 ${styles.title}`}>
                           <div class={`d-flex flex-row flex-grow-1 align-items-center p-2 ${styles.subcategoryTitle}`}>
                             <div class="flex-grow-1 text-truncate text-capitalize">
diff --git a/ui/webapp/src/layout/explore/card/Menu.module.css b/ui/webapp/src/layout/explore/card/Menu.module.css
index 13eaaa3d..0f18516c 100644
--- a/ui/webapp/src/layout/explore/card/Menu.module.css
+++ b/ui/webapp/src/layout/explore/card/Menu.module.css
@@ -8,10 +8,12 @@
   min-width: 270px;
   top: 5.5rem;
   bottom: 1rem;
-  max-height: calc(100vh - 6.5rem);
+  max-height: calc(var(--app-height) - 6.5rem);
 }
 
 .content {
+  overflow-y: auto;
+  max-height: 100%;
   overscroll-behavior: contain;
 }
 
diff --git a/ui/webapp/src/layout/explore/card/Menu.tsx b/ui/webapp/src/layout/explore/card/Menu.tsx
index e4f912a7..2737d6bc 100644
--- a/ui/webapp/src/layout/explore/card/Menu.tsx
+++ b/ui/webapp/src/layout/explore/card/Menu.tsx
@@ -79,8 +79,7 @@ const Menu = (props: Props) => {
                             }}
                             disabled={`#${hash}` === location.hash}
                             onClick={() => {
-                              // When menu sticky, we need to check #landscape
-                              goToElement(!props.sticky, `card_${hash}`, 16);
+                              goToElement(`card_${hash}`);
                               if (!isUndefined(props.onClickOption)) {
                                 props.onClickOption();
                               }
diff --git a/ui/webapp/src/layout/explore/card/index.tsx b/ui/webapp/src/layout/explore/card/index.tsx
index 81e73118..73a27941 100644
--- a/ui/webapp/src/layout/explore/card/index.tsx
+++ b/ui/webapp/src/layout/explore/card/index.tsx
@@ -25,8 +25,6 @@ interface Props {
   menu?: CardMenu;
 }
 
-const TITLE_OFFSET = 16;
-
 const CardCategory = (props: Props) => {
   const location = useLocation();
   const [firstLoad, setFirstLoad] = createSignal<boolean>(false);
@@ -81,7 +79,7 @@ const CardCategory = (props: Props) => {
             }
           }
           setTimeout(() => {
-            goToElement(false, `card_${cleanHash}`, TITLE_OFFSET);
+            goToElement(`card_${cleanHash}`);
           }, 100);
         }
       }
diff --git a/ui/webapp/src/layout/explore/grid/Grid.tsx b/ui/webapp/src/layout/explore/grid/Grid.tsx
index 30722c34..86e96af3 100644
--- a/ui/webapp/src/layout/explore/grid/Grid.tsx
+++ b/ui/webapp/src/layout/explore/grid/Grid.tsx
@@ -49,7 +49,7 @@ export const ItemsList = (props: ItemsListProps) => {
   const [items, setItems] = createSignal<(BaseItem | Item)[]>();
   const [itemsPerRow, setItemsPerRow] = createSignal<number>(0);
 
-  createEffect(() => {
+  const updateItemsPerRow = () => {
     setItemsPerRow(
       calculateGridItemsPerRow(
         percentage(),
@@ -58,21 +58,43 @@ export const ItemsList = (props: ItemsListProps) => {
         !isUndefined(props.itemWidth)
       )
     );
-  });
+  };
 
-  createEffect(
-    on(itemsPerRow, () => {
-      setItems((prev) => {
-        const tmpItems: (BaseItem | Item)[] = [];
+  const prepareItems = () => {
+    setItems((prev) => {
+      const tmpItems: (BaseItem | Item)[] = [];
 
-        for (const item of new ItemIterator(initialItems(), itemsPerRow() <= 0 ? MIN_COLUMN_ITEMS : itemsPerRow())) {
-          if (item) {
-            tmpItems.push(item);
-          }
+      for (const item of new ItemIterator(initialItems(), itemsPerRow() <= 0 ? MIN_COLUMN_ITEMS : itemsPerRow())) {
+        if (item) {
+          tmpItems.push(item);
         }
+      }
 
-        return !isEqual(tmpItems, prev) ? tmpItems : prev;
-      });
+      return !isEqual(tmpItems, prev) ? tmpItems : prev;
+    });
+  };
+
+  createEffect(() => {
+    const newItemsPerRow = calculateGridItemsPerRow(
+      percentage(),
+      gridWidth(),
+      props.itemWidth || ZOOM_LEVELS[zoom()][0],
+      !isUndefined(props.itemWidth)
+    );
+    if (newItemsPerRow !== itemsPerRow()) {
+      setItemsPerRow(newItemsPerRow);
+    } else {
+      if (!isUndefined(items()) && initialItems().length !== items()!.length) {
+        prepareItems();
+      }
+    }
+  });
+
+  createEffect(on(initialItems, () => updateItemsPerRow()));
+
+  createEffect(
+    on(itemsPerRow, () => {
+      prepareItems();
     })
   );
 
diff --git a/ui/webapp/src/layout/explore/grid/GridCategory.module.css b/ui/webapp/src/layout/explore/grid/GridCategory.module.css
index d11bafbc..7c2cc2fb 100644
--- a/ui/webapp/src/layout/explore/grid/GridCategory.module.css
+++ b/ui/webapp/src/layout/explore/grid/GridCategory.module.css
@@ -39,5 +39,5 @@
 }
 
 .loading {
-  min-height: calc(100vh - 92px - 36px);
+  min-height: calc(var(--app-height) - 92px - 36px);
 }
diff --git a/ui/webapp/src/layout/explore/grid/GridItem.tsx b/ui/webapp/src/layout/explore/grid/GridItem.tsx
index 26df3856..8a0963c5 100644
--- a/ui/webapp/src/layout/explore/grid/GridItem.tsx
+++ b/ui/webapp/src/layout/explore/grid/GridItem.tsx
@@ -3,6 +3,7 @@ import { createEffect, createSignal, on, onCleanup, Show } from 'solid-js';
 
 import { BaseItem, Item } from '../../../types';
 import getItemDescription from '../../../utils/getItemDescription';
+import isTouchDevice from '../../../utils/isTouchDevice';
 import itemsDataGetter from '../../../utils/itemsDataGetter';
 import Image from '../../common/Image';
 import Loading from '../../common/Loading';
@@ -41,6 +42,9 @@ const GridItem = (props: Props) => {
   const description = () => getItemDescription(props.item);
   const containerWidth = () => (!isUndefined(props.container) ? props.container.clientWidth : window.innerWidth);
   const containerHeight = () => (!isUndefined(props.container) ? props.container.clientHeight : window.innerHeight);
+  const touchDevice = () => isTouchDevice();
+  // Only show dropdown on hover if it's not a touch device and activeDropdown prop is true
+  const activeDropdown = () => (touchDevice() ? false : props.activeDropdown);
 
   createEffect(
     on(fullDataReady, () => {
@@ -113,7 +117,7 @@ const GridItem = (props: Props) => {
 
   return (
     <Show
-      when={props.activeDropdown}
+      when={activeDropdown()}
       fallback={
         <div
           style={props.item.featured && props.item.featured.label ? { border: `2px solid ${props.borderColor}` } : {}}
diff --git a/ui/webapp/src/layout/explore/index.tsx b/ui/webapp/src/layout/explore/index.tsx
index 9cf36592..93433f50 100644
--- a/ui/webapp/src/layout/explore/index.tsx
+++ b/ui/webapp/src/layout/explore/index.tsx
@@ -448,6 +448,8 @@ const Explore = (props: Props) => {
           });
         }
       }
+      // Check if select for groups has to be visible
+      checkContainerWidth();
     })
   );
 
@@ -504,7 +506,7 @@ const Explore = (props: Props) => {
     }, DELAY_ACTIONS);
   };
 
-  const handler = () => {
+  const checkContainerWidth = () => {
     if (!isUndefined(containerRef())) {
       const gap = !isUndefined(point()) && SMALL_DEVICES_BREAKPOINTS.includes(point()!) ? 0 : TITLE_GAP;
       const width = containerRef()!.offsetWidth - gap;
@@ -555,10 +557,10 @@ const Explore = (props: Props) => {
     window.addEventListener(
       'resize',
       // eslint-disable-next-line solid/reactivity
-      throttle(() => handler(), 400),
+      throttle(() => checkContainerWidth(), 400),
       { passive: true }
     );
-    handler();
+    checkContainerWidth();
 
     if (fullDataReady()) {
       fetchItems();
@@ -566,7 +568,7 @@ const Explore = (props: Props) => {
   });
 
   onCleanup(() => {
-    window.removeEventListener('resize', handler);
+    window.removeEventListener('resize', checkContainerWidth);
   });
 
   return (
@@ -579,7 +581,7 @@ const Explore = (props: Props) => {
                 title="Index"
                 class={`position-relative btn btn-sm btn-secondary text-white btn-sm rounded-0 py-0 me-1 me-lg-4 btnIconMobile ${styles.mobileToCBtn}`}
                 onClick={() => setOpenMenuStatus(true)}
-                disabled={numVisibleItems() === 0}
+                disabled={numVisibleItems() === 0 || classify() === ClassifyOption.None}
               >
                 <SVGIcon kind={SVGIconKind.ToC} />
               </button>
diff --git a/ui/webapp/src/layout/explore/mobile/ExploreMobileIndex.module.css b/ui/webapp/src/layout/explore/mobile/ExploreMobileIndex.module.css
index 34433217..2b256ea9 100644
--- a/ui/webapp/src/layout/explore/mobile/ExploreMobileIndex.module.css
+++ b/ui/webapp/src/layout/explore/mobile/ExploreMobileIndex.module.css
@@ -3,6 +3,10 @@
   min-width: 0;
 }
 
+.section {
+  scroll-margin: 4rem;
+}
+
 .catTitle {
   background-color: var(--bs-gray-100);
 }
diff --git a/ui/webapp/src/layout/explore/mobile/ExploreMobileIndex.tsx b/ui/webapp/src/layout/explore/mobile/ExploreMobileIndex.tsx
index dce4287c..08a2ba22 100644
--- a/ui/webapp/src/layout/explore/mobile/ExploreMobileIndex.tsx
+++ b/ui/webapp/src/layout/explore/mobile/ExploreMobileIndex.tsx
@@ -112,7 +112,7 @@ const ExploreMobileIndex = (props: Props) => {
                         const id = getNormalizedName({ title: title, subtitle: subtitle, grouped: true });
 
                         return (
-                          <div id={`card_${id}`} class="mb-3">
+                          <div id={`card_${id}`} class={`mb-3 ${styles.section}`}>
                             <div class={`d-flex flex-row fw-semibold mb-3 ${styles.title}`}>
                               <div
                                 class="d-flex flex-row align-items-center p-2 w-100"
@@ -161,7 +161,7 @@ const ExploreMobileIndex = (props: Props) => {
                             const id = getNormalizedName({ title: title, subtitle: subtitle, grouped: true });
 
                             return (
-                              <div id={`card_${id}`} class="mb-3">
+                              <div id={`card_${id}`} class={`mb-3 ${styles.section}`}>
                                 <div class={`d-flex flex-row fw-semibold mb-3 ${styles.title}`}>
                                   <div
                                     class="d-flex flex-row align-items-center p-2 w-100"
@@ -200,7 +200,10 @@ const ExploreMobileIndex = (props: Props) => {
 
                           return (
                             <>
-                              <div id={`card_${id}`} class={`d-flex flex-row fw-semibold mb-2 ${styles.title}`}>
+                              <div
+                                id={`card_${id}`}
+                                class={`d-flex flex-row fw-semibold mb-2 ${styles.title} ${styles.section}`}
+                              >
                                 <div
                                   class="d-flex flex-row align-items-center p-2 w-100"
                                   style={{ 'background-color': COLORS[0] }}
diff --git a/ui/webapp/src/layout/guide/Guide.module.css b/ui/webapp/src/layout/guide/Guide.module.css
index c3994980..96c3ebf5 100644
--- a/ui/webapp/src/layout/guide/Guide.module.css
+++ b/ui/webapp/src/layout/guide/Guide.module.css
@@ -2,6 +2,10 @@
   color: rgb(56, 64, 74);
 }
 
+.section {
+  scroll-margin: 6rem;
+}
+
 .guide blockquote {
   background-color: var(--bs-gray-100);
   padding: 1rem 1.5rem;
@@ -43,13 +47,19 @@
 }
 
 .loadingContent {
-  min-height: calc(100vh - 36px);
+  min-height: calc(var(--app-height) - 36px);
 }
 
 .mobileToCBtn svg {
   margin-top: -2px;
 }
 
+@media only screen and (max-width: 991.98px) {
+  .section {
+    scroll-margin: 4rem;
+  }
+}
+
 @media only screen and (max-width: 767.98px) {
   .catSection {
     margin-bottom: 1.5rem;
diff --git a/ui/webapp/src/layout/guide/ToC.module.css b/ui/webapp/src/layout/guide/ToC.module.css
index df7c05f8..d755429e 100644
--- a/ui/webapp/src/layout/guide/ToC.module.css
+++ b/ui/webapp/src/layout/guide/ToC.module.css
@@ -2,9 +2,9 @@
   width: 350px;
   max-width: 350px;
   min-width: 350px;
-  top: 4rem;
+  top: 4.5rem;
   bottom: 1rem;
-  max-height: calc(100vh - 4.5rem);
+  max-height: calc(var(--app-height) - 4.5rem);
 }
 
 .wrapper {
diff --git a/ui/webapp/src/layout/guide/index.tsx b/ui/webapp/src/layout/guide/index.tsx
index 2dc763be..ff60baa1 100644
--- a/ui/webapp/src/layout/guide/index.tsx
+++ b/ui/webapp/src/layout/guide/index.tsx
@@ -117,11 +117,7 @@ const GuideIndex = () => {
             }
           } else {
             setTimeout(() => {
-              goToElement(
-                !isUndefined(point()) && SMALL_DEVICES_BREAKPOINTS.includes(point()!),
-                `section_${cleanHash}`,
-                16
-              );
+              goToElement(`section_${cleanHash}`);
               scrollInToC();
             }, 50);
           }
@@ -161,10 +157,10 @@ const GuideIndex = () => {
     } else {
       if (!isUndefined(onLoad) && onLoad) {
         setTimeout(() => {
-          goToElement(onSmallDevice, `section_${title}`, 16);
+          goToElement(`section_${title}`);
         }, 50);
       } else {
-        goToElement(onSmallDevice, `section_${title}`, 16);
+        goToElement(`section_${title}`);
       }
     }
   };
@@ -213,7 +209,11 @@ const GuideIndex = () => {
 
                     return (
                       <>
-                        <div id={`section_${id}`} classList={{ [styles.catSection]: !hasSubcategories }}>
+                        <div
+                          id={`section_${id}`}
+                          class={styles.section}
+                          classList={{ [styles.catSection]: !hasSubcategories }}
+                        >
                           <h1
                             class={`border-bottom mb-3 mb-lg-4 pb-2 ${styles.title}`}
                             classList={{ 'mt-4 mt-lg-5': index() !== 0 }}
@@ -237,6 +237,7 @@ const GuideIndex = () => {
                               return (
                                 <div
                                   id={`section_${id}`}
+                                  class={styles.section}
                                   classList={{ [styles.catSection]: index() === cat.subcategories.length - 1 }}
                                 >
                                   <h2 class={`mt-4 mt-lg-5 mb-3 mb-lg-4 pb-2 border-bottom ${styles.subtitle}`}>
diff --git a/ui/webapp/src/layout/navigation/EmbedModal.module.css b/ui/webapp/src/layout/navigation/EmbedModal.module.css
index 7ddd636e..98dd5e00 100644
--- a/ui/webapp/src/layout/navigation/EmbedModal.module.css
+++ b/ui/webapp/src/layout/navigation/EmbedModal.module.css
@@ -67,6 +67,7 @@
   border: 3px solid rgb(248, 249, 250) !important;
   inline-size: 35px;
   block-size: 20px;
+  border-radius: 0;
 }
 
 .inputColor::-moz-color-swatch,
diff --git a/ui/webapp/src/layout/navigation/MobileHeader.tsx b/ui/webapp/src/layout/navigation/MobileHeader.tsx
index 51fa38f0..6ce34494 100644
--- a/ui/webapp/src/layout/navigation/MobileHeader.tsx
+++ b/ui/webapp/src/layout/navigation/MobileHeader.tsx
@@ -42,7 +42,7 @@ const MobileHeader = (props: Props) => {
   return (
     <>
       <div
-        class={`d-flex flex-row align-items-center justify-content-between border-bottom shadow-sm px-2 w-100 ${styles.stickyNav}`}
+        class={`d-flex d-lg-none flex-row align-items-center justify-content-between border-bottom shadow-sm px-2 w-100 ${styles.stickyNav}`}
         classList={{ 'opacity-0': !sticky(), [styles.isSticky]: sticky() }}
       >
         <div class="d-flex flex-row align-items-center">
diff --git a/ui/webapp/src/layout/stats/Stats.module.css b/ui/webapp/src/layout/stats/Stats.module.css
index 69bedfe2..3443ffd5 100644
--- a/ui/webapp/src/layout/stats/Stats.module.css
+++ b/ui/webapp/src/layout/stats/Stats.module.css
@@ -18,7 +18,7 @@
 }
 
 .loadingContent {
-  min-height: calc(100vh - 36px);
+  min-height: calc(var(--app-height) - 36px);
 }
 
 .projectsCol {
diff --git a/ui/webapp/src/layout/upcomingEvents/UpcomingEvents.module.css b/ui/webapp/src/layout/upcomingEvents/UpcomingEvents.module.css
index 02534aa3..065bda5f 100644
--- a/ui/webapp/src/layout/upcomingEvents/UpcomingEvents.module.css
+++ b/ui/webapp/src/layout/upcomingEvents/UpcomingEvents.module.css
@@ -7,6 +7,7 @@
 
 .loaded {
   transform: translate(-50%, 0%);
+  z-index: 1025;
 }
 
 .imageWrapper {
diff --git a/ui/webapp/src/utils/goToElement.ts b/ui/webapp/src/utils/goToElement.ts
index c223b626..637d6659 100644
--- a/ui/webapp/src/utils/goToElement.ts
+++ b/ui/webapp/src/utils/goToElement.ts
@@ -1,30 +1,9 @@
-import { DEFAULT_STICKY_MOBILE_NAVBAR_HEIGHT, DEFAULT_STICKY_NAVBAR_HEIGHT } from '../data';
+const goToElement = (id: string) => {
+  const target = document.getElementById(id);
 
-const goToElement = (onWindow: boolean, id: string, offset?: number) => {
-  const target = window.document.getElementById(id);
   if (target) {
-    const elementPosition = target.getBoundingClientRect().top;
-    // Sticky navbar for small devices
-    const extraOffset =
-      window.innerWidth < 992
-        ? window.scrollY < 130
-          ? DEFAULT_STICKY_MOBILE_NAVBAR_HEIGHT * 2 + 20
-          : DEFAULT_STICKY_MOBILE_NAVBAR_HEIGHT
-        : DEFAULT_STICKY_NAVBAR_HEIGHT;
-    const offsetPosition = elementPosition - (offset || 0) - extraOffset;
-
     setTimeout(() => {
-      if (onWindow) {
-        window.scrollBy({
-          top: offsetPosition,
-          behavior: 'instant',
-        });
-      } else {
-        document.getElementById('landscape')!.scrollBy({
-          top: offsetPosition,
-          behavior: 'instant',
-        });
-      }
+      target!.scrollIntoView({ block: 'start', behavior: 'instant' });
     });
   }
 };
diff --git a/ui/webapp/src/utils/isTouchDevice.ts b/ui/webapp/src/utils/isTouchDevice.ts
new file mode 100644
index 00000000..8c7250a5
--- /dev/null
+++ b/ui/webapp/src/utils/isTouchDevice.ts
@@ -0,0 +1,5 @@
+const isTouchDevice = (): boolean => {
+  return 'ontouchstart' in window || navigator.maxTouchPoints > 0;
+};
+
+export default isTouchDevice;

From 2e23e0400e3a5b2d8e57c6d62beab32d2f731b5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20Casta=C3=B1o=20Arteaga?= <tegioz@icloud.com>
Date: Fri, 3 May 2024 14:14:00 +0200
Subject: [PATCH 43/55] Add some tests to core crate (#613)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Sergio Castaño Arteaga <tegioz@icloud.com>
---
 .github/workflows/ci.yml              |   2 +-
 .gitignore                            |   1 +
 Cargo.lock                            |  71 +++
 Cargo.toml                            |   2 +
 crates/cli/src/build/export.rs        |  24 +-
 crates/core/Cargo.toml                |   5 +
 crates/core/src/data.rs               | 654 ++++++++++++++++++++++-
 crates/core/src/data/legacy.rs        | 187 ++++++-
 crates/core/src/datasets.rs           | 306 ++++++++++-
 crates/core/src/guide.rs              | 200 ++++++-
 crates/core/src/settings.rs           | 741 +++++++++++++++++++++++++-
 crates/core/src/stats.rs              | 390 +++++++++++++-
 crates/core/src/testdata/data.yml     |  16 +
 crates/core/src/testdata/guide.yml    |   6 +
 crates/core/src/testdata/settings.yml |   2 +
 crates/core/src/util.rs               |  75 +++
 16 files changed, 2631 insertions(+), 51 deletions(-)
 create mode 100644 crates/core/src/testdata/data.yml
 create mode 100644 crates/core/src/testdata/guide.yml
 create mode 100644 crates/core/src/testdata/settings.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ee65278b..22216181 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Setup Rust
         uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: 1.77.0
+          toolchain: 1.78.0
           components: clippy, rustfmt
       - name: Install wasm-pack
         run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
diff --git a/.gitignore b/.gitignore
index f2e4eb07..e9dcf6a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@
 crates/wasm/overlay/data
 crates/wasm/overlay/dist
 crates/wasm/overlay/sources
+lcov.info
 npm-debug.log*
 target
 target-wasm
diff --git a/Cargo.lock b/Cargo.lock
index a0746ccc..5efe0678 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -171,6 +171,16 @@ dependencies = [
  "nom",
 ]
 
+[[package]]
+name = "assert-json-diff"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47e4f2b81832e72834d7518d8487a0396a28cc408186a2e8854c0f98011faf12"
+dependencies = [
+ "serde",
+ "serde_json",
+]
+
 [[package]]
 name = "async-recursion"
 version = "1.0.5"
@@ -837,6 +847,16 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
 
+[[package]]
+name = "colored"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8"
+dependencies = [
+ "lazy_static",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "const-oid"
 version = "0.9.6"
@@ -1059,6 +1079,12 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "diff"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
+
 [[package]]
 name = "digest"
 version = "0.10.7"
@@ -1871,10 +1897,13 @@ dependencies = [
  "itertools 0.12.1",
  "lazy_static",
  "markdown",
+ "mockito",
+ "pretty_assertions",
  "regex",
  "reqwest 0.12.4",
  "serde",
  "serde_yaml",
+ "tokio",
  "tracing",
  "url",
 ]
@@ -2065,6 +2094,25 @@ dependencies = [
  "syn 2.0.57",
 ]
 
+[[package]]
+name = "mockito"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2f6e023aa5bdf392aa06c78e4a4e6d498baab5138d0c993503350ebbc37bf1e"
+dependencies = [
+ "assert-json-diff",
+ "colored",
+ "futures-core",
+ "hyper 0.14.28",
+ "log",
+ "rand",
+ "regex",
+ "serde_json",
+ "serde_urlencoded",
+ "similar",
+ "tokio",
+]
+
 [[package]]
 name = "native-tls"
 version = "0.2.11"
@@ -2446,6 +2494,16 @@ dependencies = [
  "termtree",
 ]
 
+[[package]]
+name = "pretty_assertions"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66"
+dependencies = [
+ "diff",
+ "yansi",
+]
+
 [[package]]
 name = "proc-macro2"
 version = "1.0.79"
@@ -3182,6 +3240,12 @@ dependencies = [
  "rand_core",
 ]
 
+[[package]]
+name = "similar"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa42c91313f1d05da9b26f267f931cf178d4aba455b4c4622dd7355eb80c6640"
+
 [[package]]
 name = "simple_asn1"
 version = "0.6.2"
@@ -3493,6 +3557,7 @@ dependencies = [
  "libc",
  "mio",
  "num_cpus",
+ "parking_lot 0.12.1",
  "pin-project-lite",
  "signal-hook-registry",
  "socket2",
@@ -4276,6 +4341,12 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9"
 
+[[package]]
+name = "yansi"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
+
 [[package]]
 name = "zerocopy"
 version = "0.7.32"
diff --git a/Cargo.toml b/Cargo.toml
index 620eb8e2..a5a30d46 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -39,9 +39,11 @@ markdown = "1.0.0-alpha.17"
 md-5 = "0.10.6"
 mime_guess = "2.0.4"
 mockall = "0.12.1"
+mockito = "1.4.0"
 num_cpus = "1.16.0"
 octorust = "0.7.0"
 parse_link_header = "0.3.3"
+pretty_assertions = "1.4.0"
 qrcode = "0.14.0"
 regex = "1.10.4"
 reqwest = { version = "0.12.4", features = ["json", "native-tls-vendored"] }
diff --git a/crates/cli/src/build/export.rs b/crates/cli/src/build/export.rs
index c60bb91c..fd4be8d7 100644
--- a/crates/cli/src/build/export.rs
+++ b/crates/cli/src/build/export.rs
@@ -97,26 +97,26 @@ impl From<&data::Item> for Item {
 
         // Crunchbase values
         if let Some(organization) = &di.crunchbase_data {
-            item.crunchbase_city = organization.city.clone();
-            item.crunchbase_country = organization.country.clone();
-            item.crunchbase_description = organization.description.clone();
-            item.crunchbase_homepage = organization.homepage_url.clone();
-            item.crunchbase_kind = organization.kind.clone();
-            item.crunchbase_linkedin = organization.linkedin_url.clone();
+            item.crunchbase_city.clone_from(&organization.city);
+            item.crunchbase_country.clone_from(&organization.country);
+            item.crunchbase_description.clone_from(&organization.description);
+            item.crunchbase_homepage.clone_from(&organization.homepage_url);
+            item.crunchbase_kind.clone_from(&organization.kind);
+            item.crunchbase_linkedin.clone_from(&organization.linkedin_url);
             item.crunchbase_max_employees = organization.num_employees_max;
             item.crunchbase_min_employees = organization.num_employees_min;
-            item.crunchbase_region = organization.region.clone();
-            item.crunchbase_ticker = organization.ticker.clone();
-            item.crunchbase_twitter = organization.twitter_url.clone();
+            item.crunchbase_region.clone_from(&organization.region);
+            item.crunchbase_ticker.clone_from(&organization.ticker);
+            item.crunchbase_twitter.clone_from(&organization.twitter_url);
             item.funding = organization.funding;
-            item.organization = organization.name.clone();
+            item.organization.clone_from(&organization.name);
         }
 
         // Twitter
         if di.twitter_url.is_some() {
-            item.twitter = di.twitter_url.clone();
+            item.twitter.clone_from(&di.twitter_url);
         } else if item.crunchbase_twitter.is_some() {
-            item.twitter = item.crunchbase_twitter.clone();
+            item.twitter.clone_from(&item.crunchbase_twitter);
         }
 
         // Relation
diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml
index fd58dbfe..5eea284e 100644
--- a/crates/core/Cargo.toml
+++ b/crates/core/Cargo.toml
@@ -23,3 +23,8 @@ serde = { workspace = true }
 serde_yaml = { workspace = true }
 tracing = { workspace = true }
 url = { workspace = true }
+
+[dev-dependencies]
+mockito = { workspace = true }
+pretty_assertions = { workspace = true }
+tokio = { workspace = true }
diff --git a/crates/core/src/data.rs b/crates/core/src/data.rs
index 406f1776..2f1e57cb 100644
--- a/crates/core/src/data.rs
+++ b/crates/core/src/data.rs
@@ -43,10 +43,10 @@ pub type GithubData = BTreeMap<RepositoryUrl, RepositoryGithubData>;
 pub type RepositoryUrl = String;
 
 /// Type alias to represent a subcategory name.
-pub type SubCategoryName = String;
+pub type SubcategoryName = String;
 
 /// Landscape data source.
-#[derive(Args, Default)]
+#[derive(Args, Default, Debug, Clone, PartialEq)]
 #[group(required = true, multiple = false)]
 pub struct DataSource {
     /// Landscape data file local path.
@@ -207,7 +207,7 @@ impl LandscapeData {
     }
 
     /// Add items member subcategory.
-    #[cfg_attr(feature = "instrument", instrument(skip_all))]
+    #[instrument(skip_all)]
     pub fn add_member_subcategory(&mut self, members_category: &Option<String>) {
         let Some(members_category) = members_category else {
             return;
@@ -232,7 +232,7 @@ impl LandscapeData {
     }
 
     /// Add projects items TAG based on the TAGs settings.
-    #[cfg_attr(feature = "instrument", instrument(skip_all))]
+    #[instrument(skip_all)]
     pub fn add_tags(&mut self, settings: &LandscapeSettings) {
         let Some(tags) = &settings.tags else {
             return;
@@ -299,7 +299,7 @@ impl From<legacy::LandscapeData> for LandscapeData {
 
             // Subcategories
             for legacy_subcategory in legacy_category.subcategories {
-                category.subcategories.push(SubCategory {
+                category.subcategories.push(Subcategory {
                     name: legacy_subcategory.name.clone(),
                     normalized_name: normalize_name(&legacy_subcategory.name),
                 });
@@ -360,8 +360,8 @@ impl From<legacy::LandscapeData> for LandscapeData {
                         repositories.push(Repository {
                             url,
                             branch: legacy_item.branch,
+                            github_data: None,
                             primary: Some(true),
-                            ..Default::default()
                         });
                     }
                     if let Some(additional_repos) = legacy_item.additional_repos {
@@ -369,8 +369,8 @@ impl From<legacy::LandscapeData> for LandscapeData {
                             repositories.push(Repository {
                                 url: entry.repo_url,
                                 branch: entry.branch,
+                                github_data: None,
                                 primary: Some(false),
-                                ..Default::default()
                             });
                         }
                     }
@@ -389,6 +389,7 @@ impl From<legacy::LandscapeData> for LandscapeData {
                         item.clomonitor_name = extra.clomonitor_name;
                         item.devstats_url = extra.dev_stats_url;
                         item.discord_url = extra.discord_url;
+                        item.docker_url = extra.docker_url;
                         item.github_discussions_url = extra.github_discussions_url;
                         item.gitter_url = extra.gitter_url;
                         item.graduated_at = extra.graduated;
@@ -413,9 +414,10 @@ impl From<legacy::LandscapeData> for LandscapeData {
                             integration: extra.summary_integration,
                             integrations: extra.summary_integrations,
                             intro_url: extra.summary_intro_url,
+                            personas: None,
                             release_rate: extra.summary_release_rate,
+                            tags: None,
                             use_case: extra.summary_use_case,
-                            ..Default::default()
                         };
                         if let Some(personas) = extra.summary_personas {
                             let v: Vec<String> = personas.split(',').map(|p| p.trim().to_string()).collect();
@@ -450,7 +452,7 @@ impl From<legacy::LandscapeData> for LandscapeData {
 pub struct Category {
     pub name: CategoryName,
     pub normalized_name: CategoryName,
-    pub subcategories: Vec<SubCategory>,
+    pub subcategories: Vec<Subcategory>,
 }
 
 impl From<&settings::Category> for Category {
@@ -461,7 +463,7 @@ impl From<&settings::Category> for Category {
             subcategories: settings_category
                 .subcategories
                 .iter()
-                .map(|sc| SubCategory {
+                .map(|sc| Subcategory {
                     name: sc.clone(),
                     normalized_name: normalize_name(sc),
                 })
@@ -472,9 +474,9 @@ impl From<&settings::Category> for Category {
 
 /// Landscape subcategory.
 #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
-pub struct SubCategory {
-    pub name: SubCategoryName,
-    pub normalized_name: SubCategoryName,
+pub struct Subcategory {
+    pub name: SubcategoryName,
+    pub normalized_name: SubcategoryName,
 }
 
 /// Landscape item (project, product, member, etc).
@@ -678,7 +680,7 @@ pub struct Acquisition {
 #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
 pub struct AdditionalCategory {
     pub category: CategoryName,
-    pub subcategory: SubCategoryName,
+    pub subcategory: SubcategoryName,
 }
 
 /// Commit information.
@@ -863,3 +865,627 @@ pub struct RepositoryGithubData {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub license: Option<String>,
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::settings::{FeaturedItemRule, FeaturedItemRuleOption, TagRule};
+
+    #[test]
+    fn datasource_new_from_url() {
+        let url = "https://example.url/data.yml";
+        let src = DataSource::new_from_url(url.to_string());
+        assert_eq!(
+            src,
+            DataSource {
+                data_file: None,
+                data_url: Some(url.to_string()),
+            }
+        );
+    }
+
+    #[tokio::test]
+    async fn landscape_data_new_using_file() {
+        let src = DataSource {
+            data_file: Some(PathBuf::from("src/testdata/data.yml")),
+            data_url: None,
+        };
+        let _ = LandscapeData::new(&src).await.unwrap();
+    }
+
+    #[tokio::test]
+    async fn landscape_data_new_using_url() {
+        let mut server = mockito::Server::new_async().await;
+        let mock = server
+            .mock("GET", "/data.yml")
+            .with_status(200)
+            .with_body_from_file("src/testdata/data.yml")
+            .create_async()
+            .await;
+
+        let src = DataSource::new_from_url(format!("{}/data.yml", server.url()));
+        let _ = LandscapeData::new(&src).await.unwrap();
+        mock.assert_async().await;
+    }
+
+    #[tokio::test]
+    #[should_panic(expected = "data file or url not provided")]
+    async fn landscape_data_new_no_file_or_url_provided() {
+        let src = DataSource::default();
+        let _ = LandscapeData::new(&src).await.unwrap();
+    }
+
+    #[test]
+    fn landscape_data_new_from_file() {
+        let file = Path::new("src/testdata/data.yml");
+        let _ = LandscapeData::new_from_file(file).unwrap();
+    }
+
+    #[tokio::test]
+    async fn landscape_data_new_from_url() {
+        let mut server = mockito::Server::new_async().await;
+        let mock = server
+            .mock("GET", "/data.yml")
+            .with_status(200)
+            .with_body_from_file("src/testdata/data.yml")
+            .create_async()
+            .await;
+
+        let url = format!("{}/data.yml", server.url());
+        let _ = LandscapeData::new_from_url(&url).await.unwrap();
+        mock.assert_async().await;
+    }
+
+    #[tokio::test]
+    #[should_panic(expected = "unexpected status code getting landscape data file: 404")]
+    async fn landscape_data_new_from_url_not_found() {
+        let mut server = mockito::Server::new_async().await;
+        let mock = server.mock("GET", "/data.yml").with_status(404).create_async().await;
+
+        let url = format!("{}/data.yml", server.url());
+        let _ = LandscapeData::new_from_url(&url).await.unwrap();
+        mock.assert_async().await;
+    }
+
+    #[test]
+    fn landscape_data_new_from_raw_data() {
+        let raw_data = fs::read_to_string("src/testdata/data.yml").unwrap();
+        let _ = LandscapeData::new_from_raw_data(&raw_data).unwrap();
+    }
+
+    #[test]
+    fn landscape_data_add_crunchbase_data() {
+        let mut landscape_data = LandscapeData::default();
+        let crunchbase_url = "https://crunchbase.url/test".to_string();
+        landscape_data.items.push(Item {
+            crunchbase_url: Some(crunchbase_url.clone()),
+            ..Default::default()
+        });
+
+        let mut crunchbase_data = CrunchbaseData::default();
+        let org = Organization {
+            name: Some("test".to_string()),
+            ..Default::default()
+        };
+        crunchbase_data.insert(crunchbase_url, org.clone());
+
+        landscape_data.add_crunchbase_data(&crunchbase_data);
+        assert_eq!(landscape_data.items[0].crunchbase_data, Some(org));
+    }
+
+    #[test]
+    fn landscape_data_add_featured_items_data_maturity() {
+        let mut landscape_data = LandscapeData::default();
+        landscape_data.items.push(Item {
+            maturity: Some("graduated".to_string()),
+            ..Default::default()
+        });
+
+        let settings = LandscapeSettings {
+            featured_items: Some(vec![FeaturedItemRule {
+                field: "maturity".to_string(),
+                options: vec![FeaturedItemRuleOption {
+                    value: "graduated".to_string(),
+                    label: Some("Graduated".to_string()),
+                    order: Some(1),
+                }],
+            }]),
+            ..Default::default()
+        };
+
+        landscape_data.add_featured_items_data(&settings);
+        assert_eq!(
+            landscape_data.items[0].featured,
+            Some(ItemFeatured {
+                label: Some("Graduated".to_string()),
+                order: Some(1)
+            })
+        );
+    }
+
+    #[test]
+    fn landscape_data_add_featured_items_data_subcategory() {
+        let mut landscape_data = LandscapeData::default();
+        landscape_data.items.push(Item {
+            subcategory: "Subcategory".to_string(),
+            ..Default::default()
+        });
+
+        let settings = LandscapeSettings {
+            featured_items: Some(vec![FeaturedItemRule {
+                field: "subcategory".to_string(),
+                options: vec![FeaturedItemRuleOption {
+                    value: "Subcategory".to_string(),
+                    label: Some("VIP category".to_string()),
+                    order: Some(1),
+                }],
+            }]),
+            ..Default::default()
+        };
+
+        landscape_data.add_featured_items_data(&settings);
+        assert_eq!(
+            landscape_data.items[0].featured,
+            Some(ItemFeatured {
+                label: Some("VIP category".to_string()),
+                order: Some(1)
+            })
+        );
+    }
+
+    #[test]
+    fn landscape_data_add_github_data() {
+        let mut landscape_data = LandscapeData::default();
+        let repository_url = "https://repo.url/test".to_string();
+        let repository = Repository {
+            url: repository_url.clone(),
+            primary: Some(true),
+            ..Default::default()
+        };
+        landscape_data.items.push(Item {
+            repositories: Some(vec![repository.clone()]),
+            ..Default::default()
+        });
+
+        let mut github_data = GithubData::default();
+        let repository_github_data = RepositoryGithubData {
+            description: "test".to_string(),
+            license: Some("Apache-2.0".to_string()),
+            ..Default::default()
+        };
+        github_data.insert(repository_url.clone(), repository_github_data.clone());
+
+        landscape_data.add_github_data(&github_data);
+        assert_eq!(
+            landscape_data.items[0].repositories,
+            Some(vec![Repository {
+                github_data: Some(repository_github_data),
+                ..repository
+            }])
+        );
+        assert_eq!(landscape_data.items[0].oss, Some(true));
+    }
+
+    #[test]
+    fn landscape_data_add_member_subcategory() {
+        let mut landscape_data = LandscapeData::default();
+        landscape_data.items.push(Item {
+            category: "Members".to_string(),
+            subcategory: "Member subcategory".to_string(),
+            crunchbase_url: Some("https://crunchbase.url/test".to_string()),
+            ..Default::default()
+        });
+        landscape_data.items.push(Item {
+            category: "Other category".to_string(),
+            crunchbase_url: Some("https://crunchbase.url/test".to_string()),
+            ..Default::default()
+        });
+
+        landscape_data.add_member_subcategory(&Some("Members".to_string()));
+        assert_eq!(
+            landscape_data.items[1].member_subcategory,
+            Some("Member subcategory".to_string())
+        );
+    }
+
+    #[test]
+    fn landscape_data_add_tags_category_match() {
+        let mut landscape_data = LandscapeData::default();
+        landscape_data.items.push(Item {
+            category: "Category".to_string(),
+            maturity: Some("graduated".to_string()),
+            ..Default::default()
+        });
+
+        let mut tags = BTreeMap::new();
+        tags.insert(
+            "tag1".to_string(),
+            vec![TagRule {
+                category: "Category".to_string(),
+                subcategories: Some(vec![]),
+            }],
+        );
+        let settings = LandscapeSettings {
+            tags: Some(tags),
+            ..Default::default()
+        };
+
+        landscape_data.add_tags(&settings);
+        assert_eq!(landscape_data.items[0].tag, Some("tag1".to_string()));
+    }
+
+    #[test]
+    fn landscape_data_add_tags_subcategory_match() {
+        let mut landscape_data = LandscapeData::default();
+        landscape_data.items.push(Item {
+            category: "Category".to_string(),
+            subcategory: "Subcategory".to_string(),
+            maturity: Some("graduated".to_string()),
+            ..Default::default()
+        });
+
+        let mut tags = BTreeMap::new();
+        tags.insert(
+            "tag1".to_string(),
+            vec![TagRule {
+                category: "Category".to_string(),
+                subcategories: Some(vec!["Subcategory".to_string()]),
+            }],
+        );
+        let settings = LandscapeSettings {
+            tags: Some(tags),
+            ..Default::default()
+        };
+
+        landscape_data.add_tags(&settings);
+        assert_eq!(landscape_data.items[0].tag, Some("tag1".to_string()));
+    }
+
+    #[test]
+    fn landscape_data_add_tags_no_project() {
+        let mut landscape_data = LandscapeData::default();
+        landscape_data.items.push(Item {
+            category: "Category".to_string(),
+            ..Default::default()
+        });
+
+        let mut tags = BTreeMap::new();
+        tags.insert(
+            "tag1".to_string(),
+            vec![TagRule {
+                category: "Category".to_string(),
+                ..Default::default()
+            }],
+        );
+        let settings = LandscapeSettings {
+            tags: Some(tags),
+            ..Default::default()
+        };
+
+        landscape_data.add_tags(&settings);
+        assert_eq!(landscape_data.items[0].tag, None);
+    }
+
+    #[test]
+    fn landscape_data_add_tags_item_tag_already_set() {
+        let mut landscape_data = LandscapeData::default();
+        landscape_data.items.push(Item {
+            category: "Category".to_string(),
+            maturity: Some("graduated".to_string()),
+            tag: Some("tag2".to_string()),
+            ..Default::default()
+        });
+
+        let mut tags = BTreeMap::new();
+        tags.insert(
+            "tag1".to_string(),
+            vec![TagRule {
+                category: "Category".to_string(),
+                ..Default::default()
+            }],
+        );
+        let settings = LandscapeSettings {
+            tags: Some(tags),
+            ..Default::default()
+        };
+
+        landscape_data.add_tags(&settings);
+        assert_eq!(landscape_data.items[0].tag, Some("tag2".to_string()));
+    }
+
+    #[test]
+    #[allow(clippy::too_many_lines)]
+    fn landscape_data_from_legacy_data() {
+        let date = NaiveDate::from_ymd_opt(2024, 5, 1).unwrap();
+        let legacy_data = legacy::LandscapeData {
+            landscape: vec![legacy::Category {
+                name: "Category".to_string(),
+                subcategories: vec![legacy::SubCategory {
+                    name: "Subcategory".to_string(),
+                    items: vec![legacy::Item {
+                        name: "Item".to_string(),
+                        homepage_url: "homepage_url".to_string(),
+                        logo: "logo".to_string(),
+                        additional_repos: Some(vec![legacy::Repository {
+                            repo_url: "additional_repo_url".to_string(),
+                            branch: Some("branch".to_string()),
+                        }]),
+                        branch: Some("branch".to_string()),
+                        crunchbase: Some("crunchbase_url".to_string()),
+                        description: Some("description".to_string()),
+                        enduser: Some(false),
+                        extra: Some(legacy::ItemExtra {
+                            accepted: Some(date),
+                            archived: Some(date),
+                            audits: Some(vec![ItemAudit {
+                                date,
+                                kind: "kind".to_string(),
+                                url: "url".to_string(),
+                                vendor: "vendor".to_string(),
+                            }]),
+                            annual_review_date: Some(date),
+                            annual_review_url: Some("annual_review_url".to_string()),
+                            artwork_url: Some("artwork_url".to_string()),
+                            blog_url: Some("blog_url".to_string()),
+                            chat_channel: Some("chat_channel".to_string()),
+                            clomonitor_name: Some("clomonitor_name".to_string()),
+                            dev_stats_url: Some("dev_stats_url".to_string()),
+                            discord_url: Some("discord_url".to_string()),
+                            docker_url: Some("docker_url".to_string()),
+                            github_discussions_url: Some("github_discussions_url".to_string()),
+                            gitter_url: Some("gitter_url".to_string()),
+                            graduated: Some(date),
+                            incubating: Some(date),
+                            linkedin_url: Some("linkedin_url".to_string()),
+                            mailing_list_url: Some("mailing_list_url".to_string()),
+                            package_manager_url: Some("package_manager_url".to_string()),
+                            parent_project: Some("parent_project".to_string()),
+                            slack_url: Some("slack_url".to_string()),
+                            specification: Some(false),
+                            stack_overflow_url: Some("stack_overflow_url".to_string()),
+                            summary_business_use_case: Some("summary_business_use_case".to_string()),
+                            summary_integration: Some("summary_integration".to_string()),
+                            summary_integrations: Some("summary_integrations".to_string()),
+                            summary_intro_url: Some("summary_intro_url".to_string()),
+                            summary_use_case: Some("summary_use_case".to_string()),
+                            summary_personas: Some("summary_personas".to_string()),
+                            summary_release_rate: Some("summary_release_rate".to_string()),
+                            summary_tags: Some("tag1,tag2".to_string()),
+                            tag: Some("tag".to_string()),
+                            training_certifications: Some("training_certifications".to_string()),
+                            training_type: Some("training_type".to_string()),
+                            youtube_url: Some("youtube_url".to_string()),
+                        }),
+                        joined: Some(date),
+                        project: Some("graduated".to_string()),
+                        repo_url: Some("repo_url".to_string()),
+                        second_path: Some(vec!["category2/subcategory2.1".to_string()]),
+                        twitter: Some("twitter_url".to_string()),
+                        url_for_bestpractices: Some("url_for_bestpractices".to_string()),
+                        unnamed_organization: Some(false),
+                    }],
+                }],
+            }],
+        };
+
+        let expected_landscape_data = LandscapeData {
+            categories: vec![Category {
+                name: "Category".to_string(),
+                normalized_name: "category".to_string(),
+                subcategories: vec![Subcategory {
+                    name: "Subcategory".to_string(),
+                    normalized_name: "subcategory".to_string(),
+                }],
+            }],
+            items: vec![Item {
+                category: "Category".to_string(),
+                homepage_url: "homepage_url".to_string(),
+                id: "category--subcategory--item".to_string(),
+                logo: "logo".to_string(),
+                name: "Item".to_string(),
+                subcategory: "Subcategory".to_string(),
+                accepted_at: Some(date),
+                additional_categories: Some(vec![AdditionalCategory {
+                    category: "category2".to_string(),
+                    subcategory: "subcategory2.1".to_string(),
+                }]),
+                archived_at: Some(date),
+                artwork_url: Some("artwork_url".to_string()),
+                audits: Some(vec![ItemAudit {
+                    date,
+                    kind: "kind".to_string(),
+                    url: "url".to_string(),
+                    vendor: "vendor".to_string(),
+                }]),
+                blog_url: Some("blog_url".to_string()),
+                chat_channel: Some("chat_channel".to_string()),
+                clomonitor_name: Some("clomonitor_name".to_string()),
+                clomonitor_report_summary: None,
+                crunchbase_data: None,
+                crunchbase_url: Some("crunchbase_url".to_string()),
+                description: Some("description".to_string()),
+                devstats_url: Some("dev_stats_url".to_string()),
+                discord_url: Some("discord_url".to_string()),
+                docker_url: Some("docker_url".to_string()),
+                enduser: Some(false),
+                featured: None,
+                github_discussions_url: Some("github_discussions_url".to_string()),
+                gitter_url: Some("gitter_url".to_string()),
+                graduated_at: Some(date),
+                incubating_at: Some(date),
+                joined_at: Some(date),
+                linkedin_url: Some("linkedin_url".to_string()),
+                mailing_list_url: Some("mailing_list_url".to_string()),
+                maturity: Some("graduated".to_string()),
+                member_subcategory: None,
+                latest_annual_review_at: Some(date),
+                latest_annual_review_url: Some("annual_review_url".to_string()),
+                openssf_best_practices_url: Some("url_for_bestpractices".to_string()),
+                oss: None,
+                package_manager_url: Some("package_manager_url".to_string()),
+                parent_project: Some("parent_project".to_string()),
+                repositories: Some(vec![
+                    Repository {
+                        url: "repo_url".to_string(),
+                        branch: Some("branch".to_string()),
+                        github_data: None,
+                        primary: Some(true),
+                    },
+                    Repository {
+                        url: "additional_repo_url".to_string(),
+                        branch: Some("branch".to_string()),
+                        github_data: None,
+                        primary: Some(false),
+                    },
+                ]),
+                slack_url: Some("slack_url".to_string()),
+                specification: Some(false),
+                stack_overflow_url: Some("stack_overflow_url".to_string()),
+                summary: Some(ItemSummary {
+                    business_use_case: Some("summary_business_use_case".to_string()),
+                    integration: Some("summary_integration".to_string()),
+                    integrations: Some("summary_integrations".to_string()),
+                    intro_url: Some("summary_intro_url".to_string()),
+                    personas: Some("summary_personas".split(',').map(|p| p.trim().to_string()).collect()),
+                    release_rate: Some("summary_release_rate".to_string()),
+                    tags: Some(vec!["tag1".to_string(), "tag2".to_string()]),
+                    use_case: Some("summary_use_case".to_string()),
+                }),
+                tag: Some("tag".to_string()),
+                training_certifications: Some("training_certifications".to_string()),
+                training_type: Some("training_type".to_string()),
+                twitter_url: Some("twitter_url".to_string()),
+                unnamed_organization: Some(false),
+                youtube_url: Some("youtube_url".to_string()),
+            }],
+        };
+
+        let landscape_data = LandscapeData::from(legacy_data);
+        pretty_assertions::assert_eq!(landscape_data, expected_landscape_data);
+    }
+
+    #[test]
+    fn category_from_settings_category() {
+        let settings_category = settings::Category {
+            name: "Category".to_string(),
+            subcategories: vec!["Subcategory".to_string()],
+        };
+
+        let category = Category::from(&settings_category);
+        assert_eq!(
+            category,
+            Category {
+                name: "Category".to_string(),
+                normalized_name: "category".to_string(),
+                subcategories: vec![Subcategory {
+                    name: "Subcategory".to_string(),
+                    normalized_name: "subcategory".to_string(),
+                }],
+            }
+        );
+    }
+
+    #[test]
+    fn item_description() {
+        let item = Item {
+            description: Some("item description".to_string()),
+            repositories: Some(vec![Repository {
+                github_data: Some(RepositoryGithubData {
+                    description: "repository description".to_string(),
+                    ..Default::default()
+                }),
+                primary: Some(true),
+                ..Default::default()
+            }]),
+            crunchbase_data: Some(Organization {
+                description: Some("crunchbase description".to_string()),
+                ..Default::default()
+            }),
+            ..Default::default()
+        };
+
+        assert_eq!(item.description(), Some(&"item description".to_string()));
+    }
+
+    #[test]
+    fn item_description_from_repository() {
+        let item = Item {
+            repositories: Some(vec![Repository {
+                github_data: Some(RepositoryGithubData {
+                    description: "repository description".to_string(),
+                    ..Default::default()
+                }),
+                primary: Some(true),
+                ..Default::default()
+            }]),
+            crunchbase_data: Some(Organization {
+                description: Some("crunchbase description".to_string()),
+                ..Default::default()
+            }),
+            ..Default::default()
+        };
+
+        assert_eq!(item.description(), Some(&"repository description".to_string()));
+    }
+
+    #[test]
+    fn item_description_from_crunchbase() {
+        let item = Item {
+            crunchbase_data: Some(Organization {
+                description: Some("crunchbase description".to_string()),
+                ..Default::default()
+            }),
+            ..Default::default()
+        };
+
+        assert_eq!(item.description(), Some(&"crunchbase description".to_string()));
+    }
+
+    #[test]
+    fn item_primary_repository_found() {
+        let item = Item {
+            repositories: Some(vec![
+                Repository {
+                    url: "repo1".to_string(),
+                    primary: Some(false),
+                    ..Default::default()
+                },
+                Repository {
+                    url: "repo2".to_string(),
+                    primary: Some(true),
+                    ..Default::default()
+                },
+            ]),
+            ..Default::default()
+        };
+
+        assert_eq!(item.primary_repository().unwrap().url, "repo2".to_string());
+    }
+
+    #[test]
+    fn item_primary_repository_not_found() {
+        let item = Item {
+            repositories: Some(vec![Repository {
+                url: "repo1".to_string(),
+                primary: Some(false),
+                ..Default::default()
+            }]),
+            ..Default::default()
+        };
+
+        assert!(item.primary_repository().is_none());
+    }
+
+    #[test]
+    fn item_set_id() {
+        let mut item = Item {
+            category: "Category".to_string(),
+            subcategory: "Subcategory".to_string(),
+            name: "Item".to_string(),
+            ..Default::default()
+        };
+
+        item.set_id();
+        assert_eq!(item.id, "category--subcategory--item".to_string());
+    }
+}
diff --git a/crates/core/src/data/legacy.rs b/crates/core/src/data/legacy.rs
index fe0a7b21..290fe8bc 100644
--- a/crates/core/src/data/legacy.rs
+++ b/crates/core/src/data/legacy.rs
@@ -55,7 +55,7 @@ impl LandscapeData {
 
                     // Check name
                     if item.name.is_empty() {
-                        return Err(format_err!("name is required")).context(ctx);
+                        return Err(format_err!("item name is required")).context(ctx);
                     }
                     if items_seen.contains(&item.name) {
                         return Err(format_err!("duplicate item name")).context(ctx);
@@ -64,7 +64,7 @@ impl LandscapeData {
 
                     // Check homepage
                     if item.homepage_url.is_empty() {
-                        return Err(format_err!("hompage_url is required")).context(ctx);
+                        return Err(format_err!("homepage url is required")).context(ctx);
                     }
 
                     // Check logo
@@ -231,3 +231,186 @@ fn validate_urls(item: &Item) -> Result<()> {
 
     Ok(())
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn landscape_data_validate_succeeds() {
+        let mut landscape = LandscapeData::default();
+        landscape.landscape.push(Category {
+            name: "Category".to_string(),
+            subcategories: vec![SubCategory {
+                name: "Subcategory".to_string(),
+                items: vec![Item {
+                    name: "Item".to_string(),
+                    homepage_url: "https://example.com".to_string(),
+                    logo: "logo".to_string(),
+                    additional_repos: Some(vec![Repository {
+                        repo_url: "https://repo.url".to_string(),
+                        ..Default::default()
+                    }]),
+                    extra: Some(ItemExtra {
+                        audits: Some(vec![ItemAudit {
+                            url: "https://audit.url".to_string(),
+                            ..Default::default()
+                        }]),
+                        blog_url: Some("https://blog.url".to_string()),
+                        ..Default::default()
+                    }),
+                    ..Default::default()
+                }],
+            }],
+        });
+
+        landscape.validate().unwrap();
+    }
+
+    #[test]
+    #[should_panic(expected = "category [0] name is required")]
+    fn landscape_data_validate_empty_category_name() {
+        let mut landscape = LandscapeData::default();
+        landscape.landscape.push(Category {
+            name: String::new(),
+            subcategories: vec![],
+        });
+
+        landscape.validate().unwrap();
+    }
+
+    #[test]
+    #[should_panic(expected = "subcategory [0] name is required")]
+    fn landscape_data_validate_empty_subcategory_name() {
+        let mut landscape = LandscapeData::default();
+        landscape.landscape.push(Category {
+            name: "Category".to_string(),
+            subcategories: vec![SubCategory {
+                name: String::new(),
+                items: vec![],
+            }],
+        });
+
+        landscape.validate().unwrap();
+    }
+
+    #[test]
+    #[should_panic(expected = "item name is required")]
+    fn landscape_data_validate_empty_item_name() {
+        let mut landscape = LandscapeData::default();
+        landscape.landscape.push(Category {
+            name: "Category".to_string(),
+            subcategories: vec![SubCategory {
+                name: "Subcategory".to_string(),
+                items: vec![Item {
+                    name: String::new(),
+                    ..Default::default()
+                }],
+            }],
+        });
+
+        landscape.validate().unwrap();
+    }
+
+    #[test]
+    #[should_panic(expected = "duplicate item name")]
+    fn landscape_data_validate_duplicate_item_name() {
+        let mut landscape = LandscapeData::default();
+        let item = Item {
+            name: "Item".to_string(),
+            homepage_url: "https://example.com".to_string(),
+            logo: "logo".to_string(),
+            ..Default::default()
+        };
+        landscape.landscape.push(Category {
+            name: "Category".to_string(),
+            subcategories: vec![SubCategory {
+                name: "Subcategory".to_string(),
+                items: vec![item.clone(), item],
+            }],
+        });
+
+        landscape.validate().unwrap();
+    }
+
+    #[test]
+    #[should_panic(expected = "homepage url is required")]
+    fn landscape_data_validate_empty_homepage_url() {
+        let mut landscape = LandscapeData::default();
+        landscape.landscape.push(Category {
+            name: "Category".to_string(),
+            subcategories: vec![SubCategory {
+                name: "Subcategory".to_string(),
+                items: vec![Item {
+                    name: "Item".to_string(),
+                    ..Default::default()
+                }],
+            }],
+        });
+
+        landscape.validate().unwrap();
+    }
+
+    #[test]
+    #[should_panic(expected = "logo is required")]
+    fn landscape_data_validate_empty_logo() {
+        let mut landscape = LandscapeData::default();
+        landscape.landscape.push(Category {
+            name: "Category".to_string(),
+            subcategories: vec![SubCategory {
+                name: "Subcategory".to_string(),
+                items: vec![Item {
+                    name: "Item".to_string(),
+                    homepage_url: "https://example.com".to_string(),
+                    ..Default::default()
+                }],
+            }],
+        });
+
+        landscape.validate().unwrap();
+    }
+
+    #[test]
+    #[should_panic(expected = "invalid tag")]
+    fn landscape_data_validate_invalid_tag() {
+        let mut landscape = LandscapeData::default();
+        landscape.landscape.push(Category {
+            name: "Category".to_string(),
+            subcategories: vec![SubCategory {
+                name: "Subcategory".to_string(),
+                items: vec![Item {
+                    name: "Item".to_string(),
+                    homepage_url: "https://example.com".to_string(),
+                    logo: "logo".to_string(),
+                    extra: Some(ItemExtra {
+                        tag: Some("Invalid Tag".to_string()),
+                        ..Default::default()
+                    }),
+                    ..Default::default()
+                }],
+            }],
+        });
+
+        landscape.validate().unwrap();
+    }
+
+    #[test]
+    #[should_panic(expected = "invalid homepage url")]
+    fn landscape_data_validate_invalid_url() {
+        let mut landscape = LandscapeData::default();
+        landscape.landscape.push(Category {
+            name: "Category".to_string(),
+            subcategories: vec![SubCategory {
+                name: "Subcategory".to_string(),
+                items: vec![Item {
+                    name: "Item".to_string(),
+                    homepage_url: "homepage_url".to_string(),
+                    logo: "logo".to_string(),
+                    ..Default::default()
+                }],
+            }],
+        });
+
+        landscape.validate().unwrap();
+    }
+}
diff --git a/crates/core/src/datasets.rs b/crates/core/src/datasets.rs
index 20131ba7..b30816cc 100644
--- a/crates/core/src/datasets.rs
+++ b/crates/core/src/datasets.rs
@@ -14,8 +14,19 @@ use crate::{
     stats::Stats,
 };
 
-/// Datasets collection.
+/// Input used to create a new Datasets instance.
 #[derive(Debug, Clone)]
+pub struct NewDatasetsInput<'a> {
+    pub crunchbase_data: &'a CrunchbaseData,
+    pub github_data: &'a GithubData,
+    pub guide: &'a Option<LandscapeGuide>,
+    pub landscape_data: &'a LandscapeData,
+    pub qr_code: &'a String,
+    pub settings: &'a LandscapeSettings,
+}
+
+/// Datasets collection.
+#[derive(Debug, Clone, Default, PartialEq)]
 pub struct Datasets {
     /// #[base]
     pub base: Base,
@@ -43,17 +54,6 @@ impl Datasets {
     }
 }
 
-/// Input used to create a new Datasets instance.
-#[derive(Debug, Clone)]
-pub struct NewDatasetsInput<'a> {
-    pub crunchbase_data: &'a CrunchbaseData,
-    pub github_data: &'a GithubData,
-    pub guide: &'a Option<LandscapeGuide>,
-    pub landscape_data: &'a LandscapeData,
-    pub qr_code: &'a String,
-    pub settings: &'a LandscapeSettings,
-}
-
 /// Base dataset.
 ///
 /// This dataset contains the minimal data the web application needs to render
@@ -359,3 +359,285 @@ pub mod full {
         }
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::{
+        data::{self, *},
+        datasets::base,
+        guide::{self, LandscapeGuide},
+        settings::{self, *},
+    };
+    use chrono::{NaiveDate, Utc};
+    use tests::embed::EmbedView;
+
+    #[test]
+    fn datasets_new() {
+        let input = NewDatasetsInput {
+            crunchbase_data: &CrunchbaseData::default(),
+            github_data: &GithubData::default(),
+            guide: &None,
+            landscape_data: &LandscapeData::default(),
+            qr_code: &String::default(),
+            settings: &LandscapeSettings::default(),
+        };
+
+        let datasets = Datasets::new(&input);
+        assert_eq!(datasets, Datasets::default());
+    }
+
+    #[test]
+    #[allow(clippy::too_many_lines)]
+    fn base_new() {
+        // Landscape data
+        let item = data::Item {
+            category: "Category 1".to_string(),
+            crunchbase_data: Some(Organization {
+                generated_at: Utc::now(),
+                acquisitions: Some(vec![]),
+                funding_rounds: Some(vec![FundingRound {
+                    amount: Some(1000),
+                    ..Default::default()
+                }]),
+                ..Default::default()
+            }),
+            homepage_url: "https://homepage.url".to_string(),
+            id: "id".to_string(),
+            logo: "logo.svg".to_string(),
+            name: "Item".to_string(),
+            subcategory: "Subcategory 1".to_string(),
+            ..Default::default()
+        };
+        let landscape_data = LandscapeData {
+            categories: vec![data::Category {
+                name: "Category 1".to_string(),
+                normalized_name: "category-1".to_string(),
+                subcategories: vec![
+                    Subcategory {
+                        name: "Subcategory 1".to_string(),
+                        normalized_name: "subcategory-1".to_string(),
+                    },
+                    Subcategory {
+                        name: "Subcategory 2".to_string(),
+                        normalized_name: "subcategory-2".to_string(),
+                    },
+                ],
+            }],
+            items: vec![item.clone()],
+        };
+
+        // Settings
+        let colors = Some(Colors {
+            color1: "rgb(100, 100, 100)".to_string(),
+            ..Default::default()
+        });
+        let footer = Some(Footer {
+            text: Some("Footer text".to_string()),
+            ..Default::default()
+        });
+        let groups = vec![Group {
+            name: "Group 1".to_string(),
+            normalized_name: Some("group-1".to_string()),
+            categories: vec!["Category 1".to_string()],
+        }];
+        let header = Some(Header {
+            logo: Some("https://logo.url".to_string()),
+            ..Default::default()
+        });
+        let images = Some(Images {
+            favicon: Some("https://favicon.url".to_string()),
+            ..Default::default()
+        });
+        let upcoming_event = UpcomingEvent {
+            name: "Event".to_string(),
+            start: NaiveDate::from_ymd_opt(2024, 5, 2).unwrap(),
+            end: NaiveDate::from_ymd_opt(2024, 5, 3).unwrap(),
+            banner_url: "https://banner.url".to_string(),
+            details_url: "https://details.url".to_string(),
+        };
+        let settings = LandscapeSettings {
+            foundation: "Foundation".to_string(),
+            base_path: Some("/base/path".to_string()),
+            categories: Some(vec![settings::Category {
+                name: "Category 1".to_string(),
+                subcategories: vec!["Subcategory 1".to_string()],
+            }]),
+            colors: colors.clone(),
+            footer: footer.clone(),
+            grid_items_size: Some(GridItemsSize::Small),
+            groups: Some(groups.clone()),
+            header: header.clone(),
+            images: images.clone(),
+            members_category: Some("Members".to_string()),
+            upcoming_event: Some(upcoming_event.clone()),
+            view_mode: Some(ViewMode::Grid),
+            ..Default::default()
+        };
+
+        // Guide
+        let guide = LandscapeGuide {
+            categories: Some(vec![guide::Category {
+                category: "Category 1".to_string(),
+                subcategories: Some(vec![guide::Subcategory {
+                    subcategory: "Subcategory 1".to_string(),
+                    ..Default::default()
+                }]),
+                ..Default::default()
+            }]),
+        };
+
+        // QR code
+        let qr_code = "QR_CODE".to_string();
+
+        let base = Base::new(&landscape_data, &settings, &Some(guide), &qr_code);
+        let expected_base = Base {
+            finances_available: true,
+            foundation: "Foundation".to_string(),
+            qr_code: "QR_CODE".to_string(),
+            base_path: Some("/base/path".to_string()),
+            categories: vec![data::Category {
+                name: "Category 1".to_string(),
+                normalized_name: "category-1".to_string(),
+                subcategories: vec![Subcategory {
+                    name: "Subcategory 1".to_string(),
+                    normalized_name: "subcategory-1".to_string(),
+                }],
+            }],
+            categories_overridden: vec!["Category 1".to_string()],
+            colors,
+            footer,
+            grid_items_size: Some(GridItemsSize::Small),
+            groups,
+            guide_summary: vec![("Category 1".to_string(), vec!["Subcategory 1".to_string()])]
+                .into_iter()
+                .collect(),
+            header,
+            images,
+            items: vec![(&item).into()],
+            members_category: Some("Members".to_string()),
+            upcoming_event: Some(upcoming_event),
+            view_mode: Some(ViewMode::Grid),
+        };
+        pretty_assertions::assert_eq!(base, expected_base);
+    }
+
+    #[test]
+    fn base_item_from_data_item() {
+        let data_item = data::Item {
+            additional_categories: Some(vec![AdditionalCategory {
+                category: "Category 2".to_string(),
+                subcategory: "Subcategory 3".to_string(),
+            }]),
+            category: "Category 1".to_string(),
+            featured: Some(ItemFeatured {
+                label: Some("label".to_string()),
+                order: Some(1),
+            }),
+            id: "id".to_string(),
+            logo: "logo.svg".to_string(),
+            maturity: Some("graduated".to_string()),
+            name: "Item".to_string(),
+            oss: Some(true),
+            subcategory: "Subcategory 1".to_string(),
+            tag: Some("tag1".to_string()),
+            ..Default::default()
+        };
+
+        let item = base::Item::from(&data_item);
+        let expected_item = base::Item {
+            additional_categories: Some(vec![AdditionalCategory {
+                category: "Category 2".to_string(),
+                subcategory: "Subcategory 3".to_string(),
+            }]),
+            category: "Category 1".to_string(),
+            featured: Some(ItemFeatured {
+                label: Some("label".to_string()),
+                order: Some(1),
+            }),
+            id: "id".to_string(),
+            logo: "logo.svg".to_string(),
+            maturity: Some("graduated".to_string()),
+            name: "Item".to_string(),
+            oss: Some(true),
+            subcategory: "Subcategory 1".to_string(),
+            tag: Some("tag1".to_string()),
+        };
+        pretty_assertions::assert_eq!(item, expected_item);
+    }
+
+    #[test]
+    fn embed_new() {
+        let item = data::Item {
+            category: "Category 1".to_string(),
+            homepage_url: "https://homepage.url".to_string(),
+            id: "id".to_string(),
+            logo: "logo.svg".to_string(),
+            name: "Item".to_string(),
+            subcategory: "Subcategory 1".to_string(),
+            ..Default::default()
+        };
+        let landscape_data = LandscapeData {
+            categories: vec![data::Category {
+                name: "Category 1".to_string(),
+                normalized_name: "category-1".to_string(),
+                subcategories: vec![Subcategory {
+                    name: "Subcategory 1".to_string(),
+                    normalized_name: "subcategory-1".to_string(),
+                }],
+            }],
+            items: vec![item.clone()],
+        };
+
+        let embed = Embed::new(&landscape_data);
+        let expected_embed_view = EmbedView {
+            category: data::Category {
+                name: "Category 1".to_string(),
+                normalized_name: "category-1".to_string(),
+                subcategories: vec![Subcategory {
+                    name: "Subcategory 1".to_string(),
+                    normalized_name: "subcategory-1".to_string(),
+                }],
+            },
+            items: vec![(&item).into()],
+        };
+        let expected_embed = embed::Embed {
+            views: vec![
+                ("category-1".to_string(), expected_embed_view.clone()),
+                ("category-1--subcategory-1".to_string(), expected_embed_view),
+            ]
+            .into_iter()
+            .collect(),
+        };
+        pretty_assertions::assert_eq!(embed, expected_embed);
+    }
+
+    #[test]
+    fn full_new() {
+        let item = data::Item {
+            category: "Category 1".to_string(),
+            homepage_url: "https://homepage.url".to_string(),
+            id: "id".to_string(),
+            logo: "logo.svg".to_string(),
+            name: "Item".to_string(),
+            subcategory: "Subcategory 1".to_string(),
+            ..Default::default()
+        };
+        let landscape_data = LandscapeData {
+            categories: vec![],
+            items: vec![item.clone()],
+        };
+        let mut crunchbase_data = CrunchbaseData::default();
+        crunchbase_data.insert("https:://crunchbase.url".to_string(), Organization::default());
+        let mut github_data = GithubData::default();
+        github_data.insert("https:://github.url".to_string(), RepositoryGithubData::default());
+
+        let full = Full::new(&landscape_data, &crunchbase_data, &github_data);
+        let expected_full = Full {
+            crunchbase_data,
+            github_data,
+            items: vec![item],
+        };
+        pretty_assertions::assert_eq!(full, expected_full);
+    }
+}
diff --git a/crates/core/src/guide.rs b/crates/core/src/guide.rs
index dacdb13a..1ff7e5a6 100644
--- a/crates/core/src/guide.rs
+++ b/crates/core/src/guide.rs
@@ -12,7 +12,7 @@ use std::{
 use tracing::{debug, instrument};
 
 /// Landscape guide source.
-#[derive(Args, Default)]
+#[derive(Args, Default, Debug, Clone, PartialEq)]
 #[group(required = false, multiple = false)]
 pub struct GuideSource {
     /// Landscape guide file local path.
@@ -208,3 +208,201 @@ pub struct Subcategory {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub keywords: Option<Vec<String>>,
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn guidesource_new_from_url() {
+        let url = "https://example.url/guide.yml";
+        let src = GuideSource::new_from_url(url.to_string());
+        assert_eq!(
+            src,
+            GuideSource {
+                guide_file: None,
+                guide_url: Some(url.to_string()),
+            }
+        );
+    }
+
+    #[tokio::test]
+    async fn guide_new_using_file() {
+        let src = GuideSource {
+            guide_file: Some(PathBuf::from("src/testdata/guide.yml")),
+            guide_url: None,
+        };
+        let _ = LandscapeGuide::new(&src).await.unwrap();
+    }
+
+    #[tokio::test]
+    async fn guide_new_using_url() {
+        let mut server = mockito::Server::new_async().await;
+        let mock = server
+            .mock("GET", "/guide.yml")
+            .with_status(200)
+            .with_body_from_file("src/testdata/guide.yml")
+            .create_async()
+            .await;
+
+        let src = GuideSource::new_from_url(format!("{}/guide.yml", server.url()));
+        let _ = LandscapeGuide::new(&src).await.unwrap();
+        mock.assert_async().await;
+    }
+
+    #[tokio::test]
+    async fn guide_new_no_file_or_url_provided() {
+        let src = GuideSource::default();
+        assert!(LandscapeGuide::new(&src).await.unwrap().is_none());
+    }
+
+    #[test]
+    fn guide_new_from_file() {
+        let file = Path::new("src/testdata/guide.yml");
+        let _ = LandscapeGuide::new_from_file(file).unwrap();
+    }
+
+    #[tokio::test]
+    async fn guide_new_from_url() {
+        let mut server = mockito::Server::new_async().await;
+        let mock = server
+            .mock("GET", "/guide.yml")
+            .with_status(200)
+            .with_body_from_file("src/testdata/guide.yml")
+            .create_async()
+            .await;
+
+        let url = format!("{}/guide.yml", server.url());
+        let _ = LandscapeGuide::new_from_url(&url).await.unwrap();
+        mock.assert_async().await;
+    }
+
+    #[tokio::test]
+    #[should_panic(expected = "unexpected status code getting landscape guide file: 404")]
+    async fn guide_new_from_url_not_found() {
+        let mut server = mockito::Server::new_async().await;
+        let mock = server.mock("GET", "/guide.yml").with_status(404).create_async().await;
+
+        let url = format!("{}/guide.yml", server.url());
+        let _ = LandscapeGuide::new_from_url(&url).await.unwrap();
+        mock.assert_async().await;
+    }
+
+    #[test]
+    fn guide_new_from_yaml() {
+        let raw_data = fs::read_to_string("src/testdata/guide.yml").unwrap();
+        let _ = LandscapeGuide::new_from_yaml(&raw_data).unwrap();
+    }
+
+    #[test]
+    fn guide_validate_success() {
+        let guide = LandscapeGuide {
+            categories: Some(vec![Category {
+                category: "category".to_string(),
+                content: Some("content".to_string()),
+                keywords: Some(vec!["keyword".to_string()]),
+                subcategories: Some(vec![Subcategory {
+                    subcategory: "subcategory".to_string(),
+                    content: "content".to_string(),
+                    keywords: Some(vec!["keyword".to_string()]),
+                }]),
+            }]),
+        };
+
+        guide.validate().unwrap();
+    }
+
+    #[test]
+    #[should_panic(expected = "category cannot be empty")]
+    fn guide_validate_empty_category() {
+        let guide = LandscapeGuide {
+            categories: Some(vec![Category {
+                category: String::new(),
+                ..Default::default()
+            }]),
+        };
+
+        guide.validate().unwrap();
+    }
+
+    #[test]
+    #[should_panic(expected = "content cannot be empty")]
+    fn guide_validate_empty_category_content() {
+        let guide = LandscapeGuide {
+            categories: Some(vec![Category {
+                category: "category".to_string(),
+                content: Some(String::new()),
+                ..Default::default()
+            }]),
+        };
+
+        guide.validate().unwrap();
+    }
+
+    #[test]
+    #[should_panic(expected = "keywords cannot be empty")]
+    fn guide_validate_empty_category_keywords() {
+        let guide = LandscapeGuide {
+            categories: Some(vec![Category {
+                category: "category".to_string(),
+                keywords: Some(vec![String::new()]),
+                ..Default::default()
+            }]),
+        };
+
+        guide.validate().unwrap();
+    }
+
+    #[test]
+    #[should_panic(expected = "subcategory cannot be empty")]
+    fn guide_validate_empty_subcategory() {
+        let guide = LandscapeGuide {
+            categories: Some(vec![Category {
+                category: "category".to_string(),
+                subcategories: Some(vec![Subcategory {
+                    subcategory: String::new(),
+                    ..Default::default()
+                }]),
+                ..Default::default()
+            }]),
+        };
+
+        guide.validate().unwrap();
+    }
+
+    #[test]
+    #[should_panic(expected = "content cannot be empty")]
+    fn guide_validate_empty_subcategory_content() {
+        let guide = LandscapeGuide {
+            categories: Some(vec![Category {
+                category: "category".to_string(),
+                subcategories: Some(vec![Subcategory {
+                    subcategory: "subcategory".to_string(),
+                    content: String::new(),
+                    ..Default::default()
+                }]),
+                ..Default::default()
+            }]),
+        };
+
+        guide.validate().unwrap();
+    }
+
+    #[test]
+    #[should_panic(expected = "keywords cannot be empty")]
+    fn guide_validate_empty_subcategory_keywords() {
+        let guide = LandscapeGuide {
+            categories: Some(vec![Category {
+                category: "category".to_string(),
+                subcategories: Some(vec![Subcategory {
+                    subcategory: "subcategory".to_string(),
+                    content: "content".to_string(),
+                    keywords: Some(vec![String::new()]),
+                }]),
+                ..Default::default()
+            }]),
+        };
+
+        guide.validate().unwrap();
+    }
+}
diff --git a/crates/core/src/settings.rs b/crates/core/src/settings.rs
index 9f2d1d4d..9b82cecd 100644
--- a/crates/core/src/settings.rs
+++ b/crates/core/src/settings.rs
@@ -7,7 +7,7 @@
 //! NOTE: the landscape settings file uses a new format that is not backwards
 //! compatible with the legacy settings file used by existing landscapes.
 
-use super::data::{CategoryName, SubCategoryName};
+use super::data::{CategoryName, SubcategoryName};
 use crate::util::{normalize_name, validate_url};
 use anyhow::{bail, format_err, Context, Result};
 use chrono::NaiveDate;
@@ -24,7 +24,7 @@ use std::{
 use tracing::{debug, instrument};
 
 /// Landscape settings location.
-#[derive(Args, Default)]
+#[derive(Args, Default, Debug, Clone, PartialEq)]
 #[group(required = true, multiple = false)]
 pub struct SettingsSource {
     /// Landscape settings file local path.
@@ -493,7 +493,7 @@ pub struct Analytics {
 #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
 pub struct Category {
     pub name: CategoryName,
-    pub subcategories: Vec<SubCategoryName>,
+    pub subcategories: Vec<SubcategoryName>,
 }
 
 lazy_static! {
@@ -669,7 +669,7 @@ pub struct TagRule {
     pub category: CategoryName,
 
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub subcategories: Option<Vec<SubCategoryName>>,
+    pub subcategories: Option<Vec<SubcategoryName>>,
 }
 
 /// Upcoming event details.
@@ -689,3 +689,736 @@ pub enum ViewMode {
     Grid,
     Card,
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::settings::SettingsSource;
+
+    #[test]
+    fn settings_source_new_from_url() {
+        let url = "https://example.url/settings.yml";
+        let src = SettingsSource::new_from_url(url.to_string());
+        assert_eq!(
+            src,
+            SettingsSource {
+                settings_file: None,
+                settings_url: Some(url.to_string()),
+            }
+        );
+    }
+
+    #[tokio::test]
+    async fn settings_new_using_file() {
+        let src = SettingsSource {
+            settings_file: Some(PathBuf::from("src/testdata/settings.yml")),
+            settings_url: None,
+        };
+        let _ = LandscapeSettings::new(&src).await.unwrap();
+    }
+
+    #[tokio::test]
+    async fn settings_new_using_url() {
+        let mut server = mockito::Server::new_async().await;
+        let mock = server
+            .mock("GET", "/settings.yml")
+            .with_status(200)
+            .with_body_from_file("src/testdata/settings.yml")
+            .create_async()
+            .await;
+
+        let src = SettingsSource::new_from_url(format!("{}/settings.yml", server.url()));
+        let _ = LandscapeSettings::new(&src).await.unwrap();
+        mock.assert_async().await;
+    }
+
+    #[tokio::test]
+    #[should_panic(expected = "settings file or url not provided")]
+    async fn settings_new_no_file_or_url_provided() {
+        let src = SettingsSource::default();
+        let _ = LandscapeSettings::new(&src).await.unwrap();
+    }
+
+    #[test]
+    fn settings_new_from_file() {
+        let file = Path::new("src/testdata/settings.yml");
+        let _ = LandscapeSettings::new_from_file(file).unwrap();
+    }
+
+    #[tokio::test]
+    async fn settings_new_from_url() {
+        let mut server = mockito::Server::new_async().await;
+        let mock = server
+            .mock("GET", "/settings.yml")
+            .with_status(200)
+            .with_body_from_file("src/testdata/settings.yml")
+            .create_async()
+            .await;
+
+        let url = format!("{}/settings.yml", server.url());
+        let _ = LandscapeSettings::new_from_url(&url).await.unwrap();
+        mock.assert_async().await;
+    }
+
+    #[tokio::test]
+    #[should_panic(expected = "unexpected status code getting landscape settings file: 404")]
+    async fn landscape_data_new_from_url_not_found() {
+        let mut server = mockito::Server::new_async().await;
+        let mock = server.mock("GET", "/settings.yml").with_status(404).create_async().await;
+
+        let url = format!("{}/settings.yml", server.url());
+        let _ = LandscapeSettings::new_from_url(&url).await.unwrap();
+        mock.assert_async().await;
+    }
+
+    #[test]
+    fn settings_new_from_raw_data() {
+        let raw_data = fs::read_to_string("src/testdata/settings.yml").unwrap();
+        let _ = LandscapeSettings::new_from_raw_data(&raw_data).unwrap();
+    }
+
+    #[test]
+    fn settings_footer_text_to_html_works() {
+        let mut settings = LandscapeSettings {
+            footer: Some(Footer {
+                text: Some("# Footer text".to_string()),
+                ..Default::default()
+            }),
+            ..Default::default()
+        };
+
+        settings.footer_text_to_html().unwrap();
+        assert_eq!(settings.footer.unwrap().text.unwrap(), "<h1>Footer text</h1>");
+    }
+
+    #[test]
+    fn settings_remove_base_path_trailing_slash_works() {
+        let mut settings = LandscapeSettings {
+            base_path: Some("/base_path/".to_string()),
+            ..Default::default()
+        };
+
+        settings.remove_base_path_trailing_slash();
+        assert_eq!(settings.base_path.unwrap(), "/base_path");
+    }
+
+    #[test]
+    fn settings_set_groups_normalized_name_works() {
+        let mut settings = LandscapeSettings {
+            groups: Some(vec![Group {
+                name: "Group 1".to_string(),
+                ..Default::default()
+            }]),
+            ..Default::default()
+        };
+
+        settings.set_groups_normalized_name();
+        assert_eq!(
+            settings.groups.unwrap().first().unwrap().normalized_name.as_ref().unwrap(),
+            "group-1"
+        );
+    }
+
+    #[test]
+    fn settings_validate_succeeds() {
+        let settings = LandscapeSettings {
+            foundation: "Foundation".to_string(),
+            url: "https://example.url".to_string(),
+            ..Default::default()
+        };
+
+        settings.validate().unwrap();
+    }
+
+    #[test]
+    #[should_panic(expected = "foundation cannot be empty")]
+    fn settings_validate_empty_foundation() {
+        let settings = LandscapeSettings {
+            foundation: String::new(),
+            ..Default::default()
+        };
+
+        settings.validate().unwrap();
+    }
+
+    #[test]
+    #[should_panic(expected = "invalid landscape url")]
+    fn settings_validate_invalid_url() {
+        let settings = LandscapeSettings {
+            foundation: "Foundation".to_string(),
+            url: "invalid-url".to_string(),
+            ..Default::default()
+        };
+
+        settings.validate().unwrap();
+    }
+
+    #[test]
+    fn settings_validate_base_path_succeeds() {
+        let settings = LandscapeSettings {
+            foundation: "Foundation".to_string(),
+            url: "https://example.url".to_string(),
+            base_path: Some("/base_path".to_string()),
+            ..Default::default()
+        };
+
+        settings.validate().unwrap();
+    }
+
+    #[test]
+    #[should_panic(expected = "base_path cannot be empty")]
+    fn settings_validate_base_path_empty() {
+        let settings = LandscapeSettings {
+            foundation: "Foundation".to_string(),
+            url: "https://example.url".to_string(),
+            base_path: Some(String::new()),
+            ..Default::default()
+        };
+
+        settings.validate().unwrap();
+    }
+
+    #[test]
+    #[should_panic(expected = "base_path must start with a slash")]
+    fn settings_validate_base_path_no_slash() {
+        let settings = LandscapeSettings {
+            foundation: "Foundation".to_string(),
+            url: "https://example.url".to_string(),
+            base_path: Some("base_path".to_string()),
+            ..Default::default()
+        };
+
+        settings.validate().unwrap();
+    }
+
+    #[test]
+    fn settings_validate_categories_succeeds() {
+        let settings = LandscapeSettings {
+            foundation: "Foundation".to_string(),
+            url: "https://example.url".to_string(),
+            categories: Some(vec![Category {
+                name: "Category".to_string(),
+                subcategories: vec!["Subcategory".to_string()],
+            }]),
+            ..Default::default()
+        };
+
+        settings.validate().unwrap();
+    }
+
+    #[test]
+    #[should_panic(expected = "category [0] name cannot be empty")]
+    fn settings_validate_categories_empty_name() {
+        let settings = LandscapeSettings {
+            foundation: "Foundation".to_string(),
+            url: "https://example.url".to_string(),
+            categories: Some(vec![Category {
+                name: String::new(),
+                subcategories: vec![],
+            }]),
+            ..Default::default()
+        };
+
+        settings.validate().unwrap();
+    }
+
+    #[test]
+    #[should_panic(expected = "category [Category]: subcategory [0] cannot be empty")]
+    fn settings_validate_categories_empty_subcategory() {
+        let settings = LandscapeSettings {
+            foundation: "Foundation".to_string(),
+            url: "https://example.url".to_string(),
+            categories: Some(vec![Category {
+                name: "Category".to_string(),
+                subcategories: vec![String::new()],
+            }]),
+            ..Default::default()
+        };
+
+        settings.validate().unwrap();
+    }
+
+    #[test]
+    fn settings_validate_colors_succeeds() {
+        let settings = LandscapeSettings {
+            foundation: "Foundation".to_string(),
+            url: "https://example.url".to_string(),
+            colors: Some(Colors {
+                color1: "rgba(0, 107, 204, 1)".to_string(),
+                color2: "rgba(0, 107, 204, 1)".to_string(),
+                color3: "rgba(0, 107, 204, 1)".to_string(),
+                color4: "rgba(0, 107, 204, 1)".to_string(),
+                color5: "rgba(0, 107, 204, 1)".to_string(),
+                color6: "rgba(0, 107, 204, 1)".to_string(),
+            }),
+            ..Default::default()
+        };
+
+        settings.validate().unwrap();
+    }
+
+    #[test]
+    #[should_panic(expected = "color1 is not valid (expected format: \"rgba(0, 107, 204, 1)\")")]
+    fn settings_validate_colors_invalid_format() {
+        let settings = LandscapeSettings {
+            foundation: "Foundation".to_string(),
+            url: "https://example.url".to_string(),
+            colors: Some(Colors {
+                color1: "invalid-color".to_string(),
+                color2: "rgba(0, 107, 204, 1)".to_string(),
+                color3: "rgba(0, 107, 204, 1)".to_string(),
+                color4: "rgba(0, 107, 204, 1)".to_string(),
+                color5: "rgba(0, 107, 204, 1)".to_string(),
+                color6: "rgba(0, 107, 204, 1)".to_string(),
+            }),
+            ..Default::default()
+        };
+
+        settings.validate().unwrap();
+    }
+
+    #[test]
+    fn settings_validate_featured_items_succeeds() {
+        let settings = LandscapeSettings {
+            foundation: "Foundation".to_string(),
+            url: "https://example.url".to_string(),
+            featured_items: Some(vec![FeaturedItemRule {
+                field: "Field".to_string(),
+                options: vec![FeaturedItemRuleOption {
+                    value: "Value".to_string(),
+                    label: Some("Label".to_string()),
+                    order: Some(1),
+                }],
+            }]),
+            ..Default::default()
+        };
+
+        settings.validate().unwrap();
+    }
+
+    #[test]
+    #[should_panic(expected = "field cannot be empty")]
+    fn settings_validate_featured_items_empty_field() {
+        let settings = LandscapeSettings {
+            foundation: "Foundation".to_string(),
+            url: "https://example.url".to_string(),
+            featured_items: Some(vec![FeaturedItemRule {
+                field: String::new(),
+                options: vec![],
+            }]),
+            ..Default::default()
+        };
+
+        settings.validate().unwrap();
+    }
+
+    #[test]
+    #[should_panic(expected = "options cannot be empty")]
+    fn settings_validate_featured_items_empty_options() {
+        let settings = LandscapeSettings {
+            foundation: "Foundation".to_string(),
+            url: "https://example.url".to_string(),
+            featured_items: Some(vec![FeaturedItemRule {
+                field: "Field".to_string(),
+                options: vec![],
+            }]),
+            ..Default::default()
+        };
+
+        settings.validate().unwrap();
+    }
+
+    #[test]
+    #[should_panic(expected = "option value cannot be empty")]
+    fn settings_validate_featured_items_empty_option_value() {
+        let settings = LandscapeSettings {
+            foundation: "Foundation".to_string(),
+            url: "https://example.url".to_string(),
+            featured_items: Some(vec![FeaturedItemRule {
+                field: "Field".to_string(),
+                options: vec![FeaturedItemRuleOption {
+                    value: String::new(),
+                    ..Default::default()
+                }],
+            }]),
+            ..Default::default()
+        };
+
+        settings.validate().unwrap();
+    }
+
+    #[test]
+    #[should_panic(expected = "option label cannot be empty")]
+    fn settings_validate_featured_items_empty_option_label() {
+        let settings = LandscapeSettings {
+            foundation: "Foundation".to_string(),
+            url: "https://example.url".to_string(),
+            featured_items: Some(vec![FeaturedItemRule {
+                field: "Field".to_string(),
+                options: vec![FeaturedItemRuleOption {
+                    value: "Value".to_string(),
+                    label: Some(String::new()),
+                    ..Default::default()
+                }],
+            }]),
+            ..Default::default()
+        };
+
+        settings.validate().unwrap();
+    }
+
+    #[test]
+    fn settings_validate_footer_succeeds() {
+        let settings = LandscapeSettings {
+            foundation: "Foundation".to_string(),
+            url: "https://example.url".to_string(),
+            footer: Some(Footer {
+                links: Some(FooterLinks {
+                    github: Some("https://github.com".to_string()),
+                    ..Default::default()
+                }),
+                logo: Some("https://logo.url".to_string()),
+                text: Some("Footer text".to_string()),
+            }),
+            ..Default::default()
+        };
+
+        settings.validate().unwrap();
+    }
+
+    #[test]
+    #[should_panic(expected = "invalid github url")]
+    fn settings_validate_footer_invalid_github_url() {
+        let settings = LandscapeSettings {
+            foundation: "Foundation".to_string(),
+            url: "https://example.url".to_string(),
+            footer: Some(Footer {
+                links: Some(FooterLinks {
+                    github: Some("invalid-url".to_string()),
+                    ..Default::default()
+                }),
+                ..Default::default()
+            }),
+            ..Default::default()
+        };
+
+        settings.validate().unwrap();
+    }
+
+    #[test]
+    #[should_panic(expected = "invalid footer logo url")]
+    fn settings_validate_footer_invalid_logo_url() {
+        let settings = LandscapeSettings {
+            foundation: "Foundation".to_string(),
+            url: "https://example.url".to_string(),
+            footer: Some(Footer {
+                logo: Some("invalid-url".to_string()),
+                ..Default::default()
+            }),
+            ..Default::default()
+        };
+
+        settings.validate().unwrap();
+    }
+
+    #[test]
+    #[should_panic(expected = "footer text cannot be empty")]
+    fn settings_validate_footer_empty_text() {
+        let settings = LandscapeSettings {
+            foundation: "Foundation".to_string(),
+            url: "https://example.url".to_string(),
+            footer: Some(Footer {
+                text: Some(String::new()),
+                ..Default::default()
+            }),
+            ..Default::default()
+        };
+
+        settings.validate().unwrap();
+    }
+
+    #[test]
+    fn settings_validate_groups_succeeds() {
+        let settings = LandscapeSettings {
+            foundation: "Foundation".to_string(),
+            url: "https://example.url".to_string(),
+            groups: Some(vec![Group {
+                name: "Group 1".to_string(),
+                categories: vec!["Category".to_string()],
+                ..Default::default()
+            }]),
+            ..Default::default()
+        };
+
+        settings.validate().unwrap();
+    }
+
+    #[test]
+    #[should_panic(expected = "group [0] name cannot be empty")]
+    fn settings_validate_groups_empty_name() {
+        let settings = LandscapeSettings {
+            foundation: "Foundation".to_string(),
+            url: "https://example.url".to_string(),
+            groups: Some(vec![Group {
+                name: String::new(),
+                categories: vec![],
+                ..Default::default()
+            }]),
+            ..Default::default()
+        };
+
+        settings.validate().unwrap();
+    }
+
+    #[test]
+    #[should_panic(expected = "group [Group 1]: category [0] cannot be empty")]
+    fn settings_validate_groups_empty_category() {
+        let settings = LandscapeSettings {
+            foundation: "Foundation".to_string(),
+            url: "https://example.url".to_string(),
+            groups: Some(vec![Group {
+                name: "Group 1".to_string(),
+                categories: vec![String::new()],
+                ..Default::default()
+            }]),
+            ..Default::default()
+        };
+
+        settings.validate().unwrap();
+    }
+
+    #[test]
+    fn settings_validate_header_succeeds() {
+        let settings = LandscapeSettings {
+            foundation: "Foundation".to_string(),
+            url: "https://example.url".to_string(),
+            header: Some(Header {
+                links: Some(HeaderLinks {
+                    github: Some("https://github.com".to_string()),
+                }),
+                logo: Some("https://logo.url".to_string()),
+            }),
+            ..Default::default()
+        };
+
+        settings.validate().unwrap();
+    }
+
+    #[test]
+    #[should_panic(expected = "invalid github url")]
+    fn settings_validate_header_invalid_github_url() {
+        let settings = LandscapeSettings {
+            foundation: "Foundation".to_string(),
+            url: "https://example.url".to_string(),
+            header: Some(Header {
+                links: Some(HeaderLinks {
+                    github: Some("invalid-url".to_string()),
+                }),
+                ..Default::default()
+            }),
+            ..Default::default()
+        };
+
+        settings.validate().unwrap();
+    }
+
+    #[test]
+    #[should_panic(expected = "invalid header logo url")]
+    fn settings_validate_header_invalid_logo_url() {
+        let settings = LandscapeSettings {
+            foundation: "Foundation".to_string(),
+            url: "https://example.url".to_string(),
+            header: Some(Header {
+                logo: Some("invalid-url".to_string()),
+                ..Default::default()
+            }),
+            ..Default::default()
+        };
+
+        settings.validate().unwrap();
+    }
+
+    #[test]
+    fn settings_validate_images_succeeds() {
+        let settings = LandscapeSettings {
+            foundation: "Foundation".to_string(),
+            url: "https://example.url".to_string(),
+            images: Some(Images {
+                favicon: Some("https://favicon.url".to_string()),
+                open_graph: Some("https://open-graph.url".to_string()),
+            }),
+            ..Default::default()
+        };
+
+        settings.validate().unwrap();
+    }
+
+    #[test]
+    #[should_panic(expected = "invalid favicon url")]
+    fn settings_validate_images_invalid_favicon_url() {
+        let settings = LandscapeSettings {
+            foundation: "Foundation".to_string(),
+            url: "https://example.url".to_string(),
+            images: Some(Images {
+                favicon: Some("invalid-url".to_string()),
+                ..Default::default()
+            }),
+            ..Default::default()
+        };
+
+        settings.validate().unwrap();
+    }
+
+    #[test]
+    fn settings_validate_members_category_succeeds() {
+        let settings = LandscapeSettings {
+            foundation: "Foundation".to_string(),
+            url: "https://example.url".to_string(),
+            members_category: Some("Members".to_string()),
+            ..Default::default()
+        };
+
+        settings.validate().unwrap();
+    }
+
+    #[test]
+    #[should_panic(expected = "members category cannot be empty")]
+    fn settings_validate_members_category_empty() {
+        let settings = LandscapeSettings {
+            foundation: "Foundation".to_string(),
+            url: "https://example.url".to_string(),
+            members_category: Some(String::new()),
+            ..Default::default()
+        };
+
+        settings.validate().unwrap();
+    }
+
+    #[test]
+    fn settings_validate_osano_succeeds() {
+        let settings = LandscapeSettings {
+            foundation: "Foundation".to_string(),
+            url: "https://example.url".to_string(),
+            osano: Some(Osano {
+                customer_id: "customer_id".to_string(),
+                customer_configuration_id: "customer_configuration_id".to_string(),
+            }),
+            ..Default::default()
+        };
+
+        settings.validate().unwrap();
+    }
+
+    #[test]
+    #[should_panic(expected = "osano customer id cannot be empty")]
+    fn settings_validate_osano_empty_customer_id() {
+        let settings = LandscapeSettings {
+            foundation: "Foundation".to_string(),
+            url: "https://example.url".to_string(),
+            osano: Some(Osano {
+                customer_id: String::new(),
+                ..Default::default()
+            }),
+            ..Default::default()
+        };
+
+        settings.validate().unwrap();
+    }
+
+    #[test]
+    #[should_panic(expected = "osano customer configuration id cannot be empty")]
+    fn settings_validate_osano_empty_customer_configuration_id() {
+        let settings = LandscapeSettings {
+            foundation: "Foundation".to_string(),
+            url: "https://example.url".to_string(),
+            osano: Some(Osano {
+                customer_id: "customer_id".to_string(),
+                customer_configuration_id: String::new(),
+            }),
+            ..Default::default()
+        };
+
+        settings.validate().unwrap();
+    }
+
+    #[test]
+    fn settings_validate_screenshot_width_succeeds() {
+        let settings = LandscapeSettings {
+            foundation: "Foundation".to_string(),
+            url: "https://example.url".to_string(),
+            screenshot_width: Some(2000),
+            ..Default::default()
+        };
+
+        settings.validate().unwrap();
+    }
+
+    #[test]
+    #[should_panic(expected = "screenshot width must be greater than 1000")]
+    fn settings_validate_screenshot_width_invalid() {
+        let settings = LandscapeSettings {
+            foundation: "Foundation".to_string(),
+            url: "https://example.url".to_string(),
+            screenshot_width: Some(1000),
+            ..Default::default()
+        };
+
+        settings.validate().unwrap();
+    }
+
+    #[test]
+    fn settings_validate_tags_succeeds() {
+        let settings = LandscapeSettings {
+            foundation: "Foundation".to_string(),
+            url: "https://example.url".to_string(),
+            tags: Some(BTreeMap::from_iter(vec![(
+                "tag1".to_string(),
+                vec![TagRule {
+                    category: "Category".to_string(),
+                    subcategories: Some(vec!["Subcategory".to_string()]),
+                }],
+            )])),
+            ..Default::default()
+        };
+
+        settings.validate().unwrap();
+    }
+
+    #[test]
+    #[should_panic(expected = "tag [tag1] category cannot be empty")]
+    fn settings_validate_tags_empty_category() {
+        let settings = LandscapeSettings {
+            foundation: "Foundation".to_string(),
+            url: "https://example.url".to_string(),
+            tags: Some(BTreeMap::from_iter(vec![(
+                "tag1".to_string(),
+                vec![TagRule {
+                    category: String::new(),
+                    subcategories: None,
+                }],
+            )])),
+            ..Default::default()
+        };
+
+        settings.validate().unwrap();
+    }
+
+    #[test]
+    #[should_panic(expected = "tag [tag1] subcategories cannot be empty")]
+    fn settings_validate_tags_empty_subcategories() {
+        let settings = LandscapeSettings {
+            foundation: "Foundation".to_string(),
+            url: "https://example.url".to_string(),
+            tags: Some(BTreeMap::from_iter(vec![(
+                "tag1".to_string(),
+                vec![TagRule {
+                    category: "Category".to_string(),
+                    subcategories: Some(vec![]),
+                }],
+            )])),
+            ..Default::default()
+        };
+
+        settings.validate().unwrap();
+    }
+}
diff --git a/crates/core/src/stats.rs b/crates/core/src/stats.rs
index 449377b7..63ca6fba 100644
--- a/crates/core/src/stats.rs
+++ b/crates/core/src/stats.rs
@@ -2,7 +2,7 @@
 //! as well as the functionality used to prepare them.
 
 use super::{
-    data::{CategoryName, SubCategoryName},
+    data::{CategoryName, SubcategoryName},
     settings::{LandscapeSettings, TagName},
 };
 use crate::data::LandscapeData;
@@ -325,7 +325,7 @@ pub struct CategoryProjectsStats {
 
     /// Number of projects per subcategory.
     #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
-    pub subcategories: BTreeMap<SubCategoryName, u64>,
+    pub subcategories: BTreeMap<SubcategoryName, u64>,
 }
 
 /// Some stats about the repositories listed in the landscape.
@@ -405,7 +405,7 @@ impl RepositoriesStats {
 
                         // Participation stats
                         if stats.participation_stats.is_empty() {
-                            stats.participation_stats = gh_data.participation_stats.clone();
+                            stats.participation_stats.clone_from(&gh_data.participation_stats);
                         } else {
                             stats.participation_stats = stats
                                 .participation_stats
@@ -460,9 +460,9 @@ const EXCLUDED_LANGUAGES: [&str; 7] = [
 /// Helper function to increment the value of an entry in a map by the value
 /// provided if the entry exists, or insert a new entry with that value if it
 /// doesn't.
-fn increment<T: Ord>(map: &mut BTreeMap<T, u64>, key: &T, increment: u64)
+fn increment<T>(map: &mut BTreeMap<T, u64>, key: &T, increment: u64)
 where
-    T: std::hash::Hash + Eq + Clone,
+    T: std::hash::Hash + Ord + Eq + Clone,
 {
     if let Some(v) = map.get_mut(key) {
         *v += increment;
@@ -483,3 +483,383 @@ fn calculate_running_total(map: &BTreeMap<YearMonth, u64>) -> BTreeMap<YearMonth
 
     rt
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::data::{
+        Acquisition, Contributors, FundingRound, Item, ItemAudit, Organization, Repository,
+        RepositoryGithubData,
+    };
+    use chrono::NaiveDate;
+
+    #[test]
+    fn stats_new() {
+        let landscape_data = LandscapeData::default();
+        let settings = LandscapeSettings::default();
+
+        let stats = Stats::new(&landscape_data, &settings);
+        assert_eq!(stats, Stats::default());
+    }
+
+    #[test]
+    fn members_stats_new() {
+        let landscape_data = LandscapeData {
+            categories: vec![],
+            items: vec![
+                Item {
+                    name: "Member 1".to_string(),
+                    category: "Members".to_string(),
+                    subcategory: "Subcategory".to_string(),
+                    joined_at: NaiveDate::from_ymd_opt(2024, 4, 2),
+                    ..Default::default()
+                },
+                Item {
+                    name: "Member 2".to_string(),
+                    category: "Members".to_string(),
+                    subcategory: "Subcategory".to_string(),
+                    joined_at: NaiveDate::from_ymd_opt(2024, 5, 2),
+                    ..Default::default()
+                },
+            ],
+        };
+        let settings = LandscapeSettings {
+            members_category: Some("Members".to_string()),
+            ..Default::default()
+        };
+
+        let members_stats = MembersStats::new(&landscape_data, &settings);
+        let expected_members_stats = Some(MembersStats {
+            joined_at: vec![("2024-04".to_string(), 1), ("2024-05".to_string(), 1)].into_iter().collect(),
+            joined_at_rt: vec![("2024-04".to_string(), 1), ("2024-05".to_string(), 2)].into_iter().collect(),
+            members: 2,
+            subcategories: vec![("Subcategory".to_string(), 2)].into_iter().collect(),
+        });
+        pretty_assertions::assert_eq!(members_stats, expected_members_stats);
+    }
+
+    #[test]
+    fn organization_stats_new() {
+        let landscape_data = LandscapeData {
+            categories: vec![],
+            items: vec![
+                Item {
+                    name: "Organization 1".to_string(),
+                    crunchbase_data: Some(Organization {
+                        acquisitions: Some(vec![
+                            Acquisition {
+                                announced_on: NaiveDate::from_ymd_opt(2023, 5, 1),
+                                price: Some(100),
+                                ..Default::default()
+                            },
+                            Acquisition {
+                                announced_on: NaiveDate::from_ymd_opt(2024, 5, 2),
+                                price: Some(200),
+                                ..Default::default()
+                            },
+                        ]),
+                        funding_rounds: Some(vec![
+                            FundingRound {
+                                announced_on: NaiveDate::from_ymd_opt(2023, 5, 1),
+                                amount: Some(100),
+                                ..Default::default()
+                            },
+                            FundingRound {
+                                announced_on: NaiveDate::from_ymd_opt(2024, 5, 2),
+                                amount: Some(200),
+                                ..Default::default()
+                            },
+                            FundingRound {
+                                // This funding round will be ignored as it is older than 5 years
+                                announced_on: Some(
+                                    Utc::now().naive_utc().date() - chrono::Duration::days(365 * 10),
+                                ),
+                                amount: Some(1000),
+                                ..Default::default()
+                            },
+                        ]),
+                        ..Default::default()
+                    }),
+                    crunchbase_url: Some("https://crunchbase.com/org1".to_string()),
+                    ..Default::default()
+                },
+                Item {
+                    name: "Organization 2".to_string(),
+                    crunchbase_data: Some(Organization {
+                        acquisitions: Some(vec![Acquisition {
+                            announced_on: NaiveDate::from_ymd_opt(2024, 5, 3),
+                            price: Some(300),
+                            ..Default::default()
+                        }]),
+                        funding_rounds: Some(vec![FundingRound {
+                            announced_on: NaiveDate::from_ymd_opt(2024, 5, 3),
+                            amount: Some(300),
+                            ..Default::default()
+                        }]),
+                        ..Default::default()
+                    }),
+                    crunchbase_url: Some("https://crunchbase.com/org2".to_string()),
+                    ..Default::default()
+                },
+                Item {
+                    // This org will be ignored as it has the same crunchbase URL as the previous one
+                    name: "Organization 3".to_string(),
+                    crunchbase_data: Some(Organization {
+                        acquisitions: Some(vec![Acquisition {
+                            announced_on: NaiveDate::from_ymd_opt(2024, 5, 3),
+                            price: Some(300),
+                            ..Default::default()
+                        }]),
+                        ..Default::default()
+                    }),
+                    crunchbase_url: Some("https://crunchbase.com/org2".to_string()),
+                    ..Default::default()
+                },
+            ],
+        };
+
+        let orgs_stats = OrganizationsStats::new(&landscape_data);
+        let expected_orgs_stats = Some(OrganizationsStats {
+            acquisitions: vec![("2023".to_string(), 1), ("2024".to_string(), 2)].into_iter().collect(),
+            acquisitions_price: vec![("2023".to_string(), 100), ("2024".to_string(), 500)]
+                .into_iter()
+                .collect(),
+            funding_rounds: vec![("2023".to_string(), 1), ("2024".to_string(), 2)].into_iter().collect(),
+            funding_rounds_money_raised: vec![("2023".to_string(), 100), ("2024".to_string(), 500)]
+                .into_iter()
+                .collect(),
+        });
+        assert_eq!(orgs_stats, expected_orgs_stats);
+    }
+
+    #[test]
+    fn projects_stats_new() {
+        let landscape_data = LandscapeData {
+            categories: vec![],
+            items: vec![
+                Item {
+                    name: "Project 1".to_string(),
+                    category: "Category 1".to_string(),
+                    subcategory: "Subcategory 1".to_string(),
+                    maturity: Some("graduated".to_string()),
+                    homepage_url: "https://project1.com".to_string(),
+                    accepted_at: NaiveDate::from_ymd_opt(2024, 4, 2),
+                    incubating_at: NaiveDate::from_ymd_opt(2024, 4, 2),
+                    graduated_at: NaiveDate::from_ymd_opt(2024, 4, 2),
+                    tag: Some("tag1".to_string()),
+                    audits: Some(vec![ItemAudit {
+                        date: NaiveDate::from_ymd_opt(2024, 4, 2).unwrap(),
+                        ..Default::default()
+                    }]),
+                    ..Default::default()
+                },
+                Item {
+                    name: "Project 2".to_string(),
+                    category: "Category 1".to_string(),
+                    subcategory: "Subcategory 2".to_string(),
+                    maturity: Some("incubating".to_string()),
+                    homepage_url: "https://project2.com".to_string(),
+                    accepted_at: NaiveDate::from_ymd_opt(2024, 5, 1),
+                    incubating_at: NaiveDate::from_ymd_opt(2024, 5, 2),
+                    tag: Some("tag1".to_string()),
+                    audits: Some(vec![ItemAudit {
+                        date: NaiveDate::from_ymd_opt(2024, 5, 2).unwrap(),
+                        ..Default::default()
+                    }]),
+                    ..Default::default()
+                },
+                Item {
+                    // This project will be ignored as it has the same homepage URL and logo as the previous one
+                    name: "Project 3".to_string(),
+                    category: "Category 1".to_string(),
+                    subcategory: "Subcategory 2".to_string(),
+                    maturity: Some("incubating".to_string()),
+                    homepage_url: "https://project2.com".to_string(),
+                    accepted_at: NaiveDate::from_ymd_opt(2024, 5, 1),
+                    ..Default::default()
+                },
+            ],
+        };
+
+        let projects_stats = ProjectsStats::new(&landscape_data);
+        let expected_projects_stats = Some(ProjectsStats {
+            accepted_at: vec![("2024-04".to_string(), 1), ("2024-05".to_string(), 1)].into_iter().collect(),
+            accepted_at_rt: vec![("2024-04".to_string(), 1), ("2024-05".to_string(), 2)]
+                .into_iter()
+                .collect(),
+            audits: vec![("2024-04".to_string(), 1), ("2024-05".to_string(), 1)].into_iter().collect(),
+            audits_rt: vec![("2024-04".to_string(), 1), ("2024-05".to_string(), 2)].into_iter().collect(),
+            category: vec![(
+                "Category 1".to_string(),
+                CategoryProjectsStats {
+                    projects: 2,
+                    subcategories: vec![("Subcategory 1".to_string(), 1), ("Subcategory 2".to_string(), 1)]
+                        .into_iter()
+                        .collect(),
+                },
+            )]
+            .into_iter()
+            .collect(),
+            incubating_to_graduated: vec![("2024-04".to_string(), 1)].into_iter().collect(),
+            maturity: vec![("graduated".to_string(), 1), ("incubating".to_string(), 1)].into_iter().collect(),
+            projects: 2,
+            sandbox_to_incubating: vec![("2024-05".to_string(), 1)].into_iter().collect(),
+            tag: vec![("tag1".to_string(), 2)].into_iter().collect(),
+        });
+        pretty_assertions::assert_eq!(projects_stats, expected_projects_stats);
+    }
+
+    #[test]
+    #[allow(clippy::too_many_lines)]
+    fn repositories_stats_new() {
+        let landscape_data = LandscapeData {
+            categories: vec![],
+            items: vec![
+                Item {
+                    name: "Project 1".to_string(),
+                    repositories: Some(vec![Repository {
+                        url: "https://repository1.url".to_string(),
+                        github_data: Some(RepositoryGithubData {
+                            contributors: Contributors {
+                                count: 1,
+                                ..Default::default()
+                            },
+                            languages: Some(
+                                vec![
+                                    ("Rust".to_string(), 100),
+                                    ("Python".to_string(), 20),
+                                    ("Shell".to_string(), 100), // In EXCLUDED_LANGUAGES
+                                    ("otherlang1".to_string(), 5), // Out of top 10
+                                    ("otherlang2".to_string(), 10),
+                                    ("otherlang3".to_string(), 10),
+                                    ("otherlang4".to_string(), 10),
+                                    ("otherlang5".to_string(), 10),
+                                    ("otherlang6".to_string(), 10),
+                                    ("otherlang7".to_string(), 10),
+                                    ("otherlang8".to_string(), 10),
+                                    ("otherlang9".to_string(), 10),
+                                ]
+                                .into_iter()
+                                .collect(),
+                            ),
+                            license: Some("Apache-2.0".to_string()),
+                            participation_stats: vec![1, 2, 3],
+                            stars: 10,
+                            ..Default::default()
+                        }),
+                        ..Default::default()
+                    }]),
+                    ..Default::default()
+                },
+                Item {
+                    name: "Project 2".to_string(),
+                    repositories: Some(vec![
+                        Repository {
+                            url: "https://repository2.url".to_string(),
+                            github_data: Some(RepositoryGithubData {
+                                contributors: Contributors {
+                                    count: 2,
+                                    ..Default::default()
+                                },
+                                languages: Some(
+                                    vec![
+                                        ("Rust".to_string(), 200),
+                                        ("Python".to_string(), 100),
+                                        ("otherlang2".to_string(), 10),
+                                        ("otherlang3".to_string(), 10),
+                                        ("otherlang4".to_string(), 10),
+                                        ("otherlang5".to_string(), 10),
+                                        ("otherlang6".to_string(), 10),
+                                        ("otherlang7".to_string(), 10),
+                                        ("otherlang8".to_string(), 10),
+                                        ("otherlang9".to_string(), 10),
+                                    ]
+                                    .into_iter()
+                                    .collect(),
+                                ),
+                                license: Some("MIT".to_string()),
+                                participation_stats: vec![4, 5, 6],
+                                stars: 20,
+                                ..Default::default()
+                            }),
+                            ..Default::default()
+                        },
+                        Repository {
+                            // This repository will be ignored as it has the same URL as the previous one
+                            url: "https://repository2.url".to_string(),
+                            github_data: Some(RepositoryGithubData {
+                                stars: 20,
+                                ..Default::default()
+                            }),
+                            ..Default::default()
+                        },
+                    ]),
+                    ..Default::default()
+                },
+            ],
+        };
+
+        let repositories_stats = RepositoriesStats::new(&landscape_data);
+        let expected_repositories_stats = Some(RepositoriesStats {
+            bytes: 685,
+            contributors: 3,
+            languages: vec![
+                ("Rust".to_string(), 2),
+                ("Python".to_string(), 2),
+                ("otherlang2".to_string(), 2),
+                ("otherlang3".to_string(), 2),
+                ("otherlang4".to_string(), 2),
+                ("otherlang5".to_string(), 2),
+                ("otherlang6".to_string(), 2),
+                ("otherlang7".to_string(), 2),
+                ("otherlang8".to_string(), 2),
+                ("otherlang9".to_string(), 2),
+            ]
+            .into_iter()
+            .collect(),
+            languages_bytes: vec![
+                ("Rust".to_string(), 300),
+                ("Python".to_string(), 120),
+                ("otherlang2".to_string(), 20),
+                ("otherlang3".to_string(), 20),
+                ("otherlang4".to_string(), 20),
+                ("otherlang5".to_string(), 20),
+                ("otherlang6".to_string(), 20),
+                ("otherlang7".to_string(), 20),
+                ("otherlang8".to_string(), 20),
+                ("otherlang9".to_string(), 20),
+            ]
+            .into_iter()
+            .collect(),
+            licenses: vec![("Apache-2.0".to_string(), 1), ("MIT".to_string(), 1)].into_iter().collect(),
+            participation_stats: vec![5, 7, 9],
+            repositories: 2,
+            stars: 30,
+        });
+        pretty_assertions::assert_eq!(repositories_stats, expected_repositories_stats);
+    }
+
+    #[test]
+    fn increment_works() {
+        let mut map = std::collections::BTreeMap::new();
+        increment(&mut map, &"key1", 1);
+        increment(&mut map, &"key1", 1);
+        increment(&mut map, &"key2", 1);
+
+        assert_eq!(map.get(&"key1"), Some(&2));
+        assert_eq!(map.get(&"key2"), Some(&1));
+    }
+
+    #[test]
+    fn calculate_running_total_works() {
+        let mut map = std::collections::BTreeMap::new();
+        map.insert("2024-01".to_string(), 1);
+        map.insert("2024-02".to_string(), 2);
+        map.insert("2024-03".to_string(), 3);
+
+        let rt = calculate_running_total(&map);
+        assert_eq!(rt.get("2024-01"), Some(&1));
+        assert_eq!(rt.get("2024-02"), Some(&3));
+        assert_eq!(rt.get("2024-03"), Some(&6));
+    }
+}
diff --git a/crates/core/src/testdata/data.yml b/crates/core/src/testdata/data.yml
new file mode 100644
index 00000000..e4b2b05a
--- /dev/null
+++ b/crates/core/src/testdata/data.yml
@@ -0,0 +1,16 @@
+landscape:
+  - category:
+    name: Category 1
+    subcategories:
+      - subcategory:
+        name: Subcategory 1-1
+        items:
+          - item:
+            crunchbase: https://www.crunchbase.com/organization/cloud-native-computing-foundation
+            description: This is the description of item 1
+            homepage_url: https://cncf.io
+            logo: cncf.svg
+            name: Item 1
+            project: graduated
+            repo_url: https://github.com/cncf/landscape2
+            twitter: https://twitter.com/CloudNativeFdn
diff --git a/crates/core/src/testdata/guide.yml b/crates/core/src/testdata/guide.yml
new file mode 100644
index 00000000..54820f11
--- /dev/null
+++ b/crates/core/src/testdata/guide.yml
@@ -0,0 +1,6 @@
+categories:
+  - category: Category 1
+    content: Category 1 content
+    subcategories:
+      - subcategory: Subcategory 1
+        content: Subcategory 1 content
diff --git a/crates/core/src/testdata/settings.yml b/crates/core/src/testdata/settings.yml
new file mode 100644
index 00000000..32ceab12
--- /dev/null
+++ b/crates/core/src/testdata/settings.yml
@@ -0,0 +1,2 @@
+foundation: Foundation
+url: https://tests.landscape2.io
diff --git a/crates/core/src/util.rs b/crates/core/src/util.rs
index 8d494f41..895c619e 100644
--- a/crates/core/src/util.rs
+++ b/crates/core/src/util.rs
@@ -83,3 +83,78 @@ pub(crate) fn validate_url(kind: &str, url: &Option<String>) -> Result<()> {
 
     Ok(())
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn normalize_name_succeeds() {
+        assert_eq!(normalize_name("Hello World"), "hello-world");
+        assert_eq!(normalize_name("Hello  World"), "hello-world");
+        assert_eq!(normalize_name("Hello.World"), "hello-world");
+        assert_eq!(normalize_name("Hello--World"), "hello-world");
+        assert_eq!(normalize_name("Hello World-"), "hello-world");
+    }
+
+    #[test]
+    fn validate_url_succeeds() {
+        validate_url(
+            "crunchbase",
+            &Some("https://www.crunchbase.com/organization/test".to_string()),
+        )
+        .unwrap();
+
+        for (kind, domain) in &[
+            ("facebook", "facebook.com"),
+            ("flickr", "flickr.com"),
+            ("github", "github.com"),
+            ("instagram", "instagram.com"),
+            ("linkedin", "linkedin.com"),
+            ("stack_overflow", "stackoverflow.com"),
+            ("twitch", "twitch.tv"),
+            ("twitter", "twitter.com"),
+            ("youtube", "youtube.com"),
+        ] {
+            validate_url(kind, &Some(format!("https://{domain}/test"))).unwrap();
+        }
+    }
+
+    #[test]
+    #[should_panic(expected = "relative URL without a base")]
+    fn validate_url_error_parsing() {
+        validate_url("", &Some("invalid url".to_string())).unwrap();
+    }
+
+    #[test]
+    #[should_panic(expected = "invalid scheme")]
+    fn validate_url_invalid_scheme() {
+        validate_url("", &Some("oci://hostname/path".to_string())).unwrap();
+    }
+
+    #[test]
+    #[should_panic(expected = "invalid crunchbase url")]
+    fn validate_url_invalid_crunchbase_url() {
+        validate_url("crunchbase", &Some("https://www.crunchbase.com/test".to_string())).unwrap();
+    }
+
+    #[test]
+    fn validate_url_invalid_domain() {
+        for (kind, domain) in &[
+            ("facebook", "facebook.com"),
+            ("flickr", "flickr.com"),
+            ("github", "github.com"),
+            ("instagram", "instagram.com"),
+            ("linkedin", "linkedin.com"),
+            ("stack_overflow", "stackoverflow.com"),
+            ("twitch", "twitch.tv"),
+            ("twitter", "twitter.com"),
+            ("youtube", "youtube.com"),
+        ] {
+            assert_eq!(
+                validate_url(kind, &Some("https://example.com/test".to_string())).unwrap_err().to_string(),
+                format!("invalid {kind} url: expecting https://{domain}/...")
+            );
+        }
+    }
+}

From a12487bcd0c6241e78fe1285c13e9f8d9667df2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20Casta=C3=B1o=20Arteaga?= <tegioz@icloud.com>
Date: Tue, 7 May 2024 09:09:04 +0200
Subject: [PATCH 44/55] Use custom octorust client (#615)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The main reason is to follow redirects (disabled by the default client).

Signed-off-by: Sergio Castaño Arteaga <tegioz@icloud.com>
---
 Cargo.lock                     | 2 ++
 Cargo.toml                     | 2 ++
 crates/cli/Cargo.toml          | 2 ++
 crates/cli/src/build/github.rs | 6 +++++-
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5efe0678..1e250b92 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1871,7 +1871,9 @@ dependencies = [
  "parse_link_header",
  "qrcode",
  "regex",
+ "reqwest 0.11.27",
  "reqwest 0.12.4",
+ "reqwest-middleware",
  "rust-embed",
  "serde",
  "serde_json",
diff --git a/Cargo.toml b/Cargo.toml
index a5a30d46..48c969bb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -47,6 +47,8 @@ pretty_assertions = "1.4.0"
 qrcode = "0.14.0"
 regex = "1.10.4"
 reqwest = { version = "0.12.4", features = ["json", "native-tls-vendored"] }
+reqwest_octorust = { package = "reqwest", version = "0.11.14", default-features = false, features = ["json", "multipart"] }
+reqwest-middleware = "0.2.2"
 rust-embed = "8.3.0"
 serde = { version = "1.0.199", features = ["derive"] }
 serde_json = "1.0.116"
diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml
index b8a9a3fa..aadb9cdc 100644
--- a/crates/cli/Cargo.toml
+++ b/crates/cli/Cargo.toml
@@ -40,6 +40,8 @@ parse_link_header = { workspace = true }
 qrcode = { workspace = true }
 regex = { workspace = true }
 reqwest = { workspace = true }
+reqwest_octorust = { workspace = true }
+reqwest-middleware = { workspace = true }
 rust-embed = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
diff --git a/crates/cli/src/build/github.rs b/crates/cli/src/build/github.rs
index d2a638d3..fc77ccca 100644
--- a/crates/cli/src/build/github.rs
+++ b/crates/cli/src/build/github.rs
@@ -209,7 +209,11 @@ impl GHApi {
     fn new(token: &str) -> Result<Self> {
         // Setup octorust GitHub API client
         let user_agent = format!("{}/{}", env!("CARGO_PKG_NAME"), env!("CARGO_PKG_VERSION"));
-        let gh_client = octorust::Client::new(user_agent.clone(), Credentials::Token(token.to_string()))?;
+        let gh_client = octorust::Client::custom(
+            user_agent.clone(),
+            Credentials::Token(token.to_string()),
+            reqwest_middleware::ClientBuilder::new(reqwest_octorust::Client::builder().build()?).build(),
+        );
 
         // Setup HTTP client ready to make requests to the GitHub API
         // (for some operations that cannot be done with the octorust client)

From 709336f7ba2d6765f206aafe21aa7a74e7464731 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cintia=20S=C3=A1nchez=20Garc=C3=ADa?= <cynthiasg@icloud.com>
Date: Tue, 7 May 2024 09:46:18 +0200
Subject: [PATCH 45/55] Fix participation stats legend in item details view
 (#616)

Signed-off-by: Cintia Sanchez Garcia <cynthiasg@icloud.com>
---
 ui/webapp/src/layout/common/itemModal/ParticipationStats.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/webapp/src/layout/common/itemModal/ParticipationStats.tsx b/ui/webapp/src/layout/common/itemModal/ParticipationStats.tsx
index 7bfbc359..1396456d 100644
--- a/ui/webapp/src/layout/common/itemModal/ParticipationStats.tsx
+++ b/ui/webapp/src/layout/common/itemModal/ParticipationStats.tsx
@@ -20,7 +20,7 @@ const ParticipationStats = (props: Props) => {
 
   onMount(() => {
     setMonths(
-      [...Array(4).keys()].map((n: number) => {
+      [...Array(5).keys()].map((n: number) => {
         return moment()
           .subtract(n * 3, 'months')
           .format("MMM 'YY");

From 0ff53c352183d1533b3c65e936d29a38ea935c6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cintia=20S=C3=A1nchez=20Garc=C3=ADa?= <cynthiasg@icloud.com>
Date: Tue, 7 May 2024 10:05:48 +0200
Subject: [PATCH 46/55] Add organization region in items details view (#617)

Signed-off-by: Cintia Sanchez Garcia <cynthiasg@icloud.com>
---
 .../src/layout/common/itemModal/Content.tsx     | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/ui/webapp/src/layout/common/itemModal/Content.tsx b/ui/webapp/src/layout/common/itemModal/Content.tsx
index 0b7049ac..bf1e96aa 100644
--- a/ui/webapp/src/layout/common/itemModal/Content.tsx
+++ b/ui/webapp/src/layout/common/itemModal/Content.tsx
@@ -427,7 +427,9 @@ const Content = (props: Props) => {
             </div>
             <Show
               when={
-                !isUndefined(itemInfo()!.crunchbase_data!.city) || !isUndefined(itemInfo()!.crunchbase_data!.country)
+                !isUndefined(itemInfo()!.crunchbase_data!.city) ||
+                !isUndefined(itemInfo()!.crunchbase_data!.region) ||
+                !isUndefined(itemInfo()!.crunchbase_data!.country)
               }
             >
               <div class={`text-muted pt-1 ${styles.location}`}>
@@ -435,6 +437,19 @@ const Content = (props: Props) => {
                 <Show
                   when={
                     !isUndefined(itemInfo()!.crunchbase_data!.city) &&
+                    (!isUndefined(itemInfo()!.crunchbase_data!.region) ||
+                      !isUndefined(itemInfo()!.crunchbase_data!.country))
+                  }
+                >
+                  <>, </>
+                </Show>
+
+                <Show when={!isUndefined(itemInfo()!.crunchbase_data!.region)}>
+                  {itemInfo()!.crunchbase_data!.region}
+                </Show>
+                <Show
+                  when={
+                    !isUndefined(itemInfo()!.crunchbase_data!.region) &&
                     !isUndefined(itemInfo()!.crunchbase_data!.country)
                   }
                 >

From e7f522df0f249a9345afcc746e221b7d497a80bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20Casta=C3=B1o=20Arteaga?= <tegioz@icloud.com>
Date: Tue, 7 May 2024 11:48:26 +0200
Subject: [PATCH 47/55] Improve search (#619)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Cintia Sanchez Garcia <cynthiasg@icloud.com>
Signed-off-by: Sergio Castaño Arteaga <tegioz@icloud.com>
Co-authored-by: Cintia Sanchez Garcia <cynthiasg@icloud.com>
Co-authored-by: Sergio Castaño Arteaga <tegioz@icloud.com>
---
 ui/webapp/package.json                        |   1 +
 ui/webapp/src/App.css                         |   1 +
 .../src/layout/common/Searchbar.module.css    |  19 +--
 ui/webapp/src/layout/common/Searchbar.tsx     |  64 +++++-----
 ui/webapp/src/types.ts                        |   1 +
 ui/webapp/src/utils/getItemDescription.ts     |   9 +-
 ui/webapp/src/utils/itemsDataGetter.ts        |   3 +
 ui/webapp/src/utils/search.ts                 | 110 ++++++++++++++++++
 ui/webapp/yarn.lock                           |   5 +
 9 files changed, 167 insertions(+), 46 deletions(-)
 create mode 100644 ui/webapp/src/utils/search.ts

diff --git a/ui/webapp/package.json b/ui/webapp/package.json
index 86e2d787..a5a47832 100644
--- a/ui/webapp/package.json
+++ b/ui/webapp/package.json
@@ -20,6 +20,7 @@
     "apexcharts": "^3.49.0",
     "bootstrap": "^5.3.3",
     "lodash": "^4.17.21",
+    "minisearch": "^6.3.0",
     "moment": "^2.30.1",
     "solid-apexcharts": "^0.3.4",
     "solid-js": "^1.8.16",
diff --git a/ui/webapp/src/App.css b/ui/webapp/src/App.css
index ba8a5f13..28919dec 100644
--- a/ui/webapp/src/App.css
+++ b/ui/webapp/src/App.css
@@ -35,6 +35,7 @@ select:focus {
 .visibleScroll::-webkit-scrollbar {
   width: 10px;
   height: 10px;
+  background-color: var(--bs-white);
 }
 
 .visibleScroll::-webkit-scrollbar-thumb,
diff --git a/ui/webapp/src/layout/common/Searchbar.module.css b/ui/webapp/src/layout/common/Searchbar.module.css
index ff56db73..7bea1baa 100644
--- a/ui/webapp/src/layout/common/Searchbar.module.css
+++ b/ui/webapp/src/layout/common/Searchbar.module.css
@@ -68,7 +68,7 @@
 
 .legend {
   font-size: 0.75rem;
-  line-height: 0.75rem;
+  line-height: 0.85rem;
 }
 
 .badges {
@@ -84,23 +84,6 @@
   min-width: 0;
 }
 
-/* Scroll */
-.visibleScroll::-webkit-scrollbar {
-  width: 10px;
-  height: 10px;
-}
-
-.visibleScroll::-webkit-scrollbar-thumb,
-.visibleScroll::-webkit-scrollbar-thumb:horizontal {
-  border-radius: 10px;
-  background-color: #686868;
-  border: 2px solid var(--bs-white);
-}
-
-.visibleScroll::-webkit-scrollbar-corner {
-  background-color: transparent;
-}
-
 @media only screen and (max-width: 1399.98px) {
   .searchBar {
     width: 300px;
diff --git a/ui/webapp/src/layout/common/Searchbar.tsx b/ui/webapp/src/layout/common/Searchbar.tsx
index d97ba3e2..6e1b76ef 100644
--- a/ui/webapp/src/layout/common/Searchbar.tsx
+++ b/ui/webapp/src/layout/common/Searchbar.tsx
@@ -1,10 +1,12 @@
 import isNull from 'lodash/isNull';
 import isUndefined from 'lodash/isUndefined';
-import { createEffect, createSignal, For, on, onCleanup, Show } from 'solid-js';
+import { SearchResult } from 'minisearch';
+import { batch, createEffect, createSignal, For, on, onCleanup, Show } from 'solid-js';
 
 import { BANNER_ID } from '../../data';
 import { useOutsideClick } from '../../hooks/useOutsideClick';
-import { BaseItem, SVGIconKind } from '../../types';
+import { SVGIconKind } from '../../types';
+import searchEngine from '../../utils/search';
 import { useUpdateActiveItemId } from '../stores/activeItem';
 import FoundationBadge from './FoundationBadge';
 import HoverableItem from './HoverableItem';
@@ -21,15 +23,15 @@ const SEARCH_DELAY = 3 * 100; // 300ms
 const MIN_CHARACTERS_SEARCH = 2;
 
 const Searchbar = (props: Props) => {
-  const items = () => window.baseDS.items;
   const updateActiveItemId = useUpdateActiveItemId();
   const [inputEl, setInputEl] = createSignal<HTMLInputElement>();
   const [dropdownRef, setDropdownRef] = createSignal<HTMLInputElement>();
   const [value, setValue] = createSignal<string>('');
-  const [itemsList, setItemsList] = createSignal<BaseItem[] | null>(null);
+  const [itemsList, setItemsList] = createSignal<SearchResult[] | null>(null);
   const [visibleDropdown, setVisibleDropdown] = createSignal<boolean>(false);
   const [highlightedItem, setHighlightedItem] = createSignal<number | null>(null);
   const [dropdownTimeout, setDropdownTimeout] = createSignal<number | null>(null);
+  const [error, setError] = createSignal<string | null>(null);
 
   useOutsideClick([dropdownRef], [BANNER_ID], visibleDropdown, () => {
     setValue('');
@@ -86,26 +88,35 @@ const Searchbar = (props: Props) => {
     }
   };
 
-  const onSearch = (text: string) => {
-    const filteredItems = items().filter((item: BaseItem) => {
-      const re = new RegExp(text, 'i');
-      if (re.test(item.name)) {
-        return item;
-      }
-    });
-    if (filteredItems.length > 0) {
-      const isInputFocused = inputEl() === document.activeElement;
-      // We have to be sure that input has focus to display results
-      if (isInputFocused) {
-        setItemsList(filteredItems);
+  const onSearch = async (text: string) => {
+    await searchEngine
+      .searchTerm(text) /* eslint-disable solid/reactivity */
+      .then((filteredItems) => {
+        if (filteredItems.length > 0) {
+          const isInputFocused = inputEl() === document.activeElement;
+          // We have to be sure that input has focus to display results
+          if (isInputFocused) {
+            batch(() => {
+              setError(null);
+              setItemsList(filteredItems);
+              setVisibleDropdown(true);
+            });
+          } else {
+            cleanItemsSearch();
+          }
+        } else {
+          batch(() => {
+            setItemsList([]);
+            setVisibleDropdown(true);
+            setError(null);
+          });
+        }
+      })
+      .catch((error) => {
+        setError(error);
+        setItemsList([]);
         setVisibleDropdown(true);
-      } else {
-        cleanItemsSearch();
-      }
-    } else {
-      setItemsList([]);
-      setVisibleDropdown(true);
-    }
+      });
   };
 
   const search = () => {
@@ -128,6 +139,7 @@ const Searchbar = (props: Props) => {
   };
 
   const cleanItemsSearch = () => {
+    setError(null);
     setItemsList(null);
     setVisibleDropdown(false);
     setHighlightedItem(null);
@@ -229,9 +241,7 @@ const Searchbar = (props: Props) => {
       <Show when={visibleDropdown() && !isNull(itemsList())}>
         <div
           ref={setDropdownRef}
-          class={`dropdown-menu dropdown-menu-left p-0 w-100 rounded-0 show noFocus overflow-auto ${styles.dropdown} ${
-            styles.visibleScroll
-          } ${styles[`listLength-${itemsList()!.length}`]}`}
+          class={`dropdown-menu dropdown-menu-left p-0 w-100 rounded-0 show noFocus overflow-auto visibleScroll ${styles.dropdown} ${styles[`listLength-${itemsList()!.length}`]}`}
           role="listbox"
           id="search-list"
         >
@@ -239,7 +249,7 @@ const Searchbar = (props: Props) => {
             when={itemsList()!.length > 0}
             fallback={
               <div class="p-4 text-center fst-italic text-muted">
-                <small>We couldn't find any items that match that criteria.</small>
+                <small>{error() || `We couldn't find any items that match that criteria.`}</small>
               </div>
             }
           >
diff --git a/ui/webapp/src/types.ts b/ui/webapp/src/types.ts
index 358cf1d7..c220d36a 100644
--- a/ui/webapp/src/types.ts
+++ b/ui/webapp/src/types.ts
@@ -197,6 +197,7 @@ export interface GithubRepository {
   license: string;
   participation_stats: number[];
   stars: number;
+  topics: string[];
   url: string;
 }
 
diff --git a/ui/webapp/src/utils/getItemDescription.ts b/ui/webapp/src/utils/getItemDescription.ts
index 032421f6..e4d1664e 100644
--- a/ui/webapp/src/utils/getItemDescription.ts
+++ b/ui/webapp/src/utils/getItemDescription.ts
@@ -1,3 +1,5 @@
+import isUndefined from 'lodash/isUndefined';
+
 import { Item, Repository } from '../types';
 import cleanEmojis from './cleanEmojis';
 
@@ -16,7 +18,12 @@ const getItemDescription = (item?: Item | null): string => {
       ) {
         return cleanEmojis(primaryRepo.github_data.description);
       }
-    } else if (item.crunchbase_data && item.crunchbase_data.description && item.crunchbase_data.description !== '') {
+    } else if (
+      isUndefined(item.maturity) &&
+      item.crunchbase_data &&
+      item.crunchbase_data.description &&
+      item.crunchbase_data.description !== ''
+    ) {
       return cleanEmojis(item.crunchbase_data.description);
     }
   }
diff --git a/ui/webapp/src/utils/itemsDataGetter.ts b/ui/webapp/src/utils/itemsDataGetter.ts
index d2a00146..177c94aa 100644
--- a/ui/webapp/src/utils/itemsDataGetter.ts
+++ b/ui/webapp/src/utils/itemsDataGetter.ts
@@ -30,6 +30,7 @@ import {
 import capitalizeFirstLetter from './capitalizeFirstLetter';
 import checkIfCategoryInGroup from './checkIfCategoryInGroup';
 import filterData from './filterData';
+import search from './search';
 import sortMenuOptions from './sortMenuOptions';
 
 export interface ItemsDataStatus {
@@ -129,6 +130,8 @@ export class ItemsDataGetter {
 
   private initialDataPreparation(data: LandscapeData) {
     const extendedItems = this.extendItemsData(data.items, data.crunchbase_data, data.github_data);
+    // Search engine initialization
+    search.init(extendedItems);
     this.landscapeData = {
       ...data,
       items: extendedItems,
diff --git a/ui/webapp/src/utils/search.ts b/ui/webapp/src/utils/search.ts
new file mode 100644
index 00000000..7df24f2d
--- /dev/null
+++ b/ui/webapp/src/utils/search.ts
@@ -0,0 +1,110 @@
+import MiniSearch, { SearchResult } from 'minisearch';
+
+import { Item } from '../types';
+
+const MAX_RESULTS = 30;
+
+class Search {
+  private index: MiniSearch | undefined = undefined;
+
+  public init(items: Item[]): void {
+    this.indexItems(items);
+  }
+
+  private async indexItems(items: Item[]) {
+    const miniSearch = new MiniSearch({
+      fields: ['crunchbaseCategories', 'description', 'name', 'primaryRepositoryTopics', 'summaryTags'],
+      extractField: (item, fieldName) => {
+        let value = '';
+
+        switch (fieldName) {
+          case 'crunchbaseCategories':
+            if (item.crunchbase_data && item.crunchbase_data.categories) {
+              value = item.crunchbase_data.categories.join(' ');
+            }
+            break;
+
+          case 'description':
+            if (item.description && item.description !== '') {
+              value = item.description;
+            } else if (item.repositories) {
+              for (let i = 0; i < item.repositories.length; i++) {
+                const repo = item.repositories[i];
+                if (
+                  repo.primary &&
+                  repo.github_data &&
+                  repo.github_data.description &&
+                  repo.github_data.description !== ''
+                ) {
+                  value = repo.github_data.description;
+                  break;
+                }
+              }
+            }
+            break;
+
+          case 'primaryRepositoryTopics':
+            if (item.repositories) {
+              for (let i = 0; i < item.repositories.length; i++) {
+                const repo = item.repositories[i];
+                if (repo.primary && repo.github_data && repo.github_data.topics) {
+                  value = repo.github_data.topics.join(' ');
+                  break;
+                }
+              }
+            }
+            break;
+
+          case 'summaryTags':
+            if (item.summary && item.summary.tags) {
+              value = item.summary.tags.join(' ');
+            }
+            break;
+
+          default:
+            value = item[fieldName];
+            break;
+        }
+
+        return value;
+      },
+      storeFields: ['id', 'category', 'featured', 'logo', 'maturity', 'name', 'subcategory'],
+      searchOptions: {
+        boost: { name: 3 },
+        boostDocument: (_id, _term, storedFields) => {
+          // Default boost factor
+          let boostFactor = 1;
+
+          if (storedFields) {
+            // Boost -non archived- projects
+            if (storedFields.maturity && storedFields.maturity !== 'archived') {
+              boostFactor += 0.5;
+            }
+
+            // Boost featured items
+            if (storedFields.featured) {
+              boostFactor += 0.5;
+            }
+          }
+
+          return boostFactor;
+        },
+        combineWith: 'AND',
+        prefix: true,
+      },
+    });
+
+    await miniSearch.addAllAsync(items, { chunkSize: 30 });
+    this.index = miniSearch;
+  }
+
+  public async searchTerm(term: string): Promise<SearchResult[]> {
+    if (!this.index) {
+      return Promise.reject('Preparing search index...');
+    }
+    return Promise.resolve(this.index.search(term).slice(0, MAX_RESULTS - 1));
+  }
+}
+
+const searchEngine = new Search();
+export default searchEngine;
diff --git a/ui/webapp/yarn.lock b/ui/webapp/yarn.lock
index d140e17e..ea196f04 100644
--- a/ui/webapp/yarn.lock
+++ b/ui/webapp/yarn.lock
@@ -1512,6 +1512,11 @@ minimatch@^9.0.4:
   dependencies:
     brace-expansion "^2.0.1"
 
+minisearch@^6.3.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/minisearch/-/minisearch-6.3.0.tgz#985a2f1ca3c73c2d65af94f0616bfe57164b0b6b"
+  integrity sha512-ihFnidEeU8iXzcVHy74dhkxh/dn8Dc08ERl0xwoMMGqp4+LvRSCgicb+zGqWthVokQKvCSxITlh3P08OzdTYCQ==
+
 moment@^2.30.1:
   version "2.30.1"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.30.1.tgz#f8c91c07b7a786e30c59926df530b4eac96974ae"

From b86e8a9502a3286ecbeb59fc0c169030e7b7dc11 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 7 May 2024 12:30:37 +0200
Subject: [PATCH 48/55] Bump the cli group with 5 updates (#614)

Bumps the cli group with 5 updates:

| Package | From | To |
| --- | --- | --- |
| [anyhow](https://github.com/dtolnay/anyhow) | `1.0.82` | `1.0.83` |
| [aws-config](https://github.com/smithy-lang/smithy-rs) | `1.2.1` | `1.3.0` |
| [aws-sdk-s3](https://github.com/awslabs/aws-sdk-rust) | `1.24.0` | `1.25.0` |
| [base64](https://github.com/marshallpierce/rust-base64) | `0.22.0` | `0.22.1` |
| [serde](https://github.com/serde-rs/serde) | `1.0.199` | `1.0.200` |


Updates `anyhow` from 1.0.82 to 1.0.83
- [Release notes](https://github.com/dtolnay/anyhow/releases)
- [Commits](https://github.com/dtolnay/anyhow/compare/1.0.82...1.0.83)

Updates `aws-config` from 1.2.1 to 1.3.0
- [Release notes](https://github.com/smithy-lang/smithy-rs/releases)
- [Changelog](https://github.com/smithy-lang/smithy-rs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/smithy-lang/smithy-rs/commits)

Updates `aws-sdk-s3` from 1.24.0 to 1.25.0
- [Release notes](https://github.com/awslabs/aws-sdk-rust/releases)
- [Commits](https://github.com/awslabs/aws-sdk-rust/commits)

Updates `base64` from 0.22.0 to 0.22.1
- [Changelog](https://github.com/marshallpierce/rust-base64/blob/master/RELEASE-NOTES.md)
- [Commits](https://github.com/marshallpierce/rust-base64/compare/v0.22.0...v0.22.1)

Updates `serde` from 1.0.199 to 1.0.200
- [Release notes](https://github.com/serde-rs/serde/releases)
- [Commits](https://github.com/serde-rs/serde/compare/v1.0.199...v1.0.200)

---
updated-dependencies:
- dependency-name: anyhow
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: cli
- dependency-name: aws-config
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: cli
- dependency-name: aws-sdk-s3
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: cli
- dependency-name: base64
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: cli
- dependency-name: serde
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: cli
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 50 +++++++++++++++++++++++++-------------------------
 Cargo.toml | 10 +++++-----
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1e250b92..1a95a900 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -109,9 +109,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.82"
+version = "1.0.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519"
+checksum = "25bdb32cbbdce2b519a9cd7df3a678443100e265d5e25ca763b7572a5104f5f3"
 
 [[package]]
 name = "arrayref"
@@ -225,9 +225,9 @@ checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "aws-config"
-version = "1.2.1"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2a4707646259764ab59fd9a50e9de2e92c637b28b36285d6f6fa030e915fbd9"
+checksum = "baaa0be6ee7d90b775ae6ccb6d2ba182b91219ec2001f92338773a094246af1d"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -292,9 +292,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-s3"
-version = "1.24.0"
+version = "1.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f522b68eb0294c59f7beb0defa30e84fed24ebc50ee219e111d6c33eaea96a8"
+checksum = "cedc97499da49c3e36cde578340f9925284685073cb3e512aaf9ab16cd9a2541"
 dependencies = [
  "ahash",
  "aws-credential-types",
@@ -327,9 +327,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-sso"
-version = "1.21.0"
+version = "1.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d70fb493f4183f5102d8a8d0cc9b57aec29a762f55c0e7bf527e0f7177bb408"
+checksum = "ca3d6c4cba4e009391b72b0fcf12aff04ea3c9c3aa2ecaafa330326a8bd7e601"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -349,9 +349,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-ssooidc"
-version = "1.21.0"
+version = "1.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de3f37549b3e38b7ea5efd419d4d7add6ea1e55223506eb0b4fef9d25e7cc90d"
+checksum = "73400dc239d14f63d932f4ca7b55af5e9ef1f857f7d70655249ccc287adb2570"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -371,9 +371,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-sts"
-version = "1.21.0"
+version = "1.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b2ff219a5d4b795cd33251c19dbe9c4b401f2b2cbe513e07c76ada644eaf34e"
+checksum = "10f8858308af76fba3e5ffcf1bb56af5471574d2bdfaf0159470c25bc2f760e5"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -506,9 +506,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-runtime"
-version = "1.3.1"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44e7945379821074549168917e89e60630647e186a69243248f08c6d168b975a"
+checksum = "1cf64e73ef8d4dac6c933230d56d136b75b252edcf82ed36e37d603090cd7348"
 dependencies = [
  "aws-smithy-async",
  "aws-smithy-http",
@@ -532,9 +532,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-runtime-api"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cc56a5c96ec741de6c5e6bf1ce6948be969d6506dfa9c39cffc284e31e4979b"
+checksum = "8c19fdae6e3d5ac9cd01f2d6e6c359c5f5a3e028c2d148a8f5b90bf3399a18a7"
 dependencies = [
  "aws-smithy-async",
  "aws-smithy-types",
@@ -687,9 +687,9 @@ checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
 
 [[package]]
 name = "base64"
-version = "0.22.0"
+version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
 [[package]]
 name = "base64-simd"
@@ -1849,7 +1849,7 @@ dependencies = [
  "aws-config",
  "aws-sdk-s3",
  "axum",
- "base64 0.22.0",
+ "base64 0.22.1",
  "chrono",
  "clap",
  "csv",
@@ -2681,7 +2681,7 @@ version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10"
 dependencies = [
- "base64 0.22.0",
+ "base64 0.22.1",
  "bytes",
  "encoding_rs",
  "futures-core",
@@ -2951,7 +2951,7 @@ version = "2.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d"
 dependencies = [
- "base64 0.22.0",
+ "base64 0.22.1",
  "rustls-pki-types",
 ]
 
@@ -3106,9 +3106,9 @@ checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca"
 
 [[package]]
 name = "serde"
-version = "1.0.199"
+version = "1.0.200"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c9f6e76df036c77cd94996771fb40db98187f096dd0b9af39c6c6e452ba966a"
+checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f"
 dependencies = [
  "serde_derive",
 ]
@@ -3126,9 +3126,9 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.199"
+version = "1.0.200"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11bd257a6541e141e42ca6d24ae26f7714887b47e89aa739099104c7e4d3b7fc"
+checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/Cargo.toml b/Cargo.toml
index 48c969bb..5f1f1236 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,14 +15,14 @@ authors = ["Sergio Castaño Arteaga", "Cintia Sanchez Garcia"]
 homepage = "https://github.com/cncf/landscape2"
 
 [workspace.dependencies]
-anyhow = "1.0.82"
+anyhow = "1.0.83"
 askama = { version = "0.12.1", features = ["serde-json"] }
 askama_escape = { version = "0.10.3", features = ["json"] }
 async-trait = "0.1.80"
-aws-config = "1.2.1"
-aws-sdk-s3 = "1.24.0"
+aws-config = "1.3.0"
+aws-sdk-s3 = "1.25.0"
 axum = "0.7.5"
-base64 = "0.22.0"
+base64 = "0.22.1"
 chrono = { version = "0.4.38", features = ["serde"] }
 clap = { version = "4.5.4", features = ["derive"] }
 csv = "1.3.0"
@@ -50,7 +50,7 @@ reqwest = { version = "0.12.4", features = ["json", "native-tls-vendored"] }
 reqwest_octorust = { package = "reqwest", version = "0.11.14", default-features = false, features = ["json", "multipart"] }
 reqwest-middleware = "0.2.2"
 rust-embed = "8.3.0"
-serde = { version = "1.0.199", features = ["derive"] }
+serde = { version = "1.0.200", features = ["derive"] }
 serde_json = "1.0.116"
 serde-wasm-bindgen = "0.6.5"
 serde_yaml = "0.9.34"

From 78a0623ceaed1003c8bf0ae02273682cbc254142 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cintia=20S=C3=A1nchez=20Garc=C3=ADa?= <cynthiasg@icloud.com>
Date: Tue, 7 May 2024 13:59:50 +0200
Subject: [PATCH 49/55] Open item details modal from zoom view (#620)

Closes #134

Signed-off-by: Cintia Sanchez Garcia <cynthiasg@icloud.com>
---
 ui/webapp/src/data.ts                           | 1 +
 ui/webapp/src/hooks/useOutsideClick.ts          | 2 +-
 ui/webapp/src/layout/common/FullScreenModal.tsx | 4 +++-
 ui/webapp/src/layout/common/Modal.tsx           | 6 +++++-
 ui/webapp/src/layout/common/itemModal/index.tsx | 3 ++-
 ui/webapp/src/layout/common/zoomModal/index.tsx | 5 +++--
 6 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/ui/webapp/src/data.ts b/ui/webapp/src/data.ts
index a143460a..adc2f267 100644
--- a/ui/webapp/src/data.ts
+++ b/ui/webapp/src/data.ts
@@ -200,6 +200,7 @@ export const FILTER_CATEGORIES_PER_TITLE: FilterCategoriesPerTitle = {
 };
 
 export const BANNER_ID = 'banner-event';
+export const ITEM_VIEW = 'item-view';
 
 export const SORT_OPTION_LABEL = {
   [SortOption.Name]: 'Name',
diff --git a/ui/webapp/src/hooks/useOutsideClick.ts b/ui/webapp/src/hooks/useOutsideClick.ts
index 048469a9..9804abc1 100644
--- a/ui/webapp/src/hooks/useOutsideClick.ts
+++ b/ui/webapp/src/hooks/useOutsideClick.ts
@@ -23,7 +23,7 @@ export const useOutsideClick = (
       if (isNull(excludedItem)) return false;
       return e.target === excludedItem || excludedItem!.contains(e.target as HTMLElement);
     });
-    return test.every(Boolean);
+    return test.some(Boolean);
   };
 
   const onEvent = (e: MouseEvent) => {
diff --git a/ui/webapp/src/layout/common/FullScreenModal.tsx b/ui/webapp/src/layout/common/FullScreenModal.tsx
index ed6160a5..16cb2a47 100644
--- a/ui/webapp/src/layout/common/FullScreenModal.tsx
+++ b/ui/webapp/src/layout/common/FullScreenModal.tsx
@@ -12,13 +12,15 @@ interface Props {
   open?: boolean;
   onClose?: () => void;
   initialRefs?: Accessor<HTMLElement>[];
+  excludedIds?: string[];
 }
 
 const FullScreenModal = (props: Props) => {
   const [openStatus, setOpenStatus] = createSignal(false);
+  const excludedIds = () => (props.excludedIds ? [BANNER_ID, ...props.excludedIds] : [BANNER_ID]);
 
   useBodyScroll(openStatus, 'modal');
-  useOutsideClick(props.initialRefs || [], [BANNER_ID], openStatus, () => {
+  useOutsideClick(props.initialRefs || [], excludedIds(), openStatus, () => {
     closeModal();
   });
 
diff --git a/ui/webapp/src/layout/common/Modal.tsx b/ui/webapp/src/layout/common/Modal.tsx
index 829deba9..ac526588 100644
--- a/ui/webapp/src/layout/common/Modal.tsx
+++ b/ui/webapp/src/layout/common/Modal.tsx
@@ -21,6 +21,7 @@ interface Props {
   size?: string;
   noScrollable?: boolean;
   visibleContentBackdrop?: boolean;
+  id?: string;
 }
 
 const Modal = (props: Props) => {
@@ -55,7 +56,10 @@ const Modal = (props: Props) => {
             [`${props.modalDialogClass}`]: !isUndefined(props.modalDialogClass),
           }}
         >
-          <div class={`modal-content rounded-0 border border-2 mx-auto position-relative ${styles.content}`}>
+          <div
+            id={props.id}
+            class={`modal-content rounded-0 border border-2 mx-auto position-relative ${styles.content}`}
+          >
             <Show when={props.header}>
               <div class={`modal-header rounded-0 d-flex flex-row align-items-center ${styles.header}`}>
                 <div class={`modal-title h5 m-0 m-lg-2 flex-grow-1 ${styles.headerContent}`}>{props.header}</div>
diff --git a/ui/webapp/src/layout/common/itemModal/index.tsx b/ui/webapp/src/layout/common/itemModal/index.tsx
index 1ea21311..03714787 100644
--- a/ui/webapp/src/layout/common/itemModal/index.tsx
+++ b/ui/webapp/src/layout/common/itemModal/index.tsx
@@ -2,7 +2,7 @@ import isNull from 'lodash/isNull';
 import isUndefined from 'lodash/isUndefined';
 import { createEffect, createSignal, Show } from 'solid-js';
 
-import { SMALL_DEVICES_BREAKPOINTS } from '../../../data';
+import { ITEM_VIEW, SMALL_DEVICES_BREAKPOINTS } from '../../../data';
 import useBreakpointDetect from '../../../hooks/useBreakpointDetect';
 import { Item } from '../../../types';
 import itemsDataGetter from '../../../utils/itemsDataGetter';
@@ -48,6 +48,7 @@ const ItemModal = () => {
         modalDialogClass={visibleEventContent() ? styles.visibleUpcomingEvent : ''}
         bodyClass={styles.modalBody}
         onClose={() => updateActiveItemId()}
+        id={ITEM_VIEW}
       >
         <Show
           when={!isUndefined(itemInfo()) && !isNull(itemInfo())}
diff --git a/ui/webapp/src/layout/common/zoomModal/index.tsx b/ui/webapp/src/layout/common/zoomModal/index.tsx
index 44a2dfc3..4f2f010e 100644
--- a/ui/webapp/src/layout/common/zoomModal/index.tsx
+++ b/ui/webapp/src/layout/common/zoomModal/index.tsx
@@ -3,7 +3,7 @@ import isNull from 'lodash/isNull';
 import isUndefined from 'lodash/isUndefined';
 import { Accessor, createEffect, createSignal, For, on, Show, untrack } from 'solid-js';
 
-import { ZOOM_LEVELS } from '../../../data';
+import { ITEM_VIEW, ZOOM_LEVELS } from '../../../data';
 import { BaseItem, Item } from '../../../types';
 import calculateGridItemsPerRow from '../../../utils/calculateGridItemsPerRow';
 import calculateGridWidthInPx from '../../../utils/calculateGridWidthInPx';
@@ -86,6 +86,7 @@ const ZoomModal = () => {
       <FullScreenModal
         open
         initialRefs={!isUndefined(modal()) ? [modal as Accessor<HTMLDivElement>] : undefined}
+        excludedIds={[ITEM_VIEW]}
         onClose={() => updateActiveSection()}
       >
         <div class="h-100" ref={setContainer}>
@@ -134,8 +135,8 @@ const ZoomModal = () => {
                             <GridItem
                               item={item}
                               borderColor={visibleZoomSection()!.bgColor}
-                              showMoreInfo={false}
                               container={gridContainer()}
+                              showMoreInfo
                               activeDropdown
                             />
                           );

From 7f20047a5fd93d3f781711753ae8f3337485ee04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cintia=20S=C3=A1nchez=20Garc=C3=ADa?= <cynthiasg@icloud.com>
Date: Thu, 9 May 2024 11:54:09 +0200
Subject: [PATCH 50/55] Add new embed card style (#622)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Cintia Sanchez Garcia <cynthiasg@icloud.com>
Signed-off-by: Sergio Castaño Arteaga <tegioz@icloud.com>
Co-authored-by: Cintia Sanchez Garcia <cynthiasg@icloud.com>
Co-authored-by: Sergio Castaño Arteaga <tegioz@icloud.com>
---
 ADOPTERS.md                                   |   1 +
 README.md                                     |   2 +-
 crates/core/src/data.rs                       |  56 +++-
 crates/core/src/datasets.rs                   | 117 +++++++-
 ui/embed/src/App.tsx                          |   2 +
 ui/embed/src/common/CardItem.tsx              | 251 ++++++++++++++++++
 ui/embed/src/common/Loading.tsx               |   2 +-
 ui/embed/src/common/SVGIcon.tsx               |  68 +++++
 ui/embed/src/common/StyleView.tsx             |  20 ++
 ui/embed/src/index.tsx                        |  11 +-
 ui/embed/src/styles/GlobalStyles.ts           |  12 +
 ui/embed/src/types.ts                         |  27 +-
 .../src/layout/common/itemModal/Content.tsx   |  33 +--
 .../layout/common/itemModal/MobileContent.tsx |  27 +-
 ui/webapp/src/layout/explore/card/Card.tsx    |  23 +-
 ui/webapp/src/layout/explore/mobile/Card.tsx  |  20 +-
 .../layout/navigation/EmbedModal.module.css   |   2 +-
 .../src/layout/navigation/EmbedModal.tsx      | 244 +++++++++--------
 ui/webapp/src/types.ts                        |   1 +
 19 files changed, 705 insertions(+), 214 deletions(-)
 create mode 100644 ui/embed/src/common/CardItem.tsx
 create mode 100644 ui/embed/src/common/SVGIcon.tsx
 create mode 100644 ui/embed/src/styles/GlobalStyles.ts

diff --git a/ADOPTERS.md b/ADOPTERS.md
index b6a1910a..3bf94f7f 100644
--- a/ADOPTERS.md
+++ b/ADOPTERS.md
@@ -5,6 +5,7 @@ If you are using **Landscape2**, please consider adding your landscape to this l
 *(ordered alphabetically)*
 
 - [Academy Software Foundation](https://aswf.landscape2.io)
+- [Alliance for OpenUSD](https://aousd.landscape2.io)
 - [CAMARA Project](https://camara.landscape2.io)
 - [Cloud Native Computing Foundation](https://landscape.cncf.io)
 - [Continuous Delivery Foundation](https://cdf.landscape2.io)
diff --git a/README.md b/README.md
index 710ff63e..5b1637af 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ In addition to the information available in the landscape data file, the tool co
 
 - **GitHub**: a list of comma separated GitHub tokens with `public_repo` scope can be provided in the `GITHUB_TOKENS` environment variable. When these tokens are not provided no information from GitHub will be collected. If the expected number of items in the landscape is large it is recommended to provide more than one token to avoid hitting rate limits and speed up the collection of data (the concurrency of the process will be based on the number of tokens provided).
 
-- **Crunchbase**: a Crunchbase API key can be provided in the `CRUNCHBASE_API_KEY` environment variable. If this token is not provided no information from Crunchbase will be collected.
+- **Crunchbase**: a Crunchbase API key can be provided in the `CRUNCHBASE_API_KEY` environment variable. If this token is not provided no information from Crunchbase will be collected. Please note that landscape2 *needs access to the full Crunchbase API*, which requires an [Enterprise or Application license](https://data.crunchbase.com/docs/using-the-api).
 
 ## Installation
 
diff --git a/crates/core/src/data.rs b/crates/core/src/data.rs
index 2f1e57cb..d3887513 100644
--- a/crates/core/src/data.rs
+++ b/crates/core/src/data.rs
@@ -323,7 +323,6 @@ impl From<legacy::LandscapeData> for LandscapeData {
                         unnamed_organization: legacy_item.unnamed_organization,
                         ..Default::default()
                     };
-                    item.set_id();
 
                     // Additional categories
                     if let Some(second_path) = legacy_item.second_path {
@@ -436,6 +435,8 @@ impl From<legacy::LandscapeData> for LandscapeData {
                         }
                     }
 
+                    item.set_id();
+                    item.set_website();
                     data.items.push(item);
                 }
             }
@@ -488,6 +489,7 @@ pub struct Item {
     pub logo: String,
     pub name: String,
     pub subcategory: String,
+    pub website: String,
 
     #[serde(skip_serializing_if = "Option::is_none")]
     pub accepted_at: Option<NaiveDate>,
@@ -658,6 +660,26 @@ impl Item {
             normalize_name(&self.name)
         );
     }
+
+    /// Set item's website.
+    ///
+    /// The homepage URL is the preferred source for the website. However, when
+    /// it matches the primary repository URL, we'll fallback to the homepage
+    /// URL defined in the Crunchbase data -when available-.
+    pub fn set_website(&mut self) {
+        if let Some(primary_repository) = self.primary_repository() {
+            if self.homepage_url == primary_repository.url {
+                if let Some(crunchbase_data) = &self.crunchbase_data {
+                    if let Some(cb_homepage_url) = &crunchbase_data.homepage_url {
+                        self.website.clone_from(cb_homepage_url);
+                        return;
+                    }
+                }
+            }
+        }
+
+        self.website.clone_from(&self.homepage_url);
+    }
 }
 
 /// Crunchbase acquisition details.
@@ -1356,6 +1378,7 @@ mod tests {
                 training_type: Some("training_type".to_string()),
                 twitter_url: Some("twitter_url".to_string()),
                 unnamed_organization: Some(false),
+                website: "homepage_url".to_string(),
                 youtube_url: Some("youtube_url".to_string()),
             }],
         };
@@ -1488,4 +1511,35 @@ mod tests {
         item.set_id();
         assert_eq!(item.id, "category--subcategory--item".to_string());
     }
+
+    #[test]
+    fn item_set_website_from_crunchbase_data() {
+        let mut item = Item {
+            crunchbase_data: Some(Organization {
+                homepage_url: Some("crunchbase_homepage_url".to_string()),
+                ..Default::default()
+            }),
+            homepage_url: "repository_url".to_string(),
+            repositories: Some(vec![Repository {
+                url: "repository_url".to_string(),
+                primary: Some(true),
+                ..Default::default()
+            }]),
+            ..Default::default()
+        };
+
+        item.set_website();
+        assert_eq!(item.website, "crunchbase_homepage_url".to_string());
+    }
+
+    #[test]
+    fn item_set_website_from_homepage_url() {
+        let mut item = Item {
+            homepage_url: "homepage_url".to_string(),
+            ..Default::default()
+        };
+
+        item.set_website();
+        assert_eq!(item.website, "homepage_url".to_string());
+    }
 }
diff --git a/crates/core/src/datasets.rs b/crates/core/src/datasets.rs
index b30816cc..db52b614 100644
--- a/crates/core/src/datasets.rs
+++ b/crates/core/src/datasets.rs
@@ -47,7 +47,7 @@ impl Datasets {
     pub fn new(i: &NewDatasetsInput) -> Self {
         Datasets {
             base: Base::new(i.landscape_data, i.settings, i.guide, i.qr_code),
-            embed: Embed::new(i.landscape_data),
+            embed: Embed::new(i.landscape_data, i.settings),
             full: Full::new(i.landscape_data, i.crunchbase_data, i.github_data),
             stats: Stats::new(i.landscape_data, i.settings),
         }
@@ -252,8 +252,10 @@ pub mod base {
 /// This dataset contains some information about all the embeddable views that
 /// can be generated from the information available in the landscape data.
 pub mod embed {
-    use super::base::Item;
-    use crate::data::{Category, LandscapeData};
+    use crate::{
+        data::{self, AdditionalCategory, Category, LandscapeData},
+        settings::LandscapeSettings,
+    };
     use serde::{Deserialize, Serialize};
     use std::collections::HashMap;
 
@@ -266,13 +268,14 @@ pub mod embed {
 
     impl Embed {
         /// Create a new Embed instance from the data provided.
-        pub fn new(landscape_data: &LandscapeData) -> Self {
+        pub fn new(landscape_data: &LandscapeData, settings: &LandscapeSettings) -> Self {
             let mut views = HashMap::new();
 
             for category in &landscape_data.categories {
                 // Full category view
                 let key = category.normalized_name.clone();
                 let view = EmbedView {
+                    foundation: settings.foundation.clone(),
                     category: category.clone(),
                     items: landscape_data
                         .items
@@ -287,6 +290,7 @@ pub mod embed {
                 for subcategory in &category.subcategories {
                     let key = format!("{}--{}", category.normalized_name, subcategory.normalized_name,);
                     let view = EmbedView {
+                        foundation: settings.foundation.clone(),
                         category: Category {
                             name: category.name.clone(),
                             normalized_name: category.normalized_name.clone(),
@@ -314,10 +318,59 @@ pub mod embed {
     #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
     pub struct EmbedView {
         pub category: Category,
+        pub foundation: String,
 
         #[serde(default, skip_serializing_if = "Vec::is_empty")]
         pub items: Vec<Item>,
     }
+
+    /// Embed dataset item information.
+    #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
+    pub struct Item {
+        pub category: String,
+        pub id: String,
+        pub name: String,
+        pub logo: String,
+        pub subcategory: String,
+        pub website: String,
+
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub additional_categories: Option<Vec<AdditionalCategory>>,
+
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub description: Option<String>,
+
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub maturity: Option<String>,
+
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub member_subcategory: Option<String>,
+
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub organization_name: Option<String>,
+
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub primary_repository_url: Option<String>,
+    }
+
+    impl From<&data::Item> for Item {
+        fn from(data_item: &data::Item) -> Self {
+            Item {
+                additional_categories: data_item.additional_categories.clone(),
+                category: data_item.category.clone(),
+                description: data_item.description().cloned(),
+                id: data_item.id.clone(),
+                name: data_item.name.clone(),
+                logo: data_item.logo.clone(),
+                maturity: data_item.maturity.clone(),
+                member_subcategory: data_item.member_subcategory.clone(),
+                organization_name: data_item.crunchbase_data.as_ref().and_then(|org| org.name.clone()),
+                primary_repository_url: data_item.primary_repository().map(|r| r.url.clone()),
+                subcategory: data_item.subcategory.clone(),
+                website: data_item.website.clone(),
+            }
+        }
+    }
 }
 
 /// Full dataset.
@@ -588,9 +641,14 @@ mod tests {
             }],
             items: vec![item.clone()],
         };
+        let settings = LandscapeSettings {
+            foundation: "Foundation".to_string(),
+            ..Default::default()
+        };
 
-        let embed = Embed::new(&landscape_data);
+        let embed = Embed::new(&landscape_data, &settings);
         let expected_embed_view = EmbedView {
+            foundation: "Foundation".to_string(),
             category: data::Category {
                 name: "Category 1".to_string(),
                 normalized_name: "category-1".to_string(),
@@ -612,6 +670,55 @@ mod tests {
         pretty_assertions::assert_eq!(embed, expected_embed);
     }
 
+    #[test]
+    fn embed_item_from_data_item() {
+        let data_item = data::Item {
+            additional_categories: Some(vec![AdditionalCategory {
+                category: "Category 2".to_string(),
+                subcategory: "Subcategory 3".to_string(),
+            }]),
+            category: "Category 1".to_string(),
+            crunchbase_data: Some(Organization {
+                name: Some("Organization".to_string()),
+                ..Default::default()
+            }),
+            description: Some("Description".to_string()),
+            id: "id".to_string(),
+            logo: "logo.svg".to_string(),
+            maturity: Some("graduated".to_string()),
+            member_subcategory: Some("Member subcategory".to_string()),
+            name: "Item".to_string(),
+            repositories: Some(vec![Repository {
+                url: "https://repository.url".to_string(),
+                primary: Some(true),
+                ..Default::default()
+            }]),
+            subcategory: "Subcategory 1".to_string(),
+            website: "https://homepage.url".to_string(),
+            ..Default::default()
+        };
+
+        let item = embed::Item::from(&data_item);
+        let expected_item = embed::Item {
+            additional_categories: Some(vec![AdditionalCategory {
+                category: "Category 2".to_string(),
+                subcategory: "Subcategory 3".to_string(),
+            }]),
+            category: "Category 1".to_string(),
+            description: Some("Description".to_string()),
+            id: "id".to_string(),
+            logo: "logo.svg".to_string(),
+            maturity: Some("graduated".to_string()),
+            member_subcategory: Some("Member subcategory".to_string()),
+            name: "Item".to_string(),
+            organization_name: Some("Organization".to_string()),
+            primary_repository_url: Some("https://repository.url".to_string()),
+            subcategory: "Subcategory 1".to_string(),
+            website: "https://homepage.url".to_string(),
+        };
+        pretty_assertions::assert_eq!(item, expected_item);
+    }
+
     #[test]
     fn full_new() {
         let item = data::Item {
diff --git a/ui/embed/src/App.tsx b/ui/embed/src/App.tsx
index 51fbde72..5aa5d88a 100644
--- a/ui/embed/src/App.tsx
+++ b/ui/embed/src/App.tsx
@@ -298,6 +298,7 @@ const App = () => {
             fallback={
               <StyleView
                 items={data()!.items}
+                foundation={data()!.foundation}
                 style={itemsStyleView()}
                 size={itemsSize()}
                 alignment={itemsAlignment()}
@@ -338,6 +339,7 @@ const App = () => {
                     </SubcategoryTitle>
                     <StyleView
                       items={items}
+                      foundation={data()!.foundation}
                       style={itemsStyleView()}
                       size={itemsSize()}
                       alignment={itemsAlignment()}
diff --git a/ui/embed/src/common/CardItem.tsx b/ui/embed/src/common/CardItem.tsx
new file mode 100644
index 00000000..31db71a3
--- /dev/null
+++ b/ui/embed/src/common/CardItem.tsx
@@ -0,0 +1,251 @@
+import { Show } from 'solid-js';
+import { css } from 'solid-styled-components';
+
+import { BaseItem, SVGIconKind } from '../types';
+import getUrl from '../utils/getUrl';
+import ExternalLink from './ExternalLink';
+import Image from './Image';
+import SVGIcon from './SVGIcon';
+
+interface Props {
+  item: BaseItem;
+  foundation: string;
+}
+
+const ColClass = css`
+  flex: 0 0 auto;
+  margin-top: 24px;
+  padding: 0 12px;
+  width: 100%;
+
+  @media (min-width: 768px) {
+    width: 50%;
+  }
+
+  @media (min-width: 992px) {
+    width: 33.333333%;
+  }
+
+  @media (min-width: 1400px) {
+    width: 25%;
+  }
+
+  @media (min-width: 1920px) {
+    width: 20%;
+  }
+`;
+
+const LinkClass = css`
+  text-decoration: none;
+`;
+
+const CardClass = css`
+  position: relative;
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  height: 192px;
+  border: 1px solid #d2d2d2;
+  padding: 1rem;
+  font-size: 90%;
+
+  &:hover {
+    border-color: var(--bg-color);
+    box-shadow: 0 0 5px 0 rgba(13, 110, 253, 0.25);
+  }
+`;
+
+const CardHeaderClass = css`
+  width: 100%;
+  display: flex;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+`;
+
+const ImageWrapperClass = css`
+  width: 100%;
+  height: 100%;
+  display: flex;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+  -webkit-box-pack: center;
+  -ms-flex-pack: center;
+  justify-content: center;
+  height: 90px;
+  width: 70px;
+  min-width: 70px;
+`;
+
+const ImageClass = css`
+  margin: auto;
+  font-size: calc(var(--card-size-height) / 1.5);
+  width: 100%;
+  max-height: 100%;
+  height: auto;
+`;
+
+const CardItemContentClass = css`
+  background-color: #f8f9fa;
+  padding: 1rem;
+  width: calc(100% - 70px - 1rem);
+  height: 105px;
+  margin-left: 1rem;
+`;
+
+const ItemNameClass = css`
+  font-size: 1.15rem;
+  line-height: 1.15;
+  font-weight: 600;
+  padding-bottom: 0.25rem;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+`;
+
+const OrgNameClass = css`
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  color: rgba(33, 37, 41, 0.75);
+  font-size: 0.875em;
+  height: 15px;
+`;
+
+const ItemInfoWrapper = css`
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  overflow: hidden;
+  height: 26px;
+`;
+
+const BadgeClass = css`
+  margin-top: 0.5rem;
+  border: 1px solid transparent;
+  font-size: 0.6rem;
+  font-weight: 600;
+  text-transform: uppercase;
+  line-height: 0.5rem;
+  padding: 0.2rem 0.5rem;
+  margin-right: 0.5rem;
+  max-width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+`;
+
+const MemberBadgeClass = css`
+  border-color: rgb(73, 80, 87) !important;
+  color: rgb(73, 80, 87);
+`;
+
+const MaturityBadgeClass = css`
+  border-color: rgb(108, 117, 125) !important;
+  background-color: rgb(108, 117, 125);
+  color: #fff;
+  max-width: calc(50% - 0.5rem) !important;
+`;
+
+const FoundationBadgeClass = css`
+  border-color: var(--bg-color) !important;
+  background-color: var(--bg-color);
+  color: #fff;
+  max-width: calc(50% - 0.5rem) !important;
+`;
+
+const IconClass = css`
+  margin-top: 0.5rem;
+  position: relative;
+  color: inherit;
+  height: 18px;
+  line-height: 22px;
+  width: auto;
+  margin-right: 0.5rem;
+
+  &:hover {
+    color: var(--bg-color);
+  }
+
+  svg {
+    height: 15px;
+    width: 15px;
+  }
+`;
+
+const DescriptionClass = css`
+  font-size: 0.8rem;
+  line-height: 1.5;
+  color: rgba(33, 37, 41, 0.75);
+  margin-top: 1rem;
+  overflow: hidden;
+  text-overflow: unset;
+  white-space: inherit;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+  word-wrap: normal;
+  max-height: 36px;
+`;
+
+const CardItem = (props: Props) => {
+  return (
+    <div class={ColClass}>
+      <ExternalLink href={`${getUrl()}?item=${props.item.id}`} class={LinkClass}>
+        <div class={CardClass}>
+          <div class={CardHeaderClass}>
+            <div class={ImageWrapperClass}>
+              <Image name={props.item.name} class={ImageClass} logo={props.item.logo} />
+            </div>
+            <div class={CardItemContentClass}>
+              <div class={ItemNameClass}>{props.item.name}</div>
+              <div class={OrgNameClass}>
+                <Show when={props.item.organization_name}>{props.item.organization_name}</Show>
+              </div>
+              <div class={ItemInfoWrapper}>
+                <Show
+                  when={props.item.maturity}
+                  fallback={
+                    <Show when={props.item.member_subcategory}>
+                      <div
+                        title={`${props.item.member_subcategory} member`}
+                        class={`${BadgeClass} ${MemberBadgeClass}`}
+                      >
+                        {props.item.member_subcategory} member
+                      </div>
+                    </Show>
+                  }
+                >
+                  <>
+                    <div title={props.item.maturity} class={`${BadgeClass} ${FoundationBadgeClass}`}>
+                      {props.foundation}
+                    </div>
+                    <div title={props.item.maturity} class={`${BadgeClass} ${MaturityBadgeClass}`}>
+                      {props.item.maturity}
+                    </div>
+                  </>
+                </Show>
+                <Show when={props.item.website}>
+                  <ExternalLink title="Website" class={IconClass} href={props.item.website!}>
+                    <SVGIcon kind={SVGIconKind.World} />
+                  </ExternalLink>
+                </Show>
+                <Show when={props.item.primary_repository_url}>
+                  <ExternalLink title="Repository" class={IconClass} href={props.item.primary_repository_url!}>
+                    <SVGIcon kind={SVGIconKind.GitHubCircle} />
+                  </ExternalLink>
+                </Show>
+              </div>
+            </div>
+          </div>
+          <div class={DescriptionClass}>
+            {props.item.description || 'This item does not have a description available yet'}
+          </div>
+        </div>
+      </ExternalLink>
+    </div>
+  );
+};
+
+export default CardItem;
diff --git a/ui/embed/src/common/Loading.tsx b/ui/embed/src/common/Loading.tsx
index 687cd9f3..9b3fd570 100644
--- a/ui/embed/src/common/Loading.tsx
+++ b/ui/embed/src/common/Loading.tsx
@@ -123,7 +123,7 @@ const Loading = (props: Props) => {
   return (
     <Wrapper>
       <SpinnerWrapper>
-        <div class="d-flex justify-content-center">
+        <div>
           <Spinner bgColor={props.bgColor} />
         </div>
       </SpinnerWrapper>
diff --git a/ui/embed/src/common/SVGIcon.tsx b/ui/embed/src/common/SVGIcon.tsx
new file mode 100644
index 00000000..287f84f5
--- /dev/null
+++ b/ui/embed/src/common/SVGIcon.tsx
@@ -0,0 +1,68 @@
+import { ValidComponent } from 'solid-js';
+import { Dynamic } from 'solid-js/web';
+
+import { SVGIconKind } from '../types';
+
+interface Props {
+  class?: string;
+  kind: SVGIconKind;
+}
+
+interface IconProps {
+  class?: string;
+}
+
+const GitHubCircle = (props: IconProps) => (
+  <svg
+    class={props.class}
+    stroke="currentColor"
+    fill="currentColor"
+    stroke-width="0"
+    viewBox="0 0 24 24"
+    height="1em"
+    width="1em"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path d="M12 0a12 12 0 1 0 0 24 12 12 0 0 0 0-24zm3.163 21.783h-.093a.513.513 0 0 1-.382-.14.513.513 0 0 1-.14-.372v-1.406c.006-.467.01-.94.01-1.416a3.693 3.693 0 0 0-.151-1.028 1.832 1.832 0 0 0-.542-.875 8.014 8.014 0 0 0 2.038-.471 4.051 4.051 0 0 0 1.466-.964c.407-.427.71-.943.885-1.506a6.77 6.77 0 0 0 .3-2.13 4.138 4.138 0 0 0-.26-1.476 3.892 3.892 0 0 0-.795-1.284 2.81 2.81 0 0 0 .162-.582c.033-.2.05-.402.05-.604 0-.26-.03-.52-.09-.773a5.309 5.309 0 0 0-.221-.763.293.293 0 0 0-.111-.02h-.11c-.23.002-.456.04-.674.111a5.34 5.34 0 0 0-.703.26 6.503 6.503 0 0 0-.661.343c-.215.127-.405.249-.573.362a9.578 9.578 0 0 0-5.143 0 13.507 13.507 0 0 0-.572-.362 6.022 6.022 0 0 0-.672-.342 4.516 4.516 0 0 0-.705-.261 2.203 2.203 0 0 0-.662-.111h-.11a.29.29 0 0 0-.11.02 5.844 5.844 0 0 0-.23.763c-.054.254-.08.513-.081.773 0 .202.017.404.051.604.033.199.086.394.16.582A3.888 3.888 0 0 0 5.702 10a4.142 4.142 0 0 0-.263 1.476 6.871 6.871 0 0 0 .292 2.12c.181.563.483 1.08.884 1.516.415.422.915.75 1.466.964.653.25 1.337.41 2.033.476a1.828 1.828 0 0 0-.452.633 2.99 2.99 0 0 0-.2.744 2.754 2.754 0 0 1-1.175.27 1.788 1.788 0 0 1-1.065-.3 2.904 2.904 0 0 1-.752-.824 3.1 3.1 0 0 0-.292-.382 2.693 2.693 0 0 0-.372-.343 1.841 1.841 0 0 0-.432-.24 1.2 1.2 0 0 0-.481-.101c-.04.001-.08.005-.12.01a.649.649 0 0 0-.162.02.408.408 0 0 0-.13.06.116.116 0 0 0-.06.1.33.33 0 0 0 .14.242c.093.074.17.131.232.171l.03.021c.133.103.261.214.382.333.112.098.213.209.3.33.09.119.168.246.231.381.073.134.15.288.231.463.188.474.522.875.954 1.145.453.243.961.364 1.476.351.174 0 .349-.01.522-.03.172-.028.343-.057.515-.091v1.743a.5.5 0 0 1-.533.521h-.062a10.286 10.286 0 1 1 6.324 0v.005z" />
+  </svg>
+);
+
+const World = (props: IconProps) => (
+  <svg
+    class={props.class}
+    stroke="currentColor"
+    fill="currentColor"
+    stroke-width="0"
+    viewBox="0 0 512 512"
+    height="1em"
+    width="1em"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path
+      fill="none"
+      stroke-miterlimit="10"
+      stroke-width="32"
+      d="M256 48C141.13 48 48 141.13 48 256s93.13 208 208 208 208-93.13 208-208S370.87 48 256 48z"
+    />
+    <path
+      fill="none"
+      stroke-miterlimit="10"
+      stroke-width="32"
+      d="M256 48c-58.07 0-112.67 93.13-112.67 208S197.93 464 256 464s112.67-93.13 112.67-208S314.07 48 256 48z"
+    />
+    <path
+      fill="none"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+      stroke-width="32"
+      d="M117.33 117.33c38.24 27.15 86.38 43.34 138.67 43.34s100.43-16.19 138.67-43.34m0 277.34c-38.24-27.15-86.38-43.34-138.67-43.34s-100.43 16.19-138.67 43.34"
+    />
+    <path fill="none" stroke-miterlimit="10" stroke-width="32" d="M256 48v416m208-208H48" />
+  </svg>
+);
+
+const icons: ValidComponent[] = [GitHubCircle, World];
+
+const SVGIcon = (props: Props) => <Dynamic component={icons[props.kind]} class={props.class} />;
+
+export default SVGIcon;
diff --git a/ui/embed/src/common/StyleView.tsx b/ui/embed/src/common/StyleView.tsx
index 5a4238ae..75119808 100644
--- a/ui/embed/src/common/StyleView.tsx
+++ b/ui/embed/src/common/StyleView.tsx
@@ -2,11 +2,13 @@ import { For, Match, Switch } from 'solid-js';
 import { css, styled } from 'solid-styled-components';
 
 import { Alignment, BaseItem, Size, Style } from '../types';
+import CardItem from './CardItem';
 import GridItem from './GridItem';
 
 interface Props {
   style: Style;
   size: Size;
+  foundation: string;
   items: BaseItem[];
   alignment: Alignment;
   displayName: boolean;
@@ -73,6 +75,15 @@ const ItemClass = css`
   height: var(--card-size-height);
 `;
 
+const CardWrapper = css`
+  display: flex;
+  flex-wrap: wrap;
+  margin: 0 -12px;
+  margin-top: -24px;
+  width: calc(100% + 24px);
+  overflow: hidden;
+`;
+
 const StyleView = (props: Props) => {
   return (
     <Switch>
@@ -131,6 +142,15 @@ const StyleView = (props: Props) => {
           </For>
         </Grid>
       </Match>
+      <Match when={props.style === Style.Card}>
+        <div class={CardWrapper}>
+          <For each={props.items}>
+            {(item: BaseItem) => {
+              return <CardItem item={item} foundation={props.foundation} />;
+            }}
+          </For>
+        </div>
+      </Match>
     </Switch>
   );
 };
diff --git a/ui/embed/src/index.tsx b/ui/embed/src/index.tsx
index fa346d72..36d6a9f3 100644
--- a/ui/embed/src/index.tsx
+++ b/ui/embed/src/index.tsx
@@ -1,7 +1,16 @@
 import { render } from 'solid-js/web';
 
 import App from './App';
+import GlobalStyles from './styles/GlobalStyles';
 
 const root = document.getElementById('landscape-embeddable-view');
 
-render(() => <App />, root!);
+render(
+  () => (
+    <>
+      <GlobalStyles />
+      <App />
+    </>
+  ),
+  root!
+);
diff --git a/ui/embed/src/styles/GlobalStyles.ts b/ui/embed/src/styles/GlobalStyles.ts
new file mode 100644
index 00000000..dd88ae93
--- /dev/null
+++ b/ui/embed/src/styles/GlobalStyles.ts
@@ -0,0 +1,12 @@
+import { createGlobalStyles, StylesArg } from 'solid-styled-components';
+
+const CustomStyles = {
+  body: {
+    'overflow-x': 'hidden',
+    margin: '0px',
+  },
+};
+
+const GlobalStyles = createGlobalStyles(CustomStyles as StylesArg);
+
+export default GlobalStyles;
diff --git a/ui/embed/src/types.ts b/ui/embed/src/types.ts
index fd1619c8..b855ea27 100644
--- a/ui/embed/src/types.ts
+++ b/ui/embed/src/types.ts
@@ -17,6 +17,7 @@ export const TITLE_FGCOLOR_PARAM = 'fg-color';
 export const BASE_PATH_PARAM = 'base-path';
 
 export interface Data {
+  foundation: string;
   category: Category;
   items: BaseItem[];
 }
@@ -33,21 +34,30 @@ export interface Subcategory {
 }
 
 export interface BaseItem {
-  id: string;
+  additional_categories?: AdditionalCategory[];
+  description?: string;
   category: string;
-  oss?: boolean;
-  name: string;
+  id: string;
   logo: string;
-  subcategory: string;
-  description?: string;
+  name: string;
   maturity?: string;
-  tag?: string;
+  member_subcategory?: string;
+  organization_name?: string;
+  subcategory: string;
+  website?: string;
+  primary_repository_url?: string;
+}
+
+export interface AdditionalCategory {
+  category: string;
+  subcategory: string;
 }
 
 export enum Style {
   Basic = 'clean',
   BorderedBasic = 'bordered',
   ShadowedBasic = 'shadowed',
+  Card = 'card',
 }
 
 export enum Size {
@@ -70,6 +80,11 @@ export enum FontFamily {
   Monospace = 'monospace',
 }
 
+export enum SVGIconKind {
+  GitHubCircle,
+  World,
+}
+
 export const DEFAULT_DISPLAY_HEADER = true;
 export const DEFAULT_DISPLAY_CATEGORY_HEADER = true;
 export const DEFAULT_DISPLAY_CATEGORY_IN_SUBCATEGORY = false;
diff --git a/ui/webapp/src/layout/common/itemModal/Content.tsx b/ui/webapp/src/layout/common/itemModal/Content.tsx
index bf1e96aa..b2b2bd10 100644
--- a/ui/webapp/src/layout/common/itemModal/Content.tsx
+++ b/ui/webapp/src/layout/common/itemModal/Content.tsx
@@ -68,40 +68,27 @@ const Content = (props: Props) => {
   const itemInfo = () => props.item;
   const updateActiveItemId = useUpdateActiveItemId();
   const [description, setDescription] = createSignal<string>();
-  const [mainRepo, setMainRepo] = createSignal<Repository>();
-  const [websiteUrl, setWebsiteUrl] = createSignal<string>();
+  const [primaryRepo, setPrimaryRepo] = createSignal<Repository>();
 
   createEffect(
     on(itemInfo, () => {
       if (!isUndefined(itemInfo()) && !isNull(itemInfo())) {
-        let mainRepoTmp: Repository | undefined;
-        const websiteUrlTmp = itemInfo()!.homepage_url;
-        setWebsiteUrl(itemInfo()!.homepage_url);
+        let primaryRepoTmp: Repository | undefined;
         setDescription(getItemDescription(itemInfo()!));
         if (!isUndefined(itemInfo()!.repositories)) {
           itemInfo()!.repositories!.forEach((repo: Repository) => {
             if (repo.primary) {
-              mainRepoTmp = repo;
+              primaryRepoTmp = repo;
             }
           });
 
-          if (mainRepoTmp) {
-            setMainRepo(mainRepoTmp);
-          }
-        }
-
-        // If homepage_url is undefined or is equal to main repository url
-        // and maturity field is undefined,
-        // we use the homepage_url fron crunchbase
-        if (isUndefined(websiteUrlTmp) || (mainRepoTmp && websiteUrlTmp === mainRepoTmp.url)) {
-          if (itemInfo()!.crunchbase_data && itemInfo()!.crunchbase_data!.homepage_url) {
-            setWebsiteUrl(itemInfo()!.crunchbase_data!.homepage_url);
+          if (primaryRepoTmp) {
+            setPrimaryRepo(primaryRepoTmp);
           }
         }
       } else {
-        setMainRepo(undefined);
+        setPrimaryRepo(undefined);
         setDescription(undefined);
-        setWebsiteUrl(undefined);
         updateActiveItemId(); // Close modal
       }
     })
@@ -194,14 +181,14 @@ const Content = (props: Props) => {
 
               <div class="ms-auto">
                 <div class={`d-flex flex-row align-items-center ${styles.extra}`}>
-                  <Show when={!isUndefined(websiteUrl())}>
-                    <ExternalLink title="Website" class={`ms-3 ${styles.link}`} href={websiteUrl()!}>
+                  <Show when={!isUndefined(props.item!.website)}>
+                    <ExternalLink title="Website" class={`ms-3 ${styles.link}`} href={props.item!.website!}>
                       <SVGIcon kind={SVGIconKind.World} />
                     </ExternalLink>
                   </Show>
 
-                  <Show when={!isUndefined(mainRepo())}>
-                    <ExternalLink title="Repository" class={`ms-3 ${styles.link}`} href={mainRepo()!.url}>
+                  <Show when={!isUndefined(primaryRepo())}>
+                    <ExternalLink title="Repository" class={`ms-3 ${styles.link}`} href={primaryRepo()!.url}>
                       <SVGIcon kind={SVGIconKind.GitHubCircle} />
                     </ExternalLink>
                   </Show>
diff --git a/ui/webapp/src/layout/common/itemModal/MobileContent.tsx b/ui/webapp/src/layout/common/itemModal/MobileContent.tsx
index 1339b9b1..6178cd7a 100644
--- a/ui/webapp/src/layout/common/itemModal/MobileContent.tsx
+++ b/ui/webapp/src/layout/common/itemModal/MobileContent.tsx
@@ -6,7 +6,7 @@ import sortBy from 'lodash/sortBy';
 import { createEffect, createSignal, For, Match, on, Show, Switch } from 'solid-js';
 
 import { FOUNDATION } from '../../../data';
-import { AdditionalCategory, Item, Repository, SecurityAudit, SVGIconKind } from '../../../types';
+import { AdditionalCategory, Item, SecurityAudit, SVGIconKind } from '../../../types';
 import cutString from '../../../utils/cutString';
 import formatProfitLabel from '../../../utils/formatLabelProfit';
 import getItemDescription from '../../../utils/getItemDescription';
@@ -34,34 +34,13 @@ const MobileContent = (props: Props) => {
   const itemInfo = () => props.item;
   const updateActiveItemId = useUpdateActiveItemId();
   const [description, setDescription] = createSignal<string>();
-  const [websiteUrl, setWebsiteUrl] = createSignal<string>();
 
   createEffect(
     on(itemInfo, () => {
       if (!isUndefined(itemInfo()) && !isNull(itemInfo())) {
-        let mainRepoTmp: Repository | undefined;
-        const websiteUrlTmp = itemInfo()!.homepage_url;
-        setWebsiteUrl(itemInfo()!.homepage_url);
         setDescription(getItemDescription(itemInfo()!));
-        if (!isUndefined(itemInfo()!.repositories)) {
-          itemInfo()!.repositories!.forEach((repo: Repository) => {
-            if (repo.primary) {
-              mainRepoTmp = repo;
-            }
-          });
-        }
-
-        // If homepage_url is undefined or is equal to main repository url
-        // and maturity field is undefined,
-        // we use the homepage_url fron crunchbase
-        if (isUndefined(websiteUrlTmp) || (mainRepoTmp && websiteUrlTmp === mainRepoTmp.url)) {
-          if (itemInfo()!.crunchbase_data && itemInfo()!.crunchbase_data!.homepage_url) {
-            setWebsiteUrl(itemInfo()!.crunchbase_data!.homepage_url);
-          }
-        }
       } else {
         setDescription(undefined);
-        setWebsiteUrl(undefined);
         updateActiveItemId(); // Close modal
       }
     })
@@ -97,8 +76,8 @@ const MobileContent = (props: Props) => {
                   <MaturityBadge level={cutString(itemInfo()!.maturity!, 16)} class="me-2" />
                 </Show>
 
-                <Show when={!isUndefined(websiteUrl())}>
-                  <ExternalLink title="Website" class={`me-2 ${styles.link}`} href={websiteUrl()!}>
+                <Show when={!isUndefined(itemInfo()!.website)}>
+                  <ExternalLink title="Website" class={`me-2 ${styles.link}`} href={itemInfo()!.website!}>
                     <SVGIcon kind={SVGIconKind.World} />
                   </ExternalLink>
                 </Show>
diff --git a/ui/webapp/src/layout/explore/card/Card.tsx b/ui/webapp/src/layout/explore/card/Card.tsx
index cf028e13..a52c9e21 100644
--- a/ui/webapp/src/layout/explore/card/Card.tsx
+++ b/ui/webapp/src/layout/explore/card/Card.tsx
@@ -24,18 +24,16 @@ interface Props {
 const Card = (props: Props) => {
   const [description, setDescription] = createSignal<string>();
   const [stars, setStars] = createSignal<number>();
-  const [mainRepoUrl, setMainRepoUrl] = createSignal<string>();
-  const [websiteUrl, setWebsiteUrl] = createSignal<string>();
+  const [primaryRepoUrl, setPrimaryRepoUrl] = createSignal<string>();
 
   onMount(() => {
     setDescription(getItemDescription(props.item));
-    setWebsiteUrl(props.item.homepage_url);
     let starsCount: number | undefined;
 
     if (props.item.repositories) {
       props.item.repositories.forEach((repo: Repository) => {
         if (repo.primary) {
-          setMainRepoUrl(repo.url);
+          setPrimaryRepoUrl(repo.url);
         }
 
         if (repo.github_data) {
@@ -44,15 +42,6 @@ const Card = (props: Props) => {
       });
       setStars(starsCount);
     }
-
-    // If homepage_url is undefined or is equal to main repository url
-    // and maturity field is undefined,
-    // we use the homepage_url fron crunchbase
-    if (isUndefined(websiteUrl) || websiteUrl() === mainRepoUrl()) {
-      if (props.item.crunchbase_data && props.item.crunchbase_data.homepage_url) {
-        setWebsiteUrl(props.item.crunchbase_data.homepage_url);
-      }
-    }
   });
 
   return (
@@ -93,14 +82,14 @@ const Card = (props: Props) => {
               <MaturityBadge level={cutString(props.item.maturity!, 20)} class="me-2" />
             </Show>
 
-            <Show when={!isUndefined(websiteUrl())}>
-              <ExternalLink title="Website" class={`me-2 ${styles.link}`} href={websiteUrl()!}>
+            <Show when={!isUndefined(props.item.website)}>
+              <ExternalLink title="Website" class={`me-2 ${styles.link}`} href={props.item.website!}>
                 <SVGIcon kind={SVGIconKind.World} />
               </ExternalLink>
             </Show>
 
-            <Show when={!isUndefined(mainRepoUrl())}>
-              <ExternalLink title="Repository" class={`me-2 ${styles.link}`} href={mainRepoUrl()!}>
+            <Show when={!isUndefined(primaryRepoUrl())}>
+              <ExternalLink title="Repository" class={`me-2 ${styles.link}`} href={primaryRepoUrl()!}>
                 <SVGIcon kind={SVGIconKind.GitHubCircle} />
               </ExternalLink>
             </Show>
diff --git a/ui/webapp/src/layout/explore/mobile/Card.tsx b/ui/webapp/src/layout/explore/mobile/Card.tsx
index c3611568..e0007352 100644
--- a/ui/webapp/src/layout/explore/mobile/Card.tsx
+++ b/ui/webapp/src/layout/explore/mobile/Card.tsx
@@ -23,35 +23,19 @@ interface Props {
 const Card = (props: Props) => {
   const [description, setDescription] = createSignal<string>();
   const [stars, setStars] = createSignal<number>();
-  const [mainRepoUrl, setMainRepoUrl] = createSignal<string>();
-  const [websiteUrl, setWebsiteUrl] = createSignal<string>();
 
   onMount(() => {
     setDescription(getItemDescription(props.item));
-    setWebsiteUrl(props.item.homepage_url);
     let starsCount: number | undefined;
 
     if (props.item.repositories) {
       props.item.repositories.forEach((repo: Repository) => {
-        if (repo.primary) {
-          setMainRepoUrl(repo.url);
-        }
-
         if (repo.github_data) {
           starsCount = starsCount || 0 + repo.github_data.stars;
         }
       });
       setStars(starsCount);
     }
-
-    // If homepage_url is undefined or is equal to main repository url
-    // and maturity field is undefined,
-    // we use the homepage_url fron crunchbase
-    if (isUndefined(websiteUrl) || websiteUrl() === mainRepoUrl()) {
-      if (props.item.crunchbase_data && props.item.crunchbase_data.homepage_url) {
-        setWebsiteUrl(props.item.crunchbase_data.homepage_url);
-      }
-    }
   });
 
   return (
@@ -87,8 +71,8 @@ const Card = (props: Props) => {
               <MaturityBadge level={cutString(props.item.maturity!, 20)} class="me-2" />
             </Show>
 
-            <Show when={!isUndefined(websiteUrl())}>
-              <ExternalLink title="Website" class={`me-2 ${styles.link}`} href={websiteUrl()!}>
+            <Show when={!isUndefined(props.item.website)}>
+              <ExternalLink title="Website" class={`me-2 ${styles.link}`} href={props.item.website!}>
                 <SVGIcon kind={SVGIconKind.World} />
               </ExternalLink>
             </Show>
diff --git a/ui/webapp/src/layout/navigation/EmbedModal.module.css b/ui/webapp/src/layout/navigation/EmbedModal.module.css
index 98dd5e00..e5aa5304 100644
--- a/ui/webapp/src/layout/navigation/EmbedModal.module.css
+++ b/ui/webapp/src/layout/navigation/EmbedModal.module.css
@@ -42,7 +42,7 @@
 }
 
 .previewTitle {
-  padding: 0 1.9rem;
+  padding: 0 1.5rem;
   padding-top: 1.5rem;
 }
 
diff --git a/ui/webapp/src/layout/navigation/EmbedModal.tsx b/ui/webapp/src/layout/navigation/EmbedModal.tsx
index 49111875..25ba04c1 100644
--- a/ui/webapp/src/layout/navigation/EmbedModal.tsx
+++ b/ui/webapp/src/layout/navigation/EmbedModal.tsx
@@ -130,7 +130,7 @@ const EmbedModal = () => {
   const [prevSearch, setPrevSearch] = createSignal<string>('');
 
   const getIFrameUrl = () => {
-    return `${
+    let url = `${
       import.meta.env.MODE === 'development' ? 'http://localhost:8000' : window.location.origin
     }${BASE_PATH}/embed/embed.html?${KEY_PARAM}=${key() || categoriesList()[0].normalized_name}&${DISPLAY_HEADER_PARAM}=${
       displayHeader() ? 'true' : 'false'
@@ -138,15 +138,21 @@ const EmbedModal = () => {
       displayCategoryTitle() ? 'true' : 'false'
     }&${DISPLAY_CATEGORY_IN_SUBCATEGORY_PARAM}=${
       displayCategoryInSubcategory() ? 'true' : 'false'
-    }&${DISPLAY_ITEM_NAME_PARAM}=${displayItemName() ? 'true' : 'false'}&${UPPERCASE_TITLE_PARAM}=${
+    }&${UPPERCASE_TITLE_PARAM}=${
       uppercaseTitle() ? 'true' : 'false'
-    }&${TITLE_ALIGNMENT_PARAM}=${titleAlignment()}&${TITLE_FONT_FAMILY_PARAM}=${titleFontFamily()}&${TITLE_SIZE_PARAM}=${titleSize()}&${ITEMS_STYLE_PARAM}=${selectedStyle()}&${ITEMS_SIZE_PARAM}=${selectedSize()}&${ITEMS_ALIGNMENT_PARAM}=${itemsAlignment()}${
-      displayItemName() ? `&${ITEM_NAME_SIZE_PARAM}=${itemNameSize()}` : ''
-    }${
-      itemsSpacingType() === SpacingType.Custom && !isUndefined(itemsSpacing())
-        ? `&${ITEMS_SPACING_PARAM}=${itemsSpacing()}`
-        : ''
-    }&${TITLE_BGCOLOR_PARAM}=${encodeURIComponent(bgColor())}&${TITLE_FGCOLOR_PARAM}=${encodeURIComponent(fgColor())}${!isUndefined(window.baseDS.base_path) ? `&base-path=${encodeURIComponent(window.baseDS.base_path)}` : ''}`;
+    }&${TITLE_ALIGNMENT_PARAM}=${titleAlignment()}&${TITLE_FONT_FAMILY_PARAM}=${titleFontFamily()}&${TITLE_SIZE_PARAM}=${titleSize()}&${ITEMS_STYLE_PARAM}=${selectedStyle()}&${TITLE_BGCOLOR_PARAM}=${encodeURIComponent(bgColor())}&${TITLE_FGCOLOR_PARAM}=${encodeURIComponent(fgColor())}${!isUndefined(window.baseDS.base_path) ? `&base-path=${encodeURIComponent(window.baseDS.base_path)}` : ''}`;
+
+    if (selectedStyle() !== Style.Card) {
+      url = `${url}&${DISPLAY_ITEM_NAME_PARAM}=${displayItemName() ? 'true' : 'false'}&${ITEMS_SIZE_PARAM}=${selectedSize()}&${ITEMS_ALIGNMENT_PARAM}=${itemsAlignment()}${
+        displayItemName() ? `&${ITEM_NAME_SIZE_PARAM}=${itemNameSize()}` : ''
+      }${
+        itemsSpacingType() === SpacingType.Custom && !isUndefined(itemsSpacing())
+          ? `&${ITEMS_SPACING_PARAM}=${itemsSpacing()}`
+          : ''
+      }`;
+    }
+
+    return url;
   };
 
   const onUpdateSpacingType = (type: SpacingType) => {
@@ -519,39 +525,42 @@ const EmbedModal = () => {
                       <div class="mt-4">
                         <div class={`text-uppercase text-muted fw-semibold mb-1 ${styles.labelSelect}`}>Item</div>
                       </div>
-                      <div class="form-check">
-                        <CheckBox
-                          name={InputType.DisplayItemName}
-                          value="true"
-                          class="ps-0 my-2"
-                          labelClass={`mw-100 text-muted ${styles.label}`}
-                          label="Display item name"
-                          checked={displayItemName()}
-                          onChange={(value: string, checked: boolean) =>
-                            onChange(InputType.DisplayItemName, value, checked)
-                          }
-                        />
-                      </div>
-                      <Show when={displayItemName()}>
-                        <div class="d-flex flex-column mt-3">
-                          <label class={`text-muted form-check-label text-nowrap ${styles.label}`}>
-                            Item name font size (px):
-                          </label>
-                          <div>
-                            <input
-                              type="number"
-                              class={`form-control withShadow rounded-0 border-0 ${styles.input}`}
-                              min={10}
-                              max={40}
-                              value={itemNameSize()}
-                              aria-label="Size"
-                              onChange={(e) => {
-                                setItemNameSize(parseInt(e.currentTarget.value));
-                              }}
-                            />
-                          </div>
+                      <Show when={selectedStyle() !== Style.Card}>
+                        <div class="form-check">
+                          <CheckBox
+                            name={InputType.DisplayItemName}
+                            value="true"
+                            class="ps-0 my-2"
+                            labelClass={`mw-100 text-muted ${styles.label}`}
+                            label="Display item name"
+                            checked={displayItemName()}
+                            onChange={(value: string, checked: boolean) =>
+                              onChange(InputType.DisplayItemName, value, checked)
+                            }
+                          />
                         </div>
+                        <Show when={displayItemName()}>
+                          <div class="d-flex flex-column mt-3">
+                            <label class={`text-muted form-check-label text-nowrap ${styles.label}`}>
+                              Item name font size (px):
+                            </label>
+                            <div>
+                              <input
+                                type="number"
+                                class={`form-control withShadow rounded-0 border-0 ${styles.input}`}
+                                min={10}
+                                max={40}
+                                value={itemNameSize()}
+                                aria-label="Size"
+                                onChange={(e) => {
+                                  setItemNameSize(parseInt(e.currentTarget.value));
+                                }}
+                              />
+                            </div>
+                          </div>
+                        </Show>
                       </Show>
+
                       <div class="d-flex flex-column mt-3">
                         <label class={`text-muted form-check-label text-nowrap ${styles.label}`}>Style</label>
                         <select
@@ -570,86 +579,89 @@ const EmbedModal = () => {
                           </For>
                         </select>
                       </div>
-                      <div class="d-flex flex-column mt-3">
-                        <label class={`text-muted form-check-label text-nowrap ${styles.label}`}>Size</label>
-                        <select
-                          id="sizes"
-                          class={`form-select form-select-md border-0 rounded-0 ${styles.select}`}
-                          value={selectedSize()}
-                          aria-label="Sizes"
-                          onChange={(e) => {
-                            setSelectedSize(e.currentTarget.value as Size);
-                          }}
-                        >
-                          <For each={Object.values(Size)}>
-                            {(s: Size) => {
-                              return <option value={s}>{SIZES_LEGENDS[s]}</option>;
-                            }}
-                          </For>
-                        </select>
-                      </div>
-                      <div class="d-flex flex-column mt-3">
-                        <label class={`text-muted form-check-label text-nowrap ${styles.label}`}>Alignment</label>
-                        <select
-                          id="alignment"
-                          class={`form-select form-select-md border-0 rounded-0 ${styles.select}`}
-                          value={itemsAlignment()}
-                          aria-label="Styles"
-                          onChange={(e) => {
-                            setItemsAlignment(e.currentTarget.value as Alignment);
-                          }}
-                        >
-                          <For each={Object.values(Alignment)}>
-                            {(a: Alignment) => {
-                              return <option value={a}>{capitalizeFirstLetter(a)}</option>;
-                            }}
-                          </For>
-                        </select>
-                      </div>
-                      <div class="d-flex flex-column mt-3">
-                        <label class={`text-muted form-check-label text-nowrap ${styles.label}`}>
-                          Gap between items:
-                        </label>
-                        <div class="d-flex mt-1">
-                          <For each={Object.values(SpacingType)}>
-                            {(t, index) => {
-                              return (
-                                <div class="form-check form-check-inline">
-                                  <input
-                                    class="form-check-input"
-                                    type="radio"
-                                    name="spacing"
-                                    id={`spacing_${t}`}
-                                    value={t}
-                                    checked={itemsSpacingType() === t}
-                                    aria-checked={itemsSpacingType() === t}
-                                    onInput={(e) => {
-                                      onUpdateSpacingType(e.currentTarget.value as SpacingType);
-                                    }}
-                                  />
-                                  <label class={`text-muted form-check-label ${styles.label}`} for={`spacing_${t}`}>
-                                    {Object.keys(SpacingType)[index()]}
-                                    <Show when={t === SpacingType.Custom}> (px)</Show>
-                                  </label>
-                                </div>
-                              );
+
+                      <Show when={selectedStyle() !== Style.Card}>
+                        <div class="d-flex flex-column mt-3">
+                          <label class={`text-muted form-check-label text-nowrap ${styles.label}`}>Size</label>
+                          <select
+                            id="sizes"
+                            class={`form-select form-select-md border-0 rounded-0 ${styles.select}`}
+                            value={selectedSize()}
+                            aria-label="Sizes"
+                            onChange={(e) => {
+                              setSelectedSize(e.currentTarget.value as Size);
                             }}
-                          </For>
+                          >
+                            <For each={Object.values(Size)}>
+                              {(s: Size) => {
+                                return <option value={s}>{SIZES_LEGENDS[s]}</option>;
+                              }}
+                            </For>
+                          </select>
                         </div>
-
-                        <Show when={itemsSpacingType() === SpacingType.Custom}>
-                          <input
-                            type="number"
-                            min={0}
-                            class={`form-control withShadow rounded-0 border-0 ${styles.input}`}
-                            value={itemsSpacing()}
-                            aria-label="Items spacing"
+                        <div class="d-flex flex-column mt-3">
+                          <label class={`text-muted form-check-label text-nowrap ${styles.label}`}>Alignment</label>
+                          <select
+                            id="alignment"
+                            class={`form-select form-select-md border-0 rounded-0 ${styles.select}`}
+                            value={itemsAlignment()}
+                            aria-label="Styles"
                             onChange={(e) => {
-                              setItemsSpacing(parseInt(e.currentTarget.value));
+                              setItemsAlignment(e.currentTarget.value as Alignment);
                             }}
-                          />
-                        </Show>
-                      </div>
+                          >
+                            <For each={Object.values(Alignment)}>
+                              {(a: Alignment) => {
+                                return <option value={a}>{capitalizeFirstLetter(a)}</option>;
+                              }}
+                            </For>
+                          </select>
+                        </div>
+                        <div class="d-flex flex-column mt-3">
+                          <label class={`text-muted form-check-label text-nowrap ${styles.label}`}>
+                            Gap between items:
+                          </label>
+                          <div class="d-flex mt-1">
+                            <For each={Object.values(SpacingType)}>
+                              {(t, index) => {
+                                return (
+                                  <div class="form-check form-check-inline">
+                                    <input
+                                      class="form-check-input"
+                                      type="radio"
+                                      name="spacing"
+                                      id={`spacing_${t}`}
+                                      value={t}
+                                      checked={itemsSpacingType() === t}
+                                      aria-checked={itemsSpacingType() === t}
+                                      onInput={(e) => {
+                                        onUpdateSpacingType(e.currentTarget.value as SpacingType);
+                                      }}
+                                    />
+                                    <label class={`text-muted form-check-label ${styles.label}`} for={`spacing_${t}`}>
+                                      {Object.keys(SpacingType)[index()]}
+                                      <Show when={t === SpacingType.Custom}> (px)</Show>
+                                    </label>
+                                  </div>
+                                );
+                              }}
+                            </For>
+                          </div>
+
+                          <Show when={itemsSpacingType() === SpacingType.Custom}>
+                            <input
+                              type="number"
+                              min={0}
+                              class={`form-control withShadow rounded-0 border-0 ${styles.input}`}
+                              value={itemsSpacing()}
+                              aria-label="Items spacing"
+                              onChange={(e) => {
+                                setItemsSpacing(parseInt(e.currentTarget.value));
+                              }}
+                            />
+                          </Show>
+                        </div>
+                      </Show>
                     </div>
                   </div>
                   <div class="col-8 col-xxl-9 border-start">
diff --git a/ui/webapp/src/types.ts b/ui/webapp/src/types.ts
index c220d36a..45cc1ec6 100644
--- a/ui/webapp/src/types.ts
+++ b/ui/webapp/src/types.ts
@@ -85,6 +85,7 @@ export interface Featured {
 }
 
 export interface Item extends BaseItem {
+  website?: string;
   accepted_at?: string;
   homepage_url?: string;
   artwork_url?: string;

From 4c239a3c86841adb1556034ae5dffffcaf34a155 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cintia=20S=C3=A1nchez=20Garc=C3=ADa?= <cynthiasg@icloud.com>
Date: Thu, 9 May 2024 14:30:15 +0200
Subject: [PATCH 51/55] Use additional categories on embed views (#623)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Cintia Sanchez Garcia <cynthiasg@icloud.com>
Signed-off-by: Sergio Castaño Arteaga <tegioz@icloud.com>
Co-authored-by: Cintia Sanchez Garcia <cynthiasg@icloud.com>
Co-authored-by: Sergio Castaño Arteaga <tegioz@icloud.com>
---
 crates/core/src/datasets.rs                   | 67 +++++++++++++++----
 ui/embed/src/App.tsx                          | 32 +++++++--
 .../src/layout/navigation/EmbedModal.tsx      |  3 +-
 ui/webapp/src/utils/itemsDataGetter.ts        | 26 +++++++
 4 files changed, 110 insertions(+), 18 deletions(-)

diff --git a/crates/core/src/datasets.rs b/crates/core/src/datasets.rs
index db52b614..da9958e5 100644
--- a/crates/core/src/datasets.rs
+++ b/crates/core/src/datasets.rs
@@ -280,7 +280,12 @@ pub mod embed {
                     items: landscape_data
                         .items
                         .iter()
-                        .filter(|i| i.category == category.name)
+                        .filter(|i| {
+                            i.category == category.name
+                                || i.additional_categories
+                                    .as_ref()
+                                    .map_or(false, |ac| ac.iter().any(|ac| ac.category == category.name))
+                        })
                         .map(Item::from)
                         .collect(),
                 };
@@ -299,7 +304,15 @@ pub mod embed {
                         items: landscape_data
                             .items
                             .iter()
-                            .filter(|i| i.category == category.name && i.subcategory == *subcategory.name)
+                            .filter(|i| {
+                                (i.category == category.name && i.subcategory == *subcategory.name)
+                                    || i.additional_categories.as_ref().map_or(false, |ac| {
+                                        ac.iter().any(|ac| {
+                                            ac.category == category.name
+                                                && ac.subcategory == *subcategory.name
+                                        })
+                                    })
+                            })
                             .map(Item::from)
                             .collect(),
                     };
@@ -622,6 +635,10 @@ mod tests {
     #[test]
     fn embed_new() {
         let item = data::Item {
+            additional_categories: Some(vec![AdditionalCategory {
+                category: "Category 2".to_string(),
+                subcategory: "Subcategory 2".to_string(),
+            }]),
             category: "Category 1".to_string(),
             homepage_url: "https://homepage.url".to_string(),
             id: "id".to_string(),
@@ -631,14 +648,24 @@ mod tests {
             ..Default::default()
         };
         let landscape_data = LandscapeData {
-            categories: vec![data::Category {
-                name: "Category 1".to_string(),
-                normalized_name: "category-1".to_string(),
-                subcategories: vec![Subcategory {
-                    name: "Subcategory 1".to_string(),
-                    normalized_name: "subcategory-1".to_string(),
-                }],
-            }],
+            categories: vec![
+                data::Category {
+                    name: "Category 1".to_string(),
+                    normalized_name: "category-1".to_string(),
+                    subcategories: vec![Subcategory {
+                        name: "Subcategory 1".to_string(),
+                        normalized_name: "subcategory-1".to_string(),
+                    }],
+                },
+                data::Category {
+                    name: "Category 2".to_string(),
+                    normalized_name: "category-2".to_string(),
+                    subcategories: vec![Subcategory {
+                        name: "Subcategory 2".to_string(),
+                        normalized_name: "subcategory-2".to_string(),
+                    }],
+                },
+            ],
             items: vec![item.clone()],
         };
         let settings = LandscapeSettings {
@@ -647,7 +674,7 @@ mod tests {
         };
 
         let embed = Embed::new(&landscape_data, &settings);
-        let expected_embed_view = EmbedView {
+        let expected_embed_view_c1 = EmbedView {
             foundation: "Foundation".to_string(),
             category: data::Category {
                 name: "Category 1".to_string(),
@@ -659,10 +686,24 @@ mod tests {
             },
             items: vec![(&item).into()],
         };
+        let expected_embed_view_c2 = EmbedView {
+            foundation: "Foundation".to_string(),
+            category: data::Category {
+                name: "Category 2".to_string(),
+                normalized_name: "category-2".to_string(),
+                subcategories: vec![Subcategory {
+                    name: "Subcategory 2".to_string(),
+                    normalized_name: "subcategory-2".to_string(),
+                }],
+            },
+            items: vec![(&item).into()],
+        };
         let expected_embed = embed::Embed {
             views: vec![
-                ("category-1".to_string(), expected_embed_view.clone()),
-                ("category-1--subcategory-1".to_string(), expected_embed_view),
+                ("category-1".to_string(), expected_embed_view_c1.clone()),
+                ("category-1--subcategory-1".to_string(), expected_embed_view_c1),
+                ("category-2".to_string(), expected_embed_view_c2.clone()),
+                ("category-2--subcategory-2".to_string(), expected_embed_view_c2),
             ]
             .into_iter()
             .collect(),
diff --git a/ui/embed/src/App.tsx b/ui/embed/src/App.tsx
index 5aa5d88a..d5ef70d2 100644
--- a/ui/embed/src/App.tsx
+++ b/ui/embed/src/App.tsx
@@ -139,6 +139,13 @@ const App = () => {
   const [itemsAlignment, setItemsAlignment] = createSignal<Alignment>(DEFAULT_ITEMS_ALIGNMENT);
   const [itemsSpacing, setItemsSpacing] = createSignal<number | undefined>();
 
+  // Sort items by name alphabetically
+  const sortItemsByName = (items: BaseItem[]): BaseItem[] => {
+    return items.sort((a, b) => {
+      return a.name.toLowerCase().localeCompare(b.name.toLowerCase());
+    });
+  };
+
   onMount(() => {
     const urlParams = new URLSearchParams(window.location.search);
     const basePathParam = urlParams.get(BASE_PATH_PARAM);
@@ -253,6 +260,7 @@ const App = () => {
               throw new Error('Something went wrong');
             })
             .then((res) => {
+              console.log(res);
               setData(res);
             })
             .catch(() => {
@@ -297,7 +305,7 @@ const App = () => {
             when={displayHeader()}
             fallback={
               <StyleView
-                items={data()!.items}
+                items={sortItemsByName(data()!.items)}
                 foundation={data()!.foundation}
                 style={itemsStyleView()}
                 size={itemsSize()}
@@ -320,9 +328,25 @@ const App = () => {
             </Show>
             <For each={data()!.category.subcategories}>
               {(subcategory, index) => {
-                const items = data()!.items.filter((item: BaseItem) => {
-                  return item.category === data()!.category.name && item.subcategory === subcategory.name;
-                });
+                const items = sortItemsByName(
+                  data()!.items.filter((item: BaseItem) => {
+                    let inAdditionalCategory = false;
+                    // Check if category/subcategory is in additional_categories
+                    if (item.additional_categories) {
+                      inAdditionalCategory = item.additional_categories.some((additionalCategory) => {
+                        return (
+                          additionalCategory.category === data()!.category.name &&
+                          additionalCategory.subcategory === subcategory.name
+                        );
+                      });
+                    }
+
+                    return (
+                      (item.category === data()!.category.name && item.subcategory === subcategory.name) ||
+                      inAdditionalCategory
+                    );
+                  })
+                );
 
                 return (
                   <>
diff --git a/ui/webapp/src/layout/navigation/EmbedModal.tsx b/ui/webapp/src/layout/navigation/EmbedModal.tsx
index 25ba04c1..54b43b20 100644
--- a/ui/webapp/src/layout/navigation/EmbedModal.tsx
+++ b/ui/webapp/src/layout/navigation/EmbedModal.tsx
@@ -45,6 +45,7 @@ import useBreakpointDetect from '../../hooks/useBreakpointDetect';
 import { Category, Subcategory, SVGIconKind } from '../../types';
 import capitalizeFirstLetter from '../../utils/capitalizeFirstLetter';
 import isExploreSection from '../../utils/isExploreSection';
+import itemsDataGetter from '../../utils/itemsDataGetter';
 import prepareLink from '../../utils/prepareLink';
 import rgba2hex from '../../utils/rgba2hex';
 import CheckBox from '../common/Checkbox';
@@ -96,7 +97,7 @@ const EmbedModal = () => {
   const isVisible = createMemo(() => isExploreSection(location.pathname));
   const isEmbedSetupActive = () => location.pathname === EMBED_SETUP_PATH;
   const [visibleModal, setVisibleModal] = createSignal<boolean>(isEmbedSetupActive());
-  const categoriesList = () => sortBy(window.baseDS.categories, ['name']);
+  const categoriesList = () => sortBy(itemsDataGetter.getCategoriesAndSubcategoriesList(), ['name']);
   const [subcategoriesList, setSubcategoriesList] = createSignal<Subcategory[]>(
     sortBy(categoriesList()[0].subcategories, ['name'])
   );
diff --git a/ui/webapp/src/utils/itemsDataGetter.ts b/ui/webapp/src/utils/itemsDataGetter.ts
index 177c94aa..b6936730 100644
--- a/ui/webapp/src/utils/itemsDataGetter.ts
+++ b/ui/webapp/src/utils/itemsDataGetter.ts
@@ -163,6 +163,32 @@ export class ItemsDataGetter {
     return undefined;
   }
 
+  // Get categories and subcategories list with items
+  public getCategoriesAndSubcategoriesList(): Category[] {
+    const list: { [key: string]: string[] } = {};
+    window.baseDS.items.forEach((i: Item) => {
+      if (list[i.category]) {
+        list[i.category].push(i.subcategory);
+      } else {
+        list[i.category] = [i.subcategory];
+      }
+    });
+    const categories: Category[] = [];
+    window.baseDS.categories.forEach((c: Category) => {
+      if (list[c.name]) {
+        const subcategories: Subcategory[] = [];
+        c.subcategories.forEach((s: Subcategory) => {
+          if (list[c.name].includes(s.name)) {
+            subcategories.push(s);
+          }
+        });
+        categories.push({ ...c, subcategories: subcategories });
+      }
+    });
+
+    return categories;
+  }
+
   // Extend items with crunchbase and github data
   private extendItemsData(items?: Item[], crunchbaseData?: CrunchbaseData, githubData?: GithubData): Item[] {
     const itemsList: Item[] = [];

From 0c30c4a1942f6aff0ad5659e281e12de4309bdca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cintia=20S=C3=A1nchez=20Garc=C3=ADa?= <cynthiasg@icloud.com>
Date: Fri, 10 May 2024 09:35:22 +0200
Subject: [PATCH 52/55] Display other links in item's detail view (#624)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Cintia Sanchez Garcia <cynthiasg@icloud.com>
Signed-off-by: Sergio Castaño Arteaga <tegioz@icloud.com>
Co-authored-by: Cintia Sanchez Garcia <cynthiasg@icloud.com>
Co-authored-by: Sergio Castaño Arteaga <tegioz@icloud.com>
---
 crates/core/src/data.rs                       | 19 +++++
 crates/core/src/data/legacy.rs                | 73 ++++++++++++++++++-
 .../common/itemModal/Content.module.css       |  7 ++
 .../src/layout/common/itemModal/Content.tsx   | 25 +++++++
 .../common/itemModal/MobileContent.module.css | 11 +++
 .../layout/common/itemModal/MobileContent.tsx | 23 ++++++
 ui/webapp/src/types.ts                        |  6 ++
 ui/webapp/src/utils/cutString.tsx             | 11 +++
 8 files changed, 174 insertions(+), 1 deletion(-)
 create mode 100644 ui/webapp/src/utils/cutString.tsx

diff --git a/crates/core/src/data.rs b/crates/core/src/data.rs
index d3887513..2ff4cfea 100644
--- a/crates/core/src/data.rs
+++ b/crates/core/src/data.rs
@@ -397,6 +397,7 @@ impl From<legacy::LandscapeData> for LandscapeData {
                         item.latest_annual_review_url = extra.annual_review_url;
                         item.linkedin_url = extra.linkedin_url;
                         item.mailing_list_url = extra.mailing_list_url;
+                        item.other_links = extra.other_links;
                         item.package_manager_url = extra.package_manager_url;
                         item.parent_project = extra.parent_project;
                         item.slack_url = extra.slack_url;
@@ -581,6 +582,9 @@ pub struct Item {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub oss: Option<bool>,
 
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub other_links: Option<Vec<ItemLink>>,
+
     #[serde(skip_serializing_if = "Option::is_none")]
     pub package_manager_url: Option<String>,
 
@@ -752,6 +756,13 @@ pub struct ItemFeatured {
     pub order: Option<usize>,
 }
 
+/// Landscape item link.
+#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
+pub struct ItemLink {
+    pub name: String,
+    pub url: String,
+}
+
 /// Landscape item summary.
 #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
 pub struct ItemSummary {
@@ -1260,6 +1271,10 @@ mod tests {
                             incubating: Some(date),
                             linkedin_url: Some("linkedin_url".to_string()),
                             mailing_list_url: Some("mailing_list_url".to_string()),
+                            other_links: Some(vec![ItemLink {
+                                name: "name".to_string(),
+                                url: "https://link.url".to_string(),
+                            }]),
                             package_manager_url: Some("package_manager_url".to_string()),
                             parent_project: Some("parent_project".to_string()),
                             slack_url: Some("slack_url".to_string()),
@@ -1344,6 +1359,10 @@ mod tests {
                 latest_annual_review_url: Some("annual_review_url".to_string()),
                 openssf_best_practices_url: Some("url_for_bestpractices".to_string()),
                 oss: None,
+                other_links: Some(vec![ItemLink {
+                    name: "name".to_string(),
+                    url: "https://link.url".to_string(),
+                }]),
                 package_manager_url: Some("package_manager_url".to_string()),
                 parent_project: Some("parent_project".to_string()),
                 repositories: Some(vec![
diff --git a/crates/core/src/data/legacy.rs b/crates/core/src/data/legacy.rs
index 290fe8bc..87ae1c4b 100644
--- a/crates/core/src/data/legacy.rs
+++ b/crates/core/src/data/legacy.rs
@@ -1,7 +1,7 @@
 //! This module defines some types used to parse the landscape data file in
 //! legacy format and convert it to the new one.
 
-use super::ItemAudit;
+use super::{ItemAudit, ItemLink};
 use crate::util::validate_url;
 use anyhow::{bail, format_err, Context, Result};
 use chrono::NaiveDate;
@@ -74,6 +74,18 @@ impl LandscapeData {
 
                     // Check some values in extra
                     if let Some(extra) = &item.extra {
+                        // Check other links
+                        if let Some(other_links) = &extra.other_links {
+                            for link in other_links {
+                                if link.name.is_empty() {
+                                    return Err(format_err!("link name is required")).context(ctx);
+                                }
+                                if link.url.is_empty() {
+                                    return Err(format_err!("link url is required")).context(ctx);
+                                }
+                            }
+                        }
+
                         // Check tag name
                         if let Some(tag) = &extra.tag {
                             if !TAG_NAME.is_match(tag) {
@@ -151,6 +163,7 @@ pub(super) struct ItemExtra {
     pub incubating: Option<NaiveDate>,
     pub linkedin_url: Option<String>,
     pub mailing_list_url: Option<String>,
+    pub other_links: Option<Vec<ItemLink>>,
     pub package_manager_url: Option<String>,
     pub parent_project: Option<String>,
     pub slack_url: Option<String>,
@@ -257,6 +270,10 @@ mod tests {
                             ..Default::default()
                         }]),
                         blog_url: Some("https://blog.url".to_string()),
+                        other_links: Some(vec![ItemLink {
+                            name: "link".to_string(),
+                            url: "https://link.url".to_string(),
+                        }]),
                         ..Default::default()
                     }),
                     ..Default::default()
@@ -370,6 +387,60 @@ mod tests {
         landscape.validate().unwrap();
     }
 
+    #[test]
+    #[should_panic(expected = "link name is required")]
+    fn landscape_data_validate_empty_link_name() {
+        let mut landscape = LandscapeData::default();
+        landscape.landscape.push(Category {
+            name: "Category".to_string(),
+            subcategories: vec![SubCategory {
+                name: "Subcategory".to_string(),
+                items: vec![Item {
+                    name: "Item".to_string(),
+                    homepage_url: "https://example.com".to_string(),
+                    logo: "logo".to_string(),
+                    extra: Some(ItemExtra {
+                        other_links: Some(vec![ItemLink {
+                            name: String::new(),
+                            url: "https://link.url".to_string(),
+                        }]),
+                        ..Default::default()
+                    }),
+                    ..Default::default()
+                }],
+            }],
+        });
+
+        landscape.validate().unwrap();
+    }
+
+    #[test]
+    #[should_panic(expected = "link url is required")]
+    fn landscape_data_validate_empty_link_url() {
+        let mut landscape = LandscapeData::default();
+        landscape.landscape.push(Category {
+            name: "Category".to_string(),
+            subcategories: vec![SubCategory {
+                name: "Subcategory".to_string(),
+                items: vec![Item {
+                    name: "Item".to_string(),
+                    homepage_url: "https://example.com".to_string(),
+                    logo: "logo".to_string(),
+                    extra: Some(ItemExtra {
+                        other_links: Some(vec![ItemLink {
+                            name: "name".to_string(),
+                            url: String::new(),
+                        }]),
+                        ..Default::default()
+                    }),
+                    ..Default::default()
+                }],
+            }],
+        });
+
+        landscape.validate().unwrap();
+    }
+
     #[test]
     #[should_panic(expected = "invalid tag")]
     fn landscape_data_validate_invalid_tag() {
diff --git a/ui/webapp/src/layout/common/itemModal/Content.module.css b/ui/webapp/src/layout/common/itemModal/Content.module.css
index ad617242..2eda9a46 100644
--- a/ui/webapp/src/layout/common/itemModal/Content.module.css
+++ b/ui/webapp/src/layout/common/itemModal/Content.module.css
@@ -41,6 +41,13 @@
   font-size: 0.9rem;
 }
 
+.otherLink {
+  font-size: 0.75rem;
+  color: var(--color4);
+  max-width: calc(50% - 2rem - 15px);
+  line-height: 24px;
+}
+
 .additionalInfo {
   font-size: 0.75rem;
 }
diff --git a/ui/webapp/src/layout/common/itemModal/Content.tsx b/ui/webapp/src/layout/common/itemModal/Content.tsx
index b2b2bd10..14654177 100644
--- a/ui/webapp/src/layout/common/itemModal/Content.tsx
+++ b/ui/webapp/src/layout/common/itemModal/Content.tsx
@@ -7,6 +7,7 @@ import { createEffect, createSignal, For, Match, on, Show, Switch } from 'solid-
 
 import { FOUNDATION } from '../../../data';
 import { AdditionalCategory, Item, Repository, SecurityAudit, SVGIconKind } from '../../../types';
+import cutString from '../../../utils/cutString';
 import formatProfitLabel from '../../../utils/formatLabelProfit';
 import getItemDescription from '../../../utils/getItemDescription';
 import { formatTAGName } from '../../../utils/prepareFilters';
@@ -309,6 +310,30 @@ const Content = (props: Props) => {
         </div>
         {/* Description */}
         <div class={`mt-4 text-muted ${styles.description}`}>{description()}</div>
+
+        {/* Other links */}
+        <Show when={!isUndefined(itemInfo()!.other_links)}>
+          <div class="d-flex flex-row flex-wrap align-items-center mt-2">
+            <For each={itemInfo()!.other_links}>
+              {(link, index) => {
+                return (
+                  <>
+                    <ExternalLink
+                      href={link.url}
+                      class={`fw-semibold text-nowrap d-inline-block text-truncate text-uppercase ${styles.otherLink}`}
+                    >
+                      {cutString(link.name, 30)}
+                    </ExternalLink>
+                    <Show when={index() !== itemInfo()!.other_links!.length - 1}>
+                      <div class="mx-2">·</div>
+                    </Show>
+                  </>
+                );
+              }}
+            </For>
+          </div>
+        </Show>
+
         {/* Additional categories */}
         <Show when={!isUndefined(itemInfo()!.additional_categories) && !isEmpty(itemInfo()!.additional_categories)}>
           <div class={`fw-bold text-uppercase mt-4 mb-3 ${styles.titleInSection}`}>Additional categories</div>
diff --git a/ui/webapp/src/layout/common/itemModal/MobileContent.module.css b/ui/webapp/src/layout/common/itemModal/MobileContent.module.css
index 6fb3d293..8a014e29 100644
--- a/ui/webapp/src/layout/common/itemModal/MobileContent.module.css
+++ b/ui/webapp/src/layout/common/itemModal/MobileContent.module.css
@@ -74,6 +74,17 @@
   font-size: 0.9rem;
 }
 
+.otherLink {
+  max-width: calc(100% - 2rem - 15px);
+  font-size: 0.65rem;
+  color: var(--color4);
+  line-height: 16px;
+}
+
+.dot {
+  line-height: 1;
+}
+
 .section {
   font-size: 0.8rem;
 }
diff --git a/ui/webapp/src/layout/common/itemModal/MobileContent.tsx b/ui/webapp/src/layout/common/itemModal/MobileContent.tsx
index 6178cd7a..a6689b27 100644
--- a/ui/webapp/src/layout/common/itemModal/MobileContent.tsx
+++ b/ui/webapp/src/layout/common/itemModal/MobileContent.tsx
@@ -105,6 +105,29 @@ const MobileContent = (props: Props) => {
           </div>
         </div>
 
+        {/* Other links */}
+        <Show when={!isUndefined(itemInfo()!.other_links)}>
+          <div class="d-flex flex-row flex-wrap align-items-center mb-3 mt-1">
+            <For each={itemInfo()!.other_links}>
+              {(link, index) => {
+                return (
+                  <>
+                    <ExternalLink
+                      href={link.url}
+                      class={`fw-semibold text-nowrap d-inline-block text-truncate text-uppercase me-2 mt-2 ${styles.otherLink}`}
+                    >
+                      {cutString(link.name, 30)}
+                    </ExternalLink>
+                    <Show when={index() !== itemInfo()!.other_links!.length - 1}>
+                      <div class={`me-2 mt-2 ${styles.dot}`}>·</div>
+                    </Show>
+                  </>
+                );
+              }}
+            </For>
+          </div>
+        </Show>
+
         {/* Additional categories */}
         <Show when={!isUndefined(itemInfo()!.additional_categories) && !isEmpty(itemInfo()!.additional_categories)}>
           <div class={`fw-bold text-uppercase my-3 ${styles.titleInSection}`}>Additional categories</div>
diff --git a/ui/webapp/src/types.ts b/ui/webapp/src/types.ts
index 45cc1ec6..e93a1d78 100644
--- a/ui/webapp/src/types.ts
+++ b/ui/webapp/src/types.ts
@@ -120,6 +120,12 @@ export interface Item extends BaseItem {
   linkedin_url?: string;
   audits?: SecurityAudit[];
   parent_project?: string;
+  other_links?: OtherLink[];
+}
+
+export interface OtherLink {
+  name: string;
+  url: string;
 }
 
 export interface SecurityAudit {
diff --git a/ui/webapp/src/utils/cutString.tsx b/ui/webapp/src/utils/cutString.tsx
new file mode 100644
index 00000000..ccad78fa
--- /dev/null
+++ b/ui/webapp/src/utils/cutString.tsx
@@ -0,0 +1,11 @@
+const MAX_LENGTH: number = 20;
+
+const cutString = (str: string, length: number = MAX_LENGTH): string => {
+  if (str.length <= length) {
+    return str;
+  } else {
+    return `${str.substring(0, length)}...`;
+  }
+};
+
+export default cutString;

From 230df0793b1c759075a922cb2ec7914a83d7dafb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20Casta=C3=B1o=20Arteaga?= <tegioz@icloud.com>
Date: Mon, 13 May 2024 08:37:22 +0200
Subject: [PATCH 53/55] Bump version to 0.9.0 (#625)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Sergio Castaño Arteaga <tegioz@icloud.com>
---
 .github/workflows/release.yml |  8 +++----
 CHANGELOG.md                  | 41 +++++++++++++++++++++++++++++++++++
 Cargo.lock                    |  6 ++---
 Cargo.toml                    |  6 ++---
 README.md                     |  4 ++--
 ui/embed/package.json         |  2 +-
 ui/webapp/package.json        |  2 +-
 7 files changed, 55 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 72d4dfc0..2caf662e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -61,7 +61,7 @@ jobs:
         # we specify bash to get pipefail; it guards against the `curl` command
         # failing. otherwise `sh` won't catch that `curl` returned non-0
         shell: bash
-        run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.13.3/cargo-dist-installer.sh | sh"
+        run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.14.1/cargo-dist-installer.sh | sh"
       # sure would be cool if github gave us proper conditionals...
       # so here's a doubly-nested ternary-via-truthiness to try to provide the best possible
       # functionality based on whether this is a pull_request, and whether it's from a fork.
@@ -166,7 +166,7 @@ jobs:
           submodules: recursive
       - name: Install cargo-dist
         shell: bash
-        run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.13.3/cargo-dist-installer.sh | sh"
+        run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.14.1/cargo-dist-installer.sh | sh"
       # Get all the local artifacts for the global tasks to use (for e.g. checksums)
       - name: Fetch local artifacts
         uses: actions/download-artifact@v4
@@ -211,7 +211,7 @@ jobs:
         with:
           submodules: recursive
       - name: Install cargo-dist
-        run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.13.3/cargo-dist-installer.sh | sh"
+        run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.14.1/cargo-dist-installer.sh | sh"
       # Fetch artifacts from scratch-storage
       - name: Fetch artifacts
         uses: actions/download-artifact@v4
@@ -251,7 +251,7 @@ jobs:
           repository: "cncf/homebrew-landscape2"
           token: ${{ secrets.HOMEBREW_TAP_TOKEN }}
       # So we have access to the formula
-      - name: Fetch local artifacts
+      - name: Fetch homebrew formulae
         uses: actions/download-artifact@v4
         with:
           pattern: artifacts-*
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 85e80647..a49120db 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,47 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.9.0] - 2024-05-13
+
+### Added
+
+- Experimental overlay (#587)
+- Improve search (#619)
+- New embed card style (#622)
+- Repository selector to item details view (#581)
+- Not open source filter (#583)
+- Repositories good first issues link (#582)
+- Display parent project in item details view (#570, #568)
+- Display loading spinner in controls bar (#579)
+- Display package manager link in item details view (#609, 592)
+- Display other links in item's detail view (#624)
+- Organization region in items details view (#617)
+- Make default view mode configurable (#574, #572)
+- Make logos viewbox adjustments configurable (#577)
+- Hide stats link when there are no stats available (#607)
+- Open item details modal from zoom view (#620)
+- Do not display empty groups in group selector (#606)
+- Collect repositories topics from GitHub (#590)
+- Some more options to logos preview (#594)
+- Some tests to core crate (#613)
+
+### Fixed
+
+- Some issues in mobile devices (#612)
+- Some issues with filters modal (#593)
+- Badge url issue (#608)
+- Participation stats legend in item details view (#616)
+- Use additional categories on embed views (#623)
+- Do not raise errors detecting mime type on deploy (#573)
+
+### Changed
+
+- Check logos checksum while deploying (#578)
+- Use only orgs in data file when processing stats (#589)
+- Use custom octorust client (#615)
+- Upgrade CLI tool dependencies (#605)
+- Upgrade web application and embed dependencies (#610)
+
 ## [0.8.1] - 2024-04-11
 
 ### Fixed
diff --git a/Cargo.lock b/Cargo.lock
index 1a95a900..92acd593 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1840,7 +1840,7 @@ dependencies = [
 
 [[package]]
 name = "landscape2"
-version = "0.8.1"
+version = "0.9.0"
 dependencies = [
  "anyhow",
  "askama",
@@ -1891,7 +1891,7 @@ dependencies = [
 
 [[package]]
 name = "landscape2-core"
-version = "0.8.1"
+version = "0.9.0"
 dependencies = [
  "anyhow",
  "chrono",
@@ -1912,7 +1912,7 @@ dependencies = [
 
 [[package]]
 name = "landscape2-overlay"
-version = "0.8.1"
+version = "0.9.0"
 dependencies = [
  "anyhow",
  "landscape2-core",
diff --git a/Cargo.toml b/Cargo.toml
index 5f1f1236..a1dbfc36 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,7 +7,7 @@ members = [
 ]
 
 [workspace.package]
-version = "0.8.1"
+version = "0.9.0"
 license = "Apache-2.0"
 edition = "2021"
 rust-version = "1.77"
@@ -85,9 +85,9 @@ lto = "thin"
 # Config for 'cargo dist'
 [workspace.metadata.dist]
 # The preferred cargo-dist version to use in CI (Cargo.toml SemVer syntax)
-cargo-dist-version = "0.13.3"
+cargo-dist-version = "0.14.1"
 # CI backends to support
-ci = ["github"]
+ci = "github"
 # The installers to generate for each app
 installers = ["shell", "powershell", "homebrew"]
 # A GitHub repo to push Homebrew formulas to
diff --git a/README.md b/README.md
index 5b1637af..553c29c2 100644
--- a/README.md
+++ b/README.md
@@ -58,13 +58,13 @@ brew install cncf/landscape2/landscape2
 #### Install via shell script
 
 ```text
-curl --proto '=https' --tlsv1.2 -LsSf https://github.com/cncf/landscape2/releases/download/v0.8.1/landscape2-installer.sh | sh
+curl --proto '=https' --tlsv1.2 -LsSf https://github.com/cncf/landscape2/releases/download/v0.9.0/landscape2-installer.sh | sh
 ```
 
 #### Install via powershell script
 
 ```text
-irm https://github.com/cncf/landscape2/releases/download/v0.8.1/landscape2-installer.ps1 | iex
+irm https://github.com/cncf/landscape2/releases/download/v0.9.0/landscape2-installer.ps1 | iex
 ```
 
 ### Container image
diff --git a/ui/embed/package.json b/ui/embed/package.json
index ad9d2f55..ea145aed 100644
--- a/ui/embed/package.json
+++ b/ui/embed/package.json
@@ -1,7 +1,7 @@
 {
   "name": "embed",
   "private": true,
-  "version": "0.8.1",
+  "version": "0.9.0",
   "type": "module",
   "scripts": {
     "build": "tsc && vite build",
diff --git a/ui/webapp/package.json b/ui/webapp/package.json
index a5a47832..448ea247 100644
--- a/ui/webapp/package.json
+++ b/ui/webapp/package.json
@@ -1,7 +1,7 @@
 {
   "name": "landscape",
   "private": true,
-  "version": "0.8.1",
+  "version": "0.9.0",
   "type": "module",
   "scripts": {
     "build": "tsc && vite build",

From 5381876f06c45da300c548cd390aadf698998027 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20Casta=C3=B1o=20Arteaga?= <tegioz@icloud.com>
Date: Mon, 13 May 2024 09:38:57 +0200
Subject: [PATCH 54/55] Update release workflow (#626)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Sergio Castaño Arteaga <tegioz@icloud.com>
---
 .github/workflows/release.yml | 3 +++
 Cargo.toml                    | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 2caf662e..025f1470 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -125,6 +125,9 @@ jobs:
       - name: Install dependencies
         run: |
           ${{ matrix.packages_install }}
+      - name: Install wasm-pack
+        run: |
+          cargo install wasm-pack
       - name: Build artifacts
         run: |
           # Actually do builds and make zips and whatnot
diff --git a/Cargo.toml b/Cargo.toml
index a1dbfc36..39128c9c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -93,7 +93,7 @@ installers = ["shell", "powershell", "homebrew"]
 # A GitHub repo to push Homebrew formulas to
 tap = "cncf/homebrew-landscape2"
 # Target platforms to build apps for (Rust target-triple syntax)
-targets = ["aarch64-apple-darwin", "x86_64-apple-darwin", "x86_64-unknown-linux-gnu", "x86_64-unknown-linux-musl", "x86_64-pc-windows-msvc"]
+targets = ["aarch64-apple-darwin", "x86_64-apple-darwin", "x86_64-unknown-linux-gnu", "x86_64-pc-windows-msvc"]
 # Publish jobs to run in CI
 publish-jobs = ["homebrew"]
 # Publish jobs to run in CI

From 453484f372e26e23e196d53f017b7eadeb455299 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20Casta=C3=B1o=20Arteaga?= <tegioz@icloud.com>
Date: Mon, 13 May 2024 09:57:33 +0200
Subject: [PATCH 55/55] Update cargo dist config (allow-dirty) (#627)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Sergio Castaño Arteaga <tegioz@icloud.com>
---
 Cargo.toml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Cargo.toml b/Cargo.toml
index 39128c9c..36fc7c08 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -84,6 +84,8 @@ lto = "thin"
 
 # Config for 'cargo dist'
 [workspace.metadata.dist]
+# Allow customization of release workflow
+allow-dirty = ["ci"]
 # The preferred cargo-dist version to use in CI (Cargo.toml SemVer syntax)
 cargo-dist-version = "0.14.1"
 # CI backends to support