Skip to content

Commit

Permalink
Merge pull request #101 from Gamerboy59/main
Browse files Browse the repository at this point in the history
Update resources and remove duplicated webfa files
  • Loading branch information
cp6 authored Oct 5, 2023
2 parents 5ce233b + 72c49d8 commit 2b1cfa0
Show file tree
Hide file tree
Showing 28 changed files with 8,398 additions and 8,837 deletions.
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
9 changes: 6 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -29,4 +32,4 @@
"@fortawesome/fontawesome-free": "^6.4.2",
"datatables.net-bs5": "^1.13.6"
}
}
}
Loading

0 comments on commit 2b1cfa0

Please sign in to comment.