Skip to content

refactor(destinations): Introduce another loop based on new data files #146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 24, 2019
Merged

refactor(destinations): Introduce another loop based on new data files #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3f0b4f7
refactor(destinations): Introduce another loop based on new data files
Oct 24, 2019
08550e7
fix(destinations): Use slug instead of display name
Oct 24, 2019
b227413
fix(destinations): Move the content to the layout
Oct 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 11 additions & 15 deletions src/_includes/sidebar/destinations-menu-mobile.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 %}

<div class="destination-menu-mobile" data-dropdown-menu data-anchors-indicator data-sections=".destinations-catalog__section" data-active-class="destination-menu-mobile__item--active">
<div class="destination-menu-mobile__select" data-ref="dropdown-menu[head]" data-active-class="destination-menu-mobile__select--active">
Expand All @@ -14,20 +14,16 @@
</div>

<ul class="destination-menu-mobile__list list list--unstyle" data-ref="dropdown-menu[body]" data-active-class="destination-menu-mobile__list--active">
{% for category in destination_categories %}
{% assign category_name_size = category.name | size %}
{% if category_name_size != 0 %}
{% assign category_icon = category.name | slugify %}
<li class="destination-menu-mobile__item">
<a class="destination-menu-mobile__link" href="#{{ category.name | slugify }}" title="{{ category.name }}" data-ref="dropdown-menu[link]" >
<span class="destination-menu-mobile__icon">
{% include icons/destinations-catalog/{{ category_icon }}.svg %}
</span>
{{ category.name }}
</a>
</li>

{% endif %}
{% for category in categories %}
{% assign category_icon = category.slug | slugify %}
<li class="destination-menu-mobile__item">
<a class="destination-menu-mobile__link" href="#{{ category.slug | slugify }}" title="{{ category.display_name }}" data-ref="dropdown-menu[link]" >
<span class="destination-menu-mobile__icon">
{% include icons/destinations-catalog/{{ category_icon }}.svg %}
</span>
{{ category.display_name }}
</a>
</li>
{% endfor %}
</ul>
</div>
23 changes: 10 additions & 13 deletions src/_includes/sidebar/destinations-menu.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 %}

<div class="destination-menu" data-anchors-indicator data-sections=".destinations-catalog__section" data-active-class="destination-menu__link--active">
<ul class="destination-menu__list list list--unstyle">
{% for category in destination_categories %}
{% assign category_name_size = category.name | size %}
{% if category_name_size != 0 %}
{% assign category_icon = category.name | slugify %}
<li class="destination-menu__item">
<a class="destination-menu__link flex" href="#{{ category.name | slugify }}" title="{{ category.name }}">
{% include icons/destinations-catalog/{{ category_icon }}.svg %}
{{ category.name }}
</a>
</li>
{% endif %}
{% for category in categories %}
{% assign category_icon = category.slug | slugify %}
<li class="destination-menu__item">
<a class="destination-menu__link flex" href="#{{ category.slug | slugify }}" title="{{ category.display_name }}">
{% include icons/destinations-catalog/{{ category_icon }}.svg %}
{{ category.display_name }}
</a>
</li>
{% endfor %}
</ul>
</div>
</div>
45 changes: 43 additions & 2 deletions src/_layouts/destinations.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
<div class="stage__content">
<article class="destinations">
{% include components/breadcrumbs.html %}

{%- if page.title -%}
<h1 id="{{ page.title | downcase }}" class="destinations__heading page__heading">
{{ page.title }}
Expand All @@ -33,7 +32,49 @@ <h1 id="{{ page.title | downcase }}" class="destinations__heading page__heading"
{% include sidebar/destinations-menu-mobile.html %}

<div class="destinations__body" data-headings-anchors>
{{ content }}
<div class="destinations-catalog">
{% assign categories = site.data.catalogV2.destination_categories.items %}

{% for category in categories %}
<div class="destinations-catalog__section markdown" id="{{ category.slug | slugify }}">
{% assign category_icon = category.slug | slugify %}

<h2 class="destinations-catalog__title" id="{{ category.slug | slugify }}">
{% include icons/destinations-catalog/{{ category_icon }}.svg %}

{{ category.display_name }}
</h2>

<div class="flex flex--wrap waffle waffle--large">
{% 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" %}
<div class="flex__column flex__column--6 flex__column--4@medium">
<a class="thumbnail-integration" href="{{ site.baseurl }}/{{ destination.url }}">
<div class="thumbnail-integration__content flex flex--stack flex--center flex--middle">
<div class="thumbnail-integration__logo">
{% if destination.mark.url != '' %}
<img class="image" alt="{{ destination.display_name }}" src="{{ destination.mark.url }}">
{% else %}
<img class="image" alt="{{ destination.display_name }}" src="{{ destination.logo.url }}">
{% endif %}
</div>

<h5>{{ destination.display_name }}</h5>
</div>

{% if destination.status == 'PUBLIC_BETA' %}
<p class="thumbnail-integration__label">Beta</p>
{% endif %}
</a>
</div>
{% endif %}
{% endfor %}
</div>
</div>
{% endfor %}
</div>
</div>
</article>
</div>
Expand Down
47 changes: 0 additions & 47 deletions src/connections/destinations/catalog/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" %}

<div class="destinations-catalog">
{% for category in destination_categories %}
<div class="destinations-catalog__section markdown" id="{{ category.name | slugify }}">
{% assign category_name_size = category.name | size %}
{% if category_name_size != 0 %}
{% assign category_icon = category.name | slugify %}

<h2 class="destinations-catalog__title" id="{{ category.name | slugify }}">
{% include icons/destinations-catalog/{{ category_icon }}.svg %}

{{ category.name }}
</h2>
{% endif %}

<div class="flex flex--wrap waffle waffle--large">
{% 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" %}
<div class="flex__column flex__column--6 flex__column--4@medium">
<a class="thumbnail-integration" href="{{ doc_path | relative_url }}">
<div class="thumbnail-integration__content flex flex--stack flex--center flex--middle">
<div class="thumbnail-integration__logo">
{% if destination.logos.mark != '' %}
<img class="image" alt="{{destination.display_name}}" src="{{destination.logos.mark}}" />
{% else %}
<img class="image" alt="{{destination.display_name}}" src="{{destination.logos.logo}}" />
{% endif %}
</div>

<h5>{{ destination.display_name }}</h5>
</div>

{% if destination.status == 'PUBLIC_BETA' %}
<p class="thumbnail-integration__label">Beta</p>
{% endif %}
</a>
</div>
{% endif %}
{% endfor %}
</div>
</div>
{% endfor %}
</div>