From 2544e946d18512fc01a6b223bd8988e2ed097269 Mon Sep 17 00:00:00 2001
From: HaneenT <haneen@umich.edu>
Date: Tue, 26 Sep 2023 15:53:27 -0400
Subject: [PATCH 1/2] KPMP-4779: Updated styling for footer

---
 package.json                                           |  2 +-
 src/App.js                                             |  1 -
 src/components/Error/NotFoundPage.js                   |  2 ++
 src/components/Error/Oops.js                           |  2 ++
 .../SpatialViewer/ImageDatasetListSubContainer.js      |  2 ++
 src/index.scss                                         | 10 +++++++---
 6 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 9ed09658..4b7792d9 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
     "history": "5.1.0",
     "immutability-helper": "3.1.1",
     "isomorphic-unfetch": "3.1.0",
-    "kpmp-common-components": "1.2.3",
+    "kpmp-common-components": "1.2.4",
     "kpmp-common-styles": "1.0.13",
     "react": "17.0.2",
     "react-dnd": "15.1.1",
diff --git a/src/App.js b/src/App.js
index 4a633190..4586ea47 100755
--- a/src/App.js
+++ b/src/App.js
@@ -99,7 +99,6 @@ class App extends Component {
               <Route exact path="/oops" component={Oops} />
               <Route path='*' component={NotFoundPage} />
             </Switch>
-            <NavFooter app='atlas' />
           </ErrorBoundaryContainer>
         </BrowserRouter>
         </SearchProvider>
diff --git a/src/components/Error/NotFoundPage.js b/src/components/Error/NotFoundPage.js
index f7b66245..be45139f 100644
--- a/src/components/Error/NotFoundPage.js
+++ b/src/components/Error/NotFoundPage.js
@@ -1,5 +1,6 @@
 import React, { Component } from 'react';
 import { Row, Col, Button } from 'reactstrap';
+import { NavFooter } from 'kpmp-common-components';
 
 class NotFoundPage extends Component {
     render() {
@@ -24,6 +25,7 @@ class NotFoundPage extends Component {
                         </p>
                     </Col>
                 </Row>
+            <NavFooter app='atlas' />
           </article>
         );
     }
diff --git a/src/components/Error/Oops.js b/src/components/Error/Oops.js
index f330734e..d993935a 100644
--- a/src/components/Error/Oops.js
+++ b/src/components/Error/Oops.js
@@ -1,5 +1,6 @@
 import React, { Component } from 'react';
 import { Col, Row, Button } from 'reactstrap';
+import { NavFooter } from 'kpmp-common-components';
 
 class Oops extends Component {
   render() {
@@ -36,6 +37,7 @@ class Oops extends Component {
           </Row>
         </article>
 
+        <NavFooter app='atlas' />
       </div>
     );
   }
diff --git a/src/components/SpatialViewer/ImageDatasetListSubContainer.js b/src/components/SpatialViewer/ImageDatasetListSubContainer.js
index 8e068e2a..ca26b4ae 100755
--- a/src/components/SpatialViewer/ImageDatasetListSubContainer.js
+++ b/src/components/SpatialViewer/ImageDatasetListSubContainer.js
@@ -2,6 +2,7 @@ import React, { Component } from 'react';
 import { Container } from "reactstrap";
 import ImageDatasetList from "./ImageDatasetList";
 
+import { NavFooter } from 'kpmp-common-components';
 import { WithSearch } from "@elastic/react-search-ui";
 import { handleGoogleAnalyticsEvent } from '../../helpers/googleAnalyticsHelper';
 
@@ -72,6 +73,7 @@ class ImageDatasetListSubContainer extends Component {
                     />
                 )}}
                 </WithSearch>
+            <NavFooter app='atlas' />
             </Container>
         )
     }
diff --git a/src/index.scss b/src/index.scss
index 9cfc5c9e..687dc316 100755
--- a/src/index.scss
+++ b/src/index.scss
@@ -46,7 +46,6 @@
 .spatial-filter-panel {
     margin-top: 3.5rem !important;
     border-top-left-radius: 0px !important;
-    min-height: 70vh;
     // height calculation includes header, footer and additional element widths
     height: calc(100vh - 220px);
     overflow-y: scroll;
@@ -401,7 +400,6 @@ td:hover {
     box-sizing: border-box;
     position: relative;
     outline: currentcolor none medium;
-    padding: 5px;
     border-right: 2px solid rgba(0, 0, 0, 0);
 }
 .sort-dialog-option-wrapper:hover {
@@ -552,7 +550,13 @@ td:hover {
         - 150px);
 }
 
-@media only screen and (min-width: 1600px) {
+#footer {
+    width: 100vw;
+    left: 0px;
+    position: absolute;
+}
+
+@media only screen and (min-width: 1200px) {
     #footer {
         position: fixed;
         bottom: 0px;

From 88a5112938248a0aef5459a80141ca5393f0ed0d Mon Sep 17 00:00:00 2001
From: HaneenT <haneen@umich.edu>
Date: Tue, 26 Sep 2023 16:23:41 -0400
Subject: [PATCH 2/2] removed unused import

---
 src/App.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/App.js b/src/App.js
index 4586ea47..72a8d137 100755
--- a/src/App.js
+++ b/src/App.js
@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import { NavBar, NavFooter } from 'kpmp-common-components';
+import { NavBar } from 'kpmp-common-components';
 import loadedState from './initialState';
 import { createStore, applyMiddleware } from 'redux';
 import appReducer from './reducers';