From f93e4539486a2db79d2dea9217efb32b66e2c110 Mon Sep 17 00:00:00 2001 From: praveenojha3 Date: Mon, 30 Jul 2018 02:20:23 +0530 Subject: [PATCH] Address #1117: Added URL for logos --- src/app/about/about.component.html | 2 +- src/app/about/about.component.ts | 1 + src/app/contact/contact.component.html | 2 +- src/app/contact/contact.component.ts | 4 +++- src/app/dropdown/dropdown.component.html | 20 ++++++++-------- src/app/dropdown/dropdown.component.ts | 10 ++++++++ src/app/search-bar/search-bar.component.html | 2 +- src/app/search-bar/search-bar.component.ts | 3 ++- src/assets/images/github.png | Bin 1839 -> 0 bytes src/assets/url_configuration.ts | 23 ++++++++++++++++++- 10 files changed, 51 insertions(+), 16 deletions(-) delete mode 100644 src/assets/images/github.png diff --git a/src/app/about/about.component.html b/src/app/about/about.component.html index d8681403b..606e66f50 100644 --- a/src/app/about/about.component.html +++ b/src/app/about/about.component.html @@ -35,7 +35,7 @@
- +
diff --git a/src/app/about/about.component.ts b/src/app/about/about.component.ts index d765c347c..9dc7cec21 100644 --- a/src/app/about/about.component.ts +++ b/src/app/about/about.component.ts @@ -9,6 +9,7 @@ export class AboutComponent implements OnInit { susperUrl = url.susper.site; yacyUrl = url.yacy.api_server; fossasia_repo = url.github_repo.fossasia; + mountainLogo = url.logos.mountain; constructor() { } ngOnInit() { } diff --git a/src/app/contact/contact.component.html b/src/app/contact/contact.component.html index 417cf17c1..8e8d58899 100644 --- a/src/app/contact/contact.component.html +++ b/src/app/contact/contact.component.html @@ -29,7 +29,7 @@
- +
diff --git a/src/app/contact/contact.component.ts b/src/app/contact/contact.component.ts index 469b248e0..a2ee148d4 100644 --- a/src/app/contact/contact.component.ts +++ b/src/app/contact/contact.component.ts @@ -1,6 +1,6 @@ import { Component, ViewChild, OnInit } from '@angular/core'; import { ModalComponent } from 'ng2-bs3-modal/ng2-bs3-modal'; - +import { url } from 'assets/url_configuration'; @Component({ selector: 'app-contact', templateUrl: './contact.component.html', @@ -8,6 +8,8 @@ import { ModalComponent } from 'ng2-bs3-modal/ng2-bs3-modal'; }) export class ContactComponent implements OnInit { + boatImage = url.logos.boat_image; + @ViewChild('submitButton') submitButton; @ViewChild('emailInput') emailInput; diff --git a/src/app/dropdown/dropdown.component.html b/src/app/dropdown/dropdown.component.html index e17442be1..62e4575b2 100644 --- a/src/app/dropdown/dropdown.component.html +++ b/src/app/dropdown/dropdown.component.html @@ -8,12 +8,12 @@
-
+

Blogs

 -
+

Code

 @@ -23,17 +23,17 @@
-
+

Bug
Report

 -
+

Contact

 -
+

Advanced
Search

 @@ -44,17 +44,17 @@
-
+

FOSSASIA

 -
+

loklak

 -
+

SUSI

 @@ -63,11 +63,11 @@
-
+

Eventyay

 -
+

PSlab
diff --git a/src/app/dropdown/dropdown.component.ts b/src/app/dropdown/dropdown.component.ts index 0163c00db..45f31e8f2 100644 --- a/src/app/dropdown/dropdown.component.ts +++ b/src/app/dropdown/dropdown.component.ts @@ -16,6 +16,16 @@ export class DropdownComponent implements OnInit { pslabUrl = url.pslab.site; fossasiaLabsUrl = url.fossasia.labs; fossasia_repo = url.github_repo.fossasia; + blogLogo = url.logos.blog; + codeLogo = url.logos.code; + bugLogo = url.logos.bug; + contact_image = url.logos.contact_image; + searchLogo = url.logos.search; + fossasiaLogo = url.logos.fossasia; + loklakLogo = url.logos.loklak; + susiLogo = url.logos.susi; + pslabLogo = url.logos.pslab; + eventyayLogo = url.logos.eventyay; constructor() { } ngOnInit() { diff --git a/src/app/search-bar/search-bar.component.html b/src/app/search-bar/search-bar.component.html index ef244b49b..94a9d75c4 100644 --- a/src/app/search-bar/search-bar.component.html +++ b/src/app/search-bar/search-bar.component.html @@ -11,7 +11,7 @@