Skip to content

Commit 1a68a1c

Browse files
committed
Update to v1.0.6
- change: project dir structure
1 parent 91ff5b0 commit 1a68a1c

File tree

775 files changed

+1374
-794
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

775 files changed

+1374
-794
lines changed

AJAX_Full_Project_GULP/gulp-tasks/build-dist.js

+41-78
Original file line numberDiff line numberDiff line change
@@ -8,109 +8,72 @@ var del = require('del');
88
var runSequence = require('run-sequence');
99
var replace = require('gulp-replace');
1010

11-
gulp.paths = {
12-
dist: 'dist',
13-
vendors: 'dist/vendors'
14-
};
15-
1611
var paths = gulp.paths;
1712

18-
var vendorsJS = [
19-
'node_modules/bootstrap/dist/js/bootstrap.min.js',
20-
'node_modules/bootstrap-daterangepicker/daterangepicker.js',
21-
'node_modules/chart.js/dist/Chart.min.js',
22-
'node_modules/codemirror/lib/codemirror.js',
23-
'node_modules/codemirror/mode/markdown/markdown.js',
24-
'node_modules/codemirror/mode/xml/xml.js',
25-
'node_modules/datatables.net/js/jquery.dataTables.js',
26-
'node_modules/datatables.net-bs4/js/dataTables.bootstrap4.js',
27-
'node_modules/fullcalendar/dist/fullcalendar.min.js',
28-
'node_modules/fullcalendar/dist/gcal.min.js',
29-
'node_modules/gaugeJS/dist/gauge.min.js',
30-
'node_modules/ion-rangeslider/js/ion.rangeSlider.min.js',
31-
'node_modules/jquery/dist/jquery.min.js',
32-
'node_modules/jquery/dist/jquery.min.map',
33-
'node_modules/jquery-ui-dist/jquery-ui.min.js',
34-
'node_modules/jquery-validation/dist/jquery.validate.min.js',
35-
'node_modules/jquery.maskedinput/src/jquery.maskedinput.js',
36-
'node_modules/ladda/dist/ladda.min.js',
37-
'node_modules/ladda/dist/spin.min.js',
38-
'node_modules/moment/min/moment.min.js',
39-
'node_modules/quill/dist/quill.min.js',
40-
'node_modules/quill/dist/quill.min.js.map',
41-
'node_modules/pace-progress/pace.min.js',
42-
'node_modules/popper.js/dist/umd/popper.min.js',
43-
'node_modules/popper.js/dist/umd/popper.min.js.map',
44-
'node_modules/select2/dist/js/select2.min.js',
45-
'node_modules/toastr/toastr.js'
46-
]
47-
48-
var vendorsCSS = [
49-
'node_modules/codemirror/lib/codemirror.css',
50-
'node_modules/datatables.net-bs4/css/dataTables.bootstrap4.css',
51-
'node_modules/font-awesome/css/font-awesome.min.css',
52-
'node_modules/font-awesome/css/font-awesome.css.map',
53-
'node_modules/ladda/dist/ladda-themeless.min.css',
54-
'node_modules/quill/dist/quill.snow.css',
55-
'node_modules/simple-line-icons/css/simple-line-icons.css',
56-
'node_modules/spinkit/css/spinkit.css'
57-
]
58-
59-
var vendorsFonts = [
60-
'node_modules/font-awesome/fonts/**',
61-
'node_modules/simple-line-icons/fonts/**'
62-
]
13+
gulp.vendors = require('./../vendors.json');
14+
var vendors = gulp.vendors;
6315

6416
gulp.task('copy:vendorsCSS', function() {
65-
return gulp.src(vendorsCSS)
66-
.pipe(gulp.dest(paths.vendors + '/css/'));
17+
return gulp.src(vendors.css)
18+
.pipe(gulp.dest(paths.vendors + 'css/'));
6719
});
6820

6921
gulp.task('minify:vendorsCSS', function() {
70-
return gulp.src([paths.vendors + '/css/*.css', '!' + paths.vendors + '/css/*.min.css'])
22+
return gulp.src([
23+
paths.vendors + 'css/*.css',
24+
'!' + paths.vendors + 'css/*.min.css'
25+
])
7126
.pipe(cssmin())
72-
.pipe(rename({suffix: '.min'}))
73-
.pipe(gulp.dest(paths.vendors + '/css/'));
27+
.pipe(rename({suffix: '.min'}))
28+
.pipe(gulp.dest(paths.vendors + 'css/'));
7429
});
7530

7631
gulp.task('clean:vendorsCSS', function () {
77-
return del([paths.vendors + '/css/*.css', '!' + paths.vendors + '/css/*.min.css']);
32+
return del([
33+
paths.vendors + 'css/*.css',
34+
'!' + paths.vendors + 'css/*.min.css'
35+
]);
7836
});
7937

8038
gulp.task('vendors:css', function(callback) {
8139
runSequence('copy:vendorsCSS', 'minify:vendorsCSS', 'clean:vendorsCSS', callback);
8240
});
8341

8442
gulp.task('copy:vendorsJS', function() {
85-
return gulp.src(vendorsJS)
86-
.pipe(gulp.dest(paths.vendors + '/js/'));
43+
return gulp.src(vendors.js)
44+
.pipe(gulp.dest(paths.vendors + 'js/'));
8745
});
8846

8947
gulp.task('minify:vendorsJS', function() {
90-
return gulp.src([paths.vendors + '/js/*.js', '!' + paths.vendors + '/js/*.min.js'])
91-
.pipe(gulp.dest(paths.vendors + '/js/'))
48+
return gulp.src([
49+
paths.vendors + 'js/*.js',
50+
'!' + paths.vendors + 'js/*.min.js'
51+
])
52+
.pipe(gulp.dest(paths.vendors + 'js/'))
9253
.pipe(uglify())
9354
.pipe(rename({ suffix: '.min' }))
94-
.pipe(gulp.dest(paths.vendors+'/js/'));
55+
.pipe(gulp.dest(paths.vendors+'js/'));
9556
});
9657

9758
gulp.task('clean:vendorsJS', function () {
98-
return del([paths.vendors + '/js/*.js', '!' + paths.vendors + '/js/*.min.js']);
59+
return del([
60+
paths.vendors + 'js/*.js',
61+
'!' + paths.vendors + 'js/*.min.js']);
9962
});
10063

10164
gulp.task('vendors:js', function(callback) {
10265
runSequence('copy:vendorsJS', 'minify:vendorsJS', 'clean:vendorsJS', callback);
10366
});
10467

10568
gulp.task('copy:vendorsFonts', function() {
106-
return gulp.src(vendorsFonts)
107-
.pipe(gulp.dest(paths.vendors + '/fonts/'));
69+
return gulp.src(vendors.fonts)
70+
.pipe(gulp.dest(paths.vendors + 'fonts/'));
10871
});
10972

11073
gulp.task('replace:node_modules', function(){
11174
return gulp.src([
112-
'./dist/**/*.html',
113-
'./dist/**/*.js',
75+
paths.dist + '**/*.html',
76+
paths.dist + '**/*.js',
11477
], {base: './'})
11578
.pipe(replace(/node_modules+.+(\/[a-z0-9][^/]*\.js+(\'|\"))/ig, 'vendors/js$1'))
11679
.pipe(replace(/"vendors\/js\/(.*).js(\'|\")/ig, '"vendors/js/$1.min.js"'))
@@ -132,33 +95,33 @@ gulp.task('clean:dist', function () {
13295
});
13396

13497
gulp.task('copy:css', function() {
135-
return gulp.src('./css/**/*')
136-
.pipe(gulp.dest(paths.dist+'/css'));
98+
return gulp.src(paths.src + 'css/**/*')
99+
.pipe(gulp.dest(paths.dist + 'css'));
137100
});
138101

139102
gulp.task('copy:img', function() {
140-
return gulp.src('./img/**/*')
141-
.pipe(gulp.dest(paths.dist+'/img'));
103+
return gulp.src(paths.src + 'img/**/*')
104+
.pipe(gulp.dest(paths.dist + 'img'));
142105
});
143106

144107
gulp.task('copy:js', function() {
145-
return gulp.src('./js/**/*')
146-
.pipe(gulp.dest(paths.dist+'/js'));
108+
return gulp.src(paths.src + 'js/**/*')
109+
.pipe(gulp.dest(paths.dist + 'js'));
147110
});
148111

149112
gulp.task('copy:views', function() {
150-
return gulp.src('./views/**/*')
151-
.pipe(gulp.dest(paths.dist+'/views'));
113+
return gulp.src(paths.src + 'views/**/*')
114+
.pipe(gulp.dest(paths.dist + 'views'));
152115
});
153116

154117
gulp.task('copy:html', function() {
155-
return gulp.src('index.html')
156-
.pipe(gulp.dest(paths.dist+'/'));
118+
return gulp.src(paths.src + 'index.html')
119+
.pipe(gulp.dest(paths.dist));
157120
});
158121

159122
gulp.task('copy:vendors', function() {
160-
return gulp.src('./vendors/**/*')
161-
.pipe(gulp.dest(paths.dist+'/vendors/'));
123+
return gulp.src(paths.src + 'vendors/**/*')
124+
.pipe(gulp.dest(paths.dist + 'vendors/'));
162125
});
163126

164127
gulp.task('build:dist', function(callback) {

AJAX_Full_Project_GULP/gulp-tasks/vendors.js

+5-6
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,30 @@
22

33
var gulp = require('gulp');
44
var del = require('del');
5-
var rename = require("gulp-rename");
5+
var rename = require('gulp-rename');
66
var runSequence = require('run-sequence');
77
var sass = require('gulp-sass');
88
var autoprefixer = require('gulp-autoprefixer');
99
var cssmin = require('gulp-cssmin')
1010

1111
var paths = gulp.paths;
12-
var vendors = './scss/vendors/';
1312

1413
gulp.task('compile-vendors:clean', function () {
1514
return del([
16-
'./vendors/css/**'
15+
paths.src + 'vendors/css/**'
1716
]);
1817
});
1918

2019
gulp.task('compile-vendors:sass', function () {
21-
return gulp.src('./scss/vendors/**/*.scss')
20+
return gulp.src(paths.src + 'scss/vendors/**/*.scss')
2221
.pipe(sass().on('error', sass.logError))
2322
.pipe(autoprefixer())
2423
.pipe(rename({dirname: ''}))
25-
.pipe(gulp.dest('./vendors/css/'))
24+
.pipe(gulp.dest(paths.src + 'vendors/css/'))
2625
.pipe(cssmin())
2726
.pipe(rename({suffix: '.min'}))
2827
.pipe(rename({dirname: ''}))
29-
.pipe(gulp.dest('./vendors/css/'));
28+
.pipe(gulp.dest(paths.src + 'vendors/css/'));
3029
});
3130

3231
gulp.task('compile-vendors', function(callback) {

AJAX_Full_Project_GULP/gulpfile.js

+23-16
Original file line numberDiff line numberDiff line change
@@ -8,54 +8,61 @@ var cssmin = require('gulp-cssmin')
88
var rename = require('gulp-rename');
99
var runSequence = require('run-sequence');
1010

11-
require('require-dir')('./gulp-tasks');
12-
1311
gulp.paths = {
14-
dist: 'dist',
15-
vendors: 'dist/vendors'
12+
dist: 'dist/',
13+
src: 'src/',
14+
vendors: 'dist/vendors/'
1615
};
1716

1817
var paths = gulp.paths;
1918

19+
require('require-dir')('./gulp-tasks');
20+
2021
// Static Server + watching scss/html files
2122
gulp.task('serve', ['sass'], function() {
2223

2324
browserSync.init({
24-
server: "./"
25+
server: ['./', './src']
2526
});
2627

27-
gulp.watch('scss/**/*.scss', ['sass']);
28-
gulp.watch('**/*.html').on('change', browserSync.reload);
29-
gulp.watch('js/**/*.js').on('change', browserSync.reload);
28+
gulp.watch(paths.src + 'scss/**/*.scss', ['sass']);
29+
gulp.watch(paths.src + '**/*.html').on('change', browserSync.reload);
30+
gulp.watch(paths.src + 'js/**/*.js').on('change', browserSync.reload);
3031

3132
});
3233

3334
// Static Server without watching scss files
3435
gulp.task('serve:lite', function() {
3536

3637
browserSync.init({
37-
server: "./"
38+
server: ['./', './src']
3839
});
3940

40-
gulp.watch('**/*.css').on('change', browserSync.reload);
41-
gulp.watch('**/*.html').on('change', browserSync.reload);
42-
gulp.watch('js/**/*.js').on('change', browserSync.reload);
41+
gulp.watch(paths.src + '**/*.css').on('change', browserSync.reload);
42+
gulp.watch(paths.src + '**/*.html').on('change', browserSync.reload);
43+
gulp.watch(paths.src + 'js/**/*.js').on('change', browserSync.reload);
4344

4445
});
4546

47+
gulp.task('serve:dist', function() {
48+
browserSync.init({
49+
server: ['./dist']
50+
});
51+
});
52+
4653
gulp.task('sass', ['compile-vendors'], function() {
47-
return gulp.src('./scss/style.scss')
54+
return gulp.src(paths.src + '/scss/style.scss')
4855
.pipe(sass())
4956
.pipe(autoprefixer())
50-
.pipe(gulp.dest('./css'))
57+
.pipe(gulp.dest(paths.src + 'css'))
5158
.pipe(cssmin())
5259
.pipe(rename({suffix: '.min'}))
53-
.pipe(gulp.dest('./css'))
60+
.pipe(gulp.dest(paths.src + 'css'))
5461
.pipe(browserSync.stream());
5562
});
5663

5764
gulp.task('sass:watch', function() {
58-
gulp.watch('./scss/**/*.scss', ['sass']);
65+
gulp.watch(paths.src + 'scss/**/*.scss', ['sass']);
5966
});
6067

6168
gulp.task('default', ['serve']);

AJAX_Full_Project_GULP/package.json

+28-23
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,41 @@
11
{
22
"name": "@coreui/ajax",
3-
"version": "1.0.5",
3+
"version": "1.0.6",
44
"description": "Open Source Bootstrap Admin Template",
55
"main": "index.html",
66
"dependencies": {
77
"bootstrap": "4.0.0-beta.2",
8-
"chart.js": "^2.7.0",
9-
"font-awesome": "^4.7.0",
10-
"jquery": "^3.2.1",
11-
"pace-progress": "^1.0.2",
12-
"popper.js": "^1.12.5",
13-
"simple-line-icons": "^2.4.1"
8+
"chart.js": "2.7.1",
9+
"font-awesome": "4.7.0",
10+
"jquery": "3.2.1",
11+
"pace-progress": "1.0.2",
12+
"popper.js": "1.12.6",
13+
"simple-line-icons": "2.4.1"
1414
},
1515
"devDependencies": {
16-
"browser-sync": "^2.16.0",
17-
"del": "^3.0.0",
18-
"gulp": "^3.9.1",
16+
"browser-sync": "2.18.13",
17+
"del": "3.0.0",
18+
"gulp": "3.9.1",
1919
"gulp-autoprefixer": "^4.0.0",
20-
"gulp-bower-src": "^0.1.0",
21-
"gulp-concat": "^2.6.0",
22-
"gulp-contains": "^1.1.0",
23-
"gulp-cssmin": "^0.2.0",
24-
"gulp-filter": "^5.0.1",
25-
"gulp-rename": "^1.2.2",
26-
"gulp-replace": "^0.6.1",
27-
"gulp-sass": "^3.1.0",
28-
"gulp-search": "^1.0.0",
29-
"gulp-uglify": "^3.0.0",
30-
"require-dir": "^0.3.2",
31-
"run-sequence": "^2.1.0"
20+
"gulp-bower-src": "0.1.0",
21+
"gulp-concat": "2.6.1",
22+
"gulp-contains": "1.1.0",
23+
"gulp-cssmin": "0.2.0",
24+
"gulp-filter": "5.0.1",
25+
"gulp-rename": "1.2.2",
26+
"gulp-replace": "0.6.1",
27+
"gulp-sass": "3.1.0",
28+
"gulp-search": "1.0.0",
29+
"gulp-uglify": "3.0.0",
30+
"require-dir": "0.3.2",
31+
"run-sequence": "2.2.0"
32+
},
33+
"scripts": {
34+
"gulp": "gulp",
35+
"build": "gulp build:dist",
36+
"serve": "gulp serve",
37+
"serve-dist": "gulp serve:dist"
3238
},
33-
"scripts": {},
3439
"browserslist": [
3540
"Chrome >= 45",
3641
"Firefox ESR",

0 commit comments

Comments
 (0)