diff --git a/src/_includes/sidebar/destinations-menu-mobile.html b/src/_includes/sidebar/destinations-menu-mobile.html index 752fcfd6f8..dd773d3366 100644 --- a/src/_includes/sidebar/destinations-menu-mobile.html +++ b/src/_includes/sidebar/destinations-menu-mobile.html @@ -1,4 +1,4 @@ -{% assign destination_categories = site.data.catalog.destinations.destinations | group_by:"categories.primary" | sort: "name" %} +{% assign categories = site.data.catalogV2.destination_categories.items %}

- - - {% include icons/destinations-catalog/{{ category_icon }}.svg %} - - {{ category.name }} - -
+ + + {% include icons/destinations-catalog/{{ category_icon }}.svg %} + + {{ category.display_name }} + +

diff --git a/src/_includes/sidebar/destinations-menu.html b/src/_includes/sidebar/destinations-menu.html index 8ba834f244..ac9ee803da 100644 --- a/src/_includes/sidebar/destinations-menu.html +++ b/src/_includes/sidebar/destinations-menu.html @@ -1,18 +1,15 @@ -{% assign destination_categories = site.data.catalog.destinations.destinations | group_by:"categories.primary" | sort: "name" %} +{% assign categories = site.data.catalogV2.destination_categories.items %}

- - {% include icons/destinations-catalog/{{ category_icon }}.svg %} - {{ category.name }} - -
+ + {% include icons/destinations-catalog/{{ category_icon }}.svg %} + {{ category.display_name }} + +

\ No newline at end of file + diff --git a/src/_layouts/destinations.html b/src/_layouts/destinations.html index 20e94d7f2e..e82fccce50 100644 --- a/src/_layouts/destinations.html +++ b/src/_layouts/destinations.html @@ -23,7 +23,6 @@

{% include components/breadcrumbs.html %} - {%- if page.title -%}

{{ page.title }} @@ -33,7 +32,49 @@

- {{ content }} +
+ {% assign categories = site.data.catalogV2.destination_categories.items %} + + {% for category in categories %} +
+ {% assign category_icon = category.slug | slugify %} + +
+ {% include icons/destinations-catalog/{{ category_icon }}.svg %} + + {{ category.display_name }} +
+ +
+ {% assign destinations = site.data.catalogV2.destinations.items | where: "categories", category.display_name %} + + {% for destination in destinations %} + {% if destination.status contains "PUBLIC" or destination.status contains "BETA" %} +
+ +
+
+ {% if destination.mark.url != '' %} + ${{ destination.display_name }}$ + {% else %} + ${{ destination.display_name }}$ + {% endif %} +
+ +
{{ destination.display_name }}
+
+ + {% if destination.status == 'PUBLIC_BETA' %} +
Beta
+ {% endif %} + +
+ {% endif %} + {% endfor %} +
+
+ {% endfor %} +

diff --git a/src/connections/destinations/catalog/index.md b/src/connections/destinations/catalog/index.md index e1a34cdeb0..e38744e74c 100644 --- a/src/connections/destinations/catalog/index.md +++ b/src/connections/destinations/catalog/index.md @@ -3,50 +3,3 @@ title: Destination catalog hide_toc: true layout: destinations --- - -{% assign destination_categories = site.data.catalog.destinations.destinations | group_by:"categories.primary" | sort: "name" %} - -

- {% for category in destination_categories %} -

- {% assign category_name_size = category.name | size %} - {% if category_name_size != 0 %} - {% assign category_icon = category.name | slugify %} - -

- {% include icons/destinations-catalog/{{ category_icon }}.svg %} - - {{ category.name }} -

- {% endif %} - -

- {% for destination in category.items %} - {% assign doc_path = destination.name | replace: "catalog", "connections" | replace: "destinations", "destinations/catalog" %} - - {% if destination.status contains "PUBLIC" or destination.status contains "BETA" %} -

- -

- {% if destination.logos.mark != '' %} - ${{destination.display_name}}$ - {% else %} - ${{destination.display_name}}$ - {% endif %} -

- -

- - {% if destination.status == 'PUBLIC_BETA' %} -

Beta

- {% endif %} - -

- {% endif %} - {% endfor %} -

- {% endfor %} -