diff --git a/app/Views/Components/DropdownMenu.php b/app/Views/Components/DropdownMenu.php index f83712c2..d806220e 100644 --- a/app/Views/Components/DropdownMenu.php +++ b/app/Views/Components/DropdownMenu.php @@ -43,7 +43,7 @@ class DropdownMenu extends Component return <<{$menuItems} HTML; diff --git a/package-lock.json b/package-lock.json index 31ed1783..76d0a2a4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,16 +10,16 @@ "license": "AGPL-3.0-or-later", "dependencies": { "@amcharts/amcharts4": "^4.10.22", - "@amcharts/amcharts4-geodata": "^4.1.21", + "@amcharts/amcharts4-geodata": "^4.1.22", "@codemirror/basic-setup": "^0.19.0", "@codemirror/commands": "^0.19.5", - "@codemirror/lang-xml": "^0.19.1", + "@codemirror/lang-xml": "^0.19.2", "@codemirror/state": "^0.19.2", - "@codemirror/view": "^0.19.7", + "@codemirror/view": "^0.19.8", "@github/clipboard-copy-element": "^1.1.2", "@github/markdown-toolbar-element": "^1.5.1", "@github/time-elements": "^3.1.2", - "@popperjs/core": "^2.10.1", + "@popperjs/core": "^2.10.2", "@vime/core": "^5.0.33", "choices.js": "^9.0.1", "flatpickr": "^4.6.9", @@ -30,19 +30,19 @@ "xml-formatter": "^2.4.1" }, "devDependencies": { - "@commitlint/cli": "^13.1.0", - "@commitlint/config-conventional": "^13.1.0", + "@commitlint/cli": "^13.2.0", + "@commitlint/config-conventional": "^13.2.0", "@semantic-release/changelog": "^6.0.0", "@semantic-release/exec": "^6.0.1", "@semantic-release/git": "^10.0.0", "@semantic-release/gitlab": "^7.0.3", - "@tailwindcss/forms": "^0.3.3", + "@tailwindcss/forms": "^0.3.4", "@tailwindcss/line-clamp": "^0.2.1", "@tailwindcss/typography": "^0.4.1", "@types/leaflet": "^1.7.5", "@types/marked": "^3.0.1", - "@typescript-eslint/eslint-plugin": "^4.31.2", - "@typescript-eslint/parser": "^4.31.2", + "@typescript-eslint/eslint-plugin": "^4.32.0", + "@typescript-eslint/parser": "^4.32.0", "cross-env": "^7.0.3", "cssnano": "^5.0.8", "cz-conventional-changelog": "^3.3.0", @@ -54,17 +54,17 @@ "lint-staged": "^11.1.2", "postcss-import": "^14.0.2", "postcss-preset-env": "^6.7.0", - "postcss-reporter": "^7.0.2", + "postcss-reporter": "^7.0.3", "prettier": "2.4.1", "prettier-plugin-organize-imports": "^2.3.4", "semantic-release": "^18.0.0", "stylelint": "^13.13.1", "stylelint-config-standard": "^22.0.0", - "svgo": "^2.6.1", - "tailwindcss": "^2.2.15", + "svgo": "^2.7.0", + "tailwindcss": "^2.2.16", "tailwindcss-scroll-snap": "^1.1.0", "typescript": "^4.4.3", - "vite": "^2.5.10" + "vite": "^2.6.1" } }, "node_modules/@amcharts/amcharts4": { @@ -5947,6 +5947,20 @@ "resolved": "https://registry.npmjs.org/fscreen/-/fscreen-1.2.0.tgz", "integrity": "sha512-hlq4+BU0hlPmwsFjwGGzZ+OZ9N/wq9Ljg/sq3pX+2CD7hrJsX9tJgWWK/wiNTFM212CLHWhicOoqwXyZGGetJg==" }, + "node_modules/fsevents": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "dev": true, + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, "node_modules/function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", @@ -8191,6 +8205,12 @@ "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=", "dev": true }, + "node_modules/nanocolors": { + "version": "0.2.12", + "resolved": "https://registry.npmjs.org/nanocolors/-/nanocolors-0.2.12.tgz", + "integrity": "sha512-SFNdALvzW+rVlzqexid6epYdt8H9Zol7xDoQarioEFcFN0JHo4CYNztAxmtfgGTVRCmFlEOqqhBpoFGKqSAMug==", + "dev": true + }, "node_modules/nanoid": { "version": "3.1.30", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.30.tgz", @@ -21907,6 +21927,13 @@ "resolved": "https://registry.npmjs.org/fscreen/-/fscreen-1.2.0.tgz", "integrity": "sha512-hlq4+BU0hlPmwsFjwGGzZ+OZ9N/wq9Ljg/sq3pX+2CD7hrJsX9tJgWWK/wiNTFM212CLHWhicOoqwXyZGGetJg==" }, + "fsevents": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "dev": true, + "optional": true + }, "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", @@ -23619,6 +23646,12 @@ "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=", "dev": true }, + "nanocolors": { + "version": "0.2.12", + "resolved": "https://registry.npmjs.org/nanocolors/-/nanocolors-0.2.12.tgz", + "integrity": "sha512-SFNdALvzW+rVlzqexid6epYdt8H9Zol7xDoQarioEFcFN0JHo4CYNztAxmtfgGTVRCmFlEOqqhBpoFGKqSAMug==", + "dev": true + }, "nanoid": { "version": "3.1.30", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.30.tgz", diff --git a/package.json b/package.json index 43be660e..e9ba0a51 100644 --- a/package.json +++ b/package.json @@ -27,17 +27,17 @@ "prepare": "is-ci || husky install" }, "dependencies": { - "@amcharts/amcharts4-geodata": "^4.1.21", + "@amcharts/amcharts4-geodata": "^4.1.22", "@amcharts/amcharts4": "^4.10.22", "@codemirror/basic-setup": "^0.19.0", "@codemirror/commands": "^0.19.5", - "@codemirror/lang-xml": "^0.19.1", + "@codemirror/lang-xml": "^0.19.2", "@codemirror/state": "^0.19.2", - "@codemirror/view": "^0.19.7", + "@codemirror/view": "^0.19.8", "@github/clipboard-copy-element": "^1.1.2", "@github/markdown-toolbar-element": "^1.5.1", "@github/time-elements": "^3.1.2", - "@popperjs/core": "^2.10.1", + "@popperjs/core": "^2.10.2", "@vime/core": "^5.0.33", "choices.js": "^9.0.1", "flatpickr": "^4.6.9", @@ -48,19 +48,19 @@ "xml-formatter": "^2.4.1" }, "devDependencies": { - "@commitlint/cli": "^13.1.0", - "@commitlint/config-conventional": "^13.1.0", + "@commitlint/cli": "^13.2.0", + "@commitlint/config-conventional": "^13.2.0", "@semantic-release/changelog": "^6.0.0", "@semantic-release/exec": "^6.0.1", "@semantic-release/git": "^10.0.0", "@semantic-release/gitlab": "^7.0.3", - "@tailwindcss/forms": "^0.3.3", + "@tailwindcss/forms": "^0.3.4", "@tailwindcss/line-clamp": "^0.2.1", "@tailwindcss/typography": "^0.4.1", "@types/leaflet": "^1.7.5", "@types/marked": "^3.0.1", - "@typescript-eslint/eslint-plugin": "^4.31.2", - "@typescript-eslint/parser": "^4.31.2", + "@typescript-eslint/eslint-plugin": "^4.32.0", + "@typescript-eslint/parser": "^4.32.0", "cross-env": "^7.0.3", "cssnano": "^5.0.8", "cz-conventional-changelog": "^3.3.0", @@ -72,17 +72,17 @@ "lint-staged": "^11.1.2", "postcss-import": "^14.0.2", "postcss-preset-env": "^6.7.0", - "postcss-reporter": "^7.0.2", + "postcss-reporter": "^7.0.3", "prettier-plugin-organize-imports": "^2.3.4", "prettier": "2.4.1", "semantic-release": "^18.0.0", "stylelint-config-standard": "^22.0.0", "stylelint": "^13.13.1", - "svgo": "^2.6.1", + "svgo": "^2.7.0", "tailwindcss-scroll-snap": "^1.1.0", - "tailwindcss": "^2.2.15", + "tailwindcss": "^2.2.16", "typescript": "^4.4.3", - "vite": "^2.5.10" + "vite": "^2.6.1" }, "lint-staged": { "*.{js,ts,css,md,json}": "prettier --write", diff --git a/themes/cp_admin/_layout.php b/themes/cp_admin/_layout.php index f6b47bd4..5269b9e9 100644 --- a/themes/cp_admin/_layout.php +++ b/themes/cp_admin/_layout.php @@ -41,7 +41,7 @@ data-dropdown-target="my-account-dropdown-menu" aria-haspopup="true" aria-expanded="false">username . icon('caret-down', 'ml-auto text-2xl') ?> - id . '" type="button" class="inline-flex items-center p-1 outline-none focus:ring" data-dropdown="button" data-dropdown-target="more-dropdown-' . $episode->id . '-menu" aria-haspopup="true" aria-expanded="false">' . icon('more') . '' . - 'id . '-menu" labelledby="more-dropdown-' . $episode->id . '" items="' . esc(json_encode([ [ 'type' => 'link', 'title' => lang('Episode.edit'), diff --git a/themes/cp_admin/podcast/latest_episodes.php b/themes/cp_admin/podcast/latest_episodes.php index 2d795036..cf5a6f3c 100644 --- a/themes/cp_admin/podcast/latest_episodes.php +++ b/themes/cp_admin/podcast/latest_episodes.php @@ -52,7 +52,7 @@ aria-haspopup="true" aria-expanded="false" > - id ?>-menu" labelledby="more-dropdown-id ?>" items=" 'link', 'title' => lang('Episode.edit'), diff --git a/themes/cp_admin/podcast/list.php b/themes/cp_admin/podcast/list.php index 4d1738e6..41091a80 100644 --- a/themes/cp_admin/podcast/list.php +++ b/themes/cp_admin/podcast/list.php @@ -19,32 +19,45 @@
-
- <?= $podcast->title ?> - -

title ?>

-

@handle ?>

- -
- - -
+ diff --git a/themes/cp_admin/podcast/persons.php b/themes/cp_admin/podcast/persons.php index f5e2e58a..d388568e 100644 --- a/themes/cp_admin/podcast/persons.php +++ b/themes/cp_admin/podcast/persons.php @@ -66,11 +66,25 @@ subtitle="" > - - - - - + + + diff --git a/themes/cp_app/podcast/_layout.php b/themes/cp_app/podcast/_layout.php index be66043a..7a632a05 100644 --- a/themes/cp_app/podcast/_layout.php +++ b/themes/cp_app/podcast/_layout.php @@ -55,11 +55,7 @@ ) ?>
- + include('podcast/_navigation') ?>
diff --git a/themes/cp_app/podcast/_navigation.php b/themes/cp_app/podcast/_navigation.php new file mode 100644 index 00000000..66ce97f9 --- /dev/null +++ b/themes/cp_app/podcast/_navigation.php @@ -0,0 +1,23 @@ + route_to('podcast-activity', $podcast->handle), + 'label' => lang('Podcast.activity'), + ], + [ + 'uri' => route_to('podcast-episodes', $podcast->handle), + 'label' => lang('Podcast.episodes'), + ], + [ + 'uri' => route_to('podcast-about', $podcast->handle), + 'label' => lang('Podcast.about'), + ], +] +?> + \ No newline at end of file diff --git a/themes/cp_app/podcast/activity.php b/themes/cp_app/podcast/activity.php index 1be8aa5a..1a1b5176 100644 --- a/themes/cp_app/podcast/activity.php +++ b/themes/cp_app/podcast/activity.php @@ -28,6 +28,7 @@ section('content') ?>
+ reblog_of_id !== null): ?> section('content') ?> - +include('podcast/_navigation') ?>
@@ -51,7 +38,7 @@ <?= interact_as_actor() ->display_name ?> -
+
- +
diff --git a/themes/cp_app/podcast/episode_authenticated.php b/themes/cp_app/podcast/episode_authenticated.php index b8478828..0ffc7ed5 100644 --- a/themes/cp_app/podcast/episode_authenticated.php +++ b/themes/cp_app/podcast/episode_authenticated.php @@ -96,7 +96,7 @@ <?= interact_as_actor() ->display_name ?> -
+
-
+
endSection() ?> section('content') ?> - + +include('podcast/_navigation') ?>
@@ -73,26 +35,26 @@

$activeQuery['value'], + 'year' => $activeQuery['value'], 'episodeCount' => count($episodes), - ]) ?> +]) ?> $activeQuery['value'], + 'seasonNumber' => $activeQuery['value'], 'episodeCount' => count($episodes), - ]) ?> +]) ?>

$episode, + 'episode' => $episode, 'podcast' => $podcast, - ]) ?> +]) ?>

+ 'Podcast.no_episode', +) ?>