Permalink
Browse files

Start including all the built files for composer version

  • Loading branch information...
1 parent dfec69e commit 5264be8c3603a3f69aaa9b9402af5efda660882c @skyronic committed Dec 9, 2015
View
@@ -29,12 +29,13 @@ node_modules
/vendor/
.idea
-build
+temp
bower_components
vendor
.idea/*
composer.lock
adminer.php
-demo/crudkit
+demo/crudkit
+demo/
View
@@ -2,33 +2,87 @@ module.exports = function(grunt) {
var vendorRoot = "src/static/vendor/";
var buildRoot = "src/static/build/";
+ var tempRoot = "src/static/temp/";
grunt.initConfig({
watch: {
- lessFiles: {
- files: ["src/static/less/*.less"],
- tasks: ['less:main']
- }
+ lessFiles: {
+ files: ["src/static/less/*.less"],
+ tasks: ['less:main']
+ }
},
- copy:{
- libs: {
- files: [
- {expand: true, cwd: vendorRoot + 'bootstrap/dist/', src:["fonts/*"], dest: buildRoot},
- {expand: true, cwd: vendorRoot + 'adminlte/dist/', src:["img/*"], dest: buildRoot},
- {expand: true, cwd: vendorRoot + 'fontawesome/', src:["fonts/*"], dest: buildRoot},
- ]
+ copy: {
+ temp: {
+ files: [{
+ expand: true,
+ cwd: vendorRoot + 'bootstrap/dist/',
+ src: ["fonts/*"],
+ dest: buildRoot
+ }, {
+ expand: true,
+ cwd: vendorRoot + 'adminlte/dist/',
+ src: [
+ "img/boxed-bg.png",
+ "img/boxed-bg.jpg",
+ "img/default-50x50.gif",
+ "img/icons.png"
+ ],
+ dest: buildRoot
+ }, {
+ expand: true,
+ cwd: vendorRoot + 'fontawesome/',
+ src: ["fonts/*"],
+ dest: buildRoot
+ }, ]
+ },
+ build: {
+ files: [{
+ expand: true,
+ cwd: vendorRoot + 'bootstrap/dist/',
+ src: ["fonts/*"],
+ dest: tempRoot
+ }, {
+ expand: true,
+ cwd: vendorRoot + 'adminlte/dist/',
+ src: ["img/*"],
+ dest: tempRoot
+ }, {
+ expand: true,
+ cwd: vendorRoot + 'fontawesome/',
+ src: ["fonts/*"],
+ dest: tempRoot
+ }]
}
},
less: {
main: {
files: {
- "src/static/build/crudkit.css": "src/static/less/crudkit.less"
+ "src/static/temp/crudkit.css": "src/static/less/crudkit.less"
}
}
},
concat: {
+ build_css: {
+ files: {
+ "src/static/build/css/crudkit.min.css": [
+ "src/static/temp/css/crudkit-libs.min.css",
+ "src/static/temp/crudkit.css"
+ ]
+ }
+ },
+ build_js: {
+ options: {
+ separator: ";\n"
+ },
+ files: {
+ "src/static/build/js/crudkit.min.js": [
+ "src/static/temp/js/crudkit-libs.min.js",
+ "src/static/js/app.js"
+ ]
+ }
+ },
css: {
files: {
- "src/static/build/css/crudkit-libs.min.css":[
+ "src/static/temp/css/crudkit-libs.min.css": [
vendorRoot + "bootstrap/dist/css/bootstrap.min.css",
vendorRoot + "angular-busy/dist/angular-busy.min.css",
vendorRoot + "adminlte/dist/css/AdminLTE.min.css",
@@ -43,21 +97,21 @@ module.exports = function(grunt) {
separator: ";\n"
},
files: {
- "src/static/build/js/crudkit-libs.min.js": [
- vendorRoot + "jquery/dist/jquery.min.js",
- vendorRoot + "bootstrap/dist/js/bootstrap.min.js",
- vendorRoot + "lodash/lodash.min.js",
- vendorRoot + "angularjs/angular.min.js",
- vendorRoot + "angular-animate/angular-animate.min.js",
- vendorRoot + "angular-busy/dist/angular-busy.min.js",
- vendorRoot + "angular-filter/dist/angular-filter.min.js",
- vendorRoot + "bootstrap3-dialog/dist/js/bootstrap-dialog.min.js",
- vendorRoot + "jsurl/url.min.js",
- vendorRoot + "moment/min/moment.min.js",
- vendorRoot + "moment-timezone/builds/moment-timezone-with-data.min.js",
- vendorRoot + "adminlte/dist/js/app.min.js",
- "src/static/extra/ui-bootstrap-custom-0.13.0.min.js",
- "src/static/extra/ui-bootstrap-custom-tpls-0.13.0.min.js"
+ "src/static/temp/js/crudkit-libs.min.js": [
+ vendorRoot + "jquery/dist/jquery.min.js",
+ vendorRoot + "bootstrap/dist/js/bootstrap.min.js",
+ vendorRoot + "lodash/lodash.min.js",
+ vendorRoot + "angularjs/angular.min.js",
+ vendorRoot + "angular-animate/angular-animate.min.js",
+ vendorRoot + "angular-busy/dist/angular-busy.min.js",
+ vendorRoot + "angular-filter/dist/angular-filter.min.js",
+ vendorRoot + "bootstrap3-dialog/dist/js/bootstrap-dialog.min.js",
+ vendorRoot + "jsurl/url.min.js",
+ vendorRoot + "moment/min/moment.min.js",
+ vendorRoot + "moment-timezone/builds/moment-timezone-with-data.min.js",
+ vendorRoot + "adminlte/dist/js/app.min.js",
+ "src/static/extra/ui-bootstrap-custom-0.13.0.min.js",
+ "src/static/extra/ui-bootstrap-custom-tpls-0.13.0.min.js"
]
}
}
@@ -67,14 +121,12 @@ module.exports = function(grunt) {
},
replace: {
sourceMaps: {
- src: ["src/static/build/js/crudkit-libs.min.js"],
+ src: ["src/static/temp/js/crudkit-libs.min.js", "src/static/temp/css/crudkit-libs.min.css"],
overwrite: true,
- replacements: [
- {
- from: "sourceMappingURL",
- to: ""
- }
- ]
+ replacements: [{
+ from: "sourceMappingURL",
+ to: ""
+ }]
}
}
});
@@ -86,7 +138,7 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-contrib-clean');
grunt.loadNpmTasks('grunt-text-replace');
- grunt.registerTask('buildStatic', ['concat', 'replace'])
- grunt.registerTask('default', ['']);
+ grunt.registerTask('build', ['less', 'concat:js', 'concat:css', 'replace', 'copy:temp']);
+ grunt.registerTask('release', ['build', 'concat:build_css', 'concat:build_js', 'copy:build']);
};
View
@@ -17,15 +17,11 @@
"require": {
"doctrine/dbal": "2.5.1",
"twig/twig": "1.18.0",
- "brandonwamboldt/utilphp": "1.1.*",
- "league/url": "3.3.1",
+ "league/url": "3.3.1",
"filp/whoops": "~1.1",
"nesbot/carbon": "~1.19"
},
"require-dev": {
"phpunit/phpunit": "4.8.*@dev"
- },
- "scripts": {
- "phpunit":"vendor/bin/phpunit"
}
}
@@ -10,7 +10,6 @@
use Doctrine\DBAL\Query\QueryBuilder;
use Doctrine\DBAL\Schema\Column;
use Doctrine\DBAL\Types\Type;
-use utilphp\util;
abstract class SQLColumn {
public $id = null;
@@ -16,7 +16,6 @@
use Doctrine\DBAL\Query\QueryBuilder;
use Doctrine\DBAL\Schema\Column;
use PDO;
-use utilphp\util;
class SQLDataProvider extends BaseSQLDataProvider{
public function setConn ($conn) {
@@ -1,7 +1,6 @@
<?php
namespace CrudKit\Util;
-use utilphp\util;
class FlashBag /* not to be mistaken with flashbang */ {
public static function add ($category, $message, $extra = "") {
@@ -5,7 +5,6 @@
use CrudKit\Form\ManyToOneItem;
use CrudKit\Form\TextFormItem;
-use utilphp\util;
class FormHelper {
protected $id = "default_form";
Oops, something went wrong.
Binary file not shown.
Binary file not shown.
Oops, something went wrong.

0 comments on commit 5264be8

Please sign in to comment.