Merge branch '86-añadir-sistema-de-ayuda' of https://github.com/Arqui…

…soft/wiq_es1a into 86-añadir-sistema-de-ayuda
Arquisoft · Apr 27, 2024 · 32c9849 · 32c9849
2 parents d908876 + a8ab90c
commit 32c9849
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 1 deletion.
diff --git a/webapp/src/App.js b/webapp/src/App.js
@@ -23,7 +23,7 @@ import History from "./pages/History/History.js";
 import Help from "./pages/Ayuda/Ayuda.js";
 import HelpGames from "./pages/Ayuda/AyudaJuego.js";
 import HelpStats from ".pages/Ayuda/AyudaEstadisticas.js"
-import HelpSocial from "./pages/Ayuda/AyudaSocialJ.js";
+import HelpSocial from "./pages/Ayuda/AyudaSocial.js";
 
 
 function App() {

diff --git a/webapp/src/pages/Ayuda/AyudaEstadisticas.js b/webapp/src/pages/Ayuda/AyudaEstadisticas.js
@@ -1,6 +1,9 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
+<<<<<<< HEAD
 import { Heading, Table, Thead, Tbody, Tr, Th, Td } from '@chakra-ui/react';
+=======
+>>>>>>> a8ab90c201bf92f078a3df55ce8bb921238ae03d
 import Nav from '../../components/Nav/Nav';
 import Footer from '../../components/Footer/Footer';
 

diff --git a/webapp/src/pages/Ayuda/AyudaJuego.js b/webapp/src/pages/Ayuda/AyudaJuego.js
@@ -1,8 +1,14 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
+<<<<<<< HEAD
 import { Heading, Table, Thead, Tbody, Tr, Th, Td } from '@chakra-ui/react';
 import Nav from '../../components/Nav/Nav';
 import Footer from '../../components/Footer/Footer';
+=======
+import Nav from '../../components/Nav/Nav';
+import Footer from '../../components/Footer/Footer';
+
+>>>>>>> a8ab90c201bf92f078a3df55ce8bb921238ae03d
 const AyudaModosJuego = () => {
 
   const { t } = useTranslation();

diff --git a/webapp/src/pages/Ayuda/AyudaSocial.js b/webapp/src/pages/Ayuda/AyudaSocial.js
@@ -1,6 +1,9 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
+<<<<<<< HEAD
 import { Heading, Table, Thead, Tbody, Tr, Th, Td } from '@chakra-ui/react';
+=======
+>>>>>>> a8ab90c201bf92f078a3df55ce8bb921238ae03d
 import Nav from '../../components/Nav/Nav';
 import Footer from '../../components/Footer/Footer';
 
@@ -18,7 +21,11 @@ const AyudaSocial = () => {
       <p>{t('pages.helpSocial.description2')}</p>
       <Heading as="h3" size="md">{t('pages.helpSocial.groups')}</Heading>
       <p>{t('pages.helpSocial.description3')}</p>
+<<<<<<< HEAD
       <Footer />
+=======
+      <Footer/>
+>>>>>>> a8ab90c201bf92f078a3df55ce8bb921238ae03d
       </>
   );
 };