diff --git a/frontend/.gitignore b/frontend/.gitignore index 36e0f891..52a95b8e 100644 --- a/frontend/.gitignore +++ b/frontend/.gitignore @@ -32,3 +32,5 @@ yarn-error.log* # vercel .vercel ../synbiohub-docker/ + +commitHash.txt diff --git a/frontend/pages/[...view].js b/frontend/pages/[...view].js index c689940b..fd631f99 100644 --- a/frontend/pages/[...view].js +++ b/frontend/pages/[...view].js @@ -78,12 +78,16 @@ export default function View({ data, error }) { .then(response => { // URL exists setUrlExists(true); - if (!metadata && uri) + }) + .then(response => { + if (!metadata && uri) { getQueryResponse(dispatch, getMetadata, { uri: uri }, token).then( metadata => setMetadata(metadata) ); + } }) .catch(error => { + console.error("Caught Error", error); // URL does not exist setUrlExists(false); }); diff --git a/frontend/sparql/tools/getQueryResponse.js b/frontend/sparql/tools/getQueryResponse.js index 4b2c8b61..9d07a5e8 100644 --- a/frontend/sparql/tools/getQueryResponse.js +++ b/frontend/sparql/tools/getQueryResponse.js @@ -16,6 +16,8 @@ export default async function getQueryResponse( query = loadTemplate(query, options); + // console.log("q",query); + const currentURL = window.location.href; const isPublic = currentURL.includes('/public/'); let graphEx = ''; diff --git a/frontend/styles/admin.module.css b/frontend/styles/admin.module.css index da4f1661..32cae67c 100644 --- a/frontend/styles/admin.module.css +++ b/frontend/styles/admin.module.css @@ -8,7 +8,7 @@ .content { width: 100%; margin-top: 0.2rem; - overflow: scroll; + overflow: auto; } .menucontainer { diff --git a/frontend/styles/advancedsearch.module.css b/frontend/styles/advancedsearch.module.css index c237464e..f77d9029 100644 --- a/frontend/styles/advancedsearch.module.css +++ b/frontend/styles/advancedsearch.module.css @@ -56,7 +56,7 @@ } .newfilterbutton { - width: 100%; + /* width: 100%; */ display: flex; justify-content: center; padding: 0.7rem; @@ -64,7 +64,8 @@ border-radius: 0.4rem; background-color: #F2E86D; cursor: pointer; - margin: 0.6rem 0; + margin: 0.6rem; + transition: box-shadow 0.3s; } .newfilterbutton:hover { @@ -116,12 +117,13 @@ flex-direction: column; align-items: center; max-height: calc(100vh - 8rem); - overflow: scroll; + overflow: auto; } .body { width: 35rem; margin-bottom: 9rem; + overflow: hidden; } .searchbutton { @@ -134,11 +136,13 @@ display: flex; color: #fff; cursor: pointer; - margin: 1rem 0; + margin: 1rem; + transition: box-shadow 0.3s; } .searchbutton:hover { background-color: #00A1E4; + box-shadow: 0px 0px 10px #5350255d; } .searchbutton:hover .dnaicon { diff --git a/frontend/styles/basket.module.css b/frontend/styles/basket.module.css index 327c3783..2637a970 100644 --- a/frontend/styles/basket.module.css +++ b/frontend/styles/basket.module.css @@ -21,7 +21,7 @@ padding: 0 1rem 1rem 1rem; background-color: white; filter: drop-shadow(0px 0px 2px #888888); - overflow: scroll; + overflow: auto; z-index: 10; } diff --git a/frontend/styles/choosecollection.module.css b/frontend/styles/choosecollection.module.css index 4caf47fc..d945a33b 100644 --- a/frontend/styles/choosecollection.module.css +++ b/frontend/styles/choosecollection.module.css @@ -128,7 +128,7 @@ .tablecontainer { margin-top: 1rem; width: 100%; - overflow: scroll; + overflow: auto; max-height: 20rem; color: #171D26; } diff --git a/frontend/styles/error.module.css b/frontend/styles/error.module.css index 88880649..b1807ebf 100644 --- a/frontend/styles/error.module.css +++ b/frontend/styles/error.module.css @@ -81,7 +81,7 @@ .errorInfoContainer { flex-grow: 1; - overflow: scroll; + overflow: auto; z-index: 99999; background-color: #fff; padding: 0 1rem; diff --git a/frontend/styles/modal.module.css b/frontend/styles/modal.module.css index e14a1265..65bb60d8 100644 --- a/frontend/styles/modal.module.css +++ b/frontend/styles/modal.module.css @@ -21,7 +21,7 @@ margin: 2rem 0; height: fit-content; max-height: calc(100% - 2.5rem); - overflow: scroll; + overflow: auto; } .modalheader { @@ -83,7 +83,7 @@ .tablecontainer { max-height: calc(100vh - 15rem); - overflow: scroll; + overflow: auto; } @@ -135,7 +135,7 @@ .downloadmsg { height: 100%; width: 100%; - overflow: scroll; + overflow: auto; padding: 0 0 0.25rem 0; } diff --git a/frontend/styles/resulttable.module.css b/frontend/styles/resulttable.module.css index 36950e9f..5373f2c2 100644 --- a/frontend/styles/resulttable.module.css +++ b/frontend/styles/resulttable.module.css @@ -21,7 +21,7 @@ .table { min-width: 100%; text-align: left; - overflow: scroll; + overflow: auto; border-spacing: 0; font-size: 0.9rem; font-weight: 400; diff --git a/frontend/styles/sequencesearch.module.css b/frontend/styles/sequencesearch.module.css index fcf05029..f24d4ce4 100644 --- a/frontend/styles/sequencesearch.module.css +++ b/frontend/styles/sequencesearch.module.css @@ -72,7 +72,7 @@ flex-direction: column; align-items: center; max-height: calc(100vh - 8rem); - overflow: scroll; + overflow: auto; } .body { diff --git a/frontend/styles/sparql.module.css b/frontend/styles/sparql.module.css index 1893f64f..9240bcb3 100644 --- a/frontend/styles/sparql.module.css +++ b/frontend/styles/sparql.module.css @@ -9,7 +9,7 @@ display: flex; flex-direction: column; max-height: calc(100vh - 8rem); - overflow: scroll; + overflow: auto; } .graphselect { diff --git a/frontend/styles/submit.module.css b/frontend/styles/submit.module.css index 7d4d90d5..e508d39e 100644 --- a/frontend/styles/submit.module.css +++ b/frontend/styles/submit.module.css @@ -324,7 +324,7 @@ .concatenatefiles { max-height: 15rem; - overflow: scroll; + overflow: auto; } .clearfilesbuttoncontainer { @@ -415,7 +415,7 @@ margin: 0 auto; padding: 0rem 0 4rem 0; max-height: 20rem; - overflow: scroll; + overflow: auto; } .modalicon { diff --git a/frontend/styles/view.module.css b/frontend/styles/view.module.css index cc75505b..0a4c05ad 100644 --- a/frontend/styles/view.module.css +++ b/frontend/styles/view.module.css @@ -2,6 +2,7 @@ display: flex; padding: 0; margin: 0; + width: 100vw; } .emptySpace { @@ -52,6 +53,7 @@ bottom: 0; padding-bottom: 3rem; z-index: 5; + overflow-x: hidden; } .standardcontainer { @@ -64,12 +66,14 @@ .boundedheightforsidepanel { max-height: calc(100vh - 11rem); - overflow: scroll; + overflow-y: auto; + overflow-x: hidden; } .searchBoundedheightforsidepanel { max-height: calc(100vh - 5rem); - overflow: scroll; + overflow-y: auto; + overflow-x: hidden; } .headercontainer { @@ -103,7 +107,6 @@ .titleHolder { max-width: 17rem; - overflow: scroll; padding-bottom: 1rem; } @@ -301,13 +304,11 @@ margin: 1rem 0; padding: 0 1rem; width: 100%; - overflow: scroll; } .searchContent { margin: 0rem 0 0 0; width: 100%; - overflow: scroll; } .contentheader { @@ -393,7 +394,7 @@ .sectionchildcontainer { padding: 0.5rem; - overflow: scroll; + overflow: auto; /* height: 0; */ transition: 1s; height: 100%; @@ -533,7 +534,7 @@ padding: 0.5rem 1rem 0.5rem 0.5rem; border: 1px solid #ccc; font-family: inherit; - overflow: scroll; + overflow: auto; } .detailstext { @@ -593,7 +594,7 @@ .table { min-width: 100%; text-align: left; - overflow: scroll; + overflow: auto; border-spacing: 0; font-size: 0.9rem; font-weight: 400;