fix font assets path, logo path, database installation and checks
This commit is contained in:
@@ -333,7 +333,7 @@ class FroxlorInstall
|
||||
}
|
||||
|
||||
// check if we have unrecoverable errors
|
||||
if ($fatal_fail || $another_fail || $this->_abort) {
|
||||
if ($fatal_fail || isset($another_fail) && $another_fail || $this->_abort) {
|
||||
// D'oh
|
||||
$_die = true;
|
||||
$message = $this->_lng['install']['testing_mysql_fail'];
|
||||
@@ -775,7 +775,10 @@ class FroxlorInstall
|
||||
$mysql_access_host_array[] = '127.0.0.1';
|
||||
}
|
||||
|
||||
if (!in_array($this->_data['serverip'], $mysql_access_host_array)) {
|
||||
$mysql_access_host_array[] = $this->_data['serverip'];
|
||||
}
|
||||
|
||||
foreach ($mysql_access_host_array as $mysql_access_host) {
|
||||
$frox_db = str_replace('`', '', $this->_data['mysql_database']);
|
||||
$this->_grantDbPrivilegesTo($db_root, $frox_db, $this->_data['mysql_unpriv_user'], $this->_data['mysql_unpriv_pass'], $mysql_access_host);
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
{% block content %}
|
||||
<div class="container max-w-lg flex align-content-center mt-5">
|
||||
<img src="templates/Sparkle/assets/img/logo.png" alt="Froxlor Server Management Panel" />
|
||||
<img src="templates/Froxlor/assets/img/logo.png" alt="Froxlor Server Management Panel" />
|
||||
|
||||
<div class="row gx-0 rounded shadow bg-primary text-white mt-5">
|
||||
<div class="col p-5 rounded-start">
|
||||
|
||||
@@ -3,6 +3,12 @@
|
||||
let mix = require('laravel-mix');
|
||||
|
||||
mix
|
||||
.setPublicPath('')
|
||||
.options({
|
||||
fileLoaderDirs: {
|
||||
fonts: 'templates/Froxlor/assets/fonts'
|
||||
}
|
||||
})
|
||||
.js('templates/Froxlor/src/js/main.js', 'templates/Froxlor/assets/js')
|
||||
.sass('templates/Froxlor/src/scss/main.scss', 'templates/Froxlor/assets/css')
|
||||
.sass('templates/Froxlor/src/scss/dark.scss', 'templates/Froxlor/assets/css');
|
||||
Reference in New Issue
Block a user