From eb572aa140be232a5613db817fbff9aac4bf75e8 Mon Sep 17 00:00:00 2001 From: Brandon Rosage Date: Thu, 7 Mar 2019 15:06:26 -0600 Subject: [PATCH 1/2] Refactor social share solution Removes share_url include and includes share URL previs in datalist --- _config.yml | 2 +- _data/social_media.yml | 3 ++ _includes/social_media_share_url.html | 13 --------- _layouts/post.html | 40 +++++++++++++++++---------- 4 files changed, 30 insertions(+), 28 deletions(-) delete mode 100644 _includes/social_media_share_url.html diff --git a/_config.yml b/_config.yml index 2b8fa93..8e2188b 100644 --- a/_config.yml +++ b/_config.yml @@ -27,7 +27,7 @@ projects: projects: # - repo-name -social_media: +# social_media: # behance: your_username # facebook: your_username # dribbble: your_username diff --git a/_data/social_media.yml b/_data/social_media.yml index 3a5ca59..a80f59f 100644 --- a/_data/social_media.yml +++ b/_data/social_media.yml @@ -6,11 +6,13 @@ behance: facebook: name: Facebook profile_url_prefix: https://www.facebook.com/ + share_url_prefix: https://www.facebook.com/sharer/sharer.php?u= icon_svg: '' linkedin: name: LinkedIn profile_url_prefix: https://www.linkedin.com/in/ + share_url_prefix: https://www.linkedin.com/shareArticle?mini=true&url= icon_svg: '' stackoverflow: @@ -21,6 +23,7 @@ stackoverflow: twitter: name: Twitter profile_url_prefix: https://www.twitter.com/ + share_url_prefix: https://twitter.com/share?url= icon_svg: '' youtube: diff --git a/_includes/social_media_share_url.html b/_includes/social_media_share_url.html deleted file mode 100644 index 53de80a..0000000 --- a/_includes/social_media_share_url.html +++ /dev/null @@ -1,13 +0,0 @@ -{% if include.service == 'facebook' %} - {% capture share_url %} - https://www.facebook.com/sharer/sharer.php?u={{ include.permalink | prepend: site.url | prepend: site.baseurl | url_encode }} - {% endcapture %} -{% elsif include.service == 'linkedin' %} - {% capture share_url %} - https://www.linkedin.com/shareArticle?mini=true&url={{ include.permalink | prepend: site.url | prepend: site.baseurl | url_encode }}&title={{ include.title | url_encode }}&source=LinkedIn - {% endcapture %} -{% elsif include.service == 'twitter' %} - {% capture share_url %} - https://twitter.com/share?text={{ include.title | url_encode }}&url={{ include.permalink | prepend: site.url | prepend: site.baseurl | url_encode }} - {% endcapture %} -{% endif %}{{ share_url | strip }} diff --git a/_layouts/post.html b/_layouts/post.html index 5121842..769e3a1 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -2,20 +2,32 @@ {% capture post_body %} {% if site.social_media %} -
-

Share

- -
+ {% assign shareable_social_media = '' | split: ',' %} + + {% for service in site.social_media %} + {% if service.share_url %} + {% assign shareable_social_media = shareable_social_media | push: service %} + {% end %} + {% endfor %} + + {% assign total_shareable_services = shareable_social_media | size %} + + {% if total_shareable_services > 0 %} +
+

Share

+ +
+ {% endif %} {% endif %}
{{ content }} From 0820be7c19741481ba16d43e6fc4041e1de866f0 Mon Sep 17 00:00:00 2001 From: Brandon Rosage Date: Thu, 7 Mar 2019 15:27:09 -0600 Subject: [PATCH 2/2] debug share logic --- _layouts/post.html | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/_layouts/post.html b/_layouts/post.html index 769e3a1..ffa3cf5 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -4,10 +4,13 @@ {% if site.social_media %} {% assign shareable_social_media = '' | split: ',' %} - {% for service in site.social_media %} - {% if service.share_url %} + {% for account in site.social_media %} + {% assign service_shortname = account[0] %} + {% assign service = site.data.social_media[service_shortname] %} + + {% if service.share_url_prefix %} {% assign shareable_social_media = shareable_social_media | push: service %} - {% end %} + {% endif %} {% endfor %} {% assign total_shareable_services = shareable_social_media | size %} @@ -16,11 +19,9 @@

Share

    - {% for account in shareable_social_media %} + {% for service in shareable_social_media %}
  • - {% assign service_shortname = account[0] %} - {% assign service = site.data.social_media[service_shortname] %} - +
    {{ service.icon_svg }}
    {{ service.name }}