From 8717dac1efebdd769dbea6ac8df97f09ffe25d09 Mon Sep 17 00:00:00 2001
From: Benjamin Webb <40066515+webb-ben@users.noreply.github.com>
Date: Wed, 17 Jul 2024 14:44:42 -0400
Subject: [PATCH] Small fixes (#18)

* Update default limit

* Fix Queryables HTML view

* Update CSS

* Update docker-compose.yml
---
 docker-compose.yml                            |  2 -
 pygeoapi-skin-dashboard/static/css/sb.css     | 10 +++--
 pygeoapi-skin-dashboard/templates/_base.html  | 20 ++++-----
 .../templates/collections/queryables.html     | 45 ++++++++++++-------
 pygeoapi.config.yml                           |  2 +-
 5 files changed, 47 insertions(+), 32 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index feebdf9..e510062 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,5 @@
 # dont need this anymore, but useful for test deployment
 # requires separate service providing postgres database
-version: '3'
-
 services:
   pygeoapi:
     build: .
diff --git a/pygeoapi-skin-dashboard/static/css/sb.css b/pygeoapi-skin-dashboard/static/css/sb.css
index fb61b42..83b8969 100644
--- a/pygeoapi-skin-dashboard/static/css/sb.css
+++ b/pygeoapi-skin-dashboard/static/css/sb.css
@@ -6444,10 +6444,14 @@ button.bg-light:focus {
 }
 
 .bg-dark, .bg-dark a {
-  background-color: #1e1446 !important;
   color: #fff; 
 }
 
+.bg-dark {
+  background-color: #1B335F !important;
+  background-image: linear-gradient(90deg, #00A087 10%, #1B335F 35%);
+}
+
 a.bg-dark:hover, a.bg-dark:focus,
 button.bg-dark:hover,
 button.bg-dark:focus {
@@ -9864,8 +9868,8 @@ a:focus {
 }
 
 .bg-gradient-primary {
-  background-color: #4e73df;
-  background-image: linear-gradient(180deg, #4e73df 10%, #224abe 100%);
+  background-color: #00A087;
+  background-image: linear-gradient(180deg, #1B335F 33%, #00A087 66%);
   background-size: cover;
 }
 
diff --git a/pygeoapi-skin-dashboard/templates/_base.html b/pygeoapi-skin-dashboard/templates/_base.html
index 101748a..e668c95 100644
--- a/pygeoapi-skin-dashboard/templates/_base.html
+++ b/pygeoapi-skin-dashboard/templates/_base.html
@@ -153,6 +153,16 @@ <h1 class="h3 mb-0 text-gray-800">Dashboard</h1>
                   <div class="container my-auto">
                     <div class="my-auto">
                       <div class="row">
+                        <div class="col-md-3">
+                          {% if config['metadata']['contact']['hours'] %}
+                          <b>Hours</b><br/>
+                          {{ config['metadata']['contact']['hours'] }}<br/>
+                          {% endif %}
+                          {% if config['metadata']['contact']['instructions'] %}
+                            <b>Contact instructions</b><br/>
+                            {{ config['metadata']['contact']['instructions'] }}
+                          {% endif %}
+                        </div>
                         <div class="col-md-3">
                           <b>Service provided by:</b><br/>
                           <a itemprop="url" href="{{ config['metadata']['provider']['url'] }}">{{ config['metadata']['provider']['name'] }}</a><br/>
@@ -180,16 +190,6 @@ <h1 class="h3 mb-0 text-gray-800">Dashboard</h1>
                             <a href="{{ config['metadata']['contact']['url'] }}">{{ config['metadata']['contact']['url'] }}</a><br/>
                             {% endif %}
                           </div>
-                          <div class="col-md-3">
-                            {% if config['metadata']['contact']['hours'] %}
-                            <b>Hours</b><br/>
-                            {{ config['metadata']['contact']['hours'] }}<br/>
-                            {% endif %}
-                            {% if config['metadata']['contact']['instructions'] %}
-                              <b>Contact instructions</b><br/>
-                              {{ config['metadata']['contact']['instructions'] }}
-                            {% endif %}
-                        </div>
                         <div class="col-md-3">
                             {% if config['metadata']['identification']['terms_of_service'] %}
                             <p>
diff --git a/pygeoapi-skin-dashboard/templates/collections/queryables.html b/pygeoapi-skin-dashboard/templates/collections/queryables.html
index bb2a971..30ed08d 100644
--- a/pygeoapi-skin-dashboard/templates/collections/queryables.html
+++ b/pygeoapi-skin-dashboard/templates/collections/queryables.html
@@ -11,21 +11,34 @@ <h1>Queryables of {{ data['title'] }}</h1>
       <p>
         For this collection these queryable parameters are available.
       </p>
-      <table class="table table-striped">
-        <thead>
-          <tr>
-            <th>Queryable</th>
-            <th>Type</th>
-          </tr>
-        </thead>  
-        <tbody>
-        {% for queryable in data['queryables'] %}
-        <tr>
-            <td>{{ queryable['queryable'] }} </td>
-            <td>{{ queryable['type'] }}</td>
-        </tr>
-        {% endfor %}
-      </tbody>
-      </table>
+      <div class="row">
+      <div class="col-lg-6">
+        <table class="table table-striped">
+          <thead>
+            <tr>
+              <th>Queryable</th>
+              <th>Type</th>
+            </tr>
+          </thead>  
+          <tbody>
+            {% for qname, qinfo in data['properties'].items() %}
+            <tr>
+              {% if qname == 'geometry' %}
+                <th>geometry</th>
+                <td><a href="{{ qinfo['$ref'] }}">{{ qname }} </a></td>
+              {% else %}
+                <th>{{ qname }} </th>
+                <td><code>{{ qinfo['type'] }}</code></td>
+                {% if 'format' in qinfo %}
+                (<code>{{ qinfo['format'] }}</code>)
+                {% endif %}
+              {% endif %}
+              </tr>
+            {% endfor %}
+          </tbody>
+        </table>
+      </div>
+      </div>  
     </section>
 {% endblock %}
+
diff --git a/pygeoapi.config.yml b/pygeoapi.config.yml
index 98e96de..7541c09 100644
--- a/pygeoapi.config.yml
+++ b/pygeoapi.config.yml
@@ -40,7 +40,7 @@ server:
     language: en-US
     cors: true
     pretty_print: true
-    limit: 100
+    limit: 500
     map:
         url: https://tile.openstreetmap.org/{z}/{x}/{y}.png
         attribution: '<a href="https://www.openstreetmap.org/copyright">© OpenStreetMap contributors</a>'