Skip to content

Commit fb6ae7b

Browse files
rakieta2015rakieta2015
committed
fix: project url handling
1 parent 0fac4ff commit fb6ae7b

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ And modify this line:
151151

152152
To make it look like this:
153153

154-
* APP_URL = http://example.com/sub-folder/
154+
* APP_URL = http://example.com/sub-folder
155155

156156

157157
### Next step

‎app/MenuBuilder/FreelyPositionedMenus.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ private static function renderDropdown($data, $prefixClass){
2222
}else{
2323
for($i = 0; $i < count($data); $i++){
2424
if( $data[$i]['slug'] === 'link' ){
25-
echo '<a class="' . $prefixClass . 'nav-link dropdown-item" href="' . $data[$i]['href'] . '">';
25+
echo '<a class="' . $prefixClass . 'nav-link dropdown-item" href="' . env('APP_URL', '') . $data[$i]['href'] . '">';
2626
echo '<span class="' . $prefixClass . 'nav-icon"></span>' . $data[$i]['name'] . '</a>';
2727
}elseif( $data[$i]['slug'] === 'dropdown' ){
2828
self::renderDropdown( $data[$i], $prefixClass );
@@ -42,7 +42,7 @@ public static function render($data, $prefixClass = '', $navClass = ''){
4242
foreach($data as $d){
4343
if($d['slug'] === 'link'){
4444
echo '<li class="' . $prefixClass .'nav-item px-3">';
45-
echo '<a class="' . $prefixClass . 'nav-link" href="' . $d['href'] . '">';
45+
echo '<a class="' . $prefixClass . 'nav-link" href="' . env('APP_URL', '') . $d['href'] . '">';
4646
if($d['hasIcon'] === true){
4747
if($d['iconType'] === 'coreui'){
4848
echo '<i class="' . $d['icon'] . ' ' . $prefixClass . 'nav-icon"></i>';

‎resources/views/dashboard/shared/header.blade.php

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<div class="c-wrapper">
44
<header class="c-header c-header-light c-header-fixed c-header-with-subheader">
5-
<button class="c-header-toggler c-class-toggler d-lg-none mr-auto" type="button" data-target="#sidebar" data-class="c-sidebar-show"><span class="c-header-toggler-icon"></span></button><a class="c-header-brand d-sm-none" href="#"><img class="c-header-brand" src="{{ env('APP_URL') }}/assets/brand/coreui-base.svg" width="97" height="46" alt="CoreUI Logo"></a>
5+
<button class="c-header-toggler c-class-toggler d-lg-none mr-auto" type="button" data-target="#sidebar" data-class="c-sidebar-show"><span class="c-header-toggler-icon"></span></button><a class="c-header-brand d-sm-none" href="#"><img class="c-header-brand" src="{{ env('APP_URL', '') }}/assets/brand/coreui-base.svg" width="97" height="46" alt="CoreUI Logo"></a>
66
<button class="c-header-toggler c-class-toggler ml-3 d-md-down-none" type="button" data-target="#sidebar" data-class="c-sidebar-lg-show" responsive="true"><span class="c-header-toggler-icon"></span></button>
77
<?php
88
use App\MenuBuilder\FreelyPositionedMenus;
@@ -13,52 +13,52 @@
1313
<ul class="c-header-nav ml-auto mr-4">
1414
<li class="c-header-nav-item d-md-down-none mx-2"><a class="c-header-nav-link">
1515
<svg class="c-icon">
16-
<use xlink:href="{{ env('APP_URL') }}/icons/sprites/free.svg#cil-bell"></use>
16+
<use xlink:href="{{ env('APP_URL', '') }}/icons/sprites/free.svg#cil-bell"></use>
1717
</svg></a></li>
1818
<li class="c-header-nav-item d-md-down-none mx-2"><a class="c-header-nav-link">
1919
<svg class="c-icon">
20-
<use xlink:href="{{ env('APP_URL') }}/icons/sprites/free.svg#cil-list-rich"></use>
20+
<use xlink:href="{{ env('APP_URL', '') }}/icons/sprites/free.svg#cil-list-rich"></use>
2121
</svg></a></li>
2222
<li class="c-header-nav-item d-md-down-none mx-2"><a class="c-header-nav-link">
2323
<svg class="c-icon">
24-
<use xlink:href="{{ env('APP_URL') }}/icons/sprites/free.svg#cil-envelope-open"></use>
24+
<use xlink:href="{{ env('APP_URL', '') }}/icons/sprites/free.svg#cil-envelope-open"></use>
2525
</svg></a></li>
2626
<li class="c-header-nav-item dropdown"><a class="c-header-nav-link" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
27-
<div class="c-avatar"><img class="c-avatar-img" src="{{ env('APP_URL') }}/assets/img/avatars/6.jpg" alt="[email protected]"></div>
27+
<div class="c-avatar"><img class="c-avatar-img" src="{{ env('APP_URL', '') }}/assets/img/avatars/6.jpg" alt="[email protected]"></div>
2828
</a>
2929
<div class="dropdown-menu dropdown-menu-right pt-0">
3030
<div class="dropdown-header bg-light py-2"><strong>Account</strong></div><a class="dropdown-item" href="#">
3131
<svg class="c-icon mr-2">
32-
<use xlink:href="{{ env('APP_URL') }}/icons/sprites/free.svg#cil-bell"></use>
32+
<use xlink:href="{{ env('APP_URL', '') }}/icons/sprites/free.svg#cil-bell"></use>
3333
</svg> Updates<span class="badge badge-info ml-auto">42</span></a><a class="dropdown-item" href="#">
3434
<svg class="c-icon mr-2">
35-
<use xlink:href="{{ env('APP_URL') }}/icons/sprites/free.svg#cil-envelope-open"></use>
35+
<use xlink:href="{{ env('APP_URL', '') }}/icons/sprites/free.svg#cil-envelope-open"></use>
3636
</svg> Messages<span class="badge badge-success ml-auto">42</span></a><a class="dropdown-item" href="#">
3737
<svg class="c-icon mr-2">
38-
<use xlink:href="{{ env('APP_URL') }}/icons/sprites/free.svg#cil-task"></use>
38+
<use xlink:href="{{ env('APP_URL', '') }}/icons/sprites/free.svg#cil-task"></use>
3939
</svg> Tasks<span class="badge badge-danger ml-auto">42</span></a><a class="dropdown-item" href="#">
4040
<svg class="c-icon mr-2">
41-
<use xlink:href="{{ env('APP_URL') }}/icons/sprites/free.svg#cil-comment-square"></use>
41+
<use xlink:href="{{ env('APP_URL', '') }}/icons/sprites/free.svg#cil-comment-square"></use>
4242
</svg> Comments<span class="badge badge-warning ml-auto">42</span></a>
4343
<div class="dropdown-header bg-light py-2"><strong>Settings</strong></div><a class="dropdown-item" href="#">
4444
<svg class="c-icon mr-2">
45-
<use xlink:href="{{ env('APP_URL') }}/icons/sprites/free.svg#cil-user"></use>
45+
<use xlink:href="{{ env('APP_URL', '') }}/icons/sprites/free.svg#cil-user"></use>
4646
</svg> Profile</a><a class="dropdown-item" href="#">
4747
<svg class="c-icon mr-2">
48-
<use xlink:href="{{ env('APP_URL') }}/icons/sprites/free.svg#cil-settings"></use>
48+
<use xlink:href="{{ env('APP_URL', '') }}/icons/sprites/free.svg#cil-settings"></use>
4949
</svg> Settings</a><a class="dropdown-item" href="#">
5050
<svg class="c-icon mr-2">
51-
<use xlink:href="{{ env('APP_URL') }}/icons/sprites/free.svg#cil-credit-card"></use>
51+
<use xlink:href="{{ env('APP_URL', '') }}/icons/sprites/free.svg#cil-credit-card"></use>
5252
</svg> Payments<span class="badge badge-secondary ml-auto">42</span></a><a class="dropdown-item" href="#">
5353
<svg class="c-icon mr-2">
54-
<use xlink:href="{{ env('APP_URL') }}/icons/sprites/free.svg#cil-file"></use>
54+
<use xlink:href="{{ env('APP_URL', '') }}/icons/sprites/free.svg#cil-file"></use>
5555
</svg> Projects<span class="badge badge-primary ml-auto">42</span></a>
5656
<div class="dropdown-divider"></div><a class="dropdown-item" href="#">
5757
<svg class="c-icon mr-2">
58-
<use xlink:href="{{ env('APP_URL') }}/icons/sprites/free.svg#cil-lock-locked"></use>
58+
<use xlink:href="{{ env('APP_URL', '') }}/icons/sprites/free.svg#cil-lock-locked"></use>
5959
</svg> Lock Account</a><a class="dropdown-item" href="#">
6060
<svg class="c-icon mr-2">
61-
<use xlink:href="{{ env('APP_URL') }}/icons/sprites/free.svg#cil-account-logout"></use>
61+
<use xlink:href="{{ env('APP_URL', '') }}/icons/sprites/free.svg#cil-account-logout"></use>
6262
</svg><form action="/logout" method="POST"> @csrf <button type="submit" class="btn btn-ghost-dark btn-block">Logout</button></form></a>
6363
</div>
6464
</li>

‎resources/views/dashboard/shared/nav-builder.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ function renderDropdown($data){
3030
}
3131
?>
3232

33-
<div class="c-sidebar-brand"><img class="c-sidebar-brand-full" src="{{ env('APP_URL') }}/assets/brand/coreui-base-white.svg" width="118" height="46" alt="CoreUI Logo"><img class="c-sidebar-brand-minimized" src="assets/brand/coreui-signet-white.svg" width="118" height="46" alt="CoreUI Logo"></div>
33+
<div class="c-sidebar-brand"><img class="c-sidebar-brand-full" src="{{ env('APP_URL', '') }}/assets/brand/coreui-base-white.svg" width="118" height="46" alt="CoreUI Logo"><img class="c-sidebar-brand-minimized" src="assets/brand/coreui-signet-white.svg" width="118" height="46" alt="CoreUI Logo"></div>
3434
<ul class="c-sidebar-nav">
3535
@if(isset($appMenus['sidebar menu']))
3636
@foreach($appMenus['sidebar menu'] as $menuel)

0 commit comments

Comments
 (0)