Merge branch 'main' of https://github.com/JuanDaGue/curso-react-intro

JuanDaGue · Sep 2, 2024 · 2e0281d · 2e0281d
2 parents e25f4de + 4d7ecda
commit 2e0281d
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 0 deletions.
diff --git a/src/App/AppUI.js b/src/App/AppUI.js
@@ -1,6 +1,7 @@
 
 import { CreateTodoButton } from '../CreateTodoButton';
 import { CreateTodoButton2 } from '../CreateTodoButton2';
+import { CreateTodoButton2 } from '../CreateTodoButton2';
 import { TodoItem } from '../TodoItem';
 import { TodoList } from '../TodoList';
 import { TodoCont } from '../TodoCont';
@@ -62,6 +63,7 @@ function AppUI() {
       {openModal && (
         <Modal>
             <TodoForm></TodoForm>
+            <TodoForm></TodoForm>
         </Modal>
       )}
       {openModal2 && (

diff --git a/src/CreateTodoButton/index.js b/src/CreateTodoButton/index.js
@@ -15,7 +15,14 @@ function CreateTodoButton(props){
     return(
         <button 
         className="CreatedTodobutton Icon Icon-svg2"
+<<<<<<< HEAD
         onClick={handleClick}
+=======
+        onClick={()=> 
+            //console.log('You push the button'), 
+            props.setOpenModal(state=>!state)
+        }
+>>>>>>> 4d7ecdaa26183bf6106f58e85bb73118ceac79fe
 
         > <IconPlus/> </button>
     )

diff --git a/src/CreateTodoButton2/index.js b/src/CreateTodoButton2/index.js
@@ -2,6 +2,7 @@ import "./CreateTodoButton2.css"
 import { IconComplete } from  './IconComplete'
 import React from "react";
 function CreateTodoButton2(props){
+<<<<<<< HEAD
   const handleClick = () => {
     props.setOpenModal2(state => !state);
     if(props.setOpenModal2){
@@ -15,6 +16,20 @@ function CreateTodoButton2(props){
     return(
         <button 
         className="CreatedTodobutton2 Icon Icon-svg2"
+=======
+    const [isActive, setIsActive] = React.useState(false);
+
+ const handleClick = () => {
+        if (window.confirm('Do you confirm?')) {
+          console.log('ok');
+        } else {
+          console.log('false');
+        }
+      };
+    return(
+        <button 
+        className="CreatedTodobutton Icon Icon-svg2"
+>>>>>>> 4d7ecdaa26183bf6106f58e85bb73118ceac79fe
         onClick={handleClick}
         > 
             <IconComplete/>
@@ -26,3 +41,28 @@ export { CreateTodoButton2 };
 
 
 // import React from 'react';
+<<<<<<< HEAD
+=======
+
+// const YourComponent = () => {
+//   const handleClick = () => {
+//     if (window.confirm('Do you confirm?')) {
+//       console.log('ok');
+//     } else {
+//       console.log('false');
+//     }
+//   };
+
+//   return (
+//     <button onClick={handleClick} className="CreatedTodobutton">
+//       <span className="Icon Icon-svg Icon-complete">
+//         <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
+//           <path d="M21.03 5.72a.75.75 0 0 1 0 1.06l-11.5 11.5a.747.747 0 0 1-1.072-.012l-5.5-5.75a.75.75 0 1 1 1.084-1.036l4.97 5.195L19.97 5.72a.75.75 0 0 1 1.06 0Z"></path>
+//         </svg>
+//       </span>
+//     </button>
+//   );
+// };
+
+// export default YourComponent;
+>>>>>>> 4d7ecdaa26183bf6106f58e85bb73118ceac79fe
diff --git a/src/TodoContext/index.js b/src/TodoContext/index.js
@@ -70,8 +70,11 @@ function TodoProvider({children}){
             TodoDelet,
             openModal, 
             setOpenModal,
+<<<<<<< HEAD
             openModal2, 
             setOpenModal2,
+=======
+>>>>>>> 4d7ecdaa26183bf6106f58e85bb73118ceac79fe
             addTodo,
         }}>
             {children}