T-Carri · T-Carri · Nov 14, 2022 · Nov 14, 2022 · Nov 15, 2022 · Nov 15, 2022
diff --git a/.firebaserc b/.firebaserc
@@ -0,0 +1,5 @@
+{
+  "projects": {
+    "default": "cepoint-e27bf"
+  }
+}
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 node_modules
+.env.local
diff --git a/eas.json b/eas.json
@@ -0,0 +1,18 @@
+{
+  "cli": {
+    "version": ">= 2.6.0"
+  },
+  "build": {
+    "development": {
+      "developmentClient": true,
+      "distribution": "internal"
+    },
+    "preview": {
+      "distribution": "internal"
+    },
+    "production": {}
+  },
+  "submit": {
+    "production": {}
+  }
+}
diff --git a/firebase.json b/firebase.json
@@ -0,0 +1,6 @@
+{
+  "firestore": {
+    "rules": "firestore.rules",
+    "indexes": "firestore.indexes.json"
+  }
+}
diff --git a/firestore.indexes.json b/firestore.indexes.json
@@ -0,0 +1,61 @@
+{
+  "indexes": [
+    {
+      "collectionGroup": "asignaciones",
+      "queryScope": "COLLECTION_GROUP",
+      "fields": [
+        {
+          "fieldPath": "asistencias",
+          "arrayConfig": "CONTAINS"
+        },
+        {
+          "fieldPath": "asistencias",
+          "order": "DESCENDING"
+        }
+      ]
+    },
+    {
+      "collectionGroup": "asignaciones",
+      "queryScope": "COLLECTION",
+      "fields": [
+        {
+          "fieldPath": "activa",
+          "order": "ASCENDING"
+        },
+        {
+          "fieldPath": "asistencias",
+          "order": "DESCENDING"
+        }
+      ]
+    },
+    {
+      "collectionGroup": "asignaciones",
+      "queryScope": "COLLECTION",
+      "fields": [
+        {
+          "fieldPath": "residenteUid",
+          "order": "ASCENDING"
+        },
+        {
+          "fieldPath": "residente",
+          "order": "DESCENDING"
+        }
+      ]
+    },
+    {
+      "collectionGroup": "users",
+      "queryScope": "COLLECTION",
+      "fields": [
+        {
+          "fieldPath": "activo",
+          "order": "DESCENDING"
+        },
+        {
+          "fieldPath": "nombre",
+          "order": "DESCENDING"
+        }
+      ]
+    }
+  ],
+  "fieldOverrides": []
+}
diff --git a/firestore.rules b/firestore.rules
@@ -0,0 +1,10 @@
+rules_version = '2';
+service cloud.firestore {
+  match /databases/{database}/documents {
+    match /{document=**} {
+      allow read, write: if request.auth != null;
+      allow read: if resource.data.lectoreAsistencia==true;
+
+    }
+  }
+}
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -7,6 +7,7 @@
     "@testing-library/jest-dom": "^5.16.4",
     "@testing-library/react": "^13.3.0",
     "@testing-library/user-event": "^14.2.5",
+    "@trendyol-js/react-carousel": "^3.0.0",
     "axios": "^0.27.2",
     "bootstrap": "^5.1.3",
     "firebase": "^9.9.3",

diff --git a/public/index.html b/public/index.html
@@ -52,7 +52,7 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
-    <title>React App</title>
+    <title>CEpoint</title>
   </head>
   <body style="margin: 0%;">
     <noscript>You need to enable JavaScript to run this app.</noscript>

diff --git a/src/App.js b/src/App.js
@@ -1,53 +1,88 @@
-import React, { useState } from 'react';
+//habil
+import React from 'react';
 import './App.css';
-import { NavbarBrand } from 'reactstrap';
 import Bienvenida from "./Pages/bienvenida/bienvenida"
 import {BrowserRouter as Router, Route, Routes} from 'react-router-dom'
-//import {Signup} from '../src/Pages/Access/Signup'
-//import {Loginup} from '../src/Pages/Access/Loginup'
-import Account from './Pages/perfil/testRenderforAdminnUser/Account';
+
 import Totalogin from '../src/Pages/Access/Totalogin'
 import Totalsignup from '../src/Pages/Access/Totalsignup'
 import { AuthContextProvider } from './context/AuthContext';
 import { UsuariosProvider } from './context/UsuariosContext';
-import ProtectedRoute from '../src/Pages/Access/ProtectedRoute'; 
-import RouterUser from './Pages/perfil/testRenderforAdminnUser/RouterUser'
-//import ProtectedRouteRol from './Pages/perfil/ProtectedRouteRol';
-import {useSelector} from 'react-redux';
 
- import 'bootstrap/dist/css/bootstrap.min.css';
+
+
+//new feature
+import { AccountUser } from './Pages/perfil/AccountUser';
+import { WelcomeHome } from './componentes/WelcomeHome';
+import { Usuarios } from './componentes/usuarios/Usuarios';
+import { Horario } from './componentes/horario/Horario';
+import { Presupuesto } from './componentes/horario/Presupuesto';
+import { Ubicacion } from './componentes/horario/Ubicacion';
+import { Obra } from './componentes/horario/Obra';
+import { Semana } from './componentes/horario/Semana';
+import { Trabajador } from './componentes/horario/Trabajador';
+import { Asignadorendiseño } from './componentes/asignador/Asignadorendiseño';
+
+import ProtectedRoute from './componentes/security/ProtectedRoute';
+import ProtectedRouteAuth from './componentes/security/ProtectedRouteAuth';
+import 'bootstrap/dist/css/bootstrap.min.css';
 function App() {
 
 
 
   return (
-    <div className="App">
  <AuthContextProvider>
     <UsuariosProvider>
+    <>
    <Router>
    <Routes>
       <Route exact path="/" element={<Bienvenida/>} />
     <Route  path="/login" element={<Totalogin/>} />
     <Route  path="/signup" element={<Totalsignup/>} />
 
 
-    <Route  path="/account/*" element={ 
-
+    <Route  path="account/*" element={ 
       <ProtectedRoute>
-                <RouterUser/>
-                </ProtectedRoute> 
-
-              } />
+
+        <AccountUser/>
+
+      </ProtectedRoute>
+
+
+   } >
+
+    <Route index element={<WelcomeHome />}  />
+
+    <Route path="usuarios" element={<Usuarios/> } />
+
+    <Route  path="horario" element={   <Horario/>  } >  
+            <Route path='presupuesto' element={<Presupuesto/>}/> 
+            <Route path='ubicacion' element={<Ubicacion/>}/> 
+            <Route path='obra' element={<Obra/>}/> 
+            <Route path='semana' element={<Semana/>}/>
+            <Route path='trabajador' element={<Trabajador/>}/> 
+    </Route>
+
+    <Route path="asignadorEndiseño" element={
+
+           <Asignadorendiseño/>
+        } />
+
+
+
+
+    </Route>
+
 
       </Routes>
   </Router>
-    </UsuariosProvider>
 
-     </AuthContextProvider>   
+    </>
+  </UsuariosProvider>
+  </AuthContextProvider>   
 
 
 
-    </div>
   );
 }
 

diff --git a/src/App.test.js b/src/App.test.js
diff --git a/src/Pages/Access/Loginup.jsx b/src/Pages/Access/Loginup.jsx
@@ -1,23 +1,27 @@
-import React, { useState} from 'react'
+import React, { useState, useRef} from 'react'
 import {Form, Button, Card, Alert} from 'react-bootstrap'
 import GoogleButton from 'react-google-button'
 import { Link, useNavigate } from 'react-router-dom';
 import { UserAuth } from '../../context/AuthContext';
 
 export const Loginup=()=> {
-  const [email, setEmail] = useState('');
-  const [password, setPassword] = useState('');
+  const emailRef=useRef()
+  const passwordRef=useRef()
   const [error, setError] = useState('');
   const navigate = useNavigate();
   const { signIn } = UserAuth();
 
   const handleSubmit = async (e) => {
     e.preventDefault();
-    setError('')
+
     try {
-      await signIn(email, password)
+      await signIn(emailRef.current.value, passwordRef.current.value).then((response)=>{
+        navigate('/account')
+        sessionStorage.setItem('Auth Token', response._tokenResponse.refreshToken)
+
+      })
+
 
-      navigate('/account')
     } catch (e) {
       setError(e.message)
       console.log(e.message)
@@ -49,12 +53,12 @@ export const Loginup=()=> {
         <Form onClick={handleSubmit}>
 <Form.Group id="email">
 <Form.Label>Email</Form.Label>
-<Form.Control type="email" onChange={(e) => setEmail(e.target.value)} required>
+<Form.Control type="email" ref={emailRef} required>
 </Form.Control>
 </Form.Group>
 <Form.Group id="password">
 <Form.Label>Password</Form.Label>
-<Form.Control type="password" onChange={(e) => setPassword(e.target.value)} required>
+<Form.Control type="password" ref={passwordRef} required>
 </Form.Control>
 </Form.Group>
 

diff --git a/src/Pages/bienvenida/APP.png b/src/Pages/bienvenida/APP.png