Merge pull request #116 from Linaro/marcpe_staging

Make version FROM consistent and move to first item ahead of category.
Linaro · Sep 25, 2024 · 78e4905 · 78e4905
2 parents a77ce0f + 2538c4b
commit 78e4905
Show file tree

Hide file tree

Showing 5 changed files with 760 additions and 22 deletions.
diff --git a/src/components/Projects/ApplicationDetails.astro b/src/components/Projects/ApplicationDetails.astro
@@ -67,6 +67,15 @@ const { Content } = await render();
 </div>
 
 <ul class="flex flex-row flex-wrap gap-x-16 gap-y-6">
+  {
+    version_from && (
+      <li>
+        <b data-pagefind-ignore>Version From: </b>
+        <span data-pagefind-meta="version_from">{version_from}</span>
+      </li>
+    )
+  }
+
   <li>
     <b data-pagefind-ignore>Categories: </b>
     {
@@ -84,14 +93,6 @@ const { Content } = await render();
       )
     }
   </li>
-  {
-    version_from && (
-      <li>
-        <b data-pagefind-ignore>Version From: </b>
-        <span data-pagefind-meta="version_from">{version_from}</span>
-      </li>
-    )
-  }
   {
     () => {
       if (link)

diff --git a/src/components/Projects/ApplicationListing.astro b/src/components/Projects/ApplicationListing.astro
@@ -65,7 +65,12 @@ const url = `/applications/${slug}/`;
             }
           }
         </p>
-
+
+        <p class="break-all text-orange-200">
+          <b>Version From:&nbsp;</b>
+          <span class="min-w-0">{data.version_from}</span>
+        </p>
+
         <p class="px-3 flex flex-wrap">
           <b>Categories: </b>
           <span class="px-3 flex flex-wrap gap-1">
@@ -80,11 +85,6 @@ const url = `/applications/${slug}/`;
             }
           </span>
         </p>
-
-        <p class="break-all text-orange-200">
-          <b>Version:&nbsp;</b>
-          <span class="min-w-0">{data.version_from}</span>
-        </p>
       </div>
     </div>
   </article>

diff --git a/src/components/Search/Results.tsx b/src/components/Search/Results.tsx
@@ -115,6 +115,14 @@ const Result = ({
                 </span>
               </p>
               </Show>
+
+              <Show when={type === "applications"}>
+                <p class="break-all text-orange-200">
+                  <b>Version from:&nbsp;</b>
+                  <span class="min-w-0">{project()?.meta.version_from}</span>
+                </p>
+              </Show>
+
               <Show when={type === "applications"}>
               <p class="flex gap-2 flex-wrap">
                 <b>Categories: </b>
@@ -130,13 +138,6 @@ const Result = ({
               </p>
               </Show>
 
-              <Show when={type === "applications"}>
-                <p class="break-all text-orange-200">
-                  <b>Version:&nbsp;</b>
-                  <span class="min-w-0">{project()?.meta.version_from}</span>
-                </p>
-              </Show>
-
               <Show when={type === "games"}>
                 <p>
                   <b>Compatibility: </b>

diff --git a/src/content/applications/DavinciResolve.md b/src/content/applications/DavinciResolve.md
@@ -3,7 +3,7 @@ name: "Davinci Resolve"
 categories: ['creative']
 compatibility: native
 display_result: "Compatible"
-version_from: "19"
+version_from: "19.0.0"
 featured: true
 link: https://www.blackmagicdesign.com/products/davinciresolve/
 icon: DavinciResolve.jfif