Move public files into a subdirectory

Author: rimas-kudelis

.gitignore

@@ -10,9 +10,9 @@
 /docker/openldap/
 /node_modules/
 /npm-debug.log
-/assets/js/**/*.min.js
-/assets/css/**/*.css
-/assets/vendor
+/public/assets/js/**/*.min.js
+/public/assets/css/**/*.css
+/public/assets/vendor
 /config.php
 /storage/backups/*
 !/storage/backups/.htaccess

docker-compose.yml

@@ -5,15 +5,16 @@ services:
     extra_hosts:
       - host.docker.internal:host-gateway
     volumes:
-      - '.:/var/www/html'
-      - './docker/php-fpm/php-ini-overrides.ini:/usr/local/etc/php/conf.d/99-overrides.ini'
+      - '.:/var/www/html:ro,cached'
+      - './storage:/var/www/html/storage:rw,cached'
+      - './docker/php-fpm/php-ini-overrides.ini:/usr/local/etc/php/conf.d/99-overrides.ini:ro,cached'
 
   nginx:
     image: 'nginx:1.23.3-alpine'
     working_dir: /var/www/html
     volumes:
-      - '.:/var/www/html'
-      - './docker/nginx/nginx.conf:/etc/nginx/conf.d/default.conf'
+      - '.:/var/www/html:ro,cached'
+      - './docker/nginx/nginx.conf:/etc/nginx/conf.d/default.conf:ro,cached'
     ports:
       - '80:80'
 
@@ -52,7 +53,7 @@ services:
       - ./openapi.yml:/usr/share/nginx/html/openapi.yml
     environment:
       API_URL: openapi.yml
-  
+
   baikal:
     image: ckulka/baikal:0.10.1-apache
     ports:
@@ -61,7 +62,7 @@ services:
       - ./docker/baikal:/var/www/html
       - ./docker/baikal/config:/var/www/baikal/config
       - ./docker/baikal/data:/var/www/baikal/Specific
-  
+
   openldap:
     image: osixia/openldap:1.5.0
     hostname: openldap

docker/nginx/nginx.conf

@@ -7,7 +7,7 @@ server {
 
     access_log /var/log/nginx/application.access.log;
 
-    root /var/www/html;
+    root /var/www/html/public;
 
     index index.php index.html;
 

gulpfile.js

@@ -32,8 +32,7 @@ function archive(done) {
 
     fs.mkdirsSync('build');
     fs.copySync('application', 'build/application');
-    fs.copySync('assets', 'build/assets');
-    fs.copySync('system', 'build/system');
+    fs.copySync('public', 'build/public');
 
     fs.ensureDirSync('build/storage/backups');
     fs.copySync('storage/backups/.htaccess', 'build/storage/backups/.htaccess');
@@ -54,7 +53,6 @@ function archive(done) {
     fs.ensureDirSync('build/storage/uploads');
     fs.copySync('storage/uploads/index.html', 'build/storage/uploads/index.html');
 
-    fs.copySync('index.php', 'build/index.php');
     fs.copySync('patch.php', 'build/patch.php');
     fs.copySync('composer.json', 'build/composer.json');
     fs.copySync('composer.lock', 'build/composer.lock');
@@ -79,111 +77,111 @@ function archive(done) {
 }
 
 function clean(done) {
-    fs.removeSync('assets/js/**/*.min.js');
-    fs.removeSync('assets/css/**/*.min.css');
+    fs.removeSync('public/assets/js/**/*.min.js');
+    fs.removeSync('public/assets/css/**/*.min.css');
     done();
 }
 
 function scripts() {
     return gulp
-        .src(['assets/js/**/*.js', '!assets/js/**/*.min.js'])
+        .src(['public/assets/js/**/*.js', '!public/assets/js/**/*.min.js'])
         .pipe(plumber())
-        .pipe(changed('assets/js/**/*'))
+        .pipe(changed('public/assets/js/**/*'))
         .pipe(babel({comments: false}))
         .pipe(rename({suffix: '.min'}))
-        .pipe(gulp.dest('assets/js'));
+        .pipe(gulp.dest('public/assets/js'));
 }
 
 function styles() {
     return gulp
-        .src(['assets/css/**/*.scss', '!assets/css/**/*.min.css'])
+        .src(['public/assets/css/**/*.scss', '!public/assets/css/**/*.min.css'])
         .pipe(plumber())
         .pipe(cached())
         .pipe(sass().on('error', sass.logError))
-        .pipe(gulp.dest('assets/css'))
+        .pipe(gulp.dest('public/assets/css'))
         .pipe(css())
         .pipe(rename({suffix: '.min'}))
-        .pipe(gulp.dest('assets/css'));
+        .pipe(gulp.dest('public/assets/css'));
 }
 
 function watch(done) {
-    gulp.watch(['assets/js/**/*.js', '!assets/js/**/*.min.js'], gulp.parallel(scripts));
-    gulp.watch(['assets/css/**/*.scss', '!assets/css/**/*.css'], gulp.parallel(styles));
+    gulp.watch(['public/assets/js/**/*.js', '!public/assets/js/**/*.min.js'], gulp.parallel(scripts));
+    gulp.watch(['public/assets/css/**/*.scss', '!public/assets/css/**/*.css'], gulp.parallel(styles));
     done();
 }
 
 function vendor(done) {
-    del.sync(['assets/vendor/**', '!assets/vendor/index.html']);
+    del.sync(['public/assets/vendor/**', '!public/assets/vendor/index.html']);
 
     // bootstrap
     gulp.src([
         'node_modules/bootstrap/dist/js/bootstrap.min.js',
         'node_modules/bootstrap/dist/css/bootstrap.min.css',
-    ]).pipe(gulp.dest('assets/vendor/bootstrap'));
+    ]).pipe(gulp.dest('public/assets/vendor/bootstrap'));
 
     // @fortawesome-fontawesome-free
     gulp.src([
         'node_modules/@fortawesome/fontawesome-free/js/fontawesome.min.js',
         'node_modules/@fortawesome/fontawesome-free/js/solid.min.js',
-    ]).pipe(gulp.dest('assets/vendor/@fortawesome-fontawesome-free'));
+    ]).pipe(gulp.dest('public/assets/vendor/@fortawesome-fontawesome-free'));
 
     // cookieconsent
     gulp.src([
         'node_modules/cookieconsent/build/cookieconsent.min.js',
         'node_modules/cookieconsent/build/cookieconsent.min.css',
-    ]).pipe(gulp.dest('assets/vendor/cookieconsent'));
+    ]).pipe(gulp.dest('public/assets/vendor/cookieconsent'));
 
     // fullcalendar
-    gulp.src(['node_modules/fullcalendar/index.global.min.js']).pipe(gulp.dest('assets/vendor/fullcalendar'));
+    gulp.src(['node_modules/fullcalendar/index.global.min.js']).pipe(gulp.dest('public/assets/vendor/fullcalendar'));
 
     // fullcalendar-moment
     gulp.src(['node_modules/@fullcalendar/moment/index.global.min.js']).pipe(
-        gulp.dest('assets/vendor/fullcalendar-moment'),
+        gulp.dest('public/assets/vendor/fullcalendar-moment'),
     );
 
     // jquery
-    gulp.src(['node_modules/jquery/dist/jquery.min.js']).pipe(gulp.dest('assets/vendor/jquery'));
+    gulp.src(['node_modules/jquery/dist/jquery.min.js']).pipe(gulp.dest('public/assets/vendor/jquery'));
 
     // jquery-jeditable
     gulp.src(['node_modules/jquery-jeditable/dist/jquery.jeditable.min.js']).pipe(
-        gulp.dest('assets/vendor/jquery-jeditable'),
+        gulp.dest('public/assets/vendor/jquery-jeditable'),
     );
 
     // moment
-    gulp.src(['node_modules/moment/min/moment.min.js']).pipe(gulp.dest('assets/vendor/moment'));
+    gulp.src(['node_modules/moment/min/moment.min.js']).pipe(gulp.dest('public/assets/vendor/moment'));
 
     // moment-timezone
     gulp.src(['node_modules/moment-timezone/builds/moment-timezone-with-data.min.js']).pipe(
-        gulp.dest('assets/vendor/moment-timezone'),
+        gulp.dest('public/assets/vendor/moment-timezone'),
     );
 
     // @popperjs-core
-    gulp.src(['node_modules/@popperjs/core/dist/umd/popper.min.js']).pipe(gulp.dest('assets/vendor/@popperjs-core'));
+    gulp.src(['node_modules/@popperjs/core/dist/umd/popper.min.js']).pipe(gulp.dest('public/assets/vendor/@popperjs-core'));
 
     // select2
     gulp.src(['node_modules/select2/dist/js/select2.min.js', 'node_modules/select2/dist/css/select2.min.css']).pipe(
-        gulp.dest('assets/vendor/select2'),
+        gulp.dest('public/assets/vendor/select2'),
     );
 
     // tippy.js
-    gulp.src(['node_modules/tippy.js/dist/tippy-bundle.umd.min.js']).pipe(gulp.dest('assets/vendor/tippy.js'));
+    gulp.src(['node_modules/tippy.js/dist/tippy-bundle.umd.min.js']).pipe(gulp.dest('public/assets/vendor/tippy.js'));
 
     // trumbowyg
     gulp.src(['node_modules/trumbowyg/dist/trumbowyg.min.js', 'node_modules/trumbowyg/dist/ui/trumbowyg.min.css']).pipe(
-        gulp.dest('assets/vendor/trumbowyg'),
+        gulp.dest('public/assets/vendor/trumbowyg'),
     );
 
-    gulp.src(['node_modules/trumbowyg/dist/ui/icons.svg']).pipe(gulp.dest('assets/vendor/trumbowyg/ui'));
+    gulp.src(['node_modules/trumbowyg/dist/ui/icons.svg']).pipe(gulp.dest('public/assets/vendor/trumbowyg/ui'));
 
     // flatpickr
     gulp.src(['node_modules/flatpickr/dist/flatpickr.min.js', 'node_modules/flatpickr/dist/flatpickr.min.css']).pipe(
-        gulp.dest('assets/vendor/flatpickr'),
+        gulp.dest('public/assets/vendor/flatpickr'),
     );
 
     gulp.src(['node_modules/flatpickr/dist/themes/material_green.css'])
         .pipe(css())
         .pipe(rename({suffix: '.min'}))
-        .pipe(gulp.dest('assets/vendor/flatpickr'));
+        .pipe(gulp.dest('public/assets/vendor/flatpickr'));
 
     done();
 }