From cc365653346471b31450e0561a8b41f84dbd4f8a Mon Sep 17 00:00:00 2001 From: fede Date: Mon, 17 Feb 2025 00:12:57 -0300 Subject: [PATCH 1/7] finalmente lo tengo hecho viejaaa --- Aspnet/Controllers/AdminController.cs | 2 +- Aspnet/Controllers/ContratoController.cs | 4 ++-- Aspnet/Controllers/VentaController.cs | 2 +- Aspnet/Program.cs | 2 +- Aspnet/bin/Debug/net8.0/settings.json | 4 ++-- Aspnet/settings.json | 6 +++--- Entidades/Alquilafacilcontext.cs | 2 +- Entidades/makefile | 2 +- Front/src/stores/urlStore.ts | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Aspnet/Controllers/AdminController.cs b/Aspnet/Controllers/AdminController.cs index 1c7f319..d41d0e0 100644 --- a/Aspnet/Controllers/AdminController.cs +++ b/Aspnet/Controllers/AdminController.cs @@ -81,7 +81,7 @@ public class AdminController: ControllerBase if (mcon == null) throw new Exception(); mc = new MinioClient().WithCredentials(mcon.usr, mcon.scrt) - .WithEndpoint("192.168.1.11:9000") + .WithEndpoint("0.0.0.0:9000") .WithSSL(false) .Build(); } diff --git a/Aspnet/Controllers/ContratoController.cs b/Aspnet/Controllers/ContratoController.cs index 1f45809..0ee97c6 100644 --- a/Aspnet/Controllers/ContratoController.cs +++ b/Aspnet/Controllers/ContratoController.cs @@ -519,10 +519,10 @@ public class ContratoController: ControllerBase { if (mcon == null) throw new Exception(); mc = new MinioClient().WithCredentials(mcon.usr, mcon.scrt) - .WithEndpoint("192.168.1.11:9000") + .WithEndpoint("0.0.0.0:9000") .WithSSL(false) .Build(); - } + } } [HttpPost("api/contratos/subirContrato")] diff --git a/Aspnet/Controllers/VentaController.cs b/Aspnet/Controllers/VentaController.cs index 6518713..76706ca 100644 --- a/Aspnet/Controllers/VentaController.cs +++ b/Aspnet/Controllers/VentaController.cs @@ -225,7 +225,7 @@ public class VentaController:ControllerBase { if (mcon == null) throw new Exception(); mc = new MinioClient().WithCredentials(mcon.usr, mcon.scrt) - .WithEndpoint("192.168.1.11:9000") + .WithEndpoint("0.0.0.0:9000") .WithSSL(false) .Build(); } diff --git a/Aspnet/Program.cs b/Aspnet/Program.cs index 4ad5df2..aa81588 100644 --- a/Aspnet/Program.cs +++ b/Aspnet/Program.cs @@ -16,7 +16,7 @@ builder.Services.AddEndpointsApiExplorer(); builder.Services.AddSwaggerGen(); builder.Services.AddMinio(options => options .WithCredentials(mcon.usr, mcon.scrt) - .WithEndpoint("192.168.1.11:9000") + .WithEndpoint("127.0.0.0:9000") .WithSSL(false) .Build()); diff --git a/Aspnet/bin/Debug/net8.0/settings.json b/Aspnet/bin/Debug/net8.0/settings.json index b13e63f..ca7cba9 100644 --- a/Aspnet/bin/Debug/net8.0/settings.json +++ b/Aspnet/bin/Debug/net8.0/settings.json @@ -1,4 +1,4 @@ { - "usr":"u39RPWIpfVa5S67gGiNk", - "scrt":"UzNdqpwpao7Cjh3VSyvZVw7IIXW8SQ9c1F2JsttY" + "usr":"nwFNMLJcn5m0owbzeXMs", + "scrt":"Mf9HxTir5mIGwWSBtQXd6DRK2k00V0EyXk7QTu70" } diff --git a/Aspnet/settings.json b/Aspnet/settings.json index a595e0c..ca7cba9 100644 --- a/Aspnet/settings.json +++ b/Aspnet/settings.json @@ -1,4 +1,4 @@ { - "usr":"aVO9C3PqeK1hiPCyqZCj", - "scrt":"szj58kceWG3GcRZ8P1QCQiv5tSjMI7iD5zfjneTT" -} \ No newline at end of file + "usr":"nwFNMLJcn5m0owbzeXMs", + "scrt":"Mf9HxTir5mIGwWSBtQXd6DRK2k00V0EyXk7QTu70" +} diff --git a/Entidades/Alquilafacilcontext.cs b/Entidades/Alquilafacilcontext.cs index 1412713..f986a48 100644 --- a/Entidades/Alquilafacilcontext.cs +++ b/Entidades/Alquilafacilcontext.cs @@ -55,7 +55,7 @@ public partial class AlquilaFacilContext : DbContext protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) #warning To protect potentially sensitive information in your connection string, you should move it out of source code. You can avoid scaffolding the connection string by using the Name= syntax to read it from configuration - see https://go.microsoft.com/fwlink/?linkid=2131148. For more guidance on storing connection strings, see https://go.microsoft.com/fwlink/?LinkId=723263. - => optionsBuilder.UseMySQL("Server=fedesrv.ddns.net;Port=30006;Database=AlquilaFacil;Uid=AlquilaFacil;Pwd=.n@9c2ve*0,b1ETv].Kipa/~pR~V;Connection Timeout=5;SslMode=none"); + => optionsBuilder.UseMySQL("Server=127.0.0.1;Port=3306;Database=AlquilaFacil;Uid=AlquilaFacil;Pwd=.n@9c2ve*0,b1ETv].Kipa/~pR~V;Connection Timeout=5;SslMode=none"); protected override void OnModelCreating(ModelBuilder modelBuilder) { diff --git a/Entidades/makefile b/Entidades/makefile index cdf19d7..b9d75c1 100644 --- a/Entidades/makefile +++ b/Entidades/makefile @@ -1,5 +1,5 @@ run: - dotnet ef dbcontext scaffold "Server=fedesrv.ddns.net;Port=30006;Database=AlquilaFacil;Uid=AlquilaFacil;Pwd=.n@9c2ve*0,b1ETv].Kipa/~pR~V;Connection Timeout=5;SslMode=none" MySql.EntityFrameworkCore -o . + dotnet ef dbcontext scaffold "Server=127.0.0.1;Port=3306;Database=AlquilaFacil;Uid=AlquilaFacil;Pwd=.n@9c2ve*0,b1ETv].Kipa/~pR~V;Connection Timeout=5;SslMode=none" MySql.EntityFrameworkCore -o . ./convert_to_pascalcase.sh clean: diff --git a/Front/src/stores/urlStore.ts b/Front/src/stores/urlStore.ts index 9264716..bea7d68 100644 --- a/Front/src/stores/urlStore.ts +++ b/Front/src/stores/urlStore.ts @@ -1,3 +1,3 @@ import { readable, type Readable } from 'svelte/store'; -export const urlG: Readable = readable('https://fedesrv.ddns.net'); +export const urlG: Readable = readable('http://127.0.0.1:5007'); From 22d68d4ce90bede264b0ed083ff1b1038ee6579e Mon Sep 17 00:00:00 2001 From: fede Date: Mon, 17 Feb 2025 17:11:18 -0300 Subject: [PATCH 2/7] =?UTF-8?q?mal=20uso=20de=20la=20palabra=20ac=C3=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: fede --- Front/src/Componentes/ModalVeryAceptarContrato.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Front/src/Componentes/ModalVeryAceptarContrato.svelte b/Front/src/Componentes/ModalVeryAceptarContrato.svelte index 92cbbd4..723fa89 100644 --- a/Front/src/Componentes/ModalVeryAceptarContrato.svelte +++ b/Front/src/Componentes/ModalVeryAceptarContrato.svelte @@ -59,7 +59,7 @@ disabled={!contratoDescargado} /> From 6c58c6da788b4c22e06eeb1096ec8ae9f9eee931 Mon Sep 17 00:00:00 2001 From: fede Date: Wed, 5 Mar 2025 19:07:20 -0300 Subject: [PATCH 3/7] cambios en el acceso no me preocupo porque queda tocar esto --- Aspnet/Controllers/ContratoController.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Aspnet/Controllers/ContratoController.cs b/Aspnet/Controllers/ContratoController.cs index 0ee97c6..f617f37 100644 --- a/Aspnet/Controllers/ContratoController.cs +++ b/Aspnet/Controllers/ContratoController.cs @@ -768,7 +768,7 @@ public class ContratoController: ControllerBase { Contrato? cont = RepositorioContratos.Singleton.ObtenerContratoPorId(idcontrato); if (cont == null) return BadRequest(); - if (cont.Dniinquilino != cli.Dni && cont.Dnipropietario != cli.Dni) return BadRequest(); + if ((cont.Dniinquilino != cli.Dni && cont.Dnipropietario != cli.Dni)|| !RepositorioGrupos.Singleton.CheckGrupos(Auth, "Admin")) return BadRequest(); var list = cont.Idgarantes; List l = new(); @@ -835,4 +835,4 @@ public class ContratoController: ControllerBase { return ret; } -} \ No newline at end of file +} From 21724a372fcdfa1b6e995fc49ff612de9409d337 Mon Sep 17 00:00:00 2001 From: fede Date: Wed, 5 Mar 2025 19:08:11 -0300 Subject: [PATCH 4/7] =?UTF-8?q?a=C3=B1ado=20bootstrap=20como=20dependencia?= =?UTF-8?q?=20para=20que=20carge=20sin=20conexion?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Front/package-lock.json | 20 ++++++++++++++++++++ Front/package.json | 1 + Front/src/App.svelte | 1 + 3 files changed, 22 insertions(+) diff --git a/Front/package-lock.json b/Front/package-lock.json index e879516..5f90268 100644 --- a/Front/package-lock.json +++ b/Front/package-lock.json @@ -9,6 +9,7 @@ "version": "0.0.0", "dependencies": { "@sveltestrap/sveltestrap": "^6.2.8", + "bootstrap": "^5.3.3", "chartjs": "^0.3.24", "svelte-routing": "^2.13.0" }, @@ -206,6 +207,25 @@ "node": ">= 0.4" } }, + "node_modules/bootstrap": { + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.3.tgz", + "integrity": "sha512-8HLCdWgyoMguSO9o+aH+iuZ+aht+mzW0u3HIMzVu7Srrpv7EBBxTnrFlSCskwdY1+EOFQSm7uMJhNQHkdPcmjg==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/twbs" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/bootstrap" + } + ], + "license": "MIT", + "peerDependencies": { + "@popperjs/core": "^2.11.8" + } + }, "node_modules/chartjs": { "version": "0.3.24", "license": "MIT" diff --git a/Front/package.json b/Front/package.json index 4dc3054..e9fd606 100644 --- a/Front/package.json +++ b/Front/package.json @@ -22,6 +22,7 @@ }, "dependencies": { "@sveltestrap/sveltestrap": "^6.2.8", + "bootstrap": "^5.3.3", "chartjs": "^0.3.24", "svelte-routing": "^2.13.0" } diff --git a/Front/src/App.svelte b/Front/src/App.svelte index b5870a8..59f47f0 100644 --- a/Front/src/App.svelte +++ b/Front/src/App.svelte @@ -1,4 +1,5 @@