Skip to content
This repository was archived by the owner on Mar 8, 2026. It is now read-only.

Privacy notices migrated from being centralised to being localized. #142

Merged
henrietteharmse merged 1 commit into from
May 1, 2025
Merged

Privacy notices migrated from being centralised to being localized. #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions zooma-ui/src/main/frontend/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

import * as React from 'react'
import Navbar from './Navbar'
import { EBIFooter, EBIMasthead } from './components/EBI';
import { EBIFooter } from './components/EBI';
import { Route } from 'react-router-dom';
import Home from './pages/Home';
import Docs from './pages/docs';
Expand All @@ -13,7 +13,6 @@ import About from './pages/about';
export default function App() {
return (
<div className="App">
<EBIMasthead/>
<Navbar />
<Route exact path='/' component={Home}></Route>
<Route exact path='/docs' component={Docs}></Route>
Expand Down
23 changes: 11 additions & 12 deletions zooma-ui/src/main/frontend/src/components/EBI.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@

import React, { Fragment, Component } from "react"

export function EBIMasthead() {
return (
<header id="masthead-black-bar" className="clearfix masthead-black-bar">
</header>
)
}

export function EBIFooter() {
return (
<footer>
<div id="global-footer" className="global-footer">
<nav id="global-nav-expanded" className="global-nav-expanded row">
</nav>
<section id="ebi-footer-meta" className="ebi-footer-meta row">
{/*<div id="global-footer" className="global-footer">*/}
{/*<nav id="global-nav-expanded" className="global-nav-expanded row">*/}
{/*</nav>*/}
{/*<section id="ebi-footer-meta" className="ebi-footer-meta row">*/}
{/*</section>*/}
{/*</div>*/}
<section id="Zooma-footer">
<p className="address">EMBL-EBI, Wellcome Trust Genome Campus, Hinxton, Cambridgeshire, CB10 1SD,
UK &nbsp; &nbsp; +44 (0)1223 49 44 44</p>
<p className="legal">Copyright &copy; EMBL-EBI 2016 | <a
href={process.env.PUBLIC_URL + "/Privacy_notice_for_EMBL-EBI_Public_Website.pdf"}>Privacy</a></p>
</section>
</div>
</footer>
)
}
Expand Down
1 change: 0 additions & 1 deletion zooma-ui/src/main/frontend/src/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,5 @@ ReactDOM.render((
), document.getElementById('root')
);

window['ebiFrameworkInvokeScripts']()


2 changes: 0 additions & 2 deletions zooma-ui/src/main/frontend/src/pages/Home.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import { EBIMasthead, EBIFooter } from "../components/EBI";
import ZoomaNav from "../Navbar";
import { Fragment, Component, ChangeEvent } from "react";
import { Row, Column, Callout } from 'react-foundation'
import ResultsTable from "../components/ResultsTable";
Expand Down
2 changes: 0 additions & 2 deletions zooma-ui/src/main/frontend/src/pages/about.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import { EBIMasthead } from "../components/EBI";
import ZoomaNav from "../Navbar";
import React, { Fragment } from "react";
import { Row, Column } from 'react-foundation'
import { Link } from 'react-router-dom'
Expand Down
2 changes: 0 additions & 2 deletions zooma-ui/src/main/frontend/src/pages/docs/api.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import { Link } from 'react-router-dom'
import React, { Fragment } from "react";
import { Row, Column } from "react-foundation";
import { EBIMasthead, EBIFooter } from "../../components/EBI";
import ZoomaNav from "../../Navbar";
import examples from '../../data/api-response-examples.json'

export default function docs() {
Expand Down
2 changes: 0 additions & 2 deletions zooma-ui/src/main/frontend/src/pages/docs/developers.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import { Link } from 'react-router-dom'
import React, { Fragment } from "react";
import { Row } from "react-foundation";
import { EBIMasthead, EBIFooter } from "../../components/EBI";
import ZoomaNav from "../../Navbar";

export default function developerDocs() {
return (
Expand Down
2 changes: 0 additions & 2 deletions zooma-ui/src/main/frontend/src/pages/docs/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import { Link } from 'react-router-dom'
import React, { Fragment } from "react";
import { Row } from "react-foundation";
import { EBIMasthead, EBIFooter } from "../../components/EBI";
import ZoomaNav from "../../Navbar";


export default function docs() {
Expand Down
4 changes: 1 addition & 3 deletions zooma-ui/src/main/frontend/src/pages/docs/search.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@

import { Link } from 'react-router-dom'
import React, { Fragment } from "react";
import { Row } from "react-foundation";
import { EBIMasthead, EBIFooter } from "../../components/EBI";
import ZoomaNav from "../../Navbar";



export default function docs() {
Expand Down
Loading