Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/ant 2709 remove create study #40

Merged
merged 8 commits into from
Jan 31, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,33 @@ import { Suspense } from 'react';
import { Route, Routes } from 'react-router-dom';
import './App.css';
import ThemeHandler from './components/common/handler/ThemeHandler';
import Navbar from './components/pegase/navbar/Navbar';
import PegaseStar from './components/pegase/star/PegaseStar';
import { UserContext } from '@/store/contexts/UserContext';
import { PEGASE_NAVBAR_ID } from './shared/constants';
import { THEME_COLOR } from './shared/types';
import { THEME_COLOR } from '@/shared/types';
import { menuBottomData, menuTopData } from './routes';
import { PegaseToastContainer } from './shared/notification/containers';
import ProjectDetails from './pages/pegase/projects/projectDetails/ProjectDetails';
import StudyDetails from '@/pages/pegase/studies/studyDetails/studyDetails';
import { RdsNavbar } from 'rte-design-system-react';
import { navBarConfig } from '@/shared/const/navBarConfig';
import { useTranslation } from 'react-i18next';
import { translateMenuItemLabel } from '@/shared/utils/textUtils.ts';

function App() {
const { t } = useTranslation();

return (
<div className="flex h-screen w-screen dark:bg-gray-900 dark:text-gray-200">
<UserContext.Provider initialState={{ theme: THEME_COLOR.LIGHT }}>
<ThemeHandler />
<PegaseToastContainer />
<Navbar id={PEGASE_NAVBAR_ID} bottomItems={menuBottomData} topItems={menuTopData} />
<RdsNavbar
id={'main-nav-bar'}
topItems={translateMenuItemLabel(menuTopData, t)}
bottomItems={translateMenuItemLabel(menuBottomData, t)}
headerLink={'/'}
config={navBarConfig}
/>
<div className="flex h-full w-full flex-col">
<PegaseStar />
<Suspense>
Expand Down
51 changes: 0 additions & 51 deletions src/components/common/layout/stdNavbar/StdNavbar.tsx

This file was deleted.

33 changes: 0 additions & 33 deletions src/components/common/layout/stdNavbar/StdNavbarController.tsx

This file was deleted.

44 changes: 0 additions & 44 deletions src/components/common/layout/stdNavbar/StdNavbarHeader.tsx

This file was deleted.

23 changes: 0 additions & 23 deletions src/components/common/layout/stdNavbar/StdNavbarMenu.tsx

This file was deleted.

35 changes: 0 additions & 35 deletions src/components/common/layout/stdNavbar/StdNavbarMenuItem.tsx

This file was deleted.

47 changes: 0 additions & 47 deletions src/components/common/layout/stdNavbar/navbarClassBuilder.ts

This file was deleted.

32 changes: 0 additions & 32 deletions src/components/common/layout/stdNavbar/tests/StdNavbar.test.tsx

This file was deleted.

This file was deleted.

This file was deleted.

Loading
Loading