Fix reference (#119)

* Fixed phenopolis reference, and footer. * Fixed phenopolis reference, and footer.
phenopolis · Jun 30, 2020 · a5aca45 · a5aca45
1 parent ff05bae
commit a5aca45
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/src/App.js b/src/App.js
@@ -6,7 +6,7 @@ import { blue, red } from '@material-ui/core/colors';
 import './assets/carolina/base.scss';
 
 import HomeAppBar from './page/HomeAppBar';
-import Footer from './page/Footer';
+// import Footer from './page/Footer';
 import Login from './page/Login';
 import Home from './page/Home';
 import Product from './page/Product';
@@ -58,7 +58,6 @@ function App() {
               <Route path="/individual/:individualId" component={Individual} />
               <Route path="/variant/:variantId" component={Variant} />
             </HomeAppBar>
-            <Footer />
           </ThemeProvider>
         </Router>
       </Suspense>

diff --git a/src/components/AppBar/LoginBar.js b/src/components/AppBar/LoginBar.js
@@ -44,6 +44,7 @@ import ChevronLeftIcon from '@material-ui/icons/ChevronLeft';
 
 // import Sidebar from './Sidebar';
 // import NavSearch from './NavSearch';
+import Footer from '../General/Footer';
 import DrawerSearch from './DrawerSearch';
 
 import { getUsername } from '../../redux/selectors';
@@ -478,6 +479,7 @@ class LoginBar extends React.Component {
         <main className={classes.content}>
           <div className={classes.toolbar} />
           {this.props.children}
+          <Footer />
         </main>
       </div>
     );

diff --git a/src/components/AppBar/NoLoginBar.js b/src/components/AppBar/NoLoginBar.js
@@ -30,6 +30,7 @@ import TranslateIcon from '@material-ui/icons/Translate';
 import SupervisedUserCircleIcon from '@material-ui/icons/SupervisedUserCircle';
 import ShoppingCartIcon from '@material-ui/icons/ShoppingCart';
 
+import Footer from '../General/Footer';
 import NoSidebar from './NoSidebar';
 import LoginBox from './LoginBox';
 
@@ -256,7 +257,10 @@ class NoLoginBar extends React.Component {
           </Toolbar>
         </AppBar>
 
-        <main>{this.props.children}</main>
+        <main>
+          {this.props.children}
+          <Footer />
+        </main>
       </div>
     );
   }

diff --git a/src/page/Footer.js → src/components/General/Footer.js b/src/page/Footer.js → src/components/General/Footer.js
@@ -112,7 +112,7 @@ export default function StickyFooter() {
             <Grid item xs={12} md={8}>
               <Typography variant="body2" gutterBottom>
                 <Trans i18nKey="Footer.Citation">
-                  If you use Phenopolis, please cite us as:{' '}
+                  If you use Phenopolis, please cite us as:
                   <a href="https://doi.org/10.1093/bioinformatics/btx147" className={classes.a}>
                     Pontikos, N. et al. (2017). Phenopolis: an open platform for harmonization and
                     analysis of genetic and phenotypic data. Bioinformatics, 9, 7