Fix merge

This commit is contained in:
Peter Maquiran
2021-08-05 13:42:11 +01:00
parent b2e0619190
commit 0a80e17049
5 changed files with 14 additions and 31 deletions
-20
View File
@@ -1,20 +0,0 @@
## Im 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/>
+3 -3
View File
@@ -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",
+1 -1
View File
@@ -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": {
+4 -1
View File
@@ -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
@@ -133,13 +133,13 @@ export class ViewEventPage implements OnInit {
}, (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();
});
}