External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-10 10:57:35 -02:30
Code Issues Packages Projects Releases Wiki Activity

Update asset paths and task execution

Browse Source
This commit is contained in:
gconsidine
2017-07-21 16:01:14 -04:00
parent 86fb6116a0
commit f2e132f3fe
11 changed files with 119 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/grunt-tasks/concat.js
View File

@@ -12,6 +12,6 @@ module.exports = {
'static/lib/nvd3/build/nv.d3.css',
'static/lib/ng-toast/dist/ngToast.min.css'
],
dest: 'static/css/tower.vendor.css'
dest: 'static/css/app.vendor.css'
}
};

51
awx/ui/grunt-tasks/concurrent.js
View File

@@ -1,18 +1,61 @@
module.exports = {
dev: {
tasks: ['copy:vendor', 'copy:assets', 'copy:partials', 'copy:views', 'copy:languages', 'copy:config'],
tasks: [
'copy:vendor',
'copy:assets',
'copy:icons',
'copy:fonts',
'copy:images',
'copy:partials',
'copy:views',
'copy:languages',
'copy:config',
'less:dev'
]
},
// This concurrent target is intended for development ui builds that do not require raising browser-sync or filesystem polling
devNoSync: {
tasks: ['copy:vendor', 'copy:assets', 'copy:partials', 'copy:views', 'copy:languages', 'copy:config', 'less:dev', 'webpack:dev'],
tasks: [
'copy:vendor',
'copy:assets',
'copy:icons',
'copy:fonts',
'copy:images',
'copy:partials',
'copy:views',
'copy:languages',
'copy:config',
'less:dev',
'webpack:dev'
]
},
prod: {
tasks: ['newer:copy:vendor', 'newer:copy:assets', 'newer:copy:partials', 'newer:copy:views', 'newer:copy:languages', 'newer:copy:config', 'newer:less:prod']
tasks: [
'newer:copy:vendor',
'newer:copy:assets',
'newer:copy:icons',
'newer:copy:fonts',
'newer:copy:images',
'newer:copy:partials',
'newer:copy:views',
'newer:copy:languages',
'newer:copy:config',
'newer:less:prod'
]
},
watch: {
tasks: ['watch:css', 'watch:partials', 'watch:views', 'watch:assets', ['webpack:dev', 'watch:config']],
tasks: [
'watch:css',
'watch:partials',
'watch:views',
'watch:assets',
[
'watch:config'
]
],
options: {
logConcurrentOutput: true
}
}
};

23
awx/ui/grunt-tasks/copy.js
View File

@@ -20,11 +20,8 @@ module.exports = {
expand: true,
flatten: true,
filter: 'isFile',
src: [
'assets/fontcustom/fontcustom_3dfbafd778b214fc5df2a64fe14fbfb3.woff',
'assets/fontcustom/fontcustom_3dfbafd778b214fc5df2a64fe14fbfb3.ttf'
],
dest: 'static/css/'
src: 'assets/fontcustom/**/*',
dest: 'static/fonts/'
}]
},
icons: {
@@ -33,14 +30,20 @@ module.exports = {
expand: true,
flatten: true,
filter: 'isFile',
src: [
'components-font-awesome/fonts/fontawesome-webfont.ttf',
'components-font-awesome/fonts/fontawesome-webfont.woff',
'components-font-awesome/fonts/fontawesome-webfont.woff2'
],
src: 'components-font-awesome/fonts/*',
dest: 'static/fonts/'
}]
},
images: {
files: [{
cwd: 'client/',
expand: true,
flatten: true,
filter: 'isFile',
src: 'assets/images/images.new/*',
dest: 'static/images/'
}]
},
assets: {
files: [{
cwd: 'client/',

8
awx/ui/grunt-tasks/cssmin.js
View File

@@ -3,9 +3,9 @@ module.exports = {
files: [
{
expand: true,
src: 'static/css/tower.vendor.css',
src: 'static/css/app.vendor.css',
dest: '.',
ext: '.vendor.min.css'
ext: '.vendor.css'
}
]
},
@@ -13,9 +13,9 @@ module.exports = {
files: [
{
expand: true,
src: 'static/css/tower.css',
src: 'static/css/app.css',
dest: '.',
ext: '.min.css'
ext: '.css'
}
]
}

4
awx/ui/grunt-tasks/less.js
View File

@@ -7,7 +7,7 @@ var autoPrefixer = new AutoPrefixer({
module.exports = {
dev: {
files: {
'static/css/tower.css': 'client/lib/theme/index.less'
'static/css/app.css': 'client/lib/theme/index.less'
},
options: {
sourceMap: true,
@@ -16,7 +16,7 @@ module.exports = {
},
prod: {
files: {
'static/css/tower.css': 'client/lib/theme/index.less'
'static/css/app.css': 'client/lib/theme/index.less'
},
options: {
compress: true,