From b9391aebc3e6d5f0a48a9b38877b341cfd124491 Mon Sep 17 00:00:00 2001
From: oscarhgsisas <oscarhgsisas@gmail.com>
Date: Fri, 8 Sep 2023 17:58:08 -0500
Subject: [PATCH 01/12] Fin de Socializacon

---
 .eslintrc.json                              | 35 ---------------------
 package.json                                |  9 ++----
 src/pages/Presentation/sections/Counters.js | 16 ++++++++++
 3 files changed, 19 insertions(+), 41 deletions(-)
 delete mode 100644 .eslintrc.json

diff --git a/.eslintrc.json b/.eslintrc.json
deleted file mode 100644
index 792b5cfa0..000000000
--- a/.eslintrc.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "env": {
-    "browser": true,
-    "es2021": true
-  },
-  "extends": ["eslint:recommended", "plugin:react/recommended", "prettier"],
-  "parserOptions": {
-    "ecmaFeatures": {
-      "jsx": true
-    },
-    "ecmaVersion": 12,
-    "sourceType": "module"
-  },
-  "plugins": ["react", "prettier"],
-  "rules": {
-    "prettier/prettier": [
-      "error",
-      {
-        "endOfLine": "auto"
-      }
-    ],
-    "react/react-in-jsx-scope": "off",
-    "react/jsx-filename-extension": [1, { "extensions": [".js", ".jsx"] }],
-    "react/jsx-props-no-spreading": [
-      1,
-      {
-        "custom": "ignore"
-      }
-    ],
-    "react/jsx-curly-spacing": [2, "never"],
-    "default-param-last": "off",
-    "react/display-name": "off"
-  },
-  "settings": { "import/resolver": { "node": { "paths": ["src"] } } }
-}
diff --git a/package.json b/package.json
index 950622e11..92cbca8c0 100644
--- a/package.json
+++ b/package.json
@@ -23,8 +23,10 @@
     "@testing-library/jest-dom": "5.16.5",
     "@testing-library/react": "14.0.0",
     "@testing-library/user-event": "14.4.3",
+    "axios": "^1.5.0",
     "chroma-js": "2.4.2",
     "flatpickr": "4.6.13",
+    "node-fetch": "^3.3.2",
     "prop-types": "15.8.1",
     "react": "18.2.0",
     "react-copy-to-clipboard": "5.1.0",
@@ -44,12 +46,7 @@
     "lint": "eslint ./src",
     "prettify": "prettier --write ."
   },
-  "eslintConfig": {
-    "extends": [
-      "react-app",
-      "react-app/jest"
-    ]
-  },
+  "eslintConfig": {},
   "browserslist": {
     "production": [
       ">0.2%",
diff --git a/src/pages/Presentation/sections/Counters.js b/src/pages/Presentation/sections/Counters.js
index 5b22ee930..5aebd5a0f 100644
--- a/src/pages/Presentation/sections/Counters.js
+++ b/src/pages/Presentation/sections/Counters.js
@@ -20,11 +20,25 @@ import Divider from "@mui/material/Divider";
 
 // Material Kit 2 React components
 import MKBox from "components/MKBox";
+import React from "react";
 
 // Material Kit 2 React examples
+import axios from "axios";
 import DefaultCounterCard from "examples/Cards/CounterCards/DefaultCounterCard";
 
 function Counters() {
+
+  const [ethPrice, setethPrice] = React.useState(50);
+
+  const baseURL="https://api.owlracle.info/v4/eth/gas?apikey=d75facf55eb54ea4825e69645f6d5e64"
+  const test = async() => {
+    axios.get(`${baseURL}`).then((response) => {
+      setethPrice(response.data.avgTx)
+    });
+  };
+
+
+
   return (
     <MKBox component="section" py={3}>
       <Container>
@@ -36,6 +50,8 @@ function Counters() {
               title="Coded Elements"
               description="From buttons, to inputs, navbars, alerts or cards, you are covered"
             />
+            <button onClick={test}>Press me</button>
+            <p>{ethPrice}</p>
           </Grid>
           <Grid item xs={12} md={4} display="flex">
             <Divider orientation="vertical" sx={{ display: { xs: "none", md: "block" }, mx: 0 }} />

From 06273072a3d47f18a5df93ca47d369302e527686 Mon Sep 17 00:00:00 2001
From: oscarhgsisas <oscarhgsisas@gmail.com>
Date: Fri, 8 Sep 2023 18:07:07 -0500
Subject: [PATCH 02/12] Titulo y Subtitulo de la pagina presentacion

---
 src/pages/Presentation/index.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/pages/Presentation/index.js b/src/pages/Presentation/index.js
index 8c14779dd..103a94dcf 100644
--- a/src/pages/Presentation/index.js
+++ b/src/pages/Presentation/index.js
@@ -83,7 +83,7 @@ function Presentation() {
                 },
               })}
             >
-              Material Kit 2 React{" "}
+              VENTA DE EMPANADAS{" "}
             </MKTypography>
             <MKTypography
               variant="body1"
@@ -92,8 +92,11 @@ function Presentation() {
               px={{ xs: 6, lg: 12 }}
               mt={1}
             >
-              Free & Open Source Web UI Kit built over ReactJS &amp; MUI. Join over 1.6 million
-              developers around the world.
+              <div class="row">
+                <div class="col-6">
+                  <h5 class="text-center">Precios: $2000</h5>
+                </div>
+              </div>
             </MKTypography>
           </Grid>
         </Container>

From 8c04b6f39a4b91d354ec4ddc91d0dffd864008fb Mon Sep 17 00:00:00 2001
From: gasanchez10 <ga.sanchez10@uniandes.edu.co>
Date: Fri, 8 Sep 2023 18:15:56 -0500
Subject: [PATCH 03/12] Test conflict

---
 src/App.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/App.js b/src/App.js
index 9809064ab..63e92c63f 100644
--- a/src/App.js
+++ b/src/App.js
@@ -56,7 +56,7 @@ export default function App() {
       <CssBaseline />
       <Routes>
         {getRoutes(routes)}
-        <Route path="/presentation" element={<Presentation />} />
+        <Route path="/nuevaruta" element={<Presentation />} />
         <Route path="*" element={<Navigate to="/presentation" />} />
       </Routes>
     </ThemeProvider>

From d0411a147cafff30a99a14c50d38f9748e01e8ee Mon Sep 17 00:00:00 2001
From: oscarhgsisas <oscarhgsisas@gmail.com>
Date: Fri, 8 Sep 2023 18:23:37 -0500
Subject: [PATCH 04/12] Cambios_De_Rutas

---
 src/App.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/App.js b/src/App.js
index 9809064ab..4f178667b 100644
--- a/src/App.js
+++ b/src/App.js
@@ -56,7 +56,7 @@ export default function App() {
       <CssBaseline />
       <Routes>
         {getRoutes(routes)}
-        <Route path="/presentation" element={<Presentation />} />
+        <Route path="/presentationju" element={<Presentation />} />
         <Route path="*" element={<Navigate to="/presentation" />} />
       </Routes>
     </ThemeProvider>

From 0f4f3d2404a34ebf1cc3a13240604787b0914f33 Mon Sep 17 00:00:00 2001
From: German Andres <german@Germans-MacBook-Air.local>
Date: Thu, 2 Nov 2023 17:34:38 -0500
Subject: [PATCH 05/12] Test3

---
 src/App.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/App.js b/src/App.js
index 4f178667b..9809064ab 100644
--- a/src/App.js
+++ b/src/App.js
@@ -56,7 +56,7 @@ export default function App() {
       <CssBaseline />
       <Routes>
         {getRoutes(routes)}
-        <Route path="/presentationju" element={<Presentation />} />
+        <Route path="/presentation" element={<Presentation />} />
         <Route path="*" element={<Navigate to="/presentation" />} />
       </Routes>
     </ThemeProvider>

From 6076575905b0fee2159358240f88175609b2c765 Mon Sep 17 00:00:00 2001
From: Luisa Sanchez <luisasanchez@MacBook-Air-de-German.local>
Date: Thu, 2 Nov 2023 17:49:55 -0500
Subject: [PATCH 06/12] prueba

---
 src/pages/Presentation/index.js             | 2 +-
 src/pages/Presentation/sections/Counters.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/Presentation/index.js b/src/pages/Presentation/index.js
index 103a94dcf..12a2594aa 100644
--- a/src/pages/Presentation/index.js
+++ b/src/pages/Presentation/index.js
@@ -94,7 +94,7 @@ function Presentation() {
             >
               <div class="row">
                 <div class="col-6">
-                  <h5 class="text-center">Precios: $2000</h5>
+                  <h5 class="text-center">Ricas y deliciosas empanadas</h5>
                 </div>
               </div>
             </MKTypography>
diff --git a/src/pages/Presentation/sections/Counters.js b/src/pages/Presentation/sections/Counters.js
index 5aebd5a0f..e8b2a86f1 100644
--- a/src/pages/Presentation/sections/Counters.js
+++ b/src/pages/Presentation/sections/Counters.js
@@ -47,7 +47,7 @@ function Counters() {
             <DefaultCounterCard
               count={70}
               suffix="+"
-              title="Coded Elements"
+              title="Elements"
               description="From buttons, to inputs, navbars, alerts or cards, you are covered"
             />
             <button onClick={test}>Press me</button>

From 49dd58fb6f717faaeb0526d6efeaa3da6e985cfe Mon Sep 17 00:00:00 2001
From: Fernanda Sanchez <fernandagsisas@gmail.com>
Date: Thu, 2 Nov 2023 18:04:01 -0500
Subject: [PATCH 07/12] prueba 2

---
 src/pages/Presentation/sections/Counters.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Presentation/sections/Counters.js b/src/pages/Presentation/sections/Counters.js
index e8b2a86f1..77f89c9f9 100644
--- a/src/pages/Presentation/sections/Counters.js
+++ b/src/pages/Presentation/sections/Counters.js
@@ -56,7 +56,7 @@ function Counters() {
           <Grid item xs={12} md={4} display="flex">
             <Divider orientation="vertical" sx={{ display: { xs: "none", md: "block" }, mx: 0 }} />
             <DefaultCounterCard
-              count={15}
+              count={5}
               suffix="+"
               title="Design Blocks"
               description="Mix the sections, change the colors and unleash your creativity"

From abfec367bbe224194982f4ec60e1911f39f89feb Mon Sep 17 00:00:00 2001
From: Fernanda Sanchez <fernandagsisas@gmail.com>
Date: Thu, 2 Nov 2023 18:07:44 -0500
Subject: [PATCH 08/12] prueba 3

---
 src/pages/Presentation/sections/Counters.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Presentation/sections/Counters.js b/src/pages/Presentation/sections/Counters.js
index 77f89c9f9..a6c7c247a 100644
--- a/src/pages/Presentation/sections/Counters.js
+++ b/src/pages/Presentation/sections/Counters.js
@@ -66,7 +66,7 @@ function Counters() {
           <Grid item xs={12} md={4}>
             <DefaultCounterCard
               count={4}
-              title="Pages"
+              title="Paes"
               description="Save 3-4 weeks of work when you use our pre-made pages for your website"
             />
           </Grid>

From b585d2c7b4ca850564485a48af01a5eb3492a130 Mon Sep 17 00:00:00 2001
From: Fernanda Sanchez <fernandagsisas@gmail.com>
Date: Thu, 2 Nov 2023 18:10:53 -0500
Subject: [PATCH 09/12] Prueba 4

---
 src/pages/Presentation/sections/Counters.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Presentation/sections/Counters.js b/src/pages/Presentation/sections/Counters.js
index a6c7c247a..3f0e7323f 100644
--- a/src/pages/Presentation/sections/Counters.js
+++ b/src/pages/Presentation/sections/Counters.js
@@ -48,7 +48,7 @@ function Counters() {
               count={70}
               suffix="+"
               title="Elements"
-              description="From buttons, to inputs, navbars, alerts or cards, you are covered"
+              description="Nevermind"
             />
             <button onClick={test}>Press me</button>
             <p>{ethPrice}</p>

From 33110a7cedaf955f9a63d9c0695deb6755754e80 Mon Sep 17 00:00:00 2001
From: Fernanda Sanchez <fernandagsisas@gmail.com>
Date: Thu, 2 Nov 2023 18:24:54 -0500
Subject: [PATCH 10/12] elem

---
 src/pages/Presentation/index.js             | 8 ++++----
 src/pages/Presentation/sections/Counters.js | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/pages/Presentation/index.js b/src/pages/Presentation/index.js
index 12a2594aa..9d1d3ad96 100644
--- a/src/pages/Presentation/index.js
+++ b/src/pages/Presentation/index.js
@@ -74,7 +74,7 @@ function Presentation() {
           <Grid container item xs={12} lg={7} justifyContent="center" mx="auto">
             <MKTypography
               variant="h1"
-              color="white"
+              color="Black"
               mt={-6}
               mb={1}
               sx={({ breakpoints, typography: { size } }) => ({
@@ -87,14 +87,14 @@ function Presentation() {
             </MKTypography>
             <MKTypography
               variant="body1"
-              color="white"
-              textAlign="center"
+              color="Cyan"
+              textAlign="left"
               px={{ xs: 6, lg: 12 }}
               mt={1}
             >
               <div class="row">
                 <div class="col-6">
-                  <h5 class="text-center">Ricas y deliciosas empanadas</h5>
+                  <h5 class="text-right">Ricas y deliciosas empanadas</h5>
                 </div>
               </div>
             </MKTypography>
diff --git a/src/pages/Presentation/sections/Counters.js b/src/pages/Presentation/sections/Counters.js
index 3f0e7323f..852ce04c0 100644
--- a/src/pages/Presentation/sections/Counters.js
+++ b/src/pages/Presentation/sections/Counters.js
@@ -50,11 +50,11 @@ function Counters() {
               title="Elements"
               description="Nevermind"
             />
-            <button onClick={test}>Press me</button>
+            <button onClick={test}>r</button>
             <p>{ethPrice}</p>
           </Grid>
           <Grid item xs={12} md={4} display="flex">
-            <Divider orientation="vertical" sx={{ display: { xs: "none", md: "block" }, mx: 0 }} />
+            <Divider orientation="horizontal" sx={{ display: { xs: "none", md: "block" }, mx: 0 }} />
             <DefaultCounterCard
               count={5}
               suffix="+"

From da94d26591675a7f9246e96973c97b5fabefb73d Mon Sep 17 00:00:00 2001
From: Fernanda Sanchez <fernandagsisas@gmail.com>
Date: Thu, 2 Nov 2023 18:26:22 -0500
Subject: [PATCH 11/12] Prueba 5

---
 src/pages/Presentation/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Presentation/index.js b/src/pages/Presentation/index.js
index 9d1d3ad96..9ec4e315c 100644
--- a/src/pages/Presentation/index.js
+++ b/src/pages/Presentation/index.js
@@ -74,7 +74,7 @@ function Presentation() {
           <Grid container item xs={12} lg={7} justifyContent="center" mx="auto">
             <MKTypography
               variant="h1"
-              color="Black"
+              color="Red"
               mt={-6}
               mb={1}
               sx={({ breakpoints, typography: { size } }) => ({

From 751a4b806fc09fe0ae021f41a7919eda6e4463e5 Mon Sep 17 00:00:00 2001
From: Fernanda Sanchez <fernandagsisas@gmail.com>
Date: Thu, 2 Nov 2023 18:43:07 -0500
Subject: [PATCH 12/12] Merge remote-tracking branch

---
 src/pages/Presentation/sections/Counters.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Presentation/sections/Counters.js b/src/pages/Presentation/sections/Counters.js
index 852ce04c0..605aaeb64 100644
--- a/src/pages/Presentation/sections/Counters.js
+++ b/src/pages/Presentation/sections/Counters.js
@@ -59,7 +59,7 @@ function Counters() {
               count={5}
               suffix="+"
               title="Design Blocks"
-              description="Mix the sections, change the colors and unleash your creativity"
+              description="mportancia ecológica: A pesar de su mala reputación, las arañas son esenciales para el equilibrio ecológico. Son depredadores naturales que controlan las poblaciones de insectos, lo que ayuda a regular los ecosistemas.M"
             />
             <Divider orientation="vertical" sx={{ display: { xs: "none", md: "block" }, ml: 0 }} />
           </Grid>