Merge branch 'dev' into US-17-VerPerfildeinformacióndecomunidaddevivienda

Backend del servicio para activar y desactivar una comunidad de vivienda

.github/workflows/node.js.yml

@@ -29,3 +29,22 @@ jobs:
           cd ./api-gateway
           npm ci
           npm run build --if-present
+  build-web:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [14.x, 16.x, 18.x]
+        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
+    steps:
+      - name: checkout
+        uses: actions/checkout@v3
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node-version }}
+          cache: 'npm'
+      - name: Test
+        run: |
+          cd ./web-ui/web-react/
+          npm ci
+          npm run build --if-present

api-gateway/src/app.controller.ts

@@ -11,22 +11,12 @@ export class AppController {
     @Body('last_name') last_name: string,
     @Body('email') email: string,
     @Body('phone') phone: number,
-    @Body('password') password: string,
     @Body('user_type') user_type: string,
     @Body('status') status: string,
     @Body('date_entry') date_entry: Date,
   ) {
-    return this.appService.createAdminSystem(
-      dni,
-      name,
-      last_name,
-      email,
-      phone,
-      password,
-      user_type,
-      status,
-      date_entry,
-    );
+    return this.appService.createAdminSystem(dni, name, last_name, email, phone, 
+            user_type, status, date_entry);
   }
 
   @Post('user/createGuard')
@@ -37,24 +27,30 @@ export class AppController {
     @Body('last_name') last_name: string,
     @Body('email') email: string,
     @Body('phone') phone: number,
-    @Body('password') password: string,
     @Body('user_type') user_type: string,
     @Body('status') status: string,
     @Body('date_entry') date_entry: Date,
     @Body('community_id') community_id: string,
   ) {
-    return this.appService.createGuard(
-      dni,
-      name,
-      last_name,
-      email,
-      phone,
-      password,
-      user_type,
-      status,
-      date_entry,
-      community_id,
-    );
+    return this.appService.createGuard(dni, name, last_name, email, phone,
+      user_type, status, date_entry,community_id);
+  }
+
+  @Post('user/createAdminCommunity')
+  createAdminCommunity(
+    //Nombre, Apellidos, Correo electrónico, Cédula, Teléfono, Contraseña
+    @Body('dni') dni: string,
+    @Body('name') name: string,
+    @Body('last_name') last_name: string,
+    @Body('email') email: string,
+    @Body('phone') phone: number,
+    @Body('user_type') user_type: string,
+    @Body('status') status: string,
+    @Body('date_entry') date_entry: Date,
+    @Body('community_id') community_id:string
+  ) {
+    return this.appService.createAdminCommunity(dni, name, last_name, email, phone,
+      user_type, status, date_entry,community_id);
   }
 
   @Post('user/createUser')
@@ -106,16 +102,27 @@ export class AppController {
   allUsersAdminComunidad() {
     return this.appService.allUsersAdminComunidad();
   }
+
   @Get('user/findGuards/:community')
   findGuardsCommunity(@Param('community_id') community_id: string) {
     return this.appService.findGuardsCommunity(community_id);
   }
 
+  @Get('user/findTenants/:community_id')
+  allUsersTenants(@Param('community_id') paramCommunity_id: string) {
+    return this.appService.findTenantsCommunity(paramCommunity_id);
+  }
+  
   @Get('user/find/:dni')
   findUser(@Param('dni') paramUserDNI: string) {
     return this.appService.findUser(paramUserDNI);
   }
 
+  @Get('user/findUserById/:id')
+  findUserById(@Param('id') id: string) {
+    return this.appService.findUserById(id);
+  }
+
   @Delete('user/deleteAdminSystem/:id')
   deleteAdminSystem(@Param('id') id: string) {
     return this.appService.deleteAdminSystem(id);
@@ -166,7 +173,13 @@ export class AppController {
   findCommunityAdmin(@Body('community_id') community_id: string) {
     return this.appService.findCommunityAdmin(community_id);
   }
-
+  @Post('community/changeStatus')
+  changeStatus(
+    @Body('id') pId: string,
+    @Body('status') pStatus: string,
+  ) {
+    return this.appService.changeStatus(pId, pStatus);
+  }
   // #==== API Common Areas
   @Post('commonArea/createCommonArea')
   createCommonArea(
@@ -195,6 +208,17 @@ export class AppController {
     return this.appService.findCommonArea(paramCommonAreaId);
   }
 
+  @Get('commonArea/findByCommunity/:community_id')
+  findByCommunity(@Param('community_id') paramCommunityId: string) {
+    return this.appService.findByCommunity(paramCommunityId);
+  }
+
+
+  @Delete('commonArea/deleteCommonArea/:id')
+  deleteCommonArea(@Param('id') id: string) {
+    return this.appService.deleteCommonArea(id);
+  }
+
   // #==== API GUEST
   //#API userService - create user
   @Post('guest/createGuest')

api-gateway/src/app.service.ts

@@ -54,64 +54,47 @@ export class AppService {
   }
 
   //POST parameter from API
-  createAdminSystem(
-    dni: string,
-    name: string,
-    last_name: string,
-    email: string,
-    phone: number,
-    password: string,
-    user_type: string,
-    status: string,
-    date_entry: Date,
-  ) {
+  createAdminSystem(dni: string, name: string, last_name: string, email: string, phone: number
+    , user_type: string, status: string, date_entry: Date) {
     const pattern = { cmd: 'createAdminSystem' };
     const payload = {
-      dni: dni,
-      name: name,
-      last_name: last_name,
-      email: email,
-      phone: phone,
-      password: password,
-      user_type: user_type,
-      status: status,
-      date_entry: date_entry,
+      dni: dni, name: name, last_name: last_name, email: email, phone: phone,
+      password: this.generatePassword(), user_type: user_type, status: status, date_entry: date_entry
     };
     return this.clientUserApp
       .send<string>(pattern, payload)
       .pipe(map((message: string) => ({ message })));
   }
 
-  createGuard(
-    dni: string,
-    name: string,
-    last_name: string,
-    email: string,
-    phone: number,
-    password: string,
-    user_type: string,
-    status: string,
-    date_entry: Date,
-    community_id: string,
-  ) {
+  createGuard(dni: string, name: string, last_name: string, email: string, phone: number
+    , user_type: string, status: string, date_entry: Date, community_id: string) {
     const pattern = { cmd: 'createGuard' };
     const payload = {
-      dni: dni,
-      name: name,
-      last_name: last_name,
-      email: email,
-      phone: phone,
-      password: password,
-      user_type: user_type,
-      status: status,
-      date_entry: date_entry,
-      community_id,
+      dni: dni, name: name, last_name: last_name, email: email, phone: phone,
+      password: this.generatePassword(), user_type: user_type, status: status, date_entry: date_entry, community_id
+
     };
     return this.clientUserApp
       .send<string>(pattern, payload)
       .pipe(map((message: string) => ({ message })));
   }
 
+  
+  createAdminCommunity(dni: string, name: string, last_name: string, email: string, phone: number
+    , user_type: string, status: string, date_entry: Date, community_id: string) {
+    const pattern = { cmd: 'createAdminCommunity' };
+    const payload = {
+      dni: dni, name: name, last_name: last_name, email: email, phone: phone,
+      password: this.generatePassword(), user_type: user_type, status: status, date_entry: date_entry, community_id
+
+    };
+    return this.clientUserApp
+      .send<string>(pattern, payload)
+      .pipe(
+        map((message: string) => ({ message })),
+      );
+  }
+
   allUsers() {
     const pattern = { cmd: 'findAllUsers' };
     const payload = {};
@@ -136,6 +119,17 @@ export class AppService {
       .pipe(map((message: string) => ({ message })));
   }
 
+  allUsersTenants() {
+    const pattern = { cmd: 'findTenants' };
+    const payload = {};
+    return this.clientUserApp
+      .send<string>(pattern, payload)
+      .pipe(
+        map((message: string) => ({ message })),
+      );
+  }
+  
+
   //GET parameter from API
   findUser(paramUserDNI: string) {
     const pattern = { cmd: 'findUserDNI' };
@@ -153,6 +147,14 @@ export class AppService {
       .pipe(map((message: string) => ({ message })));
   }
 
+  findTenantsCommunity(community_id: string) {
+    const pattern = { cmd: 'findTenantsCommunity' };
+    const payload = { community_id: community_id };
+    return this.clientUserApp
+      .send<string>(pattern, payload)
+      .pipe(map((message: string) => ({ message })));
+  }
+
   deleteAdminSystem(id: string) {
     const pattern = { cmd: 'deleteAdminSystem' };
     const payload = { id: id };
@@ -177,21 +179,30 @@ export class AppService {
       .send<string>(pattern, payload)
       .pipe(map((message: string) => ({ message })));
   }
+  changeStatus(pId: string, pStatus: string) {
+    const pattern = { cmd: 'changeStatus' };
+    const payload = { id: pId, status: pStatus };
+    return this.clientCommunityApp
+      .send<string>(pattern, payload)
+      .pipe(map((message: string) => ({ message })));
+  }
+
+
+   //GET parameter from API
+   findUserById(id: string) {
+    const pattern = { cmd: 'findById' };
+    const payload = { id: id };
+    return this.clientUserApp
+      .send<string>(pattern, payload)
+      .pipe(map((message: string) => ({ message })));
+  }
+
 
   // ====================== COMMUNITIES ===============================
 
   //POST parameter from API
-  createCommunity(
-    name: string,
-    province: string,
-    canton: string,
-    district: string,
-    num_houses: number,
-    phone: string,
-    status: string,
-    date_entry: Date,
-    houses: [],
-  ) {
+  createCommunity(name: string, province: string, canton: string, district: string
+    , num_houses: number, phone: string, status: string, date_entry: Date, houses: []) {
     const pattern = { cmd: 'createCommunity' };
     const payload = {
       name: name,
@@ -273,6 +284,26 @@ export class AppService {
       .pipe(map((message: string) => ({ message })));
   }
 
+
+   //GET parameter from API
+   findByCommunity(paramCommunityId: string) {
+    const pattern = { cmd: 'findByCommunity' };
+    const payload = { community_id: paramCommunityId };
+    return this.clientCommonAreaApp
+      .send<string>(pattern, payload)
+      .pipe(map((message: string) => ({ message })));
+  }
+
+
+    //DELETE parameter from API
+    deleteCommonArea(paramCommonAreaId: string) {
+      const pattern = { cmd: 'removeCommonArea' };
+      const payload = { id: paramCommonAreaId };
+      return this.clientCommonAreaApp
+        .send<string>(pattern, payload)
+        .pipe(map((message: string) => ({ message })));
+    }
+
   // ====================== GUESTS ===============================
 
   //POST parameter from API
@@ -287,13 +318,8 @@ export class AppService {
   ) {
     const pattern = { cmd: 'createGuest' };
     const payload = {
-      name: name,
-      last_name: last_name,
-      dni: dni,
-      number_plate: number_plate,
-      phone: phone,
-      status: status,
-      date_entry: date_entry,
+      name: name, last_name: last_name, dni: dni, number_plate: number_plate, phone: phone,
+      status: status, date_entry: date_entry
     };
     return this.clientGuestApp
       .send<string>(pattern, payload)
@@ -331,13 +357,8 @@ export class AppService {
   ) {
     const pattern = { cmd: 'createPayment' };
     const payload = {
-      date_payment: date_payment,
-      mount: mount,
-      description: description,
-      period: period,
-      status: status,
-      user_id: user_id,
-      communty_id: communty_id,
+      date_payment: date_payment, mount: mount, description: description,
+      period: period, status: status, user_id: user_id, communty_id: communty_id
     };
     return this.clientPaymentApp
       .send<string>(pattern, payload)
@@ -364,22 +385,12 @@ export class AppService {
   // ====================== RESERVATIONS ===============================
 
   //POST parameter from API
-  createReservation(
-    start_time: string,
-    finish_time: string,
-    status: string,
-    date_entry: Date,
-    user_id: string,
-    common_area_id: string,
-  ) {
+  createReservation(start_time: string, finish_time: string, status: string,
+    date_entry: Date, user_id: string, common_area_id: string) {
     const pattern = { cmd: 'createReservation' };
     const payload = {
-      start_time: start_time,
-      finish_time: finish_time,
-      status: status,
-      date_entry: date_entry,
-      user_id: user_id,
-      common_area_id: common_area_id,
+      start_time: start_time, finish_time: finish_time, status: status,
+      date_entry: date_entry, user_id: user_id, common_area_id: common_area_id
     };
     return this.clientReservationApp
       .send<string>(pattern, payload)
@@ -406,18 +417,12 @@ export class AppService {
   // ====================== POSTS ===============================
 
   //POST parameter from API
-  createPost(
-    post: string,
-    date_entry: Date,
-    user_id: string,
-    community_id: string,
-  ) {
+  createPost(post: string, date_entry: Date, user_id: string,
+    community_id: string) {
     const pattern = { cmd: 'createPost' };
     const payload = {
-      post: post,
-      date_entry: date_entry,
-      user_id: user_id,
-      community_id: community_id,
+      post: post, date_entry: date_entry, user_id: user_id,
+      community_id: community_id
     };
     return this.clientPostApp
       .send<string>(pattern, payload)
@@ -444,18 +449,12 @@ export class AppService {
   // ====================== COMMNENT POSTS ===============================
 
   //Comment parameter from API
-  createComment(
-    comment: string,
-    date_entry: Date,
-    user_id: string,
-    post_id: string,
-  ) {
+  createComment(comment: string, date_entry: Date, user_id: string,
+    post_id: string) {
     const pattern = { cmd: 'createComment' };
     const payload = {
-      comment: comment,
-      date_entry: date_entry,
-      user_id: user_id,
-      post_id: post_id,
+      comment: comment, date_entry: date_entry, user_id: user_id,
+      post_id: post_id
     };
     return this.clientPostApp
       .send<string>(pattern, payload)
@@ -482,18 +481,12 @@ export class AppService {
   // ====================== REPORTS ===============================
 
   //Report parameter from API
-  createReport(
-    action: string,
-    description: string,
-    date_entry: Date,
-    user_id: string,
-  ) {
+  createReport(action: string, description: string, date_entry: Date,
+    user_id: string) {
     const pattern = { cmd: 'createReport' };
     const payload = {
-      action: action,
-      description: description,
-      date_entry: date_entry,
-      user_id: user_id,
+      action: action, description: description, date_entry: date_entry,
+      user_id: user_id
     };
     return this.clientReportApp
       .send<string>(pattern, payload)
@@ -532,4 +525,22 @@ export class AppService {
       .send<string>(pattern, payload)
       .pipe(map((message: string) => ({ message })));
   }
+
+
+
+  /* Function to generate combination of password */
+  generatePassword() {
+    var pass = '';
+    var str = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' +
+      'abcdefghijklmnopqrstuvwxyz0123456789@#$';
+
+    for (let i = 1; i <= 8; i++) {
+      var char = Math.floor(Math.random()
+        * str.length + 1);
+
+      pass += str.charAt(char)
+    }
+
+    return pass;
+  }
 }

servicio-areas-comunes/src/common_areas/common_areas.controller.ts

@@ -30,7 +30,13 @@ export class CommonAreasController {
 
   @MessagePattern({ cmd: 'removeCommonArea' })
   remove(@Payload() id: string) {
-    let _id = id['_id'];
+    let _id = id['id'];
     return this.commonAreasService.remove(_id);
   }
+
+  @MessagePattern({ cmd: 'findByCommunity' })
+  findByCommunity(@Payload() id: string) {
+    let _community_id = id['community_id'];
+    return this.commonAreasService.findByCommunity(_community_id);
+  }
 }

servicio-areas-comunes/src/common_areas/common_areas.service.ts

@@ -32,6 +32,13 @@ export class CommonAreasService {
   }
 
   async remove(id: string) {
-    return this.commonAreaModel.findByIdAndRemove({ _id: id }).exec();
+    return this.commonAreaModel.findOneAndUpdate({ _id: id }, {status: '-1'}, {
+      new: true,
+    });  
+  };
+
+  async findByCommunity(community_id: string): Promise<CommonArea[]> {
+    return this.commonAreaModel.find({ community_id: community_id }).exec();
   }
+
 }

servicio-areas-comunes/src/schemas/common_area.schema.ts

@@ -19,6 +19,9 @@ export class CommonArea {
   @Prop()
   bookable: number; //saber si es necesario reservarlo o no
 
+  @Prop()
+  status: string;
+
   @Prop()
   community_id: string;
 }

servicio-comunidad-viviendas/src/communities/communities.controller.ts

@@ -45,4 +45,14 @@ export class CommunitiesController {
     let _id = id['_id'];
     return this.communitiesService.remove(_id);
   }
+
+   //cambiar de estado
+   @MessagePattern({ cmd: 'changeStatus' })
+   changeStatus(@Payload() body: string) {
+     let pid = body['id'];
+     let pstatus = body['status'];
+     console.log(pid);
+     console.log(pstatus);
+     return this.communitiesService.changeStatus(pid,pstatus);
+   }
 }

servicio-comunidad-viviendas/src/communities/communities.service.ts

@@ -56,7 +56,15 @@ export class CommunitiesService {
   }
 
   async remove(id: string) {
-    return this.communityModel.findByIdAndRemove({ _id: id }).exec();
+    return this.communityModel.findOneAndUpdate({ _id: id }, {status: '-1'}, {
+      new: true,
+    });  
+  }
+
+  async changeStatus(id: string, status: string) {
+    return this.communityModel.findOneAndUpdate({ _id: id }, {status: status}, {
+      new: true,
+    });  
   }
 
   async findCommunityAdmin(community: string, user_type: string) {

servicio-foro-comunicaciones/src/post-comments/post-comments.service.ts

@@ -33,6 +33,8 @@ export class PostCommentsService {
   }
 
   async remove(id: string) {
-    return this.commentModel.findByIdAndRemove({ _id: id }).exec();
+    return this.commentModel.findOneAndUpdate({ _id: id }, {status: '-1'}, {
+      new: true,
+    });  
   }
 }

servicio-invitados/src/guests/guests.service.ts

@@ -32,6 +32,8 @@ export class GuestsService {
   }
 
   async remove(id: string) {
-    return this.guestModel.findByIdAndRemove({ _id: id }).exec();
+    return this.guestModel.findOneAndUpdate({ _id: id }, {status: '-1'}, {
+      new: true,
+    });  
   }
 }

servicio-notificaciones/src/email.controller.ts

@@ -21,24 +21,59 @@ export class EmailController {
 
     @MessagePattern({ cmd: 'html' })
     async postHTMLEmail(@Payload() user: any) {
-    const url = 'http://localhost:3000/';
-    const image = 'images/email.ong';
+        const url = "http://localhost:3000/";
+        const image = "images/email.png";
         var response = await this.mailService.sendMail({
-      to: user['email'],
-      from: 'mbonilla.guti@gmail.com',
+            to: user["email"],
+            from: "mbonilla.guti@gmail.com",
             subject: 'HTML Dynamic Template',
             template: 'templateEmail',
             context: {
-        name: user['name'],
-        url,
+                name: user["name"],
+                url
             },
             attachments: [
                 {
                     filename: 'email.png',
                     path: __dirname + '/mails/images/email.png',
-          cid: 'logo', //my mistake was putting "cid:logo@cid" here!
+                    cid: 'logo' //my mistake was putting "cid:logo@cid" here! 
+                }
+            ]
+        });
+        return response;
+    }
+
+
+    @MessagePattern({ cmd: 'emailCreateUserAdminCommunity' })
+    async emailCreateUserAdmin(@Payload() user: any) {
+        const url = "http://localhost:3000/";
+        const image = "images/email.png";
+        const logo = "images/Logo Katoikia.png";
+        var response = await this.mailService.sendMail({
+            to: user["email"],
+            from: "mbonilla.guti@gmail.com",
+            subject: 'Usuario registrado',
+            template: 'emailCreateUserAdminCommunity',
+            context: {
+                name: user["name"],
+                password: user["password"],
+                date_entry: user["date_entry"],
+                email: user["email"],
+                community_name: user['community_name'],
+                url
             },
-      ],
+            attachments: [
+                {
+                    filename: 'email.png',
+                    path: __dirname + '/mails/images/email.png',
+                    cid: 'image_email' //my mistake was putting "cid:logo@cid" here! 
+                },
+                {
+                    filename: 'Logo_Katoikia.png',
+                    path: __dirname + '/mails/images/Logo_Katoikia.png',
+                    cid: 'logoKatoikia' //my mistake was putting "cid:logo@cid" here! 
+                }
+            ]
         });
         return response;
     }

servicio-notificaciones/src/mails/emailCreateUserAdmin.hbs

@@ -0,0 +1,457 @@
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml"
+    xmlns:o="urn:schemas-microsoft-com:office:office">
+
+<head>
+    <meta charset="utf-8"> <!-- utf-8 works for most cases -->
+    <meta name="viewport" content="width=device-width"> <!-- Forcing initial-scale shouldn't be necessary -->
+    <meta http-equiv="X-UA-Compatible" content="IE=edge"> <!-- Use the latest (edge) version of IE rendering engine -->
+    <meta name="x-apple-disable-message-reformatting"> <!-- Disable auto-scale in iOS 10 Mail entirely -->
+    <title></title> <!-- The title tag shows in email notifications, like Android 4.4. -->
+
+    <link href="https://fonts.googleapis.com/css?family=Lato:300,400,700" rel="stylesheet">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.1.2/css/all.min.css"
+        integrity="sha512-1sCRPdkRXhBV2PBLUdRb4tMg1w2YPf37qatUFeS7zlBy7jJI8Lf4VHwWfZZfpXtYSLy85pkm9GaYVYMfw5BC1A=="
+        crossorigin="anonymous" referrerpolicy="no-referrer" />
+
+
+    <!-- CSS Reset : BEGIN -->
+    <style>
+        html,
+        body {
+            margin: 0 auto !important;
+            padding: 0 !important;
+            height: 100% !important;
+            width: 100% !important;
+            background: #f1f1f1;
+        }
+
+        /* What it does: Stops email clients resizing small text. */
+        * {
+            -ms-text-size-adjust: 100%;
+            -webkit-text-size-adjust: 100%;
+        }
+
+        /* What it does: Centers email on Android 4.4 */
+        div[style*="margin: 16px 0"] {
+            margin: 0 !important;
+        }
+
+        /* What it does: Stops Outlook from adding extra spacing to tables. */
+        table,
+        td {
+            mso-table-lspace: 0pt !important;
+            mso-table-rspace: 0pt !important;
+        }
+
+        /* What it does: Fixes webkit padding issue. */
+        table {
+            border-spacing: 0 !important;
+            border-collapse: collapse !important;
+            table-layout: fixed !important;
+            margin: 0 auto !important;
+        }
+
+        /* What it does: Uses a better rendering method when resizing images in IE. */
+        img {
+            -ms-interpolation-mode: bicubic;
+        }
+
+        /* What it does: Prevents Windows 10 Mail from underlining links despite inline CSS. Styles for underlined links should be inline. */
+        a {
+            text-decoration: none;
+        }
+
+        /* What it does: A work-around for email clients meddling in triggered links. */
+        *[x-apple-data-detectors],
+        /* iOS */
+        .unstyle-auto-detected-links *,
+        .aBn {
+            border-bottom: 0 !important;
+            cursor: default !important;
+            color: inherit !important;
+            text-decoration: none !important;
+            font-size: inherit !important;
+            font-family: inherit !important;
+            font-weight: inherit !important;
+            line-height: inherit !important;
+        }
+
+        /* What it does: Prevents Gmail from displaying a download button on large, non-linked images. */
+        .a6S {
+            display: none !important;
+            opacity: 0.01 !important;
+        }
+
+        /* What it does: Prevents Gmail from changing the text color in conversation threads. */
+        .im {
+            color: inherit !important;
+        }
+
+        /* If the above doesn't work, add a .g-img class to any image in question. */
+        img.g-img+div {
+            display: none !important;
+        }
+
+        /* What it does: Removes right gutter in Gmail iOS app: https://github.com/TedGoas/Cerberus/issues/89  */
+        /* Create one of these media queries for each additional viewport size you'd like to fix */
+
+        /* iPhone 4, 4S, 5, 5S, 5C, and 5SE */
+        @media only screen and (min-device-width: 320px) and (max-device-width: 374px) {
+            u~div .email-container {
+                min-width: 320px !important;
+            }
+        }
+
+        /* iPhone 6, 6S, 7, 8, and X */
+        @media only screen and (min-device-width: 375px) and (max-device-width: 413px) {
+            u~div .email-container {
+                min-width: 375px !important;
+            }
+        }
+
+        /* iPhone 6+, 7+, and 8+ */
+        @media only screen and (min-device-width: 414px) {
+            u~div .email-container {
+                min-width: 414px !important;
+            }
+        }
+    </style>
+
+    <!-- CSS Reset : END -->
+
+    <!-- Progressive Enhancements : BEGIN -->
+    <style>
+        .primary {
+            background: #D7A86E;
+        }
+
+        .bg_white {
+            background: #ffffff;
+        }
+
+        .bg_light {
+            background: #fafafa;
+        }
+
+        .bg_black {
+            background: #000000;
+        }
+
+        .bg_dark {
+            background: rgba(0, 0, 0, .8);
+        }
+
+        .email-section {
+            padding: 2.5em;
+        }
+
+        /*BUTTON*/
+        .btn {
+            padding: 10px 15px;
+            display: inline-block;
+        }
+
+        .btn.btn-primary {
+            border-radius: 5px;
+            background: #D7A86E;
+            color: #ffffff;
+        }
+
+        .btn.btn-white {
+            border-radius: 5px;
+            background: #ffffff;
+            color: #000000;
+        }
+
+        .btn.btn-white-outline {
+            border-radius: 5px;
+            background: transparent;
+            border: 1px solid #fff;
+            color: #fff;
+        }
+
+        .btn.btn-black-outline {
+            border-radius: 0px;
+            background: transparent;
+            border: 2px solid #000;
+            color: #000;
+            font-weight: 700;
+        }
+
+        h1,
+        h2,
+        h3,
+        h4,
+        h5,
+        h6 {
+            font-family: 'Lato', sans-serif;
+            color: #000000;
+            margin-top: 0;
+            font-weight: 400;
+            margin-bottom: 12px;
+        }
+
+        body {
+            font-family: 'Lato', sans-serif;
+            font-weight: 400;
+            font-size: 15px;
+            line-height: 1.8;
+            color: rgba(0, 0, 0, 0.808);
+        }
+
+        a {
+            color: #D7A86E;
+        }
+
+        table {}
+
+        /*LOGO*/
+
+        .logo h1 {
+            margin: 0;
+        }
+
+        .logo h1 a {
+            color: #D7A86E;
+            font-size: 24px;
+            font-weight: 700;
+            font-family: 'Lato', sans-serif;
+        }
+
+        /*HERO*/
+        .hero {
+            position: relative;
+            z-index: 0;
+        }
+
+        .hero .text {
+            color: rgba(0, 0, 0, 0.884);
+        }
+
+        .hero .text h2 {
+            color: #000;
+            font-size: 40px;
+            margin-bottom: 0;
+            font-weight: 400;
+            line-height: 1.4;
+        }
+
+        .hero .text h3 {
+            font-size: 24px;
+            font-weight: 300;
+        }
+
+        .hero .text h2 span {
+            font-weight: 600;
+            color: #D7A86E;
+        }
+
+
+        /*HEADING SECTION*/
+        .heading-section {}
+
+        .heading-section h2 {
+            color: #000000;
+            font-size: 28px;
+            margin-top: 0;
+            line-height: 1.4;
+            font-weight: 400;
+        }
+
+        .heading-section .subheading {
+            margin-bottom: 20px !important;
+            display: inline-block;
+            font-size: 13px;
+            text-transform: uppercase;
+            letter-spacing: 2px;
+            color: rgba(0, 0, 0, .4);
+            position: relative;
+        }
+
+        .heading-section .subheading::after {
+            position: absolute;
+            left: 0;
+            right: 0;
+            bottom: -10px;
+            content: '';
+            width: 100%;
+            height: 2px;
+            background: #D7A86E;
+            margin: 0 auto;
+        }
+
+        .heading-section-white {
+            color: rgba(255, 255, 255, .8);
+        }
+
+        .heading-section-white h2 {
+            line-height: 1;
+            padding-bottom: 0;
+        }
+
+        .heading-section-white h2 {
+            color: #ffffff;
+        }
+
+        .heading-section-white .subheading {
+            margin-bottom: 0;
+            display: inline-block;
+            font-size: 13px;
+            text-transform: uppercase;
+            letter-spacing: 2px;
+            color: rgba(255, 255, 255, .4);
+        }
+
+
+        ul.social {
+            padding: 0;
+        }
+
+        ul.social li {
+            display: inline-block;
+            margin-right: 10px;
+        }
+
+        /*FOOTER*/
+
+        .footer {
+            border-top: 1px solid rgba(0, 0, 0, .05);
+            color: rgba(0, 0, 0, .5);
+        }
+
+        .footer .heading {
+            color: #000;
+            font-size: 20px;
+        }
+
+        .footer ul {
+            margin: 0;
+            padding: 0;
+        }
+
+        .footer ul li {
+            list-style: none;
+            margin-bottom: 10px;
+        }
+
+        .footer ul li a {
+            color: rgba(0, 0, 0, 1);
+        }
+
+
+        @media screen and (max-width: 500px) {}
+    </style>
+
+
+</head>
+
+<body width="100%" style="margin: 0; padding: 0 !important; mso-line-height-rule: exactly; background-color: #f1f1f1;">
+    <center style="width: 100%; background-color: #f1f1f1;">
+        <div
+            style="display: none; font-size: 1px;max-height: 0px; max-width: 0px; opacity: 0; overflow: hidden; mso-hide: all; font-family: sans-serif;">
+            &zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;
+        </div>
+        <div style="max-width: 600px; margin: 0 auto;" class="email-container">
+            <!-- BEGIN BODY -->
+            <table align="center" role="presentation" cellspacing="0" cellpadding="0" border="0" width="100%"
+                style="margin: auto;">
+                <tr>
+                    <td valign="top" class="bg_white" style="padding: 1em 2.5em 0 2.5em;">
+                        <table role="presentation" border="0" cellpadding="0" cellspacing="0" width="100%">
+                            <tr>
+
+                                <td class="logo" style="text-align: right;">
+                                    <img src="cid:logoLatoikia" alt="Logo Katoikia"
+                                        style="width: 60px; max-width: 60px; height: auto; margin: auto; display: block; float: right;">
+                                </td>
+                                <td class="logo" style="text-align: left;">
+                                    <h1><a href="#">Katoikia</a></h1>
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+
+                </tr><!-- end tr -->
+                <tr>
+                    <td valign="middle" class="hero bg_white" style="padding: 3em 0 2em 0;">
+                        <img src="cid:image_email" alt="Logo Katoikia"
+                            style="width: 150px; max-width: 300px; height: auto; margin: auto; display: block;">
+                    </td>
+                </tr><!-- end tr -->
+                <tr>
+                    <td valign="middle" class="hero bg_white" style="padding: 2em 0 4em 0;">
+                        <table>
+                            <tr>
+                                <td>
+                                    <div class="text" style="padding: 0 2.5em; text-align: center;">
+                                        <h2> Hola , {{ name }} <i class="fa-regular fa-face-smile-wink"
+                                                style="color:#D7A86E; font-size: 0.8em; margin-left: 20px;"></i></h2>
+                                        <h3>Ha sido registrado como un Administrador General del sitio web Katoikia</h3>
+                                        <h4><i class="fa-solid fa-calendar-day"
+                                                style="color:#D7A86E; margin-right: 10px;"></i> Fecha de registro
+                                            {{date_entry}}</h4>
+                                    </div>
+                                    <div class="text" style="padding: 0 4em; text-align: left;">
+                                        <h3>Estas son sus credenciales:</h3>
+                                        <p><i class="fa-regular fa-envelope"  style="color:#D7A86E; margin-right: 10px;"></i>  Correo electronico: {{email}}</p>
+                                        <p><i class="fa-solid fa-key"  style="color:#D7A86E; margin-right: 10px;"></i> Password: {{password}}</p>
+
+                                    </div>
+                                    <div class="text" style="padding: 0 2.5em; text-align: center;">
+                                        <h3>Inicie sesión en el sitio web para poder acceder y disfrutar todos sus
+                                            beneficios</h3>
+                                        <p><a href="{{ url }}" class="btn btn-primary">Iniciar sesión</a></p>
+                                    </div>
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr><!-- end tr -->
+                
+                <!-- 1 Column Text + Button : END -->
+            </table>
+            <table align="center" role="presentation" cellspacing="0" cellpadding="0" border="0" width="100%"
+                style="margin: auto;">
+                <td valign="middle" class="bg_light footer email-section">
+                    <table>
+                      <tr>
+                        <td valign="top" width="33.333%" style="padding-top: 20px">
+                          <table role="presentation" cellspacing="0" cellpadding="0" border="0" width="100%">
+                            <tr>
+                              <td style="text-align: left; padding-right: 10px">
+                                <h3 class="heading">Acerca de</h3>
+                                <p>Katoikia es su compañero más cercano para poder estar en contacto con sus vecinos y conocer sobre los mejores anuncios sobre su comunidad.</p>
+                              </td>
+                            </tr>
+                          </table>
+                        </td>
+                        <td valign="top" width="33.333%" style="padding-top: 20px">
+                          <table role="presentation" cellspacing="0" cellpadding="0" border="0" width="100%">
+                            <tr>
+                              <td style="text-align: left; padding-left: 5px; padding-right: 5px">
+                                <h3 class="heading">Información de contacto</h3>
+                                <ul>
+                                  <li><span href="mailto:katoikiaapp@gmail.com" class="text">katoikiaapp@gmail.com</span></li>
+                                </ul>
+                              </td>
+                            </tr>
+                          </table>
+                        </td>
+                      </tr>
+                    </table>
+                  </td>
+                </tr>
+                <!-- end: tr -->
+                <tr>
+                  <td class="bg_light" style="text-align: center">
+                    <p><a href="http://localhost:3000" style="color: rgba(0, 0, 0, 0.8)">katoikiaapp.org</a></p>
+                  </td>
+
+            </table>
+
+        </div>
+    </center>
+</body>
+
+</html>

servicio-notificaciones/src/mails/emailCreateUserAdminCommunity.hbs

@@ -0,0 +1,464 @@
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml"
+    xmlns:o="urn:schemas-microsoft-com:office:office">
+
+<head>
+    <meta charset="utf-8"> <!-- utf-8 works for most cases -->
+    <meta name="viewport" content="width=device-width"> <!-- Forcing initial-scale shouldn't be necessary -->
+    <meta http-equiv="X-UA-Compatible" content="IE=edge"> <!-- Use the latest (edge) version of IE rendering engine -->
+    <meta name="x-apple-disable-message-reformatting"> <!-- Disable auto-scale in iOS 10 Mail entirely -->
+    <title></title> <!-- The title tag shows in email notifications, like Android 4.4. -->
+
+    <link href="https://fonts.googleapis.com/css?family=Lato:300,400,700" rel="stylesheet">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.1.2/css/all.min.css"
+        integrity="sha512-1sCRPdkRXhBV2PBLUdRb4tMg1w2YPf37qatUFeS7zlBy7jJI8Lf4VHwWfZZfpXtYSLy85pkm9GaYVYMfw5BC1A=="
+        crossorigin="anonymous" referrerpolicy="no-referrer" />
+
+
+    <!-- CSS Reset : BEGIN -->
+    <style>
+        html,
+        body {
+            margin: 0 auto !important;
+            padding: 0 !important;
+            height: 100% !important;
+            width: 100% !important;
+            background: #f1f1f1;
+        }
+
+        /* What it does: Stops email clients resizing small text. */
+        * {
+            -ms-text-size-adjust: 100%;
+            -webkit-text-size-adjust: 100%;
+        }
+
+        /* What it does: Centers email on Android 4.4 */
+        div[style*="margin: 16px 0"] {
+            margin: 0 !important;
+        }
+
+        /* What it does: Stops Outlook from adding extra spacing to tables. */
+        table,
+        td {
+            mso-table-lspace: 0pt !important;
+            mso-table-rspace: 0pt !important;
+        }
+
+        /* What it does: Fixes webkit padding issue. */
+        table {
+            border-spacing: 0 !important;
+            border-collapse: collapse !important;
+            table-layout: fixed !important;
+            margin: 0 auto !important;
+        }
+
+        /* What it does: Uses a better rendering method when resizing images in IE. */
+        img {
+            -ms-interpolation-mode: bicubic;
+        }
+
+        /* What it does: Prevents Windows 10 Mail from underlining links despite inline CSS. Styles for underlined links should be inline. */
+        a {
+            text-decoration: none;
+        }
+
+        /* What it does: A work-around for email clients meddling in triggered links. */
+        *[x-apple-data-detectors],
+        /* iOS */
+        .unstyle-auto-detected-links *,
+        .aBn {
+            border-bottom: 0 !important;
+            cursor: default !important;
+            color: inherit !important;
+            text-decoration: none !important;
+            font-size: inherit !important;
+            font-family: inherit !important;
+            font-weight: inherit !important;
+            line-height: inherit !important;
+        }
+
+        /* What it does: Prevents Gmail from displaying a download button on large, non-linked images. */
+        .a6S {
+            display: none !important;
+            opacity: 0.01 !important;
+        }
+
+        /* What it does: Prevents Gmail from changing the text color in conversation threads. */
+        .im {
+            color: inherit !important;
+        }
+
+        /* If the above doesn't work, add a .g-img class to any image in question. */
+        img.g-img+div {
+            display: none !important;
+        }
+
+        /* What it does: Removes right gutter in Gmail iOS app: https://github.com/TedGoas/Cerberus/issues/89  */
+        /* Create one of these media queries for each additional viewport size you'd like to fix */
+
+        /* iPhone 4, 4S, 5, 5S, 5C, and 5SE */
+        @media only screen and (min-device-width: 320px) and (max-device-width: 374px) {
+            u~div .email-container {
+                min-width: 320px !important;
+            }
+        }
+
+        /* iPhone 6, 6S, 7, 8, and X */
+        @media only screen and (min-device-width: 375px) and (max-device-width: 413px) {
+            u~div .email-container {
+                min-width: 375px !important;
+            }
+        }
+
+        /* iPhone 6+, 7+, and 8+ */
+        @media only screen and (min-device-width: 414px) {
+            u~div .email-container {
+                min-width: 414px !important;
+            }
+        }
+    </style>
+
+    <!-- CSS Reset : END -->
+
+    <!-- Progressive Enhancements : BEGIN -->
+    <style>
+        .primary {
+            background: #D7A86E;
+        }
+
+        .bg_white {
+            background: #ffffff;
+        }
+
+        .bg_light {
+            background: #fafafa;
+        }
+
+        .bg_black {
+            background: #000000;
+        }
+
+        .bg_dark {
+            background: rgba(0, 0, 0, .8);
+        }
+
+        .email-section {
+            padding: 2.5em;
+        }
+
+        /*BUTTON*/
+        .btn {
+            padding: 10px 15px;
+            display: inline-block;
+        }
+
+        .btn.btn-primary {
+            border-radius: 5px;
+            background: #D7A86E;
+            color: #ffffff;
+        }
+
+        .btn.btn-white {
+            border-radius: 5px;
+            background: #ffffff;
+            color: #000000;
+        }
+
+        .btn.btn-white-outline {
+            border-radius: 5px;
+            background: transparent;
+            border: 1px solid #fff;
+            color: #fff;
+        }
+
+        .btn.btn-black-outline {
+            border-radius: 0px;
+            background: transparent;
+            border: 2px solid #000;
+            color: #000;
+            font-weight: 700;
+        }
+
+        h1,
+        h2,
+        h3,
+        h4,
+        h5,
+        h6 {
+            font-family: 'Lato', sans-serif;
+            color: #000000;
+            margin-top: 0;
+            font-weight: 400;
+            margin-bottom: 12px;
+        }
+
+        body {
+            font-family: 'Lato', sans-serif;
+            font-weight: 400;
+            font-size: 15px;
+            line-height: 1.8;
+            color: rgba(0, 0, 0, 0.808);
+        }
+
+        a {
+            color: #D7A86E;
+        }
+
+        table {}
+
+        /*LOGO*/
+
+        .logo h1 {
+            margin: 0;
+        }
+
+        .logo h1 a {
+            color: #D7A86E;
+            font-size: 24px;
+            font-weight: 700;
+            font-family: 'Lato', sans-serif;
+        }
+
+        /*HERO*/
+        .hero {
+            position: relative;
+            z-index: 0;
+        }
+
+        .hero .text {
+            color: rgba(0, 0, 0, 0.884);
+        }
+
+        .hero .text h2 {
+            color: #000;
+            font-size: 40px;
+            margin-bottom: 0;
+            font-weight: 400;
+            line-height: 1.4;
+        }
+
+        .hero .text h3 {
+            font-size: 24px;
+            font-weight: 300;
+        }
+
+        .hero .text h2 span {
+            font-weight: 600;
+            color: #D7A86E;
+        }
+
+
+        /*HEADING SECTION*/
+        .heading-section {}
+
+        .heading-section h2 {
+            color: #000000;
+            font-size: 28px;
+            margin-top: 0;
+            line-height: 1.4;
+            font-weight: 400;
+        }
+
+        .heading-section .subheading {
+            margin-bottom: 20px !important;
+            display: inline-block;
+            font-size: 13px;
+            text-transform: uppercase;
+            letter-spacing: 2px;
+            color: rgba(0, 0, 0, .4);
+            position: relative;
+        }
+
+        .heading-section .subheading::after {
+            position: absolute;
+            left: 0;
+            right: 0;
+            bottom: -10px;
+            content: '';
+            width: 100%;
+            height: 2px;
+            background: #D7A86E;
+            margin: 0 auto;
+        }
+
+        .heading-section-white {
+            color: rgba(255, 255, 255, .8);
+        }
+
+        .heading-section-white h2 {
+            line-height: 1;
+            padding-bottom: 0;
+        }
+
+        .heading-section-white h2 {
+            color: #ffffff;
+        }
+
+        .heading-section-white .subheading {
+            margin-bottom: 0;
+            display: inline-block;
+            font-size: 13px;
+            text-transform: uppercase;
+            letter-spacing: 2px;
+            color: rgba(255, 255, 255, .4);
+        }
+
+
+        ul.social {
+            padding: 0;
+        }
+
+        ul.social li {
+            display: inline-block;
+            margin-right: 10px;
+        }
+
+        /*FOOTER*/
+
+        .footer {
+            border-top: 1px solid rgba(0, 0, 0, .05);
+            color: rgba(0, 0, 0, .5);
+        }
+
+        .footer .heading {
+            color: #000;
+            font-size: 20px;
+        }
+
+        .footer ul {
+            margin: 0;
+            padding: 0;
+        }
+
+        .footer ul li {
+            list-style: none;
+            margin-bottom: 10px;
+        }
+
+        .footer ul li a {
+            color: rgba(0, 0, 0, 1);
+        }
+
+
+        @media screen and (max-width: 500px) {}
+    </style>
+
+
+</head>
+
+<body width="100%" style="margin: 0; padding: 0 !important; mso-line-height-rule: exactly; background-color: #f1f1f1;">
+    <center style="width: 100%; background-color: #f1f1f1;">
+        <div
+            style="display: none; font-size: 1px;max-height: 0px; max-width: 0px; opacity: 0; overflow: hidden; mso-hide: all; font-family: sans-serif;">
+            &zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;
+        </div>
+        <div style="max-width: 600px; margin: 0 auto;" class="email-container">
+            <!-- BEGIN BODY -->
+            <table align="center" role="presentation" cellspacing="0" cellpadding="0" border="0" width="100%"
+                style="margin: auto;">
+                <tr>
+                    <td valign="top" class="bg_white" style="padding: 1em 2.5em 0 2.5em;">
+                        <table role="presentation" border="0" cellpadding="0" cellspacing="0" width="100%">
+                            <tr>
+
+                                <td class="logo" style="text-align: right;">
+                                    <img src="cid:logoKatoikia" alt="Logo Katoikia"
+                                        style="width: 60px; max-width: 60px; height: auto; margin: auto; display: block; float: right;">
+                                </td>
+                                <td class="logo" style="text-align: left;">
+                                    <h1><a href="#">Katoikia</a></h1>
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+
+                </tr><!-- end tr -->
+                <tr>
+                    <td valign="middle" class="hero bg_white" style="padding: 3em 0 2em 0;">
+                        <img src="cid:image_email" alt="Logo Katoikia"
+                            style="width: 150px; max-width: 300px; height: auto; margin: auto; display: block;">
+                    </td>
+                </tr><!-- end tr -->
+                <tr>
+                    <td valign="middle" class="hero bg_white" style="padding: 2em 0 4em 0;">
+                        <table>
+                            <tr>
+                                <td>
+                                    <div class="text" style="padding: 0 2.5em; text-align: center;">
+                                        <h2> Hola , {{ name }} <i class="fa-regular fa-face-smile-wink"
+                                                style="color:#D7A86E; font-size: 0.8em; margin-left: 20px;"></i></h2>
+                                        <h3>Ha sido registrado como un Administrador de la Comunidad `{{community_name}}`
+                                        </h3>
+
+                                        <h4><i class="fa-solid fa-calendar-day"
+                                                style="color:#D7A86E; margin-right: 10px;"></i> Fecha de registro
+                                            {{date_entry}}</h4>
+                                    </div>
+                                    <div class="text" style="padding: 0 4em; text-align: left;">
+                                        <h3>Estas son sus credenciales:</h3>
+                                        <p><i class="fa fa-regular fa-envelope"
+                                                style="color:#D7A86E; margin-right: 10px;"></i> Correo electronico:
+                                            {{email}}</p>
+                                        <p><i class="fa-solid fa-key" style="color:#D7A86E; margin-right: 10px;"></i>
+                                            Password: {{password}}</p>
+
+                                    </div>
+                                    <div class="text" style="padding: 0 2.5em; text-align: center;">
+                                        <h3>Inicie sesión en el sitio web para poder acceder y disfrutar todos sus
+                                            beneficios</h3>
+                                        <p><a href="{{ url }}" class="btn btn-primary">Iniciar sesión</a></p>
+                                    </div>
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr><!-- end tr -->
+
+                <!-- 1 Column Text + Button : END -->
+            </table>
+            <table align="center" role="presentation" cellspacing="0" cellpadding="0" border="0" width="100%"
+                style="margin: auto;">
+                <td valign="middle" class="bg_light footer email-section">
+                    <table>
+                        <tr>
+                            <td valign="top" width="33.333%" style="padding-top: 20px">
+                                <table role="presentation" cellspacing="0" cellpadding="0" border="0" width="100%">
+                                    <tr>
+                                        <td style="text-align: left; padding-right: 10px">
+                                            <h3 class="heading">Acerca de</h3>
+                                            <p>Katoikia es su compañero más cercano para poder estar en contacto con sus
+                                                vecinos y conocer sobre los mejores anuncios sobre su comunidad.</p>
+                                        </td>
+                                    </tr>
+                                </table>
+                            </td>
+                            <td valign="top" width="33.333%" style="padding-top: 20px">
+                                <table role="presentation" cellspacing="0" cellpadding="0" border="0" width="100%">
+                                    <tr>
+                                        <td style="text-align: left; padding-left: 5px; padding-right: 5px">
+                                            <h3 class="heading">Información de contacto</h3>
+                                            <ul>
+                                                <li><span href="mailto:katoikiaapp@gmail.com"
+                                                        class="text">katoikiaapp@gmail.com</span></li>
+                                            </ul>
+                                        </td>
+                                    </tr>
+                                </table>
+                            </td>
+                        </tr>
+                    </table>
+                </td>
+                </tr>
+                <!-- end: tr -->
+                <tr>
+                    <td class="bg_light" style="text-align: center">
+                        <p><a href="http://localhost:3000" style="color: rgba(0, 0, 0, 0.8)">katoikiaapp.org</a></p>
+                    </td>
+
+            </table>
+
+        </div>
+    </center>
+</body>
+
+</html>

servicio-reportes/src/reports/reports.service.ts

@@ -9,9 +9,8 @@ import { map } from 'rxjs/operators';
 export class ReportsService {
   constructor(
     @InjectModel(Report.name)
-    private readonly reportModel: Model<ReportDocument>,
-  ) //
-  {}
+    private readonly reportModel: Model<ReportDocument>, //
+  ) {}
 
   async create(report: ReportDocument): Promise<Report> {
     return this.reportModel.create(report);
@@ -32,6 +31,9 @@ export class ReportsService {
   }
 
   async remove(id: string) {
-    return this.reportModel.findByIdAndRemove({ _id: id }).exec();
+    return this.reportModel.findOneAndUpdate({ _id: id }, {status: '-1'}, {
+      new: true,
+    });  
+    
   }
 }

servicio-reservaciones/src/reservations/reservations.service.ts

@@ -41,6 +41,8 @@ export class ReservationsService {
   }
 
   async remove(id: string) {
-    return this.reservationModel.findByIdAndRemove({ _id: id }).exec();
+    return this.reservationModel.findOneAndUpdate({ _id: id }, {status: '-1'}, {
+      new: true,
+    });  
   }
 }

servicio-usuarios/package.json

@@ -29,10 +29,12 @@
     "@nestjs/platform-express": "^8.0.0",
     "@nestjs/swagger": "^5.2.1",
     "buffer": "^5.7.1",
+    "class-validator": "^0.13.2",
     "cors": "^2.8.5",
     "crypto-browserify": "^3.12.0",
     "md5-typescript": "^1.0.5",
     "mongoose": "^6.4.1",
+    "mongoose-unique-validator": "^3.1.0",
     "reflect-metadata": "^0.1.13",
     "rimraf": "^3.0.2",
     "rxjs": "^7.2.0",

servicio-usuarios/src/MongoExceptionFilter.ts

@@ -0,0 +1,14 @@
+import { ArgumentsHost, Catch, ConflictException, ExceptionFilter } from '@nestjs/common';
+import { MongoError } from 'mongodb';
+
+@Catch(MongoError)
+export class MongoExceptionFilter implements ExceptionFilter {
+  catch(exception: MongoError, host: ArgumentsHost) {
+    switch (exception.code) {
+      case 11000:
+          console.log('llave duplicada')
+        // duplicate exception
+        // do whatever you want here, for instance send error to client
+    }
+  }
+}

servicio-usuarios/src/app.module.ts

@@ -16,7 +16,8 @@ import { UsersModule } from './users/users.module';
       },
     ]),
     MongooseModule.forRoot(
-      `mongodb+srv://proyecto_4:proyecto_4@proyecto4.yv4fb.mongodb.net/servicio_usuarios?retryWrites=true&w=majority`,
+      `mongodb+srv://proyecto_4:proyecto_4@proyecto4.yv4fb.mongodb.net/servicio_usuarios?retryWrites=true&w=majority`
+
     ),
     UsersModule,
   ],

servicio-usuarios/src/exceptions/UserExistsRule.ts

@@ -0,0 +1,30 @@
+import { Injectable } from "@nestjs/common";
+import { Model } from 'mongoose';
+import { User, UserDocument } from '../schemas/user.schema';
+import { InjectModel } from '@nestjs/mongoose';
+import { ValidationArguments, ValidatorConstraint, ValidatorConstraintInterface } from "class-validator";
+
+
+@ValidatorConstraint({ name: 'UserExists', async: true })
+@Injectable()
+export class UserExistsRule implements ValidatorConstraintInterface {
+  constructor(    
+      @InjectModel(User.name) private readonly userModel: Model<UserDocument>,
+  ) {}
+
+  async validate(value: string) {
+    try {
+      await this.userModel.find({email: value});
+    } catch (e) {
+      return false;
+    }
+
+    return true;
+  }
+
+  defaultMessage(args: ValidationArguments) {
+    return `User doesn't exist`;
+  }
+}
+
+

servicio-usuarios/src/schemas/user.schema.ts

@@ -1,23 +1,25 @@
 import { Schema, Prop, SchemaFactory } from '@nestjs/mongoose';
 import { Document } from 'mongoose';
+var uniqueValidator = require('mongoose-unique-validator');
+import { IsEmail, IsNotEmpty, IsString, Validate } from 'class-validator';
 
 export type UserDocument = User & Document;
 
 @Schema({ collection: 'users'})
 export class User {
-  @Prop()
-  dni: string;
+  @Prop({index: true})
+  dni!: string;
 
-  @Prop()
+  @Prop({required: true})
   name: string;
 
-  @Prop()
+  @Prop({required: true})
   last_name: string;
 
-  @Prop()
+  @Prop({required: true, unique: true})
   email: string; 
 
-  @Prop()
+  @Prop({required: true, unique: true})
   phone: number;
 
   @Prop()
@@ -34,6 +36,10 @@ export class User {
 
   @Prop()
   community_id?: string;
+
+  @Prop()
+  number_house?: string;
 }
 
 export const UserSchema = SchemaFactory.createForClass(User);
+UserSchema.plugin(uniqueValidator);

servicio-usuarios/src/users/users.controller.ts

@@ -1,7 +1,8 @@
-import { Controller } from '@nestjs/common';
+import { Controller, UseFilters } from '@nestjs/common';
 import { MessagePattern, Payload } from '@nestjs/microservices';
 import { User, UserDocument } from '../schemas/user.schema';
 import { UsersService } from './users.service';
+import { MongoExceptionFilter } from 'src/MongoExceptionFilter';
 
 @Controller()
 export class UsersController {
@@ -13,6 +14,7 @@ export class UsersController {
   }
 
   @MessagePattern({ cmd: 'createAdminSystem' })
+  @UseFilters(MongoExceptionFilter)
   createUserAdmin(@Payload() user: UserDocument) {
     return this.userService.create(user);
   }
@@ -22,6 +24,11 @@ export class UsersController {
     return this.userService.create(user);
   }
 
+  @MessagePattern({ cmd: 'createAdminCommunity' })
+  createAdminCommunity(@Payload() user: UserDocument) {
+    return this.userService.createAdminCommunity(user);
+  }
+
   @MessagePattern({ cmd: 'findAllUsers' })
   findAll() {
     return this.userService.findAll();
@@ -33,12 +40,30 @@ export class UsersController {
     return this.userService.findOneByDNI(dni);
   }
 
+  @MessagePattern({ cmd: 'findById' })
+  findById(@Payload() id: string) {
+    let _id = id['id'];
+    return this.userService.findOne(_id);
+  }
+
   @MessagePattern({ cmd: 'findGuardsCommunity' })
   findGuardsCommunity(@Payload() community_id: string) {
     let pcommunity_id = community_id['community_id'];
     return this.userService.findGuardsCommunity(pcommunity_id);
   }
 
+  @MessagePattern({ cmd: 'findTenantsCommunity' })
+  findTenantsCommunity(@Payload() community_id: string) {
+    let pcommunity_id = community_id['community_id'];
+    return this.userService.findTenantsCommunity(pcommunity_id);
+  }
+
+  @MessagePattern({ cmd: 'findTenants' })
+  findTenants() {
+    return this.userService.findTenants();
+  }
+
+
   @MessagePattern({ cmd: 'updateUser' })
   update(@Payload() user: UserDocument) {
     return this.userService.update(user.id, user);
@@ -91,4 +116,7 @@ export class UsersController {
 
     return this.userService.deleteAdminSystem(user['id']);
   }
+
+  
+
 }

servicio-usuarios/src/users/users.module.ts

@@ -18,6 +18,16 @@ import { ClientsModule, Transport } from '@nestjs/microservices';
         },
       },
     ]),
+    ClientsModule.register([
+      {
+        name: "SERVICIO_COMUNIDADES",
+        transport: Transport.TCP,
+        options: {
+          host: "127.0.0.1",
+          port: 3002
+        }
+      }
+    ]),
     MongooseModule.forFeature([{ name: User.name, schema: UserSchema }]), 
   ],
   controllers: [UsersController],

servicio-usuarios/src/users/users.service.ts

@@ -4,6 +4,7 @@ import { User, UserDocument } from '../schemas/user.schema';
 import { InjectModel } from '@nestjs/mongoose';
 import { Md5 } from 'md5-typescript';
 import { map } from 'rxjs/operators';
+import { lastValueFrom } from 'rxjs';
 
 import { RpcException, ClientProxy } from '@nestjs/microservices';
 
@@ -11,8 +12,9 @@ import { RpcException, ClientProxy } from '@nestjs/microservices';
 export class UsersService {
   constructor(
     @InjectModel(User.name) private readonly userModel: Model<UserDocument>,
-    @Inject('SERVICIO_NOTIFICACIONES')
-    private readonly clientNotificationtApp: ClientProxy,
+    @Inject('SERVICIO_NOTIFICACIONES') private readonly clientNotificationtApp: ClientProxy,
+    @Inject('SERVICIO_COMUNIDADES') private readonly clientCommunityApp: ClientProxy,
+
   ) { }
   private publicKey: string;
   async create(user: UserDocument): Promise<User> {
@@ -21,6 +23,44 @@ export class UsersService {
     return this.userModel.create(user);
   }
 
+
+  async createAdminCommunity(user: UserDocument) {
+    let password = user.password;
+    let passwordEncriptada = Md5.init(user.password);
+    user.password = passwordEncriptada;
+
+    this.userModel.create(user)
+
+
+    let community = await this.findCommunity(user.community_id);
+    user.community_id = community['name'];
+
+    const pattern = { cmd: 'emailCreateUserAdminCommunity' };
+    const payload = {
+      email: user['email'], password: password, name: user['name'],
+      date_entry: user['date_entry'], community_name: community['name']
+    };
+    return this.clientNotificationtApp
+      .send<string>(pattern, payload)
+      .pipe(
+        map((message: string) => ({ message })),
+      );
+  }
+
+  async findCommunity(community_id: string) {
+    const pattern = { cmd: 'findOneCommunity' }
+    const payload = { _id: community_id }
+
+    let callback = await this.clientCommunityApp
+      .send<string>(pattern, payload)
+      .pipe(
+        map((response: string) => ({ response }))
+      )
+    const finalValue = await lastValueFrom(callback);
+    return finalValue['response'];
+
+  }
+
   async findAll(): Promise<User[]> {
     return this.userModel.find().setOptions({ sanitizeFilter: true }).exec();
   }
@@ -38,8 +78,14 @@ export class UsersService {
     });
   }
 
-  async remove(id: string) {
+ /* async remove(id: string) {
     return this.userModel.findByIdAndRemove({ _id: id }).exec();
+  }*/
+
+  async remove(id: string) {
+    return this.userModel.findOneAndUpdate({ _id: id }, {status: '-1'}, {
+      new: true,
+    });  
   }
 
   //inicio de sesion
@@ -79,6 +125,36 @@ export class UsersService {
     return this.userModel.find({ user_type: 2 }).exec();
   }
 
+
+  //find inquilinos
+  async findTenants(): Promise<User[]> {
+    return this.userModel.find({ user_type: 3 }).exec();
+  }
+
+
+  //find inquilinos
+  async findTenantsCommunity(pcommunity_id: string) {
+    //let tenants = await this.findCommunityTenants(pcommunity_id);
+
+
+
+    return await this.userModel.find({ community_id: pcommunity_id, user_type: 4 })
+      .then(async (users) => {
+        if (users) {
+          await Promise.all(
+            users.map(async (u) => {
+              //buscar al usuario con el id de la comunidad anexado
+              let number_house = await this.findNumHouseTenant(pcommunity_id, u['_id']);
+              u['number_house'] = number_house;
+              return u;
+            }),
+          )
+        }
+        return users;
+      })
+  }
+
+
   async testSendMail(user: UserDocument) {
     let passwordEncriptada = Md5.init(user.password);
     user.password = passwordEncriptada;
@@ -104,6 +180,48 @@ export class UsersService {
   }
 
   async deleteAdminSystem(id: string) {
-    return this.userModel.deleteOne({ _id: id }).exec();
+    return this.userModel.findOneAndUpdate({ _id: id }, {status: '-1'}, {
+      new: true,
+    });  
+  }
+
+  async validateEmail(email: string) {
+    let repo1 = this.userModel;
+    return new Promise<User>((resolve, reject) => {
+      let repo = repo1;
+
+      repo.find({ email: email }).exec((err, res) => {
+        if (err) {
+          reject(err);
+        } else {
+          if (res.length > 0) {
+            return res;
           }
         }
+      });
+    });
+  }
+
+  async findNumHouseTenant(community_id: string, tenant_id: string) {
+    const pattern = { cmd: 'findOneCommunity' }
+    const payload = { _id: community_id }
+
+    let callback = await this.clientCommunityApp
+      .send<string>(pattern, payload)
+      .pipe(
+        map((response: string) => ({ response }))
+      )
+    const finalValue = await lastValueFrom(callback);
+    const response = finalValue['response'];
+    const houses = response['houses'];
+    let num_house = "";
+    await houses.forEach(async house => {
+        if (tenant_id == house.tenants.tenant_id) {
+          num_house = house.number_house;
+        }
+    })
+    return num_house;
+  }
+
+}
+

web-ui/web-react/package-lock.json

@@ -27,6 +27,7 @@
                 "prismjs": "1.9.0",
                 "react": "^17.0.1",
                 "react-app-polyfill": "^1.0.6",
+                "react-cookie": "^4.1.1",
                 "react-dom": "^17.0.1",
                 "react-router-dom": "^5.2.0",
                 "react-scripts": "3.4.1",
@@ -2475,6 +2476,11 @@
                 "@babel/types": "^7.3.0"
             }
         },
+        "node_modules/@types/cookie": {
+            "version": "0.3.3",
+            "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.3.3.tgz",
+            "integrity": "sha512-LKVP3cgXBT9RYj+t+9FDKwS5tdI+rPBXaNSkma7hvqy35lc7mAokC2zsqWJH0LaqIt3B962nuYI77hsJoT1gow=="
+        },
         "node_modules/@types/eslint-visitor-keys": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
@@ -2489,6 +2495,15 @@
                 "@types/node": "*"
             }
         },
+        "node_modules/@types/hoist-non-react-statics": {
+            "version": "3.3.1",
+            "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz",
+            "integrity": "sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==",
+            "dependencies": {
+                "@types/react": "*",
+                "hoist-non-react-statics": "^3.3.0"
+            }
+        },
         "node_modules/@types/istanbul-lib-coverage": {
             "version": "2.0.4",
             "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz",
@@ -2531,11 +2546,31 @@
             "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
             "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="
         },
+        "node_modules/@types/prop-types": {
+            "version": "15.7.5",
+            "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz",
+            "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w=="
+        },
         "node_modules/@types/q": {
             "version": "1.5.5",
             "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.5.tgz",
             "integrity": "sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ=="
         },
+        "node_modules/@types/react": {
+            "version": "18.0.15",
+            "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.15.tgz",
+            "integrity": "sha512-iz3BtLuIYH1uWdsv6wXYdhozhqj20oD4/Hk2DNXIn1kFsmp9x8d9QB6FnPhfkbhd2PgEONt9Q1x/ebkwjfFLow==",
+            "dependencies": {
+                "@types/prop-types": "*",
+                "@types/scheduler": "*",
+                "csstype": "^3.0.2"
+            }
+        },
+        "node_modules/@types/scheduler": {
+            "version": "0.16.2",
+            "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz",
+            "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew=="
+        },
         "node_modules/@types/stack-utils": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz",
@@ -13402,6 +13437,19 @@
                 "node": ">=6"
             }
         },
+        "node_modules/react-cookie": {
+            "version": "4.1.1",
+            "resolved": "https://registry.npmjs.org/react-cookie/-/react-cookie-4.1.1.tgz",
+            "integrity": "sha512-ffn7Y7G4bXiFbnE+dKhHhbP+b8I34mH9jqnm8Llhj89zF4nPxPutxHT1suUqMeCEhLDBI7InYwf1tpaSoK5w8A==",
+            "dependencies": {
+                "@types/hoist-non-react-statics": "^3.0.1",
+                "hoist-non-react-statics": "^3.0.0",
+                "universal-cookie": "^4.0.0"
+            },
+            "peerDependencies": {
+                "react": ">= 16.3.0"
+            }
+        },
         "node_modules/react-dev-utils": {
             "version": "10.2.1",
             "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-10.2.1.tgz",
@@ -16599,6 +16647,23 @@
                 "imurmurhash": "^0.1.4"
             }
         },
+        "node_modules/universal-cookie": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/universal-cookie/-/universal-cookie-4.0.4.tgz",
+            "integrity": "sha512-lbRVHoOMtItjWbM7TwDLdl8wug7izB0tq3/YVKhT/ahB4VDvWMyvnADfnJI8y6fSvsjh51Ix7lTGC6Tn4rMPhw==",
+            "dependencies": {
+                "@types/cookie": "^0.3.3",
+                "cookie": "^0.4.0"
+            }
+        },
+        "node_modules/universal-cookie/node_modules/cookie": {
+            "version": "0.4.2",
+            "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
+            "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==",
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
         "node_modules/universalify": {
             "version": "0.1.2",
             "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
@@ -19769,6 +19834,11 @@
                 "@babel/types": "^7.3.0"
             }
         },
+        "@types/cookie": {
+            "version": "0.3.3",
+            "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.3.3.tgz",
+            "integrity": "sha512-LKVP3cgXBT9RYj+t+9FDKwS5tdI+rPBXaNSkma7hvqy35lc7mAokC2zsqWJH0LaqIt3B962nuYI77hsJoT1gow=="
+        },
         "@types/eslint-visitor-keys": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
@@ -19783,6 +19853,15 @@
                 "@types/node": "*"
             }
         },
+        "@types/hoist-non-react-statics": {
+            "version": "3.3.1",
+            "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz",
+            "integrity": "sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==",
+            "requires": {
+                "@types/react": "*",
+                "hoist-non-react-statics": "^3.3.0"
+            }
+        },
         "@types/istanbul-lib-coverage": {
             "version": "2.0.4",
             "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz",
@@ -19825,11 +19904,31 @@
             "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
             "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="
         },
+        "@types/prop-types": {
+            "version": "15.7.5",
+            "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz",
+            "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w=="
+        },
         "@types/q": {
             "version": "1.5.5",
             "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.5.tgz",
             "integrity": "sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ=="
         },
+        "@types/react": {
+            "version": "18.0.15",
+            "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.15.tgz",
+            "integrity": "sha512-iz3BtLuIYH1uWdsv6wXYdhozhqj20oD4/Hk2DNXIn1kFsmp9x8d9QB6FnPhfkbhd2PgEONt9Q1x/ebkwjfFLow==",
+            "requires": {
+                "@types/prop-types": "*",
+                "@types/scheduler": "*",
+                "csstype": "^3.0.2"
+            }
+        },
+        "@types/scheduler": {
+            "version": "0.16.2",
+            "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz",
+            "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew=="
+        },
         "@types/stack-utils": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz",
@@ -28396,6 +28495,16 @@
                 "whatwg-fetch": "^3.0.0"
             }
         },
+        "react-cookie": {
+            "version": "4.1.1",
+            "resolved": "https://registry.npmjs.org/react-cookie/-/react-cookie-4.1.1.tgz",
+            "integrity": "sha512-ffn7Y7G4bXiFbnE+dKhHhbP+b8I34mH9jqnm8Llhj89zF4nPxPutxHT1suUqMeCEhLDBI7InYwf1tpaSoK5w8A==",
+            "requires": {
+                "@types/hoist-non-react-statics": "^3.0.1",
+                "hoist-non-react-statics": "^3.0.0",
+                "universal-cookie": "^4.0.0"
+            }
+        },
         "react-dev-utils": {
             "version": "10.2.1",
             "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-10.2.1.tgz",
@@ -30926,6 +31035,22 @@
                 "imurmurhash": "^0.1.4"
             }
         },
+        "universal-cookie": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/universal-cookie/-/universal-cookie-4.0.4.tgz",
+            "integrity": "sha512-lbRVHoOMtItjWbM7TwDLdl8wug7izB0tq3/YVKhT/ahB4VDvWMyvnADfnJI8y6fSvsjh51Ix7lTGC6Tn4rMPhw==",
+            "requires": {
+                "@types/cookie": "^0.3.3",
+                "cookie": "^0.4.0"
+            },
+            "dependencies": {
+                "cookie": {
+                    "version": "0.4.2",
+                    "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
+                    "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA=="
+                }
+            }
+        },
         "universalify": {
             "version": "0.1.2",
             "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",

web-ui/web-react/package.json

@@ -27,6 +27,7 @@
         "prismjs": "1.9.0",
         "react": "^17.0.1",
         "react-app-polyfill": "^1.0.6",
+        "react-cookie": "^4.1.1",
         "react-dom": "^17.0.1",
         "react-router-dom": "^5.2.0",
         "react-scripts": "3.4.1",

web-ui/web-react/public/assets/themes/khaki/theme.css

@@ -7118,3 +7118,42 @@
 .p-button.p-button-danger:enabled:focus {
     box-shadow: 0 0 0 2px #ffffff, 0 0 0 4px #f7a2a2, 0 1px 2px 0 black;
 }
+
+
+.icon-khaki {
+    color: var(--primary-color);
+}
+
+.row {
+    display: flex;
+}
+
+
+.status {
+    border-radius: var(--border-radius);
+    padding: 0.25em 0.5rem;
+    text-transform: uppercase;
+    font-weight: 700;
+    font-size: 12px;
+    letter-spacing: 0.3px;
+}
+
+.status.status-1 {
+    background: #c8e6c9!important;
+    color: #256029!important;
+}
+
+.status.status-0 {
+    background: #ffcdd2;
+    color: #c63737;
+}
+
+.status.status-2 {
+    background: #feedaf;
+    color: #8a5340;
+}
+
+.status.status--1 {
+    background: #565656;
+    color: #f7f9f7;
+}

web-ui/web-react/src/App.js

@@ -51,6 +51,7 @@ import './assets/layout/layout.scss';
 import './App.scss';
 import LogIn from './components/LogIn';
 import { PrimeIcons } from 'primereact/api';
+import AreasComunes from './components/AreasComunes';
 
 const App = () => {
   const [layoutMode, setLayoutMode] = useState('static');
@@ -183,11 +184,20 @@ const App = () => {
           to: '/guardasSeguridad',
         },
         {
-          label: 'Comunidadades',
+          label: 'Comunidades',
           icon: PrimeIcons.BUILDING,
           to: '/comunidadesViviendas',
         },
-        { label: 'Inquilinos', icon: PrimeIcons.USER, to: '/inquilinos' },
+        {
+          label: 'Inquilinos',
+          icon: PrimeIcons.USER,
+          to: '/inquilinos'
+        },
+        {
+          label: 'Áreas Comunes de Comunidad',
+          icon: PrimeIcons.BUILDING,
+          to: '/areasComunes',
+        },
         { label: 'Log in', icon: 'pi pi-fw pi-id-card', to: '/logIn' },
       ],
     },
@@ -411,6 +421,7 @@ const App = () => {
           <Route path="/guardasSeguridad" component={GuardasSeguridad} />
           <Route path="/comunidadesViviendas" component={Communities} />
           <Route path="/inquilinos" component={Inquilinos} />
+          <Route path="/areasComunes" component={AreasComunes} />
           <Route path="/logIn" component={LogIn} />
         </div>
 

web-ui/web-react/src/components/AdministradoresComunidad.js

@@ -13,20 +13,10 @@ import { faAt } from '@fortawesome/free-solid-svg-icons';
 import { faIdCardAlt } from '@fortawesome/free-solid-svg-icons';
 import { faEllipsis } from '@fortawesome/free-solid-svg-icons';
 import { faHomeAlt } from '@fortawesome/free-solid-svg-icons';
+import { Dropdown } from 'primereact/dropdown';
+import classNames from 'classnames';
 
 const AdministradoresComunidad = () => {
-  const [listaAdmins, setListaAdmins] = useState([]);
-  const [listaAdminComunidad, setListaAdminComunidad] = useState([]);
-  const [adminCommunity, setAdminCommunity] = useState(emptyAdminCommunity);
-  const [selectedAdminsCommunities, setSelectedAdminsCommunities] =
-    useState(null);
-  const [globalFilter, setGlobalFilter] = useState(null);
-  const [deleteAdminCommunityDialog, setDeleteAdminCommunityDialog] =
-    useState(false);
-  const [deleteAdminsCommunitiesDialog, setDeleteAdminsCommunitiesDialog] =
-    useState(false);
-  const toast = useRef(null);
-  const dt = useRef(null);
 
     let emptyAdminCommunity = {
         _id: null,
@@ -36,59 +26,72 @@ const AdministradoresComunidad = () => {
         email: '',
         phone: '',
         password: '',
+        confirmPassword: '',
         community_id: '',
         community_name: '',
         user_type: '2',
-    status: '',
+        date_entry: new Date(),
+        status: '1'
     };
 
+    const [listaAdmins, setListaAdmins] = useState([]);
+    const [listaAdminComunidad, setListaAdminComunidad] = useState([]);
+    const [adminCommunity, setAdminCommunity] = useState(emptyAdminCommunity);
+    const [selectedAdminsCommunities, setSelectedAdminsCommunities] = useState(null);
+    const [globalFilter, setGlobalFilter] = useState(null);
+    const [deleteAdminCommunityDialog, setDeleteAdminCommunityDialog] = useState(false);
+    const [deleteAdminsCommunitiesDialog, setDeleteAdminsCommunitiesDialog] = useState(false);
+    const [communitiesList, setCommunitiesList] = useState([]);
+    const [communityId, setCommunityId] = useState(null);
+    const [submitted, setSubmitted] = useState(false);
+    const toast = useRef(null);
+    const dt = useRef(null);
+
+
     async function listaAdmin() {
-    let nombres = await fetch(
-      'http://localhost:4000/user/findAdminComunidad/',
-      { method: 'GET' },
-    )
+        let nombres = await fetch('http://localhost:4000/user/findAdminComunidad/', { method: 'GET' })
             .then((response) => response.json())
             .then((data) => {
-        return Promise.all(
-          data.message.map((item) => {
+                return Promise.all(data.message.map(item => {
                     //item.full_name returns the repositorie name
-            return fetch(
-              `http://localhost:4000/community/findCommunityName/${item.community_id}`,
-              { method: 'GET' },
-            )
+                    return fetch(`http://localhost:4000/community/findCommunityName/${item.community_id}`, { method: 'GET' })
                         .then((response2) => response2.json())
-              .then((data) => {
-                console.log(data.message.name);
-                item.community_name = data.message.name;
-                return item;
-              });
-          }),
-        );
+                        .then(data => data.message)
+                        .then(data => {
+                            item.community_name = data['name']
+                            return item
                         })
-      .then((data) => setListaAdmins(data));
+                }));
+            })
+            .then(data => setListaAdmins(data));
+
     }
 
-  async function nombreComunidad(id) {
-    let nombres = await fetch(
-      'http://localhost:4000/community/findCommunityName/' + id,
-      { method: 'GET' },
-    );
-    let nombresRes = await nombres.json();
-    return await nombresRes.message['name'];
-  }
 
-  async function setNameCommunities() {
-    Promise.all(
-      listaAdmins.map(async function (administrador) {
-        // await listaComunidades(administrador.community_id);
-        administrador.community_id = await listaAdminComunidad.name;
-      }),
-    );
+
+
+
+    async function getCommunites() {
+        let response = await fetch('http://localhost:4000/community/allCommunities', { method: 'GET' });
+        let resList = await response.json();
+        let list = await resList.message;
+
+        setCommunitiesList(await list);
     }
 
     useEffect(() => {
         listaAdmin();
-  }, []);
+    }, [])
+
+    useEffect(() => {
+        getCommunites();
+    },[])
+
+    const cList = communitiesList.map((item) => ({
+        label: item.name,
+        value: item._id,
+    }))
+
 
     const deleteAdminCommunity = () => {
         /*   fetch('http://localhost:4000/community/deleteCommunity/' + community._id, {
@@ -155,28 +158,78 @@ const AdministradoresComunidad = () => {
         toast.current.show({
             severity: 'success',
             summary: 'Éxito',
-      detail: 'Administradores de Comunidad de Viviendas Eliminado',
+            detail: 'Administradores de Comunidad de Viviendas Eliminados',
             life: 3000,
         });
     };
 
+    const saveAdminCommunity = () => {
+        if (adminCommunity.name && adminCommunity.dni && adminCommunity.last_name && adminCommunity.email && adminCommunity.phone) {
+
+            let _administrators = [...listaAdmins];
+            let _adminCommunity = { ...adminCommunity };
+            _adminCommunity.community_id = communityId;
+            console.log(_adminCommunity)
+            console.log(communityId)
+
+            fetch('http://localhost:4000/user/createAdminCommunity', {
+                cache: 'no-cache',
+                method: 'POST',
+                body: JSON.stringify(_adminCommunity),
+                headers: {
+                    'Content-Type': 'application/json'
+                }
+            })
+                .then(
+                    function (response) {
+                        if (response.status != 201)
+                            console.log('Ocurrió un error con el servicio: ' + response.status);
+                        else
+                            return response.json();
+                    }
+                )
+                .then(() => {
+
+                    // _adminCommunity.community_id = communitiesList.find(c => c._id === _adminCommunity.community_id).name
+
+                    _administrators.push(_adminCommunity);
+                    toast.current.show({ severity: 'success', summary: 'Registro exitoso', detail: 'Administrador de Comunidad de vivienda Creada', life: 3000 });
+
+                    setListaAdmins(_administrators);
+
+                    setAdminCommunity(emptyAdminCommunity);
+
+                })
+                .catch(
+                    err => console.log('Ocurrió un error con el fetch', err)
+                );
+
+
+        } else {
+            setSubmitted(true);
+
+        }
+    }
+
     const hideDeleteAdminCommunityDialog = () => {
         setDeleteAdminCommunityDialog(false);
-  };
+    }
 
     const hideDeleteAdminsCommunitysDialog = () => {
         setDeleteAdminsCommunitiesDialog(false);
-  };
+    }
 
     const confirmDeleteAdminCommunity = (adminCommunity) => {
         setAdminCommunity(adminCommunity);
         setDeleteAdminCommunityDialog(true);
-  };
+    }
 
     const confirmDeleteSelected = () => {
         setDeleteAdminsCommunitiesDialog(true);
     };
 
+
+
     const actionsAdminCommunity = (rowData) => {
         return (
             <div className="actions">
@@ -189,473 +242,244 @@ const AdministradoresComunidad = () => {
         );
     };
 
-  const leftToolbarTemplate = () => {
-    return (
-      <React.Fragment>
-        <div className="my-2">
-          <Button
-            label="Eliminar"
-            icon="pi pi-trash"
-            className="p-button-danger"
-            onClick={confirmDeleteSelected}
-            disabled={
-              !selectedAdminsCommunities || !selectedAdminsCommunities.length
-            }
-          />
-        </div>
-      </React.Fragment>
-    );
-  };
-
-  const rightToolbarTemplate = () => {
-    return (
-      <React.Fragment>
-        <Button
-          label="Exportar"
-          icon="pi pi-upload"
-          className="p-button-help"
-        />
-      </React.Fragment>
-    );
-  };
-
-  const header = (
-    <div className="flex flex-column md:flex-row md:justify-content-between md:align-items-center">
-      <h5 className="m-0">Administradores de Comunidades</h5>
-      <span className="block mt-2 md:mt-0 p-input-icon-left">
-        <i className="pi pi-search" />
-        <InputText
-          type="search"
-          onInput={(e) => setGlobalFilter(e.target.value)}
-          placeholder="Buscar..."
-        />
-      </span>
-    </div>
-  );
 
     const deleteAdminCommunityDialogFooter = (
         <>
-      <Button
-        label="No"
-        icon="pi pi-times"
-        className="p-button-text"
-        onClick={hideDeleteAdminCommunityDialog}
-      />
-      <Button
-        label="Yes"
-        icon="pi pi-check"
-        className="p-button-text"
-        onClick={deleteAdminCommunity}
-      />
+            <Button label="No" icon="pi pi-times" className="p-button-text" onClick={hideDeleteAdminCommunityDialog} />
+            <Button label="Yes" icon="pi pi-check" className="p-button-text" onClick={deleteAdminCommunity} />
         </>
     );
 
     const deleteAdminsCommunityDialogFooter = (
         <>
-      <Button
-        label="No"
-        icon="pi pi-times"
-        className="p-button-text"
-        onClick={hideDeleteAdminsCommunitysDialog}
-      />
-      <Button
-        label="Yes"
-        icon="pi pi-check"
-        className="p-button-text"
-        onClick={deleteSelectedAdminsCommunity}
-      />
+            <Button label="No" icon="pi pi-times" className="p-button-text" onClick={hideDeleteAdminsCommunitysDialog} />
+            <Button label="Yes" icon="pi pi-check" className="p-button-text" onClick={deleteSelectedAdminsCommunity} />
         </>
     );
 
-  const headerName = (
-    <>
-      <p>
-        {' '}
-        <FontAwesomeIcon icon={faUserAlt} style={{ color: '#C08135' }} /> Nombre
-      </p>
-    </>
-  );
-
-  const headerLastName = (
-    <>
-      <p>
-        {' '}
-        <FontAwesomeIcon icon={faUserAlt} style={{ color: '#D7A86E' }} />{' '}
-        Apellidos
-      </p>
-    </>
-  );
-
-  const headerDNI = (
-    <>
-      <p>
-        {' '}
-        <FontAwesomeIcon icon={faIdCardAlt} style={{ color: '#C08135' }} />{' '}
-        Identificación
-      </p>
-    </>
-  );
-
-  const headerEmail = (
-    <>
-      <p>
-        {' '}
-        <FontAwesomeIcon icon={faAt} style={{ color: '#D7A86E' }} /> Correo
-        Electrónico
-      </p>
-    </>
-  );
-
-  const headerPhone = (
-    <>
-      <p>
-        {' '}
-        <FontAwesomeIcon icon={faPhoneAlt} style={{ color: '#C08135' }} />{' '}
-        Teléfono
-      </p>
-    </>
-  );
-
-  const headerCommuntiy = (
-    <>
-      <p>
-        {' '}
-        <FontAwesomeIcon icon={faHomeAlt} style={{ color: '#D7A86E' }} />{' '}
-        Comunidad
-      </p>
-    </>
-  );
-
-  const headerOptions = (
-    <>
-      <p>
-        <FontAwesomeIcon
-          icon={faEllipsis}
-          size="2x"
-          style={{ color: '#C08135' }}
-        />
-      </p>
-    </>
-  );
-
-  const hideDeleteAdminSystemDialog = () => {
-    setDeleteAdminSystemDialog(false);
-  };
-
-  const hideDeleteAdminsSystemsDialog = () => {
-    setDeleteAdminsSystemDialog(false);
-  };
-
-  const confirmDeleteAdminSystem = (sysAdmin) => {
-    setSysAdmin(sysAdmin);
-    setDeleteAdminSystemDialog(true);
-  };
-
-  const confirmDeleteSelected = () => {
-    setDeleteAdminsSystemDialog(true);
-  };
-
-  const deleteSysAdmin = () => {
-    fetch('http://localhost:4000/user/deleteAdminSystem/' + sysadmin._id, {
-      cache: 'no-cache',
-      method: 'DELETE',
-      headers: {
-        'Content-Type': 'application/json',
-      },
-    })
-      .then(function (response) {
-        if (response.status != 201)
-          console.log('Ocurrió un error con el servicio: ' + response.status);
-        else return response.json();
-      })
-      .then(function (response) {
-        let _sysadmin = listaAdmins.filter((val) => val._id !== sysadmin._id);
-        setListaAdmins(_sysadmin);
-
-        setDeleteAdminSystemDialog(false);
-        setSysAdmin(emptySysAdmin);
-
-        toast.current.show({
-          severity: 'success',
-          summary: 'Exito',
-          detail: 'Administrador del Sistema Eliminado',
-          life: 3000,
-        });
-      })
-      .catch((err) => {
-        console.log('Ocurrió un error con el fetch', err);
-        toast.current.show({
-          severity: 'danger',
-          summary: 'Error',
-          detail: 'Administrador del Sistema no se pudo eliminar',
-          life: 3000,
-        });
-      });
-  };
-
-  const deleteSelectedAdminsSystem = () => {
-    let _administrators = listaAdmins.filter(
-      (val) => !selectedAdministrators.includes(val),
-    );
-    selectedAdministrators.map((item) => {
-      fetch('http://localhost:4000/user/deleteAdminSystem/' + item._id, {
-        cache: 'no-cache',
-        method: 'DELETE',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-      });
-    });
-    setListaAdmins(_administrators);
-    setDeleteAdminsSystemDialog(false);
-    setSelectedAdministrators(null);
-    toast.current.show({
-      severity: 'success',
-      summary: 'Successful',
-      detail: 'Products Deleted',
-      life: 3000,
-    });
-  };
-
-  const actionsAdmin = (rowData) => {
-    return (
-      <div className="actions">
-        <Button
-          icon="pi pi-trash"
-          className="p-button-rounded p-button-danger mt-2"
-          onClick={() => confirmDeleteAdminSystem(rowData)}
-        />
-      </div>
-    );
-  };
 
     const leftToolbarTemplate = () => {
         return (
             <React.Fragment>
                 <div className="my-2">
-          <Button
-            label="Eliminar"
-            icon="pi pi-trash"
-            className="p-button-danger"
-            onClick={confirmDeleteSelected}
-            disabled={!selectedAdministrators || !selectedAdministrators.length}
-          />
+                    <Button label="Eliminar" icon="pi pi-trash" className="p-button-danger" onClick={confirmDeleteSelected} disabled={!selectedAdminsCommunities || !selectedAdminsCommunities.length} />
                 </div>
             </React.Fragment>
-    );
-  };
+        )
+    }
 
     const rightToolbarTemplate = () => {
         return (
             <React.Fragment>
-        <Button
-          label="Exportar"
-          icon="pi pi-upload"
-          className="p-button-help"
-        />
+                <Button label="Exportar" icon="pi pi-upload" className="p-button-help" />
             </React.Fragment>
-    );
-  };
+        )
+    }
+
 
     const header = (
+        <React.Fragment>
+
             <div className="flex flex-column md:flex-row md:justify-content-between md:align-items-center">
-      <h5 className="m-0">
-        Administradores del sistema <i class="fal fa-user"></i>
-      </h5>
+                <h5 className="m-0">Administradores de Comunidades</h5>
                 <span className="block mt-2 md:mt-0 p-input-icon-left">
                     <i className="pi pi-search" />
-        <InputText
-          type="search"
-          onInput={(e) => setGlobalFilter(e.target.value)}
-          placeholder="Buscar..."
-        />
+                    <InputText type="search" onInput={(e) => setGlobalFilter(e.target.value)} placeholder="Buscar..." />
                 </span>
             </div>
+        </React.Fragment>
     );
 
-  const deleteAdminSystemDialogFooter = (
+    const headerName = (
         <>
-      <Button
-        label="No"
-        icon="pi pi-times"
-        className="p-button-text"
-        onClick={hideDeleteAdminSystemDialog}
-      />
-      <Button
-        label="Yes"
-        icon="pi pi-check"
-        className="p-button-text"
-        onClick={deleteSysAdmin}
-      />
+            <p>{' '}
+                <FontAwesomeIcon icon={faUserAlt} style={{ color: "#C08135" }} /> {' '}
+                Nombre
+            </p>
         </>
-  );
+    )
 
-  const deleteAdminsSystemDialogFooter = (
+    const headerLastName = (
         <>
-      <Button
-        label="No"
-        icon="pi pi-times"
-        className="p-button-text"
-        onClick={hideDeleteAdminsSystemsDialog}
-      />
-      <Button
-        label="Yes"
-        icon="pi pi-check"
-        className="p-button-text"
-        onClick={deleteSelectedAdminsSystem}
-      />
+            <p>
+                {' '}
+                <FontAwesomeIcon icon={faUserAlt} style={{ color: "#D7A86E" }} />{' '}
+                Apellidos
+            </p>
         </>
-  );
+    )
+
+    const headerDNI = (
+        <>
+            <p> {' '}
+                <FontAwesomeIcon icon={faIdCardAlt} style={{ color: "#C08135" }} />{' '}
+                Identificación
+            </p>
+        </>
+    )
+
+    const headerEmail = (
+        <>
+            <p> {' '}
+                <FontAwesomeIcon icon={faAt} style={{ color: "#D7A86E" }} />{' '}
+                Correo Electrónico
+            </p>
+        </>
+    )
+
+    const headerPhone = (
+        <>
+            <p> <FontAwesomeIcon icon={faPhoneAlt} style={{ color: "#C08135" }} />{' '}
+                Teléfono
+            </p>
+        </>
+    )
+
+    const headerCommuntiy = (
+        <>
+            <p>
+                {' '}
+                <FontAwesomeIcon icon={faHomeAlt} style={{ color: "#D7A86E" }} />{' '}
+                Comunidad</p>
+        </>
+    )
+
+  
+
+    const onInputChange = (e, name) => {
+        const val = (e.target && e.target.value) || '';
+        let _adminCommunity = { ...adminCommunity };
+        _adminCommunity[`${name}`] = val;
+
+        setAdminCommunity(_adminCommunity);
+    }
+
+    const handleCommunities = (event) => {
+        const getCommunityValue = event.target.value;
+        setCommunityId(getCommunityValue);
+        console.log(getCommunityValue)
+    }
 
     return (
+
+
         <div className="grid">
             <div className="col-12">
                 <Toast ref={toast} />
                 <div className="card">
-          <Toolbar
-            className="mb-4"
-            left={leftToolbarTemplate}
-            right={rightToolbarTemplate}
-          ></Toolbar>
-          <DataTable
-            ref={dt}
-            value={listaAdmins}
-            dataKey="_id"
-            paginator
-            rows={5}
-            selection={selectedAdminsCommunities}
-            onSelectionChange={(e) => setSelectedAdminsCommunities(e.value)}
-            scrollable
-            scrollHeight="400px"
-            scrollDirection="both"
-            header={header}
-            rowsPerPageOptions={[5, 10, 25]}
-            className="datatable-responsive mt-3"
+                    <Toolbar className="mb-4" left={leftToolbarTemplate} right={rightToolbarTemplate}></Toolbar>
+                    <DataTable ref={dt} value={listaAdmins} dataKey="_id" paginator rows={5} selection={selectedAdminsCommunities} onSelectionChange={(e) => setSelectedAdminsCommunities(e.value)}
+                        scrollable scrollHeight="400px" scrollDirection="both" header={header}
+                        rowsPerPageOptions={[5, 10, 25]} className="datatable-responsive mt-3"
                         paginatorTemplate="FirstPageLink PrevPageLink PageLinks NextPageLink LastPageLink CurrentPageReport RowsPerPageDropdown"
                         currentPageReportTemplate="Mostrando {first} a {last} de {totalRecords} administradores de comunidades de viviendas"
-            globalFilter={globalFilter}
-            emptyMessage="No hay administradores de comunidades registrados."
-          >
-            <Column
-              selectionMode="multiple"
-              headerStyle={{ width: '3rem' }}
-            ></Column>
-            <Column
-              field="name"
-              sortable
-              header={headerName}
-              style={{
-                flexGrow: 1,
-                flexBasis: '160px',
-                minWidth: '160px',
-                wordBreak: 'break-word',
-              }}
-            ></Column>
-            <Column
-              field="last_name"
-              sortable
-              header={headerLastName}
-              style={{
-                flexGrow: 1,
-                flexBasis: '160px',
-                minWidth: '160px',
-                wordBreak: 'break-word',
-              }}
-              alignFrozen="left"
-            ></Column>
-            <Column
-              field="dni"
-              sortable
-              header={headerDNI}
-              style={{
-                flexGrow: 1,
-                flexBasis: '160px',
-                minWidth: '160px',
-                wordBreak: 'break-word',
-              }}
-            ></Column>
-            <Column
-              field="email"
-              sortable
-              header={headerEmail}
-              style={{
-                flexGrow: 1,
-                flexBasis: '160px',
-                minWidth: '160px',
-                wordBreak: 'break-word',
-              }}
-            ></Column>
-            <Column
-              field="phone"
-              sortable
-              header={headerPhone}
-              style={{
-                flexGrow: 1,
-                flexBasis: '160px',
-                minWidth: '160px',
-                wordBreak: 'break-word',
-              }}
-            ></Column>
-            <Column
-              field="community_name"
-              header={headerCommuntiy}
-              style={{
-                flexGrow: 1,
-                flexBasis: '160px',
-                minWidth: '160px',
-                wordBreak: 'break-word',
-              }}
-            ></Column>
-            <Column
-              header={headerOptions}
-              style={{ flexGrow: 1, flexBasis: '130px', minWidth: '130px' }}
-              body={actionsAdminCommunity}
-            ></Column>
+                        globalFilter={globalFilter} emptyMessage="No hay administradores de comunidades registrados.">
+                        <Column selectionMode="multiple" headerStyle={{ width: '3rem' }}></Column>
+                        <Column field="name" sortable header={headerName} style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }}></Column>
+                        <Column field="last_name" sortable header={headerLastName} style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }} alignFrozen="left"></Column>
+                        <Column field="dni" sortable header={headerDNI} style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }}>
+                        </Column>
+                        <Column field="email" sortable header={headerEmail} style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }}></Column>
+                        <Column field="phone"  header={headerPhone} style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }}></Column>
+                        <Column field="community_name" sortable header={headerCommuntiy} style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }}></Column>
+                        <Column  style={{ flexGrow: 1, flexBasis: '130px', minWidth: '130px' }} body={actionsAdminCommunity}></Column>
                     </DataTable>
-          <Dialog
-            visible={deleteAdminCommunityDialog}
-            style={{ width: '450px' }}
-            header="Confirmar"
-            modal
-            footer={deleteAdminCommunityDialogFooter}
-            onHide={hideDeleteAdminCommunityDialog}
-          >
+                    <Dialog visible={deleteAdminCommunityDialog} style={{ width: '450px' }} header="Confirmar" modal footer={deleteAdminCommunityDialogFooter} onHide={hideDeleteAdminCommunityDialog}>
                         <div className="flex align-items-center justify-content-center">
-              <i
-                className="pi pi-exclamation-triangle mr-3"
-                style={{ fontSize: '2rem' }}
-              />
-              {adminCommunity && (
-                <span>
-                  ¿Estás seguro que desea eliminar a{' '}
-                  <b>{adminCommunity.name}</b>?
-                </span>
-              )}
+                            <i className="pi pi-exclamation-triangle mr-3" style={{ fontSize: '2rem' }} />
+                            {adminCommunity && <span>¿Estás seguro que desea eliminar a <b>{adminCommunity.name}</b>?</span>}
                         </div>
                     </Dialog>
-          <Dialog
-            visible={deleteAdminsCommunitiesDialog}
-            style={{ width: '450px' }}
-            header="Confirmar"
-            modal
-            footer={deleteAdminsCommunityDialogFooter}
-            onHide={hideDeleteAdminsCommunitysDialog}
-          >
+                    <Dialog visible={deleteAdminsCommunitiesDialog} style={{ width: '450px' }} header="Confirmar" modal footer={deleteAdminsCommunityDialogFooter} onHide={hideDeleteAdminsCommunitysDialog}>
                         <div className="flex align-items-center justify-content-center">
-              <i
-                className="pi pi-exclamation-triangle mr-3"
-                style={{ fontSize: '2rem' }}
-              />
-              {selectedAdminsCommunities && (
-                <span>
-                  ¿Está seguro eliminar los administradores de las comunidades
-                  de viviendas seleccionados?
-                </span>
-              )}
+                            <i className="pi pi-exclamation-triangle mr-3" style={{ fontSize: '2rem' }} />
+                            {selectedAdminsCommunities && <span>¿Está seguro eliminar los administradores de las comunidades de viviendas seleccionados?</span>}
                         </div>
                     </Dialog>
                 </div>
             </div>
+            <div className="col-12">
+                <div className="card">
+                    <h5>Registro de un administrador de una comunidad de viviendas</h5>
+                    <div className="p-fluid formgrid grid">
+                        <div className="field col-12 md:col-6">
+                            <label htmlFor="name">Nombre</label>
+                            <div className="p-0 col-12 md:col-12">
+                                <div className="p-inputgroup">
+                                    <span className="p-inputgroup-addon p-button p-icon-input-khaki">
+                                        <i className="pi pi-home"></i>
+                                    </span>
+                                    <InputText id="name" value={adminCommunity.name} onChange={(e) => onInputChange(e, 'name')} required autoFocus className={classNames({ 'p-invalid': submitted && adminCommunity.name === '' })} />
+                                </div>
+                                {submitted && adminCommunity.name === '' && <small className="p-invalid">Nombre es requirido.</small>}
+                            </div>
+                        </div>
+                        <div className="field col-12 md:col-6">
+                            <label htmlFor="name">Apellido(s)</label>
+                            <div className="p-0 col-12 md:col-12">
+                                <div className="p-inputgroup">
+                                    <span className="p-inputgroup-addon p-button p-icon-input-khaki">
+                                        <i className="pi pi-home"></i>
+                                    </span>
+                                    <InputText id="last_name" value={adminCommunity.last_name} onChange={(e) => onInputChange(e, 'last_name')} required autoFocus className={classNames({ 'p-invalid': submitted && adminCommunity.last_name === '' })} />
+                                </div>
+                                {submitted && adminCommunity.last_name === '' && <small className="p-invalid">Apellidos es requirido.</small>}
+                            </div>
+                        </div>
+                        <div className="field col-12 md:col-6">
+                            <label htmlFor="name">Correo Electrónico</label>
+                            <div className="p-0 col-12 md:col-12">
+                                <div className="p-inputgroup">
+                                    <span className="p-inputgroup-addon p-button p-icon-input-khaki">
+                                        <i className="pi pi-home"></i>
+                                    </span>
+                                    <InputText id="email" value={adminCommunity.email} onChange={(e) => onInputChange(e, 'email')} required autoFocus className={classNames({ 'p-invalid': submitted && adminCommunity.email === '' })} />
+                                </div>
+                                {submitted && adminCommunity.email === '' && <small className="p-invalid">Correo electrónico
+                                    es requirido.</small>}
+                            </div>
+                        </div>
+                        <div className="field col-12 md:col-6">
+                            <label htmlFor="name">Identificación</label>
+                            <div className="p-0 col-12 md:col-12">
+                                <div className="p-inputgroup">
+                                    <span className="p-inputgroup-addon p-button p-icon-input-khaki">
+                                        <i className="pi pi-home"></i>
+                                    </span>
+                                    <InputText id="dni" value={adminCommunity.dni} onChange={(e) => onInputChange(e, 'dni')} required autoFocus className={classNames({ 'p-invalid': submitted && adminCommunity.dni === '' })} />
+                                </div>
+                                {submitted && adminCommunity.email === '' && <small className="p-invalid">Identificación es requirida.</small>}
+                            </div>
+                        </div>
+                        <div className="field col-12 md:col-6">
+                            <label htmlFor="name">Número de teléfono</label>
+                            <div className="p-0 col-12 md:col-12">
+                                <div className="p-inputgroup">
+                                    <span className="p-inputgroup-addon p-button p-icon-input-khaki">
+                                        <i className="pi pi-phone"></i>
+                                    </span>
+                                    <InputText id="phone" value={adminCommunity.phone} onChange={(e) => onInputChange(e, 'phone')} required autoFocus className={classNames({ 'p-invalid': submitted && adminCommunity.phone === '' })} />
+                                </div>
+                                {submitted && adminCommunity.phone === '' && <small className="p-invalid">Número de teléfono es requirida.</small>}
+                            </div>
+                        </div>
+                        <div className="field col-12 md:col-6">
+                            <label htmlFor="administrator">Comunidad a asignar: </label>
+                            <div className="p-0 col-12 md:col-12">
+                                <div className="p-inputgroup">
+                                    <span className="p-inputgroup-addon p-button p-icon-input-khaki">
+                                        <i className="pi pi-home"></i>
+                                    </span>
+                                    <Dropdown placeholder="--Seleccione la Comunidad a Asignar--" id="administrator" value={communityId} options={cList}
+                                        onChange={handleCommunities} required autoFocus className={classNames({ 'p-invalid': submitted && !communityId })} />
+                                </div>
+                                {submitted && !communityId && <small className="p-invalid">Comunidad es requirida.</small>}
+                            </div>
+                        </div>
+                        <Button label="Registrar" onClick={saveAdminCommunity} />
+                    </div>
+                </div>
+            </div>
         </div>
     );
 };

web-ui/web-react/src/components/AdministradoresSistema.js

@@ -36,9 +36,10 @@ const AdministradoresSistema = () => {
     phone: '',
     password: '',
     user_type: '1',
-    status: '',
+    status: '1',
   };
 
+
   async function fetchP() {
     let nombres = await fetch(urlFetch, { method: 'GET' });
     let adminRes = await nombres.json();
@@ -47,7 +48,8 @@ const AdministradoresSistema = () => {
   }
   useEffect(() => {
     fetchP();
-  }, []);
+  }, [])
+
 
   function registrarAdmin() {
     var data = {
@@ -57,9 +59,10 @@ const AdministradoresSistema = () => {
       email: document.getElementById('correo_electronico').value,
       phone: document.getElementById('telefono').value,
       password: document.getElementById('correo_electronico').value,
-      user_type: '1', //1 es admin
-      status: '1',
+      user_type: "1", //1 es admin
+      status: "1"
     };
+    setSysAdmin(data)
     // console.log(data);
 
     fetch('http://localhost:4000/user/createAdminSystem/', {
@@ -67,30 +70,29 @@ const AdministradoresSistema = () => {
       method: 'POST',
       body: JSON.stringify(data),
       headers: {
-        'Content-Type': 'application/json',
-      },
+        'Content-Type': 'application/json'
+      }
     })
-      .then(function (response) {
+      .then(
+        function (response) {
           if (response.status != 201)
             console.log('Ocurrió un error con el servicio: ' + response.status);
-        else return response.json();
-      })
-      .then(function (response) {
-        let _administrators = [...administrators];
-        let _admin = { ...response.message };
-        _administrators.push(_admin);
-        setAdministrators(_administrators);
-      })
-      .catch((err) => console.log('Ocurrió un error con el fetch', err));
+          else
+            return response.json();
+        }
+      )
+      .then(
+        function (response) {
+          let _administrators = [...administrators];
+          let _admin = { ...sysadmin };
+          _administrators.push(_admin);
+          setAdministrators(_administrators)
+        }
+      )
+      .catch(
+        err => console.log('Ocurrió un error con el fetch', err)
+      );
   }
-
-  const hideDeleteAdminSystemDialog = () => {
-    setDeleteAdminSystemDialog(false);
-  };
-
-  const hideDeleteAdminsSystemsDialog = () => {
-    setDeleteAdminsSystemDialog(false);
-  };
 
   const confirmDeleteAdminSystem = (sysAdmin) => {
     setSysAdmin(sysAdmin);
@@ -101,6 +103,15 @@ const AdministradoresSistema = () => {
     setDeleteAdminsSystemDialog(true);
   };
 
+  const hideDeleteAdminSystemDialog = () => {
+    setDeleteAdminSystemDialog(false);
+  };
+
+  const hideDeleteAdminsSystemDialog = () => {
+    setDeleteAdminsSystemDialog(false);
+  };
+
+
   const deleteSysAdmin = () => {
     fetch('http://localhost:4000/user/deleteAdminSystem/' + sysadmin._id, {
       cache: 'no-cache',
@@ -206,7 +217,7 @@ const AdministradoresSistema = () => {
   const header = (
     <div className="flex flex-column md:flex-row md:justify-content-between md:align-items-center">
       <h5 className="m-0">
-        Administradores del sistema <i class="fal fa-user"></i>
+        Administradores del sistema <i className="fal fa-user"></i>
       </h5>
       <span className="block mt-2 md:mt-0 p-input-icon-left">
         <i className="pi pi-search" />
@@ -242,7 +253,7 @@ const AdministradoresSistema = () => {
         label="No"
         icon="pi pi-times"
         className="p-button-text"
-        onClick={hideDeleteAdminsSystemsDialog}
+        onClick={hideDeleteAdminsSystemDialog}
       />
       <Button
         label="Yes"
@@ -302,15 +313,6 @@ const AdministradoresSistema = () => {
     </>
   );
 
-  const headerOptions = (
-    <>
-      <p>
-        Opciones{' '}
-        <FontAwesomeIcon icon={faEllipsis} style={{ color: '#D7A86E' }} />
-      </p>
-    </>
-  );
-
   return (
     <div className="grid">
       <div className="col-12">
@@ -391,7 +393,6 @@ const AdministradoresSistema = () => {
             ></Column>
             <Column
               field="phone"
-              sortable
               header={headerPhone}
               style={{
                 flexGrow: 1,
@@ -401,7 +402,7 @@ const AdministradoresSistema = () => {
               }}
             ></Column>
             <Column
-              header={headerOptions}
+              
               style={{ flexGrow: 1, flexBasis: '130px', minWidth: '130px' }}
               body={actionsAdmin}
             ></Column>
@@ -432,7 +433,7 @@ const AdministradoresSistema = () => {
             header="Confirmar"
             modal
             footer={deleteAdminsSystemDialogFooter}
-            onHide={hideDeleteAdminsSystemsDialog}
+            onHide={hideDeleteAdminsSystemDialog}
           >
             <div className="flex align-items-center justify-content-center">
               <i

web-ui/web-react/src/components/AreasComunes.js

@@ -0,0 +1,350 @@
+import React, { useEffect, useState, useRef } from 'react';
+import { InputText } from 'primereact/inputtext';
+import { Button } from 'primereact/button';
+import { Dropdown } from 'primereact/dropdown';
+import { DataTable } from 'primereact/datatable';
+import { Column } from 'primereact/column';
+import { Toast } from 'primereact/toast';
+import { Dialog } from 'primereact/dialog';
+import { Toolbar } from 'primereact/toolbar';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import { faHome, faUserAlt } from '@fortawesome/free-solid-svg-icons';
+import { faCircleQuestion } from '@fortawesome/free-solid-svg-icons';
+import { faAt } from '@fortawesome/free-solid-svg-icons';
+import { faIdCardAlt } from '@fortawesome/free-solid-svg-icons';
+import { faClipboardCheck } from '@fortawesome/free-solid-svg-icons';
+import classNames from 'classnames';
+import { useCookies } from "react-cookie";
+
+
+const AreasComunes = () => {
+
+    let emptyCommonArea = {
+        _id: null,
+        dni: '',
+        name: '',
+        hourMin: '',
+        hourMax: '',
+        community_id: '',
+        bookable: '1',
+        bookable_text: '',
+        status: '1',
+        status_text: '',
+    };
+
+    const [commonAreaList, setCommonAreaList] = useState([]);
+    const [commonArea, setCommonArea] = useState(emptyCommonArea);
+    const [selectedCommonAreas, setSelectedCommonAreas] = useState(null);
+    const [globalFilter, setGlobalFilter] = useState(null);
+    const [deleteCommonAreaDialog, setDeleteCommonAreaDialog] = useState(false);
+    const [deleteCommonAreasDialog, setDeleteCommonAreasDialog] = useState(false);
+    const [submitted, setSubmitted] = useState(false);
+    const toast = useRef(null);
+    const dt = useRef(null);
+
+    const [cookies, setCookie] = useCookies();
+
+    async function getCommonAreas() {
+        await fetch(`http://localhost:4000/commonArea/findByCommunity/${cookies.community_id}`, { method: 'GET' })
+            .then((response) => response.json())
+            .then(data => data.message)
+            .then(data => {
+                if (data) {
+                    data.map(item => {
+                        if (item.bookable == '1') {
+                            item.bookable_text = 'Necesaria';
+                        } else {
+                            item.bookable_text = 'No es necesarioa';
+                        }
+
+                        if (item.status == '1') {
+                            item.status_text = 'Activo';
+                        } else if (item.status == '0') {
+                            item.status_text = 'Inactivo';
+                        } else {
+                            item.status_text = 'Eliminado';
+                        }
+                    })
+                }
+
+                data = data.filter(
+                    (val) => val.status != -1,
+                )
+                setCommonAreaList(data);
+            });
+    }
+
+    useEffect(() => {
+        getCommonAreas();
+    }, []);
+
+
+    const deleteCommonArea = () => {
+        fetch('http://localhost:4000/commonArea/deleteCommonArea/' + commonArea._id, {
+            cache: 'no-cache',
+            method: 'DELETE',
+            headers: {
+                'Content-Type': 'application/json'
+            }
+        })
+            .then(
+                function (response) {
+                    if (response.status != 201)
+                        console.log('Ocurrió un error con el servicio: ' + response.status);
+                    else
+                        return response.json();
+                }
+            )
+            .then(
+                function (response) {
+
+                    let _common_areas = commonAreaList.filter(
+                        (val) => val._id !== commonArea._id,
+                    );
+                    _common_areas = _common_areas.filter(
+                        (val) => val.status != -1,
+                    )
+                    setCommonAreaList(_common_areas);
+                    setDeleteCommonAreaDialog(false);
+                    setCommonArea(emptyCommonArea);
+                    toast.current.show({
+                        severity: 'success',
+                        summary: 'Área Común Eliminada',
+                        life: 3000,
+                    });
+                }
+            )
+            .catch(
+                err => {
+                    console.log('Ocurrió un error con el fetch', err)
+                    toast.current.show({ severity: 'danger', summary: 'Error', detail: 'Área Común no se pudo eliminar', life: 3000 });
+                }
+            );
+
+    };
+
+    const deleteSelectedCommonAreas = () => {
+        let _common_areas = commonAreaList.filter(
+            (val) => !selectedCommonAreas.includes(val),
+        );
+        selectedCommonAreas.map((item) => {
+            fetch('http://localhost:4000/commonArea/deleteCommonArea/' + item._id, {
+                cache: 'no-cache',
+                method: 'DELETE',
+                headers: {
+                    'Content-Type': 'application/json'
+                }
+            })
+        });
+        _common_areas = _common_areas.filter(
+            (val) => val.status != -1,
+        )
+        setCommonAreaList(_common_areas);
+        setDeleteCommonAreasDialog(false);
+        setSelectedCommonAreas(null);
+        toast.current.show({
+            severity: 'success',
+            summary: 'Éxito',
+            detail: 'Áreas Comúnes Eliminadas',
+            life: 3000,
+        });
+    };
+
+    const hideDeleteCommonAreaDialog = () => {
+        setDeleteCommonAreaDialog(false);
+    }
+
+    const hideDeleteCommonAreasDialog = () => {
+        setDeleteCommonAreasDialog(false);
+    }
+
+    const confirmDeleteCommonArea = (commonArea) => {
+        setCommonArea(commonArea);
+        setDeleteCommonAreaDialog(true);
+    }
+
+    const confirmDeleteSelected = () => {
+        setDeleteCommonAreasDialog(true);
+    };
+
+
+
+    const actionsCommonArea = (rowData) => {
+        return (
+            <div className="actions">
+                <Button
+                    icon="pi pi-trash"
+                    className="p-button-rounded p-button-danger mt-2"
+                    onClick={() => confirmDeleteCommonArea(rowData)}
+                />
+            </div>
+        );
+    };
+
+
+    const deleteCommonAreaDialogFooter = (
+        <>
+            <Button label="No" icon="pi pi-times" className="p-button-text" onClick={hideDeleteCommonAreaDialog} />
+            <Button label="Yes" icon="pi pi-check" className="p-button-text" onClick={deleteCommonArea} />
+        </>
+    );
+
+    const deleteCommonAreasDialogFooter = (
+        <>
+            <Button label="No" icon="pi pi-times" className="p-button-text" onClick={hideDeleteCommonAreasDialog} />
+            <Button label="Yes" icon="pi pi-check" className="p-button-text" onClick={deleteSelectedCommonAreas} />
+        </>
+    );
+
+
+    const leftToolbarTemplate = () => {
+        return (
+            <React.Fragment>
+                <div className="my-2">
+                    <Button label="Eliminar" icon="pi pi-trash" className="p-button-danger" onClick={confirmDeleteSelected} disabled={!selectedCommonAreas || !selectedCommonAreas.length} />
+                </div>
+            </React.Fragment>
+        )
+    }
+
+    const rightToolbarTemplate = () => {
+        return (
+            <React.Fragment>
+                <Button label="Exportar" icon="pi pi-upload" className="p-button-help" />
+            </React.Fragment>
+        )
+    }
+
+
+    const header = (
+        <React.Fragment>
+
+            <div className="flex flex-column md:flex-row md:justify-content-between md:align-items-center">
+                <h5 className="m-0">Áreas Comunes</h5>
+                <span className="block mt-2 md:mt-0 p-input-icon-left">
+                    <i className="pi pi-search" />
+                    <InputText type="search" onInput={(e) => setGlobalFilter(e.target.value)} placeholder="Buscar..." />
+                </span>
+            </div>
+        </React.Fragment>
+    );
+
+    const headerName = (
+        <>
+            <p>{' '}
+                <FontAwesomeIcon icon={faUserAlt} style={{ color: "#C08135" }} /> {' '}
+                Nombre
+            </p>
+        </>
+    )
+
+    const headerHourMin = (
+        <>
+            <p>
+                {' '}
+                <FontAwesomeIcon icon={faUserAlt} style={{ color: "#D7A86E" }} />{' '}
+                Hora de apertura
+            </p>
+        </>
+    )
+
+    const headerHourMax = (
+        <>
+            <p> {' '}
+                <FontAwesomeIcon icon={faIdCardAlt} style={{ color: "#C08135" }} />{' '}
+                Hora de cierre
+            </p>
+        </>
+    )
+
+    const headerBookable = (
+        <>
+            <p> {' '}
+                <FontAwesomeIcon icon={faClipboardCheck} style={{ color: "#D7A86E" }} />{' '}
+                Reservación
+            </p>
+        </>
+    )
+
+    const headerStatus = (
+        <>
+            <p> {' '}
+                <FontAwesomeIcon icon={faCircleQuestion} style={{ color: "#C08135" }} />{' '}
+                Estado
+            </p>
+        </>
+    )
+
+
+    const bookableBodyTemplate = (rowData) => {
+        let class_color = '';
+        if(rowData.bookable == '1') {
+            class_color = '0';
+        } else {
+            class_color = '1';
+
+        }
+        return (
+            <>
+                <span
+                    className={`status status-${class_color}`}
+                >
+                    {rowData.bookable_text}
+                </span>
+            </>
+        );
+    };
+
+    const statusBodyTemplate = (rowData) => {
+        return (
+            <>
+                <span
+                    className={`status status-${rowData.status}`}
+                >
+                    {rowData.status_text}
+                </span>
+            </>
+        );
+    };
+
+    return (
+        <div className="grid">
+            <div className="col-12">
+                <Toast ref={toast} />
+                <div className="card">
+                    <Toolbar className="mb-4" left={leftToolbarTemplate} right={rightToolbarTemplate}></Toolbar>
+                    <DataTable ref={dt} value={commonAreaList} dataKey="_id" paginator rows={5} selection={selectedCommonAreas} onSelectionChange={(e) => setSelectedCommonAreas(e.value)}
+                        scrollable scrollHeight="400px" scrollDirection="both" header={header}
+                        rowsPerPageOptions={[5, 10, 25]} className="datatable-responsive mt-3"
+                        paginatorTemplate="FirstPageLink PrevPageLink PageLinks NextPageLink LastPageLink CurrentPageReport RowsPerPageDropdown"
+                        currentPageReportTemplate="Mostrando {first} a {last} de {totalRecords} áreas comunes"
+                        globalFilter={globalFilter} emptyMessage="No hay áreas comunes registrados.">
+                        <Column selectionMode="multiple" headerStyle={{ width: '3rem' }}></Column>
+                        <Column field="name" sortable header={headerName} style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }}></Column>
+                        <Column field="hourMin" header={headerHourMin} style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }} alignFrozen="left"></Column>
+                        <Column field="hourMax" header={headerHourMax} style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }}>                    </Column>
+                        <Column field="bookable" sortable header={headerBookable} body={bookableBodyTemplate} style={{ flexGrow: 1, flexBasis: '200px', minWidth: '200px', wordBreak: 'break-word' }}></Column>
+                        <Column field="status" sortable header={headerStatus} body={statusBodyTemplate} style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }}></Column>
+                        <Column style={{ flexGrow: 1, flexBasis: '130px', minWidth: '130px' }} body={actionsCommonArea}></Column>
+                    </DataTable>
+                    <Dialog visible={deleteCommonAreaDialog} style={{ width: '450px' }} header="Confirmar" modal footer={deleteCommonAreaDialogFooter} onHide={hideDeleteCommonAreaDialog}>
+                        <div className="flex align-items-center justify-content-center">
+                            <i className="pi pi-exclamation-triangle mr-3" style={{ fontSize: '2rem' }} />
+                            {commonArea && <span>¿Estás seguro que desea eliminar a <b>{commonArea.name}</b>?</span>}
+                        </div>
+                    </Dialog>
+                    <Dialog visible={deleteCommonAreasDialog} style={{ width: '450px' }} header="Confirmar" modal footer={deleteCommonAreasDialogFooter} onHide={hideDeleteCommonAreasDialog}>
+                        <div className="flex align-items-center justify-content-center">
+                            <i className="pi pi-exclamation-triangle mr-3" style={{ fontSize: '2rem' }} />
+                            {selectedCommonAreas && <span>¿Está seguro eliminar las áreas comunes seleccionadas?</span>}
+                        </div>
+                    </Dialog>
+                </div>
+            </div>
+        </div>
+    );
+
+};
+
+
+export default React.memo(AreasComunes);

web-ui/web-react/src/components/ComunidadViviendas.js

@@ -9,10 +9,11 @@ import classNames from 'classnames';
 import { Dialog } from 'primereact/dialog';
 import { Toolbar } from 'primereact/toolbar';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { faHome } from '@fortawesome/free-solid-svg-icons';
+import { faHome, faUserAlt } from '@fortawesome/free-solid-svg-icons';
 import { faMapLocationDot } from '@fortawesome/free-solid-svg-icons';
 import { faPhoneAlt } from '@fortawesome/free-solid-svg-icons';
 import { faEllipsis } from '@fortawesome/free-solid-svg-icons';
+import { faHashtag } from '@fortawesome/free-solid-svg-icons';
 
 const Communities = () => {
   let emptyCommunity = {
@@ -23,7 +24,7 @@ const Communities = () => {
     district: districtId,
     phone: '',
     num_houses: 0,
-    status: 'activo',
+    status: '1',
     date_entry: new Date(),
     houses: [],
   };
@@ -47,6 +48,16 @@ const Communities = () => {
   const toast = useRef(null);
   const dt = useRef(null);
 
+
+
+  //para el perfil de la comunidad
+  const [tenants, setTenants] = useState([]);
+
+  const [communityDialog, setCommunityDialog] = useState(false);
+  const [editcommunityDialog, setEditCommunityDialog] = useState(false);
+
+
+
   const p = provincesList.map((item) => ({
     label: item.name,
     value: item.code,
@@ -64,17 +75,6 @@ const Communities = () => {
     parent: item.parentCode,
   }));
 
-  useEffect(() => {
-    fillProvinces();
-  }, []);
-
-  useEffect(() => {
-    fillCantons();
-  }, [provinciaId]);
-
-  useEffect(() => {
-    fillDistricts();
-  }, [cantonId]);
 
   async function getProvinces() {
     const response = await fetch('assets/demo/data/provincias.json', {
@@ -118,6 +118,20 @@ const Communities = () => {
     setDistrictsList(await districts);
   }
 
+
+  useEffect(() => {
+    fillProvinces();
+  }, []);
+
+  useEffect(() => {
+    fillCantons();
+  }, [provinciaId]);
+
+  useEffect(() => {
+    fillDistricts();
+  }, [cantonId]);
+
+
   const handleProvinces = (event) => {
     const getprovinciaId = event.target.value;
     setProvinciaId(getprovinciaId);
@@ -162,6 +176,20 @@ const Communities = () => {
     getCommunites();
   }, []);
 
+  async function tenantsList(id) {
+    await fetch(`http://localhost:4000/user/findTenants/${id}`, { method: 'GET' })
+      .then((response) => response.json())
+      .then(data => data.message)
+      .then(data => {
+        setTenants(data)
+      });
+  }
+
+  useEffect(() => {
+    tenantsList(community._id);
+  }, [])
+
+
   const saveCommunity = () => {
     if (
       community.name &&
@@ -230,6 +258,20 @@ const Communities = () => {
     }
   };
 
+
+
+  function findNameTenant(tenant_id) {
+    let name = '';
+    if (tenant_id == '') {
+      name = 'Sin inquilino';
+    } else {
+      let tenant = tenants.find(t => t._id == tenant_id )
+      name = tenant['name'] + ' ' + tenant['last_name'];
+    }
+    console.log(name);
+    return name;
+  }
+
   const onInputChange = (e, name) => {
     const val = (e.target && e.target.value) || '';
     let _community = { ...community };
@@ -238,6 +280,11 @@ const Communities = () => {
     setCommunity(_community);
   };
 
+  const hideCommunityDialog = () => {
+    setSubmitted(false);
+    setCommunityDialog(false);
+  };
+
   const hideDeleteCommunityDialog = () => {
     setDeleteCommunityDialog(false);
   };
@@ -255,6 +302,19 @@ const Communities = () => {
     setDeleteCommunitiesDialog(true);
   };
 
+
+  const infoCommunity = async (community) => {
+    await tenantsList(community._id);
+
+    setCommunity({ ...community });
+    setCommunityDialog(true);
+  };
+
+  const editCommunity = (community) => {
+    setCommunity({ ...community });
+    setEditCommunityDialog(true);
+  };
+
   const deleteCommunity = () => {
     /*   fetch('http://localhost:4000/community/deleteCommunity/' + community._id, {
                cache: 'no-cache',
@@ -327,6 +387,11 @@ const Communities = () => {
   const actionsCommunity = (rowData) => {
     return (
       <div className="actions">
+        <Button
+          icon="pi pi-exclamation-circle"
+          className="p-button-rounded p-button-primary mr-2"
+          onClick={() => infoCommunity(rowData)}
+        />
         <Button
           icon="pi pi-trash"
           className="p-button-rounded p-button-danger mt-2"
@@ -378,6 +443,18 @@ const Communities = () => {
     </div>
   );
 
+  const communityDialogFooter = (
+    <>
+      <Button
+        label="Cerrar"
+        icon="pi pi-times"
+        className="p-button-text"
+        onClick={hideCommunityDialog}
+      />
+
+    </>
+  );
+
   const deleteCommunityDialogFooter = (
     <>
       <Button
@@ -429,7 +506,7 @@ const Communities = () => {
           icon={faMapLocationDot}
           style={{ color: '#D7A86E' }}
         />{' '}
-        Pronvincia
+        Provincia
       </p>
     </>
   );
@@ -474,7 +551,7 @@ const Communities = () => {
     <>
       <p>
         {' '}
-        <FontAwesomeIcon icon={faPhoneAlt} style={{ color: '#D7A86E' }} />{' '}
+        <FontAwesomeIcon icon={faHashtag} style={{ color: '#D7A86E' }} />{' '}
         Número de viviendas
       </p>
     </>
@@ -490,15 +567,30 @@ const Communities = () => {
     </>
   );
 
-  const headerOptions = (
+  //ver perfil comunidad
+  const headerTenant = (
     <>
       <p>
-        Opciones{' '}
-        <FontAwesomeIcon icon={faEllipsis} style={{ color: '#D7A86E' }} />
+        {' '}
+        <FontAwesomeIcon icon={faUserAlt} style={{ color: '#C08135' }} />{' '}
+        Inquilinos
       </p>
+        
     </>
   );
 
+
+  const tenantsBodyTemplate = (rowData) => {
+    let tenants = rowData.tenants;
+    let name = findNameTenant(tenants.tenant_id);
+    console.log(name);
+    return (
+      <>
+          {name}
+      </>
+    )
+  };
+
   return (
     <div className="grid">
       <div className="col-12">
@@ -534,21 +626,25 @@ const Communities = () => {
             ></Column>
             <Column
               field="name"
+              sortable
               header={headerName}
               style={{ flexGrow: 1, flexBasis: '160px' }}
             ></Column>
             <Column
               field="province"
+              sortable
               header={headerProvince}
               style={{ flexGrow: 1, flexBasis: '160px' }}
             ></Column>
             <Column
               field="canton"
+              sortable
               header={headerCanton}
               style={{ flexGrow: 1, flexBasis: '160px' }}
             ></Column>
             <Column
               field="district"
+              sortable
               header={headerDistrict}
               style={{ flexGrow: 1, flexBasis: '160px' }}
             ></Column>
@@ -559,16 +655,149 @@ const Communities = () => {
             ></Column>
             <Column
               field="num_houses"
+              sortable
               header={headerNumberHouses}
               style={{ flexGrow: 1, flexBasis: '180px' }}
             ></Column>
             <Column
               field="name_admin"
+              sortable
               header={headerAdministrator}
               style={{ flexGrow: 1, flexBasis: '180px' }}
             ></Column>
-            <Column header={headerOptions} body={actionsCommunity}></Column>
+            <Column
+             body={actionsCommunity}
+             style={{ flexGrow: 1, flexBasis: '180px' }}
+             ></Column>
           </DataTable>
+
+
+          <Dialog
+            visible={communityDialog}
+            style={{ width: '650px' }}
+            header="Información de la Comunidad"
+            modal
+            className="p-fluid"
+            footer={communityDialogFooter}
+            onHide={hideCommunityDialog}>
+            <div className='container text-center'>
+              <div className='row my-4'>
+                <div className=" col-12 md:col-12">
+                  <p>Nombre</p>
+                  <div className="p-0 col-2  md:col-2" style={{ margin: '0 auto' }}>
+                    <div className="p-inputgroup align-items-center justify-content-evenly">
+                      <i className="pi pi-home icon-khaki"></i>
+                      <p>{community.name}</p>
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <div className='row my-5'>
+                <div className=" col-6 md:col-6">
+                  <p>Administrador</p>
+                  <div className="p-0 col-6  md:col-6" style={{ margin: '0 auto' }}>
+                    <div className="p-inputgroup align-items-center justify-content-evenly">
+                      <i className="pi pi-user icon-khaki"></i>
+                      <p>{community.name_admin}</p>
+                    </div>
+
+                  </div>
+                </div>
+                <div className=" col-6 md:col-6">
+                  <p>Teléfono Administrativo</p>
+                  <div className="p-0 col-6  md:col-6" style={{ margin: '0 auto' }}>
+                    <div className="p-inputgroup align-items-center justify-content-evenly">
+                      <i className="pi pi-phone icon-khaki"></i>
+                      <p>{community.phone}</p>
+                    </div>
+
+                  </div>
+                </div>
+              </div>
+
+              <div className='row my-5'>
+                <div className=" col-4 col-md-4 md:col-4">
+                  <p>Provincia</p>
+                  <div className="p-0 col-10 md:col-10">
+                    <div className="p-inputgroup align-items-center justify-content-evenly">
+                      <i className="pi pi-map-marker icon-khaki"></i>
+                      <p>{community.province}</p>
+                    </div>
+
+                  </div>
+                </div>
+                <div className=" col-4 md:col-4">
+                  <p>Cantón</p>
+                  <div className="p-0 col-10 md:col-10">
+                    <div className="p-inputgroup align-items-center justify-content-evenly">
+                      <i className="pi pi-map-marker icon-khaki"></i>
+                      <p>{community.canton}</p>
+                    </div>
+
+                  </div>
+                </div>
+                <div className=" col-4 md:col-4">
+                  <p>Distrito</p>
+                  <div className="p-0 col-10 md:col-10">
+                    <div className="p-inputgroup align-items-center justify-content-evenly">
+                      <i className="pi pi-map-marker icon-khaki"></i>
+                      <p>{community.district}</p>
+                    </div>
+
+                  </div>
+                </div>
+              </div>
+              <div className='row my-5'>
+                <div className=" col-12 md:col-12">
+                  <p>Número de Viviendas</p>
+                  <div className="p-0 col-2  md:col-2" style={{ margin: '0 auto' }}>
+                    <div className="p-inputgroup justify-content-evenly">
+                      <i className="pi pi-hashtag icon-khaki"></i>
+                      <p>{community.num_houses}</p>
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <div className='row my-5'>
+                <div className=" col-12 md:col-12">
+
+
+                  <p> <i className="pi pi-home icon-khaki"></i>  Viviendas</p>
+                  <div className="p-0 col-12  md:col-12" style={{ margin: '0 auto' }}>
+                    <div className="p-inputgroup justify-content-evenly">
+                      <DataTable
+                        value={community.houses}
+                        paginator
+                        rows={5}
+                        scrollable
+                        scrollHeight="200px"
+                        scrollDirection="both"
+                        rowsPerPageOptions={[5, 10, 25]}
+                        className="datatable-responsive mt-3"
+                        paginatorTemplate="FirstPageLink PrevPageLink PageLinks NextPageLink LastPageLink CurrentPageReport RowsPerPageDropdown"
+                        currentPageReportTemplate="Mostrando {first} a {last} de {totalRecords} viviendas"
+                        globalFilter={globalFilter}
+                      >
+                        <Column
+                          field="number_house"
+                          header={headerNumberHouses}
+                          style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px' }}
+                        ></Column>
+                        <Column
+                          field="tenants"
+                          header={headerTenant}
+                          body={tenantsBodyTemplate}
+                          style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px' }}
+                        ></Column>
+                      </DataTable>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+
+          </Dialog>
+
           <Dialog
             visible={deleteCommunityDialog}
             style={{ width: '450px' }}

web-ui/web-react/src/components/GuardasSeguridad.js

@@ -1,23 +1,50 @@
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useState, useRef } from 'react';
 import { InputText } from 'primereact/inputtext';
 import { Button } from 'primereact/button';
 import { DataTable } from 'primereact/datatable';
 import { Column } from 'primereact/column';
+import { Toast } from 'primereact/toast';
+import { Dialog } from 'primereact/dialog';
+import { Toolbar } from 'primereact/toolbar';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
+import { faUserAlt } from '@fortawesome/free-solid-svg-icons';
+import { faPhoneAlt } from '@fortawesome/free-solid-svg-icons';
+import { faAt } from '@fortawesome/free-solid-svg-icons';
+import { faIdCardAlt } from '@fortawesome/free-solid-svg-icons';
+import { faEllipsis } from '@fortawesome/free-solid-svg-icons';
 
 const GuardasSeguridad = () => {
-  const [pokemones, setPokemones] = useState([]);
-  const [urlFetch, setUrlFetch] = useState(
-    'http://localhost:4000/user/findGuards/62be68215692582bbfd77134',
-  );
-  async function fetchP() {
+    const [listaGuardas, setListaGuardas] = useState([]);
+    const [urlFetch, setUrlFetch] = useState('http://localhost:4000/user/findGuards/62be68215692582bbfd77134');
+    const [guarda, setGuarda] = useState(emptyGuarda);
+    const [selectedGuardas, setSelectedGuardas] = useState(null);
+    const [globalFilter, setGlobalFilter] = useState(null);
+    const [deleteGuardaDialog, setDeleteGuardaDialog] = useState(false);
+    const [deleteGuardasDialog, setDeleteGuardasDialog] = useState(false);
+    const toast = useRef(null);
+    const dt = useRef(null);
+    let emptyGuarda = {
+        _id: null,
+        dni: '',
+        name: '',
+        last_name: '',
+        email: '',
+        phone: '',
+        password: '',
+        user_type: '1',
+        status: ''
+    };
+
+
+
+    async function listaGuardasF() {
         let nombres = await fetch(urlFetch, { method: 'GET' });
-    let pokemonesRes = await nombres.json();
-    setPokemones(pokemonesRes.message);
-    console.log(pokemones);
+        let listaGuardasRes = await nombres.json();
+        setListaGuardas(listaGuardasRes.message);
     }
     useEffect(() => {
-    fetchP();
-  }, []);
+        listaGuardasF();
+    }, [])
 
     function registrarGuarda() {
         var data = {
@@ -27,82 +54,247 @@ const GuardasSeguridad = () => {
             email: document.getElementById('correo_electronico').value,
             phone: document.getElementById('telefono').value,
             password: document.getElementById('correo_electronico').value,
-      user_type: '4', //4 es guarda
-      status: '1',
-      community_id: '62be68215692582bbfd77134',
+            user_type: "4", //4 es guarda
+            status: "1",
+            community_id: "62be68215692582bbfd77134"
         };
         var data2 = {
-      dni: '98765',
-      name: 'Danielito',
-      last_name: 'Rodriguez',
-      email: 'danirodriguez@gmail.com',
+            dni: "11979037",
+            name: "Jorge",
+            last_name: "Soto",
+            email: "jorgesoto@gmail.com",
             phone: 84664515,
-      password: '1203',
-      user_type: '2',
-      status: '4',
-      community_id: '62be68215692582bbfd77134',
-    };
-    console.log(data2);
-
+            password: "1203",
+            user_type: "2",
+            status: "4",
+            community_id: "62be68215692582bbfd77134"
+        }
+        console.log('ssss');
         fetch('http://localhost:4000/user/createGuard', {
             cache: 'no-cache',
             method: 'POST',
             mode: 'cors',
             body: JSON.stringify(data2),
             headers: {
-        'Content-Type': 'application/json',
-      },
+                'Content-Type': 'application/json'
+            }
         })
-      .then(function (response) {
+            .then(
+                function (response) {
                     if (response.status != 201)
                         console.log('Ocurrió un error con el servicio: ' + response.status);
-        else return response.json();
-      })
-      .then(function (response) {
-        fetchP();
-      })
-      .catch((err) => console.log('Ocurrió un error con el fetch', err));
+                    else
+                        return response.json();
                 }
+            )
+            .then(
+                function (response) {
+                    console.log('fff');
+                    listaGuardasF();
+                }
+            )
+            .catch(
+                err => console.log('Ocurrió un error con el fetch', err)
+            );
+    }
+
+    const hideDeleteGuardaDialog = () => {
+        setDeleteGuardaDialog(false);
+    }
+
+    const hideDeleteGuardasDialog = () => {
+        setDeleteGuardasDialog(false);
+    }
+
+    const confirmDeleteGuarda = (guarda) => {
+        setGuarda(guarda);
+        setDeleteGuardaDialog(true);
+    }
+
+    const confirmDeleteSelected = () => {
+        setDeleteGuardasDialog(true);
+    }
+
+    const deleteGuarda = () => {
+
+        fetch('http://localhost:4000/user/deleteAdminSystem/' + guarda._id, {
+            cache: 'no-cache',
+            method: 'DELETE',
+            headers: {
+                'Content-Type': 'application/json'
+            }
+        })
+            .then(
+                function (response) {
+                    if (response.status != 201)
+                        console.log('Ocurrió un error con el servicio: ' + response.status);
+                    else
+                        return response.json();
+                }
+            )
+            .then(
+                function (response) {
+                    let _guarda = listaGuardas.filter(val => val._id !== guarda._id);
+                    setListaGuardas(_guarda);
+                    setDeleteGuardaDialog(false);
+                    setGuarda(emptyGuarda);
+                    toast.current.show({ severity: 'success', summary: 'Éxito', detail: 'Administrador del Sistema Eliminado', life: 3000 });
+                }
+            )
+            .catch(
+                err => {
+                    console.log('Ocurrió un error con el fetch', err)
+                    toast.current.show({ severity: 'danger', summary: 'Error', detail: 'Administrador del Sistema no se pudo Eliminar', life: 3000 });
+                }
+            );
+    }
+
+    const deleteSelectedGuardas = () => {
+        let _guardas = listaGuardas.filter(val => !selectedGuardas.includes(val));
+        selectedGuardas.map((item) => {
+            fetch('http://localhost:4000/user/deleteAdminSystem/' + item._id, {
+                cache: 'no-cache',
+                method: 'DELETE',
+                headers: {
+                    'Content-Type': 'application/json'
+                }
+            })
+        })
+        setListaGuardas(_guardas);
+        setDeleteGuardasDialog(false);
+        setSelectedGuardas(null);
+        toast.current.show({ severity: 'success', summary: 'Éxito', detail: 'Administradores del Sistema Eliminados', life: 3000 });
+    }
+
+    const actionsAdmin = (rowData) => {
+        return (
+            <div className="actions">
+                <Button icon="pi pi-trash" className="p-button-rounded p-button-danger mt-2" onClick={() => confirmDeleteGuarda(rowData)} />
+            </div>
+        );
+    }
+
+    const leftToolbarTemplate = () => {
+        return (
+            <React.Fragment>
+                <div className="my-2">
+                    <Button label="Eliminar" icon="pi pi-trash" className="p-button-danger" onClick={confirmDeleteSelected} disabled={!selectedGuardas || !selectedGuardas.length} />
+                </div>
+            </React.Fragment>
+        )
+    }
+
+    const rightToolbarTemplate = () => {
+        return (
+            <React.Fragment>
+                <Button label="Exportar" icon="pi pi-upload" className="p-button-help" />
+            </React.Fragment>
+        )
+    }
+
+    const header = (
+        <div className="flex flex-column md:flex-row md:justify-content-between md:align-items-center">
+            <h5 className="m-0">Guardas de seguridad</h5>
+            <span className="block mt-2 md:mt-0 p-input-icon-left">
+                <i className="pi pi-search" />
+                <InputText type="search" onInput={(e) => setGlobalFilter(e.target.value)} placeholder="Buscar..." />
+            </span>
+        </div>
+    );
+
+    const deleteAdminSystemDialogFooter = (
+        <>
+            <Button label="No" icon="pi pi-times" className="p-button-text" onClick={hideDeleteGuardasDialog} />
+            <Button label="Yes" icon="pi pi-check" className="p-button-text" onClick={deleteGuarda} />
+        </>
+    );
+
+    const deleteAdminsSystemDialogFooter = (
+        <>
+            <Button label="No" icon="pi pi-times" className="p-button-text" onClick={hideDeleteGuardasDialog} />
+            <Button label="Yes" icon="pi pi-check" className="p-button-text" onClick={deleteSelectedGuardas} />
+        </>
+    );
+
+    const headerName = (
+        <>
+            <p>{' '}
+                <FontAwesomeIcon icon={faUserAlt} style={{ color: "#C08135" }} /> {' '}
+                Nombre
+            </p>
+        </>
+    )
+
+    const headerLastName = (
+        <>
+            <p>
+                {' '}
+                <FontAwesomeIcon icon={faUserAlt} style={{ color: "#D7A86E" }} />{' '}
+                Apellido(s)
+            </p>
+        </>
+    )
+
+    const headerDNI = (
+        <p> {' '}
+            <FontAwesomeIcon icon={faIdCardAlt} style={{ color: "#C08135" }} />{' '}
+            Identificación
+        </p>
+    )
+
+    const headerEmail = (
+        <>
+            <p> {' '}
+                <FontAwesomeIcon icon={faAt} style={{ color: "#D7A86E" }} />{' '}
+                Correo Electrónico
+            </p>
+        </>
+    )
+
+    const headerPhone = (
+        <>
+            <p>
+                {' '}
+                <FontAwesomeIcon icon={faPhoneAlt} style={{ color: '#C08135' }} />{' '}
+                Teléfono
+            </p>
+        </>
+    )
+
 
     return (
         <div className="grid">
             <div className="col-12">
+                <Toast ref={toast} />
                 <div className="card">
-          <h5>Guardas de seguridad</h5>
-          <DataTable
-            value={pokemones}
-            scrollable
-            scrollHeight="400px"
-            scrollDirection="both"
-            className="mt-3"
-          >
-            <Column
-              field="name"
-              header="Nombre"
-              style={{ flexGrow: 1, flexBasis: '160px' }}
-            ></Column>
-            <Column
-              field="last_name"
-              header="Apellidos"
-              style={{ flexGrow: 1, flexBasis: '160px' }}
-              alignFrozen="left"
-            ></Column>
-            <Column
-              field="dni"
-              header="Identificación"
-              style={{ flexGrow: 1, flexBasis: '160px' }}
-            ></Column>
-            <Column
-              field="email"
-              header="Correo electrónico"
-              style={{ flexGrow: 1, flexBasis: '160px' }}
-            ></Column>
-            <Column
-              field="phone"
-              header="Telefóno"
-              style={{ flexGrow: 1, flexBasis: '160px' }}
-            ></Column>
+                    <Toolbar className="mb-4" left={leftToolbarTemplate} right={rightToolbarTemplate}></Toolbar>
+                    <DataTable ref={dt} value={listaGuardas} dataKey="_id" paginator rows={5} selection={selectedGuardas} onSelectionChange={(e) => setSelectedGuardas(e.value)}
+                        responsiveLayout="scroll" header={header}
+                        rowsPerPageOptions={[5, 10, 25]} className="datatable-responsive mt-3"
+                        paginatorTemplate="FirstPageLink PrevPageLink PageLinks NextPageLink LastPageLink CurrentPageReport RowsPerPageDropdown"
+                        currentPageReportTemplate="Mostrando {first} a {last} de {totalRecords}"
+                        globalFilter={globalFilter} emptyMessage="No hay guardas registrados.">
+                        <Column selectionMode="multiple" headerStyle={{ width: '3rem' }}></Column>
+                        <Column field="name" sortable header={headerName} style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }}></Column>
+                        <Column field="last_name" sortable header={headerLastName} style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }} alignFrozen="left"></Column>
+                        <Column field="dni" sortable header={headerDNI} style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }}>
+                        </Column>
+                        <Column field="email" sortable header={headerEmail} style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }}></Column>
+                        <Column field="phone" header={headerPhone} style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }}></Column>
+                        <Column style={{ flexGrow: 1, flexBasis: '130px', minWidth: '130px' }} body={actionsAdmin}></Column>
                     </DataTable>
+                    <Dialog visible={deleteGuardaDialog} style={{ width: '450px' }} header="Confirmar" modal footer={deleteAdminSystemDialogFooter} onHide={hideDeleteGuardaDialog}>
+                        <div className="flex align-items-center justify-content-center">
+                            <i className="pi pi-exclamation-triangle mr-3" style={{ fontSize: '2rem' }} />
+                            {guarda && <span>¿Estás seguro que desea eliminar a <b>{guarda.name}</b>?</span>}
+                        </div>
+                    </Dialog>
+                    <Dialog visible={deleteGuardasDialog} style={{ width: '450px' }} header="Confirmar" modal footer={deleteAdminsSystemDialogFooter} onHide={hideDeleteGuardasDialog}>
+                        <div className="flex align-items-center justify-content-center">
+                            <i className="pi pi-exclamation-triangle mr-3" style={{ fontSize: '2rem' }} />
+                            {selectedGuardas && <span>¿Está seguro eliminar los adminsitradores del sistema seleccionados?</span>}
+                        </div>
+                    </Dialog>
                 </div>
             </div>
             <div className="col-12">

web-ui/web-react/src/components/Inquilinos.js

@@ -1,27 +1,104 @@
 import { Button } from 'primereact/button';
+import { InputText } from 'primereact/inputtext'
+import React, { useEffect, useState, useRef } from 'react'
+import { DataTable } from 'primereact/datatable';
+import { Column } from 'primereact/column';
 import { Dropdown } from 'primereact/dropdown';
-import { InputText } from 'primereact/inputtext';
-import React, { useEffect, useState } from 'react';
+import { Toast } from 'primereact/toast';
+import { Dialog } from 'primereact/dialog';
+import { Toolbar } from 'primereact/toolbar';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
+import { faHome } from '@fortawesome/free-solid-svg-icons';
+import { faUserAlt } from '@fortawesome/free-solid-svg-icons';
+import { faPhoneAlt } from '@fortawesome/free-solid-svg-icons';
+import { faAt } from '@fortawesome/free-solid-svg-icons';
+import { faIdCardAlt } from '@fortawesome/free-solid-svg-icons';
+import { faEllipsis } from '@fortawesome/free-solid-svg-icons';
+import { faHashtag } from '@fortawesome/free-solid-svg-icons';
+
+import { useCookies } from "react-cookie";
+
 
 const Inquilinos = () => {
+
+  let emptyTenant = {
+    _id: null,
+    dni: '',
+    name: '',
+    last_name: '',
+    email: '',
+    phone: '',
+    password: '',
+    community_id: '',
+    community_name: '',
+    number_house: 'Sin número de vivienda',
+    user_type: '4',
+    date_entry: new Date(),
+    status: '1'
+  };
+
+  const [tenants, setTenants] = useState([]);
+  const [tenant, setTenant] = useState(emptyTenant);
+  const [selectedTentants, setSelectedTenants] = useState(null);
+  const [globalFilter, setGlobalFilter] = useState(null);
+  const [deleteTenantDialog, setDeleteTenantDialog] = useState(false);
+  const [deleteTenantsDialog, setDeleteTenantsDialog,] = useState(false);
   const [communitiesList, setCommunitiesList] = useState([]);
-  const communityIdList = communitiesList.map((community) => community.id);
+  const [communityId, setCommunityId] = useState(null);
+  const [submitted, setSubmitted] = useState(false);
+  const toast = useRef(null);
+  const dt = useRef(null);
+
+  const [cookies, setCookie] = useCookies();
+
+
+  async function tenantsList() {
+    await fetch(`http://localhost:4000/user/findTenants/${cookies.community_id}`, { method: 'GET' })
+      .then((response) => response.json())
+      .then(data => data.message)
+      .then(data => {
+
+        data.map((item) => {
+          if(item.number_house ==""){
+            item.number_house = "Sin vivienda asignada";
+          }
+        })
+        setTenants(data)
+      });
+  }
+
+
   async function getCommunites() {
-    let response = await fetch(
-      'http://localhost:4000/community/allCommunities',
-      { method: 'GET' },
-    );
-    let list = await response.json();
-    setCommunitiesList(list.message);
+    let response = await fetch('http://localhost:4000/community/allCommunities', { method: 'GET' });
+    let resList = await response.json();
+    let list = await resList.message;
+
+    setCommunitiesList(await list);
   }
 
+  useEffect(() => {
+    tenantsList();
+  }, [])
+
+
   useEffect(() => {
     getCommunites();
-  }, []);
+  }, [])
+
+  const cList = communitiesList.map((item) => ({
+    label: item.name,
+    value: item._id,
+  }))
+
   function registrarInquilino() {
     let data = {
+      dni: document.getElementById('identificacion').value,
+      name: document.getElementById('nombre').value,
+      last_name: document.getElementById('apellidos').value,
+      phone: document.getElementById('telefono').value,
       email: document.getElementById('correo_electronico').value,
       community_id: document.getElementById('numero_vivienda').value,
+      password: document.getElementById('password').value,
       user_type: '3',
       status: '1',
     };
@@ -42,13 +119,241 @@ const Inquilinos = () => {
     });
   }
 
+  const deleteTenant = () => {
+    /*   fetch('http://localhost:4000/community/deleteCommunity/' + community._id, {
+           cache: 'no-cache',
+           method: 'DELETE',
+           headers: {
+               'Content-Type': 'application/json'
+           }
+       })
+           .then(
+               function (response) {
+                   if (response.status != 201)
+                       console.log('Ocurrió un error con el servicio: ' + response.status);
+                   else
+                       return response.json();
+               }
+           )
+           .then(
+               function (response) {
+                   
+                   let _community = communities.filter(val => val._id !== community._id);
+                   setCommunities(_community);
+                   setDeleteCommunityDialog(false);
+                   setCommunity(emptyCommunity);
+                   toast.current.show({ severity: 'success', summary: 'Exito', detail: 'Comunidad de Viviendas Eliminada', life: 3000 });
+               }
+           )
+           .catch(
+               err => {
+                   console.log('Ocurrió un error con el fetch', err)
+                   toast.current.show({ severity: 'danger', summary: 'Error', detail: 'Comunidad de Viviendas no se pudo eliminar', life: 3000 });
+               }
+           ); 
+    */
+    let _tenants = tenants.filter(
+      (val) => val._id !== tenant._id,
+    );
+    setTenants(_tenants);
+    setDeleteTenantDialog(false);
+    setTenant(emptyTenant);
+    toast.current.show({
+      severity: 'success',
+      summary: 'Inquilino Eliminado',
+      life: 3000,
+    });
+  };
+
+  const deleteSelectedTenants = () => {
+    let _tenants = tenants.filter(
+      (val) => !selectedTentants.includes(val),
+    );
+    /*  selectedCommunities.map((item) => {
+             fetch('http://localhost:4000/user/deleteCommunity/' + item._id, {
+                 cache: 'no-cache',
+                 method: 'DELETE',
+                 headers: {
+                     'Content-Type': 'application/json'
+                 }
+             })
+         })*/
+    setTenants(_tenants);
+    setDeleteTenantsDialog(false);
+    setSelectedTenants(null);
+    toast.current.show({
+      severity: 'success',
+      summary: 'Éxito',
+      detail: 'Inquilinos Eliminados',
+      life: 3000,
+    });
+  };
+
+
+  const hideDeleteTenantDialog = () => {
+    setDeleteTenantDialog(false);
+  }
+
+  const hideDeleteTenantsDialog = () => {
+    setDeleteTenantsDialog(false);
+  }
+
+  const confirmDeleteTenant = (tenant) => {
+    setTenant(tenant);
+    setDeleteTenantDialog(true);
+  }
+
+  const confirmDeleteSelected = () => {
+    setDeleteTenantsDialog(true);
+  };
+
+
+  const actionsTenant = (rowData) => {
+    return (
+      <div className="actions">
+        <Button icon="pi pi-trash" className="p-button-rounded p-button-danger mt-2" onClick={() => confirmDeleteTenant(rowData)} />
+      </div>
+    );
+  }
+
+  const leftToolbarTemplate = () => {
+    return (
+      <React.Fragment>
+        <div className="my-2">
+          <Button label="Eliminar" icon="pi pi-trash" className="p-button-danger" onClick={confirmDeleteSelected} disabled={!selectedTentants || !selectedTentants.length} />
+        </div>
+      </React.Fragment>
+    )
+  }
+
+  const rightToolbarTemplate = () => {
+    return (
+      <React.Fragment>
+        <Button label="Exportar" icon="pi pi-upload" className="p-button-help" />
+      </React.Fragment>
+    )
+  }
+
+  const header = (
+    <div className="flex flex-column md:flex-row md:justify-content-between md:align-items-center">
+      <h5 className="m-0">Inquilinos</h5>
+      <span className="block mt-2 md:mt-0 p-input-icon-left">
+        <i className="pi pi-search" />
+        <InputText type="search" onInput={(e) => setGlobalFilter(e.target.value)} placeholder="Buscar..." />
+      </span>
+    </div>
+  );
+
+  const deleteTenantDialogFooter = (
+    <>
+      <Button label="No" icon="pi pi-times" className="p-button-text" onClick={hideDeleteTenantDialog} />
+      <Button label="Yes" icon="pi pi-check" className="p-button-text" onClick={deleteTenant} />
+    </>
+  );
+
+  const deleteTenantsDialogFooter = (
+    <>
+      <Button label="No" icon="pi pi-times" className="p-button-text" onClick={hideDeleteTenantsDialog} />
+      <Button label="Yes" icon="pi pi-check" className="p-button-text" onClick={deleteSelectedTenants} />
+    </>
+  );
+
+  const headerName = (
+    <>
+      <p> <FontAwesomeIcon icon={faUserAlt} style={{ color: "#C08135" }} />  Nombre</p>
+    </>
+  )
+
+  const headerLastName = (
+    <>
+      <p> <FontAwesomeIcon icon={faUserAlt} style={{ color: "#D7A86E" }} />    Apellidos</p>
+    </>
+  )
+
+  const headerDNI = (
+    <>
+      <p> <FontAwesomeIcon icon={faIdCardAlt} style={{ color: "#C08135" }} />    Identificación</p>
+    </>
+  )
+
+  const headerEmail = (
+    <>
+      <p> <FontAwesomeIcon icon={faAt} style={{ color: "#D7A86E" }} />    Correo Electrónico</p>
+    </>
+  )
+
+  const headerPhone = (
+    <>
+      <p> <FontAwesomeIcon icon={faPhoneAlt} style={{ color: "#C08135" }} />   Teléfono</p>
+    </>
+  )
+
+
+
+  const headerNumberHouse = (
+    <>
+      <p> <FontAwesomeIcon icon={faHashtag} style={{ color: "#C08135" }} />   Número de vivienda</p>
+    </>
+  )
+
+ 
   return (
     <div className="grid">
+      <div className="col-12">
+        <Toast ref={toast} />
+        <div className="card">
+          <Toolbar className="mb-4" left={leftToolbarTemplate} right={rightToolbarTemplate}></Toolbar>
+          <DataTable ref={dt} value={tenants} dataKey="_id" paginator rows={5} selection={selectedTentants} onSelectionChange={(e) => setSelectedTenants(e.value)}
+            scrollable scrollHeight="400px" scrollDirection="both" header={header}
+            rowsPerPageOptions={[5, 10, 25]} className="datatable-responsive mt-3"
+            paginatorTemplate="FirstPageLink PrevPageLink PageLinks NextPageLink LastPageLink CurrentPageReport RowsPerPageDropdown"
+            currentPageReportTemplate="Mostrando {first} a {last} de {totalRecords} inquilinos"
+            globalFilter={globalFilter} emptyMessage="No hay inquilinos en esta comunidad registrados.">
+            <Column selectionMode="multiple" headerStyle={{ width: '3rem' }}></Column>
+            <Column field="name" sortable header={headerName} style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }}></Column>
+            <Column field="last_name" sortable header={headerLastName} style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }} alignFrozen="left"></Column>
+            <Column field="dni" sortable header={headerDNI} style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }}>
+            </Column>
+            <Column field="email" sortable header={headerEmail} style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }}></Column>
+            <Column field="phone" header={headerPhone} style={{ flexGrow: 1, flexBasis: '80px', minWidth: '80px', wordBreak: 'break-word' }}></Column>
+            <Column field="number_house" sortable header={headerNumberHouse} style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word', justifyContent: 'center' }}></Column>
+            <Column  style={{ flexGrow: 1, flexBasis: '130px', minWidth: '130px' }} body={actionsTenant}></Column>
+          </DataTable>
+          <Dialog visible={deleteTenantDialog} style={{ width: '450px' }} header="Confirmar" modal footer={deleteTenantDialogFooter} onHide={hideDeleteTenantDialog}>
+            <div className="flex align-items-center justify-content-center">
+              <i className="pi pi-exclamation-triangle mr-3" style={{ fontSize: '2rem' }} />
+              {tenant && <span>¿Estás seguro que desea eliminar a <b>{tenant.name}</b>?</span>}
+            </div>
+          </Dialog>
+          <Dialog visible={deleteTenantsDialog} style={{ width: '450px' }} header="Confirmar" modal footer={deleteTenantsDialogFooter} onHide={hideDeleteTenantsDialog}>
+            <div className="flex align-items-center justify-content-center">
+              <i className="pi pi-exclamation-triangle mr-3" style={{ fontSize: '2rem' }} />
+              {selectedTentants && <span>¿Está seguro eliminar los Inquilinos seleccionados?</span>}
+            </div>
+          </Dialog>
+        </div>
+      </div>
       <div className="col-12">
         <div className="card">
           <h5 className="card-header">Registrar Inquilino</h5>
           <div className="p-fluid formgrid grid">
-            <div className="p-field col-12 md:col-6">
+            <div className="field col-12 md:col-6">
+              <label htmlFor="nombre">Nombre</label>
+              <InputText type="text" className="form-control" id="nombre" />
+            </div>
+            <div className="field col-12 md:col-6">
+              <label htmlFor="apellidos">Apellidos</label>
+              <InputText type="text" className="form-control" id="apellidos" />
+            </div>
+            <div className="field col-12 md:col-6">
+              <label htmlFor="identificacion">Identificación</label>
+              <InputText
+                type="text"
+                className="form-control"
+                id="identificacion"
+              />
+            </div>
+            <div className="field col-12 md:col-6">
               <label htmlFor="correo_electronico">Correo electrónico</label>
               <InputText
                 type="email"
@@ -56,12 +361,16 @@ const Inquilinos = () => {
                 id="correo_electronico"
               />
             </div>
-            <div className="p-field col-12 md:col-6">
+            <div className="field col-12 md:col-6">
               <label htmlFor="numero_vivienda">Número de Vivienda</label>
-              <Dropdown
-                id="numero_vivienda"
-                value={communityIdList[0]}
-                options={communitiesList}
+              <Dropdown id="numero_vivienda" value={communityId} options={cList} />
+            </div>
+            <div className="field col-12 md:col-6">
+              <label htmlFor="identificacion">Identificación</label>
+              <InputText
+                type="password"
+                className="form-control"
+                id="identificacion"
               />
             </div>
             <Button label="Registrar" onClick={registrarInquilino} />

web-ui/web-react/src/index.js

@@ -5,11 +5,14 @@ import App from './App';
 //import * as serviceWorker from './serviceWorker';
 import { HashRouter } from 'react-router-dom';
 import ScrollToTop from './ScrollToTop';
+import { CookiesProvider } from "react-cookie";
 
 ReactDOM.render(
   <HashRouter>
     <ScrollToTop>
+      <CookiesProvider>
         <App></App>
+      </CookiesProvider>
     </ScrollToTop>
   </HashRouter>,
   document.getElementById('root'),