Update 2022-03-07
This commit is contained in:
@ -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) {
|
||||
|
@ -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'],
|
||||
|
@ -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:
|
||||
|
@ -23,18 +23,19 @@
|
||||
@include('layout.menu.informes')
|
||||
</li>
|
||||
|
||||
<li rol="presentation" class="dropdown">
|
||||
<a class="dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
|
||||
Operadores <span class="caret"></span>
|
||||
</a>
|
||||
@include('layout.menu.operadores')
|
||||
</li>
|
||||
|
||||
<li role="presentation" class="dropdown">
|
||||
<a class="dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
|
||||
Herramientas <span class="caret"></span>
|
||||
</a>
|
||||
@include('layout.menu.herramientas')
|
||||
</li>
|
||||
<li rol="presentation" class="dropdown">
|
||||
<a class="dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
|
||||
Operadores <span class="caret"></span>
|
||||
</a>
|
||||
@include('layout.menu.operadores')
|
||||
</li>
|
||||
</ul>
|
||||
<ul class="nav navbar-nav navbar-right">
|
||||
<li role="presentation" class="dropdown">
|
||||
|
@ -1,5 +1,6 @@
|
||||
<?php
|
||||
return [
|
||||
'debug' => $_ENV['DEBUG'],
|
||||
'folders' => function() {
|
||||
$arr = ['base' => dirname(__DIR__, 2)];
|
||||
$arr['resources'] = implode(DIRECTORY_SEPARATOR, [
|
||||
|
Reference in New Issue
Block a user