diff --git a/api/common/Controller/Proyectos.php b/api/common/Controller/Proyectos.php index 3d4ff13..c310f34 100644 --- a/api/common/Controller/Proyectos.php +++ b/api/common/Controller/Proyectos.php @@ -44,6 +44,7 @@ class Proyectos { } public function operadores(Request $request, Response $response, $id_proyecto): Response { $proyecto = Model::factory(Proyecto::class)->find_one($id_proyecto); +error_log(var_export($proyecto->operadores(), true)); $output = [ 'proyecto' => $proyecto->as_array(), 'operadores' => $proyecto->operadores() ? array_map(function($item) { diff --git a/api/setup/settings/01_env.php b/api/setup/settings/01_env.php index 9c8d337..d12fd58 100644 --- a/api/setup/settings/01_env.php +++ b/api/setup/settings/01_env.php @@ -7,7 +7,7 @@ return [ 'engine' => 'mysql', 'name' => $_ENV['MYSQL_DATABASE'], 'host' => (object) [ - 'name' => 'db' + 'name' => $_ENV['MYSQL_HOST'] ], 'user' => (object) [ 'name' => $_ENV['MYSQL_USER'], diff --git a/docker-compose.yml b/docker-compose.yml index 7fa8dc3..0e448f8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,11 +10,12 @@ services: - ./logs/api/:/var/log/nginx/ restart: unless-stopped ports: - - 8081:80 + - 8001:80 depends_on: - backend backend: container_name: backend + restart: unless-stopped image: php build: context: ./api @@ -22,8 +23,8 @@ services: env_file: .db.env volumes: - ./api/:/app/ - depends_on: - - db +# depends_on: +# - db frontend-proxy: container_name: frontend_proxy @@ -34,11 +35,12 @@ services: - ./logs/ui/:/var/log/nginx/ restart: unless-stopped ports: - - 8080:80 + - 8000:80 depends_on: - frontend frontend: container_name: frontend + restart: unless-stopped image: php:ui build: context: ./ui @@ -46,23 +48,23 @@ services: env_file: .ui.env volumes: - ./ui/:/app/ - - db: - image: mariadb - volumes: - - database:/var/lib/mysql - env_file: .db.env - adminer: - image: adminer - environment: - ADMINER_PLUGINS: "dump-json edit-foreign enum-option json-column" - ADMINER_DESIGN: "dracula" - volumes: - - ./adminer/plugins-enabled/:/var/www/html/plugins-enabled/ - ports: - - 8082:8080 - depends_on: - - db - -volumes: - database: +# +# db: +# image: mariadb +# volumes: +# - database:/var/lib/mysql +# env_file: .db.env +# adminer: +# image: adminer +# environment: +# ADMINER_PLUGINS: "dump-json edit-foreign enum-option json-column" +# ADMINER_DESIGN: "dracula" +# volumes: +# - ./adminer/plugins-enabled/:/var/www/html/plugins-enabled/ +# ports: +# - 8082:8080 +# depends_on: +# - db +# +#volumes: +# database: diff --git a/ui/resources/views/layout/menu.blade.php b/ui/resources/views/layout/menu.blade.php index 090a66b..d8fe9d4 100644 --- a/ui/resources/views/layout/menu.blade.php +++ b/ui/resources/views/layout/menu.blade.php @@ -23,18 +23,19 @@ @include('layout.menu.informes') +