From 558614b1f3fc309eced8a5c62c3416b236640084 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Krakowski?= Date: Fri, 25 Oct 2019 11:30:20 +0200 Subject: [PATCH 1/2] refactor(sources): Introduce another loop based on new data files --- ...bile.html => destination-menu-mobile.html} | 0 ...ations-menu.html => destination-menu.html} | 0 src/_includes/sidebar/source-menu-mobile.html | 31 +++++++ src/_includes/sidebar/source-menu.html | 17 ++++ .../{destinations.html => catalog.html} | 4 +- src/connections/destinations/catalog/index.md | 2 +- src/connections/sources/catalog/index.md | 84 +++++-------------- 7 files changed, 73 insertions(+), 65 deletions(-) rename src/_includes/sidebar/{destinations-menu-mobile.html => destination-menu-mobile.html} (100%) rename src/_includes/sidebar/{destinations-menu.html => destination-menu.html} (100%) create mode 100644 src/_includes/sidebar/source-menu-mobile.html create mode 100644 src/_includes/sidebar/source-menu.html rename src/_layouts/{destinations.html => catalog.html} (89%) diff --git a/src/_includes/sidebar/destinations-menu-mobile.html b/src/_includes/sidebar/destination-menu-mobile.html similarity index 100% rename from src/_includes/sidebar/destinations-menu-mobile.html rename to src/_includes/sidebar/destination-menu-mobile.html diff --git a/src/_includes/sidebar/destinations-menu.html b/src/_includes/sidebar/destination-menu.html similarity index 100% rename from src/_includes/sidebar/destinations-menu.html rename to src/_includes/sidebar/destination-menu.html diff --git a/src/_includes/sidebar/source-menu-mobile.html b/src/_includes/sidebar/source-menu-mobile.html new file mode 100644 index 0000000000..8b98672fba --- /dev/null +++ b/src/_includes/sidebar/source-menu-mobile.html @@ -0,0 +1,31 @@ +{% assign destination_categories = site.data.catalogV2.source_categories.items | sort: "name" %} + +
+
+
+ + Choose category + + + + + +
+
+ + +
diff --git a/src/_includes/sidebar/source-menu.html b/src/_includes/sidebar/source-menu.html new file mode 100644 index 0000000000..d68c474817 --- /dev/null +++ b/src/_includes/sidebar/source-menu.html @@ -0,0 +1,17 @@ +{% assign destination_categories = site.data.catalogV2.source_categories.items | sort: "name" %} + +
+ +
diff --git a/src/_layouts/destinations.html b/src/_layouts/catalog.html similarity index 89% rename from src/_layouts/destinations.html rename to src/_layouts/catalog.html index 20e94d7f2e..2b59118d60 100644 --- a/src/_layouts/destinations.html +++ b/src/_layouts/catalog.html @@ -30,7 +30,7 @@

{%- endif -%} - {% include sidebar/destinations-menu-mobile.html %} + {% include sidebar/{{ page.integration_type }}-menu-mobile.html %}
{{ content }} @@ -43,7 +43,7 @@

- {% include sidebar/destinations-menu.html %} + {% include sidebar/{{ page.integration_type }}-menu.html %} {% include sidebar/feedback.html %}

diff --git a/src/connections/destinations/catalog/index.md b/src/connections/destinations/catalog/index.md index e1a34cdeb0..c3868c0fc9 100644 --- a/src/connections/destinations/catalog/index.md +++ b/src/connections/destinations/catalog/index.md @@ -1,7 +1,7 @@ --- title: Destination catalog hide_toc: true -layout: destinations +layout: catalog --- {% assign destination_categories = site.data.catalog.destinations.destinations | group_by:"categories.primary" | sort: "name" %} diff --git a/src/connections/sources/catalog/index.md b/src/connections/sources/catalog/index.md index 4dfe29f64d..60dd1154d6 100644 --- a/src/connections/sources/catalog/index.md +++ b/src/connections/sources/catalog/index.md @@ -4,76 +4,36 @@ hide_toc: true landing: true icon: symbols/connections.svg excerpt: Detailed information about each destination. Learn how our API methods are implemented for that destination. +layout: catalog ---
- - {% assign items = site.data.catalog.sources.sources %} - {% assign categories_array = "" | split: ',' %} - - {% for item in items %} - {% assign main_category = item.categories[0] %} - {% unless categories_array contains main_category %} - {% if main_category and main_category != "" %} - {% assign categories_array = categories_array | push: main_category %} - {% endif %} - {% endunless %} - {% endfor %} - {% for item in items %} - {% assign main_category = item.categories[0] %} - {% unless categories_array contains main_category %} - {% unless main_category and main_category != "" %} - {% assign categories_array = categories_array | push: 'Uncategorized' %} - {% endunless %} - {% endunless %} - {% endfor %} - - {% for category in categories_array %} -
+ {% assign categories = site.data.catalogV2.source_categories.items %} + {% for category in categories %} +

- {{ category }} + {{ category.display_name }}

- {% for item in items %} - {% if item.categories[0] and item.categories[0] != "" %} - {% if item.categories[0] == category %} -
- -
- -
{{ item.display_name }}
-
- {% if item.status == 'PUBLIC_BETA' %} -

Beta

+ {% assign integrations = site.data.catalogV2.sources.items | where: "categories", category.display_name %} + {% for integration in integrations %} +
+ +
+ - {% endif %} - {% else %} -
- -
- -
{{ item.display_name }}
- {% if item.status == 'PUBLIC_BETA' %} -

Beta

- {% endif %} - -
- {% endif %} +
{{ integration.display_name }}
+
+ {% if integration.status == 'PUBLIC_BETA' %} +

Beta

+ {% endif %} + +
{% endfor %}
From 64eebbfdcf9038ffef40d5312734a148b41a2f04 Mon Sep 17 00:00:00 2001 From: jedrzejchalubek Date: Fri, 25 Oct 2019 15:30:57 +0200 Subject: [PATCH 2/2] fix(sources): Headings links --- src/connections/sources/catalog/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/connections/sources/catalog/index.md b/src/connections/sources/catalog/index.md index 60dd1154d6..d128e5f631 100644 --- a/src/connections/sources/catalog/index.md +++ b/src/connections/sources/catalog/index.md @@ -11,7 +11,7 @@ layout: catalog {% assign categories = site.data.catalogV2.source_categories.items %} {% for category in categories %}
-

+

{{ category.display_name }}