diff --git a/composer.json b/composer.json
index 635beca..3edeb29 100644
--- a/composer.json
+++ b/composer.json
@@ -11,18 +11,18 @@
"license": "MIT",
"require": {
"php": "^8.1",
- "guzzlehttp/guzzle": "^7.7",
+ "guzzlehttp/guzzle": "^7.8",
"laravel/framework": "^10",
"laravel/tinker": "^2.8",
"laravel/ui": "^4.2",
- "yajra/laravel-datatables-oracle": "~10.7",
+ "yajra/laravel-datatables-oracle": "~10.8",
"ext-json": "*",
- "doctrine/dbal": "v3.6"
+ "doctrine/dbal": "^3"
},
"require-dev": {
"fakerphp/faker": "^1.23",
- "laravel/breeze": "^1.22",
- "laravel/sail": "^1.23",
+ "laravel/breeze": "^1.24",
+ "laravel/sail": "^1.25",
"mockery/mockery": "^1.6",
"nunomaduro/collision": "^7",
"phpunit/phpunit": "^10",
diff --git a/package.json b/package.json
index 60407ed..882e8f4 100644
--- a/package.json
+++ b/package.json
@@ -12,14 +12,17 @@
},
"devDependencies": {
"axios": "^0.27.2",
- "bootstrap": "^5.3.1",
+ "bootstrap": "^5.3.2",
"bootstrap-dark-5": "^1.1.3",
"bootstrap-data-table": "^1.0.0",
"datatables": "^1.10.18",
"datatables.net-bs": "^1.13.6",
"font-awesome": "^4.7.0",
- "jquery": "^3.7.0",
+ "jquery": "^3.7.1",
"laravel-mix": "^6.0.49",
+ "resolve-url-loader": "^5.0.0",
+ "sass": "^1.68.0",
+ "sass-loader": "^12.6.0",
"vue": "^2.7.14",
"vue-loader": "^17.2.2",
"vue-resource": "^1.5.3",
@@ -29,4 +32,4 @@
"@fortawesome/fontawesome-free": "^6.4.2",
"datatables.net-bs5": "^1.13.6"
}
-}
+}
\ No newline at end of file
diff --git a/public/css/app.css b/public/css/app.css
index b17c09e..99725b4 100644
Binary files a/public/css/app.css and b/public/css/app.css differ
diff --git a/public/css/light.css b/public/css/light.css
index c8c3364..2114eb9 100644
Binary files a/public/css/light.css and b/public/css/light.css differ
diff --git a/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.ttf b/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.ttf
deleted file mode 100644
index 30f55b7..0000000
Binary files a/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.ttf and /dev/null differ
diff --git a/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.woff2 b/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.woff2
deleted file mode 100644
index 8a480d9..0000000
Binary files a/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.woff2 and /dev/null differ
diff --git a/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-solid-900.ttf b/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-solid-900.ttf
deleted file mode 100644
index e479fb2..0000000
Binary files a/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-solid-900.ttf and /dev/null differ
diff --git a/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-solid-900.woff2 b/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-solid-900.woff2
deleted file mode 100644
index 88b0367..0000000
Binary files a/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-solid-900.woff2 and /dev/null differ
diff --git a/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-v4compatibility.ttf b/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-v4compatibility.ttf
deleted file mode 100644
index ba6cb25..0000000
Binary files a/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-v4compatibility.ttf and /dev/null differ
diff --git a/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-v4compatibility.woff2 b/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-v4compatibility.woff2
deleted file mode 100644
index 23b1c47..0000000
Binary files a/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-v4compatibility.woff2 and /dev/null differ
diff --git a/public/js/app.js b/public/js/app.js
index e08f2a3..53ef6d5 100644
Binary files a/public/js/app.js and b/public/js/app.js differ
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 21c4155..81afd31 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -2,5 +2,9 @@
"/js/app.js": "/js/app.js",
"/css/app.css": "/css/app.css",
"/css/dark.css": "/css/dark.css",
- "/css/light.css": "/css/light.css"
+ "/css/light.css": "/css/light.css",
+ "/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"
}
diff --git a/public/webfonts/fa-brands-400.eot b/public/webfonts/fa-brands-400.eot
deleted file mode 100644
index 958684e..0000000
Binary files a/public/webfonts/fa-brands-400.eot and /dev/null differ
diff --git a/public/webfonts/fa-brands-400.svg b/public/webfonts/fa-brands-400.svg
deleted file mode 100644
index 2b7cf17..0000000
--- a/public/webfonts/fa-brands-400.svg
+++ /dev/null
@@ -1,3717 +0,0 @@
-
-
-
diff --git a/public/webfonts/fa-brands-400.ttf b/public/webfonts/fa-brands-400.ttf
deleted file mode 100644
index f071825..0000000
Binary files a/public/webfonts/fa-brands-400.ttf and /dev/null differ
diff --git a/public/webfonts/fa-brands-400.woff b/public/webfonts/fa-brands-400.woff
deleted file mode 100644
index 277ab65..0000000
Binary files a/public/webfonts/fa-brands-400.woff and /dev/null differ
diff --git a/public/webfonts/fa-brands-400.woff2 b/public/webfonts/fa-brands-400.woff2
deleted file mode 100644
index 47805d4..0000000
Binary files a/public/webfonts/fa-brands-400.woff2 and /dev/null differ
diff --git a/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-regular-400.ttf b/public/webfonts/fa-regular-400.ttf
similarity index 100%
rename from public/fonts/vendor/@fortawesome/fontawesome-free/webfa-regular-400.ttf
rename to public/webfonts/fa-regular-400.ttf
diff --git a/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-regular-400.woff2 b/public/webfonts/fa-regular-400.woff2
similarity index 100%
rename from public/fonts/vendor/@fortawesome/fontawesome-free/webfa-regular-400.woff2
rename to public/webfonts/fa-regular-400.woff2
diff --git a/public/webfonts/fa-solid-900.eot b/public/webfonts/fa-solid-900.eot
deleted file mode 100644
index 5da4fa0..0000000
Binary files a/public/webfonts/fa-solid-900.eot and /dev/null differ
diff --git a/public/webfonts/fa-solid-900.svg b/public/webfonts/fa-solid-900.svg
deleted file mode 100644
index 313b311..0000000
--- a/public/webfonts/fa-solid-900.svg
+++ /dev/null
@@ -1,5028 +0,0 @@
-
-
-
diff --git a/public/webfonts/fa-solid-900.ttf b/public/webfonts/fa-solid-900.ttf
index e074608..e479fb2 100644
Binary files a/public/webfonts/fa-solid-900.ttf and b/public/webfonts/fa-solid-900.ttf differ
diff --git a/public/webfonts/fa-solid-900.woff b/public/webfonts/fa-solid-900.woff
deleted file mode 100644
index ef6b447..0000000
Binary files a/public/webfonts/fa-solid-900.woff and /dev/null differ
diff --git a/public/webfonts/fa-solid-900.woff2 b/public/webfonts/fa-solid-900.woff2
index 120b300..88b0367 100644
Binary files a/public/webfonts/fa-solid-900.woff2 and b/public/webfonts/fa-solid-900.woff2 differ
diff --git a/resources/css/app.css b/resources/css/app.css
index 2cdc273..fc93fd7 100644
--- a/resources/css/app.css
+++ b/resources/css/app.css
@@ -1,3 +1,2 @@
-@import '~@fortawesome/fontawesome-free/css/all.min.css';
@import "datatables.net-bs5";
@import "style.css";
diff --git a/resources/sass/_variables.scss b/resources/sass/_variables.scss
index 172daaa..1beabcb 100644
--- a/resources/sass/_variables.scss
+++ b/resources/sass/_variables.scss
@@ -1,7 +1,2 @@
-// Body
-$body-bg: #f8fafc;
-
-// Typography
-$font-family-sans-serif: 'Nunito', sans-serif;
-$font-size-base: 0.9rem;
-$line-height-base: 1.6;
+// FontAwesome
+$fa-font-path: "webfonts";
\ No newline at end of file
diff --git a/resources/sass/app.scss b/resources/sass/app.scss
index 3193ffa..43b3977 100644
--- a/resources/sass/app.scss
+++ b/resources/sass/app.scss
@@ -1,8 +1,7 @@
-// Fonts
-@import url('https://fonts.googleapis.com/css?family=Nunito');
+// FontAwesome
+@import "~@fortawesome/fontawesome-free/scss/fontawesome";
+@import "~@fortawesome/fontawesome-free/scss/regular";
+@import "~@fortawesome/fontawesome-free/scss/solid";
// Variables
-@import 'variables';
-
-// Bootstrap
-@import '~bootstrap/scss/bootstrap';
+@import 'variables';
\ No newline at end of file
diff --git a/webpack.mix.js b/webpack.mix.js
index cfbb533..b97ac60 100644
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -11,9 +11,21 @@ const mix = require('laravel-mix');
|
*/
-mix.js('resources/js/app.js', 'public/js').postCss('resources/css/app.css', 'public/css', [
-
-]);
-
+mix.js('resources/js/app.js', 'public/js').postCss('resources/css/app.css', 'public/css');
+mix.sass('resources/sass/app.scss', 'public/css').options({
+ processCssUrls: false
+}).copy(
+ 'node_modules/@fortawesome/fontawesome-free/webfonts/fa-regular-400.ttf',
+ 'public/webfonts/fa-regular-400.ttf'
+).copy(
+ 'node_modules/@fortawesome/fontawesome-free/webfonts/fa-regular-400.woff2',
+ 'public/webfonts/fa-regular-400.woff2'
+).copy(
+ 'node_modules/@fortawesome/fontawesome-free/webfonts/fa-solid-900.ttf',
+ 'public/webfonts/fa-solid-900.ttf'
+).copy(
+ 'node_modules/@fortawesome/fontawesome-free/webfonts/fa-solid-900.woff2',
+ 'public/webfonts/fa-solid-900.woff2'
+);
mix.postCss('resources/css/light.css', 'public/css');
-mix.postCss('resources/css/dark.css', 'public/css');
+mix.postCss('resources/css/dark.css', 'public/css');
\ No newline at end of file