From 88b60077dfc08fff0d258e739f07c9008e28ae74 Mon Sep 17 00:00:00 2001 From: DrMint Date: Sat, 21 May 2022 13:18:57 +0200 Subject: [PATCH] Added tailwindcss prettier --- next.config.js | 5 + package-lock.json | 102 ++++++++++++++---- package.json | 1 + src/components/AppLayout.tsx | 51 ++++----- src/components/Chip.tsx | 4 +- src/components/HorizontalLine.tsx | 2 +- src/components/Inputs/Button.tsx | 16 +-- src/components/Inputs/OrderableList.tsx | 11 +- src/components/Inputs/PageSelector.tsx | 2 +- src/components/Inputs/Select.tsx | 14 +-- src/components/Inputs/Switch.tsx | 8 +- src/components/InsetBox.tsx | 2 +- src/components/Library/ContentLine.tsx | 10 +- src/components/Library/ScanSet.tsx | 21 ++-- src/components/Library/ScanSetCover.tsx | 22 ++-- src/components/LightBox.tsx | 7 +- src/components/Markdown/Markdawn.tsx | 8 +- src/components/Markdown/TOC.tsx | 6 +- src/components/PanelComponents/NavOption.tsx | 2 +- .../PanelComponents/PanelHeader.tsx | 4 +- src/components/Panels/ContentPanel.tsx | 2 +- src/components/Panels/MainPanel.tsx | 42 ++++---- src/components/Panels/SubPanel.tsx | 2 +- src/components/Popup.tsx | 6 +- src/components/PostPage.tsx | 6 +- src/components/PreviewCard.tsx | 76 ++++++------- src/components/PreviewLine.tsx | 16 +-- src/components/RecorderChip.tsx | 4 +- src/components/ThumbnailHeader.tsx | 8 +- .../Chronology/ChronologyItemComponent.tsx | 20 ++-- .../Chronology/ChronologyYearComponent.tsx | 2 +- src/pages/about-us/contact.tsx | 8 +- src/pages/archives/videos/c/[uid].tsx | 7 +- src/pages/archives/videos/index.tsx | 8 +- src/pages/archives/videos/v/[uid].tsx | 23 ++-- src/pages/contents/[slug]/index.tsx | 14 +-- src/pages/contents/index.tsx | 18 ++-- src/pages/dev/checkup/contents.tsx | 14 +-- src/pages/dev/checkup/libraryitems.tsx | 14 +-- src/pages/dev/editor.tsx | 10 +- src/pages/gallery/index.tsx | 35 ------ src/pages/index.tsx | 12 +-- src/pages/library/[slug]/index.tsx | 54 +++++----- src/pages/library/index.tsx | 24 ++--- src/pages/news/index.tsx | 4 +- src/pages/wiki/chronology.tsx | 2 +- src/tailwind.css | 44 ++++---- 47 files changed, 404 insertions(+), 369 deletions(-) delete mode 100644 src/pages/gallery/index.tsx diff --git a/next.config.js b/next.config.js index a847b98..1000373 100644 --- a/next.config.js +++ b/next.config.js @@ -26,6 +26,11 @@ module.exports = { destination: "https://discord.com/invite/5mcXcRAczj", permanent: false, }, + { + source: "/gallery", + destination: "https://gallery.accords-library.com/", + permanent: false, + }, ]; }, }; diff --git a/package-lock.json b/package-lock.json index 07dc4ee..f476b15 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,6 +11,7 @@ "@fontsource/vollkorn": "^4.5.9", "@fontsource/zen-maru-gothic": "^4.5.11", "@tippyjs/react": "^4.2.6", + "autoprefixer": "^10.4.7", "graphql-request": "^4.2.0", "markdown-to-jsx": "^7.1.7", "next": "^12.1.6", @@ -3133,6 +3134,38 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/autoprefixer": { + "version": "10.4.7", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.7.tgz", + "integrity": "sha512-ypHju4Y2Oav95SipEcCcI5J7CGPuvz8oat7sUtYj3ClK44bldfvtvcxK6IEK++7rqB7YchDGzweZIBG+SD0ZAA==", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/autoprefixer" + } + ], + "dependencies": { + "browserslist": "^4.20.3", + "caniuse-lite": "^1.0.30001335", + "fraction.js": "^4.2.0", + "normalize-range": "^0.1.2", + "picocolors": "^1.0.0", + "postcss-value-parser": "^4.2.0" + }, + "bin": { + "autoprefixer": "bin/autoprefixer" + }, + "engines": { + "node": "^10 || ^12 || >=14" + }, + "peerDependencies": { + "postcss": "^8.1.0" + } + }, "node_modules/axe-core": { "version": "4.4.1", "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.4.1.tgz", @@ -3279,7 +3312,6 @@ "version": "4.20.3", "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.3.tgz", "integrity": "sha512-NBhymBQl1zM0Y5dQT/O+xiLP9/rzOIQdKM/eMJBAq7yBgaB6krIYLGejrwVYnSHZdqjscB1SPuAjHwxjvN6Wdg==", - "dev": true, "funding": [ { "type": "opencollective", @@ -4324,8 +4356,7 @@ "node_modules/electron-to-chromium": { "version": "1.4.137", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.137.tgz", - "integrity": "sha512-0Rcpald12O11BUogJagX3HsCN3FE83DSqWjgXoHo5a72KUKMSfI39XBgJpgNNxS9fuGzytaFjE06kZkiVFy2qA==", - "dev": true + "integrity": "sha512-0Rcpald12O11BUogJagX3HsCN3FE83DSqWjgXoHo5a72KUKMSfI39XBgJpgNNxS9fuGzytaFjE06kZkiVFy2qA==" }, "node_modules/elegant-spinner": { "version": "1.0.1", @@ -4427,7 +4458,6 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", - "dev": true, "engines": { "node": ">=6" } @@ -5106,6 +5136,18 @@ "node": ">= 12" } }, + "node_modules/fraction.js": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz", + "integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==", + "engines": { + "node": "*" + }, + "funding": { + "type": "patreon", + "url": "https://www.patreon.com/infusion" + } + }, "node_modules/fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", @@ -6845,8 +6887,7 @@ "node_modules/node-releases": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.4.tgz", - "integrity": "sha512-gbMzqQtTtDz/00jQzZ21PQzdI9PyLYqUSvD0p3naOhX4odFji0ZxYdnVwPTxmSwkmxhcFImpozceidSG+AgoPQ==", - "dev": true + "integrity": "sha512-gbMzqQtTtDz/00jQzZ21PQzdI9PyLYqUSvD0p3naOhX4odFji0ZxYdnVwPTxmSwkmxhcFImpozceidSG+AgoPQ==" }, "node_modules/nodemailer": { "version": "6.7.5", @@ -6865,6 +6906,14 @@ "node": ">=0.10.0" } }, + "node_modules/normalize-range": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz", + "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/normalize-url": { "version": "4.5.1", "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz", @@ -7341,7 +7390,6 @@ "version": "8.4.12", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.12.tgz", "integrity": "sha512-lg6eITwYe9v6Hr5CncVbK70SoioNQIq81nsaG86ev5hAidQvmOeETBqs7jm43K2F5/Ley3ytDtriImV6TpNiSg==", - "dev": true, "funding": [ { "type": "opencollective", @@ -7444,8 +7492,7 @@ "node_modules/postcss-value-parser": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz", - "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==", - "dev": true + "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==" }, "node_modules/prelude-ls": { "version": "1.2.1", @@ -11254,6 +11301,19 @@ "integrity": "sha512-Hdw8qdNiqdJ8LqT0iK0sVzkFbzg6fhnQqqfWhBDxcHZvU75+B+ayzTy8x+k5Ix0Y92XOhOUlx74ps+bA6BeYMQ==", "dev": true }, + "autoprefixer": { + "version": "10.4.7", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.7.tgz", + "integrity": "sha512-ypHju4Y2Oav95SipEcCcI5J7CGPuvz8oat7sUtYj3ClK44bldfvtvcxK6IEK++7rqB7YchDGzweZIBG+SD0ZAA==", + "requires": { + "browserslist": "^4.20.3", + "caniuse-lite": "^1.0.30001335", + "fraction.js": "^4.2.0", + "normalize-range": "^0.1.2", + "picocolors": "^1.0.0", + "postcss-value-parser": "^4.2.0" + } + }, "axe-core": { "version": "4.4.1", "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.4.1.tgz", @@ -11374,7 +11434,6 @@ "version": "4.20.3", "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.3.tgz", "integrity": "sha512-NBhymBQl1zM0Y5dQT/O+xiLP9/rzOIQdKM/eMJBAq7yBgaB6krIYLGejrwVYnSHZdqjscB1SPuAjHwxjvN6Wdg==", - "dev": true, "requires": { "caniuse-lite": "^1.0.30001332", "electron-to-chromium": "^1.4.118", @@ -12234,8 +12293,7 @@ "electron-to-chromium": { "version": "1.4.137", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.137.tgz", - "integrity": "sha512-0Rcpald12O11BUogJagX3HsCN3FE83DSqWjgXoHo5a72KUKMSfI39XBgJpgNNxS9fuGzytaFjE06kZkiVFy2qA==", - "dev": true + "integrity": "sha512-0Rcpald12O11BUogJagX3HsCN3FE83DSqWjgXoHo5a72KUKMSfI39XBgJpgNNxS9fuGzytaFjE06kZkiVFy2qA==" }, "elegant-spinner": { "version": "1.0.1", @@ -12321,8 +12379,7 @@ "escalade": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", - "dev": true + "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==" }, "escape-string-regexp": { "version": "4.0.0", @@ -12862,6 +12919,11 @@ } } }, + "fraction.js": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz", + "integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==" + }, "fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", @@ -14136,8 +14198,7 @@ "node-releases": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.4.tgz", - "integrity": "sha512-gbMzqQtTtDz/00jQzZ21PQzdI9PyLYqUSvD0p3naOhX4odFji0ZxYdnVwPTxmSwkmxhcFImpozceidSG+AgoPQ==", - "dev": true + "integrity": "sha512-gbMzqQtTtDz/00jQzZ21PQzdI9PyLYqUSvD0p3naOhX4odFji0ZxYdnVwPTxmSwkmxhcFImpozceidSG+AgoPQ==" }, "nodemailer": { "version": "6.7.5", @@ -14150,6 +14211,11 @@ "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", "dev": true }, + "normalize-range": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz", + "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=" + }, "normalize-url": { "version": "4.5.1", "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz", @@ -14495,7 +14561,6 @@ "version": "8.4.12", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.12.tgz", "integrity": "sha512-lg6eITwYe9v6Hr5CncVbK70SoioNQIq81nsaG86ev5hAidQvmOeETBqs7jm43K2F5/Ley3ytDtriImV6TpNiSg==", - "dev": true, "requires": { "nanoid": "^3.3.1", "picocolors": "^1.0.0", @@ -14543,8 +14608,7 @@ "postcss-value-parser": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz", - "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==", - "dev": true + "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==" }, "prelude-ls": { "version": "1.2.1", diff --git a/package.json b/package.json index 20c933e..c2347d7 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "@fontsource/vollkorn": "^4.5.9", "@fontsource/zen-maru-gothic": "^4.5.11", "@tippyjs/react": "^4.2.6", + "autoprefixer": "^10.4.7", "graphql-request": "^4.2.0", "markdown-to-jsx": "^7.1.7", "next": "^12.1.6", diff --git a/src/components/AppLayout.tsx b/src/components/AppLayout.tsx index 114c086..1dcaee8 100644 --- a/src/components/AppLayout.tsx +++ b/src/components/AppLayout.tsx @@ -164,7 +164,7 @@ export function AppLayout(props: Immutable): JSX.Element { >
@@ -198,15 +198,15 @@ export function AppLayout(props: Immutable): JSX.Element { {/* Background when navbar is opened */}
): JSX.Element { {/* Content panel */}
{contentPanel ? ( contentPanel ) : ( -
+

❮

-

{langui.select_option_sidebar}

+

{langui.select_option_sidebar}

)} @@ -243,13 +243,14 @@ export function AppLayout(props: Immutable): JSX.Element { {/* Sub panel */} {subPanel && (
@@ -259,10 +260,10 @@ export function AppLayout(props: Immutable): JSX.Element { {/* Main panel */}
@@ -271,8 +272,8 @@ export function AppLayout(props: Immutable): JSX.Element { {/* Navbar */}
): JSX.Element { {appLayout.mainPanelOpen ? "close" : "menu"}

30 - ? "text-xl max-h-14" - : "text-2xl max-h-16" + ? "max-h-14 text-xl" + : "max-h-16 text-2xl" }`} > {ogTitle} @@ -314,7 +315,7 @@ export function AppLayout(props: Immutable): JSX.Element {

{langui.settings}

{router.locales && ( @@ -358,7 +359,7 @@ export function AppLayout(props: Immutable): JSX.Element { )}
)} -
+

{langui.theme}

diff --git a/src/components/Chip.tsx b/src/components/Chip.tsx index 33dbe51..bc62478 100644 --- a/src/components/Chip.tsx +++ b/src/components/Chip.tsx @@ -8,8 +8,8 @@ interface Props { export function Chip(props: Immutable): JSX.Element { return (
{props.children} diff --git a/src/components/HorizontalLine.tsx b/src/components/HorizontalLine.tsx index 1d5e291..25e1c7e 100644 --- a/src/components/HorizontalLine.tsx +++ b/src/components/HorizontalLine.tsx @@ -7,7 +7,7 @@ interface Props { export function HorizontalLine(props: Immutable): JSX.Element { return (
); } diff --git a/src/components/Inputs/Button.tsx b/src/components/Inputs/Button.tsx index 9a18772..b16fd34 100644 --- a/src/components/Inputs/Button.tsx +++ b/src/components/Inputs/Button.tsx @@ -35,19 +35,19 @@ export function Button(props: Immutable): JSX.Element { draggable={draggable} id={id} onClick={onClick} - className={`grid place-content-center place-items-center border-[1px] - border-dark text-dark rounded-full px-4 pt-[0.4rem] pb-[0.5rem] - transition-all select-none hover:[--opacityBadge:0] --opacityBadge:100 ${className} ${ + className={`--opacityBadge:100 grid select-none place-content-center + place-items-center rounded-full border-[1px] border-dark px-4 pt-[0.4rem] + pb-[0.5rem] text-dark transition-all hover:[--opacityBadge:0] ${className} ${ active - ? "text-light bg-black drop-shadow-black-lg !border-black cursor-not-allowed" - : `cursor-pointer hover:text-light hover:bg-dark hover:drop-shadow-shade-lg - active:bg-black active:text-light active:drop-shadow-black-lg active:border-black` + ? "cursor-not-allowed !border-black bg-black text-light drop-shadow-black-lg" + : `cursor-pointer hover:bg-dark hover:text-light hover:drop-shadow-shade-lg + active:border-black active:bg-black active:text-light active:drop-shadow-black-lg` }`} > {badgeNumber && (
{badgeNumber}
diff --git a/src/components/Inputs/OrderableList.tsx b/src/components/Inputs/OrderableList.tsx index 040b4a5..537beec 100644 --- a/src/components/Inputs/OrderableList.tsx +++ b/src/components/Inputs/OrderableList.tsx @@ -56,16 +56,15 @@ export function OrderableList(props: Immutable): JSX.Element { ); updateOrder(sourceIndex, targetIndex); }} - className="grid grid-cols-[auto_1fr] place-content-center - border-[1px] transition-all hover:text-light hover:bg-dark - hover:drop-shadow-shade-lg border-dark bg-light text-dark - rounded-full cursor-grab select-none px-1 py-2 pr-4 gap-2" + className="grid cursor-grab select-none grid-cols-[auto_1fr] place-content-center gap-2 + rounded-full border-[1px] border-dark bg-light px-1 py-2 pr-4 text-dark transition-all + hover:bg-dark hover:text-light hover:drop-shadow-shade-lg" draggable >
{index > 0 && ( { updateOrder(index, index - 1); }} @@ -75,7 +74,7 @@ export function OrderableList(props: Immutable): JSX.Element { )} {index < items.size - 1 && ( { updateOrder(index, index + 1); }} diff --git a/src/components/Inputs/PageSelector.tsx b/src/components/Inputs/PageSelector.tsx index fe376bd..dae31ed 100644 --- a/src/components/Inputs/PageSelector.tsx +++ b/src/components/Inputs/PageSelector.tsx @@ -13,7 +13,7 @@ export function PageSelector(props: Immutable): JSX.Element { const { page, setPage, maxPage } = props; return ( -
+