From 34ba67e44b074b3d781375808dca96ddd42fd5df Mon Sep 17 00:00:00 2001 From: Caleb Jacob Date: Tue, 13 Aug 2024 08:14:18 -0600 Subject: [PATCH] Upgrade UI library to 1.0.0 --- package.json | 20 ++-- pnpm-lock.yaml | 12 +-- src/components/CookiePrompt.tsx | 2 +- .../ResearchFormWizard.tsx | 2 +- src/components/vm/VmInitializer.tsx | 4 +- src/hooks/useResearchWizardEvents.tsx | 3 +- src/pages/_app.tsx | 95 ++++++++++--------- 7 files changed, 70 insertions(+), 68 deletions(-) diff --git a/package.json b/package.json index a4414a94f..63d03f880 100644 --- a/package.json +++ b/package.json @@ -2,13 +2,11 @@ "name": "near-discovery", "version": "0.1.0", "private": true, - "engines": - { + "engines": { "node": ">=18.0.0", "pnpm": ">=8.5.0" }, - "scripts": - { + "scripts": { "dev": "next dev", "build": "next build", "start": "next start", @@ -20,13 +18,12 @@ "commit": "cz", "ts:check": "tsc --noEmit --incremental" }, - "dependencies": - { + "dependencies": { "@idos-network/idos-sdk": "^0.0.30", "@keypom/selector": "1.2.3", "@monaco-editor/react": "^4.6.0", "@near-js/biometric-ed25519": "0.3.0", - "@near-pagoda/ui": "^0.3.0", + "@near-pagoda/ui": "^1.0.0", "@near-wallet-selector/core": "8.9.7", "@near-wallet-selector/here-wallet": "8.9.7", "@near-wallet-selector/ledger": "^8.9.7", @@ -79,8 +76,7 @@ "typescript": "^5.4.5", "zustand": "^4.5.2" }, - "devDependencies": - { + "devDependencies": { "@commitlint/cli": "^19.3.0", "@commitlint/config-conventional": "^19.2.2", "@types/big.js": "^6.2.2", @@ -101,10 +97,8 @@ "is-ci": "^3.0.1", "prettier": "^2.8.8" }, - "config": - { - "commitizen": - { + "config": { + "commitizen": { "path": "./node_modules/cz-conventional-changelog" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 60250ccb9..3ffe5fc13 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -21,8 +21,8 @@ importers: specifier: 0.3.0 version: 0.3.0 '@near-pagoda/ui': - specifier: ^0.3.0 - version: 0.3.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(next@13.5.6(@babel/core@7.24.9)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(zustand@4.5.4(@types/react@18.3.3)(react@18.3.1)) + specifier: ^1.0.0 + version: 1.0.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(zustand@4.5.4(@types/react@18.3.3)(react@18.3.1)) '@near-wallet-selector/core': specifier: 8.9.7 version: 8.9.7(near-api-js@4.0.3) @@ -1973,11 +1973,10 @@ packages: '@near-js/wallet-account@1.2.2': resolution: {integrity: sha512-LaWzqaz2tP1hcToDlmiQnFMGZ1W9dM9i4nFSILe5PLIFLBQmYXdLWc80skGDiTUeihVu6wwtQr6Z2CcG231rWw==} - '@near-pagoda/ui@0.3.0': - resolution: {integrity: sha512-GZ7jdZdJGC9YRcyhYMJ75w8BJg6kcycRuKGVxgPvwHwGyYs3CVUjYoQmkt2Bd1aUqzct/D0pAwUOx9VIsYJ0LQ==} + '@near-pagoda/ui@1.0.0': + resolution: {integrity: sha512-lOve8WnHXJfx/ci2zDY0RJz+Rccl2UvzrLtULVYd3p2QBtsY/Afbe2H3x4lKl8SLFDLgE7uL3LecUte+wiE6AQ==} engines: {node: '>=20', pnpm: 9.1.1} peerDependencies: - next: '>=13' react: ^18 react-dom: ^18 zustand: ^4 @@ -11410,7 +11409,7 @@ snapshots: transitivePeerDependencies: - encoding - '@near-pagoda/ui@0.3.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(next@13.5.6(@babel/core@7.24.9)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(zustand@4.5.4(@types/react@18.3.3)(react@18.3.1))': + '@near-pagoda/ui@1.0.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(zustand@4.5.4(@types/react@18.3.3)(react@18.3.1))': dependencies: '@phosphor-icons/react': 2.1.7(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@radix-ui/react-accordion': 1.2.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -11422,7 +11421,6 @@ snapshots: '@radix-ui/react-tooltip': 1.1.2(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) downshift: 9.0.7(react@18.3.1) lodash-es: 4.17.21 - next: 13.5.6(@babel/core@7.24.9)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) zustand: 4.5.4(@types/react@18.3.3)(react@18.3.1) diff --git a/src/components/CookiePrompt.tsx b/src/components/CookiePrompt.tsx index 7cc0e8e58..c8a23691b 100644 --- a/src/components/CookiePrompt.tsx +++ b/src/components/CookiePrompt.tsx @@ -1,9 +1,9 @@ import styled from 'styled-components'; import { useBosComponents } from '@/hooks/useBosComponents'; +import { useCookieStore } from '@/stores/cookieData'; import { VmComponent } from './vm/VmComponent'; -import { useCookieStore } from '@/stores/cookieData'; const Wrapper = styled.div` position: fixed; diff --git a/src/components/research-form-wizard/ResearchFormWizard.tsx b/src/components/research-form-wizard/ResearchFormWizard.tsx index 5fad81c8e..f85634c98 100644 --- a/src/components/research-form-wizard/ResearchFormWizard.tsx +++ b/src/components/research-form-wizard/ResearchFormWizard.tsx @@ -3,11 +3,11 @@ import Modal from 'react-bootstrap/Modal'; import styled from 'styled-components'; import { useResearchWizardEvents } from '@/hooks/useResearchWizardEvents'; +import { useCookieStore } from '@/stores/cookieData'; import { useResearchWizardStore } from '@/stores/researchWizard'; import { recordEventWithProps } from '@/utils/analytics'; import { StepLayout } from './StepLayout'; -import { useCookieStore } from '@/stores/cookieData'; const MobileWrapper = styled.div` width: 276px; diff --git a/src/components/vm/VmInitializer.tsx b/src/components/vm/VmInitializer.tsx index 068eb7191..ffd268ec0 100644 --- a/src/components/vm/VmInitializer.tsx +++ b/src/components/vm/VmInitializer.tsx @@ -35,6 +35,7 @@ import { useEthersProviderContext } from '@/data/web3'; import { useIdOS } from '@/hooks/useIdOS'; import { useSignInRedirect } from '@/hooks/useSignInRedirect'; import { useAuthStore } from '@/stores/auth'; +import { useCookieStore } from '@/stores/cookieData'; import { useIdosStore } from '@/stores/idosStore'; import { useVmStore } from '@/stores/vm'; import { @@ -54,7 +55,6 @@ import { import { KEYPOM_OPTIONS } from '@/utils/keypom-options'; import { useNavigationStore } from '../sidebar-navigation/store'; -import { useCookieStore } from '@/stores/cookieData'; export default function VmInitializer() { const [signedIn, setSignedIn] = useState(false); @@ -177,7 +177,7 @@ export default function VmInitializer() { enableWidgetSrcWithCodeOverride: isLocalEnvironment, }, }); - }, [initNear, router.query]); + }, [initNear, router.query, setCookieData]); useEffect(() => { if (!near || !idOS) { diff --git a/src/hooks/useResearchWizardEvents.tsx b/src/hooks/useResearchWizardEvents.tsx index 056156c26..e33aba3f5 100644 --- a/src/hooks/useResearchWizardEvents.tsx +++ b/src/hooks/useResearchWizardEvents.tsx @@ -1,6 +1,7 @@ -import { useResearchWizardStore } from '@/stores/researchWizard'; import { useEffect, useState } from 'react'; +import { useResearchWizardStore } from '@/stores/researchWizard'; + export function useResearchWizardEvents() { const set = useResearchWizardStore((state) => state.set); const [showMobileResearchForm, setShowMobileResearchForm] = useState(false); diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx index 4a1d19d74..3aa07ea75 100644 --- a/src/pages/_app.tsx +++ b/src/pages/_app.tsx @@ -7,11 +7,12 @@ import '@near-wallet-selector/modal-ui/styles.css'; import 'react-bootstrap-typeahead/css/Typeahead.css'; import 'react-bootstrap-typeahead/css/Typeahead.bs5.css'; -import { openToast, Toaster } from '@near-pagoda/ui'; +import { openToast, PagodaUiProvider, Toaster } from '@near-pagoda/ui'; import Gleap from 'gleap'; import type { AppProps } from 'next/app'; import dynamic from 'next/dynamic'; import Head from 'next/head'; +import Link from 'next/link'; import { useRouter } from 'next/router'; import Script from 'next/script'; import { useEffect } from 'react'; @@ -23,13 +24,13 @@ import { useClickTracking } from '@/hooks/useClickTracking'; import { useHashUrlBackwardsCompatibility } from '@/hooks/useHashUrlBackwardsCompatibility'; import { usePageAnalytics } from '@/hooks/usePageAnalytics'; import { useAuthStore } from '@/stores/auth'; +import { useCookieStore } from '@/stores/cookieData'; +import { useResearchWizardStore } from '@/stores/researchWizard'; import { init as initializeAnalytics, recordHandledError, setReferrer } from '@/utils/analytics'; import { gleapSdkToken } from '@/utils/config'; import { setNotificationsLocalStorage } from '@/utils/notificationsLocalStorage'; import type { NextPageWithLayout } from '@/utils/types'; import { styleZendesk } from '@/utils/zendesk'; -import { useResearchWizardStore } from '@/stores/researchWizard'; -import { useCookieStore } from '@/stores/cookieData'; const VmInitializer = dynamic(() => import('../components/vm/VmInitializer'), { ssr: false, @@ -113,7 +114,7 @@ export default function App({ Component, pageProps }: AppPropsWithLayout) { } else { Gleap.showFeedbackButton(true); } - }, [isResearchFormDismissed, cookieData, gleapSdkToken]); + }, [isResearchFormDismissed, cookieData]); useEffect(() => { checkCookieData(); @@ -121,45 +122,53 @@ export default function App({ Component, pageProps }: AppPropsWithLayout) { return ( <> - - - - - - - -