Skip to content

Commit

Permalink
Merge pull request #725 from rfcx/bug/hotfix-getting-uniq-species
Browse files Browse the repository at this point in the history 
Hotfix getting unique species on the homepage
  • Loading branch information
@rassokhina-e
rassokhina-e authored Aug 10, 2021
2 parents 4ba8321 + 5832a84 commit 5a5452c
Show file tree
Hide file tree
Showing 8 changed files with 40 additions and 31 deletions.
2 changes: 1 addition & 1 deletion app/model/recordings.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
11 changes: 6 additions & 5 deletions app/views/admin.ejs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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 %>
Expand Down
11 changes: 6 additions & 5 deletions app/views/app.ejs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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">
Expand Down
11 changes: 6 additions & 5 deletions app/views/citizen-scientist.ejs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 %>
Expand Down
13 changes: 7 additions & 6 deletions app/views/fragments/home-nav.ejs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
11 changes: 6 additions & 5 deletions app/views/visualizer.ejs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
8 changes: 4 additions & 4 deletions assets/app/home.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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));
})
Expand Down
4 changes: 4 additions & 0 deletions assets/less/style.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1651,6 +1651,10 @@ search-bar {
}
}

.search-nav-mobile-offset {
right: 95px;
}

.input-search-desc {
font-size: 12px;
}
Expand Down

0 comments on commit 5a5452c

Please sign in to comment.