Merge pull request #43 from deco-finter/feat/hifi-gallery-detail

[FAB-103] Hifi Gallery Detail
deco-finter · Sep 25, 2021 · 99a9f5f · 99a9f5f
2 parents 32b4feb + d14e1bb
commit 99a9f5f
Show file tree

Hide file tree

Showing 4 changed files with 254 additions and 96 deletions.
diff --git a/fableous-fe/src/App.tsx b/fableous-fe/src/App.tsx
@@ -139,7 +139,10 @@ export default function App() {
                 <InjectAxiosRespInterceptor />
                 <ThemeProvider theme={theme}>
                   <Navbar />
-                  <Container className="flex flex-col flex-1 pt-5 pb-12">
+                  <Container
+                    className="flex flex-col flex-1 pt-5 pb-12"
+                    disableGutters
+                  >
                     <Routes />
                   </Container>
                 </ThemeProvider>

diff --git a/fableous-fe/src/components/Navbar.tsx b/fableous-fe/src/components/Navbar.tsx
@@ -1,10 +1,11 @@
-import { makeStyles } from "@material-ui/core";
+import { Icon, makeStyles } from "@material-ui/core";
 import AppBar from "@material-ui/core/AppBar";
 import Toolbar from "@material-ui/core/Toolbar";
 import Typography from "@material-ui/core/Typography";
 import Button from "@material-ui/core/Button";
 import { Link, useHistory } from "react-router-dom";
 import { useContext } from "react";
+
 import { AuthContext } from "./AuthProvider";
 
 const useStyles = makeStyles(() => ({
@@ -36,14 +37,17 @@ export default function Navbar() {
             <Button
               variant="outlined"
               className="text-white"
+              startIcon={<Icon fontSize="small">person</Icon>}
               component={Link}
               to="/profile"
             >
               Profile
             </Button>
+
             <Button
               variant="outlined"
               className="ml-4 text-white"
+              startIcon={<Icon fontSize="small">logout</Icon>}
               onClick={onLogout}
             >
               Logout
@@ -54,6 +58,7 @@ export default function Navbar() {
             <Button
               variant="outlined"
               className="text-white"
+              startIcon={<Icon fontSize="small">login</Icon>}
               component={Link}
               to="/login"
             >
@@ -62,6 +67,7 @@ export default function Navbar() {
             <Button
               variant="outlined"
               className="ml-4 text-white"
+              startIcon={<Icon fontSize="small">person</Icon>}
               component={Link}
               to="/register"
             >

diff --git a/fableous-fe/src/containers/HomePage.tsx b/fableous-fe/src/containers/HomePage.tsx
@@ -1,4 +1,4 @@
-import { Button, Grid, Typography } from "@material-ui/core";
+import { Button, Grid, Icon, Typography } from "@material-ui/core";
 import { Link } from "react-router-dom";
 
 export default function HomePage() {
@@ -27,6 +27,7 @@ export default function HomePage() {
           variant="contained"
           color="secondary"
           component={Link}
+          endIcon={<Icon fontSize="small">brush</Icon>}
           to="/join"
         >
           Join