From 0d23eefbb7de82cc9cef2e118fdb7a03b7ce320b Mon Sep 17 00:00:00 2001 From: Roman Timashev Date: Thu, 13 Oct 2022 12:50:15 +0600 Subject: [PATCH 01/13] fix contrast theme on mobile --- src/style/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/style/style.css b/src/style/style.css index 9cbd739d..ae54dbaa 100644 --- a/src/style/style.css +++ b/src/style/style.css @@ -160,7 +160,7 @@ h3 { /* MOBILE */ @media (max-width: 31.25em) { - :root { + :root, .theme-contrast { --font-size-default: 14pt; --font-size-accent: 16pt; --font-size-h1: 1.5rem; From e3714f8caaf973a12293a26323af79a017bf3d95 Mon Sep 17 00:00:00 2001 From: Roman Timashev Date: Thu, 13 Oct 2022 12:52:20 +0600 Subject: [PATCH 02/13] bumb eslint to 8.25 --- package-lock.json | 92 +++++++++++++++++++---------------------------- package.json | 2 +- 2 files changed, 38 insertions(+), 56 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0829b756..36c20e8a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -34,7 +34,7 @@ "@types/node": "^12.12.34", "@types/react": "^18.0.18", "@types/sharp": "^0.29.2", - "eslint": "^8.23.0", + "eslint": "^8.25.0", "eslint-config-next": "^12.3.0", "feed": "^4.1.0", "should": "^8.2.2", @@ -66,9 +66,9 @@ } }, "node_modules/@eslint/eslintrc": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.1.tgz", - "integrity": "sha512-OhSY22oQQdw3zgPOOwdoj01l/Dzl1Z+xyUP33tkSN+aqyEhymJCcPHyXt+ylW8FSe0TfRC2VG+ROQOapD0aZSQ==", + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.3.tgz", + "integrity": "sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==", "dev": true, "dependencies": { "ajv": "^6.12.4", @@ -89,9 +89,9 @@ } }, "node_modules/@humanwhocodes/config-array": { - "version": "0.10.4", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.4.tgz", - "integrity": "sha512-mXAIHxZT3Vcpg83opl1wGlVZ9xydbfZO3r5YfRSH6Gpp2J/PfdBP0wbDa2sO6/qRbcalpoevVyW6A/fI6LfeMw==", + "version": "0.10.7", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.7.tgz", + "integrity": "sha512-MDl6D6sBsaV452/QSdX+4CXIjZhIcI0PELsxUjk4U828yd58vk3bTIvk/6w5FY+4hIy9sLW0sfrV7K7Kc++j/w==", "dev": true, "dependencies": { "@humanwhocodes/object-schema": "^1.2.1", @@ -102,16 +102,6 @@ "node": ">=10.10.0" } }, - "node_modules/@humanwhocodes/gitignore-to-minimatch": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz", - "integrity": "sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA==", - "dev": true, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/nzakas" - } - }, "node_modules/@humanwhocodes/module-importer": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", @@ -1407,14 +1397,13 @@ } }, "node_modules/eslint": { - "version": "8.23.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.23.0.tgz", - "integrity": "sha512-pBG/XOn0MsJcKcTRLr27S5HpzQo4kLr+HjLQIyK4EiCsijDl/TB+h5uEuJU6bQ8Edvwz1XWOjpaP2qgnXGpTcA==", + "version": "8.25.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.25.0.tgz", + "integrity": "sha512-DVlJOZ4Pn50zcKW5bYH7GQK/9MsoQG2d5eDH0ebEkE8PbgzTTmtt/VTH9GGJ4BfeZCpBLqFfvsjX35UacUL83A==", "dev": true, "dependencies": { - "@eslint/eslintrc": "^1.3.1", - "@humanwhocodes/config-array": "^0.10.4", - "@humanwhocodes/gitignore-to-minimatch": "^1.0.2", + "@eslint/eslintrc": "^1.3.3", + "@humanwhocodes/config-array": "^0.10.5", "@humanwhocodes/module-importer": "^1.0.1", "ajv": "^6.10.0", "chalk": "^4.0.0", @@ -1431,7 +1420,6 @@ "fast-deep-equal": "^3.1.3", "file-entry-cache": "^6.0.1", "find-up": "^5.0.0", - "functional-red-black-tree": "^1.0.1", "glob-parent": "^6.0.1", "globals": "^13.15.0", "globby": "^11.1.0", @@ -1440,6 +1428,7 @@ "import-fresh": "^3.0.0", "imurmurhash": "^0.1.4", "is-glob": "^4.0.0", + "js-sdsl": "^4.1.4", "js-yaml": "^4.1.0", "json-stable-stringify-without-jsonify": "^1.0.1", "levn": "^0.4.1", @@ -2083,12 +2072,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/functional-red-black-tree": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", - "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", - "dev": true - }, "node_modules/functions-have-names": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", @@ -2584,6 +2567,12 @@ "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-2.2.1.tgz", "integrity": "sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ==" }, + "node_modules/js-sdsl": { + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.5.tgz", + "integrity": "sha512-08bOAKweV2NUC1wqTtf3qZlnpOX/R2DU9ikpjOHs0H+ibQv3zpncVQg6um4uYtRtrwIX8M4Nh3ytK4HGlYAq7Q==", + "dev": true + }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -4313,9 +4302,9 @@ } }, "@eslint/eslintrc": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.1.tgz", - "integrity": "sha512-OhSY22oQQdw3zgPOOwdoj01l/Dzl1Z+xyUP33tkSN+aqyEhymJCcPHyXt+ylW8FSe0TfRC2VG+ROQOapD0aZSQ==", + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.3.tgz", + "integrity": "sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==", "dev": true, "requires": { "ajv": "^6.12.4", @@ -4330,9 +4319,9 @@ } }, "@humanwhocodes/config-array": { - "version": "0.10.4", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.4.tgz", - "integrity": "sha512-mXAIHxZT3Vcpg83opl1wGlVZ9xydbfZO3r5YfRSH6Gpp2J/PfdBP0wbDa2sO6/qRbcalpoevVyW6A/fI6LfeMw==", + "version": "0.10.7", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.7.tgz", + "integrity": "sha512-MDl6D6sBsaV452/QSdX+4CXIjZhIcI0PELsxUjk4U828yd58vk3bTIvk/6w5FY+4hIy9sLW0sfrV7K7Kc++j/w==", "dev": true, "requires": { "@humanwhocodes/object-schema": "^1.2.1", @@ -4340,12 +4329,6 @@ "minimatch": "^3.0.4" } }, - "@humanwhocodes/gitignore-to-minimatch": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz", - "integrity": "sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA==", - "dev": true - }, "@humanwhocodes/module-importer": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", @@ -5252,14 +5235,13 @@ } }, "eslint": { - "version": "8.23.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.23.0.tgz", - "integrity": "sha512-pBG/XOn0MsJcKcTRLr27S5HpzQo4kLr+HjLQIyK4EiCsijDl/TB+h5uEuJU6bQ8Edvwz1XWOjpaP2qgnXGpTcA==", + "version": "8.25.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.25.0.tgz", + "integrity": "sha512-DVlJOZ4Pn50zcKW5bYH7GQK/9MsoQG2d5eDH0ebEkE8PbgzTTmtt/VTH9GGJ4BfeZCpBLqFfvsjX35UacUL83A==", "dev": true, "requires": { - "@eslint/eslintrc": "^1.3.1", - "@humanwhocodes/config-array": "^0.10.4", - "@humanwhocodes/gitignore-to-minimatch": "^1.0.2", + "@eslint/eslintrc": "^1.3.3", + "@humanwhocodes/config-array": "^0.10.5", "@humanwhocodes/module-importer": "^1.0.1", "ajv": "^6.10.0", "chalk": "^4.0.0", @@ -5276,7 +5258,6 @@ "fast-deep-equal": "^3.1.3", "file-entry-cache": "^6.0.1", "find-up": "^5.0.0", - "functional-red-black-tree": "^1.0.1", "glob-parent": "^6.0.1", "globals": "^13.15.0", "globby": "^11.1.0", @@ -5285,6 +5266,7 @@ "import-fresh": "^3.0.0", "imurmurhash": "^0.1.4", "is-glob": "^4.0.0", + "js-sdsl": "^4.1.4", "js-yaml": "^4.1.0", "json-stable-stringify-without-jsonify": "^1.0.1", "levn": "^0.4.1", @@ -5780,12 +5762,6 @@ "functions-have-names": "^1.2.2" } }, - "functional-red-black-tree": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", - "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", - "dev": true - }, "functions-have-names": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", @@ -6126,6 +6102,12 @@ "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-2.2.1.tgz", "integrity": "sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ==" }, + "js-sdsl": { + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.5.tgz", + "integrity": "sha512-08bOAKweV2NUC1wqTtf3qZlnpOX/R2DU9ikpjOHs0H+ibQv3zpncVQg6um4uYtRtrwIX8M4Nh3ytK4HGlYAq7Q==", + "dev": true + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", diff --git a/package.json b/package.json index 1db8ac91..ad4a1934 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "@types/node": "^12.12.34", "@types/react": "^18.0.18", "@types/sharp": "^0.29.2", - "eslint": "^8.23.0", + "eslint": "^8.25.0", "eslint-config-next": "^12.3.0", "feed": "^4.1.0", "should": "^8.2.2", From da488654d6b00ad40f45c93e7863b1322ddac394 Mon Sep 17 00:00:00 2001 From: Roman Timashev Date: Thu, 13 Oct 2022 12:53:44 +0600 Subject: [PATCH 03/13] bump date-fns to 2.29 --- package-lock.json | 21 ++++++++++++++------- package.json | 2 +- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 36c20e8a..eb3c1d73 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "@radix-ui/react-icons": "^1.1.1", "@radix-ui/react-navigation-menu": "^1.0.0", "classnames": "^2.2.6", - "date-fns": "^2.11.1", + "date-fns": "^2.29.0", "lodash": "^4.17.21", "markdown-it": "^13.0.1", "next": "^12.3.0", @@ -1198,9 +1198,16 @@ "dev": true }, "node_modules/date-fns": { - "version": "2.11.1", - "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.11.1.tgz", - "integrity": "sha512-3RdUoinZ43URd2MJcquzBbDQo+J87cSzB8NkXdZiN5ia1UNyep0oCyitfiL88+R7clGTeq/RniXAc16gWyAu1w==" + "version": "2.29.3", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.29.3.tgz", + "integrity": "sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA==", + "engines": { + "node": ">=0.11" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/date-fns" + } }, "node_modules/debug": { "version": "4.3.4", @@ -5086,9 +5093,9 @@ "dev": true }, "date-fns": { - "version": "2.11.1", - "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.11.1.tgz", - "integrity": "sha512-3RdUoinZ43URd2MJcquzBbDQo+J87cSzB8NkXdZiN5ia1UNyep0oCyitfiL88+R7clGTeq/RniXAc16gWyAu1w==" + "version": "2.29.3", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.29.3.tgz", + "integrity": "sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA==" }, "debug": { "version": "4.3.4", diff --git a/package.json b/package.json index ad4a1934..0e0efaab 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "@radix-ui/react-icons": "^1.1.1", "@radix-ui/react-navigation-menu": "^1.0.0", "classnames": "^2.2.6", - "date-fns": "^2.11.1", + "date-fns": "^2.29.0", "lodash": "^4.17.21", "markdown-it": "^13.0.1", "next": "^12.3.0", From 78e33e456c68834f01f2e8180238f8c4f54a903f Mon Sep 17 00:00:00 2001 From: Roman Timashev Date: Thu, 13 Oct 2022 13:47:45 +0600 Subject: [PATCH 04/13] add HudozkaLogo component --- src/assets/hudozka-logo.png | Bin 0 -> 11312 bytes src/components/HudozkaLogo/index.tsx | 19 +++++++++++++ src/components/HudozkaLogo/logo.module.css | 31 +++++++++++++++++++++ 3 files changed, 50 insertions(+) create mode 100644 src/assets/hudozka-logo.png create mode 100644 src/components/HudozkaLogo/index.tsx create mode 100644 src/components/HudozkaLogo/logo.module.css diff --git a/src/assets/hudozka-logo.png b/src/assets/hudozka-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..ca9e6a3bc4aceb472b26c8b2cea65fd399362ae3 GIT binary patch literal 11312 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 = ({ dark }) => ( +
+ {"Hudozka"} +
+) diff --git a/src/components/HudozkaLogo/logo.module.css b/src/components/HudozkaLogo/logo.module.css new file mode 100644 index 00000000..4bda5ec5 --- /dev/null +++ b/src/components/HudozkaLogo/logo.module.css @@ -0,0 +1,31 @@ +.container { + display: flex; + align-items: center; + justify-content: center; + + width: var(--size-l); + height: var(--size-l); + + border-radius: var(--radius-small); +} + +.dark { + background-color: #f9ea12; + + --shadow-color: 60deg 100% 29%; + --shadow-elevation-high: + 0px 0.1px 0.1px hsl(var(--shadow-color) / 0.34), + 0px 0.4px 0.5px -0.4px hsl(var(--shadow-color) / 0.34), + 0px 0.8px 0.9px -0.7px hsl(var(--shadow-color) / 0.34), + 0px 1.3px 1.5px -1.1px hsl(var(--shadow-color) / 0.34), + 0px 2.1px 2.4px -1.4px hsl(var(--shadow-color) / 0.34), + 0px 3.3px 3.7px -1.8px hsl(var(--shadow-color) / 0.34), + -0.1px 5.1px 5.7px -2.1px hsl(var(--shadow-color) / 0.34), + -0.1px 7.5px 8.4px -2.5px hsl(var(--shadow-color) / 0.34); + + box-shadow: var(--shadow-elevation-high); +} + +.dark img { + filter: invert(0%); +} From e75697819b3a3eff7e0a13a472bf5f8194cba376 Mon Sep 17 00:00:00 2001 From: Roman Timashev Date: Thu, 13 Oct 2022 13:48:29 +0600 Subject: [PATCH 05/13] add logo and other layout changes --- pages/index.tsx | 85 +++++++++++++++------------ src/components/HudozkaTitle/index.tsx | 24 +++++--- src/components/Menu/styles.module.css | 11 +++- src/components/Navigation/index.tsx | 18 ++++-- src/hooks/useDarkTheme.ts | 5 ++ src/ui/Box/index.tsx | 2 +- 6 files changed, 92 insertions(+), 53 deletions(-) create mode 100644 src/hooks/useDarkTheme.ts diff --git a/pages/index.tsx b/pages/index.tsx index 5d853c61..d04c8339 100644 --- a/pages/index.tsx +++ b/pages/index.tsx @@ -8,6 +8,7 @@ import { GetStaticProps, NextPage } from "next" import { IMenu, IMeta, PageCardDto } from "src/types" import { apiGet } from "@/next-lib" import { createHomeCards, createMenu } from "@/remote/factory" +import { useMobile } from "@/hooks/useMobile" type Props = { title: string @@ -16,48 +17,54 @@ type Props = { items: PageCardDto[] } -const Index: NextPage = props => ( - <> - - - {props.title} - - - = props => { + const mobile = useMobile() + + return ( + <> + + + {props.title} + + + {mobile ? null : ( + + )} - - - -) + + + + ) +} export const getStaticProps: GetStaticProps = async () => { const items = await apiGet(createHomeCards)("https://hudozka.tmshv.com/home", async () => []) diff --git a/src/components/HudozkaTitle/index.tsx b/src/components/HudozkaTitle/index.tsx index 6fc1a983..1fb37187 100644 --- a/src/components/HudozkaTitle/index.tsx +++ b/src/components/HudozkaTitle/index.tsx @@ -3,15 +3,25 @@ import s from "./title.module.css" import { memo } from "react" export type HudozkaTitleProps = { + compact?: boolean style?: React.CSSProperties } -export const HudozkaTitle: React.FC = memo(props => ( -

- МБУДО - Шлиссельбургская
- детская художественная школа -

-)) +export const HudozkaTitle: React.FC = memo(({ style, compact = false }) => { + if (compact) { + return ( + + Шлиссельбургская ДХШ + + ) + } + return ( +

+ МБУДО + Шлиссельбургская
+ детская художественная школа +

+ ) +}) HudozkaTitle.displayName = "HudozkaTitle" diff --git a/src/components/Menu/styles.module.css b/src/components/Menu/styles.module.css index 448076a1..5fbc9bda 100644 --- a/src/components/Menu/styles.module.css +++ b/src/components/Menu/styles.module.css @@ -3,7 +3,7 @@ align-items: flex-start; flex-wrap: wrap; - gap: var(--size-m); + gap: var(--size-s); font-size: var(--font-size-second); list-style: none; @@ -19,11 +19,18 @@ /* MENU ITEM */ .menuItem { + display: flex; + align-items: center; + justify-content: center; + user-select: none; background-color: var(--color-back-main); border-radius: var(--radius-small); transition: box-shadow 200ms ease-in, background-color 200ms ease-in; - padding: var(--size-s) var(--size-s); + /* padding: var(--size-s) var(--size-s); */ + padding: 0 var(--size-s); + + height: var(--size-l); } .menuItem.active { diff --git a/src/components/Navigation/index.tsx b/src/components/Navigation/index.tsx index a7b3a2df..0614614b 100644 --- a/src/components/Navigation/index.tsx +++ b/src/components/Navigation/index.tsx @@ -9,13 +9,17 @@ import { Spacer } from "../Spacer" import { useToggle } from "react-use" import { Button } from "@/ui/Button" import { EyeOpenIcon } from "@radix-ui/react-icons" +import { HudozkaLogo } from "../HudozkaLogo" +import { useDarkTheme } from "@/hooks/useDarkTheme" +import { HudozkaTitle } from "../HudozkaTitle" export type NavigationProps = { style?: React.CSSProperties } export const Navigation: React.FC = props => { - const collapseMenu = useMobile() + const mobile = useMobile() + const dark = useDarkTheme() const [open, toggleOpen] = useToggle(false) const { menu } = useContext(ConfigContext) @@ -45,10 +49,16 @@ export const Navigation: React.FC = props => { - - {collapseMenu ? null : ( + + + {!mobile ? null : ( + + )} + + {mobile ? null : ( { @@ -59,7 +69,7 @@ export const Navigation: React.FC = props => { - {!collapseMenu ? null : ( + {!mobile ? null : ( = ({ From 2353003a3b82c9af2bc872c9c78bf956fe0c9fac Mon Sep 17 00:00:00 2001 From: Roman Timashev Date: Thu, 13 Oct 2022 14:19:08 +0600 Subject: [PATCH 06/13] add important keyword --- src/style/style.css | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/style/style.css b/src/style/style.css index ae54dbaa..7111ce02 100644 --- a/src/style/style.css +++ b/src/style/style.css @@ -161,17 +161,17 @@ h3 { /* MOBILE */ @media (max-width: 31.25em) { :root, .theme-contrast { - --font-size-default: 14pt; - --font-size-accent: 16pt; - --font-size-h1: 1.5rem; - --font-size-h2: 1.5rem; - --font-size-h3: 1.25rem; + --font-size-default: 14pt !important; + --font-size-accent: 16pt !important; + --font-size-h1: 1.5rem !important; + --font-size-h2: 1.5rem !important; + --font-size-h3: 1.25rem !important; - --content-width: 100%; - --content-margin: var(--size-m); - --content-wide-margin: var(--size-m) var(--size-m); + --content-width: 100% !important; + --content-margin: var(--size-m) !important; + --content-wide-margin: var(--size-m) var(--size-m) !important; - --picture-wide-increase: 0px; + --picture-wide-increase: 0px !important; } } From 496d26481e9cc88401ac3b96455293ffd16df09c Mon Sep 17 00:00:00 2001 From: Roman Timashev Date: Thu, 13 Oct 2022 14:24:09 +0600 Subject: [PATCH 07/13] add link to / for logo --- src/components/Navigation/index.tsx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/components/Navigation/index.tsx b/src/components/Navigation/index.tsx index 0614614b..6ca5550b 100644 --- a/src/components/Navigation/index.tsx +++ b/src/components/Navigation/index.tsx @@ -12,6 +12,7 @@ import { EyeOpenIcon } from "@radix-ui/react-icons" import { HudozkaLogo } from "../HudozkaLogo" import { useDarkTheme } from "@/hooks/useDarkTheme" import { HudozkaTitle } from "../HudozkaTitle" +import Link from "next/link" export type NavigationProps = { style?: React.CSSProperties @@ -52,7 +53,11 @@ export const Navigation: React.FC = props => { - + + + + + {!mobile ? null : ( From 6d4d495daf16b50699475c75953bd245e89ce8ad Mon Sep 17 00:00:00 2001 From: Roman Timashev Date: Thu, 13 Oct 2022 14:51:33 +0600 Subject: [PATCH 08/13] use radix-ui tooltip instead of rc-tooltip --- package-lock.json | 410 ++++++++++++------- package.json | 2 +- src/components/FIleCard/Signature.tsx | 21 +- src/components/FIleCard/index.tsx | 17 +- src/components/FIleCard/signature.module.css | 30 +- src/style/style.css | 32 -- src/ui/Box/box.module.css | 2 - 7 files changed, 308 insertions(+), 206 deletions(-) diff --git a/package-lock.json b/package-lock.json index eb3c1d73..a7d7eb3a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,13 +11,13 @@ "dependencies": { "@radix-ui/react-icons": "^1.1.1", "@radix-ui/react-navigation-menu": "^1.0.0", + "@radix-ui/react-tooltip": "^1.0.0", "classnames": "^2.2.6", "date-fns": "^2.29.0", "lodash": "^4.17.21", "markdown-it": "^13.0.1", "next": "^12.3.0", "next-seo": "^5.5.0", - "rc-tooltip": "^5.1.0", "react": "^18.2.0", "react-dom": "^18.2.0", "react-icons": "^4.2.0", @@ -88,6 +88,32 @@ "url": "https://opencollective.com/eslint" } }, + "node_modules/@floating-ui/core": { + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-0.7.3.tgz", + "integrity": "sha512-buc8BXHmG9l82+OQXOFU3Kr2XQx9ys01U/Q9HMIrZ300iLc8HLMgh7dcCqgYzAzf4BkoQvDcXf5Y+CuEZ5JBYg==" + }, + "node_modules/@floating-ui/dom": { + "version": "0.5.4", + "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-0.5.4.tgz", + "integrity": "sha512-419BMceRLq0RrmTSDxn8hf9R3VCJv2K9PUfugh5JyEFmdjzDo+e8U5EdR8nzKq8Yj1htzLm3b6eQEEam3/rrtg==", + "dependencies": { + "@floating-ui/core": "^0.7.3" + } + }, + "node_modules/@floating-ui/react-dom": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-0.7.2.tgz", + "integrity": "sha512-1T0sJcpHgX/u4I1OzIEhlcrvkUN8ln39nz7fMoE/2HDHrPiMFoOGR7++GYyfUmIQHkkrTinaeQsO3XWubjSvGg==", + "dependencies": { + "@floating-ui/dom": "^0.5.3", + "use-isomorphic-layout-effect": "^1.1.1" + }, + "peerDependencies": { + "react": ">=16.8.0", + "react-dom": ">=16.8.0" + } + }, "node_modules/@humanwhocodes/config-array": { "version": "0.10.7", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.7.tgz", @@ -373,6 +399,19 @@ "@babel/runtime": "^7.13.10" } }, + "node_modules/@radix-ui/react-arrow": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-arrow/-/react-arrow-1.0.0.tgz", + "integrity": "sha512-1MUuv24HCdepi41+qfv125EwMuxgQ+U+h0A9K3BjCO/J8nVRREKHHpkD9clwfnjEDk9hgGzCnff4aUKCPiRepw==", + "dependencies": { + "@babel/runtime": "^7.13.10", + "@radix-ui/react-primitive": "1.0.0" + }, + "peerDependencies": { + "react": "^16.8 || ^17.0 || ^18.0", + "react-dom": "^16.8 || ^17.0 || ^18.0" + } + }, "node_modules/@radix-ui/react-collection": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/@radix-ui/react-collection/-/react-collection-1.0.0.tgz", @@ -485,6 +524,40 @@ "react-dom": "^16.8 || ^17.0 || ^18.0" } }, + "node_modules/@radix-ui/react-popper": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-popper/-/react-popper-1.0.0.tgz", + "integrity": "sha512-k2dDd+1Wl0XWAMs9ZvAxxYsB9sOsEhrFQV4CINd7IUZf0wfdye4OHen9siwxvZImbzhgVeKTJi68OQmPRvVdMg==", + "dependencies": { + "@babel/runtime": "^7.13.10", + "@floating-ui/react-dom": "0.7.2", + "@radix-ui/react-arrow": "1.0.0", + "@radix-ui/react-compose-refs": "1.0.0", + "@radix-ui/react-context": "1.0.0", + "@radix-ui/react-primitive": "1.0.0", + "@radix-ui/react-use-layout-effect": "1.0.0", + "@radix-ui/react-use-rect": "1.0.0", + "@radix-ui/react-use-size": "1.0.0", + "@radix-ui/rect": "1.0.0" + }, + "peerDependencies": { + "react": "^16.8 || ^17.0 || ^18.0", + "react-dom": "^16.8 || ^17.0 || ^18.0" + } + }, + "node_modules/@radix-ui/react-portal": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.0.0.tgz", + "integrity": "sha512-a8qyFO/Xb99d8wQdu4o7qnigNjTPG123uADNecz0eX4usnQEj7o+cG4ZX4zkqq98NYekT7UoEQIjxBNWIFuqTA==", + "dependencies": { + "@babel/runtime": "^7.13.10", + "@radix-ui/react-primitive": "1.0.0" + }, + "peerDependencies": { + "react": "^16.8 || ^17.0 || ^18.0", + "react-dom": "^16.8 || ^17.0 || ^18.0" + } + }, "node_modules/@radix-ui/react-presence": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/@radix-ui/react-presence/-/react-presence-1.0.0.tgz", @@ -524,6 +597,30 @@ "react": "^16.8 || ^17.0 || ^18.0" } }, + "node_modules/@radix-ui/react-tooltip": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-tooltip/-/react-tooltip-1.0.0.tgz", + "integrity": "sha512-RB06pov+O4Npy10ei1C6fsyB9QoOjz7Ubo8Sl3qdKtLgkL9iI96925DYtH0bxx6MH6YB2FuzLU6B75qn3AQQQw==", + "dependencies": { + "@babel/runtime": "^7.13.10", + "@radix-ui/primitive": "1.0.0", + "@radix-ui/react-compose-refs": "1.0.0", + "@radix-ui/react-context": "1.0.0", + "@radix-ui/react-dismissable-layer": "1.0.0", + "@radix-ui/react-id": "1.0.0", + "@radix-ui/react-popper": "1.0.0", + "@radix-ui/react-portal": "1.0.0", + "@radix-ui/react-presence": "1.0.0", + "@radix-ui/react-primitive": "1.0.0", + "@radix-ui/react-slot": "1.0.0", + "@radix-ui/react-use-controllable-state": "1.0.0", + "@radix-ui/react-visually-hidden": "1.0.0" + }, + "peerDependencies": { + "react": "^16.8 || ^17.0 || ^18.0", + "react-dom": "^16.8 || ^17.0 || ^18.0" + } + }, "node_modules/@radix-ui/react-use-callback-ref": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.0.0.tgz", @@ -581,6 +678,30 @@ "react": "^16.8 || ^17.0 || ^18.0" } }, + "node_modules/@radix-ui/react-use-rect": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-rect/-/react-use-rect-1.0.0.tgz", + "integrity": "sha512-TB7pID8NRMEHxb/qQJpvSt3hQU4sqNPM1VCTjTRjEOa7cEop/QMuq8S6fb/5Tsz64kqSvB9WnwsDHtjnrM9qew==", + "dependencies": { + "@babel/runtime": "^7.13.10", + "@radix-ui/rect": "1.0.0" + }, + "peerDependencies": { + "react": "^16.8 || ^17.0 || ^18.0" + } + }, + "node_modules/@radix-ui/react-use-size": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-size/-/react-use-size-1.0.0.tgz", + "integrity": "sha512-imZ3aYcoYCKhhgNpkNDh/aTiU05qw9hX+HHI1QDBTyIlcFjgeFlKKySNGMwTp7nYFLQg/j0VA2FmCY4WPDDHMg==", + "dependencies": { + "@babel/runtime": "^7.13.10", + "@radix-ui/react-use-layout-effect": "1.0.0" + }, + "peerDependencies": { + "react": "^16.8 || ^17.0 || ^18.0" + } + }, "node_modules/@radix-ui/react-visually-hidden": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/@radix-ui/react-visually-hidden/-/react-visually-hidden-1.0.0.tgz", @@ -594,6 +715,14 @@ "react-dom": "^16.8 || ^17.0 || ^18.0" } }, + "node_modules/@radix-ui/rect": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@radix-ui/rect/-/rect-1.0.0.tgz", + "integrity": "sha512-d0O68AYy/9oeEy1DdC07bz1/ZXX+DqCskRd3i4JzLSTXwefzaepQrKjXC7aNM8lTHjFLDO0pDgaEiQ7jEk+HVg==", + "dependencies": { + "@babel/runtime": "^7.13.10" + } + }, "node_modules/@rushstack/eslint-patch": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.1.4.tgz", @@ -1302,11 +1431,6 @@ "node": ">=6.0.0" } }, - "node_modules/dom-align": { - "version": "1.12.3", - "resolved": "https://registry.npmjs.org/dom-align/-/dom-align-1.12.3.tgz", - "integrity": "sha512-Gj9hZN3a07cbR6zviMUBOMPdWxYhbMI+x+WS0NAIu2zFZmbK8ys9R79g+iG9qLnlCwpFoaB+fKy8Pdv470GsPA==" - }, "node_modules/emoji-regex": { "version": "9.2.2", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", @@ -3275,83 +3399,6 @@ "rc": "cli.js" } }, - "node_modules/rc-align": { - "version": "4.0.12", - "resolved": "https://registry.npmjs.org/rc-align/-/rc-align-4.0.12.tgz", - "integrity": "sha512-3DuwSJp8iC/dgHzwreOQl52soj40LchlfUHtgACOUtwGuoFIOVh6n/sCpfqCU8kO5+iz6qR0YKvjgB8iPdE3aQ==", - "dependencies": { - "@babel/runtime": "^7.10.1", - "classnames": "2.x", - "dom-align": "^1.7.0", - "lodash": "^4.17.21", - "rc-util": "^5.3.0", - "resize-observer-polyfill": "^1.5.1" - }, - "peerDependencies": { - "react": ">=16.9.0", - "react-dom": ">=16.9.0" - } - }, - "node_modules/rc-motion": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/rc-motion/-/rc-motion-2.6.2.tgz", - "integrity": "sha512-4w1FaX3dtV749P8GwfS4fYnFG4Rb9pxvCYPc/b2fw1cmlHJWNNgOFIz7ysiD+eOrzJSvnLJWlNQQncpNMXwwpg==", - "dependencies": { - "@babel/runtime": "^7.11.1", - "classnames": "^2.2.1", - "rc-util": "^5.21.0" - }, - "peerDependencies": { - "react": ">=16.9.0", - "react-dom": ">=16.9.0" - } - }, - "node_modules/rc-tooltip": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/rc-tooltip/-/rc-tooltip-5.1.0.tgz", - "integrity": "sha512-pFqD1JZwNIpbdcefB7k5xREoHAWM/k3yQwYF0iminbmDXERgq4rvBfUwIvlCqqZSM7HDr9hYeYr6ZsVNaKtvCQ==", - "dependencies": { - "@babel/runtime": "^7.11.2", - "rc-trigger": "^5.0.0" - }, - "peerDependencies": { - "react": ">=16.9.0", - "react-dom": ">=16.9.0" - } - }, - "node_modules/rc-trigger": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/rc-trigger/-/rc-trigger-5.3.1.tgz", - "integrity": "sha512-5gaFbDkYSefZ14j2AdzucXzlWgU2ri5uEjkHvsf1ynRhdJbKxNOnw4PBZ9+FVULNGFiDzzlVF8RJnR9P/xrnKQ==", - "dependencies": { - "@babel/runtime": "^7.18.3", - "classnames": "^2.2.6", - "rc-align": "^4.0.0", - "rc-motion": "^2.0.0", - "rc-util": "^5.19.2" - }, - "engines": { - "node": ">=8.x" - }, - "peerDependencies": { - "react": ">=16.9.0", - "react-dom": ">=16.9.0" - } - }, - "node_modules/rc-util": { - "version": "5.24.2", - "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.24.2.tgz", - "integrity": "sha512-MWd0ZEV7xSwN4HM9jz9BwpnMzwCPjYJ7K90lePsrdgAkrmm8U7b4BOTIsv/84BQsaF7N3ejNkcrZ3AfEwc9HXA==", - "dependencies": { - "@babel/runtime": "^7.18.3", - "react-is": "^16.12.0", - "shallowequal": "^1.1.0" - }, - "peerDependencies": { - "react": ">=16.9.0", - "react-dom": ">=16.9.0" - } - }, "node_modules/rc/node_modules/strip-json-comments": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", @@ -3394,7 +3441,8 @@ "node_modules/react-is": { "version": "16.13.1", "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", - "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", + "dev": true }, "node_modules/react-universal-interface": { "version": "0.6.2", @@ -3635,11 +3683,6 @@ "node": ">=6.9" } }, - "node_modules/shallowequal": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz", - "integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==" - }, "node_modules/sharp": { "version": "0.31.0", "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.31.0.tgz", @@ -4196,6 +4239,19 @@ "resolved": "http://storage.mds.yandex.net/get-npm/69187/url-join-1.1.0.tgz", "integrity": "sha1-dBxsL0WWxIMNZxhGCSDQySIC3Hg=" }, + "node_modules/use-isomorphic-layout-effect": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.2.tgz", + "integrity": "sha512-49L8yCO3iGT/ZF9QttjwLF/ZD9Iwto5LnH5LmEdk/6cFmXddqi2ulF0edxTwjj+7mqvpVVGQWvbXZdn32wRSHA==", + "peerDependencies": { + "react": "^16.8.0 || ^17.0.0 || ^18.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, "node_modules/use-media": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/use-media/-/use-media-1.4.0.tgz", @@ -4325,6 +4381,28 @@ "strip-json-comments": "^3.1.1" } }, + "@floating-ui/core": { + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-0.7.3.tgz", + "integrity": "sha512-buc8BXHmG9l82+OQXOFU3Kr2XQx9ys01U/Q9HMIrZ300iLc8HLMgh7dcCqgYzAzf4BkoQvDcXf5Y+CuEZ5JBYg==" + }, + "@floating-ui/dom": { + "version": "0.5.4", + "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-0.5.4.tgz", + "integrity": "sha512-419BMceRLq0RrmTSDxn8hf9R3VCJv2K9PUfugh5JyEFmdjzDo+e8U5EdR8nzKq8Yj1htzLm3b6eQEEam3/rrtg==", + "requires": { + "@floating-ui/core": "^0.7.3" + } + }, + "@floating-ui/react-dom": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-0.7.2.tgz", + "integrity": "sha512-1T0sJcpHgX/u4I1OzIEhlcrvkUN8ln39nz7fMoE/2HDHrPiMFoOGR7++GYyfUmIQHkkrTinaeQsO3XWubjSvGg==", + "requires": { + "@floating-ui/dom": "^0.5.3", + "use-isomorphic-layout-effect": "^1.1.1" + } + }, "@humanwhocodes/config-array": { "version": "0.10.7", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.7.tgz", @@ -4474,6 +4552,15 @@ "@babel/runtime": "^7.13.10" } }, + "@radix-ui/react-arrow": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-arrow/-/react-arrow-1.0.0.tgz", + "integrity": "sha512-1MUuv24HCdepi41+qfv125EwMuxgQ+U+h0A9K3BjCO/J8nVRREKHHpkD9clwfnjEDk9hgGzCnff4aUKCPiRepw==", + "requires": { + "@babel/runtime": "^7.13.10", + "@radix-ui/react-primitive": "1.0.0" + } + }, "@radix-ui/react-collection": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/@radix-ui/react-collection/-/react-collection-1.0.0.tgz", @@ -4560,6 +4647,32 @@ "@radix-ui/react-visually-hidden": "1.0.0" } }, + "@radix-ui/react-popper": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-popper/-/react-popper-1.0.0.tgz", + "integrity": "sha512-k2dDd+1Wl0XWAMs9ZvAxxYsB9sOsEhrFQV4CINd7IUZf0wfdye4OHen9siwxvZImbzhgVeKTJi68OQmPRvVdMg==", + "requires": { + "@babel/runtime": "^7.13.10", + "@floating-ui/react-dom": "0.7.2", + "@radix-ui/react-arrow": "1.0.0", + "@radix-ui/react-compose-refs": "1.0.0", + "@radix-ui/react-context": "1.0.0", + "@radix-ui/react-primitive": "1.0.0", + "@radix-ui/react-use-layout-effect": "1.0.0", + "@radix-ui/react-use-rect": "1.0.0", + "@radix-ui/react-use-size": "1.0.0", + "@radix-ui/rect": "1.0.0" + } + }, + "@radix-ui/react-portal": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.0.0.tgz", + "integrity": "sha512-a8qyFO/Xb99d8wQdu4o7qnigNjTPG123uADNecz0eX4usnQEj7o+cG4ZX4zkqq98NYekT7UoEQIjxBNWIFuqTA==", + "requires": { + "@babel/runtime": "^7.13.10", + "@radix-ui/react-primitive": "1.0.0" + } + }, "@radix-ui/react-presence": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/@radix-ui/react-presence/-/react-presence-1.0.0.tgz", @@ -4588,6 +4701,26 @@ "@radix-ui/react-compose-refs": "1.0.0" } }, + "@radix-ui/react-tooltip": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-tooltip/-/react-tooltip-1.0.0.tgz", + "integrity": "sha512-RB06pov+O4Npy10ei1C6fsyB9QoOjz7Ubo8Sl3qdKtLgkL9iI96925DYtH0bxx6MH6YB2FuzLU6B75qn3AQQQw==", + "requires": { + "@babel/runtime": "^7.13.10", + "@radix-ui/primitive": "1.0.0", + "@radix-ui/react-compose-refs": "1.0.0", + "@radix-ui/react-context": "1.0.0", + "@radix-ui/react-dismissable-layer": "1.0.0", + "@radix-ui/react-id": "1.0.0", + "@radix-ui/react-popper": "1.0.0", + "@radix-ui/react-portal": "1.0.0", + "@radix-ui/react-presence": "1.0.0", + "@radix-ui/react-primitive": "1.0.0", + "@radix-ui/react-slot": "1.0.0", + "@radix-ui/react-use-controllable-state": "1.0.0", + "@radix-ui/react-visually-hidden": "1.0.0" + } + }, "@radix-ui/react-use-callback-ref": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.0.0.tgz", @@ -4630,6 +4763,24 @@ "@babel/runtime": "^7.13.10" } }, + "@radix-ui/react-use-rect": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-rect/-/react-use-rect-1.0.0.tgz", + "integrity": "sha512-TB7pID8NRMEHxb/qQJpvSt3hQU4sqNPM1VCTjTRjEOa7cEop/QMuq8S6fb/5Tsz64kqSvB9WnwsDHtjnrM9qew==", + "requires": { + "@babel/runtime": "^7.13.10", + "@radix-ui/rect": "1.0.0" + } + }, + "@radix-ui/react-use-size": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-size/-/react-use-size-1.0.0.tgz", + "integrity": "sha512-imZ3aYcoYCKhhgNpkNDh/aTiU05qw9hX+HHI1QDBTyIlcFjgeFlKKySNGMwTp7nYFLQg/j0VA2FmCY4WPDDHMg==", + "requires": { + "@babel/runtime": "^7.13.10", + "@radix-ui/react-use-layout-effect": "1.0.0" + } + }, "@radix-ui/react-visually-hidden": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/@radix-ui/react-visually-hidden/-/react-visually-hidden-1.0.0.tgz", @@ -4639,6 +4790,14 @@ "@radix-ui/react-primitive": "1.0.0" } }, + "@radix-ui/rect": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@radix-ui/rect/-/rect-1.0.0.tgz", + "integrity": "sha512-d0O68AYy/9oeEy1DdC07bz1/ZXX+DqCskRd3i4JzLSTXwefzaepQrKjXC7aNM8lTHjFLDO0pDgaEiQ7jEk+HVg==", + "requires": { + "@babel/runtime": "^7.13.10" + } + }, "@rushstack/eslint-patch": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.1.4.tgz", @@ -5158,11 +5317,6 @@ "esutils": "^2.0.2" } }, - "dom-align": { - "version": "1.12.3", - "resolved": "https://registry.npmjs.org/dom-align/-/dom-align-1.12.3.tgz", - "integrity": "sha512-Gj9hZN3a07cbR6zviMUBOMPdWxYhbMI+x+WS0NAIu2zFZmbK8ys9R79g+iG9qLnlCwpFoaB+fKy8Pdv470GsPA==" - }, "emoji-regex": { "version": "9.2.2", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", @@ -6621,60 +6775,6 @@ } } }, - "rc-align": { - "version": "4.0.12", - "resolved": "https://registry.npmjs.org/rc-align/-/rc-align-4.0.12.tgz", - "integrity": "sha512-3DuwSJp8iC/dgHzwreOQl52soj40LchlfUHtgACOUtwGuoFIOVh6n/sCpfqCU8kO5+iz6qR0YKvjgB8iPdE3aQ==", - "requires": { - "@babel/runtime": "^7.10.1", - "classnames": "2.x", - "dom-align": "^1.7.0", - "lodash": "^4.17.21", - "rc-util": "^5.3.0", - "resize-observer-polyfill": "^1.5.1" - } - }, - "rc-motion": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/rc-motion/-/rc-motion-2.6.2.tgz", - "integrity": "sha512-4w1FaX3dtV749P8GwfS4fYnFG4Rb9pxvCYPc/b2fw1cmlHJWNNgOFIz7ysiD+eOrzJSvnLJWlNQQncpNMXwwpg==", - "requires": { - "@babel/runtime": "^7.11.1", - "classnames": "^2.2.1", - "rc-util": "^5.21.0" - } - }, - "rc-tooltip": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/rc-tooltip/-/rc-tooltip-5.1.0.tgz", - "integrity": "sha512-pFqD1JZwNIpbdcefB7k5xREoHAWM/k3yQwYF0iminbmDXERgq4rvBfUwIvlCqqZSM7HDr9hYeYr6ZsVNaKtvCQ==", - "requires": { - "@babel/runtime": "^7.11.2", - "rc-trigger": "^5.0.0" - } - }, - "rc-trigger": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/rc-trigger/-/rc-trigger-5.3.1.tgz", - "integrity": "sha512-5gaFbDkYSefZ14j2AdzucXzlWgU2ri5uEjkHvsf1ynRhdJbKxNOnw4PBZ9+FVULNGFiDzzlVF8RJnR9P/xrnKQ==", - "requires": { - "@babel/runtime": "^7.18.3", - "classnames": "^2.2.6", - "rc-align": "^4.0.0", - "rc-motion": "^2.0.0", - "rc-util": "^5.19.2" - } - }, - "rc-util": { - "version": "5.24.2", - "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.24.2.tgz", - "integrity": "sha512-MWd0ZEV7xSwN4HM9jz9BwpnMzwCPjYJ7K90lePsrdgAkrmm8U7b4BOTIsv/84BQsaF7N3ejNkcrZ3AfEwc9HXA==", - "requires": { - "@babel/runtime": "^7.18.3", - "react-is": "^16.12.0", - "shallowequal": "^1.1.0" - } - }, "react": { "version": "18.2.0", "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz", @@ -6701,7 +6801,8 @@ "react-is": { "version": "16.13.1", "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", - "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", + "dev": true }, "react-universal-interface": { "version": "0.6.2", @@ -6860,11 +6961,6 @@ "resolved": "https://registry.npmjs.org/set-harmonic-interval/-/set-harmonic-interval-1.0.1.tgz", "integrity": "sha512-AhICkFV84tBP1aWqPwLZqFvAwqEoVA9kxNMniGEUvzOlm4vLmOFLiTT3UZ6bziJTy4bOVpzWGTfSCbmaayGx8g==" }, - "shallowequal": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz", - "integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==" - }, "sharp": { "version": "0.31.0", "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.31.0.tgz", @@ -7283,6 +7379,12 @@ "resolved": "http://storage.mds.yandex.net/get-npm/69187/url-join-1.1.0.tgz", "integrity": "sha1-dBxsL0WWxIMNZxhGCSDQySIC3Hg=" }, + "use-isomorphic-layout-effect": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.2.tgz", + "integrity": "sha512-49L8yCO3iGT/ZF9QttjwLF/ZD9Iwto5LnH5LmEdk/6cFmXddqi2ulF0edxTwjj+7mqvpVVGQWvbXZdn32wRSHA==", + "requires": {} + }, "use-media": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/use-media/-/use-media-1.4.0.tgz", diff --git a/package.json b/package.json index 0e0efaab..080e8772 100644 --- a/package.json +++ b/package.json @@ -20,13 +20,13 @@ "dependencies": { "@radix-ui/react-icons": "^1.1.1", "@radix-ui/react-navigation-menu": "^1.0.0", + "@radix-ui/react-tooltip": "^1.0.0", "classnames": "^2.2.6", "date-fns": "^2.29.0", "lodash": "^4.17.21", "markdown-it": "^13.0.1", "next": "^12.3.0", "next-seo": "^5.5.0", - "rc-tooltip": "^5.1.0", "react": "^18.2.0", "react-dom": "^18.2.0", "react-icons": "^4.2.0", diff --git a/src/components/FIleCard/Signature.tsx b/src/components/FIleCard/Signature.tsx index f51dac49..25add110 100644 --- a/src/components/FIleCard/Signature.tsx +++ b/src/components/FIleCard/Signature.tsx @@ -1,9 +1,9 @@ -import "rc-tooltip/assets/bootstrap_white.css" import s from "./signature.module.css" import { Sign } from "@/types" import { FiShield } from "react-icons/fi" -import Tooltip from "rc-tooltip" + +import * as Tooltip from "@radix-ui/react-tooltip" export type SignatureProps = Sign export const Signature: React.FC = props => { @@ -17,8 +17,19 @@ export const Signature: React.FC = props => { ) return ( - - - + + + + + + + + + {content} + + + + + ) } diff --git a/src/components/FIleCard/index.tsx b/src/components/FIleCard/index.tsx index 331dff57..892469c9 100644 --- a/src/components/FIleCard/index.tsx +++ b/src/components/FIleCard/index.tsx @@ -6,6 +6,7 @@ import { size, ext } from "@/lib/file" import { getResizedUrl } from "@/lib/image" import { Signature } from "./Signature" import Link from "next/link" +import { Box } from "@/ui/Box" export type FileCardProps = FileTokenData & { sign?: Sign @@ -38,12 +39,16 @@ export const FileCard: React.FC = props => {
- {!props.sign ? null : ( - - )} - {props.title} + + {!props.sign ? null : ( + + )} + + {props.title} + +
diff --git a/src/components/FIleCard/signature.module.css b/src/components/FIleCard/signature.module.css index 452b1f4b..5a2d738b 100644 --- a/src/components/FIleCard/signature.module.css +++ b/src/components/FIleCard/signature.module.css @@ -1,9 +1,27 @@ -.secure { - padding-right: var(--size-xs); - position: relative; - top: 2px; -} - .signature{ list-style: none; } + +.tooltipTrigger { + background-color: rgba(0, 0, 0, 0); + border: none; +} + +.tooltip { + padding: var(--size-m); + color: var(--color-text-opposite); + text-align: left; + text-decoration: none; + background-color: var(--color-back-opposite); + border-radius: var(--radius); + min-height: 34px; + border: none; + box-shadow: var(--shadow); +} + +.tooltipArrow { + width: var(--size-m); + height: var(--size-s); + + fill: var(--color-back-opposite); +} diff --git a/src/style/style.css b/src/style/style.css index 7111ce02..cb2088b9 100644 --- a/src/style/style.css +++ b/src/style/style.css @@ -126,38 +126,6 @@ h3 { border-bottom-color: var(--color-text-opposite); } - -/* RC TOOLTIP OVERRIDE */ -.hudozka.rc-tooltip { - position: absolute; - background-color: initial; - padding: 0; - opacity: 1; -} -.hudozka.rc-tooltip-placement-left .rc-tooltip-arrow { - border-left-color: var(--color-back-opposite); -} -.hudozka.rc-tooltip-placement-right .rc-tooltip-arrow { - border-right-color: var(--color-back-opposite); -} -.hudozka.rc-tooltip-placement-top .rc-tooltip-arrow { - border-top-color: var(--color-back-opposite); -} -.hudozka.rc-tooltip-placement-bottom .rc-tooltip-arrow { - border-bottom-color: var(--color-back-opposite); -} -.hudozka .rc-tooltip-inner { - padding: var(--size-m); - color: var(--color-text-opposite); - text-align: left; - text-decoration: none; - background-color: var(--color-back-opposite); - border-radius: var(--radius); - min-height: 34px; - border: none; - box-shadow: var(--shadow); -} - /* MOBILE */ @media (max-width: 31.25em) { :root, .theme-contrast { diff --git a/src/ui/Box/box.module.css b/src/ui/Box/box.module.css index 3eb304c2..6bb4c0aa 100644 --- a/src/ui/Box/box.module.css +++ b/src/ui/Box/box.module.css @@ -1,7 +1,5 @@ .box { display: flex; - align-items: baseline; - justify-content: flex-start; flex-wrap: nowrap; flex-direction: row; From d66cefa75dc688285d390960a5244f41de36fc2b Mon Sep 17 00:00:00 2001 From: Roman Timashev Date: Thu, 13 Oct 2022 14:53:49 +0600 Subject: [PATCH 09/13] import Signature dynamic --- src/components/FIleCard/index.tsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/components/FIleCard/index.tsx b/src/components/FIleCard/index.tsx index 892469c9..97b2ea63 100644 --- a/src/components/FIleCard/index.tsx +++ b/src/components/FIleCard/index.tsx @@ -1,13 +1,17 @@ import s from "./filecard.module.css" import Image from "next/image" +import dynamic from "next/dynamic" import { FileTokenData, Sign } from "@/types" import { size, ext } from "@/lib/file" import { getResizedUrl } from "@/lib/image" -import { Signature } from "./Signature" import Link from "next/link" import { Box } from "@/ui/Box" +const Signature = dynamic(import("./Signature").then(m => m.Signature), { + ssr: false, +}) + export type FileCardProps = FileTokenData & { sign?: Sign } From 671bc9456238b16d3f4ce91b02b3ea417695555f Mon Sep 17 00:00:00 2001 From: Roman Timashev Date: Thu, 13 Oct 2022 14:55:31 +0600 Subject: [PATCH 10/13] fix eye button --- src/components/App/index.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/App/index.tsx b/src/components/App/index.tsx index fbcd1a23..f311313a 100644 --- a/src/components/App/index.tsx +++ b/src/components/App/index.tsx @@ -72,7 +72,9 @@ export const App: React.FC = ({ showAuthor = false, menu, ...props }) - + Версия для слабовидящих From fdf6ee302f6efc77c1eed89926d12439188d495d Mon Sep 17 00:00:00 2001 From: Roman Timashev Date: Thu, 13 Oct 2022 15:08:58 +0600 Subject: [PATCH 11/13] change icon set --- package-lock.json | 15 --------------- package.json | 1 - src/components/App/index.tsx | 6 +++--- src/components/FIleCard/Signature.tsx | 4 ++-- src/components/MenuToggle/index.tsx | 6 +++--- src/components/Navigation/index.tsx | 2 -- 6 files changed, 8 insertions(+), 26 deletions(-) diff --git a/package-lock.json b/package-lock.json index a7d7eb3a..0f8b611d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,6 @@ "version": "7.0.0", "license": "ISC", "dependencies": { - "@radix-ui/react-icons": "^1.1.1", "@radix-ui/react-navigation-menu": "^1.0.0", "@radix-ui/react-tooltip": "^1.0.0", "classnames": "^2.2.6", @@ -478,14 +477,6 @@ "react-dom": "^16.8 || ^17.0 || ^18.0" } }, - "node_modules/@radix-ui/react-icons": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@radix-ui/react-icons/-/react-icons-1.1.1.tgz", - "integrity": "sha512-xc3wQC59rsFylVbSusQCrrM+6695ppF730Q6yqzhRdqDcRNWIm2R6ngpzBoSOQMcwnq4p805F+Gr7xo4fmtN1A==", - "peerDependencies": { - "react": "^16.x || ^17.x || ^18.x" - } - }, "node_modules/@radix-ui/react-id": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/@radix-ui/react-id/-/react-id-1.0.0.tgz", @@ -4610,12 +4601,6 @@ "@radix-ui/react-use-escape-keydown": "1.0.0" } }, - "@radix-ui/react-icons": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@radix-ui/react-icons/-/react-icons-1.1.1.tgz", - "integrity": "sha512-xc3wQC59rsFylVbSusQCrrM+6695ppF730Q6yqzhRdqDcRNWIm2R6ngpzBoSOQMcwnq4p805F+Gr7xo4fmtN1A==", - "requires": {} - }, "@radix-ui/react-id": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/@radix-ui/react-id/-/react-id-1.0.0.tgz", diff --git a/package.json b/package.json index 080e8772..e0882299 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,6 @@ "author": "Roman Timashev", "license": "ISC", "dependencies": { - "@radix-ui/react-icons": "^1.1.1", "@radix-ui/react-navigation-menu": "^1.0.0", "@radix-ui/react-tooltip": "^1.0.0", "classnames": "^2.2.6", diff --git a/src/components/App/index.tsx b/src/components/App/index.tsx index f311313a..f09c0c25 100644 --- a/src/components/App/index.tsx +++ b/src/components/App/index.tsx @@ -10,7 +10,7 @@ import { useMobile } from "src/hooks/useMobile" import { Navigation } from "@/components/Navigation" import { Box } from "@/ui/Box" import { Button } from "@/ui/Button" -import { EyeClosedIcon, EyeOpenIcon } from "@radix-ui/react-icons" +import { HiOutlineEye, HiOutlineEyeOff } from "react-icons/hi" import { useTheme } from "@/ui/theme/useTheme" import { Copyright } from "../Copyright" import { Spacer } from "../Spacer" @@ -82,9 +82,9 @@ export const App: React.FC = ({ showAuthor = false, menu, ...props }) setTheme(theme === "default" ? "contrast" : "default") }}> {theme === "default" ? ( - + ) : ( - + )} diff --git a/src/components/FIleCard/Signature.tsx b/src/components/FIleCard/Signature.tsx index 25add110..4d6a5096 100644 --- a/src/components/FIleCard/Signature.tsx +++ b/src/components/FIleCard/Signature.tsx @@ -1,7 +1,7 @@ import s from "./signature.module.css" import { Sign } from "@/types" -import { FiShield } from "react-icons/fi" +import { HiOutlineShieldCheck } from "react-icons/hi" import * as Tooltip from "@radix-ui/react-tooltip" @@ -20,7 +20,7 @@ export const Signature: React.FC = props => { - + diff --git a/src/components/MenuToggle/index.tsx b/src/components/MenuToggle/index.tsx index 84868393..a05725ba 100644 --- a/src/components/MenuToggle/index.tsx +++ b/src/components/MenuToggle/index.tsx @@ -1,5 +1,5 @@ import { Button, ButtonProps } from "@/ui/Button" -import { HamburgerMenuIcon, Cross1Icon } from "@radix-ui/react-icons" +import { HiOutlineMenuAlt4, HiOutlineX } from "react-icons/hi" export type MenuToggleProps = Omit & { open: boolean @@ -7,9 +7,9 @@ export type MenuToggleProps = Omit & { export const MenuToggle: React.FC = ({ open, ...props }) => { const icon = open ? ( - + ) : ( - + ) return (