From ee55af7c72aad01d43ebe66dac6842e521c27550 Mon Sep 17 00:00:00 2001 From: Kolia Date: Mon, 29 Aug 2022 09:57:42 +0300 Subject: [PATCH] Returning a deleted photo and code refactoring *Returned the deleted photo to the about, support and rules pages *Added a removed css property that exposed information under the photo *Changed the variable name to be more clear and moved it to the top. --- src/app/shared/styles/info.scss | 1 + src/app/shell/info/about/about.component.html | 2 +- src/app/shell/info/about/about.component.ts | 5 +++-- src/app/shell/info/info.component.html | 5 ++++- src/app/shell/info/rules/rules.component.html | 2 +- src/app/shell/info/rules/rules.component.ts | 3 ++- src/app/shell/info/support/support.component.html | 2 +- src/app/shell/info/support/support.component.ts | 3 ++- 8 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/app/shared/styles/info.scss b/src/app/shared/styles/info.scss index eb6b172f74..634951c267 100644 --- a/src/app/shared/styles/info.scss +++ b/src/app/shared/styles/info.scss @@ -3,6 +3,7 @@ &-content { position: relative; + top: -33px; text-align: center; width: 97.6%; margin: 0 auto 2%; diff --git a/src/app/shell/info/about/about.component.html b/src/app/shell/info/about/about.component.html index 8cc45d3cd6..45c76eb5e0 100644 --- a/src/app/shell/info/about/about.component.html +++ b/src/app/shell/info/about/about.component.html @@ -13,6 +13,6 @@

{{ platformInformation?.title }}

- + diff --git a/src/app/shell/info/about/about.component.ts b/src/app/shell/info/about/about.component.ts index 1fa81de0da..902d82ea82 100644 --- a/src/app/shell/info/about/about.component.ts +++ b/src/app/shell/info/about/about.component.ts @@ -20,14 +20,15 @@ import { NoResultsTitle } from 'src/app/shared/enum/no-results'; styleUrls: ['./about.component.scss'], }) export class AboutComponent implements OnInit, OnDestroy { + readonly noData = NoResultsTitle.noInfo; + @Select(AdminState.AboutPortal) platformInformation$: Observable; @Select(AdminState.isLoading) isLoading$: Observable; platformInformation: CompanyInformation; - - readonly emptyList = NoResultsTitle.noInfo; + private destroy$: Subject = new Subject(); constructor(private store: Store, private navigationBarService: NavigationBarService) {} diff --git a/src/app/shell/info/info.component.html b/src/app/shell/info/info.component.html index e740002b29..31750641ea 100644 --- a/src/app/shell/info/info.component.html +++ b/src/app/shell/info/info.component.html @@ -1,3 +1,6 @@
- +
+ +
+
diff --git a/src/app/shell/info/rules/rules.component.html b/src/app/shell/info/rules/rules.component.html index 9c8d001c5c..1969043c0c 100644 --- a/src/app/shell/info/rules/rules.component.html +++ b/src/app/shell/info/rules/rules.component.html @@ -13,6 +13,6 @@

{{ platformRules?.title }}

- + diff --git a/src/app/shell/info/rules/rules.component.ts b/src/app/shell/info/rules/rules.component.ts index 9e81d2b6d1..d5755d49b8 100644 --- a/src/app/shell/info/rules/rules.component.ts +++ b/src/app/shell/info/rules/rules.component.ts @@ -18,6 +18,8 @@ import { NoResultsTitle } from 'src/app/shared/enum/no-results'; }) export class RulesComponent implements OnInit, OnDestroy { + readonly noData = NoResultsTitle.noInfo; + @Select(AdminState.LawsAndRegulations) platformRules$: Observable; @Select(AdminState.isLoading) @@ -25,7 +27,6 @@ export class RulesComponent implements OnInit, OnDestroy { platformRules: CompanyInformation; - readonly emptyList = NoResultsTitle.noInfo; private destroy$: Subject = new Subject(); constructor(private store: Store, private navigationBarService: NavigationBarService) {} diff --git a/src/app/shell/info/support/support.component.html b/src/app/shell/info/support/support.component.html index f060965c48..96bd930f47 100644 --- a/src/app/shell/info/support/support.component.html +++ b/src/app/shell/info/support/support.component.html @@ -13,6 +13,6 @@

{{ platformSupport.title }}

- + diff --git a/src/app/shell/info/support/support.component.ts b/src/app/shell/info/support/support.component.ts index ca9c3bdb56..1d43e1396e 100644 --- a/src/app/shell/info/support/support.component.ts +++ b/src/app/shell/info/support/support.component.ts @@ -17,6 +17,8 @@ import { NoResultsTitle } from 'src/app/shared/enum/no-results'; styleUrls: ['./support.component.scss'], }) export class SupportComponent implements OnInit, OnDestroy { + readonly noData = NoResultsTitle.noInfo; + @Select(AdminState.SupportInformation) platformSupport$: Observable; @Select(AdminState.isLoading) @@ -24,7 +26,6 @@ export class SupportComponent implements OnInit, OnDestroy { platformSupport: CompanyInformation; - readonly emptyList = NoResultsTitle.noInfo; private destroy$: Subject = new Subject(); constructor(private store: Store, public navigationBarService: NavigationBarService ) { }