Revert "Merge branch 'main' of github.com:iodepo/oih-ui into feature/…

…restyling" This reverts commit 64bfde0, reversing changes made to 88bb45e.
iodepo · Sep 13, 2024 · b46fc98 · b46fc98
1 parent e706d27
commit b46fc98
Show file tree

Hide file tree

Showing 12 changed files with 100 additions and 229 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
diff --git a/.github/workflows/check-crlf.yml b/.github/workflows/check-crlf.yml
@@ -12,7 +12,7 @@ jobs:
 
     steps:
       - name: Checkout repository contents
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Use action to check for CRLF endings
         uses: erclu/[email protected]

diff --git a/.github/workflows/irc_notify.yml b/.github/workflows/irc_notify.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: irc push
-        uses: rectalogic/notify-irc@v2
+        uses: rectalogic/notify-irc@v1
         if: github.event_name == 'push'
         with:
           channel: "#oih"
@@ -26,7 +26,7 @@ jobs:
             ${{ github.actor }} pushed ${{ github.event.ref }} ${{ github.event.compare }}
             ${{ join(github.event.commits.*.message) }}
       - name: irc pull request
-        uses: rectalogic/notify-irc@v2
+        uses: rectalogic/notify-irc@v1
         if: github.event_name == 'pull_request'
         with:
           channel: "#oih"
@@ -35,9 +35,8 @@ jobs:
           notice: true
           message: |
             ${{ github.actor }} opened PR ${{ github.event.pull_request.html_url }}
-            ${{ github.event.pull_request.title }}
       - name: irc tag created
-        uses: rectalogic/notify-irc@v2
+        uses: rectalogic/notify-irc@v1
         if: github.event_name == 'create' && github.event.ref_type == 'tag'
         with:
           channel: "#oih"

diff --git a/LICENSE.md b/LICENSE.md
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 Ocean InfoHub
+Copyright (c) 2023 Ocean InfoHub
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -6,6 +6,6 @@ This repo contains the code for the Ocean Info Hub Global Search Portal.
 * `/indexer` contains all of the code to ingest the OIH graph into the SOLR Instance
 * `/solr` contains the configuration required for the solr instance, including the schema. 
 * `/frontend` contains the code for the static javascript app. This will produce a container in dev mode running a live server, and a static html/javascript site in production mode. 
-* `/regions` contains the QGIS file defining the geographical regions. 
+* `/regions` contains the QGIS file defining the gographical regions. 
 
 See the individual README files for more information. 
diff --git a/frontend/public/index.html b/frontend/public/index.html
@@ -1,49 +1,82 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-  <meta charset="utf-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1" />
-  <meta name="OIH" content="OIH Global Search"/>
-  <title>OIH Global Search</title>
-  <style>
-    .oih-popover {
-      margin: auto;
-      width: 100%;
-      padding: 20px;
-      background-color: #012e6a;
-      color: white;
-    }
-  </style>
-</head>
-<body>
-<noscript>You need to enable JavaScript to run this app.</noscript>
-<script>
-  //we don't want people to visit this page, redirect to the homepage
-  window.location.replace("https://oceaninfohub.org");
-
-  //all what follows is useless as we are redirecting to the homepage
-
-  //open first popover available in your page
-  //let popover = document.getElementById('popover');
-  //popover.style.display = "block";
-</script>
-<!--
-<div
-        class="oih-popover"
-        role="dialog"
-        id="popover"
-        data-scrollable-element="#scrollable-element">
-  <h1>This is still a beta version.</h1>
-  This page is the beta-version of the search interface for the OIH project proof of concept.<br />
-  Please visit the <a href="https://oceaninfohub.org">project's website</a> for more information.<br />
-  <br />
-  <a
-         href="#"
-         onclick="let popover = document.getElementById('popover');popover.style.display = 'none';">
-    close this warning
-  </a>
-</div>
--->
-<div id="root"></div>
-</body>
-</html>
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="OIH" content="OIH Global Search" />
+    <link
+      href="https://fonts.googleapis.com/css2?family=Montserrat&display=swap"
+      rel="stylesheet"
+    />
+    <link
+      rel="stylesheet"
+      href="https://unpkg.com/[email protected]/dist/maplibre-gl.css"
+    />
+    <script src="https://unpkg.com/[email protected]/dist/maplibre-gl.js"></script>
+    <script src="https://www.unpkg.com/[email protected]/turf.min.js"></script>
+    <script src="https://www.unpkg.com/@mapbox/[email protected]/dist/mapbox-gl-draw.js"></script>
+    <link
+      rel="stylesheet"
+      href="https://www.unpkg.com/@mapbox/[email protected]/dist/mapbox-gl-draw.css"
+      type="text/css"
+    />
+    <title>OIH Global Search</title>
+    <style>
+      .oih-popover {
+        margin: auto;
+        width: 100%;
+        padding: 20px;
+        background-color: #012e6a;
+        color: white;
+      }
+    </style>
+    <!-- Matomo -->
+    <script>
+      var _paq = (window._paq = window._paq || []);
+      /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
+      /* _paq.push(["trackPageView"]); */
+      _paq.push(["enableLinkTracking"]);
+      (function () {
+        var u = "//analytics.iode.org/";
+        _paq.push(["setTrackerUrl", u + "matomo.php"]);
+        _paq.push(["setSiteId", "1"]);
+        var d = document,
+          g = d.createElement("script"),
+          s = d.getElementsByTagName("script")[0];
+        g.async = true;
+        g.src = u + "matomo.js";
+        s.parentNode.insertBefore(g, s);
+      })();
+    </script>
+    <!-- End Matomo Code -->
+  </head>
+  <body>
+    <noscript>You need to enable JavaScript to run this app.</noscript>
+    <!-- <script>
+      //open first popover available in your page
+      let popover = document.getElementById("popover");
+      popover.style.display = "block";
+    </script>
+    <div
+      class="oih-popover"
+      role="dialog"
+      id="popover"
+      data-scrollable-element="#scrollable-element"
+    >
+      <h1>This is still a beta version.</h1>
+      This page is the beta-version of the search interface for the OIH project
+      proof of concept.<br />
+      Please visit the
+      <a href="https://oceaninfohub.org">project's website</a> for more
+      information.<br />
+      <br />
+      <a
+        href="#"
+        onclick="let popover = document.getElementById('popover');popover.style.display = 'none';"
+      >
+        close this warning
+      </a>
+    </div> -->
+    <div id="root"></div>
+  </body>
+</html>
diff --git a/frontend/src/components/results/types/CreativeWork.json b/frontend/src/components/results/types/CreativeWork.json
diff --git a/frontend/src/components/results/types/Dataset.json b/frontend/src/components/results/types/Dataset.json
diff --git a/indexer/conversions.py b/indexer/conversions.py
@@ -132,21 +132,6 @@ def GeoShape(geo):
     raise UnhandledFormatException("Didn't handle %s in GeoShape" % json.dumps(geo))
 
 
-def GeoCoordinates(geo):
-    #print('here [GeoCoordinates]')
-
-    lat = geo.get("latitude",None)
-    long = geo.get("longitude",None)
-    if lat is not None and long is not None:
-        print ("Generating a Point from the GeoCoordinates...")
-        newPoint = "POINT (" + str(long) + " " + str(lat) + ")"
-        print(newPoint)
-        return _geo('point', newPoint)      
-
-    raise UnhandledFormatException("Didn't handle %s in GeoCoordinates" % json.dumps(geo))
-
-
-
 def CourseInstance(data):
     atts = [_dispatch(field, data.get(field, None)) for field in ('startDate', 'endDate')]
     if 'location' in data:
@@ -254,7 +239,7 @@ def _parseDate(field, d):
     try:
         dt = isoparse(d)
         return [
-            Att('dt', dt.isoformat(timespec='seconds').replace('+00:00', 'Z'), field),
+            Att('dt', dt.isoformat(), field),
             Att('n', dt.year, field.replace('Date', 'Year')),
         ]
     except ValueError:

diff --git a/indexer/indexer-graph-solr.py b/indexer/indexer-graph-solr.py