Skip to content

Commit 1c3bfed

Browse files
committed
Merge branch 'develop'
2 parents 45fead0 + 0c3c388 commit 1c3bfed

File tree

4 files changed

+31
-17
lines changed

4 files changed

+31
-17
lines changed

assets/js/base.js

+28-14
Original file line numberDiff line numberDiff line change
@@ -26,25 +26,39 @@ $('a').each(function() {
2626
}
2727
})();
2828

29+
function determineGlobalData(locale, globalData) {
30+
determineGitHubStargazersCount(locale, globalData);
31+
determineMastodonFollowersCount(locale, globalData);
32+
}
33+
2934
function determineGitHubStargazersCount(locale, globalData) {
3035
$.getJSON('https://api.cryptomator.org/desktop/repo.json', data => {
3136
globalData.githubStargazers = formatNumber(data.stargazers_count, locale);
3237
}).fail(() => {
3338
console.error('Error fetching repository data.');
3439
});
35-
function formatNumber(num, locale) {
36-
let formatted = num;
37-
if (num >= 1000 && num < 1000000) {
38-
formatted = (num / 1000).toFixed(1);
39-
formatted = formatted.endsWith('.0') ? formatted.slice(0, -2) + 'k' : formatted + 'k';
40-
} else if (num >= 1000000) {
41-
formatted = (num / 1000000).toFixed(1);
42-
formatted = formatted.endsWith('.0') ? formatted.slice(0, -2) + 'M' : formatted + 'M';
43-
}
44-
if (locale === 'de') {
45-
return formatted.replace('.', ',');
46-
} else {
47-
return formatted;
48-
}
40+
}
41+
42+
function determineMastodonFollowersCount(locale, globalData) {
43+
$.getJSON('https://api.cryptomator.org/social/mastodon.json', data => {
44+
globalData.mastodonFollowers = formatNumber(data.followers_count, locale);
45+
}).fail(() => {
46+
console.error('Error fetching Mastodon data.');
47+
});
48+
}
49+
50+
function formatNumber(num, locale) {
51+
let formatted = num;
52+
if (num >= 1000 && num < 1000000) {
53+
formatted = (num / 1000).toFixed(1);
54+
formatted = formatted.endsWith('.0') ? formatted.slice(0, -2) + 'k' : formatted + 'k';
55+
} else if (num >= 1000000) {
56+
formatted = (num / 1000000).toFixed(1);
57+
formatted = formatted.endsWith('.0') ? formatted.slice(0, -2) + 'M' : formatted + 'M';
58+
}
59+
if (locale === 'de') {
60+
return formatted.replace('.', ',');
61+
} else {
62+
return formatted;
4963
}
5064
}

content/sponsors.de.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<p class="text-xs md:text-sm lg:text-base leading-relaxed text-gray-700">GitHub Stars</p>
2424
</div>
2525
<div class="white-box text-center p-2">
26-
<p class="font-bold text-2xl md:text-3xl lg:text-4xl leading-relaxed">4,2k</p>
26+
<p x-text="globalData.mastodonFollowers ?? '…'" class="font-bold text-2xl md:text-3xl lg:text-4xl leading-relaxed"></p>
2727
<p class="text-xs md:text-sm lg:text-base leading-relaxed text-gray-700">Mastodon Followers</p>
2828
</div>
2929
<div class="white-box text-center p-2">

content/sponsors.en.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<p class="text-xs md:text-sm lg:text-base leading-relaxed text-gray-700">GitHub Stars</p>
2424
</div>
2525
<div class="white-box text-center p-2">
26-
<p class="font-bold text-2xl md:text-3xl lg:text-4xl leading-relaxed">4.2k</p>
26+
<p x-text="globalData.mastodonFollowers ?? '…'" class="font-bold text-2xl md:text-3xl lg:text-4xl leading-relaxed"></p>
2727
<p class="text-xs md:text-sm lg:text-base leading-relaxed text-gray-700">Mastodon Followers</p>
2828
</div>
2929
<div class="white-box text-center p-2">

layouts/_default/baseof.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<link rel="alternate" hreflang="{{ .Lang }}" href="{{ .Permalink }}" />
6767
{{ end }}
6868
</head>
69-
<body x-data="{ isNavOpen: false, globalData: { githubStargazers: null } }" x-init="determineGitHubStargazersCount('{{ .Site.Language.Lang }}', globalData)" :class="isNavOpen && 'overflow-hidden'" class="bg-dark font-body text-gray-900">
69+
<body x-data="{ isNavOpen: false, globalData: { githubStargazers: null, mastodonFollowers: null } }" x-init="determineGlobalData('{{ .Site.Language.Lang }}', globalData)" :class="isNavOpen && 'overflow-hidden'" class="bg-dark font-body text-gray-900">
7070
{{ partial "nav.html" . }}
7171
{{- $topPadding := cond .IsHome "" "pt-24 md:pt-18" -}}
7272
<div class="bg-gray-100 min-h-[80vh] {{ $topPadding }}">

0 commit comments

Comments
 (0)