Merge pull request #37 from CityOfLosAngeles/ghi-35

fix: update dependencies, resolve security issues, and update configuration for builds

README.md

@@ -1,5 +1,8 @@
-# Open SDG - Site starter ![Build and Deploy Development Static Site](https://github.com/CityOfLosAngeles/open-sdg-site-starter/workflows/Build%20and%20Deploy%20Development%20Static%20Site/badge.svg) ![Build and Deploy Production Static Site](https://github.com/CityOfLosAngeles/open-sdg-site-starter/workflows/Build%20and%20Deploy%20Production%20Static%20Site/badge.svg)
+# Open SDG - Site starter
 
+[![Build and Deploy Development Static Site Dev](https://github.com/CityOfLosAngeles/open-sdg-site-starter/actions/workflows/BuildNDeployDev.yml/badge.svg)](https://github.com/CityOfLosAngeles/open-sdg-site-starter/actions/workflows/BuildNDeployDev.yml)
+
+[![Build and Deploy Production Static Site Prod](https://github.com/CityOfLosAngeles/open-sdg-site-starter/actions/workflows/BuildNDeployProd.yml/badge.svg?branch=production)](https://github.com/CityOfLosAngeles/open-sdg-site-starter/actions/workflows/BuildNDeployProd.yml)
 
 This is a starter repository to help in implementing the [Open SDG](https://github.com/open-sdg/open-sdg) platform. [See here for documentation](https://open-sdg.readthedocs.io).
 
@@ -17,7 +20,7 @@ You will need to build the SDG Data site first locally in order to proceed with
 
 4.) In a separate VS Code window have this project opened and navigate to the `_config.yml` file and change `remote_data_prefix:` set to `"http://localhost:9000"`. Remember to revert this change before committing.
 
-5.) Proceed with the steps below after running `bundle check --path=vendor/bundle || bundle install --path=vendor/bundle` to install the necessary dependencies.
+5.) Proceed with the steps below after running `bundle config --local path $PWD/vendor/bundle && bundle install` to install the necessary dependencies.
 
 **Test what development will look like by running the following command:**
 

_config_prod.yml

@@ -11,7 +11,7 @@ environment: production
 #  ga_prod: 'paste UA code here'
 
 # Uncomment and configure to point to a different data source for production.
-remote_data_prefix: https://sdgdatabase.lamayor.org
+remote_data_prefix: https://data.sdg.lacity.gov
 remote_translations:
   - https://open-sdg.github.io/sdg-translations/translations-2.1.0.json
 analytics:

_includes/components/download-all-metadata.html

@@ -1,14 +1,16 @@
+<!-- File is currently not being used on the website 2024-09-19 -->
+
 <div id="main-content" class="container search-results" role="main">
    <div id='mydiv'>
         <button class='btn btn-primary btn-download'>Download All Metadata</button>
     </div>
 </div>
- <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/PapaParse/5.1.0/papaparse.js"></script>
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.1/jquery.min.js" integrity="sha512-aVKKRRi/Q/YV+4mjoKBsE4x3H+BkegoM/em46NNlCqNTmUYADjBbeNefNxYV7giUp0VxICtqdrbqU7iVaeZNXA==" crossorigin="anonymous"></script>
+ <script src="https://cdnjs.cloudflare.com/ajax/libs/PapaParse/5.1.0/papaparse.js" integrity="sha512-psmE9mPOijgkia3d84n+hmabnYqFn2qVRcDtED22ou0gGd49DVAOLtx6rNk92U/0kPkSIKWgA0y6KnehTLv4Cg==" crossorigin="anonymous"></script>
     <script>
           $(document).ready(function () {
             $('button').click(function () {
-                fetch("https://dawncomer.github.io/open-sdg-data-starter/meta/all.json")
+                fetch("data.sdg.lacity.gov/en/meta/all.json")
                     .then(response => response.json())
                     .then(function (data) {
                         var metadataArray = Object.values(data);

_includes/scripts.html

@@ -1,24 +1,24 @@
-<script src="//code.jquery.com/jquery-1.12.4.min.js" integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ=" crossorigin="anonymous"></script>
-<script src="//cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/js/tether.min.js"></script>
-<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.4.1/js/bootstrap.min.js"></script>
-<script src="//cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
-<script src="//cdn.datatables.net/1.10.16/js/dataTables.bootstrap.min.js"></script>
-<script src="//cdn.datatables.net/fixedcolumns/3.2.3/js/dataTables.fixedColumns.min.js"></script>
-<script src="//cdnjs.cloudflare.com/ajax/libs/underscore.js/1.8.3/underscore-min.js"></script>
-<script src="//cdnjs.cloudflare.com/ajax/libs/Chart.js/2.7.0/Chart.bundle.min.js"></script>
+<script src="https://code.jquery.com/jquery-3.6.1.min.js" integrity="sha256-o88AwQnZB+VDvE9tvIXrMQaPlFFSUTR+nldQm1LuPXQ=" crossorigin="anonymous"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/js/tether.min.js" integrity="sha512-HsZ1i9vlo01lbae+KIl//6KPxkOO6xSPI2PefsZiC8LmSW9KDWMYK9jhNqE9XsbjGyrnQAZ6sSHvtnR12sJPjA==" crossorigin="anonymous"></script>
+<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.1/js/bootstrap.min.js" integrity="sha512-oBTprMeNEKCnqfuqKd6sbvFzmFQtlXS3e0C/RGFV0hD6QzhHV+ODfaQbAlmY6/q0ubbwlAM/nCJjkrgA3waLzg==" crossorigin="anonymous"></script>
+<script src="https://cdn.datatables.net/1.11.5/js/jquery.dataTables.min.js" integrity="sha512-gzsDzZKwY3mJWOtC5MviMWjvGPL+FdPaxN62NTXdu0hiogj9QnpY8gpu6QGk9RExu13mOvFpHbkLfB0E31jwOQ==" crossorigin="anonymous"></script>
+<script src="https://cdn.datatables.net/1.11.5/js/dataTables.bootstrap.min.js" integrity="sha512-RA3qzjBY4vccd5aCAuSeZUo4/X0wYyUBbHmyDvVpQYNesAvWZH6fB5RK6slf7+0wxzwsH1ko8ouO8oXH+XkFZA==" crossorigin="anonymous"></script>
+<script src="https://cdn.datatables.net/fixedcolumns/3.2.3/js/dataTables.fixedColumns.min.js" integrity="sha512-g6Fq63JElgOjtGUH9Q9i2UXkJFb9xYC7Yy/7FrDrejxqjbn6y/tipTxdVrCEiOr8gzLHyG5m7IaVQMKfyKxDBA==" crossorigin="anonymous"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.8.3/underscore-min.js" integrity="sha512-7fNh7OUGa7bdpmSQ81iNxgBywspNTxVxBxfbT1gSnQ124VGfksj3AR/QGhdYaO8ZLHBLSoaa+VsVDgw795eBaw==" crossorigin="anonymous"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.7.0/Chart.bundle.min.js" integrity="sha512-gn8nfou+jxKzIB12SukaRgYVOhKaf/Vd6lwSmv07eKGmU1XsdpGU0DUNQBJQr70ew/gawrPqLlmxExC/9hA75Q==" crossorigin="anonymous"></script>
 <script src="https://unpkg.com/[email protected]/dist/leaflet.js" integrity="sha512-nMMmRyTVoLYqjP9hrbed9S+FzjZHW5gY1TWCHA5ckwXZBadntCNs8kEqAWdrb9O7rxbCaA4lKTIWjDXZxflOcA==" crossorigin=""></script>
-<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/leaflet-zoom-show-hide.min.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/chroma-js/1.4.0/chroma.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/leaflet-zoom-show-hide.min.js" integrity="sha512-5uyvXspHmYpHnvj4Rx9TsxOe33UVdOflJRM+ZewCiZ2BafbT7UCYq+THZqIohzF9sMzA5jfu+Rld03b16mUP/g==" crossorigin="anonymous"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/chroma-js/1.4.0/chroma.min.js" integrity="sha512-NGWa8dShxoI7BMIaVxXT7G6/KSAaelrcOgHFEdbGdN1M4gbpOj8cLEa3OSnL/rHiDpoMokW96OP3T/TRIGGi5A==" crossorigin="anonymous"></script>
 <script src="https://cdn.rawgit.com/nezasa/iso8601-js-period/master/iso8601.min.js"></script>
-<script src="https://cdn.rawgit.com/socib/Leaflet.TimeDimension/master/dist/leaflet.timedimension.min.js"></script>
-<script src='https://api.mapbox.com/mapbox.js/plugins/leaflet-fullscreen/v1.0.1/Leaflet.fullscreen.min.js'></script>
-<script src="https://bowercdn.net/c/leaflet.zoomhome-latest/dist/leaflet.zoomhome.min.js"></script>
-<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/leaflet-search.min.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/autotrack/2.4.1/autotrack.js"></script>
-<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/html2canvas.js"></script>
-<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/FileSaver.min.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/chartjs-plugin-annotation/0.5.7/chartjs-plugin-annotation.js"></script>
-<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/regression.min.js"></script>
+<script src="https://cdn.rawgit.com/socib/Leaflet.TimeDimension/master/dist/leaflet.timedimension.min.js" integrity="sha512-rqjieCWeEZ9F1zMhh522cBrceXnUUO3bePHTVqpfi8jC0PQjLZAPfMQNqQYqeOyIWDYNFT8aJw4A25bfCYBmTw==" crossorigin="anonymous"></script>
+<script src="https://api.mapbox.com/mapbox.js/plugins/leaflet-fullscreen/v1.0.1/Leaflet.fullscreen.min.js" integrity="sha512-gyvCiKy2sIRwqd5QeTyyeJBTPx5OQdyluEFSIe1KnKDi0DM0w/T+T8iczSYRRcwmMYGVixYL2QGKJ+8XylbyTA==" crossorigin="anonymous"></script>
+<script src="https://bowercdn.net/c/leaflet.zoomhome-latest/dist/leaflet.zoomhome.min.js" integrity="sha512-Y+l2pNmWhfRtGPJjSYHXPTRRlp+z1GkHs0gHK8AlC8SArNIN5FbZUmT1gQRaJ8ngzcrFly38vMLixzlQ3Rl9Rg==" crossorigin="anonymous"></script>
+<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/leaflet-search.min.js" integrity="sha512-ZT0dz1DPPSb6xRqSwmxVyDO4KuUwBKFQAJcdAsa0FQP+cAcGGq7nYzVcIRg6UMRSfLScJTShX+K01V6tzGUbWA==" crossorigin="anonymous"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/autotrack/2.4.1/autotrack.js" integrity="sha512-HUmooslVKj4m6OBu0OgzjXXr+QuFYy/k7eLI5jdeEy/F4RSgMn6XRWRGkFi5IFaFgy7uFTkegp3Z0XnJf3Jq+g==" crossorigin="anonymous"></script>
+<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/html2canvas.js" integrity="sha512-8UPOdRhB7y+LJbUYgjm7EkPjXnAYz3B24TyzngKvHjMcPstdWeTGQzrWe/ZHiNvUHT9fVB7HTxZMEf1udpvV2Q==" crossorigin="anonymous"></script>
+<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/FileSaver.min.js" integrity="sha512-k8F8QynmFNURwbUJC8drKA+fo3YfNvjqKzStdydD6au+MzvxBoRnxH8E31RJXwDY9DrnEiPhh9wBoDSIxhkyHQ==" crossorigin="anonymous"></script>
+<script src="https://cdn.jsdelivr.net/npm/chartjs-plugin-annotation@1.2.2/dist/chartjs-plugin-annotation.min.js" integrity="sha256-XuHhf6q+GD7fscc96mTm/228GXf1Nn9wOYOE0EgeFzY=" crossorigin="anonymous"></script>
+<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/regression.min.js" integrity="sha512-0k6FXllQktdobw8Nc8KQN2WtZrOuxpMn7jC2RKCF6LR7EdOhhrg3H5cBPxhs3CFzQVlO6ni1B9SDLUPhBs0Alg==" crossorigin="anonymous"></script>
 <script src='{{ site.baseurl }}/assets/js/sdg.js?v={{ cache_bust }}'></script>
 {%- if site.custom_js -%}
   {%- for custom_js_file in site.custom_js -%}