elixir bsc

elixir-europe · Jun 20, 2024 · 34ceb4f · 34ceb4f
1 parent ddd603a
commit 34ceb4f
Show file tree

Hide file tree

Showing 20 changed files with 729 additions and 450 deletions.
diff --git a/frontend/public/eraser.png b/frontend/public/eraser.png
diff --git a/frontend/public/magnifier.png b/frontend/public/magnifier.png
diff --git a/frontend/src/App.css b/frontend/src/App.css
@@ -60,6 +60,13 @@ html {
   margin-top: 8px;
 }
 
+.buttonsDiv {
+  height: 93px;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-around;
+}
+
 .containerExtraSections2 {
   display: flex;
   flex-direction: column;
@@ -84,7 +91,7 @@ html {
 }
 
 .version {
-  margin-right: 20px;
+  margin-right: 28px;
   margin-top: -18px;
   color: #3176b1 !important;
   font-weight: 600 !important;
@@ -100,12 +107,42 @@ html {
 }
 
 .searchButton {
-  padding-right: 4px;
-  padding-left: 0px;
   cursor: pointer;
   margin-left: 12px;
   border: none;
+  border-radius: 100px;
+  background: #3176b1;
+  padding: 10px, 24px, 10px, 16px;
+  color: white;
+  font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto,
+    Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
+  font-size: 14px;
+  display: flex;
+  font-weight: 500;
+  width: 99px;
+  height: 40px;
+  justify-content: space-evenly;
+  align-items: center;
+}
+
+.clearButton {
+  cursor: pointer;
+  margin-left: 12px;
+  border: none;
+  border-radius: 100px;
   background: white;
+  padding: 10px, 24px, 10px, 16px;
+  color: #3176b1;
+  font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto,
+    Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
+  font-size: 14px;
+  display: flex;
+  font-weight: 500;
+  width: 99px;
+  height: 40px;
+  justify-content: space-evenly;
+  align-items: center;
+  border: 1px solid #3176b1;
 }
 
 .scopeDiv {
@@ -396,12 +433,12 @@ p a {
 }
 
 .searchIcon {
-  width: 31px;
-  margin-top: -1px;
+  width: 13px;
+  margin-right: -2px;
 }
-.searchIcon:hover {
-  width: 33px;
-  margin-top: -3px;
+.clearIcon {
+  width: 15px;
+  margin-right: -2px;
 }
 
 .forwardIcon {
@@ -697,7 +734,8 @@ p a {
 .container2 {
   width: 100vw;
   display: flex;
-  margin-bottom: 40px;
+  margin-bottom: 18px;
+  margin-top: 10px;
 }
 
 .NavlinkVerifier {
@@ -860,7 +898,6 @@ p a {
   transition: 0.2s ease-in-out;
 }
 
-
 .elixirLogo:hover {
   -webkit-filter: grayscale(0%);
   filter: grayscale(0%);
@@ -1439,6 +1476,12 @@ h5 {
     text-underline-offset: 1px;
   }
 
+  .buttonsDiv {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-around;
+  }
+
   .crossQueriesTittle {
     margin-bottom: 12px;
     font-size: 12px;
@@ -1556,10 +1599,6 @@ h5 {
     box-shadow: rgb(234 221 221 / 16%) 0px 1px 4px;
   }
 
-  .container2 {
-    margin-bottom: 0px;
-  }
-
   .exampleQuery {
     width: 100%;
     border: none;
@@ -1715,21 +1754,6 @@ h5 {
       'Helvetica Neue', sans-serif;
     text-transform: uppercase;
   }
-  .searchIcon {
-    width: 26px;
-    margin-top: -1px;
-    margin-left: -8px;
-  }
-  .searchIcon:hover {
-    width: 27px;
-    margin-top: -1px;
-    margin-left: -8px;
-  }
-
-  .searchButton {
-    height: 30px;
-    cursor: pointer;
-  }
 
   .examplesQueriesList {
     display: flex;
@@ -1889,10 +1913,6 @@ h5 {
     box-shadow: rgb(234 221 221 / 16%) 0px 1px 4px;
   }
 
-  .container2 {
-    margin-bottom: 0px;
-  }
-
   .exampleQuery {
     width: 100%;
     border: none;
@@ -2065,22 +2085,6 @@ h5 {
       'Helvetica Neue', sans-serif;
     text-transform: uppercase;
   }
-  .searchIcon {
-    width: 26px;
-    margin-top: -1px;
-    margin-left: -8px;
-  }
-  .searchIcon:hover {
-    width: 27px;
-    margin-top: -1px;
-    margin-left: -8px;
-  }
-
-
-  .searchButton {
-    height: 30px;
-    cursor: pointer;
-  }
 
   .examplesQueriesList {
     display: flex;
@@ -2116,6 +2120,15 @@ h5 {
   }
 }
 
+@media (max-width: 700px) {
+  .buttonsDiv {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-around;
+    margin-top: 5px;
+    height: 101px;
+  }
+}
 @media (max-width: 460px) {
   .containerForm {
     margin-left: 0px;

diff --git a/frontend/src/components/Biosamples/BiosamplesResults.js b/frontend/src/components/Biosamples/BiosamplesResults.js
@@ -316,7 +316,8 @@ function BiosamplesResults (props) {
                 queryArray[index].push('!')
               } else {
                 queryArray[index] = term.split('%')
-                queryArray[index].push('%')
+                console.log(queryArray[index])
+                queryArray[index].push('=')
               }
 
               let alphanumericFilter = {}
@@ -466,7 +467,9 @@ function BiosamplesResults (props) {
         }
 
         if (updatedArrayFilterVar.length === 0) {
-          beaconsList.push(res.data.response)
+          res.data.responses.forEach(element => {
+            beaconsList.push(element)
+          })
         }
 
         let variablePause = false

diff --git a/frontend/src/components/CrossQueries/CrossQueries.css b/frontend/src/components/CrossQueries/CrossQueries.css
@@ -135,18 +135,7 @@ h5:hover {
     margin-left: 10px;
     margin-right: 10px;
   }
-  .inputSearch {
-    width: 70vw;
-    height: -moz-fit-content;
-    height: fit-content;
-    padding: 10px;
-    font-size: 14 px;
-    border: 1px solid #3176b1;
-    text-overflow: clip;
-    max-width: 80vw;
-    font-size: 13px;
-    border-radius: 3px;
-  }
+
   .crossQueriesForm {
     padding: 34px;
     display: flex;

diff --git a/frontend/src/components/Dataset/BeaconInfo.css b/frontend/src/components/Dataset/BeaconInfo.css
@@ -69,7 +69,6 @@ p a:hover {
 .tittle2 h1 {
   font-size: 14px;
   font-weight: normal;
-  margin: 14px;
   color: #5d5454;
 }
 
@@ -97,7 +96,7 @@ p a:hover {
   margin-bottom: -3px;
 }
 .tittle {
-  width: 40vw;
+  width: 36vw;
   background: #c8d4e6;
   border-radius: 2px;
   /* height: 80px; */
@@ -120,7 +119,6 @@ p a:hover {
   flex-direction: row;
   justify-content: center;
   align-items: center;
-  margin-bottom: 7px;
 }
 
 .descriptionBeacon a {
@@ -166,7 +164,7 @@ p a:hover {
 }
 
 .datasetCard {
-  width: 40vw;
+  width: 36.7vw;
   margin: 30px;
 
   /* border: 2px solid #3b9ad5; */
@@ -212,12 +210,17 @@ p a:hover {
 }
 
 .datasetCard p {
-  font-size: 12px;
   font-weight: normal;
   color: rgb(61 60 60);
   line-height: 20px;
   margin-top: -5px;
+  width: 35vw;
+  text-align: justify;
+  height: 92px;
+  overflow-y: scroll;
+  font-size: 13px;
 }
+
 .datasetCardResults p {
   font-size: 12px;
   font-weight: normal;
@@ -229,7 +232,6 @@ p a:hover {
 .tittle2 h1 {
   font-size: 14px;
   font-weight: normal;
-  margin: 14px;
   color: #5d5454;
 }
 
@@ -269,13 +271,15 @@ p a:hover {
   margin-bottom: -3px;
 }
 .tittle {
-  width: 38vw;
+  width: 36vw;
   background: #c8d4e6;
   border-radius: 2px;
-  /* height: 80px; */
+  height: fit-content;
   display: flex;
   padding: 2px;
   flex-direction: column;
+  align-items: center;
+  justify-content: center;
 }
 
 .tittleResults {
@@ -321,6 +325,8 @@ p a:hover {
   color: rgba(12, 16, 64, 0.606);
   font-size: 12px;
   font-weight: 600;
+  margin-bottom: 8px;
+  margin-top: 2px;
 }
 
 .tittleResults h2 {
@@ -346,6 +352,7 @@ p a:hover {
   background: #c8d4e6;
   flex-wrap: wrap;
   align-items: center;
+  margin-top: 8px;
 }
 
 .tittle4 {
@@ -493,7 +500,6 @@ h5 {
   .tittle2 h1 {
     font-size: 11px;
     font-weight: normal;
-    margin: 14px;
     color: #5d5454;
   }
 }
@@ -612,7 +618,6 @@ h5 {
     font-weight: bold;
     /* margin: 14px; */
     color: #5d5454;
-    margin: 7px;
   }
 }