diff --git a/app/Language/en/Comment.php b/app/Language/en/Comment.php index 741f78961cab027061ac5014238dec431eaa9127..06a2fc1d3c0f13f40e66dbdb541334643d4eb46a 100644 --- a/app/Language/en/Comment.php +++ b/app/Language/en/Comment.php @@ -10,7 +10,7 @@ declare(strict_types=1); return [ 'title' => "{actorDisplayName}'s comment for {episodeTitle}", - 'back_to_episode' => 'Back to {episodeTitle}', + 'back_to_comments' => 'Back to comments', 'form' => [ 'episode_message_placeholder' => 'Write a comment...', 'reply_to_placeholder' => 'Reply to @{actorUsername}', diff --git a/app/Resources/js/modules/SidebarToggler.ts b/app/Resources/js/modules/SidebarToggler.ts index f9176f4f657bbf6fc1300e78d339701301984646..3a4f50af8347d8e63ab52ff6c555b94234eff5b0 100644 --- a/app/Resources/js/modules/SidebarToggler.ts +++ b/app/Resources/js/modules/SidebarToggler.ts @@ -1,62 +1,65 @@ const SidebarToggler = (): void => { const sidebar = document.querySelector( - "aside[id='admin-sidebar']" + "aside[data-sidebar-toggler='sidebar']" ) as HTMLElement; const toggler = document.querySelector( - "button[id='sidebar-toggler']" + "button[data-sidebar-toggler='toggler']" ) as HTMLButtonElement; const sidebarBackdrop = document.querySelector( - "div[id='sidebar-backdrop']" - ) as HTMLElement; + "div[data-sidebar-toggler='backdrop']" + ) as HTMLDivElement; - const setAriaExpanded = (isExpanded: "true" | "false") => { - toggler.setAttribute("aria-expanded", isExpanded); - sidebarBackdrop.setAttribute("aria-expanded", isExpanded); - }; - - const hideSidebar = () => { - setAriaExpanded("false"); - sidebar.classList.add("-translate-x-full"); - sidebarBackdrop.classList.add("hidden"); - toggler.style.transform = "translateX(0px)"; - }; - - const showSidebar = () => { - setAriaExpanded("true"); - sidebar.classList.remove("-translate-x-full"); - sidebarBackdrop.classList.remove("hidden"); - toggler.style.transform = - "translateX(" + sidebar.getBoundingClientRect().width + "px)"; - }; - - toggler.addEventListener("click", () => { - if (sidebar.classList.contains("-translate-x-full")) { - showSidebar(); - } else { - hideSidebar(); - } - }); - - sidebarBackdrop.addEventListener("click", () => { - if (!sidebar.classList.contains("-translate-x-full")) { - hideSidebar(); - } - }); - - const setAriaExpandedOnWindowEvent = () => { - const isExpanded = - !sidebar.classList.contains("-translate-x-full") || - window.innerWidth >= 768; - const ariaExpanded = toggler.getAttribute("aria-expanded"); - if (isExpanded && (!ariaExpanded || ariaExpanded === "false")) { - setAriaExpanded("true"); - } else if (!isExpanded && (!ariaExpanded || ariaExpanded === "true")) { + if (typeof sidebar.dataset.toggleClass !== "undefined") { + console.log("zefzef"); + + const setAriaExpanded = (isExpanded: "true" | "false") => { + toggler.setAttribute("aria-expanded", isExpanded); + sidebarBackdrop.setAttribute("aria-expanded", isExpanded); + }; + + const hideSidebar = () => { setAriaExpanded("false"); - } - }; + sidebar.classList.add(sidebar.dataset.toggleClass as string); + sidebarBackdrop.classList.add("hidden"); + toggler.classList.add(toggler.dataset.toggleClass as string); + }; + + const showSidebar = () => { + setAriaExpanded("true"); + sidebar.classList.remove(sidebar.dataset.toggleClass as string); + sidebarBackdrop.classList.remove("hidden"); + toggler.classList.remove(toggler.dataset.toggleClass as string); + }; + + toggler.addEventListener("click", () => { + if (sidebar.classList.contains(sidebar.dataset.hideClass as string)) { + showSidebar(); + } else { + hideSidebar(); + } + }); + + sidebarBackdrop.addEventListener("click", () => { + if (!sidebar.classList.contains(sidebar.dataset.hideClass as string)) { + hideSidebar(); + } + }); + + const setAriaExpandedOnWindowEvent = () => { + const isExpanded = + !sidebar.classList.contains(sidebar.dataset.hideClass as string) || + window.innerWidth >= 768; + const ariaExpanded = toggler.getAttribute("aria-expanded"); + if (isExpanded && (!ariaExpanded || ariaExpanded === "false")) { + setAriaExpanded("true"); + } else if (!isExpanded && (!ariaExpanded || ariaExpanded === "true")) { + setAriaExpanded("false"); + } + }; - window.addEventListener("load", setAriaExpandedOnWindowEvent); - window.addEventListener("resize", setAriaExpandedOnWindowEvent); + window.addEventListener("load", setAriaExpandedOnWindowEvent); + window.addEventListener("resize", setAriaExpandedOnWindowEvent); + } }; export default SidebarToggler; diff --git a/app/Resources/js/podcast.ts b/app/Resources/js/podcast.ts index c5250eed802e7c67580f172fcf71054d244239cc..e7b0df73a503b24b03b90738ff8ac95efcd17901 100644 --- a/app/Resources/js/podcast.ts +++ b/app/Resources/js/podcast.ts @@ -1,4 +1,5 @@ import "@github/time-elements"; +import SidebarToggler from "./modules/SidebarToggler"; import Time from "./modules/Time"; import Toggler from "./modules/Toggler"; import Tooltip from "./modules/Tooltip"; @@ -6,3 +7,4 @@ import Tooltip from "./modules/Tooltip"; Time(); Toggler(); Tooltip(); +SidebarToggler(); diff --git a/package-lock.json b/package-lock.json index cf8706fe7c07d24dd0284618a4f467be0629d7af..a0c50e518ae891df203da8d5c466e42410d77106 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,6 +20,7 @@ "@github/markdown-toolbar-element": "^1.5.3", "@github/time-elements": "^3.1.2", "@popperjs/core": "^2.10.2", + "@tailwindcss/nesting": "^0.0.0-insiders.565cd3e", "@vime/core": "^5.0.34", "choices.js": "^9.0.1", "flatpickr": "^4.6.9", @@ -27,7 +28,7 @@ "leaflet.markercluster": "^1.5.3", "lit": "^2.0.2", "marked": "^3.0.7", - "xml-formatter": "^2.5.0" + "xml-formatter": "^2.5.1" }, "devDependencies": { "@commitlint/cli": "^13.2.1", @@ -36,10 +37,9 @@ "@semantic-release/exec": "^6.0.1", "@semantic-release/git": "^10.0.0", "@semantic-release/gitlab": "^7.0.3", - "@tailwindcss/aspect-ratio": "^0.3.0", - "@tailwindcss/forms": "^0.3.4", + "@tailwindcss/forms": "^0.4.0-alpha.1", "@tailwindcss/line-clamp": "^0.2.2", - "@tailwindcss/typography": "^0.4.1", + "@tailwindcss/typography": "^0.5.0-alpha.2", "@types/leaflet": "^1.7.5", "@types/marked": "^3.0.1", "@typescript-eslint/eslint-plugin": "^5.0.0", @@ -50,22 +50,22 @@ "eslint": "^8.0.1", "eslint-config-prettier": "^8.3.0", "eslint-plugin-prettier": "^4.0.0", - "husky": "^7.0.2", + "husky": "^7.0.4", "is-ci": "^3.0.0", "lint-staged": "^11.2.3", "postcss-import": "^14.0.2", + "postcss-nesting": "^8.0.1", "postcss-preset-env": "^6.7.0", "postcss-reporter": "^7.0.4", "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", + "stylelint": "^14.0.0", + "stylelint-config-standard": "^23.0.0", "svgo": "^2.7.0", - "tailwindcss": "^2.2.17", - "tailwindcss-scroll-snap": "^1.1.0", + "tailwindcss": "^3.0.0-alpha.1", "typescript": "^4.4.4", - "vite": "^2.6.9" + "vite": "^2.6.10" } }, "node_modules/@amcharts/amcharts4": { @@ -108,170 +108,6 @@ "node": ">=6.9.0" } }, - "node_modules/@babel/compat-data": { - "version": "7.16.4", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/core": { - "version": "7.16.5", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/code-frame": "^7.16.0", - "@babel/generator": "^7.16.5", - "@babel/helper-compilation-targets": "^7.16.3", - "@babel/helper-module-transforms": "^7.16.5", - "@babel/helpers": "^7.16.5", - "@babel/parser": "^7.16.5", - "@babel/template": "^7.16.0", - "@babel/traverse": "^7.16.5", - "@babel/types": "^7.16.0", - "convert-source-map": "^1.7.0", - "debug": "^4.1.0", - "gensync": "^1.0.0-beta.2", - "json5": "^2.1.2", - "semver": "^6.3.0", - "source-map": "^0.5.0" - }, - "engines": { - "node": ">=6.9.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/babel" - } - }, - "node_modules/@babel/generator": { - "version": "7.16.5", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/types": "^7.16.0", - "jsesc": "^2.5.1", - "source-map": "^0.5.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-compilation-targets": { - "version": "7.16.3", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/compat-data": "^7.16.0", - "@babel/helper-validator-option": "^7.14.5", - "browserslist": "^4.17.5", - "semver": "^6.3.0" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0" - } - }, - "node_modules/@babel/helper-environment-visitor": { - "version": "7.16.5", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/types": "^7.16.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-function-name": { - "version": "7.16.0", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-get-function-arity": "^7.16.0", - "@babel/template": "^7.16.0", - "@babel/types": "^7.16.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-get-function-arity": { - "version": "7.16.0", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/types": "^7.16.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-hoist-variables": { - "version": "7.16.0", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/types": "^7.16.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-module-imports": { - "version": "7.16.0", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/types": "^7.16.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-module-transforms": { - "version": "7.16.5", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-environment-visitor": "^7.16.5", - "@babel/helper-module-imports": "^7.16.0", - "@babel/helper-simple-access": "^7.16.0", - "@babel/helper-split-export-declaration": "^7.16.0", - "@babel/helper-validator-identifier": "^7.15.7", - "@babel/template": "^7.16.0", - "@babel/traverse": "^7.16.5", - "@babel/types": "^7.16.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-simple-access": { - "version": "7.16.0", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/types": "^7.16.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-split-export-declaration": { - "version": "7.16.0", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/types": "^7.16.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, "node_modules/@babel/helper-validator-identifier": { "version": "7.15.7", "dev": true, @@ -280,27 +116,6 @@ "node": ">=6.9.0" } }, - "node_modules/@babel/helper-validator-option": { - "version": "7.14.5", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helpers": { - "version": "7.16.5", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/template": "^7.16.0", - "@babel/traverse": "^7.16.5", - "@babel/types": "^7.16.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, "node_modules/@babel/highlight": { "version": "7.16.0", "dev": true, @@ -327,17 +142,6 @@ "node": ">=4" } }, - "node_modules/@babel/parser": { - "version": "7.16.6", - "dev": true, - "license": "MIT", - "bin": { - "parser": "bin/babel-parser.js" - }, - "engines": { - "node": ">=6.0.0" - } - }, "node_modules/@babel/runtime": { "version": "7.12.5", "license": "MIT", @@ -345,51 +149,6 @@ "regenerator-runtime": "^0.13.4" } }, - "node_modules/@babel/template": { - "version": "7.16.0", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/code-frame": "^7.16.0", - "@babel/parser": "^7.16.0", - "@babel/types": "^7.16.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/traverse": { - "version": "7.16.5", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/code-frame": "^7.16.0", - "@babel/generator": "^7.16.5", - "@babel/helper-environment-visitor": "^7.16.5", - "@babel/helper-function-name": "^7.16.0", - "@babel/helper-hoist-variables": "^7.16.0", - "@babel/helper-split-export-declaration": "^7.16.0", - "@babel/parser": "^7.16.5", - "@babel/types": "^7.16.0", - "debug": "^4.1.0", - "globals": "^11.1.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/types": { - "version": "7.16.0", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-validator-identifier": "^7.15.7", - "to-fast-properties": "^2.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, "node_modules/@codemirror/autocomplete": { "version": "0.19.9", "license": "MIT", @@ -1162,21 +921,6 @@ "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, - "node_modules/@eslint/eslintrc/node_modules/globals": { - "version": "13.12.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz", - "integrity": "sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==", - "dev": true, - "dependencies": { - "type-fest": "^0.20.2" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/@eslint/eslintrc/node_modules/ignore": { "version": "4.0.6", "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", @@ -1198,18 +942,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/@eslint/eslintrc/node_modules/type-fest": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", - "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/@foliojs-fork/fontkit": { "version": "1.9.1", "license": "MIT", @@ -1916,31 +1648,6 @@ "npm": ">=6.0.0" } }, - "node_modules/@stylelint/postcss-css-in-js": { - "version": "0.37.2", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/core": ">=7.9.0" - }, - "peerDependencies": { - "postcss": ">=7.0.0", - "postcss-syntax": ">=0.36.2" - } - }, - "node_modules/@stylelint/postcss-markdown": { - "version": "0.36.2", - "dev": true, - "license": "MIT", - "dependencies": { - "remark": "^13.0.0", - "unist-util-find-all-after": "^3.0.2" - }, - "peerDependencies": { - "postcss": ">=7.0.0", - "postcss-syntax": ">=0.36.2" - } - }, "node_modules/@szmarczak/http-timer": { "version": "4.0.6", "dev": true, @@ -1952,24 +1659,16 @@ "node": ">=10" } }, - "node_modules/@tailwindcss/aspect-ratio": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/@tailwindcss/aspect-ratio/-/aspect-ratio-0.3.0.tgz", - "integrity": "sha512-DMgWskNJR6FNPLbQ8Xoq/PKV/9DfNKh5dvKB+SM8x7lVl4+pnxlZ3Ns4+yGmurA/ze708HrnCG1tXk85HolJmw==", - "dev": true, - "peerDependencies": { - "tailwindcss": ">=2.0.0 || >=3.0.0-alpha.1" - } - }, "node_modules/@tailwindcss/forms": { - "version": "0.3.4", + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.4.0.tgz", + "integrity": "sha512-DeaQBx6EgEeuZPQACvC+mKneJsD8am1uiJugjgQK1+/Vt+Ai0GpFBC2T2fqnUad71WgOxyrZPE6BG1VaI6YqfQ==", "dev": true, - "license": "MIT", "dependencies": { "mini-svg-data-uri": "^1.2.3" }, "peerDependencies": { - "tailwindcss": ">=2.0.0" + "tailwindcss": ">=3.0.0 || >= 3.0.0-alpha.1" } }, "node_modules/@tailwindcss/line-clamp": { @@ -1980,10 +1679,22 @@ "tailwindcss": ">=2.0.0 || >=3.0.0-alpha.1" } }, + "node_modules/@tailwindcss/nesting": { + "version": "0.0.0-insiders.565cd3e", + "resolved": "https://registry.npmjs.org/@tailwindcss/nesting/-/nesting-0.0.0-insiders.565cd3e.tgz", + "integrity": "sha512-WhHoFBx19TnH/c+xLwT/sxei6+4RpdfiyG3MYXfmLaMsADmVqBkF7B6lDalgZD9YdM459MF7DtxVbWkOrV7IaQ==", + "dependencies": { + "postcss-nested": "^5.0.5" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, "node_modules/@tailwindcss/typography": { - "version": "0.4.1", + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.5.0.tgz", + "integrity": "sha512-1p/3C6C+JJziS/ghtG8ACYalbA2SyLJY27Pm33cVTlAoY6VQ7zfm2H64cPxUMBkVIlWXTtWHhZcZJPobMRmQAA==", "dev": true, - "license": "MIT", "dependencies": { "lodash.castarray": "^4.4.0", "lodash.isplainobject": "^4.0.6", @@ -1991,7 +1702,7 @@ "lodash.uniq": "^4.5.0" }, "peerDependencies": { - "tailwindcss": ">=2.0.0" + "tailwindcss": ">=3.0.0 || >= 3.0.0-alpha.1 || insiders" } }, "node_modules/@tootallnate/once": { @@ -2066,14 +1777,6 @@ "dev": true, "license": "MIT" }, - "node_modules/@types/mdast": { - "version": "3.0.10", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/unist": "*" - } - }, "node_modules/@types/minimist": { "version": "1.2.1", "dev": true, @@ -2111,11 +1814,6 @@ "version": "2.0.2", "license": "MIT" }, - "node_modules/@types/unist": { - "version": "2.0.6", - "dev": true, - "license": "MIT" - }, "node_modules/@typescript-eslint/eslint-plugin": { "version": "5.8.1", "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.8.1.tgz", @@ -2608,15 +2306,6 @@ "version": "0.11.1", "license": "MIT" }, - "node_modules/bail": { - "version": "1.0.5", - "dev": true, - "license": "MIT", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, "node_modules/balanced-match": { "version": "1.0.0", "dev": true, @@ -2754,14 +2443,6 @@ "version": "1.1.2", "license": "MIT" }, - "node_modules/bytes": { - "version": "3.1.1", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, "node_modules/cacheable-lookup": { "version": "5.0.4", "dev": true, @@ -2977,49 +2658,22 @@ "node": ">=8" } }, - "node_modules/character-entities": { - "version": "1.2.4", + "node_modules/chardet": { + "version": "0.7.0", "dev": true, + "license": "MIT" + }, + "node_modules/choices.js": { + "version": "9.0.1", "license": "MIT", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" + "dependencies": { + "deepmerge": "^4.2.0", + "fuse.js": "^3.4.5", + "redux": "^4.0.4" } }, - "node_modules/character-entities-legacy": { - "version": "1.1.4", - "dev": true, - "license": "MIT", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, - "node_modules/character-reference-invalid": { - "version": "1.1.4", - "dev": true, - "license": "MIT", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, - "node_modules/chardet": { - "version": "0.7.0", - "dev": true, - "license": "MIT" - }, - "node_modules/choices.js": { - "version": "9.0.1", - "license": "MIT", - "dependencies": { - "deepmerge": "^4.2.0", - "fuse.js": "^3.4.5", - "redux": "^4.0.4" - } - }, - "node_modules/chokidar": { - "version": "3.5.2", + "node_modules/chokidar": { + "version": "3.5.2", "dev": true, "license": "MIT", "dependencies": { @@ -3311,15 +2965,6 @@ "node": ">=0.8" } }, - "node_modules/color": { - "version": "4.1.0", - "dev": true, - "license": "MIT", - "dependencies": { - "color-convert": "^2.0.1", - "color-string": "^1.9.0" - } - }, "node_modules/color-convert": { "version": "1.9.3", "dev": true, @@ -3333,35 +2978,11 @@ "dev": true, "license": "MIT" }, - "node_modules/color-string": { - "version": "1.9.0", - "dev": true, - "license": "MIT", - "dependencies": { - "color-name": "^1.0.0", - "simple-swizzle": "^0.2.2" - } - }, - "node_modules/color/node_modules/color-convert": { - "version": "2.0.1", - "dev": true, - "license": "MIT", - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/color/node_modules/color-name": { - "version": "1.1.4", - "dev": true, - "license": "MIT" - }, "node_modules/colord": { - "version": "2.9.1", - "dev": true, - "license": "MIT" + "version": "2.9.2", + "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.2.tgz", + "integrity": "sha512-Uqbg+J445nc1TKn4FoDPS6ZZqAvEDnwrH42yo8B40JSOgSLxMZ/gt3h4nmCtPLQeXhjJJkqBx7SCY35WnIixaQ==", + "dev": true }, "node_modules/colorette": { "version": "2.0.16", @@ -3784,14 +3405,6 @@ "node": ">=0.10.0" } }, - "node_modules/css-color-names": { - "version": "0.0.4", - "dev": true, - "license": "MIT", - "engines": { - "node": "*" - } - }, "node_modules/css-declaration-sorter": { "version": "6.1.3", "dev": true, @@ -3937,11 +3550,6 @@ "node": ">=0.10.0" } }, - "node_modules/css-unit-converter": { - "version": "1.1.2", - "dev": true, - "license": "MIT" - }, "node_modules/cssdb": { "version": "4.4.0", "dev": true, @@ -3949,7 +3557,6 @@ }, "node_modules/cssesc": { "version": "3.0.0", - "dev": true, "license": "MIT", "bin": { "cssesc": "bin/cssesc" @@ -4479,31 +4086,6 @@ "node": ">=6.0.0" } }, - "node_modules/dom-serializer": { - "version": "0.2.2", - "dev": true, - "license": "MIT", - "dependencies": { - "domelementtype": "^2.0.1", - "entities": "^2.0.0" - } - }, - "node_modules/dom-serializer/node_modules/domelementtype": { - "version": "2.2.0", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/fb55" - } - ], - "license": "BSD-2-Clause" - }, - "node_modules/domelementtype": { - "version": "1.3.1", - "dev": true, - "license": "BSD-2-Clause" - }, "node_modules/domexception": { "version": "2.0.1", "license": "MIT", @@ -4521,23 +4103,6 @@ "node": ">=8" } }, - "node_modules/domhandler": { - "version": "2.4.2", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "domelementtype": "1" - } - }, - "node_modules/domutils": { - "version": "1.7.0", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "dom-serializer": "0", - "domelementtype": "1" - } - }, "node_modules/dot-prop": { "version": "5.3.0", "dev": true, @@ -4970,20 +4535,6 @@ "node": ">=10.13.0" } }, - "node_modules/eslint/node_modules/globals": { - "version": "13.7.0", - "dev": true, - "license": "MIT", - "dependencies": { - "type-fest": "^0.20.2" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/eslint/node_modules/ignore": { "version": "4.0.6", "dev": true, @@ -5028,17 +4579,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/eslint/node_modules/type-fest": { - "version": "0.20.2", - "dev": true, - "license": "(MIT OR CC0-1.0)", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/espree": { "version": "9.2.0", "resolved": "https://registry.npmjs.org/espree/-/espree-9.2.0.tgz", @@ -5237,11 +4777,6 @@ "version": "2.5.0", "license": "ISC" }, - "node_modules/extend": { - "version": "3.0.2", - "dev": true, - "license": "MIT" - }, "node_modules/external-editor": { "version": "3.1.0", "dev": true, @@ -5520,14 +5055,6 @@ "node": ">=6" } }, - "node_modules/gensync": { - "version": "1.0.0-beta.2", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6.9.0" - } - }, "node_modules/get-assigned-identifiers": { "version": "1.2.0", "license": "Apache-2.0" @@ -5700,11 +5227,30 @@ } }, "node_modules/globals": { - "version": "11.12.0", + "version": "13.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz", + "integrity": "sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==", "dev": true, - "license": "MIT", + "dependencies": { + "type-fest": "^0.20.2" + }, "engines": { - "node": ">=4" + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/globals/node_modules/type-fest": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/globby": { @@ -5731,20 +5277,6 @@ "dev": true, "license": "MIT" }, - "node_modules/gonzales-pe": { - "version": "4.3.0", - "dev": true, - "license": "MIT", - "dependencies": { - "minimist": "^1.2.5" - }, - "bin": { - "gonzales": "bin/gonzales.js" - }, - "engines": { - "node": ">=0.6.0" - } - }, "node_modules/got": { "version": "11.8.3", "dev": true, @@ -5851,11 +5383,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/hex-color-regex": { - "version": "1.1.0", - "dev": true, - "license": "MIT" - }, "node_modules/homedir-polyfill": { "version": "1.0.3", "dev": true, @@ -5886,16 +5413,6 @@ "node": ">=10" } }, - "node_modules/hsl-regex": { - "version": "1.0.0", - "dev": true, - "license": "MIT" - }, - "node_modules/hsla-regex": { - "version": "1.0.0", - "dev": true, - "license": "MIT" - }, "node_modules/html-encoding-sniffer": { "version": "2.0.1", "license": "MIT", @@ -5914,37 +5431,6 @@ "node": ">=8" } }, - "node_modules/htmlparser2": { - "version": "3.10.1", - "dev": true, - "license": "MIT", - "dependencies": { - "domelementtype": "^1.3.1", - "domhandler": "^2.3.0", - "domutils": "^1.5.1", - "entities": "^1.1.1", - "inherits": "^2.0.1", - "readable-stream": "^3.1.1" - } - }, - "node_modules/htmlparser2/node_modules/entities": { - "version": "1.1.2", - "dev": true, - "license": "BSD-2-Clause" - }, - "node_modules/htmlparser2/node_modules/readable-stream": { - "version": "3.6.0", - "dev": true, - "license": "MIT", - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/http-cache-semantics": { "version": "4.1.0", "dev": true, @@ -6021,9 +5507,10 @@ } }, "node_modules/ignore": { - "version": "5.1.9", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz", + "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==", "dev": true, - "license": "MIT", "engines": { "node": ">= 4" } @@ -6175,28 +5662,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/is-alphabetical": { - "version": "1.0.4", - "dev": true, - "license": "MIT", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, - "node_modules/is-alphanumerical": { - "version": "1.0.4", - "dev": true, - "license": "MIT", - "dependencies": { - "is-alphabetical": "^1.0.0", - "is-decimal": "^1.0.0" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, "node_modules/is-arguments": { "version": "1.1.0", "license": "MIT", @@ -6210,11 +5675,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-arrayish": { - "version": "0.3.2", - "dev": true, - "license": "MIT" - }, "node_modules/is-binary-path": { "version": "2.1.0", "dev": true, @@ -6226,28 +5686,6 @@ "node": ">=8" } }, - "node_modules/is-buffer": { - "version": "2.0.5", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT", - "engines": { - "node": ">=4" - } - }, "node_modules/is-ci": { "version": "3.0.1", "dev": true, @@ -6259,21 +5697,8 @@ "is-ci": "bin.js" } }, - "node_modules/is-color-stop": { - "version": "1.1.0", - "dev": true, - "license": "MIT", - "dependencies": { - "css-color-names": "^0.0.4", - "hex-color-regex": "^1.1.0", - "hsl-regex": "^1.0.0", - "hsla-regex": "^1.0.0", - "rgb-regex": "^1.0.1", - "rgba-regex": "^1.0.0" - } - }, - "node_modules/is-core-module": { - "version": "2.2.0", + "node_modules/is-core-module": { + "version": "2.2.0", "dev": true, "license": "MIT", "dependencies": { @@ -6293,15 +5718,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-decimal": { - "version": "1.0.4", - "dev": true, - "license": "MIT", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, "node_modules/is-extglob": { "version": "2.1.1", "dev": true, @@ -6329,15 +5745,6 @@ "node": ">=0.10.0" } }, - "node_modules/is-hexadecimal": { - "version": "1.0.4", - "dev": true, - "license": "MIT", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, "node_modules/is-number": { "version": "7.0.0", "dev": true, @@ -6449,17 +5856,6 @@ "dev": true, "license": "MIT" }, - "node_modules/is-unicode-supported": { - "version": "0.1.0", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/is-utf8": { "version": "0.2.1", "dev": true, @@ -6652,17 +6048,6 @@ "node": ">= 0.8.0" } }, - "node_modules/jsesc": { - "version": "2.5.2", - "dev": true, - "license": "MIT", - "bin": { - "jsesc": "bin/jsesc" - }, - "engines": { - "node": ">=4" - } - }, "node_modules/json-buffer": { "version": "3.0.1", "dev": true, @@ -6694,20 +6079,6 @@ "dev": true, "license": "ISC" }, - "node_modules/json5": { - "version": "2.2.0", - "dev": true, - "license": "MIT", - "dependencies": { - "minimist": "^1.2.5" - }, - "bin": { - "json5": "lib/cli.js" - }, - "engines": { - "node": ">=6" - } - }, "node_modules/jsonfile": { "version": "4.0.0", "dev": true, @@ -6756,9 +6127,10 @@ } }, "node_modules/known-css-properties": { - "version": "0.21.0", - "dev": true, - "license": "MIT" + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.24.0.tgz", + "integrity": "sha512-RTSoaUAfLvpR357vWzAz/50Q/BmHfmE6ETSWfutT0AJiw10e6CmcdYRQJlLRd95B53D0Y2aD1jSxD3V3ySF+PA==", + "dev": true }, "node_modules/leaflet": { "version": "1.7.1", @@ -7032,11 +6404,6 @@ "dev": true, "license": "MIT" }, - "node_modules/lodash.topath": { - "version": "4.5.2", - "dev": true, - "license": "MIT" - }, "node_modules/lodash.truncate": { "version": "4.4.2", "dev": true, @@ -7052,21 +6419,6 @@ "dev": true, "license": "MIT" }, - "node_modules/log-symbols": { - "version": "4.1.0", - "dev": true, - "license": "MIT", - "dependencies": { - "chalk": "^4.1.0", - "is-unicode-supported": "^0.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/log-update": { "version": "4.0.0", "dev": true, @@ -7237,15 +6589,6 @@ "node": ">=0.10.0" } }, - "node_modules/longest-streak": { - "version": "2.0.4", - "dev": true, - "license": "MIT", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, "node_modules/loose-envify": { "version": "1.4.0", "license": "MIT", @@ -7317,48 +6660,6 @@ "url": "https://github.com/sponsors/wooorm" } }, - "node_modules/mdast-util-from-markdown": { - "version": "0.8.5", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/mdast": "^3.0.0", - "mdast-util-to-string": "^2.0.0", - "micromark": "~2.11.0", - "parse-entities": "^2.0.0", - "unist-util-stringify-position": "^2.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/mdast-util-to-markdown": { - "version": "0.6.5", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/unist": "^2.0.0", - "longest-streak": "^2.0.0", - "mdast-util-to-string": "^2.0.0", - "parse-entities": "^2.0.0", - "repeat-string": "^1.0.0", - "zwitch": "^1.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/mdast-util-to-string": { - "version": "2.0.0", - "dev": true, - "license": "MIT", - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, "node_modules/mdn-data": { "version": "2.0.14", "dev": true, @@ -7408,25 +6709,6 @@ "node": ">= 8" } }, - "node_modules/micromark": { - "version": "2.11.4", - "dev": true, - "funding": [ - { - "type": "GitHub Sponsors", - "url": "https://github.com/sponsors/unifiedjs" - }, - { - "type": "OpenCollective", - "url": "https://opencollective.com/unified" - } - ], - "license": "MIT", - "dependencies": { - "debug": "^4.0.0", - "parse-entities": "^2.0.0" - } - }, "node_modules/micromatch": { "version": "4.0.4", "dev": true, @@ -7528,17 +6810,6 @@ "version": "3.0.0", "license": "MIT" }, - "node_modules/modern-normalize": { - "version": "1.1.0", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/modify-values": { "version": "1.0.1", "dev": true, @@ -7558,7 +6829,6 @@ }, "node_modules/nanoid": { "version": "3.1.30", - "dev": true, "license": "MIT", "bin": { "nanoid": "bin/nanoid.cjs" @@ -10863,23 +10133,6 @@ "node": ">=6" } }, - "node_modules/parse-entities": { - "version": "2.0.0", - "dev": true, - "license": "MIT", - "dependencies": { - "character-entities": "^1.0.0", - "character-entities-legacy": "^1.0.0", - "character-reference-invalid": "^1.0.0", - "is-alphanumerical": "^1.0.0", - "is-decimal": "^1.0.0", - "is-hexadecimal": "^1.0.0" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, "node_modules/parse-json": { "version": "4.0.0", "dev": true, @@ -10991,7 +10244,6 @@ }, "node_modules/picocolors": { "version": "1.0.0", - "dev": true, "license": "ISC" }, "node_modules/picomatch": { @@ -11106,7 +10358,6 @@ }, "node_modules/postcss": { "version": "8.4.5", - "dev": true, "license": "MIT", "dependencies": { "nanoid": "^3.1.30", @@ -11903,18 +11154,6 @@ "node": ">=0.10.0" } }, - "node_modules/postcss-html": { - "version": "0.36.0", - "dev": true, - "license": "MIT", - "dependencies": { - "htmlparser2": "^3.10.0" - }, - "peerDependencies": { - "postcss": ">=5.0.0", - "postcss-syntax": ">=0.36.0" - } - }, "node_modules/postcss-image-set-function": { "version": "3.0.1", "dev": true, @@ -12067,46 +11306,6 @@ "node": ">=0.10.0" } }, - "node_modules/postcss-less": { - "version": "3.1.4", - "dev": true, - "license": "MIT", - "dependencies": { - "postcss": "^7.0.14" - }, - "engines": { - "node": ">=6.14.4" - } - }, - "node_modules/postcss-less/node_modules/picocolors": { - "version": "0.2.1", - "dev": true, - "license": "ISC" - }, - "node_modules/postcss-less/node_modules/postcss": { - "version": "7.0.39", - "dev": true, - "license": "MIT", - "dependencies": { - "picocolors": "^0.2.1", - "source-map": "^0.6.1" - }, - "engines": { - "node": ">=6.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" - } - }, - "node_modules/postcss-less/node_modules/source-map": { - "version": "0.6.1", - "dev": true, - "license": "BSD-3-Clause", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/postcss-load-config": { "version": "3.1.0", "dev": true, @@ -12313,7 +11512,6 @@ }, "node_modules/postcss-nested": { "version": "5.0.6", - "dev": true, "license": "MIT", "dependencies": { "postcss-selector-parser": "^6.0.6" @@ -12330,43 +11528,15 @@ } }, "node_modules/postcss-nesting": { - "version": "7.0.1", - "dev": true, - "license": "CC0-1.0", - "dependencies": { - "postcss": "^7.0.2" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/postcss-nesting/node_modules/picocolors": { - "version": "0.2.1", - "dev": true, - "license": "ISC" - }, - "node_modules/postcss-nesting/node_modules/postcss": { - "version": "7.0.39", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-8.0.1.tgz", + "integrity": "sha512-cHPNhW5VvRQjszFDxmy16mis9qFQqQLBNw6KVmueLqqE3M182ZAk9+QoxGqbGVryzLVhannw2B5Yhosqq522fA==", "dev": true, - "license": "MIT", - "dependencies": { - "picocolors": "^0.2.1", - "source-map": "^0.6.1" - }, "engines": { - "node": ">=6.0.0" + "node": "12 - 16" }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" - } - }, - "node_modules/postcss-nesting/node_modules/source-map": { - "version": "0.6.1", - "dev": true, - "license": "BSD-3-Clause", - "engines": { - "node": ">=0.10.0" + "peerDependencies": { + "postcss": "^8" } }, "node_modules/postcss-normalize-charset": { @@ -12719,6 +11889,18 @@ "url": "https://opencollective.com/postcss/" } }, + "node_modules/postcss-preset-env/node_modules/postcss-nesting": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-7.0.1.tgz", + "integrity": "sha512-FrorPb0H3nuVq0Sff7W2rnc3SmIcruVC6YwpcS+k687VxyxO33iE1amna7wHuRVzM8vfiYofXSBHNAZ3QhLvYg==", + "dev": true, + "dependencies": { + "postcss": "^7.0.2" + }, + "engines": { + "node": ">=6.0.0" + } + }, "node_modules/postcss-preset-env/node_modules/source-map": { "version": "0.6.1", "dev": true, @@ -12884,22 +12066,36 @@ "license": "MIT" }, "node_modules/postcss-safe-parser": { - "version": "4.0.2", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz", + "integrity": "sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==", + "dev": true, + "engines": { + "node": ">=12.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + "peerDependencies": { + "postcss": "^8.3.3" + } + }, + "node_modules/postcss-selector-matches": { + "version": "4.0.0", "dev": true, "license": "MIT", "dependencies": { - "postcss": "^7.0.26" - }, - "engines": { - "node": ">=6.0.0" + "balanced-match": "^1.0.0", + "postcss": "^7.0.2" } }, - "node_modules/postcss-safe-parser/node_modules/picocolors": { + "node_modules/postcss-selector-matches/node_modules/picocolors": { "version": "0.2.1", "dev": true, "license": "ISC" }, - "node_modules/postcss-safe-parser/node_modules/postcss": { + "node_modules/postcss-selector-matches/node_modules/postcss": { "version": "7.0.39", "dev": true, "license": "MIT", @@ -12915,7 +12111,7 @@ "url": "https://opencollective.com/postcss/" } }, - "node_modules/postcss-safe-parser/node_modules/source-map": { + "node_modules/postcss-selector-matches/node_modules/source-map": { "version": "0.6.1", "dev": true, "license": "BSD-3-Clause", @@ -12923,21 +12119,21 @@ "node": ">=0.10.0" } }, - "node_modules/postcss-sass": { - "version": "0.4.4", + "node_modules/postcss-selector-not": { + "version": "4.0.1", "dev": true, "license": "MIT", "dependencies": { - "gonzales-pe": "^4.3.0", - "postcss": "^7.0.21" + "balanced-match": "^1.0.0", + "postcss": "^7.0.2" } }, - "node_modules/postcss-sass/node_modules/picocolors": { + "node_modules/postcss-selector-not/node_modules/picocolors": { "version": "0.2.1", "dev": true, "license": "ISC" }, - "node_modules/postcss-sass/node_modules/postcss": { + "node_modules/postcss-selector-not/node_modules/postcss": { "version": "7.0.39", "dev": true, "license": "MIT", @@ -12953,7 +12149,7 @@ "url": "https://opencollective.com/postcss/" } }, - "node_modules/postcss-sass/node_modules/source-map": { + "node_modules/postcss-selector-not/node_modules/source-map": { "version": "0.6.1", "dev": true, "license": "BSD-3-Clause", @@ -12961,125 +12157,8 @@ "node": ">=0.10.0" } }, - "node_modules/postcss-scss": { - "version": "2.1.1", - "dev": true, - "license": "MIT", - "dependencies": { - "postcss": "^7.0.6" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/postcss-scss/node_modules/picocolors": { - "version": "0.2.1", - "dev": true, - "license": "ISC" - }, - "node_modules/postcss-scss/node_modules/postcss": { - "version": "7.0.39", - "dev": true, - "license": "MIT", - "dependencies": { - "picocolors": "^0.2.1", - "source-map": "^0.6.1" - }, - "engines": { - "node": ">=6.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" - } - }, - "node_modules/postcss-scss/node_modules/source-map": { - "version": "0.6.1", - "dev": true, - "license": "BSD-3-Clause", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/postcss-selector-matches": { - "version": "4.0.0", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0", - "postcss": "^7.0.2" - } - }, - "node_modules/postcss-selector-matches/node_modules/picocolors": { - "version": "0.2.1", - "dev": true, - "license": "ISC" - }, - "node_modules/postcss-selector-matches/node_modules/postcss": { - "version": "7.0.39", - "dev": true, - "license": "MIT", - "dependencies": { - "picocolors": "^0.2.1", - "source-map": "^0.6.1" - }, - "engines": { - "node": ">=6.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" - } - }, - "node_modules/postcss-selector-matches/node_modules/source-map": { - "version": "0.6.1", - "dev": true, - "license": "BSD-3-Clause", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/postcss-selector-not": { - "version": "4.0.1", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0", - "postcss": "^7.0.2" - } - }, - "node_modules/postcss-selector-not/node_modules/picocolors": { - "version": "0.2.1", - "dev": true, - "license": "ISC" - }, - "node_modules/postcss-selector-not/node_modules/postcss": { - "version": "7.0.39", - "dev": true, - "license": "MIT", - "dependencies": { - "picocolors": "^0.2.1", - "source-map": "^0.6.1" - }, - "engines": { - "node": ">=6.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" - } - }, - "node_modules/postcss-selector-not/node_modules/source-map": { - "version": "0.6.1", - "dev": true, - "license": "BSD-3-Clause", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/postcss-selector-parser": { - "version": "6.0.7", - "dev": true, + "node_modules/postcss-selector-parser": { + "version": "6.0.7", "license": "MIT", "dependencies": { "cssesc": "^3.0.0", @@ -13104,14 +12183,6 @@ "postcss": "^8.2.15" } }, - "node_modules/postcss-syntax": { - "version": "0.36.2", - "dev": true, - "license": "MIT", - "peerDependencies": { - "postcss": ">=5.0.0" - } - }, "node_modules/postcss-unique-selectors": { "version": "5.0.2", "dev": true, @@ -13184,14 +12255,6 @@ "typescript": ">=2.9" } }, - "node_modules/pretty-hrtime": { - "version": "1.0.3", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, "node_modules/printj": { "version": "1.1.2", "license": "Apache-2.0", @@ -13239,20 +12302,6 @@ "node": ">=6" } }, - "node_modules/purgecss": { - "version": "4.1.3", - "dev": true, - "license": "MIT", - "dependencies": { - "commander": "^8.0.0", - "glob": "^7.1.7", - "postcss": "^8.3.5", - "postcss-selector-parser": "^6.0.6" - }, - "bin": { - "purgecss": "bin/purgecss.js" - } - }, "node_modules/q": { "version": "1.5.1", "dev": true, @@ -13485,20 +12534,6 @@ "esprima": "~4.0.0" } }, - "node_modules/reduce-css-calc": { - "version": "2.1.8", - "dev": true, - "license": "MIT", - "dependencies": { - "css-unit-converter": "^1.1.1", - "postcss-value-parser": "^3.3.0" - } - }, - "node_modules/reduce-css-calc/node_modules/postcss-value-parser": { - "version": "3.3.1", - "dev": true, - "license": "MIT" - }, "node_modules/redux": { "version": "4.0.5", "license": "MIT", @@ -13551,52 +12586,6 @@ "version": "2.0.1", "license": "MIT" }, - "node_modules/remark": { - "version": "13.0.0", - "dev": true, - "license": "MIT", - "dependencies": { - "remark-parse": "^9.0.0", - "remark-stringify": "^9.0.0", - "unified": "^9.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/remark-parse": { - "version": "9.0.0", - "dev": true, - "license": "MIT", - "dependencies": { - "mdast-util-from-markdown": "^0.8.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/remark-stringify": { - "version": "9.0.1", - "dev": true, - "license": "MIT", - "dependencies": { - "mdast-util-to-markdown": "^0.6.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/repeat-string": { - "version": "1.6.1", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10" - } - }, "node_modules/require-directory": { "version": "2.1.1", "dev": true, @@ -13708,16 +12697,6 @@ "dev": true, "license": "MIT" }, - "node_modules/rgb-regex": { - "version": "1.0.1", - "dev": true, - "license": "MIT" - }, - "node_modules/rgba-regex": { - "version": "1.0.0", - "dev": true, - "license": "MIT" - }, "node_modules/rgbcolor": { "version": "1.0.1", "license": "MIT OR SEE LICENSE IN FEEL-FREE.md", @@ -14033,14 +13012,6 @@ "node": ">=4" } }, - "node_modules/simple-swizzle": { - "version": "0.2.2", - "dev": true, - "license": "MIT", - "dependencies": { - "is-arrayish": "^0.3.1" - } - }, "node_modules/slash": { "version": "3.0.0", "dev": true, @@ -14112,7 +13083,6 @@ }, "node_modules/source-map-js": { "version": "1.0.1", - "dev": true, "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" @@ -14576,56 +13546,48 @@ } }, "node_modules/stylelint": { - "version": "13.13.1", + "version": "14.2.0", + "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.2.0.tgz", + "integrity": "sha512-i0DrmDXFNpDsWiwx6SPRs4/pyw4kvZgqpDGvsTslQMY7hpUl6r33aQvNSn6cnTg2wtZ9rreFElI7XAKpOWi1vQ==", "dev": true, - "license": "MIT", "dependencies": { - "@stylelint/postcss-css-in-js": "^0.37.2", - "@stylelint/postcss-markdown": "^0.36.2", - "autoprefixer": "^9.8.6", "balanced-match": "^2.0.0", - "chalk": "^4.1.1", - "cosmiconfig": "^7.0.0", - "debug": "^4.3.1", + "colord": "^2.9.2", + "cosmiconfig": "^7.0.1", + "debug": "^4.3.3", "execall": "^2.0.0", - "fast-glob": "^3.2.5", + "fast-glob": "^3.2.7", "fastest-levenshtein": "^1.0.12", "file-entry-cache": "^6.0.1", "get-stdin": "^8.0.0", "global-modules": "^2.0.0", - "globby": "^11.0.3", + "globby": "^11.0.4", "globjoin": "^0.1.4", "html-tags": "^3.1.0", - "ignore": "^5.1.8", + "ignore": "^5.2.0", "import-lazy": "^4.0.0", "imurmurhash": "^0.1.4", - "known-css-properties": "^0.21.0", - "lodash": "^4.17.21", - "log-symbols": "^4.1.0", + "is-plain-object": "^5.0.0", + "known-css-properties": "^0.24.0", "mathml-tag-names": "^2.1.3", "meow": "^9.0.0", "micromatch": "^4.0.4", + "normalize-path": "^3.0.0", "normalize-selector": "^0.2.0", - "postcss": "^7.0.35", - "postcss-html": "^0.36.0", - "postcss-less": "^3.1.4", + "picocolors": "^1.0.0", + "postcss": "^8.3.11", "postcss-media-query-parser": "^0.2.3", "postcss-resolve-nested-selector": "^0.1.1", - "postcss-safe-parser": "^4.0.2", - "postcss-sass": "^0.4.4", - "postcss-scss": "^2.1.1", - "postcss-selector-parser": "^6.0.5", - "postcss-syntax": "^0.36.2", + "postcss-safe-parser": "^6.0.0", + "postcss-selector-parser": "^6.0.7", "postcss-value-parser": "^4.1.0", "resolve-from": "^5.0.0", - "slash": "^3.0.0", "specificity": "^0.4.1", - "string-width": "^4.2.2", - "strip-ansi": "^6.0.0", + "string-width": "^4.2.3", + "strip-ansi": "^6.0.1", "style-search": "^0.1.0", - "sugarss": "^2.0.0", "svg-tags": "^1.0.0", - "table": "^6.6.0", + "table": "^6.7.5", "v8-compile-cache": "^2.3.0", "write-file-atomic": "^3.0.3" }, @@ -14633,7 +13595,7 @@ "stylelint": "bin/stylelint.js" }, "engines": { - "node": ">=10.13.0" + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" }, "funding": { "type": "opencollective", @@ -14641,22 +13603,24 @@ } }, "node_modules/stylelint-config-recommended": { - "version": "5.0.0", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-6.0.0.tgz", + "integrity": "sha512-ZorSSdyMcxWpROYUvLEMm0vSZud2uB7tX1hzBZwvVY9SV/uly4AvvJPPhCcymZL3fcQhEQG5AELmrxWqtmzacw==", "dev": true, - "license": "MIT", "peerDependencies": { - "stylelint": "^13.13.0" + "stylelint": "^14.0.0" } }, "node_modules/stylelint-config-standard": { - "version": "22.0.0", + "version": "23.0.0", + "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-23.0.0.tgz", + "integrity": "sha512-8PDlk+nWuc1T66nVaODTdVodN0pjuE5TBlopi39Lt9EM36YJsRhqttMyUhnS78oc/59Q6n8iw2GJB4QcoFqtRg==", "dev": true, - "license": "MIT", "dependencies": { - "stylelint-config-recommended": "^5.0.0" + "stylelint-config-recommended": "^6.0.0" }, "peerDependencies": { - "stylelint": "^13.13.0" + "stylelint": "^14.0.0" } }, "node_modules/stylelint/node_modules/ansi-regex": { @@ -14667,27 +13631,6 @@ "node": ">=8" } }, - "node_modules/stylelint/node_modules/autoprefixer": { - "version": "9.8.8", - "dev": true, - "license": "MIT", - "dependencies": { - "browserslist": "^4.12.0", - "caniuse-lite": "^1.0.30001109", - "normalize-range": "^0.1.2", - "num2fraction": "^1.2.2", - "picocolors": "^0.2.1", - "postcss": "^7.0.32", - "postcss-value-parser": "^4.1.0" - }, - "bin": { - "autoprefixer": "bin/autoprefixer" - }, - "funding": { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/autoprefixer" - } - }, "node_modules/stylelint/node_modules/balanced-match": { "version": "2.0.0", "dev": true, @@ -14750,35 +13693,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/stylelint/node_modules/picocolors": { - "version": "0.2.1", - "dev": true, - "license": "ISC" - }, - "node_modules/stylelint/node_modules/postcss": { - "version": "7.0.39", - "dev": true, - "license": "MIT", - "dependencies": { - "picocolors": "^0.2.1", - "source-map": "^0.6.1" - }, - "engines": { - "node": ">=6.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" - } - }, - "node_modules/stylelint/node_modules/source-map": { - "version": "0.6.1", - "dev": true, - "license": "BSD-3-Clause", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/stylelint/node_modules/string-width": { "version": "4.2.3", "dev": true, @@ -14803,43 +13717,6 @@ "node": ">=8" } }, - "node_modules/sugarss": { - "version": "2.0.0", - "dev": true, - "license": "MIT", - "dependencies": { - "postcss": "^7.0.2" - } - }, - "node_modules/sugarss/node_modules/picocolors": { - "version": "0.2.1", - "dev": true, - "license": "ISC" - }, - "node_modules/sugarss/node_modules/postcss": { - "version": "7.0.39", - "dev": true, - "license": "MIT", - "dependencies": { - "picocolors": "^0.2.1", - "source-map": "^0.6.1" - }, - "engines": { - "node": ">=6.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" - } - }, - "node_modules/sugarss/node_modules/source-map": { - "version": "0.6.1", - "dev": true, - "license": "BSD-3-Clause", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/supports-color": { "version": "5.5.0", "dev": true, @@ -15096,40 +13973,30 @@ } }, "node_modules/tailwindcss": { - "version": "2.2.19", + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.8.tgz", + "integrity": "sha512-Yww1eRYO1AxITJmW/KduZPxNvYdHuedeKwPju9Oakp7MdiixRi5xkpLhirsc81QCxHL0eoce6qKmxXwYGt4Cjw==", "dev": true, - "license": "MIT", "dependencies": { "arg": "^5.0.1", - "bytes": "^3.0.0", "chalk": "^4.1.2", "chokidar": "^3.5.2", - "color": "^4.0.1", + "color-name": "^1.1.4", "cosmiconfig": "^7.0.1", "detective": "^5.2.0", "didyoumean": "^1.2.2", "dlv": "^1.1.3", "fast-glob": "^3.2.7", - "fs-extra": "^10.0.0", - "glob-parent": "^6.0.1", - "html-tags": "^3.1.0", - "is-color-stop": "^1.1.0", - "is-glob": "^4.0.1", - "lodash": "^4.17.21", - "lodash.topath": "^4.5.2", - "modern-normalize": "^1.1.0", - "node-emoji": "^1.11.0", + "glob-parent": "^6.0.2", + "is-glob": "^4.0.3", "normalize-path": "^3.0.0", "object-hash": "^2.2.0", "postcss-js": "^3.0.3", "postcss-load-config": "^3.1.0", "postcss-nested": "5.0.6", - "postcss-selector-parser": "^6.0.6", - "postcss-value-parser": "^4.1.0", - "pretty-hrtime": "^1.0.3", - "purgecss": "^4.0.3", + "postcss-selector-parser": "^6.0.7", + "postcss-value-parser": "^4.2.0", "quick-lru": "^5.1.1", - "reduce-css-calc": "^2.1.8", "resolve": "^1.20.0", "tmp": "^0.2.1" }, @@ -15145,27 +14012,11 @@ "postcss": "^8.0.9" } }, - "node_modules/tailwindcss-scroll-snap": { - "version": "1.1.0", - "dev": true, - "license": "MIT", - "dependencies": { - "lodash": "^4.17.15", - "reduce-css-calc": "^2.1.7" - } - }, - "node_modules/tailwindcss/node_modules/fs-extra": { - "version": "10.0.0", - "dev": true, - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=12" - } + "node_modules/tailwindcss/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true }, "node_modules/tailwindcss/node_modules/glob-parent": { "version": "6.0.2", @@ -15178,17 +14029,6 @@ "node": ">=10.13.0" } }, - "node_modules/tailwindcss/node_modules/jsonfile": { - "version": "6.1.0", - "dev": true, - "license": "MIT", - "dependencies": { - "universalify": "^2.0.0" - }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, "node_modules/tailwindcss/node_modules/quick-lru": { "version": "5.1.1", "dev": true, @@ -15223,14 +14063,6 @@ "node": ">=8.17.0" } }, - "node_modules/tailwindcss/node_modules/universalify": { - "version": "2.0.0", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 10.0.0" - } - }, "node_modules/temp-dir": { "version": "2.0.0", "dev": true, @@ -15335,14 +14167,6 @@ "node": ">=0.6.0" } }, - "node_modules/to-fast-properties": { - "version": "2.0.0", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, "node_modules/to-regex-range": { "version": "5.0.1", "dev": true, @@ -15389,15 +14213,6 @@ "node": ">=8" } }, - "node_modules/trough": { - "version": "1.0.5", - "dev": true, - "license": "MIT", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, "node_modules/ts-node": { "version": "9.1.1", "dev": true, @@ -15526,31 +14341,6 @@ "tiny-inflate": "^1.0.0" } }, - "node_modules/unified": { - "version": "9.2.2", - "dev": true, - "license": "MIT", - "dependencies": { - "bail": "^1.0.0", - "extend": "^3.0.0", - "is-buffer": "^2.0.0", - "is-plain-obj": "^2.0.0", - "trough": "^1.0.0", - "vfile": "^4.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/unified/node_modules/is-plain-obj": { - "version": "2.1.0", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, "node_modules/uniq": { "version": "1.0.1", "dev": true, @@ -15567,39 +14357,6 @@ "node": ">=8" } }, - "node_modules/unist-util-find-all-after": { - "version": "3.0.2", - "dev": true, - "license": "MIT", - "dependencies": { - "unist-util-is": "^4.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/unist-util-is": { - "version": "4.1.0", - "dev": true, - "license": "MIT", - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/unist-util-stringify-position": { - "version": "2.0.3", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/unist": "^2.0.2" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, "node_modules/universal-user-agent": { "version": "6.0.0", "dev": true, @@ -15643,34 +14400,6 @@ "spdx-expression-parse": "^3.0.0" } }, - "node_modules/vfile": { - "version": "4.2.1", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/unist": "^2.0.0", - "is-buffer": "^2.0.0", - "unist-util-stringify-position": "^2.0.0", - "vfile-message": "^2.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/vfile-message": { - "version": "2.0.4", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/unist": "^2.0.0", - "unist-util-stringify-position": "^2.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, "node_modules/vite": { "version": "2.7.3", "dev": true, @@ -16079,201 +14808,70 @@ "dependencies": { "ansi-regex": "^5.0.0" }, - "engines": { - "node": ">=8" - } - }, - "node_modules/yn": { - "version": "3.1.1", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/yocto-queue": { - "version": "0.1.0", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/zwitch": { - "version": "1.0.5", - "dev": true, - "license": "MIT", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - } - }, - "dependencies": { - "@amcharts/amcharts4": { - "version": "4.10.23", - "requires": { - "@babel/runtime": "^7.6.3", - "core-js": "^3.0.0", - "d3-force": "^2.0.1", - "d3-geo": "^2.0.1", - "d3-geo-projection": "^3.0.0", - "d3-selection": "^1.0.2", - "d3-transition": "^1.0.1", - "pdfmake": "^0.2.2", - "polylabel": "^1.0.2", - "raf": "^3.4.1", - "regression": "^2.0.1", - "rgbcolor": "^1.0.1", - "stackblur-canvas": "^2.0.0", - "tslib": "^2.0.1", - "xlsx": "^0.17.0" - }, - "dependencies": { - "tslib": { - "version": "2.1.0" - } - } - }, - "@amcharts/amcharts4-geodata": { - "version": "4.1.22" - }, - "@babel/code-frame": { - "version": "7.16.0", - "dev": true, - "requires": { - "@babel/highlight": "^7.16.0" - } - }, - "@babel/compat-data": { - "version": "7.16.4", - "dev": true - }, - "@babel/core": { - "version": "7.16.5", - "dev": true, - "requires": { - "@babel/code-frame": "^7.16.0", - "@babel/generator": "^7.16.5", - "@babel/helper-compilation-targets": "^7.16.3", - "@babel/helper-module-transforms": "^7.16.5", - "@babel/helpers": "^7.16.5", - "@babel/parser": "^7.16.5", - "@babel/template": "^7.16.0", - "@babel/traverse": "^7.16.5", - "@babel/types": "^7.16.0", - "convert-source-map": "^1.7.0", - "debug": "^4.1.0", - "gensync": "^1.0.0-beta.2", - "json5": "^2.1.2", - "semver": "^6.3.0", - "source-map": "^0.5.0" - } - }, - "@babel/generator": { - "version": "7.16.5", - "dev": true, - "requires": { - "@babel/types": "^7.16.0", - "jsesc": "^2.5.1", - "source-map": "^0.5.0" - } - }, - "@babel/helper-compilation-targets": { - "version": "7.16.3", - "dev": true, - "requires": { - "@babel/compat-data": "^7.16.0", - "@babel/helper-validator-option": "^7.14.5", - "browserslist": "^4.17.5", - "semver": "^6.3.0" - } - }, - "@babel/helper-environment-visitor": { - "version": "7.16.5", - "dev": true, - "requires": { - "@babel/types": "^7.16.0" - } - }, - "@babel/helper-function-name": { - "version": "7.16.0", - "dev": true, - "requires": { - "@babel/helper-get-function-arity": "^7.16.0", - "@babel/template": "^7.16.0", - "@babel/types": "^7.16.0" - } - }, - "@babel/helper-get-function-arity": { - "version": "7.16.0", - "dev": true, - "requires": { - "@babel/types": "^7.16.0" - } - }, - "@babel/helper-hoist-variables": { - "version": "7.16.0", - "dev": true, - "requires": { - "@babel/types": "^7.16.0" - } - }, - "@babel/helper-module-imports": { - "version": "7.16.0", - "dev": true, - "requires": { - "@babel/types": "^7.16.0" + "engines": { + "node": ">=8" } }, - "@babel/helper-module-transforms": { - "version": "7.16.5", + "node_modules/yn": { + "version": "3.1.1", "dev": true, - "requires": { - "@babel/helper-environment-visitor": "^7.16.5", - "@babel/helper-module-imports": "^7.16.0", - "@babel/helper-simple-access": "^7.16.0", - "@babel/helper-split-export-declaration": "^7.16.0", - "@babel/helper-validator-identifier": "^7.15.7", - "@babel/template": "^7.16.0", - "@babel/traverse": "^7.16.5", - "@babel/types": "^7.16.0" + "license": "MIT", + "engines": { + "node": ">=6" } }, - "@babel/helper-simple-access": { - "version": "7.16.0", + "node_modules/yocto-queue": { + "version": "0.1.0", "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + } + }, + "dependencies": { + "@amcharts/amcharts4": { + "version": "4.10.23", "requires": { - "@babel/types": "^7.16.0" + "@babel/runtime": "^7.6.3", + "core-js": "^3.0.0", + "d3-force": "^2.0.1", + "d3-geo": "^2.0.1", + "d3-geo-projection": "^3.0.0", + "d3-selection": "^1.0.2", + "d3-transition": "^1.0.1", + "pdfmake": "^0.2.2", + "polylabel": "^1.0.2", + "raf": "^3.4.1", + "regression": "^2.0.1", + "rgbcolor": "^1.0.1", + "stackblur-canvas": "^2.0.0", + "tslib": "^2.0.1", + "xlsx": "^0.17.0" + }, + "dependencies": { + "tslib": { + "version": "2.1.0" + } } }, - "@babel/helper-split-export-declaration": { + "@amcharts/amcharts4-geodata": { + "version": "4.1.22" + }, + "@babel/code-frame": { "version": "7.16.0", "dev": true, "requires": { - "@babel/types": "^7.16.0" + "@babel/highlight": "^7.16.0" } }, "@babel/helper-validator-identifier": { "version": "7.15.7", "dev": true }, - "@babel/helper-validator-option": { - "version": "7.14.5", - "dev": true - }, - "@babel/helpers": { - "version": "7.16.5", - "dev": true, - "requires": { - "@babel/template": "^7.16.0", - "@babel/traverse": "^7.16.5", - "@babel/types": "^7.16.0" - } - }, "@babel/highlight": { "version": "7.16.0", "dev": true, @@ -16294,49 +14892,12 @@ } } }, - "@babel/parser": { - "version": "7.16.6", - "dev": true - }, "@babel/runtime": { "version": "7.12.5", "requires": { "regenerator-runtime": "^0.13.4" } }, - "@babel/template": { - "version": "7.16.0", - "dev": true, - "requires": { - "@babel/code-frame": "^7.16.0", - "@babel/parser": "^7.16.0", - "@babel/types": "^7.16.0" - } - }, - "@babel/traverse": { - "version": "7.16.5", - "dev": true, - "requires": { - "@babel/code-frame": "^7.16.0", - "@babel/generator": "^7.16.5", - "@babel/helper-environment-visitor": "^7.16.5", - "@babel/helper-function-name": "^7.16.0", - "@babel/helper-hoist-variables": "^7.16.0", - "@babel/helper-split-export-declaration": "^7.16.0", - "@babel/parser": "^7.16.5", - "@babel/types": "^7.16.0", - "debug": "^4.1.0", - "globals": "^11.1.0" - } - }, - "@babel/types": { - "version": "7.16.0", - "dev": true, - "requires": { - "@babel/helper-validator-identifier": "^7.15.7", - "to-fast-properties": "^2.0.0" - } - }, "@codemirror/autocomplete": { "version": "0.19.9", "requires": { @@ -16912,15 +15473,6 @@ "strip-json-comments": "^3.1.1" }, "dependencies": { - "globals": { - "version": "13.12.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz", - "integrity": "sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==", - "dev": true, - "requires": { - "type-fest": "^0.20.2" - } - }, "ignore": { "version": "4.0.6", "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", @@ -16932,12 +15484,6 @@ "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", "dev": true - }, - "type-fest": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", - "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", - "dev": true } } }, @@ -17436,21 +15982,6 @@ "@stencil/core": { "version": "2.5.2" }, - "@stylelint/postcss-css-in-js": { - "version": "0.37.2", - "dev": true, - "requires": { - "@babel/core": ">=7.9.0" - } - }, - "@stylelint/postcss-markdown": { - "version": "0.36.2", - "dev": true, - "requires": { - "remark": "^13.0.0", - "unist-util-find-all-after": "^3.0.2" - } - }, "@szmarczak/http-timer": { "version": "4.0.6", "dev": true, @@ -17458,15 +15989,10 @@ "defer-to-connect": "^2.0.0" } }, - "@tailwindcss/aspect-ratio": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/@tailwindcss/aspect-ratio/-/aspect-ratio-0.3.0.tgz", - "integrity": "sha512-DMgWskNJR6FNPLbQ8Xoq/PKV/9DfNKh5dvKB+SM8x7lVl4+pnxlZ3Ns4+yGmurA/ze708HrnCG1tXk85HolJmw==", - "dev": true, - "requires": {} - }, "@tailwindcss/forms": { - "version": "0.3.4", + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.4.0.tgz", + "integrity": "sha512-DeaQBx6EgEeuZPQACvC+mKneJsD8am1uiJugjgQK1+/Vt+Ai0GpFBC2T2fqnUad71WgOxyrZPE6BG1VaI6YqfQ==", "dev": true, "requires": { "mini-svg-data-uri": "^1.2.3" @@ -17477,8 +16003,18 @@ "dev": true, "requires": {} }, + "@tailwindcss/nesting": { + "version": "0.0.0-insiders.565cd3e", + "resolved": "https://registry.npmjs.org/@tailwindcss/nesting/-/nesting-0.0.0-insiders.565cd3e.tgz", + "integrity": "sha512-WhHoFBx19TnH/c+xLwT/sxei6+4RpdfiyG3MYXfmLaMsADmVqBkF7B6lDalgZD9YdM459MF7DtxVbWkOrV7IaQ==", + "requires": { + "postcss-nested": "^5.0.5" + } + }, "@tailwindcss/typography": { - "version": "0.4.1", + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.5.0.tgz", + "integrity": "sha512-1p/3C6C+JJziS/ghtG8ACYalbA2SyLJY27Pm33cVTlAoY6VQ7zfm2H64cPxUMBkVIlWXTtWHhZcZJPobMRmQAA==", "dev": true, "requires": { "lodash.castarray": "^4.4.0", @@ -17543,13 +16079,6 @@ "version": "3.0.3", "dev": true }, - "@types/mdast": { - "version": "3.0.10", - "dev": true, - "requires": { - "@types/unist": "*" - } - }, "@types/minimist": { "version": "1.2.1", "dev": true @@ -17580,10 +16109,6 @@ "@types/trusted-types": { "version": "2.0.2" }, - "@types/unist": { - "version": "2.0.6", - "dev": true - }, "@typescript-eslint/eslint-plugin": { "version": "5.8.1", "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.8.1.tgz", @@ -17884,10 +16409,6 @@ } } }, - "bail": { - "version": "1.0.5", - "dev": true - }, "balanced-match": { "version": "1.0.0", "dev": true @@ -17989,10 +16510,6 @@ "buffer-from": { "version": "1.1.2" }, - "bytes": { - "version": "3.1.1", - "dev": true - }, "cacheable-lookup": { "version": "5.0.4", "dev": true @@ -18124,18 +16641,6 @@ } } }, - "character-entities": { - "version": "1.2.4", - "dev": true - }, - "character-entities-legacy": { - "version": "1.1.4", - "dev": true - }, - "character-reference-invalid": { - "version": "1.1.4", - "dev": true - }, "chardet": { "version": "0.7.0", "dev": true @@ -18338,27 +16843,6 @@ "codepage": { "version": "1.15.0" }, - "color": { - "version": "4.1.0", - "dev": true, - "requires": { - "color-convert": "^2.0.1", - "color-string": "^1.9.0" - }, - "dependencies": { - "color-convert": { - "version": "2.0.1", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "dev": true - } - } - }, "color-convert": { "version": "1.9.3", "dev": true, @@ -18370,16 +16854,10 @@ "version": "1.1.3", "dev": true }, - "color-string": { - "version": "1.9.0", - "dev": true, - "requires": { - "color-name": "^1.0.0", - "simple-swizzle": "^0.2.2" - } - }, "colord": { - "version": "2.9.1", + "version": "2.9.2", + "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.2.tgz", + "integrity": "sha512-Uqbg+J445nc1TKn4FoDPS6ZZqAvEDnwrH42yo8B40JSOgSLxMZ/gt3h4nmCtPLQeXhjJJkqBx7SCY35WnIixaQ==", "dev": true }, "colorette": { @@ -18662,10 +17140,6 @@ } } }, - "css-color-names": { - "version": "0.0.4", - "dev": true - }, "css-declaration-sorter": { "version": "6.1.3", "dev": true, @@ -18751,17 +17225,12 @@ } } }, - "css-unit-converter": { - "version": "1.1.2", - "dev": true - }, "cssdb": { "version": "4.4.0", "dev": true }, "cssesc": { - "version": "3.0.0", - "dev": true + "version": "3.0.0" }, "cssnano": { "version": "5.0.13", @@ -19111,24 +17580,6 @@ "esutils": "^2.0.2" } }, - "dom-serializer": { - "version": "0.2.2", - "dev": true, - "requires": { - "domelementtype": "^2.0.1", - "entities": "^2.0.0" - }, - "dependencies": { - "domelementtype": { - "version": "2.2.0", - "dev": true - } - } - }, - "domelementtype": { - "version": "1.3.1", - "dev": true - }, "domexception": { "version": "2.0.1", "requires": { @@ -19140,21 +17591,6 @@ } } }, - "domhandler": { - "version": "2.4.2", - "dev": true, - "requires": { - "domelementtype": "1" - } - }, - "domutils": { - "version": "1.7.0", - "dev": true, - "requires": { - "dom-serializer": "0", - "domelementtype": "1" - } - }, "dot-prop": { "version": "5.3.0", "dev": true, @@ -19411,13 +17847,6 @@ "is-glob": "^4.0.3" } }, - "globals": { - "version": "13.7.0", - "dev": true, - "requires": { - "type-fest": "^0.20.2" - } - }, "ignore": { "version": "4.0.6", "dev": true @@ -19439,10 +17868,6 @@ "strip-json-comments": { "version": "3.1.1", "dev": true - }, - "type-fest": { - "version": "0.20.2", - "dev": true } } }, @@ -19619,10 +18044,6 @@ } } }, - "extend": { - "version": "3.0.2", - "dev": true - }, "external-editor": { "version": "3.1.0", "dev": true, @@ -19812,10 +18233,6 @@ "fuse.js": { "version": "3.6.1" }, - "gensync": { - "version": "1.0.0-beta.2", - "dev": true - }, "get-assigned-identifiers": { "version": "1.2.0" }, @@ -19933,8 +18350,21 @@ } }, "globals": { - "version": "11.12.0", - "dev": true + "version": "13.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz", + "integrity": "sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==", + "dev": true, + "requires": { + "type-fest": "^0.20.2" + }, + "dependencies": { + "type-fest": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "dev": true + } + } }, "globby": { "version": "11.0.4", @@ -19952,13 +18382,6 @@ "version": "0.1.4", "dev": true }, - "gonzales-pe": { - "version": "4.3.0", - "dev": true, - "requires": { - "minimist": "^1.2.5" - } - }, "got": { "version": "11.8.3", "dev": true, @@ -20020,10 +18443,6 @@ "has-symbols": "^1.0.2" } }, - "hex-color-regex": { - "version": "1.1.0", - "dev": true - }, "homedir-polyfill": { "version": "1.0.3", "dev": true, @@ -20036,57 +18455,22 @@ "dev": true }, "hosted-git-info": { - "version": "4.0.2", - "dev": true, - "requires": { - "lru-cache": "^6.0.0" - } - }, - "hsl-regex": { - "version": "1.0.0", - "dev": true - }, - "hsla-regex": { - "version": "1.0.0", - "dev": true - }, - "html-encoding-sniffer": { - "version": "2.0.1", - "requires": { - "whatwg-encoding": "^1.0.5" - } - }, - "html-tags": { - "version": "3.1.0", - "dev": true - }, - "htmlparser2": { - "version": "3.10.1", - "dev": true, - "requires": { - "domelementtype": "^1.3.1", - "domhandler": "^2.3.0", - "domutils": "^1.5.1", - "entities": "^1.1.1", - "inherits": "^2.0.1", - "readable-stream": "^3.1.1" - }, - "dependencies": { - "entities": { - "version": "1.1.2", - "dev": true - }, - "readable-stream": { - "version": "3.6.0", - "dev": true, - "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - } - } + "version": "4.0.2", + "dev": true, + "requires": { + "lru-cache": "^6.0.0" + } + }, + "html-encoding-sniffer": { + "version": "2.0.1", + "requires": { + "whatwg-encoding": "^1.0.5" } }, + "html-tags": { + "version": "3.1.0", + "dev": true + }, "http-cache-semantics": { "version": "4.1.0", "dev": true @@ -20131,7 +18515,9 @@ } }, "ignore": { - "version": "5.1.9", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz", + "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==", "dev": true }, "import-cwd": { @@ -20234,28 +18620,12 @@ "p-is-promise": "^3.0.0" } }, - "is-alphabetical": { - "version": "1.0.4", - "dev": true - }, - "is-alphanumerical": { - "version": "1.0.4", - "dev": true, - "requires": { - "is-alphabetical": "^1.0.0", - "is-decimal": "^1.0.0" - } - }, "is-arguments": { "version": "1.1.0", "requires": { "call-bind": "^1.0.0" } }, - "is-arrayish": { - "version": "0.3.2", - "dev": true - }, "is-binary-path": { "version": "2.1.0", "dev": true, @@ -20263,10 +18633,6 @@ "binary-extensions": "^2.0.0" } }, - "is-buffer": { - "version": "2.0.5", - "dev": true - }, "is-ci": { "version": "3.0.1", "dev": true, @@ -20274,18 +18640,6 @@ "ci-info": "^3.2.0" } }, - "is-color-stop": { - "version": "1.1.0", - "dev": true, - "requires": { - "css-color-names": "^0.0.4", - "hex-color-regex": "^1.1.0", - "hsl-regex": "^1.0.0", - "hsla-regex": "^1.0.0", - "rgb-regex": "^1.0.1", - "rgba-regex": "^1.0.0" - } - }, "is-core-module": { "version": "2.2.0", "dev": true, @@ -20296,10 +18650,6 @@ "is-date-object": { "version": "1.0.2" }, - "is-decimal": { - "version": "1.0.4", - "dev": true - }, "is-extglob": { "version": "2.1.1", "dev": true @@ -20315,10 +18665,6 @@ "is-extglob": "^2.1.1" } }, - "is-hexadecimal": { - "version": "1.0.4", - "dev": true - }, "is-number": { "version": "7.0.0", "dev": true @@ -20383,10 +18729,6 @@ "version": "1.0.0", "dev": true }, - "is-unicode-supported": { - "version": "0.1.0", - "dev": true - }, "is-utf8": { "version": "0.2.1", "dev": true @@ -20510,10 +18852,6 @@ } } }, - "jsesc": { - "version": "2.5.2", - "dev": true - }, "json-buffer": { "version": "3.0.1", "dev": true @@ -20540,13 +18878,6 @@ "version": "5.0.1", "dev": true }, - "json5": { - "version": "2.2.0", - "dev": true, - "requires": { - "minimist": "^1.2.5" - } - }, "jsonfile": { "version": "4.0.0", "dev": true, @@ -20578,7 +18909,9 @@ "dev": true }, "known-css-properties": { - "version": "0.21.0", + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.24.0.tgz", + "integrity": "sha512-RTSoaUAfLvpR357vWzAz/50Q/BmHfmE6ETSWfutT0AJiw10e6CmcdYRQJlLRd95B53D0Y2aD1jSxD3V3ySF+PA==", "dev": true }, "leaflet": { @@ -20779,10 +19112,6 @@ "version": "4.6.2", "dev": true }, - "lodash.topath": { - "version": "4.5.2", - "dev": true - }, "lodash.truncate": { "version": "4.4.2", "dev": true @@ -20795,14 +19124,6 @@ "version": "4.7.0", "dev": true }, - "log-symbols": { - "version": "4.1.0", - "dev": true, - "requires": { - "chalk": "^4.1.0", - "is-unicode-supported": "^0.1.0" - } - }, "log-update": { "version": "4.0.0", "dev": true, @@ -20903,10 +19224,6 @@ "version": "2.0.1", "dev": true }, - "longest-streak": { - "version": "2.0.4", - "dev": true - }, "loose-envify": { "version": "1.4.0", "requires": { @@ -20945,33 +19262,6 @@ "version": "2.1.3", "dev": true }, - "mdast-util-from-markdown": { - "version": "0.8.5", - "dev": true, - "requires": { - "@types/mdast": "^3.0.0", - "mdast-util-to-string": "^2.0.0", - "micromark": "~2.11.0", - "parse-entities": "^2.0.0", - "unist-util-stringify-position": "^2.0.0" - } - }, - "mdast-util-to-markdown": { - "version": "0.6.5", - "dev": true, - "requires": { - "@types/unist": "^2.0.0", - "longest-streak": "^2.0.0", - "mdast-util-to-string": "^2.0.0", - "parse-entities": "^2.0.0", - "repeat-string": "^1.0.0", - "zwitch": "^1.0.0" - } - }, - "mdast-util-to-string": { - "version": "2.0.0", - "dev": true - }, "mdn-data": { "version": "2.0.14", "dev": true @@ -21007,14 +19297,6 @@ "version": "1.4.1", "dev": true }, - "micromark": { - "version": "2.11.4", - "dev": true, - "requires": { - "debug": "^4.0.0", - "parse-entities": "^2.0.0" - } - }, "micromatch": { "version": "4.0.4", "dev": true, @@ -21074,10 +19356,6 @@ "mitt": { "version": "3.0.0" }, - "modern-normalize": { - "version": "1.1.0", - "dev": true - }, "modify-values": { "version": "1.0.1", "dev": true @@ -21090,8 +19368,7 @@ "dev": true }, "nanoid": { - "version": "3.1.30", - "dev": true + "version": "3.1.30" }, "natural-compare": { "version": "1.4.0", @@ -23422,18 +21699,6 @@ } } }, - "parse-entities": { - "version": "2.0.0", - "dev": true, - "requires": { - "character-entities": "^1.0.0", - "character-entities-legacy": "^1.0.0", - "character-reference-invalid": "^1.0.0", - "is-alphanumerical": "^1.0.0", - "is-decimal": "^1.0.0", - "is-hexadecimal": "^1.0.0" - } - }, "parse-json": { "version": "4.0.0", "dev": true, @@ -23509,8 +21774,7 @@ "version": "2.1.0" }, "picocolors": { - "version": "1.0.0", - "dev": true + "version": "1.0.0" }, "picomatch": { "version": "2.2.3", @@ -23585,7 +21849,6 @@ }, "postcss": { "version": "8.4.5", - "dev": true, "requires": { "nanoid": "^3.1.30", "picocolors": "^1.0.0", @@ -24076,13 +22339,6 @@ } } }, - "postcss-html": { - "version": "0.36.0", - "dev": true, - "requires": { - "htmlparser2": "^3.10.0" - } - }, "postcss-image-set-function": { "version": "3.0.1", "dev": true, @@ -24178,31 +22434,6 @@ } } }, - "postcss-less": { - "version": "3.1.4", - "dev": true, - "requires": { - "postcss": "^7.0.14" - }, - "dependencies": { - "picocolors": { - "version": "0.2.1", - "dev": true - }, - "postcss": { - "version": "7.0.39", - "dev": true, - "requires": { - "picocolors": "^0.2.1", - "source-map": "^0.6.1" - } - }, - "source-map": { - "version": "0.6.1", - "dev": true - } - } - }, "postcss-load-config": { "version": "3.1.0", "dev": true, @@ -24320,35 +22551,16 @@ }, "postcss-nested": { "version": "5.0.6", - "dev": true, "requires": { "postcss-selector-parser": "^6.0.6" } }, "postcss-nesting": { - "version": "7.0.1", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-8.0.1.tgz", + "integrity": "sha512-cHPNhW5VvRQjszFDxmy16mis9qFQqQLBNw6KVmueLqqE3M182ZAk9+QoxGqbGVryzLVhannw2B5Yhosqq522fA==", "dev": true, - "requires": { - "postcss": "^7.0.2" - }, - "dependencies": { - "picocolors": { - "version": "0.2.1", - "dev": true - }, - "postcss": { - "version": "7.0.39", - "dev": true, - "requires": { - "picocolors": "^0.2.1", - "source-map": "^0.6.1" - } - }, - "source-map": { - "version": "0.6.1", - "dev": true - } - } + "requires": {} }, "postcss-normalize-charset": { "version": "5.0.1", @@ -24567,122 +22779,14 @@ "picocolors": "^0.2.1", "source-map": "^0.6.1" } - }, - "source-map": { - "version": "0.6.1", - "dev": true - } - } - }, - "postcss-pseudo-class-any-link": { - "version": "6.0.0", - "dev": true, - "requires": { - "postcss": "^7.0.2", - "postcss-selector-parser": "^5.0.0-rc.3" - }, - "dependencies": { - "cssesc": { - "version": "2.0.0", - "dev": true - }, - "picocolors": { - "version": "0.2.1", - "dev": true - }, - "postcss": { - "version": "7.0.39", - "dev": true, - "requires": { - "picocolors": "^0.2.1", - "source-map": "^0.6.1" - } - }, - "postcss-selector-parser": { - "version": "5.0.0", - "dev": true, - "requires": { - "cssesc": "^2.0.0", - "indexes-of": "^1.0.1", - "uniq": "^1.0.1" - } - }, - "source-map": { - "version": "0.6.1", - "dev": true - } - } - }, - "postcss-reduce-initial": { - "version": "5.0.2", - "dev": true, - "requires": { - "browserslist": "^4.16.6", - "caniuse-api": "^3.0.0" - } - }, - "postcss-reduce-transforms": { - "version": "5.0.1", - "dev": true, - "requires": { - "cssnano-utils": "^2.0.1", - "postcss-value-parser": "^4.1.0" - } - }, - "postcss-replace-overflow-wrap": { - "version": "3.0.0", - "dev": true, - "requires": { - "postcss": "^7.0.2" - }, - "dependencies": { - "picocolors": { - "version": "0.2.1", - "dev": true - }, - "postcss": { - "version": "7.0.39", - "dev": true, - "requires": { - "picocolors": "^0.2.1", - "source-map": "^0.6.1" - } - }, - "source-map": { - "version": "0.6.1", - "dev": true - } - } - }, - "postcss-reporter": { - "version": "7.0.5", - "dev": true, - "requires": { - "picocolors": "^1.0.0", - "thenby": "^1.3.4" - } - }, - "postcss-resolve-nested-selector": { - "version": "0.1.1", - "dev": true - }, - "postcss-safe-parser": { - "version": "4.0.2", - "dev": true, - "requires": { - "postcss": "^7.0.26" - }, - "dependencies": { - "picocolors": { - "version": "0.2.1", - "dev": true - }, - "postcss": { - "version": "7.0.39", + }, + "postcss-nesting": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-7.0.1.tgz", + "integrity": "sha512-FrorPb0H3nuVq0Sff7W2rnc3SmIcruVC6YwpcS+k687VxyxO33iE1amna7wHuRVzM8vfiYofXSBHNAZ3QhLvYg==", "dev": true, "requires": { - "picocolors": "^0.2.1", - "source-map": "^0.6.1" + "postcss": "^7.0.2" } }, "source-map": { @@ -24691,14 +22795,18 @@ } } }, - "postcss-sass": { - "version": "0.4.4", + "postcss-pseudo-class-any-link": { + "version": "6.0.0", "dev": true, "requires": { - "gonzales-pe": "^4.3.0", - "postcss": "^7.0.21" + "postcss": "^7.0.2", + "postcss-selector-parser": "^5.0.0-rc.3" }, "dependencies": { + "cssesc": { + "version": "2.0.0", + "dev": true + }, "picocolors": { "version": "0.2.1", "dev": true @@ -24711,17 +22819,42 @@ "source-map": "^0.6.1" } }, + "postcss-selector-parser": { + "version": "5.0.0", + "dev": true, + "requires": { + "cssesc": "^2.0.0", + "indexes-of": "^1.0.1", + "uniq": "^1.0.1" + } + }, "source-map": { "version": "0.6.1", "dev": true } } }, - "postcss-scss": { - "version": "2.1.1", + "postcss-reduce-initial": { + "version": "5.0.2", + "dev": true, + "requires": { + "browserslist": "^4.16.6", + "caniuse-api": "^3.0.0" + } + }, + "postcss-reduce-transforms": { + "version": "5.0.1", "dev": true, "requires": { - "postcss": "^7.0.6" + "cssnano-utils": "^2.0.1", + "postcss-value-parser": "^4.1.0" + } + }, + "postcss-replace-overflow-wrap": { + "version": "3.0.0", + "dev": true, + "requires": { + "postcss": "^7.0.2" }, "dependencies": { "picocolors": { @@ -24742,6 +22875,25 @@ } } }, + "postcss-reporter": { + "version": "7.0.5", + "dev": true, + "requires": { + "picocolors": "^1.0.0", + "thenby": "^1.3.4" + } + }, + "postcss-resolve-nested-selector": { + "version": "0.1.1", + "dev": true + }, + "postcss-safe-parser": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz", + "integrity": "sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==", + "dev": true, + "requires": {} + }, "postcss-selector-matches": { "version": "4.0.0", "dev": true, @@ -24796,7 +22948,6 @@ }, "postcss-selector-parser": { "version": "6.0.7", - "dev": true, "requires": { "cssesc": "^3.0.0", "util-deprecate": "^1.0.2" @@ -24810,11 +22961,6 @@ "svgo": "^2.7.0" } }, - "postcss-syntax": { - "version": "0.36.2", - "dev": true, - "requires": {} - }, "postcss-unique-selectors": { "version": "5.0.2", "dev": true, @@ -24856,10 +23002,6 @@ "dev": true, "requires": {} }, - "pretty-hrtime": { - "version": "1.0.3", - "dev": true - }, "printj": { "version": "1.1.2" }, @@ -24888,16 +23030,6 @@ "punycode": { "version": "2.1.1" }, - "purgecss": { - "version": "4.1.3", - "dev": true, - "requires": { - "commander": "^8.0.0", - "glob": "^7.1.7", - "postcss": "^8.3.5", - "postcss-selector-parser": "^6.0.6" - } - }, "q": { "version": "1.5.1", "dev": true @@ -25058,20 +23190,6 @@ "esprima": "~4.0.0" } }, - "reduce-css-calc": { - "version": "2.1.8", - "dev": true, - "requires": { - "css-unit-converter": "^1.1.1", - "postcss-value-parser": "^3.3.0" - }, - "dependencies": { - "postcss-value-parser": { - "version": "3.3.1", - "dev": true - } - } - }, "redux": { "version": "4.0.5", "requires": { @@ -25103,33 +23221,6 @@ "regression": { "version": "2.0.1" }, - "remark": { - "version": "13.0.0", - "dev": true, - "requires": { - "remark-parse": "^9.0.0", - "remark-stringify": "^9.0.0", - "unified": "^9.1.0" - } - }, - "remark-parse": { - "version": "9.0.0", - "dev": true, - "requires": { - "mdast-util-from-markdown": "^0.8.0" - } - }, - "remark-stringify": { - "version": "9.0.1", - "dev": true, - "requires": { - "mdast-util-to-markdown": "^0.6.0" - } - }, - "repeat-string": { - "version": "1.6.1", - "dev": true - }, "require-directory": { "version": "2.1.1", "dev": true @@ -25200,14 +23291,6 @@ "version": "1.3.0", "dev": true }, - "rgb-regex": { - "version": "1.0.1", - "dev": true - }, - "rgba-regex": { - "version": "1.0.0", - "dev": true - }, "rgbcolor": { "version": "1.0.1" }, @@ -25405,13 +23488,6 @@ } } }, - "simple-swizzle": { - "version": "0.2.2", - "dev": true, - "requires": { - "is-arrayish": "^0.3.1" - } - }, "slash": { "version": "3.0.0", "dev": true @@ -25453,8 +23529,7 @@ "version": "0.5.7" }, "source-map-js": { - "version": "1.0.1", - "dev": true + "version": "1.0.1" }, "source-map-support": { "version": "0.5.21", @@ -25770,55 +23845,48 @@ } }, "stylelint": { - "version": "13.13.1", + "version": "14.2.0", + "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.2.0.tgz", + "integrity": "sha512-i0DrmDXFNpDsWiwx6SPRs4/pyw4kvZgqpDGvsTslQMY7hpUl6r33aQvNSn6cnTg2wtZ9rreFElI7XAKpOWi1vQ==", "dev": true, "requires": { - "@stylelint/postcss-css-in-js": "^0.37.2", - "@stylelint/postcss-markdown": "^0.36.2", - "autoprefixer": "^9.8.6", "balanced-match": "^2.0.0", - "chalk": "^4.1.1", - "cosmiconfig": "^7.0.0", - "debug": "^4.3.1", + "colord": "^2.9.2", + "cosmiconfig": "^7.0.1", + "debug": "^4.3.3", "execall": "^2.0.0", - "fast-glob": "^3.2.5", + "fast-glob": "^3.2.7", "fastest-levenshtein": "^1.0.12", "file-entry-cache": "^6.0.1", "get-stdin": "^8.0.0", "global-modules": "^2.0.0", - "globby": "^11.0.3", + "globby": "^11.0.4", "globjoin": "^0.1.4", "html-tags": "^3.1.0", - "ignore": "^5.1.8", + "ignore": "^5.2.0", "import-lazy": "^4.0.0", "imurmurhash": "^0.1.4", - "known-css-properties": "^0.21.0", - "lodash": "^4.17.21", - "log-symbols": "^4.1.0", + "is-plain-object": "^5.0.0", + "known-css-properties": "^0.24.0", "mathml-tag-names": "^2.1.3", "meow": "^9.0.0", "micromatch": "^4.0.4", + "normalize-path": "^3.0.0", "normalize-selector": "^0.2.0", - "postcss": "^7.0.35", - "postcss-html": "^0.36.0", - "postcss-less": "^3.1.4", + "picocolors": "^1.0.0", + "postcss": "^8.3.11", "postcss-media-query-parser": "^0.2.3", "postcss-resolve-nested-selector": "^0.1.1", - "postcss-safe-parser": "^4.0.2", - "postcss-sass": "^0.4.4", - "postcss-scss": "^2.1.1", - "postcss-selector-parser": "^6.0.5", - "postcss-syntax": "^0.36.2", + "postcss-safe-parser": "^6.0.0", + "postcss-selector-parser": "^6.0.7", "postcss-value-parser": "^4.1.0", "resolve-from": "^5.0.0", - "slash": "^3.0.0", "specificity": "^0.4.1", - "string-width": "^4.2.2", - "strip-ansi": "^6.0.0", + "string-width": "^4.2.3", + "strip-ansi": "^6.0.1", "style-search": "^0.1.0", - "sugarss": "^2.0.0", "svg-tags": "^1.0.0", - "table": "^6.6.0", + "table": "^6.7.5", "v8-compile-cache": "^2.3.0", "write-file-atomic": "^3.0.3" }, @@ -25827,19 +23895,6 @@ "version": "5.0.1", "dev": true }, - "autoprefixer": { - "version": "9.8.8", - "dev": true, - "requires": { - "browserslist": "^4.12.0", - "caniuse-lite": "^1.0.30001109", - "normalize-range": "^0.1.2", - "num2fraction": "^1.2.2", - "picocolors": "^0.2.1", - "postcss": "^7.0.32", - "postcss-value-parser": "^4.1.0" - } - }, "balanced-match": { "version": "2.0.0", "dev": true @@ -25882,22 +23937,6 @@ "yargs-parser": "^20.2.3" } }, - "picocolors": { - "version": "0.2.1", - "dev": true - }, - "postcss": { - "version": "7.0.39", - "dev": true, - "requires": { - "picocolors": "^0.2.1", - "source-map": "^0.6.1" - } - }, - "source-map": { - "version": "0.6.1", - "dev": true - }, "string-width": { "version": "4.2.3", "dev": true, @@ -25917,40 +23956,19 @@ } }, "stylelint-config-recommended": { - "version": "5.0.0", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-6.0.0.tgz", + "integrity": "sha512-ZorSSdyMcxWpROYUvLEMm0vSZud2uB7tX1hzBZwvVY9SV/uly4AvvJPPhCcymZL3fcQhEQG5AELmrxWqtmzacw==", "dev": true, "requires": {} }, "stylelint-config-standard": { - "version": "22.0.0", - "dev": true, - "requires": { - "stylelint-config-recommended": "^5.0.0" - } - }, - "sugarss": { - "version": "2.0.0", + "version": "23.0.0", + "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-23.0.0.tgz", + "integrity": "sha512-8PDlk+nWuc1T66nVaODTdVodN0pjuE5TBlopi39Lt9EM36YJsRhqttMyUhnS78oc/59Q6n8iw2GJB4QcoFqtRg==", "dev": true, "requires": { - "postcss": "^7.0.2" - }, - "dependencies": { - "picocolors": { - "version": "0.2.1", - "dev": true - }, - "postcss": { - "version": "7.0.39", - "dev": true, - "requires": { - "picocolors": "^0.2.1", - "source-map": "^0.6.1" - } - }, - "source-map": { - "version": "0.6.1", - "dev": true - } + "stylelint-config-recommended": "^6.0.0" } }, "supports-color": { @@ -26119,51 +24137,39 @@ } }, "tailwindcss": { - "version": "2.2.19", + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.8.tgz", + "integrity": "sha512-Yww1eRYO1AxITJmW/KduZPxNvYdHuedeKwPju9Oakp7MdiixRi5xkpLhirsc81QCxHL0eoce6qKmxXwYGt4Cjw==", "dev": true, "requires": { "arg": "^5.0.1", - "bytes": "^3.0.0", "chalk": "^4.1.2", "chokidar": "^3.5.2", - "color": "^4.0.1", + "color-name": "^1.1.4", "cosmiconfig": "^7.0.1", "detective": "^5.2.0", "didyoumean": "^1.2.2", "dlv": "^1.1.3", "fast-glob": "^3.2.7", - "fs-extra": "^10.0.0", - "glob-parent": "^6.0.1", - "html-tags": "^3.1.0", - "is-color-stop": "^1.1.0", - "is-glob": "^4.0.1", - "lodash": "^4.17.21", - "lodash.topath": "^4.5.2", - "modern-normalize": "^1.1.0", - "node-emoji": "^1.11.0", + "glob-parent": "^6.0.2", + "is-glob": "^4.0.3", "normalize-path": "^3.0.0", "object-hash": "^2.2.0", "postcss-js": "^3.0.3", "postcss-load-config": "^3.1.0", "postcss-nested": "5.0.6", - "postcss-selector-parser": "^6.0.6", - "postcss-value-parser": "^4.1.0", - "pretty-hrtime": "^1.0.3", - "purgecss": "^4.0.3", + "postcss-selector-parser": "^6.0.7", + "postcss-value-parser": "^4.2.0", "quick-lru": "^5.1.1", - "reduce-css-calc": "^2.1.8", "resolve": "^1.20.0", "tmp": "^0.2.1" }, "dependencies": { - "fs-extra": { - "version": "10.0.0", - "dev": true, - "requires": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - } + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true }, "glob-parent": { "version": "6.0.2", @@ -26172,14 +24178,6 @@ "is-glob": "^4.0.3" } }, - "jsonfile": { - "version": "6.1.0", - "dev": true, - "requires": { - "graceful-fs": "^4.1.6", - "universalify": "^2.0.0" - } - }, "quick-lru": { "version": "5.1.1", "dev": true @@ -26198,21 +24196,9 @@ "requires": { "rimraf": "^3.0.0" } - }, - "universalify": { - "version": "2.0.0", - "dev": true } } }, - "tailwindcss-scroll-snap": { - "version": "1.1.0", - "dev": true, - "requires": { - "lodash": "^4.17.15", - "reduce-css-calc": "^2.1.7" - } - }, "temp-dir": { "version": "2.0.0", "dev": true @@ -26284,10 +24270,6 @@ "os-tmpdir": "~1.0.2" } }, - "to-fast-properties": { - "version": "2.0.0", - "dev": true - }, "to-regex-range": { "version": "5.0.1", "dev": true, @@ -26317,10 +24299,6 @@ "version": "3.0.1", "dev": true }, - "trough": { - "version": "1.0.5", - "dev": true - }, "ts-node": { "version": "9.1.1", "dev": true, @@ -26399,24 +24377,6 @@ "tiny-inflate": "^1.0.0" } }, - "unified": { - "version": "9.2.2", - "dev": true, - "requires": { - "bail": "^1.0.0", - "extend": "^3.0.0", - "is-buffer": "^2.0.0", - "is-plain-obj": "^2.0.0", - "trough": "^1.0.0", - "vfile": "^4.0.0" - }, - "dependencies": { - "is-plain-obj": { - "version": "2.1.0", - "dev": true - } - } - }, "uniq": { "version": "1.0.1", "dev": true @@ -26428,24 +24388,6 @@ "crypto-random-string": "^2.0.0" } }, - "unist-util-find-all-after": { - "version": "3.0.2", - "dev": true, - "requires": { - "unist-util-is": "^4.0.0" - } - }, - "unist-util-is": { - "version": "4.1.0", - "dev": true - }, - "unist-util-stringify-position": { - "version": "2.0.3", - "dev": true, - "requires": { - "@types/unist": "^2.0.2" - } - }, "universal-user-agent": { "version": "6.0.0", "dev": true @@ -26479,24 +24421,6 @@ "spdx-expression-parse": "^3.0.0" } }, - "vfile": { - "version": "4.2.1", - "dev": true, - "requires": { - "@types/unist": "^2.0.0", - "is-buffer": "^2.0.0", - "unist-util-stringify-position": "^2.0.0", - "vfile-message": "^2.0.0" - } - }, - "vfile-message": { - "version": "2.0.4", - "dev": true, - "requires": { - "@types/unist": "^2.0.0", - "unist-util-stringify-position": "^2.0.0" - } - }, "vite": { "version": "2.7.3", "dev": true, @@ -26754,10 +24678,6 @@ "yocto-queue": { "version": "0.1.0", "dev": true - }, - "zwitch": { - "version": "1.0.5", - "dev": true } } } diff --git a/package.json b/package.json index 9ff417995934fce5350c1fdca2ab0c786a1506bd..82ae568525155980cee5e7c7dfe03e73470cc96c 100644 --- a/package.json +++ b/package.json @@ -38,6 +38,7 @@ "@github/markdown-toolbar-element": "^1.5.3", "@github/time-elements": "^3.1.2", "@popperjs/core": "^2.10.2", + "@tailwindcss/nesting": "^0.0.0-insiders.565cd3e", "@vime/core": "^5.0.34", "choices.js": "^9.0.1", "flatpickr": "^4.6.9", @@ -45,7 +46,7 @@ "leaflet.markercluster": "^1.5.3", "lit": "^2.0.2", "marked": "^3.0.7", - "xml-formatter": "^2.5.0" + "xml-formatter": "^2.5.1" }, "devDependencies": { "@commitlint/cli": "^13.2.1", @@ -54,10 +55,9 @@ "@semantic-release/exec": "^6.0.1", "@semantic-release/git": "^10.0.0", "@semantic-release/gitlab": "^7.0.3", - "@tailwindcss/aspect-ratio": "^0.3.0", - "@tailwindcss/forms": "^0.3.4", + "@tailwindcss/forms": "^0.4.0-alpha.1", "@tailwindcss/line-clamp": "^0.2.2", - "@tailwindcss/typography": "^0.4.1", + "@tailwindcss/typography": "^0.5.0-alpha.2", "@types/leaflet": "^1.7.5", "@types/marked": "^3.0.1", "@typescript-eslint/eslint-plugin": "^5.0.0", @@ -68,22 +68,22 @@ "eslint": "^8.0.1", "eslint-config-prettier": "^8.3.0", "eslint-plugin-prettier": "^4.0.0", - "husky": "^7.0.2", + "husky": "^7.0.4", "is-ci": "^3.0.0", "lint-staged": "^11.2.3", "postcss-import": "^14.0.2", + "postcss-nesting": "^8.0.1", "postcss-preset-env": "^6.7.0", "postcss-reporter": "^7.0.4", "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", + "stylelint": "^14.0.0", + "stylelint-config-standard": "^23.0.0", "svgo": "^2.7.0", - "tailwindcss": "^2.2.17", - "tailwindcss-scroll-snap": "^1.1.0", + "tailwindcss": "^3.0.0-alpha.1", "typescript": "^4.4.4", - "vite": "^2.6.9" + "vite": "^2.6.10" }, "lint-staged": { "*.{js,ts,css,md,json}": "prettier --write", diff --git a/postcss.config.js b/postcss.config.js index aec4a6746d5fd309a70d30ccf9b5ef6e3102c638..64319f2af6d654bae42d460d1026fa33040dc631 100644 --- a/postcss.config.js +++ b/postcss.config.js @@ -4,8 +4,12 @@ module.exports = { plugins: [ require("postcss-import"), require("postcss-reporter"), + require("tailwindcss/nesting")(require("postcss-nesting")), require("tailwindcss"), - require("postcss-preset-env")({ stage: 1 }), + require("postcss-preset-env")({ + stage: 1, + features: { "nesting-rules": false }, + }), ...(process.env.NODE_ENV === "production" ? [ require("cssnano")({ diff --git a/tailwind.config.js b/tailwind.config.js index cf66ca79facd8819097df9700f0511383a63f86b..da4aca32f9a81c54429951044f1c65855d35d780 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -1,10 +1,8 @@ /* eslint-disable */ const defaultTheme = require("tailwindcss/defaultTheme"); -const colors = require("tailwindcss/colors"); module.exports = { - mode: "jit", - purge: [ + content: [ "./app/Views/**/*.php", "./modules/**/Views/**/*.php", "./themes/**/*.php", @@ -42,10 +40,6 @@ module.exports = { 800: "#b21a39", 900: "#8e162e", }, - orange: colors.orange, - }, - spacing: { - 112: "28rem", }, gridTemplateColumns: { admin: "300px calc(100% - 300px)", @@ -67,7 +61,5 @@ module.exports = { require("@tailwindcss/forms"), require("@tailwindcss/typography"), require("@tailwindcss/line-clamp"), - require("@tailwindcss/aspect-ratio"), - require("tailwindcss-scroll-snap"), ], }; diff --git a/themes/cp_admin/_layout.php b/themes/cp_admin/_layout.php index 2bac8cff16046bde7aaaff9e2a7c336f658564e8..3b673615abd8278046aebd47181a85382d14e026 100644 --- a/themes/cp_admin/_layout.php +++ b/themes/cp_admin/_layout.php @@ -18,7 +18,6 @@ </head> <body class="relative grid items-start min-h-screen bg-pine-50 grid-cols-admin grid-rows-admin"> - <div id="sidebar-backdrop" role="button" tabIndex="0" aria-label="Close" class="fixed z-50 hidden w-full h-full bg-gray-900 bg-opacity-50 md:hidden"></div> <?= $this->include('_partials/_nav_header') ?> <?= $this->include('_partials/_nav_aside') ?> <main class="relative max-w-full col-start-1 row-start-2 col-span-full md:col-start-2 md:col-span-1"> @@ -39,9 +38,4 @@ <?= $this->renderSection('content') ?> </div> </main> - <button - type="button" - id="sidebar-toggler" - class="fixed bottom-0 left-0 z-50 p-3 mb-3 ml-3 text-xl transition duration-300 ease-in-out bg-white border-2 rounded-full shadow-lg md:hidden hover:bg-gray-100 focus:ring-castopod" - style="transform: translateX(0px);"><?= icon('menu') ?></button> </body> \ No newline at end of file diff --git a/themes/cp_admin/_partials/_nav_aside.php b/themes/cp_admin/_partials/_nav_aside.php index 6abe45c4b3192a55577c44b9af9970acb8f865b0..341674f63eb8f610cffa5a943b8f14fbd6ce5a14 100644 --- a/themes/cp_admin/_partials/_nav_aside.php +++ b/themes/cp_admin/_partials/_nav_aside.php @@ -1,4 +1,5 @@ -<aside id="admin-sidebar" class="h-full max-h-[calc(100vh-40px)] sticky z-50 flex flex-col row-start-2 col-start-1 text-white transition duration-200 ease-in-out transform -translate-x-full border-r top-10 border-pine-900 bg-pine-800 md:translate-x-0"> +<div data-sidebar-toggler="backdrop" role="button" tabIndex="0" aria-label="Close" class="fixed z-50 hidden w-full h-full bg-gray-800/75 md:hidden"></div> +<aside data-sidebar-toggler="sidebar" data-toggle-class="-translate-x-full" data-hide-class="-translate-x-full" class="h-full max-h-[calc(100vh-40px)] sticky z-50 flex flex-col row-start-2 col-start-1 text-white transition duration-200 ease-in-out transform -translate-x-full border-r top-10 border-pine-900 bg-pine-800 md:translate-x-0"> <?php if (isset($podcast) && isset($episode)): ?> <?= $this->include('episode/_sidebar') ?> <?php elseif (isset($podcast)): ?> diff --git a/themes/cp_admin/_partials/_nav_header.php b/themes/cp_admin/_partials/_nav_header.php index bb97fdd1e3523afa9c12f496e0e6f74951e42a38..fc726afd5014e020cf058837c1ce9de56db473cb 100644 --- a/themes/cp_admin/_partials/_nav_header.php +++ b/themes/cp_admin/_partials/_nav_header.php @@ -1,4 +1,7 @@ -<header class="sticky top-0 z-50 flex items-center justify-between h-10 text-white border-b col-span-full bg-pine-800 border-pine-900"> +<header class="sticky top-0 z-[60] flex items-center h-10 text-white border-b col-span-full bg-pine-800 border-pine-900"> + <button type="button" + data-sidebar-toggler="toggler" + class="h-full pr-1 text-xl md:hidden focus:ring-castopod focus:ring-inset"><?= icon('menu') ?></button> <div class="inline-flex items-center h-full"> <a href="<?= route_to( 'admin', @@ -14,7 +17,7 @@ </div> <button type="button" - class="inline-flex items-center h-full px-3 text-sm font-semibold focus:ring-inset focus:ring-castopod gap-x-2" + class="inline-flex items-center h-full px-3 ml-auto text-sm font-semibold focus:ring-inset focus:ring-castopod gap-x-2" id="my-account-dropdown" data-dropdown="button" data-dropdown-target="my-account-dropdown-menu" diff --git a/themes/cp_app/episode/_layout.php b/themes/cp_app/episode/_layout.php index 73018e1ce6b8bf7c89fd47a3f7ca22858a3c6927..8eb6efd87257c49f5b46a8a8d83f0c77f7b95a4e 100644 --- a/themes/cp_app/episode/_layout.php +++ b/themes/cp_app/episode/_layout.php @@ -24,7 +24,7 @@ ->asset('js/audio-player.ts', 'js') ?> </head> -<body class="grid items-start mx-auto grid-cols-podcast bg-pine-50"> +<body class="flex flex-col min-h-screen mx-auto md:min-h-full md:grid md:grid-cols-podcast bg-pine-50"> <?php if (can_user_interact()): ?> <div class="col-span-full"> <?= $this->include('_admin_navbar') ?> @@ -124,10 +124,11 @@ <?php endif; ?> </div> <?= $this->include('episode/_partials/navigation') ?> - <div class="relative grid items-start col-start-2 pt-6 pb-4 grid-cols-podcastMain gap-x-6"> - <main class="w-full col-span-full md:col-span-1"> + <div class="relative grid items-start flex-1 col-start-2 grid-cols-podcastMain gap-x-6"> + <main class="w-full col-start-1 row-start-1 py-6 col-span-full md:col-span-1"> <?= $this->renderSection('content') ?> </main> + <div data-sidebar-toggler="backdrop" class="absolute top-0 left-0 z-10 hidden w-full h-full bg-pine-800/75 md:hidden" role="button" tabIndex="0" aria-label="Close"></div> <?= $this->include('podcast/_partials/sidebar') ?> </div> <?= view('_persons_modal', [ diff --git a/themes/cp_app/episode/_partials/navigation.php b/themes/cp_app/episode/_partials/navigation.php index 9114b0dc4ce853640450858fe95d7fb7e3d95965..1a47c075ea9c03a5edb2564c261a76d3f6f5ce4b 100644 --- a/themes/cp_app/episode/_partials/navigation.php +++ b/themes/cp_app/episode/_partials/navigation.php @@ -18,5 +18,5 @@ $navigationItems = [ <?php $isActive = url_is($item['uri']); ?> <a href="<?= $item['uri'] ?>" class="px-4 py-1 text-sm font-semibold uppercase focus:ring-castopod border-b-4<?= $isActive ? ' border-b-4 text-pine-500 border-pine-500' : ' text-gray-500 hover:text-gray-900 hover:border-gray-200 border-transparent' ?>"><?= $item['label'] ?><span class="px-2 ml-1 font-semibold rounded-full <?= $isActive ? ' bg-pine-100' : ' bg-gray-100' ?>"><?= $item['labelInfo'] ?></span></a> <?php endforeach; ?> - <button type="button" class="p-2 ml-auto rotate-180 rounded-full md:hidden focus:ring-castopod" data-toggle="podcast-sidebar" data-toggle-class="absolute sticky top-0 right-0 hidden bg-white top-12"><?= icon('menu') ?></button> + <button type="button" class="p-2 ml-auto rotate-180 rounded-full md:hidden focus:ring-castopod" data-sidebar-toggler="toggler"><?= icon('menu') ?></button> </nav> \ No newline at end of file diff --git a/themes/cp_app/episode/comment.php b/themes/cp_app/episode/comment.php index 87e31e34d6f39634a5e67356f323b9585ddfa072..3cad657ee824e2d93d8807e96c231750552d25e8 100644 --- a/themes/cp_app/episode/comment.php +++ b/themes/cp_app/episode/comment.php @@ -21,13 +21,10 @@ <div class="max-w-2xl px-6 mx-auto"> <nav class="py-3"> <a href="<?= route_to('episode', $podcast->handle, $episode->slug) ?>" - class="inline-flex items-center px-4 py-2 text-sm"><?= icon( + class="inline-flex items-center px-4 py-2 text-sm focus:ring-castopod"><?= icon( 'arrow-left', 'mr-2 text-lg', - ) . - lang('Comment.back_to_episode', [ - 'episodeTitle' => $episode->title, - ]) ?></a> + ) . lang('Comment.back_to_comments') ?></a> </nav> <div class="pb-12"> <?= $this->include('episode/_partials/comment_with_replies') ?> diff --git a/themes/cp_app/podcast/_layout.php b/themes/cp_app/podcast/_layout.php index 5909b6f46bdc342e5ee44363cfa0b1d1d8e0a651..487a58abcf263b3325e280f65afe410e0216976f 100644 --- a/themes/cp_app/podcast/_layout.php +++ b/themes/cp_app/podcast/_layout.php @@ -24,14 +24,14 @@ ->asset('js/audio-player.ts', 'js') ?> </head> -<body class="grid items-start mx-auto grid-cols-podcast bg-pine-50"> +<body class="flex flex-col min-h-screen mx-auto md:min-h-full md:grid md:grid-cols-podcast bg-pine-50"> <?php if (can_user_interact()): ?> <div class="col-span-full"> <?= $this->include('_admin_navbar') ?> </div> <?php endif; ?> - <header class="z-50 flex flex-col-reverse justify-between w-full col-start-2 bg-top bg-no-repeat bg-cover sm:flex-row sm:items-end bg-pine-800" style="background-image: url('<?= $podcast->actor->cover_image_url ?>'); aspect-ratio: 3 / 1;"> + <header class="z-50 flex flex-col-reverse justify-between w-full col-start-2 bg-top bg-no-repeat bg-cover sm:flex-row sm:items-end bg-pine-800 aspect-[3/1]" style="background-image: url('<?= $podcast->actor->cover_image_url ?>');"> <div class="flex items-center pl-4 -mb-6 md:pl-8 md:-mb-8 gap-x-4"> <img src="<?= $podcast->image->thumbnail_url ?>" alt="<?= $podcast->title ?>" loading="lazy" class="h-24 rounded-full md:h-28 ring-4 ring-white" /> <div class="relative flex flex-col text-white -top-2"> @@ -61,8 +61,8 @@ </div> </header> <?= $this->include('podcast/_partials/navigation') ?> - <div class="grid items-start col-start-2 pb-4 mt-6 grid-cols-podcastMain gap-x-6"> - <main class="w-full max-w-xl mx-auto col-span-full md:col-span-1"> + <div class="relative grid items-start flex-1 col-start-2 grid-cols-podcastMain gap-x-6"> + <main class="w-full max-w-xl col-start-1 row-start-1 py-6 mx-auto col-span-full md:col-span-1"> <?= $this->renderSection('content') ?> </main> <?= $this->include('podcast/_partials/sidebar') ?> diff --git a/themes/cp_app/podcast/_partials/navigation.php b/themes/cp_app/podcast/_partials/navigation.php index 4bf09e8ca8c8e4250e99027cd14950c7cd12ac72..ea6eef86b9f66f34206bec3dea0ea7c65c9076b4 100644 --- a/themes/cp_app/podcast/_partials/navigation.php +++ b/themes/cp_app/podcast/_partials/navigation.php @@ -15,10 +15,10 @@ $navigationItems = [ ], ] ?> -<nav class="sticky z-40 flex col-start-2 px-4 pt-8 bg-white shadow gap-x-2 md:gap-x-4 md:px-8 -top-8 md:-top-12 rounded-conditional-b-xl md:pt-12 "> +<nav class="sticky z-40 flex col-start-2 px-2 pt-8 bg-white shadow gap-x-2 md:gap-x-4 md:px-8 -top-6 md:-top-10 rounded-conditional-b-xl md:pt-12 "> <?php foreach ($navigationItems as $item): ?> <?php $isActive = url_is($item['uri']); ?> <a href="<?= $item['uri'] ?>" class="px-4 py-1 text-sm font-semibold uppercase focus:ring-castopod border-b-4<?= $isActive ? ' border-b-4 text-pine-500 border-pine-500' : ' text-gray-500 hover:text-gray-900 hover:border-gray-200 border-transparent' ?>"><?= $item['label'] ?></a> <?php endforeach; ?> - <button type="button" class="p-2 ml-auto rotate-180 rounded-full md:hidden focus:ring-castopod"><?= icon('menu') ?></button> + <button type="button" class="p-2 ml-auto rotate-180 rounded-full md:hidden focus:ring-castopod" data-sidebar-toggler="toggler"><?= icon('menu') ?></button> </nav> \ No newline at end of file diff --git a/themes/cp_app/podcast/_partials/sidebar.php b/themes/cp_app/podcast/_partials/sidebar.php index 9d35a7669da457747722f06bc2c49d597f0fced2..99d129c72d58512e7baf783eb0bf4043827b6a5d 100644 --- a/themes/cp_app/podcast/_partials/sidebar.php +++ b/themes/cp_app/podcast/_partials/sidebar.php @@ -1,6 +1,6 @@ -<aside id="podcast-sidebar" class="sticky hidden col-span-1 md:block top-12"> - <div class="absolute z-0 w-full h-full sm:hidden bg-pine-800/50"></div> - <div class="z-10 bg-pine-50"> +<div data-sidebar-toggler="backdrop" class="absolute top-0 left-0 z-10 hidden w-full h-full bg-pine-800/75 md:hidden" role="button" tabIndex="0" aria-label="Close"></div> +<aside id="podcast-sidebar" data-sidebar-toggler="sidebar" data-toggle-class="hidden" data-hide-class="hidden" class="p-4 py-6 z-20 shadow-2xl md:shadow-none hidden h-full col-span-1 col-start-2 row-start-1 md:block bg-pine-50 w-[300px]"> + <div class="sticky z-10 bg-pine-50 top-12"> <a href="<?= route_to('podcast_feed', $podcast->handle) ?>" class="inline-flex items-center mb-6 text-sm font-semibold focus:ring-castopod text-pine-800 group" target="_blank" rel="noopener noreferrer"> <?= icon('rss', ' mr-2 bg-orange-500 text-xl text-white group-hover:bg-orange-700 p-1 w-6 h-6 inline-flex items-center justify-center rounded-lg') . lang('Podcast.feed') ?> </a> diff --git a/themes/cp_app/post/post.php b/themes/cp_app/post/post.php index 3cc1299f10393a237e7b7c91ba038a9748f8a5ff..f5ee1525521b2462e81eff91b225e8f01dcca7b1 100644 --- a/themes/cp_app/post/post.php +++ b/themes/cp_app/post/post.php @@ -20,7 +20,7 @@ <?= $this->section('content') ?> <nav class="py-2"> <a href="<?= route_to('podcast-activity', $podcast->handle) ?>" - class="inline-flex items-center px-4 py-2 text-sm"><?= icon( + class="inline-flex items-center px-4 py-2 text-sm focus:ring-castopod"><?= icon( 'arrow-left', 'mr-2 text-lg', ) .