Skip to content

Commit cb1a1b0

Browse files
JamesonRGrieveJamesonRGrieve
committed
Merge branch 'main' of github.com:JamesonRGrieve/ClientFramework into dev
2 parents 41677af + af8075e commit cb1a1b0

36 files changed

+2501
-107
lines changed

‎src/app/NavMain.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import { ChevronRightIcon } from '@radix-ui/react-icons';
44

55
import { useTeam } from '@/auth/hooks/useTeam';
6+
import { items } from '@/components/auth/src/NavMenu';
67
import { Collapsible, CollapsibleContent, CollapsibleTrigger } from '@/components/ui/collapsible';
78
import {
89
SidebarGroup,
@@ -15,7 +16,6 @@ import {
1516
SidebarMenuSubItem,
1617
useSidebar,
1718
} from '@/components/ui/sidebar';
18-
import { items } from '@/interactive/NavMenu';
1919
import { cn } from '@/lib/utils';
2020
import Link from 'next/link';
2121
import { usePathname, useRouter, useSearchParams } from 'next/navigation';

‎src/app/docs/api-reference/page.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { SidebarPage } from '@/appwrapper/SidebarPage';
2-
import MarkdownBlock from '@/interactive/components/Chat/Message/MarkdownBlock';
2+
import MarkdownBlock from '@/components/markdown/MarkdownBlock';
33

44
export default function APIReference() {
55
const content = `See our [REST API Documentation](${process.env.NEXT_PUBLIC_API_URI}/redoc) for more information.`;

‎src/app/docs/privacy/page.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { SidebarPage } from '@/appwrapper/SidebarPage';
2-
import MarkdownBlock from '@/interactive/components/Chat/Message/MarkdownBlock';
2+
import MarkdownBlock from '@/components/markdown/MarkdownBlock';
33
import fs from 'fs';
44
import path from 'path';
55

‎src/app/layout.tsx‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ import { SidebarContext } from '@/appwrapper/SidebarContext';
44
import { SidebarMain } from '@/appwrapper/SidebarMain';
55
import { SidebarProvider } from '@/components/ui/sidebar';
66
import { Toaster } from '@/components/ui/toaster';
7-
import InteractiveConfigContextWrapper from '@/interactive/ContextWrapper';
8-
import { CommandMenuProvider } from '@/interface/Selectors/Command/command-menu-context';
97
import { cn } from '@/lib/utils';
108
import '@/zod2gql';
119
import { cookies } from 'next/headers';
@@ -33,19 +31,15 @@ export default async function RootLayout({ children }: { children: ReactNode }):
3331
<html lang='en'>
3432
<Head />
3533
<body className={cn(/*inter.className,*/ theme, appearance)}>
36-
<InteractiveConfigContextWrapper>
37-
<CommandMenuProvider>
38-
<SidebarContentProvider>
39-
<SidebarProvider className='flex-1'>
40-
<SidebarMain side='left' />
41-
{children}
42-
<Toaster />
43-
{/* <ThemeSetter /> */}
44-
<SidebarContext side='right' />
45-
</SidebarProvider>
46-
</SidebarContentProvider>
47-
</CommandMenuProvider>
48-
</InteractiveConfigContextWrapper>
34+
<SidebarContentProvider>
35+
<SidebarProvider className='flex-1'>
36+
<SidebarMain side='left' />
37+
{children}
38+
<Toaster />
39+
{/* <ThemeSetter /> */}
40+
<SidebarContext side='right' />
41+
</SidebarProvider>
42+
</SidebarContentProvider>
4943
</body>
5044
</html>
5145
);

‎src/app/notifications/page.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use client';
22

33
import { SidebarPage } from '@/appwrapper/SidebarPage';
4-
import { EmptyNotifications, Notifications } from '@/interactive/components/Notifications';
4+
import { EmptyNotifications, Notifications } from '@/components/appwrapper/src/Notifications';
55
import { useState } from 'react';
66

77
export const dummyNotifications = [

‎src/app/page.tsx‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { ThemeToggle } from '@/components/theme/ThemeToggle';
22
import { Button } from '@/components/ui/button';
3-
import InteractiveHome from '@/interface/Home';
3+
44
import { cookies } from 'next/headers';
55
import Link from 'next/link';
66
import { redirect } from 'next/navigation';
@@ -30,9 +30,7 @@ export default function Home() {
3030
</Link>
3131
</div>
3232
</header>
33-
<main>
34-
<InteractiveHome />
35-
</main>
33+
<main></main>
3634
</div>
3735
);
3836
}

‎src/app/settings/chains/page.tsx‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎src/app/settings/extensions/page.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { SidebarPage } from '@/appwrapper/SidebarPage';
2-
import { Extensions } from '@/interface/Settings/extensions';
2+
import { Extensions } from '@/components/settings/extensions';
33

44
export default function ExtensionsPage() {
55
return (

‎src/app/settings/page.tsx‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
import { SidebarPage } from '@/appwrapper/SidebarPage';
2-
import AgentPanel from '@/interface/Settings/agent/AgentPanel';
3-
import { Providers } from '@/interface/Settings/providers';
42
import { SidebarContent } from '@/components/appwrapper/src/SidebarContentManager';
3+
import { Providers } from '@/components/settings/providers';
54

65
export default function ProvidersPage() {
76
return (
87
<SidebarPage title='Settings'>
9-
<SidebarContent title='Agent Settings'>
10-
<AgentPanel />
8+
<SidebarContent title='Settings'>
9+
<div></div>
1110
</SidebarContent>
1211
<Providers />
1312
</SidebarPage>

‎src/app/settings/prompts/page.tsx‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)