diff --git a/.github/workflows/dashboard-firebase-hosting-merge.yml b/.github/workflows/dashboard-firebase-hosting-merge.yml index 1293e33b..9fbe124b 100644 --- a/.github/workflows/dashboard-firebase-hosting-merge.yml +++ b/.github/workflows/dashboard-firebase-hosting-merge.yml @@ -18,7 +18,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: - node-version: "18" + node-version: "20" - run: | cd packages/client/dashboard yarn @@ -52,7 +52,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: - node-version: "18" + node-version: "20" - run: | cd packages/client/dashboard yarn diff --git a/.github/workflows/dashboard-firebase-hosting-pull-request.yml b/.github/workflows/dashboard-firebase-hosting-pull-request.yml index 9d4f9dd5..9e75bf1d 100644 --- a/.github/workflows/dashboard-firebase-hosting-pull-request.yml +++ b/.github/workflows/dashboard-firebase-hosting-pull-request.yml @@ -18,7 +18,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: - node-version: "18" + node-version: "20" - run: | cd packages/client/dashboard yarn @@ -51,7 +51,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: - node-version: "18" + node-version: "20" - run: | cd packages/client/dashboard yarn diff --git a/.github/workflows/scan-firebase-hosting-merge.yml b/.github/workflows/scan-firebase-hosting-merge.yml index 6d2f285b..a27d787f 100644 --- a/.github/workflows/scan-firebase-hosting-merge.yml +++ b/.github/workflows/scan-firebase-hosting-merge.yml @@ -18,7 +18,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: - node-version: '18' + node-version: '20' - run: | cd packages/client/scan yarn @@ -49,7 +49,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: - node-version: '18' + node-version: '20' - run: | cd packages/client/scan yarn diff --git a/.github/workflows/scan-firebase-hosting-pull-request.yml b/.github/workflows/scan-firebase-hosting-pull-request.yml index 01d826cd..1357ae6d 100644 --- a/.github/workflows/scan-firebase-hosting-pull-request.yml +++ b/.github/workflows/scan-firebase-hosting-pull-request.yml @@ -18,7 +18,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: - node-version: '18' + node-version: '20' - run: | cd packages/client/scan yarn @@ -48,7 +48,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: - node-version: '18' + node-version: '20' - run: | cd packages/client/scan yarn diff --git a/packages/client/dashboard/package.json b/packages/client/dashboard/package.json index 9a39452f..1b6f568c 100644 --- a/packages/client/dashboard/package.json +++ b/packages/client/dashboard/package.json @@ -3,9 +3,9 @@ "version": "0.1.0", "private": true, "dependencies": { - "@ceramicnetwork/common": "^2.26.0", - "@ceramicnetwork/http-client": "^2.22.0", - "@composedb/devtools": "0.5.0", + "@ceramicnetwork/common": "^3.2.0", + "@ceramicnetwork/http-client": "^3.2.0", + "@composedb/devtools": "0.6.1", "@graphiql/plugin-explorer": "^0.1.20", "@monaco-editor/react": "^4.5.1", "@rjsf/core": "^5.8.2", @@ -24,9 +24,10 @@ "@types/react": "^18.0.0", "@types/react-dom": "^18.0.0", "@types/styled-components": "^5.1.26", - "@us3r-network/auth-with-rainbowkit": "^0.1.8", - "@us3r-network/data-model": "^0.2.1", - "@us3r-network/profile": "^0.4.11", + "@us3r-network/auth-with-rainbowkit": "^0.2.4-alpha.0", + "@us3r-network/data-model": "^0.7.0", + "@us3r-network/profile": "^0.7.0", + "axios": "^1.6.2", "camelcase": "^7.0.1", "dayjs": "^1.11.7", "ejs": "^3.1.9", @@ -40,16 +41,22 @@ "prism-react-renderer": "^2.0.6", "prismjs": "^1.29.0", "react": "^18.2.0", - "react-aria-components": "^1.0.0-alpha.4", + "typescript": "^5.3.3", + "wagmi": "^1.4.10", + "viem": "^1.19.13", + "@rainbow-me/rainbowkit": "^1.3.0", + "react-aria-components": "^1.0.0", "react-dom": "^18.2.0", "react-infinite-scroll-component": "^6.1.0", "react-router-dom": "^6.11.2", "react-scripts": "5.0.1", "react-toastify": "^9.1.3", + "socket.io-client": "^4.7.2", "styled-components": "^5.3.11", - "typescript": "^4.4.2", "use-url-search-params": "^2.5.1", - "web-vitals": "^2.1.0" + "web-vitals": "^2.1.0", + "xterm": "^5.3.0", + "xterm-addon-fit": "^0.8.0" }, "scripts": { "start": "react-scripts start", diff --git a/packages/client/dashboard/src/App.tsx b/packages/client/dashboard/src/App.tsx index 66598632..dd3fecd3 100644 --- a/packages/client/dashboard/src/App.tsx +++ b/packages/client/dashboard/src/App.tsx @@ -1,78 +1,96 @@ -import { Outlet, Route, Routes, useLocation, useParams } from 'react-router-dom' -import styled from 'styled-components' -import dayjs from 'dayjs' -import relativeTime from 'dayjs/plugin/relativeTime' import { Us3rAuthWithRainbowkitProvider } from '@us3r-network/auth-with-rainbowkit' import { ProfileStateProvider } from '@us3r-network/profile' - -import { useAppCtx } from './context/AppCtx' - -import MyDapps from './container/MyDapps' -import NoMatch from './container/NoMatch' -import CeramicProvider from './context/AppCtx' +import dayjs from 'dayjs' +import relativeTime from 'dayjs/plugin/relativeTime' +import { useEffect, useState } from 'react' +// import { Radio, RadioGroup } from 'react-aria-components' +import { + // NavLink, + Outlet, + Route, + Routes, + useLocation, + useParams +} from 'react-router-dom' +import { ToastContainer } from 'react-toastify' +import 'react-toastify/dist/ReactToastify.min.css' +import styled from 'styled-components' +import DappModelAndComposites from './components/model/DappModelAndComposites' +import Header from './components/nav/Header' +import Nav from './components/nav/Nav' import { CERAMIC_TESTNET_HOST, WALLET_CONNECT_PROJECT_ID } from './constants' +import CeramicNodes from './container/CeramicNodes' +import Components from './container/Components' +import DappEditor from './container/DappEditor' import DappHome from './container/DappHome' -import DappCreate from './container/DappCreate' -import Header from './components/Header' -import Nav from './components/Nav' import DappInfo from './container/DappInfo' +import DappMetrics from './container/DappMetrics' +import DappPlayground from './container/DappPlayground' +import DappCreate from './container/DappQuickStart' +import DappSdk from './container/DappSdk' +import ExploreComposite from './container/ExploreComposite' import ExploreModel from './container/ExploreModel' - -import DappModelEditor from './container/DappModelEditor' -import DappModelPlayground from './container/DappModelPlayground' -import DappDataStatistic from './container/DappDataStatistic' -import Components from './container/Components' - -import { useEffect, useState } from 'react' -import ModelList from './components/ModelList' -import { DappComposite, ModelStream } from './types' -import { ToastContainer } from 'react-toastify' -import 'react-toastify/dist/ReactToastify.min.css' -import DappModelSdk from './container/DappModelSdk' +import MyDapps from './container/MyDapps' +import NoMatch from './container/NoMatch' +import AppProvider, { useAppCtx } from './context/AppCtx' +import CeramicNodeProvider from './context/CeramicNodeCtx' +import { DappCompositeDto, ModelStream } from './types.d' dayjs.extend(relativeTime) -function Routers() { +function Routers () { return ( - }> + }> } /> - } /> - }> - } /> - }> - } /> - } /> - } /> - } /> + } /> + }> + } /> + }> + } /> + } /> + } /> + + }> + } /> + } /> + } /> + } /> - } /> - } /> - } /> - } /> + } /> + } /> - } /> + } /> ) } -export default function App() { +export default function App () { return ( - - - + + + + + ) } -function Layout() { +function Layout () { return (
@@ -80,7 +98,7 @@ function Layout() {
) } -function DappLayout() { +function DappLayout () { const { loadingDApps, setCurrAppId } = useAppCtx() const { appId } = useParams() @@ -105,16 +123,16 @@ function DappLayout() { if (!appId || loadingDApps) { return ( -
-
- +
+
+
) } return ( -
+