diff --git a/gulpfile.js b/gulpfile.js index ec3519b08..34faaeff7 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -17,21 +17,21 @@ var argv = require('yargs').argv, gulp.task('3rdparty', function () { gulp.src([ - 'dashboard/src/3rdparty/**/*.js', - 'dashboard/src/3rdparty/**/*.map', - 'dashboard/src/3rdparty/**/*.css', - 'dashboard/src/3rdparty/**/*.otf', - 'dashboard/src/3rdparty/**/*.eot', - 'dashboard/src/3rdparty/**/*.svg', - 'dashboard/src/3rdparty/**/*.gif', - 'dashboard/src/3rdparty/**/*.ttf', - 'dashboard/src/3rdparty/**/*.woff', - 'dashboard/src/3rdparty/**/*.woff2' + 'src/3rdparty/**/*.js', + 'src/3rdparty/**/*.map', + 'src/3rdparty/**/*.css', + 'src/3rdparty/**/*.otf', + 'src/3rdparty/**/*.eot', + 'src/3rdparty/**/*.svg', + 'src/3rdparty/**/*.gif', + 'src/3rdparty/**/*.ttf', + 'src/3rdparty/**/*.woff', + 'src/3rdparty/**/*.woff2' ]) - .pipe(gulp.dest('dashboard/dist/3rdparty/')); + .pipe(gulp.dest('dist/3rdparty/')); gulp.src('node_modules/bootstrap-sass/assets/javascripts/bootstrap.min.js') - .pipe(gulp.dest('dashboard/dist/3rdparty/js')); + .pipe(gulp.dest('dist/3rdparty/js')); }); @@ -78,18 +78,18 @@ gulp.task('js-index', function () { }); gulp.src([ - 'dashboard/src/js/index.js', - 'dashboard/src/js/client.js', - 'dashboard/src/js/appstore.js', - 'dashboard/src/js/main.js', - 'dashboard/src/views/*.js' + 'src/js/index.js', + 'src/js/client.js', + 'src/js/appstore.js', + 'src/js/main.js', + 'src/views/*.js' ]) .pipe(ejs({ oauth: oauth, revision: revision }, {}, { ext: '.js' })) .pipe(sourcemaps.init()) .pipe(concat('index.js', { newLine: ';' })) .pipe(uglifyer) .pipe(sourcemaps.write()) - .pipe(gulp.dest('dashboard/dist/js')); + .pipe(gulp.dest('dist/js')); }); gulp.task('js-logs', function () { @@ -99,13 +99,13 @@ gulp.task('js-logs', function () { console.error(error); }); - gulp.src(['dashboard/src/js/logs.js', 'dashboard/src/js/client.js']) + gulp.src(['src/js/logs.js', 'src/js/client.js']) .pipe(ejs({ oauth: oauth }, {}, { ext: '.js' })) .pipe(sourcemaps.init()) .pipe(concat('logs.js', { newLine: ';' })) .pipe(uglifyer) .pipe(sourcemaps.write()) - .pipe(gulp.dest('dashboard/dist/js')); + .pipe(gulp.dest('dist/js')); }); gulp.task('js-terminal', function () { @@ -115,13 +115,13 @@ gulp.task('js-terminal', function () { console.error(error); }); - gulp.src(['dashboard/src/js/terminal.js', 'dashboard/src/js/client.js']) + gulp.src(['src/js/terminal.js', 'src/js/client.js']) .pipe(ejs({ oauth: oauth }, {}, { ext: '.js' })) .pipe(sourcemaps.init()) .pipe(concat('terminal.js', { newLine: ';' })) .pipe(uglifyer) .pipe(sourcemaps.write()) - .pipe(gulp.dest('dashboard/dist/js')); + .pipe(gulp.dest('dist/js')); }); gulp.task('js-setup', function () { @@ -131,13 +131,13 @@ gulp.task('js-setup', function () { console.error(error); }); - gulp.src(['dashboard/src/js/setup.js', 'dashboard/src/js/client.js']) + gulp.src(['src/js/setup.js', 'src/js/client.js']) .pipe(ejs({ oauth: oauth }, {}, { ext: '.js' })) .pipe(sourcemaps.init()) .pipe(concat('setup.js', { newLine: ';' })) .pipe(uglifyer) .pipe(sourcemaps.write()) - .pipe(gulp.dest('dashboard/dist/js')); + .pipe(gulp.dest('dist/js')); }); gulp.task('js-setupdns', function () { @@ -147,13 +147,13 @@ gulp.task('js-setupdns', function () { console.error(error); }); - gulp.src(['dashboard/src/js/setupdns.js', 'dashboard/src/js/client.js']) + gulp.src(['src/js/setupdns.js', 'src/js/client.js']) .pipe(ejs({ oauth: oauth }, {}, { ext: '.js' })) .pipe(sourcemaps.init()) .pipe(concat('setupdns.js', { newLine: ';' })) .pipe(uglifyer) .pipe(sourcemaps.write()) - .pipe(gulp.dest('dashboard/dist/js')); + .pipe(gulp.dest('dist/js')); }); gulp.task('js-restore', function () { @@ -163,13 +163,13 @@ gulp.task('js-restore', function () { console.error(error); }); - gulp.src(['dashboard/src/js/restore.js', 'dashboard/src/js/client.js']) + gulp.src(['src/js/restore.js', 'src/js/client.js']) .pipe(ejs({ oauth: oauth }, {}, { ext: '.js' })) .pipe(sourcemaps.init()) .pipe(concat('restore.js', { newLine: ';' })) .pipe(uglifyer) .pipe(sourcemaps.write()) - .pipe(gulp.dest('dashboard/dist/js')); + .pipe(gulp.dest('dist/js')); }); @@ -180,11 +180,11 @@ gulp.task('js-update', function () { console.error(error); }); - gulp.src(['dashboard/src/js/update.js']) + gulp.src(['src/js/update.js']) .pipe(sourcemaps.init()) .pipe(uglifyer) .pipe(sourcemaps.write()) - .pipe(gulp.dest('dashboard/dist/js')); + .pipe(gulp.dest('dist/js')); }); @@ -193,15 +193,15 @@ gulp.task('js-update', function () { // -------------- gulp.task('html', ['html-views', 'html-templates'], function () { - return gulp.src('dashboard/src/*.html').pipe(ejs({ apiOriginHostname: oauth.apiOriginHostname, revision: revision }, {}, { ext: '.html' })).pipe(gulp.dest('dashboard/dist')); + return gulp.src('src/*.html').pipe(ejs({ apiOriginHostname: oauth.apiOriginHostname, revision: revision }, {}, { ext: '.html' })).pipe(gulp.dest('dist')); }); gulp.task('html-views', function () { - return gulp.src('dashboard/src/views/**/*.html').pipe(gulp.dest('dashboard/dist/views')); + return gulp.src('src/views/**/*.html').pipe(gulp.dest('dist/views')); }); gulp.task('html-templates', function () { - return gulp.src('dashboard/src/templates/**/*.html').pipe(gulp.dest('dashboard/dist/templates')); + return gulp.src('src/templates/**/*.html').pipe(gulp.dest('dist/templates')); }); // -------------- @@ -209,18 +209,18 @@ gulp.task('html-templates', function () { // -------------- gulp.task('css', function () { - return gulp.src('dashboard/src/*.scss') + return gulp.src('src/*.scss') .pipe(sourcemaps.init()) .pipe(sass({ includePaths: ['node_modules/bootstrap-sass/assets/stylesheets/'] }).on('error', sass.logError)) .pipe(autoprefixer()) .pipe(cssnano()) .pipe(sourcemaps.write()) - .pipe(gulp.dest('dashboard/dist')); + .pipe(gulp.dest('dist')); }); gulp.task('images', function () { - return gulp.src('dashboard/src/img/**') - .pipe(gulp.dest('dashboard/dist/img')); + return gulp.src('src/img/**') + .pipe(gulp.dest('dist/img')); }); // -------------- @@ -228,25 +228,25 @@ gulp.task('images', function () { // -------------- gulp.task('watch', ['default'], function () { - gulp.watch(['dashboard/src/*.scss'], ['css']); - gulp.watch(['dashboard/src/img/*'], ['images']); - gulp.watch(['dashboard/src/**/*.html'], ['html']); - gulp.watch(['dashboard/src/views/*.html'], ['html-views']); - gulp.watch(['dashboard/src/templates/*.html'], ['html-templates']); - gulp.watch(['dashboard/src/js/update.js'], ['js-update']); - gulp.watch(['dashboard/src/js/setup.js', 'dashboard/src/js/client.js'], ['js-setup']); - gulp.watch(['dashboard/src/js/setupdns.js', 'dashboard/src/js/client.js'], ['js-setupdns']); - gulp.watch(['dashboard/src/js/restore.js', 'dashboard/src/js/client.js'], ['js-restore']); - gulp.watch(['dashboard/src/js/logs.js', 'dashboard/src/js/client.js'], ['js-logs']); - gulp.watch(['dashboard/src/js/terminal.js', 'dashboard/src/js/client.js'], ['js-terminal']); - gulp.watch(['dashboard/src/js/index.js', 'dashboard/src/js/client.js', 'dashboard/src/js/appstore.js', 'dashboard/src/js/main.js', 'dashboard/src/views/*.js'], ['js-index']); - gulp.watch(['dashboard/src/3rdparty/**/*'], ['3rdparty']); + gulp.watch(['src/*.scss'], ['css']); + gulp.watch(['src/img/*'], ['images']); + gulp.watch(['src/**/*.html'], ['html']); + gulp.watch(['src/views/*.html'], ['html-views']); + gulp.watch(['src/templates/*.html'], ['html-templates']); + gulp.watch(['src/js/update.js'], ['js-update']); + gulp.watch(['src/js/setup.js', 'src/js/client.js'], ['js-setup']); + gulp.watch(['src/js/setupdns.js', 'src/js/client.js'], ['js-setupdns']); + gulp.watch(['src/js/restore.js', 'src/js/client.js'], ['js-restore']); + gulp.watch(['src/js/logs.js', 'src/js/client.js'], ['js-logs']); + gulp.watch(['src/js/terminal.js', 'src/js/client.js'], ['js-terminal']); + gulp.watch(['src/js/index.js', 'src/js/client.js', 'src/js/appstore.js', 'src/js/main.js', 'src/views/*.js'], ['js-index']); + gulp.watch(['src/3rdparty/**/*'], ['3rdparty']); }); gulp.task('clean', function () { - rimraf.sync('dashboard/dist'); + rimraf.sync('dist'); }); gulp.task('default', ['clean', 'html', 'js', '3rdparty', 'images', 'css'], function () {}); -gulp.task('develop', ['watch'], serve({ root: 'dashboard/dist', port: 4000 })); +gulp.task('develop', ['watch'], serve({ root: 'dist', port: 4000 })); diff --git a/dashboard/src/3rdparty/Roboto-Light.ttf b/src/3rdparty/Roboto-Light.ttf similarity index 100% rename from dashboard/src/3rdparty/Roboto-Light.ttf rename to src/3rdparty/Roboto-Light.ttf diff --git a/dashboard/src/3rdparty/Roboto-Regular.ttf b/src/3rdparty/Roboto-Regular.ttf similarity index 100% rename from dashboard/src/3rdparty/Roboto-Regular.ttf rename to src/3rdparty/Roboto-Regular.ttf diff --git a/dashboard/src/3rdparty/ajax-loader.gif b/src/3rdparty/ajax-loader.gif similarity index 100% rename from dashboard/src/3rdparty/ajax-loader.gif rename to src/3rdparty/ajax-loader.gif diff --git a/dashboard/src/3rdparty/angular-ui-notification.min.css b/src/3rdparty/angular-ui-notification.min.css similarity index 100% rename from dashboard/src/3rdparty/angular-ui-notification.min.css rename to src/3rdparty/angular-ui-notification.min.css diff --git a/dashboard/src/3rdparty/bootstrap-3.3.7.min.css b/src/3rdparty/bootstrap-3.3.7.min.css similarity index 100% rename from dashboard/src/3rdparty/bootstrap-3.3.7.min.css rename to src/3rdparty/bootstrap-3.3.7.min.css diff --git a/dashboard/src/3rdparty/bootstrap-slider/bootstrap-slider.css b/src/3rdparty/bootstrap-slider/bootstrap-slider.css similarity index 100% rename from dashboard/src/3rdparty/bootstrap-slider/bootstrap-slider.css rename to src/3rdparty/bootstrap-slider/bootstrap-slider.css diff --git a/dashboard/src/3rdparty/bootstrap-slider/bootstrap-slider.js b/src/3rdparty/bootstrap-slider/bootstrap-slider.js similarity index 100% rename from dashboard/src/3rdparty/bootstrap-slider/bootstrap-slider.js rename to src/3rdparty/bootstrap-slider/bootstrap-slider.js diff --git a/dashboard/src/3rdparty/bootstrap-slider/bootstrap-slider.min.css b/src/3rdparty/bootstrap-slider/bootstrap-slider.min.css similarity index 100% rename from dashboard/src/3rdparty/bootstrap-slider/bootstrap-slider.min.css rename to src/3rdparty/bootstrap-slider/bootstrap-slider.min.css diff --git a/dashboard/src/3rdparty/bootstrap-slider/bootstrap-slider.min.js b/src/3rdparty/bootstrap-slider/bootstrap-slider.min.js similarity index 100% rename from dashboard/src/3rdparty/bootstrap-slider/bootstrap-slider.min.js rename to src/3rdparty/bootstrap-slider/bootstrap-slider.min.js diff --git a/dashboard/src/3rdparty/bootstrap-slider/slider.js b/src/3rdparty/bootstrap-slider/slider.js similarity index 100% rename from dashboard/src/3rdparty/bootstrap-slider/slider.js rename to src/3rdparty/bootstrap-slider/slider.js diff --git a/dashboard/src/3rdparty/bootstrap/css/bootstrap-theme.css b/src/3rdparty/bootstrap/css/bootstrap-theme.css similarity index 100% rename from dashboard/src/3rdparty/bootstrap/css/bootstrap-theme.css rename to src/3rdparty/bootstrap/css/bootstrap-theme.css diff --git a/dashboard/src/3rdparty/bootstrap/css/bootstrap-theme.css.map b/src/3rdparty/bootstrap/css/bootstrap-theme.css.map similarity index 100% rename from dashboard/src/3rdparty/bootstrap/css/bootstrap-theme.css.map rename to src/3rdparty/bootstrap/css/bootstrap-theme.css.map diff --git a/dashboard/src/3rdparty/bootstrap/css/bootstrap-theme.min.css b/src/3rdparty/bootstrap/css/bootstrap-theme.min.css similarity index 100% rename from dashboard/src/3rdparty/bootstrap/css/bootstrap-theme.min.css rename to src/3rdparty/bootstrap/css/bootstrap-theme.min.css diff --git a/dashboard/src/3rdparty/bootstrap/css/bootstrap.css b/src/3rdparty/bootstrap/css/bootstrap.css similarity index 100% rename from dashboard/src/3rdparty/bootstrap/css/bootstrap.css rename to src/3rdparty/bootstrap/css/bootstrap.css diff --git a/dashboard/src/3rdparty/bootstrap/css/bootstrap.css.map b/src/3rdparty/bootstrap/css/bootstrap.css.map similarity index 100% rename from dashboard/src/3rdparty/bootstrap/css/bootstrap.css.map rename to src/3rdparty/bootstrap/css/bootstrap.css.map diff --git a/dashboard/src/3rdparty/bootstrap/css/bootstrap.min.css b/src/3rdparty/bootstrap/css/bootstrap.min.css similarity index 100% rename from dashboard/src/3rdparty/bootstrap/css/bootstrap.min.css rename to src/3rdparty/bootstrap/css/bootstrap.min.css diff --git a/dashboard/src/3rdparty/bootstrap/fonts/glyphicons-halflings-regular.eot b/src/3rdparty/bootstrap/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from dashboard/src/3rdparty/bootstrap/fonts/glyphicons-halflings-regular.eot rename to src/3rdparty/bootstrap/fonts/glyphicons-halflings-regular.eot diff --git a/dashboard/src/3rdparty/bootstrap/fonts/glyphicons-halflings-regular.svg b/src/3rdparty/bootstrap/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from dashboard/src/3rdparty/bootstrap/fonts/glyphicons-halflings-regular.svg rename to src/3rdparty/bootstrap/fonts/glyphicons-halflings-regular.svg diff --git a/dashboard/src/3rdparty/bootstrap/fonts/glyphicons-halflings-regular.ttf b/src/3rdparty/bootstrap/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from dashboard/src/3rdparty/bootstrap/fonts/glyphicons-halflings-regular.ttf rename to src/3rdparty/bootstrap/fonts/glyphicons-halflings-regular.ttf diff --git a/dashboard/src/3rdparty/bootstrap/fonts/glyphicons-halflings-regular.woff b/src/3rdparty/bootstrap/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from dashboard/src/3rdparty/bootstrap/fonts/glyphicons-halflings-regular.woff rename to src/3rdparty/bootstrap/fonts/glyphicons-halflings-regular.woff diff --git a/dashboard/src/3rdparty/bootstrap/fonts/glyphicons-halflings-regular.woff2 b/src/3rdparty/bootstrap/fonts/glyphicons-halflings-regular.woff2 similarity index 100% rename from dashboard/src/3rdparty/bootstrap/fonts/glyphicons-halflings-regular.woff2 rename to src/3rdparty/bootstrap/fonts/glyphicons-halflings-regular.woff2 diff --git a/dashboard/src/3rdparty/bootstrap/info.txt b/src/3rdparty/bootstrap/info.txt similarity index 100% rename from dashboard/src/3rdparty/bootstrap/info.txt rename to src/3rdparty/bootstrap/info.txt diff --git a/dashboard/src/3rdparty/bootstrap/js/bootstrap.js b/src/3rdparty/bootstrap/js/bootstrap.js similarity index 100% rename from dashboard/src/3rdparty/bootstrap/js/bootstrap.js rename to src/3rdparty/bootstrap/js/bootstrap.js diff --git a/dashboard/src/3rdparty/bootstrap/js/bootstrap.min.js b/src/3rdparty/bootstrap/js/bootstrap.min.js similarity index 100% rename from dashboard/src/3rdparty/bootstrap/js/bootstrap.min.js rename to src/3rdparty/bootstrap/js/bootstrap.min.js diff --git a/dashboard/src/3rdparty/bootstrap/js/npm.js b/src/3rdparty/bootstrap/js/npm.js similarity index 100% rename from dashboard/src/3rdparty/bootstrap/js/npm.js rename to src/3rdparty/bootstrap/js/npm.js diff --git a/dashboard/src/3rdparty/css/font-awesome.css b/src/3rdparty/css/font-awesome.css similarity index 100% rename from dashboard/src/3rdparty/css/font-awesome.css rename to src/3rdparty/css/font-awesome.css diff --git a/dashboard/src/3rdparty/css/font-awesome.min.css b/src/3rdparty/css/font-awesome.min.css similarity index 100% rename from dashboard/src/3rdparty/css/font-awesome.min.css rename to src/3rdparty/css/font-awesome.min.css diff --git a/dashboard/src/3rdparty/fonts/FontAwesome.otf b/src/3rdparty/fonts/FontAwesome.otf similarity index 100% rename from dashboard/src/3rdparty/fonts/FontAwesome.otf rename to src/3rdparty/fonts/FontAwesome.otf diff --git a/dashboard/src/3rdparty/fonts/fontawesome-webfont.eot b/src/3rdparty/fonts/fontawesome-webfont.eot similarity index 100% rename from dashboard/src/3rdparty/fonts/fontawesome-webfont.eot rename to src/3rdparty/fonts/fontawesome-webfont.eot diff --git a/dashboard/src/3rdparty/fonts/fontawesome-webfont.svg b/src/3rdparty/fonts/fontawesome-webfont.svg similarity index 100% rename from dashboard/src/3rdparty/fonts/fontawesome-webfont.svg rename to src/3rdparty/fonts/fontawesome-webfont.svg diff --git a/dashboard/src/3rdparty/fonts/fontawesome-webfont.ttf b/src/3rdparty/fonts/fontawesome-webfont.ttf similarity index 100% rename from dashboard/src/3rdparty/fonts/fontawesome-webfont.ttf rename to src/3rdparty/fonts/fontawesome-webfont.ttf diff --git a/dashboard/src/3rdparty/fonts/fontawesome-webfont.woff b/src/3rdparty/fonts/fontawesome-webfont.woff similarity index 100% rename from dashboard/src/3rdparty/fonts/fontawesome-webfont.woff rename to src/3rdparty/fonts/fontawesome-webfont.woff diff --git a/dashboard/src/3rdparty/fonts/fontawesome-webfont.woff2 b/src/3rdparty/fonts/fontawesome-webfont.woff2 similarity index 100% rename from dashboard/src/3rdparty/fonts/fontawesome-webfont.woff2 rename to src/3rdparty/fonts/fontawesome-webfont.woff2 diff --git a/dashboard/src/3rdparty/js/Chart.js b/src/3rdparty/js/Chart.js similarity index 100% rename from dashboard/src/3rdparty/js/Chart.js rename to src/3rdparty/js/Chart.js diff --git a/dashboard/src/3rdparty/js/angular-animate.min.js b/src/3rdparty/js/angular-animate.min.js similarity index 100% rename from dashboard/src/3rdparty/js/angular-animate.min.js rename to src/3rdparty/js/angular-animate.min.js diff --git a/dashboard/src/3rdparty/js/angular-animate.min.js.map b/src/3rdparty/js/angular-animate.min.js.map similarity index 100% rename from dashboard/src/3rdparty/js/angular-animate.min.js.map rename to src/3rdparty/js/angular-animate.min.js.map diff --git a/dashboard/src/3rdparty/js/angular-base64.min.js b/src/3rdparty/js/angular-base64.min.js similarity index 100% rename from dashboard/src/3rdparty/js/angular-base64.min.js rename to src/3rdparty/js/angular-base64.min.js diff --git a/dashboard/src/3rdparty/js/angular-bootstrap-multiselect.js b/src/3rdparty/js/angular-bootstrap-multiselect.js similarity index 100% rename from dashboard/src/3rdparty/js/angular-bootstrap-multiselect.js rename to src/3rdparty/js/angular-bootstrap-multiselect.js diff --git a/dashboard/src/3rdparty/js/angular-fittext.min.js b/src/3rdparty/js/angular-fittext.min.js similarity index 100% rename from dashboard/src/3rdparty/js/angular-fittext.min.js rename to src/3rdparty/js/angular-fittext.min.js diff --git a/dashboard/src/3rdparty/js/angular-loader.min.js b/src/3rdparty/js/angular-loader.min.js similarity index 100% rename from dashboard/src/3rdparty/js/angular-loader.min.js rename to src/3rdparty/js/angular-loader.min.js diff --git a/dashboard/src/3rdparty/js/angular-loader.min.js.map b/src/3rdparty/js/angular-loader.min.js.map similarity index 100% rename from dashboard/src/3rdparty/js/angular-loader.min.js.map rename to src/3rdparty/js/angular-loader.min.js.map diff --git a/dashboard/src/3rdparty/js/angular-md5.min.js b/src/3rdparty/js/angular-md5.min.js similarity index 100% rename from dashboard/src/3rdparty/js/angular-md5.min.js rename to src/3rdparty/js/angular-md5.min.js diff --git a/dashboard/src/3rdparty/js/angular-md5.min.js.map b/src/3rdparty/js/angular-md5.min.js.map similarity index 100% rename from dashboard/src/3rdparty/js/angular-md5.min.js.map rename to src/3rdparty/js/angular-md5.min.js.map diff --git a/dashboard/src/3rdparty/js/angular-route.min.js b/src/3rdparty/js/angular-route.min.js similarity index 100% rename from dashboard/src/3rdparty/js/angular-route.min.js rename to src/3rdparty/js/angular-route.min.js diff --git a/dashboard/src/3rdparty/js/angular-route.min.js.map b/src/3rdparty/js/angular-route.min.js.map similarity index 100% rename from dashboard/src/3rdparty/js/angular-route.min.js.map rename to src/3rdparty/js/angular-route.min.js.map diff --git a/dashboard/src/3rdparty/js/angular-sanitize.min.js b/src/3rdparty/js/angular-sanitize.min.js similarity index 100% rename from dashboard/src/3rdparty/js/angular-sanitize.min.js rename to src/3rdparty/js/angular-sanitize.min.js diff --git a/dashboard/src/3rdparty/js/angular-sanitize.min.js.map b/src/3rdparty/js/angular-sanitize.min.js.map similarity index 100% rename from dashboard/src/3rdparty/js/angular-sanitize.min.js.map rename to src/3rdparty/js/angular-sanitize.min.js.map diff --git a/dashboard/src/3rdparty/js/angular-slick.min.js b/src/3rdparty/js/angular-slick.min.js similarity index 100% rename from dashboard/src/3rdparty/js/angular-slick.min.js rename to src/3rdparty/js/angular-slick.min.js diff --git a/dashboard/src/3rdparty/js/angular-tld.js b/src/3rdparty/js/angular-tld.js similarity index 100% rename from dashboard/src/3rdparty/js/angular-tld.js rename to src/3rdparty/js/angular-tld.js diff --git a/dashboard/src/3rdparty/js/angular-ui-notification.min.js b/src/3rdparty/js/angular-ui-notification.min.js similarity index 100% rename from dashboard/src/3rdparty/js/angular-ui-notification.min.js rename to src/3rdparty/js/angular-ui-notification.min.js diff --git a/dashboard/src/3rdparty/js/angular.min.js b/src/3rdparty/js/angular.min.js similarity index 100% rename from dashboard/src/3rdparty/js/angular.min.js rename to src/3rdparty/js/angular.min.js diff --git a/dashboard/src/3rdparty/js/angular.min.js.map b/src/3rdparty/js/angular.min.js.map similarity index 100% rename from dashboard/src/3rdparty/js/angular.min.js.map rename to src/3rdparty/js/angular.min.js.map diff --git a/dashboard/src/3rdparty/js/ansi_up.js b/src/3rdparty/js/ansi_up.js similarity index 100% rename from dashboard/src/3rdparty/js/ansi_up.js rename to src/3rdparty/js/ansi_up.js diff --git a/dashboard/src/3rdparty/js/autofill-event.js b/src/3rdparty/js/autofill-event.js similarity index 100% rename from dashboard/src/3rdparty/js/autofill-event.js rename to src/3rdparty/js/autofill-event.js diff --git a/dashboard/src/3rdparty/js/canvas-to-blob.min.js b/src/3rdparty/js/canvas-to-blob.min.js similarity index 100% rename from dashboard/src/3rdparty/js/canvas-to-blob.min.js rename to src/3rdparty/js/canvas-to-blob.min.js diff --git a/dashboard/src/3rdparty/js/clipboard.min.js b/src/3rdparty/js/clipboard.min.js similarity index 100% rename from dashboard/src/3rdparty/js/clipboard.min.js rename to src/3rdparty/js/clipboard.min.js diff --git a/dashboard/src/3rdparty/js/colors.js b/src/3rdparty/js/colors.js similarity index 100% rename from dashboard/src/3rdparty/js/colors.js rename to src/3rdparty/js/colors.js diff --git a/dashboard/src/3rdparty/js/jquery.min.js b/src/3rdparty/js/jquery.min.js similarity index 100% rename from dashboard/src/3rdparty/js/jquery.min.js rename to src/3rdparty/js/jquery.min.js diff --git a/dashboard/src/3rdparty/js/moment.min.js b/src/3rdparty/js/moment.min.js similarity index 100% rename from dashboard/src/3rdparty/js/moment.min.js rename to src/3rdparty/js/moment.min.js diff --git a/dashboard/src/3rdparty/js/showdown-1.6.4.min.js b/src/3rdparty/js/showdown-1.6.4.min.js similarity index 100% rename from dashboard/src/3rdparty/js/showdown-1.6.4.min.js rename to src/3rdparty/js/showdown-1.6.4.min.js diff --git a/dashboard/src/3rdparty/js/showdown-target-blank.min.js b/src/3rdparty/js/showdown-target-blank.min.js similarity index 100% rename from dashboard/src/3rdparty/js/showdown-target-blank.min.js rename to src/3rdparty/js/showdown-target-blank.min.js diff --git a/dashboard/src/3rdparty/js/slick.js b/src/3rdparty/js/slick.js similarity index 100% rename from dashboard/src/3rdparty/js/slick.js rename to src/3rdparty/js/slick.js diff --git a/dashboard/src/3rdparty/js/tld.js b/src/3rdparty/js/tld.js similarity index 100% rename from dashboard/src/3rdparty/js/tld.js rename to src/3rdparty/js/tld.js diff --git a/dashboard/src/3rdparty/js/ui-bootstrap-tpls-1.3.3.min.js b/src/3rdparty/js/ui-bootstrap-tpls-1.3.3.min.js similarity index 100% rename from dashboard/src/3rdparty/js/ui-bootstrap-tpls-1.3.3.min.js rename to src/3rdparty/js/ui-bootstrap-tpls-1.3.3.min.js diff --git a/dashboard/src/3rdparty/slick.css b/src/3rdparty/slick.css similarity index 100% rename from dashboard/src/3rdparty/slick.css rename to src/3rdparty/slick.css diff --git a/dashboard/src/3rdparty/xterm/addons/attach/attach.js b/src/3rdparty/xterm/addons/attach/attach.js similarity index 100% rename from dashboard/src/3rdparty/xterm/addons/attach/attach.js rename to src/3rdparty/xterm/addons/attach/attach.js diff --git a/dashboard/src/3rdparty/xterm/addons/fit/fit.js b/src/3rdparty/xterm/addons/fit/fit.js similarity index 100% rename from dashboard/src/3rdparty/xterm/addons/fit/fit.js rename to src/3rdparty/xterm/addons/fit/fit.js diff --git a/dashboard/src/3rdparty/xterm/addons/fullscreen/fullscreen.css b/src/3rdparty/xterm/addons/fullscreen/fullscreen.css similarity index 100% rename from dashboard/src/3rdparty/xterm/addons/fullscreen/fullscreen.css rename to src/3rdparty/xterm/addons/fullscreen/fullscreen.css diff --git a/dashboard/src/3rdparty/xterm/addons/fullscreen/fullscreen.js b/src/3rdparty/xterm/addons/fullscreen/fullscreen.js similarity index 100% rename from dashboard/src/3rdparty/xterm/addons/fullscreen/fullscreen.js rename to src/3rdparty/xterm/addons/fullscreen/fullscreen.js diff --git a/dashboard/src/3rdparty/xterm/addons/linkify/linkify.js b/src/3rdparty/xterm/addons/linkify/linkify.js similarity index 100% rename from dashboard/src/3rdparty/xterm/addons/linkify/linkify.js rename to src/3rdparty/xterm/addons/linkify/linkify.js diff --git a/dashboard/src/3rdparty/xterm/addons/terminado/terminado.js b/src/3rdparty/xterm/addons/terminado/terminado.js similarity index 100% rename from dashboard/src/3rdparty/xterm/addons/terminado/terminado.js rename to src/3rdparty/xterm/addons/terminado/terminado.js diff --git a/dashboard/src/3rdparty/xterm/xterm.css b/src/3rdparty/xterm/xterm.css similarity index 100% rename from dashboard/src/3rdparty/xterm/xterm.css rename to src/3rdparty/xterm/xterm.css diff --git a/dashboard/src/3rdparty/xterm/xterm.js b/src/3rdparty/xterm/xterm.js similarity index 100% rename from dashboard/src/3rdparty/xterm/xterm.js rename to src/3rdparty/xterm/xterm.js diff --git a/dashboard/src/3rdparty/xterm/xterm.js.map b/src/3rdparty/xterm/xterm.js.map similarity index 100% rename from dashboard/src/3rdparty/xterm/xterm.js.map rename to src/3rdparty/xterm/xterm.js.map diff --git a/dashboard/src/appstatus.html b/src/appstatus.html similarity index 100% rename from dashboard/src/appstatus.html rename to src/appstatus.html diff --git a/dashboard/src/error.html b/src/error.html similarity index 100% rename from dashboard/src/error.html rename to src/error.html diff --git a/dashboard/src/img/appicon_fallback.png b/src/img/appicon_fallback.png similarity index 100% rename from dashboard/src/img/appicon_fallback.png rename to src/img/appicon_fallback.png diff --git a/dashboard/src/img/avatars/armchair.png b/src/img/avatars/armchair.png similarity index 100% rename from dashboard/src/img/avatars/armchair.png rename to src/img/avatars/armchair.png diff --git a/dashboard/src/img/avatars/avatar_0.png b/src/img/avatars/avatar_0.png similarity index 100% rename from dashboard/src/img/avatars/avatar_0.png rename to src/img/avatars/avatar_0.png diff --git a/dashboard/src/img/avatars/cap.png b/src/img/avatars/cap.png similarity index 100% rename from dashboard/src/img/avatars/cap.png rename to src/img/avatars/cap.png diff --git a/dashboard/src/img/avatars/carrot.png b/src/img/avatars/carrot.png similarity index 100% rename from dashboard/src/img/avatars/carrot.png rename to src/img/avatars/carrot.png diff --git a/dashboard/src/img/avatars/cup.png b/src/img/avatars/cup.png similarity index 100% rename from dashboard/src/img/avatars/cup.png rename to src/img/avatars/cup.png diff --git a/dashboard/src/img/avatars/football.png b/src/img/avatars/football.png similarity index 100% rename from dashboard/src/img/avatars/football.png rename to src/img/avatars/football.png diff --git a/dashboard/src/img/avatars/jar.png b/src/img/avatars/jar.png similarity index 100% rename from dashboard/src/img/avatars/jar.png rename to src/img/avatars/jar.png diff --git a/dashboard/src/img/avatars/meat.png b/src/img/avatars/meat.png similarity index 100% rename from dashboard/src/img/avatars/meat.png rename to src/img/avatars/meat.png diff --git a/dashboard/src/img/avatars/owl.png b/src/img/avatars/owl.png similarity index 100% rename from dashboard/src/img/avatars/owl.png rename to src/img/avatars/owl.png diff --git a/dashboard/src/img/avatars/pan.png b/src/img/avatars/pan.png similarity index 100% rename from dashboard/src/img/avatars/pan.png rename to src/img/avatars/pan.png diff --git a/dashboard/src/img/avatars/rubber-duck.png b/src/img/avatars/rubber-duck.png similarity index 100% rename from dashboard/src/img/avatars/rubber-duck.png rename to src/img/avatars/rubber-duck.png diff --git a/dashboard/src/img/avatars/space-rocket.png b/src/img/avatars/space-rocket.png similarity index 100% rename from dashboard/src/img/avatars/space-rocket.png rename to src/img/avatars/space-rocket.png diff --git a/dashboard/src/img/avatars/umbrella.png b/src/img/avatars/umbrella.png similarity index 100% rename from dashboard/src/img/avatars/umbrella.png rename to src/img/avatars/umbrella.png diff --git a/dashboard/src/img/logo.png b/src/img/logo.png similarity index 100% rename from dashboard/src/img/logo.png rename to src/img/logo.png diff --git a/dashboard/src/img/plus.png b/src/img/plus.png similarity index 100% rename from dashboard/src/img/plus.png rename to src/img/plus.png diff --git a/dashboard/src/index.html b/src/index.html similarity index 100% rename from dashboard/src/index.html rename to src/index.html diff --git a/dashboard/src/js/appstore.js b/src/js/appstore.js similarity index 100% rename from dashboard/src/js/appstore.js rename to src/js/appstore.js diff --git a/dashboard/src/js/client.js b/src/js/client.js similarity index 100% rename from dashboard/src/js/client.js rename to src/js/client.js diff --git a/dashboard/src/js/index.js b/src/js/index.js similarity index 100% rename from dashboard/src/js/index.js rename to src/js/index.js diff --git a/dashboard/src/js/logs.js b/src/js/logs.js similarity index 100% rename from dashboard/src/js/logs.js rename to src/js/logs.js diff --git a/dashboard/src/js/main.js b/src/js/main.js similarity index 100% rename from dashboard/src/js/main.js rename to src/js/main.js diff --git a/dashboard/src/js/restore.js b/src/js/restore.js similarity index 100% rename from dashboard/src/js/restore.js rename to src/js/restore.js diff --git a/dashboard/src/js/setup.js b/src/js/setup.js similarity index 100% rename from dashboard/src/js/setup.js rename to src/js/setup.js diff --git a/dashboard/src/js/setupdns.js b/src/js/setupdns.js similarity index 100% rename from dashboard/src/js/setupdns.js rename to src/js/setupdns.js diff --git a/dashboard/src/js/terminal.js b/src/js/terminal.js similarity index 100% rename from dashboard/src/js/terminal.js rename to src/js/terminal.js diff --git a/dashboard/src/js/update.js b/src/js/update.js similarity index 100% rename from dashboard/src/js/update.js rename to src/js/update.js diff --git a/dashboard/src/login_callback.html b/src/login_callback.html similarity index 100% rename from dashboard/src/login_callback.html rename to src/login_callback.html diff --git a/dashboard/src/logs.html b/src/logs.html similarity index 100% rename from dashboard/src/logs.html rename to src/logs.html diff --git a/dashboard/src/noapp.html b/src/noapp.html similarity index 100% rename from dashboard/src/noapp.html rename to src/noapp.html diff --git a/dashboard/src/restore.html b/src/restore.html similarity index 100% rename from dashboard/src/restore.html rename to src/restore.html diff --git a/dashboard/src/setup.html b/src/setup.html similarity index 100% rename from dashboard/src/setup.html rename to src/setup.html diff --git a/dashboard/src/setupdns.html b/src/setupdns.html similarity index 100% rename from dashboard/src/setupdns.html rename to src/setupdns.html diff --git a/dashboard/src/terminal.html b/src/terminal.html similarity index 100% rename from dashboard/src/terminal.html rename to src/terminal.html diff --git a/dashboard/src/theme.scss b/src/theme.scss similarity index 100% rename from dashboard/src/theme.scss rename to src/theme.scss diff --git a/dashboard/src/update.html b/src/update.html similarity index 100% rename from dashboard/src/update.html rename to src/update.html diff --git a/dashboard/src/views/account.html b/src/views/account.html similarity index 100% rename from dashboard/src/views/account.html rename to src/views/account.html diff --git a/dashboard/src/views/account.js b/src/views/account.js similarity index 100% rename from dashboard/src/views/account.js rename to src/views/account.js diff --git a/dashboard/src/views/activity.html b/src/views/activity.html similarity index 100% rename from dashboard/src/views/activity.html rename to src/views/activity.html diff --git a/dashboard/src/views/activity.js b/src/views/activity.js similarity index 100% rename from dashboard/src/views/activity.js rename to src/views/activity.js diff --git a/dashboard/src/views/apps.html b/src/views/apps.html similarity index 100% rename from dashboard/src/views/apps.html rename to src/views/apps.html diff --git a/dashboard/src/views/apps.js b/src/views/apps.js similarity index 100% rename from dashboard/src/views/apps.js rename to src/views/apps.js diff --git a/dashboard/src/views/appstore.html b/src/views/appstore.html similarity index 100% rename from dashboard/src/views/appstore.html rename to src/views/appstore.html diff --git a/dashboard/src/views/appstore.js b/src/views/appstore.js similarity index 100% rename from dashboard/src/views/appstore.js rename to src/views/appstore.js diff --git a/dashboard/src/views/domains.html b/src/views/domains.html similarity index 100% rename from dashboard/src/views/domains.html rename to src/views/domains.html diff --git a/dashboard/src/views/domains.js b/src/views/domains.js similarity index 100% rename from dashboard/src/views/domains.js rename to src/views/domains.js diff --git a/dashboard/src/views/email.html b/src/views/email.html similarity index 100% rename from dashboard/src/views/email.html rename to src/views/email.html diff --git a/dashboard/src/views/email.js b/src/views/email.js similarity index 100% rename from dashboard/src/views/email.js rename to src/views/email.js diff --git a/dashboard/src/views/graphs.html b/src/views/graphs.html similarity index 100% rename from dashboard/src/views/graphs.html rename to src/views/graphs.html diff --git a/dashboard/src/views/graphs.js b/src/views/graphs.js similarity index 100% rename from dashboard/src/views/graphs.js rename to src/views/graphs.js diff --git a/dashboard/src/views/settings.html b/src/views/settings.html similarity index 100% rename from dashboard/src/views/settings.html rename to src/views/settings.html diff --git a/dashboard/src/views/settings.js b/src/views/settings.js similarity index 100% rename from dashboard/src/views/settings.js rename to src/views/settings.js diff --git a/dashboard/src/views/support.html b/src/views/support.html similarity index 100% rename from dashboard/src/views/support.html rename to src/views/support.html diff --git a/dashboard/src/views/support.js b/src/views/support.js similarity index 100% rename from dashboard/src/views/support.js rename to src/views/support.js diff --git a/dashboard/src/views/tokens.html b/src/views/tokens.html similarity index 100% rename from dashboard/src/views/tokens.html rename to src/views/tokens.html diff --git a/dashboard/src/views/tokens.js b/src/views/tokens.js similarity index 100% rename from dashboard/src/views/tokens.js rename to src/views/tokens.js diff --git a/dashboard/src/views/users.html b/src/views/users.html similarity index 100% rename from dashboard/src/views/users.html rename to src/views/users.html diff --git a/dashboard/src/views/users.js b/src/views/users.js similarity index 100% rename from dashboard/src/views/users.js rename to src/views/users.js