Merged in feature/BKL-70-AddCountToFavoritesHeader (pull request #55)

Feature/BKL-70-AddCountToFavoritesHeader

Author: AndreasEngelmark

web/profiles/custom/os2loop/modules/os2loop_messages/os2loop_messages.module

@@ -6,6 +6,8 @@
  */
 
 use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Render\Markup;
+use Drupal\views\Views;
 
 /**
  * Implements hook_entity_insert().
@@ -33,3 +35,40 @@ function os2loop_messages_entity_update(EntityInterface $entity) {
 function os2loop_messages_form_alter(&$form, &$form_state, $form_id) {
   Drupal::service('os2loop_messages.helper')->formAlter($form, $form_id);
 }
+
+/**
+ * Implements hook_preprocess_page_title().
+ */
+function os2loop_messages_preprocess_page_title(&$variables) {
+  $view_id = 'os2loop_messages';
+
+  if (\Drupal::routeMatch()->getParameter('view_id') === $view_id) {
+    $view = Views::getView($view_id);
+    $view->execute('page_1');
+
+    $title_suffix = '<div class="total-row-count">' . $view->total_rows . '</div>';
+    $variables['title_suffix'] = Markup::create($title_suffix);
+  }
+}
+
+/**
+ * Implements hook_preprocess_field().
+ *
+ * Prepare variables for fields.
+ */
+function os2loop_messages_preprocess_field(&$variables) {
+  if ($variables['field_name'] === 'os2loop_section_page_view_header') {
+    $paragraph_fields = $variables['element']['#object']->getFields();
+    $views_block = $paragraph_fields['os2loop_section_page_block']->view()[0]['#block'];
+
+    $derivative_id = $views_block->getDerivativeId();
+    $derivative_id_exploded = explode('-', $derivative_id);
+
+    if ($derivative_id_exploded[0] === 'os2loop_messages') {
+      $view = Views::getView($derivative_id_exploded[0]);
+      $view->execute($derivative_id_exploded[1]);
+
+      $variables['total_rows'] = (string) count($view->result);
+    }
+  }
+}

web/profiles/custom/os2loop/themes/os2loop_theme/assets/signifly-custom/blocks/notifications.scss

@@ -11,7 +11,6 @@
 @import "layout/entity.scss";
 
 // blocks
-@import "blocks/notifications.scss";
 @import "blocks/messages.scss";
 @import "blocks/section.scss";
 @import "blocks/table-of-contents.scss";
@@ -53,3 +52,4 @@
 @import "pages/user-questions.scss";
 @import "pages/user-subscriptions.scss";
 @import "pages/user-replies.scss";
+@import "pages/user-messages.scss";

web/profiles/custom/os2loop/themes/os2loop_theme/assets/signifly-custom/custom-index.scss

@@ -0,0 +1,53 @@
+.user-messages > .content-wrapper {
+	@extend .block-primary-light-green;
+
+	.page-title {
+		@extend .d-inline-flex, .align-items-center;
+
+		.total-row-count {
+			@extend .rounded-circle, .ml-20;
+
+			width: 25px;
+			height: 25px;
+
+			background-color: $loop-green-400;
+			color: $loop-white;
+
+			text-align: center;
+		}
+	}
+}
+
+.user-messages > .content-wrapper,
+.paragraph.paragraph--type--os2loop-section-page-views-refer--views-blockos2loop-messages-block-1 {
+	.views-row {
+		.list-group-item {
+			@extend .bg-primary-white;
+			@extend .py-15;
+
+			border-radius: $border-radius;
+		}
+	}
+
+	.views-row + .views-row {
+		@extend .mt-10;
+	}
+}
+
+.paragraph.paragraph--type--os2loop-section-page-views-refer--views-blockos2loop-messages-block-1 {
+	.os2loop-section-page-view-header {
+		@extend .d-inline-flex, .align-items-center;
+
+		.total-row-count {
+			@extend .rounded-circle, .ml-20;
+
+			width: 25px;
+			height: 25px;
+
+			background-color: $loop-green-400;
+			color: $loop-white;
+
+			text-align: center;
+		}
+	}
+}

web/profiles/custom/os2loop/themes/os2loop_theme/assets/signifly-custom/pages/user-messages.scss

@@ -38,6 +38,16 @@
  * @ingroup themeable
  */
 #}
-{% for item in items %}
-  <h3{{ attributes.addClass('mb-20') }}>{{ item.content }}</h3>
-{% endfor %}
+
+<div class="{{ field_name|clean_class }} mb-20">
+  {% for item in items %}
+    <h3{{ attributes.addClass('mb-0') }}>
+      {{ item.content }}
+    </h3>
+  {% endfor %}
+  {% if total_rows %}
+    <div class="total-row-count">
+      {{ total_rows }}
+    </div>
+  {% endif %}
+</div>

web/profiles/custom/os2loop/themes/os2loop_theme/templates/field/field--os2loop-section-page-view-header.html.twig

@@ -14,8 +14,10 @@
  * @ingroup themeable
  */
 #}
-{{ title_prefix }}
-{% if title %}
-  <h1{{ title_attributes.addClass('h2 mb-20') }}>{{ title }}</h1>
-{% endif %}
-{{ title_suffix }}
+<div class="page-title mb-20">
+  {{ title_prefix }}
+  {% if title %}
+    <h1{{ title_attributes.addClass('h2 mb-0') }}>{{ title }}</h1>
+  {% endif %}
+  {{ title_suffix }}
+</div>

web/profiles/custom/os2loop/themes/os2loop_theme/templates/layout/page-title.html.twig

@@ -47,7 +47,6 @@
 {% set classes = [
   os2loop_container_class,
   is_front ? 'front-page',
-  path('<current>') == '/user/messages' ? 'notification-page',
   path('<current>') == '/contacts' ? 'contact-page',
   path('<current>') == '/node/add/os2loop_question' ? 'add-question-page',
   path('<current>') matches '/^\\/user\\/\\d+$/' ? 'view-profile-page',

web/profiles/custom/os2loop/themes/os2loop_theme/templates/layout/page.html.twig

@@ -49,10 +49,7 @@
 
   {{ exposed }}
   {{ attachment_before }}
-
-  <div class="mb-10">
-    {{ 'New messages:'|t }} <span class="badge badge-pill badge-primary">{{ total_rows }}</span>
-  </div>
+  
   {% if rows -%}
     {{ rows }}
   {% elseif empty -%}