Skip to content

Commit

Permalink
Remove last of bower assets and add them to npm and laravel-mix asset…
Browse files Browse the repository at this point in the history
… management
  • Loading branch information
DariusIII committed Nov 8, 2018
1 parent 2a50fbc commit f1f8fc9
Show file tree
Hide file tree
Showing 18 changed files with 754 additions and 401 deletions.
8 changes: 1 addition & 7 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,4 @@ test.php
/resources/nzb/*
/resources/tmp/*
!/resources/tmp/unrar/
/public/assets/*
!/public/assets/js/
!/public/assets/css/
!/public/assets/images/
!/public/assets/Charisma/
!/public/assets/Gamma/
!/public/assets/Omicron/
!/public/assets/*
1 change: 1 addition & 0 deletions Changelog
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
2018-11-08 DariusIII
* Chg: Remove last of bower assets and add them to npm and laravel-mix asset management
* Chg: First batch of changes to use npm and laravel-mix for asset management
* Chg: Update helpres makeFieldLinks function to properly create links, update Movie class and MovieController
* Chg: Update API v2 capabilities ouput by adding category tags used on site
Expand Down
7 changes: 0 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -96,13 +96,6 @@
"b3rs3rk/steamfront": "dev-master",
"barracudanetworks/forkdaemon-php": "~1.0",
"bhuvidya/laravel-countries": "^1.0",
"bower-asset/colorbox": "~1.6.3",
"bower-asset/fastclick": "~1.0.6",
"bower-asset/flexboxgrid": "^6.3",
"bower-asset/multifile": "^2.2.2",
"bower-asset/multiselect": "^0.9.12",
"bower-asset/pace": "~1.0.2",
"bower-asset/slimScroll": "~1.3.7",
"canihavesomecoffee/thetvdbapi": "^1.0",
"dariusiii/rarinfo": "^2.5",
"dborsatto/php-giantbomb": "^1.0",
Expand Down
300 changes: 1 addition & 299 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 8 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
"axios": "^0.18",
"cross-env": "^5.1",
"jquery": "^3.2",
"laravel-mix": "^2.0",
"laravel-mix": "^2.1.14",
"lodash": "^4.17.5",
"popper.js": "^1.12",
"popper.js": "^1.14.5",
"vue": "^2.5.7"
},
"dependencies": {
Expand All @@ -28,10 +28,16 @@
"bootstrap-hover-dropdown": "^2.2.1",
"bootstrap-progressbar": "^0.9.0",
"datatables": "^1.10.18",
"flexboxgrid2": "^7.2.1",
"icheck": "^1.0.2",
"jquery-colorbox": "^1.6.4",
"jquery-goup": "^1.1.3",
"jquery-migrate": "^3.0.1",
"jquery-multifile": "^2.2.2",
"jquery-slimscroll": "^1.3.8",
"jquery.nicescroll": "^3.7.6",
"multiselect": "^0.9.12",
"pace-js": "^1.0.2",
"pnotify": "^3.2.1",
"tinymce": "^4.8.5"
}
Expand Down
1 change: 1 addition & 0 deletions public/assets/css/flexboxgrid2.min.css

Large diffs are not rendered by default.

Loading

0 comments on commit f1f8fc9

Please sign in to comment.