Skip to content

Commit 0b50b9f

Browse files
authored
Merge branch 'main' into dependabot/npm_and_yarn/npm-dependencies-f8e63e08de
2 parents 98f9767 + ef98585 commit 0b50b9f

10 files changed

Lines changed: 22 additions & 19 deletions

File tree

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @jbampton
1+
* @BaseMax @jbampton
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ permissions:
1010
contents: read
1111

1212
jobs:
13-
pre-commit:
13+
prek-audit:
1414
name: 🏃‍♂️‍➡️ prek on ${{ matrix.os }}
1515
runs-on: ${{ matrix.os }}
1616
strategy:
1717
matrix:
18-
os: [ubuntu-latest, windows-latest]
18+
os: [macos-latest, ubuntu-latest, windows-latest]
1919
steps:
2020
- name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
2121
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ permissions:
1010
contents: read
1111

1212
jobs:
13-
pre-commit:
13+
prek-manual:
1414
name: 🏃‍♂️‍➡️ prek on ${{ matrix.os }}
1515
runs-on: ${{ matrix.os }}
1616
strategy:
1717
matrix:
18-
os: [ubuntu-latest, windows-latest]
18+
os: [macos-latest, ubuntu-latest, windows-latest]
1919
steps:
2020
- name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
2121
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ permissions:
1010
contents: read
1111

1212
jobs:
13-
pre-commit:
14-
name: 🏃🏿‍♂️‍➡️ Run prek on ${{ matrix.os }}
13+
prek:
14+
name: 🏃🏿‍♂️‍➡️ prek on ${{ matrix.os }}
1515
runs-on: ${{ matrix.os }}
1616
strategy:
1717
matrix:
18-
os: [ubuntu-latest, windows-latest]
18+
os: [macos-latest, ubuntu-latest, windows-latest]
1919
steps:
2020
- name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
2121
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
[![Built with Tailwind CSS](https://img.shields.io/badge/Built%20with-Tailwind-blue)](https://tailwindcss.com/)
99

1010
[![Super-Linter](https://github.com/NextCommunity/NextCommunity.github.io/actions/workflows/super-linter.yml/badge.svg?branch=main)](https://github.com/NextCommunity/NextCommunity.github.io/actions/workflows/super-linter.yml?query=branch%3Amain)
11-
[![Audit hooks](https://github.com/NextCommunity/NextCommunity.github.io/actions/workflows/pre-commit-audit.yml/badge.svg?branch=main)](https://github.com/NextCommunity/NextCommunity.github.io/actions/workflows/pre-commit-audit.yml?query=branch%3Amain)
12-
[![Manual hooks](https://github.com/NextCommunity/NextCommunity.github.io/actions/workflows/pre-commit-manual.yml/badge.svg?branch=main)](https://github.com/NextCommunity/NextCommunity.github.io/actions/workflows/pre-commit-manual.yml?query=branch%3Amain)
13-
[![Standard hooks](https://github.com/NextCommunity/NextCommunity.github.io/actions/workflows/pre-commit.yml/badge.svg?branch=main)](https://github.com/NextCommunity/NextCommunity.github.io/actions/workflows/pre-commit.yml?query=branch%3Amain)
11+
[![Audit hooks](https://github.com/NextCommunity/NextCommunity.github.io/actions/workflows/prek-audit.yml/badge.svg?branch=main)](https://github.com/NextCommunity/NextCommunity.github.io/actions/workflows/prek-audit.yml?query=branch%3Amain)
12+
[![Manual hooks](https://github.com/NextCommunity/NextCommunity.github.io/actions/workflows/prek-manual.yml/badge.svg?branch=main)](https://github.com/NextCommunity/NextCommunity.github.io/actions/workflows/prek-manual.yml?query=branch%3Amain)
13+
[![Standard hooks](https://github.com/NextCommunity/NextCommunity.github.io/actions/workflows/prek.yml/badge.svg?branch=main)](https://github.com/NextCommunity/NextCommunity.github.io/actions/workflows/prek.yml?query=branch%3Amain)
1414

1515
[![Easter Eggs](https://img.shields.io/badge/Easter-Eggs-ff69b4?labelColor=9b59b6)](https://nextcommunity.github.io)
1616

‎biome.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "https://biomejs.dev/schemas/2.4.10/schema.json",
33
"files": {
4-
"includes": ["**/*.json", "**/*.njk", "**/*.yaml", "**/*.yml"]
4+
"includes": ["**/*.json"]
55
},
66
"linter": {
77
"enabled": true,

‎src/_includes/bio.njk‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,12 @@
2222
</div>
2323

2424
<div class="space-y-4 text-sm border-t border-[var(--border-color)] pt-6">
25+
{% if location or country %}
2526
<div class="flex items-center gap-3">
2627
<span class="text-lg">📍</span>
27-
<span class="text-[var(--text-muted)]">{{ location }}{% if country %}, {{ country }}{% endif %}</span>
28+
<span class="text-[var(--text-muted)]">{{ location }}{% if location and country %}, {% endif %}{{ country }}</span>
2829
</div>
30+
{% endif %}
2931

3032
{% if email %}
3133
<div class="flex items-center gap-3 group cursor-pointer" onclick="copyToClipboard('{{ email }}', this)">
@@ -72,6 +74,7 @@
7274
</div>
7375

7476
<div class="lg:col-span-2 space-y-8">
77+
{% if bio %}
7578
<div class="user-card p-8 sm:p-12 rounded-3xl">
7679
<h2 class="text-xs font-black uppercase tracking-[0.3em] text-[var(--text-muted)] mb-6 flex items-center gap-2">
7780
<span class="w-8 h-[2px] bg-accent"></span> Professional Bio
@@ -80,6 +83,7 @@
8083
{{ bio }}
8184
</div>
8285
</div>
86+
{% endif %}
8387

8488
{% if languages is defined and languages is not null %}
8589
<div class="user-card p-8 rounded-3xl">

‎src/_includes/header-details.njk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
{% else %}
99
<a href="/" class="group/back flex items-center gap-3">
1010
<span class="text-2xl md:text-4xl text-accent transition-transform group-hover/back:-translate-x-2">←</span>
11-
<h1 class="text-3xl md:text-5xl font-black tracking-tighter text-[var(--text-main)] uppercase italic leading-none transition-all group-hover/back:text-accent">
11+
<h1 class="text-3xl md:text-5xl font-black tracking-tighter text-accent uppercase italic leading-none transition-colors duration-300">
1212
Directory
1313
</h1>
1414
</a>

‎src/index.njk‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,11 @@ layout: false
2828
<h2 class="text-2xl font-bold group-hover:text-accent transition-colors">{{ person.data.name }}</h2>
2929
<p class="text-accent font-semibold text-sm uppercase tracking-wider">{{ person.data.role }}</p>
3030
</div>
31+
{% set country = person.data.country %}
3132
{% set location = person.data.location %}
32-
{% if location %}
33+
{% if location or country %}
3334
<span class="shrink-0 text-[10px] bg-[var(--bg-footer)] text-[var(--text-muted)] px-2 py-1 rounded font-bold uppercase border border-[var(--border-color)]">
34-
{{ location }}
35+
{{ location }}{% if location and country %}, {% endif %}{{ country }}
3536
</span>
3637
{% endif %}
3738
</div>
@@ -45,7 +46,7 @@ layout: false
4546

4647
{% set bio = person.data.bio %}
4748
{% if bio %}
48-
<p class="mt-4 text-[var(--text-muted)] text-sm italic line-clamp-3">"{{ bio | truncate(120) }}"</p>
49+
<p class="mt-4 text-[var(--text-muted)] text-sm italic line-clamp-3">"{{ bio | trim | truncate(120) }}"</p>
4950
{% endif %}
5051
</div>
5152

‎src/users/jbampton.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
name: John Bampton 🏂 🏄 🎿 ♠️ ♥️ ♣️ ♦️ 💎 🏆 😎 🎀
22
github: jbampton
3-
website: https://john.onelang.workers.dev/
4-
email: jbampton@gmail.com
53
country: Australia
64
location: Brisbane
75
role: Technical Manager and Scrum Master

0 commit comments

Comments
 (0)