Merge pull request #139 from zachlasiuk/main

Fixed category display, modified some content's categories.
odidev · Mar 18, 2024 · 800d0cd · 800d0cd
2 parents ee038eb + 2762c29
commit 800d0cd
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 14 deletions.
diff --git a/content/commercial_packages/intersystem_iris.md b/content/commercial_packages/intersystem_iris.md
@@ -1,7 +1,7 @@
 ---
 name: IRIS
 vendor: InterSystems
-category: Databases
+category: Database
 description: InterSystems IRIS® makes it easier to build high-performance, machine learning-enabled applications that connect data and application silos.
 product_url: https://www.intersystems.com/data-platform/
 works_on_arm: true

diff --git a/content/opensource_packages/ansible.md b/content/opensource_packages/ansible.md
@@ -1,6 +1,6 @@
 ---
 name: Ansible
-category: CI/CD
+category: DevOps
 description: Ansible is a simple IT automation platform that makes your applications and systems easier to deploy and maintain.
 download_url: https://developers.redhat.com/products/ansible/download 
 works_on_arm: true

diff --git a/content/opensource_packages/gitlab.md b/content/opensource_packages/gitlab.md
@@ -1,6 +1,6 @@
 ---
 name: Gitlab
-category: CI/CD
+category: DevOps
 description: Gitlab is a complete DevOps platform that enables developers to perform all the tasks in a project, from project planning and source code management to monitoring and security.
 download_url: https://packages.gitlab.com/gitlab/gitlab-ee
 works_on_arm: true

diff --git a/content/opensource_packages/golang.md b/content/opensource_packages/golang.md
@@ -1,6 +1,6 @@
 ---
 name: Golang
-category: Languages
+category: Languages and Frameworks
 description: Golang, also known as Go, is a statically typed, compiled programming language designed by Google for efficiency, simplicity, and reliability. It has robust support for concurrent programming.
 download_url: https://go.dev/dl/
 works_on_arm: true

diff --git a/content/opensource_packages/httpd.md b/content/opensource_packages/httpd.md
@@ -1,6 +1,6 @@
 --- 
 name: Apache httpd 
-category: Web 
+category: Web Server
 description: The Apache HTTP Server, commonly called Apache, is a web server application known for playing a key role in the initial growth of the World Wide Web. 
 download_url: https://archive.apache.org/dist/httpd/ 
 works_on_arm: true

diff --git a/content/opensource_packages/jenkins.md b/content/opensource_packages/jenkins.md
@@ -1,6 +1,6 @@
 --- 
 name: Jenkins 
-category: CI/CD 
+category: DevOps
 description: Jenkins is an open-source continuous integration/continuous delivery and deployment (CI/CD) automation software DevOps tool written in the Java programming language. It is used to implement CI/CD workflows, called pipelines. 
 download_url: https://get.jenkins.io/war-stable/ 
 works_on_arm: true 

diff --git a/content/opensource_packages/kyverno.md b/content/opensource_packages/kyverno.md
@@ -1,6 +1,6 @@
 ---
 name: Kyverno
-category: Security & Compliance
+category: Security applications
 description: Security applications
 download_url: https://github.com/kyverno/kyverno/releases
 works_on_arm: true

diff --git a/content/opensource_packages/terraform.md b/content/opensource_packages/terraform.md
@@ -1,6 +1,6 @@
 ---
 name: Terraform
-category: CI/CD
+category: DevOps
 description: Terraform is an infrastructure as code tool. It is used to automate cloud infrastructure.
 download_url: https://developer.hashicorp.com/terraform/install
 works_on_arm: true

diff --git a/content/opensource_packages/vitess.md b/content/opensource_packages/vitess.md
@@ -1,6 +1,6 @@
 ---
 name: Vitess
-category: Database - SQL
+category: Database
 description: Vitess is a database clustering system for horizontal scaling of MySQL through generalized sharding.
 download_url: https://github.com/vitessio/vitess/releases
 works_on_arm: true

diff --git a/themes/arm-design-system-hugo-theme/layouts/partials/package-display/_category_display.html b/themes/arm-design-system-hugo-theme/layouts/partials/package-display/_category_display.html
@@ -5,11 +5,11 @@
         Category: OS & Languages -> Runtimes
 */}}
 
-{{ $category := .Params.category}}
+{{ $category := .}}
 {{ $group := ""}}
 
-{{ if isset .Site.Data.category_data.subcategory_mapping $category }}
-    {{ $test_group := index .Site.Data.category_data.subcategory_mapping $category }}
+{{ if isset site.Data.category_data.subcategory_mapping $category }}
+    {{ $test_group := index site.Data.category_data.subcategory_mapping $category }}
     {{ if ne $test_group nil }}
         {{ $group = $test_group }}
     {{end}}

diff --git a/themes/arm-design-system-hugo-theme/layouts/partials/package-display/row-sub.html b/themes/arm-design-system-hugo-theme/layouts/partials/package-display/row-sub.html
@@ -8,7 +8,7 @@
                     <table class="align-table" width="100%" style="width: 100%; border-collapse: collapse; margin: 0px; padding: 0px;">
                         <tr>
                             <td style="width:75%; margin: 0px; padding: 0px;">
-                                {{partial "package-display/_category_display.html" .metadata}}
+                                {{partial "package-display/_category_display.html" .metadata.Params.category}}
                             </td>
                             <td style="margin: 0px; padding: 0px;">
                                 {{partial "eco-dashboard/github-links.html" .metadata  }}

diff --git a/themes/arm-design-system-hugo-theme/static/js/anonymous-analytics.js b/themes/arm-design-system-hugo-theme/static/js/anonymous-analytics.js
@@ -118,7 +118,7 @@ document.addEventListener("DOMContentLoaded", function() {
         if (timer) clearTimeout(timer);         // Clear timer if input detected
 
         timer = setTimeout(function() {         
-            trackSearchInteraction('2_second_delay_after_search_change');
+            trackSearchInteraction('delay_after_search_change');
         }, input_delay);
     });