From 91ee98229bffb8596ee20af4218fe04a9757c872 Mon Sep 17 00:00:00 2001 From: Melnyk Mykhailo Date: Wed, 24 Jan 2024 17:25:34 +0200 Subject: [PATCH 01/10] move use-toast hook to hooks folder --- src/utils/api/{ => hooks}/hooks.ts | 2 +- src/{components/ui => utils/api/hooks}/use-toast.ts | 0 src/utils/api/index.ts | 2 +- src/utils/api/metacom.ts | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename src/utils/api/{ => hooks}/hooks.ts (96%) rename src/{components/ui => utils/api/hooks}/use-toast.ts (100%) diff --git a/src/utils/api/hooks.ts b/src/utils/api/hooks/hooks.ts similarity index 96% rename from src/utils/api/hooks.ts rename to src/utils/api/hooks/hooks.ts index 7b3a531..e8b0576 100644 --- a/src/utils/api/hooks.ts +++ b/src/utils/api/hooks/hooks.ts @@ -1,6 +1,6 @@ 'use client' -import { useToast } from '@/components/ui/use-toast' +import { useToast } from '@/utils/api/hooks/use-toast' import { useCallback, useEffect, useRef, useState } from 'react' export const useApi = >( diff --git a/src/components/ui/use-toast.ts b/src/utils/api/hooks/use-toast.ts similarity index 100% rename from src/components/ui/use-toast.ts rename to src/utils/api/hooks/use-toast.ts diff --git a/src/utils/api/index.ts b/src/utils/api/index.ts index 41e7a5f..c772298 100644 --- a/src/utils/api/index.ts +++ b/src/utils/api/index.ts @@ -1,2 +1,2 @@ -export * from './hooks' +export * from './hooks/hooks' export * from './metacom' diff --git a/src/utils/api/metacom.ts b/src/utils/api/metacom.ts index 29e66d4..601d595 100644 --- a/src/utils/api/metacom.ts +++ b/src/utils/api/metacom.ts @@ -1,7 +1,7 @@ 'use client' -import { useToast } from '@/components/ui/use-toast' import { URL_PRODUCT_API } from '@/constants' +import { useToast } from '@/utils/api/hooks/use-toast' import { Metacom } from 'metacom' import { createContext, From 13aa8dab6869040f55a7229d00c699191841260d Mon Sep 17 00:00:00 2001 From: Melnyk Mykhailo Date: Wed, 24 Jan 2024 17:27:59 +0200 Subject: [PATCH 02/10] add shadcn theme toggle dropdown --- package-lock.json | 433 ++++++++++++++++++++++ package.json | 1 + src/app/auth/page.tsx | 6 +- src/app/page.tsx | 4 +- src/components/ui/button.tsx | 3 + src/components/ui/dropdown-menu.tsx | 199 ++++++++++ src/components/ui/index/theme-toggler.tsx | 23 -- src/components/ui/theme-toggler.tsx | 39 ++ src/components/ui/toaster.tsx | 2 +- 9 files changed, 682 insertions(+), 28 deletions(-) create mode 100644 src/components/ui/dropdown-menu.tsx delete mode 100644 src/components/ui/index/theme-toggler.tsx create mode 100644 src/components/ui/theme-toggler.tsx diff --git a/package-lock.json b/package-lock.json index 060ebef..333026a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,6 +10,7 @@ "dependencies": { "@hookform/resolvers": "^3.3.4", "@radix-ui/react-checkbox": "^1.0.4", + "@radix-ui/react-dropdown-menu": "^2.0.6", "@radix-ui/react-label": "^2.0.2", "@radix-ui/react-slot": "^1.0.2", "@radix-ui/react-toast": "^1.1.5", @@ -558,6 +559,40 @@ "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, + "node_modules/@floating-ui/core": { + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.5.3.tgz", + "integrity": "sha512-O0WKDOo0yhJuugCx6trZQj5jVJ9yR0ystG2JaNAemYUWce+pmM6WUEFIibnWyEJKdrDxhm75NoSRME35FNaM/Q==", + "dependencies": { + "@floating-ui/utils": "^0.2.0" + } + }, + "node_modules/@floating-ui/dom": { + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.5.4.tgz", + "integrity": "sha512-jByEsHIY+eEdCjnTVu+E3ephzTOzkQ8hgUfGwos+bg7NlH33Zc5uO+QHz1mrQUOgIKKDD1RtS201P9NvAfq3XQ==", + "dependencies": { + "@floating-ui/core": "^1.5.3", + "@floating-ui/utils": "^0.2.0" + } + }, + "node_modules/@floating-ui/react-dom": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.0.6.tgz", + "integrity": "sha512-IB8aCRFxr8nFkdYZgH+Otd9EVQPJoynxeFRGTB8voPoZMRWo8XjYuCRgpI1btvuKY69XMiLnW+ym7zoBHM90Rw==", + "dependencies": { + "@floating-ui/dom": "^1.5.4" + }, + "peerDependencies": { + "react": ">=16.8.0", + "react-dom": ">=16.8.0" + } + }, + "node_modules/@floating-ui/utils": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.1.tgz", + "integrity": "sha512-9TANp6GPoMtYzQdt54kfAyMmz1+osLlXdg2ENroU7zzrtflTLrrC/lgrIfaSe+Wu0b89GKccT7vxXA0MoAIO+Q==" + }, "node_modules/@hookform/resolvers": { "version": "3.3.4", "resolved": "https://registry.npmjs.org/@hookform/resolvers/-/resolvers-3.3.4.tgz", @@ -931,6 +966,29 @@ "@babel/runtime": "^7.13.10" } }, + "node_modules/@radix-ui/react-arrow": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@radix-ui/react-arrow/-/react-arrow-1.0.3.tgz", + "integrity": "sha512-wSP+pHsB/jQRaL6voubsQ/ZlrGBHHrOjmBnr19hxYgtS0WvAFwZhK2WP/YY5yF9uKECCEEDGxuLxq1NBK51wFA==", + "dependencies": { + "@babel/runtime": "^7.13.10", + "@radix-ui/react-primitive": "1.0.3" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0", + "react-dom": "^16.8 || ^17.0 || ^18.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, "node_modules/@radix-ui/react-checkbox": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/@radix-ui/react-checkbox/-/react-checkbox-1.0.4.tgz", @@ -1021,6 +1079,23 @@ } } }, + "node_modules/@radix-ui/react-direction": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-direction/-/react-direction-1.0.1.tgz", + "integrity": "sha512-RXcvnXgyvYvBEOhCBuddKecVkoMiI10Jcm5cTI7abJRAHYfFxeu+FBQs/DvdxSYucxR5mna0dNsL6QFlds5TMA==", + "dependencies": { + "@babel/runtime": "^7.13.10" + }, + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, "node_modules/@radix-ui/react-dismissable-layer": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.0.5.tgz", @@ -1048,6 +1123,95 @@ } } }, + "node_modules/@radix-ui/react-dropdown-menu": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/@radix-ui/react-dropdown-menu/-/react-dropdown-menu-2.0.6.tgz", + "integrity": "sha512-i6TuFOoWmLWq+M/eCLGd/bQ2HfAX1RJgvrBQ6AQLmzfvsLdefxbWu8G9zczcPFfcSPehz9GcpF6K9QYreFV8hA==", + "dependencies": { + "@babel/runtime": "^7.13.10", + "@radix-ui/primitive": "1.0.1", + "@radix-ui/react-compose-refs": "1.0.1", + "@radix-ui/react-context": "1.0.1", + "@radix-ui/react-id": "1.0.1", + "@radix-ui/react-menu": "2.0.6", + "@radix-ui/react-primitive": "1.0.3", + "@radix-ui/react-use-controllable-state": "1.0.1" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0", + "react-dom": "^16.8 || ^17.0 || ^18.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-focus-guards": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-guards/-/react-focus-guards-1.0.1.tgz", + "integrity": "sha512-Rect2dWbQ8waGzhMavsIbmSVCgYxkXLxxR3ZvCX79JOglzdEy4JXMb98lq4hPxUbLr77nP0UOGf4rcMU+s1pUA==", + "dependencies": { + "@babel/runtime": "^7.13.10" + }, + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-focus-scope": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-scope/-/react-focus-scope-1.0.4.tgz", + "integrity": "sha512-sL04Mgvf+FmyvZeYfNu1EPAaaxD+aw7cYeIB9L9Fvq8+urhltTRaEo5ysKOpHuKPclsZcSUMKlN05x4u+CINpA==", + "dependencies": { + "@babel/runtime": "^7.13.10", + "@radix-ui/react-compose-refs": "1.0.1", + "@radix-ui/react-primitive": "1.0.3", + "@radix-ui/react-use-callback-ref": "1.0.1" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0", + "react-dom": "^16.8 || ^17.0 || ^18.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-id": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-id/-/react-id-1.0.1.tgz", + "integrity": "sha512-tI7sT/kqYp8p96yGWY1OAnLHrqDgzHefRBKQ2YAkBS5ja7QLcZ9Z/uY7bEjPUatf8RomoXM8/1sMj1IJaE5UzQ==", + "dependencies": { + "@babel/runtime": "^7.13.10", + "@radix-ui/react-use-layout-effect": "1.0.1" + }, + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, "node_modules/@radix-ui/react-label": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/@radix-ui/react-label/-/react-label-2.0.2.tgz", @@ -1071,6 +1235,78 @@ } } }, + "node_modules/@radix-ui/react-menu": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/@radix-ui/react-menu/-/react-menu-2.0.6.tgz", + "integrity": "sha512-BVkFLS+bUC8HcImkRKPSiVumA1VPOOEC5WBMiT+QAVsPzW1FJzI9KnqgGxVDPBcql5xXrHkD3JOVoXWEXD8SYA==", + "dependencies": { + "@babel/runtime": "^7.13.10", + "@radix-ui/primitive": "1.0.1", + "@radix-ui/react-collection": "1.0.3", + "@radix-ui/react-compose-refs": "1.0.1", + "@radix-ui/react-context": "1.0.1", + "@radix-ui/react-direction": "1.0.1", + "@radix-ui/react-dismissable-layer": "1.0.5", + "@radix-ui/react-focus-guards": "1.0.1", + "@radix-ui/react-focus-scope": "1.0.4", + "@radix-ui/react-id": "1.0.1", + "@radix-ui/react-popper": "1.1.3", + "@radix-ui/react-portal": "1.0.4", + "@radix-ui/react-presence": "1.0.1", + "@radix-ui/react-primitive": "1.0.3", + "@radix-ui/react-roving-focus": "1.0.4", + "@radix-ui/react-slot": "1.0.2", + "@radix-ui/react-use-callback-ref": "1.0.1", + "aria-hidden": "^1.1.1", + "react-remove-scroll": "2.5.5" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0", + "react-dom": "^16.8 || ^17.0 || ^18.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-popper": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@radix-ui/react-popper/-/react-popper-1.1.3.tgz", + "integrity": "sha512-cKpopj/5RHZWjrbF2846jBNacjQVwkP068DfmgrNJXpvVWrOvlAmE9xSiy5OqeE+Gi8D9fP+oDhUnPqNMY8/5w==", + "dependencies": { + "@babel/runtime": "^7.13.10", + "@floating-ui/react-dom": "^2.0.0", + "@radix-ui/react-arrow": "1.0.3", + "@radix-ui/react-compose-refs": "1.0.1", + "@radix-ui/react-context": "1.0.1", + "@radix-ui/react-primitive": "1.0.3", + "@radix-ui/react-use-callback-ref": "1.0.1", + "@radix-ui/react-use-layout-effect": "1.0.1", + "@radix-ui/react-use-rect": "1.0.1", + "@radix-ui/react-use-size": "1.0.1", + "@radix-ui/rect": "1.0.1" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0", + "react-dom": "^16.8 || ^17.0 || ^18.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, "node_modules/@radix-ui/react-portal": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.0.4.tgz", @@ -1141,6 +1377,37 @@ } } }, + "node_modules/@radix-ui/react-roving-focus": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@radix-ui/react-roving-focus/-/react-roving-focus-1.0.4.tgz", + "integrity": "sha512-2mUg5Mgcu001VkGy+FfzZyzbmuUWzgWkj3rvv4yu+mLw03+mTzbxZHvfcGyFp2b8EkQeMkpRQ5FiA2Vr2O6TeQ==", + "dependencies": { + "@babel/runtime": "^7.13.10", + "@radix-ui/primitive": "1.0.1", + "@radix-ui/react-collection": "1.0.3", + "@radix-ui/react-compose-refs": "1.0.1", + "@radix-ui/react-context": "1.0.1", + "@radix-ui/react-direction": "1.0.1", + "@radix-ui/react-id": "1.0.1", + "@radix-ui/react-primitive": "1.0.3", + "@radix-ui/react-use-callback-ref": "1.0.1", + "@radix-ui/react-use-controllable-state": "1.0.1" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0", + "react-dom": "^16.8 || ^17.0 || ^18.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, "node_modules/@radix-ui/react-slot": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.0.2.tgz", @@ -1280,6 +1547,24 @@ } } }, + "node_modules/@radix-ui/react-use-rect": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-rect/-/react-use-rect-1.0.1.tgz", + "integrity": "sha512-Cq5DLuSiuYVKNU8orzJMbl15TXilTnJKUCltMVQg53BQOF1/C5toAaGrowkgksdBQ9H+SRL23g0HDmg9tvmxXw==", + "dependencies": { + "@babel/runtime": "^7.13.10", + "@radix-ui/rect": "1.0.1" + }, + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, "node_modules/@radix-ui/react-use-size": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@radix-ui/react-use-size/-/react-use-size-1.0.1.tgz", @@ -1321,6 +1606,14 @@ } } }, + "node_modules/@radix-ui/rect": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@radix-ui/rect/-/rect-1.0.1.tgz", + "integrity": "sha512-fyrgCaedtvMg9NK3en0pnOYJdtfwxUcNolezkNPUsoX57X8oQk+NkqcvzHXD2uKNij6GXmWU9NDru2IWjrO4BQ==", + "dependencies": { + "@babel/runtime": "^7.13.10" + } + }, "node_modules/@rushstack/eslint-patch": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.6.0.tgz", @@ -1643,6 +1936,17 @@ "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", "dev": true }, + "node_modules/aria-hidden": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/aria-hidden/-/aria-hidden-1.2.3.tgz", + "integrity": "sha512-xcLxITLe2HYa1cnYnwCjkOO1PqUHQpozB8x9AR0OgWN2woOBi5kSDVxKfd0b7sb1hw5qFeJhXm9H1nu3xSfLeQ==", + "dependencies": { + "tslib": "^2.0.0" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/aria-query": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz", @@ -2746,6 +3050,11 @@ "node": ">=6" } }, + "node_modules/detect-node-es": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/detect-node-es/-/detect-node-es-1.1.0.tgz", + "integrity": "sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ==" + }, "node_modules/didyoumean": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz", @@ -3753,6 +4062,14 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/get-nonce": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/get-nonce/-/get-nonce-1.0.1.tgz", + "integrity": "sha512-FJhYRoDaiatfEkUK8HKlicmu/3SGFD51q3itKDGoSTysQJBnfOcxU5GxnhE1E6soB76MbT0MBtnKJuXyAx+96Q==", + "engines": { + "node": ">=6" + } + }, "node_modules/get-stdin": { "version": "9.0.0", "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-9.0.0.tgz", @@ -4123,6 +4440,14 @@ "node": ">= 0.4" } }, + "node_modules/invariant": { + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", + "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", + "dependencies": { + "loose-envify": "^1.0.0" + } + }, "node_modules/is-array-buffer": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz", @@ -5817,6 +6142,73 @@ "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", "dev": true }, + "node_modules/react-remove-scroll": { + "version": "2.5.5", + "resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.5.5.tgz", + "integrity": "sha512-ImKhrzJJsyXJfBZ4bzu8Bwpka14c/fQt0k+cyFp/PBhTfyDnU5hjOtM4AG/0AMyy8oKzOTR0lDgJIM7pYXI0kw==", + "dependencies": { + "react-remove-scroll-bar": "^2.3.3", + "react-style-singleton": "^2.2.1", + "tslib": "^2.1.0", + "use-callback-ref": "^1.3.0", + "use-sidecar": "^1.1.2" + }, + "engines": { + "node": ">=10" + }, + "peerDependencies": { + "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0", + "react": "^16.8.0 || ^17.0.0 || ^18.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/react-remove-scroll-bar": { + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/react-remove-scroll-bar/-/react-remove-scroll-bar-2.3.4.tgz", + "integrity": "sha512-63C4YQBUt0m6ALadE9XV56hV8BgJWDmmTPY758iIJjfQKt2nYwoUrPk0LXRXcB/yIj82T1/Ixfdpdk68LwIB0A==", + "dependencies": { + "react-style-singleton": "^2.2.1", + "tslib": "^2.0.0" + }, + "engines": { + "node": ">=10" + }, + "peerDependencies": { + "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0", + "react": "^16.8.0 || ^17.0.0 || ^18.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/react-style-singleton": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/react-style-singleton/-/react-style-singleton-2.2.1.tgz", + "integrity": "sha512-ZWj0fHEMyWkHzKYUr2Bs/4zU6XLmq9HsgBURm7g5pAVfyn49DgUiNgY2d4lXRlYSiCif9YBGpQleewkcqddc7g==", + "dependencies": { + "get-nonce": "^1.0.0", + "invariant": "^2.2.4", + "tslib": "^2.0.0" + }, + "engines": { + "node": ">=10" + }, + "peerDependencies": { + "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0", + "react": "^16.8.0 || ^17.0.0 || ^18.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, "node_modules/read-cache": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz", @@ -6803,6 +7195,47 @@ "punycode": "^2.1.0" } }, + "node_modules/use-callback-ref": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/use-callback-ref/-/use-callback-ref-1.3.1.tgz", + "integrity": "sha512-Lg4Vx1XZQauB42Hw3kK7JM6yjVjgFmFC5/Ab797s79aARomD2nEErc4mCgM8EZrARLmmbWpi5DGCadmK50DcAQ==", + "dependencies": { + "tslib": "^2.0.0" + }, + "engines": { + "node": ">=10" + }, + "peerDependencies": { + "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0", + "react": "^16.8.0 || ^17.0.0 || ^18.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/use-sidecar": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/use-sidecar/-/use-sidecar-1.1.2.tgz", + "integrity": "sha512-epTbsLuzZ7lPClpz2TyryBfztm7m+28DlEv2ZCQ3MDr5ssiwyOwGH/e5F9CkfWjJ1t4clvI58yF822/GUkjjhw==", + "dependencies": { + "detect-node-es": "^1.1.0", + "tslib": "^2.0.0" + }, + "engines": { + "node": ">=10" + }, + "peerDependencies": { + "@types/react": "^16.9.0 || ^17.0.0 || ^18.0.0", + "react": "^16.8.0 || ^17.0.0 || ^18.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", diff --git a/package.json b/package.json index 7068465..36ebc3f 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "dependencies": { "@hookform/resolvers": "^3.3.4", "@radix-ui/react-checkbox": "^1.0.4", + "@radix-ui/react-dropdown-menu": "^2.0.6", "@radix-ui/react-label": "^2.0.2", "@radix-ui/react-slot": "^1.0.2", "@radix-ui/react-toast": "^1.1.5", diff --git a/src/app/auth/page.tsx b/src/app/auth/page.tsx index 150f63d..fb3058f 100644 --- a/src/app/auth/page.tsx +++ b/src/app/auth/page.tsx @@ -2,7 +2,7 @@ import FormAuth from '@/components/pages/auth/form-auth' import ImageCard from '@/components/pages/auth/image-card' import Content from '@/components/ui/content' import { Icons } from '@/components/ui/icons' -import ThemeToggler from '@/components/ui/index/theme-toggler' +import { ModeToggle } from '@/components/ui/theme-toggler' export default function Auth() { return ( @@ -15,7 +15,9 @@ export default function Auth() {

Authentication

- +
+ +
diff --git a/src/app/page.tsx b/src/app/page.tsx index dcaf385..99330e5 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -1,8 +1,8 @@ 'use client' import { Button } from '@/components/ui/button' -import { useToast } from '@/components/ui/use-toast' import { useApi, useApiContext } from '@/utils' +import { useToast } from '@/utils/api/hooks/use-toast' const Home = () => { const api = useApiContext() @@ -23,7 +23,7 @@ const Home = () => { }) return ( -
+
{data}
{calculated} diff --git a/src/components/ui/button.tsx b/src/components/ui/button.tsx index f9b6278..d23c48e 100644 --- a/src/components/ui/button.tsx +++ b/src/components/ui/button.tsx @@ -12,6 +12,7 @@ const buttonVariants = cva('overflow-hidden inline-block text-center', { size: { default: 'py-3.5 px-5 rounded-2xl', icon: 'py-1 px-2 rounded-lg text-xs', + theme_icon: 'h-10 w-10', }, variant: { default: @@ -19,6 +20,8 @@ const buttonVariants = cva('overflow-hidden inline-block text-center', { disabled: 'text-base-gray-4 bg-base-gray-3 dark:text-base-gray-8 dark:bg-base-gray-7', icon: 'text-base-gray-8 bg-base-gray-2', + outline: + 'border border-input bg-background hover:bg-accent hover:text-accent-foreground inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50', }, }, }) diff --git a/src/components/ui/dropdown-menu.tsx b/src/components/ui/dropdown-menu.tsx new file mode 100644 index 0000000..c576c76 --- /dev/null +++ b/src/components/ui/dropdown-menu.tsx @@ -0,0 +1,199 @@ +'use client' + +import { cn } from '@/lib/utils' +import * as DropdownMenuPrimitive from '@radix-ui/react-dropdown-menu' +import { Check, ChevronRight, Circle } from 'lucide-react' +import * as React from 'react' + +const DropdownMenu = DropdownMenuPrimitive.Root + +const DropdownMenuTrigger = DropdownMenuPrimitive.Trigger + +const DropdownMenuGroup = DropdownMenuPrimitive.Group + +const DropdownMenuPortal = DropdownMenuPrimitive.Portal + +const DropdownMenuSub = DropdownMenuPrimitive.Sub + +const DropdownMenuRadioGroup = DropdownMenuPrimitive.RadioGroup + +const DropdownMenuSubTrigger = React.forwardRef< + React.ElementRef, + React.ComponentPropsWithoutRef & { + inset?: boolean + } +>(({ children, className, inset, ...props }, ref) => ( + + {children} + + +)) +DropdownMenuSubTrigger.displayName = + DropdownMenuPrimitive.SubTrigger.displayName + +const DropdownMenuSubContent = React.forwardRef< + React.ElementRef, + React.ComponentPropsWithoutRef +>(({ className, ...props }, ref) => ( + +)) +DropdownMenuSubContent.displayName = + DropdownMenuPrimitive.SubContent.displayName + +const DropdownMenuContent = React.forwardRef< + React.ElementRef, + React.ComponentPropsWithoutRef +>(({ className, sideOffset = 4, ...props }, ref) => ( + + + +)) +DropdownMenuContent.displayName = DropdownMenuPrimitive.Content.displayName + +const DropdownMenuItem = React.forwardRef< + React.ElementRef, + React.ComponentPropsWithoutRef & { + inset?: boolean + } +>(({ className, inset, ...props }, ref) => ( + +)) +DropdownMenuItem.displayName = DropdownMenuPrimitive.Item.displayName + +const DropdownMenuCheckboxItem = React.forwardRef< + React.ElementRef, + React.ComponentPropsWithoutRef +>(({ checked, children, className, ...props }, ref) => ( + + + + + + + {children} + +)) +DropdownMenuCheckboxItem.displayName = + DropdownMenuPrimitive.CheckboxItem.displayName + +const DropdownMenuRadioItem = React.forwardRef< + React.ElementRef, + React.ComponentPropsWithoutRef +>(({ children, className, ...props }, ref) => ( + + + + + + + {children} + +)) +DropdownMenuRadioItem.displayName = DropdownMenuPrimitive.RadioItem.displayName + +const DropdownMenuLabel = React.forwardRef< + React.ElementRef, + React.ComponentPropsWithoutRef & { + inset?: boolean + } +>(({ className, inset, ...props }, ref) => ( + +)) +DropdownMenuLabel.displayName = DropdownMenuPrimitive.Label.displayName + +const DropdownMenuSeparator = React.forwardRef< + React.ElementRef, + React.ComponentPropsWithoutRef +>(({ className, ...props }, ref) => ( + +)) +DropdownMenuSeparator.displayName = DropdownMenuPrimitive.Separator.displayName + +const DropdownMenuShortcut = ({ + className, + ...props +}: React.HTMLAttributes) => { + return ( + + ) +} +DropdownMenuShortcut.displayName = 'DropdownMenuShortcut' + +export { + DropdownMenu, + DropdownMenuCheckboxItem, + DropdownMenuContent, + DropdownMenuGroup, + DropdownMenuItem, + DropdownMenuLabel, + DropdownMenuPortal, + DropdownMenuRadioGroup, + DropdownMenuRadioItem, + DropdownMenuSeparator, + DropdownMenuShortcut, + DropdownMenuSub, + DropdownMenuSubContent, + DropdownMenuSubTrigger, + DropdownMenuTrigger, +} diff --git a/src/components/ui/index/theme-toggler.tsx b/src/components/ui/index/theme-toggler.tsx deleted file mode 100644 index 1c58058..0000000 --- a/src/components/ui/index/theme-toggler.tsx +++ /dev/null @@ -1,23 +0,0 @@ -'use client' - -import { Button } from '@/components/ui/button' -import Theme, { THEME } from '@/types/enums/Theme' -import { useTheme } from 'next-themes' - -const ThemeToggler = () => { - const { resolvedTheme, setTheme } = useTheme() - - const toggleTheme = () => { - setTheme( - (resolvedTheme as Theme) === THEME.light ? THEME.dark : THEME.light - ) - } - - return ( - - ) -} - -export default ThemeToggler diff --git a/src/components/ui/theme-toggler.tsx b/src/components/ui/theme-toggler.tsx new file mode 100644 index 0000000..aae11f6 --- /dev/null +++ b/src/components/ui/theme-toggler.tsx @@ -0,0 +1,39 @@ +'use client' + +import { Button } from '@/components/ui/button' +import { + DropdownMenu, + DropdownMenuContent, + DropdownMenuItem, + DropdownMenuTrigger, +} from '@/components/ui/dropdown-menu' +import { Moon, Sun } from 'lucide-react' +import { useTheme } from 'next-themes' +import * as React from 'react' + +export function ModeToggle() { + const { setTheme } = useTheme() + + return ( + + + + + + setTheme('light')}> + Light + + setTheme('dark')}> + Dark + + setTheme('system')}> + System + + + + ) +} diff --git a/src/components/ui/toaster.tsx b/src/components/ui/toaster.tsx index 9dd0cb5..f4cc26e 100644 --- a/src/components/ui/toaster.tsx +++ b/src/components/ui/toaster.tsx @@ -8,7 +8,7 @@ import { ToastTitle, ToastViewport, } from '@/components/ui/toast' -import { useToast } from '@/components/ui/use-toast' +import { useToast } from '@/utils/api/hooks/use-toast' export function Toaster() { const { toasts } = useToast() From 6f5d1c933d3632266ed13a822c0cd8bbbb87665c Mon Sep 17 00:00:00 2001 From: Melnyk Mykhailo Date: Wed, 24 Jan 2024 17:58:42 +0200 Subject: [PATCH 03/10] move react hooks to src/hooks --- src/app/page.tsx | 2 +- src/components/ui/toaster.tsx | 2 +- src/{utils/api => }/hooks/hooks.ts | 2 +- src/{utils/api => }/hooks/use-toast.ts | 0 src/utils/api/index.ts | 4 ++-- src/utils/api/metacom.ts | 2 +- src/utils/index.ts | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) rename src/{utils/api => }/hooks/hooks.ts (96%) rename src/{utils/api => }/hooks/use-toast.ts (100%) diff --git a/src/app/page.tsx b/src/app/page.tsx index 99330e5..eec98e6 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -1,8 +1,8 @@ 'use client' import { Button } from '@/components/ui/button' +import { useToast } from '@/hooks/use-toast' import { useApi, useApiContext } from '@/utils' -import { useToast } from '@/utils/api/hooks/use-toast' const Home = () => { const api = useApiContext() diff --git a/src/components/ui/toaster.tsx b/src/components/ui/toaster.tsx index f4cc26e..c59f423 100644 --- a/src/components/ui/toaster.tsx +++ b/src/components/ui/toaster.tsx @@ -8,7 +8,7 @@ import { ToastTitle, ToastViewport, } from '@/components/ui/toast' -import { useToast } from '@/utils/api/hooks/use-toast' +import { useToast } from '@/hooks/use-toast' export function Toaster() { const { toasts } = useToast() diff --git a/src/utils/api/hooks/hooks.ts b/src/hooks/hooks.ts similarity index 96% rename from src/utils/api/hooks/hooks.ts rename to src/hooks/hooks.ts index e8b0576..c5de7bc 100644 --- a/src/utils/api/hooks/hooks.ts +++ b/src/hooks/hooks.ts @@ -1,6 +1,6 @@ 'use client' -import { useToast } from '@/utils/api/hooks/use-toast' +import { useToast } from '@/hooks/use-toast' import { useCallback, useEffect, useRef, useState } from 'react' export const useApi = >( diff --git a/src/utils/api/hooks/use-toast.ts b/src/hooks/use-toast.ts similarity index 100% rename from src/utils/api/hooks/use-toast.ts rename to src/hooks/use-toast.ts diff --git a/src/utils/api/index.ts b/src/utils/api/index.ts index c772298..dea09bf 100644 --- a/src/utils/api/index.ts +++ b/src/utils/api/index.ts @@ -1,2 +1,2 @@ -export * from './hooks/hooks' -export * from './metacom' +export * from '@/hooks/hooks' +export * from '@/utils/api/metacom' diff --git a/src/utils/api/metacom.ts b/src/utils/api/metacom.ts index 601d595..00c7333 100644 --- a/src/utils/api/metacom.ts +++ b/src/utils/api/metacom.ts @@ -1,7 +1,7 @@ 'use client' import { URL_PRODUCT_API } from '@/constants' -import { useToast } from '@/utils/api/hooks/use-toast' +import { useToast } from '@/hooks/use-toast' import { Metacom } from 'metacom' import { createContext, diff --git a/src/utils/index.ts b/src/utils/index.ts index 9c21d5b..7fded4e 100644 --- a/src/utils/index.ts +++ b/src/utils/index.ts @@ -1,2 +1,2 @@ -export * from './misc' -export * from './api' +export * from '@/utils/misc' +export * from '@/utils/api' From 7ea58960fa55f3dbd96e68c47f40e0ae86d97946 Mon Sep 17 00:00:00 2001 From: Melnyk Mykhailo Date: Wed, 24 Jan 2024 18:02:47 +0200 Subject: [PATCH 04/10] fix theme toggle position on auth page --- src/app/auth/page.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/auth/page.tsx b/src/app/auth/page.tsx index fb3058f..57c07e6 100644 --- a/src/app/auth/page.tsx +++ b/src/app/auth/page.tsx @@ -13,11 +13,11 @@ export default function Auth() {
-

Authentication

- -
+
+

Authentication

+
From 427440b4c4092d86867ae3c87b1fdaa6806a5714 Mon Sep 17 00:00:00 2001 From: Melnyk Mykhailo Date: Wed, 24 Jan 2024 18:48:20 +0200 Subject: [PATCH 05/10] fix imports in api index and rename hooks to use-api --- src/hooks/{hooks.ts => use-api.ts} | 0 src/utils/api/index.ts | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename src/hooks/{hooks.ts => use-api.ts} (100%) diff --git a/src/hooks/hooks.ts b/src/hooks/use-api.ts similarity index 100% rename from src/hooks/hooks.ts rename to src/hooks/use-api.ts diff --git a/src/utils/api/index.ts b/src/utils/api/index.ts index dea09bf..3e8bec1 100644 --- a/src/utils/api/index.ts +++ b/src/utils/api/index.ts @@ -1,2 +1,2 @@ -export * from '@/hooks/hooks' +export * from '@/hooks/use-api' export * from '@/utils/api/metacom' From 39c731af6676fcae4d48383cbed11a5fac442138 Mon Sep 17 00:00:00 2001 From: Melnyk Mykhailo Date: Wed, 24 Jan 2024 18:49:31 +0200 Subject: [PATCH 06/10] rename modetoggle component to themetoggler --- src/app/auth/page.tsx | 4 ++-- src/components/ui/theme-toggler.tsx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/auth/page.tsx b/src/app/auth/page.tsx index 57c07e6..4052d90 100644 --- a/src/app/auth/page.tsx +++ b/src/app/auth/page.tsx @@ -2,7 +2,7 @@ import FormAuth from '@/components/pages/auth/form-auth' import ImageCard from '@/components/pages/auth/image-card' import Content from '@/components/ui/content' import { Icons } from '@/components/ui/icons' -import { ModeToggle } from '@/components/ui/theme-toggler' +import { ThemeToggler } from '@/components/ui/theme-toggler' export default function Auth() { return ( @@ -15,7 +15,7 @@ export default function Auth() {

Authentication

- +
diff --git a/src/components/ui/theme-toggler.tsx b/src/components/ui/theme-toggler.tsx index aae11f6..6b077d9 100644 --- a/src/components/ui/theme-toggler.tsx +++ b/src/components/ui/theme-toggler.tsx @@ -11,7 +11,7 @@ import { Moon, Sun } from 'lucide-react' import { useTheme } from 'next-themes' import * as React from 'react' -export function ModeToggle() { +export function ThemeToggler() { const { setTheme } = useTheme() return ( From 27c9cd506a06ced7deddb0de9e1026b4386cc05e Mon Sep 17 00:00:00 2001 From: Melnyk Mykhailo Date: Wed, 24 Jan 2024 18:53:31 +0200 Subject: [PATCH 07/10] fix imports of useapi hook for app page --- src/app/page.tsx | 3 ++- src/utils/api/index.ts | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/page.tsx b/src/app/page.tsx index eec98e6..8da1f04 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -1,8 +1,9 @@ 'use client' import { Button } from '@/components/ui/button' +import { useApi } from '@/hooks/use-api' import { useToast } from '@/hooks/use-toast' -import { useApi, useApiContext } from '@/utils' +import { useApiContext } from '@/utils' const Home = () => { const api = useApiContext() diff --git a/src/utils/api/index.ts b/src/utils/api/index.ts index 3e8bec1..8f3ad85 100644 --- a/src/utils/api/index.ts +++ b/src/utils/api/index.ts @@ -1,2 +1 @@ -export * from '@/hooks/use-api' export * from '@/utils/api/metacom' From 9aeb1a4a886c16d4d8983c4d9833fd0a9f0097bf Mon Sep 17 00:00:00 2001 From: Melnyk Mykhailo Date: Wed, 24 Jan 2024 19:02:25 +0200 Subject: [PATCH 08/10] add index file for hooks exports --- src/hooks/index.tsx | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 src/hooks/index.tsx diff --git a/src/hooks/index.tsx b/src/hooks/index.tsx new file mode 100644 index 0000000..caaa029 --- /dev/null +++ b/src/hooks/index.tsx @@ -0,0 +1,2 @@ +export * from '@/hooks/use-api' +export * from '@/hooks/use-toast' From 1100dca618618dd713735c5fd002941a8e42ba2d Mon Sep 17 00:00:00 2001 From: Melnyk Mykhailo Date: Wed, 24 Jan 2024 19:06:54 +0200 Subject: [PATCH 09/10] fix hooks imports according to hooks index file --- src/app/page.tsx | 3 +-- src/components/ui/toaster.tsx | 2 +- src/hooks/use-api.ts | 2 +- src/utils/api/metacom.ts | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/app/page.tsx b/src/app/page.tsx index 8da1f04..f13b83a 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -1,8 +1,7 @@ 'use client' import { Button } from '@/components/ui/button' -import { useApi } from '@/hooks/use-api' -import { useToast } from '@/hooks/use-toast' +import { useApi, useToast } from '@/hooks' import { useApiContext } from '@/utils' const Home = () => { diff --git a/src/components/ui/toaster.tsx b/src/components/ui/toaster.tsx index c59f423..e575bd3 100644 --- a/src/components/ui/toaster.tsx +++ b/src/components/ui/toaster.tsx @@ -8,7 +8,7 @@ import { ToastTitle, ToastViewport, } from '@/components/ui/toast' -import { useToast } from '@/hooks/use-toast' +import { useToast } from '@/hooks' export function Toaster() { const { toasts } = useToast() diff --git a/src/hooks/use-api.ts b/src/hooks/use-api.ts index c5de7bc..8e54ae3 100644 --- a/src/hooks/use-api.ts +++ b/src/hooks/use-api.ts @@ -1,6 +1,6 @@ 'use client' -import { useToast } from '@/hooks/use-toast' +import { useToast } from '@/hooks' import { useCallback, useEffect, useRef, useState } from 'react' export const useApi = >( diff --git a/src/utils/api/metacom.ts b/src/utils/api/metacom.ts index 00c7333..bcbd1d4 100644 --- a/src/utils/api/metacom.ts +++ b/src/utils/api/metacom.ts @@ -1,7 +1,7 @@ 'use client' import { URL_PRODUCT_API } from '@/constants' -import { useToast } from '@/hooks/use-toast' +import { useToast } from '@/hooks' import { Metacom } from 'metacom' import { createContext, From 4fb34a13b7e5b19328adfc27000afdbab8f67678 Mon Sep 17 00:00:00 2001 From: Melnyk Mykhailo Date: Wed, 24 Jan 2024 19:08:30 +0200 Subject: [PATCH 10/10] fix arrow to extracted funcs in theme toggler --- src/components/ui/theme-toggler.tsx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/components/ui/theme-toggler.tsx b/src/components/ui/theme-toggler.tsx index 6b077d9..86340d4 100644 --- a/src/components/ui/theme-toggler.tsx +++ b/src/components/ui/theme-toggler.tsx @@ -14,6 +14,10 @@ import * as React from 'react' export function ThemeToggler() { const { setTheme } = useTheme() + const setLightTheme = () => setTheme('light') + const setDarkTheme = () => setTheme('dark') + const setSystemTheme = () => setTheme('system') + return ( @@ -24,13 +28,9 @@ export function ThemeToggler() { - setTheme('light')}> - Light - - setTheme('dark')}> - Dark - - setTheme('system')}> + setLightTheme}>Light + setDarkTheme}>Dark + setSystemTheme}> System