evo/EvoCalculator.Client2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

disable notification for mobile & non calculation pages

Browse Source
This commit is contained in:
vchikalkin 2024-07-01 18:35:44 +03:00
parent d0856f95af
commit b99cad781e
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/web/Components/Common/Notification.tsx
View File

@ -1,4 +1,5 @@
/* eslint-disable import/no-mutable-exports */ /* eslint-disable import/no-mutable-exports */
import { Media } from '@/styles/media';
import type { MessageInstance } from 'antd/es/message/interface'; import type { MessageInstance } from 'antd/es/message/interface';
import type { NotificationInstance } from 'antd/es/notification/interface'; import type { NotificationInstance } from 'antd/es/notification/interface';
import type { ReactNode } from 'react'; import type { ReactNode } from 'react';
@ -26,7 +27,7 @@ export function Notification({ children }: { readonly children: ReactNode }) {
return ( return (
<> <>
{messageContextHolder} {messageContextHolder}
{notificationContextHolder} <Media greaterThanOrEqual="laptop">{notificationContextHolder}</Media>
{children} {children}
</> </>
); );

14
apps/web/pages/_app.jsx
View File

@ -4,7 +4,7 @@ import '../styles/antd-fix.css';
import '../styles/antd.min.css'; import '../styles/antd.min.css';
import initializeQueryClient from '@/api/client'; import initializeQueryClient from '@/api/client';
import initializeApollo from '@/apollo/client'; import initializeApollo from '@/apollo/client';
import { Loading, Notification } from '@/Components/Common'; import { Loading } from '@/Components/Common';
import Layout from '@/Components/Layout'; import Layout from '@/Components/Layout';
import { theme } from '@/config/ui'; import { theme } from '@/config/ui';
import { usePageLoading } from '@/hooks'; import { usePageLoading } from '@/hooks';
@ -55,13 +55,11 @@ function App({ Component, pageProps }) {
}, },
}} }}
> >
<Notification> <MediaContextProvider>
<MediaContextProvider> <Layout {...pageProps}>
<Layout {...pageProps}> {loading ? <Loading /> : <Component {...pageProps} />}
{loading ? <Loading /> : <Component {...pageProps} />} </Layout>
</Layout> </MediaContextProvider>
</MediaContextProvider>
</Notification>
</AntdConfig> </AntdConfig>
</QueryClientProvider> </QueryClientProvider>
</ApolloProvider> </ApolloProvider>

2
apps/web/pages/index.jsx
View File

@ -1,5 +1,6 @@
import initializeApollo from '@/apollo/client'; import initializeApollo from '@/apollo/client';
import * as Calculation from '@/Components/Calculation'; import * as Calculation from '@/Components/Calculation';
import { Notification } from '@/Components/Common';
import { Error } from '@/Components/Common/Error'; import { Error } from '@/Components/Common/Error';
import { NavigationBar, Tabs } from '@/Components/Layout/Navigation'; import { NavigationBar, Tabs } from '@/Components/Layout/Navigation';
import { NavigationProvider } from '@/context/navigation'; import { NavigationProvider } from '@/context/navigation';
@ -36,6 +37,7 @@ export function Content({ initHooks, title }) {
<Head> <Head>
<title>{getPageTitle(title)}</title> <title>{getPageTitle(title)}</title>
</Head> </Head>
<Notification />
<Media lessThan="laptop"> <Media lessThan="laptop">
<NavigationProvider> <NavigationProvider>
<Tabs tabs={tabs} /> <Tabs tabs={tabs} />