From 92eb0ee3b024dc0eef745f60a4cc9a6e0e62d312 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thea=20Sch=C3=B6bl?= <wulkanat@gmail.com>
Date: Tue, 27 Sep 2022 13:44:06 +0000
Subject: [PATCH] refactor: news module styling

---
 .../chips/filter/chip-filter.component.html   | 30 ++++---
 .../chips/filter/chip-filter.component.scss   | 23 +++++
 src/app/modules/news/item/news-item.html      | 24 ++---
 src/app/modules/news/item/news-item.scss      | 39 ++++----
 src/app/modules/news/page/news-item.html      | 56 ------------
 src/app/modules/news/page/news-page.html      | 88 ++++++++++---------
 src/app/modules/news/page/news-page.scss      |  2 +-
 7 files changed, 112 insertions(+), 150 deletions(-)
 delete mode 100644 src/app/modules/news/page/news-item.html

diff --git a/src/app/modules/data/chips/filter/chip-filter.component.html b/src/app/modules/data/chips/filter/chip-filter.component.html
index d8b15c6f..b029a815 100644
--- a/src/app/modules/data/chips/filter/chip-filter.component.html
+++ b/src/app/modules/data/chips/filter/chip-filter.component.html
@@ -1,22 +1,24 @@
 <!--
   ~ Copyright (C) 2022 StApps
-  ~  This program is free software: you can redistribute it and/or modify it
-  ~  under the terms of the GNU General Public License as published by the Free
-  ~  Software Foundation, version 3.
+  ~ This program is free software: you can redistribute it and/or modify it
+  ~ under the terms of the GNU General Public License as published by the Free
+  ~ Software Foundation, version 3.
   ~
-  ~  This program is distributed in the hope that it will be useful, but WITHOUT
-  ~  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  ~  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~  more details.
+  ~ This program is distributed in the hope that it will be useful, but WITHOUT
+  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  ~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  ~ more details.
   ~
-  ~  You should have received a copy of the GNU General Public License along with
-  ~  this program. If not, see <https://www.gnu.org/licenses/>.
+  ~ You should have received a copy of the GNU General Public License along with
+  ~ this program. If not, see <https://www.gnu.org/licenses/>.
   -->
 
-<ion-chip
-  [attr.color]="active ? 'primary' : 'medium'"
-  (click)="emitToggle(value)"
->
-  <ion-icon name="check_circle" *ngIf="active"></ion-icon>
+<ion-chip [class.active]="active" (click)="emitToggle(value)">
+  <ion-icon
+    class="ion-color"
+    name="check_circle"
+    fill="true"
+    *ngIf="active"
+  ></ion-icon>
   <ion-label>{{ displayValue }}</ion-label>
 </ion-chip>
diff --git a/src/app/modules/data/chips/filter/chip-filter.component.scss b/src/app/modules/data/chips/filter/chip-filter.component.scss
index e69de29b..9fed43eb 100644
--- a/src/app/modules/data/chips/filter/chip-filter.component.scss
+++ b/src/app/modules/data/chips/filter/chip-filter.component.scss
@@ -0,0 +1,23 @@
+/*!
+ * Copyright (C) 2022 StApps
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+ion-chip {
+  --background: var(--ion-color-primary-tint);
+  --color: var(--ion-color-primary-contrast);
+
+  &.active {
+    --background: var(--ion-color-primary-shade);
+  }
+}
diff --git a/src/app/modules/news/item/news-item.html b/src/app/modules/news/item/news-item.html
index ed80b55c..3ec8c828 100644
--- a/src/app/modules/news/item/news-item.html
+++ b/src/app/modules/news/item/news-item.html
@@ -13,29 +13,17 @@
   ~ this program. If not, see <https://www.gnu.org/licenses/>.
   -->
 
-<ion-card [routerLink]="['/data-detail', item.uid]">
-  <ion-thumbnail
-    ><ion-img
-      src="{{ item.image }}"
-      (ionError)="$event.target.nextSibling.style.display = 'block'"
-      alt=""
-    ></ion-img>
-    <ion-icon name="newspaper"></ion-icon>
-  </ion-thumbnail>
+<ion-card
+  [routerLink]="['/data-detail', item.uid]"
+  class="card"
+  [style.--background]="item.image ? 'url(' + item.image + ')' : undefined"
+>
   <ion-card-header>
     <ion-card-subtitle *ngIf="item.datePublished">{{
       item.datePublished | amCalendar | sentencecase
     }}</ion-card-subtitle>
     <ion-card-title>
-      <span>
-        <a [routerLink]="['/data-detail', item.uid]"
-          ><span class="text">{{ item.name }}</span></a
-        ></span
-      >
+      {{ item.name }}
     </ion-card-title>
   </ion-card-header>
-  <ion-card-content>
-    <!-- TODO: Temporary solution until the designs are ready, where is probable use of title only -->
-    {{ item.messageBody | slice: 0:120 }}...
-  </ion-card-content>
 </ion-card>
diff --git a/src/app/modules/news/item/news-item.scss b/src/app/modules/news/item/news-item.scss
index 281bae5a..ff18fcb0 100644
--- a/src/app/modules/news/item/news-item.scss
+++ b/src/app/modules/news/item/news-item.scss
@@ -13,27 +13,30 @@
  * this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
-ion-card-header a {
-  color: var(--ion-color-dark-tint);
-  text-decoration: none;
-}
-
 ion-card {
   height: 100%;
   margin: 0;
+  background-size: cover;
 }
 
-ion-card ion-thumbnail {
-  background: var(--placeholder-gray);
-  width: 100%;
-  height: auto;
-  img {
-    display: block;
-  }
-  ion-icon {
-    width: 100%;
-    height: 250px;
-    color: white;
-    display: none;
-  }
+ion-card::part(native) {
+  display: flex;
+  flex-direction: column-reverse;
+  height: 100%;
+  background: linear-gradient(to top, var(--ion-color-dark), transparent);
+}
+
+.card {
+  aspect-ratio: 1;
+  padding: 0;
+  box-shadow: none;
+}
+
+ion-card-title {
+  font-size: var(--font-size-xl);
+  --color: var(--ion-color-dark-contrast);
+}
+
+ion-card-subtitle {
+  --color: var(--ion-color-dark-contrast);
 }
diff --git a/src/app/modules/news/page/news-item.html b/src/app/modules/news/page/news-item.html
deleted file mode 100644
index 8f67cbca..00000000
--- a/src/app/modules/news/page/news-item.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!--
-  ~ Copyright (C) 2022 StApps
-  ~  This program is free software: you can redistribute it and/or modify it
-  ~  under the terms of the GNU General Public License as published by the Free
-  ~  Software Foundation, version 3.
-  ~
-  ~  This program is distributed in the hope that it will be useful, but WITHOUT
-  ~  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  ~  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~  more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License along with
-  ~  this program. If not, see <https://www.gnu.org/licenses/>.
-  -->
-
-<ion-card>
-  <span *ngIf="item.url; else imageNoUrl">
-    <a href="{{ item.url }}">
-      <ion-thumbnail
-        ><ion-img
-          src="{{ item.image }}"
-          (ionError)="$event.target.nextSibling.style.display = 'block'"
-          alt=""
-        ></ion-img>
-        <ion-icon name="newspaper"></ion-icon>
-      </ion-thumbnail>
-    </a>
-  </span>
-  <ng-template #imageNoUrl>
-    <ion-thumbnail>
-      <ion-img
-        src="{{ item.image }}"
-        (ionError)="$event.target.nextSibling.style.display = 'block'"
-        alt=""
-      ></ion-img>
-      <ion-icon name="newspaper"></ion-icon>
-    </ion-thumbnail>
-  </ng-template>
-  <ion-card-header>
-    <ion-card-subtitle *ngIf="item.datePublished">{{
-      item.datePublished | amCalendar | sentencecase
-    }}</ion-card-subtitle>
-    <ion-card-title>
-      <span *ngIf="item.url; else titleNoUrl"
-        ><a href="{{ item.url }}"
-          ><span class="text">{{ item.name }}</span
-          ><span class="icon"
-            ><ion-icon name="open_in_browser"></ion-icon></span></a
-      ></span>
-      <ng-template #titleNoUrl>{{ item.name }}</ng-template>
-    </ion-card-title>
-  </ion-card-header>
-  <ion-card-content>
-    {{ item.messageBody }}
-  </ion-card-content>
-</ion-card>
diff --git a/src/app/modules/news/page/news-page.html b/src/app/modules/news/page/news-page.html
index 25057ede..2a57b992 100644
--- a/src/app/modules/news/page/news-page.html
+++ b/src/app/modules/news/page/news-page.html
@@ -22,49 +22,51 @@
   </ion-toolbar>
 </ion-header>
 
-<ion-content fullscreen>
-  <ion-refresher slot="fixed" (ionRefresh)="refresh($event.target)">
-    <ion-refresher-content
-      pullingIcon="chevron-down-outline"
-      pullingText="{{ 'data.REFRESH_ACTION' | translate }}"
-      refreshingText="{{ 'data.REFRESHING' | translate }}"
-      refreshingSpinner="crescent"
+<ion-content class="ion-content-parallax">
+  <div>
+    <ion-refresher slot="fixed" (ionRefresh)="refresh($event.target)">
+      <ion-refresher-content
+        pullingIcon="chevron-down-outline"
+        pullingText="{{ 'data.REFRESH_ACTION' | translate }}"
+        refreshingText="{{ 'data.REFRESHING' | translate }}"
+        refreshingSpinner="crescent"
+      >
+      </ion-refresher-content>
+    </ion-refresher>
+    <ion-grid>
+      <ion-row>
+        <ion-col size="12">
+          <stapps-news-settings-filter
+            *ngIf="settings"
+            [settings]="settings"
+            (filtersChanged)="toggleFilter($event)"
+          ></stapps-news-settings-filter>
+        </ion-col>
+      </ion-row>
+    </ion-grid>
+    <div class="news-grid">
+      <ng-container *ngIf="!news">
+        <stapps-skeleton-news-item
+          *ngFor="let skeleton of [1, 2, 3, 4, 5]"
+        ></stapps-skeleton-news-item>
+      </ng-container>
+      <ng-container *ngIf="news.length > 0">
+        <stapps-news-item
+          *ngFor="let item of news"
+          [item]="item"
+        ></stapps-news-item>
+      </ng-container>
+    </div>
+    <ion-label *ngIf="news.length === 0" class="centeredMessageContainer">
+      {{ 'search.nothing_found' | translate | titlecase }}
+    </ion-label>
+    <ion-infinite-scroll
+      id="infinite-scroll"
+      threshold="20%"
+      (ionInfinite)="loadMore($event.target)"
     >
-    </ion-refresher-content>
-  </ion-refresher>
-  <ion-grid>
-    <ion-row>
-      <ion-col size="12">
-        <stapps-news-settings-filter
-          *ngIf="settings"
-          [settings]="settings"
-          (filtersChanged)="toggleFilter($event)"
-        ></stapps-news-settings-filter>
-      </ion-col>
-    </ion-row>
-  </ion-grid>
-  <div class="news-grid">
-    <ng-container *ngIf="!news">
-      <stapps-skeleton-news-item
-        *ngFor="let skeleton of [1, 2, 3, 4, 5]"
-      ></stapps-skeleton-news-item>
-    </ng-container>
-    <ng-container *ngIf="news.length > 0">
-      <stapps-news-item
-        *ngFor="let item of news"
-        [item]="item"
-      ></stapps-news-item>
-    </ng-container>
+      <ion-infinite-scroll-content loading-spinner="crescent">
+      </ion-infinite-scroll-content>
+    </ion-infinite-scroll>
   </div>
-  <ion-label *ngIf="news.length === 0" class="centeredMessageContainer">
-    {{ 'search.nothing_found' | translate | titlecase }}
-  </ion-label>
-  <ion-infinite-scroll
-    id="infinite-scroll"
-    threshold="20%"
-    (ionInfinite)="loadMore($event.target)"
-  >
-    <ion-infinite-scroll-content loading-spinner="crescent">
-    </ion-infinite-scroll-content>
-  </ion-infinite-scroll>
 </ion-content>
diff --git a/src/app/modules/news/page/news-page.scss b/src/app/modules/news/page/news-page.scss
index 743c17ae..f66c66a6 100644
--- a/src/app/modules/news/page/news-page.scss
+++ b/src/app/modules/news/page/news-page.scss
@@ -29,7 +29,7 @@
   }
 }
 
-ion-content.ios > .news-grid {
+ion-content.ios > div > .news-grid {
   gap: var(--spacing-lg);
   margin: var(--spacing-lg);
   @include auto-grid(350px);