Merge pull request #101 from Gamerboy59/main

Update resources and remove duplicated webfa files

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/breeze": "^1.24",
-        "laravel/sail": "^1.23",
+        "laravel/sail": "^1.25",
         "mockery/mockery": "^1.6",
         "nunomaduro/collision": "^7",
         "phpunit/phpunit": "^10",

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",

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"
 }

resources/css/app.css

@@ -1,3 +1,2 @@
-@import '~@fortawesome/fontawesome-free/css/all.min.css';
 @import "datatables.net-bs5";
 @import "style.css";

resources/sass/_variables.scss

@@ -1,7 +1,2 @@
-// Body
+// FontAwesome
-$body-bg: #f8fafc;
+$fa-font-path: "webfonts";
-
-// Typography
-$font-family-sans-serif: 'Nunito', sans-serif;
-$font-size-base: 0.9rem;
-$line-height-base: 1.6;

resources/sass/app.scss

@@ -1,8 +1,7 @@
-// Fonts
+// FontAwesome
-@import url('https://fonts.googleapis.com/css?family=Nunito');
+@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';

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');