Update 2022-03-07

This commit is contained in:
Aldarien
2022-03-07 12:43:32 +00:00
parent 71e10c52bd
commit 52e922685d
5 changed files with 36 additions and 31 deletions

View File

@ -44,6 +44,7 @@ class Proyectos {
} }
public function operadores(Request $request, Response $response, $id_proyecto): Response { public function operadores(Request $request, Response $response, $id_proyecto): Response {
$proyecto = Model::factory(Proyecto::class)->find_one($id_proyecto); $proyecto = Model::factory(Proyecto::class)->find_one($id_proyecto);
error_log(var_export($proyecto->operadores(), true));
$output = [ $output = [
'proyecto' => $proyecto->as_array(), 'proyecto' => $proyecto->as_array(),
'operadores' => $proyecto->operadores() ? array_map(function($item) { 'operadores' => $proyecto->operadores() ? array_map(function($item) {

View File

@ -7,7 +7,7 @@ return [
'engine' => 'mysql', 'engine' => 'mysql',
'name' => $_ENV['MYSQL_DATABASE'], 'name' => $_ENV['MYSQL_DATABASE'],
'host' => (object) [ 'host' => (object) [
'name' => 'db' 'name' => $_ENV['MYSQL_HOST']
], ],
'user' => (object) [ 'user' => (object) [
'name' => $_ENV['MYSQL_USER'], 'name' => $_ENV['MYSQL_USER'],

View File

@ -10,11 +10,12 @@ services:
- ./logs/api/:/var/log/nginx/ - ./logs/api/:/var/log/nginx/
restart: unless-stopped restart: unless-stopped
ports: ports:
- 8081:80 - 8001:80
depends_on: depends_on:
- backend - backend
backend: backend:
container_name: backend container_name: backend
restart: unless-stopped
image: php image: php
build: build:
context: ./api context: ./api
@ -22,8 +23,8 @@ services:
env_file: .db.env env_file: .db.env
volumes: volumes:
- ./api/:/app/ - ./api/:/app/
depends_on: # depends_on:
- db # - db
frontend-proxy: frontend-proxy:
container_name: frontend_proxy container_name: frontend_proxy
@ -34,11 +35,12 @@ services:
- ./logs/ui/:/var/log/nginx/ - ./logs/ui/:/var/log/nginx/
restart: unless-stopped restart: unless-stopped
ports: ports:
- 8080:80 - 8000:80
depends_on: depends_on:
- frontend - frontend
frontend: frontend:
container_name: frontend container_name: frontend
restart: unless-stopped
image: php:ui image: php:ui
build: build:
context: ./ui context: ./ui
@ -46,23 +48,23 @@ services:
env_file: .ui.env env_file: .ui.env
volumes: volumes:
- ./ui/:/app/ - ./ui/:/app/
#
db: # db:
image: mariadb # image: mariadb
volumes: # volumes:
- database:/var/lib/mysql # - database:/var/lib/mysql
env_file: .db.env # env_file: .db.env
adminer: # adminer:
image: adminer # image: adminer
environment: # environment:
ADMINER_PLUGINS: "dump-json edit-foreign enum-option json-column" # ADMINER_PLUGINS: "dump-json edit-foreign enum-option json-column"
ADMINER_DESIGN: "dracula" # ADMINER_DESIGN: "dracula"
volumes: # volumes:
- ./adminer/plugins-enabled/:/var/www/html/plugins-enabled/ # - ./adminer/plugins-enabled/:/var/www/html/plugins-enabled/
ports: # ports:
- 8082:8080 # - 8082:8080
depends_on: # depends_on:
- db # - db
#
volumes: #volumes:
database: # database:

View File

@ -23,18 +23,19 @@
@include('layout.menu.informes') @include('layout.menu.informes')
</li> </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"> <li role="presentation" class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false"> <a class="dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
Herramientas <span class="caret"></span> Herramientas <span class="caret"></span>
</a> </a>
@include('layout.menu.herramientas') @include('layout.menu.herramientas')
</li> </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>
<ul class="nav navbar-nav navbar-right"> <ul class="nav navbar-nav navbar-right">
<li role="presentation" class="dropdown"> <li role="presentation" class="dropdown">

View File

@ -1,5 +1,6 @@
<?php <?php
return [ return [
'debug' => $_ENV['DEBUG'],
'folders' => function() { 'folders' => function() {
$arr = ['base' => dirname(__DIR__, 2)]; $arr = ['base' => dirname(__DIR__, 2)];
$arr['resources'] = implode(DIRECTORY_SEPARATOR, [ $arr['resources'] = implode(DIRECTORY_SEPARATOR, [