From 81c538bb77f2b2b0e5ad6f6529d77c1244525ae2 Mon Sep 17 00:00:00 2001
From: raandino <aandino186@gmail.com>
Date: Tue, 2 Jun 2020 19:35:30 -0600
Subject: [PATCH 1/5] colorines

---
 css/index.css            | 7 +++++++
 js/app/pages/TodoPage.js | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/css/index.css b/css/index.css
index 644cfa0..99c13e6 100644
--- a/css/index.css
+++ b/css/index.css
@@ -107,6 +107,13 @@ button{
   flex-wrap: wrap;
 }
 
+#addtodo{
+  background-color: #17223b;
+  color: white;
+  height: 90px;
+  border-radius: 100%;
+  width: 90px;
+}
 
   #sidebar-wrapper a{
     color: white;
diff --git a/js/app/pages/TodoPage.js b/js/app/pages/TodoPage.js
index 5fae8fb..afee71e 100644
--- a/js/app/pages/TodoPage.js
+++ b/js/app/pages/TodoPage.js
@@ -73,7 +73,7 @@ const TodoPage = (props) => {
     return (
     <Fragment>
         <h1 className="text-center mt-2" style="color: white; font-weight:bold;"> Things To Do</h1>
-  <div className="text-center" >      <Button id="addtodo" onClick={openModal}> Add Todo</Button></div>
+  <div className="text-center" >      <Button id="addtodo" onClick={openModal}> Add </Button></div>
         
         <Modal id="modal" title='Add Form'
             visible={(()=> {

From 576f792429d8d4778c1843928338c8d73eae6c31 Mon Sep 17 00:00:00 2001
From: raandino <aandino186@gmail.com>
Date: Tue, 2 Jun 2020 19:55:21 -0600
Subject: [PATCH 2/5] coloris

---
 css/index.css                 | 14 ++++++++++++++
 js/app/components/TodoItem.js |  4 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/css/index.css b/css/index.css
index 99c13e6..473c6ac 100644
--- a/css/index.css
+++ b/css/index.css
@@ -113,8 +113,22 @@ button{
   height: 90px;
   border-radius: 100%;
   width: 90px;
+  border: 1px solid white;
 }
 
+#eliminar{
+  background-color:rgb(180, 180, 180);
+  width: 100px;
+}
+
+#editar{
+  background-color: rgb(180, 180, 180);
+  width: 100px;
+}
+
+#todo{
+  background-color: #67a0d4;
+}
   #sidebar-wrapper a{
     color: white;
   }
diff --git a/js/app/components/TodoItem.js b/js/app/components/TodoItem.js
index 203d8c9..9f8958b 100644
--- a/js/app/components/TodoItem.js
+++ b/js/app/components/TodoItem.js
@@ -30,8 +30,8 @@ const TodoItem = ( {todo ,indice} ) => {
           <div className="card-footer">
             <div className="text-center">
             
-          <button id="editar" class="btn btn-primary mr-4 active" onClick={openEdit}>Editar</button>
-          <button id="eliminar" class="btn btn-primary ml-4 active" onClick={openDelete}>Eliminar</button>
+          <button id="editar" class="btn btn-primary mx-4 active" onClick={openEdit}>Editar</button>
+          <button id="eliminar" class="btn btn-primary mx-4 active" onClick={openDelete}>Eliminar</button>
           <Editar
               showModal={showEdit}
               closeForm={closeEdit}

From a5bbc818917b1c85cee73b1de5353c187a3a4ea8 Mon Sep 17 00:00:00 2001
From: raandino <aandino186@gmail.com>
Date: Tue, 2 Jun 2020 19:59:03 -0600
Subject: [PATCH 3/5]

---
 css/index.css                 | 4 +++-
 js/app/components/TodoItem.js | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/css/index.css b/css/index.css
index 473c6ac..983d5da 100644
--- a/css/index.css
+++ b/css/index.css
@@ -126,9 +126,11 @@ button{
   width: 100px;
 }
 
-#todo{
+#todo1{
   background-color: #67a0d4;
 }
+
+
   #sidebar-wrapper a{
     color: white;
   }
diff --git a/js/app/components/TodoItem.js b/js/app/components/TodoItem.js
index 9f8958b..7f1516e 100644
--- a/js/app/components/TodoItem.js
+++ b/js/app/components/TodoItem.js
@@ -16,7 +16,7 @@ const TodoItem = ( {todo ,indice} ) => {
 
     return ( 
         <div className="col-md-4 mt-4">
-        <div  id="todo"  className="card" >
+        <div  id="todo1"  className="card" >
           <div className="card-header" id="taskh">
          <h3>{  `${todo.todo}` }</h3> 
          <span className="badge badge-pill badge-dark ml-2">{`${todo.date?.format('DD-MM-YYYY')}`}</span>

From 8e6f39460a10aa5bd1e6a053401f8a316f4da1c1 Mon Sep 17 00:00:00 2001
From: raandino <aandino186@gmail.com>
Date: Tue, 2 Jun 2020 20:07:52 -0600
Subject: [PATCH 4/5]

---
 js/app/pages/LoginPage.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/js/app/pages/LoginPage.js b/js/app/pages/LoginPage.js
index f6135d8..75bf4d7 100644
--- a/js/app/pages/LoginPage.js
+++ b/js/app/pages/LoginPage.js
@@ -8,7 +8,7 @@ const RegisterForm = (props) => {
 
         <form id="log" class="email-login">
             <div class="form-group">
-                <label for="username">User Name</label>
+                <label for="username">UserName</label>
                 <input type="text" class="form-control" id="username" aria-describedby="emailHelp"></input>
             </div>
             <div class="form-group">
@@ -20,12 +20,12 @@ const RegisterForm = (props) => {
                 <input type="password" class="form-control" id="pass"></input>
             </div>
             <div class="form-group">
-                <label for="passConf">Confirmar Password</label>
+                <label for="passConf">Confirm Password</label>
                 <input type="password" class="form-control" id="passConf"></input>
             </div>
             
             <div class="text-center" style="margin-top: 30px;">
-                <button type="submit" id="boton" class="btn btn-primary">Sign Up</button>
+                <button type="submit" id="boton" class="btn btn-primary">Create</button>
         
                 </div>
                 
@@ -46,7 +46,7 @@ const LoginForm = (props) => {
 
         <form id="log" class="email-login">
             <div class="form-group">
-                <label for="username">User Name</label>
+                <label for="username">UserName</label>
                 <input type="email" class="form-control" id="username" aria-describedby="emailHelp"></input>
             </div>
             <div class="form-group">
@@ -78,7 +78,7 @@ const LoginPage = (props) => {
             <h3 class="display-4 text-center mt-5" id="cuenta">Cuenta</h3>
             <div id="login" class="mx-auto">
                 <div id="header" class="card-header">
-                    <a onClick={goToLogin} href="#" class="active" id="login-box-link">Login</a>
+                    <a onClick={goToLogin} href="#" class="active" id="login-box-link">Log in</a>
                     <a onClick={goToRegister} href="#"  class="active"  id="signup-box-link">Register</a>
                 </div>
 

From 81da554e6babe0534aecc05eb34b9012acbf6f59 Mon Sep 17 00:00:00 2001
From: AlexC01 <alexcuadraxxx@gmail.com>
Date: Wed, 3 Jun 2020 18:49:26 -0600
Subject: [PATCH 5/5] date to moment

---
 js/app/components/TodoItem.js | 5 +++--
 js/app/pages/TodoPage.js      | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/js/app/components/TodoItem.js b/js/app/components/TodoItem.js
index 067c2b1..0c9a85e 100644
--- a/js/app/components/TodoItem.js
+++ b/js/app/components/TodoItem.js
@@ -5,7 +5,7 @@ import Editar from './Editar'
 import EliminarTodo from './EliminarTodo'
 import TodoContext from '../context/TodoContext'
 import { useEffect } from 'preact/hooks/src'
-
+import moment from 'moment'
 
 const TodoItem = ( {todo ,indice} ) => {
 
@@ -16,6 +16,7 @@ const TodoItem = ( {todo ,indice} ) => {
     
     console.log('Delet Item Modal',showEdit)
 
+    const date =   moment(todo.endDate).format('DD-MM-YYYY')
    
 
     return ( 
@@ -23,7 +24,7 @@ const TodoItem = ( {todo ,indice} ) => {
         <div  id="todo"  className="card" >
           <div className="card-header" id="taskh">
          <h3>{  `${todo.todo}` }</h3> 
-         <span className="badge badge-pill badge-dark ml-2">{`${todo.endDate?.format('DD-MM-YYYY')}`}</span>
+         <span className="badge badge-pill badge-dark ml-2">{date}</span>
           </div>
             <div id="cuerpecito" className="card-body text-center">
           {
diff --git a/js/app/pages/TodoPage.js b/js/app/pages/TodoPage.js
index 9886b25..74a2833 100644
--- a/js/app/pages/TodoPage.js
+++ b/js/app/pages/TodoPage.js
@@ -5,7 +5,6 @@ import TodoContext from '../context/TodoContext'
 import TodoItems from '../components/TodoItems'
 import { useModal } from '../hooks'
 import { Select } from 'antd'
-import moment from 'moment'
 
 const TodoPage = (props) => {
     const [todoItems, setTodoItems] = useState([])
@@ -36,12 +35,14 @@ const TodoPage = (props) => {
         
             setTodoItems(
              data
+         
            )
        
         })
       }, [])
       
-
+      
+    
     
     const addTodo = e => {