From 87bbaa7f1dd9828c90b7864f8e411d15870837e5 Mon Sep 17 00:00:00 2001 From: Mike Cao Date: Tue, 7 Feb 2023 22:17:55 -0800 Subject: [PATCH] Fixed tooltips. --- components/input/LanguageButton.js | 5 +-- components/input/LogoutButton.js | 7 ++-- components/layout/NavBar.module.css | 9 ++++- components/pages/websites/WebsiteMenuView.js | 2 +- package.json | 3 +- yarn.lock | 41 +++----------------- 6 files changed, 19 insertions(+), 48 deletions(-) diff --git a/components/input/LanguageButton.js b/components/input/LanguageButton.js index 687f639f..f01b4716 100644 --- a/components/input/LanguageButton.js +++ b/components/input/LanguageButton.js @@ -18,14 +18,13 @@ export default function LanguageButton({ tooltipPosition = 'top' }) { return ( - + - {formatMessage(labels.language)} - +
{items.map(({ value, label }) => { diff --git a/components/input/LogoutButton.js b/components/input/LogoutButton.js index f6f2450e..31b4317d 100644 --- a/components/input/LogoutButton.js +++ b/components/input/LogoutButton.js @@ -1,4 +1,4 @@ -import { Button, Icon, Icons, PopupTrigger, Tooltip } from 'react-basics'; +import { Button, Icon, Icons, Tooltip } from 'react-basics'; import Link from 'next/link'; import { labels } from 'components/messages'; import { useIntl } from 'react-intl'; @@ -8,14 +8,13 @@ export default function LogoutButton({ tooltipPosition = 'top' }) { return ( - + - {formatMessage(labels.logout)} - + ); diff --git a/components/layout/NavBar.module.css b/components/layout/NavBar.module.css index 6610e602..1d387643 100644 --- a/components/layout/NavBar.module.css +++ b/components/layout/NavBar.module.css @@ -25,9 +25,14 @@ } .icon { - position: absolute; - right: 0; visibility: hidden; + position: absolute; + right: -10px; + border-radius: 100%; + color: var(--base50); + background: var(--base800); + height: 20px; + width: 20px; } .minimized.navbar { diff --git a/components/pages/websites/WebsiteMenuView.js b/components/pages/websites/WebsiteMenuView.js index 6b1f6627..f9717688 100644 --- a/components/pages/websites/WebsiteMenuView.js +++ b/components/pages/websites/WebsiteMenuView.js @@ -12,7 +12,7 @@ import ScreenTable from 'components/metrics/ScreenTable'; import EventsTable from 'components/metrics/EventsTable'; import usePageQuery from 'hooks/usePageQuery'; import Icons from 'components/icons'; -import { labels } from '../../messages'; +import { labels } from 'components/messages'; import { useIntl } from 'react-intl'; const views = { diff --git a/package.json b/package.json index f9543a67..384eacdf 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "@prisma/client": "4.9.0", "@tanstack/react-query": "^4.16.1", "@umami/prisma-client": "^0.2.0", - "@umami/redis-client": "^0.1.0", + "@umami/redis-client": "^0.2.0", "chalk": "^4.1.1", "chart.js": "^2.9.4", "classnames": "^2.3.1", @@ -103,7 +103,6 @@ "react-tooltip": "^4.2.21", "react-use-measure": "^2.0.4", "react-window": "^1.8.6", - "redis": "^4.6.2", "request-ip": "^3.3.0", "semver": "^7.3.6", "thenby": "^1.3.4", diff --git a/yarn.lock b/yarn.lock index c4a2b397..96e53d7f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1930,11 +1930,6 @@ resolved "https://registry.yarnpkg.com/@redis/bloom/-/bloom-1.1.0.tgz#64e310ddee72010676e14296076329e594a1f6c7" integrity sha512-9QovlxmpRtvxVbN0UBcv8WfdSMudNZZTFqCsnBszcQXqaZb/TVe30ScgGEO7u1EAIacTPAo7/oCYjYAxiHLanQ== -"@redis/bloom@1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@redis/bloom/-/bloom-1.2.0.tgz#d3fd6d3c0af3ef92f26767b56414a370c7b63b71" - integrity sha512-HG2DFjYKbpNmVXsa0keLHp/3leGJz1mjh09f2RLGGLQZzSHpkmZWuwJbAvo3QcRY8p80m5+ZdXZdYOSBLlp7Cg== - "@redis/client@1.4.2": version "1.4.2" resolved "https://registry.yarnpkg.com/@redis/client/-/client-1.4.2.tgz#2a3f5e98bc33b7b979390442e6e08f96e57fabdd" @@ -1944,15 +1939,6 @@ generic-pool "3.9.0" yallist "4.0.0" -"@redis/client@1.5.3": - version "1.5.3" - resolved "https://registry.yarnpkg.com/@redis/client/-/client-1.5.3.tgz#2295ca770c9c40dcc59a96da9d05f4403c32e847" - integrity sha512-kPad3QmWyRcmFj1gnb+SkzjXBV7oPpyTJmasVA+ocgNClxqZaTJjLFReqxm9cZQiCtqZK9vrcTISNrgzQXFpLg== - dependencies: - cluster-key-slot "1.1.2" - generic-pool "3.9.0" - yallist "4.0.0" - "@redis/graph@1.1.0": version "1.1.0" resolved "https://registry.yarnpkg.com/@redis/graph/-/graph-1.1.0.tgz#cc2b82e5141a29ada2cce7d267a6b74baa6dd519" @@ -1968,11 +1954,6 @@ resolved "https://registry.yarnpkg.com/@redis/search/-/search-1.1.0.tgz#7abb18d431f27ceafe6bcb4dd83a3fa67e9ab4df" integrity sha512-NyFZEVnxIJEybpy+YskjgOJRNsfTYqaPbK/Buv6W2kmFNaRk85JiqjJZA5QkRmWvGbyQYwoO5QfDi2wHskKrQQ== -"@redis/search@1.1.1": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@redis/search/-/search-1.1.1.tgz#f547b76b74f267831d3b368e3d7bba3a6a9e32bd" - integrity sha512-pqCXTc5e7wJJgUuJiC3hBgfoFRoPxYzwn0BEfKgejTM7M/9zP3IpUcqcjgfp8hF+LoV8rHZzcNTz7V+pEIY7LQ== - "@redis/time-series@1.0.4": version "1.0.4" resolved "https://registry.yarnpkg.com/@redis/time-series/-/time-series-1.0.4.tgz#af85eb080f6934580e4d3b58046026b6c2b18717" @@ -2435,10 +2416,10 @@ dependencies: debug "^4.3.4" -"@umami/redis-client@^0.1.0": - version "0.1.0" - resolved "https://registry.yarnpkg.com/@umami/redis-client/-/redis-client-0.1.0.tgz#69599b1243406a3aef83927bb8655a3ef4c0c031" - integrity sha512-XCqCdc3xA5KDOorIUvOVlz+/F/SEyL9cKWfCCGYYZix1b9yFo+5BzM0C0q7Yu/qV+1jYd+viNsBQQSM6a8sfjg== +"@umami/redis-client@^0.2.0": + version "0.2.0" + resolved "https://registry.yarnpkg.com/@umami/redis-client/-/redis-client-0.2.0.tgz#bdb1cd8b5c99afc5230621f19296c6d3559d68af" + integrity sha512-TONWhkuC//K2hRo3Psk7FHsuvu3XkQIYMY62/CERPtlIJz4Ac7DqsmYw4jO9/RkljA9XLl/5u+OggD4ARhMV8A== dependencies: debug "^4.3.4" redis "^4.5.1" @@ -3147,7 +3128,7 @@ cluster-key-slot@1.1.1: resolved "https://registry.yarnpkg.com/cluster-key-slot/-/cluster-key-slot-1.1.1.tgz#10ccb9ded0729464b6d2e7d714b100a2d1259d43" integrity sha512-rwHwUfXL40Chm1r08yrhU3qpUvdVlgkKNeyeGPOxnW8/SyVDvgRaed/Uz54AqWNaTCAThlj6QAs3TZcKI0xDEw== -cluster-key-slot@1.1.2, cluster-key-slot@^1.1.0: +cluster-key-slot@^1.1.0: version "1.1.2" resolved "https://registry.yarnpkg.com/cluster-key-slot/-/cluster-key-slot-1.1.2.tgz#88ddaa46906e303b5de30d3153b7d9fe0a0c19ac" integrity sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA== @@ -6932,18 +6913,6 @@ redis@^4.5.1: "@redis/search" "1.1.0" "@redis/time-series" "1.0.4" -redis@^4.6.2: - version "4.6.2" - resolved "https://registry.yarnpkg.com/redis/-/redis-4.6.2.tgz#5592db7b95c1b6652cde463e58a8029a1f7890bb" - integrity sha512-Xoh7UyU6YnT458xA8svaZAJu6ZunKeW7Z/7GXrLWGGwhVLTsDX6pr3u7ENAoV+DHBPO+9LwIu45ClwUwpIjAxw== - dependencies: - "@redis/bloom" "1.2.0" - "@redis/client" "1.5.3" - "@redis/graph" "1.1.0" - "@redis/json" "1.0.4" - "@redis/search" "1.1.1" - "@redis/time-series" "1.0.4" - redux@^4.0.0, redux@^4.0.4: version "4.2.0" resolved "https://registry.yarnpkg.com/redux/-/redux-4.2.0.tgz#46f10d6e29b6666df758780437651eeb2b969f13"