This is an automated email from the ASF dual-hosted git repository. mintsweet pushed a commit to branch next in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
commit 9a7c5f177dbed81c1ac7dded8c98291789211b5e Author: mintsweet <[email protected]> AuthorDate: Mon Oct 23 16:46:24 2023 +1300 feat(config-ui): integrate external code --- config-ui/src/App.tsx | 8 +++++++- config-ui/src/app/store.ts | 2 ++ config-ui/vite.config.ts | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/config-ui/src/App.tsx b/config-ui/src/App.tsx index 11757250e..cff5889f1 100644 --- a/config-ui/src/App.tsx +++ b/config-ui/src/App.tsx @@ -33,6 +33,8 @@ import { Error, ErrorEnum } from '@/routes/error'; import { Pipelines, Pipeline } from '@/routes/pipeline'; import { ApiKeys } from '@/routes/api-keys'; +import { ExtraLayout } from '@next'; + const router = createBrowserRouter([ { path: 'db-migrate', @@ -44,7 +46,11 @@ const router = createBrowserRouter([ }, { path: '/', - element: <Layout />, + element: ( + <ExtraLayout> + <Layout></Layout> + </ExtraLayout> + ), loader: layoutLoader, errorElement: <Error />, children: [ diff --git a/config-ui/src/app/store.ts b/config-ui/src/app/store.ts index 4e27d7f1d..772dc4784 100644 --- a/config-ui/src/app/store.ts +++ b/config-ui/src/app/store.ts @@ -18,10 +18,12 @@ import { configureStore, ThunkAction, Action } from '@reduxjs/toolkit'; import ConnectionSlice from '@/features/connections/slice'; +import userSlice from '@next/user/slice'; export const store = configureStore({ reducer: { connections: ConnectionSlice, + user: userSlice, }, }); diff --git a/config-ui/vite.config.ts b/config-ui/vite.config.ts index 89f068d13..92db4c918 100644 --- a/config-ui/vite.config.ts +++ b/config-ui/vite.config.ts @@ -38,6 +38,7 @@ export default defineConfig({ resolve: { alias: { '@': path.join(__dirname, './src'), + '@next': path.join(__dirname, '../../frontend/src'), }, }, });
