shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed app url issue

Browse Source
This commit is contained in:
Denis Duliçi 2021-05-17 10:57:13 +03:00
parent 03c960d7e9
commit bdb51a27a4
5 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.env.example
View File

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

1
.env.testing
View File

@ -5,6 +5,7 @@ APP_INSTALLED=true
APP_KEY=base64:xBC+BxlC7sXhYAtpTZv8TYAHqoPgsJaXL0S5Id6BbBc= APP_KEY=base64:xBC+BxlC7sXhYAtpTZv8TYAHqoPgsJaXL0S5Id6BbBc=
APP_DEBUG=true APP_DEBUG=true
APP_SCHEDULE_TIME="09:00" APP_SCHEDULE_TIME="09:00"
APP_URL=
DB_CONNECTION=sqlite DB_CONNECTION=sqlite
DB_DATABASE=:memory: DB_DATABASE=:memory:

22
app/Utilities/Installer.php
View File

@ -5,10 +5,10 @@ namespace App\Utilities;
use App\Jobs\Auth\CreateUser; use App\Jobs\Auth\CreateUser;
use App\Jobs\Common\CreateCompany; use App\Jobs\Common\CreateCompany;
use App\Utilities\Console; use App\Utilities\Console;
use Artisan; use Illuminate\Support\Facades\Artisan;
use Config; use Illuminate\Support\Facades\Config;
use DB; use Illuminate\Support\Facades\DB;
use File; use Illuminate\Support\Facades\File;
use Illuminate\Support\Str; use Illuminate\Support\Str;
/** /**
@ -232,7 +232,7 @@ class Installer
public static function createCompany($name, $email, $locale) public static function createCompany($name, $email, $locale)
{ {
dispatch_now(new CreateCompany([ dispatch_sync(new CreateCompany([
'name' => $name, 'name' => $name,
'domain' => '', 'domain' => '',
'email' => $email, 'email' => $email,
@ -244,7 +244,7 @@ class Installer
public static function createUser($email, $password, $locale) public static function createUser($email, $password, $locale)
{ {
dispatch_now(new CreateUser([ dispatch_sync(new CreateUser([
'name' => '', 'name' => '',
'email' => $email, 'email' => $email,
'password' => $password, 'password' => $password,
@ -258,13 +258,19 @@ class Installer
public static function finalTouches() public static function finalTouches()
{ {
// Update .env file // Update .env file
static::updateEnv([ $env = [
'APP_LOCALE' => session('locale'), 'APP_LOCALE' => session('locale'),
'APP_INSTALLED' => 'true', 'APP_INSTALLED' => 'true',
'APP_DEBUG' => 'false', 'APP_DEBUG' => 'false',
'FIREWALL_ENABLED' => 'true', 'FIREWALL_ENABLED' => 'true',
'MODEL_CACHE_ENABLED' => 'true', 'MODEL_CACHE_ENABLED' => 'true',
]); ];
if (!app()->runningInConsole()) {
$env['APP_URL'] = request()->getUriForPath('');
}
static::updateEnv($env);
// Rename the robots.txt file // Rename the robots.txt file
try { try {

6
app/Utilities/Overrider.php
View File

@ -50,8 +50,10 @@ class Overrider
app()->setLocale(setting('default.locale')); app()->setLocale(setting('default.locale'));
} }
// Set app url dynamically // Set app url dynamically if empty
config(['app.url' => url('/')]); if (!config('app.url')) {
config(['app.url' => url('/')]);
}
} }
protected static function loadCurrencies() protected static function loadCurrencies()

2
config/app.php
View File

@ -55,7 +55,7 @@ return [
| |
*/ */
'url' => env('APP_URL', 'http://localhost'), 'url' => env('APP_URL', ''),
'asset_url' => env('ASSET_URL', null), 'asset_url' => env('ASSET_URL', null),