From bcdb1183e2b5681ab79b16a24f8029f6371cdccb Mon Sep 17 00:00:00 2001 From: andrelllb Date: Tue, 8 Oct 2024 14:52:13 -0700 Subject: [PATCH 1/8] Handling hugo version upgrades --- layouts/_default/baseof.html | 13 +++++-- layouts/datasets/single.html | 36 +++++++++++++++++--- layouts/partials/data-dictionary.html | 18 +++++++--- layouts/partials/datasets-categories-lg.html | 11 +++--- 4 files changed, 62 insertions(+), 16 deletions(-) diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 9a1db57c78..be7a9081f7 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -5,8 +5,17 @@ - {{ $style := resources.Get "scss/style.scss" | resources.ToCSS }} - + {{ with resources.Get "sass/main.scss" }} + {{ with . | toCSS }} + {{ if hugo.IsDevelopment }} + + {{ else }} + {{ with . | minify | fingerprint }} + + {{ end }} + {{ end }} + {{ end }} +{{ end }}
@@ -34,7 +60,7 @@

{{- range first 1 .Params.distributions -}} - {{ partial "download-card" (dict "distribution" . "dlCardCat" (anchorize $selectedPageCat) "dlRows" $distroRowCounts) }} + {{ partial "download-card" (dict "distribution" . "dlCardCat" (anchorize $selectedPageCat) "dlRows" ($.Scratch.Get "distroRowCounts") ) }} {{- end -}}
@@ -113,7 +139,7 @@

*/}} {{- $thisURL := printf "%s" .url }} {{- $thisRowCount := 0 }} - {{- range $i, $e := $distroRowCounts }} + {{- range $i, $e := $.Scratch.Get "distroRowCounts" }} {{- $currDlRow := index $e 0 }} {{- if eq $currDlRow $thisURL }} {{- $thisRowCount = int (index $e 1) }} diff --git a/layouts/partials/data-dictionary.html b/layouts/partials/data-dictionary.html index c8edc5f6d0..3d80203120 100644 --- a/layouts/partials/data-dictionary.html +++ b/layouts/partials/data-dictionary.html @@ -1,10 +1,19 @@
{{ $url := .Params.described_by }} -{{ $sep := "," }} -{{ $csvRows := getCSV $sep $url}} -{{ $noRows := $csvRows | len }} +{{- with resources.GetRemote $url }} + {{- with .Err }} + {{- errorf "%s" . }} + {{- else }} + {{- $.Scratch.Add "csvRows" ( .Content | transform.Unmarshal ) }} + {{- end }} +{{- else }} + {{- errorf "Unable to get remote resource %q" $url }} +{{- end }} + + +{{ $noRows := ( $.Scratch.Get "csvRows" ) | len }} {{ $noDataFields := sub $noRows 1 }} -{{ $dataFields := last $noDataFields $csvRows }} +{{ $dataFields := last $noDataFields ( $.Scratch.Get "csvRows" ) }} {{ $dataFieldsLen := sub $noDataFields 1 }}
@@ -16,6 +25,7 @@ + {{- range $i, $r := $dataFields }} {{ index $r 0 }} diff --git a/layouts/partials/datasets-categories-lg.html b/layouts/partials/datasets-categories-lg.html index 202890df8d..8979b483a6 100644 --- a/layouts/partials/datasets-categories-lg.html +++ b/layouts/partials/datasets-categories-lg.html @@ -6,10 +6,11 @@

Datasets by category

- {{ range $key, $value := .Site.Taxonomies.categories }} - {{ $iconPartial := (printf "%s%s" "icon-" $key) }} + {{- range site.Menus.category }} + {{- $thisCategory := lower (replace .Name " " "-") }} + {{- $iconPartial := (printf "%s%s" "icon-" $thisCategory) }}
- +
@@ -17,12 +18,12 @@

Datasets by category

-
{{ humanize $key }}
+
{{ humanize $thisCategory }}
- {{ end }} + {{- end }}
From 8ced73404fefe30a0bdeb95bedef6a7d49f7a09e Mon Sep 17 00:00:00 2001 From: andrelllb Date: Tue, 8 Oct 2024 15:18:06 -0700 Subject: [PATCH 2/8] Updating hugo version for netlify and correct path to scss --- layouts/_default/baseof.html | 2 +- netlify.toml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index be7a9081f7..006c63fecc 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -5,7 +5,7 @@ - {{ with resources.Get "sass/main.scss" }} + {{ with resources.Get "scss/style.scss" }} {{ with . | toCSS }} {{ if hugo.IsDevelopment }} diff --git a/netlify.toml b/netlify.toml index a207d6e89e..f3906980e0 100644 --- a/netlify.toml +++ b/netlify.toml @@ -3,7 +3,7 @@ publish = "public" command = "hugo --gc --minify" [context.production.environment] -HUGO_VERSION = "0.118.2" +HUGO_VERSION = "0.135.0" HUGO_ENV = "production" HUGO_ENABLEGITINFO = "true" @@ -11,20 +11,20 @@ HUGO_ENABLEGITINFO = "true" command = "hugo --gc --minify --enableGitInfo" [context.split1.environment] -HUGO_VERSION = "0.118.2" +HUGO_VERSION = "0.135.0" HUGO_ENV = "production" [context.deploy-preview] command = "hugo --gc --minify --buildFuture -b $DEPLOY_PRIME_URL" [context.deploy-preview.environment] -HUGO_VERSION = "0.118.2" +HUGO_VERSION = "0.135.0" [context.branch-deploy] command = "hugo --gc --minify -b $DEPLOY_PRIME_URL" [context.branch-deploy.environment] -HUGO_VERSION = "0.118.2" +HUGO_VERSION = "0.135.0" [context.next.environment] HUGO_ENABLEGITINFO = "true" From e035c28d72627d1429b5e9d0584b596bb19a0263 Mon Sep 17 00:00:00 2001 From: Jasmine Tran Date: Mon, 27 Jan 2025 22:33:03 -0800 Subject: [PATCH 3/8] Update about.md --- content/about.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/content/about.md b/content/about.md index 6cfcbbd880..70350b37d8 100644 --- a/content/about.md +++ b/content/about.md @@ -10,4 +10,5 @@ colorbar: orange --- -Here is some helpful information \ No newline at end of file + +San Diego's Open Data Portal is an archive containing all of our collected data sets openly accessible to the public. Managed by the Data Analytics department, there is a wide range of categories of data sets, all here openly accessible by the public. Feel free to explore the website and use the data for research projects! \ No newline at end of file From b4a5657764872b264933cc6f6897f42cb1488e49 Mon Sep 17 00:00:00 2001 From: Jasmine Tran Date: Tue, 28 Jan 2025 14:03:10 -0800 Subject: [PATCH 4/8] Update about.md --- content/about.md | 1 - 1 file changed, 1 deletion(-) diff --git a/content/about.md b/content/about.md index 70350b37d8..727287f8ea 100644 --- a/content/about.md +++ b/content/about.md @@ -10,5 +10,4 @@ colorbar: orange --- - San Diego's Open Data Portal is an archive containing all of our collected data sets openly accessible to the public. Managed by the Data Analytics department, there is a wide range of categories of data sets, all here openly accessible by the public. Feel free to explore the website and use the data for research projects! \ No newline at end of file From 16d7e0b2c2cfdf5fb770a210a56a8d835aca0bbd Mon Sep 17 00:00:00 2001 From: Jasmine Tran Date: Tue, 4 Mar 2025 13:57:50 -0800 Subject: [PATCH 5/8] Pre-meeting work --- content/about.md | 6 +++++- data/servicesDesc.json | 11 +++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 data/servicesDesc.json diff --git a/content/about.md b/content/about.md index 727287f8ea..42d28b4601 100644 --- a/content/about.md +++ b/content/about.md @@ -10,4 +10,8 @@ colorbar: orange --- -San Diego's Open Data Portal is an archive containing all of our collected data sets openly accessible to the public. Managed by the Data Analytics department, there is a wide range of categories of data sets, all here openly accessible by the public. Feel free to explore the website and use the data for research projects! \ No newline at end of file +San Diego's Open Data Portal is an archive containing all of our collected +data sets openly accessible to the public. Managed by the Data Analytics +department, there is a wide range of categories of data sets, all here +openly accessible by the public. Feel free to explore the website and use +the data for research projects! \ No newline at end of file diff --git a/data/servicesDesc.json b/data/servicesDesc.json new file mode 100644 index 0000000000..6d7bc2404a --- /dev/null +++ b/data/servicesDesc.json @@ -0,0 +1,11 @@ +{ + "City Treasurer": "City Treasurer manages funds and tax revenue as well as monitoring financial statistics.", + "Commission for Arts and Culture": "The Commission for Arts and Culture serves as an advisory team who is promoting and encouraging more work and support for San Diego's artistic assets and the importance of including art in our local culture.", + "Environmental Services": "Environmental Services helps ensure San Diego has a clean and safe environment for residents, as well as resources regarding managing waste.", + "Performance and Analytics": "Performance and Analytics manages data and tracks progress for a variety of City projects. They aim to better serve the community by being honest and transparent with data.", + "Police": "The San Diego Police have a mission of maintaining public safety and serving our communities.", + "Public Utilities": "The Public Utilities department serves wastewater customers and maintains water and wastewater treatment plants, water reservoirs, and helps provide clean and safe drinking water for 1.4 million residents.", + "Real Estate and Airport Management": "", + "Sangis": "", + "Transportation": "The Transportation department helps operate and maintain roads and other related infrastructure to help create a safe traveling environment." +} \ No newline at end of file From 905bf17af74d0c1d6e369dbe550cd3165614f2e2 Mon Sep 17 00:00:00 2001 From: Jasmine Tran Date: Tue, 4 Mar 2025 14:22:01 -0800 Subject: [PATCH 6/8] Update servicesDesc.json --- data/servicesDesc.json | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/data/servicesDesc.json b/data/servicesDesc.json index 6d7bc2404a..739bee6685 100644 --- a/data/servicesDesc.json +++ b/data/servicesDesc.json @@ -1,11 +1,22 @@ { + "City Clerk": "", "City Treasurer": "City Treasurer manages funds and tax revenue as well as monitoring financial statistics.", "Commission for Arts and Culture": "The Commission for Arts and Culture serves as an advisory team who is promoting and encouraging more work and support for San Diego's artistic assets and the importance of including art in our local culture.", + "Commission on Police Practices": "", + "Development Services": "", + "Engineering and Capital Projects": "", "Environmental Services": "Environmental Services helps ensure San Diego has a clean and safe environment for residents, as well as resources regarding managing waste.", + "Finance": "", + "Fire and Rescue": "", + "General Services": "", + "Information Technology": "", + "Parks and Recreation": "", "Performance and Analytics": "Performance and Analytics manages data and tracks progress for a variety of City projects. They aim to better serve the community by being honest and transparent with data.", "Police": "The San Diego Police have a mission of maintaining public safety and serving our communities.", "Public Utilities": "The Public Utilities department serves wastewater customers and maintains water and wastewater treatment plants, water reservoirs, and helps provide clean and safe drinking water for 1.4 million residents.", "Real Estate and Airport Management": "", - "Sangis": "", + "San Diego Geographic Information Source (SanGIS)": "", + "Special Events and Filming": "", + "Stormwater": "The Stormwater department works to enhance San Diego's water quality and to protect communities from flooding.", "Transportation": "The Transportation department helps operate and maintain roads and other related infrastructure to help create a safe traveling environment." } \ No newline at end of file From c282a14ac948ffece3a98e7cb515c93567fe307c Mon Sep 17 00:00:00 2001 From: Jasmine Tran Date: Thu, 13 Mar 2025 10:49:11 -0700 Subject: [PATCH 7/8] Update servicesDesc.json --- data/servicesDesc.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/data/servicesDesc.json b/data/servicesDesc.json index 739bee6685..23439fe429 100644 --- a/data/servicesDesc.json +++ b/data/servicesDesc.json @@ -1,22 +1,22 @@ { - "City Clerk": "", + "City Clerk": "The City Clerk aspires to provide accurate information, maximize equitable access to the government, and to build a transparent connection with their citizens.", "City Treasurer": "City Treasurer manages funds and tax revenue as well as monitoring financial statistics.", "Commission for Arts and Culture": "The Commission for Arts and Culture serves as an advisory team who is promoting and encouraging more work and support for San Diego's artistic assets and the importance of including art in our local culture.", - "Commission on Police Practices": "", - "Development Services": "", - "Engineering and Capital Projects": "", + "Commission on Police Practices": "The Commission on Police Practices is an independent body of the Police department who investigates and manages reports regarding the actions of police officers and the department's policies and practices.", + "Development Services": "The Development Services Department helps enforce safe building and land codes, as well as review plans, provide permits and inspections, and retains building records across San Diego.", + "Engineering and Capital Projects": "The Engineering and Capital Projects department works to enhance the safety and the environment of San Diego through quality engineering, program, and construction management.", "Environmental Services": "Environmental Services helps ensure San Diego has a clean and safe environment for residents, as well as resources regarding managing waste.", - "Finance": "", - "Fire and Rescue": "", - "General Services": "", - "Information Technology": "", - "Parks and Recreation": "", + "Finance": "The Department of Finance oversees the budgets for the City, accounts for all financial reports of City funding, manages payroll and vendor payments, and manages the City's debt obligations.", + "Fire and Rescue": "Fire and Rescue provides safety services around San Diego, including fire stations, 911 operation centers, lifeguard towers and training facilities.", + "General Services": "General Services helps the other departments by providing management of the vehicles and facilities owned by the City.", + "Information Technology": "Information Technology (IT) works to improve the technology around San Diego and to continue to find innovative technlogical solutions for various problems.", + "Parks and Recreation": "Parks and Recreation is responsible for managing the parks and open space, recreation facilities and recreation programs for San Diego citizens and visitors alike.", "Performance and Analytics": "Performance and Analytics manages data and tracks progress for a variety of City projects. They aim to better serve the community by being honest and transparent with data.", "Police": "The San Diego Police have a mission of maintaining public safety and serving our communities.", "Public Utilities": "The Public Utilities department serves wastewater customers and maintains water and wastewater treatment plants, water reservoirs, and helps provide clean and safe drinking water for 1.4 million residents.", - "Real Estate and Airport Management": "", - "San Diego Geographic Information Source (SanGIS)": "", - "Special Events and Filming": "", + "Real Estate and Airport Management": "The Economic Development Department oversees management of airports and real estate around San Diego, and is actively working towards goals such as affordable housing, wayfinding technology, and other programs that develop the communities, businesses and the economy of San Diego.", + "San Diego Geographic Information Source (SanGIS)": "The San Diego Geographic Information Source (SanGIS) is a joint project called a Joint Power Authority (JPA) between the City of San Diego and the County of San Diego to maintain an accurate database of the regional and geographic information of San Diego.", + "Special Events and Filming": "The Special Events & Filming department enhances the economic and arts sides of San Diego by supporting special events and filming around the region.", "Stormwater": "The Stormwater department works to enhance San Diego's water quality and to protect communities from flooding.", "Transportation": "The Transportation department helps operate and maintain roads and other related infrastructure to help create a safe traveling environment." } \ No newline at end of file From 50a706ec2a7b0e5a75678f173d0648abcffc2a31 Mon Sep 17 00:00:00 2001 From: Jasmine Tran Date: Thu, 13 Mar 2025 10:52:35 -0700 Subject: [PATCH 8/8] Update about.md --- content/about.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/content/about.md b/content/about.md index 42d28b4601..236463237a 100644 --- a/content/about.md +++ b/content/about.md @@ -11,7 +11,4 @@ colorbar: orange --- San Diego's Open Data Portal is an archive containing all of our collected -data sets openly accessible to the public. Managed by the Data Analytics -department, there is a wide range of categories of data sets, all here -openly accessible by the public. Feel free to explore the website and use -the data for research projects! \ No newline at end of file +data sets openly accessible to the public. Managed by the Performance and Analytics Department, the many City of San Diego departments have come together to be transparent about the data they collect, how they use it, and how it impacts their policies and procedures. The goal of this data portal is to use this technology to be open, accessible, efficient, and transparent regarding data, and to allow citizens to be more connected to the government. \ No newline at end of file