Skip to content

Commit

Permalink
footer issue fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
@vikasguptaebi
vikasguptaebi committed Nov 12, 2024
1 parent a12faa7 commit 6b3943b
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 134 deletions.
46 changes: 26 additions & 20 deletions dataportal-app/src/App.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,35 @@ import Header from './components/organisms/Header';
import HomePage from './components/pages/HomePage';
import GeneViewerPage from './components/pages/GeneViewerPage';
import ErrorBoundary from "@components/atoms/ErrorBoundary";
import Footer from "@components/organisms/Footer";

const App: React.FC = () => {
return (
<Router>
<Header/>
<main
className="vf-body | vf-stack vf-stack--200"
style={{'--vf-body-width': '80em'} as React.CSSProperties}
>
<Routes>
<Route path="/" element={<HomePage />} />
{/* Route for gene and genome */}
<Route path="/gene-viewer/gene/:geneId/genome/:genomeId" element={<GeneViewerPage />} />
{/* Route for genome only */}
<Route path="/gene-viewer/genome/:genomeId" element={
<ErrorBoundary>
<GeneViewerPage />
</ErrorBoundary>
} />
</Routes>
</main>
{/*<Footer />*/}
</Router>
<div style={{display: 'flex', flexDirection: 'column', minHeight: '100vh'}}>
<Router>
<Header/>
<main
className="vf-body | vf-stack vf-stack--200"
style={{
'--vf-body-width': '80em',
paddingBottom: '200px',
} as React.CSSProperties}
>
<Routes>
<Route path="/" element={<HomePage/>}/>
{/* Route for gene and genome */}
<Route path="/gene-viewer/gene/:geneId/genome/:genomeId" element={<GeneViewerPage/>}/>
{/* Route for genome only */}
<Route path="/gene-viewer/genome/:genomeId" element={
<ErrorBoundary>
<GeneViewerPage/>
</ErrorBoundary>
}/>
</Routes>
</main>
<Footer/>
</Router>
</div>
);
};

Expand Down
119 changes: 7 additions & 112 deletions dataportal-app/src/components/organisms/Footer.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,120 +5,15 @@ const Footer: React.FC = () => {
<footer className="vf-footer">
<div className="vf-footer__inner">

<div className="vf-flag vf-flag--middle vf-flag--400 space-below-20">
<div className="vf-flag__media">
<img src="/img/eu-flag.svg"
width="100px"
alt="EU Flag"
height="67px"/>
</div>
<div className="vf-flag__body">
<p className="vf-footer__notice">
This project has received funding from the European Union’s Horizon
2020 research and innovation programme under grant agreement No 817729
</p>
</div>
</div>
<div className="vf-footer__links-group | vf-grid">
<div className="vf-links">
<h4 className="vf-links__heading">The project</h4>
<ul className="vf-links__list | vf-list">
<li className="vf-list__item">
<a className="vf-list__link" href="https://www.dataportal.eu">DataPortal project
site</a>
</li>
<li className="vf-list__item">
<a className="vf-list__link" href="{% url 'admin:index' %}">Admin login</a>
</li>
<li className="vf-list__item">
<a className="vf-list__link" href="{{ DOCS_URL }}/publications.html">DataPortal
publications</a>
</li>
</ul>
</div>
<div className="vf-links">
<h4 className="vf-links__heading">Help</h4>
<ul className="vf-links__list | vf-list">
<li className="vf-list__item">
<a className="vf-list__link" href="{{ DOCS_URL }}">Documentation</a>
</li>
<li className="vf-list__item">
<a className="vf-list__link" href="mailto:[email protected]">Helpdesk</a>
</li>
<li className="vf-list__item">
<a className="vf-list__link" href="https://dataportal.cronitorstatus.com">Status
page</a>
</li>
<li className="vf-list__item">
<a className="vf-list__link"
href="https://github.com/ebi-metagenomics/dataportal-database">Data
portal codebase</a>
</li>
</ul>
</div>
<div className="vf-links">
<h4 className="vf-links__heading">Data repositories</h4>
<ul className="vf-links__list | vf-list">
<li className="vf-list__item">
<a className="vf-list__link"
href="https://www.ebi.ac.uk/ena/browser/view/PRJEB43192">ENA</a>
</li>
<li className="vf-list__item">
<a className="vf-list__link"
href="https://www.ebi.ac.uk/biosamples/samples?filter=attr%3Aproject%3Adataportal">Biosamples</a>
</li>
<li className="vf-list__item">
<a className="vf-list__link"
href="https://www.ebi.ac.uk/metabolights/">Metabolights</a>
</li>
<li className="vf-list__item">
<a className="vf-list__link"
href="https://www.ebi.ac.uk/metagenomics/super-studies/dataportal">MGnify</a>
</li>
<li className="vf-list__item">
<a className="vf-list__link"
href="https://workflowhub.eu/programmes/28">WorkflowHub</a>
</li>
<li className="vf-list__item">
<a className="vf-list__link"
href="https://workflowhub.eu/programmes/28">WorkflowHub</a>
</li>
<li className="vf-list__item">
<a className="vf-list__link"
href="https://ftp.ebi.ac.uk/pub/databases/metagenomics/dataportal_data/">Data
portal DB
snapshots</a>
</li>
</ul>
</div>
</div>
<p className="vf-footer__notice">ME TT Data Portal is a flagship project of EMBL’s microbial ecosystems
transversal theme.</p>
<section className="vf-footer__legal | vf-grid vf-grid__col-1">
<ul className="vf-footer__list vf-footer__list--legal | vf-list vf-list--inline">
<li className="vf-list__item">
<a href="https://www.dataportal.eu/data-policy" className="vf-list__link">Privacy
policy</a>
</li>

<li className="vf-footer__legal-text">Data Portal technical support: <a
className="vf-list__link"
href="mailto:[email protected]">[email protected]</a>
</li>
</ul>
<p className="vf-footer__legal-text">Copyright © EMBL-EBI</p>
<p className="vf-footer__legal-text">EMBL-EBI is part of the European Molecular Biology
Laboratory</p>
<a className="vf-footer__link" href="https://www.ebi.ac.uk/about/terms-of-use">Terms of use</a>
</section>
<div data-vf-js-banner-cookie-name="emblContentHub27360"
className="vf-banner vf-banner--fixed vf-banner--bottom vf-banner--notice"
data-vf-js-banner="true"
data-vf-js-banner-cookie-version="224467"
data-vf-js-banner-state="dismissible"
data-vf-js-banner-button-text="I agree">
<div className="vf-banner__content | vf-grid" data-vf-js-banner-text="">
<p className="vf-text vf-text-body--2"> This website uses cookies to function.
By using the site you are agreeing to this as outlined in our
<a className="vf-banner__link" href="https://www.embl.org/info/privacy-policy/">Privacy
Policy</a>.
</p>
</div>
</div>

</div>
<script src="https://assets.emblstatic.net/vf/v2.5.7/scripts/scripts.js"></script>
</footer>
Expand Down
2 changes: 1 addition & 1 deletion k8s-hl/dev/mett-dataportal-api-deployment.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spec:
runAsUser: 7123
runAsGroup: 1347
containers:
- image: quay.io/microbiome-informatics/mett-dataportal-api:v0.0.19
- image: quay.io/microbiome-informatics/mett-dataportal-api:v0.0.20
imagePullPolicy: Always
name: mett-dataportal-api-dev
env:
Expand Down
2 changes: 1 addition & 1 deletion k8s-hl/dev/mett-dataportal-app-deployment.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
app: mett-dataportal-react-app-dev
spec:
containers:
- image: quay.io/microbiome-informatics/mett-dataportal-react-app:v0.0.19
- image: quay.io/microbiome-informatics/mett-dataportal-react-app:v0.0.20
imagePullPolicy: Always
name: mett-dataportal-react-app-dev
env:
Expand Down

0 comments on commit 6b3943b

Please sign in to comment.