Merge pull request #1697 from watchdogpolska/dev_ext

v1.2.20 donate popup and frontend updates
watchdogpolska · Feb 6, 2025 · eed02a8 · eed02a8
2 parents 84f5313 + 716811b
commit eed02a8
Show file tree

Hide file tree

Showing 11 changed files with 296 additions and 264 deletions.
diff --git a/Makefile b/Makefile
@@ -19,9 +19,9 @@ build:
 	docker compose build web
 
 gulp:
-	docker compose run web python manage.py collectstatic --no-input
-	docker compose up gulp
-	docker compose run web python manage.py collectstatic --no-input
+	docker compose run --remove-orphans web python manage.py collectstatic --no-input
+	docker compose up --remove-orphans gulp
+	docker compose run --remove-orphans web python manage.py collectstatic --no-input
 
 test: wait_mysql
 	docker compose exec -t db mysql --user=root --password=password -e "DROP DATABASE IF EXISTS test_poradnia;"

diff --git a/gulpfile.js b/gulpfile.js
@@ -4,10 +4,11 @@ var fs = require('fs'),
     concat = require('gulp-concat'),
     livereload = require('gulp-livereload'),
     cleanCSS = require('gulp-clean-css'),
-    prefix = require('gulp-autoprefixer'),
     rename = require('gulp-rename'),
     sass = require('gulp-sass')(require('sass')),
     uglify = require('gulp-uglify'),
+    postcss = require('gulp-postcss'),
+    autoprefixer = require('autoprefixer'),
     watch = require('gulp-watch'),
     json = JSON.parse(fs.readFileSync('./package.json'));
 
@@ -35,7 +36,7 @@ var config = (function () {
             include: [
                 path.npm,
                 path.npm + '/pikaday-time/scss/',
-		        path.npm + '/bootstrap/scss/',
+		        // path.npm + '/bootstrap/scss/',
                 path.staticfiles,
                 path.assets + '/scss/'
             ],
@@ -97,8 +98,6 @@ var config = (function () {
     };
 }());
 
-console.log(config.script);
-
 gulp.task('icons', function () {
     return gulp.src(config.icons.input)
         .pipe(gulp.dest(config.icons.output));
@@ -122,13 +121,11 @@ gulp.task('js', function () {
 
 gulp.task('scss', function () {
     return gulp.src(config.scss.input)
-        .pipe(sass(
-            {
-                style: 'expanded',
-                includePaths: config.scss.include
-            }
-        ))
-        .pipe(prefix())
+        .pipe(sass({
+            style: 'expanded',
+            includePaths: config.scss.include
+        }))
+        .pipe(postcss([autoprefixer()]))
         .pipe(concat(config.scss.output.filename))
         .pipe(gulp.dest(config.scss.output.dir))
         .pipe(livereload())
@@ -138,19 +135,6 @@ gulp.task('scss', function () {
         .pipe(livereload());
 });
 
-// Rerun the task when a file changes
-// TODO  - fix watch task - it doesn't work
-// gulp.task('watch', function () {
-//     livereload.listen();
-//     config.scss.watch.forEach(function (path) {
-//         gulp.watch(path, ['scss']);
-//     });
-//     config.script.watch.forEach(function (path) {
-//         gulp.watch(path, ['js']);
-//     });
-// });
-
-gulp.task('build', gulp.series('images','icons', 'js', 'scss'));
+gulp.task('build', gulp.series('images', 'icons', 'js', 'scss'));
 
-// gulp.task('default', gulp.series('build', 'watch'));
 gulp.task('default', gulp.series('build'));