Билд работает без загрузов, но меню нет

diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile
index e827fe830a2a937dc03ae346408b053eb4a9e168..d9d401bc00d864eab81009d3d8f1981dbd753feb 100644 (file)
--- a/docker/php/Dockerfile
+++ b/docker/php/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.4-rc-fpm-alpine as app
+FROM php:7.4-rc-fpm-alpine
 # Install tools required for build stage
 RUN apk add --update --no-cache \
     bash curl wget rsync ca-certificates openssl openssh git tzdata openntpd \
@@ -9,32 +9,19 @@ RUN apk add --no-cache zlib libpng icu \
   && docker-php-ext-install -j$(nproc) gd mysqli pdo pdo_mysql intl calendar opcache \
   && apk del .deps
 
+RUN apk --no-cache --update --repository http://dl-cdn.alpinelinux.org/alpine/v$ALPINE_VERSION/main/ add \
+    postgresql-dev
+RUN docker-php-ext-install pdo_pgsql
+
 #add composer
 RUN wget https://getcomposer.org/installer \
   && php installer \
   && mv composer.phar /usr/local/bin/composer \
   && rm installer
 
-# Для поддержки jpg в gd из докер контейнера нужно запустить:
-RUN apk add zlib-dev libpng-dev libjpeg jpeg-dev freetype-dev \
-    && docker-php-ext-configure gd --with-freetype --with-jpeg \
-    && docker-php-ext-install -j$(nproc) gd
-
 #add xdebug
 RUN apk add --no-cache $PHPIZE_DEPS \
-#  && pecl install xdebug \
-#  && docker-php-ext-enable xdebug \
+  && pecl install xdebug \
+  && docker-php-ext-enable xdebug \
   && apk del $PHPIZE_DEPS
 WORKDIR /www
-
-FROM app as app_dev
-
-ENV XDEBUG_MODE=off
-
-COPY --from=mlocati/php-extension-installer /usr/bin/install-php-extensions /usr/local/bin/
-
-RUN set -eux; \
-    install-php-extensions xdebug
-
-# Для перезагрузки nginx:
-# kill -USR2 1
\ No newline at end of file

diff --git a/erp24/build.js b/erp24/build.js
index d69041741aa0ec1a1ff4ab1ac15d86648f0120c9..4a47a98c6af4a93e76db5ba4940234abfbad95fe 100644 (file)
--- a/erp24/build.js
+++ b/erp24/build.js
@@ -4,7 +4,7 @@ const sassPlugin = require('esbuild-plugin-sass');
 const config = {
     production: process.env.NODE_ENV === 'prod',
     vendorPath: './node_modules/',
-    inputPath: './',
+    inputPath: './web/',
     outputPath: './web/' + (process.env.NODE_ENV === 'prod' ? 'dist-prod' : 'dist')
 };
 

diff --git a/erp24/views/layouts/api2_menu.php b/erp24/views/layouts/api2_menu.php
index 18e16f09561b7d8246605639b5a39855dc0cc1cc..2f5389a3fd35a826f6acd9418dc3904e6b6b4cd7 100644 (file)
--- a/erp24/views/layouts/api2_menu.php
+++ b/erp24/views/layouts/api2_menu.php
@@ -4,4 +4,4 @@ $this->registerJS("
     var ADMIN_ID = " . (Yii::$app->user->id ?? 0) . ";
 ", \yii\web\View::POS_BEGIN, 'api2_menu_init_global_vars');
 
-$this->registerJsFile('/js/site/get_menu.js', ['position' => \yii\web\View::POS_END]);
+//$this->registerJsFile('/js/site/get_menu.js', ['position' => \yii\web\View::POS_END]);

diff --git a/erp24/web/css/common/azea.scss b/erp24/web/css/common/azea.scss
index c06b476f24945faea91d6cdf566887cd36353ec4..0d3ef9dfa3e1698eef66c946127904ecbb2d604e 100755 (executable)
--- a/erp24/web/css/common/azea.scss
+++ b/erp24/web/css/common/azea.scss
@@ -28,4 +28,4 @@
 //@import "../../../azea/assets/plugins/accordion/accordion.css";
 //@import "../../../azea/assets/css/icons.css";
 //@import "../../../azea/assets/css/sortable.css";
-@import "../../web/azea/assets/colors/color1";
+@import "../../azea/assets/colors/color1";

diff --git a/erp24/web/js/common/perfect-scrollbar.js b/erp24/web/js/common/perfect-scrollbar.js
index 748c5d2fee6c510dfa34e680ad445898518827ca..7ef9b929945ea4e06fa5ee25c212e560c657b707 100755 (executable)
--- a/erp24/web/js/common/perfect-scrollbar.js
+++ b/erp24/web/js/common/perfect-scrollbar.js
@@ -1,4 +1,4 @@
-import PerfectScrollbar from '../../web/azea/assets/plugins/p-scrollbar/p-scrollbar.js';
+import PerfectScrollbar from './../../azea/assets/plugins/p-scrollbar/p-scrollbar.js';
 
 document.addEventListener('DOMContentLoaded', () => {
     let selectors = ['.app-sidebar', '.message-menu', '.notify-menu'];