From 1dffef89cd6905add406d06105436be7a646a4a3 Mon Sep 17 00:00:00 2001 From: Ale Date: Sun, 31 Aug 2025 19:16:45 -0300 Subject: [PATCH 1/6] Actualizado gitignore con *.swp --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 68da81a..2d09873 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ .env .env.backup .phpunit.result.cache +*.swp Homestead.json Homestead.yaml npm-debug.log -- 2.48.1 From 0c24ee662ee2931549318b6a113a48f504cf4a88 Mon Sep 17 00:00:00 2001 From: Ale Date: Sun, 31 Aug 2025 19:20:02 -0300 Subject: [PATCH 2/6] Movido todo lo referente al server a la carpeta server --- LICENSE | 21 ------------------ dev-start | 2 -- run_watch.sh | 1 - {app => server/app}/CanastaLog.php | 0 .../AgregarEsBonoAPedidosAprobados.php | 0 .../CrearPedidosAprobadosViewCommand.php | 0 {app => server/app}/Console/Kernel.php | 0 {app => server/app}/Exceptions/Handler.php | 0 {app => server/app}/Filtros/Filtro.php | 0 .../app}/Filtros/FiltroDeProducto.php | 0 .../app}/Filtros/FiltroDeSubpedido.php | 0 {app => server/app}/GrupoDeCompra.php | 0 {app => server/app}/Helpers/CanastaHelper.php | 0 {app => server/app}/Helpers/CsvHelper.php | 0 {app => server/app}/Helpers/PdfHelper.php | 0 .../app}/Helpers/PedidosExportHelper.php | 0 .../app}/Helpers/TransporteHelper.php | 0 .../app}/Http/Controllers/AdminController.php | 0 .../Controllers/Api/CanastaController.php | 0 .../Api/GrupoDeCompraController.php | 0 .../Controllers/Api/ProductoController.php | 0 .../Controllers/Api/SubpedidoController.php | 0 .../Auth/ConfirmPasswordController.php | 0 .../Auth/ForgotPasswordController.php | 0 .../Http/Controllers/Auth/LoginController.php | 0 .../Controllers/Auth/RegisterController.php | 0 .../Auth/ResetPasswordController.php | 0 .../Auth/VerificationController.php | 0 .../Http/Controllers/ComisionesController.php | 0 .../app}/Http/Controllers/Controller.php | 0 .../app}/Http/Controllers/OllasController.php | 0 .../Http/Controllers/ProductoController.php | 0 .../app}/Http/Controllers/RouteController.php | 0 .../Http/Controllers/SessionController.php | 0 .../app}/Http/Controllers/UserController.php | 0 {app => server/app}/Http/Kernel.php | 0 .../app}/Http/Middleware/Authenticate.php | 0 .../Middleware/CheckForMaintenanceMode.php | 0 .../app}/Http/Middleware/CheckRole.php | 0 .../app}/Http/Middleware/EncryptCookies.php | 0 .../Middleware/RedirectIfAuthenticated.php | 0 .../app}/Http/Middleware/Subpedido.php | 0 .../app}/Http/Middleware/TrimStrings.php | 0 .../app}/Http/Middleware/TrustHosts.php | 0 .../app}/Http/Middleware/TrustProxies.php | 0 .../app}/Http/Middleware/VerifyCsrfToken.php | 0 .../GrupoDeCompraComisionesResource.php | 0 .../Resources/GrupoDeCompraPedidoResource.php | 0 .../Http/Resources/GrupoDeCompraResource.php | 0 .../Http/Resources/PedidoOllasResource.php | 0 .../app}/Http/Resources/ProductoResource.php | 0 .../app}/Http/Resources/SubpedidoResource.php | 0 {app => server/app}/Producto.php | 0 .../app}/Providers/AppServiceProvider.php | 0 .../app}/Providers/AuthServiceProvider.php | 0 .../Providers/BroadcastServiceProvider.php | 0 .../app}/Providers/EventServiceProvider.php | 0 .../app}/Providers/RouteServiceProvider.php | 0 {app => server/app}/Subpedido.php | 0 {app => server/app}/TipoPedido.php | 0 {app => server/app}/User.php | 0 {app => server/app}/UserRole.php | 0 artisan => server/artisan | 0 {bootstrap => server/bootstrap}/app.php | 0 .../bootstrap}/cache/.gitignore | 0 composer.json => server/composer.json | 0 composer.lock => server/composer.lock | 0 {config => server/config}/app.php | 0 {config => server/config}/auth.php | 0 {config => server/config}/broadcasting.php | 0 {config => server/config}/cache.php | 0 {config => server/config}/cors.php | 0 {config => server/config}/database.php | 0 {config => server/config}/filesystems.php | 0 {config => server/config}/hashing.php | 0 {config => server/config}/logging.php | 0 {config => server/config}/mail.php | 0 {config => server/config}/queue.php | 0 {config => server/config}/sanctum.php | 0 {config => server/config}/services.php | 0 {config => server/config}/session.php | 0 {config => server/config}/view.php | 0 {database => server/database}/.gitignore | 0 .../database}/factories/UserFactory.php | 0 .../2014_10_12_000000_create_users_table.php | 0 ...12_100000_create_password_resets_table.php | 0 ..._08_19_000000_create_failed_jobs_table.php | 0 ...01_create_personal_access_tokens_table.php | 0 ...3_165235_create_grupos_de_compra_table.php | 0 ..._09_23_173149_create_proveedores_table.php | 0 ...20_09_23_173620_create_productos_table.php | 0 ...0_09_23_180334_create_subpedidos_table.php | 0 .../2021_12_30_153540_create_admins_table.php | 0 ...egar_columna_bono_a_tabla_de_productos.php | 0 ...na_total_a_tabla_de_producto_subpedido.php | 0 ..._fila_en_planilla_a_tabla_de_productos.php | 0 ...06_015926_call_crear_pedidos_aprobados.php | 0 .../2023_11_12_142350_devoluciones_pedido.php | 0 ...23_11_12_145219_habilitar_devoluciones.php | 0 ...08_28_000025_agregar_is_compras_a_user.php | 0 .../2024_09_17_234635_notas_producto.php | 0 ...4_09_19_230732_producto_requiere_notas.php | 0 ...4_12_21_181409_crear_carga_de_canastas.php | 0 ...ll_agregar_es_bono_a_pedidos_aprobados.php | 0 ...5_05_15_021941_create_user_roles_table.php | 0 .../2025_05_15_023829_agregar_rol_a_user.php | 0 .../2025_05_15_033316_simplificar_users.php | 0 .../2025_05_15_033711_simplificar_barrios.php | 0 ...025_05_15_034325_simplificar_productos.php | 0 ..._034910_simplificar_producto_subpedido.php | 0 ...2025_05_15_035305_agregar_es_solidario.php | 0 .../2025_05_15_035807_eliminar_proveedor.php | 0 .../2025_05_15_041404_eliminar_admin.php | 0 .../2025_05_23_193246_hacer_fila_nullable.php | 0 ...603_quitar_password_de_grupo_de_compra.php | 0 ..._06_14_172643_agregar_saldos_a_barrios.php | 0 ...06_20_001436_create_tipo_pedidos_table.php | 0 .../2025_06_20_040800_user_role_ollas.php | 0 ...25_06_23_233548_cantidad_ollas_pedidos.php | 0 .../database}/seeds/CanastaSeeder.php | 0 .../database}/seeds/DatabaseSeeder.php | 0 .../database}/seeds/GrupoDeCompraSeeder.php | 0 .../database}/seeds/UserSeeder.php | 0 .../database}/seeds/UsuarioOllasSeeder.php | 0 package-lock.json => server/package-lock.json | 0 package.json => server/package.json | 0 {php => server/php}/local.ini | 0 phpunit.xml => server/phpunit.xml | 0 {public => server/public}/.htaccess | 0 {public => server/public}/assets/.directory | 0 {public => server/public}/assets/chismosa.png | Bin {public => server/public}/assets/favicon.png | Bin {public => server/public}/assets/logoMPS.png | Bin .../public}/assets/solidaria.png | Bin {public => server/public}/assets/uruguay.png | Bin {public => server/public}/favicon.ico | 0 {public => server/public}/index.php | 0 {public => server/public}/robots.txt | 0 {public => server/public}/web.config | 0 .../resources}/csv/barrios.csv | 0 .../resources}/csv/parametros.csv | 0 .../resources}/csv/productos.csv | 0 .../resources}/csv/saldos.csv | 0 {resources => server/resources}/js/app.ts | 0 .../resources}/js/components/AppLogin.vue | 0 .../resources}/js/components/AppMain.vue | 0 .../js/components/admin/AdminNavBarBrand.vue | 0 .../resources}/js/components/admin/Body.vue | 0 .../admin/CaracteristicasOpcionales.vue | 0 .../js/components/admin/DropdownDescargar.vue | 0 .../components/admin/FilaCaracteristica.vue | 0 .../js/components/admin/FilaPedido.vue | 0 .../js/components/admin/SwitchAprobacion.vue | 0 .../js/components/admin/TablaPedidos.vue | 0 .../js/components/comisiones/Body.vue | 0 .../comisiones/ComisionesNavBarBrand.vue | 0 .../comisiones/DropdownDescargar.vue | 0 .../comisiones/canasta/CanastaInput.vue | 0 .../comisiones/canasta/CanastaSeccion.vue | 0 .../comisiones/parametros/FilaParametro.vue | 0 .../parametros/ParametrosSeccion.vue | 0 .../components/comisiones/saldos/SaldoRow.vue | 0 .../comisiones/saldos/SaldosSeccion.vue | 0 .../comisiones/saldos/TablaSaldos.vue | 0 .../js/components/comunes/Burger.vue | 0 .../js/components/comunes/InfoTags.vue | 0 .../js/components/comunes/InputFileButton.vue | 0 .../js/components/comunes/NavBar.vue | 0 .../js/components/comunes/TabsSecciones.vue | 0 .../js/components/login/LoginDropdown.vue | 0 .../js/components/login/LoginInput.vue | 0 .../js/components/login/LoginTitulos.vue | 0 .../js/components/login/input/BarrioLogin.vue | 0 .../components/login/input/PasswordInput.vue | 0 .../js/components/login/input/UserLogin.vue | 0 .../login/input/barrio/BarrioSelect.vue | 0 .../login/input/barrio/RegionSelect.vue | 0 .../components/login/input/user/UserInput.vue | 0 .../js/components/ollas/CantidadOllas.vue | 0 .../js/components/ollas/OllasBody.vue | 0 .../js/components/ollas/OllasNavBarBrand.vue | 0 .../resources}/js/components/pedidos/Body.vue | 0 .../js/components/pedidos/Buscador.vue | 0 .../js/components/pedidos/Canasta.vue | 0 .../pedidos/CartelPedidoAprobado.vue | 0 .../pedidos/CategoriasContainer.vue | 0 .../js/components/pedidos/Chismosa.vue | 0 .../components/pedidos/ChismosaDropdown.vue | 0 .../components/pedidos/DevolucionesModal.vue | 0 .../js/components/pedidos/NavMigas.vue | 0 .../js/components/pedidos/PedidoSelect.vue | 0 .../js/components/pedidos/PedidosMain.vue | 0 .../components/pedidos/PedidosNavBarBrand.vue | 0 .../components/pedidos/ProductoCantidad.vue | 0 .../js/components/pedidos/ProductoCard.vue | 0 .../js/components/pedidos/ProductoRow.vue | 0 .../components/pedidos/ProductosContainer.vue | 0 .../resources}/js/globals.d.ts | 0 .../resources}/js/shims-vue.d.ts | 0 .../resources}/js/store/comunes.ts | 0 .../resources}/js/store/index.ts | 0 .../js/store/modules/admin/index.ts | 0 .../js/store/modules/admin/types.ts | 0 .../js/store/modules/comisiones/index.ts | 0 .../js/store/modules/comisiones/types.ts | 0 .../js/store/modules/login/index.ts | 0 .../js/store/modules/login/types.ts | 0 .../resources}/js/store/modules/ollas.js | 0 .../js/store/modules/pedido/index.ts | 0 .../js/store/modules/pedido/types.ts | 0 .../js/store/modules/productos/index.ts | 0 .../js/store/modules/productos/types.ts | 0 .../resources}/js/store/modules/ui/index.ts | 0 .../resources}/js/store/modules/ui/types.ts | 0 .../resources}/lang/en/auth.php | 0 .../resources}/lang/en/pagination.php | 0 .../resources}/lang/en/passwords.php | 0 .../resources}/lang/en/validation.php | 0 .../resources}/sass/_variables.scss | 0 {resources => server/resources}/sass/app.scss | 0 .../resources}/views/auth/login.blade.php | 0 .../views/auth/passwords/confirm.blade.php | 0 .../views/auth/passwords/email.blade.php | 0 .../views/auth/passwords/reset.blade.php | 0 .../resources}/views/auth/verify.blade.php | 0 .../resources}/views/layouts/app.blade.php | 0 .../resources}/views/main.blade.php | 0 .../views/pdfgen/pedido_tabla.blade.php | 0 {routes => server/routes}/api.php | 0 {routes => server/routes}/channels.php | 0 {routes => server/routes}/console.php | 0 {routes => server/routes}/web.php | 0 server.php => server/server.php | 0 {storage => server/storage}/app/.gitignore | 0 .../storage}/app/public/.gitignore | 0 .../storage}/framework/.gitignore | 0 .../storage}/framework/cache/.gitignore | 0 .../storage}/framework/cache/data/.gitignore | 0 .../storage}/framework/sessions/.gitignore | 0 .../storage}/framework/testing/.gitignore | 0 .../storage}/framework/views/.gitignore | 0 {storage => server/storage}/logs/.gitignore | 0 .../tests}/CreatesApplication.php | 0 .../tests}/Feature/ExampleTest.php | 0 {tests => server/tests}/TestCase.php | 0 {tests => server/tests}/Unit/ExampleTest.php | 0 tsconfig.json => server/tsconfig.json | 0 vite.config.mjs => server/vite.config.mjs | 0 tee | 0 249 files changed, 24 deletions(-) delete mode 100644 LICENSE delete mode 100755 dev-start delete mode 100755 run_watch.sh rename {app => server/app}/CanastaLog.php (100%) rename {app => server/app}/Console/Commands/AgregarEsBonoAPedidosAprobados.php (100%) rename {app => server/app}/Console/Commands/CrearPedidosAprobadosViewCommand.php (100%) rename {app => server/app}/Console/Kernel.php (100%) rename {app => server/app}/Exceptions/Handler.php (100%) rename {app => server/app}/Filtros/Filtro.php (100%) rename {app => server/app}/Filtros/FiltroDeProducto.php (100%) rename {app => server/app}/Filtros/FiltroDeSubpedido.php (100%) rename {app => server/app}/GrupoDeCompra.php (100%) rename {app => server/app}/Helpers/CanastaHelper.php (100%) rename {app => server/app}/Helpers/CsvHelper.php (100%) rename {app => server/app}/Helpers/PdfHelper.php (100%) rename {app => server/app}/Helpers/PedidosExportHelper.php (100%) rename {app => server/app}/Helpers/TransporteHelper.php (100%) rename {app => server/app}/Http/Controllers/AdminController.php (100%) rename {app => server/app}/Http/Controllers/Api/CanastaController.php (100%) rename {app => server/app}/Http/Controllers/Api/GrupoDeCompraController.php (100%) rename {app => server/app}/Http/Controllers/Api/ProductoController.php (100%) rename {app => server/app}/Http/Controllers/Api/SubpedidoController.php (100%) rename {app => server/app}/Http/Controllers/Auth/ConfirmPasswordController.php (100%) rename {app => server/app}/Http/Controllers/Auth/ForgotPasswordController.php (100%) rename {app => server/app}/Http/Controllers/Auth/LoginController.php (100%) rename {app => server/app}/Http/Controllers/Auth/RegisterController.php (100%) rename {app => server/app}/Http/Controllers/Auth/ResetPasswordController.php (100%) rename {app => server/app}/Http/Controllers/Auth/VerificationController.php (100%) rename {app => server/app}/Http/Controllers/ComisionesController.php (100%) rename {app => server/app}/Http/Controllers/Controller.php (100%) rename {app => server/app}/Http/Controllers/OllasController.php (100%) rename {app => server/app}/Http/Controllers/ProductoController.php (100%) rename {app => server/app}/Http/Controllers/RouteController.php (100%) rename {app => server/app}/Http/Controllers/SessionController.php (100%) rename {app => server/app}/Http/Controllers/UserController.php (100%) rename {app => server/app}/Http/Kernel.php (100%) rename {app => server/app}/Http/Middleware/Authenticate.php (100%) rename {app => server/app}/Http/Middleware/CheckForMaintenanceMode.php (100%) rename {app => server/app}/Http/Middleware/CheckRole.php (100%) rename {app => server/app}/Http/Middleware/EncryptCookies.php (100%) rename {app => server/app}/Http/Middleware/RedirectIfAuthenticated.php (100%) rename {app => server/app}/Http/Middleware/Subpedido.php (100%) rename {app => server/app}/Http/Middleware/TrimStrings.php (100%) rename {app => server/app}/Http/Middleware/TrustHosts.php (100%) rename {app => server/app}/Http/Middleware/TrustProxies.php (100%) rename {app => server/app}/Http/Middleware/VerifyCsrfToken.php (100%) rename {app => server/app}/Http/Resources/GrupoDeCompraComisionesResource.php (100%) rename {app => server/app}/Http/Resources/GrupoDeCompraPedidoResource.php (100%) rename {app => server/app}/Http/Resources/GrupoDeCompraResource.php (100%) rename {app => server/app}/Http/Resources/PedidoOllasResource.php (100%) rename {app => server/app}/Http/Resources/ProductoResource.php (100%) rename {app => server/app}/Http/Resources/SubpedidoResource.php (100%) rename {app => server/app}/Producto.php (100%) rename {app => server/app}/Providers/AppServiceProvider.php (100%) rename {app => server/app}/Providers/AuthServiceProvider.php (100%) rename {app => server/app}/Providers/BroadcastServiceProvider.php (100%) rename {app => server/app}/Providers/EventServiceProvider.php (100%) rename {app => server/app}/Providers/RouteServiceProvider.php (100%) rename {app => server/app}/Subpedido.php (100%) rename {app => server/app}/TipoPedido.php (100%) rename {app => server/app}/User.php (100%) rename {app => server/app}/UserRole.php (100%) rename artisan => server/artisan (100%) rename {bootstrap => server/bootstrap}/app.php (100%) rename {bootstrap => server/bootstrap}/cache/.gitignore (100%) rename composer.json => server/composer.json (100%) rename composer.lock => server/composer.lock (100%) rename {config => server/config}/app.php (100%) rename {config => server/config}/auth.php (100%) rename {config => server/config}/broadcasting.php (100%) rename {config => server/config}/cache.php (100%) rename {config => server/config}/cors.php (100%) rename {config => server/config}/database.php (100%) rename {config => server/config}/filesystems.php (100%) rename {config => server/config}/hashing.php (100%) rename {config => server/config}/logging.php (100%) rename {config => server/config}/mail.php (100%) rename {config => server/config}/queue.php (100%) rename {config => server/config}/sanctum.php (100%) rename {config => server/config}/services.php (100%) rename {config => server/config}/session.php (100%) rename {config => server/config}/view.php (100%) rename {database => server/database}/.gitignore (100%) rename {database => server/database}/factories/UserFactory.php (100%) rename {database => server/database}/migrations/2014_10_12_000000_create_users_table.php (100%) rename {database => server/database}/migrations/2014_10_12_100000_create_password_resets_table.php (100%) rename {database => server/database}/migrations/2019_08_19_000000_create_failed_jobs_table.php (100%) rename {database => server/database}/migrations/2019_12_14_000001_create_personal_access_tokens_table.php (100%) rename {database => server/database}/migrations/2020_09_23_165235_create_grupos_de_compra_table.php (100%) rename {database => server/database}/migrations/2020_09_23_173149_create_proveedores_table.php (100%) rename {database => server/database}/migrations/2020_09_23_173620_create_productos_table.php (100%) rename {database => server/database}/migrations/2020_09_23_180334_create_subpedidos_table.php (100%) rename {database => server/database}/migrations/2021_12_30_153540_create_admins_table.php (100%) rename {database => server/database}/migrations/2022_02_23_204330_agregar_columna_bono_a_tabla_de_productos.php (100%) rename {database => server/database}/migrations/2022_02_23_220046_agregar_columna_total_a_tabla_de_producto_subpedido.php (100%) rename {database => server/database}/migrations/2022_09_11_020612_agregar_columna_fila_en_planilla_a_tabla_de_productos.php (100%) rename {database => server/database}/migrations/2023_07_06_015926_call_crear_pedidos_aprobados.php (100%) rename {database => server/database}/migrations/2023_11_12_142350_devoluciones_pedido.php (100%) rename {database => server/database}/migrations/2023_11_12_145219_habilitar_devoluciones.php (100%) rename {database => server/database}/migrations/2024_08_28_000025_agregar_is_compras_a_user.php (100%) rename {database => server/database}/migrations/2024_09_17_234635_notas_producto.php (100%) rename {database => server/database}/migrations/2024_09_19_230732_producto_requiere_notas.php (100%) rename {database => server/database}/migrations/2024_12_21_181409_crear_carga_de_canastas.php (100%) rename {database => server/database}/migrations/2025_05_12_214437_call_agregar_es_bono_a_pedidos_aprobados.php (100%) rename {database => server/database}/migrations/2025_05_15_021941_create_user_roles_table.php (100%) rename {database => server/database}/migrations/2025_05_15_023829_agregar_rol_a_user.php (100%) rename {database => server/database}/migrations/2025_05_15_033316_simplificar_users.php (100%) rename {database => server/database}/migrations/2025_05_15_033711_simplificar_barrios.php (100%) rename {database => server/database}/migrations/2025_05_15_034325_simplificar_productos.php (100%) rename {database => server/database}/migrations/2025_05_15_034910_simplificar_producto_subpedido.php (100%) rename {database => server/database}/migrations/2025_05_15_035305_agregar_es_solidario.php (100%) rename {database => server/database}/migrations/2025_05_15_035807_eliminar_proveedor.php (100%) rename {database => server/database}/migrations/2025_05_15_041404_eliminar_admin.php (100%) rename {database => server/database}/migrations/2025_05_23_193246_hacer_fila_nullable.php (100%) rename {database => server/database}/migrations/2025_05_23_212603_quitar_password_de_grupo_de_compra.php (100%) rename {database => server/database}/migrations/2025_06_14_172643_agregar_saldos_a_barrios.php (100%) rename {database => server/database}/migrations/2025_06_20_001436_create_tipo_pedidos_table.php (100%) rename {database => server/database}/migrations/2025_06_20_040800_user_role_ollas.php (100%) rename {database => server/database}/migrations/2025_06_23_233548_cantidad_ollas_pedidos.php (100%) rename {database => server/database}/seeds/CanastaSeeder.php (100%) rename {database => server/database}/seeds/DatabaseSeeder.php (100%) rename {database => server/database}/seeds/GrupoDeCompraSeeder.php (100%) rename {database => server/database}/seeds/UserSeeder.php (100%) rename {database => server/database}/seeds/UsuarioOllasSeeder.php (100%) rename package-lock.json => server/package-lock.json (100%) rename package.json => server/package.json (100%) rename {php => server/php}/local.ini (100%) rename phpunit.xml => server/phpunit.xml (100%) rename {public => server/public}/.htaccess (100%) rename {public => server/public}/assets/.directory (100%) rename {public => server/public}/assets/chismosa.png (100%) rename {public => server/public}/assets/favicon.png (100%) rename {public => server/public}/assets/logoMPS.png (100%) rename {public => server/public}/assets/solidaria.png (100%) rename {public => server/public}/assets/uruguay.png (100%) rename {public => server/public}/favicon.ico (100%) rename {public => server/public}/index.php (100%) rename {public => server/public}/robots.txt (100%) rename {public => server/public}/web.config (100%) rename {resources => server/resources}/csv/barrios.csv (100%) rename {resources => server/resources}/csv/parametros.csv (100%) rename {resources => server/resources}/csv/productos.csv (100%) rename {resources => server/resources}/csv/saldos.csv (100%) rename {resources => server/resources}/js/app.ts (100%) rename {resources => server/resources}/js/components/AppLogin.vue (100%) rename {resources => server/resources}/js/components/AppMain.vue (100%) rename {resources => server/resources}/js/components/admin/AdminNavBarBrand.vue (100%) rename {resources => server/resources}/js/components/admin/Body.vue (100%) rename {resources => server/resources}/js/components/admin/CaracteristicasOpcionales.vue (100%) rename {resources => server/resources}/js/components/admin/DropdownDescargar.vue (100%) rename {resources => server/resources}/js/components/admin/FilaCaracteristica.vue (100%) rename {resources => server/resources}/js/components/admin/FilaPedido.vue (100%) rename {resources => server/resources}/js/components/admin/SwitchAprobacion.vue (100%) rename {resources => server/resources}/js/components/admin/TablaPedidos.vue (100%) rename {resources => server/resources}/js/components/comisiones/Body.vue (100%) rename {resources => server/resources}/js/components/comisiones/ComisionesNavBarBrand.vue (100%) rename {resources => server/resources}/js/components/comisiones/DropdownDescargar.vue (100%) rename {resources => server/resources}/js/components/comisiones/canasta/CanastaInput.vue (100%) rename {resources => server/resources}/js/components/comisiones/canasta/CanastaSeccion.vue (100%) rename {resources => server/resources}/js/components/comisiones/parametros/FilaParametro.vue (100%) rename {resources => server/resources}/js/components/comisiones/parametros/ParametrosSeccion.vue (100%) rename {resources => server/resources}/js/components/comisiones/saldos/SaldoRow.vue (100%) rename {resources => server/resources}/js/components/comisiones/saldos/SaldosSeccion.vue (100%) rename {resources => server/resources}/js/components/comisiones/saldos/TablaSaldos.vue (100%) rename {resources => server/resources}/js/components/comunes/Burger.vue (100%) rename {resources => server/resources}/js/components/comunes/InfoTags.vue (100%) rename {resources => server/resources}/js/components/comunes/InputFileButton.vue (100%) rename {resources => server/resources}/js/components/comunes/NavBar.vue (100%) rename {resources => server/resources}/js/components/comunes/TabsSecciones.vue (100%) rename {resources => server/resources}/js/components/login/LoginDropdown.vue (100%) rename {resources => server/resources}/js/components/login/LoginInput.vue (100%) rename {resources => server/resources}/js/components/login/LoginTitulos.vue (100%) rename {resources => server/resources}/js/components/login/input/BarrioLogin.vue (100%) rename {resources => server/resources}/js/components/login/input/PasswordInput.vue (100%) rename {resources => server/resources}/js/components/login/input/UserLogin.vue (100%) rename {resources => server/resources}/js/components/login/input/barrio/BarrioSelect.vue (100%) rename {resources => server/resources}/js/components/login/input/barrio/RegionSelect.vue (100%) rename {resources => server/resources}/js/components/login/input/user/UserInput.vue (100%) rename {resources => server/resources}/js/components/ollas/CantidadOllas.vue (100%) rename {resources => server/resources}/js/components/ollas/OllasBody.vue (100%) rename {resources => server/resources}/js/components/ollas/OllasNavBarBrand.vue (100%) rename {resources => server/resources}/js/components/pedidos/Body.vue (100%) rename {resources => server/resources}/js/components/pedidos/Buscador.vue (100%) rename {resources => server/resources}/js/components/pedidos/Canasta.vue (100%) rename {resources => server/resources}/js/components/pedidos/CartelPedidoAprobado.vue (100%) rename {resources => server/resources}/js/components/pedidos/CategoriasContainer.vue (100%) rename {resources => server/resources}/js/components/pedidos/Chismosa.vue (100%) rename {resources => server/resources}/js/components/pedidos/ChismosaDropdown.vue (100%) rename {resources => server/resources}/js/components/pedidos/DevolucionesModal.vue (100%) rename {resources => server/resources}/js/components/pedidos/NavMigas.vue (100%) rename {resources => server/resources}/js/components/pedidos/PedidoSelect.vue (100%) rename {resources => server/resources}/js/components/pedidos/PedidosMain.vue (100%) rename {resources => server/resources}/js/components/pedidos/PedidosNavBarBrand.vue (100%) rename {resources => server/resources}/js/components/pedidos/ProductoCantidad.vue (100%) rename {resources => server/resources}/js/components/pedidos/ProductoCard.vue (100%) rename {resources => server/resources}/js/components/pedidos/ProductoRow.vue (100%) rename {resources => server/resources}/js/components/pedidos/ProductosContainer.vue (100%) rename {resources => server/resources}/js/globals.d.ts (100%) rename {resources => server/resources}/js/shims-vue.d.ts (100%) rename {resources => server/resources}/js/store/comunes.ts (100%) rename {resources => server/resources}/js/store/index.ts (100%) rename {resources => server/resources}/js/store/modules/admin/index.ts (100%) rename {resources => server/resources}/js/store/modules/admin/types.ts (100%) rename {resources => server/resources}/js/store/modules/comisiones/index.ts (100%) rename {resources => server/resources}/js/store/modules/comisiones/types.ts (100%) rename {resources => server/resources}/js/store/modules/login/index.ts (100%) rename {resources => server/resources}/js/store/modules/login/types.ts (100%) rename {resources => server/resources}/js/store/modules/ollas.js (100%) rename {resources => server/resources}/js/store/modules/pedido/index.ts (100%) rename {resources => server/resources}/js/store/modules/pedido/types.ts (100%) rename {resources => server/resources}/js/store/modules/productos/index.ts (100%) rename {resources => server/resources}/js/store/modules/productos/types.ts (100%) rename {resources => server/resources}/js/store/modules/ui/index.ts (100%) rename {resources => server/resources}/js/store/modules/ui/types.ts (100%) rename {resources => server/resources}/lang/en/auth.php (100%) rename {resources => server/resources}/lang/en/pagination.php (100%) rename {resources => server/resources}/lang/en/passwords.php (100%) rename {resources => server/resources}/lang/en/validation.php (100%) rename {resources => server/resources}/sass/_variables.scss (100%) rename {resources => server/resources}/sass/app.scss (100%) rename {resources => server/resources}/views/auth/login.blade.php (100%) rename {resources => server/resources}/views/auth/passwords/confirm.blade.php (100%) rename {resources => server/resources}/views/auth/passwords/email.blade.php (100%) rename {resources => server/resources}/views/auth/passwords/reset.blade.php (100%) rename {resources => server/resources}/views/auth/verify.blade.php (100%) rename {resources => server/resources}/views/layouts/app.blade.php (100%) rename {resources => server/resources}/views/main.blade.php (100%) rename {resources => server/resources}/views/pdfgen/pedido_tabla.blade.php (100%) rename {routes => server/routes}/api.php (100%) rename {routes => server/routes}/channels.php (100%) rename {routes => server/routes}/console.php (100%) rename {routes => server/routes}/web.php (100%) rename server.php => server/server.php (100%) rename {storage => server/storage}/app/.gitignore (100%) rename {storage => server/storage}/app/public/.gitignore (100%) rename {storage => server/storage}/framework/.gitignore (100%) rename {storage => server/storage}/framework/cache/.gitignore (100%) rename {storage => server/storage}/framework/cache/data/.gitignore (100%) rename {storage => server/storage}/framework/sessions/.gitignore (100%) rename {storage => server/storage}/framework/testing/.gitignore (100%) rename {storage => server/storage}/framework/views/.gitignore (100%) rename {storage => server/storage}/logs/.gitignore (100%) rename {tests => server/tests}/CreatesApplication.php (100%) rename {tests => server/tests}/Feature/ExampleTest.php (100%) rename {tests => server/tests}/TestCase.php (100%) rename {tests => server/tests}/Unit/ExampleTest.php (100%) rename tsconfig.json => server/tsconfig.json (100%) rename vite.config.mjs => server/vite.config.mjs (100%) delete mode 100644 tee diff --git a/LICENSE b/LICENSE deleted file mode 100644 index c477e94..0000000 --- a/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2020 Dyarlen Iber - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/dev-start b/dev-start deleted file mode 100755 index 242484c..0000000 --- a/dev-start +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/bash -docker-compose up -d && docker-compose exec app npm run watch diff --git a/run_watch.sh b/run_watch.sh deleted file mode 100755 index f0fbd92..0000000 --- a/run_watch.sh +++ /dev/null @@ -1 +0,0 @@ -sudo docker compose exec app npm run watch diff --git a/app/CanastaLog.php b/server/app/CanastaLog.php similarity index 100% rename from app/CanastaLog.php rename to server/app/CanastaLog.php diff --git a/app/Console/Commands/AgregarEsBonoAPedidosAprobados.php b/server/app/Console/Commands/AgregarEsBonoAPedidosAprobados.php similarity index 100% rename from app/Console/Commands/AgregarEsBonoAPedidosAprobados.php rename to server/app/Console/Commands/AgregarEsBonoAPedidosAprobados.php diff --git a/app/Console/Commands/CrearPedidosAprobadosViewCommand.php b/server/app/Console/Commands/CrearPedidosAprobadosViewCommand.php similarity index 100% rename from app/Console/Commands/CrearPedidosAprobadosViewCommand.php rename to server/app/Console/Commands/CrearPedidosAprobadosViewCommand.php diff --git a/app/Console/Kernel.php b/server/app/Console/Kernel.php similarity index 100% rename from app/Console/Kernel.php rename to server/app/Console/Kernel.php diff --git a/app/Exceptions/Handler.php b/server/app/Exceptions/Handler.php similarity index 100% rename from app/Exceptions/Handler.php rename to server/app/Exceptions/Handler.php diff --git a/app/Filtros/Filtro.php b/server/app/Filtros/Filtro.php similarity index 100% rename from app/Filtros/Filtro.php rename to server/app/Filtros/Filtro.php diff --git a/app/Filtros/FiltroDeProducto.php b/server/app/Filtros/FiltroDeProducto.php similarity index 100% rename from app/Filtros/FiltroDeProducto.php rename to server/app/Filtros/FiltroDeProducto.php diff --git a/app/Filtros/FiltroDeSubpedido.php b/server/app/Filtros/FiltroDeSubpedido.php similarity index 100% rename from app/Filtros/FiltroDeSubpedido.php rename to server/app/Filtros/FiltroDeSubpedido.php diff --git a/app/GrupoDeCompra.php b/server/app/GrupoDeCompra.php similarity index 100% rename from app/GrupoDeCompra.php rename to server/app/GrupoDeCompra.php diff --git a/app/Helpers/CanastaHelper.php b/server/app/Helpers/CanastaHelper.php similarity index 100% rename from app/Helpers/CanastaHelper.php rename to server/app/Helpers/CanastaHelper.php diff --git a/app/Helpers/CsvHelper.php b/server/app/Helpers/CsvHelper.php similarity index 100% rename from app/Helpers/CsvHelper.php rename to server/app/Helpers/CsvHelper.php diff --git a/app/Helpers/PdfHelper.php b/server/app/Helpers/PdfHelper.php similarity index 100% rename from app/Helpers/PdfHelper.php rename to server/app/Helpers/PdfHelper.php diff --git a/app/Helpers/PedidosExportHelper.php b/server/app/Helpers/PedidosExportHelper.php similarity index 100% rename from app/Helpers/PedidosExportHelper.php rename to server/app/Helpers/PedidosExportHelper.php diff --git a/app/Helpers/TransporteHelper.php b/server/app/Helpers/TransporteHelper.php similarity index 100% rename from app/Helpers/TransporteHelper.php rename to server/app/Helpers/TransporteHelper.php diff --git a/app/Http/Controllers/AdminController.php b/server/app/Http/Controllers/AdminController.php similarity index 100% rename from app/Http/Controllers/AdminController.php rename to server/app/Http/Controllers/AdminController.php diff --git a/app/Http/Controllers/Api/CanastaController.php b/server/app/Http/Controllers/Api/CanastaController.php similarity index 100% rename from app/Http/Controllers/Api/CanastaController.php rename to server/app/Http/Controllers/Api/CanastaController.php diff --git a/app/Http/Controllers/Api/GrupoDeCompraController.php b/server/app/Http/Controllers/Api/GrupoDeCompraController.php similarity index 100% rename from app/Http/Controllers/Api/GrupoDeCompraController.php rename to server/app/Http/Controllers/Api/GrupoDeCompraController.php diff --git a/app/Http/Controllers/Api/ProductoController.php b/server/app/Http/Controllers/Api/ProductoController.php similarity index 100% rename from app/Http/Controllers/Api/ProductoController.php rename to server/app/Http/Controllers/Api/ProductoController.php diff --git a/app/Http/Controllers/Api/SubpedidoController.php b/server/app/Http/Controllers/Api/SubpedidoController.php similarity index 100% rename from app/Http/Controllers/Api/SubpedidoController.php rename to server/app/Http/Controllers/Api/SubpedidoController.php diff --git a/app/Http/Controllers/Auth/ConfirmPasswordController.php b/server/app/Http/Controllers/Auth/ConfirmPasswordController.php similarity index 100% rename from app/Http/Controllers/Auth/ConfirmPasswordController.php rename to server/app/Http/Controllers/Auth/ConfirmPasswordController.php diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/server/app/Http/Controllers/Auth/ForgotPasswordController.php similarity index 100% rename from app/Http/Controllers/Auth/ForgotPasswordController.php rename to server/app/Http/Controllers/Auth/ForgotPasswordController.php diff --git a/app/Http/Controllers/Auth/LoginController.php b/server/app/Http/Controllers/Auth/LoginController.php similarity index 100% rename from app/Http/Controllers/Auth/LoginController.php rename to server/app/Http/Controllers/Auth/LoginController.php diff --git a/app/Http/Controllers/Auth/RegisterController.php b/server/app/Http/Controllers/Auth/RegisterController.php similarity index 100% rename from app/Http/Controllers/Auth/RegisterController.php rename to server/app/Http/Controllers/Auth/RegisterController.php diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/server/app/Http/Controllers/Auth/ResetPasswordController.php similarity index 100% rename from app/Http/Controllers/Auth/ResetPasswordController.php rename to server/app/Http/Controllers/Auth/ResetPasswordController.php diff --git a/app/Http/Controllers/Auth/VerificationController.php b/server/app/Http/Controllers/Auth/VerificationController.php similarity index 100% rename from app/Http/Controllers/Auth/VerificationController.php rename to server/app/Http/Controllers/Auth/VerificationController.php diff --git a/app/Http/Controllers/ComisionesController.php b/server/app/Http/Controllers/ComisionesController.php similarity index 100% rename from app/Http/Controllers/ComisionesController.php rename to server/app/Http/Controllers/ComisionesController.php diff --git a/app/Http/Controllers/Controller.php b/server/app/Http/Controllers/Controller.php similarity index 100% rename from app/Http/Controllers/Controller.php rename to server/app/Http/Controllers/Controller.php diff --git a/app/Http/Controllers/OllasController.php b/server/app/Http/Controllers/OllasController.php similarity index 100% rename from app/Http/Controllers/OllasController.php rename to server/app/Http/Controllers/OllasController.php diff --git a/app/Http/Controllers/ProductoController.php b/server/app/Http/Controllers/ProductoController.php similarity index 100% rename from app/Http/Controllers/ProductoController.php rename to server/app/Http/Controllers/ProductoController.php diff --git a/app/Http/Controllers/RouteController.php b/server/app/Http/Controllers/RouteController.php similarity index 100% rename from app/Http/Controllers/RouteController.php rename to server/app/Http/Controllers/RouteController.php diff --git a/app/Http/Controllers/SessionController.php b/server/app/Http/Controllers/SessionController.php similarity index 100% rename from app/Http/Controllers/SessionController.php rename to server/app/Http/Controllers/SessionController.php diff --git a/app/Http/Controllers/UserController.php b/server/app/Http/Controllers/UserController.php similarity index 100% rename from app/Http/Controllers/UserController.php rename to server/app/Http/Controllers/UserController.php diff --git a/app/Http/Kernel.php b/server/app/Http/Kernel.php similarity index 100% rename from app/Http/Kernel.php rename to server/app/Http/Kernel.php diff --git a/app/Http/Middleware/Authenticate.php b/server/app/Http/Middleware/Authenticate.php similarity index 100% rename from app/Http/Middleware/Authenticate.php rename to server/app/Http/Middleware/Authenticate.php diff --git a/app/Http/Middleware/CheckForMaintenanceMode.php b/server/app/Http/Middleware/CheckForMaintenanceMode.php similarity index 100% rename from app/Http/Middleware/CheckForMaintenanceMode.php rename to server/app/Http/Middleware/CheckForMaintenanceMode.php diff --git a/app/Http/Middleware/CheckRole.php b/server/app/Http/Middleware/CheckRole.php similarity index 100% rename from app/Http/Middleware/CheckRole.php rename to server/app/Http/Middleware/CheckRole.php diff --git a/app/Http/Middleware/EncryptCookies.php b/server/app/Http/Middleware/EncryptCookies.php similarity index 100% rename from app/Http/Middleware/EncryptCookies.php rename to server/app/Http/Middleware/EncryptCookies.php diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/server/app/Http/Middleware/RedirectIfAuthenticated.php similarity index 100% rename from app/Http/Middleware/RedirectIfAuthenticated.php rename to server/app/Http/Middleware/RedirectIfAuthenticated.php diff --git a/app/Http/Middleware/Subpedido.php b/server/app/Http/Middleware/Subpedido.php similarity index 100% rename from app/Http/Middleware/Subpedido.php rename to server/app/Http/Middleware/Subpedido.php diff --git a/app/Http/Middleware/TrimStrings.php b/server/app/Http/Middleware/TrimStrings.php similarity index 100% rename from app/Http/Middleware/TrimStrings.php rename to server/app/Http/Middleware/TrimStrings.php diff --git a/app/Http/Middleware/TrustHosts.php b/server/app/Http/Middleware/TrustHosts.php similarity index 100% rename from app/Http/Middleware/TrustHosts.php rename to server/app/Http/Middleware/TrustHosts.php diff --git a/app/Http/Middleware/TrustProxies.php b/server/app/Http/Middleware/TrustProxies.php similarity index 100% rename from app/Http/Middleware/TrustProxies.php rename to server/app/Http/Middleware/TrustProxies.php diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/server/app/Http/Middleware/VerifyCsrfToken.php similarity index 100% rename from app/Http/Middleware/VerifyCsrfToken.php rename to server/app/Http/Middleware/VerifyCsrfToken.php diff --git a/app/Http/Resources/GrupoDeCompraComisionesResource.php b/server/app/Http/Resources/GrupoDeCompraComisionesResource.php similarity index 100% rename from app/Http/Resources/GrupoDeCompraComisionesResource.php rename to server/app/Http/Resources/GrupoDeCompraComisionesResource.php diff --git a/app/Http/Resources/GrupoDeCompraPedidoResource.php b/server/app/Http/Resources/GrupoDeCompraPedidoResource.php similarity index 100% rename from app/Http/Resources/GrupoDeCompraPedidoResource.php rename to server/app/Http/Resources/GrupoDeCompraPedidoResource.php diff --git a/app/Http/Resources/GrupoDeCompraResource.php b/server/app/Http/Resources/GrupoDeCompraResource.php similarity index 100% rename from app/Http/Resources/GrupoDeCompraResource.php rename to server/app/Http/Resources/GrupoDeCompraResource.php diff --git a/app/Http/Resources/PedidoOllasResource.php b/server/app/Http/Resources/PedidoOllasResource.php similarity index 100% rename from app/Http/Resources/PedidoOllasResource.php rename to server/app/Http/Resources/PedidoOllasResource.php diff --git a/app/Http/Resources/ProductoResource.php b/server/app/Http/Resources/ProductoResource.php similarity index 100% rename from app/Http/Resources/ProductoResource.php rename to server/app/Http/Resources/ProductoResource.php diff --git a/app/Http/Resources/SubpedidoResource.php b/server/app/Http/Resources/SubpedidoResource.php similarity index 100% rename from app/Http/Resources/SubpedidoResource.php rename to server/app/Http/Resources/SubpedidoResource.php diff --git a/app/Producto.php b/server/app/Producto.php similarity index 100% rename from app/Producto.php rename to server/app/Producto.php diff --git a/app/Providers/AppServiceProvider.php b/server/app/Providers/AppServiceProvider.php similarity index 100% rename from app/Providers/AppServiceProvider.php rename to server/app/Providers/AppServiceProvider.php diff --git a/app/Providers/AuthServiceProvider.php b/server/app/Providers/AuthServiceProvider.php similarity index 100% rename from app/Providers/AuthServiceProvider.php rename to server/app/Providers/AuthServiceProvider.php diff --git a/app/Providers/BroadcastServiceProvider.php b/server/app/Providers/BroadcastServiceProvider.php similarity index 100% rename from app/Providers/BroadcastServiceProvider.php rename to server/app/Providers/BroadcastServiceProvider.php diff --git a/app/Providers/EventServiceProvider.php b/server/app/Providers/EventServiceProvider.php similarity index 100% rename from app/Providers/EventServiceProvider.php rename to server/app/Providers/EventServiceProvider.php diff --git a/app/Providers/RouteServiceProvider.php b/server/app/Providers/RouteServiceProvider.php similarity index 100% rename from app/Providers/RouteServiceProvider.php rename to server/app/Providers/RouteServiceProvider.php diff --git a/app/Subpedido.php b/server/app/Subpedido.php similarity index 100% rename from app/Subpedido.php rename to server/app/Subpedido.php diff --git a/app/TipoPedido.php b/server/app/TipoPedido.php similarity index 100% rename from app/TipoPedido.php rename to server/app/TipoPedido.php diff --git a/app/User.php b/server/app/User.php similarity index 100% rename from app/User.php rename to server/app/User.php diff --git a/app/UserRole.php b/server/app/UserRole.php similarity index 100% rename from app/UserRole.php rename to server/app/UserRole.php diff --git a/artisan b/server/artisan similarity index 100% rename from artisan rename to server/artisan diff --git a/bootstrap/app.php b/server/bootstrap/app.php similarity index 100% rename from bootstrap/app.php rename to server/bootstrap/app.php diff --git a/bootstrap/cache/.gitignore b/server/bootstrap/cache/.gitignore similarity index 100% rename from bootstrap/cache/.gitignore rename to server/bootstrap/cache/.gitignore diff --git a/composer.json b/server/composer.json similarity index 100% rename from composer.json rename to server/composer.json diff --git a/composer.lock b/server/composer.lock similarity index 100% rename from composer.lock rename to server/composer.lock diff --git a/config/app.php b/server/config/app.php similarity index 100% rename from config/app.php rename to server/config/app.php diff --git a/config/auth.php b/server/config/auth.php similarity index 100% rename from config/auth.php rename to server/config/auth.php diff --git a/config/broadcasting.php b/server/config/broadcasting.php similarity index 100% rename from config/broadcasting.php rename to server/config/broadcasting.php diff --git a/config/cache.php b/server/config/cache.php similarity index 100% rename from config/cache.php rename to server/config/cache.php diff --git a/config/cors.php b/server/config/cors.php similarity index 100% rename from config/cors.php rename to server/config/cors.php diff --git a/config/database.php b/server/config/database.php similarity index 100% rename from config/database.php rename to server/config/database.php diff --git a/config/filesystems.php b/server/config/filesystems.php similarity index 100% rename from config/filesystems.php rename to server/config/filesystems.php diff --git a/config/hashing.php b/server/config/hashing.php similarity index 100% rename from config/hashing.php rename to server/config/hashing.php diff --git a/config/logging.php b/server/config/logging.php similarity index 100% rename from config/logging.php rename to server/config/logging.php diff --git a/config/mail.php b/server/config/mail.php similarity index 100% rename from config/mail.php rename to server/config/mail.php diff --git a/config/queue.php b/server/config/queue.php similarity index 100% rename from config/queue.php rename to server/config/queue.php diff --git a/config/sanctum.php b/server/config/sanctum.php similarity index 100% rename from config/sanctum.php rename to server/config/sanctum.php diff --git a/config/services.php b/server/config/services.php similarity index 100% rename from config/services.php rename to server/config/services.php diff --git a/config/session.php b/server/config/session.php similarity index 100% rename from config/session.php rename to server/config/session.php diff --git a/config/view.php b/server/config/view.php similarity index 100% rename from config/view.php rename to server/config/view.php diff --git a/database/.gitignore b/server/database/.gitignore similarity index 100% rename from database/.gitignore rename to server/database/.gitignore diff --git a/database/factories/UserFactory.php b/server/database/factories/UserFactory.php similarity index 100% rename from database/factories/UserFactory.php rename to server/database/factories/UserFactory.php diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/server/database/migrations/2014_10_12_000000_create_users_table.php similarity index 100% rename from database/migrations/2014_10_12_000000_create_users_table.php rename to server/database/migrations/2014_10_12_000000_create_users_table.php diff --git a/database/migrations/2014_10_12_100000_create_password_resets_table.php b/server/database/migrations/2014_10_12_100000_create_password_resets_table.php similarity index 100% rename from database/migrations/2014_10_12_100000_create_password_resets_table.php rename to server/database/migrations/2014_10_12_100000_create_password_resets_table.php diff --git a/database/migrations/2019_08_19_000000_create_failed_jobs_table.php b/server/database/migrations/2019_08_19_000000_create_failed_jobs_table.php similarity index 100% rename from database/migrations/2019_08_19_000000_create_failed_jobs_table.php rename to server/database/migrations/2019_08_19_000000_create_failed_jobs_table.php diff --git a/database/migrations/2019_12_14_000001_create_personal_access_tokens_table.php b/server/database/migrations/2019_12_14_000001_create_personal_access_tokens_table.php similarity index 100% rename from database/migrations/2019_12_14_000001_create_personal_access_tokens_table.php rename to server/database/migrations/2019_12_14_000001_create_personal_access_tokens_table.php diff --git a/database/migrations/2020_09_23_165235_create_grupos_de_compra_table.php b/server/database/migrations/2020_09_23_165235_create_grupos_de_compra_table.php similarity index 100% rename from database/migrations/2020_09_23_165235_create_grupos_de_compra_table.php rename to server/database/migrations/2020_09_23_165235_create_grupos_de_compra_table.php diff --git a/database/migrations/2020_09_23_173149_create_proveedores_table.php b/server/database/migrations/2020_09_23_173149_create_proveedores_table.php similarity index 100% rename from database/migrations/2020_09_23_173149_create_proveedores_table.php rename to server/database/migrations/2020_09_23_173149_create_proveedores_table.php diff --git a/database/migrations/2020_09_23_173620_create_productos_table.php b/server/database/migrations/2020_09_23_173620_create_productos_table.php similarity index 100% rename from database/migrations/2020_09_23_173620_create_productos_table.php rename to server/database/migrations/2020_09_23_173620_create_productos_table.php diff --git a/database/migrations/2020_09_23_180334_create_subpedidos_table.php b/server/database/migrations/2020_09_23_180334_create_subpedidos_table.php similarity index 100% rename from database/migrations/2020_09_23_180334_create_subpedidos_table.php rename to server/database/migrations/2020_09_23_180334_create_subpedidos_table.php diff --git a/database/migrations/2021_12_30_153540_create_admins_table.php b/server/database/migrations/2021_12_30_153540_create_admins_table.php similarity index 100% rename from database/migrations/2021_12_30_153540_create_admins_table.php rename to server/database/migrations/2021_12_30_153540_create_admins_table.php diff --git a/database/migrations/2022_02_23_204330_agregar_columna_bono_a_tabla_de_productos.php b/server/database/migrations/2022_02_23_204330_agregar_columna_bono_a_tabla_de_productos.php similarity index 100% rename from database/migrations/2022_02_23_204330_agregar_columna_bono_a_tabla_de_productos.php rename to server/database/migrations/2022_02_23_204330_agregar_columna_bono_a_tabla_de_productos.php diff --git a/database/migrations/2022_02_23_220046_agregar_columna_total_a_tabla_de_producto_subpedido.php b/server/database/migrations/2022_02_23_220046_agregar_columna_total_a_tabla_de_producto_subpedido.php similarity index 100% rename from database/migrations/2022_02_23_220046_agregar_columna_total_a_tabla_de_producto_subpedido.php rename to server/database/migrations/2022_02_23_220046_agregar_columna_total_a_tabla_de_producto_subpedido.php diff --git a/database/migrations/2022_09_11_020612_agregar_columna_fila_en_planilla_a_tabla_de_productos.php b/server/database/migrations/2022_09_11_020612_agregar_columna_fila_en_planilla_a_tabla_de_productos.php similarity index 100% rename from database/migrations/2022_09_11_020612_agregar_columna_fila_en_planilla_a_tabla_de_productos.php rename to server/database/migrations/2022_09_11_020612_agregar_columna_fila_en_planilla_a_tabla_de_productos.php diff --git a/database/migrations/2023_07_06_015926_call_crear_pedidos_aprobados.php b/server/database/migrations/2023_07_06_015926_call_crear_pedidos_aprobados.php similarity index 100% rename from database/migrations/2023_07_06_015926_call_crear_pedidos_aprobados.php rename to server/database/migrations/2023_07_06_015926_call_crear_pedidos_aprobados.php diff --git a/database/migrations/2023_11_12_142350_devoluciones_pedido.php b/server/database/migrations/2023_11_12_142350_devoluciones_pedido.php similarity index 100% rename from database/migrations/2023_11_12_142350_devoluciones_pedido.php rename to server/database/migrations/2023_11_12_142350_devoluciones_pedido.php diff --git a/database/migrations/2023_11_12_145219_habilitar_devoluciones.php b/server/database/migrations/2023_11_12_145219_habilitar_devoluciones.php similarity index 100% rename from database/migrations/2023_11_12_145219_habilitar_devoluciones.php rename to server/database/migrations/2023_11_12_145219_habilitar_devoluciones.php diff --git a/database/migrations/2024_08_28_000025_agregar_is_compras_a_user.php b/server/database/migrations/2024_08_28_000025_agregar_is_compras_a_user.php similarity index 100% rename from database/migrations/2024_08_28_000025_agregar_is_compras_a_user.php rename to server/database/migrations/2024_08_28_000025_agregar_is_compras_a_user.php diff --git a/database/migrations/2024_09_17_234635_notas_producto.php b/server/database/migrations/2024_09_17_234635_notas_producto.php similarity index 100% rename from database/migrations/2024_09_17_234635_notas_producto.php rename to server/database/migrations/2024_09_17_234635_notas_producto.php diff --git a/database/migrations/2024_09_19_230732_producto_requiere_notas.php b/server/database/migrations/2024_09_19_230732_producto_requiere_notas.php similarity index 100% rename from database/migrations/2024_09_19_230732_producto_requiere_notas.php rename to server/database/migrations/2024_09_19_230732_producto_requiere_notas.php diff --git a/database/migrations/2024_12_21_181409_crear_carga_de_canastas.php b/server/database/migrations/2024_12_21_181409_crear_carga_de_canastas.php similarity index 100% rename from database/migrations/2024_12_21_181409_crear_carga_de_canastas.php rename to server/database/migrations/2024_12_21_181409_crear_carga_de_canastas.php diff --git a/database/migrations/2025_05_12_214437_call_agregar_es_bono_a_pedidos_aprobados.php b/server/database/migrations/2025_05_12_214437_call_agregar_es_bono_a_pedidos_aprobados.php similarity index 100% rename from database/migrations/2025_05_12_214437_call_agregar_es_bono_a_pedidos_aprobados.php rename to server/database/migrations/2025_05_12_214437_call_agregar_es_bono_a_pedidos_aprobados.php diff --git a/database/migrations/2025_05_15_021941_create_user_roles_table.php b/server/database/migrations/2025_05_15_021941_create_user_roles_table.php similarity index 100% rename from database/migrations/2025_05_15_021941_create_user_roles_table.php rename to server/database/migrations/2025_05_15_021941_create_user_roles_table.php diff --git a/database/migrations/2025_05_15_023829_agregar_rol_a_user.php b/server/database/migrations/2025_05_15_023829_agregar_rol_a_user.php similarity index 100% rename from database/migrations/2025_05_15_023829_agregar_rol_a_user.php rename to server/database/migrations/2025_05_15_023829_agregar_rol_a_user.php diff --git a/database/migrations/2025_05_15_033316_simplificar_users.php b/server/database/migrations/2025_05_15_033316_simplificar_users.php similarity index 100% rename from database/migrations/2025_05_15_033316_simplificar_users.php rename to server/database/migrations/2025_05_15_033316_simplificar_users.php diff --git a/database/migrations/2025_05_15_033711_simplificar_barrios.php b/server/database/migrations/2025_05_15_033711_simplificar_barrios.php similarity index 100% rename from database/migrations/2025_05_15_033711_simplificar_barrios.php rename to server/database/migrations/2025_05_15_033711_simplificar_barrios.php diff --git a/database/migrations/2025_05_15_034325_simplificar_productos.php b/server/database/migrations/2025_05_15_034325_simplificar_productos.php similarity index 100% rename from database/migrations/2025_05_15_034325_simplificar_productos.php rename to server/database/migrations/2025_05_15_034325_simplificar_productos.php diff --git a/database/migrations/2025_05_15_034910_simplificar_producto_subpedido.php b/server/database/migrations/2025_05_15_034910_simplificar_producto_subpedido.php similarity index 100% rename from database/migrations/2025_05_15_034910_simplificar_producto_subpedido.php rename to server/database/migrations/2025_05_15_034910_simplificar_producto_subpedido.php diff --git a/database/migrations/2025_05_15_035305_agregar_es_solidario.php b/server/database/migrations/2025_05_15_035305_agregar_es_solidario.php similarity index 100% rename from database/migrations/2025_05_15_035305_agregar_es_solidario.php rename to server/database/migrations/2025_05_15_035305_agregar_es_solidario.php diff --git a/database/migrations/2025_05_15_035807_eliminar_proveedor.php b/server/database/migrations/2025_05_15_035807_eliminar_proveedor.php similarity index 100% rename from database/migrations/2025_05_15_035807_eliminar_proveedor.php rename to server/database/migrations/2025_05_15_035807_eliminar_proveedor.php diff --git a/database/migrations/2025_05_15_041404_eliminar_admin.php b/server/database/migrations/2025_05_15_041404_eliminar_admin.php similarity index 100% rename from database/migrations/2025_05_15_041404_eliminar_admin.php rename to server/database/migrations/2025_05_15_041404_eliminar_admin.php diff --git a/database/migrations/2025_05_23_193246_hacer_fila_nullable.php b/server/database/migrations/2025_05_23_193246_hacer_fila_nullable.php similarity index 100% rename from database/migrations/2025_05_23_193246_hacer_fila_nullable.php rename to server/database/migrations/2025_05_23_193246_hacer_fila_nullable.php diff --git a/database/migrations/2025_05_23_212603_quitar_password_de_grupo_de_compra.php b/server/database/migrations/2025_05_23_212603_quitar_password_de_grupo_de_compra.php similarity index 100% rename from database/migrations/2025_05_23_212603_quitar_password_de_grupo_de_compra.php rename to server/database/migrations/2025_05_23_212603_quitar_password_de_grupo_de_compra.php diff --git a/database/migrations/2025_06_14_172643_agregar_saldos_a_barrios.php b/server/database/migrations/2025_06_14_172643_agregar_saldos_a_barrios.php similarity index 100% rename from database/migrations/2025_06_14_172643_agregar_saldos_a_barrios.php rename to server/database/migrations/2025_06_14_172643_agregar_saldos_a_barrios.php diff --git a/database/migrations/2025_06_20_001436_create_tipo_pedidos_table.php b/server/database/migrations/2025_06_20_001436_create_tipo_pedidos_table.php similarity index 100% rename from database/migrations/2025_06_20_001436_create_tipo_pedidos_table.php rename to server/database/migrations/2025_06_20_001436_create_tipo_pedidos_table.php diff --git a/database/migrations/2025_06_20_040800_user_role_ollas.php b/server/database/migrations/2025_06_20_040800_user_role_ollas.php similarity index 100% rename from database/migrations/2025_06_20_040800_user_role_ollas.php rename to server/database/migrations/2025_06_20_040800_user_role_ollas.php diff --git a/database/migrations/2025_06_23_233548_cantidad_ollas_pedidos.php b/server/database/migrations/2025_06_23_233548_cantidad_ollas_pedidos.php similarity index 100% rename from database/migrations/2025_06_23_233548_cantidad_ollas_pedidos.php rename to server/database/migrations/2025_06_23_233548_cantidad_ollas_pedidos.php diff --git a/database/seeds/CanastaSeeder.php b/server/database/seeds/CanastaSeeder.php similarity index 100% rename from database/seeds/CanastaSeeder.php rename to server/database/seeds/CanastaSeeder.php diff --git a/database/seeds/DatabaseSeeder.php b/server/database/seeds/DatabaseSeeder.php similarity index 100% rename from database/seeds/DatabaseSeeder.php rename to server/database/seeds/DatabaseSeeder.php diff --git a/database/seeds/GrupoDeCompraSeeder.php b/server/database/seeds/GrupoDeCompraSeeder.php similarity index 100% rename from database/seeds/GrupoDeCompraSeeder.php rename to server/database/seeds/GrupoDeCompraSeeder.php diff --git a/database/seeds/UserSeeder.php b/server/database/seeds/UserSeeder.php similarity index 100% rename from database/seeds/UserSeeder.php rename to server/database/seeds/UserSeeder.php diff --git a/database/seeds/UsuarioOllasSeeder.php b/server/database/seeds/UsuarioOllasSeeder.php similarity index 100% rename from database/seeds/UsuarioOllasSeeder.php rename to server/database/seeds/UsuarioOllasSeeder.php diff --git a/package-lock.json b/server/package-lock.json similarity index 100% rename from package-lock.json rename to server/package-lock.json diff --git a/package.json b/server/package.json similarity index 100% rename from package.json rename to server/package.json diff --git a/php/local.ini b/server/php/local.ini similarity index 100% rename from php/local.ini rename to server/php/local.ini diff --git a/phpunit.xml b/server/phpunit.xml similarity index 100% rename from phpunit.xml rename to server/phpunit.xml diff --git a/public/.htaccess b/server/public/.htaccess similarity index 100% rename from public/.htaccess rename to server/public/.htaccess diff --git a/public/assets/.directory b/server/public/assets/.directory similarity index 100% rename from public/assets/.directory rename to server/public/assets/.directory diff --git a/public/assets/chismosa.png b/server/public/assets/chismosa.png similarity index 100% rename from public/assets/chismosa.png rename to server/public/assets/chismosa.png diff --git a/public/assets/favicon.png b/server/public/assets/favicon.png similarity index 100% rename from public/assets/favicon.png rename to server/public/assets/favicon.png diff --git a/public/assets/logoMPS.png b/server/public/assets/logoMPS.png similarity index 100% rename from public/assets/logoMPS.png rename to server/public/assets/logoMPS.png diff --git a/public/assets/solidaria.png b/server/public/assets/solidaria.png similarity index 100% rename from public/assets/solidaria.png rename to server/public/assets/solidaria.png diff --git a/public/assets/uruguay.png b/server/public/assets/uruguay.png similarity index 100% rename from public/assets/uruguay.png rename to server/public/assets/uruguay.png diff --git a/public/favicon.ico b/server/public/favicon.ico similarity index 100% rename from public/favicon.ico rename to server/public/favicon.ico diff --git a/public/index.php b/server/public/index.php similarity index 100% rename from public/index.php rename to server/public/index.php diff --git a/public/robots.txt b/server/public/robots.txt similarity index 100% rename from public/robots.txt rename to server/public/robots.txt diff --git a/public/web.config b/server/public/web.config similarity index 100% rename from public/web.config rename to server/public/web.config diff --git a/resources/csv/barrios.csv b/server/resources/csv/barrios.csv similarity index 100% rename from resources/csv/barrios.csv rename to server/resources/csv/barrios.csv diff --git a/resources/csv/parametros.csv b/server/resources/csv/parametros.csv similarity index 100% rename from resources/csv/parametros.csv rename to server/resources/csv/parametros.csv diff --git a/resources/csv/productos.csv b/server/resources/csv/productos.csv similarity index 100% rename from resources/csv/productos.csv rename to server/resources/csv/productos.csv diff --git a/resources/csv/saldos.csv b/server/resources/csv/saldos.csv similarity index 100% rename from resources/csv/saldos.csv rename to server/resources/csv/saldos.csv diff --git a/resources/js/app.ts b/server/resources/js/app.ts similarity index 100% rename from resources/js/app.ts rename to server/resources/js/app.ts diff --git a/resources/js/components/AppLogin.vue b/server/resources/js/components/AppLogin.vue similarity index 100% rename from resources/js/components/AppLogin.vue rename to server/resources/js/components/AppLogin.vue diff --git a/resources/js/components/AppMain.vue b/server/resources/js/components/AppMain.vue similarity index 100% rename from resources/js/components/AppMain.vue rename to server/resources/js/components/AppMain.vue diff --git a/resources/js/components/admin/AdminNavBarBrand.vue b/server/resources/js/components/admin/AdminNavBarBrand.vue similarity index 100% rename from resources/js/components/admin/AdminNavBarBrand.vue rename to server/resources/js/components/admin/AdminNavBarBrand.vue diff --git a/resources/js/components/admin/Body.vue b/server/resources/js/components/admin/Body.vue similarity index 100% rename from resources/js/components/admin/Body.vue rename to server/resources/js/components/admin/Body.vue diff --git a/resources/js/components/admin/CaracteristicasOpcionales.vue b/server/resources/js/components/admin/CaracteristicasOpcionales.vue similarity index 100% rename from resources/js/components/admin/CaracteristicasOpcionales.vue rename to server/resources/js/components/admin/CaracteristicasOpcionales.vue diff --git a/resources/js/components/admin/DropdownDescargar.vue b/server/resources/js/components/admin/DropdownDescargar.vue similarity index 100% rename from resources/js/components/admin/DropdownDescargar.vue rename to server/resources/js/components/admin/DropdownDescargar.vue diff --git a/resources/js/components/admin/FilaCaracteristica.vue b/server/resources/js/components/admin/FilaCaracteristica.vue similarity index 100% rename from resources/js/components/admin/FilaCaracteristica.vue rename to server/resources/js/components/admin/FilaCaracteristica.vue diff --git a/resources/js/components/admin/FilaPedido.vue b/server/resources/js/components/admin/FilaPedido.vue similarity index 100% rename from resources/js/components/admin/FilaPedido.vue rename to server/resources/js/components/admin/FilaPedido.vue diff --git a/resources/js/components/admin/SwitchAprobacion.vue b/server/resources/js/components/admin/SwitchAprobacion.vue similarity index 100% rename from resources/js/components/admin/SwitchAprobacion.vue rename to server/resources/js/components/admin/SwitchAprobacion.vue diff --git a/resources/js/components/admin/TablaPedidos.vue b/server/resources/js/components/admin/TablaPedidos.vue similarity index 100% rename from resources/js/components/admin/TablaPedidos.vue rename to server/resources/js/components/admin/TablaPedidos.vue diff --git a/resources/js/components/comisiones/Body.vue b/server/resources/js/components/comisiones/Body.vue similarity index 100% rename from resources/js/components/comisiones/Body.vue rename to server/resources/js/components/comisiones/Body.vue diff --git a/resources/js/components/comisiones/ComisionesNavBarBrand.vue b/server/resources/js/components/comisiones/ComisionesNavBarBrand.vue similarity index 100% rename from resources/js/components/comisiones/ComisionesNavBarBrand.vue rename to server/resources/js/components/comisiones/ComisionesNavBarBrand.vue diff --git a/resources/js/components/comisiones/DropdownDescargar.vue b/server/resources/js/components/comisiones/DropdownDescargar.vue similarity index 100% rename from resources/js/components/comisiones/DropdownDescargar.vue rename to server/resources/js/components/comisiones/DropdownDescargar.vue diff --git a/resources/js/components/comisiones/canasta/CanastaInput.vue b/server/resources/js/components/comisiones/canasta/CanastaInput.vue similarity index 100% rename from resources/js/components/comisiones/canasta/CanastaInput.vue rename to server/resources/js/components/comisiones/canasta/CanastaInput.vue diff --git a/resources/js/components/comisiones/canasta/CanastaSeccion.vue b/server/resources/js/components/comisiones/canasta/CanastaSeccion.vue similarity index 100% rename from resources/js/components/comisiones/canasta/CanastaSeccion.vue rename to server/resources/js/components/comisiones/canasta/CanastaSeccion.vue diff --git a/resources/js/components/comisiones/parametros/FilaParametro.vue b/server/resources/js/components/comisiones/parametros/FilaParametro.vue similarity index 100% rename from resources/js/components/comisiones/parametros/FilaParametro.vue rename to server/resources/js/components/comisiones/parametros/FilaParametro.vue diff --git a/resources/js/components/comisiones/parametros/ParametrosSeccion.vue b/server/resources/js/components/comisiones/parametros/ParametrosSeccion.vue similarity index 100% rename from resources/js/components/comisiones/parametros/ParametrosSeccion.vue rename to server/resources/js/components/comisiones/parametros/ParametrosSeccion.vue diff --git a/resources/js/components/comisiones/saldos/SaldoRow.vue b/server/resources/js/components/comisiones/saldos/SaldoRow.vue similarity index 100% rename from resources/js/components/comisiones/saldos/SaldoRow.vue rename to server/resources/js/components/comisiones/saldos/SaldoRow.vue diff --git a/resources/js/components/comisiones/saldos/SaldosSeccion.vue b/server/resources/js/components/comisiones/saldos/SaldosSeccion.vue similarity index 100% rename from resources/js/components/comisiones/saldos/SaldosSeccion.vue rename to server/resources/js/components/comisiones/saldos/SaldosSeccion.vue diff --git a/resources/js/components/comisiones/saldos/TablaSaldos.vue b/server/resources/js/components/comisiones/saldos/TablaSaldos.vue similarity index 100% rename from resources/js/components/comisiones/saldos/TablaSaldos.vue rename to server/resources/js/components/comisiones/saldos/TablaSaldos.vue diff --git a/resources/js/components/comunes/Burger.vue b/server/resources/js/components/comunes/Burger.vue similarity index 100% rename from resources/js/components/comunes/Burger.vue rename to server/resources/js/components/comunes/Burger.vue diff --git a/resources/js/components/comunes/InfoTags.vue b/server/resources/js/components/comunes/InfoTags.vue similarity index 100% rename from resources/js/components/comunes/InfoTags.vue rename to server/resources/js/components/comunes/InfoTags.vue diff --git a/resources/js/components/comunes/InputFileButton.vue b/server/resources/js/components/comunes/InputFileButton.vue similarity index 100% rename from resources/js/components/comunes/InputFileButton.vue rename to server/resources/js/components/comunes/InputFileButton.vue diff --git a/resources/js/components/comunes/NavBar.vue b/server/resources/js/components/comunes/NavBar.vue similarity index 100% rename from resources/js/components/comunes/NavBar.vue rename to server/resources/js/components/comunes/NavBar.vue diff --git a/resources/js/components/comunes/TabsSecciones.vue b/server/resources/js/components/comunes/TabsSecciones.vue similarity index 100% rename from resources/js/components/comunes/TabsSecciones.vue rename to server/resources/js/components/comunes/TabsSecciones.vue diff --git a/resources/js/components/login/LoginDropdown.vue b/server/resources/js/components/login/LoginDropdown.vue similarity index 100% rename from resources/js/components/login/LoginDropdown.vue rename to server/resources/js/components/login/LoginDropdown.vue diff --git a/resources/js/components/login/LoginInput.vue b/server/resources/js/components/login/LoginInput.vue similarity index 100% rename from resources/js/components/login/LoginInput.vue rename to server/resources/js/components/login/LoginInput.vue diff --git a/resources/js/components/login/LoginTitulos.vue b/server/resources/js/components/login/LoginTitulos.vue similarity index 100% rename from resources/js/components/login/LoginTitulos.vue rename to server/resources/js/components/login/LoginTitulos.vue diff --git a/resources/js/components/login/input/BarrioLogin.vue b/server/resources/js/components/login/input/BarrioLogin.vue similarity index 100% rename from resources/js/components/login/input/BarrioLogin.vue rename to server/resources/js/components/login/input/BarrioLogin.vue diff --git a/resources/js/components/login/input/PasswordInput.vue b/server/resources/js/components/login/input/PasswordInput.vue similarity index 100% rename from resources/js/components/login/input/PasswordInput.vue rename to server/resources/js/components/login/input/PasswordInput.vue diff --git a/resources/js/components/login/input/UserLogin.vue b/server/resources/js/components/login/input/UserLogin.vue similarity index 100% rename from resources/js/components/login/input/UserLogin.vue rename to server/resources/js/components/login/input/UserLogin.vue diff --git a/resources/js/components/login/input/barrio/BarrioSelect.vue b/server/resources/js/components/login/input/barrio/BarrioSelect.vue similarity index 100% rename from resources/js/components/login/input/barrio/BarrioSelect.vue rename to server/resources/js/components/login/input/barrio/BarrioSelect.vue diff --git a/resources/js/components/login/input/barrio/RegionSelect.vue b/server/resources/js/components/login/input/barrio/RegionSelect.vue similarity index 100% rename from resources/js/components/login/input/barrio/RegionSelect.vue rename to server/resources/js/components/login/input/barrio/RegionSelect.vue diff --git a/resources/js/components/login/input/user/UserInput.vue b/server/resources/js/components/login/input/user/UserInput.vue similarity index 100% rename from resources/js/components/login/input/user/UserInput.vue rename to server/resources/js/components/login/input/user/UserInput.vue diff --git a/resources/js/components/ollas/CantidadOllas.vue b/server/resources/js/components/ollas/CantidadOllas.vue similarity index 100% rename from resources/js/components/ollas/CantidadOllas.vue rename to server/resources/js/components/ollas/CantidadOllas.vue diff --git a/resources/js/components/ollas/OllasBody.vue b/server/resources/js/components/ollas/OllasBody.vue similarity index 100% rename from resources/js/components/ollas/OllasBody.vue rename to server/resources/js/components/ollas/OllasBody.vue diff --git a/resources/js/components/ollas/OllasNavBarBrand.vue b/server/resources/js/components/ollas/OllasNavBarBrand.vue similarity index 100% rename from resources/js/components/ollas/OllasNavBarBrand.vue rename to server/resources/js/components/ollas/OllasNavBarBrand.vue diff --git a/resources/js/components/pedidos/Body.vue b/server/resources/js/components/pedidos/Body.vue similarity index 100% rename from resources/js/components/pedidos/Body.vue rename to server/resources/js/components/pedidos/Body.vue diff --git a/resources/js/components/pedidos/Buscador.vue b/server/resources/js/components/pedidos/Buscador.vue similarity index 100% rename from resources/js/components/pedidos/Buscador.vue rename to server/resources/js/components/pedidos/Buscador.vue diff --git a/resources/js/components/pedidos/Canasta.vue b/server/resources/js/components/pedidos/Canasta.vue similarity index 100% rename from resources/js/components/pedidos/Canasta.vue rename to server/resources/js/components/pedidos/Canasta.vue diff --git a/resources/js/components/pedidos/CartelPedidoAprobado.vue b/server/resources/js/components/pedidos/CartelPedidoAprobado.vue similarity index 100% rename from resources/js/components/pedidos/CartelPedidoAprobado.vue rename to server/resources/js/components/pedidos/CartelPedidoAprobado.vue diff --git a/resources/js/components/pedidos/CategoriasContainer.vue b/server/resources/js/components/pedidos/CategoriasContainer.vue similarity index 100% rename from resources/js/components/pedidos/CategoriasContainer.vue rename to server/resources/js/components/pedidos/CategoriasContainer.vue diff --git a/resources/js/components/pedidos/Chismosa.vue b/server/resources/js/components/pedidos/Chismosa.vue similarity index 100% rename from resources/js/components/pedidos/Chismosa.vue rename to server/resources/js/components/pedidos/Chismosa.vue diff --git a/resources/js/components/pedidos/ChismosaDropdown.vue b/server/resources/js/components/pedidos/ChismosaDropdown.vue similarity index 100% rename from resources/js/components/pedidos/ChismosaDropdown.vue rename to server/resources/js/components/pedidos/ChismosaDropdown.vue diff --git a/resources/js/components/pedidos/DevolucionesModal.vue b/server/resources/js/components/pedidos/DevolucionesModal.vue similarity index 100% rename from resources/js/components/pedidos/DevolucionesModal.vue rename to server/resources/js/components/pedidos/DevolucionesModal.vue diff --git a/resources/js/components/pedidos/NavMigas.vue b/server/resources/js/components/pedidos/NavMigas.vue similarity index 100% rename from resources/js/components/pedidos/NavMigas.vue rename to server/resources/js/components/pedidos/NavMigas.vue diff --git a/resources/js/components/pedidos/PedidoSelect.vue b/server/resources/js/components/pedidos/PedidoSelect.vue similarity index 100% rename from resources/js/components/pedidos/PedidoSelect.vue rename to server/resources/js/components/pedidos/PedidoSelect.vue diff --git a/resources/js/components/pedidos/PedidosMain.vue b/server/resources/js/components/pedidos/PedidosMain.vue similarity index 100% rename from resources/js/components/pedidos/PedidosMain.vue rename to server/resources/js/components/pedidos/PedidosMain.vue diff --git a/resources/js/components/pedidos/PedidosNavBarBrand.vue b/server/resources/js/components/pedidos/PedidosNavBarBrand.vue similarity index 100% rename from resources/js/components/pedidos/PedidosNavBarBrand.vue rename to server/resources/js/components/pedidos/PedidosNavBarBrand.vue diff --git a/resources/js/components/pedidos/ProductoCantidad.vue b/server/resources/js/components/pedidos/ProductoCantidad.vue similarity index 100% rename from resources/js/components/pedidos/ProductoCantidad.vue rename to server/resources/js/components/pedidos/ProductoCantidad.vue diff --git a/resources/js/components/pedidos/ProductoCard.vue b/server/resources/js/components/pedidos/ProductoCard.vue similarity index 100% rename from resources/js/components/pedidos/ProductoCard.vue rename to server/resources/js/components/pedidos/ProductoCard.vue diff --git a/resources/js/components/pedidos/ProductoRow.vue b/server/resources/js/components/pedidos/ProductoRow.vue similarity index 100% rename from resources/js/components/pedidos/ProductoRow.vue rename to server/resources/js/components/pedidos/ProductoRow.vue diff --git a/resources/js/components/pedidos/ProductosContainer.vue b/server/resources/js/components/pedidos/ProductosContainer.vue similarity index 100% rename from resources/js/components/pedidos/ProductosContainer.vue rename to server/resources/js/components/pedidos/ProductosContainer.vue diff --git a/resources/js/globals.d.ts b/server/resources/js/globals.d.ts similarity index 100% rename from resources/js/globals.d.ts rename to server/resources/js/globals.d.ts diff --git a/resources/js/shims-vue.d.ts b/server/resources/js/shims-vue.d.ts similarity index 100% rename from resources/js/shims-vue.d.ts rename to server/resources/js/shims-vue.d.ts diff --git a/resources/js/store/comunes.ts b/server/resources/js/store/comunes.ts similarity index 100% rename from resources/js/store/comunes.ts rename to server/resources/js/store/comunes.ts diff --git a/resources/js/store/index.ts b/server/resources/js/store/index.ts similarity index 100% rename from resources/js/store/index.ts rename to server/resources/js/store/index.ts diff --git a/resources/js/store/modules/admin/index.ts b/server/resources/js/store/modules/admin/index.ts similarity index 100% rename from resources/js/store/modules/admin/index.ts rename to server/resources/js/store/modules/admin/index.ts diff --git a/resources/js/store/modules/admin/types.ts b/server/resources/js/store/modules/admin/types.ts similarity index 100% rename from resources/js/store/modules/admin/types.ts rename to server/resources/js/store/modules/admin/types.ts diff --git a/resources/js/store/modules/comisiones/index.ts b/server/resources/js/store/modules/comisiones/index.ts similarity index 100% rename from resources/js/store/modules/comisiones/index.ts rename to server/resources/js/store/modules/comisiones/index.ts diff --git a/resources/js/store/modules/comisiones/types.ts b/server/resources/js/store/modules/comisiones/types.ts similarity index 100% rename from resources/js/store/modules/comisiones/types.ts rename to server/resources/js/store/modules/comisiones/types.ts diff --git a/resources/js/store/modules/login/index.ts b/server/resources/js/store/modules/login/index.ts similarity index 100% rename from resources/js/store/modules/login/index.ts rename to server/resources/js/store/modules/login/index.ts diff --git a/resources/js/store/modules/login/types.ts b/server/resources/js/store/modules/login/types.ts similarity index 100% rename from resources/js/store/modules/login/types.ts rename to server/resources/js/store/modules/login/types.ts diff --git a/resources/js/store/modules/ollas.js b/server/resources/js/store/modules/ollas.js similarity index 100% rename from resources/js/store/modules/ollas.js rename to server/resources/js/store/modules/ollas.js diff --git a/resources/js/store/modules/pedido/index.ts b/server/resources/js/store/modules/pedido/index.ts similarity index 100% rename from resources/js/store/modules/pedido/index.ts rename to server/resources/js/store/modules/pedido/index.ts diff --git a/resources/js/store/modules/pedido/types.ts b/server/resources/js/store/modules/pedido/types.ts similarity index 100% rename from resources/js/store/modules/pedido/types.ts rename to server/resources/js/store/modules/pedido/types.ts diff --git a/resources/js/store/modules/productos/index.ts b/server/resources/js/store/modules/productos/index.ts similarity index 100% rename from resources/js/store/modules/productos/index.ts rename to server/resources/js/store/modules/productos/index.ts diff --git a/resources/js/store/modules/productos/types.ts b/server/resources/js/store/modules/productos/types.ts similarity index 100% rename from resources/js/store/modules/productos/types.ts rename to server/resources/js/store/modules/productos/types.ts diff --git a/resources/js/store/modules/ui/index.ts b/server/resources/js/store/modules/ui/index.ts similarity index 100% rename from resources/js/store/modules/ui/index.ts rename to server/resources/js/store/modules/ui/index.ts diff --git a/resources/js/store/modules/ui/types.ts b/server/resources/js/store/modules/ui/types.ts similarity index 100% rename from resources/js/store/modules/ui/types.ts rename to server/resources/js/store/modules/ui/types.ts diff --git a/resources/lang/en/auth.php b/server/resources/lang/en/auth.php similarity index 100% rename from resources/lang/en/auth.php rename to server/resources/lang/en/auth.php diff --git a/resources/lang/en/pagination.php b/server/resources/lang/en/pagination.php similarity index 100% rename from resources/lang/en/pagination.php rename to server/resources/lang/en/pagination.php diff --git a/resources/lang/en/passwords.php b/server/resources/lang/en/passwords.php similarity index 100% rename from resources/lang/en/passwords.php rename to server/resources/lang/en/passwords.php diff --git a/resources/lang/en/validation.php b/server/resources/lang/en/validation.php similarity index 100% rename from resources/lang/en/validation.php rename to server/resources/lang/en/validation.php diff --git a/resources/sass/_variables.scss b/server/resources/sass/_variables.scss similarity index 100% rename from resources/sass/_variables.scss rename to server/resources/sass/_variables.scss diff --git a/resources/sass/app.scss b/server/resources/sass/app.scss similarity index 100% rename from resources/sass/app.scss rename to server/resources/sass/app.scss diff --git a/resources/views/auth/login.blade.php b/server/resources/views/auth/login.blade.php similarity index 100% rename from resources/views/auth/login.blade.php rename to server/resources/views/auth/login.blade.php diff --git a/resources/views/auth/passwords/confirm.blade.php b/server/resources/views/auth/passwords/confirm.blade.php similarity index 100% rename from resources/views/auth/passwords/confirm.blade.php rename to server/resources/views/auth/passwords/confirm.blade.php diff --git a/resources/views/auth/passwords/email.blade.php b/server/resources/views/auth/passwords/email.blade.php similarity index 100% rename from resources/views/auth/passwords/email.blade.php rename to server/resources/views/auth/passwords/email.blade.php diff --git a/resources/views/auth/passwords/reset.blade.php b/server/resources/views/auth/passwords/reset.blade.php similarity index 100% rename from resources/views/auth/passwords/reset.blade.php rename to server/resources/views/auth/passwords/reset.blade.php diff --git a/resources/views/auth/verify.blade.php b/server/resources/views/auth/verify.blade.php similarity index 100% rename from resources/views/auth/verify.blade.php rename to server/resources/views/auth/verify.blade.php diff --git a/resources/views/layouts/app.blade.php b/server/resources/views/layouts/app.blade.php similarity index 100% rename from resources/views/layouts/app.blade.php rename to server/resources/views/layouts/app.blade.php diff --git a/resources/views/main.blade.php b/server/resources/views/main.blade.php similarity index 100% rename from resources/views/main.blade.php rename to server/resources/views/main.blade.php diff --git a/resources/views/pdfgen/pedido_tabla.blade.php b/server/resources/views/pdfgen/pedido_tabla.blade.php similarity index 100% rename from resources/views/pdfgen/pedido_tabla.blade.php rename to server/resources/views/pdfgen/pedido_tabla.blade.php diff --git a/routes/api.php b/server/routes/api.php similarity index 100% rename from routes/api.php rename to server/routes/api.php diff --git a/routes/channels.php b/server/routes/channels.php similarity index 100% rename from routes/channels.php rename to server/routes/channels.php diff --git a/routes/console.php b/server/routes/console.php similarity index 100% rename from routes/console.php rename to server/routes/console.php diff --git a/routes/web.php b/server/routes/web.php similarity index 100% rename from routes/web.php rename to server/routes/web.php diff --git a/server.php b/server/server.php similarity index 100% rename from server.php rename to server/server.php diff --git a/storage/app/.gitignore b/server/storage/app/.gitignore similarity index 100% rename from storage/app/.gitignore rename to server/storage/app/.gitignore diff --git a/storage/app/public/.gitignore b/server/storage/app/public/.gitignore similarity index 100% rename from storage/app/public/.gitignore rename to server/storage/app/public/.gitignore diff --git a/storage/framework/.gitignore b/server/storage/framework/.gitignore similarity index 100% rename from storage/framework/.gitignore rename to server/storage/framework/.gitignore diff --git a/storage/framework/cache/.gitignore b/server/storage/framework/cache/.gitignore similarity index 100% rename from storage/framework/cache/.gitignore rename to server/storage/framework/cache/.gitignore diff --git a/storage/framework/cache/data/.gitignore b/server/storage/framework/cache/data/.gitignore similarity index 100% rename from storage/framework/cache/data/.gitignore rename to server/storage/framework/cache/data/.gitignore diff --git a/storage/framework/sessions/.gitignore b/server/storage/framework/sessions/.gitignore similarity index 100% rename from storage/framework/sessions/.gitignore rename to server/storage/framework/sessions/.gitignore diff --git a/storage/framework/testing/.gitignore b/server/storage/framework/testing/.gitignore similarity index 100% rename from storage/framework/testing/.gitignore rename to server/storage/framework/testing/.gitignore diff --git a/storage/framework/views/.gitignore b/server/storage/framework/views/.gitignore similarity index 100% rename from storage/framework/views/.gitignore rename to server/storage/framework/views/.gitignore diff --git a/storage/logs/.gitignore b/server/storage/logs/.gitignore similarity index 100% rename from storage/logs/.gitignore rename to server/storage/logs/.gitignore diff --git a/tests/CreatesApplication.php b/server/tests/CreatesApplication.php similarity index 100% rename from tests/CreatesApplication.php rename to server/tests/CreatesApplication.php diff --git a/tests/Feature/ExampleTest.php b/server/tests/Feature/ExampleTest.php similarity index 100% rename from tests/Feature/ExampleTest.php rename to server/tests/Feature/ExampleTest.php diff --git a/tests/TestCase.php b/server/tests/TestCase.php similarity index 100% rename from tests/TestCase.php rename to server/tests/TestCase.php diff --git a/tests/Unit/ExampleTest.php b/server/tests/Unit/ExampleTest.php similarity index 100% rename from tests/Unit/ExampleTest.php rename to server/tests/Unit/ExampleTest.php diff --git a/tsconfig.json b/server/tsconfig.json similarity index 100% rename from tsconfig.json rename to server/tsconfig.json diff --git a/vite.config.mjs b/server/vite.config.mjs similarity index 100% rename from vite.config.mjs rename to server/vite.config.mjs diff --git a/tee b/tee deleted file mode 100644 index e69de29..0000000 -- 2.48.1 From 50d65e5091242bfe8cd4ed97d12ce2252226bfb3 Mon Sep 17 00:00:00 2001 From: Ale Date: Sun, 31 Aug 2025 19:20:45 -0300 Subject: [PATCH 3/6] movido .styleci.yml a server --- .styleci.yml => server/.styleci.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .styleci.yml => server/.styleci.yml (100%) diff --git a/.styleci.yml b/server/.styleci.yml similarity index 100% rename from .styleci.yml rename to server/.styleci.yml -- 2.48.1 From 4f99e75d1d92e4cf15cfe56d021285c38fc047f2 Mon Sep 17 00:00:00 2001 From: Ale Date: Sun, 31 Aug 2025 21:43:14 -0300 Subject: [PATCH 4/6] Separado .env en dos, uno para server y otro para lo demas --- .docker-compose.yml.swp | Bin 1024 -> 0 bytes .env.example | 47 ---------------------------------------- server/.env.example | 24 ++++++++++++++++++++ 3 files changed, 24 insertions(+), 47 deletions(-) delete mode 100644 .docker-compose.yml.swp create mode 100644 server/.env.example diff --git a/.docker-compose.yml.swp b/.docker-compose.yml.swp deleted file mode 100644 index a18349a4b8c397a249e3e8e70eeba4e9e4696a50..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmYc?$V<%2S1{ExVL$=j=QA@T=A@#C;o=k|=9QGDQ(0Ez+^`0(GVC7fq@7C0A7(0Hvj+t diff --git a/.env.example b/.env.example index 4579169..fc54bdd 100644 --- a/.env.example +++ b/.env.example @@ -1,55 +1,8 @@ -APP_NAME="Pedidos MPS" -APP_ENV=local -APP_KEY= -APP_DEBUG=true -APP_URL=http://localhost - -VITE_DEV_SERVER_URL=http://vite:5173 - -LOG_CHANNEL=stack - USERID=1000 -DB_CONNECTION=mysql -DB_HOST=db DB_PORT_EXPOSED=3306 DB_DATABASE=pedi2 DB_USERNAME=pedi2 DB_PASSWORD=pedi2 -BROADCAST_DRIVER=log -CACHE_DRIVER=file -QUEUE_CONNECTION=sync -SESSION_DRIVER=file -SESSION_LIFETIME=120 - -REDIS_HOST=127.0.0.1 -REDIS_PASSWORD=null -REDIS_PORT=6379 - -MAIL_MAILER=smtp -MAIL_HOST=smtp.mailtrap.io -MAIL_PORT=2525 -MAIL_USERNAME=null -MAIL_PASSWORD=null -MAIL_ENCRYPTION=null -MAIL_FROM_ADDRESS=null -MAIL_FROM_NAME="${APP_NAME}" - -AWS_ACCESS_KEY_ID= -AWS_SECRET_ACCESS_KEY= -AWS_DEFAULT_REGION=us-east-1 -AWS_BUCKET= - -PUSHER_APP_ID= -PUSHER_APP_KEY= -PUSHER_APP_SECRET= -PUSHER_APP_CLUSTER=mt1 - -MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}" -MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}" - -WEB_CLIENT_EMAIL=informaticamps@buzon.uy -WEB_CLIENT_NAME=web -WEB_CLIENT_PASS=pass NGINX_PORT=8000 diff --git a/server/.env.example b/server/.env.example new file mode 100644 index 0000000..7a5a0be --- /dev/null +++ b/server/.env.example @@ -0,0 +1,24 @@ +APP_NAME="Pedidos MPS" +APP_ENV=local +APP_KEY= +APP_DEBUG=true +APP_URL=http://localhost + +VITE_DEV_SERVER_URL=http://vite:5173 + +#LOG_CHANNEL=stack + +DB_CONNECTION=mysql +DB_HOST=db +DB_PORT_EXPOSED=3306 +DB_DATABASE=pedi2 +DB_USERNAME=pedi2 +DB_PASSWORD=pedi2 + +#BROADCAST_DRIVER=log +#CACHE_DRIVER=file +#QUEUE_CONNECTION=sync +#SESSION_DRIVER=file +#SESSION_LIFETIME=120 + +NGINX_PORT=8000 -- 2.48.1 From bc32dd2d7ebcd075ecbfa27ca1867f22c1637cc1 Mon Sep 17 00:00:00 2001 From: Ale Date: Sun, 31 Aug 2025 21:44:02 -0300 Subject: [PATCH 5/6] Cambios de configuracion de usuario e instalacion de dependencias --- Dockerfile | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8c8c84c..5b4960d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,12 +28,20 @@ RUN docker-php-ext-install pdo_mysql mbstring exif pcntl bcmath gd zip # Get latest Composer COPY --from=composer:latest /usr/bin/composer /usr/bin/composer +COPY ./server/ /var/www + # Create system user to run Composer and Artisan Commands -RUN useradd -G www-data,root -u $uid -d /home/$user $user +RUN useradd -G www-data -u $uid -d /home/$user $user RUN mkdir -p /home/$user/.composer && \ - chown -R $user:$user /home/$user + chown -R $user:$user /home/$user && \ + chown -R $user:$user /var/www + # Set working directory WORKDIR /var/www USER $user + +RUN composer install && \ + php artisan key:generate && \ + npm install -- 2.48.1 From 4541caf1f7225c1e1a25477858105470f01eaafa Mon Sep 17 00:00:00 2001 From: Ale Date: Sun, 31 Aug 2025 21:44:46 -0300 Subject: [PATCH 6/6] docker-compose.yml adaptado a prod y agregado docker-compose.dev.yml para desarrollo --- docker-compose.dev.yml | 76 ++++++++++++++++++++++++++++++++++++++++++ docker-compose.yml | 32 ++++++++++-------- 2 files changed, 94 insertions(+), 14 deletions(-) create mode 100644 docker-compose.dev.yml diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml new file mode 100644 index 0000000..6292d8f --- /dev/null +++ b/docker-compose.dev.yml @@ -0,0 +1,76 @@ +version: '3.2' + +services: + app: + build: + args: + user: www + uid: ${USERID} + context: ./ + dockerfile: Dockerfile + image: laravel-image + container_name: pedi2-app + restart: unless-stopped + working_dir: /var/www/ + volumes: + - ./:/var/www + - ./php/local.ini:/usr/local/etc/php/conf.d/local.ini + networks: + - app-network + + vite: + build: + args: + user: www + uid: ${USERID} + context: ./ + container_name: vite + working_dir: /var/www + command: npm run dev + volumes: + - ./:/var/www + ports: + - "5173:5173" + networks: + - app-network + + db: + image: mysql:5.7 + container_name: pedi2-db + restart: unless-stopped + environment: + MYSQL_DATABASE: ${DB_DATABASE} + MYSQL_ROOT_PASSWORD: ${DB_PASSWORD} + MYSQL_PASSWORD: ${DB_PASSWORD} + MYSQL_USER: ${DB_USERNAME} + SERVICE_TAGS: dev + SERVICE_NAME: mysql + volumes: + - ./mysql/my.cnf:/etc/mysql/my.cnf + - ./mysql/docker-entrypoint-initdb.d/:/docker-entrypoint-initdb.d/ + - dbdata:/var/lib/mysql + networks: + - app-network + ports: + - ${DB_PORT_EXPOSED}:3306 + + nginx: + image: nginx:alpine + container_name: pedi2-nginx + restart: unless-stopped + ports: + - ${NGINX_PORT}:80 + volumes: + - ./:/var/www + - ./nginx/conf.d/:/etc/nginx/conf.d/ + networks: + - app-network + +networks: + app-network: + driver: bridge + +#Volumes +volumes: + dbdata: + driver: local diff --git a/docker-compose.yml b/docker-compose.yml index 6292d8f..856ea16 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,27 +8,24 @@ services: uid: ${USERID} context: ./ dockerfile: Dockerfile - image: laravel-image + image: pedi2-server container_name: pedi2-app restart: unless-stopped working_dir: /var/www/ volumes: - - ./:/var/www - - ./php/local.ini:/usr/local/etc/php/conf.d/local.ini + - server-storage:/var/www/storage + - server-public:/var/www/public + - server-root:/var/www +# - ./php/local.ini:/usr/local/etc/php/conf.d/local.ini networks: - app-network vite: - build: - args: - user: www - uid: ${USERID} - context: ./ - container_name: vite - working_dir: /var/www + image: pedi2-server +# working_dir: /var/www command: npm run dev volumes: - - ./:/var/www + - server-public:/var/www/public ports: - "5173:5173" networks: @@ -46,8 +43,7 @@ services: SERVICE_TAGS: dev SERVICE_NAME: mysql volumes: - - ./mysql/my.cnf:/etc/mysql/my.cnf - - ./mysql/docker-entrypoint-initdb.d/:/docker-entrypoint-initdb.d/ +# - ./mysql/my.cnf:/etc/mysql/my.cnf - dbdata:/var/lib/mysql networks: - app-network @@ -61,7 +57,9 @@ services: ports: - ${NGINX_PORT}:80 volumes: - - ./:/var/www + - server-storage:/var/www/storage + - server-public:/var/www/public + - server-root:/var/www - ./nginx/conf.d/:/etc/nginx/conf.d/ networks: - app-network @@ -72,5 +70,11 @@ networks: #Volumes volumes: + server-root: + driver: local + server-storage: + driver: local + server-public: + driver: local dbdata: driver: local -- 2.48.1