From 0a80e1704999e6cb0d96ab3045106784cd85724d Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Thu, 5 Aug 2021 13:42:11 +0100
Subject: [PATCH] Fix merge

---
 nice.md                                       | 20 -------------------
 package-lock.json                             |  6 +++---
 package.json                                  |  4 ++--
 readme.md                                     |  5 ++++-
 .../agenda/view-event/view-event.page.ts      | 10 +++++-----
 5 files changed, 14 insertions(+), 31 deletions(-)
 delete mode 100644 nice.md

diff --git a/nice.md b/nice.md
deleted file mode 100644
index 2e8b4881b..000000000
--- a/nice.md
+++ /dev/null
@@ -1,20 +0,0 @@
-## I’m Peter, a computer technician, doing my first year of electronics and telecommunications college
-____
-
-<br>
-<br>
-<br>
-
-<div style="display:flex"> 
-    <div style="width:100px;">
-         <img style="width:100px;" src="https://drive.google.com/uc?export=view&id=1TGGfel3FvbYK04BohwmQxeHZHU0oHJA5" >
-    </div>
-    <div >
-        <h3 style="margin-top:0px">Most frequently used design pattern</h3>
-        <ul>
-            <li><a href="https://refactoring.guru/design-patterns/singleton">Singleton</a></li>
-            <li><a href="https://medium.com/angular-in-depth/the-page-pattern-9f437ec99d7b">Page</a>
-            <li><a href="https://refactoring.guru/design-patterns/strategy">Strategy</a></li>
-        <ul>
-    </div>
-<div/>
diff --git a/package-lock.json b/package-lock.json
index 129f078ff..d2768bfd1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -27168,9 +27168,9 @@
       "dev": true
     },
     "tar": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.0.tgz",
-      "integrity": "sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA==",
+      "version": "6.1.6",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.6.tgz",
+      "integrity": "sha512-oaWyu5dQbHaYcyZCTfyPpC+VmI62/OM2RTUYavTk1MDr1cwW5Boi3baeYQKiZbY2uSQJGr+iMOzb/JFxLrft+g==",
       "requires": {
         "chownr": "^2.0.0",
         "fs-minipass": "^2.0.0",
diff --git a/package.json b/package.json
index 3ec6745e2..6d9eef49f 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
     "e2e": "ng e2e",
     "test": "jest  --detectOpenHandles  --runInBand",
     "test:prof": "ionic build --configuration production && npm run test",
-    "dev": "lite-server --baseDir=www"
+    "dev:share": "lite-server --baseDir=share"
   },
   "private": true,
   "dependencies": {
@@ -186,4 +186,4 @@
     "url": "git+https://Kayaya@bitbucket.org/equilibriumito/gabinete-digital.git"
   },
   "license": "ISC"
-}
+}
\ No newline at end of file
diff --git a/readme.md b/readme.md
index 8dcb26007..121ad0073 100644
--- a/readme.md
+++ b/readme.md
@@ -12,8 +12,11 @@ Use the package manager npm to install dependencies.
 npm ci
 npm install
 npm install -g @ionic/cli
-npm install -g http-server
+npm install -g lite-server
 npm install -g @angular/cli
+
+## Mobile first dependencies
+cordova plugin add cordova-plugin-mfp-jsonstore
 ```
 
 ## Start the development server
diff --git a/src/app/pages/agenda/view-event/view-event.page.ts b/src/app/pages/agenda/view-event/view-event.page.ts
index 70932c383..fc7e786e0 100644
--- a/src/app/pages/agenda/view-event/view-event.page.ts
+++ b/src/app/pages/agenda/view-event/view-event.page.ts
@@ -131,15 +131,15 @@ export class ViewEventPage implements OnInit {
       this.customDate = this.days[this.today.getDay()]+ ", "  + this.today.getDate() +" de "  + ( this.months[this.today.getMonth()]); */
       loader.remove()
     }, (error)=>{
-
+      
       if(error.status == 0) {
-        this.toastService.badRequest('Não é possível  visualizar este evento no modo offline')
+        this.toastService.badRequest('não é possível  vizualizar este event no modo offline')
       } else {
         this.toastService.badRequest('Este evento já não existe na sua agenda')
-      }
+      } 
 
       loader.remove()
-      this.modalController.dismiss('Eevento não Encontrado');
+      this.modalController.dismiss('Eevent not Foud');
       this.location.back();
     });
   }
@@ -163,7 +163,7 @@ export class ViewEventPage implements OnInit {
 
 
   async OpenDeleteEventModal() {
-
+    
     const modal = await this.modalController.create({
       component: EliminateEventPage,
       componentProps: {