fix: resolve image image urls

johannschopplich · Feb 6, 2023 · 69d91b4 · 69d91b4
1 parent 1eda027
commit 69d91b4
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 19 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/site/plugins/kirby-vue-kit/classes/VueKit.php b/site/plugins/kirby-vue-kit/classes/VueKit.php
@@ -4,8 +4,8 @@
 
 use Exception;
 use Kirby\Data\Data;
-use Kirby\Http\Url;
 use Kirby\Filesystem\F;
+use Kirby\Http\Url;
 use Kirby\Toolkit\Html;
 
 class VueKit

diff --git a/site/plugins/kirby-vue-kit/routes.php b/site/plugins/kirby-vue-kit/routes.php
@@ -1,8 +1,9 @@
 <?php
 
+use JohannSchopplich\VueKit\Page;
 use Kirby\Cms\Url;
+use Kirby\Filesystem\F;
 use Kirby\Http\Response;
-use JohannSchopplich\VueKit\Page;
 
 $apiLocation = Url::path(env('KIRBY_CONTENT_API_SLUG', ''), false, true);
 
@@ -14,17 +15,19 @@
         'pattern' => "{$apiLocation}(:all).json",
         'language' => '*',
         'action' => function (...$args) {
-            if (kirby()->multilang()) {
+            $kirby = kirby();
+
+            if ($kirby->multilang()) {
                 [$languageCode, $pageId] = $args;
             } else {
                 [$pageId] = $args;
             }
 
-            $page = kirby()->page($pageId);
+            $page = $kirby->page($pageId);
 
             if (!$page || !$page->isVerified(get('token'))) {
-                $page = kirby()->site()->errorPage();
-            };
+                $page = $kirby->site()->errorPage();
+            }
 
             $json = Page::render($page, 'json');
             return Response::json($json);
@@ -38,22 +41,42 @@
         'pattern' => '(:all)',
         'language' => '*',
         'action' => function (...$args) {
-            if (kirby()->multilang()) {
-                [$languageCode, $pageId] = $args;
+            $kirby = kirby();
+
+            if ($kirby->multilang()) {
+                [$languageCode, $path] = $args;
             } else {
-                [$pageId] = $args;
+                [$path] = $args;
+            }
+
+            $extension = F::extension($path);
+
+            // Try to resolve page and site files
+            if (!empty($extension)) {
+                $id = dirname($path);
+                $filename = basename($path);
+
+                // Try to resolve image urls for pages and drafts
+                if ($page = $kirby->site()->findPageOrDraft($id)) {
+                    return $page->file($filename);
+                }
+
+                // Try to resolve site files at last
+                if ($file = $kirby->site()->file($filename)) {
+                    return $file;
+                }
             }
 
             // Fall back to homepage id
-            if (empty($pageId)) {
-                $pageId = site()->homePageId();
+            if (empty($path)) {
+                $path = site()->homePageId();
             }
 
-            $page = kirby()->page($pageId);
+            $page = $kirby->page($path);
 
             if (!$page || !$page->isVerified(get('token'))) {
-                $page = kirby()->site()->errorPage();
-            };
+                $page = $kirby->site()->errorPage();
+            }
 
             $html = Page::render($page, 'html');
             return $html;