forked from uc-cdis/commons-frontend-app
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update style and version to better match data-portal's version of BRH (…
…#6) * update brh config * update colors * adjust base path * fix Docker start * set port in start.sh * refine Docker start * add start.sh * refine Docker start (again) * fix image paths * add AISearch Page * update GEN3_API * update navigation * update AISearch path * update navigation * update ai search API * update ai search API * update navigation * update package-lock * update icon paths in footer * update gen3ff version * update navi links and labels * update AISearch to include Discovery Page --------- Co-authored-by: craigrbarnes <[email protected]>
- Loading branch information
1 parent
d3312dd
commit af135e3
Showing
24 changed files
with
210 additions
and
117 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,4 @@ | ||
| BASE_PATH=/ff | ||
| GEN3_COMMONS_NAME=brh | ||
| NEXT_PUBLIC_GEN3_API=https://localhost | ||
| NEXT_PUBLIC_GEN3_DOMAIN=https://localhost | ||
| NEXT_PUBLIC_GEN3_MDS_API=https://localhost | ||
| #NEXT_PUBLIC_GEN3_AI_SEARCH_API=http://localhost:8089 | ||
| #NEXT_PUBLIC_GEN3_GUPPY_API=https://localhost:3010/guppy | ||
| NEXT_PUBLIC_GEN3_API='https://brhstaging.data-commons.org' | ||
| NEXT_PUBLIC_GEN3_AI_SEARCH_API='https://brhstaging.data-commons.org/ai' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| BASE_PATH=/ff | ||
| GEN3_COMMONS_NAME=brh | ||
| NEXT_PUBLIC_GEN3_API=https://localhost/ | ||
| NEXT_PUBLIC_GEN3_DOMAIN=https://localhost/ | ||
| NEXT_PUBLIC_GEN3_API='https://brhstaging.data-commons.org' | ||
| NEXT_PUBLIC_GEN3_AI_SEARCH_API='https://brhstaging.data-commons.org/ai' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,7 +15,7 @@ | |
| { | ||
| "link": { | ||
| "href": "/Discovery", | ||
| "text": "Discovery Data" | ||
| "text": "Discover Data" | ||
| } | ||
| } | ||
| ], | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,5 +21,5 @@ | |
| ], | ||
| "image": "images/brh/gene_bgy.png", | ||
| "email": "[email protected]", | ||
| "showCredentialsLogin" : true | ||
| "showCredentialsLogin" : false | ||
| } | ||
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,45 +1,79 @@ | ||
| { | ||
| "navigation": { | ||
| "logo": { | ||
| "src": "/images/brh/logo.png", | ||
| "height":256, | ||
| "href": "/Discovery" | ||
| }, | ||
| "items": [{ | ||
| "icon": "gen3:query", | ||
| "href": "/Discovery", | ||
| "name": "Discovery", | ||
| "tooltip": "Discover Data" | ||
| "src": "/ff/images/brh/logo.png", | ||
| "height": 256, | ||
| "href": "https://brhstaging.data-commons.org/" | ||
| }, | ||
| "items": [ | ||
| { | ||
| "icon": "gen3:query", | ||
| "href": "https://brhstaging.data-commons.org/discovery", | ||
| "name": "Discovery", | ||
| "classNames" : { | ||
| "root": "border-opacity-50 border-blue", | ||
| "button": "hover:border-white" | ||
| }, | ||
| "tooltip": "Use free-text search and tags to rapidly find relevant studies, discover new datasets across multiple resources, and easily export selected data files to the analysis workspace." | ||
| }, | ||
| { | ||
| "icon": "gen3:aisearch", | ||
| "href": "/AISearch", | ||
| "name": "AI Search - Beta", | ||
| "tooltip": "Use AI Based search to find relevant studies using a chat-like interface." | ||
| }, | ||
| { | ||
| "name": "Workspace", | ||
| "href": "https://brhstaging.data-commons.org/workspace", | ||
| "icon": "gen3:workspace", | ||
| "tooltip": "Gen3 workspaces are secure data analysis environments in the cloud that can access data from one or more data resources." | ||
| }, | ||
| { | ||
| "name": "Example Analysis", | ||
| "href": "https://brhstaging.data-commons.org/resource-browser", | ||
| "icon": "gen3:bar-chart", | ||
| "tooltip": "Learn how to use Jupyter Notebooks to explore and visualize data discovered in the Biomedical Research Hub by running a static tutorial notebook, or use one of these examples as a launching point for your own custom analysis." | ||
| }, | ||
| { | ||
| "icon": "gen3:profile", | ||
| "href": "/Profile", | ||
| "href": "https://brhstaging.data-commons.org/identity", | ||
| "name": "Profile", | ||
| "tooltip": "Create API keys for programmatic data access, and review your authorization privileges to datasets and services.", | ||
| "classNames": { | ||
| "root": "flex flex-col flex-nowrap px-1 py-2 pt-4 items-center hover:text-accent opacity-80 hover:opacity-100 pr-10" | ||
| } | ||
| "tooltip": "Create API keys for programmatic data access, and review your authorization privileges to datasets and services." | ||
| } | ||
| ] | ||
| }, | ||
| "topBar": { | ||
| "items": [ | ||
| { | ||
| "link": "https://uc-cdis.github.io/BRH-documentation/", | ||
| "name": "Documentation" | ||
| "name": "Documentation", | ||
| "classNames": { | ||
| "root": "border-blue border-opacity-50", | ||
| "label": "text-white font-bold text-sm", | ||
| "button": "hover:border-white mx-4" | ||
| } | ||
| }, | ||
| { | ||
| "link": "[email protected]", | ||
| "name": "Email Support" | ||
| "name": "Email Support", | ||
| "classNames": { | ||
| "root": "border-base-lighter ", | ||
| "label": "text-white font-bold text-sm", | ||
| "button": "hover:border-white mx-4" | ||
| } | ||
| }, | ||
| { | ||
| "link": "https://uc-cdis.github.io/platform-citation/brh-cite/", | ||
| "name": "Cite BRH" | ||
| "name": "Cite BRH", | ||
| "classNames": { | ||
| "label": "text-white font-bold text-sm", | ||
| "button": "hover:border-white mx-4 mr-[64px]" | ||
| } | ||
| } | ||
| ], | ||
| "showLogin": true, | ||
| "showLogin": false, | ||
| "classNames": { | ||
| "root": "flex justify-end items-center align-middle w-100 h-10 bg-secondary" | ||
| "root": "bg-primary" | ||
| } | ||
| } | ||
| } |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| { | ||
| "systemUseModal": { | ||
| "enabled": false, | ||
| "title": "Data Use Agreement for Academic and Institutional Users", | ||
| "content": { | ||
| "text": [ | ||
| "Please see the below two Data Use Agreements: the first one is for Academic and Institutional users for non-commercial use; the second agreement is for commercial use.", | ||
| "", | ||
| "", | ||
| "Data Use Agreement - Non-Commercial Research Use Only", | ||
| "This Data Use Agreement for Academic and Institutional Users (this “Agreement”) is by and between you and the University and governs your access to and use of the deidentified imaging and associated demographic and clinical data provided to you by the University. By accessing, using, or downloading any data, you are agreeing to be bound by the terms and conditions of this Agreement.", | ||
| "1. The University is the legal entity that hosts data.", | ||
| "", | ||
| "DATA USE AGREEMENT – COMMERCIAL USE PERMITTED", | ||
| "This Data Use Agreement (this “Agreement”) is by and between you or the entity you represent (“you”) and the University of Chicago (the “University”) and governs your access to and use of the deidentified imaging and associated demographic and clinical data provided to you by the University. By accessing, using, or downloading any data, you are agreeing to be bound by the terms and conditions of this Agreement. If you are entering into this Agreement for an entity, such as the company you work for, you represent and warrant that you have legal authority to bind that entity", | ||
| "1. The University may terminate this Agreement at any time upon notice to you. The University shall have no liability in the event of any such termination. Upon such termination, the University may direct that you immediately return or destroy all copies of any data and, upon the University’s request, you will certify the foregoing to the University in writing." | ||
| ] | ||
| }, | ||
| "expireDays": 365, | ||
| "showOnlyOnLogin": true | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| { | ||
| "heading": ["Montserrat", "sans-serif"], | ||
| "content": ["Noto Sans", "sans-serif"], | ||
| "fontFamily": "Montserrat" | ||
| "heading": ["Source Sans Pro", "sans-serif"], | ||
| "content": ["Source Sans Pro", "sans-serif"], | ||
| "fontFamily": "Source Sans Pro" | ||
| } |
Oops, something went wrong.