cleaning up the carbon mess and adding mui again
This commit is contained in:
@@ -1,17 +1,28 @@
|
||||
import { QueryClient, QueryClientProvider } from "react-query";
|
||||
|
||||
import { GlobalTheme } from "@carbon/react/lib/components/Theme";
|
||||
import Login from "./Login";
|
||||
import NirvanaRouter from "./router";
|
||||
import ProtectedRoute from "../components/ProtectedRoute";
|
||||
import { ReactQueryDevtools } from "react-query/devtools";
|
||||
import { RecoilRoot } from "recoil";
|
||||
import { Toaster } from "react-hot-toast";
|
||||
import { createTheme } from "@mui/material";
|
||||
import io from "socket.io-client";
|
||||
import testConnection from "@nirvana/core";
|
||||
|
||||
testConnection();
|
||||
|
||||
const theme = createTheme({
|
||||
palette: {
|
||||
primary: {
|
||||
main: "#438E86",
|
||||
},
|
||||
secondary: {
|
||||
main: "#393939",
|
||||
},
|
||||
},
|
||||
});
|
||||
|
||||
// Create a client
|
||||
export const queryClient = new QueryClient();
|
||||
|
||||
@@ -21,14 +32,12 @@ function NirvanaApp() {
|
||||
return (
|
||||
<>
|
||||
<QueryClientProvider client={queryClient}>
|
||||
<GlobalTheme theme="white">
|
||||
<RecoilRoot>
|
||||
<ProtectedRoute>
|
||||
<NirvanaRouter />
|
||||
</ProtectedRoute>
|
||||
<ReactQueryDevtools initialIsOpen={true} position={"bottom-left"} />
|
||||
</RecoilRoot>
|
||||
</GlobalTheme>
|
||||
<RecoilRoot>
|
||||
<ProtectedRoute>
|
||||
<NirvanaRouter />
|
||||
</ProtectedRoute>
|
||||
<ReactQueryDevtools initialIsOpen={true} position={"bottom-left"} />
|
||||
</RecoilRoot>
|
||||
<Toaster />
|
||||
</QueryClientProvider>
|
||||
</>
|
||||
|
||||
@@ -1,6 +1,3 @@
|
||||
import { Button, Search } from "@carbon/react";
|
||||
|
||||
import { Add } from "@carbon/react/icons";
|
||||
import NirvanaHeader from "../../components/header";
|
||||
|
||||
export default function NirvanaTerminal() {
|
||||
@@ -8,24 +5,7 @@ export default function NirvanaTerminal() {
|
||||
<div className="flex flex-col flex-1">
|
||||
<NirvanaHeader />
|
||||
|
||||
<div className="flex flex-row m-2 gap-2">
|
||||
<Search
|
||||
closeButtonLabelText="Clear search input"
|
||||
id="search-1"
|
||||
placeholder={"search for anything someone said or shared"}
|
||||
onChange={function noRefCheck() {}}
|
||||
onKeyDown={function noRefCheck() {}}
|
||||
size="sm"
|
||||
/>
|
||||
|
||||
<Button
|
||||
size="sm"
|
||||
kind="secondary"
|
||||
hasIconOnly
|
||||
renderIcon={Add}
|
||||
iconDescription="New line"
|
||||
/>
|
||||
</div>
|
||||
<div className="flex flex-row m-2 gap-2"></div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user