From b075d31ee8568a6f7153f64da7b47f14f10485a4 Mon Sep 17 00:00:00 2001 From: Tudor Stanciu Date: Sun, 4 Jul 2021 02:34:53 +0300 Subject: [PATCH] content component --- src/components/Layout/Content.js | 110 ++++++++++++++++++++++++ src/components/Layout/Layout.js | 142 ++----------------------------- 2 files changed, 119 insertions(+), 133 deletions(-) create mode 100644 src/components/Layout/Content.js diff --git a/src/components/Layout/Content.js b/src/components/Layout/Content.js new file mode 100644 index 0000000..3f24ca7 --- /dev/null +++ b/src/components/Layout/Content.js @@ -0,0 +1,110 @@ +import React from "react"; +import { Route, Switch, Redirect } from "react-router-dom"; +import classnames from "classnames"; +import { Box, IconButton, Link } from "@material-ui/core"; +import Icon from "@mdi/react"; + +//icons +import { + mdiFacebook as FacebookIcon, + mdiTwitter as TwitterIcon, + mdiGithub as GithubIcon +} from "@mdi/js"; + +// pages +import Dashboard from "../../pages/dashboard/Dashboard"; +import Typography from "../../pages/typography/Typography"; +import Notifications from "../../pages/notifications/Notifications"; +import Maps from "../../pages/maps/Maps"; +import Tables from "../../pages/tables/Tables"; +import Icons from "../../pages/icons/Icons"; +import Charts from "../../pages/charts/Charts"; + +// context +import { useLayoutState } from "../../context/LayoutContext"; + +// styles +import useStyles from "./styles"; + +const Content = () => { + // global + var layoutState = useLayoutState(); + var classes = useStyles(); + + return ( +
+
+ + + + + + } + /> + + + + + +
+ + Flatlogic + + + About Us + + + Blog + +
+
+ + + + + + + + + + + + + + + +
+
+
+ ); +}; + +export default Content; diff --git a/src/components/Layout/Layout.js b/src/components/Layout/Layout.js index 8b09c84..882fb5d 100644 --- a/src/components/Layout/Layout.js +++ b/src/components/Layout/Layout.js @@ -1,148 +1,24 @@ import React from "react"; -import { - Route, - Switch, - Redirect, - withRouter, -} from "react-router-dom"; -import classnames from "classnames"; -import {Box, IconButton, Link} from '@material-ui/core' -import Icon from '@mdi/react' - -//icons -import { - mdiFacebook as FacebookIcon, - mdiTwitter as TwitterIcon, - mdiGithub as GithubIcon, -} from '@mdi/js' - -// styles -import useStyles from "./styles"; +import { withRouter } from "react-router-dom"; // components import Header from "../Header"; import Sidebar from "../Sidebar"; +import Content from "./Content"; -// pages -import Dashboard from "../../pages/dashboard"; -import Typography from "../../pages/typography"; -import Notifications from "../../pages/notifications"; -import Maps from "../../pages/maps"; -import Tables from "../../pages/tables"; -import Icons from "../../pages/icons"; -import Charts from "../../pages/charts"; - -// context -import { useLayoutState } from "../../context/LayoutContext"; +// styles +import useStyles from "./styles"; function Layout(props) { var classes = useStyles(); - // global - var layoutState = useLayoutState(); - return (
- <> -
- -
-
- - - - - - } - /> - - - - - -
- - Flatlogic - - - About Us - - - Blog - -
-
- - - - - - - - - - - - - - - -
-
-
- + <> +
+ + +
); }