diff --git a/packages/webapp/src/components/board/Board.scss b/packages/webapp/src/components/board/Board.scss
index bc648a8..5fb0347 100644
--- a/packages/webapp/src/components/board/Board.scss
+++ b/packages/webapp/src/components/board/Board.scss
@@ -2,7 +2,11 @@
flex-grow: 1;
}
.board-content{
+ margin-bottom: 60px;
margin-top: 1vh;
+ overflow-y: auto;
+ height: 100vh;
+ padding-bottom: 165px;
}
.category{
padding: 0 1vw;
@@ -37,6 +41,7 @@
}
.toolbar-box{
+ margin-top: 65px;
padding: 0.5%;
border-bottom-color: rgb(194, 194, 194) !important;
}
diff --git a/packages/webapp/src/components/board/Board.tsx b/packages/webapp/src/components/board/Board.tsx
index 5abc384..68d70ee 100644
--- a/packages/webapp/src/components/board/Board.tsx
+++ b/packages/webapp/src/components/board/Board.tsx
@@ -20,6 +20,7 @@ import InfoOutlinedIcon from '@material-ui/icons/InfoOutlined';
import './Board.scss';
import { getUserIDStorageKey } from '../../common-utils';
+import Footer from '../common/footer/Footer';
type NoteType = { category: string, text: string, boardId: string, cardId: string, votes: string[] };
type TBoardStateProps = { userId: string; boardId: string; safetyScores: number[], connectionStatus: ConnectionStatus, notes: any }
@@ -150,6 +151,7 @@ const Boards = ({
))}
+
diff --git a/packages/webapp/src/components/common/footer/Footer.scss b/packages/webapp/src/components/common/footer/Footer.scss
new file mode 100644
index 0000000..019e0ad
--- /dev/null
+++ b/packages/webapp/src/components/common/footer/Footer.scss
@@ -0,0 +1,21 @@
+.custom-footer{
+ top: auto !important;
+ bottom: 0;
+ height: 45px;
+ flex-grow: 1;
+}
+.branding-text{
+ color:#5a5858;
+ flex-grow: 1;
+ margin-left: 2vh !important;
+ margin-bottom: 1.35em !important;
+}
+.feedback-text{
+ color:#5a5858;
+ margin-right: 2vh !important;
+ margin-bottom: 1.35em !important;
+}
+.toolbar{
+ padding-left: 0.3% !important;
+ padding-right: 0.3% !important;
+}
\ No newline at end of file
diff --git a/packages/webapp/src/components/common/footer/Footer.tsx b/packages/webapp/src/components/common/footer/Footer.tsx
new file mode 100644
index 0000000..0737a69
--- /dev/null
+++ b/packages/webapp/src/components/common/footer/Footer.tsx
@@ -0,0 +1,22 @@
+import React from "react";
+import AppBar from '@material-ui/core/AppBar';
+import Toolbar from '@material-ui/core/Toolbar';
+import { CssBaseline, Typography } from "@material-ui/core";
+
+import './Footer.scss';
+
+const Footer = () => {
+ return (
+
+
+
+
+ From the minds of Bored Engineers
+ Please provide your valuable feedback here .
+
+
+
+ );
+}
+
+export default Footer;
\ No newline at end of file
diff --git a/packages/webapp/src/components/common/navbar/Navbar.tsx b/packages/webapp/src/components/common/navbar/Navbar.tsx
index ce70810..f628b69 100644
--- a/packages/webapp/src/components/common/navbar/Navbar.tsx
+++ b/packages/webapp/src/components/common/navbar/Navbar.tsx
@@ -13,7 +13,7 @@ const Navbar = () => {
const browserHistory = useHistory();
return (
-
+
{ browserHistory.push('/') }}>
diff --git a/packages/webapp/src/components/common/navbar/board-info/BoardInfo.tsx b/packages/webapp/src/components/common/navbar/board-info/BoardInfo.tsx
index c223b2c..1fa1b94 100644
--- a/packages/webapp/src/components/common/navbar/board-info/BoardInfo.tsx
+++ b/packages/webapp/src/components/common/navbar/board-info/BoardInfo.tsx
@@ -3,10 +3,8 @@ import { connect } from 'react-redux';
import { exportBoard } from '../../../../services/board.service'
import Button from '@material-ui/core/Button';
import { ButtonGroup, Menu, MenuItem, Divider, ListItemIcon, ListItemText } from '@material-ui/core';
-import { useHistory } from 'react-router'
import PictureAsPdfRoundedIcon from '@material-ui/icons/PictureAsPdfRounded';
import FileCopyRoundedIcon from '@material-ui/icons/FileCopyRounded';
-import FeedbackRoundedIcon from '@material-ui/icons/FeedbackRounded';
import ArrowDropDownIcon from '@material-ui/icons/ArrowDropDown';
import ArrowDropUpIcon from '@material-ui/icons/ArrowDropUp';
import FiberManualRecordIcon from '@material-ui/icons/FiberManualRecord';
@@ -28,7 +26,6 @@ type TBoardInfoDispatchProps = {
type TBoardInfoProps = TBoardInfoStateProps & TBoardInfoDispatchProps;
const BoardInfo = ({ boardId, connectionStatus, addToastMessage }: TBoardInfoProps) => {
- const browserHistory = useHistory();
const [anchorEl, setAnchorEl] = React.useState(null);
const onClickBoardInfoHeading = async (event: any) => {
@@ -48,10 +45,6 @@ const BoardInfo = ({ boardId, connectionStatus, addToastMessage }: TBoardInfoPro
exportBoard(boardId);
};
- const onFeedBack = (event: any) => {
- setAnchorEl(null);
- browserHistory.push(`/survey`);
- };
const handleClose = () => {
setAnchorEl(null);
};
@@ -76,14 +69,12 @@ const BoardInfo = ({ boardId, connectionStatus, addToastMessage }: TBoardInfoPro
anchorOrigin={{ vertical: 'bottom', horizontal: 'center' }}
transformOrigin={{ vertical: 'top', horizontal: 'center' }}
>
- {getConnectionStatusIcon()}
+ {getConnectionStatusIcon()}
-
-
);
}
diff --git a/packages/webapp/src/index.scss b/packages/webapp/src/index.scss
index 430af1d..2deaa70 100644
--- a/packages/webapp/src/index.scss
+++ b/packages/webapp/src/index.scss
@@ -1,6 +1,6 @@
html, body, #root{
width: 100%;
height: 100%;
- // overflow: hidden; // commenting these two causes bounce affect but scroll works in other pages
+ overflow: hidden; // commenting these two causes bounce affect but scroll works in other pages
// position: relative;
}
\ No newline at end of file