Skip to content

Commit

Permalink
Ajuste sin apiBaseUrl
Browse files Browse the repository at this point in the history
  • Loading branch information
@PELUQAZ
PELUQAZ committed Dec 8, 2024
1 parent d6dc9f1 commit 95ab2af
Show file tree
Hide file tree
Showing 2 changed files with 57 additions and 47 deletions.
92 changes: 52 additions & 40 deletions test/front/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,64 +28,76 @@

<body>

<h3>Datos del Acuerdo</h3>
<div class="form-container">

<!-- Campos adicionales -->
<label for="servicePayer">Wallet pagador servicio (empresa):</label>
<input type="text" id="servicePayer" placeholder="Wallet empresa" class="wallet-input"><br><br>
<h3 class="titulo" id="titulo">Datos del Acuerdo</h3>

<label for="serviceProvider">Wallet proveedor servicio (freelancer):</label>
<input type="text" id="serviceProvider" value="0x8789dcfCC65FaF09bFF9CE6a37188062585d1B9A"
placeholder="Wallet freelancer" class="wallet-input"><br><br>
<form id="user-form">
<div class="row">
<div class="col-xs-12 col-md-6">

<label for="arbitrator">Wallet árbitro:</label>
<input type="text" id="arbitrator" value="0x0aE67cE895B26BdAb093542c8783b985a243E60C" placeholder="Wallet árbitro"
class="wallet-input"><br><br>
<!-- Campos adicionales -->
<label for="servicePayer">Wallet pagador servicio (empresa):</label>
<input type="text" id="servicePayer" placeholder="Wallet empresa" class="wallet-input"><br><br>

<label for="startDate">Fecha inicio:</label>
<input type="date" id="startDate"><br><br>
<label for="serviceProvider">Wallet proveedor servicio (freelancer):</label>
<input type="text" id="serviceProvider" value="0x8789dcfCC65FaF09bFF9CE6a37188062585d1B9A"
placeholder="Wallet freelancer" class="wallet-input"><br><br>

<label for="endDate">Fecha fin:</label>
<input type="date" id="endDate"><br><br>
<label for="arbitrator">Wallet árbitro:</label>
<input type="text" id="arbitrator" value="0x0aE67cE895B26BdAb093542c8783b985a243E60C"
placeholder="Wallet árbitro" class="wallet-input"><br><br>

<label for="numHours">Nro. horas:</label>
<input type="number" id="numHours" min="0" step="1" value="40"><br><br>
<label for="startDate">Fecha inicio:</label>
<input type="date" id="startDate"><br><br>

<label for="hourlyRate">Valor hora (USDC):</label>
<input type="number" id="hourlyRate" min="0" step="0.01" value="30" placeholder="USD $"><br><br>
<label for="endDate">Fecha fin:</label>
<input type="date" id="endDate"><br><br>

<label for="agreementAmount">Monto acuerdo (USDC):</label>
<input type="text" id="agreementAmount" readonly placeholder="USD $" value="1200"><br><br>
<label for="numHours">Nro. horas:</label>
<input type="number" id="numHours" min="0" step="1" value="40"><br><br>

<label for="agreementAmount">Fee de arbitraje (USDC):</label>
<input type="text" id="arbitrateFee" readonly placeholder="USD $" value="0.3" class="fee-input"><br><br>
<label for="hourlyRate">Valor hora (USDC):</label>
<input type="number" id="hourlyRate" min="0" step="0.01" value="30" placeholder="USD $"><br><br>

<label for="agreementAmount">Fee DAO (USDC):</label>
<input type="text" id="daoFee" readonly placeholder="USD $" value="0.5" class="fee-input"><br><br>
<label for="agreementAmount">Monto acuerdo (USDC):</label>
<input type="text" id="agreementAmount" readonly placeholder="USD $" value="1200"><br><br>

</br>
<label for="agreementAmount">Fee de arbitraje (USDC):</label>
<input type="text" id="arbitrateFee" readonly placeholder="USD $" value="0.3"
class="fee-input"><br><br>

<button id="connectWallet">Conectar wallet</button>
<button id="createAgreement">Crear acuerdo (SPA y SPR?)</button>
<label for="agreementAmount">Fee DAO (USDC):</label>
<input type="text" id="daoFee" readonly placeholder="USD $" value="0.5" class="fee-input"><br><br>

</br></br>
</br>

<!-- <button id="createAgreementByApi">Crear acuerdo (API)</button></br></br> -->
<!-- <button id="getAgreement">Consultar acuerdo (requiere quemar clave privada)</button></br></br> -->
<button id="connectWallet">Conectar wallet</button>
<button id="createAgreement">Crear acuerdo (SPA y SPR?)</button>

<!-- Campo de texto para ingresar el ID del acuerdo -->
<label for="agreementId">Id acuerdo:</label>
<input type="number" id="agreementId" min="0" step="1" placeholder="Ingresa ID del acuerdo" required
class="wallet-input">
<button id="getAgreement">Consultar acuerdo</button>
</br></br>

<!--<button id="updateState">Actualizar estado</button>-->
<!-- <button id="createAgreementByApi">Crear acuerdo (API)</button></br></br> -->
<!-- <button id="getAgreement">Consultar acuerdo (requiere quemar clave privada)</button></br></br> -->

</br></br></br>
<!-- Campo de texto para ingresar el ID del acuerdo -->
<label for="agreementId">Id acuerdo:</label>
<input type="number" id="agreementId" min="0" step="1" placeholder="Ingresa ID del acuerdo" required
class="wallet-input">
<button id="getAgreement">Consultar acuerdo</button>

<button id="disagreement">Desacuerdo (SPA y SPR)</button>
<button id="resolveDisagreement">Resolver desacuerdo (ARB)</button>
<button id="payAgreement">Pagar acuerdo (WMC-AGR-PAY)</button>
<!--<button id="updateState">Actualizar estado</button>-->

</br></br></br>

<button id="disagreement">Desacuerdo (SPA y SPR)</button>
<button id="resolveDisagreement">Resolver desacuerdo (ARB)</button>
<button id="payAgreement">Pagar acuerdo (WMC-Agreements-Payer)</button>

</div>
</div>
</form>
</div>

<script src="ethers.umd.min.js"></script>
<script src="wmc-front-script.js"></script>
Expand Down
12 changes: 5 additions & 7 deletions test/front/wmc-front-script.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ let contractAddress;
let usdcTokenAddress;
let contractABI;
let signer;
let apiBaseUrl; // = window.location.hostname === '127.0.0.1' ? 'http://localhost:3000' : 'https://wmc-agreements-app-hncub6e4edcphph5.canadacentral-01.azurewebsites.net';
//let apiBaseUrl; // = window.location.hostname === '127.0.0.1' ? 'http://localhost:3000' : 'https://wmc-agreements-app-hncub6e4edcphph5.canadacentral-01.azurewebsites.net';

// Carga el ABI dinámicamente desde el archivo generado por Hardhat
async function loadABI() {
Expand All @@ -22,18 +22,16 @@ async function loadABI() {
// Carga la configuración desde config.json
async function loadConfig() {
try {
// Detecta el entorno actual y construye la URL base
const baseUrl = window.location.hostname === '127.0.0.1' ?
'http://localhost:3000' : window.location.origin
//// Detecta el entorno actual y construye la URL base
//const baseUrl = window.location.hostname === '127.0.0.1' ? 'http://localhost:3000' : window.location.origin
//const response = await fetch("/api/config");
//const response = await fetch("http://localhost:3000/api/config");
//const response = await fetch(`${baseUrl}/api/config`);

//const config = await response.json();
//apiBaseUrl = baseUrl; //config.apiBaseUrl;

contractAddress = '0xE2e2b4297c51bF174b656F064BA3cb82095A5399'; //config.contractAddress;
usdcTokenAddress = '0x3c499c542cEF5E3811e1192ce70d8cC03d5c3359'; //config.usdcTokenAddress;
apiBaseUrl = baseUrl; //config.apiBaseUrl;

} catch (error) {
console.error("Error al cargar config.json:", error);
}
Expand Down

0 comments on commit 95ab2af

Please sign in to comment.