mirror of
https://git.imnavajas.es/jjimenez/safekat.git
synced 2025-07-25 22:52:08 +00:00
Merge branch 'main' into 'dev/papelimp_tip3'
# Conflicts: # ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/viewPapelImpresionForm.php
This commit is contained in:
@ -24,68 +24,72 @@ namespace Config;
|
||||
|
||||
use CodeIgniter\Config\BaseConfig;
|
||||
|
||||
class Basics extends BaseConfig {
|
||||
class Basics extends BaseConfig
|
||||
{
|
||||
|
||||
public $appName = 'Safekat';
|
||||
public $appName = 'Safekat';
|
||||
|
||||
public $i18n = 'es-ES';
|
||||
|
||||
public $languages = [
|
||||
'en' => 'English',
|
||||
'es' => 'Spanish',
|
||||
];
|
||||
public $i18n = 'es-ES';
|
||||
|
||||
|
||||
public $languageFlags = [
|
||||
'en' => 'us',
|
||||
'es' => 'es',
|
||||
];
|
||||
public $vista_impresion = 'impresion';
|
||||
public $vista_maquetacion = 'maquetacion';
|
||||
public $vista_digitalizacion = 'digitalizacion';
|
||||
|
||||
public $languages = [
|
||||
'en' => 'English',
|
||||
'es' => 'Spanish',
|
||||
];
|
||||
|
||||
|
||||
public $authImplemented = false;
|
||||
public $languageFlags = [
|
||||
'en' => 'us',
|
||||
'es' => 'es',
|
||||
];
|
||||
|
||||
|
||||
public $authImplemented = false;
|
||||
|
||||
|
||||
public $theme = [
|
||||
'name' => 'vuexy',
|
||||
'body-sm' => false,
|
||||
'navbar' => [
|
||||
'bg' => 'gray',
|
||||
'type' => 'dark',
|
||||
'border' => true,
|
||||
'user' => [
|
||||
'visible' => true,
|
||||
'shadow' => 0,
|
||||
],
|
||||
],
|
||||
'sidebar' => [
|
||||
'type' => 'dark',
|
||||
'shadow' => 4,
|
||||
'border' => false,
|
||||
'compact' => true,
|
||||
'links' => [
|
||||
'bg' => 'black', // only works with AdminLTE theme
|
||||
'shadow' => 1,
|
||||
],
|
||||
'brand' => [
|
||||
'bg' => 'gray-dark',
|
||||
'logo' => [
|
||||
'icon' => 'favicon.ico', // path to image | this example icon on public root folder.
|
||||
'text' => 'sk_test',
|
||||
'shadow' => 2,
|
||||
],
|
||||
],
|
||||
'user' => [
|
||||
'visible' => true,
|
||||
'shadow' => 2,
|
||||
],
|
||||
],
|
||||
'footer' => [
|
||||
'fixed' => false,
|
||||
'organization' => 'Your Awesome Company',
|
||||
'orglink' => 'https://www.ozar.net/',
|
||||
],
|
||||
];
|
||||
public $theme = [
|
||||
'name' => 'vuexy',
|
||||
'body-sm' => false,
|
||||
'navbar' => [
|
||||
'bg' => 'gray',
|
||||
'type' => 'dark',
|
||||
'border' => true,
|
||||
'user' => [
|
||||
'visible' => true,
|
||||
'shadow' => 0,
|
||||
],
|
||||
],
|
||||
'sidebar' => [
|
||||
'type' => 'dark',
|
||||
'shadow' => 4,
|
||||
'border' => false,
|
||||
'compact' => true,
|
||||
'links' => [
|
||||
'bg' => 'black', // only works with AdminLTE theme
|
||||
'shadow' => 1,
|
||||
],
|
||||
'brand' => [
|
||||
'bg' => 'gray-dark',
|
||||
'logo' => [
|
||||
'icon' => 'favicon.ico', // path to image | this example icon on public root folder.
|
||||
'text' => 'sk_test',
|
||||
'shadow' => 2,
|
||||
],
|
||||
],
|
||||
'user' => [
|
||||
'visible' => true,
|
||||
'shadow' => 2,
|
||||
],
|
||||
],
|
||||
'footer' => [
|
||||
'fixed' => false,
|
||||
'organization' => 'Your Awesome Company',
|
||||
'orglink' => 'https://www.ozar.net/',
|
||||
],
|
||||
];
|
||||
|
||||
}
|
||||
|
||||
@ -29,6 +29,7 @@ $routes->setAutoRoute(true);
|
||||
//------------------------------------------------------------------
|
||||
$routes->get('/', 'Home::index');
|
||||
$routes->get('lang/{locale}', 'Language::index');
|
||||
$routes->get('viewmode/(:alpha)', 'Viewmode::index/$1');
|
||||
|
||||
//API ROUTER ------------------------------------------------------
|
||||
//------------------------------------------------------------------
|
||||
@ -76,7 +77,7 @@ $routes->group('tarifaacabado', ['namespace' => 'App\Controllers\Tarifas'], func
|
||||
$routes->post('menuitems', 'Tarifaacabado::menuItems', ['as' => 'menuItemsOfTarifasacabado']);
|
||||
});
|
||||
|
||||
$routes->group('users', ['namespace' => 'App\Controllers\Usuarios'], function ($routes) {
|
||||
$routes->group('users', ['namespace' => 'App\Controllers\Configuracion'], function ($routes) {
|
||||
$routes->get('', 'Users::index', ['as' => 'userList']);
|
||||
$routes->get('index', 'Users::index', ['as' => 'userIndex']);
|
||||
$routes->get('list', 'Users::index', ['as' => 'userList2']);
|
||||
@ -89,7 +90,7 @@ $routes->group('users', ['namespace' => 'App\Controllers\Usuarios'], function ($
|
||||
$routes->post('menuitems', 'Users::menuItems', ['as' => 'menuItemsOfUsers']);
|
||||
});
|
||||
|
||||
$routes->group('group', ['namespace' => 'App\Controllers\Usuarios'], function ($routes) {
|
||||
$routes->group('group', ['namespace' => 'App\Controllers\Configuracion'], function ($routes) {
|
||||
$routes->get('', 'Group::index', ['as' => 'userGroupList']);
|
||||
$routes->get('index', 'Group::index', ['as' => 'groupIndex']);
|
||||
$routes->post('edit/(:num)', 'Group::edit/$1', ['as' => 'updateGroup']);
|
||||
|
||||
Reference in New Issue
Block a user