first commit

fullstacktf · Dec 22, 2021 · 6bd8aff · 6bd8aff
1 parent 28aaa0b
commit 6bd8aff
Show file tree

Hide file tree

Showing 13 changed files with 50 additions and 70 deletions.
diff --git a/src/App.jsx b/src/App.jsx
@@ -92,7 +92,7 @@ function App() {
 
                         <Route path="/payments" element={<Payment />} />
                         <Route
-                            path="/general-payments"
+                            path="/generar-payments"
                             element={<GeneralPayment />}
                         />
                         <Route

diff --git a/src/components/Incidents/CheckIncidents.jsx b/src/components/Incidents/CheckIncidents.jsx
@@ -1,6 +1,6 @@
-import { React, useState, useEffect } from 'react'
-import styles from './CheckIncidents.module.css'
-import { IncidentService } from '../../services/incident.service'
+import { React, useState, useEffect } from 'react';
+import styles from './CheckIncidents.module.css';
+import { IncidentService } from '../../services/incident.service';
 
 export const CheckIncidents = () => {
     const [incident, setIncident] = useState([])

diff --git a/src/components/Incidents/CheckIncidents.module.css b/src/components/Incidents/CheckIncidents.module.css
@@ -17,7 +17,7 @@
 .blockRight{
     height:100%;
     width: 50%;
-    border: 1px solid red;
+
     display:flex;
     flex-direction:column;
     justify-content: center;
@@ -35,7 +35,7 @@
 
 .MainContainer h2 {
     font-size: 20px;
-    color: #0004ff;
+
     margin-bottom: 30px;
 }
 .MainContainer input, .MainContainer textarea, .MainContainer select {
@@ -80,8 +80,9 @@
 .blockLeftContainer{
     height: 800px;
     width: 1500px;
-    border: 1px solid grey;
-    background-color: grey;
+
+    background: rgb(2,0,36);
+  background: radial-gradient(circle, rgba(2, 0, 36, 0) 0%, rgba(74, 84, 126, 0) 35%, rgba(37,69,130,1) 96%);
     display: flex;
     flex-direction: column;
     align-items: left;
@@ -95,11 +96,12 @@
     width: 100%;
     display:flex;
     flex-direction: column;
-    border: 1px solid blue;
-    background: rgb(215, 239, 248);
+
+    background-image: url("https://i.imgur.com/xwNFy3D.jpg");
+    background-size: 2500px 1200px;
     align-items: center;
     justify-content: center;
-    border: 1px solid red;
+
 
 }
 
@@ -120,7 +122,7 @@
     align-items: center;
     justify-content: space-between;
     padding-top: 20px;
-    border: 1px solid blue;
+
 }
 
 .Contenedores{

diff --git a/src/components/MasterProfile/MasterProfile.tsx b/src/components/MasterProfile/MasterProfile.tsx
@@ -16,7 +16,7 @@ export const MasterProfile = () => {
           <div className={styles.profileContainer}>
 
             <div className={styles.calendar}>
-              <p className={styles.title}>"¡Hola, Nombre-Usuario!"</p>
+              <p className={styles.title}>"¡Hola, Vecino!"</p>
               <div className={styles.calendarBox}>
               <CalendarEvents />
               </div>

diff --git a/src/components/MasterProfile/UserMasterInfo.tsx b/src/components/MasterProfile/UserMasterInfo.tsx
@@ -9,8 +9,7 @@ const UserInfo = () => {
                     Foto de Perfil
                 </div>
                 <div className={styles.userNameCont}>
-                    <div className={styles.userName}>Nombre Usuario</div>
-                    <div className={styles.userEmail}>Email Usuario</div>
+
                 </div>
             </div>
 

diff --git a/src/components/MasterProfile/css/MasterProfile.module.css b/src/components/MasterProfile/css/MasterProfile.module.css
@@ -51,8 +51,8 @@
 .decoSingleLine{
     width: 3px;
     height: 65%;
-    border: 1px solid #7879F1;
-    background: #7879F1;
+    border: 1px solid #ffffff;
+    background: #ffffff;
     border-radius: 15px;
 }
 .decoLinesContainer{
@@ -62,24 +62,3 @@
     width: 4%;
     height: 102%;
 }
-.decoLinesContainer > div{
-    border: 1px solid #7879F1;
-    background: #7879F1;
-    border-radius: 15px;
-}
-
-.decoLine1 {
-    width: 2%;
-}
-.decoLine2 {
-    width: 4%;
-}
-.decoLine3 {
-    width: 6%;
-}
-.decoLine4 {
-    width: 8%;
-}
-.decoLine5 {
-    width: 10%;
-}
diff --git a/src/components/MasterProfile/css/NotificMasterView.module.css b/src/components/MasterProfile/css/NotificMasterView.module.css
@@ -20,13 +20,13 @@
     font-family: 'Raleway', sans-serif;
     font-size: 1.5rem;
     font-weight: bold;
-    color: #5152C3;
+    color: #ffffff;
     text-transform: uppercase;
     margin-bottom: 0;
 }
 .iconNotif {
     font-size: 2.5rem;
-    color: #5152C3;
+    color: #ffffff;
     margin-bottom: 0.5rem;
 }
 .notifBox{
@@ -37,18 +37,18 @@
     align-items: center;
     flex-direction: column;
     gap: 1rem;
-    border-top: 2px solid #7879F1;
-    border-bottom: 2px solid #7879F1;
+    border-top: 2px solid #ffffff;
+    border-bottom: 2px solid #ffffff;
 
 }
 .notifBox button {
     width: 90%;
     height: 5rem;
     border-radius: 1rem;
     background: #e1e2fd;
-    border: 2.5px solid #7879F1;
+    border: 2.5px solid #ffffff;
     font-family: 'Raleway', sans-serif;
     font-size: 1rem;
     font-weight: bold;
-    color: #7879F1;
+    color: #ffffff;
 }
diff --git a/src/components/MasterProfile/css/UserMasterInfo.module.css b/src/components/MasterProfile/css/UserMasterInfo.module.css
@@ -1,6 +1,6 @@
 .userInfoContainer{
     width: 100%;
-    height: 100%;
+    height: 80%;
     display: flex;
     justify-content: center;
     align-items: center;
@@ -9,9 +9,9 @@
 }
 
 .userInfo{
-
-    background: rgb(2,0,36);
-    background: radial-gradient(circle, rgba(2, 0, 36, 0.534) 0%, rgba(74, 84, 126, 0.26) 35%, rgba(37, 70, 130, 0.767) 96%);
+    width: 240px;
+    height: 120px;
+
 }
 .myHomeContainer {
     width: 100%;
@@ -59,8 +59,8 @@
 .decoSingleLine{
     width: 70%;
     height: 2.5px;
-    border: 1px solid #7879F1;
-    background: #7879F1;
+    border: 1px solid #ffffff;
+    background: #ffffff;
     border-radius: 15px;
 }
 
@@ -115,7 +115,7 @@
     text-align: left;
     text-transform: uppercase;
     text-decoration: underline;
-    color: #5152C3;
+    color: #ffffff;
 }
 
 .location{
@@ -129,15 +129,15 @@
 
 .iconLocation{
     font-size: 2rem;
-    color: #5152C3;
+    color: #ffffff;
 }
 
 .location div{
     font-family: 'Raleway', sans-serif;
     font-size: 1rem;
     font-weight: bold;
     text-align: left;
-    color: #7879F1;
+    color: #ffffff;
 }
 
 .presiImage{
@@ -160,7 +160,7 @@
     text-align: left;
     text-transform: uppercase;
     text-decoration: underline;
-    color: #5152C3;
+    color: #ffffff;
 }
 
 .presiName{
@@ -169,7 +169,7 @@
     font-size: 1rem;
     font-weight: bold;
     text-align: left;
-    color: #7879F1;
+    color: #ffffff;
 }
 
 .myHomeContent{
@@ -199,12 +199,12 @@
     text-align: center;
     text-transform: uppercase;
     text-decoration: underline;
-    color: #5152C3;
+    color: #ffffff;
 }
 
 .myHomeInfo div{
     width: 40%;
-    border: 1px solid #5152C3;
+    border: 1px solid #ffffff;
     border-radius: 10px;
     background: #e1e2fd;
     font-family: 'Raleway', sans-serif;
@@ -241,7 +241,7 @@
     align-items: center;
     flex-direction: row;
     gap: 1rem;
-    border: 1px solid #5152C3;
+    border: 1px solid #ffffff;
     border-radius: 10px;
     background: #e1e2fd;
 }

diff --git a/src/components/MasterProfile/css/UsersList.module.css b/src/components/MasterProfile/css/UsersList.module.css
@@ -12,7 +12,7 @@
     font-family: 'Raleway', sans-serif;
     font-size: 1.5rem;
     font-weight: bold;
-    color: #5152C3;
+    color: #ffffff;
     text-transform: uppercase;
     margin-bottom: 0;
 }
diff --git a/src/components/Notifications/CheckNotification.module.css b/src/components/Notifications/CheckNotification.module.css
@@ -11,7 +11,8 @@
     width: 100vw;
     display: flex;
     flex-direction: row;
-    background: linear-gradient(to left, #c0c1f1 40%, #bcbdfc 50%, #E9E9F9 65%);
+        background-image: url("https://i.imgur.com/xwNFy3D.jpg");
+        background-size: 2500px 1200px;
     font-family: "Quicksand";
 }
 .blockRight{
@@ -80,8 +81,8 @@
 .blockLeftContainer{
     height: 800px;
     width: 1500px;
-    border: 1px solid grey;
-    background-color: grey;
+    background: rgb(2,0,36);
+  background: radial-gradient(circle, rgba(2, 0, 36, 0) 0%, rgba(74, 84, 126, 0) 35%, rgba(37,69,130,1) 96%);
     display: flex;
     flex-direction: column;
     align-items: left;
@@ -95,11 +96,11 @@
     width: 100%;
     display:flex;
     flex-direction: column;
-    border: 1px solid blue;
-    background: rgb(215, 239, 248);
+    background-image: url("https://i.imgur.com/xwNFy3D.jpg");
+    background-size: 2500px 1200px;
     align-items: center;
     justify-content: center;
-    border: 1px solid red;
+
 
 }
 
@@ -120,7 +121,7 @@
     align-items: center;
     justify-content: space-between;
     padding-top: 20px;
-    border: 1px solid blue;
+
 }
 
 .Contenedores{

diff --git a/src/components/UserProfile/css/UserInfo.module.css b/src/components/UserProfile/css/UserInfo.module.css
@@ -6,8 +6,7 @@
     align-items: center;
     flex-direction: column;
     gap: 1rem;
-    background: rgb(2,0,36);
-    background: radial-gradient(circle, rgba(178, 177, 196, 0.356) 0%, rgba(203, 205, 214, 0.26) 35%, rgb(157, 185, 236) 96%);
+
 }
 
 .userInfo{

diff --git a/src/components/login/login.module.css b/src/components/login/login.module.css
@@ -111,7 +111,7 @@
   }
 
   .formControl{
-    color: #ffffff;
+    color: #6969e9;
     font-size: 15px;
     font-weight: bolder;
     border-radius: 20px;

diff --git a/src/components/registro/registro.module.css b/src/components/registro/registro.module.css
@@ -109,7 +109,7 @@
   }
 
   .formControl{
-    color: #ffffff;
+    color: #6969e9;
     font-size: 15px;
     font-weight: bolder;
     border-radius: 20px;