Merge branch 'hotfix/fix-navbar' into develop

my-zivi · May 17, 2021 · 53061dc · 53061dc
2 parents c7c01ab + c1a469c
commit 53061dc
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 5 deletions.
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -15,6 +15,10 @@ def navbar_link(name, path)
     end
   end
 
+  def app_page_title
+    page_title(app_name: t('layouts.application.title'), separator: ' | ')
+  end
+
   private
 
   def generate_picture_tag(base_path, extension, mime, **kwargs)

diff --git a/app/views/blog_entries/show.html.slim b/app/views/blog_entries/show.html.slim
@@ -3,6 +3,11 @@
 
 - content_for(:container_class, 'index-container')
 - content_for(:page_title, @blog_entry.title)
+- content_for(:social_tags) do
+  meta name="description" content=@blog_entry.description /
+  meta property="og:title" content=app_page_title /
+  meta property="og:type" content='article' /
+  meta property="article:author" content=@blog_entry.author /
 
 - cache @blog_entry do
   = render 'home/navbar'

diff --git a/app/views/home/_navbar.html.slim b/app/views/home/_navbar.html.slim
@@ -13,7 +13,7 @@ nav.navbar.navbar-expand-lg.navbar-light.bg-light.my-zivi-top-navbar
       span.navbar-toggler-icon
         i.fas.fa-bars.fa-lg
     #navbarScroll.collapse.navbar-collapse
-      ul.navbar-nav.mr-auto.my-2.my-lg-0.navbar-nav-scroll style=("max-height: 100px;")
+      ul.navbar-nav.mr-auto.my-2.my-lg-0.navbar-nav-scroll
         = navbar_link(t('home.navbar.links.recruiting'), recruiting_path)
         = navbar_link(t('home.navbar.links.admin'), administration_path)
         = navbar_link(t('home.navbar.links.about_us'), about_us_path)

diff --git a/app/views/layouts/_meta_tags.html.slim b/app/views/layouts/_meta_tags.html.slim
@@ -16,11 +16,15 @@ link href="/site.webmanifest" rel="manifest" /
 link color="#5bbad5" href="/safari-pinned-tab.svg" rel="mask-icon" /
 meta content="#eff0f1" name="msapplication-TileColor" /
 meta content="#ffffff" name="theme-color" /
-meta name="description" content=t('layouts.application.meta.description') /
-meta property="og:title" content=t('layouts.application.meta.og_title') /
-meta property="og:type" content='website' /
 link rel="preconnect" href="https://fonts.gstatic.com" /
 
+- if content_for?(:social_tags)
+  = yield(:social_tags)
+- else
+  meta name="description" content=t('layouts.application.meta.description') /
+  meta property="og:title" content=t('layouts.application.meta.og_title') /
+  meta property="og:type" content='website' /
+
 - %w[LightItalic Light Italic Regular MediumItalic Medium BoldItalic Bold].each do |font|
   link[
     rel="preload"

diff --git a/app/views/layouts/application.html.slim b/app/views/layouts/application.html.slim
@@ -1,7 +1,7 @@
 doctype html
 html lang=I18n.locale.to_s
   head
-    title = page_title(app_name: t('layouts.application.title'), separator: ' | ')
+    title = app_page_title
     = render 'layouts/meta_tags'
     = csrf_meta_tags
     = csp_meta_tag

diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
@@ -61,4 +61,16 @@
       end
     end
   end
+
+  describe '#app_page_title' do
+    subject { helper.app_page_title }
+
+    it { is_expected.to eq I18n.t('layouts.application.title') }
+
+    context 'with page title' do
+      before { helper.content_for(:page_title, 'Test') }
+
+      it { is_expected.to eq "#{I18n.t('layouts.application.title')} | Test" }
+    end
+  end
 end