diff --git a/.gitignore b/.gitignore
index 8859577..3c6c907 100644
--- a/.gitignore
+++ b/.gitignore
@@ -77,5 +77,6 @@ build/Release
# https://docs.npmjs.com/misc/faq#should-i-check-my-node-modules-folder-into-git
node_modules
/node_modules
+bower_components
.idea/workspace.xml
diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml
index 60571b8..5e73e53 100644
--- a/.idea/jsLibraryMappings.xml
+++ b/.idea/jsLibraryMappings.xml
@@ -3,5 +3,6 @@
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 72abef0..e503d88 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,8 @@
+
+
+
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index eb1eafe..2cc7f13 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,8 +3,11 @@
+
+
-
+
+
@@ -26,211 +29,60 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
@@ -287,9 +138,10 @@
-
+
+
@@ -334,6 +186,7 @@
+
@@ -367,9 +220,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
@@ -527,7 +397,8 @@
1437394742450
-
+
+
1438335954140
@@ -813,7 +684,7 @@
-
+
@@ -822,9 +693,8 @@
-
-
+
@@ -836,6 +706,7 @@
+
@@ -899,48 +770,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -990,13 +819,6 @@
-
-
-
-
-
-
-
@@ -1170,7 +992,7 @@
-
+
@@ -1190,14 +1012,6 @@
-
-
-
-
-
-
-
-
@@ -1238,10 +1052,79 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/gulpfile.js b/gulpfile.js
index aa2536b..8b66c87 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -30,27 +30,31 @@ gulp.task('scripts', function() {
/*.pipe(rename({suffix: '.min'}))*/
/* .pipe(uglify({mangle: false}))*/
/*.pipe(concat('app.js'))*/
- .pipe(gulp.dest('dist/js'))
- .pipe(notify({ message: 'Scripts task complete' }));
+ .pipe(gulp.dest('dist/js'));
});
gulp.task('vendor', function() {
return gulp.src(['html/libs/microevent.js','html/js/moment.min.js','html/js/ejs_production.js','html/js/jquery.unveil.js'])
.pipe(concat('vendor.js'))
.pipe(uglify({mangle: false}))
- .pipe(gulp.dest('dist/js'))
- .pipe(notify({ message: 'Scripts task complete' }));
+ .pipe(gulp.dest('dist/js'));
+});
+
+gulp.task('remote', function() {
+ return gulp.src(['bower_components/mui/packages/cdn/js/mui.min.js','bower_components/jquery/dist/jquery.min.js','bower_components/string/dist/string.min.js'])
+ .pipe(concat('remote.js'))
+ .pipe(uglify({mangle: false}))
+ .pipe(gulp.dest('dist/js'));
});
gulp.task('styles', function() {
- return gulp.src(['html/css/app.css','html/css/md.css'])
+ return gulp.src(['bower_components/mui/packages/cdn/css/mui.min.css','html/css/app.css','html/css/md.css'])
.pipe(autoprefixer('last 2 version', 'safari 5', 'ie 8', 'ie 9', 'opera 12.1', 'ios 6', 'android 4'))
/*.pipe(gulp.dest('dist/css'))*/
/*.pipe(rename({suffix: '.min'}))*/
.pipe(cssnano())
.pipe(concat('app.css'))
- .pipe(gulp.dest('dist/css'))
- .pipe(notify({ message: 'Styles task complete' }));
+ .pipe(gulp.dest('dist/css'));
});
gulp.task('partials', function() {
@@ -69,7 +73,8 @@ gulp.task('index', function () {
.pipe(htmlreplace({
'css': 'css/app.css',
'js': 'js/app.js',
- 'vendor': 'js/vendor.js'
+ 'vendor': 'js/vendor.js',
+ 'remote': 'js/remote.js'
}))
.pipe(htmlmin({removeComments: true, collapseWhitespace: true, keepClosingSlash: true}))
.pipe(gulp.dest('dist/'));
@@ -81,5 +86,5 @@ gulp.task('clean', function() {
gulp.task('default', ['clean'], function() {
- gulp.start('styles', 'scripts','vendor', 'partials','index');
+ gulp.start('styles', 'scripts', 'remote', 'vendor', 'partials','index');
});
diff --git a/html/index.html b/html/index.html
index 167ede9..a9a29f1 100644
--- a/html/index.html
+++ b/html/index.html
@@ -6,8 +6,9 @@
-
+
+
@@ -37,10 +38,11 @@
+
-
+