diff --git a/rest_api_debug_tool/.gitignore b/rest_api_debug_tool/.gitignore new file mode 100644 index 0000000..b694934 --- /dev/null +++ b/rest_api_debug_tool/.gitignore @@ -0,0 +1 @@ +.venv \ No newline at end of file diff --git a/server/.gitignore b/server/.gitignore index a379718..f2da39d 100644 --- a/server/.gitignore +++ b/server/.gitignore @@ -1,9 +1,4 @@ .phpintel/ SHServ/Logs/ -node_modules/ -users_files/ -side_scripts/__pycache__ -side_scripts/*/__pycache__ -side_scripts/iziua_data_lendlease/used_urls.json *.pyc diff --git a/webclient/.gitignore b/webclient/.gitignore new file mode 100644 index 0000000..074ab52 --- /dev/null +++ b/webclient/.gitignore @@ -0,0 +1,2 @@ +package-lock.json +node_modules \ No newline at end of file diff --git a/webclient/dist/css/main.css b/webclient/dist/css/main.css new file mode 100644 index 0000000..beaecac --- /dev/null +++ b/webclient/dist/css/main.css @@ -0,0 +1,2 @@ +*{padding:0;margin:0}body{background-color:#141414;color:#fefefe} +/*# sourceMappingURL=main.css.map */ diff --git a/webclient/dist/css/main.css.map b/webclient/dist/css/main.css.map new file mode 100644 index 0000000..2e9afa9 --- /dev/null +++ b/webclient/dist/css/main.css.map @@ -0,0 +1 @@ +{"version":3,"sources":["main.scss"],"names":[],"mappings":"AAAA,EACC,QAAA,EACA,OAAA,EAGD,KACC,iBAAA,QACA,MAAA","file":"main.css","sourcesContent":["* {\n\tpadding: 0;\n\tmargin: 0;\n}\n\nbody {\n\tbackground-color: #141414;\n\tcolor: #fefefe;\n}"]} \ No newline at end of file diff --git a/webclient/dist/js/main.js b/webclient/dist/js/main.js new file mode 100644 index 0000000..6efee94 --- /dev/null +++ b/webclient/dist/js/main.js @@ -0,0 +1,2 @@ +(()=>{console.log("App init");})(); +//# sourceMappingURL=main.js.map diff --git a/webclient/dist/js/main.js.map b/webclient/dist/js/main.js.map new file mode 100644 index 0000000..03bbd89 --- /dev/null +++ b/webclient/dist/js/main.js.map @@ -0,0 +1,7 @@ +{ + "version": 3, + "sources": ["../../src/js/index.js"], + "sourcesContent": ["console.log(\"App init\");"], + "mappings": "MAAA,QAAQ,IAAI,UAAU", + "names": [] +} diff --git a/webclient/gulpfile.js b/webclient/gulpfile.js new file mode 100755 index 0000000..6c8de58 --- /dev/null +++ b/webclient/gulpfile.js @@ -0,0 +1,92 @@ +const gulp = require('gulp'); +const sass = require('gulp-sass')(require('sass')); +const cleanCSS = require('gulp-clean-css'); +const sourcemaps = require('gulp-sourcemaps'); +const autoprefixer = require('gulp-autoprefixer'); +const browserSync = require('browser-sync').create(); +const fileInclude = require('gulp-file-include'); +const esbuild = require('esbuild'); + +// Пути +const paths = { + scss: { + src: 'src/scss/**/*.scss', + dest: 'dist/css/' + }, + js: { + src: 'src/js/**/*.js', + entry: 'src/js/index.js', + dest: 'dist/js/' + }, + html: { + src: 'src/html/*.html', + dest: 'dist/' + } +}; + +// SCSS -> CSS +function styles() { + return gulp.src('src/scss/main.scss') + .pipe(sourcemaps.init()) + .pipe(sass().on('error', sass.logError)) + .pipe(autoprefixer()) + .pipe(cleanCSS()) + .pipe(sourcemaps.write('.')) + .pipe(gulp.dest(paths.scss.dest)) + .pipe(browserSync.stream()); +} + +// JS -> esbuild bundle + minify + sourcemap +function scripts(cb) { + esbuild.build({ + entryPoints: [paths.js.entry], // только entry файл + bundle: true, + minify: true, + sourcemap: true, + outfile: paths.js.dest + 'main.js', + target: ['es2015'], + platform: 'browser' + }).then(() => { + browserSync.reload(); + cb(); + }).catch((err) => { + console.error(err); + cb(err); + }); +} + +// HTML + partials +function html() { + return gulp.src(paths.html.src) + .pipe(fileInclude({ + prefix: '@@', + basepath: '@file' + })) + .pipe(gulp.dest(paths.html.dest)) + .pipe(browserSync.stream()); +} + +// Слежение и сервер +function serve() { + browserSync.init({ + server: { + baseDir: 'dist/' + } + }); + + watch(); +} + +function watch() { + gulp.watch(paths.scss.src, styles); + gulp.watch('src/js/**/*.js', scripts); // следим за всеми js + // gulp.watch('src/html/**/*.html', html); +} + +// Экспорт задач +exports.default = gulp.series( + // gulp.parallel(styles, scripts, html), + gulp.parallel(styles, scripts), + watch + // serve +); diff --git a/webclient/index.php b/webclient/index.php new file mode 100644 index 0000000..b6fd006 --- /dev/null +++ b/webclient/index.php @@ -0,0 +1,14 @@ + + + + + + SHServ Web Client + + + +

SHServ Web Client

+ + + + \ No newline at end of file diff --git a/webclient/package.json b/webclient/package.json new file mode 100755 index 0000000..c6bd6c8 --- /dev/null +++ b/webclient/package.json @@ -0,0 +1,21 @@ +{ + "name": "SHServWebclient", + "version": "1.0.0", + "scripts": { + "start": "gulp" + }, + "devDependencies": { + "browser-sync": "^2.29.3", + "esbuild": "^0.25.6", + "gulp": "^4.0.2", + "gulp-autoprefixer": "^8.0.0", + "gulp-clean-css": "^4.3.0", + "gulp-concat": "^2.6.1", + "gulp-file-include": "^2.3.0", + "gulp-sass": "^5.1.0", + "gulp-sourcemaps": "^3.0.0", + "gulp-terser": "^2.1.0", + "marked": "^15.0.12", + "sass": "^1.68.0" + } +} diff --git a/webclient/src/js/index.js b/webclient/src/js/index.js new file mode 100644 index 0000000..705ebe9 --- /dev/null +++ b/webclient/src/js/index.js @@ -0,0 +1 @@ +console.log("App init"); \ No newline at end of file diff --git a/webclient/src/scss/main.scss b/webclient/src/scss/main.scss new file mode 100644 index 0000000..826f2b4 --- /dev/null +++ b/webclient/src/scss/main.scss @@ -0,0 +1,9 @@ +* { + padding: 0; + margin: 0; +} + +body { + background-color: #141414; + color: #fefefe; +} \ No newline at end of file