Merge branch 'dev' into UH-registroAdminComunidad

.github/workflows/node.js.yml

@@ -5,30 +5,27 @@ name: Node.js CI
 
 on:
   push:
-    branches: ['master']
+    branches: ['master', 'dev']
   pull_request:
-    branches: ['master']
+    branches: ['master', 'dev']
 
 jobs:
-  build:
+  build-api:
     runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: ./mobile-ui
     strategy:
       matrix:
         node-version: [14.x, 16.x, 18.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
-
     steps:
-      - uses: actions/checkout@v3
+      - name: checkout
-        run: cd ./mobile-ui
+        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 ./api-gateway
           npm ci
           npm run build --if-present
-          npm test

.jsbeautifyrc

@@ -0,0 +1,25 @@
+{
+    "editorconfig": false,
+    "indent_size": 2,
+    "end_with_newline": true,
+    "html": {
+        "brace_style": "collapse",
+        "indent_char": " ",
+        "indent_scripts": "normal",
+        "indent_inner_html": true,
+        "indent_empty_lines": false,
+        "wrap_line_length": 120,
+        "wrap_attributes": "force-expand-multiline",
+        "unformatted": [
+            "sub",
+            "sup",
+            "b",
+            "i",
+            "u",
+            "em",
+            "strong"
+        ],
+        "preserve_newlines": true,
+        "max_preserve_newlines": 2
+    }
+}

.prettierignore

@@ -0,0 +1,4 @@
+node_modules/*
+e2e/*
+dist/*
+src/assets/scss/bootstrap/*

.prettierrc

@@ -0,0 +1,11 @@
+{
+  "printWidth": 80,
+  "tabWidth": 2,
+  "useTabs": false,
+  "singleQuote": true,
+  "trailingComma": "all",
+  "bracketSpacing": true,
+  "arrowParens": "always",
+  "jsxBracketSameLine": false,
+  "semi": true
+}

api-gateway/src/app.controller.ts

@@ -1,5 +1,5 @@
 import { Controller, Get, Post, Body, Param, Delete } from '@nestjs/common';
-import { AppService } from "./app.service";
+import { AppService } from './app.service';
 @Controller()
 export class AppController {
   constructor(private readonly appService: AppService) {}
@@ -30,7 +30,7 @@ export class AppController {
     @Body('user_type') user_type: string,
     @Body('status') status: string,
     @Body('date_entry') date_entry: Date,
-    @Body('community_id') community_id:string
+    @Body('community_id') community_id: string,
   ) {
     return this.appService.createGuard(dni, name, last_name, email, phone,
       user_type, status, date_entry,community_id);
@@ -66,8 +66,18 @@ export class AppController {
     @Body('date_entry') date_entry: Date,
     @Body('community_id') community_id: string,
   ) {
-    return this.appService.createUser(dni, name, last_name, email, phone, password,
+    return this.appService.createUser(
-      user_type, status, date_entry, community_id);
+      dni,
+      name,
+      last_name,
+      email,
+      phone,
+      password,
+      user_type,
+      status,
+      date_entry,
+      community_id,
+    );
   }
 
   @Get('user/allUsers')
@@ -93,24 +103,17 @@ export class AppController {
     return this.appService.allUsersAdminComunidad();
   }
   @Get('user/findGuards/:community')
-  findGuardsCommunity(
+  findGuardsCommunity(@Param('community_id') community_id: string) {
-    @Param('community_id') community_id: string
-  ) {
     return this.appService.findGuardsCommunity(community_id);
   }
 
   @Get('user/find/:dni')
-  findUser(
+  findUser(@Param('dni') paramUserDNI: string) {
-    @Param('dni') paramUserDNI: string
-  ) {
     return this.appService.findUser(paramUserDNI);
   }
 
-
   @Delete('user/deleteAdminSystem/:id')
-  deleteAdminSystem(
+  deleteAdminSystem(@Param('id') id: string) {
-    @Param('id') id: string,
-  ) {
     return this.appService.deleteAdminSystem(id);
   }
 
@@ -126,11 +129,18 @@ export class AppController {
     @Body('status') status: string,
     @Body('date_entry') date_entry: Date,
     @Body('houses') houses: [],
-
   ) {
-    return this.appService.createCommunity(name, province, canton,
+    return this.appService.createCommunity(
-      district, num_houses, phone,
+      name,
-      status, date_entry, houses);
+      province,
+      canton,
+      district,
+      num_houses,
+      phone,
+      status,
+      date_entry,
+      houses,
+    );
   }
 
   @Get('community/allCommunities')
@@ -139,25 +149,17 @@ export class AppController {
   }
 
   @Get('community/findCommunity/:id')
-  findCommunity(
+  findCommunity(@Param('id') paramCommunityId: string) {
-    @Param('id') paramCommunityId: string
-  ) {
     return this.appService.findCommunity(paramCommunityId);
   }
 
   @Get('community/findCommunityName/:id')
-  findCommunityName(
+  findCommunityName(@Param('id') paramCommunityId: string) {
-    @Param('id') paramCommunityId: string
-  ) {
     return this.appService.findCommunityName(paramCommunityId);
   }
 
-
-  
   @Post('community/findCommunityAdmin')
-  findCommunityAdmin(
+  findCommunityAdmin(@Body('community_id') community_id: string) {
-    @Body('community_id') community_id: string,
-  ) {
     return this.appService.findCommunityAdmin(community_id);
   }
 
@@ -170,22 +172,22 @@ export class AppController {
     @Body('bookable') bookable: number,
     @Body('community_id') community_id: string,
   ) {
-
+    return this.appService.createCommonArea(
-    return this.appService.createCommonArea(name, hourMin, hourMax,
+      name,
-      bookable, community_id);
+      hourMin,
+      hourMax,
+      bookable,
+      community_id,
+    );
   }
 
-
   @Get('commonArea/allCommonAreas')
   allCommonAreas() {
     return this.appService.allCommonAreas();
   }
 
-
   @Get('commonArea/findCommonArea/:id')
-  findCommonArea(
+  findCommonArea(@Param('id') paramCommonAreaId: string) {
-    @Param('id') paramCommonAreaId: string
-  ) {
     return this.appService.findCommonArea(paramCommonAreaId);
   }
 
@@ -201,7 +203,15 @@ export class AppController {
     @Body('status') status: string,
     @Body('date_entry') date_entry: Date,
   ) {
-    return this.appService.createGuest(name, last_name, dni, number_plate, phone,  status, date_entry);
+    return this.appService.createGuest(
+      name,
+      last_name,
+      dni,
+      number_plate,
+      phone,
+      status,
+      date_entry,
+    );
   }
 
   @Get('guest/allGuests')
@@ -210,13 +220,10 @@ export class AppController {
   }
 
   @Get('guest/find/:dni')
-  findGuest(
+  findGuest(@Param('dni') paramGuestDNI: string) {
-    @Param('dni') paramGuestDNI: string
-  ) {
     return this.appService.findGuest(paramGuestDNI);
   }
 
-  
   // #==== API Payment
 
   @Post('payment/createPayment')
@@ -229,8 +236,15 @@ export class AppController {
     @Body('user_id') user_id: string,
     @Body('communty_id') communty_id: string,
   ) {
-    return this.appService.createPayment(date_payment, mount, description, 
+    return this.appService.createPayment(
-      period, status,  user_id, communty_id);
+      date_payment,
+      mount,
+      description,
+      period,
+      status,
+      user_id,
+      communty_id,
+    );
   }
 
   @Get('payment/allPayments')
@@ -239,9 +253,7 @@ export class AppController {
   }
 
   @Get('payment/find/:dni')
-  findPayment(
+  findPayment(@Param('dni') paramPaymentDNI: string) {
-    @Param('dni') paramPaymentDNI: string
-  ) {
     return this.appService.findPayment(paramPaymentDNI);
   }
 
@@ -256,8 +268,14 @@ export class AppController {
     @Body('user_id') user_id: string,
     @Body('common_area_id') common_area_id: string,
   ) {
-    return this.appService.createReservation(start_time, finish_time, status, 
+    return this.appService.createReservation(
-      date_entry, user_id, common_area_id);
+      start_time,
+      finish_time,
+      status,
+      date_entry,
+      user_id,
+      common_area_id,
+    );
   }
 
   @Get('reservation/allReservations')
@@ -266,13 +284,10 @@ export class AppController {
   }
 
   @Get('reservation/find/:id')
-  findReservation(
+  findReservation(@Param('id') paramReservation: string) {
-    @Param('id') paramReservation: string
-  ) {
     return this.appService.findReservation(paramReservation);
   }
 
-  
   // #==== API Post
 
   @Post('post/createPost')
@@ -291,13 +306,10 @@ export class AppController {
   }
 
   @Get('post/find/:id')
-  findPost(
+  findPost(@Param('id') paramPost: string) {
-    @Param('id') paramPost: string
-  ) {
     return this.appService.findPost(paramPost);
   }
 
-
   // #==== API Comment
 
   @Post('post/createComment')
@@ -316,14 +328,10 @@ export class AppController {
   }
 
   @Get('post/findComment/:id')
-  findComment(
+  findComment(@Param('id') paramComment: string) {
-    @Param('id') paramComment: string
-  ) {
     return this.appService.findComment(paramComment);
   }
 
-
-  
   // #==== API Report
 
   @Post('report/createReport')
@@ -333,7 +341,12 @@ export class AppController {
     @Body('date_entry') date_entry: Date,
     @Body('user_id') user_id: string,
   ) {
-    return this.appService.createReport(action, description, date_entry, user_id);
+    return this.appService.createReport(
+      action,
+      description,
+      date_entry,
+      user_id,
+    );
   }
 
   @Get('report/allReports')
@@ -342,26 +355,16 @@ export class AppController {
   }
 
   @Get('report/find/:id')
-  findReport(
+  findReport(@Param('id') paramReport: string) {
-    @Param('id') paramReport: string
-  ) {
     return this.appService.findReport(paramReport);
   }
 
-
   @Post('email/sendMail')
-  senMail(
+  senMail(@Body('email') email: string) {
-    @Body('email') email: string,
-  ) {
-
     return this.appService.sendMail(email);
   }
   @Post('email/html')
-  html(
+  html(@Body('email') email: string, @Body('name') name: string) {
-    @Body('email') email: string,
-    @Body('name') name: string,
-  ) {
-
     return this.appService.html(email, name);
   }
 

api-gateway/src/app.module.ts

@@ -1,99 +1,99 @@
 import { Module } from '@nestjs/common';
 import { AppController } from './app.controller';
-import { ClientsModule, Transport } from "@nestjs/microservices";
+import { ClientsModule, Transport } from '@nestjs/microservices';
 import { AppService } from './app.service';
 
 @Module({
   imports: [
     ClientsModule.register([
       {
-        name: "SERVICIO_USUARIOS",
+        name: 'SERVICIO_USUARIOS',
         transport: Transport.TCP,
         options: {
-          host: "127.0.0.1",
+          host: '127.0.0.1',
-          port: 3001
+          port: 3001,
-        }
+        },
-      }
+      },
     ]),
     ClientsModule.register([
       {
-        name: "SERVICIO_COMUNIDADES",
+        name: 'SERVICIO_COMUNIDADES',
         transport: Transport.TCP,
         options: {
-          host: "127.0.0.1",
+          host: '127.0.0.1',
-          port: 3002
+          port: 3002,
-        }
+        },
-      }
+      },
     ]),
     ClientsModule.register([
       {
-        name: "SERVICIO_AREAS_COMUNES",
+        name: 'SERVICIO_AREAS_COMUNES',
         transport: Transport.TCP,
         options: {
-          host: "127.0.0.1",
+          host: '127.0.0.1',
-          port: 3003
+          port: 3003,
-        }
+        },
-      }
+      },
     ]),
     ClientsModule.register([
       {
-        name: "SERVICIO_INVITADOS",
+        name: 'SERVICIO_INVITADOS',
         transport: Transport.TCP,
         options: {
-          host: "127.0.0.1",
+          host: '127.0.0.1',
-          port: 3004
+          port: 3004,
-        }
+        },
-      }
+      },
     ]),
     ClientsModule.register([
       {
-        name: "SERVICIO_PAGOS",
+        name: 'SERVICIO_PAGOS',
         transport: Transport.TCP,
         options: {
-          host: "127.0.0.1",
+          host: '127.0.0.1',
-          port: 3005
+          port: 3005,
-        }
+        },
-      }
+      },
     ]),
     ClientsModule.register([
       {
-        name: "SERVICIO_RESERVACIONES",
+        name: 'SERVICIO_RESERVACIONES',
         transport: Transport.TCP,
         options: {
-          host: "127.0.0.1",
+          host: '127.0.0.1',
-          port: 3006
+          port: 3006,
-        }
+        },
-      }
+      },
     ]),
     ClientsModule.register([
       {
-        name: "SERVICIO_POSTS",
+        name: 'SERVICIO_POSTS',
         transport: Transport.TCP,
         options: {
-          host: "127.0.0.1",
+          host: '127.0.0.1',
-          port: 3007
+          port: 3007,
-        }
+        },
-      }
+      },
     ]),
     ClientsModule.register([
       {
-        name: "SERVICIO_REPORTES",
+        name: 'SERVICIO_REPORTES',
         transport: Transport.TCP,
         options: {
-          host: "127.0.0.1",
+          host: '127.0.0.1',
-          port: 3008
+          port: 3008,
-        }
+        },
-      }
+      },
     ]),
     ClientsModule.register([
       {
-        name: "SERVICIO_NOTIFICACIONES",
+        name: 'SERVICIO_NOTIFICACIONES',
         transport: Transport.TCP,
         options: {
-          host: "127.0.0.1",
+          host: '127.0.0.1',
-          port: 3009
+          port: 3009,
-        }
+        },
-      }
+      },
     ]),
   ],
   controllers: [AppController],

api-gateway/src/app.service.ts

@@ -1,38 +1,56 @@
 import { Injectable, Inject } from '@nestjs/common';
-import { ClientProxy } from "@nestjs/microservices";
+import { ClientProxy } from '@nestjs/microservices';
-import { map } from "rxjs/operators";
+import { map } from 'rxjs/operators';
-
 
 @Injectable()
 export class AppService {
   constructor(
     @Inject('SERVICIO_USUARIOS') private readonly clientUserApp: ClientProxy,
-    @Inject('SERVICIO_COMUNIDADES') private readonly clientCommunityApp: ClientProxy,
+    @Inject('SERVICIO_COMUNIDADES')
-    @Inject('SERVICIO_AREAS_COMUNES') private readonly clientCommonAreaApp: ClientProxy,
+    private readonly clientCommunityApp: ClientProxy,
+    @Inject('SERVICIO_AREAS_COMUNES')
+    private readonly clientCommonAreaApp: ClientProxy,
     @Inject('SERVICIO_INVITADOS') private readonly clientGuestApp: ClientProxy,
     @Inject('SERVICIO_PAGOS') private readonly clientPaymentApp: ClientProxy,
-    @Inject('SERVICIO_RESERVACIONES') private readonly clientReservationApp: ClientProxy,
+    @Inject('SERVICIO_RESERVACIONES')
+    private readonly clientReservationApp: ClientProxy,
     @Inject('SERVICIO_POSTS') private readonly clientPostApp: ClientProxy,
     @Inject('SERVICIO_REPORTES') private readonly clientReportApp: ClientProxy,
-    @Inject('SERVICIO_NOTIFICACIONES') private readonly clientNotificationtApp: ClientProxy,
+    @Inject('SERVICIO_NOTIFICACIONES')
+    private readonly clientNotificationtApp: ClientProxy,
   ) {}
 
   // ====================== USERS ===============================
 
   //POST parameter from API
-  createUser(dni: string, name: string, last_name: string, email: string, phone: number
+  createUser(
-    , password: string, user_type: string, status: string, date_entry: Date, community_id: string) {
+    dni: string,
+    name: string,
+    last_name: string,
+    email: string,
+    phone: number,
+    password: string,
+    user_type: string,
+    status: string,
+    date_entry: Date,
+    community_id: string,
+  ) {
     const pattern = { cmd: 'createUser' };
     const payload = {
-      dni: dni, name: name, last_name: last_name, email: email, phone: phone,
+      dni: dni,
-      password: password, user_type: user_type, status: status, date_entry: date_entry,
+      name: name,
-      community_id: community_id
+      last_name: last_name,
+      email: email,
+      phone: phone,
+      password: password,
+      user_type: user_type,
+      status: status,
+      date_entry: date_entry,
+      community_id: community_id,
     };
     return this.clientUserApp
       .send<string>(pattern, payload)
-      .pipe(
+      .pipe(map((message: string) => ({ message })));
-        map((message: string) => ({ message })),
-      );
   }
 
   //POST parameter from API
@@ -45,9 +63,7 @@ export class AppService {
     };
     return this.clientUserApp
       .send<string>(pattern, payload)
-      .pipe(
+      .pipe(map((message: string) => ({ message })));
-        map((message: string) => ({ message })),
-      );
   }
 
   createGuard(dni: string, name: string, last_name: string, email: string, phone: number
@@ -60,9 +76,7 @@ export class AppService {
     };
     return this.clientUserApp
       .send<string>(pattern, payload)
-      .pipe(
+      .pipe(map((message: string) => ({ message })));
-        map((message: string) => ({ message })),
-      );
   }
 
   
@@ -86,9 +100,7 @@ export class AppService {
     const payload = {};
     return this.clientUserApp
       .send<string>(pattern, payload)
-      .pipe(
+      .pipe(map((message: string) => ({ message })));
-        map((message: string) => ({ message })),
-      );
   }
 
   allUsersAdminSistema() {
@@ -96,9 +108,7 @@ export class AppService {
     const payload = {};
     return this.clientUserApp
       .send<string>(pattern, payload)
-      .pipe(
+      .pipe(map((message: string) => ({ message })));
-        map((message: string) => ({ message })),
-      );
   }
 
   allUsersAdminComunidad() {
@@ -106,9 +116,7 @@ export class AppService {
     const payload = {};
     return this.clientUserApp
       .send<string>(pattern, payload)
-      .pipe(
+      .pipe(map((message: string) => ({ message })));
-        map((message: string) => ({ message })),
-      );
   }
 
   //GET parameter from API
@@ -117,9 +125,7 @@ export class AppService {
     const payload = { dni: paramUserDNI };
     return this.clientUserApp
       .send<string>(pattern, payload)
-      .pipe(
+      .pipe(map((message: string) => ({ message })));
-        map((message: string) => ({ message })),
-      );
   }
 
   findGuardsCommunity(community_id: string) {
@@ -127,9 +133,7 @@ export class AppService {
     const payload = { community_id: community_id };
     return this.clientUserApp
       .send<string>(pattern, payload)
-      .pipe(
+      .pipe(map((message: string) => ({ message })));
-        map((message: string) => ({ message })),
-      );
   }
 
 
@@ -138,9 +142,7 @@ export class AppService {
     const payload = { id: id };
     return this.clientUserApp
       .send<string>(pattern, payload)
-      .pipe(
+      .pipe(map((message: string) => ({ message })));
-        map((message: string) => ({ message })),
-      );
   }
 
   inicioSesion(pEmail: string, pPassword: string) {
@@ -148,21 +150,16 @@ export class AppService {
     const payload = { email: pEmail, password: pPassword };
     return this.clientUserApp
       .send<string>(pattern, payload)
-      .pipe(
+      .pipe(map((message: string) => ({ message })));
-        map((message: string) => ({ message })),
-      );
   }
 
-
   //GET parameter from API
   findCommunityAdmin(community_id: string) {
     const pattern = { cmd: 'findCommunityAdmin' };
     const payload = { community_id: community_id };
     return this.clientCommunityApp
       .send<string>(pattern, payload)
-      .pipe(
+      .pipe(map((message: string) => ({ message })));
-        map((message: string) => ({ message })),
-      );
   }
 
   // ====================== COMMUNITIES ===============================
@@ -172,14 +169,19 @@ export class AppService {
     , num_houses: number, phone: string, status: string, date_entry: Date, houses: []) {
     const pattern = { cmd: 'createCommunity' };
     const payload = {
-      name: name, province: province, canton: canton, district: district, num_houses: num_houses,
+      name: name,
-      phone: phone, status: status, date_entry: date_entry, houses: houses
+      province: province,
+      canton: canton,
+      district: district,
+      num_houses: num_houses,
+      phone: phone,
+      status: status,
+      date_entry: date_entry,
+      houses: houses,
     };
     return this.clientCommunityApp
       .send<string>(pattern, payload)
-      .pipe(
+      .pipe(map((message: string) => ({ message })));
-        map((message: string) => ({ message })),
-      );
   }
 
   allCommunities() {
@@ -187,9 +189,7 @@ export class AppService {
     const payload = {};
     return this.clientCommunityApp
       .send<string>(pattern, payload)
-      .pipe(
+      .pipe(map((message: string) => ({ message })));
-        map((message: string) => ({ message })),
-      );
   }
 
   //GET parameter from API
@@ -198,9 +198,7 @@ export class AppService {
     const payload = { id: paramCommunityId };
     return this.clientCommunityApp
       .send<string>(pattern, payload)
-      .pipe(
+      .pipe(map((message: string) => ({ message })));
-        map((message: string) => ({ message })),
-      );
   }
 
   findCommunityName(paramCommunityId: string) {
@@ -208,27 +206,29 @@ export class AppService {
     const payload = { id: paramCommunityId };
     return this.clientCommunityApp
       .send<string>(pattern, payload)
-      .pipe(
+      .pipe(map((message: string) => ({ message })));
-        map((message: string) => ({ message })),
-      );
   }
 
-
-
   // ====================== COMMON AREAS ===============================
   //POST parameter from API
-  createCommonArea(name: string, hourMin: string, hourMax: string,
+  createCommonArea(
-    bookable: number, community_id: string) {
+    name: string,
+    hourMin: string,
+    hourMax: string,
+    bookable: number,
+    community_id: string,
+  ) {
     const pattern = { cmd: 'createCommonArea' };
     const payload = {
-      name: name, hourMin: hourMin, hourMax: hourMax, bookable: bookable,
+      name: name,
-      community_id: community_id
+      hourMin: hourMin,
+      hourMax: hourMax,
+      bookable: bookable,
+      community_id: community_id,
     };
     return this.clientCommonAreaApp
       .send<string>(pattern, payload)
-      .pipe(
+      .pipe(map((message: string) => ({ message })));
-        map((message: string) => ({ message })),
-      );
   }
 
   allCommonAreas() {
@@ -236,9 +236,7 @@ export class AppService {
     const payload = {};
     return this.clientCommonAreaApp
       .send<string>(pattern, payload)
-      .pipe(
+      .pipe(map((message: string) => ({ message })));
-        map((message: string) => ({ message })),
-      );
   }
 
   //GET parameter from API
@@ -247,18 +245,21 @@ export class AppService {
     const payload = { id: paramCommonAreaId };
     return this.clientCommonAreaApp
       .send<string>(pattern, payload)
-      .pipe(
+      .pipe(map((message: string) => ({ message })));
-        map((message: string) => ({ message })),
-      );
   }
 
-
   // ====================== GUESTS ===============================
 
-
   //POST parameter from API
-  createGuest(name: string, last_name: string, dni: string, number_plate: string, phone: number
+  createGuest(
-    , status: string, date_entry: Date) {
+    name: string,
+    last_name: string,
+    dni: string,
+    number_plate: string,
+    phone: number,
+    status: string,
+    date_entry: Date,
+  ) {
     const pattern = { cmd: 'createGuest' };
     const payload = {
       name: name, last_name: last_name, dni: dni, number_plate: number_plate, phone: phone,
@@ -266,9 +267,7 @@ export class AppService {
     };
     return this.clientGuestApp
       .send<string>(pattern, payload)
-      .pipe(
+      .pipe(map((message: string) => ({ message })));
-        map((message: string) => ({ message })),
-      );
   }
 
   allGuests() {
@@ -276,9 +275,7 @@ export class AppService {
     const payload = {};
     return this.clientGuestApp
       .send<string>(pattern, payload)
-      .pipe(
+      .pipe(map((message: string) => ({ message })));
-        map((message: string) => ({ message })),
-      );
   }
 
   //GET parameter from API
@@ -287,16 +284,21 @@ export class AppService {
     const payload = { dni: paramGuestDNI };
     return this.clientGuestApp
       .send<string>(pattern, payload)
-      .pipe(
+      .pipe(map((message: string) => ({ message })));
-        map((message: string) => ({ message })),
-      );
   }
 
   // ====================== PAYMENTS =============================== 
 
   //POST parameter from API
-  createPayment(date_payment: Date, mount: number, description: string, period: string
+  createPayment(
-    , status: string, user_id: string, communty_id: string) {
+    date_payment: Date,
+    mount: number,
+    description: string,
+    period: string,
+    status: string,
+    user_id: string,
+    communty_id: string,
+  ) {
     const pattern = { cmd: 'createPayment' };
     const payload = {
       date_payment: date_payment, mount: mount, description: description,
@@ -304,9 +306,7 @@ export class AppService {
     };
     return this.clientPaymentApp
       .send<string>(pattern, payload)
-      .pipe(
+      .pipe(map((message: string) => ({ message })));
-        map((message: string) => ({ message })),
-      );
   }
 
   allPayments() {
@@ -314,9 +314,7 @@ export class AppService {
     const payload = {};
     return this.clientPaymentApp
       .send<string>(pattern, payload)
-      .pipe(
+      .pipe(map((message: string) => ({ message })));
-        map((message: string) => ({ message })),
-      );
   }
 
   //GET parameter from API
@@ -325,12 +323,9 @@ export class AppService {
     const payload = { id: paramPaymentId };
     return this.clientPaymentApp
       .send<string>(pattern, payload)
-      .pipe(
+      .pipe(map((message: string) => ({ message })));
-        map((message: string) => ({ message })),
-      );
   }
 
-
   // ====================== RESERVATIONS ===============================
 
   //POST parameter from API
@@ -343,9 +338,7 @@ export class AppService {
     };
     return this.clientReservationApp
       .send<string>(pattern, payload)
-      .pipe(
+      .pipe(map((message: string) => ({ message })));
-        map((message: string) => ({ message })),
-      );
   }
 
   allReservations() {
@@ -353,9 +346,7 @@ export class AppService {
     const payload = {};
     return this.clientReservationApp
       .send<string>(pattern, payload)
-      .pipe(
+      .pipe(map((message: string) => ({ message })));
-        map((message: string) => ({ message })),
-      );
   }
 
   //GET parameter from API
@@ -364,12 +355,9 @@ export class AppService {
     const payload = { id: paramReservationId };
     return this.clientReservationApp
       .send<string>(pattern, payload)
-      .pipe(
+      .pipe(map((message: string) => ({ message })));
-        map((message: string) => ({ message })),
-      );
   }
 
-
   // ====================== POSTS ===============================
 
   //POST parameter from API
@@ -382,9 +370,7 @@ export class AppService {
     };
     return this.clientPostApp
       .send<string>(pattern, payload)
-      .pipe(
+      .pipe(map((message: string) => ({ message })));
-        map((message: string) => ({ message })),
-      );
   }
 
   allPosts() {
@@ -392,9 +378,7 @@ export class AppService {
     const payload = {};
     return this.clientPostApp
       .send<string>(pattern, payload)
-      .pipe(
+      .pipe(map((message: string) => ({ message })));
-        map((message: string) => ({ message })),
-      );
   }
 
   //GET parameter from API
@@ -403,9 +387,7 @@ export class AppService {
     const payload = { id: paramPostId };
     return this.clientPostApp
       .send<string>(pattern, payload)
-      .pipe(
+      .pipe(map((message: string) => ({ message })));
-        map((message: string) => ({ message })),
-      );
   }
 
   // ====================== COMMNENT POSTS ===============================
@@ -420,9 +402,7 @@ export class AppService {
     };
     return this.clientPostApp
       .send<string>(pattern, payload)
-      .pipe(
+      .pipe(map((message: string) => ({ message })));
-        map((message: string) => ({ message })),
-      );
   }
 
   allComments() {
@@ -430,9 +410,7 @@ export class AppService {
     const payload = {};
     return this.clientPostApp
       .send<string>(pattern, payload)
-      .pipe(
+      .pipe(map((message: string) => ({ message })));
-        map((message: string) => ({ message })),
-      );
   }
 
   //GET parameter from API
@@ -441,9 +419,7 @@ export class AppService {
     const payload = { id: paramCommentId };
     return this.clientPostApp
       .send<string>(pattern, payload)
-      .pipe(
+      .pipe(map((message: string) => ({ message })));
-        map((message: string) => ({ message })),
-      );
   }
 
   // ====================== REPORTS ===============================
@@ -458,9 +434,7 @@ export class AppService {
     };
     return this.clientReportApp
       .send<string>(pattern, payload)
-      .pipe(
+      .pipe(map((message: string) => ({ message })));
-        map((message: string) => ({ message })),
-      );
   }
 
   allReports() {
@@ -468,9 +442,7 @@ export class AppService {
     const payload = {};
     return this.clientReportApp
       .send<string>(pattern, payload)
-      .pipe(
+      .pipe(map((message: string) => ({ message })));
-        map((message: string) => ({ message })),
-      );
   }
 
   //GET parameter from API
@@ -479,20 +451,15 @@ export class AppService {
     const payload = { id: paramReportId };
     return this.clientReportApp
       .send<string>(pattern, payload)
-      .pipe(
+      .pipe(map((message: string) => ({ message })));
-        map((message: string) => ({ message })),
-      );
   }
 
-
   sendMail(email: string) {
     const pattern = { cmd: 'sendMail' };
     const payload = { email: email };
     return this.clientNotificationtApp
       .send<string>(pattern, payload)
-      .pipe(
+      .pipe(map((message: string) => ({ message })));
-        map((message: string) => ({ message })),
-      );
   }
 
   html(email: string, name: string) {
@@ -500,9 +467,7 @@ export class AppService {
     const payload = { email: email, name: name };
     return this.clientNotificationtApp
       .send<string>(pattern, payload)
-      .pipe(
+      .pipe(map((message: string) => ({ message })));
-        map((message: string) => ({ message })),
-      );
   }
 
 

package.json

@@ -0,0 +1,28 @@
+{
+  "devDependencies": {
+    "husky": "^8.0.1",
+    "js-beautify": "^1.14.4",
+    "lint-staged": "^13.0.3",
+    "prettier": "^2.7.1"
+  },
+  "scripts": {
+    "format": "npm run format:prettier && npm run format:html",
+    "format:prettier": "prettier --config .prettierrc \"**/src/**/*.{ts,css,less,scss,js}\" --write",
+    "format:html": "js-beautify --config .jsbeautifyrc --type 'html' --file '**/src/**/*.html' --replace"
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged"
+    }
+  },
+  "lint-staged": {
+    "*.{ts,css,less,scss,js}": [
+      "prettier --config .prettierrc --write",
+      "git add"
+    ],
+    "*.html": [
+      "js-beautify --config .jsbeautifyrc --type 'html' --replace",
+      "git add"
+    ]
+  }
+}

service-a/src/app.module.ts

@@ -6,7 +6,9 @@ import { BooksModule } from './books/books.module';
 
 @Module({
   imports: [
-    MongooseModule.forRoot(`mongodb+srv://proyecto_4:proyecto_4@proyecto4.yv4fb.mongodb.net/servicio_books?retryWrites=true&w=majority`),
+    MongooseModule.forRoot(
+      `mongodb+srv://proyecto_4:proyecto_4@proyecto4.yv4fb.mongodb.net/servicio_books?retryWrites=true&w=majority`,
+    ),
     BooksModule,
   ],
   controllers: [AppController],

service-a/src/books/books.module.ts

@@ -9,6 +9,6 @@ import { Book, BookSchema } from './schemas/book.schema';
     MongooseModule.forFeature([{ name: Book.name, schema: BookSchema }]),
   ],
   controllers: [BooksController],
-  providers: [BooksService]
+  providers: [BooksService],
 })
 export class BooksModule {}

service-a/src/books/dto/create-book.dto.ts

@@ -1,7 +1,5 @@
 import { ApiProperty } from '@nestjs/swagger';
 
-
-
 export class CreateBookDto {
   @ApiProperty({
     example: 'Nest.js: A Progressive Node.js Framework (English Edition)',

servicio-areas-comunes/src/app.module.ts

@@ -1,23 +1,25 @@
 import { Module } from '@nestjs/common';
 import { CommonAreasModule } from './common_areas/common_areas.module';
 import { MongooseModule } from '@nestjs/mongoose';
-import { ClientsModule, Transport } from "@nestjs/microservices";
+import { ClientsModule, Transport } from '@nestjs/microservices';
-
 
 @Module({
   imports: [
     ClientsModule.register([
       {
-        name: "SERVICIO_AREAS_COMUNES",
+        name: 'SERVICIO_AREAS_COMUNES',
         transport: Transport.TCP,
         options: {
-          host: "127.0.0.1",
+          host: '127.0.0.1',
-          port: 3003
+          port: 3003,
-        }
+        },
-      }
+      },
     ]),
-    MongooseModule.forRoot(`mongodb+srv://proyecto_4:proyecto_4@proyecto4.yv4fb.mongodb.net/servicio_areas_comunes?retryWrites=true&w=majority`),
+    MongooseModule.forRoot(
-    CommonAreasModule],
+      `mongodb+srv://proyecto_4:proyecto_4@proyecto4.yv4fb.mongodb.net/servicio_areas_comunes?retryWrites=true&w=majority`,
+    ),
+    CommonAreasModule,
+  ],
   controllers: [],
   providers: [],
 })

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

@@ -6,9 +6,11 @@ import { MongooseModule } from '@nestjs/mongoose';
 import { CommonArea, CommonAreaSchema } from '../schemas/common_area.schema';
 @Module({
   imports: [
-    MongooseModule.forFeature([{ name: CommonArea.name, schema: CommonAreaSchema }]), 
+    MongooseModule.forFeature([
+      { name: CommonArea.name, schema: CommonAreaSchema },
+    ]),
   ],
   controllers: [CommonAreasController],
-  providers: [CommonAreasService]
+  providers: [CommonAreasService],
 })
 export class CommonAreasModule {}

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

@@ -5,9 +5,9 @@ import { Model } from 'mongoose';
 
 @Injectable()
 export class CommonAreasService {
-  
   constructor(
-    @InjectModel(CommonArea.name) private readonly commonAreaModel: Model<CommonAreaDocument>,
+    @InjectModel(CommonArea.name)
+    private readonly commonAreaModel: Model<CommonAreaDocument>,
   ) {}
 
   async create(commonArea: CommonAreaDocument): Promise<CommonArea> {

servicio-areas-comunes/src/main.ts

@@ -1,7 +1,7 @@
-import { NestFactory } from "@nestjs/core";
+import { NestFactory } from '@nestjs/core';
-import { Transport } from "@nestjs/microservices";
+import { Transport } from '@nestjs/microservices';
-import { AppModule } from "./app.module";
+import { AppModule } from './app.module';
-import { Logger } from "@nestjs/common";
+import { Logger } from '@nestjs/common';
 
 const logger = new Logger();
 
@@ -9,10 +9,12 @@ async function bootstrap() {
   const app = await NestFactory.createMicroservice(AppModule, {
     transport: Transport.TCP,
     options: {
-      host: "127.0.0.1",
+      host: '127.0.0.1',
-      port: 3003
+      port: 3003,
-    }
+    },
   });
-  app.listen().then(() => logger.log("Microservice Áreas Comunes is listening" ));
+  app
+    .listen()
+    .then(() => logger.log('Microservice Áreas Comunes is listening'));
 }
 bootstrap();

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

@@ -1,15 +1,12 @@
-
 import { Schema, Prop, SchemaFactory } from '@nestjs/mongoose';
 import { Document } from 'mongoose';
 import { Timestamp } from 'rxjs';
 import { TimerOptions } from 'timers';
 
-
 export type CommonAreaDocument = CommonArea & Document;
 
 @Schema({ collection: 'common_areas' })
 export class CommonArea {
-
   @Prop()
   name: string;
 

servicio-comunidad-viviendas/src/app.module.ts

@@ -1,23 +1,25 @@
 import { Module } from '@nestjs/common';
 import { CommunitiesModule } from './communities/communities.module';
 import { MongooseModule } from '@nestjs/mongoose';
-import { ClientsModule, Transport } from "@nestjs/microservices";
+import { ClientsModule, Transport } from '@nestjs/microservices';
-
 
 @Module({
   imports: [
     ClientsModule.register([
       {
-        name: "SERVICIO_COMUNIDADES",
+        name: 'SERVICIO_COMUNIDADES',
         transport: Transport.TCP,
         options: {
-          host: "127.0.0.1",
+          host: '127.0.0.1',
-          port: 3002
+          port: 3002,
-        }
+        },
-      }
+      },
     ]),
-    MongooseModule.forRoot(`mongodb+srv://proyecto_4:proyecto_4@proyecto4.yv4fb.mongodb.net/servicio_comunidades?retryWrites=true&w=majority`),
+    MongooseModule.forRoot(
-    CommunitiesModule],
+      `mongodb+srv://proyecto_4:proyecto_4@proyecto4.yv4fb.mongodb.net/servicio_comunidades?retryWrites=true&w=majority`,
+    ),
+    CommunitiesModule,
+  ],
   controllers: [],
   providers: [],
 })

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

@@ -2,26 +2,27 @@ import { Module } from '@nestjs/common';
 import { CommunitiesService } from './communities.service';
 import { CommunitiesController } from './communities.controller';
 import { MongooseModule } from '@nestjs/mongoose';
-import { ClientsModule, Transport } from "@nestjs/microservices";
+import { ClientsModule, Transport } from '@nestjs/microservices';
 
 import { Community, CommunitySchema } from '../schemas/community.schema';
 
-
 @Module({
   imports: [
     ClientsModule.register([
       {
-        name: "SERVICIO_USUARIOS",
+        name: 'SERVICIO_USUARIOS',
         transport: Transport.TCP,
         options: {
-          host: "127.0.0.1",
+          host: '127.0.0.1',
-          port: 3001
+          port: 3001,
-        }
+        },
-      }
+      },
+    ]),
+    MongooseModule.forFeature([
+      { name: Community.name, schema: CommunitySchema },
     ]),
-    MongooseModule.forFeature([{ name: Community.name, schema: CommunitySchema }]), 
   ],
   controllers: [CommunitiesController],
-  providers: [CommunitiesService]
+  providers: [CommunitiesService],
 })
 export class CommunitiesModule {}

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

@@ -7,14 +7,12 @@ import { from, lastValueFrom, map, scan, mergeMap } from 'rxjs';
 import { Admin } from 'src/schemas/admin.entity';
 import { appendFileSync } from 'fs';
 
-
 @Injectable()
 export class CommunitiesService {
-
   constructor(
-    @InjectModel(Community.name) private readonly communityModel: Model<CommunityDocument>,
+    @InjectModel(Community.name)
+    private readonly communityModel: Model<CommunityDocument>,
     @Inject('SERVICIO_USUARIOS') private readonly clientUserApp: ClientProxy,
-
   ) {}
 
   async create(community: CommunityDocument): Promise<Community> {
@@ -22,25 +20,26 @@ export class CommunitiesService {
   }
 
   async findAll(): Promise<Community[]> {
-
     return await this.communityModel
       .find()
       .setOptions({ sanitizeFilter: true })
       .exec()
-      .then(async community => {
+      .then(async (community) => {
         if (community) {
-          await Promise.all(community.map(async c => {
+          await Promise.all(
+            community.map(async (c) => {
               //buscar al usuario con el id de la comunidad anexado
-            let admin = await this.findCommunityAdmin(c["_id"], "2")
+              let admin = await this.findCommunityAdmin(c['_id'], '2');
               if (admin) {
-              c["id_admin"] = admin["_id"]
+                c['id_admin'] = admin['_id'];
-              c["name_admin"] = admin["name"]
+                c['name_admin'] = admin['name'];
               }
-            return c
+              return c;
-          }))
+            }),
+          );
         }
         return community;
-      })
+      });
   }
 
   findOne(id: string): Promise<Community> {
@@ -61,17 +60,14 @@ export class CommunitiesService {
   }
 
   async findCommunityAdmin(community: string, user_type: string) {
-    const pattern = { cmd: 'findOneCommunityUser' }
+    const pattern = { cmd: 'findOneCommunityUser' };
-    const payload = { community_id: community, user_type: user_type }
+    const payload = { community_id: community, user_type: user_type };
 
     let callback = await this.clientUserApp
       .send<string>(pattern, payload)
-      .pipe(
+      .pipe(map((response: string) => ({ response })));
-        map((response: string) => ({ response }))
-      )
 
     const finalValue = await lastValueFrom(callback);
     return finalValue['response'];
-
   }
 }

servicio-comunidad-viviendas/src/main.ts

@@ -1,7 +1,7 @@
-import { NestFactory } from "@nestjs/core";
+import { NestFactory } from '@nestjs/core';
-import { Transport } from "@nestjs/microservices";
+import { Transport } from '@nestjs/microservices';
-import { AppModule } from "./app.module";
+import { AppModule } from './app.module';
-import { Logger } from "@nestjs/common";
+import { Logger } from '@nestjs/common';
 
 const logger = new Logger();
 
@@ -9,10 +9,14 @@ async function bootstrap() {
   const app = await NestFactory.createMicroservice(AppModule, {
     transport: Transport.TCP,
     options: {
-      host: "127.0.0.1",
+      host: '127.0.0.1',
-      port: 3002
+      port: 3002,
-    }
+    },
   });
-  app.listen().then(() => logger.log("Microservice Comunidades de vivienda is listening" ));
+  app
+    .listen()
+    .then(() =>
+      logger.log('Microservice Comunidades de vivienda is listening'),
+    );
 }
 bootstrap();

servicio-comunidad-viviendas/src/schemas/community.schema.ts

@@ -2,7 +2,6 @@ import { Schema, Prop, SchemaFactory } from '@nestjs/mongoose';
 import { Document } from 'mongoose';
 import { House, HouseSchema } from './house.schema';
 
-
 export type CommunityDocument = Community & Document;
 
 @Schema({ collection: 'communities' })
@@ -39,8 +38,6 @@ export class Community {
 
   @Prop({ type: [HouseSchema] })
   houses: Array<House>;
-
 }
 
-
 export const CommunitySchema = SchemaFactory.createForClass(Community);

servicio-comunidad-viviendas/src/schemas/house.schema.ts

@@ -4,14 +4,12 @@ import { Document } from 'mongoose';
 import { empty } from 'rxjs';
 import { Tenant, TenantSchema } from './tenant.schema';
 
-
-
 @Schema()
 export class House extends Document {
-    @Prop({ default: " " })
+  @Prop({ default: ' ' })
   number_house: string;
 
-    @Prop({ default: "desocupada" })
+  @Prop({ default: 'desocupada' })
   state: string;
 
   @Prop({ type: TenantSchema })

servicio-comunidad-viviendas/src/schemas/tenant.schema.ts

@@ -1,7 +1,5 @@
 import { Schema, Prop, SchemaFactory } from '@nestjs/mongoose';
 
-
-
 @Schema()
 export class Tenant {
   @Prop({ default: '' })

servicio-foro-comunicaciones/src/app.module.ts

@@ -1,23 +1,27 @@
 import { Module } from '@nestjs/common';
 import { MongooseModule } from '@nestjs/mongoose';
-import { ClientsModule, Transport } from "@nestjs/microservices";
+import { ClientsModule, Transport } from '@nestjs/microservices';
 import { PostsModule } from './posts/posts.module';
 import { PostCommentsModule } from './post-comments/post-comments.module';
 
 @Module({
-  imports: [ ClientsModule.register([
+  imports: [
+    ClientsModule.register([
       {
-      name: "SERVICIO_POSTS",
+        name: 'SERVICIO_POSTS',
         transport: Transport.TCP,
         options: {
-        host: "127.0.0.1",
+          host: '127.0.0.1',
-        port: 3007
+          port: 3007,
-      }
+        },
-    }
+      },
     ]),
-  MongooseModule.forRoot(`mongodb+srv://proyecto_4:proyecto_4@proyecto4.yv4fb.mongodb.net/servicio_posts?retryWrites=true&w=majority`),
+    MongooseModule.forRoot(
+      `mongodb+srv://proyecto_4:proyecto_4@proyecto4.yv4fb.mongodb.net/servicio_posts?retryWrites=true&w=majority`,
+    ),
     PostsModule,
-    PostCommentsModule],
+    PostCommentsModule,
+  ],
   controllers: [],
   providers: [],
 })

servicio-foro-comunicaciones/src/main.ts

@@ -1,7 +1,7 @@
-import { NestFactory } from "@nestjs/core";
+import { NestFactory } from '@nestjs/core';
-import { Transport } from "@nestjs/microservices";
+import { Transport } from '@nestjs/microservices';
-import { AppModule } from "./app.module";
+import { AppModule } from './app.module';
-import { Logger } from "@nestjs/common";
+import { Logger } from '@nestjs/common';
 
 const logger = new Logger();
 
@@ -9,10 +9,10 @@ async function bootstrap() {
   const app = await NestFactory.createMicroservice(AppModule, {
     transport: Transport.TCP,
     options: {
-      host: "127.0.0.1",
+      host: '127.0.0.1',
-      port: 3007
+      port: 3007,
-    }
+    },
   });
-  app.listen().then(() => logger.log("Microservice Comunicados is listening" ));
+  app.listen().then(() => logger.log('Microservice Comunicados is listening'));
 }
 bootstrap();

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

@@ -3,7 +3,6 @@ import { MessagePattern, Payload } from '@nestjs/microservices';
 import { PostCommentsService } from './post-comments.service';
 import { Comment, CommentDocument } from '../schemas/post-comment.schema';
 
-
 @Controller()
 export class PostCommentsController {
   constructor(private readonly postCommentsService: PostCommentsService) {}

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

@@ -9,6 +9,6 @@ import { Comment, CommentSchema } from '../schemas/post-comment.schema';
     MongooseModule.forFeature([{ name: Comment.name, schema: CommentSchema }]),
   ],
   controllers: [PostCommentsController],
-  providers: [PostCommentsService]
+  providers: [PostCommentsService],
 })
 export class PostCommentsModule {}

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

@@ -3,11 +3,11 @@ import { Comment, CommentDocument } from '../schemas/post-comment.schema';
 import { Model } from 'mongoose';
 import { InjectModel } from '@nestjs/mongoose';
 
-
 @Injectable()
 export class PostCommentsService {
   constructor(
-    @InjectModel(Comment.name) private readonly commentModel: Model<CommentDocument>,
+    @InjectModel(Comment.name)
+    private readonly commentModel: Model<CommentDocument>,
   ) {}
 
   async create(comment: CommentDocument): Promise<Comment> {
@@ -15,10 +15,7 @@ export class PostCommentsService {
   }
 
   async findAll(): Promise<Comment[]> {
-    return this.commentModel
+    return this.commentModel.find().setOptions({ sanitizeFilter: true }).exec();
-      .find() 
-      .setOptions({ sanitizeFilter: true }) 
-      .exec();
   }
 
   async findOne(id: string): Promise<Comment> {

servicio-foro-comunicaciones/src/posts/posts.controller.ts

@@ -3,7 +3,6 @@ import { MessagePattern, Payload } from '@nestjs/microservices';
 import { PostsService } from './posts.service';
 import { Post, PostDocument } from '../schemas/post.schema';
 
-
 @Controller()
 export class PostsController {
   constructor(private readonly postsService: PostsService) {}

servicio-foro-comunicaciones/src/posts/posts.module.ts

@@ -9,6 +9,6 @@ import { MongooseModule } from '@nestjs/mongoose';
     MongooseModule.forFeature([{ name: Post.name, schema: PostSchema }]),
   ],
   controllers: [PostsController],
-  providers: [PostsService]
+  providers: [PostsService],
 })
 export class PostsModule {}

servicio-foro-comunicaciones/src/posts/posts.service.ts

@@ -14,10 +14,7 @@ export class PostsService {
   }
 
   async findAll(): Promise<Post[]> {
-    return this.postModel
+    return this.postModel.find().setOptions({ sanitizeFilter: true }).exec();
-      .find() 
-      .setOptions({ sanitizeFilter: true }) 
-      .exec();
   }
 
   async findOne(id: string): Promise<Post> {

servicio-foro-comunicaciones/src/schemas/post-comment.schema.ts

@@ -1,12 +1,10 @@
 import { Schema, Prop, SchemaFactory } from '@nestjs/mongoose';
 import { Document, ObjectId } from 'mongoose';
 
-
 export type CommentDocument = Comment & Document;
 
 @Schema({ collection: 'comments' })
 export class Comment {
-    
   @Prop()
   comment: string;
 
@@ -14,12 +12,10 @@ export class Comment {
   date_entry: Date;
 
   @Prop()
-    user_id: string
+  user_id: string;
 
   @Prop()
   post_id: string;
-
 }
 
-
 export const CommentSchema = SchemaFactory.createForClass(Comment);

servicio-foro-comunicaciones/src/schemas/post.schema.ts

@@ -1,12 +1,10 @@
 import { Schema, Prop, SchemaFactory } from '@nestjs/mongoose';
 import { Document, ObjectId } from 'mongoose';
 
-
 export type PostDocument = Post & Document;
 
 @Schema({ collection: 'posts' })
 export class Post {
-    
   @Prop()
   post: string;
 
@@ -14,11 +12,10 @@ export class Post {
   date_entry: Date;
 
   @Prop()
-    user_id: string
+  user_id: string;
 
   @Prop()
-    community_id: string // id de la comunidad 
+  community_id: string; // id de la comunidad
 }
 
-
 export const PostSchema = SchemaFactory.createForClass(Post);

servicio-invitados/src/app.module.ts

@@ -1,23 +1,25 @@
 import { Module } from '@nestjs/common';
 import { GuestsModule } from './guests/guests.module';
 import { MongooseModule } from '@nestjs/mongoose';
-import { ClientsModule, Transport } from "@nestjs/microservices";
+import { ClientsModule, Transport } from '@nestjs/microservices';
-
 
 @Module({
   imports: [
     ClientsModule.register([
       {
-        name: "SERVICIO_INVITADOS",
+        name: 'SERVICIO_INVITADOS',
         transport: Transport.TCP,
         options: {
-          host: "127.0.0.1",
+          host: '127.0.0.1',
-          port: 3004
+          port: 3004,
-        }
+        },
-      }
+      },
     ]),
-    MongooseModule.forRoot(`mongodb+srv://proyecto_4:proyecto_4@proyecto4.yv4fb.mongodb.net/servicio_invitados?retryWrites=true&w=majority`),
+    MongooseModule.forRoot(
-    GuestsModule],
+      `mongodb+srv://proyecto_4:proyecto_4@proyecto4.yv4fb.mongodb.net/servicio_invitados?retryWrites=true&w=majority`,
+    ),
+    GuestsModule,
+  ],
   controllers: [],
   providers: [],
 })

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

@@ -8,6 +8,6 @@ import { Guest, GuestSchema } from 'src/schemas/guest.schema';
     MongooseModule.forFeature([{ name: Guest.name, schema: GuestSchema }]),
   ],
   controllers: [GuestsController],
-  providers: [GuestsService]
+  providers: [GuestsService],
 })
 export class GuestsModule {}

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

@@ -14,18 +14,13 @@ export class GuestsService {
   }
 
   async findAll(): Promise<Guest[]> {
-    return this.guestModel
+    return this.guestModel.find().setOptions({ sanitizeFilter: true }).exec();
-      .find() 
-      .setOptions({ sanitizeFilter: true }) 
-      .exec();
   }
 
-
   findOneId(id: string): Promise<Guest> {
     return this.guestModel.findOne({ _id: id }).exec();
   }
 
-
   findOne(id: string): Promise<Guest> {
     return this.guestModel.findOne({ dni: id }).exec();
   }

servicio-invitados/src/main.ts

@@ -1,7 +1,7 @@
-import { NestFactory } from "@nestjs/core";
+import { NestFactory } from '@nestjs/core';
-import { Transport } from "@nestjs/microservices";
+import { Transport } from '@nestjs/microservices';
-import { AppModule } from "./app.module";
+import { AppModule } from './app.module';
-import { Logger } from "@nestjs/common";
+import { Logger } from '@nestjs/common';
 
 const logger = new Logger();
 
@@ -9,10 +9,10 @@ async function bootstrap() {
   const app = await NestFactory.createMicroservice(AppModule, {
     transport: Transport.TCP,
     options: {
-      host: "127.0.0.1",
+      host: '127.0.0.1',
-      port: 3004
+      port: 3004,
-    }
+    },
   });
-  app.listen().then(() => logger.log("Microservice Invitados is listening" ));
+  app.listen().then(() => logger.log('Microservice Invitados is listening'));
 }
 bootstrap();

servicio-invitados/src/schemas/guest.schema.ts

@@ -1,12 +1,10 @@
 import { Schema, Prop, SchemaFactory } from '@nestjs/mongoose';
 import { Document } from 'mongoose';
 
-
 export type GuestDocument = Guest & Document;
 
 @Schema({ collection: 'guests' })
 export class Guest {
-
   @Prop()
   name: string;
 
@@ -36,5 +34,4 @@ export class Guest {
   // ver los invitados de x comunidad
 }
 
-
 export const GuestSchema = SchemaFactory.createForClass(Guest);

servicio-notificaciones/src/app.controller.ts

@@ -6,6 +6,6 @@ export class AppController {
 
   @Get()
   getHello(): string {
-    return "hola";
+    return 'hola';
   }
 }

servicio-notificaciones/src/app.module.ts

@@ -1,14 +1,13 @@
 import { Module } from '@nestjs/common';
 import { AppController } from './app.controller';
 import { MailerModule } from '@nestjs-modules/mailer';
-import { ClientsModule, Transport } from "@nestjs/microservices";
+import { ClientsModule, Transport } from '@nestjs/microservices';
 import { AuthModule } from './auth/auth.module';
 import { EmailController } from './email.controller';
 import { join } from 'path';
 import { HandlebarsAdapter } from '@nestjs-modules/mailer/dist/adapters/handlebars.adapter';
 import { ConfigModule, ConfigService } from '@nestjs/config';
 
-
 @Module({
   imports: [
     MailerModule.forRootAsync({
@@ -42,15 +41,16 @@ import { ConfigModule, ConfigService } from '@nestjs/config';
     }),
     ClientsModule.register([
       {
-        name: "SERVICIO_NOTIFICACIONES",
+        name: 'SERVICIO_NOTIFICACIONES',
         transport: Transport.TCP,
         options: {
-          host: "127.0.0.1",
+          host: '127.0.0.1',
-          port: 3009
+          port: 3009,
-        }
+        },
-      }
+      },
     ]),
-    AuthModule],
+    AuthModule,
+  ],
   controllers: [AppController, EmailController],
   providers: [],
 })

servicio-notificaciones/src/auth/auth.service.ts

@@ -3,7 +3,6 @@ import { User } from './../user/user.entity';
 
 @Injectable()
 export class AuthService {
-
   async signUp(user: User) {
     const token = Math.floor(1000 + Math.random() * 9000).toString();
     // create user in db

servicio-notificaciones/src/email.controller.ts

@@ -10,6 +10,14 @@ export class EmailController {
 
   @MessagePattern({ cmd: 'sendMail' })
   sendMail(@Payload() toEmail: string) {
+    var response = this.mailService.sendMail({
+      to: toEmail['email'],
+      from: 'mbonilla.guti@gmail.com',
+      subject: 'Plain Text Email ✔',
+      text: 'Welcome NestJS Email Sending Tutorial',
+    });
+    return response;
+  }
 
         var response = this.mailService.sendMail({
             to: toEmail["email"],

servicio-notificaciones/src/main.ts

@@ -1,7 +1,7 @@
-import { NestFactory } from "@nestjs/core";
+import { NestFactory } from '@nestjs/core';
-import { Transport } from "@nestjs/microservices";
+import { Transport } from '@nestjs/microservices';
-import { AppModule } from "./app.module";
+import { AppModule } from './app.module';
-import { Logger } from "@nestjs/common";
+import { Logger } from '@nestjs/common';
 
 const logger = new Logger();
 
@@ -9,10 +9,12 @@ async function bootstrap() {
   const app = await NestFactory.createMicroservice(AppModule, {
     transport: Transport.TCP,
     options: {
-      host: "127.0.0.1",
+      host: '127.0.0.1',
-      port: 3009
+      port: 3009,
-    }
+    },
   });
-  app.listen().then(() => logger.log("Microservice Notificaciones is listening" ));
+  app
+    .listen()
+    .then(() => logger.log('Microservice Notificaciones is listening'));
 }
 bootstrap();

servicio-notificaciones/src/notifications/notifications.controller.ts

@@ -25,7 +25,10 @@ export class NotificationsController {
 
   @MessagePattern({ cmd: 'updateNotification' })
   update(@Payload() updateNotificationDto: UpdateNotificationDto) {
-    return this.notificationsService.update(updateNotificationDto.id, updateNotificationDto);
+    return this.notificationsService.update(
+      updateNotificationDto.id,
+      updateNotificationDto,
+    );
   }
 
   @MessagePattern({ cmd: 'removeNotification' })

servicio-notificaciones/src/notifications/notifications.module.ts

@@ -4,6 +4,6 @@ import { NotificationsController } from './notifications.controller';
 
 @Module({
   controllers: [NotificationsController],
-  providers: [NotificationsService]
+  providers: [NotificationsService],
 })
 export class NotificationsModule {}

servicio-pagos/src/app.module.ts

@@ -1,23 +1,25 @@
 import { Module } from '@nestjs/common';
 import { PaymentsModule } from './payments/payments.module';
 import { MongooseModule } from '@nestjs/mongoose';
-import { ClientsModule, Transport } from "@nestjs/microservices";
+import { ClientsModule, Transport } from '@nestjs/microservices';
-
 
 @Module({
   imports: [
     ClientsModule.register([
       {
-        name: "SERVICIO_PAGOS",
+        name: 'SERVICIO_PAGOS',
         transport: Transport.TCP,
         options: {
-          host: "127.0.0.1",
+          host: '127.0.0.1',
-          port: 3005
+          port: 3005,
-        }
+        },
-      }
+      },
     ]),
-    MongooseModule.forRoot(`mongodb+srv://proyecto_4:proyecto_4@proyecto4.yv4fb.mongodb.net/servicio_pagos?retryWrites=true&w=majority`),
+    MongooseModule.forRoot(
-    PaymentsModule],
+      `mongodb+srv://proyecto_4:proyecto_4@proyecto4.yv4fb.mongodb.net/servicio_pagos?retryWrites=true&w=majority`,
+    ),
+    PaymentsModule,
+  ],
   controllers: [],
   providers: [],
 })

servicio-pagos/src/main.ts

@@ -1,7 +1,7 @@
-import { NestFactory } from "@nestjs/core";
+import { NestFactory } from '@nestjs/core';
-import { Transport } from "@nestjs/microservices";
+import { Transport } from '@nestjs/microservices';
-import { AppModule } from "./app.module";
+import { AppModule } from './app.module';
-import { Logger } from "@nestjs/common";
+import { Logger } from '@nestjs/common';
 
 const logger = new Logger();
 
@@ -9,10 +9,10 @@ async function bootstrap() {
   const app = await NestFactory.createMicroservice(AppModule, {
     transport: Transport.TCP,
     options: {
-      host: "127.0.0.1",
+      host: '127.0.0.1',
-      port: 3005
+      port: 3005,
-    }
+    },
   });
-  app.listen().then(() => logger.log("Microservice Invitados is listening" ));
+  app.listen().then(() => logger.log('Microservice Invitados is listening'));
 }
 bootstrap();

servicio-pagos/src/payments/payments.module.ts

@@ -4,12 +4,11 @@ import { PaymentsController } from './payments.controller';
 import { MongooseModule } from '@nestjs/mongoose';
 import { Payment, PaymentSchema } from 'src/schemas/payment.schema';
 
-
 @Module({
   imports: [
     MongooseModule.forFeature([{ name: Payment.name, schema: PaymentSchema }]),
   ],
   controllers: [PaymentsController],
-  providers: [PaymentsService]
+  providers: [PaymentsService],
 })
 export class PaymentsModule {}

servicio-pagos/src/payments/payments.service.ts

@@ -3,11 +3,11 @@ import { Payment, PaymentDocument } from 'src/schemas/payment.schema';
 import { Model } from 'mongoose';
 import { InjectModel } from '@nestjs/mongoose';
 
-
 @Injectable()
 export class PaymentsService {
   constructor(
-    @InjectModel(Payment.name) private readonly paymentModel: Model<PaymentDocument>,
+    @InjectModel(Payment.name)
+    private readonly paymentModel: Model<PaymentDocument>,
   ) {}
 
   async create(payment: PaymentDocument): Promise<Payment> {
@@ -15,18 +15,13 @@ export class PaymentsService {
   }
 
   async findAll(): Promise<Payment[]> {
-    return this.paymentModel
+    return this.paymentModel.find().setOptions({ sanitizeFilter: true }).exec();
-      .find() 
-      .setOptions({ sanitizeFilter: true }) 
-      .exec();
   }
 
-
   findOneId(id: string): Promise<Payment> {
     return this.paymentModel.findOne({ _id: id }).exec();
   }
 
-
   findByUser(id: string): Promise<Payment> {
     return this.paymentModel.findOne({ user_id: id }).exec();
   }

servicio-pagos/src/schemas/payment.schema.ts

@@ -1,13 +1,10 @@
-
 import { Schema, Prop, SchemaFactory } from '@nestjs/mongoose';
 import { Document } from 'mongoose';
 
-
 export type PaymentDocument = Payment & Document;
 
 @Schema({ collection: 'payments' })
 export class Payment {
-
   @Prop()
   date_payment: Date;
 

servicio-reportes/src/app.module.ts

@@ -1,24 +1,25 @@
 import { Module } from '@nestjs/common';
 import { ReportsModule } from './reports/reports.module';
 import { MongooseModule } from '@nestjs/mongoose';
-import { ClientsModule, Transport } from "@nestjs/microservices";
+import { ClientsModule, Transport } from '@nestjs/microservices';
-
-
 
 @Module({
   imports: [
     ClientsModule.register([
       {
-        name: "SERVICIO_REPORTES",
+        name: 'SERVICIO_REPORTES',
         transport: Transport.TCP,
         options: {
-          host: "127.0.0.1",
+          host: '127.0.0.1',
-          port: 3008
+          port: 3008,
-        }
+        },
-      }
+      },
     ]),
-    MongooseModule.forRoot(`mongodb+srv://proyecto_4:proyecto_4@proyecto4.yv4fb.mongodb.net/servicio_reportes?retryWrites=true&w=majority`),
+    MongooseModule.forRoot(
-    ReportsModule],
+      `mongodb+srv://proyecto_4:proyecto_4@proyecto4.yv4fb.mongodb.net/servicio_reportes?retryWrites=true&w=majority`,
+    ),
+    ReportsModule,
+  ],
   controllers: [],
   providers: [],
 })

servicio-reportes/src/main.ts

@@ -1,7 +1,7 @@
-import { NestFactory } from "@nestjs/core";
+import { NestFactory } from '@nestjs/core';
-import { Transport } from "@nestjs/microservices";
+import { Transport } from '@nestjs/microservices';
-import { AppModule } from "./app.module";
+import { AppModule } from './app.module';
-import { Logger } from "@nestjs/common";
+import { Logger } from '@nestjs/common';
 
 const logger = new Logger();
 
@@ -9,10 +9,10 @@ async function bootstrap() {
   const app = await NestFactory.createMicroservice(AppModule, {
     transport: Transport.TCP,
     options: {
-      host: "127.0.0.1",
+      host: '127.0.0.1',
-      port: 3008
+      port: 3008,
-    }
+    },
   });
-  app.listen().then(() => logger.log("Microservice Reportes is listening" ));
+  app.listen().then(() => logger.log('Microservice Reportes is listening'));
 }
 bootstrap();

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

@@ -7,7 +7,6 @@ import { Report, ReportDocument } from '../schemas/report.schema';
 export class ReportsController {
   constructor(private readonly reportsService: ReportsService) {}
 
- 
   @MessagePattern({ cmd: 'createReport' })
   create(@Payload() report: ReportDocument) {
     return this.reportsService.create(report);

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

@@ -9,6 +9,6 @@ import { Report, ReportSchema } from '../schemas/report.schema';
     MongooseModule.forFeature([{ name: Report.name, schema: ReportSchema }]),
   ],
   controllers: [ReportsController],
-  providers: [ReportsService]
+  providers: [ReportsService],
 })
 export class ReportsModule {}

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

@@ -1,34 +1,30 @@
 import { Injectable, Inject } from '@nestjs/common';
-import { ClientProxy } from "@nestjs/microservices";
+import { ClientProxy } from '@nestjs/microservices';
 import { Model } from 'mongoose';
 import { InjectModel } from '@nestjs/mongoose';
 import { Report, ReportDocument } from '../schemas/report.schema';
-import { map } from "rxjs/operators";
+import { map } from 'rxjs/operators';
 
 @Injectable()
 export class ReportsService {
   constructor(
-    @InjectModel(Report.name) private readonly reportModel: Model<ReportDocument>,
+    @InjectModel(Report.name)
-
+    private readonly reportModel: Model<ReportDocument>,
-    //
+  ) //
-  ) { }
+  {}
 
   async create(report: ReportDocument): Promise<Report> {
     return this.reportModel.create(report);
   }
 
   async findAll(): Promise<Report[]> {
-    return this.reportModel
+    return this.reportModel.find().setOptions({ sanitizeFilter: true }).exec();
-      .find()
-      .setOptions({ sanitizeFilter: true })
-      .exec();
   }
 
   async findOne(id: string): Promise<Report> {
     return this.reportModel.findOne({ _id: id }).exec();
   }
 
-
   async update(id: string, report: ReportDocument) {
     return this.reportModel.findOneAndUpdate({ _id: id }, report, {
       new: true,

servicio-reportes/src/schemas/report.schema.ts

@@ -1,12 +1,10 @@
 import { Schema, Prop, SchemaFactory } from '@nestjs/mongoose';
 import { Document, ObjectId } from 'mongoose';
 
-
 export type ReportDocument = Report & Document;
 
 @Schema({ collection: 'reports' })
 export class Report {
-    
   @Prop()
   action: string;
 
@@ -17,8 +15,7 @@ export class Report {
   date_entry: Date;
 
   @Prop()
-    user_id: string
+  user_id: string;
 }
 
-
 export const ReportSchema = SchemaFactory.createForClass(Report);

servicio-reservaciones/src/app.module.ts

@@ -1,22 +1,25 @@
 import { Module } from '@nestjs/common';
 import { ReservationsModule } from './reservations/reservations.module';
-import { ClientsModule, Transport } from "@nestjs/microservices";
+import { ClientsModule, Transport } from '@nestjs/microservices';
 import { MongooseModule } from '@nestjs/mongoose';
 
 @Module({
   imports: [
     ClientsModule.register([
       {
-        name: "SERVICIO_RESERVACIONES",
+        name: 'SERVICIO_RESERVACIONES',
         transport: Transport.TCP,
         options: {
-          host: "127.0.0.1",
+          host: '127.0.0.1',
-          port: 3006
+          port: 3006,
-        }
+        },
-      }
+      },
     ]),
-    MongooseModule.forRoot(`mongodb+srv://proyecto_4:proyecto_4@proyecto4.yv4fb.mongodb.net/servicio_reservaciones?retryWrites=true&w=majority`),
+    MongooseModule.forRoot(
-    ReservationsModule],
+      `mongodb+srv://proyecto_4:proyecto_4@proyecto4.yv4fb.mongodb.net/servicio_reservaciones?retryWrites=true&w=majority`,
+    ),
+    ReservationsModule,
+  ],
   controllers: [],
   providers: [],
 })

servicio-reservaciones/src/main.ts

@@ -1,7 +1,7 @@
-import { NestFactory } from "@nestjs/core";
+import { NestFactory } from '@nestjs/core';
-import { Transport } from "@nestjs/microservices";
+import { Transport } from '@nestjs/microservices';
-import { AppModule } from "./app.module";
+import { AppModule } from './app.module';
-import { Logger } from "@nestjs/common";
+import { Logger } from '@nestjs/common';
 
 const logger = new Logger();
 
@@ -9,10 +9,12 @@ async function bootstrap() {
   const app = await NestFactory.createMicroservice(AppModule, {
     transport: Transport.TCP,
     options: {
-      host: "127.0.0.1",
+      host: '127.0.0.1',
-      port: 3006
+      port: 3006,
-    }
+    },
   });
-  app.listen().then(() => logger.log("Microservice Reservaciones is listening" ));
+  app
+    .listen()
+    .then(() => logger.log('Microservice Reservaciones is listening'));
 }
 bootstrap();

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

@@ -1,7 +1,10 @@
 import { Controller } from '@nestjs/common';
 import { MessagePattern, Payload } from '@nestjs/microservices';
 import { ReservationsService } from './reservations.service';
-import { Reservation, ReservationDocument } from '../schemas/reservation.schema';
+import {
+  Reservation,
+  ReservationDocument,
+} from '../schemas/reservation.schema';
 
 @Controller()
 export class ReservationsController {

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

@@ -7,9 +7,11 @@ import { Reservation, ReservationSchema} from '../schemas/reservation.schema';
 
 @Module({
   imports: [
-    MongooseModule.forFeature([{ name: Reservation.name, schema: ReservationSchema }]), 
+    MongooseModule.forFeature([
+      { name: Reservation.name, schema: ReservationSchema },
+    ]),
   ],
   controllers: [ReservationsController],
-  providers: [ReservationsService]
+  providers: [ReservationsService],
 })
 export class ReservationsModule {}

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

@@ -1,12 +1,16 @@
 import { Injectable } from '@nestjs/common';
-import { Reservation, ReservationDocument} from '../schemas/reservation.schema';
+import {
+  Reservation,
+  ReservationDocument,
+} from '../schemas/reservation.schema';
 import { Model } from 'mongoose';
 import { InjectModel } from '@nestjs/mongoose';
 
 @Injectable()
 export class ReservationsService {
   constructor(
-    @InjectModel(Reservation.name) private readonly reservationModel: Model<ReservationDocument>,
+    @InjectModel(Reservation.name)
+    private readonly reservationModel: Model<ReservationDocument>,
   ) {}
 
   create(reservation: ReservationDocument) {

servicio-reservaciones/src/schemas/reservation.schema.ts

@@ -1,12 +1,10 @@
 import { Schema, Prop, SchemaFactory } from '@nestjs/mongoose';
 import { Document, ObjectId } from 'mongoose';
 
-
 export type ReservationDocument = Reservation & Document;
 
 @Schema({ collection: 'reservations' })
 export class Reservation {
-    
   @Prop()
   start_time: string;
 
@@ -23,8 +21,7 @@ export class Reservation {
   common_area_id: string;
 
   @Prop()
-    user_id: string
+  user_id: string;
 }
 
-
 export const ReservationSchema = SchemaFactory.createForClass(Reservation);

servicio-usuarios/src/app.module.ts

@@ -1,22 +1,25 @@
 import { Module } from '@nestjs/common';
 import { MongooseModule } from '@nestjs/mongoose';
-import { ClientsModule, Transport } from "@nestjs/microservices";
+import { ClientsModule, Transport } from '@nestjs/microservices';
 import { UsersModule } from './users/users.module';
 
 @Module({
   imports: [
     ClientsModule.register([
       {
-        name: "SERVICIO_USUARIOS",
+        name: 'SERVICIO_USUARIOS',
         transport: Transport.TCP,
         options: {
-          host: "127.0.0.1",
+          host: '127.0.0.1',
-          port: 3001
+          port: 3001,
-        }
+        },
-      }
+      },
     ]),
-    MongooseModule.forRoot(`mongodb+srv://proyecto_4:proyecto_4@proyecto4.yv4fb.mongodb.net/servicio_usuarios?retryWrites=true&w=majority`),
+    MongooseModule.forRoot(
-    UsersModule],
+      `mongodb+srv://proyecto_4:proyecto_4@proyecto4.yv4fb.mongodb.net/servicio_usuarios?retryWrites=true&w=majority`,
+    ),
+    UsersModule,
+  ],
   controllers: [],
   providers: [],
 })

servicio-usuarios/src/main.ts

@@ -1,7 +1,7 @@
-import { NestFactory } from "@nestjs/core";
+import { NestFactory } from '@nestjs/core';
-import { Transport } from "@nestjs/microservices";
+import { Transport } from '@nestjs/microservices';
-import { AppModule } from "./app.module";
+import { AppModule } from './app.module';
-import { Logger } from "@nestjs/common";
+import { Logger } from '@nestjs/common';
 
 const logger = new Logger();
 
@@ -9,10 +9,10 @@ async function bootstrap() {
   const app = await NestFactory.createMicroservice(AppModule, {
     transport: Transport.TCP,
     options: {
-      host: "127.0.0.1",
+      host: '127.0.0.1',
-      port: 3001
+      port: 3001,
-    }
+    },
   });
-  app.listen().then(() => logger.log("Microservice Usuarios is listening" ));
+  app.listen().then(() => logger.log('Microservice Usuarios is listening'));
 }
 bootstrap();

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

@@ -1,14 +1,10 @@
-
 import { Schema, Prop, SchemaFactory } from '@nestjs/mongoose';
 import { Document } from 'mongoose';
 
-
 export type UserDocument = User & Document;
 
-
 @Schema({ collection: 'users' })
 export class User {
-
   @Prop()
   dni: string;
 
@@ -36,11 +32,8 @@ export class User {
   @Prop()
   date_entry: Date;
 
-
   @Prop()
   community_id?: string;
 }
 
-
-
 export const UserSchema = SchemaFactory.createForClass(User);

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

@@ -44,7 +44,6 @@ export class UsersController {
     return this.userService.findGuardsCommunity(pcommunity_id);
   }
 
-
   @MessagePattern({ cmd: 'updateUser' })
   update(@Payload() user: UserDocument) {
     return this.userService.update(user.id, user);
@@ -85,17 +84,19 @@ export class UsersController {
   //buscar usuario de una comunidad
   @MessagePattern({ cmd: 'findOneCommunityUser' })
   findCommunityUser(@Payload() user: any) {
-    return this.userService.findCommunityUser(user["community_id"], user["user_type"]);
+    return this.userService.findCommunityUser(
+      user['community_id'],
+      user['user_type'],
+    );
   }
 
   @MessagePattern({ cmd: 'deleteAdminSystem' })
   deleteAdminSystem(@Payload() user: any) {
-    console.log("entró")
+    console.log('entró');
 
-    return this.userService.deleteAdminSystem(user["id"]);
+    return this.userService.deleteAdminSystem(user['id']);
   }
 
   
 
 }
-

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

@@ -4,19 +4,19 @@ import { MongooseModule } from '@nestjs/mongoose';
 
 import { UsersController } from './users.controller';
 import { User, UserSchema } from '../schemas/user.schema';
-import { ClientsModule, Transport } from "@nestjs/microservices";
+import { ClientsModule, Transport } from '@nestjs/microservices';
 
 @Module({
   imports: [
     ClientsModule.register([
       {
-        name: "SERVICIO_NOTIFICACIONES",
+        name: 'SERVICIO_NOTIFICACIONES',
         transport: Transport.TCP,
         options: {
-          host: "127.0.0.1",
+          host: '127.0.0.1',
-          port: 3009
+          port: 3009,
-        }
+        },
-      }
+      },
     ]),
     ClientsModule.register([
       {
@@ -31,6 +31,6 @@ import { ClientsModule, Transport } from "@nestjs/microservices";
     MongooseModule.forFeature([{ name: User.name, schema: UserSchema }]), 
   ],
   controllers: [UsersController],
-  providers: [UsersService]
+  providers: [UsersService],
 })
 export class UsersModule {}

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

@@ -2,14 +2,12 @@ import { Injectable, Inject } from '@nestjs/common';
 import { Model } from 'mongoose';
 import { User, UserDocument } from '../schemas/user.schema';
 import { InjectModel } from '@nestjs/mongoose';
-import { Md5 } from "md5-typescript";
+import { Md5 } from 'md5-typescript';
 import { map } from 'rxjs/operators';
 import { lastValueFrom } from 'rxjs';
 
 import { RpcException, ClientProxy } from '@nestjs/microservices';
 
-
-
 @Injectable()
 export class UsersService {
   constructor(
@@ -58,10 +56,7 @@ export class UsersService {
   }
 
   async findAll(): Promise<User[]> {
-    return this.userModel
+    return this.userModel.find().setOptions({ sanitizeFilter: true }).exec();
-      .find()
-      .setOptions({ sanitizeFilter: true })
-      .exec();
   }
   async findOne(id: string): Promise<User> {
     return this.userModel.findOne({ _id: id }).exec();
@@ -90,13 +85,11 @@ export class UsersService {
       repo.find({ email: email }).exec((err, res) => {
         if (err) {
           reject(err);
-        }
+        } else {
-        else {
           let passwordEncriptada = Md5.init(password);
           if (res[0].password == passwordEncriptada) {
             resolve(res[0]);
-          }
+          } else {
-          else {
             resolve(null);
           }
         }
@@ -111,7 +104,6 @@ export class UsersService {
     return this.userModel.find({ user_type: 1 }).exec();
   }
 
-
   //find admin del sistema
   async findGuardsCommunity(pcommunity_id: string): Promise<User[]> {
     return this.userModel.find({ user_type: 4 }).exec();
@@ -121,11 +113,10 @@ export class UsersService {
     return this.userModel.find({ user_type: 2 }).exec();
   }
 
-
   async testSendMail(user: UserDocument) {
     let passwordEncriptada = Md5.init(user.password);
     user.password = passwordEncriptada;
-    this.userModel.create(user)
+    this.userModel.create(user);
     /*.then(() => {
       
     } );*/
@@ -134,13 +125,16 @@ export class UsersService {
     const payload = { email: user['email'], name: user['name'] };
     return this.clientNotificationtApp
       .send<string>(pattern, payload)
-      .pipe(
+      .pipe(map((message: string) => ({ message })));
-        map((message: string) => ({ message })),
-      );
   }
 
-  async findCommunityUser(community_id: string, user_type: number): Promise<User> {
+  async findCommunityUser(
-    return this.userModel.findOne({ community_id: community_id, user_type: user_type }).exec();
+    community_id: string,
+    user_type: number,
+  ): Promise<User> {
+    return this.userModel
+      .findOne({ community_id: community_id, user_type: user_type })
+      .exec();
   }
 
   async deleteAdminSystem(id: string) {

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

@@ -54,7 +54,7 @@ import {PrimeIcons} from 'primereact/api';
 
 const App = () => {
   const [layoutMode, setLayoutMode] = useState('static');
-    const [layoutColorMode, setLayoutColorMode] = useState('light')
+  const [layoutColorMode, setLayoutColorMode] = useState('light');
   const [inputStyle, setInputStyle] = useState('outlined');
   const [ripple, setRipple] = useState(true);
   const [staticMenuInactive, setStaticMenuInactive] = useState(false);
@@ -71,32 +71,34 @@ const App = () => {
 
   useEffect(() => {
     if (mobileMenuActive) {
-            addClass(document.body, "body-overflow-hidden");
+      addClass(document.body, 'body-overflow-hidden');
     } else {
-            removeClass(document.body, "body-overflow-hidden");
+      removeClass(document.body, 'body-overflow-hidden');
     }
   }, [mobileMenuActive]);
 
   useEffect(() => {
-        copyTooltipRef && copyTooltipRef.current && copyTooltipRef.current.updateTargetEvents();
+    copyTooltipRef &&
+      copyTooltipRef.current &&
+      copyTooltipRef.current.updateTargetEvents();
   }, [location]);
 
   const onInputStyleChange = (inputStyle) => {
     setInputStyle(inputStyle);
-    }
+  };
 
   const onRipple = (e) => {
     PrimeReact.ripple = e.value;
-        setRipple(e.value)
+    setRipple(e.value);
-    }
+  };
 
   const onLayoutModeChange = (mode) => {
-        setLayoutMode(mode)
+    setLayoutMode(mode);
-    }
+  };
 
   const onColorModeChange = (mode) => {
-        setLayoutColorMode(mode)
+    setLayoutColorMode(mode);
-    }
+  };
 
   const onWrapperClick = (event) => {
     if (!menuClick) {
@@ -110,7 +112,7 @@ const App = () => {
 
     mobileTopbarMenuClick = false;
     menuClick = false;
-    }
+  };
 
   const onToggleMenuClick = (event) => {
     menuClick = true;
@@ -123,186 +125,254 @@ const App = () => {
 
         setOverlayMenuActive((prevState) => !prevState);
         setMobileMenuActive(false);
-            }
+      } else if (layoutMode === 'static') {
-            else if (layoutMode === 'static') {
         setStaticMenuInactive((prevState) => !prevState);
       }
-        }
+    } else {
-        else {
       setMobileMenuActive((prevState) => !prevState);
     }
 
     event.preventDefault();
-    }
+  };
 
   const onSidebarClick = () => {
     menuClick = true;
-    }
+  };
 
   const onMobileTopbarMenuClick = (event) => {
     mobileTopbarMenuClick = true;
 
     setMobileTopbarMenuActive((prevState) => !prevState);
     event.preventDefault();
-    }
+  };
 
   const onMobileSubTopbarMenuClick = (event) => {
     mobileTopbarMenuClick = true;
 
     event.preventDefault();
-    }
+  };
 
   const onMenuItemClick = (event) => {
     if (!event.item.items) {
       setOverlayMenuActive(false);
       setMobileMenuActive(false);
     }
-    }
+  };
   const isDesktop = () => {
     return window.innerWidth >= 992;
-    }
+  };
 
   const menu = [
     {
       label: 'Home',
       items: [
         { label: 'Dashboard', icon: 'pi pi-fw pi-home', to: '/' },
-                {label: 'Administradores del sistema', icon: PrimeIcons.USERS, to: '/administradoresSistema'}, 
+        {
-                {label: 'Administradores de comunidad', icon: PrimeIcons.USERS, to: '/administradoresComunidad'}, 
+          label: 'Administradores del sistema',
-                {label: 'Guardas de seguridad', icon: PrimeIcons.LOCK, to: '/guardasSeguridad'}, 
+          icon: PrimeIcons.USERS,
-                {label: 'Comunidadades', icon: PrimeIcons.BUILDING, to: '/comunidadesViviendas'}, 
+          to: '/administradoresSistema',
-                {label: 'Inquilinos', icon: PrimeIcons.USER, to: '/inquilinos'},
-                {label: 'Log in', icon: 'pi pi-fw pi-id-card', to: '/logIn'}
-            ]
         },
         {
-            label: 'UI Components', icon: 'pi pi-fw pi-sitemap',
+          label: 'Administradores de comunidad',
+          icon: PrimeIcons.USERS,
+          to: '/administradoresComunidad',
+        },
+        {
+          label: 'Guardas de seguridad',
+          icon: PrimeIcons.LOCK,
+          to: '/guardasSeguridad',
+        },
+        {
+          label: 'Comunidadades',
+          icon: PrimeIcons.BUILDING,
+          to: '/comunidadesViviendas',
+        },
+        { label: 'Inquilinos', icon: PrimeIcons.USER, to: '/inquilinos' },
+        { label: 'Log in', icon: 'pi pi-fw pi-id-card', to: '/logIn' },
+      ],
+    },
+    {
+      label: 'UI Components',
+      icon: 'pi pi-fw pi-sitemap',
       items: [
-                { label: 'Form Layout', icon: 'pi pi-fw pi-id-card', to: '/formlayout' },
+        {
+          label: 'Form Layout',
+          icon: 'pi pi-fw pi-id-card',
+          to: '/formlayout',
+        },
         { label: 'Input', icon: 'pi pi-fw pi-check-square', to: '/input' },
-                { label: "Float Label", icon: "pi pi-fw pi-bookmark", to: "/floatlabel" },
+        {
-                { label: "Invalid State", icon: "pi pi-fw pi-exclamation-circle", to: "invalidstate" },
+          label: 'Float Label',
+          icon: 'pi pi-fw pi-bookmark',
+          to: '/floatlabel',
+        },
+        {
+          label: 'Invalid State',
+          icon: 'pi pi-fw pi-exclamation-circle',
+          to: 'invalidstate',
+        },
         { label: 'Button', icon: 'pi pi-fw pi-mobile', to: '/button' },
         { label: 'Table', icon: 'pi pi-fw pi-table', to: '/table' },
         { label: 'List', icon: 'pi pi-fw pi-list', to: '/list' },
         { label: 'Tree', icon: 'pi pi-fw pi-share-alt', to: '/tree' },
         { label: 'Panel', icon: 'pi pi-fw pi-tablet', to: '/panel' },
         { label: 'Overlay', icon: 'pi pi-fw pi-clone', to: '/overlay' },
-                { label: "Media", icon: "pi pi-fw pi-image", to: "/media" },
+        { label: 'Media', icon: 'pi pi-fw pi-image', to: '/media' },
         { label: 'Menu', icon: 'pi pi-fw pi-bars', to: '/menu' },
         { label: 'Message', icon: 'pi pi-fw pi-comment', to: '/messages' },
         { label: 'File', icon: 'pi pi-fw pi-file', to: '/file' },
         { label: 'Chart', icon: 'pi pi-fw pi-chart-bar', to: '/chart' },
         { label: 'Misc', icon: 'pi pi-fw pi-circle-off', to: '/misc' },
-            ]
+      ],
     },
     {
       label: 'UI Blocks',
       items: [
-                { label: 'Free Blocks', icon: 'pi pi-fw pi-eye', to: '/blocks', badge: "NEW" },
+        {
-                { label: 'All Blocks', icon: 'pi pi-fw pi-globe', url: 'https://www.primefaces.org/primeblocks-react' }
+          label: 'Free Blocks',
-            ]
+          icon: 'pi pi-fw pi-eye',
+          to: '/blocks',
+          badge: 'NEW',
+        },
+        {
+          label: 'All Blocks',
+          icon: 'pi pi-fw pi-globe',
+          url: 'https://www.primefaces.org/primeblocks-react',
+        },
+      ],
     },
     {
       label: 'Icons',
-            items: [
+      items: [{ label: 'PrimeIcons', icon: 'pi pi-fw pi-prime', to: '/icons' }],
-                { label: 'PrimeIcons', icon: 'pi pi-fw pi-prime', to: '/icons' }
-            ]
     },
     {
-            label: 'Pages', icon: 'pi pi-fw pi-clone',
+      label: 'Pages',
+      icon: 'pi pi-fw pi-clone',
       items: [
         { label: 'Crud', icon: 'pi pi-fw pi-user-edit', to: '/crud' },
         { label: 'Timeline', icon: 'pi pi-fw pi-calendar', to: '/timeline' },
-                { label: 'Empty', icon: 'pi pi-fw pi-circle-off', to: '/empty' }
+        { label: 'Empty', icon: 'pi pi-fw pi-circle-off', to: '/empty' },
-            ]
+      ],
     },
     {
-            label: 'Menu Hierarchy', icon: 'pi pi-fw pi-search',
+      label: 'Menu Hierarchy',
+      icon: 'pi pi-fw pi-search',
       items: [
         {
-                    label: 'Submenu 1', icon: 'pi pi-fw pi-bookmark',
+          label: 'Submenu 1',
+          icon: 'pi pi-fw pi-bookmark',
           items: [
             {
-                            label: 'Submenu 1.1', icon: 'pi pi-fw pi-bookmark',
+              label: 'Submenu 1.1',
+              icon: 'pi pi-fw pi-bookmark',
               items: [
                 { label: 'Submenu 1.1.1', icon: 'pi pi-fw pi-bookmark' },
                 { label: 'Submenu 1.1.2', icon: 'pi pi-fw pi-bookmark' },
                 { label: 'Submenu 1.1.3', icon: 'pi pi-fw pi-bookmark' },
-                            ]
+              ],
             },
             {
-                            label: 'Submenu 1.2', icon: 'pi pi-fw pi-bookmark',
+              label: 'Submenu 1.2',
+              icon: 'pi pi-fw pi-bookmark',
               items: [
                 { label: 'Submenu 1.2.1', icon: 'pi pi-fw pi-bookmark' },
-                                { label: 'Submenu 1.2.2', icon: 'pi pi-fw pi-bookmark' }
+                { label: 'Submenu 1.2.2', icon: 'pi pi-fw pi-bookmark' },
-                            ]
+              ],
             },
-                    ]
+          ],
         },
         {
-                    label: 'Submenu 2', icon: 'pi pi-fw pi-bookmark',
+          label: 'Submenu 2',
+          icon: 'pi pi-fw pi-bookmark',
           items: [
             {
-                            label: 'Submenu 2.1', icon: 'pi pi-fw pi-bookmark',
+              label: 'Submenu 2.1',
+              icon: 'pi pi-fw pi-bookmark',
               items: [
                 { label: 'Submenu 2.1.1', icon: 'pi pi-fw pi-bookmark' },
                 { label: 'Submenu 2.1.2', icon: 'pi pi-fw pi-bookmark' },
                 { label: 'Submenu 2.1.3', icon: 'pi pi-fw pi-bookmark' },
-                            ]
+              ],
             },
             {
-                            label: 'Submenu 2.2', icon: 'pi pi-fw pi-bookmark',
+              label: 'Submenu 2.2',
+              icon: 'pi pi-fw pi-bookmark',
               items: [
                 { label: 'Submenu 2.2.1', icon: 'pi pi-fw pi-bookmark' },
-                                { label: 'Submenu 2.2.2', icon: 'pi pi-fw pi-bookmark' }
+                { label: 'Submenu 2.2.2', icon: 'pi pi-fw pi-bookmark' },
-                            ]
+              ],
-                        }
+            },
-                    ]
+          ],
-                }
+        },
-            ]
+      ],
-        }
+    },
   ];
 
   const addClass = (element, className) => {
-        if (element.classList)
+    if (element.classList) element.classList.add(className);
-            element.classList.add(className);
+    else element.className += ' ' + className;
-        else
+  };
-            element.className += ' ' + className;
-    }
 
   const removeClass = (element, className) => {
-        if (element.classList)
+    if (element.classList) element.classList.remove(className);
-            element.classList.remove(className);
     else
-            element.className = element.className.replace(new RegExp('(^|\\b)' + className.split(' ').join('|') + '(\\b|$)', 'gi'), ' ');
+      element.className = element.className.replace(
-    }
+        new RegExp(
+          '(^|\\b)' + className.split(' ').join('|') + '(\\b|$)',
+          'gi',
+        ),
+        ' ',
+      );
+  };
 
   const wrapperClass = classNames('layout-wrapper', {
     'layout-overlay': layoutMode === 'overlay',
     'layout-static': layoutMode === 'static',
-        'layout-static-sidebar-inactive': staticMenuInactive && layoutMode === 'static',
+    'layout-static-sidebar-inactive':
-        'layout-overlay-sidebar-active': overlayMenuActive && layoutMode === 'overlay',
+      staticMenuInactive && layoutMode === 'static',
+    'layout-overlay-sidebar-active':
+      overlayMenuActive && layoutMode === 'overlay',
     'layout-mobile-sidebar-active': mobileMenuActive,
     'p-input-filled': inputStyle === 'filled',
     'p-ripple-disabled': ripple === false,
-        'layout-theme-light': layoutColorMode === 'light'
+    'layout-theme-light': layoutColorMode === 'light',
   });
 
   return (
     <div className={wrapperClass} onClick={onWrapperClick}>
-            <Tooltip ref={copyTooltipRef} target=".block-action-copy" position="bottom" content="Copied to clipboard" event="focus" />
+      <Tooltip
+        ref={copyTooltipRef}
+        target=".block-action-copy"
+        position="bottom"
+        content="Copied to clipboard"
+        event="focus"
+      />
 
-            <AppTopbar onToggleMenuClick={onToggleMenuClick} layoutColorMode={layoutColorMode}
+      <AppTopbar
-                mobileTopbarMenuActive={mobileTopbarMenuActive} onMobileTopbarMenuClick={onMobileTopbarMenuClick} onMobileSubTopbarMenuClick={onMobileSubTopbarMenuClick} />
+        onToggleMenuClick={onToggleMenuClick}
+        layoutColorMode={layoutColorMode}
+        mobileTopbarMenuActive={mobileTopbarMenuActive}
+        onMobileTopbarMenuClick={onMobileTopbarMenuClick}
+        onMobileSubTopbarMenuClick={onMobileSubTopbarMenuClick}
+      />
 
       <div className="layout-sidebar" onClick={onSidebarClick}>
-                <AppMenu model={menu} onMenuItemClick={onMenuItemClick} layoutColorMode={layoutColorMode} />
+        <AppMenu
+          model={menu}
+          onMenuItemClick={onMenuItemClick}
+          layoutColorMode={layoutColorMode}
+        />
       </div>
 
       <div className="layout-main-container">
         <div className="layout-main">
-                    <Route path="/" exact render={() => <Dashboard colorMode={layoutColorMode} location={location} />} />
+          <Route
+            path="/"
+            exact
+            render={() => (
+              <Dashboard colorMode={layoutColorMode} location={location} />
+            )}
+          />
           <Route path="/formlayout" component={FormLayoutDemo} />
           <Route path="/input" component={InputDemo} />
           <Route path="/floatlabel" component={FloatLabelDemo} />
@@ -319,14 +389,25 @@ const App = () => {
           <Route path="/blocks" component={BlocksDemo} />
           <Route path="/icons" component={IconsDemo} />
           <Route path="/file" component={FileDemo} />
-                    <Route path="/chart" render={() => <ChartDemo colorMode={layoutColorMode} location={location} />} />
+          <Route
+            path="/chart"
+            render={() => (
+              <ChartDemo colorMode={layoutColorMode} location={location} />
+            )}
+          />
           <Route path="/misc" component={MiscDemo} />
           <Route path="/timeline" component={TimelineDemo} />
           <Route path="/crud" component={Crud} />
           <Route path="/empty" component={EmptyPage} />
           <Route path="/documentation" component={Documentation} />
-                    <Route path="/administradoresSistema" component={AdministradoresSistema} />
+          <Route
-                    <Route path="/administradoresComunidad" component={AdministradoresComunidad} />
+            path="/administradoresSistema"
+            component={AdministradoresSistema}
+          />
+          <Route
+            path="/administradoresComunidad"
+            component={AdministradoresComunidad}
+          />
           <Route path="/guardasSeguridad" component={GuardasSeguridad} />
           <Route path="/comunidadesViviendas" component={Communities} />
           <Route path="/inquilinos" component={Inquilinos} />
@@ -336,17 +417,27 @@ const App = () => {
         <AppFooter layoutColorMode={layoutColorMode} />
       </div>
 
-            <AppConfig rippleEffect={ripple} onRippleEffect={onRipple} inputStyle={inputStyle} onInputStyleChange={onInputStyleChange}
+      <AppConfig
-                layoutMode={layoutMode} onLayoutModeChange={onLayoutModeChange} layoutColorMode={layoutColorMode} onColorModeChange={onColorModeChange} />
+        rippleEffect={ripple}
+        onRippleEffect={onRipple}
+        inputStyle={inputStyle}
+        onInputStyleChange={onInputStyleChange}
+        layoutMode={layoutMode}
+        onLayoutModeChange={onLayoutModeChange}
+        layoutColorMode={layoutColorMode}
+        onColorModeChange={onColorModeChange}
+      />
 
-            <CSSTransition classNames="layout-mask" timeout={{ enter: 200, exit: 200 }} in={mobileMenuActive} unmountOnExit>
+      <CSSTransition
+        classNames="layout-mask"
+        timeout={{ enter: 200, exit: 200 }}
+        in={mobileMenuActive}
+        unmountOnExit
+      >
         <div className="layout-mask p-component-overlay"></div>
       </CSSTransition>
-
-
     </div>
   );
-
+};
-}
 
 export default App;

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

@@ -1 +0,0 @@
-

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

@@ -2,10 +2,9 @@ import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { RadioButton } from 'primereact/radiobutton';
 import { InputSwitch } from 'primereact/inputswitch';
 import classNames from 'classnames';
-import { Button } from "primereact/button";
+import { Button } from 'primereact/button';
 
 export const AppConfig = (props) => {
-
   const [active, setActive] = useState(false);
   const [scale, setScale] = useState(14);
   const [scales] = useState([12, 13, 14, 15, 16]);
@@ -20,11 +19,14 @@ export const AppConfig = (props) => {
     }
   }, []);
 
-    const hideConfigurator = useCallback((event) => {
+  const hideConfigurator = useCallback(
+    (event) => {
       setActive(false);
       unbindOutsideClickListener();
       event.preventDefault();
-    }, [unbindOutsideClickListener]);
+    },
+    [unbindOutsideClickListener],
+  );
 
   const bindOutsideClickListener = useCallback(() => {
     if (!outsideClickListener.current) {
@@ -39,36 +41,38 @@ export const AppConfig = (props) => {
 
   useEffect(() => {
     if (active) {
-            bindOutsideClickListener()
+      bindOutsideClickListener();
-        }
+    } else {
-        else {
+      unbindOutsideClickListener();
-            unbindOutsideClickListener()
     }
   }, [active, bindOutsideClickListener, unbindOutsideClickListener]);
 
   const isOutsideClicked = (event) => {
-        return !(config.current.isSameNode(event.target) || config.current.contains(event.target));
+    return !(
-    }
+      config.current.isSameNode(event.target) ||
+      config.current.contains(event.target)
+    );
+  };
 
   const decrementScale = () => {
     setScale((prevState) => --prevState);
-    }
+  };
 
   const incrementScale = () => {
     setScale((prevState) => ++prevState);
-    }
+  };
 
   useEffect(() => {
     document.documentElement.style.fontSize = scale + 'px';
-    }, [scale])
+  }, [scale]);
 
   const toggleConfigurator = (event) => {
-        setActive(prevState => !prevState);
+    setActive((prevState) => !prevState);
-    }
+  };
 
   const configClassName = classNames('layout-config', {
-        'layout-config-active': active
+    'layout-config-active': active,
-    })
+  });
 
   const replaceLink = useCallback((linkElement, href, callback) => {
     if (isIE()) {
@@ -77,15 +81,17 @@ export const AppConfig = (props) => {
       if (callback) {
         callback();
       }
-        }
+    } else {
-        else {
       const id = linkElement.getAttribute('id');
       const cloneLinkElement = linkElement.cloneNode(true);
 
       cloneLinkElement.setAttribute('href', href);
       cloneLinkElement.setAttribute('id', id + '-clone');
 
-            linkElement.parentNode.insertBefore(cloneLinkElement, linkElement.nextSibling);
+      linkElement.parentNode.insertBefore(
+        cloneLinkElement,
+        linkElement.nextSibling,
+      );
 
       cloneLinkElement.addEventListener('load', () => {
         linkElement.remove();
@@ -96,66 +102,115 @@ export const AppConfig = (props) => {
         }
       });
     }
-    }, [])
+  }, []);
 
   useEffect(() => {
     let themeElement = document.getElementById('theme-link');
     const themeHref = 'assets/themes/' + theme + '/theme.css';
     replaceLink(themeElement, themeHref);
-
+  }, [theme, replaceLink]);
-    }, [theme, replaceLink])
 
   const isIE = () => {
-        return /(MSIE|Trident\/|Edge\/)/i.test(window.navigator.userAgent)
+    return /(MSIE|Trident\/|Edge\/)/i.test(window.navigator.userAgent);
-    }
+  };
 
   const changeTheme = (e, theme, scheme) => {
     props.onColorModeChange(scheme);
     setTheme(theme);
-    }
+  };
 
   return (
-        <div ref={config} className={configClassName} id={"layout-config"}>
+    <div ref={config} className={configClassName} id={'layout-config'}>
-            <button className="layout-config-button p-link" id="layout-config-button" onClick={toggleConfigurator}>
+      <button
+        className="layout-config-button p-link"
+        id="layout-config-button"
+        onClick={toggleConfigurator}
+      >
         <i className="pi pi-cog"></i>
       </button>
-            <Button className="p-button-danger layout-config-close p-button-rounded p-button-text" icon="pi pi-times" onClick={hideConfigurator} />
+      <Button
+        className="p-button-danger layout-config-close p-button-rounded p-button-text"
+        icon="pi pi-times"
+        onClick={hideConfigurator}
+      />
 
       <div className="layout-config-content">
         <h5 className="mt-0">Component Scale</h5>
         <div className="config-scale">
-                    <Button icon="pi pi-minus" onClick={decrementScale} className="p-button-text" disabled={scale === scales[0]} />
+          <Button
-                    {
+            icon="pi pi-minus"
-                        scales.map((item) => {
+            onClick={decrementScale}
-                            return <i className={classNames('pi pi-circle-on', { 'scale-active': item === scale })} key={item} />
+            className="p-button-text"
-                        })
+            disabled={scale === scales[0]}
-                    }
+          />
-                    <Button icon="pi pi-plus" onClick={incrementScale} className="p-button-text" disabled={scale === scales[scales.length - 1]} />
+          {scales.map((item) => {
+            return (
+              <i
+                className={classNames('pi pi-circle-on', {
+                  'scale-active': item === scale,
+                })}
+                key={item}
+              />
+            );
+          })}
+          <Button
+            icon="pi pi-plus"
+            onClick={incrementScale}
+            className="p-button-text"
+            disabled={scale === scales[scales.length - 1]}
+          />
         </div>
 
         <h5>Input Style</h5>
         <div className="p-formgroup-inline">
           <div className="field-radiobutton">
-                        <RadioButton inputId="input_outlined" name="inputstyle" value="outlined" onChange={(e) => props.onInputStyleChange(e.value)} checked={props.inputStyle === 'outlined'} />
+            <RadioButton
+              inputId="input_outlined"
+              name="inputstyle"
+              value="outlined"
+              onChange={(e) => props.onInputStyleChange(e.value)}
+              checked={props.inputStyle === 'outlined'}
+            />
             <label htmlFor="input_outlined">Outlined</label>
           </div>
           <div className="field-radiobutton">
-                        <RadioButton inputId="input_filled" name="inputstyle" value="filled" onChange={(e) => props.onInputStyleChange(e.value)} checked={props.inputStyle === 'filled'} />
+            <RadioButton
+              inputId="input_filled"
+              name="inputstyle"
+              value="filled"
+              onChange={(e) => props.onInputStyleChange(e.value)}
+              checked={props.inputStyle === 'filled'}
+            />
             <label htmlFor="input_filled">Filled</label>
           </div>
         </div>
 
         <h5>Ripple Effect</h5>
-                <InputSwitch checked={props.rippleEffect} onChange={props.onRippleEffect} />
+        <InputSwitch
+          checked={props.rippleEffect}
+          onChange={props.onRippleEffect}
+        />
 
         <h5>Menu Type</h5>
         <div className="p-formgroup-inline">
           <div className="field-radiobutton">
-                        <RadioButton inputId="static" name="layoutMode" value="static" onChange={(e) => props.onLayoutModeChange(e.value)} checked={props.layoutMode === 'static'} />
+            <RadioButton
+              inputId="static"
+              name="layoutMode"
+              value="static"
+              onChange={(e) => props.onLayoutModeChange(e.value)}
+              checked={props.layoutMode === 'static'}
+            />
             <label htmlFor="static">Static</label>
           </div>
           <div className="field-radiobutton">
-                        <RadioButton inputId="overlay" name="layoutMode" value="overlay" onChange={(e) => props.onLayoutModeChange(e.value)} checked={props.layoutMode === 'overlay'} />
+            <RadioButton
+              inputId="overlay"
+              name="layoutMode"
+              value="overlay"
+              onChange={(e) => props.onLayoutModeChange(e.value)}
+              checked={props.layoutMode === 'overlay'}
+            />
             <label htmlFor="overlay">Overlay</label>
           </div>
         </div>
@@ -164,23 +219,49 @@ export const AppConfig = (props) => {
         <h6 className="mt-0">Bootstrap</h6>
         <div className="grid free-themes">
           <div className="col-3 text-center">
-                        <button className="p-link" onClick={e => changeTheme(e, 'bootstrap4-light-blue', 'light')}>
+            <button
-                            <img src="assets/layout/images/themes/bootstrap4-light-blue.svg" alt="Bootstrap Light Blue" />
+              className="p-link"
+              onClick={(e) => changeTheme(e, 'bootstrap4-light-blue', 'light')}
+            >
+              <img
+                src="assets/layout/images/themes/bootstrap4-light-blue.svg"
+                alt="Bootstrap Light Blue"
+              />
             </button>
           </div>
           <div className="col-3 text-center">
-                        <button className="p-link" onClick={e => changeTheme(e, 'bootstrap4-light-purple', 'light')}>
+            <button
-                            <img src="assets/layout/images/themes/bootstrap4-light-purple.svg" alt="Bootstrap Light Purple" />
+              className="p-link"
+              onClick={(e) =>
+                changeTheme(e, 'bootstrap4-light-purple', 'light')
+              }
+            >
+              <img
+                src="assets/layout/images/themes/bootstrap4-light-purple.svg"
+                alt="Bootstrap Light Purple"
+              />
             </button>
           </div>
           <div className="col-3 text-center">
-                        <button className="p-link" onClick={e => changeTheme(e, 'bootstrap4-dark-blue', 'dark')}>
+            <button
-                            <img src="assets/layout/images/themes/bootstrap4-dark-blue.svg" alt="Bootstrap Dark Blue" />
+              className="p-link"
+              onClick={(e) => changeTheme(e, 'bootstrap4-dark-blue', 'dark')}
+            >
+              <img
+                src="assets/layout/images/themes/bootstrap4-dark-blue.svg"
+                alt="Bootstrap Dark Blue"
+              />
             </button>
           </div>
           <div className="col-3 text-center">
-                        <button className="p-link" onClick={e => changeTheme(e, 'bootstrap4-dark-purple', 'dark')}>
+            <button
-                            <img src="assets/layout/images/themes/bootstrap4-dark-purple.svg" alt="Bootstrap Dark Purple" />
+              className="p-link"
+              onClick={(e) => changeTheme(e, 'bootstrap4-dark-purple', 'dark')}
+            >
+              <img
+                src="assets/layout/images/themes/bootstrap4-dark-purple.svg"
+                alt="Bootstrap Dark Purple"
+              />
             </button>
           </div>
         </div>
@@ -188,28 +269,58 @@ export const AppConfig = (props) => {
         <h6>Material Design</h6>
         <div className="grid free-themes">
           <div className="col-3 text-center">
-                        <button className="p-link" onClick={e => changeTheme(e, 'md-light-indigo', 'light')}>
+            <button
-                            <img src="assets/layout/images/themes/md-light-indigo.svg" alt="Material Light Indigo" />
+              className="p-link"
+              onClick={(e) => changeTheme(e, 'md-light-indigo', 'light')}
+            >
+              <img
+                src="assets/layout/images/themes/md-light-indigo.svg"
+                alt="Material Light Indigo"
+              />
             </button>
           </div>
           <div className="col-3 text-center">
-                        <button className="p-link" onClick={e => changeTheme(e, 'md-light-indigo', 'light')}>
+            <button
-                            <img src="assets/layout/images/themes/md-light-indigo.svg" alt="Material Light Indigo" />
+              className="p-link"
+              onClick={(e) => changeTheme(e, 'md-light-indigo', 'light')}
+            >
+              <img
+                src="assets/layout/images/themes/md-light-indigo.svg"
+                alt="Material Light Indigo"
+              />
             </button>
           </div>
           <div className="col-3 text-center">
-                        <button className="p-link" onClick={e => changeTheme(e, 'md-light-deeppurple', 'light')}>
+            <button
-                            <img src="assets/layout/images/themes/md-light-deeppurple.svg" alt="Material Light DeepPurple" />
+              className="p-link"
+              onClick={(e) => changeTheme(e, 'md-light-deeppurple', 'light')}
+            >
+              <img
+                src="assets/layout/images/themes/md-light-deeppurple.svg"
+                alt="Material Light DeepPurple"
+              />
             </button>
           </div>
           <div className="col-3 text-center">
-                        <button className="p-link" onClick={e => changeTheme(e, 'md-dark-indigo', 'dark')}>
+            <button
-                            <img src="assets/layout/images/themes/md-dark-indigo.svg" alt="Material Dark Indigo" />
+              className="p-link"
+              onClick={(e) => changeTheme(e, 'md-dark-indigo', 'dark')}
+            >
+              <img
+                src="assets/layout/images/themes/md-dark-indigo.svg"
+                alt="Material Dark Indigo"
+              />
             </button>
           </div>
           <div className="col-3 text-center">
-                        <button className="p-link" onClick={e => changeTheme(e, 'md-dark-deeppurple', 'dark')}>
+            <button
-                            <img src="assets/layout/images/themes/md-dark-deeppurple.svg" alt="Material Dark DeepPurple" />
+              className="p-link"
+              onClick={(e) => changeTheme(e, 'md-dark-deeppurple', 'dark')}
+            >
+              <img
+                src="assets/layout/images/themes/md-dark-deeppurple.svg"
+                alt="Material Dark DeepPurple"
+              />
             </button>
           </div>
         </div>
@@ -217,23 +328,47 @@ export const AppConfig = (props) => {
         <h6>Material Design Compact</h6>
         <div className="grid free-themes">
           <div className="col-3 text-center">
-                        <button className="p-link" onClick={e => changeTheme(e, 'mdc-light-indigo', 'light')}>
+            <button
-                            <img src="assets/layout/images/themes/md-light-indigo.svg" alt="Material Light Indigo" />
+              className="p-link"
+              onClick={(e) => changeTheme(e, 'mdc-light-indigo', 'light')}
+            >
+              <img
+                src="assets/layout/images/themes/md-light-indigo.svg"
+                alt="Material Light Indigo"
+              />
             </button>
           </div>
           <div className="col-3 text-center">
-                        <button className="p-link" onClick={e => changeTheme(e, 'mdc-light-deeppurple', 'light')}>
+            <button
-                            <img src="assets/layout/images/themes/md-light-deeppurple.svg" alt="Material Light DeepPurple" />
+              className="p-link"
+              onClick={(e) => changeTheme(e, 'mdc-light-deeppurple', 'light')}
+            >
+              <img
+                src="assets/layout/images/themes/md-light-deeppurple.svg"
+                alt="Material Light DeepPurple"
+              />
             </button>
           </div>
           <div className="col-3 text-center">
-                        <button className="p-link" onClick={e => changeTheme(e, 'mdc-dark-indigo', 'dark')}>
+            <button
-                            <img src="assets/layout/images/themes/md-dark-indigo.svg" alt="Material Dark Indigo" />
+              className="p-link"
+              onClick={(e) => changeTheme(e, 'mdc-dark-indigo', 'dark')}
+            >
+              <img
+                src="assets/layout/images/themes/md-dark-indigo.svg"
+                alt="Material Dark Indigo"
+              />
             </button>
           </div>
           <div className="col-3 text-center">
-                        <button className="p-link" onClick={e => changeTheme(e, 'mdc-dark-deeppurple', 'dark')}>
+            <button
-                            <img src="assets/layout/images/themes/md-dark-deeppurple.svg" alt="Material Dark DeepPurple" />
+              className="p-link"
+              onClick={(e) => changeTheme(e, 'mdc-dark-deeppurple', 'dark')}
+            >
+              <img
+                src="assets/layout/images/themes/md-dark-deeppurple.svg"
+                alt="Material Dark DeepPurple"
+              />
             </button>
           </div>
         </div>
@@ -241,8 +376,14 @@ export const AppConfig = (props) => {
         <h6>Tailwind</h6>
         <div className="grid free-themes">
           <div className="col-3 text-center">
-                        <button className="p-link" onClick={e => changeTheme(e, 'tailwind-light', 'light')}>
+            <button
-                            <img src="assets/layout/images/themes/tailwind-light.png" alt="Tailwind Light" />
+              className="p-link"
+              onClick={(e) => changeTheme(e, 'tailwind-light', 'light')}
+            >
+              <img
+                src="assets/layout/images/themes/tailwind-light.png"
+                alt="Tailwind Light"
+              />
             </button>
           </div>
         </div>
@@ -250,8 +391,14 @@ export const AppConfig = (props) => {
         <h6>Fluent UI</h6>
         <div className="grid free-themes">
           <div className="col-3 text-center">
-                        <button className="p-link" onClick={e => changeTheme(e, 'fluent-light', 'light')}>
+            <button
-                            <img src="assets/layout/images/themes/fluent-light.png" alt="Fluent Light" />
+              className="p-link"
+              onClick={(e) => changeTheme(e, 'fluent-light', 'light')}
+            >
+              <img
+                src="assets/layout/images/themes/fluent-light.png"
+                alt="Fluent Light"
+              />
             </button>
           </div>
         </div>
@@ -259,48 +406,102 @@ export const AppConfig = (props) => {
         <h6>PrimeOne Design - 2022</h6>
         <div className="grid free-themes">
           <div className="col-3 text-center">
-                        <button className="p-link" onClick={(e) => changeTheme(e, 'khaki', 'light')}>
+            <button
-                            <img src="assets/layout/images/themes/lara-light-indigo.png" alt="Khaki" />
+              className="p-link"
+              onClick={(e) => changeTheme(e, 'khaki', 'light')}
+            >
+              <img
+                src="assets/layout/images/themes/lara-light-indigo.png"
+                alt="Khaki"
+              />
             </button>
           </div>
           <div className="col-3 text-center">
-                        <button className="p-link" onClick={(e) => changeTheme(e, 'lara-light-indigo', 'light')}>
+            <button
-                            <img src="assets/layout/images/themes/lara-light-indigo.png" alt="Lara Light Indigo" />
+              className="p-link"
+              onClick={(e) => changeTheme(e, 'lara-light-indigo', 'light')}
+            >
+              <img
+                src="assets/layout/images/themes/lara-light-indigo.png"
+                alt="Lara Light Indigo"
+              />
             </button>
           </div>
           <div className="col-3 text-center">
-                        <button className="p-link" onClick={(e) => changeTheme(e, 'lara-light-blue', 'light')}>
+            <button
-                            <img src="assets/layout/images/themes/lara-light-blue.png" alt="Lara Light Blue" />
+              className="p-link"
+              onClick={(e) => changeTheme(e, 'lara-light-blue', 'light')}
+            >
+              <img
+                src="assets/layout/images/themes/lara-light-blue.png"
+                alt="Lara Light Blue"
+              />
             </button>
           </div>
           <div className="col-3 text-center">
-                        <button className="p-link" onClick={(e) => changeTheme(e, 'lara-light-purple', 'light')}>
+            <button
-                            <img src="assets/layout/images/themes/lara-light-purple.png" alt="Lara Light Purple" />
+              className="p-link"
+              onClick={(e) => changeTheme(e, 'lara-light-purple', 'light')}
+            >
+              <img
+                src="assets/layout/images/themes/lara-light-purple.png"
+                alt="Lara Light Purple"
+              />
             </button>
           </div>
           <div className="col-3 text-center">
-                        <button className="p-link" onClick={(e) => changeTheme(e, 'lara-light-teal', 'light')}>
+            <button
-                            <img src="assets/layout/images/themes/lara-light-teal.png" alt="Lara Light Teal" />
+              className="p-link"
+              onClick={(e) => changeTheme(e, 'lara-light-teal', 'light')}
+            >
+              <img
+                src="assets/layout/images/themes/lara-light-teal.png"
+                alt="Lara Light Teal"
+              />
             </button>
           </div>
           <div className="col-3 text-center">
-                        <button className="p-link" onClick={(e) => changeTheme(e, 'lara-dark-indigo', 'dark')}>
+            <button
-                            <img src="assets/layout/images/themes/lara-dark-indigo.png" alt="Lara Dark Indigo" />
+              className="p-link"
+              onClick={(e) => changeTheme(e, 'lara-dark-indigo', 'dark')}
+            >
+              <img
+                src="assets/layout/images/themes/lara-dark-indigo.png"
+                alt="Lara Dark Indigo"
+              />
             </button>
           </div>
           <div className="col-3 text-center">
-                        <button className="p-link" onClick={(e) => changeTheme(e, 'lara-dark-blue', 'dark')}>
+            <button
-                            <img src="assets/layout/images/themes/lara-dark-blue.png" alt="Lara Dark Blue" />
+              className="p-link"
+              onClick={(e) => changeTheme(e, 'lara-dark-blue', 'dark')}
+            >
+              <img
+                src="assets/layout/images/themes/lara-dark-blue.png"
+                alt="Lara Dark Blue"
+              />
             </button>
           </div>
           <div className="col-3 text-center">
-                        <button className="p-link" onClick={(e) => changeTheme(e, 'lara-dark-purple', 'dark')}>
+            <button
-                            <img src="assets/layout/images/themes/lara-dark-purple.png" alt="Lara Dark Purple" />
+              className="p-link"
+              onClick={(e) => changeTheme(e, 'lara-dark-purple', 'dark')}
+            >
+              <img
+                src="assets/layout/images/themes/lara-dark-purple.png"
+                alt="Lara Dark Purple"
+              />
             </button>
           </div>
           <div className="col-3 text-center">
-                        <button className="p-link" onClick={(e) => changeTheme(e, 'lara-dark-teal', 'dark')}>
+            <button
-                            <img src="assets/layout/images/themes/lara-dark-teal.png" alt="Lara Dark Teal" />
+              className="p-link"
+              onClick={(e) => changeTheme(e, 'lara-dark-teal', 'dark')}
+            >
+              <img
+                src="assets/layout/images/themes/lara-dark-teal.png"
+                alt="Lara Dark Teal"
+              />
             </button>
           </div>
         </div>
@@ -308,68 +509,139 @@ export const AppConfig = (props) => {
         <h6>PrimeOne Design - 2021</h6>
         <div className="grid free-themes">
           <div className="col-3 text-center">
-                        <button className="p-link" onClick={e => changeTheme(e, 'saga-blue', 'light')}>
+            <button
-                            <img src="assets/layout/images/themes/saga-blue.png" alt="Saga Blue" />
+              className="p-link"
+              onClick={(e) => changeTheme(e, 'saga-blue', 'light')}
+            >
+              <img
+                src="assets/layout/images/themes/saga-blue.png"
+                alt="Saga Blue"
+              />
             </button>
           </div>
           <div className="col-3 text-center">
-                        <button className="p-link" onClick={e => changeTheme(e, 'saga-green', 'light')}>
+            <button
-                            <img src="assets/layout/images/themes/saga-green.png" alt="Saga Green" />
+              className="p-link"
+              onClick={(e) => changeTheme(e, 'saga-green', 'light')}
+            >
+              <img
+                src="assets/layout/images/themes/saga-green.png"
+                alt="Saga Green"
+              />
             </button>
           </div>
           <div className="col-3 text-center">
-                        <button className="p-link" onClick={e => changeTheme(e, 'saga-orange', 'light')}>
+            <button
-                            <img src="assets/layout/images/themes/saga-orange.png" alt="Saga Orange" />
+              className="p-link"
+              onClick={(e) => changeTheme(e, 'saga-orange', 'light')}
+            >
+              <img
+                src="assets/layout/images/themes/saga-orange.png"
+                alt="Saga Orange"
+              />
             </button>
           </div>
           <div className="col-3 text-center">
-                        <button className="p-link" onClick={e => changeTheme(e, 'saga-purple', 'light')}>
+            <button
-                            <img src="assets/layout/images/themes/saga-purple.png" alt="Saga Purple" />
+              className="p-link"
+              onClick={(e) => changeTheme(e, 'saga-purple', 'light')}
+            >
+              <img
+                src="assets/layout/images/themes/saga-purple.png"
+                alt="Saga Purple"
+              />
             </button>
           </div>
           <div className="col-3 text-center">
-                        <button className="p-link" onClick={e => changeTheme(e, 'vela-blue', 'dim')}>
+            <button
-                            <img src="assets/layout/images/themes/vela-blue.png" alt="Vela Blue" />
+              className="p-link"
+              onClick={(e) => changeTheme(e, 'vela-blue', 'dim')}
+            >
+              <img
+                src="assets/layout/images/themes/vela-blue.png"
+                alt="Vela Blue"
+              />
             </button>
           </div>
           <div className="col-3 text-center">
-                        <button className="p-link" onClick={e => changeTheme(e, 'vela-green', 'dim')}>
+            <button
-                            <img src="assets/layout/images/themes/vela-green.png" alt="Vela Green" />
+              className="p-link"
+              onClick={(e) => changeTheme(e, 'vela-green', 'dim')}
+            >
+              <img
+                src="assets/layout/images/themes/vela-green.png"
+                alt="Vela Green"
+              />
             </button>
           </div>
           <div className="col-3 text-center">
-                        <button className="p-link" onClick={e => changeTheme(e, 'vela-orange', 'dim')}>
+            <button
-                            <img src="assets/layout/images/themes/vela-orange.png" alt="Vela Orange" />
+              className="p-link"
+              onClick={(e) => changeTheme(e, 'vela-orange', 'dim')}
+            >
+              <img
+                src="assets/layout/images/themes/vela-orange.png"
+                alt="Vela Orange"
+              />
             </button>
           </div>
           <div className="col-3 text-center">
-                        <button className="p-link" onClick={e => changeTheme(e, 'vela-purple', 'dim')}>
+            <button
-                            <img src="assets/layout/images/themes/vela-purple.png" alt="Vela Purple" />
+              className="p-link"
+              onClick={(e) => changeTheme(e, 'vela-purple', 'dim')}
+            >
+              <img
+                src="assets/layout/images/themes/vela-purple.png"
+                alt="Vela Purple"
+              />
             </button>
           </div>
           <div className="col-3 text-center">
-                        <button className="p-link" onClick={e => changeTheme(e, 'arya-blue', 'dark')}>
+            <button
-                            <img src="assets/layout/images/themes/arya-blue.png" alt="Arya Blue" />
+              className="p-link"
+              onClick={(e) => changeTheme(e, 'arya-blue', 'dark')}
+            >
+              <img
+                src="assets/layout/images/themes/arya-blue.png"
+                alt="Arya Blue"
+              />
             </button>
           </div>
           <div className="col-3 text-center">
-                        <button className="p-link" onClick={e => changeTheme(e, 'arya-green', 'dark')}>
+            <button
-                            <img src="assets/layout/images/themes/arya-green.png" alt="Arya Green" />
+              className="p-link"
+              onClick={(e) => changeTheme(e, 'arya-green', 'dark')}
+            >
+              <img
+                src="assets/layout/images/themes/arya-green.png"
+                alt="Arya Green"
+              />
             </button>
           </div>
           <div className="col-3 text-center">
-                        <button className="p-link" onClick={e => changeTheme(e, 'arya-orange', 'dark')}>
+            <button
-                            <img src="assets/layout/images/themes/arya-orange.png" alt="Arya Orange" />
+              className="p-link"
+              onClick={(e) => changeTheme(e, 'arya-orange', 'dark')}
+            >
+              <img
+                src="assets/layout/images/themes/arya-orange.png"
+                alt="Arya Orange"
+              />
             </button>
           </div>
           <div className="col-3 text-center">
-                        <button className="p-link" onClick={e => changeTheme(e, 'arya-purple', 'dark')}>
+            <button
-                            <img src="assets/layout/images/themes/arya-purple.png" alt="Arya Purple" />
+              className="p-link"
+              onClick={(e) => changeTheme(e, 'arya-purple', 'dark')}
+            >
+              <img
+                src="assets/layout/images/themes/arya-purple.png"
+                alt="Arya Purple"
+              />
             </button>
           </div>
         </div>
-
       </div>
     </div>
   );
-}
+};

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

@@ -1,12 +1,20 @@
 import React from 'react';
 
 export const AppFooter = (props) => {
-
   return (
     <div className="layout-footer">
-            <img src={props.layoutColorMode === 'light' ? 'assets/layout/images/logo-dark.svg' : 'assets/layout/images/logo-white.svg'} alt="Logo" height="20" className="mr-2" />
+      <img
+        src={
+          props.layoutColorMode === 'light'
+            ? 'assets/layout/images/logo-dark.svg'
+            : 'assets/layout/images/logo-white.svg'
+        }
+        alt="Logo"
+        height="20"
+        className="mr-2"
+      />
       by
       <span className="font-medium ml-2">PrimeReact</span>
     </div>
   );
-}
+};

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

@@ -2,12 +2,11 @@ import React, { useState } from 'react';
 import { NavLink } from 'react-router-dom';
 import { CSSTransition } from 'react-transition-group';
 import classNames from 'classnames';
-import {Ripple} from "primereact/ripple";
+import { Ripple } from 'primereact/ripple';
 import { Badge } from 'primereact/badge';
 
 const AppSubmenu = (props) => {
-
+  const [activeIndex, setActiveIndex] = useState(null);
-    const [activeIndex, setActiveIndex] = useState(null)
 
   const onMenuItemClick = (event, item, index) => {
     //avoid processing disabled items
@@ -21,29 +20,29 @@ const AppSubmenu = (props) => {
       item.command({ originalEvent: event, item: item });
     }
 
-        if (index === activeIndex)
+    if (index === activeIndex) setActiveIndex(null);
-            setActiveIndex(null);
+    else setActiveIndex(index);
-        else
-            setActiveIndex(index);
 
     if (props.onMenuItemClick) {
       props.onMenuItemClick({
         originalEvent: event,
-                item: item
+        item: item,
       });
     }
-    }
+  };
 
   const onKeyDown = (event) => {
     if (event.code === 'Enter' || event.code === 'Space') {
       event.preventDefault();
       event.target.click();
     }
-    }
+  };
 
   const renderLinkContent = (item) => {
-        let submenuIcon = item.items && <i className="pi pi-fw pi-angle-down menuitem-toggle-icon"></i>;
+    let submenuIcon = item.items && (
-        let badge = item.badge && <Badge value={item.badge} />
+      <i className="pi pi-fw pi-angle-down menuitem-toggle-icon"></i>
+    );
+    let badge = item.badge && <Badge value={item.badge} />;
 
     return (
       <React.Fragment>
@@ -54,65 +53,124 @@ const AppSubmenu = (props) => {
         <Ripple />
       </React.Fragment>
     );
-    }
+  };
 
   const renderLink = (item, i) => {
     let content = renderLinkContent(item);
 
     if (item.to) {
       return (
-                <NavLink aria-label={item.label} onKeyDown={onKeyDown} role="menuitem" className="p-ripple" activeClassName="router-link-active router-link-exact-active" to={item.to} onClick={(e) => onMenuItemClick(e, item, i)} exact target={item.target}>
+        <NavLink
+          aria-label={item.label}
+          onKeyDown={onKeyDown}
+          role="menuitem"
+          className="p-ripple"
+          activeClassName="router-link-active router-link-exact-active"
+          to={item.to}
+          onClick={(e) => onMenuItemClick(e, item, i)}
+          exact
+          target={item.target}
+        >
           {content}
         </NavLink>
-            )
+      );
-        }
+    } else {
-        else {
       return (
-                <a tabIndex="0" aria-label={item.label} onKeyDown={onKeyDown} role="menuitem" href={item.url} className="p-ripple" onClick={(e) => onMenuItemClick(e, item, i)} target={item.target}>
+        <a
+          tabIndex="0"
+          aria-label={item.label}
+          onKeyDown={onKeyDown}
+          role="menuitem"
+          href={item.url}
+          className="p-ripple"
+          onClick={(e) => onMenuItemClick(e, item, i)}
+          target={item.target}
+        >
           {content}
         </a>
       );
     }
-    }
+  };
 
-    let items = props.items && props.items.map((item, i) => {
+  let items =
+    props.items &&
+    props.items.map((item, i) => {
       let active = activeIndex === i;
-        let styleClass = classNames(item.badgeStyleClass, {'layout-menuitem-category': props.root, 'active-menuitem': active && !item.to });
+      let styleClass = classNames(item.badgeStyleClass, {
+        'layout-menuitem-category': props.root,
+        'active-menuitem': active && !item.to,
+      });
 
       if (props.root) {
         return (
           <li className={styleClass} key={i} role="none">
-                    {props.root === true && <React.Fragment>
+            {props.root === true && (
-                        <div className="layout-menuitem-root-text" aria-label={item.label}>{item.label}</div>
+              <React.Fragment>
-                        <AppSubmenu items={item.items} onMenuItemClick={props.onMenuItemClick} />
+                <div
-                    </React.Fragment>}
+                  className="layout-menuitem-root-text"
+                  aria-label={item.label}
+                >
+                  {item.label}
+                </div>
+                <AppSubmenu
+                  items={item.items}
+                  onMenuItemClick={props.onMenuItemClick}
+                />
+              </React.Fragment>
+            )}
           </li>
         );
-        }
+      } else {
-        else {
         return (
           <li className={styleClass} key={i} role="none">
             {renderLink(item, i)}
-                    <CSSTransition classNames="layout-submenu-wrapper" timeout={{ enter: 1000, exit: 450 }} in={active} unmountOnExit>
+            <CSSTransition
-                        <AppSubmenu items={item.items} onMenuItemClick={props.onMenuItemClick} />
+              classNames="layout-submenu-wrapper"
+              timeout={{ enter: 1000, exit: 450 }}
+              in={active}
+              unmountOnExit
+            >
+              <AppSubmenu
+                items={item.items}
+                onMenuItemClick={props.onMenuItemClick}
+              />
             </CSSTransition>
           </li>
         );
       }
     });
 
-    return items ? <ul className={props.className} role="menu">{items}</ul> : null;
+  return items ? (
-}
+    <ul className={props.className} role="menu">
+      {items}
+    </ul>
+  ) : null;
+};
 
 export const AppMenu = (props) => {
-
   return (
     <div className="layout-menu-container">
-            <AppSubmenu items={props.model} className="layout-menu"  onMenuItemClick={props.onMenuItemClick} root={true} role="menu" />
+      <AppSubmenu
-            <a href="https://www.primefaces.org/primeblocks-react" className="block mt-3">
+        items={props.model}
-                <img alt="primeblocks" className="w-full"
+        className="layout-menu"
-                     src={props.layoutColorMode === 'light' ? 'assets/layout/images/banner-primeblocks.png' : 'assets/layout/images/banner-primeblocks-dark.png'}/>
+        onMenuItemClick={props.onMenuItemClick}
+        root={true}
+        role="menu"
+      />
+      <a
+        href="https://www.primefaces.org/primeblocks-react"
+        className="block mt-3"
+      >
+        <img
+          alt="primeblocks"
+          className="w-full"
+          src={
+            props.layoutColorMode === 'light'
+              ? 'assets/layout/images/banner-primeblocks.png'
+              : 'assets/layout/images/banner-primeblocks-dark.png'
+          }
+        />
       </a>
     </div>
   );
-}
+};

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

@@ -3,7 +3,6 @@ import { Link } from 'react-router-dom';
 import classNames from 'classnames';
 
 export const AppTopbar = (props) => {
-
   return (
     <div className="layout-topbar">
       <Link to="/" className="layout-topbar-logo">
@@ -15,7 +14,10 @@ export const AppTopbar = (props) => {
                 <i className="pi pi-bars"/>
             </button> */}
 
-            <button type="button" className="p-link layout-topbar-menu-button layout-topbar-button" >
+      <button
+        type="button"
+        className="p-link layout-topbar-menu-button layout-topbar-button"
+      >
         <i className="pi pi-ellipsis-v" />
       </button>
 
@@ -41,4 +43,4 @@ export const AppTopbar = (props) => {
       </ul>
     </div>
   );
-}
+};

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

@@ -3,13 +3,12 @@ import { classNames } from 'primereact/utils';
 import { CodeHighlight } from './templates/CodeHighlight';
 
 const BlockViewer = (props) => {
-
+  const [blockView, setBlockView] = useState('PREVIEW');
-    const [blockView, setBlockView] = useState('PREVIEW')
 
   const copyCode = async (event) => {
     await navigator.clipboard.writeText(props.code);
     event.preventDefault();
-    }
+  };
 
   return (
     <div className="block-viewer">
@@ -20,30 +19,47 @@ const BlockViewer = (props) => {
             {props.new && <span className="badge-new">New</span>}
           </span>
           <div className="block-actions">
-                        <button tabIndex="0" className={classNames('p-link', { 'block-action-active': blockView === 'PREVIEW' })} onClick={() => setBlockView('PREVIEW')}><span>Preview</span></button>
+            <button
-                        <button className={classNames('p-link', { 'block-action-active': blockView === 'CODE' })} onClick={() => setBlockView('CODE')} >
+              tabIndex="0"
+              className={classNames('p-link', {
+                'block-action-active': blockView === 'PREVIEW',
+              })}
+              onClick={() => setBlockView('PREVIEW')}
+            >
+              <span>Preview</span>
+            </button>
+            <button
+              className={classNames('p-link', {
+                'block-action-active': blockView === 'CODE',
+              })}
+              onClick={() => setBlockView('CODE')}
+            >
               <span>Code</span>
             </button>
-                        <button tabIndex="0" className="p-link block-action-copy" onClick={copyCode}>
+            <button
+              tabIndex="0"
+              className="p-link block-action-copy"
+              onClick={copyCode}
+            >
               <i className="pi pi-copy"></i>
             </button>
           </div>
         </div>
         <div className="block-content">
-                    {blockView === 'PREVIEW' &&
+          {blockView === 'PREVIEW' && (
-                        <div className={props.containerClassName} style={props.previewStyle}>
+            <div
+              className={props.containerClassName}
+              style={props.previewStyle}
+            >
               {props.children}
-                        </div>}
+            </div>
+          )}
 
-                    {blockView === 'CODE' &&
+          {blockView === 'CODE' && <CodeHighlight>{props.code}</CodeHighlight>}
-                        <CodeHighlight>
-                            {props.code}
-                        </CodeHighlight>
-                    }
         </div>
       </div>
     </div>
-    )
+  );
-}
+};
 
 export default BlockViewer;

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

@@ -2,14 +2,13 @@ import { useEffect } from 'react';
 import { useLocation, withRouter } from 'react-router-dom';
 
 const ScrollToTop = (props) => {
-
   let location = useLocation();
 
   useEffect(() => {
-        window.scrollTo(0, 0)
+    window.scrollTo(0, 0);
   }, [location]);
 
   return props.children;
-}
+};
 
 export default withRouter(ScrollToTop);

web-ui/web-react/src/assets/demo/Badge.scss

@@ -2,94 +2,94 @@
 .product-badge,
 .order-badge {
   border-radius: var(--border-radius);
-    padding: .25em .5rem;
+  padding: 0.25em 0.5rem;
   text-transform: uppercase;
   font-weight: 700;
   font-size: 12px;
-    letter-spacing: .3px;
+  letter-spacing: 0.3px;
 }
 
 .customer-badge {
   &.status-qualified {
-        background: #C8E6C9;
+    background: #c8e6c9;
     color: #256029;
   }
 
   &.status-unqualified {
-        background: #FFCDD2;
+    background: #ffcdd2;
-        color: #C63737;
+    color: #c63737;
   }
 
   &.status-negotiation {
-        background: #FEEDAF;
+    background: #feedaf;
-        color: #8A5340;
+    color: #8a5340;
   }
 
   &.status-new {
-        background: #B3E5FC;
+    background: #b3e5fc;
-        color: #23547B;
+    color: #23547b;
   }
 
   &.status-renewal {
-        background: #ECCFFF;
+    background: #eccfff;
     color: #694382;
   }
 
   &.status-proposal {
-        background: #FFD8B2;
+    background: #ffd8b2;
-        color: #805B36;
+    color: #805b36;
   }
 }
 
 .product-badge {
   border-radius: var(--border-radius);
-    padding: .25em .5rem;
+  padding: 0.25em 0.5rem;
   text-transform: uppercase;
   font-weight: 700;
   font-size: 12px;
-    letter-spacing: .3px;
+  letter-spacing: 0.3px;
 
   &.status-instock {
-        background: #C8E6C9;
+    background: #c8e6c9;
     color: #256029;
   }
 
   &.status-outofstock {
-        background: #FFCDD2;
+    background: #ffcdd2;
-        color: #C63737;
+    color: #c63737;
   }
 
   &.status-lowstock {
-        background: #FEEDAF;
+    background: #feedaf;
-        color: #8A5340;
+    color: #8a5340;
   }
 }
 
 .order-badge {
   border-radius: var(--border-radius);
-    padding: .25em .5rem;
+  padding: 0.25em 0.5rem;
   text-transform: uppercase;
   font-weight: 700;
   font-size: 12px;
-    letter-spacing: .3px;
+  letter-spacing: 0.3px;
 
   &.order-delivered {
-        background: #C8E6C9;
+    background: #c8e6c9;
     color: #256029;
   }
 
   &.order-cancelled {
-        background: #FFCDD2;
+    background: #ffcdd2;
-        color: #C63737;
+    color: #c63737;
   }
 
   &.order-pending {
-        background: #FEEDAF;
+    background: #feedaf;
-        color: #8A5340;
+    color: #8a5340;
   }
 
   &.order-returned {
-        background: #ECCFFF;
+    background: #eccfff;
     color: #694382;
   }
 }

web-ui/web-react/src/assets/demo/BlockViewer.scss

@@ -21,12 +21,12 @@
 
       .badge-free {
         border-radius: 4px;
-                padding: .25rem .5rem;
+        padding: 0.25rem 0.5rem;
         background-color: var(--orange-500);
         color: white;
         margin-left: 1rem;
         font-weight: 700;
-                font-size: .875rem;
+        font-size: 0.875rem;
       }
     }
 
@@ -37,15 +37,16 @@
       user-select: none;
       margin-left: 1rem;
 
-            a,button {
+      a,
+      button {
         display: flex;
         align-items: center;
-                margin-right: .75rem;
+        margin-right: 0.75rem;
-                padding: .5rem 1rem;
+        padding: 0.5rem 1rem;
         border-radius: 4px;
         font-weight: 600;
         border: 1px solid transparent;
-                transition: background-color .2s;
+        transition: background-color 0.2s;
         cursor: pointer;
 
         &:last-child {
@@ -70,12 +71,12 @@
         }
 
         &.block-action-disabled {
-                    opacity: .6;
+          opacity: 0.6;
           cursor: auto !important;
         }
 
         i {
-                    margin-right: .5rem;
+          margin-right: 0.5rem;
         }
       }
     }
@@ -90,10 +91,11 @@
     overflow: hidden;
   }
 
-    pre[class*="language-"] {
+  pre[class*='language-'] {
     margin: 0 !important;
 
-        &:before, &:after {
+    &:before,
+    &:after {
       display: none !important;
     }
 
@@ -109,16 +111,16 @@
       .token {
         &.tag,
         &.keyword {
-                    color: #2196F3 !important;
+          color: #2196f3 !important;
         }
 
         &.attr-name,
         &.attr-string {
-                    color: #2196F3 !important;
+          color: #2196f3 !important;
         }
 
         &.attr-value {
-                    color: #4CAF50 !important;
+          color: #4caf50 !important;
         }
 
         &.punctuation {

web-ui/web-react/src/assets/demo/Documentation.scss

@@ -1,5 +1,5 @@
 .docs {
-    i:not([class~="pi"]) {
+  i:not([class~='pi']) {
     background-color: transparent;
     color: #2196f3;
     font-family: Monaco, courier, monospace;
@@ -7,7 +7,7 @@
     font-size: 12px;
     font-weight: 500;
     padding: 0 4px;
-        letter-spacing: .5px;
+    letter-spacing: 0.5px;
     font-weight: 600;
     margin: 0 2px;
     display: inline-flex;
@@ -17,8 +17,9 @@
     font-weight: 500;
   }
 
-    pre[class*="language-"] {
+  pre[class*='language-'] {
-        &:before, &:after {
+    &:before,
+    &:after {
       display: none !important;
     }
 
@@ -34,16 +35,16 @@
     .token {
       &.tag,
       &.keyword {
-                color: #2196F3 !important;
+        color: #2196f3 !important;
       }
 
       &.attr-name,
       &.attr-string {
-                color: #2196F3 !important;
+        color: #2196f3 !important;
       }
 
       &.attr-value {
-                color: #4CAF50 !important;
+        color: #4caf50 !important;
       }
 
       &.punctuation {

web-ui/web-react/src/assets/demo/TableDemo.scss

@@ -11,6 +11,6 @@
 
   .image-text {
     vertical-align: middle;
-        margin-left: .5rem;
+    margin-left: 0.5rem;
   }
 }

web-ui/web-react/src/assets/layout/_variables.scss

@@ -1,4 +1,4 @@
 /* General */
 $fontSize: 10px;
 $borderRadius: 12px;
-$transitionDuration:.2s;
+$transitionDuration: 0.2s;

web-ui/web-react/src/assets/layout/layout.scss

@@ -1,3 +1,3 @@
-@import "./_variables";
+@import './_variables';
-@import "./sass/_layout";
+@import './sass/_layout';
-@import "./_overrides";
+@import './_overrides';

web-ui/web-react/src/assets/layout/sass/_config.scss

@@ -9,7 +9,8 @@
   transform: translateX(100%);
   transition: transform $transitionDuration;
   backface-visibility: hidden;
-    box-shadow: 0px 3px 5px rgba(0,0,0,.02), 0px 0px 2px rgba(0,0,0,.05), 0px 1px 4px rgba(0,0,0,.08) !important;
+  box-shadow: 0px 3px 5px rgba(0, 0, 0, 0.02), 0px 0px 2px rgba(0, 0, 0, 0.05),
+    0px 1px 4px rgba(0, 0, 0, 0.08) !important;
   color: var(--text-color);
   background-color: var(--surface-overlay);
   border-top-left-radius: 12px;
@@ -68,12 +69,12 @@
     margin: 1rem 0 2rem 0;
 
     .p-button {
-            margin-right: .5rem;
+      margin-right: 0.5rem;
     }
 
     i {
-            margin-right: .5rem;
+      margin-right: 0.5rem;
-            font-size: .75rem;
+      font-size: 0.75rem;
       color: var(--text-color-secondary);
 
       &.scale-active {
@@ -87,7 +88,7 @@
     img {
       width: 2rem;
       border-radius: 4px;
-            transition: transform .2s;
+      transition: transform 0.2s;
       display: block;
 
       &:hover {
@@ -96,8 +97,8 @@
     }
 
     span {
-            font-size: .75rem;
+      font-size: 0.75rem;
-            margin-top: .25rem;
+      margin-top: 0.25rem;
     }
   }
 }

web-ui/web-react/src/assets/layout/sass/_layout.scss

@@ -1,11 +1,11 @@
-@import "./_mixins";
+@import './_mixins';
-@import "./_splash";
+@import './_splash';
-@import "./_main";
+@import './_main';
-@import "./_topbar";
+@import './_topbar';
-@import "./_menu";
+@import './_menu';
-@import "./_config";
+@import './_config';
-@import "./_content";
+@import './_content';
-@import "./_footer";
+@import './_footer';
-@import "./_responsive";
+@import './_responsive';
-@import "./_utils";
+@import './_utils';
-@import "./_typography";
+@import './_typography';

web-ui/web-react/src/assets/layout/sass/_main.scss

@@ -18,7 +18,8 @@ body {
   -moz-osx-font-smoothing: grayscale;
 }
 
-a, button {
+a,
+button {
   text-decoration: none;
   color: var(--primary-color);
 }

web-ui/web-react/src/assets/layout/sass/_menu.scss

@@ -11,7 +11,8 @@
   background-color: var(--surface-overlay);
   border-radius: 12px;
   padding: 1.5rem;
-    box-shadow: 0px 3px 5px rgba(0,0,0,.02), 0px 0px 2px rgba(0,0,0,.05), 0px 1px 4px rgba(0,0,0,.08)
+  box-shadow: 0px 3px 5px rgba(0, 0, 0, 0.02), 0px 0px 2px rgba(0, 0, 0, 0.05),
+    0px 1px 4px rgba(0, 0, 0, 0.08);
 }
 
 .layout-menu {
@@ -21,7 +22,7 @@
 
   li {
     &.layout-menuitem-category {
-            margin-top: .75rem;
+      margin-top: 0.75rem;
 
       &:first-child {
         margin-top: 0;
@@ -32,8 +33,8 @@
       text-transform: uppercase;
       color: var(--surface-900);
       font-weight: 600;
-            margin-bottom: .5rem;
+      margin-bottom: 0.5rem;
-            font-size: .875rem;
+      font-size: 0.875rem;
     }
 
     a {
@@ -44,8 +45,8 @@
       color: var(--text-color);
       transition: color $transitionDuration;
       border-radius: $borderRadius;
-            padding: .75rem 1rem;
+      padding: 0.75rem 1rem;
-            transition: background-color .15s;
+      transition: background-color 0.15s;
 
       span {
         margin-left: 0.5rem;

web-ui/web-react/src/assets/layout/sass/_mixins.scss

@@ -1,13 +1,13 @@
 @mixin focused() {
   outline: 0 none;
   outline-offset: 0;
-    transition: box-shadow .2s;
+  transition: box-shadow 0.2s;
   box-shadow: var(--focus-ring);
 }
 
 @mixin focused-inset() {
   outline: 0 none;
   outline-offset: 0;
-    transition: box-shadow .2s;
+  transition: box-shadow 0.2s;
   box-shadow: inset var(--focus-ring);
 }

web-ui/web-react/src/assets/layout/sass/_splash.scss

@@ -15,7 +15,8 @@
   left: calc(50vw - 75px);
 }
 
-.preloader-content:before, .preloader-content:after{
+.preloader-content:before,
+.preloader-content:after {
   content: '';
   border: 1em solid var(--primary-color);
   border-radius: 50%;

web-ui/web-react/src/assets/layout/sass/_topbar.scss

@@ -10,7 +10,8 @@
   transition: left $transitionDuration;
   display: flex;
   align-items: center;
-    box-shadow: 0px 3px 5px rgba(0,0,0,.02), 0px 0px 2px rgba(0,0,0,.05), 0px 1px 4px rgba(0,0,0,.08);
+  box-shadow: 0px 3px 5px rgba(0, 0, 0, 0.02), 0px 0px 2px rgba(0, 0, 0, 0.05),
+    0px 1px 4px rgba(0, 0, 0, 0.08);
 
   .layout-topbar-logo {
     display: flex;
@@ -23,7 +24,7 @@
 
     img {
       height: 2.5rem;
-            margin-right: .5rem;
+      margin-right: 0.5rem;
     }
 
     &:focus {
@@ -111,7 +112,8 @@
       position: absolute;
       flex-direction: column;
       background-color: var(--surface-overlay);
-            box-shadow: 0px 3px 5px rgba(0,0,0,.02), 0px 0px 2px rgba(0,0,0,.05), 0px 1px 4px rgba(0,0,0,.08);
+      box-shadow: 0px 3px 5px rgba(0, 0, 0, 0.02),
+        0px 0px 2px rgba(0, 0, 0, 0.05), 0px 1px 4px rgba(0, 0, 0, 0.08);
       border-radius: 12px;
       padding: 1rem;
       right: 2rem;
@@ -122,7 +124,7 @@
       animation: scalein 0.15s linear;
 
       &.layout-topbar-menu-mobile-active {
-                display: block
+        display: block;
       }
 
       .layout-topbar-button {
@@ -136,7 +138,7 @@
 
         i {
           font-size: 1rem;
-                    margin-right: .5rem;
+          margin-right: 0.5rem;
         }
 
         span {

web-ui/web-react/src/assets/layout/sass/_typography.scss

@@ -1,4 +1,9 @@
-h1, h2, h3, h4, h5, h6 {
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
   margin: 1.5rem 0 1rem 0;
   font-family: inherit;
   font-weight: 500;
@@ -35,8 +40,8 @@ h6 {
 }
 
 mark {
-    background: #FFF8E1;
+  background: #fff8e1;
-    padding: .25rem .4rem;
+  padding: 0.25rem 0.4rem;
   border-radius: $borderRadius;
   font-family: monospace;
 }
@@ -44,7 +49,7 @@ mark {
 blockquote {
   margin: 1rem 0;
   padding: 0 2rem;
-    border-left: 4px solid #90A4AE;
+  border-left: 4px solid #90a4ae;
 }
 
 hr {

web-ui/web-react/src/assets/layout/sass/_utils.scss

@@ -3,7 +3,8 @@
   padding: 1.5rem;
   margin-bottom: 1rem;
   border-radius: $borderRadius;
-    box-shadow: 0px 3px 5px rgba(0,0,0,.02), 0px 0px 2px rgba(0,0,0,.05), 0px 1px 4px rgba(0,0,0,.08) !important;
+  box-shadow: 0px 3px 5px rgba(0, 0, 0, 0.02), 0px 0px 2px rgba(0, 0, 0, 0.05),
+    0px 1px 4px rgba(0, 0, 0, 0.08) !important;
 
   &.card-w-title {
     padding-bottom: 2rem;

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

@@ -6,7 +6,7 @@ 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 { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faHome, faUserAlt } from '@fortawesome/free-solid-svg-icons';
 import { faPhoneAlt } from '@fortawesome/free-solid-svg-icons';
 import { faAt } from '@fortawesome/free-solid-svg-icons';
@@ -18,7 +18,6 @@ import classNames from 'classnames';
 
 const AdministradoresComunidad = () => {
 
-
     let emptyAdminCommunity = {
         _id: null,
         dni: '',
@@ -67,13 +66,19 @@ const AdministradoresComunidad = () => {
             .then(data => setListaAdmins(data));
 
     }
-
+    useEffect(() => {
+        listaAdmin();
     useEffect(() => {
         listaAdmin();
 
     }, [])
 
 
+    const deleteAdminCommunity = () => {
+        /*   fetch('http://localhost:4000/community/deleteCommunity/' + community._id, {
+    }, [])
+
+
     async function getCommunites() {
         let response = await fetch('http://localhost:4000/community/allCommunities', { method: 'GET' });
         let resList = await response.json();
@@ -126,15 +131,23 @@ const AdministradoresComunidad = () => {
                    }
                ); 
         */
-        let _administrators = listaAdmins.filter(val => val._id !== adminCommunity._id);
+    let _administrators = listaAdmins.filter(
+      (val) => val._id !== adminCommunity._id,
+    );
     setListaAdmins(_administrators);
     setDeleteAdminCommunityDialog(false);
     setAdminCommunity(emptyAdminCommunity);
-        toast.current.show({ severity: 'success', summary: 'Administrador de Comunidad Eliminada', life: 3000 });
+    toast.current.show({
-    }
+      severity: 'success',
+      summary: 'Administrador de Comunidad Eliminada',
+      life: 3000,
+    });
+  };
 
   const deleteSelectedAdminsCommunity = () => {
-        let _admins = listaAdmins.filter(val => !selectedAdminsCommunities.includes(val));
+    let _admins = listaAdmins.filter(
+      (val) => !selectedAdminsCommunities.includes(val),
+    );
     /*  selectedCommunities.map((item) => {
              fetch('http://localhost:4000/user/deleteCommunity/' + item._id, {
                  cache: 'no-cache',
@@ -147,9 +160,17 @@ const AdministradoresComunidad = () => {
     setListaAdmins(_admins);
     setDeleteAdminsCommunitiesDialog(false);
     setSelectedAdminsCommunities(null);
-        toast.current.show({ severity: 'success', summary: 'Éxito', detail: 'Administradores de Comunidad de Viviendas Eliminado', life: 3000 });
+    toast.current.show({
-    }
+      severity: 'success',
+      summary: 'Éxito',
+      detail: 'Administradores de Comunidad de Viviendas Eliminado',
+      life: 3000,
+    });
+  };
 
+  const hideDeleteAdminCommunityDialog = () => {
+    setDeleteAdminCommunityDialog(false);
+  };
 
     const saveAdminCommunity = () => {
         if (adminCommunity.name && adminCommunity.dni && adminCommunity.last_name && adminCommunity.email && adminCommunity.phone) {
@@ -203,14 +224,21 @@ const AdministradoresComunidad = () => {
         setDeleteAdminCommunityDialog(false);
     }
 
-    const hideDeleteAdminsCommunitysDialog = () => {
+  const confirmDeleteSelected = () => {
-        setDeleteAdminsCommunitiesDialog(false);
+    setDeleteAdminsCommunitiesDialog(true);
-    }
+  };
 
-    const confirmDeleteAdminCommunity = (adminCommunity) => {
+  const actionsAdminCommunity = (rowData) => {
-        setAdminCommunity(adminCommunity);
+    return (
-        setDeleteAdminCommunityDialog(true);
+      <div className="actions">
-    }
+        <Button
+          icon="pi pi-trash"
+          className="p-button-rounded p-button-danger mt-2"
+          onClick={() => confirmDeleteAdminCommunity(rowData)}
+        />
+      </div>
+    );
+  };
 
     const confirmDeleteSelected = () => {
         setDeleteAdminsCommunitiesDialog(true);
@@ -267,7 +295,9 @@ const AdministradoresComunidad = () => {
                 <InputText type="search" onInput={(e) => setGlobalFilter(e.target.value)} placeholder="Buscar..." />
             </span>
         </div>
+      </React.Fragment>
     );
+  };
 
     const headerName = (
         <>
@@ -275,41 +305,71 @@ const AdministradoresComunidad = () => {
         </>
     )
 
+  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}
+      />
+    </>
+  );
+
+  const headerName = (
+    <>
+      <p>
+        {' '}
+        <FontAwesomeIcon icon={faUserAlt} style={{ color: '#C08135' }} /> Nombre
+      </p>
+    </>
+  );
+
   const headerLastName = (
     <>
-            <p> <FontAwesomeIcon icon={faUserAlt} style={{ color: "#D7A86E" }} />    Apellidos</p>
+      <p>
+        {' '}
+        <FontAwesomeIcon icon={faUserAlt} style={{ color: '#D7A86E' }} />{' '}
+        Apellidos
+      </p>
     </>
-    )
+  );
 
   const headerDNI = (
     <>
-            <p> <FontAwesomeIcon icon={faIdCardAlt} style={{ color: "#C08135" }} />    Identificación</p>
+      <p>
+        {' '}
+        <FontAwesomeIcon icon={faIdCardAlt} style={{ color: '#C08135' }} />{' '}
+        Identificación
+      </p>
     </>
-    )
+  );
 
   const headerEmail = (
     <>
-            <p> <FontAwesomeIcon icon={faAt} style={{ color: "#D7A86E" }} />    Correo Electrónico</p>
+      <p>
+        {' '}
+        <FontAwesomeIcon icon={faAt} style={{ color: '#D7A86E' }} /> Correo
+        Electrónico
+      </p>
     </>
-    )
+  );
 
   const headerPhone = (
     <>
-            <p> <FontAwesomeIcon icon={faPhoneAlt} style={{ color: "#C08135" }} />   Teléfono</p>
+      <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 onInputChange = (e, name) => {
@@ -320,6 +380,112 @@ const AdministradoresComunidad = () => {
         setAdminCommunity(_adminCommunity);
     }
 
+    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 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></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={hideDeleteAdminSystemDialog} />
+            <Button label="Yes" icon="pi pi-check" className="p-button-text" onClick={deleteSysAdmin} />
+        </>
+    );
+
+    const deleteAdminsSystemDialogFooter = (
+        <>
+            <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} />
+        </>
+    );
+
+
+
+    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"
+                        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>
+                    </DataTable>
+                    <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>}
+                        </div>
+                    </Dialog>
+                    <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>}
+                        </div>
+                    </Dialog>
+                </div>
     const handleCommunities = (event) => {
         const getCommunityValue = event.target.value;
         setCommunityId(getCommunityValue);
@@ -444,7 +610,9 @@ const AdministradoresComunidad = () => {
                 </div>
             </div>
         </div>
-    )
+      </div>
-}
+    </div>
+  );
+};
 
 export default React.memo(AdministradoresComunidad);

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

@@ -6,23 +6,24 @@ 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 { 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 AdministradoresSistema = () => {
-
   const [administrators, setAdministrators] = useState([]);
-    const [urlFetch, setUrlFetch] = useState('http://localhost:4000/user/findAdminSistema/');
+  const [urlFetch, setUrlFetch] = useState(
+    'http://localhost:4000/user/findAdminSistema/',
+  );
   const [sysadmin, setSysAdmin] = useState(emptySysAdmin);
   const [selectedAdministrators, setSelectedAdministrators] = useState(null);
   const [globalFilter, setGlobalFilter] = useState(null);
   const [deleteAdminSystemDialog, setDeleteAdminSystemDialog] = useState(false);
-    const [deleteAdminsSystemDialog, setDeleteAdminsSystemDialog] = useState(false);
+  const [deleteAdminsSystemDialog, setDeleteAdminsSystemDialog] =
+    useState(false);
   const toast = useRef(null);
   const dt = useRef(null);
 
@@ -35,18 +36,10 @@ const AdministradoresSistema = () => {
     phone: '',
     password: '',
     user_type: '1',
-        status: '1'
+    status: '',
   };
 
-    async function fetchP() {
+    
-        let nombres = await fetch(urlFetch, { method: 'GET' });
-        let adminRes = await nombres.json();
-        setAdministrators(adminRes.message);
-        console.log(administrators);
-    }
-    useEffect(() => {
-        fetchP();
-    }, [])
 
     function registrarAdmin() {
         var data = {
@@ -91,192 +84,359 @@ const AdministradoresSistema = () => {
             );
     }
 
-
-    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'
+        'Content-Type': 'application/json',
-            }
+      },
     })
-            .then(
+      .then(function (response) {
-                function (response) {
         if (response.status != 201)
           console.log('Ocurrió un error con el servicio: ' + response.status);
-                    else
+        else return response.json();
-                        return response.json();
+      })
-                }
+      .then(function (response) {
-            )
+        let _sysadmin = administrators.filter(
-            .then(
+          (val) => val._id !== sysadmin._id,
-                function (response) {
+        );
-                    let _sysadmin = administrators.filter(val => val._id !== sysadmin._id);
         setAdministrators(_sysadmin);
         setDeleteAdminSystemDialog(false);
         setSysAdmin(emptySysAdmin);
-                    toast.current.show({ severity: 'success', summary: 'Éxito', detail: 'Administrador del Sistema Eliminado', life: 3000 });
+        toast.current.show({
-                }
+          severity: 'success',
-            )
+          summary: 'Éxito',
-            .catch(
+          detail: 'Administrador del Sistema Eliminado',
-                err => {
+          life: 3000,
-                    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 });
+      })
-                }
+      .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 = administrators.filter(val => !selectedAdministrators.includes(val));
+    let _administrators = administrators.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'
+          'Content-Type': 'application/json',
-                }
+        },
-            })
+      });
-        })
+    });
     setAdministrators(_administrators);
     setDeleteAdminsSystemDialog(false);
     setSelectedAdministrators(null);
-        toast.current.show({ severity: 'success', summary: 'Éxito', detail: 'Administradores del Sistema Eliminados', life: 3000 });
+    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={() => confirmDeleteAdminSystem(rowData)} />
+        <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={!selectedAdministrators || !selectedAdministrators.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 = (
     <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 del sistema <i class="fal fa-user"></i>
+      </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>
   );
 
   const deleteAdminSystemDialogFooter = (
     <>
-            <Button label="No" icon="pi pi-times" className="p-button-text" onClick={hideDeleteAdminSystemDialog} />
+      <Button
-            <Button label="Yes" icon="pi pi-check" className="p-button-text" onClick={deleteSysAdmin} />
+        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}
+      />
     </>
   );
 
   const deleteAdminsSystemDialogFooter = (
     <>
-            <Button label="No" icon="pi pi-times" className="p-button-text" onClick={hideDeleteAdminsSystemsDialog} />
+      <Button
-            <Button label="Yes" icon="pi pi-check" className="p-button-text" onClick={deleteSelectedAdminsSystem} />
+        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}
+      />
     </>
   );
 
   const headerName = (
     <>
-            <p> <FontAwesomeIcon icon={faUserAlt} style={{color: "#C08135"}} />  Nombre</p>
+      <p>
+        {' '}
+        <FontAwesomeIcon icon={faUserAlt} style={{ color: '#C08135' }} /> Nombre
+      </p>
     </>
-    )
+  );
 
   const headerLastName = (
     <>
-            <p> <FontAwesomeIcon icon={faUserAlt} style={{color: "#D7A86E"}} />    Apellidos</p>
+      <p>
+        {' '}
+        <FontAwesomeIcon icon={faUserAlt} style={{ color: '#D7A86E' }} />{' '}
+        Apellidos
+      </p>
     </>
-    )
+  );
 
   const headerDNI = (
     <>
-            <p> <FontAwesomeIcon icon={faIdCardAlt} style={{color: "#C08135"}} />    Identificación</p>
+      <p>
+        {' '}
+        <FontAwesomeIcon icon={faIdCardAlt} style={{ color: '#C08135' }} />{' '}
+        Identificación
+      </p>
     </>
-    )
+  );
 
   const headerEmail = (
     <>
-            <p> <FontAwesomeIcon icon={faAt} style={{color: "#D7A86E"}} />    Correo Electrónico</p>
+      <p>
+        {' '}
+        <FontAwesomeIcon icon={faAt} style={{ color: '#D7A86E' }} /> Correo
+        Electrónico
+      </p>
     </>
-    )
+  );
 
   const headerPhone = (
     <>
-            <p> <FontAwesomeIcon icon={faPhoneAlt} style={{color: "#C08135"}} />   Teléfono</p>
+      <p>
+        {' '}
+        <FontAwesomeIcon icon={faPhoneAlt} style={{ color: '#C08135' }} />{' '}
+        Teléfono
+      </p>
     </>
-    )
+  );
 
   const headerOptions = (
     <>
-            <p>Opciones <FontAwesomeIcon icon={faEllipsis} style={{color: "#D7A86E"}} /></p>
+      <p>
+        Opciones{' '}
+        <FontAwesomeIcon icon={faEllipsis} style={{ color: '#D7A86E' }} />
+      </p>
     </>
-    )
+  );
 
   return (
     <div className="grid">
       <div className="col-12">
         <Toast ref={toast} />
         <div className="card">
-                    <Toolbar className="mb-4" left={leftToolbarTemplate} right={rightToolbarTemplate}></Toolbar>
+          <Toolbar
-                    <DataTable ref={dt} value={administrators} dataKey="_id" paginator rows={5} selection={selectedAdministrators} onSelectionChange={(e) => setSelectedAdministrators(e.value)}
+            className="mb-4"
-                        scrollable scrollHeight="400px" scrollDirection="both" header={header}
+            left={leftToolbarTemplate}
-                        rowsPerPageOptions={[5, 10, 25]} className="datatable-responsive mt-3"
+            right={rightToolbarTemplate}
+          ></Toolbar>
+          <DataTable
+            ref={dt}
+            value={administrators}
+            dataKey="_id"
+            paginator
+            rows={5}
+            selection={selectedAdministrators}
+            onSelectionChange={(e) => setSelectedAdministrators(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 del sistema"
-                        globalFilter={globalFilter} emptyMessage="No hay administradores del sistema registrados.">
+            globalFilter={globalFilter}
-                        <Column selectionMode="multiple" headerStyle={{ width: '3rem' }}></Column>
+            emptyMessage="No hay administradores del sistema registrados."
-                        <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
-                        <Column field="dni" sortable header={headerDNI} style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }}>
+              selectionMode="multiple"
-                        </Column>
+              headerStyle={{ width: '3rem' }}
-                        <Column field="email" sortable header={headerEmail} style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }}></Column>
+            ></Column>
-                        <Column field="phone" sortable header={headerPhone} style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }}></Column>
+            <Column
-                        <Column header={headerOptions} style={{ flexGrow: 1, flexBasis: '130px', minWidth: '130px' }} body={actionsAdmin}></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
+              header={headerOptions}
+              style={{ flexGrow: 1, flexBasis: '130px', minWidth: '130px' }}
+              body={actionsAdmin}
+            ></Column>
           </DataTable>
-                    <Dialog visible={deleteAdminSystemDialog} style={{ width: '450px' }} header="Confirmar" modal footer={deleteAdminSystemDialogFooter} onHide={hideDeleteAdminSystemDialog}>
+          <Dialog
+            visible={deleteAdminSystemDialog}
+            style={{ width: '450px' }}
+            header="Confirmar"
+            modal
+            footer={deleteAdminSystemDialogFooter}
+            onHide={hideDeleteAdminSystemDialog}
+          >
             <div className="flex align-items-center justify-content-center">
-                            <i className="pi pi-exclamation-triangle mr-3" style={{ fontSize: '2rem' }} />
+              <i
-                            {sysadmin && <span>¿Estás seguro que desea eliminar a <b>{sysadmin.name}</b>?</span>}
+                className="pi pi-exclamation-triangle mr-3"
+                style={{ fontSize: '2rem' }}
+              />
+              {sysadmin && (
+                <span>
+                  ¿Estás seguro que desea eliminar a <b>{sysadmin.name}</b>?
+                </span>
+              )}
             </div>
           </Dialog>
-                    <Dialog visible={deleteAdminsSystemDialog} style={{ width: '450px' }} header="Confirmar" modal footer={deleteAdminsSystemDialogFooter} onHide={hideDeleteAdminsSystemsDialog}>
+          <Dialog
+            visible={deleteAdminsSystemDialog}
+            style={{ width: '450px' }}
+            header="Confirmar"
+            modal
+            footer={deleteAdminsSystemDialogFooter}
+            onHide={hideDeleteAdminsSystemsDialog}
+          >
             <div className="flex align-items-center justify-content-center">
-                            <i className="pi pi-exclamation-triangle mr-3" style={{ fontSize: '2rem' }} />
+              <i
-                            {selectedAdministrators && <span>¿Está seguro eliminar los adminsitradores del sistema seleccionados?</span>}
+                className="pi pi-exclamation-triangle mr-3"
+                style={{ fontSize: '2rem' }}
+              />
+              {selectedAdministrators && (
+                <span>
+                  ¿Está seguro eliminar los adminsitradores del sistema
+                  seleccionados?
+                </span>
+              )}
             </div>
           </Dialog>
         </div>
@@ -310,8 +470,8 @@ const AdministradoresSistema = () => {
         </div>
       </div>
     </div>
-    )
+  );
-}
+};
 
 const comparisonFn = function (prevProps, nextProps) {
   return prevProps.location.pathname === nextProps.location.pathname;

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

@@ -8,14 +8,13 @@ import { Toast } from 'primereact/toast';
 import classNames from 'classnames';
 import { Dialog } from 'primereact/dialog';
 import { Toolbar } from 'primereact/toolbar';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faHome } 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';
 
 const Communities = () => {
-
   let emptyCommunity = {
     _id: null,
     name: '',
@@ -24,12 +23,11 @@ const Communities = () => {
     district: districtId,
     phone: '',
     num_houses: 0,
-        status: '1',
+    status: 'activo',
     date_entry: new Date(),
     houses: [],
   };
 
-
   const [communitiesList, setCommunitiesList] = useState([]);
   const [community, setCommunity] = useState(emptyCommunity);
 
@@ -49,43 +47,39 @@ const Communities = () => {
   const toast = useRef(null);
   const dt = useRef(null);
 
-
-
   const p = provincesList.map((item) => ({
     label: item.name,
-        value: item.code
+    value: item.code,
-    }))
+  }));
-
 
   const c = cantonsList.map((item) => ({
     label: item.name,
     value: item.code,
-        parent: item.parentCode
+    parent: item.parentCode,
-    }))
+  }));
 
   const d = districtsList.map((item) => ({
     label: item.name,
     value: item.code,
-        parent: item.parentCode
+    parent: item.parentCode,
-    }))
+  }));
-
-
 
   useEffect(() => {
     fillProvinces();
-
+  }, []);
-    }, [])
 
   useEffect(() => {
     fillCantons();
-    }, [provinciaId])
+  }, [provinciaId]);
 
   useEffect(() => {
     fillDistricts();
-    }, [cantonId])
+  }, [cantonId]);
 
   async function getProvinces() {
-        const response = await fetch('assets/demo/data/provincias.json', { method: 'GET' });
+    const response = await fetch('assets/demo/data/provincias.json', {
+      method: 'GET',
+    });
     return await response.json();
   }
 
@@ -95,7 +89,9 @@ const Communities = () => {
   }
 
   async function getCantons() {
-        const response = await fetch('assets/demo/data/cantones.json', { method: 'GET' });
+    const response = await fetch('assets/demo/data/cantones.json', {
+      method: 'GET',
+    });
     return await response.json();
   }
 
@@ -108,7 +104,9 @@ const Communities = () => {
   }
 
   async function getDistricts() {
-        const response = await fetch('assets/demo/data/distritos.json', { method: 'GET' });
+    const response = await fetch('assets/demo/data/distritos.json', {
+      method: 'GET',
+    });
     return await response.json();
   }
 
@@ -123,61 +121,66 @@ const Communities = () => {
   const handleProvinces = (event) => {
     const getprovinciaId = event.target.value;
     setProvinciaId(getprovinciaId);
-    }
+  };
 
   const handleCanton = (event) => {
     const getCantonId = event.target.value;
     setCantonId(getCantonId);
-    }
+  };
 
   const handleDistrict = (event) => {
     const getDistrictId = event.target.value;
     setDistrictId(getDistrictId);
-    }
+  };
-
 
   const handleCodeHouses = (event) => {
     const getcodehouse = event.target.value;
     setCodeHouses(getcodehouse);
-    }
+  };
 
   async function getCommunites() {
-        let response = await fetch('http://localhost:4000/community/allCommunities', { method: 'GET' });
+    let response = await fetch(
+      'http://localhost:4000/community/allCommunities',
+      { method: 'GET' },
+    );
     let resJson = await response.json();
     let pList = await getProvinces();
     let cList = await getCantons();
     let dList = await getDistricts();
     await resJson.message.map((item) => {
-            item.province = pList.find(p => p.code === item.province).name
+      item.province = pList.find((p) => p.code === item.province).name;
-            item.canton = cList.find(p => p.code === item.canton).name
+      item.canton = cList.find((p) => p.code === item.canton).name;
-            item.district = dList.find(p => p.code === item.district).name
+      item.district = dList.find((p) => p.code === item.district).name;
       if (!item.id_admin) {
-                item.name_admin = "Sin Administrador"
+        item.name_admin = 'Sin Administrador';
       }
-        })
+    });
     setCommunitiesList(await resJson.message);
   }
 
   useEffect(() => {
     getCommunites();
-    }, [])
+  }, []);
-
 
   const saveCommunity = () => {
-
+    if (
-        if (community.name && community.num_houses > 0 && provinciaId && cantonId && districtId && community.phone) {
+      community.name &&
+      community.num_houses > 0 &&
+      provinciaId &&
+      cantonId &&
+      districtId &&
+      community.phone
+    ) {
       let _communities = [...communitiesList];
       let _community = { ...community };
       _community.province = provinciaId;
       _community.canton = cantonId;
       _community.district = districtId;
 
-
-
       for (let i = 0; i < _community.num_houses; i++) {
         _community.houses.push({
           number_house: codeHouses + (i + 1),
-                })
+        });
       }
       // console.log(houses)
       fetch('http://localhost:4000/community/createCommunity', {
@@ -185,48 +188,47 @@ const Communities = () => {
         method: 'POST',
         body: JSON.stringify(_community),
         headers: {
-                    'Content-Type': 'application/json'
+          'Content-Type': 'application/json',
-                }
+        },
       })
-                .then(
+        .then(function (response) {
-                    function (response) {
           if (response.status != 201)
             console.log('Ocurrió un error con el servicio: ' + response.status);
-                        else
+          else return response.json();
-                            return response.json();
+        })
-                    }
-                )
         .then(() => {
-
+          _community.province = provincesList.find(
-                    _community.province = provincesList.find(p => p.code === _community.province).name
+            (p) => p.code === _community.province,
-                    _community.canton = cantonsList.find(p => p.code === _community.canton).name
+          ).name;
-                    _community.district = districtsList.find(p => p.code === _community.district).name
+          _community.canton = cantonsList.find(
+            (p) => p.code === _community.canton,
+          ).name;
+          _community.district = districtsList.find(
+            (p) => p.code === _community.district,
+          ).name;
 
           _communities.push(_community);
-                    toast.current.show({ severity: 'success', summary: 'Registro exitoso', detail: 'Comunidad de vivienda Creada', life: 3000 });
+          toast.current.show({
+            severity: 'success',
+            summary: 'Registro exitoso',
+            detail: 'Comunidad de vivienda Creada',
+            life: 3000,
+          });
 
           setCommunitiesList(_communities);
 
-
           setProvinciaId('');
           setCantonId('');
           setDistrictId('');
           setCodeHouses('');
 
           setCommunity(emptyCommunity);
-
         })
-                .catch(
+        .catch((err) => console.log('Ocurrió un error con el fetch', err));
-                    err => console.log('Ocurrió un error con el fetch', err)
-                );
-
-
     } else {
       setSubmitted(true);
-
-        }
-
     }
+  };
 
   const onInputChange = (e, name) => {
     const val = (e.target && e.target.value) || '';
@@ -234,28 +236,26 @@ const Communities = () => {
     _community[`${name}`] = val;
 
     setCommunity(_community);
-    }
+  };
-
 
   const hideDeleteCommunityDialog = () => {
     setDeleteCommunityDialog(false);
-    }
+  };
 
   const hideDeleteCommunitiesDialog = () => {
     setDeleteCommunitiesDialog(false);
-    }
+  };
 
   const confirmDeleteCommunity = (community) => {
     setCommunity(community);
     setDeleteCommunityDialog(true);
-    }
+  };
 
   const confirmDeleteSelected = () => {
     setDeleteCommunitiesDialog(true);
-    }
+  };
 
   const deleteCommunity = () => {
-
     /*   fetch('http://localhost:4000/community/deleteCommunity/' + community._id, {
                cache: 'no-cache',
                method: 'DELETE',
@@ -288,15 +288,22 @@ const Communities = () => {
                    }
                ); 
         */
-        let _community = communitiesList.filter(val => val._id !== community._id);
+    let _community = communitiesList.filter((val) => val._id !== community._id);
     setCommunitiesList(_community);
     setDeleteCommunityDialog(false);
     setCommunity(emptyCommunity);
-        toast.current.show({ severity: 'success', summary: 'Éxito', detail: 'Comunidad de Viviendas Eliminada', life: 3000 });
+    toast.current.show({
-    }
+      severity: 'success',
+      summary: 'Éxito',
+      detail: 'Comunidad de Viviendas Eliminada',
+      life: 3000,
+    });
+  };
 
   const deleteSelectedCommunities = () => {
-        let _communities = communitiesList.filter(val => !selectedCommunities.includes(val));
+    let _communities = communitiesList.filter(
+      (val) => !selectedCommunities.includes(val),
+    );
     /*  selectedCommunities.map((item) => {
              fetch('http://localhost:4000/user/deleteCommunity/' + item._id, {
                  cache: 'no-cache',
@@ -309,140 +316,298 @@ const Communities = () => {
     setCommunitiesList(_communities);
     setDeleteCommunitiesDialog(false);
     setSelectedCommunities(null);
-        toast.current.show({ severity: 'success', summary: 'Éxito', detail: 'Comunidades de Viviendas Eliminadas', life: 3000 });
+    toast.current.show({
-    }
+      severity: 'success',
+      summary: 'Éxito',
+      detail: 'Comunidades de Viviendas Eliminadas',
+      life: 3000,
+    });
+  };
 
   const actionsCommunity = (rowData) => {
     return (
       <div className="actions">
-                <Button icon="pi pi-trash" className="p-button-rounded p-button-danger mt-2" onClick={() => confirmDeleteCommunity(rowData)} />
+        <Button
+          icon="pi pi-trash"
+          className="p-button-rounded p-button-danger mt-2"
+          onClick={() => confirmDeleteCommunity(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={!selectedCommunities || !selectedCommunities.length} />
+          <Button
+            label="Eliminar"
+            icon="pi pi-trash"
+            className="p-button-danger"
+            onClick={confirmDeleteSelected}
+            disabled={!selectedCommunities || !selectedCommunities.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 = (
     <div className="flex flex-column md:flex-row md:justify-content-between md:align-items-center">
       <h5 className="m-0">Comunidade de Viviendas</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>
   );
 
   const deleteCommunityDialogFooter = (
     <>
-            <Button label="No" icon="pi pi-times" className="p-button-text" onClick={hideDeleteCommunityDialog} />
+      <Button
-            <Button label="Yes" icon="pi pi-check" className="p-button-text" onClick={deleteCommunity} />
+        label="No"
+        icon="pi pi-times"
+        className="p-button-text"
+        onClick={hideDeleteCommunityDialog}
+      />
+      <Button
+        label="Yes"
+        icon="pi pi-check"
+        className="p-button-text"
+        onClick={deleteCommunity}
+      />
     </>
   );
 
-    
   const deleteCommutitiesDialogFooter = (
     <>
-            <Button label="No" icon="pi pi-times" className="p-button-text" onClick={hideDeleteCommunitiesDialog} />
+      <Button
-            <Button label="Yes" icon="pi pi-check" className="p-button-text" onClick={deleteSelectedCommunities} />
+        label="No"
+        icon="pi pi-times"
+        className="p-button-text"
+        onClick={hideDeleteCommunitiesDialog}
+      />
+      <Button
+        label="Yes"
+        icon="pi pi-check"
+        className="p-button-text"
+        onClick={deleteSelectedCommunities}
+      />
     </>
   );
 
   const headerName = (
     <>
-            <p> <FontAwesomeIcon icon={faHome} style={{ color: "#C08135" }} />  Nombre</p>
+      <p>
+        {' '}
+        <FontAwesomeIcon icon={faHome} style={{ color: '#C08135' }} /> Nombre
+      </p>
     </>
-    )
+  );
 
   const headerProvince = (
     <>
-            <p> <FontAwesomeIcon icon={faMapLocationDot} style={{ color: "#D7A86E" }} />    Pronvincia</p>
+      <p>
+        {' '}
+        <FontAwesomeIcon
+          icon={faMapLocationDot}
+          style={{ color: '#D7A86E' }}
+        />{' '}
+        Pronvincia
+      </p>
     </>
-    )
+  );
 
   const headerCanton = (
     <>
-            <p> <FontAwesomeIcon icon={faMapLocationDot} style={{ color: "#C08135" }} />    Cantón</p>
+      <p>
+        {' '}
+        <FontAwesomeIcon
+          icon={faMapLocationDot}
+          style={{ color: '#C08135' }}
+        />{' '}
+        Cantón
+      </p>
     </>
-    )
+  );
 
   const headerDistrict = (
     <>
-            <p> <FontAwesomeIcon icon={faMapLocationDot} style={{ color: "#D7A86E" }} />    Distrito</p>
+      <p>
+        {' '}
+        <FontAwesomeIcon
+          icon={faMapLocationDot}
+          style={{ color: '#D7A86E' }}
+        />{' '}
+        Distrito
+      </p>
     </>
-    )
+  );
 
   const headerPhone = (
     <>
-            <p> <FontAwesomeIcon icon={faPhoneAlt} style={{ color: "#C08135" }} />   Teléfono</p>
+      <p>
+        {' '}
+        <FontAwesomeIcon icon={faPhoneAlt} style={{ color: '#C08135' }} />{' '}
+        Teléfono
+      </p>
     </>
-    )
+  );
 
   const headerNumberHouses = (
     <>
-            <p> <FontAwesomeIcon icon={faPhoneAlt} style={{ color: "#D7A86E" }} />   Número de viviendas</p>
+      <p>
+        {' '}
+        <FontAwesomeIcon icon={faPhoneAlt} style={{ color: '#D7A86E' }} />{' '}
+        Número de viviendas
+      </p>
     </>
-    )
+  );
 
   const headerAdministrator = (
     <>
-            <p> <FontAwesomeIcon icon={faPhoneAlt} style={{ color: "#C08135" }} />   Administrador</p>
+      <p>
+        {' '}
+        <FontAwesomeIcon icon={faPhoneAlt} style={{ color: '#C08135' }} />{' '}
+        Administrador
+      </p>
     </>
-    )
+  );
 
   const headerOptions = (
     <>
-            <p>Opciones <FontAwesomeIcon icon={faEllipsis} style={{ color: "#D7A86E" }} /></p>
+      <p>
+        Opciones{' '}
+        <FontAwesomeIcon icon={faEllipsis} style={{ color: '#D7A86E' }} />
+      </p>
     </>
-    )
+  );
 
   return (
     <div className="grid">
       <div className="col-12">
         <Toast ref={toast} />
         <div className="card">
-                    <   Toolbar className="mb-4" left={leftToolbarTemplate} right={rightToolbarTemplate}></Toolbar>
+          <Toolbar
-                    <DataTable ref={dt} value={communitiesList} dataKey="_id" paginator rows={5} selection={selectedCommunities} onSelectionChange={(e) => setSelectedCommunities(e.value)}
+            className="mb-4"
-                        scrollable scrollHeight="400px" scrollDirection="both" header={header}
+            left={leftToolbarTemplate}
-                        rowsPerPageOptions={[5, 10, 25]} className="datatable-responsive mt-3"
+            right={rightToolbarTemplate}
+          ></Toolbar>
+          <DataTable
+            ref={dt}
+            value={communitiesList}
+            dataKey="_id"
+            paginator
+            rows={5}
+            selection={selectedCommunities}
+            onSelectionChange={(e) => setSelectedCommunities(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} comunidades de viviendas"
-                        globalFilter={globalFilter} emptyMessage="No hay comunidades de viviendas registrados.">
+            globalFilter={globalFilter}
-                        <Column selectionMode="multiple" headerStyle={{ width: '3rem' }}></Column>
+            emptyMessage="No hay comunidades de viviendas registrados."
-                        <Column field="name" header={headerName} style={{ flexGrow: 1, flexBasis: '160px' }}></Column>
+          >
-                        <Column field="province" header={headerProvince} style={{ flexGrow: 1, flexBasis: '160px' }}></Column>
+            <Column
-                        <Column field="canton" header={headerCanton} style={{ flexGrow: 1, flexBasis: '160px' }}></Column>
+              selectionMode="multiple"
-                        <Column field="district" header={headerDistrict} style={{ flexGrow: 1, flexBasis: '160px' }}></Column>
+              headerStyle={{ width: '3rem' }}
-                        <Column field="phone" header={headerPhone} style={{ flexGrow: 1, flexBasis: '180px' }}></Column>
+            ></Column>
-                        <Column field="num_houses" header={headerNumberHouses} style={{ flexGrow: 1, flexBasis: '180px' }}></Column>
+            <Column
-                        <Column field="name_admin" header={headerAdministrator} style={{ flexGrow: 1, flexBasis: '180px' }}></Column>
+              field="name"
+              header={headerName}
+              style={{ flexGrow: 1, flexBasis: '160px' }}
+            ></Column>
+            <Column
+              field="province"
+              header={headerProvince}
+              style={{ flexGrow: 1, flexBasis: '160px' }}
+            ></Column>
+            <Column
+              field="canton"
+              header={headerCanton}
+              style={{ flexGrow: 1, flexBasis: '160px' }}
+            ></Column>
+            <Column
+              field="district"
+              header={headerDistrict}
+              style={{ flexGrow: 1, flexBasis: '160px' }}
+            ></Column>
+            <Column
+              field="phone"
+              header={headerPhone}
+              style={{ flexGrow: 1, flexBasis: '180px' }}
+            ></Column>
+            <Column
+              field="num_houses"
+              header={headerNumberHouses}
+              style={{ flexGrow: 1, flexBasis: '180px' }}
+            ></Column>
+            <Column
+              field="name_admin"
+              header={headerAdministrator}
+              style={{ flexGrow: 1, flexBasis: '180px' }}
+            ></Column>
             <Column header={headerOptions} body={actionsCommunity}></Column>
           </DataTable>
-                    <Dialog visible={deleteCommunityDialog} style={{ width: '450px' }} header="Confirmar" modal footer={deleteCommunityDialogFooter} onHide={hideDeleteCommunityDialog}>
+          <Dialog
+            visible={deleteCommunityDialog}
+            style={{ width: '450px' }}
+            header="Confirmar"
+            modal
+            footer={deleteCommunityDialogFooter}
+            onHide={hideDeleteCommunityDialog}
+          >
             <div className="flex align-items-center justify-content-center">
-                            <i className="pi pi-exclamation-triangle mr-3" style={{ fontSize: '2rem' }} />
+              <i
-                            {community && <span>¿Estás seguro que desea eliminar a <b>{community.name}</b>?</span>}
+                className="pi pi-exclamation-triangle mr-3"
+                style={{ fontSize: '2rem' }}
+              />
+              {community && (
+                <span>
+                  ¿Estás seguro que desea eliminar a <b>{community.name}</b>?
+                </span>
+              )}
             </div>
           </Dialog>
-                    <Dialog visible={deleteCommunitiesDialog} style={{ width: '450px' }} header="Confirmar" modal footer={deleteCommutitiesDialogFooter} onHide={hideDeleteCommunitiesDialog}>
+          <Dialog
+            visible={deleteCommunitiesDialog}
+            style={{ width: '450px' }}
+            header="Confirmar"
+            modal
+            footer={deleteCommutitiesDialogFooter}
+            onHide={hideDeleteCommunitiesDialog}
+          >
             <div className="flex align-items-center justify-content-center">
-                            <i className="pi pi-exclamation-triangle mr-3" style={{ fontSize: '2rem' }} />
+              <i
-                            {selectedCommunities && <span>¿Está seguro eliminar los adminsitradores del sistema seleccionados?</span>}
+                className="pi pi-exclamation-triangle mr-3"
+                style={{ fontSize: '2rem' }}
+              />
+              {selectedCommunities && (
+                <span>
+                  ¿Está seguro eliminar los adminsitradores del sistema
+                  seleccionados?
+                </span>
+              )}
             </div>
           </Dialog>
         </div>
@@ -458,9 +623,20 @@ const Communities = () => {
                   <span className="p-inputgroup-addon p-button p-icon-input-khaki">
                     <i className="pi pi-home"></i>
                   </span>
-                                    <InputText id="name" value={community.name} onChange={(e) => onInputChange(e, 'name')} required autoFocus className={classNames({ 'p-invalid': submitted && community.name === '' })} />
+                  <InputText
+                    id="name"
+                    value={community.name}
+                    onChange={(e) => onInputChange(e, 'name')}
+                    required
+                    autoFocus
+                    className={classNames({
+                      'p-invalid': submitted && community.name === '',
+                    })}
+                  />
                 </div>
-                                {submitted && community.name === '' && <small className="p-invalid">Nombre es requirido.</small>}
+                {submitted && community.name === '' && (
+                  <small className="p-invalid">Nombre es requirido.</small>
+                )}
               </div>
             </div>
             <div className="field col-12 md:col-6">
@@ -470,9 +646,21 @@ const Communities = () => {
                   <span className="p-inputgroup-addon p-button p-icon-input-khaki">
                     <i className="pi pi-map-marker"></i>
                   </span>
-                                    <Dropdown placeholder="--Seleccione Provincia--" value={provinciaId} options={p} onChange={handleProvinces} required autoFocus className={classNames({ 'p-invalid': submitted && !provinciaId })} />
+                  <Dropdown
+                    placeholder="--Seleccione Provincia--"
+                    value={provinciaId}
+                    options={p}
+                    onChange={handleProvinces}
+                    required
+                    autoFocus
+                    className={classNames({
+                      'p-invalid': submitted && !provinciaId,
+                    })}
+                  />
                 </div>
-                                {submitted && !provinciaId && <small className="p-invalid">Provincia es requirido.</small>}
+                {submitted && !provinciaId && (
+                  <small className="p-invalid">Provincia es requirido.</small>
+                )}
               </div>
             </div>
             <div className="field col-12 md:col-6">
@@ -482,9 +670,21 @@ const Communities = () => {
                   <span className="p-inputgroup-addon p-button p-icon-input-khaki">
                     <i className="pi pi-map-marker"></i>
                   </span>
-                                    <Dropdown placeholder="--Seleccione Cantón--" value={cantonId} options={c} onChange={handleCanton} required autoFocus className={classNames({ 'p-invalid': submitted && !cantonId })} />
+                  <Dropdown
+                    placeholder="--Seleccione Cantón--"
+                    value={cantonId}
+                    options={c}
+                    onChange={handleCanton}
+                    required
+                    autoFocus
+                    className={classNames({
+                      'p-invalid': submitted && !cantonId,
+                    })}
+                  />
                 </div>
-                                {submitted && !cantonId && <small className="p-invalid">Cantón es requirido.</small>}
+                {submitted && !cantonId && (
+                  <small className="p-invalid">Cantón es requirido.</small>
+                )}
               </div>
             </div>
             <div className="field col-12 md:col-6">
@@ -494,9 +694,21 @@ const Communities = () => {
                   <span className="p-inputgroup-addon p-button p-icon-input-khaki">
                     <i className="pi pi-map-marker"></i>
                   </span>
-                                    <Dropdown placeholder="--Seleccione Distrito--" value={districtId} options={d} onChange={handleDistrict} required autoFocus className={classNames({ 'p-invalid': submitted && !districtId })} />
+                  <Dropdown
+                    placeholder="--Seleccione Distrito--"
+                    value={districtId}
+                    options={d}
+                    onChange={handleDistrict}
+                    required
+                    autoFocus
+                    className={classNames({
+                      'p-invalid': submitted && !districtId,
+                    })}
+                  />
                 </div>
-                                {submitted && !districtId && <small className="p-invalid">Distrito es requirido.</small>}
+                {submitted && !districtId && (
+                  <small className="p-invalid">Distrito es requirido.</small>
+                )}
               </div>
             </div>
             <div className="field col-12 md:col-6">
@@ -506,9 +718,22 @@ const Communities = () => {
                   <span className="p-inputgroup-addon p-button p-icon-input-khaki">
                     <i className="pi pi-phone"></i>
                   </span>
-                                    <InputText id="phone" value={community.phone} onChange={(e) => onInputChange(e, 'phone')} required autoFocus className={classNames({ 'p-invalid': submitted && community.phone === '' })} />
+                  <InputText
+                    id="phone"
+                    value={community.phone}
+                    onChange={(e) => onInputChange(e, 'phone')}
+                    required
+                    autoFocus
+                    className={classNames({
+                      'p-invalid': submitted && community.phone === '',
+                    })}
+                  />
                 </div>
-                                {submitted && community.phone === '' && <small className="p-invalid">Número de teléfono es requirido.</small>}
+                {submitted && community.phone === '' && (
+                  <small className="p-invalid">
+                    Número de teléfono es requirido.
+                  </small>
+                )}
               </div>
             </div>
             <div className="field col-12 md:col-6">
@@ -518,34 +743,62 @@ const Communities = () => {
                   <span className="p-inputgroup-addon p-button p-icon-input-khaki">
                     <i className="pi pi-hashtag"></i>
                   </span>
-                                    <InputText id="num_houses" value={community.num_houses} onChange={(e) => onInputChange(e, 'num_houses')} required autoFocus className={classNames({ 'p-invalid': submitted && community.num_houses < 1 })} />
+                  <InputText
+                    id="num_houses"
+                    value={community.num_houses}
+                    onChange={(e) => onInputChange(e, 'num_houses')}
+                    required
+                    autoFocus
+                    className={classNames({
+                      'p-invalid': submitted && community.num_houses < 1,
+                    })}
+                  />
                 </div>
-                                {submitted && community.num_houses < 1 && <small className="p-invalid">Número de viviendas es requirido y debe ser mayor que 0.</small>}
+                {submitted && community.num_houses < 1 && (
+                  <small className="p-invalid">
+                    Número de viviendas es requirido y debe ser mayor que 0.
+                  </small>
+                )}
               </div>
             </div>
             <div className="field col-12 md:col-6">
-                            <label htmlFor="numHouse">Ingrese el prefijo para el código de las viviendas</label>
+              <label htmlFor="numHouse">
+                Ingrese el prefijo para el código de las viviendas
+              </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-hashtag"></i>
                   </span>
-                                    <InputText id="code_houses" value={codeHouses} onChange={handleCodeHouses} autoFocus className={classNames({ 'p-invalid': submitted && codeHouses === '' })} />
+                  <InputText
+                    id="code_houses"
+                    value={codeHouses}
+                    onChange={handleCodeHouses}
+                    autoFocus
+                    className={classNames({
+                      'p-invalid': submitted && codeHouses === '',
+                    })}
+                  />
                 </div>
-                                {submitted && codeHouses === '' && <small className="p-invalid">El código para las viviendas es requirido.</small>}
+                {submitted && codeHouses === '' && (
+                  <small className="p-invalid">
+                    El código para las viviendas es requirido.
+                  </small>
+                )}
               </div>
             </div>
             <div className="col-12 md:col-12 py-2">
-                            <Button label="Registrar" icon="pi pi-check" onClick={saveCommunity}></Button>
+              <Button
-
+                label="Registrar"
+                icon="pi pi-check"
+                onClick={saveCommunity}
+              ></Button>
             </div>
           </div>
         </div>
       </div>
     </div>
-
+  );
-
+};
-    )
-}
 
 export default React.memo(Communities);

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

@@ -5,9 +5,10 @@ import { DataTable } from 'primereact/datatable';
 import { Column } from 'primereact/column';
 
 const GuardasSeguridad = () => {
-
   const [pokemones, setPokemones] = useState([]);
-    const [urlFetch,setUrlFetch]=useState('http://localhost:4000/user/findGuards/62be68215692582bbfd77134');
+  const [urlFetch, setUrlFetch] = useState(
+    'http://localhost:4000/user/findGuards/62be68215692582bbfd77134',
+  );
   async function fetchP() {
     let nombres = await fetch(urlFetch, { method: 'GET' });
     let pokemonesRes = await nombres.json();
@@ -16,7 +17,7 @@ const GuardasSeguridad = () => {
   }
   useEffect(() => {
     fetchP();
-    },[])
+  }, []);
 
   function registrarGuarda() {
     var data = {
@@ -26,21 +27,21 @@ 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
+      user_type: '4', //4 es guarda
-            status: "1",
+      status: '1',
-            community_id:"62be68215692582bbfd77134"
+      community_id: '62be68215692582bbfd77134',
     };
     var data2 = {
-            dni: "98765",
+      dni: '98765',
-            name: "Danielito",
+      name: 'Danielito',
-            last_name: "Rodriguez",
+      last_name: 'Rodriguez',
-            email: "danirodriguez@gmail.com",
+      email: 'danirodriguez@gmail.com',
       phone: 84664515,
-            password: "1203",
+      password: '1203',
-            user_type: "2",
+      user_type: '2',
-            status: "4",
+      status: '4',
-            community_id:"62be68215692582bbfd77134"
+      community_id: '62be68215692582bbfd77134',
-        }
+    };
     console.log(data2);
 
     fetch('http://localhost:4000/user/createGuard', {
@@ -49,25 +50,18 @@ const GuardasSeguridad = () => {
       mode: 'cors',
       body: JSON.stringify(data2),
       headers: {
-                'Content-Type': 'application/json'
+        'Content-Type': 'application/json',
-            }
+      },
     })
-        .then(
+      .then(function (response) {
-            function (response) {
         if (response.status != 201)
           console.log('Ocurrió un error con el servicio: ' + response.status);
-                else
+        else return response.json();
-                    return response.json();
+      })
-            }
+      .then(function (response) {
-        )
-        .then(
-            function (response) {
         fetchP();
-            }
+      })
-        )
+      .catch((err) => console.log('Ocurrió un error con el fetch', err));
-        .catch(
-            err => console.log('Ocurrió un error con el fetch', err)
-        );
   }
 
   return (
@@ -75,12 +69,39 @@ const GuardasSeguridad = () => {
       <div className="col-12">
         <div className="card">
           <h5>Guardas de seguridad</h5>
-                    <DataTable value={pokemones}  scrollable scrollHeight="400px" scrollDirection="both" className="mt-3">
+          <DataTable
-                        <Column field="name" header="Nombre" style={{ flexGrow: 1, flexBasis: '160px' }}></Column>
+            value={pokemones}
-                        <Column field="last_name" header="Apellidos" style={{ flexGrow: 1, flexBasis: '160px' }} alignFrozen="left"></Column>
+            scrollable
-                        <Column field="dni" header="Identificación" style={{ flexGrow: 1, flexBasis: '160px' }}></Column>
+            scrollHeight="400px"
-                        <Column field="email" header="Correo electrónico" style={{ flexGrow: 1, flexBasis: '160px' }}></Column>
+            scrollDirection="both"
-                        <Column field="phone" header="Telefóno" style={{ flexGrow: 1, flexBasis: '160px' }}></Column>
+            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>
           </DataTable>
         </div>
       </div>
@@ -113,9 +134,7 @@ const GuardasSeguridad = () => {
         </div>
       </div>
     </div>
-
+  );
-        
+};
-    )
-}
 
 export default React.memo(GuardasSeguridad);

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

@@ -1,27 +1,30 @@
 import { Button } from 'primereact/button';
 import { Dropdown } from 'primereact/dropdown';
-import { InputText } from 'primereact/inputtext'
+import { InputText } from 'primereact/inputtext';
-import React, { useEffect, useState } from 'react'
+import React, { useEffect, useState } from 'react';
 
 const Inquilinos = () => {
   const [communitiesList, setCommunitiesList] = useState([]);
-  const communityIdList = communitiesList.map(community => community.id);
+  const communityIdList = communitiesList.map((community) => community.id);
   async function getCommunites() {
-    let response = await fetch('http://localhost:4000/community/allCommunities', { method: 'GET' });
+    let response = await fetch(
+      'http://localhost:4000/community/allCommunities',
+      { method: 'GET' },
+    );
     let list = await response.json();
     setCommunitiesList(list.message);
   }
 
   useEffect(() => {
     getCommunites();
-  }, [])
+  }, []);
   function registrarInquilino() {
     let data = {
       email: document.getElementById('correo_electronico').value,
       community_id: document.getElementById('numero_vivienda').value,
       user_type: '3',
       status: '1',
-    }
+    };
 
     fetch('http://localhost:3000/api/createUser', {
       method: 'POST',
@@ -32,11 +35,11 @@ const Inquilinos = () => {
       },
     }).then((response) => {
       if (response.ok) {
-        alert('Inquilino registrado correctamente')
+        alert('Inquilino registrado correctamente');
       } else {
-        alert('Error al registrar inquilino')
+        alert('Error al registrar inquilino');
       }
-    })
+    });
   }
 
   return (
@@ -47,18 +50,26 @@ const Inquilinos = () => {
           <div className="p-fluid formgrid grid">
             <div className="p-field col-12 md:col-6">
               <label htmlFor="correo_electronico">Correo electrónico</label>
-              <InputText type="email" className="form-control" id="correo_electronico" />
+              <InputText
+                type="email"
+                className="form-control"
+                id="correo_electronico"
+              />
             </div>
             <div className="p-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={communityIdList[0]}
+                options={communitiesList}
+              />
             </div>
             <Button label="Registrar" onClick={registrarInquilino} />
           </div>
         </div>
       </div>
     </div>
-  )
+  );
-}
+};
 
 export default React.memo(Inquilinos);

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

@@ -2,7 +2,6 @@ import React from 'react';
 import { InputText } from 'primereact/inputtext';
 
 const LogIn = () => {
-
   return (
     <div className="grid">
       <div className="col-12">
@@ -23,11 +22,9 @@ const LogIn = () => {
         </div>
       </div>
     </div>
-    )
+  );
-}
+};
 
-export default LogIn
+export default LogIn;
 
 /* image 1 */
-
-

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

@@ -3,7 +3,7 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import App from './App';
 //import * as serviceWorker from './serviceWorker';
-import { HashRouter } from 'react-router-dom'
+import { HashRouter } from 'react-router-dom';
 import ScrollToTop from './ScrollToTop';
 
 ReactDOM.render(
@@ -12,7 +12,7 @@ ReactDOM.render(
       <App></App>
     </ScrollToTop>
   </HashRouter>,
-    document.getElementById('root')
+  document.getElementById('root'),
 );
 
 // If you want your app to work offline and load faster, you can change