From 7ba15a22d1bd57e7c26ff2d5fccf5505aaf8619e Mon Sep 17 00:00:00 2001 From: eug-vs Date: Mon, 10 Aug 2020 00:28:39 +0300 Subject: refactor: move pages -> containers --- src/containers/Page/Page.tsx | 59 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 src/containers/Page/Page.tsx (limited to 'src/containers/Page') diff --git a/src/containers/Page/Page.tsx b/src/containers/Page/Page.tsx new file mode 100644 index 0000000..8a39636 --- /dev/null +++ b/src/containers/Page/Page.tsx @@ -0,0 +1,59 @@ +import React, { Suspense } from 'react'; +import { makeStyles, useTheme } from '@material-ui/core/styles'; +import { useMediaQuery } from '@material-ui/core'; +import { SnackbarProvider } from 'notistack'; +import { Switch, Route } from 'react-router-dom'; +import Loading from '../../components/Loading/Loading'; + +const ProfilePage = React.lazy(() => import('../ProfilePage/ProfilePage')); +const FeedPage = React.lazy(() => import('../FeedPage/FeedPage')); +const LoginPage = React.lazy(() => import('../LoginPage/LoginPage')); +const RegistrationPage = React.lazy(() => import('../RegistrationPage/RegistrationPage')); +const HomePage = React.lazy(() => import('../HomePage/HomePage')); +const NotificationsPage = React.lazy(() => import('../NotificationsPage/NotificationsPage')); + + +const useStyles = makeStyles(theme => ({ + root: { + [theme.breakpoints.down('sm')]: { + margin: theme.spacing(2, 0, 12, 0) + }, + [theme.breakpoints.up('md')]: { + margin: theme.spacing(15, 5, 8, 5) + } + } +})); + + +const Page: React.FC = () => { + const classes = useStyles(); + const theme = useTheme(); + const isMobile = useMediaQuery(theme.breakpoints.down('sm')); + + return ( + +
+ }> + + + + + + + + + +
+
+ ); +}; + + +export default Page; + -- cgit v1.2.3 From f97989967ee0b88a8c64f226a4b28a79eeef5fd2 Mon Sep 17 00:00:00 2001 From: eug-vs Date: Mon, 10 Aug 2020 11:19:53 +0300 Subject: refactor: remove "Page" from container names --- src/containers/Page/Page.tsx | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'src/containers/Page') diff --git a/src/containers/Page/Page.tsx b/src/containers/Page/Page.tsx index 8a39636..df27b74 100644 --- a/src/containers/Page/Page.tsx +++ b/src/containers/Page/Page.tsx @@ -5,12 +5,12 @@ import { SnackbarProvider } from 'notistack'; import { Switch, Route } from 'react-router-dom'; import Loading from '../../components/Loading/Loading'; -const ProfilePage = React.lazy(() => import('../ProfilePage/ProfilePage')); -const FeedPage = React.lazy(() => import('../FeedPage/FeedPage')); -const LoginPage = React.lazy(() => import('../LoginPage/LoginPage')); -const RegistrationPage = React.lazy(() => import('../RegistrationPage/RegistrationPage')); -const HomePage = React.lazy(() => import('../HomePage/HomePage')); -const NotificationsPage = React.lazy(() => import('../NotificationsPage/NotificationsPage')); +const Profile = React.lazy(() => import('../Profile/Profile')); +const Feed = React.lazy(() => import('../Feed/Feed')); +const Login = React.lazy(() => import('../Login/Login')); +const Registration = React.lazy(() => import('../Registration/Registration')); +const Home = React.lazy(() => import('../Home/Home')); +const Notifications = React.lazy(() => import('../Notifications/Notifications')); const useStyles = makeStyles(theme => ({ @@ -41,12 +41,12 @@ const Page: React.FC = () => {
}> - - - - - - + + + + + +
-- cgit v1.2.3 From 35fcdceb8f04fe333d45c5b1cb7ba395352c92d6 Mon Sep 17 00:00:00 2001 From: eug-vs Date: Mon, 10 Aug 2020 13:22:00 +0300 Subject: feat: only allow 1 snackbar on mobile --- src/containers/Page/Page.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/containers/Page') diff --git a/src/containers/Page/Page.tsx b/src/containers/Page/Page.tsx index df27b74..643e6de 100644 --- a/src/containers/Page/Page.tsx +++ b/src/containers/Page/Page.tsx @@ -32,7 +32,7 @@ const Page: React.FC = () => { return (