Доработка мелочей и начало интернац.
This commit is contained in:
parent
486d46c467
commit
48e8551b0e
21 changed files with 408 additions and 76 deletions
|
|
@ -3,7 +3,7 @@ import { createRoot } from 'react-dom/client';
|
|||
import { HashRouter } from 'react-router-dom';
|
||||
import { useIpStore } from './src/store';
|
||||
import { useEffect } from 'react';
|
||||
import {useCheckAdmin} from './src/utils/checkAdmin.ts'
|
||||
import { useCheckAdmin } from './src/utils/checkAdmin';
|
||||
|
||||
import {
|
||||
ModalProvider,
|
||||
|
|
@ -11,28 +11,44 @@ import {
|
|||
ThemeProvider
|
||||
} from './src/store';
|
||||
|
||||
import WindowComponent from './src/components/modalwindows/modalWindow.tsx';
|
||||
import Router from './src/router.tsx';
|
||||
import WindowComponent from './src/components/modalwindows/modalWindow';
|
||||
import Router from './src/router';
|
||||
import { I18nProvider } from "./src/utils/i18n/provider";
|
||||
import { useLanguage } from "./src/hooks/useSettings";
|
||||
|
||||
const AppWithProviders = () => {
|
||||
const currentLanguage = useLanguage();
|
||||
|
||||
return (
|
||||
<I18nProvider initialLanguage={currentLanguage}>
|
||||
<ThemeProvider>
|
||||
<HashRouter>
|
||||
<ModalProvider>
|
||||
<MainComponent />
|
||||
</ModalProvider>
|
||||
</HashRouter>
|
||||
</ThemeProvider>
|
||||
</I18nProvider>
|
||||
);
|
||||
};
|
||||
|
||||
const MainComponent = () => {
|
||||
|
||||
const checkAdmin = useCheckAdmin()
|
||||
const {ipAddress} = useIpStore()
|
||||
const checkAdmin = useCheckAdmin();
|
||||
const { ipAddress } = useIpStore();
|
||||
|
||||
useEffect(() => {
|
||||
const checkAdminStatus = async () => {
|
||||
await checkAdmin()
|
||||
}
|
||||
checkAdminStatus()
|
||||
}, [ipAddress])
|
||||
|
||||
await checkAdmin();
|
||||
};
|
||||
checkAdminStatus();
|
||||
}, [ipAddress]);
|
||||
|
||||
const { isOpen, modalType, modalData } = useModalContext();
|
||||
return (
|
||||
<>
|
||||
<WindowComponent isOpen={isOpen} type={modalType} data={modalData} />
|
||||
<Router />
|
||||
</>
|
||||
<>
|
||||
<WindowComponent isOpen={isOpen} type={modalType} data={modalData} />
|
||||
<Router />
|
||||
</>
|
||||
);
|
||||
};
|
||||
|
||||
|
|
@ -40,13 +56,6 @@ const container = document.getElementById('root');
|
|||
if (!container) {
|
||||
throw new Error('Root element with id "root" not found');
|
||||
}
|
||||
|
||||
const root = createRoot(container);
|
||||
root.render(
|
||||
<ThemeProvider>
|
||||
<HashRouter>
|
||||
<ModalProvider>
|
||||
<MainComponent />
|
||||
</ModalProvider>
|
||||
</HashRouter>
|
||||
</ThemeProvider>
|
||||
);
|
||||
root.render(<AppWithProviders />);
|
||||
Loading…
Add table
Add a link
Reference in a new issue