From 3fcfdae7ed3a54d58060adbbfd3e5bbd620a1c26 Mon Sep 17 00:00:00 2001 From: Rafael Bardini Date: Sun, 18 Jul 2021 15:21:43 +0200 Subject: [PATCH] feat(url): merge links with headings --- partials/awards.hbs | 12 +++---- partials/certificates.hbs | 17 ++++----- partials/education.hbs | 13 +++---- partials/link.hbs | 1 + partials/projects.hbs | 23 +++++------- partials/publications.hbs | 17 ++++----- partials/volunteer.hbs | 9 +---- partials/work.hbs | 9 +---- style.css | 2 +- tap-snapshots/test/render.js.test.cjs | 51 +++++++++------------------ 10 files changed, 51 insertions(+), 103 deletions(-) create mode 100644 partials/link.hbs diff --git a/partials/awards.hbs b/partials/awards.hbs index 2e322f4..1cd1255 100644 --- a/partials/awards.hbs +++ b/partials/awards.hbs @@ -11,13 +11,11 @@ {{/date}} -
- {{#awarder}} -
- Awarded by {{.}} -
- {{/awarder}} -
+ {{#awarder}} + + Awarded by {{.}} + + {{/awarder}} {{#summary}} {{{markdown .}}} diff --git a/partials/certificates.hbs b/partials/certificates.hbs index 36728a7..ee1b01d 100644 --- a/partials/certificates.hbs +++ b/partials/certificates.hbs @@ -6,21 +6,16 @@
-

{{name}}

+

{{> link}}

{{#date}} {{/date}}
-
- {{#issuer}} - - Issued by {{.}} - - {{/issuer}} - {{#url}} - {{formatURL .}} - {{/url}} -
+ {{#issuer}} + + Issued by {{.}} + + {{/issuer}}
{{/each}} diff --git a/partials/education.hbs b/partials/education.hbs index 7b53058..7a58bc2 100644 --- a/partials/education.hbs +++ b/partials/education.hbs @@ -6,20 +6,15 @@
-

{{institution}}

+

{{> link name=institution}}

– {{#if endDate}}{{else}}Present{{/if}}
-
- {{#area}} - {{.}} - {{/area}} - {{#url}} - {{formatURL .}} - {{/url}} -
+ {{#area}} + {{.}} + {{/area}}
{{#studyType}} {{{markdown .}}} diff --git a/partials/link.hbs b/partials/link.hbs new file mode 100644 index 0000000..b373510 --- /dev/null +++ b/partials/link.hbs @@ -0,0 +1 @@ +{{#if name}}{{#if url}}{{name}}{{else}}{{name}}{{/if}}{{else}}{{#url}}{{formatURL .}}{{/url}}{{/if}} \ No newline at end of file diff --git a/partials/projects.hbs b/partials/projects.hbs index 745ab7a..3a2850c 100644 --- a/partials/projects.hbs +++ b/partials/projects.hbs @@ -6,25 +6,20 @@
-

{{name}}

+

{{> link}}

– {{#if endDate}}{{else}}Present{{/if}}
-
- - {{#if roles}} - {{join roles}} - {{/if}} - {{#entity}} - at {{.}} - {{/entity}} - - {{#url}} - {{formatURL .}} - {{/url}} -
+ + {{#if roles}} + {{join roles}} + {{/if}} + {{#entity}} + at {{.}} + {{/entity}} +
{{#description}} {{{markdown .}}} diff --git a/partials/publications.hbs b/partials/publications.hbs index f6f0c1f..8da32b6 100644 --- a/partials/publications.hbs +++ b/partials/publications.hbs @@ -6,21 +6,16 @@
-

{{name}}

+

{{> link}}

{{#releaseDate}} {{/releaseDate}}
-
- {{#publisher}} - - Published by {{.}} - - {{/publisher}} - {{#url}} - {{formatURL .}} - {{/url}} -
+ {{#publisher}} + + Published by {{.}} + + {{/publisher}}
{{#summary}} {{{markdown .}}} diff --git a/partials/volunteer.hbs b/partials/volunteer.hbs index 28c86cc..7ea437c 100644 --- a/partials/volunteer.hbs +++ b/partials/volunteer.hbs @@ -12,14 +12,7 @@ {{#if endDate}}{{else}}Present{{/if}} -
- {{#organization}} - {{.}} - {{/organization}} - {{#url}} - {{formatURL .}} - {{/url}} -
+ {{> link name=organization}} {{#summary}} {{{markdown .}}} diff --git a/partials/work.hbs b/partials/work.hbs index 0de7673..803893e 100644 --- a/partials/work.hbs +++ b/partials/work.hbs @@ -12,14 +12,7 @@ {{#if endDate}}{{else}}Present{{/if}} -
- {{#name}} - {{.}} - {{/name}} - {{#url}} - {{formatURL .}} - {{/url}} -
+ {{> link}} {{#summary}} {{{markdown .}}} diff --git a/style.css b/style.css index 7bde906..75a207e 100644 --- a/style.css +++ b/style.css @@ -194,7 +194,7 @@ blockquote > * + * { justify-content: space-between; } -.spaced-list:first-child::before { +.spaced-list::before { border-bottom: 1px solid var(--color-muted); content: ''; flex-grow: 1; diff --git a/tap-snapshots/test/render.js.test.cjs b/tap-snapshots/test/render.js.test.cjs index beeb7b9..88a5ce6 100644 --- a/tap-snapshots/test/render.js.test.cjs +++ b/tap-snapshots/test/render.js.test.cjs @@ -210,7 +210,7 @@ blockquote > * + * { justify-content: space-between; } -.spaced-list:first-child::before { +.spaced-list::before { border-bottom: 1px solid var(--color-muted); content: ''; flex-grow: 1; @@ -318,10 +318,7 @@ blockquote > * + * { -
- Pied Piper - piedpiper.example.com -
+ Pied Piper

Pied Piper is a multi-platform technology based on a proprietary universal compression algorithm that has consistently fielded high Weisman Scores™ that are not merely competitive, but approach the theoretical limit of lossless compression.

    @@ -344,10 +341,7 @@ blockquote > * + * { -
    - CoderDojo - coderdojo.example.com -
    + CoderDojo

    Global movement of free coding clubs for young people.

      @@ -362,16 +356,13 @@ blockquote > * + * {
      -

      University of Oklahoma

      +

      University of Oklahoma

      –
      -
      - Information Technology - www.ou.edu -
      + Information Technology

      Bachelor

      Courses
      @@ -388,19 +379,16 @@ blockquote > * + * {
      -

      Miss Direction

      +

      Miss Direction

      –
      -
      - - Team lead, Designer - at Smoogle - - missdirection.example.com -
      + + Team lead, Designer + at Smoogle +

      A mapping engine that misguides you

        @@ -420,11 +408,9 @@ blockquote > * + * {

        Digital Compression Pioneer Award

        -
        -
        - Awarded by Techcrunch -
        -
        + + Awarded by Techcrunch +

        There is no spoon.

      @@ -436,15 +422,12 @@ blockquote > * + * {