From 5ca113b545a9ba7d9bb7fa87f2f00b9851e6d3c4 Mon Sep 17 00:00:00 2001
From: riggraz <riccardo.graziosi97@gmail.com>
Date: Wed, 11 Sep 2019 21:03:40 +0200
Subject: [PATCH] Fix flickering caused by turbolinks and other minor fixes

---
 app/javascript/components/Board/PostList.tsx         | 5 ++++-
 app/javascript/components/Board/PostStatusFilter.tsx | 5 ++---
 app/views/layouts/application.html.erb               | 2 ++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/javascript/components/Board/PostList.tsx b/app/javascript/components/Board/PostList.tsx
index 2e298ec6..d07b0d0f 100644
--- a/app/javascript/components/Board/PostList.tsx
+++ b/app/javascript/components/Board/PostList.tsx
@@ -50,7 +50,10 @@ const PostList = ({
             />
           ))
         :
-          !areLoading ? <span className="infoText text-muted">There are no posts.</span> : null
+          areLoading ?
+            <span className="infoText">Loading...</span>
+          :
+            <span className="infoText text-muted">There are no posts.</span>
       }
     </InfiniteScroll>
   </div>
diff --git a/app/javascript/components/Board/PostStatusFilter.tsx b/app/javascript/components/Board/PostStatusFilter.tsx
index 3fa97369..9c56bf21 100644
--- a/app/javascript/components/Board/PostStatusFilter.tsx
+++ b/app/javascript/components/Board/PostStatusFilter.tsx
@@ -24,9 +24,6 @@ const PostStatusFilter = ({
 }: Props) => (
   <div className="box sidebar-box postStatusFilterContainer">
     <span className="smallTitle">Filter by post status:</span>
-
-    { areLoading ? <Spinner /> : null }
-    { error ? <span className="error">{error}</span> : null }
     {
       postStatuses.map((postStatus, i) => (
         <PostStatusListItem
@@ -41,6 +38,8 @@ const PostStatusFilter = ({
         />
       ))
     }
+    { areLoading ? <Spinner /> : null }
+    { error ? <span className="error">{error}</span> : null }
   </div>
 );
 
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index d3150376..0a5b7481 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -5,6 +5,8 @@
     <%= csrf_meta_tags %>
     <%= csp_meta_tag %>
 
+    <meta name="turbolinks-cache-control" content="no-cache">
+
     <%= stylesheet_pack_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
     <%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %>
   </head>