- Add Property - - +

+ + Background Type +

+ + Solid Color +

+ + Gradient +

+ Add Property + + +

diff --git a/src/demo/js/script.js b/src/demo/js/script.js index 752eb579..1141c0c1 100644 --- a/src/demo/js/script.js +++ b/src/demo/js/script.js @@ -85,7 +85,7 @@ const preview = { }; const parent = document.querySelector(".advanced .color-properties"); - if (propertyName === "background") { + if (propertyName === "background" && document.querySelector("#background-type-gradient").checked) { const valueParts = value.split(","); let angleValue = "45"; let color1Value = "#EB5454FF"; @@ -335,8 +335,26 @@ window.addEventListener( [...document.querySelectorAll("select:not(#properties)")].forEach((element) => { element.addEventListener("change", refresh, false); }); + // when the background-type changes, remove the background and replace it + const toggleBackgroundType = () => { + const value = document.querySelector("input#background, input#background-color1")?.value; + preview.removeProperty("background"); + if (value && document.querySelector("#background-type-gradient").checked) { + preview.addProperty("background", `45,${value},${value}`); + } else if (value) { + preview.addProperty("background", value); + } + }; + document.querySelector("#background-type-solid").addEventListener("change", toggleBackgroundType, false); + document.querySelector("#background-type-gradient").addEventListener("change", toggleBackgroundType, false); // set input boxes to match URL parameters const searchParams = new URLSearchParams(window.location.search); + const backgroundParams = searchParams.getAll("background"); + // set background-type + if (backgroundParams.length > 1) { + document.querySelector("#background-type-gradient").checked = true; + } + // set input field and select values searchParams.forEach((val, key) => { const paramInput = document.querySelector(`[name="${key}"]`); if (paramInput) { @@ -348,9 +366,8 @@ window.addEventListener( preview.addProperty(key, searchParams.getAll(key).join(",")); } }); - // set background angle and colors - const backgroundParams = searchParams.getAll("background"); - if (backgroundParams.length > 0) { + // set background angle and gradient colors + if (backgroundParams.length > 1) { document.querySelector("#rotate").value = backgroundParams[0]; document.querySelector("#background-color1").value = backgroundParams[1]; document.querySelector("#background-color2").value = backgroundParams[2]; From 42e7be3967f8fb4d055a6de8fdb7f8d1a346a2e9 Mon Sep 17 00:00:00 2001 From: Kristaller <112420322+Kristallers@users.noreply.github.com> Date: Thu, 13 Apr 2023 14:31:41 +0200 Subject: [PATCH 34/40] Added swedish translation (#488) --- src/translations.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/translations.php b/src/translations.php index 7902ec3c..2e913bdb 100644 --- a/src/translations.php +++ b/src/translations.php @@ -250,6 +250,14 @@ "Week Streak" => "निरन्तरसप्ताहाः", "Longest Week Streak" => "दीर्घतमाः निरन्तरसप्ताहाः", "Present" => "वर्तमान", + ], + "sv" => [ + "Total Contributions" => "Totalt antal uppladningar", + "Current Streak" => "Dagar uppladdat i rad just nu", + "Longest Streak" => "Längst antal dagar uppladdat i rad", + "Week Streak" => "Antal veckor i rad", + "Longest Week Streak" => "Längst antal veckor i rad", + "Present" => "Just nu", ], "sw" => [ "Total Contributions" => "Jumla ya Michango", From 162ae1e981f2eacc135c01583d3667da6072b565 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Thu, 13 Apr 2023 12:32:12 +0000 Subject: [PATCH 35/40] docs(readme): Update translation progress --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9bf38f8b..65ff7d8b 100644 --- a/README.md +++ b/README.md @@ -89,7 +89,7 @@ The following are the locales that have labels translated in Streak Stats. The ` -

`en` - English	`ar` - العربية	`bg` - български	`bn` - বাংলা	`da` - dansk
`de` - Deutsch	`el` - Ελληνικά	`es` - español	`fa` - فارسی	`fr` - français
`he` - עברית	`hi` - हिन्दी	`ht` - Haitian Creole	`hy` - հայերեն	`id` - Indonesia
`it` - italiano	`ja` - 日本語	`kn` - ಕನ್ನಡ	`ko` - 한국어	`mr` - मराठी
`nl` - Nederlands	`pl` - polski	`ps` - پښتو	`pt_BR` - português (Brasil)	`ru` - русский
`rw` - Kinyarwanda	`sa` - संस्कृत भाषा	`sw` - Kiswahili	`ta` - தமிழ்	`tr` - Türkçe
`uk` - українська	`ur_PK` - اردو (پاکستان)	`vi` - Tiếng Việt	`yo` - Èdè Yorùbá	`zh_Hans` - 中文（简体）
`zh_Hant` - 中文（繁體）

`en` - English	`ar` - العربية	`bg` - български	`bn` - বাংলা	`da` - dansk
`de` - Deutsch	`el` - Ελληνικά	`es` - español	`fa` - فارسی	`fr` - français
`he` - עברית	`hi` - हिन्दी	`ht` - Haitian Creole	`hy` - հայերեն	`id` - Indonesia
`it` - italiano	`ja` - 日本語	`kn` - ಕನ್ನಡ	`ko` - 한국어	`mr` - मराठी
`nl` - Nederlands	`pl` - polski	`ps` - پښتو	`pt_BR` - português (Brasil)	`ru` - русский
`rw` - Kinyarwanda	`sa` - संस्कृत भाषा	`sv` - svenska	`sw` - Kiswahili	`ta` - தமிழ்
`tr` - Türkçe	`uk` - українська	`ur_PK` - اردو (پاکستان)	`vi` - Tiếng Việt	`yo` - Èdè Yorùbá
`zh_Hans` - 中文（简体）	`zh_Hant` - 中文（繁體）

From 3c59cfb3a21bc3ca4b1f85422121329468a22fb6 Mon Sep 17 00:00:00 2001 From: Jonah Lawrence Date: Thu, 13 Apr 2023 15:42:53 +0300 Subject: [PATCH 36/40] style: Whitespace formatting fixes --- src/translations.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/translations.php b/src/translations.php index 2e913bdb..995313c1 100644 --- a/src/translations.php +++ b/src/translations.php @@ -251,7 +251,7 @@ "Longest Week Streak" => "दीर्घतमाः निरन्तरसप्ताहाः", "Present" => "वर्तमान", ], - "sv" => [ + "sv" => [ "Total Contributions" => "Totalt antal uppladningar", "Current Streak" => "Dagar uppladdat i rad just nu", "Longest Streak" => "Längst antal dagar uppladdat i rad", From 9fe466c1c360cc756cea7781355394f07c03f059 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Apr 2023 10:49:59 +0300 Subject: [PATCH 37/40] chore(deps-dev): bump phpunit/phpunit from 9.6.6 to 9.6.7 (#489) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 61672dbc..4ba49ac2 100644 --- a/composer.lock +++ b/composer.lock @@ -1093,16 +1093,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.6", + "version": "9.6.7", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "b65d59a059d3004a040c16a82e07bbdf6cfdd115" + "reference": "c993f0d3b0489ffc42ee2fe0bd645af1538a63b2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b65d59a059d3004a040c16a82e07bbdf6cfdd115", - "reference": "b65d59a059d3004a040c16a82e07bbdf6cfdd115", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c993f0d3b0489ffc42ee2fe0bd645af1538a63b2", + "reference": "c993f0d3b0489ffc42ee2fe0bd645af1538a63b2", "shasum": "" }, "require": { @@ -1176,7 +1176,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.6" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.7" }, "funding": [ { @@ -1192,7 +1192,7 @@ "type": "tidelift" } ], - "time": "2023-03-27T11:43:46+00:00" + "time": "2023-04-14T08:58:40+00:00" }, { "name": "sebastian/cli-parser", From 622d48ef9b599d2026002777f088ef4207944d90 Mon Sep 17 00:00:00 2001 From: Jonah Lawrence Date: Mon, 17 Apr 2023 19:56:16 +0300 Subject: [PATCH 38/40] feat: Add support for excluding days of the week from the streak (#490) Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> --- README.md | 43 ++++++++++--------- scripts/translation-progress.php | 1 + src/card.php | 47 ++++++++++++++++++++ src/demo/css/style.css | 29 +++++++++++++ src/demo/index.php | 19 +++++++++ src/demo/js/script.js | 33 +++++++++++++++ src/demo/preview.php | 2 + src/index.php | 4 +- src/stats.php | 40 ++++++++++++++++- src/translations.php | 2 + tests/RenderTest.php | 11 +++++ tests/StatsTest.php | 73 ++++++++++++++++++++++++++++++++ tests/TranslationsTest.php | 1 + tests/expected/test_card.svg | 1 + 14 files changed, 282 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index 65ff7d8b..5a6e44be 100644 --- a/README.md +++ b/README.md @@ -43,27 +43,28 @@ The `user` field is the only required option. All other fields are optional. If the `theme` parameter is specified, any color customizations specified will be applied on top of the theme, overriding the theme's values. -| Parameter | Details | Example | -| :------------------: | :---------------------------------------------: | :------------------------------------------------------------------------------------------------: | -| `user` | GitHub username to show stats for | `DenverCoder1` | -| `theme` | The theme to apply (Default: `default`) | `dark`, `radical`, etc. [🎨➜](./docs/themes.md) | -| `hide_border` | Make the border transparent (Default: `false`) | `true` or `false` | -| `border_radius` | Set the roundness of the edges (Default: `4.5`) | Number `0` (sharp corners) to `248` (ellipse) | -| `background` | Background color (eg. `f2f2f2`, `35,d22,00f`) | **hex code** without `#`, **css color**, or gradient in the form `angle,start_color,...,end_color` | -| `border` | Border color | **hex code** without `#` or **css color** | -| `stroke` | Stroke line color between sections | **hex code** without `#` or **css color** | -| `ring` | Color of the ring around the current streak | **hex code** without `#` or **css color** | -| `fire` | Color of the fire in the ring | **hex code** without `#` or **css color** | -| `currStreakNum` | Current streak number | **hex code** without `#` or **css color** | -| `sideNums` | Total and longest streak numbers | **hex code** without `#` or **css color** | -| `currStreakLabel` | Current streak label | **hex code** without `#` or **css color** | -| `sideLabels` | Total and longest streak labels | **hex code** without `#` or **css color** | -| `dates` | Date range text color | **hex code** without `#` or **css color** | -| `date_format` | Date format pattern or empty for locale format | See note below on [📅 Date Formats](#-date-formats) | -| `locale` | Locale for labels and numbers (Default: `en`) | ISO 639-1 code - See [🗪 Locales](#-locales) | -| `type` | Output format (Default: `svg`) | Current options: `svg`, `png` or `json` | -| `mode` | Streak mode (Default: `daily`) | `daily` (contribute daily) or `weekly` (contribute once per Sun-Sat week) | -| `disable_animations` | Disable SVG animations (Default: `false`) | `true` or `false` | +| Parameter | Details | Example | +| :------------------: | :----------------------------------------------: | :------------------------------------------------------------------------------------------------: | +| `user` | GitHub username to show stats for | `DenverCoder1` | +| `theme` | The theme to apply (Default: `default`) | `dark`, `radical`, etc. [🎨➜](./docs/themes.md) | +| `hide_border` | Make the border transparent (Default: `false`) | `true` or `false` | +| `border_radius` | Set the roundness of the edges (Default: `4.5`) | Number `0` (sharp corners) to `248` (ellipse) | +| `background` | Background color (eg. `f2f2f2`, `35,d22,00f`) | **hex code** without `#`, **css color**, or gradient in the form `angle,start_color,...,end_color` | +| `border` | Border color | **hex code** without `#` or **css color** | +| `stroke` | Stroke line color between sections | **hex code** without `#` or **css color** | +| `ring` | Color of the ring around the current streak | **hex code** without `#` or **css color** | +| `fire` | Color of the fire in the ring | **hex code** without `#` or **css color** | +| `currStreakNum` | Current streak number | **hex code** without `#` or **css color** | +| `sideNums` | Total and longest streak numbers | **hex code** without `#` or **css color** | +| `currStreakLabel` | Current streak label | **hex code** without `#` or **css color** | +| `sideLabels` | Total and longest streak labels | **hex code** without `#` or **css color** | +| `dates` | Date range text color | **hex code** without `#` or **css color** | +| `date_format` | Date format pattern or empty for locale format | See note below on [📅 Date Formats](#-date-formats) | +| `locale` | Locale for labels and numbers (Default: `en`) | ISO 639-1 code - See [🗪 Locales](#-locales) | +| `type` | Output format (Default: `svg`) | Current options: `svg`, `png` or `json` | +| `mode` | Streak mode (Default: `daily`) | `daily` (contribute daily) or `weekly` (contribute once per Sun-Sat week) | +| `exclude_days` | List of days of the week to exclude from streaks | Comma-separated list of day abbreviations (Sun,Mon,Tue,Wed,Thu,Fri,Sat) e.g. `Sun,Sat` | +| `disable_animations` | Disable SVG animations (Default: `false`) | `true` or `false` | ### 🖌 Themes diff --git a/scripts/translation-progress.php b/scripts/translation-progress.php index 1849f686..030fff9c 100644 --- a/scripts/translation-progress.php +++ b/scripts/translation-progress.php @@ -17,6 +17,7 @@ function getProgress(array $translations): array "Week Streak", "Longest Week Streak", "Present", + "Excluding", ]; $translations_file = file(__DIR__ . "/../src/translations.php"); diff --git a/src/card.php b/src/card.php index 66b5b2a5..df469cb2 100644 --- a/src/card.php +++ b/src/card.php @@ -53,6 +53,37 @@ function formatDate(string $dateString, string|null $format, string $locale): st return htmlspecialchars($formatted); } +/** + * Translate days of the week + * + * Takes a list of days (eg. ["Sun", "Mon", "Sat"]) and returns the short abbreviation of the days of the week in another locale + * e.g. ["Sun", "Mon", "Sat"] -> ["dim", "lun", "sam"] + * + * @param array $days List of days to translate + * @param string $locale Locale code + * + * @return array Translated days + */ +function translateDays(array $days, string $locale): array +{ + if ($locale === "en") { + return $days; + } + $patternGenerator = new IntlDatePatternGenerator($locale); + $pattern = $patternGenerator->getBestPattern("EEE"); + $dateFormatter = new IntlDateFormatter( + $locale, + IntlDateFormatter::NONE, + IntlDateFormatter::NONE, + pattern: $pattern + ); + $translatedDays = []; + foreach ($days as $day) { + $translatedDays[] = $dateFormatter->format(new DateTime($day)); + } + return $translatedDays; +} + /** * Normalize a theme name * @@ -335,6 +366,21 @@ function generateCard(array $stats, array $params = null): string $currentStreakRange = splitLines($currentStreakRange, 28, 0); $longestStreakRange = splitLines($longestStreakRange, 28, 0); + // if days are excluded, add a note to the corner + $excludedDays = ""; + if (!empty($stats["excludedDays"])) { + $daysCommaSeparated = implode(", ", translateDays($stats["excludedDays"], $localeCode)); + $offset = $direction === "rtl" ? 495 - 5 : 5; + $excludedDays = " + + + + * {$localeTranslations["Excluding"]} {$daysCommaSeparated} + + + "; + } + return " "; diff --git a/src/demo/css/style.css b/src/demo/css/style.css index 3b3a5446..c7215da5 100644 --- a/src/demo/css/style.css +++ b/src/demo/css/style.css @@ -185,6 +185,35 @@ h2 { text-transform: capitalize; } +.weekdays input { + display: none !important; +} + +.weekdays input[type="checkbox"] + label { + font-size: 90%; + display: inline-block; + border-radius: 6px; + height: 30px; + width: 30px; + margin-right: 3px; + line-height: 28px; + text-align: center; + cursor: pointer; + background: var(--card-background); + color: var(--text); + border: 1px solid var(--border); +} + +.weekdays input[type="checkbox"]:checked + label { + background: var(--text); + color: var(--background); +} + +.weekdays input[type="checkbox"]:disabled + label { + background: var(--card-background); + color: var(--stroke); +} + span[title="required"] { color: var(--red); } diff --git a/src/demo/index.php b/src/demo/index.php index bd3580ce..573de37e 100644 --- a/src/demo/index.php +++ b/src/demo/index.php @@ -137,6 +137,25 @@ function gtag() { + Exclude Days +

+ + S + + M + + T + + W + + T + + F + + S + +

+ Output Type