Merge branch 'master' of github.com:Raandino/Todo-app

Raandino · Jun 4, 2020 · f0d1388 · f0d1388
2 parents a4fef7d + f89ec0b
commit f0d1388
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 12 deletions.
diff --git a/css/index.css b/css/index.css
@@ -107,6 +107,29 @@ button{
   flex-wrap: wrap;
 }
 
+#addtodo{
+  background-color: #17223b;
+  color: white;
+  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;
+}
+
+#todo1{
+  background-color: #67a0d4;
+}
+
 
   #sidebar-wrapper a{
     color: white;

diff --git 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,14 +16,15 @@ const TodoItem = ( {todo ,indice} ) => {
 
     console.log('Delet Item Modal',showEdit)
 
+    const date =   moment(todo.endDate).format('DD-MM-YYYY')
 
 
     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.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">
           {
@@ -34,8 +35,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}

diff --git a/js/app/pages/LoginPage.js b/js/app/pages/LoginPage.js
@@ -9,7 +9,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">
@@ -21,12 +21,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>
 
@@ -107,7 +107,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>
 

diff --git 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 API_ROUTE='localhost:3000'
 const API_ROUTER='https://pwa-postgre.heroukuapp.com'
@@ -39,12 +38,14 @@ const TodoPage = (props) => {
 
             setTodoItems(
              data
+
            )
 
         })
       }, [])
 
-
+
+
 
     const addTodo = e => {
 
@@ -87,7 +88,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={(()=> {