Skip to content

Commit

Permalink
Merge branch 'develop' into backend
Browse files Browse the repository at this point in the history
  • Loading branch information
costero-e authored Sep 22, 2023
2 parents 87d86d6 + 0c72513 commit d194f50
Show file tree
Hide file tree
Showing 26 changed files with 2,066 additions and 1,344 deletions.
Binary file added frontend/public/copy.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
465 changes: 223 additions & 242 deletions frontend/src/App.css

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions frontend/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import ResultsDatasets from './components/Datasets/ResultsDatasets'
import CrossQueries from './components/CrossQueries/CrossQueries'
import LoggedIn from './components/SignIn/LoggedIn'
import Verifier from './components/Verifier/Verifier'
import SignInFormNoLS from './components/SignIn/SignInFormNoLS'

function App () {
return (
Expand All @@ -31,6 +32,7 @@ function App () {
<Route path='/cohorts' element={<Cohorts />} />
<Route path='/members' element={<ResultsDatasets />} />
<Route path='/sign-in' element={<SignInForm />} />
<Route path='/sign-in-noLS' element={<SignInFormNoLS />} />
<Route path='/loggedOut' element={<LoggedIn />} />
<Route path='/cross-queries' element={<CrossQueries />} />
<Route path='/verifier' element={<Verifier />} />
Expand Down
13 changes: 9 additions & 4 deletions frontend/src/components/Analyses/Analyses.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
import '../../App.css';
import '../../App.css'
import Layout from '../Layout/Layout'

function Analyses(){
return (<><h2 className="comming_message">Comming soon...</h2></>)
function Analyses () {
return (
<div>
<Layout collection={'Analyses'} />
</div>
)
}
export default Analyses
export default Analyses
13 changes: 9 additions & 4 deletions frontend/src/components/Biosamples/Biosamples.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
import '../../App.css';
import '../../App.css'
import Layout from '../Layout/Layout'

function Biosamples(){
return (<><h2 className="comming_message">Comming soon...</h2></>)
function Biosamples () {
return (
<div>
<Layout collection={'Biosamples'} />
</div>
)
}

export default Biosamples
export default Biosamples
Loading

0 comments on commit d194f50

Please sign in to comment.