Merge pull request #92 from zihanKuang/delete-banner

Refactor: Update asset handling to use Page Bundles

Author: zihanKuang

layouts/partials/badge.html

@@ -1,9 +1,9 @@
 {{- $b := .badge -}}
 {{- $contentId := .curriculaId -}}
-{{- $orgId := .orgId | default "" -}}
+{{- $page_ctx := .page -}}
 
-{{- $svg := cond (partial "is-url.html" $b.svg) $b.svg (partial "banner-url.html" (dict "uuid" $orgId "banner" $b.svg )) -}}
-{{- $png := cond (partial "is-url.html" $b.png) $b.png (partial "banner-url.html" (dict "uuid" $orgId "banner" $b.svg )) -}}
+{{- $svg := cond (partial "is-url.html" $b.svg) $b.svg (partial "resolve-local-resource.html" (dict "page" $page_ctx "path" $b.svg)) -}}
+{{- $png := cond (partial "is-url.html" $b.png) $b.png (partial "resolve-local-resource.html" (dict "page" $page_ctx "path" $b.png)) -}}
 
 {{- $badge := "nil" -}}
 

layouts/partials/banner-url.html

@@ -1,12 +1,9 @@
 
 {{- $page := .page -}}
-{{- $uuid := .uuid -}}
 {{- $type := or $page.Params.Type "default" -}}
-{{- $banner_url := partial "banner-url.html" (dict "uuid" $uuid "banner" $page.Params.Banner) -}}
+{{- $banner_url := partial "resolve-local-resource.html" (dict "page" .page "path" .page.Params.Banner) -}}
 {{- $id := partial "id.html" .page -}}
 
-
-
 "title": {{ $page.Title | jsonify }},
 "slug": {{ or $page.Slug $page.File.ContentBaseName | jsonify }},
 "id": {{ $id | jsonify }},

layouts/partials/common-curricula-properties.html

@@ -3,7 +3,7 @@
 {{- $ctx := partial "resolve-tenant.html" . -}}
 {{- $uuid := $ctx.uuid -}}
 {{- $level := partial "validate-level.html" . -}}
-{{- $banner_url := partial "banner-url.html" (dict "uuid" $uuid "banner" .Params.Banner) -}}
+{{- $banner_url := partial "resolve-local-resource.html" (dict "page" . "path" .Params.Banner) -}}
 {{- $id := partial "id.html" . -}}
 
 
@@ -27,7 +27,7 @@
     "title": {{ .Title | jsonify }},
     "description": {{ .Description | jsonify }},
     "banner": {{ $banner_url | jsonify }},
-    "badge": {{ partial "badge.html" (dict "badge" .Params.badge "curriculaId" $id "orgId" $uuid ) | jsonify }},
+    "badge": {{ partial "badge.html" (dict "page" . "badge" .Params.badge "curriculaId" $id ) | jsonify }},
     "certificate": {{ .Params.certificate | jsonify }},
     "permalink": {{ .Permalink | jsonify }},
     "categories": {{ .Params.Categories | jsonify }},

layouts/partials/learning-path.json.html

@@ -0,0 +1,18 @@
+{{/*
+  //revice a page and a path, return the final url of the resource in the page bundle.
+  @param {dict} . - A dictionary containing:
+  - "page" {page}: The current page context.
+  - "path" {string}: The filename of the resource.
+*/}}
+{{- $page_ctx := .page -}}
+{{- $resource_path := .path -}}
+
+{{- $resolved_url := "" -}}
+
+{{- if and $page_ctx $resource_path -}}
+  {{- with $page_ctx.Resources.GetMatch $resource_path -}}
+    {{- $resolved_url = .Permalink -}}
+  {{- end -}}
+{{- end -}}
+
+{{- return $resolved_url -}}