Skip to content

GitLab

Commit a721f7d1 authored by Maxym Borodenko's avatar Maxym Borodenko
Browse files

Migrate to npm 

change dependency for jquery-ui

remove unused dependency
parent 05888195
Hide whitespace changes
Inline Side-by-side
Showing with 88 additions and 65 deletions
Gruntfile.js
View file @ a721f7d1
......@@ -23,7 +23,7 @@ module.exports = function(grunt) {
options : {
cssDir : '.tmp/styles',
generatedImagesDir : '.tmp/images/generated',
importPath : './bower_components',
importPath : './node_modules',
httpImagesPath : '/images',
httpGeneratedImagesPath : '/images/generated',
httpFontsPath : '/styles/fonts',
......@@ -59,49 +59,49 @@ module.exports = function(grunt) {
src : [ 'generated/*' ]
}, {
expand : true,
cwd : 'bower_components/bootstrap-sass/assets/fonts/bootstrap/',
cwd : 'node_modules/bootstrap-sass/assets/fonts/bootstrap/',
src : '*',
dest : '<%= app.dist1 %>/styles/fonts'
}, {
expand : true,
cwd : 'bower_components/fontawesome/fonts/',
cwd : 'node_modules/font-awesome/fonts/',
src : '*',
dest : '<%= app.dist1 %>/styles/fonts'
}, {
expand : true,
cwd : 'bower_components/fontawesome/css/',
cwd : 'node_modules/font-awesome/css/',
src : '*',
dest : '<%= app.dist1 %>/styles/'
}, {
expand : true,
cwd : 'bower_components/webfont-notosans/regular/',
cwd : 'node_modules/notosans-fontface/fonts/',
src : '*',
dest : '<%= app.dist1 %>/styles/fonts'
}, {
// tinyMCE
expand : true,
cwd : 'bower_components/tinymce/skins',
cwd : 'node_modules/tinymce/skins',
src : [ '**' ],
dest : '<%= app.dist1 %>/js/skins'
}, {
// leaflet
expand : true,
cwd : 'bower_components/leaflet/dist/',
src : [ 'leaflet.css', 'images/*.png' ],
cwd : 'node_modules/leaflet/dist/',
src : [ 'leaflet.css', 'images/*.png' ],
dest : '<%= app.dist1 %>/styles'
}, {
// simplecolorpicker
expand : true,
cwd : 'bower_components/jquery-simplecolorpicker/',
cwd : 'node_modules/jquery-simplecolorpicker/',
src : [ 'jquery.simplecolorpicker.css', 'jquery.simplecolorpicker-regularfont.css' ],
dest : '<%= app.dist1 %>/styles'
}, {
expand : true,
cwd : 'bower_components/jquery-ui/themes/base/',
cwd : 'node_modules/jquery-ui-dist/',
src : [ 'jquery-ui.css' ],
dest : '<%= app.dist1 %>/styles'
} ]
},
}
// styles : {
// expand : true,
......@@ -114,7 +114,7 @@ module.exports = function(grunt) {
// Make sure code styles are up to par and there are no obvious mistakes
jshint : {
options : {
jshintrc : '.jshintrc',
jshintrc : '.jshintrc'
// reporter : require('jshint-stylish')
},
dist1 : {
......@@ -122,7 +122,7 @@ module.exports = function(grunt) {
},
dist2 : {
src : [ '<%= app.source2 %>/js/{,*/}*.js' ]
},
}
},
concat : {
......@@ -130,20 +130,42 @@ module.exports = function(grunt) {
// separator: ';',
},
dist1 : {
src : [ 'bower_components/jquery/dist/jquery.js', 'bower_components/modernizr/modernizr.js', 'bower_components/jquery-flot/jquery.flot.js', 'bower_components/jquery-flot/jquery.flot.pie.js',
'bower_components/jquery-flot/jquery.flot.fillbetween.js', 'bower_components/jquery-simplecolorpicker/jquery.simplecolorpicker.js', 'bower_components/tinymce/tinymce.js',
'bower_components/tinymce/tinymce.jquery.js', 'bower_components/tinymce/themes/modern/theme.js', 'bower_components/tinymce/plugins/link/plugin.js',
'bower_components/tinymce/plugins/autolink/plugin.js', 'bower_components/tinymce/plugins/code/plugin.js', 'bower_components/leaflet/dist/leaflet.js',
'bower_components/leaflet-locationfilter/src/locationfilter.js', 'bower_components/bootstrap-sass/assets/javascripts/bootstrap.js', 'bower_components/jquery-ui/jquery-ui.js',
'bower_components/jquery-ui/ui/autocomplete.js', 'bower_components/jstree/dist/jstree.min.js', 'bower_components/jquery-serialize-object/jquery.serialize-object.js' ],
dest : '<%= app.dist1 %>/js/libraries.js',
src : [
'node_modules/jquery/dist/jquery.js',
'node_modules/jquery-flot/jquery.flot.js',
'node_modules/jquery-flot/jquery.flot.pie.js',
'node_modules/jquery-flot/jquery.flot.fillbetween.js',
'node_modules/jquery-simplecolorpicker/jquery.simplecolorpicker.js',
'node_modules/tinymce/tinymce.js',
'node_modules/tinymce/tinymce.jquery.js',
'node_modules/tinymce/themes/modern/theme.js',
'node_modules/tinymce/plugins/link/plugin.js',
'node_modules/tinymce/plugins/autolink/plugin.js',
'node_modules/tinymce/plugins/code/plugin.js',
'node_modules/leaflet/dist/leaflet.js',
'node_modules/leaflet.locationfilter/src/locationfilter.js',
'node_modules/bootstrap-sass/assets/javascripts/bootstrap.js',
'node_modules/jquery-ui-dist/jquery-ui.js',
'node_modules/jstree/dist/jstree.js',
'node_modules/modernizr/bin/modernizr.js',
'node_modules/form-serializer/jquery.serialize-object.js'
],
dest : '<%= app.dist1 %>/js/libraries.js'
},
app1 : {
src : [ '<%= app.source1 %>/js/prologue.js', '<%= app.source1 %>/js/crophub.js', '<%= app.source1 %>/js/epilogue.js' ],
src : [
'<%= app.source1 %>/js/prologue.js',
'<%= app.source1 %>/js/crophub.js',
'<%= app.source1 %>/js/epilogue.js'
],
dest : '<%= app.dist1 %>/js/genesys.js'
},
world1 : {
src : [ 'bower_components/highmaps-beta/highmaps.src.js', 'bower_components/highcharts/modules/data.src.js', '<%= app.source1 %>/js/world.js' ],
src : [
'node_modules/highmaps-release/highmaps.src.js',
'node_modules/highcharts/lib/modules/data.src.js',
'<%= app.source1 %>/js/world.js'
],
dest : '<%= app.dist1 %>/js/genesyshighcharts.js'
}
},
......@@ -168,13 +190,24 @@ module.exports = function(grunt) {
},
dist1 : {
files : {
'<%= app.dist1 %>/styles/bootstrap.min.css' : [ '<%= app.dist1 %>/styles/bootstrap.css' ],
'<%= app.dist1 %>/styles/other.min.css' : [ '<%= app.dist1 %>/styles/jquery-ui.css', '<%= app.dist1 %>/styles/forza.css', '<%= app.dist1 %>/styles/leaflet.css',
'<%= app.dist1 %>/styles/jquery.simplecolorpicker.css', '<%= app.dist1 %>/styles/jquery.simplecolorpicker-regularfont.css' ],
'<%= app.dist1 %>/styles/genesys.min.css' : [ '<%= app.dist1 %>/styles/genesys.css' ],
'<%= app.dist1 %>/styles/all.min.css' : [ '<%= app.dist1 %>/styles/bootstrap.css', '<%= app.dist1 %>/styles/jquery-ui.css', '<%= app.dist1 %>/styles/forza.css',
'<%= app.dist1 %>/styles/leaflet.css', '<%= app.dist1 %>/styles/jquery.simplecolorpicker.css', '<%= app.dist1 %>/styles/jquery.simplecolorpicker-regularfont.css',
'<%= app.dist1 %>/styles/genesys.css' ],
'<%= app.dist1 %>/styles/bootstrap.min.css' : [ '<%= app.dist1 %>/styles/bootstrap.css' ],
'<%= app.dist1 %>/styles/other.min.css' : [
'<%= app.dist1 %>/styles/jquery-ui.css',
'<%= app.dist1 %>/styles/forza.css',
'<%= app.dist1 %>/styles/leaflet.css',
'<%= app.dist1 %>/styles/jquery.simplecolorpicker.css',
'<%= app.dist1 %>/styles/jquery.simplecolorpicker-regularfont.css'
],
'<%= app.dist1 %>/styles/genesys.min.css' : [ '<%= app.dist1 %>/styles/genesys.css' ],
'<%= app.dist1 %>/styles/all.min.css' : [
'<%= app.dist1 %>/styles/bootstrap.css',
'<%= app.dist1 %>/styles/jquery-ui.css',
'<%= app.dist1 %>/styles/forza.css',
'<%= app.dist1 %>/styles/leaflet.css',
'<%= app.dist1 %>/styles/jquery.simplecolorpicker.css',
'<%= app.dist1 %>/styles/jquery.simplecolorpicker-regularfont.css',
'<%= app.dist1 %>/styles/genesys.css'
]
}
}
},
......
bower.json deleted 100644 → 0
View file @ 05888195
{
"name": "genesys2-server",
"version": "1.1",
"appPath": "src/main/sourceapp",
"dependencies": {
"jquery": "~2.1.3",
"modernizr": "~2.8.3",
"leaflet": "~0.7.3",
"leaflet-locationfilter": "*",
"jquery-simplecolorpicker": "~0.3.0",
"jquery-flot": "~0.8.3",
"tinymce": "~4.1.9",
"jquery.tinymce": "*",
"bootstrap-sass": "~3.3.6",
"jquery-ui": "~1.11.4",
"webfont-notosans": "~0.1.0",
"fontawesome": "~4.4.0",
"highcharts": "~4.1.8",
"highmaps-beta": "highmaps#~1.0.1",
"jstree": "~3.2.1",
"jquery-serialize-object": "^2.5.0"
}
}
package.json
View file @ a721f7d1
......@@ -7,7 +7,6 @@
"node": ">=0.10.0"
},
"devDependencies": {
"bower": "~1.7.5",
"grunt": "~1.0.1",
"grunt-autoprefixer": "^3.0.4",
"grunt-cli": "~1.2",
......@@ -23,5 +22,22 @@
"grunt-newer": "^1.2.0",
"load-grunt-tasks": "^3.5",
"time-grunt": "^1.3.0"
},
"dependencies": {
"bootstrap-sass": "~3.3.6",
"font-awesome": "~4.4.0",
"form-serializer": "^2.5.0",
"highcharts": "~4.1.8",
"highmaps-release": "~1.1.10",
"jquery": "~2.1.3",
"jquery-flot": "~0.8.3",
"jquery-simplecolorpicker": "~0.3.1",
"jquery-ui-dist": "~1.12.1",
"jstree": "~3.2.1",
"leaflet": "~0.7.3",
"leaflet.locationfilter": "~0.1.0",
"modernizr": "~3.5.0",
"notosans-fontface": "~1.0.1",
"tinymce": "~4.1.9"
}
}
pom.xml
View file @ a721f7d1
......@@ -667,15 +667,6 @@
<arguments>install</arguments>
</configuration>
</execution>
<execution>
<id>bower-install</id>
<goals>
<goal>bower</goal>
</goals>
<configuration>
<arguments>--allow-root install</arguments>
</configuration>
</execution>
<execution>
<id>grunt-build</id>
<goals>
......@@ -726,9 +717,6 @@
<version>3.0.0</version>
<configuration>
<filesets>
<fileset>
<directory>bower_components</directory>
</fileset>
<fileset>
<directory>node_modules</directory>
</fileset>
......
src/main/sourceapp/1/styles/genesys.scss
View file @ a721f7d1
......@@ -6573,3 +6573,12 @@ table.accessions {
// content: '\2190' // &larr;
// }
}
// Changes for jquery-ui autocomplete
.ui-state-active, .ui-widget-content .ui-state-active,
.ui-widget-header .ui-state-active, a.ui-button:active,
.ui-button:active, .ui-state-active.ui-button:hover {
border: 1px solid #999999;
color: #2b2b2b;
background: #DADADA;
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment