Merge branch 'dev' into UH-iniciarsesionV2

.envrc

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+# ^ added for shellcheck and file-type detection
+
+# Watch & reload direnv on change
+watch_file devshell.toml
+
+if [[ $(type -t use_flake) != function ]]; then
+  echo "ERROR: use_flake function missing."
+  echo "Please update direnv to v2.30.0 or later."
+  exit 1
+fi
+use flake

.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 { Controller, Get, Post, Put, 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) {}
@@ -11,12 +11,11 @@ export class AppController {
     @Body('last_name') last_name: string,
     @Body('email') email: string,
     @Body('phone') phone: number,
-    @Body('password') password: string,
     @Body('user_type') user_type: string,
     @Body('status') status: string,
     @Body('date_entry') date_entry: Date,
   ) {
-    return this.appService.createAdminSystem(dni, name, last_name, email, phone, password,
+    return this.appService.createAdminSystem(dni, name, last_name, email, phone, 
             user_type, status, date_entry);
   }
 
@@ -28,13 +27,29 @@ export class AppController {
     @Body('last_name') last_name: string,
     @Body('email') email: string,
     @Body('phone') phone: number,
-    @Body('password') password: string,
+    @Body('user_type') user_type: string,
+    @Body('status') status: string,
+    @Body('date_entry') date_entry: Date,
+    @Body('community_id') community_id: string,
+  ) {
+    return this.appService.createGuard(dni, name, last_name, email, phone,
+      user_type, status, date_entry,community_id);
+  }
+
+  @Post('user/createAdminCommunity')
+  createAdminCommunity(
+    //Nombre, Apellidos, Correo electrónico, Cédula, Teléfono, Contraseña
+    @Body('dni') dni: string,
+    @Body('name') name: string,
+    @Body('last_name') last_name: string,
+    @Body('email') email: string,
+    @Body('phone') phone: number,
     @Body('user_type') user_type: string,
     @Body('status') status: string,
     @Body('date_entry') date_entry: Date,
     @Body('community_id') community_id:string
   ) {
-    return this.appService.createGuard(dni, name, last_name, email, phone, password,
+    return this.appService.createAdminCommunity(dni, name, last_name, email, phone,
       user_type, status, date_entry,community_id);
   }
 
@@ -51,8 +66,45 @@ 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,
+    );
+  }
+
+  @Put('user/updateUser')
+  updateUser(
+    @Body('dni') dni: string,
+    @Body('name') name: string,
+    @Body('last_name') last_name: string,
+    @Body('email') email: string,
+    @Body('phone') phone: number,
+    @Body('password') password: string,
+    @Body('user_type') user_type: string,
+    @Body('status') status: string,
+    @Body('date_entry') date_entry: Date,
+    @Body('community_id') community_id: string,
+  ) {
+    return this.appService.updateUser(
+      dni,
+      name,
+      last_name,
+      email,
+      phone,
+      password,
+      user_type,
+      status,
+      date_entry,
+      community_id,
+    );
   }
 
   @Get('user/allUsers')
@@ -77,28 +129,40 @@ export class AppController {
   allUsersAdminComunidad() {
     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/findTenants/:community_id')
+  allUsersTenants(@Param('community_id') paramCommunity_id: string) {
+    return this.appService.findTenantsCommunity(paramCommunity_id);
+  }
+  
   @Get('user/find/:dni')
-  findUser(
+  findUser(@Param('dni') paramUserDNI: string) {
-    @Param('dni') paramUserDNI: string
-  ) {
     return this.appService.findUser(paramUserDNI);
   }
 
+  @Get('user/findUserById/:id')
+  findUserById(@Param('id') id: string) {
+    return this.appService.findUserById(id);
+  }
 
   @Delete('user/deleteAdminSystem/:id')
-  deleteAdminSystem(
+  deleteAdminSystem(@Param('id') id: string) {
-    @Param('id') id: string,
-  ) {
     return this.appService.deleteAdminSystem(id);
   }
 
+  @Post('user/changeStatus')
+  changeStatusUser(
+    @Body('id') pId: string,
+    @Body('status') pStatus: string,
+  ) {
+    return this.appService.changeStatusUser(pId, pStatus);
+  }
+
   // #==== API Communities
   @Post('community/createCommunity')
   createCommunity(
@@ -111,11 +175,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')
@@ -124,28 +195,26 @@ 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);
   }
-
+  @Post('community/changeStatus')
+  changeStatusCommunity(
+    @Body('id') pId: string,
+    @Body('status') pStatus: string,
+  ) {
+    return this.appService.changeStatusCommunity(pId, pStatus);
+  }
   // #==== API Common Areas
   @Post('commonArea/createCommonArea')
   createCommonArea(
@@ -155,25 +224,36 @@ 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);
   }
 
+  @Get('commonArea/findByCommunity/:community_id')
+  findByCommunity(@Param('community_id') paramCommunityId: string) {
+    return this.appService.findByCommunity(paramCommunityId);
+  }
+
+
+  @Delete('commonArea/deleteCommonArea/:id')
+  deleteCommonArea(@Param('id') id: string) {
+    return this.appService.deleteCommonArea(id);
+  }
+
   // #==== API GUEST
   //#API userService - create user
   @Post('guest/createGuest')
@@ -186,7 +266,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')
@@ -195,13 +283,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')
@@ -214,8 +299,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')
@@ -224,9 +316,7 @@ export class AppController {
   }
 
   @Get('payment/find/:dni')
-  findPayment(
+  findPayment(@Param('dni') paramPaymentDNI: string) {
-    @Param('dni') paramPaymentDNI: string
-  ) {
     return this.appService.findPayment(paramPaymentDNI);
   }
 
@@ -241,8 +331,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')
@@ -251,13 +347,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')
@@ -276,13 +369,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')
@@ -301,14 +391,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')
@@ -318,7 +404,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')
@@ -327,26 +418,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,61 +1,121 @@
 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 })),
+  }
-      );
+
+  updateUser(
+    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: 'updateUser' };
+    const payload = {
+      dni: dni,
+      name: name,
+      last_name: last_name,
+      email: email,
+      phone: phone,
+      password: password,
+      user_type: user_type,
+      status: status,
+      date_entry: date_entry,
+      community_id: community_id,
+    };
+    return this.clientUserApp
+      .send<string>(pattern, payload)
+      .pipe(map((message: string) => ({ message })));
   }
 
   //POST parameter from API
   createAdminSystem(dni: string, name: string, last_name: string, email: string, phone: number
-    , password: string, user_type: string, status: string, date_entry: Date) {
+    , user_type: string, status: string, date_entry: Date) {
     const pattern = { cmd: 'createAdminSystem' };
     const payload = {
       dni: dni, name: name, last_name: last_name, email: email, phone: phone,
-      password: password, user_type: user_type, status: status, date_entry: date_entry
+      password: this.generatePassword(), user_type: user_type, status: status, date_entry: date_entry
     };
     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
-    , password: string, user_type: string, status: string, date_entry: Date, community_id: string) {
+    , user_type: string, status: string, date_entry: Date, community_id: string) {
     const pattern = { cmd: 'createGuard' };
     const payload = {
       dni: dni, name: name, last_name: last_name, email: email, phone: phone,
-      password: password, user_type: user_type, status: status, date_entry: date_entry, community_id
+      password: this.generatePassword(), user_type: user_type, status: status, date_entry: date_entry, community_id
+
+    };
+    return this.clientUserApp
+      .send<string>(pattern, payload)
+      .pipe(map((message: string) => ({ message })));
+  }
+
+
+  createAdminCommunity(dni: string, name: string, last_name: string, email: string, phone: number
+    , user_type: string, status: string, date_entry: Date, community_id: string) {
+    const pattern = { cmd: 'createAdminCommunity' };
+    const payload = {
+      dni: dni, name: name, last_name: last_name, email: email, phone: phone,
+      password: this.generatePassword(), user_type: user_type, status: status, date_entry: date_entry, community_id
 
     };
     return this.clientUserApp
@@ -70,9 +130,7 @@ export class AppService {
     const payload = {};
     return this.clientUserApp
       .send<string>(pattern, payload)
-      .pipe(
+      .pipe(map((message: string) => ({ message })));
-        map((message: string) => ({ message })),
-      );
   }
 
   allUsersAdminSistema() {
@@ -80,14 +138,20 @@ export class AppService {
     const payload = {};
     return this.clientUserApp
       .send<string>(pattern, payload)
-      .pipe(
+      .pipe(map((message: string) => ({ message })));
-        map((message: string) => ({ message })),
-      );
   }
 
   allUsersAdminComunidad() {
     const pattern = { cmd: 'findAdminComunidad' };
     const payload = {};
+    return this.clientUserApp
+      .send<string>(pattern, payload)
+      .pipe(map((message: string) => ({ message })));
+  }
+
+  allUsersTenants() {
+    const pattern = { cmd: 'findTenants' };
+    const payload = {};
     return this.clientUserApp
       .send<string>(pattern, payload)
       .pipe(
@@ -95,15 +159,14 @@ export class AppService {
       );
   }
 
+
   //GET parameter from API
   findUser(paramUserDNI: string) {
     const pattern = { cmd: 'findUserDNI' };
     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) {
@@ -111,20 +174,23 @@ 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 })),
-      );
   }
 
+  findTenantsCommunity(community_id: string) {
+    const pattern = { cmd: 'findTenantsCommunity' };
+    const payload = { community_id: community_id };
+    return this.clientUserApp
+      .send<string>(pattern, payload)
+      .pipe(map((message: string) => ({ message })));
+  }
 
   deleteAdminSystem(id: string) {
     const pattern = { cmd: 'deleteAdminSystem' };
     const payload = { id: id };
     return this.clientUserApp
       .send<string>(pattern, payload)
-      .pipe(
+      .pipe(map((message: string) => ({ message })));
-        map((message: string) => ({ message })),
-      );
   }
 
   inicioSesion(pEmail: string, pPassword: string) {
@@ -132,38 +198,64 @@ 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 })),
-      );
   }
 
+
+  //GET parameter from API
+  findUserById(id: string) {
+    const pattern = { cmd: 'findById' };
+    const payload = { id: id };
+    return this.clientUserApp
+      .send<string>(pattern, payload)
+      .pipe(map((message: string) => ({ message })));
+  }
+
+  changeStatusUser(pId: string, pStatus: string) {
+    const pattern = { cmd: 'changeStatus' };
+    const payload = { id: pId, status: pStatus };
+    return this.clientUserApp
+      .send<string>(pattern, payload)
+      .pipe(map((message: string) => ({ message })));
+  }
+
+
   // ====================== COMMUNITIES ===============================
+  changeStatusCommunity(pId: string, pStatus: string) {
+    const pattern = { cmd: 'changeStatus' };
+    const payload = { id: pId, status: pStatus };
+    return this.clientCommunityApp
+      .send<string>(pattern, payload)
+      .pipe(map((message: string) => ({ message })));
+  }
 
   //POST parameter from API
   createCommunity(name: string, province: string, canton: string, district: string
     , num_houses: number, phone: string, status: string, date_entry: Date, houses: []) {
     const pattern = { cmd: 'createCommunity' };
     const payload = {
-      name: name, 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() {
@@ -171,9 +263,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
@@ -182,9 +272,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) {
@@ -192,27 +280,30 @@ 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,
+      status: '1'
     };
     return this.clientCommonAreaApp
       .send<string>(pattern, payload)
-      .pipe(
+      .pipe(map((message: string) => ({ message })));
-        map((message: string) => ({ message })),
-      );
   }
 
   allCommonAreas() {
@@ -220,9 +311,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
@@ -231,18 +320,41 @@ export class AppService {
     const payload = { id: paramCommonAreaId };
     return this.clientCommonAreaApp
       .send<string>(pattern, payload)
-      .pipe(
+      .pipe(map((message: string) => ({ message })));
-        map((message: string) => ({ message })),
-      );
   }
 
 
+  //GET parameter from API
+  findByCommunity(paramCommunityId: string) {
+    const pattern = { cmd: 'findByCommunity' };
+    const payload = { community_id: paramCommunityId };
+    return this.clientCommonAreaApp
+      .send<string>(pattern, payload)
+      .pipe(map((message: string) => ({ message })));
+  }
+
+
+  //DELETE parameter from API
+  deleteCommonArea(paramCommonAreaId: string) {
+    const pattern = { cmd: 'removeCommonArea' };
+    const payload = { id: paramCommonAreaId };
+    return this.clientCommonAreaApp
+      .send<string>(pattern, payload)
+      .pipe(map((message: string) => ({ message })));
+  }
+
   // ====================== GUESTS ===============================
 
-
   //POST parameter from API
-  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,
@@ -250,9 +362,7 @@ export class AppService {
     };
     return this.clientGuestApp
       .send<string>(pattern, payload)
-      .pipe(
+      .pipe(map((message: string) => ({ message })));
-        map((message: string) => ({ message })),
-      );
   }
 
   allGuests() {
@@ -260,9 +370,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
@@ -271,16 +379,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,
@@ -288,9 +401,7 @@ export class AppService {
     };
     return this.clientPaymentApp
       .send<string>(pattern, payload)
-      .pipe(
+      .pipe(map((message: string) => ({ message })));
-        map((message: string) => ({ message })),
-      );
   }
 
   allPayments() {
@@ -298,9 +409,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
@@ -309,12 +418,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
@@ -327,9 +433,7 @@ export class AppService {
     };
     return this.clientReservationApp
       .send<string>(pattern, payload)
-      .pipe(
+      .pipe(map((message: string) => ({ message })));
-        map((message: string) => ({ message })),
-      );
   }
 
   allReservations() {
@@ -337,9 +441,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
@@ -348,12 +450,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
@@ -366,9 +465,7 @@ export class AppService {
     };
     return this.clientPostApp
       .send<string>(pattern, payload)
-      .pipe(
+      .pipe(map((message: string) => ({ message })));
-        map((message: string) => ({ message })),
-      );
   }
 
   allPosts() {
@@ -376,9 +473,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
@@ -387,9 +482,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 ===============================
@@ -404,9 +497,7 @@ export class AppService {
     };
     return this.clientPostApp
       .send<string>(pattern, payload)
-      .pipe(
+      .pipe(map((message: string) => ({ message })));
-        map((message: string) => ({ message })),
-      );
   }
 
   allComments() {
@@ -414,9 +505,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
@@ -425,9 +514,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 ===============================
@@ -442,9 +529,7 @@ export class AppService {
     };
     return this.clientReportApp
       .send<string>(pattern, payload)
-      .pipe(
+      .pipe(map((message: string) => ({ message })));
-        map((message: string) => ({ message })),
-      );
   }
 
   allReports() {
@@ -452,9 +537,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
@@ -463,20 +546,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) {
@@ -484,8 +562,24 @@ 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 })),
+  }
-      );
+
+
+
+  /* Function to generate combination of password */
+  generatePassword() {
+    var pass = '';
+    var str = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' +
+      'abcdefghijklmnopqrstuvwxyz0123456789@#$';
+
+    for (let i = 1; i <= 8; i++) {
+      var char = Math.floor(Math.random()
+        * str.length + 1);
+
+      pass += str.charAt(char)
+    }
+
+    return pass;
   }
 }

devshell.toml

@@ -0,0 +1,4 @@
+# https://numtide.github.io/devshell
+[[commands]]
+package = "devshell.cli"
+help = "Per project developer environments"

flake.lock

@@ -0,0 +1,92 @@
+{
+  "nodes": {
+    "devshell": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1658746384,
+        "narHash": "sha256-CCJcoMOcXyZFrV1ag4XMTpAPjLWb4Anbv+ktXFI1ry0=",
+        "owner": "numtide",
+        "repo": "devshell",
+        "rev": "0ffc7937bb5e8141af03d462b468bd071eb18e1b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "devshell",
+        "type": "github"
+      }
+    },
+    "flake-utils": {
+      "locked": {
+        "lastModified": 1642700792,
+        "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "846b2ae0fc4cc943637d3d1def4454213e203cba",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_2": {
+      "locked": {
+        "lastModified": 1656928814,
+        "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1643381941,
+        "narHash": "sha256-pHTwvnN4tTsEKkWlXQ8JMY423epos8wUOhthpwJjtpc=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "5efc8ca954272c4376ac929f4c5ffefcc20551d5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1659782844,
+        "narHash": "sha256-tM/qhHFE61puBxh9ebP3BIG1fkRAT4rHqD3jCM0HXGY=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "c85e56bb060291eac3fb3c75d4e0e64f6836fcfe",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "type": "indirect"
+      }
+    },
+    "root": {
+      "inputs": {
+        "devshell": "devshell",
+        "flake-utils": "flake-utils_2",
+        "nixpkgs": "nixpkgs_2"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

flake.nix

@@ -0,0 +1,20 @@
+{
+  description = "virtual environments";
+
+  inputs.devshell.url = "github:numtide/devshell";
+  inputs.flake-utils.url = "github:numtide/flake-utils";
+
+  outputs = { self, flake-utils, devshell, nixpkgs }:
+    flake-utils.lib.eachDefaultSystem (system: {
+      devShell =
+        let pkgs = import nixpkgs {
+          inherit system;
+
+          overlays = [ devshell.overlay ];
+        };
+        in
+        pkgs.devshell.mkShell {
+          imports = [ (pkgs.devshell.importTOML ./devshell.toml) ];
+        };
+    });
+}

mobile-ui/.gitignore

@@ -1,6 +1,5 @@
 node_modules/
 .expo/
-dist/
 npm-debug.*
 *.jks
 *.p8
@@ -9,6 +8,6 @@ npm-debug.*
 *.mobileprovision
 *.orig.*
 web-build/
-
+.vscode
-# macOS
 .DS_Store
+

mobile-ui/App.js

@@ -0,0 +1,138 @@
+import React from "react";
+import {
+  Text,
+  Link,
+  HStack,
+  Center,
+  Heading,
+  Switch,
+  useColorMode,
+  NativeBaseProvider,
+  extendTheme,
+  VStack,
+  Box,
+  FormControl,
+  Input,
+  Button,
+  Image
+} from "native-base";
+import NativeBaseIcon from "./components/NativeBaseIcon";
+import { Platform } from "react-native";
+
+// Define the config
+const config = {
+  useSystemColorMode: false,
+  initialColorMode: "dark",
+};
+
+// extend the theme
+export const theme = extendTheme({ config,
+colors: {
+  brown: "#D7A86E"
+} });
+
+//const logo = require('./assets/')
+
+export default function App() {
+  return (
+    <NativeBaseProvider>
+      <Center w="100%">
+        <Box safeArea p="2" py="8" w="90%" maxW="290">
+        {/* <Image source={{
+      uri: logo.default.src
+    }} width={500} height={500}
+    alt="Katoikia logo" size="xl" /> */}
+
+          <Heading
+            size="lg"
+            fontWeight="600"
+            color="coolGray.800"
+            _dark={{
+              color: "warmGray.50",
+            }}
+          >
+            Bienvenido a Katoikia 
+          </Heading>
+          <Heading
+            mt="1"
+            _dark={{
+              color: "warmGray.200",
+            }}
+            color="coolGray.600"
+            fontWeight="medium"
+            size="xs"
+          >
+             Su app de comunidad de confianza
+          </Heading>
+
+          <VStack space={3} mt="5">
+            <FormControl>
+              <FormControl.Label> Correo Electrónico</FormControl.Label>
+              <Input />
+            </FormControl>
+            <FormControl>
+              <FormControl.Label> Contraseña </FormControl.Label>
+              <Input type="password" />
+              <Link
+                _text={{
+                  fontSize: "xs",
+                  fontWeight: "500",
+                  color: "indigo.500",
+                }}
+                alignSelf="flex-end"
+                mt="1"
+              >
+                  Recuperar contraseña
+               
+              </Link>
+            </FormControl>
+            <Button mt="2" colorScheme="primary"
+            >
+              <Text>Continuar</Text>
+            </Button>
+            <HStack mt="6" justifyContent="center">
+              {/* <Text
+                fontSize="sm"
+                color="coolGray.600"
+                _dark={{
+                  color: "warmGray.200",
+                }}
+              >
+                I'm a new user.
+              </Text> */}
+              <Link
+                _text={{
+                  color: "warning.300",
+                  fontWeight: "medium",
+                  fontSize: "sm",
+                }}
+                href="#"
+              >
+                 Regístrese aquí
+              </Link>
+            </HStack>
+          </VStack>
+        </Box>
+      </Center>
+      
+    </NativeBaseProvider>
+  );
+}
+
+// Color Switch Component
+function ToggleDarkMode() {
+  const { colorMode, toggleColorMode } = useColorMode();
+  return (
+    <HStack space={2} alignItems="center">
+      <Text>Dark</Text>
+      <Switch
+        isChecked={colorMode === "light"}
+        onToggle={toggleColorMode}
+        aria-label={
+          colorMode === "light" ? "switch to dark mode" : "switch to light mode"
+        }
+      />
+      <Text>Light</Text>
+    </HStack>
+  );
+}

mobile-ui/App.tsx

@@ -1,20 +0,0 @@
-import { StatusBar } from 'expo-status-bar';
-import { StyleSheet, Text, View } from 'react-native';
-
-export default function App() {
-  return (
-    <View style={styles.container}>
-      <Text>Open up App.tsx to start working on your app!</Text>
-      <StatusBar style="auto" />
-    </View>
-  );
-}
-
-const styles = StyleSheet.create({
-  container: {
-    flex: 1,
-    backgroundColor: '#fff',
-    alignItems: 'center',
-    justifyContent: 'center',
-  },
-});

mobile-ui/Readme.md

@@ -0,0 +1,9 @@
+# NativeBase Expo Template
+
+The official NativeBase template for [Expo](https://docs.expo.io/)
+
+## Usage
+
+```sh
+expo init my-app --template @native-base/expo-template
+```

mobile-ui/app.json

@@ -1,11 +1,10 @@
 {
   "expo": {
-    "name": "mobile-ui",
+    "name": "my-app",
-    "slug": "mobile-ui",
+    "slug": "my-app",
     "version": "1.0.0",
     "orientation": "portrait",
     "icon": "./assets/icon.png",
-    "userInterfaceStyle": "light",
     "splash": {
       "image": "./assets/splash.png",
       "resizeMode": "contain",

mobile-ui/components/NativeBaseIcon.js

@@ -0,0 +1,44 @@
+import React from "react";
+import { Icon } from "native-base";
+import { G, Path } from "react-native-svg";
+const NativeBaseIcon = () => {
+  return (
+    <Icon size="220px" viewBox="0 0 602.339 681.729">
+      <G
+        id="Group_403"
+        data-name="Group 403"
+        transform="translate(14575 1918.542)"
+      >
+        <Path
+          id="Path_1"
+          data-name="Path 1"
+          d="M488.722,0A45.161,45.161,0,0,1,527.83,22.576L675.676,278.584a45.162,45.162,0,0,1,0,45.171L527.83,579.763a45.162,45.162,0,0,1-39.108,22.576H193.008A45.162,45.162,0,0,1,153.9,579.763L6.053,323.755a45.162,45.162,0,0,1,0-45.171L153.9,22.576A45.162,45.162,0,0,1,193.008,0Z"
+          transform="translate(-13972.661 -1918.542) rotate(90)"
+          fill="#356290"
+        />
+        <Path
+          id="Path_252"
+          data-name="Path 252"
+          d="M401.1,0A60.816,60.816,0,0,1,453.77,30.405L567.2,226.844a60.816,60.816,0,0,1,0,60.82L453.77,484.1A60.816,60.816,0,0,1,401.1,514.509H174.241A60.816,60.816,0,0,1,121.575,484.1L8.149,287.665a60.816,60.816,0,0,1,0-60.82L121.575,30.405A60.816,60.816,0,0,1,174.241,0Z"
+          transform="translate(-14016.576 -1865.281) rotate(90)"
+          fill="#1784b2"
+        />
+        <Path
+          id="Path_251"
+          data-name="Path 251"
+          d="M345.81,0a36.573,36.573,0,0,1,31.674,18.288L480.566,196.856a36.573,36.573,0,0,1,0,36.569L377.484,411.993a36.573,36.573,0,0,1-31.674,18.288H139.655a36.572,36.572,0,0,1-31.674-18.288L4.9,233.425a36.573,36.573,0,0,1,0-36.569L107.981,18.288A36.573,36.573,0,0,1,139.655,0Z"
+          transform="translate(-14058.69 -1820.41) rotate(90)"
+          fill="#50bfc3"
+        />
+        <Path
+          id="_x3C__x2F__x3E_"
+          d="M187.066,335.455V297.993l-65.272-21.949,65.272-22.523V216.059L81,259.5v32.521Zm38.726,29.3L286.123,174H256.7l-60.33,190.759Zm72.052-29.3,106.066-43.783V259.267L297.844,216.059V254.44l59.3,23.328-59.3,19.421Z"
+          transform="translate(-14516.286 -1846.988)"
+          fill="#fff"
+        />
+      </G>
+    </Icon>
+  );
+};
+
+export default NativeBaseIcon;

mobile-ui/package.json

@@ -1,7 +1,14 @@
 {
-  "name": "mobile-ui",
+  "name": "my-app",
   "version": "1.0.0",
   "main": "node_modules/expo/AppEntry.js",
+  "keywords": [
+    "react",
+    "expo",
+    "template",
+    "nativebase"
+  ],
+  "license": "MIT",
   "scripts": {
     "start": "expo start",
     "android": "expo start --android",
@@ -10,20 +17,23 @@
     "eject": "expo eject"
   },
   "dependencies": {
-    "expo": "~45.0.0",
+    "expo": "^44.0.0",
-    "expo-cli": "^5.4.12",
+    "expo-status-bar": "~1.2.0",
-    "expo-status-bar": "~1.3.0",
+    "native-base": "3.4.0",
-    "react": "17.0.2",
+    "react": "17.0.1",
-    "react-dom": "17.0.2",
+    "react-dom": "17.0.1",
-    "react-native": "0.68.2",
+    "react-native": "0.64.3",
-    "react-native-web": "0.17.7",
+    "react-native-safe-area-context": "3.3.2",
-    "sharp-cli": "^2.1.1"
+    "react-native-svg": "12.1.1",
+    "react-native-web": "0.17.1"
   },
   "devDependencies": {
-    "@babel/core": "^7.12.9",
+    "@babel/core": "^7.12.9"
-    "@types/react": "~17.0.21",
-    "@types/react-native": "~0.66.13",
-    "typescript": "~4.3.5"
   },
+  "bugs": {
+    "url": "https://github.com/GeekyAnts/nativebase-templates/issues"
+  },
+  "homepage": "https://github.com/GeekyAnts/nativebase-templates#readme",
+  "author": "Aditya Jamuar",
   "private": true
 }

mobile-ui/tsconfig.json

@@ -1,6 +0,0 @@
-{
-  "extends": "expo/tsconfig.base",
-  "compilerOptions": {
-    "strict": true
-  }
-}

package.json

@@ -0,0 +1,31 @@
+{
+  "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"
+    ]
+  },
+  "dependencies": {
+    "@react-navigation/native": "^6.0.11"
+  }
+}

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.controller.ts

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

servicio-areas-comunes/src/common_areas/common_areas.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> {
@@ -32,6 +32,13 @@ export class CommonAreasService {
   }
 
   async remove(id: string) {
-    return this.commonAreaModel.findByIdAndRemove({ _id: id }).exec();
+    return this.commonAreaModel.findOneAndUpdate({ _id: id }, {status: '-1'}, {
+      new: true,
+    });  
+  };
+
+  async findByCommunity(community_id: string): Promise<CommonArea[]> {
+    return this.commonAreaModel.find({ community_id: community_id }).exec();
   }
+
 }

servicio-areas-comunes/src/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;
 
@@ -22,6 +19,9 @@ export class CommonArea {
   @Prop()
   bookable: number; //saber si es necesario reservarlo o no
 
+  @Prop()
+  status: string;
+
   @Prop()
   community_id: string;
 }

servicio-comunidad-viviendas/src/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.controller.ts

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

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,32 +20,33 @@ 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> {
     return this.communityModel.findOne({ _id: id }).exec();
   }
   findOneName(id: string): Promise<Community> {
-    return this.communityModel.findOne({ _id: "62be68215692582bbfd77134" }).exec();
+    return this.communityModel.findOne({ _id: id }).exec();
   }
 
   update(id: string, community: CommunityDocument) {
@@ -57,21 +56,26 @@ export class CommunitiesService {
   }
 
   async remove(id: string) {
-    return this.communityModel.findByIdAndRemove({ _id: id }).exec();
+    return this.communityModel.findOneAndUpdate({ _id: id }, {status: '-1'}, {
+      new: true,
+    });  
+  }
+
+  async changeStatus(id: string, status: string) {
+    return this.communityModel.findOneAndUpdate({ _id: id }, {status: status}, {
+      new: true,
+    });  
   }
 
   async findCommunityAdmin(community: string, user_type: string) {
-    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> {
@@ -36,6 +33,8 @@ export class PostCommentsService {
   }
 
   async remove(id: string) {
-    return this.commentModel.findByIdAndRemove({ _id: id }).exec();
+    return this.commentModel.findOneAndUpdate({ _id: id }, {status: '-1'}, {
+      new: true,
+    });  
   }
 }

servicio-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();
   }
@@ -37,6 +32,8 @@ export class GuestsService {
   }
 
   async remove(id: string) {
-    return this.guestModel.findByIdAndRemove({ _id: id }).exec();
+    return this.guestModel.findOneAndUpdate({ _id: id }, {status: '-1'}, {
+      new: true,
+    });  
   }
 }

servicio-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,10 +10,9 @@ export class EmailController {
 
   @MessagePattern({ cmd: 'sendMail' })
   sendMail(@Payload() toEmail: string) {
-
     var response = this.mailService.sendMail({
-            to: toEmail["email"],
+      to: toEmail['email'],
-            from: "mbonilla.guti@gmail.com",
+      from: 'mbonilla.guti@gmail.com',
       subject: 'Plain Text Email ✔',
       text: 'Welcome NestJS Email Sending Tutorial',
     });
@@ -23,7 +22,7 @@ export class EmailController {
     @MessagePattern({ cmd: 'html' })
     async postHTMLEmail(@Payload() user: any) {
         const url = "http://localhost:3000/";
-        const image =  "images/email.ong";
+        const image = "images/email.png";
         var response = await this.mailService.sendMail({
             to: user["email"],
             from: "mbonilla.guti@gmail.com",
@@ -43,4 +42,39 @@ export class EmailController {
         });
         return response;
     }
+
+
+    @MessagePattern({ cmd: 'emailCreateUserAdminCommunity' })
+    async emailCreateUserAdmin(@Payload() user: any) {
+        const url = "http://localhost:3000/";
+        const image = "images/email.png";
+        const logo = "images/Logo Katoikia.png";
+        var response = await this.mailService.sendMail({
+            to: user["email"],
+            from: "mbonilla.guti@gmail.com",
+            subject: 'Usuario registrado',
+            template: 'emailCreateUserAdminCommunity',
+            context: {
+                name: user["name"],
+                password: user["password"],
+                date_entry: user["date_entry"],
+                email: user["email"],
+                community_name: user['community_name'],
+                url
+            },
+            attachments: [
+                {
+                    filename: 'email.png',
+                    path: __dirname + '/mails/images/email.png',
+                    cid: 'image_email' //my mistake was putting "cid:logo@cid" here! 
+                },
+                {
+                    filename: 'Logo_Katoikia.png',
+                    path: __dirname + '/mails/images/Logo_Katoikia.png',
+                    cid: 'logoKatoikia' //my mistake was putting "cid:logo@cid" here! 
+                }
+            ]
+        });
+        return response;
+    }
 }

servicio-notificaciones/src/mails/emailCreateUserAdmin.hbs

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

servicio-notificaciones/src/mails/emailCreateUserAdminCommunity.hbs

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

servicio-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,16 +1,15 @@
 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> {
@@ -18,17 +17,13 @@ export class ReportsService {
   }
 
   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,
@@ -36,6 +31,9 @@ export class ReportsService {
   }
 
   async remove(id: string) {
-    return this.reportModel.findByIdAndRemove({ _id: id }).exec();
+    return this.reportModel.findOneAndUpdate({ _id: id }, {status: '-1'}, {
+      new: true,
+    });  
+    
   }
 }

servicio-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) {
@@ -37,6 +41,8 @@ export class ReservationsService {
   }
 
   async remove(id: string) {
-    return this.reservationModel.findByIdAndRemove({ _id: id }).exec();
+    return this.reservationModel.findOneAndUpdate({ _id: id }, {status: '-1'}, {
+      new: true,
+    });  
   }
 }

servicio-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/package.json

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

servicio-usuarios/src/MongoExceptionFilter.ts

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

servicio-usuarios/src/app.module.ts

@@ -1,22 +1,26 @@
 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/exceptions/UserExistsRule.ts

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

servicio-usuarios/src/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,27 +1,25 @@
-
 import { Schema, Prop, SchemaFactory } from '@nestjs/mongoose';
 import { Document } from 'mongoose';
-
+var uniqueValidator = require('mongoose-unique-validator');
+import { IsEmail, IsNotEmpty, IsString, Validate } from 'class-validator';
 
 export type UserDocument = User & Document;
 
-
 @Schema({ collection: 'users'})
 export class User {
+  @Prop({index: true})
+  dni!: string;
 
-    @Prop()
+  @Prop({required: true})
-    dni: string;
-
-    @Prop()
   name: string;
 
-    @Prop()
+  @Prop({required: true})
   last_name: string;
 
-    @Prop()
+  @Prop({required: true, unique: true})
   email: string; 
 
-    @Prop()
+  @Prop({required: true, unique: true})
   phone: number;
 
   @Prop()
@@ -36,11 +34,12 @@ export class User {
   @Prop()
   date_entry: Date;
 
-
   @Prop()
   community_id?: string;
+
+  @Prop()
+  number_house?: string;
 }
 
-
-
 export const UserSchema = SchemaFactory.createForClass(User);
+UserSchema.plugin(uniqueValidator);

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

@@ -1,7 +1,8 @@
-import { Controller } from '@nestjs/common';
+import { Controller, UseFilters } from '@nestjs/common';
 import { MessagePattern, Payload } from '@nestjs/microservices';
 import { User, UserDocument } from '../schemas/user.schema';
 import { UsersService } from './users.service';
+import { MongoExceptionFilter } from 'src/MongoExceptionFilter';
 
 @Controller()
 export class UsersController {
@@ -13,6 +14,7 @@ export class UsersController {
   }
 
   @MessagePattern({ cmd: 'createAdminSystem' })
+  @UseFilters(MongoExceptionFilter)
   createUserAdmin(@Payload() user: UserDocument) {
     return this.userService.create(user);
   }
@@ -22,6 +24,10 @@ export class UsersController {
     return this.userService.create(user);
   }
 
+  @MessagePattern({ cmd: 'createAdminCommunity' })
+  createAdminCommunity(@Payload() user: UserDocument) {
+    return this.userService.createAdminCommunity(user);
+  }
 
   @MessagePattern({ cmd: 'findAllUsers' })
   findAll() {
@@ -34,12 +40,29 @@ export class UsersController {
     return this.userService.findOneByDNI(dni);
   }
 
+  @MessagePattern({ cmd: 'findById' })
+  findById(@Payload() id: string) {
+    let _id = id['id'];
+    return this.userService.findOne(_id);
+  }
+
   @MessagePattern({ cmd: 'findGuardsCommunity' })
   findGuardsCommunity(@Payload() community_id: string) {
     let pcommunity_id = community_id['community_id'];
     return this.userService.findGuardsCommunity(pcommunity_id);
   }
 
+  @MessagePattern({ cmd: 'findTenantsCommunity' })
+  findTenantsCommunity(@Payload() community_id: string) {
+    let pcommunity_id = community_id['community_id'];
+    return this.userService.findTenantsCommunity(pcommunity_id);
+  }
+
+  @MessagePattern({ cmd: 'findTenants' })
+  findTenants() {
+    return this.userService.findTenants();
+  }
+
 
   @MessagePattern({ cmd: 'updateUser' })
   update(@Payload() user: UserDocument) {
@@ -81,15 +104,24 @@ 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']);
   }
 
-}
 
+  @MessagePattern({ cmd: 'changeStatus' })
+  changeStatus(@Payload() body: string) {
+    let pid = body['id'];
+    let pstatus = body['status'];
+    return this.userService.changeStatus(pid, pstatus);
+  }
+}

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

@@ -4,23 +4,33 @@ 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',
+          port: 3009,
+        },
+      },
+    ]),
+    ClientsModule.register([
+      {
+        name: "SERVICIO_COMUNIDADES",
         transport: Transport.TCP,
         options: {
           host: "127.0.0.1",
-          port: 3009
+          port: 3002
         }
       }
     ]),
     MongooseModule.forFeature([{ name: User.name, schema: UserSchema }]), 
   ],
   controllers: [UsersController],
-  providers: [UsersService]
+  providers: [UsersService],
 })
 export class UsersModule {}

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

@@ -2,18 +2,18 @@ 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(
     @InjectModel(User.name) private readonly userModel: Model<UserDocument>,
     @Inject('SERVICIO_NOTIFICACIONES') private readonly clientNotificationtApp: ClientProxy,
+    @Inject('SERVICIO_COMUNIDADES') private readonly clientCommunityApp: ClientProxy,
 
   ) { }
   private publicKey: string;
@@ -23,11 +23,46 @@ export class UsersService {
     return this.userModel.create(user);
   }
 
+
+  async createAdminCommunity(user: UserDocument) {
+    let password = user.password;
+    let passwordEncriptada = Md5.init(user.password);
+    user.password = passwordEncriptada;
+
+    this.userModel.create(user)
+
+
+    let community = await this.findCommunity(user.community_id);
+    user.community_id = community['name'];
+
+    const pattern = { cmd: 'emailCreateUserAdminCommunity' };
+    const payload = {
+      email: user['email'], password: password, name: user['name'],
+      date_entry: user['date_entry'], community_name: community['name']
+    };
+    return this.clientNotificationtApp
+      .send<string>(pattern, payload)
+      .pipe(
+        map((message: string) => ({ message })),
+      );
+  }
+
+  async findCommunity(community_id: string) {
+    const pattern = { cmd: 'findOneCommunity' }
+    const payload = { _id: community_id }
+
+    let callback = await this.clientCommunityApp
+      .send<string>(pattern, payload)
+      .pipe(
+        map((response: string) => ({ response }))
+      )
+    const finalValue = await lastValueFrom(callback);
+    return finalValue['response'];
+
+  }
+
   async findAll(): Promise<User[]> {
-    return this.userModel
+    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();
@@ -43,8 +78,14 @@ export class UsersService {
     });
   }
 
-  async remove(id: string) {
+ /* async remove(id: string) {
     return this.userModel.findByIdAndRemove({ _id: id }).exec();
+  }*/
+
+  async remove(id: string) {
+    return this.userModel.findOneAndUpdate({ _id: id }, {status: '-1'}, {
+      new: true,
+    });  
   }
 
   //inicio de sesion
@@ -56,13 +97,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);
           }
         }
@@ -77,7 +116,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();
@@ -88,10 +126,39 @@ export class UsersService {
   }
 
 
+  //find inquilinos
+  async findTenants(): Promise<User[]> {
+    return this.userModel.find({ user_type: 3 }).exec();
+  }
+
+
+  //find inquilinos
+  async findTenantsCommunity(pcommunity_id: string) {
+    //let tenants = await this.findCommunityTenants(pcommunity_id);
+
+
+
+    return await this.userModel.find({ community_id: pcommunity_id, user_type: 4 })
+      .then(async (users) => {
+        if (users) {
+          await Promise.all(
+            users.map(async (u) => {
+              //buscar al usuario con el id de la comunidad anexado
+              let number_house = await this.findNumHouseTenant(pcommunity_id, u['_id']);
+              u['number_house'] = number_house;
+              return u;
+            }),
+          )
+        }
+        return users;
+      })
+  }
+
+
   async testSendMail(user: UserDocument) {
     let passwordEncriptada = Md5.init(user.password);
     user.password = passwordEncriptada;
-    this.userModel.create(user)
+    this.userModel.create(user);
     /*.then(() => {
       
     } );*/
@@ -100,17 +167,66 @@ 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) {
-    return this.userModel.deleteOne({_id: id}).exec();
+    return this.userModel.findOneAndUpdate({ _id: id }, {status: '-1'}, {
+      new: true,
+    });  
   }
 
+  async validateEmail(email: string) {
+    let repo1 = this.userModel;
+    return new Promise<User>((resolve, reject) => {
+      let repo = repo1;
+
+      repo.find({ email: email }).exec((err, res) => {
+        if (err) {
+          reject(err);
+        } else {
+          if (res.length > 0) {
+            return res;
           }
+        }
+      });
+    });
+  }
+
+  async findNumHouseTenant(community_id: string, tenant_id: string) {
+    const pattern = { cmd: 'findOneCommunity' }
+    const payload = { _id: community_id }
+
+    let callback = await this.clientCommunityApp
+      .send<string>(pattern, payload)
+      .pipe(
+        map((response: string) => ({ response }))
+      )
+    const finalValue = await lastValueFrom(callback);
+    const response = finalValue['response'];
+    const houses = response['houses'];
+    let num_house = "";
+    await houses.forEach(async house => {
+        if (tenant_id == house.tenants.tenant_id) {
+          num_house = house.number_house;
+        }
+    })
+    return num_house;
+  }
+
+  async changeStatus(id: string, status: string) {
+    return this.userModel.findOneAndUpdate({ _id: id }, {status: status}, {
+      new: true,
+    });  
+  }
+}
+

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

@@ -9,6 +9,9 @@
             "version": "7.0.3-SNAPSHOT",
             "license": "MIT",
             "dependencies": {
+                "@fortawesome/fontawesome-svg-core": "^6.1.1",
+                "@fortawesome/free-solid-svg-icons": "^6.1.1",
+                "@fortawesome/react-fontawesome": "^0.2.0",
                 "@fullcalendar/core": "^5.7.2",
                 "@fullcalendar/daygrid": "^5.7.2",
                 "@fullcalendar/interaction": "^5.7.2",
@@ -24,6 +27,7 @@
                 "prismjs": "1.9.0",
                 "react": "^17.0.1",
                 "react-app-polyfill": "^1.0.6",
+                "react-cookie": "^4.1.1",
                 "react-dom": "^17.0.1",
                 "react-router-dom": "^5.2.0",
                 "react-scripts": "3.4.1",
@@ -1874,6 +1878,51 @@
             "resolved": "https://registry.npmjs.org/@csstools/normalize.css/-/normalize.css-10.1.0.tgz",
             "integrity": "sha512-ij4wRiunFfaJxjB0BdrYHIH8FxBJpOwNPhhAcunlmPdXudL1WQV1qoP9un6JsEBAgQH+7UXyyjh0g7jTxXK6tg=="
         },
+        "node_modules/@fortawesome/fontawesome-common-types": {
+            "version": "6.1.1",
+            "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.1.1.tgz",
+            "integrity": "sha512-wVn5WJPirFTnzN6tR95abCx+ocH+3IFLXAgyavnf9hUmN0CfWoDjPT/BAWsUVwSlYYVBeCLJxaqi7ZGe4uSjBA==",
+            "hasInstallScript": true,
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/@fortawesome/fontawesome-svg-core": {
+            "version": "6.1.1",
+            "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.1.1.tgz",
+            "integrity": "sha512-NCg0w2YIp81f4V6cMGD9iomfsIj7GWrqmsa0ZsPh59G7PKiGN1KymZNxmF00ssuAlo/VZmpK6xazsGOwzKYUMg==",
+            "hasInstallScript": true,
+            "dependencies": {
+                "@fortawesome/fontawesome-common-types": "6.1.1"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/@fortawesome/free-solid-svg-icons": {
+            "version": "6.1.1",
+            "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.1.1.tgz",
+            "integrity": "sha512-0/5exxavOhI/D4Ovm2r3vxNojGZioPwmFrKg0ZUH69Q68uFhFPs6+dhAToh6VEQBntxPRYPuT5Cg1tpNa9JUPg==",
+            "hasInstallScript": true,
+            "dependencies": {
+                "@fortawesome/fontawesome-common-types": "6.1.1"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/@fortawesome/react-fontawesome": {
+            "version": "0.2.0",
+            "resolved": "https://registry.npmjs.org/@fortawesome/react-fontawesome/-/react-fontawesome-0.2.0.tgz",
+            "integrity": "sha512-uHg75Rb/XORTtVt7OS9WoK8uM276Ufi7gCzshVWkUJbHhh3svsUUeqXerrM96Wm7fRiDzfKRwSoahhMIkGAYHw==",
+            "dependencies": {
+                "prop-types": "^15.8.1"
+            },
+            "peerDependencies": {
+                "@fortawesome/fontawesome-svg-core": "~1 || ~6",
+                "react": ">=16.3"
+            }
+        },
         "node_modules/@fullcalendar/common": {
             "version": "5.11.0",
             "resolved": "https://registry.npmjs.org/@fullcalendar/common/-/common-5.11.0.tgz",
@@ -2427,6 +2476,11 @@
                 "@babel/types": "^7.3.0"
             }
         },
+        "node_modules/@types/cookie": {
+            "version": "0.3.3",
+            "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.3.3.tgz",
+            "integrity": "sha512-LKVP3cgXBT9RYj+t+9FDKwS5tdI+rPBXaNSkma7hvqy35lc7mAokC2zsqWJH0LaqIt3B962nuYI77hsJoT1gow=="
+        },
         "node_modules/@types/eslint-visitor-keys": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
@@ -2441,6 +2495,15 @@
                 "@types/node": "*"
             }
         },
+        "node_modules/@types/hoist-non-react-statics": {
+            "version": "3.3.1",
+            "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz",
+            "integrity": "sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==",
+            "dependencies": {
+                "@types/react": "*",
+                "hoist-non-react-statics": "^3.3.0"
+            }
+        },
         "node_modules/@types/istanbul-lib-coverage": {
             "version": "2.0.4",
             "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz",
@@ -2483,11 +2546,31 @@
             "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
             "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="
         },
+        "node_modules/@types/prop-types": {
+            "version": "15.7.5",
+            "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz",
+            "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w=="
+        },
         "node_modules/@types/q": {
             "version": "1.5.5",
             "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.5.tgz",
             "integrity": "sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ=="
         },
+        "node_modules/@types/react": {
+            "version": "18.0.15",
+            "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.15.tgz",
+            "integrity": "sha512-iz3BtLuIYH1uWdsv6wXYdhozhqj20oD4/Hk2DNXIn1kFsmp9x8d9QB6FnPhfkbhd2PgEONt9Q1x/ebkwjfFLow==",
+            "dependencies": {
+                "@types/prop-types": "*",
+                "@types/scheduler": "*",
+                "csstype": "^3.0.2"
+            }
+        },
+        "node_modules/@types/scheduler": {
+            "version": "0.16.2",
+            "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz",
+            "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew=="
+        },
         "node_modules/@types/stack-utils": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz",
@@ -13354,6 +13437,19 @@
                 "node": ">=6"
             }
         },
+        "node_modules/react-cookie": {
+            "version": "4.1.1",
+            "resolved": "https://registry.npmjs.org/react-cookie/-/react-cookie-4.1.1.tgz",
+            "integrity": "sha512-ffn7Y7G4bXiFbnE+dKhHhbP+b8I34mH9jqnm8Llhj89zF4nPxPutxHT1suUqMeCEhLDBI7InYwf1tpaSoK5w8A==",
+            "dependencies": {
+                "@types/hoist-non-react-statics": "^3.0.1",
+                "hoist-non-react-statics": "^3.0.0",
+                "universal-cookie": "^4.0.0"
+            },
+            "peerDependencies": {
+                "react": ">= 16.3.0"
+            }
+        },
         "node_modules/react-dev-utils": {
             "version": "10.2.1",
             "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-10.2.1.tgz",
@@ -16551,6 +16647,23 @@
                 "imurmurhash": "^0.1.4"
             }
         },
+        "node_modules/universal-cookie": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/universal-cookie/-/universal-cookie-4.0.4.tgz",
+            "integrity": "sha512-lbRVHoOMtItjWbM7TwDLdl8wug7izB0tq3/YVKhT/ahB4VDvWMyvnADfnJI8y6fSvsjh51Ix7lTGC6Tn4rMPhw==",
+            "dependencies": {
+                "@types/cookie": "^0.3.3",
+                "cookie": "^0.4.0"
+            }
+        },
+        "node_modules/universal-cookie/node_modules/cookie": {
+            "version": "0.4.2",
+            "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
+            "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==",
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
         "node_modules/universalify": {
             "version": "0.1.2",
             "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
@@ -19237,6 +19350,35 @@
             "resolved": "https://registry.npmjs.org/@csstools/normalize.css/-/normalize.css-10.1.0.tgz",
             "integrity": "sha512-ij4wRiunFfaJxjB0BdrYHIH8FxBJpOwNPhhAcunlmPdXudL1WQV1qoP9un6JsEBAgQH+7UXyyjh0g7jTxXK6tg=="
         },
+        "@fortawesome/fontawesome-common-types": {
+            "version": "6.1.1",
+            "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.1.1.tgz",
+            "integrity": "sha512-wVn5WJPirFTnzN6tR95abCx+ocH+3IFLXAgyavnf9hUmN0CfWoDjPT/BAWsUVwSlYYVBeCLJxaqi7ZGe4uSjBA=="
+        },
+        "@fortawesome/fontawesome-svg-core": {
+            "version": "6.1.1",
+            "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.1.1.tgz",
+            "integrity": "sha512-NCg0w2YIp81f4V6cMGD9iomfsIj7GWrqmsa0ZsPh59G7PKiGN1KymZNxmF00ssuAlo/VZmpK6xazsGOwzKYUMg==",
+            "requires": {
+                "@fortawesome/fontawesome-common-types": "6.1.1"
+            }
+        },
+        "@fortawesome/free-solid-svg-icons": {
+            "version": "6.1.1",
+            "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.1.1.tgz",
+            "integrity": "sha512-0/5exxavOhI/D4Ovm2r3vxNojGZioPwmFrKg0ZUH69Q68uFhFPs6+dhAToh6VEQBntxPRYPuT5Cg1tpNa9JUPg==",
+            "requires": {
+                "@fortawesome/fontawesome-common-types": "6.1.1"
+            }
+        },
+        "@fortawesome/react-fontawesome": {
+            "version": "0.2.0",
+            "resolved": "https://registry.npmjs.org/@fortawesome/react-fontawesome/-/react-fontawesome-0.2.0.tgz",
+            "integrity": "sha512-uHg75Rb/XORTtVt7OS9WoK8uM276Ufi7gCzshVWkUJbHhh3svsUUeqXerrM96Wm7fRiDzfKRwSoahhMIkGAYHw==",
+            "requires": {
+                "prop-types": "^15.8.1"
+            }
+        },
         "@fullcalendar/common": {
             "version": "5.11.0",
             "resolved": "https://registry.npmjs.org/@fullcalendar/common/-/common-5.11.0.tgz",
@@ -19692,6 +19834,11 @@
                 "@babel/types": "^7.3.0"
             }
         },
+        "@types/cookie": {
+            "version": "0.3.3",
+            "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.3.3.tgz",
+            "integrity": "sha512-LKVP3cgXBT9RYj+t+9FDKwS5tdI+rPBXaNSkma7hvqy35lc7mAokC2zsqWJH0LaqIt3B962nuYI77hsJoT1gow=="
+        },
         "@types/eslint-visitor-keys": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
@@ -19706,6 +19853,15 @@
                 "@types/node": "*"
             }
         },
+        "@types/hoist-non-react-statics": {
+            "version": "3.3.1",
+            "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz",
+            "integrity": "sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==",
+            "requires": {
+                "@types/react": "*",
+                "hoist-non-react-statics": "^3.3.0"
+            }
+        },
         "@types/istanbul-lib-coverage": {
             "version": "2.0.4",
             "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz",
@@ -19748,11 +19904,31 @@
             "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
             "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="
         },
+        "@types/prop-types": {
+            "version": "15.7.5",
+            "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz",
+            "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w=="
+        },
         "@types/q": {
             "version": "1.5.5",
             "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.5.tgz",
             "integrity": "sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ=="
         },
+        "@types/react": {
+            "version": "18.0.15",
+            "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.15.tgz",
+            "integrity": "sha512-iz3BtLuIYH1uWdsv6wXYdhozhqj20oD4/Hk2DNXIn1kFsmp9x8d9QB6FnPhfkbhd2PgEONt9Q1x/ebkwjfFLow==",
+            "requires": {
+                "@types/prop-types": "*",
+                "@types/scheduler": "*",
+                "csstype": "^3.0.2"
+            }
+        },
+        "@types/scheduler": {
+            "version": "0.16.2",
+            "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz",
+            "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew=="
+        },
         "@types/stack-utils": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz",
@@ -28319,6 +28495,16 @@
                 "whatwg-fetch": "^3.0.0"
             }
         },
+        "react-cookie": {
+            "version": "4.1.1",
+            "resolved": "https://registry.npmjs.org/react-cookie/-/react-cookie-4.1.1.tgz",
+            "integrity": "sha512-ffn7Y7G4bXiFbnE+dKhHhbP+b8I34mH9jqnm8Llhj89zF4nPxPutxHT1suUqMeCEhLDBI7InYwf1tpaSoK5w8A==",
+            "requires": {
+                "@types/hoist-non-react-statics": "^3.0.1",
+                "hoist-non-react-statics": "^3.0.0",
+                "universal-cookie": "^4.0.0"
+            }
+        },
         "react-dev-utils": {
             "version": "10.2.1",
             "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-10.2.1.tgz",
@@ -30849,6 +31035,22 @@
                 "imurmurhash": "^0.1.4"
             }
         },
+        "universal-cookie": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/universal-cookie/-/universal-cookie-4.0.4.tgz",
+            "integrity": "sha512-lbRVHoOMtItjWbM7TwDLdl8wug7izB0tq3/YVKhT/ahB4VDvWMyvnADfnJI8y6fSvsjh51Ix7lTGC6Tn4rMPhw==",
+            "requires": {
+                "@types/cookie": "^0.3.3",
+                "cookie": "^0.4.0"
+            },
+            "dependencies": {
+                "cookie": {
+                    "version": "0.4.2",
+                    "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
+                    "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA=="
+                }
+            }
+        },
         "universalify": {
             "version": "0.1.2",
             "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",

web-ui/web-react/package.json

@@ -9,6 +9,9 @@
     },
     "license": "MIT",
     "dependencies": {
+        "@fortawesome/fontawesome-svg-core": "^6.1.1",
+        "@fortawesome/free-solid-svg-icons": "^6.1.1",
+        "@fortawesome/react-fontawesome": "^0.2.0",
         "@fullcalendar/core": "^5.7.2",
         "@fullcalendar/daygrid": "^5.7.2",
         "@fullcalendar/interaction": "^5.7.2",
@@ -24,6 +27,7 @@
         "prismjs": "1.9.0",
         "react": "^17.0.1",
         "react-app-polyfill": "^1.0.6",
+        "react-cookie": "^4.1.1",
         "react-dom": "^17.0.1",
         "react-router-dom": "^5.2.0",
         "react-scripts": "3.4.1",

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

@@ -7120,6 +7120,45 @@
 }
 
 
+.icon-khaki {
+    color: var(--primary-color);
+}
+
+.row {
+    display: flex;
+}
+
+
+.status {
+    border-radius: var(--border-radius);
+    padding: 0.25em 0.5rem;
+    text-transform: uppercase;
+    font-weight: 700;
+    font-size: 12px;
+    letter-spacing: 0.3px;
+}
+
+.status.status-1 {
+    background: #c8e6c9!important;
+    color: #256029!important;
+}
+
+.status.status-0 {
+    background: #ffcdd2;
+    color: #c63737;
+}
+
+.status.status-2 {
+    background: #feedaf;
+    color: #8a5340;
+}
+
+.status.status--1 {
+    background: #565656;
+    color: #f7f9f7;
+}
+
+
 .login-wrapper {
     display: flex;
     flex-direction: column;

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

@@ -33,6 +33,7 @@ import AdministradoresComunidad from './components/AdministradoresComunidad';
 import GuardasSeguridad from './components/GuardasSeguridad';
 import Communities from './components/ComunidadViviendas';
 import Inquilinos from './components/Inquilinos';
+import InquilinosCompletar from "./components/InquilinosCompletar.js";
 
 import Crud from './pages/Crud';
 import EmptyPage from './pages/EmptyPage';
@@ -50,6 +51,8 @@ import './assets/demo/Demos.scss';
 import './assets/layout/layout.scss';
 import './App.scss';
 import LogIn from './components/LogIn';
+import { PrimeIcons } from 'primereact/api';
+import AreasComunes from './components/AreasComunes';
 import { useCookies } from "react-cookie";
 import LoginLocalStorage from './components/LoginLocalStorage';
 
@@ -68,11 +71,6 @@ const App = () => {
     const location = useLocation();
     const [cookies, setCookies] = useCookies();
 
-    const handleLogout = () => {
-        localStorage.clear();
-        window.location.reload();
-    }
-
   PrimeReact.ripple = true;
 
   let menuClick = false;
@@ -80,32 +78,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) {
@@ -119,39 +119,55 @@ const App = () => {
 
     mobileTopbarMenuClick = false;
     menuClick = false;
-    }
+  };
 
   const onToggleMenuClick = (event) => {
+    menuClick = true;
+
+    if (isDesktop()) {
+      if (layoutMode === 'overlay') {
+        if (mobileMenuActive === true) {
+          setOverlayMenuActive(true);
+        }
+
+        setOverlayMenuActive((prevState) => !prevState);
+        setMobileMenuActive(false);
+      } else if (layoutMode === 'static') {
+        setStaticMenuInactive((prevState) => !prevState);
+      }
+    } 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 menu2 = [
         {
@@ -187,129 +203,183 @@ const App = () => {
 
     const menu = [
         {
-            label: 'Home',
+          label: 'Administradores del sistema',
-            items: [
+          icon: PrimeIcons.USERS,
-                { label: 'Dashboard', icon: 'pi pi-fw pi-home', to: '/' },
+          to: '/administradoresSistema',
-                { label: 'Administradores del sistema', icon: 'pi pi-fw pi-id-card', to: '/administradoresSistema' },
-                { label: 'Administradores de comunidad', icon: 'pi pi-fw pi-id-card', to: '/administradoresComunidad' },
-                { label: 'Guardas de seguridad', icon: 'pi pi-fw pi-id-card', to: '/guardasSeguridad' },
-                { label: 'Comunidadades', icon: 'pi pi-fw pi-id-card', to: '/comunidadesViviendas' },
-                { label: 'Inquilinos', icon: 'pi pi-fw pi-id-card', to: '/inquilinos' },
-                { label: 'Log in', icon: 'pi pi-fw pi-id-card', to: '/logIn' },
-                { label: 'Log out', icon: 'pi pi-fw pi-id-card', to: '/logOut' }
-            ]
         },
         {
-            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: 'Comunidades',
+          icon: PrimeIcons.BUILDING,
+          to: '/comunidadesViviendas',
+        },
+        {
+          label: 'Inquilinos',
+          icon: PrimeIcons.USER,
+          to: '/inquilinos'
+        },
+        {
+          label: 'Áreas Comunes de Comunidad',
+          icon: PrimeIcons.BUILDING,
+          to: '/areasComunes',
+        },
+        { label: 'Log in', icon: 'pi pi-fw pi-id-card', to: '/logIn' },
+      ],
+    },
+    {
+      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 (