maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

update cron fpm config builder and webpack assets

Browse Source
This commit is contained in:
envoyr
2022-04-21 18:19:23 +02:00
parent 16c38b4066
commit cb7f180d8d
7 changed files with 33 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -19,4 +19,5 @@ templates/*
!templates/Froxlor/
templates/Froxlor/assets/css/
templates/Froxlor/assets/js/
templates/Froxlor/assets/webfonts/
!templates/misc/

5
lib/Froxlor/Cron/Http/Php/Fpm.php
View File

@@ -244,13 +244,16 @@ class Fpm
$fpm_config .= "\n\n";
foreach ($phpini_array as $inisection) {
$is = explode("=", $inisection);
if (count($is) !== 2 || empty($is[0])) {
continue;
}
foreach ($this->ini as $sec => $possibles) {
if (in_array(trim($is[0]), $possibles)) {
// check explicitly for open_basedir
if (trim($is[0]) == 'open_basedir' && $openbasedir == '') {
continue;
}
$fpm_config .= $sec . '[' . trim($is[0]) . '] = ' . trim($is[1]) . "\n";
$fpm_config .= $sec . '[' . trim($is[0]) . '] = ' . trim($is[1] ?? '') . "\n";
}
}
}

5
mix-manifest.json
View File

@@ -1,5 +0,0 @@
{
"/templates/Froxlor/assets/js/main.js": "/templates/Froxlor/assets/js/main.js",
"/templates/Froxlor/assets/css/dark.css": "/templates/Froxlor/assets/css/dark.css",
"/templates/Froxlor/assets/css/main.css": "/templates/Froxlor/assets/css/main.css"
}

13
templates/Froxlor/assets/mix-manifest.json Normal file
View File

@@ -0,0 +1,13 @@
{
"/js/main.js": "/js/main.js",
"/css/dark.css": "/css/dark.css",
"/css/main.css": "/css/main.css",
"/webfonts/fa-brands-400.ttf": "/webfonts/fa-brands-400.ttf",
"/webfonts/fa-brands-400.woff2": "/webfonts/fa-brands-400.woff2",
"/webfonts/fa-regular-400.ttf": "/webfonts/fa-regular-400.ttf",
"/webfonts/fa-regular-400.woff2": "/webfonts/fa-regular-400.woff2",
"/webfonts/fa-solid-900.ttf": "/webfonts/fa-solid-900.ttf",
"/webfonts/fa-solid-900.woff2": "/webfonts/fa-solid-900.woff2",
"/webfonts/fa-v4compatibility.ttf": "/webfonts/fa-v4compatibility.ttf",
"/webfonts/fa-v4compatibility.woff2": "/webfonts/fa-v4compatibility.woff2"
}

1
templates/Froxlor/src/js/main.js
View File

@@ -1,5 +1,6 @@
// load bootstrap
import 'bootstrap';
import '@fortawesome/fontawesome-free';
import 'chart.js/dist/chart';
// load jquery

1
templates/Froxlor/src/scss/main.scss
View File

@@ -3,6 +3,7 @@
// Bootstrap
@import "variables/main";
@import "~bootstrap/scss/bootstrap";
@import "~@fortawesome/fontawesome-free/scss/fontawesome";
// Theme
@import "global";

13
webpack.mix.js
View File

@@ -3,12 +3,11 @@
let mix = require('laravel-mix');
mix
.setPublicPath('')
.setPublicPath('templates/Froxlor/assets')
.options({
fileLoaderDirs: {
fonts: 'templates/Froxlor/assets/fonts'
}
processCssUrls: false
})
.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');
.copyDirectory('node_modules/@fortawesome/fontawesome-free/webfonts', 'templates/Froxlor/assets/webfonts')
.js('templates/Froxlor/src/js/main.js', 'js')
.sass('templates/Froxlor/src/scss/main.scss', 'css')
.sass('templates/Froxlor/src/scss/dark.scss', 'css');