removed APP_URL requirement

This commit is contained in:
denisdulici 2019-03-09 17:24:27 +03:00
parent ce2a6c5203
commit 702fd460ea
11 changed files with 9 additions and 12 deletions

View File

@ -5,7 +5,6 @@ APP_INSTALLED=false
APP_KEY= APP_KEY=
APP_DEBUG=true APP_DEBUG=true
APP_LOG_LEVEL=debug APP_LOG_LEVEL=debug
APP_URL=
APP_SCHEDULE_TIME="09:00" APP_SCHEDULE_TIME="09:00"
DB_CONNECTION=mysql DB_CONNECTION=mysql

View File

@ -5,7 +5,6 @@ APP_INSTALLED=false
APP_KEY=base64:xBC+BxlC7sXhYAtpTZv8TYAHqoPgsJaXL0S5Id6BbBc= APP_KEY=base64:xBC+BxlC7sXhYAtpTZv8TYAHqoPgsJaXL0S5Id6BbBc=
APP_DEBUG=true APP_DEBUG=true
APP_LOG_LEVEL=debug APP_LOG_LEVEL=debug
APP_URL=http://akaunting.test
APP_SCHEDULE_TIME="09:00" APP_SCHEDULE_TIME="09:00"
DB_CONNECTION=sqlite DB_CONNECTION=sqlite

View File

@ -551,7 +551,7 @@ trait Modules
$headers['headers'] = [ $headers['headers'] = [
'Authorization' => 'Bearer ' . setting('general.api_token'), 'Authorization' => 'Bearer ' . setting('general.api_token'),
'Accept' => 'application/json', 'Accept' => 'application/json',
'Referer' => env('APP_URL'), 'Referer' => url('/'),
'Akaunting' => version('short'), 'Akaunting' => version('short'),
'Language' => language()->getShortCode() 'Language' => language()->getShortCode()
]; ];

View File

@ -17,7 +17,7 @@ trait SiteApi
$headers['headers'] = array( $headers['headers'] = array(
'Authorization' => 'Bearer ' . setting('general.api_token'), 'Authorization' => 'Bearer ' . setting('general.api_token'),
'Accept' => 'application/json', 'Accept' => 'application/json',
'Referer' => env('APP_URL'), 'Referer' => url('/'),
'Akaunting' => version('short'), 'Akaunting' => version('short'),
'Language' => language()->getShortCode() 'Language' => language()->getShortCode()
); );

View File

@ -113,7 +113,6 @@ class Installer
// Update .env file // Update .env file
static::updateEnv([ static::updateEnv([
'APP_KEY' => 'base64:'.base64_encode(random_bytes(32)), 'APP_KEY' => 'base64:'.base64_encode(random_bytes(32)),
'APP_URL' => url('/'),
]); ]);
} }

View File

@ -94,7 +94,7 @@ return [
'chartjs' => [ 'chartjs' => [
'scripts' => [ 'scripts' => [
env('APP_URL') . '/public/js/chartjs/Chart.min.js', asset('/public/js/chartjs/Chart.min.js'),
], ],
], ],

View File

@ -51,14 +51,14 @@ return [
'public' => [ 'public' => [
'driver' => 'local', 'driver' => 'local',
'root' => storage_path('app/public'), 'root' => storage_path('app/public'),
'url' => env('APP_URL').'/storage', 'url' => url('/') . '/storage',
'visibility' => 'public', 'visibility' => 'public',
], ],
'uploads' => [ 'uploads' => [
'driver' => 'local', 'driver' => 'local',
'root' => storage_path('app/uploads'), 'root' => storage_path('app/uploads'),
'url' => env('APP_URL').'/uploads', 'url' => url('/') . '/uploads',
'visibility' => 'private', 'visibility' => 'private',
], ],

View File

@ -60,7 +60,7 @@
<script src="{{ asset('public/js/app.js?v=' . version('short')) }}"></script> <script src="{{ asset('public/js/app.js?v=' . version('short')) }}"></script>
<script type="text/javascript"><!-- <script type="text/javascript"><!--
var app_url = '{{ env("APP_URL") }}'; var app_url = '{{ url("/") }}';
var url_search = '{{ url("common/search/search") }}'; var url_search = '{{ url("common/search/search") }}';
//--></script> //--></script>

View File

@ -66,7 +66,7 @@
<script src="{{ asset('public/js/app.js?v=' . version('short')) }}"></script> <script src="{{ asset('public/js/app.js?v=' . version('short')) }}"></script>
<script type="text/javascript"><!-- <script type="text/javascript"><!--
var app_url = '{{ env("APP_URL") }}'; var app_url = '{{ url("/") }}';
var url_search = '{{ url("common/search/search") }}'; var url_search = '{{ url("common/search/search") }}';
//--></script> //--></script>

View File

@ -66,7 +66,7 @@
<script src="{{ asset('public/js/app.js?v=' . version('short')) }}"></script> <script src="{{ asset('public/js/app.js?v=' . version('short')) }}"></script>
<script type="text/javascript"><!-- <script type="text/javascript"><!--
var app_url = '{{ env("APP_URL") }}'; var app_url = '{{ url("/") }}';
var url_search = '{{ url("common/search/search") }}'; var url_search = '{{ url("common/search/search") }}';
//--></script> //--></script>

View File

@ -60,7 +60,7 @@
<script src="{{ asset('public/js/app.js?v=' . version('short')) }}"></script> <script src="{{ asset('public/js/app.js?v=' . version('short')) }}"></script>
<script type="text/javascript"><!-- <script type="text/javascript"><!--
var app_url = '{{ env("APP_URL") }}'; var app_url = '{{ url("/") }}';
var url_search = '{{ url("common/search/search") }}'; var url_search = '{{ url("common/search/search") }}';
//--></script> //--></script>