From 5832a84af22df425917a81c82f888bc8462ec11b Mon Sep 17 00:00:00 2001
From: Evgeniia Rassokhina <ea.rassokhina@gmail.com>
Date: Tue, 10 Aug 2021 22:18:07 +0300
Subject: [PATCH] hotfix getting unique species on the homepage

---
 app/model/recordings.js          |  2 +-
 app/views/admin.ejs              | 11 ++++++-----
 app/views/app.ejs                | 11 ++++++-----
 app/views/citizen-scientist.ejs  | 11 ++++++-----
 app/views/fragments/home-nav.ejs | 13 +++++++------
 app/views/visualizer.ejs         | 11 ++++++-----
 assets/app/home.js               |  8 ++++----
 assets/less/style.less           |  4 ++++
 8 files changed, 40 insertions(+), 31 deletions(-)

diff --git a/app/model/recordings.js b/app/model/recordings.js
index 053ef4b96..60672ffef 100644
--- a/app/model/recordings.js
+++ b/app/model/recordings.js
@@ -1657,7 +1657,7 @@ var Recordings = {
     },
 
     countAllSpecies: function() {
-        return dbpool.query('SELECT count(*) AS count FROM recording_validations WHERE present=1');
+        return dbpool.query('SELECT COUNT(DISTINCT species_id) AS count FROM recording_validations WHERE present != 0');
     },
 
     countAllRecordings: function() {
diff --git a/app/views/admin.ejs b/app/views/admin.ejs
index d845fb7d7..4f9520bb8 100644
--- a/app/views/admin.ejs
+++ b/app/views/admin.ejs
@@ -22,6 +22,9 @@
                     <span class="navbar-title">Arbimon</span>
                 </a>
                 <% if (!user || user.isAnonymousGuest) { %>
+                <div ng-click="toggleSearch = !toggleSearch;" class="search-nav-mobile search-nav-mobile-offset">
+                    <i class="fa fa-search" style="font-size: 20px; position: relative;"></i>
+                </div>
                 <a class="navbar-btn btn btn-primary navbar-toggle-right collapse-menu-hide collapsed" href="<%- auth0UniversalLoginUrl %>">
                     Sign In
                 </a>
@@ -51,11 +54,9 @@
                     </li>
                 </ul>
                 <ul class="nav navbar-nav navbar-right">
-                    <% if (user && !user.isAnonymousGuest) { %>
-                        <li style="padding: 11px 15px 9px; position: relative;" class="search-input">
-                            <search-bar></search-bar>
-                        </li>
-                    <% } %>
+                    <li style="padding: 11px 15px 9px; position: relative;" class="search-input">
+                        <search-bar></search-bar>
+                    </li>
                     <hr class="navbar-divider-collapse">
                     <li>
                         <% include fragments/other-rfcx-apps %>
diff --git a/app/views/app.ejs b/app/views/app.ejs
index e3dd27a09..3a9f88be0 100644
--- a/app/views/app.ejs
+++ b/app/views/app.ejs
@@ -24,6 +24,9 @@
                             <span class="navbar-title hide-for-tablet">Arbimon</span>
                         </a>
                         <% if (!user || user.isAnonymousGuest) { %>
+                        <div ng-click="toggleSearch = !toggleSearch;" class="search-nav-mobile search-nav-mobile-offset">
+                            <i class="fa fa-search" style="font-size: 20px; position: relative;"></i>
+                        </div>
                         <a class="navbar-btn btn btn-primary navbar-toggle-right collapse-menu-hide collapsed mr-0"
                             href="<%- auth0UniversalLoginUrl %>">
                             Sign In
@@ -106,11 +109,9 @@
                             </li>
                         </ul>
                         <ul class="nav navbar-nav navbar-right">
-                            <% if (user && !user.isAnonymousGuest) { %>
-                                <li style="position: relative;" class="search-input">
-                                    <search-bar></search-bar>
-                                </li>
-                            <% } %>
+                            <li style="position: relative;" class="search-input">
+                                <search-bar></search-bar>
+                            </li>
                             <hr class="navbar-divider-collapse">
                             <% include fragments/other-rfcx-apps %>
                             <ul class="nav navbar-nav navbar-menu-hide hide-tooltip-lg mr-0">
diff --git a/app/views/citizen-scientist.ejs b/app/views/citizen-scientist.ejs
index 225de4e15..ec9dd73e7 100644
--- a/app/views/citizen-scientist.ejs
+++ b/app/views/citizen-scientist.ejs
@@ -24,6 +24,9 @@
                             <span class="navbar-title hide-for-tablet">Arbimon</span>
                         </a>
                         <% if (!user || user.isAnonymousGuest) { %>
+                        <div ng-click="toggleSearch = !toggleSearch;" class="search-nav-mobile search-nav-mobile-offset">
+                            <i class="fa fa-search" style="font-size: 20px; position: relative;"></i>
+                        </div>
                         <a class="navbar-btn btn btn-primary navbar-toggle-right collapse-menu-hide collapsed"
                             href="<%- auth0UniversalLoginUrl %>">
                             Sign In
@@ -95,11 +98,9 @@
                         </ul>
                         <hr class="navbar-divider-collapse">
                         <ul class="nav navbar-nav navbar-right">
-                            <% if (user && !user.isAnonymousGuest) { %>
-                                <li style="padding: 11px 15px 9px; position: relative;" class="search-input">
-                                    <search-bar></search-bar>
-                                </li>
-                            <% } %>
+                            <li style="padding: 11px 15px 9px; position: relative;" class="search-input">
+                                <search-bar></search-bar>
+                            </li>
                             <hr class="navbar-divider-collapse">
                             <li>
                                 <% include fragments/other-rfcx-apps %>
diff --git a/app/views/fragments/home-nav.ejs b/app/views/fragments/home-nav.ejs
index f2d2fa302..40039f12e 100644
--- a/app/views/fragments/home-nav.ejs
+++ b/app/views/fragments/home-nav.ejs
@@ -13,6 +13,9 @@
                 <span class="navbar-title">Arbimon</span>
             </a>
             <% if (!user || user.isAnonymousGuest) { %>
+            <div ng-click="toggleSearch = !toggleSearch;" class="search-nav-mobile search-nav-mobile-offset">
+                <i class="fa fa-search" style="font-size: 20px; position: relative;"></i>
+            </div>
             <a class="navbar-btn btn btn-primary navbar-toggle-right collapse-menu-hide collapsed mr-0" href="<%- auth0UniversalLoginUrl %>">
                 Sign In
             </a>
@@ -39,12 +42,10 @@
                 <% } %>
             </ul>
             <ul class="nav navbar-nav navbar-right">
-                <% if (user && !user.isAnonymousGuest) { %>
-                    <li style="padding: 11px 15px 9px; position: relative;" class="search-input">
-                        <search-bar is-unsafe="true"></search-bar>
-                    </li>
-                    <hr class="navbar-divider-collapse">
-                <% } %>
+                <li style="padding: 11px 15px 9px; position: relative;" class="search-input">
+                    <search-bar is-unsafe="true"></search-bar>
+                </li>
+                <hr class="navbar-divider-collapse">
                 <li>
                     <% include other-rfcx-apps %>
                 </li>
diff --git a/app/views/visualizer.ejs b/app/views/visualizer.ejs
index d375714a1..5e01c037a 100644
--- a/app/views/visualizer.ejs
+++ b/app/views/visualizer.ejs
@@ -22,6 +22,9 @@
                     <span class="navbar-title">Arbimon</span>
                 </a>
                 <% if (!user || user.isAnonymousGuest) { %>
+                <div ng-click="toggleSearch = !toggleSearch;" class="search-nav-mobile search-nav-mobile-offset">
+                    <i class="fa fa-search" style="font-size: 20px; position: relative;"></i>
+                </div>
                 <a class="navbar-btn btn btn-primary navbar-toggle-right collapse-menu-hide collapsed" href="<%- auth0UniversalLoginUrl %>">
                     Sign In
                 </a>
@@ -54,11 +57,9 @@
                             <span><%=  project.name  %></span>
                         </a>
                     </li>
-                    <% if (user && !user.isAnonymousGuest) { %>
-                        <li style="padding: 11px 15px 9px; position: relative;" class="search-input">
-                            <search-bar></search-bar>
-                        </li>
-                    <% } %>
+                    <li style="padding: 11px 15px 9px; position: relative;" class="search-input">
+                        <search-bar></search-bar>
+                    </li>
                     <li>
                         <% include fragments/other-rfcx-apps %>
                     </li>
diff --git a/assets/app/home.js b/assets/app/home.js
index edbf0559d..f3841faa4 100644
--- a/assets/app/home.js
+++ b/assets/app/home.js
@@ -96,8 +96,8 @@ angular.module('a2.home', [
     }
 
     this.loadProjectList = function() {
-        const isFeatured = this.isAnonymousGuest || $scope.isExplorePage;
-        const isMyProjects = !this.isAnonymousGuest && !$scope.isExplorePage;
+        const isFeatured = $scope.isAnonymousGuest || $scope.isExplorePage;
+        const isMyProjects = !$scope.isAnonymousGuest && !$scope.isExplorePage;
         var config = {
             params: {
                 include_location: true,
@@ -173,10 +173,10 @@ angular.module('a2.home', [
         $window.location.assign("/project/" + project.url + "/");
     };
 
-    this.isAnonymousGuest = true;
+    $scope.isAnonymousGuest = true;
 
     $http.get('/api/user/info').success((function(data) {
-        this.isAnonymousGuest = data.isAnonymousGuest;
+        $scope.isAnonymousGuest = data.isAnonymousGuest;
         this.loadProjectList();
     }).bind(this));
 })
diff --git a/assets/less/style.less b/assets/less/style.less
index 90e3f3ebf..912ef4dbf 100644
--- a/assets/less/style.less
+++ b/assets/less/style.less
@@ -1651,6 +1651,10 @@ search-bar {
   }
 }
 
+.search-nav-mobile-offset {
+  right: 95px;
+}
+
 .input-search-desc {
   font-size: 12px;
 }