lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove Bower dependency. Closes #1780

Browse Source
This commit is contained in:
James Brooks
2016-05-11 20:11:46 +01:00
parent bda3484cac
commit 9f4270f4a5
9 changed files with 87 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.bowerrc
View File

@@ -1,4 +0,0 @@
{
"directory": "vendor/bower_components",
"interactive": false
}

8
README.md
View File

@@ -52,10 +52,9 @@ You'll need to install Node.js, Bower and Gulp.
To get started you can do the following:
1. Install Node.js, Bower and Gulp.
2. Install the assets; `bower install`
3. Modify the SCSS files in `./resources/assets/sass/`
4. Run `gulp`
1. Install Node.js and our dev dependencies.
2. Modify the SCSS files in `./resources/assets/sass/`
3. Run `gulp`
If you're making a lot of changes, you'll find that running `gulp watch` will really help you out!
@@ -66,7 +65,6 @@ Built using [Laravel](https://laravel.com), Cachet is very easy to jump into. Ha
These extra dependencies are required to develop Cachet:
- Node.js
- Bower
- Gulp
- Git

23
bower.json
View File

@@ -1,23 +0,0 @@
{
"name": "cachet",
"dependencies": {
"animate-sass": "~0.6",
"autosize": "~3.0",
"bootstrap-sass": "~3.3",
"Chart.js": "~2.0",
"eonasdan-bootstrap-datetimepicker": "~3.1",
"github-markdown-css": "~2.2",
"humane-js": "~3.2",
"ionicons": "~2.0",
"jquery": "~2.2",
"jquery-minicolors": "~2.2",
"jquery-serialize-object": "~2.5",
"jquery-sparkline": "~2.1",
"livestampjs": "~1.1",
"lodash": "~4.11",
"messenger": "~1.5",
"moment": "~2.13",
"Sortable": "~1.4",
"sweetalert": "~1.1"
}
}

36
gulpfile.js
View File

@@ -7,30 +7,30 @@ elixir(function (mix) {
mix
.sass('app.scss', 'public/dist/css/app.css')
.styles([
'vendor/bower_components/jquery-minicolors/jquery.minicolors.css',
'vendor/bower_components/sweetalert/dist/sweetalert.css',
'vendor/bower_components/github-markdown-css/github-markdown.css',
'node_modules/jquery-minicolors/jquery.minicolors.css',
'node_modules/sweetalert/dist/sweetalert.css',
'node_modules/github-markdown-css/github-markdown.css',
'public/dist/css/app.css'
], 'public/dist/css/all.css', './')
.scripts([
'vendor/bower_components/jquery/dist/jquery.js',
'vendor/bower_components/bootstrap-sass/assets/javascripts/bootstrap.js',
'vendor/bower_components/moment/min/moment-with-locales.js',
'vendor/bower_components/eonasdan-bootstrap-datetimepicker/src/js/bootstrap-datetimepicker.js',
'vendor/bower_components/lodash/lodash.js',
'vendor/bower_components/autosize/dist/autosize.js',
'vendor/bower_components/messenger/build/js/messenger.js',
'vendor/bower_components/Sortable/Sortable.js',
'vendor/bower_components/livestampjs/livestamp.js',
'vendor/bower_components/jquery-minicolors/jquery.minicolors.js',
'vendor/bower_components/jquery-serialize-object/jquery.serialize-object.js',
'vendor/bower_components/Chart.js/dist/Chart.js',
'vendor/bower_components/jquery-sparkline/dist/jquery.sparkline.js',
'vendor/bower_components/sweetalert/dist/sweetalert.min.js',
'node_modules/jquery/dist/jquery.js',
'node_modules/bootstrap-sass/assets/javascripts/bootstrap.js',
'node_modules/moment/min/moment-with-locales.js',
'node_modules/eonasdan-bootstrap-datetimepicker/src/js/bootstrap-datetimepicker.js',
'node_modules/lodash/lodash.js',
'node_modules/autosize/dist/autosize.js',
'node_modules/messenger/build/js/messenger.js',
'node_modules/sortablejs/Sortable.js',
'node_modules/livestamp/livestamp.js',
'node_modules/jquery-minicolors/jquery.minicolors.js',
'node_modules/jquery-serializeobject/jquery.serializeObject.js',
'node_modules/Chart.js/dist/Chart.js',
'node_modules/jquery-sparkline/jquery.sparkline.js',
'node_modules/sweetalert/dist/sweetalert.min.js',
'resources/assets/js/password-strength.js',
'resources/assets/js/app.js',
'resources/assets/js/**/*.js'
], 'public/dist/js/all.js', './')
.version(['public/dist/css/all.css', 'public/dist/js/all.js'])
.copy('vendor/bower_components/ionicons/fonts/', 'public/fonts/');
.copy('node_modules/ionicons/fonts/', 'public/fonts/');
});

31
package.json
View File

@@ -1,8 +1,27 @@
{
"dependencies": {
"bower": "~1.7.7",
"gulp": "~3.9.1",
"laravel-elixir": "~5.0.0"
},
"private": true
"name": "cachet",
"dependencies": {
"animate-sass": "git+https://github.com/tgdev/animate-sass.git",
"autosize": "^3.0.15",
"bootstrap-sass": "^3.3.6",
"chart.js": "^2.1.2",
"eonasdan-bootstrap-datetimepicker": "~3.1",
"github-markdown-css": "^2.3.0",
"ionicons": "~2.0",
"jquery": "~2.2",
"jquery-minicolors": "^2.1.10",
"jquery-serializeobject": "^1.0.0",
"jquery-sparkline": "^2.3.2",
"livestamp": "git+https://github.com/mattbradley/livestampjs.git#develop",
"lodash": "^4.12.0",
"messenger": "git+https://github.com/HubSpot/messenger.git",
"moment": "^2.13.0",
"sortablejs": "^1.4.2",
"sweetalert": "^1.1.3"
},
"devDependencies": {
"gulp": "~3.9.1",
"laravel-elixir": "~5.0.0"
},
"private": true
}

2
resources/assets/sass/app.scss vendored
View File

@@ -1,7 +1,7 @@
@import "palette";
$ionicons-font-path: "../../../fonts" !default;
@import "./vendor/bower_components/ionicons/scss/ionicons";
@import "./node_modules/ionicons/scss/ionicons";
@import "modules/bootstrap";

76
resources/assets/sass/modules/_bootstrap.scss vendored
View File

@@ -2,51 +2,51 @@
@import "variables";
// Core variables and mixins
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/variables";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/mixins";
@import "./node_modules/bootstrap-sass/assets/stylesheets/bootstrap/variables";
@import "./node_modules/bootstrap-sass/assets/stylesheets/bootstrap/mixins";
// Reset and dependencies
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/normalize";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/print";
@import "./node_modules/bootstrap-sass/assets/stylesheets/bootstrap/normalize";
@import "./node_modules/bootstrap-sass/assets/stylesheets/bootstrap/print";
// Core CSS
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/scaffolding";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/type";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/code";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/grid";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/tables";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/forms";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/buttons";
@import "./node_modules/bootstrap-sass/assets/stylesheets/bootstrap/scaffolding";
@import "./node_modules/bootstrap-sass/assets/stylesheets/bootstrap/type";
@import "./node_modules/bootstrap-sass/assets/stylesheets/bootstrap/code";
@import "./node_modules/bootstrap-sass/assets/stylesheets/bootstrap/grid";
@import "./node_modules/bootstrap-sass/assets/stylesheets/bootstrap/tables";
@import "./node_modules/bootstrap-sass/assets/stylesheets/bootstrap/forms";
@import "./node_modules/bootstrap-sass/assets/stylesheets/bootstrap/buttons";
// Components
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/component-animations";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/dropdowns";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/button-groups";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/input-groups";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/navs";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/navbar";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/breadcrumbs";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/pagination";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/pager";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/labels";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/badges";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/jumbotron";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/thumbnails";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/alerts";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/progress-bars";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/media";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/list-group";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/panels";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/responsive-embed";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/wells";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/close";
@import "./node_modules/bootstrap-sass/assets/stylesheets/bootstrap/component-animations";
@import "./node_modules/bootstrap-sass/assets/stylesheets/bootstrap/dropdowns";
@import "./node_modules/bootstrap-sass/assets/stylesheets/bootstrap/button-groups";
@import "./node_modules/bootstrap-sass/assets/stylesheets/bootstrap/input-groups";
@import "./node_modules/bootstrap-sass/assets/stylesheets/bootstrap/navs";
@import "./node_modules/bootstrap-sass/assets/stylesheets/bootstrap/navbar";
@import "./node_modules/bootstrap-sass/assets/stylesheets/bootstrap/breadcrumbs";
@import "./node_modules/bootstrap-sass/assets/stylesheets/bootstrap/pagination";
@import "./node_modules/bootstrap-sass/assets/stylesheets/bootstrap/pager";
@import "./node_modules/bootstrap-sass/assets/stylesheets/bootstrap/labels";
@import "./node_modules/bootstrap-sass/assets/stylesheets/bootstrap/badges";
@import "./node_modules/bootstrap-sass/assets/stylesheets/bootstrap/jumbotron";
@import "./node_modules/bootstrap-sass/assets/stylesheets/bootstrap/thumbnails";
@import "./node_modules/bootstrap-sass/assets/stylesheets/bootstrap/alerts";
@import "./node_modules/bootstrap-sass/assets/stylesheets/bootstrap/progress-bars";
@import "./node_modules/bootstrap-sass/assets/stylesheets/bootstrap/media";
@import "./node_modules/bootstrap-sass/assets/stylesheets/bootstrap/list-group";
@import "./node_modules/bootstrap-sass/assets/stylesheets/bootstrap/panels";
@import "./node_modules/bootstrap-sass/assets/stylesheets/bootstrap/responsive-embed";
@import "./node_modules/bootstrap-sass/assets/stylesheets/bootstrap/wells";
@import "./node_modules/bootstrap-sass/assets/stylesheets/bootstrap/close";
// Components w/ JavaScript
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/modals";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/tooltip";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/popovers";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/carousel";
@import "./node_modules/bootstrap-sass/assets/stylesheets/bootstrap/modals";
@import "./node_modules/bootstrap-sass/assets/stylesheets/bootstrap/tooltip";
@import "./node_modules/bootstrap-sass/assets/stylesheets/bootstrap/popovers";
@import "./node_modules/bootstrap-sass/assets/stylesheets/bootstrap/carousel";
// Utility classes
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/utilities";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/responsive-utilities";
@import "./node_modules/bootstrap-sass/assets/stylesheets/bootstrap/utilities";
@import "./node_modules/bootstrap-sass/assets/stylesheets/bootstrap/responsive-utilities";

2
resources/assets/sass/plugins/_animate.scss vendored
View File

@@ -1,4 +1,4 @@
@import "./vendor/bower_components/animate-sass/animate";
@import "./node_modules/animate-sass/animate";
body {
-webkit-backface-visibility: hidden; // Addresses a small issue in webkit: http://bit.ly/NEdoDq

2
resources/assets/sass/plugins/bootstrap-datetimepicker/bootstrap-datetimepicker.scss vendored
View File

@@ -1,5 +1,5 @@
// Import boostrap variables including default color palette and fonts
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/_variables";
@import "./node_modules/bootstrap-sass/assets/stylesheets/bootstrap/_variables";
.bootstrap-datetimepicker-widget {
list-style: none;