Skip to content

Commit e8c3363

Browse files
committed
feat: support bagisto being served from subdir
1 parent 2763f53 commit e8c3363

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed

public/vendor/bagistoplus/visual/admin/assets/admin-CIEK0yqP.css renamed to public/vendor/bagistoplus/visual/admin/assets/admin-DVslIxF6.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/vendor/bagistoplus/visual/admin/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"resources/assets/admin/css/admin.css": {
3-
"file": "assets/admin-CIEK0yqP.css",
3+
"file": "assets/admin-DVslIxF6.css",
44
"src": "resources/assets/admin/css/admin.css",
55
"isEntry": true
66
},

resources/assets/admin/css/admin.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@
55
width: 24px;
66
height: 24px;
77
background-color: currentColor;
8-
mask-image: url('../images/logo.svg');
8+
/* mask-image: url('../images/logo.svg'); */
9+
mask-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='none' stroke='currentColor' viewBox='0 0 24 24'%0A%3E%3Cpath stroke-linecap='round' stroke-linejoin='round' d='M4 5a1 1 0 0 1 1-1h14a1 1 0 0 1 1 1v2a1 1 0 0 1-1 1H5a1 1 0 0 1-1-1V5zm0 8a1 1 0 0 1 1-1h6a1 1 0 0 1 1 1v6a1 1 0 0 1-1 1H5a1 1 0 0 1-1-1v-6zm12 0a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1v6a1 1 0 0 1-1 1h-2a1 1 0 0 1-1-1v-6z' /%3E%3C/svg%3E");
910
}

src/Http/Controllers/Admin/ThemeEditorController.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public function index($themeCode)
2525
{
2626
return view('visual::admin.editor.index', [
2727
'config' => [
28-
'baseUrl' => route('visual.admin.editor', ['theme' => $themeCode], false),
28+
'baseUrl' => parse_url(route('visual.admin.editor', ['theme' => $themeCode]), PHP_URL_PATH),
2929
'imagesBaseUrl' => Storage::disk(config('bagisto_visual.images_storage'))->url(''),
3030
'storefrontUrl' => url('/').'?'.http_build_query(['_designMode' => $themeCode]),
3131
'channels' => $this->getChannels(),
@@ -56,12 +56,17 @@ public function persistTheme(Request $request)
5656

5757
$this->themePersister->persist($request->all());
5858

59+
$baseUrl = rtrim(config('app.url'));
5960
$url = $request->input('url');
6061

6162
if (! empty($sections = $request->input('updatedSections', []))) {
6263
$url .= '&'.http_build_query(['_sections' => implode(',', $sections)]);
6364
}
6465

66+
if (parse_url($baseUrl, PHP_URL_PATH) !== null) {
67+
return redirect($url);
68+
}
69+
6570
$request = Request::create($url, 'GET');
6671
$response = app()->handle($request);
6772

0 commit comments

Comments
 (0)