Merge pull request #18 from NBISweden/search-function

Search function
NBISweden · Jun 14, 2024 · 052039b · 052039b
2 parents fed24f7 + 4162db6
commit 052039b
Show file tree

Hide file tree

Showing 15 changed files with 148 additions and 5,303 deletions.
diff --git a/header_extractor.go b/header_extractor.go
@@ -24,22 +24,30 @@ type StringAttribute struct {
 	Value string `xml:"VALUE"`
 }
 
-// Function to extract header value from XML content
-func getHeaderValueFromXMLContent(xmlContent []byte) (string, error) {
+func getHeaderValueFromXMLContent(xmlContent []byte) (string, string, error) {
 	var landingPageSet LandingPageSet
 	err := xml.Unmarshal(xmlContent, &landingPageSet)
 	if err != nil {
-		log.Fatal("Unmarshalling XML file for header failed", err)
+		log.Fatal("Unmarshalling XML file failed", err)
 	}
 
-	// Iterate over the string attributes to find the header value
+	var header, doi string
+
+	// Iterate over the string attributes to find the header and doi values
 	for _, attr := range landingPageSet.LandingPage.Attributes.StringAttributes {
-		if attr.Tag == "header" {
-			return attr.Value, nil
+		switch attr.Tag {
+		case "header":
+			header = attr.Value
+		case "doi":
+			doi = attr.Value
 		}
 	}
-	return "sf", err
 
+	if header == "" {
+		return "", "", err
+	}
+
+	return header, doi, nil
 }
 
 // Function to read the XML file and return its content

diff --git a/markdown_writer.go b/markdown_writer.go
@@ -40,7 +40,7 @@ func markDownCreator() {
 		if err != nil {
 			log.Fatalf("Error reading the XML file %V", err)
 		}
-		headerValue, err := getHeaderValueFromXMLContent(xmlContent)
+		headerValue, doiValue, err := getHeaderValueFromXMLContent(xmlContent)
 		if err != nil {
 			log.Fatal("Error while getting header value from XML file", err)
 		}
@@ -52,13 +52,14 @@ func markDownCreator() {
 		// Markdown content
 		markdownContent := fmt.Sprintf(`---
 title: "%s"
+doi: "%s"
 ---
 
 {{< datafetch variable="%s" >}}
 
 
 Filename of the associated XML file: %s
-`, headerValue, fileNameWithoutExt, xmlFileName)
+`, headerValue, doiValue, fileNameWithoutExt, xmlFileName)
 
 		// Create Markdown file
 		mdFileName := filepath.Join(markdownDir, fileNameWithoutExt+".md")

diff --git a/static_files_uploader.go b/static_files_uploader.go
@@ -53,6 +53,12 @@ func staticSiteUploader(DeploymenClient *DeploymentBackend) {
 		if ext == ".svg" {
 			contentType = "image/svg+xml;"
 		}
+		if ext == ".js" {
+			contentType = "application/javascript;"
+		}
+		if ext == ".xml" {
+			contentType = "application/xml;"
+		}
 
 		if err != nil {
 			log.Fatalln("File bytes empty", path, err)

diff --git a/web/README.md b/web/README.md
@@ -1,2 +1,9 @@
-# hugo.bp.datasets.nbis.se
+# Bigpicture landing pages web components
+
 Bigpicture landing pages and data description pages using HUGO
+
+## Start Development server
+```
+hugo server  --disableFastRender 
+```
+
diff --git a/web/content/datasets/_index.md b/web/content/datasets/_index.md
@@ -1,5 +1,5 @@
 ---
-title: "Search"
+title: "Dataset search"
 date: 2024-03-20T10:31:33+01:00
 layout: test
 ---
diff --git a/web/layouts/_default/baseof.html b/web/layouts/_default/baseof.html
@@ -1,21 +1,18 @@
 <!DOCTYPE html>
-<html lang="{{ .Site.LanguageCode }}">
+<html lang="{{ .Site.LanguageCode }}"> 
 <meta name="viewport" content="width=device-width, initial-scale=1.0"> 
 {{ partial "head.html" . }}
 
 <body>
     {{ partial "nav.html" . }}
 <!-- Page Header -->
 
-<header class="page-header" ,role="banner" >
-                <h1 class="project-name" >{{ .Site.Title}} </h1>
-                <h2 class="project-tagline">{{ .Site.Params.slogan }}</h2>
-</header>
     <main id="content" class="main-content" role="main">
 {{ block "main" . }}
 
 {{ end }}
 
 </main>
+{{ partial "footer.html" . }}
 </body>
 </html>
diff --git a/web/layouts/datasets/list.html b/web/layouts/datasets/list.html
@@ -1,17 +1,20 @@
 {{ define "main" }}
 <h2> Bigpicture Datasets</h2>
+  <div class="datasets-cards-parent-container">
+    {{ range .Pages }}
+    <div class="dataset-card">
+      <div class="dataset-card-top-section">
+      <div class="dataset-card-image"><img src="{{.Site.BaseURL}}/img/bigpicture_logo.svg" alt="sdf"></div>
+      <div class="dataset-card-title"><h4>{{ .Params.title }}</h4></div>
+      </div>
+      <div class="dataset-card-bottom-section">
+        <div class="dataset-card-doi"><p>DOI: {{.Params.doi}}</p></div>
+        <div class="dataset-card-descrition"></div>
+      </div>
+    </div>
+    {{end}}
+  </div>
 
-<div id="search">
-<script>
-    window.addEventListener('DOMContentLoaded', (event) => {
-        new PagefindUI({ element: "#search", showSubResults: true });
-    });
-</script>
-<ul data-pagefind-ignore >
-  {{ range .Pages }}
-      <a href="{{ .RelPermalink }}"><p>{{ .Params.title }}</p></a>
-
-  {{ end }}
-  </ul>
-{{ .Content }}
+
+  {{ .Content }}
 {{ end }}
diff --git a/web/layouts/index.html b/web/layouts/index.html
@@ -1,17 +1,35 @@
 {{ define "main" }}
   <div data-pagefind-ignore="all" class="container">
     <main id="content" class="main-content" role="main" >
-        <h2>NOTICE (Please read the following notice carefully)</h2>
-        <br/>
-        This website is openly accessible to Everyone on the Internet, because the purpose of Dataset description pages / DOI landing pages is to be accessible to anyone on the Internet.
-        <br/>
-        The reason for Dataset description pages / DOI landing pages to be openly accessible to anyone on the Internet, is so that a potential user can learn<br/> 
-        1) that a dataset exists,<br/> 
-        2) how it can be used, <br/>
-        3) why they should bother applying for access, and  how to apply for access.
-        <br/>
-
-
+
+          <script>
+          window.addEventListener('DOMContentLoaded', (event) => {
+              new PagefindUI({ element: "#search", showSubResults: true });
+          });
+
+        </script>
+         <h2>Bigpicture Dataset search</h2>
+         <div style="max-height: 1%;">
+        <div id="search" style="overflow-x: auto;">
+        </div>
+        </div>
+        <h2 style="margin-top: 5rem;">Explore Bigpicture datasets</h2>
+        <div class="datasets-cards-parent-container">
+          {{ range where .Site.RegularPages "Section" "datasets" }}
+          <div class="dataset-card">
+            <div class="dataset-card-top-section">
+            <div class="dataset-card-image"><img src="{{.Site.BaseURL}}/img/bigpicture_logo.svg" alt="sdf"></div>
+            <div class="dataset-card-title"><a href="{{ .RelPermalink }}"><h4>{{ .Params.title }}</h4></a></div>
+            </div>
+            <div class="dataset-card-bottom-section">
+              <div class="dataset-card-doi"><p>DOI: {{.Params.doi}}</p></div>
+              <div class="dataset-card-descrition"></div>
+            </div>
+          </div>
+          {{end}}
+        </div>
+
+
     </main>
 
 </div>

diff --git a/web/layouts/partials/footer.html b/web/layouts/partials/footer.html
@@ -1,13 +1,9 @@
 <footer class="site-footer">
-    <div class="columns">
-
-      <div class="column text-center">
-        <a href="https://bigpicture.eu/">About</a>
-      </div>
-      <div class="column text-right">
-        <a href="/datasets/">Datasets</a>
-      </div>
-    </div>
-
+  <div class = "footer-columns">
+<div class="footer-container" >
+  <img style="height: 100px;" src="{{.Site.BaseURL}}/img/bigpicture_logo.svg">
+</div>
+<div class="footer-container" >© 2024 BIGPICTURE</div>
+  </div>
   </footer>
 
diff --git a/web/layouts/partials/head.html b/web/layouts/partials/head.html
@@ -14,7 +14,7 @@
     <meta name="keyword"  content="{{ .Site.Params.keyword }}">
     <link rel="shortcut icon" href="{{ "img/favicon.ico" | relURL }}">
 
-    <title>{{ if .Title }}{{ .Title }} | {{ .Site.Params.SEOTitle }}{{ else }}{{ .Site.Params.SEOTitle }}{{ end }}</title>
+    <title data-pagefind-meta="title" >{{ if .Title }}{{ .Title }} | {{ .Site.Params.SEOTitle }}{{ else }}{{ .Site.Params.SEOTitle }}{{ end }}</title>
 
     <link rel="canonical" href="{{ .RelPermalink }}">
 

diff --git a/web/layouts/partials/nav.html b/web/layouts/partials/nav.html
@@ -2,22 +2,7 @@
 
 <div class="topnav" id="navbar">
 
-            <script>
-var navbar = document.getElementById('navbar');
-  var navbarHeight = navbar.offsetHeight;
-  window.addEventListener('scroll', function() {
-    if (window.scrollY > 0) {
-      navbar.classList.add('shrink');
-    } else {
-      navbar.classList.remove('shrink');
-      navbar.style.position = 'initial';
-    }
-    if (window.scrollY >= navbarHeight) {
-      navbar.style.position = 'fixed';
-      navbar.style.top = '0';
-    } 
-  });
-</script> 
+
 
 <div class="logo-nav-container">
 <img id = "nav-logo" src="{{.Site.BaseURL}}/img/bigpicture_logo.svg">