Skip to content

Commit

Permalink
fix: revert changes and cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
PauliusPreiksaCode committed Jun 13, 2024
1 parent 9bef5b3 commit 54f1497
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 16 deletions.
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Box, Typography, useTheme } from '@mui/material';
import { useState } from 'react';
import { useLanguageContext } from '../../../contexts';
// import FunctionalityInstance from './FunctionalityInstance';
// import HistoryInstance from './HistoryInstance';
import FunctionalityInstance from './FunctionalityInstance';
import HistoryInstance from './HistoryInstance';

interface Props {}

Expand Down Expand Up @@ -50,15 +50,15 @@ export const ExtensionDisplay: React.FC<Props> = () => {
</Typography>
</Box>
</Box>
{/* <Box
<Box
display={'flex'}
flexDirection={'column'}
height={'calc(100% - 80px)'}
width={'100%'}
sx={{ backgroundColor: Theme.palette.background.paper }}
>
{selectedTab === 'Functionality' ? <FunctionalityInstance /> : <HistoryInstance />}
</Box> */}
</Box>
</Box>
);
};
14 changes: 2 additions & 12 deletions GUI/front-end/src/main/app/App.tsx
Original file line number Diff line number Diff line change
@@ -1,22 +1,13 @@
import React, { useEffect } from 'react';
import { Box, useTheme } from '@mui/material';
import { useGetUsers } from '../../hooks';
import { ExtensionDisplay, ChatDisplay } from '../../components/displays';
import BaseLayout from '../layout/BaseLayout';
import HeaderLayout from '../layout/HeaderLayout';
import '../../css/app/App.css';

function App() {
/// THESE LINES ARE ONLY FOR EXAMPLE PURPOSES ///

const { data } = useGetUsers();
useEffect(() => {
console.log(data);
}, [data]);

/////////////////////////////////////////////////

const [isDrawerOpen, setIsDrawerOpen] = React.useState(false);
const [isDrawerOpen, setIsDrawerOpen] = React.useState(true);
const Theme = useTheme();

useEffect(() => {
Expand Down Expand Up @@ -60,8 +51,7 @@ function App() {
}}
>
{/* Up - header */}
{/* TODO: set to isDrawerOpen */}
<HeaderLayout open={false} onClick={() => setIsDrawerOpen(!isDrawerOpen)} />
<HeaderLayout open={isDrawerOpen} onClick={() => setIsDrawerOpen(!isDrawerOpen)} />

{/* Chat display */}
<Box
Expand Down

0 comments on commit 54f1497

Please sign in to comment.