From acbecd1d3e7e1558520e46f1abab6f2fdedcf4df Mon Sep 17 00:00:00 2001 From: ahmedabuamra Date: Mar 23 2019 14:03:08 +0000 Subject: [PATCH 1/3] Added error component to /src/components and edited pages: Home, Ask Signed-off-by: ahmedabuamra --- diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 566ea94..b160ced 100755 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -23,7 +23,7 @@ import { ViewPackagePage } from '../pages/view-package/view-package'; import { NoBookmarksComponent } from '../components/no-bookmarks/no-bookmarks'; import { NoMeetingsComponent } from '../components/no-meetings/no-meetings'; import { NoResultsComponent } from '../components/no-results/no-results'; -import { NoInternetComponent } from '../components/no-internet/no-internet'; +import { ErrorComponent } from '../components/error/error'; import { Browser } from '../providers/browser/browser'; import { DatabaseProvider } from '../providers/database/database'; @@ -52,7 +52,7 @@ import { FedoCalService } from '../providers/fedo-cal/fedo-cal'; NoBookmarksComponent, NoMeetingsComponent, NoResultsComponent, - NoInternetComponent, + ErrorComponent, FedoraPodcast, PodcastPlayer ], diff --git a/src/assets/img/error.svg b/src/assets/img/error.svg new file mode 100644 index 0000000..de4eb24 --- /dev/null +++ b/src/assets/img/error.svg @@ -0,0 +1 @@ +server down \ No newline at end of file diff --git a/src/components/error/error.html b/src/components/error/error.html new file mode 100755 index 0000000..9289a3f --- /dev/null +++ b/src/components/error/error.html @@ -0,0 +1,6 @@ +
+ +

An Error Occurred!

+

You may be offline, please check your internet connection

+ +
diff --git a/src/components/error/error.ts b/src/components/error/error.ts new file mode 100755 index 0000000..60b7aa0 --- /dev/null +++ b/src/components/error/error.ts @@ -0,0 +1,18 @@ +import { Component, EventEmitter, Output } from '@angular/core'; + +@Component({ + selector: 'error', + templateUrl: 'error.html' +}) +export class ErrorComponent { + @Output() onClick = new EventEmitter(); + + constructor() { + } + + + onClickButton(event) { + this.onClick.emit(event); + } + +} diff --git a/src/pages/ask/ask.html b/src/pages/ask/ask.html index 90a1389..ce057a3 100644 --- a/src/pages/ask/ask.html +++ b/src/pages/ask/ask.html @@ -44,5 +44,8 @@ + + + \ No newline at end of file diff --git a/src/pages/home/home.html b/src/pages/home/home.html index f82c0c4..669fa0e 100644 --- a/src/pages/home/home.html +++ b/src/pages/home/home.html @@ -12,6 +12,7 @@ + @@ -40,6 +41,9 @@ + + + @@ -57,7 +61,8 @@ + - + \ No newline at end of file diff --git a/src/pages/home/home.ts b/src/pages/home/home.ts index 09e36a9..e1c61cc 100644 --- a/src/pages/home/home.ts +++ b/src/pages/home/home.ts @@ -166,6 +166,12 @@ export class HomePage { }); } + functioncall(event) { + console.log('functioncall', event); + } + + + beautifyDateSocial = x => beautifyDate(x, 'social'); beautifyDateBlog = x => beautifyDate(x, 'blog'); From b109511a7c9e541e5d79becb80f3abb3385b3cbc Mon Sep 17 00:00:00 2001 From: ahmedabuamra Date: Mar 23 2019 14:42:22 +0000 Subject: [PATCH 2/3] Added Error Component and implemented it in Home page Signed-off-by: ahmedabuamra --- diff --git a/src/pages/home/home.ts b/src/pages/home/home.ts index e1c61cc..6b0aa7b 100644 --- a/src/pages/home/home.ts +++ b/src/pages/home/home.ts @@ -166,10 +166,6 @@ export class HomePage { }); } - functioncall(event) { - console.log('functioncall', event); - } - beautifyDateSocial = x => beautifyDate(x, 'social'); From 59af59655a14a2a88897944e3abab9906c0b96bb Mon Sep 17 00:00:00 2001 From: ahmedabuamra Date: Mar 23 2019 14:46:39 +0000 Subject: [PATCH 3/3] deleted error from ask page Signed-off-by: ahmedabuamra --- diff --git a/src/pages/ask/ask.html b/src/pages/ask/ask.html index ce057a3..90a1389 100644 --- a/src/pages/ask/ask.html +++ b/src/pages/ask/ask.html @@ -44,8 +44,5 @@ - - - \ No newline at end of file