diff --git a/src/web/css/style.css b/frontend/old_frontend/css/style.css similarity index 100% rename from src/web/css/style.css rename to frontend/old_frontend/css/style.css diff --git a/src/web/js/dictionary.js b/frontend/old_frontend/js/dictionary.js similarity index 100% rename from src/web/js/dictionary.js rename to frontend/old_frontend/js/dictionary.js diff --git a/src/web/js/events.js b/frontend/old_frontend/js/events.js similarity index 100% rename from src/web/js/events.js rename to frontend/old_frontend/js/events.js diff --git a/src/web/js/initialize.js b/frontend/old_frontend/js/initialize.js similarity index 100% rename from src/web/js/initialize.js rename to frontend/old_frontend/js/initialize.js diff --git a/src/web/js/sentence.js b/frontend/old_frontend/js/sentence.js similarity index 100% rename from src/web/js/sentence.js rename to frontend/old_frontend/js/sentence.js diff --git a/src/web/js/sound.js b/frontend/old_frontend/js/sound.js similarity index 100% rename from src/web/js/sound.js rename to frontend/old_frontend/js/sound.js diff --git a/src/web/js/ui.js b/frontend/old_frontend/js/ui.js similarity index 100% rename from src/web/js/ui.js rename to frontend/old_frontend/js/ui.js diff --git a/src/web/js/url.js b/frontend/old_frontend/js/url.js similarity index 100% rename from src/web/js/url.js rename to frontend/old_frontend/js/url.js diff --git a/src/web/js/volume.js b/frontend/old_frontend/js/volume.js similarity index 100% rename from src/web/js/volume.js rename to frontend/old_frontend/js/volume.js diff --git a/gulpfile.js b/gulpfile.js index 182cafcde6..1f4eef76e2 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -14,29 +14,29 @@ var buildLibraries = function() { .pipe(filter('**/*.js')) // filter out CSS (bootstrap, etc.) .pipe(uglify()) .pipe(concat('libraries.js')) - .pipe(gulp.dest('web/')); + .pipe(gulp.dest('web/output/')); } var buildCss = function() { - return gulp.src('src/web/css/*.css') + return gulp.src('frontend/old_frontend/css/*.css') .pipe(concat('style.css')) - .pipe(gulp.dest('web/')); + .pipe(gulp.dest('web/output/')); } var buildJs = function() { return gulp.src([ - 'src/web/js/sentence.js', - 'src/web/js/dictionary.js', - 'src/web/js/sound.js', - 'src/web/js/volume.js', - 'src/web/js/url.js', - 'src/web/js/ui.js', - 'src/web/js/events.js', - 'src/web/js/initialize.js', + 'frontend/old_frontend/js/sentence.js', + 'frontend/old_frontend/js/dictionary.js', + 'frontend/old_frontend/js/sound.js', + 'frontend/old_frontend/js/volume.js', + 'frontend/old_frontend/js/url.js', + 'frontend/old_frontend/js/ui.js', + 'frontend/old_frontend/js/events.js', + 'frontend/old_frontend/js/initialize.js', ]) .pipe(uglify()) .pipe(concat('script.js')) - .pipe(gulp.dest('web/')); + .pipe(gulp.dest('web/output/')); } gulp.task('bower', buildLibraries); @@ -45,8 +45,8 @@ gulp.task('css', buildCss); gulp.task('watch', function() { gulp.watch(['bower.json', '.bowerrc'], ['bower']); - watch([ 'src/web/js/*.js' ], buildJs); - watch([ 'src/web/css/*.css' ], buildCss); + watch([ 'frontend/old_frontend/js/*.js' ], buildJs); + watch([ 'frontend/old_frontend/css/*.css' ], buildCss); }); gulp.task('build-development', ['bower', 'js', 'css']); diff --git a/web/index.html b/web/index.html index 5ac6644554..a265d71d5d 100644 --- a/web/index.html +++ b/web/index.html @@ -2,7 +2,7 @@