From 4773747e010e6fe6e1310806bae4478147a60408 Mon Sep 17 00:00:00 2001
From: Jonathan Bertoldi <contato@jonathanbertoldi.com.br>
Date: Thu, 4 Mar 2021 16:58:42 -0300
Subject: [PATCH] Fixed admin theme not loading with custom admin url

---
 packages/Webkul/Theme/src/ThemeViewFinder.php | 2 +-
 packages/Webkul/Theme/src/Themes.php          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/Webkul/Theme/src/ThemeViewFinder.php b/packages/Webkul/Theme/src/ThemeViewFinder.php
index 574a7bf7f..84fa3f61d 100755
--- a/packages/Webkul/Theme/src/ThemeViewFinder.php
+++ b/packages/Webkul/Theme/src/ThemeViewFinder.php
@@ -20,7 +20,7 @@ class ThemeViewFinder extends FileViewFinder
         // Extract the $view and the $namespace parts
         list($namespace, $view) = $this->parseNamespaceSegments($name);
 
-        if (request()->route() !== null && ! Str::contains(request()->route()->uri, 'admin/')) {
+        if (request()->route() !== null && ! Str::contains(request()->route()->uri, config('app.admin_url') . '/')) {
             $paths = $this->addThemeNamespacePaths($namespace);
 
             try {
diff --git a/packages/Webkul/Theme/src/Themes.php b/packages/Webkul/Theme/src/Themes.php
index 4229605ff..05720be56 100755
--- a/packages/Webkul/Theme/src/Themes.php
+++ b/packages/Webkul/Theme/src/Themes.php
@@ -43,7 +43,7 @@ class Themes
      */
     public function __construct()
     {
-        if (request()->route() !== null && Str::contains(request()->route()->uri, 'admin/')) {
+        if (request()->route() !== null && Str::contains(request()->route()->uri, config('app.admin_url') . '/')) {
             $this->defaultThemeCode = Config::get('themes.admin-default', null);
         } else {
             $this->defaultThemeCode = Config::get('themes.default', null);