Skip to content

Commit 82f865b

Browse files
onyxvdonyxvd
authored
Feat/remove friends (#593)
Remove "Friends" feature
1 parent 2234c15 commit 82f865b

File tree

10 files changed

+18
-207
lines changed

10 files changed

+18
-207
lines changed

‎client/scripts/configs/states.js‎

Lines changed: 9 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ app.config(/* @ngInject */function ($locationProvider, $stateProvider, $urlRoute
2626
// Use $stateProvider to configure your states.
2727
$stateProvider
2828

29-
/// ///////
30-
// Home //
31-
/// ///////
29+
/// ///////
30+
// Home //
31+
/// ///////
3232
.state('home', {
3333
url: '/',
3434
templateUrl: '/views/home.html',
@@ -295,20 +295,6 @@ app.config(/* @ngInject */function ($locationProvider, $stateProvider, $urlRoute
295295
}
296296
})
297297

298-
/// ////////
299-
// User Friends Management //
300-
/// ////////
301-
.state('auth.users.friends', {
302-
url: '/friends',
303-
views: {
304-
'content@auth': {
305-
templateUrl: '/views/users/friends.html',
306-
controller: 'FriendsController',
307-
controllerAs: '$ctrl'
308-
}
309-
}
310-
})
311-
312298
/// ////////
313299
// Monitorings //
314300
/// ////////
@@ -340,9 +326,9 @@ app.config(/* @ngInject */function ($locationProvider, $stateProvider, $urlRoute
340326
angular.forEach(forms, function (formDef, formName) {
341327
$stateProvider
342328

343-
/// ////////
344-
// Monitoring List public //
345-
/// ////////
329+
/// ////////
330+
// Monitoring List public //
331+
/// ////////
346332
.state('auth.monitoring.public.' + formName, {
347333
url: '/' + formName + '?' + (formDef || []).filters.join('&'),
348334
views: {
@@ -460,9 +446,9 @@ app.config(/* @ngInject */function ($locationProvider, $stateProvider, $urlRoute
460446
})
461447
$stateProvider
462448

463-
/// ////////
464-
// Zones //
465-
/// ////////
449+
/// ////////
450+
// Zones //
451+
/// ////////
466452
.state('auth.zones', {
467453
url: '/zones?status&{location:int}&{owner:int}&zone',
468454
views: {

‎client/scripts/controllers/FriendsController.js‎

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎client/scripts/controllers/MonitoringController.js‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,6 @@ require('../app').controller('MonitoringController', /* @ngInject */function ($s
5757
if (!controller.filter.user) {
5858
controller.filter.user = user.getIdentity().id
5959
}
60-
$q.resolve(db.users.$promise || db.users).then(function (users) {
61-
// if he has sharers
62-
if (Object.keys(users).length > 1) {
63-
controller.canFilterByUser = true
64-
}
65-
})
6660
}
6761
break
6862
}

‎client/scripts/models/user.js‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,13 @@
22
* Created by groupsky on 12.11.15.
33
*/
44

5-
var angular = require('angular')
6-
var md5 = require('blueimp-md5')
5+
const angular = require('angular')
6+
const md5 = require('blueimp-md5')
77

88
require('../app').factory('User', /* @ngInject */function ($resource, $translate, BANNER_BASE_URL, ENDPOINT_URL) {
9-
var User = $resource(ENDPOINT_URL + '/user/:id', {
9+
const User = $resource(ENDPOINT_URL + '/user/:id', {
1010
id: '@id'
1111
}, {
12-
// api methods
13-
getSharers: { method: 'GET', url: ENDPOINT_URL + '/user/:id/sharers', isArray: true, cache: true },
14-
getSharees: { method: 'GET', url: ENDPOINT_URL + '/user/:id/sharees', isArray: true },
15-
saveSharees: { method: 'POST', url: ENDPOINT_URL + '/user/:id/sharees', isArray: true }
1612
})
1713

1814
// methods

‎client/views/layout.html‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,12 @@
88
<span class="icon-bar"></span>
99
<span class="icon-bar"></span>
1010
<span class="icon-bar"></span>
11-
<span ng-if="main.navbarCollapsed && $root.localCount > 0"
12-
class="badge">{{$root.localCount}}</span>
11+
<span ng-if="main.navbarCollapsed && $root.localCount > 0" class="badge">{{$root.localCount}}</span>
1312
</button>
1413
<a class="navbar-brand" ui-sref="auth.dashboard">
1514
<translate>SITE_NAME</translate>
1615
<span ng-if="::main.SW" style="margin-left: 0.25em; font-size: 50%; vertical-align: middle;"
17-
ng-style="{color: isOnline ? '#8BC34A' : '#F44336'}">
16+
ng-style="{color: isOnline ? '#8BC34A' : '#F44336'}">
1817
<i class="fa fa-circle"></i>
1918
</span>
2019
<span ng-if="::$user.isAdmin() || $user.isOrgAdmin()" class="text-danger">ADMIN</span>
@@ -25,16 +24,14 @@
2524
<nav class="navbar-collapse" uib-collapse="main.navbarCollapsed">
2625
<ul class="nav navbar-top-links navbar-right">
2726
<li class="dropdown" uib-dropdown>
28-
<a href role="button" id="user-dropdown" type="button" class="dropdown-toggle"
29-
uib-dropdown-toggle>
27+
<a href role="button" id="user-dropdown" type="button" class="dropdown-toggle" uib-dropdown-toggle>
3028
<translate translate-values="::{userName: $user.getIdentity().firstName}">
3129
NAV_HELLO
3230
</translate>
3331
<span class="caret"></span>
3432
</a>
3533
<ul uib-dropdown-menu aria-labelledby="user-dropdown">
3634
<li>
37-
<a href ui-sref="auth.users.friends" translate>NAV_FRIENDS</a>
3835
<a href ui-sref="auth.users.detail({id: $user.getIdentity().id})" translate>NAV_PROFILE</a>
3936
<a href ui-sref="auth.users.changepw" translate>NAV_CHANGE_PASSWORD</a>
4037
</li>
@@ -95,4 +92,4 @@
9592
</footer>
9693

9794
</div>
98-
<!-- /#wrapper -->
95+
<!-- /#wrapper -->

‎client/views/users/friends.html‎

Lines changed: 0 additions & 70 deletions
This file was deleted.

‎i18n/bg.json‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -698,21 +698,9 @@
698698
"SPECIES_COL_INTERESTING": "Интересен",
699699
"SPECIES_COL_SENSITIVE": "Чувствителен",
700700
"WARNING_EXPORT_DISABLED": "Експортът на данни от други потребители не е разрешен",
701-
"NAV_FRIENDS": "Приятели",
702-
"FRIENDS_TITLE": "Модул за управление на приятели",
703-
"FRIENDS_FIELD_EMAIL_LABEL": "E-mail:",
704-
"FRIENDS_FIELD_EMAIL_PLACEHOLDER": "[email protected]",
705-
"FRIENDS_FIELD_EMAIL_HELP": "Добавете e-mail на потребители, с който искате да споделите данните си. Чувствителните записи няма да бъдат видими.",
706-
"FRIENDS_LIST_SHARED_TO": "Потребителите, с които съм споделил моите данни",
707-
"FRIENDS_LIST_SHARED_WITH_ME": "Потребителите, които са споделили данни с мен",
708-
"FRIENDS_BUTTON_SAVE": "Запази",
709-
"FRIENDS_UNSAVED_DATA_ALERT_TITLE": "Има незаписани промени!",
710-
"FRIENDS_UNSAVED_DATA_ALERT_MESSAGE": "Имате незаписани промени. Сигурни ли сте, че искате да продължите?",
711-
"FRIENDS_SAVE_SUCCESS": "Приятелите са успешно добавени",
712-
"FRIENDS_SAVE_ERROR": "Грешка при добавяне на приятели",
713701
"PUBLIC_BIRDS_STATISTIC_TABLE_COL_COUNT_SPECIES": "{{count}} вида",
714702
"PUBLIC_BIRDS_STATISTIC_TABLE_COL_COUNT_RECORDS": "{{count}} записа",
715-
"NAV_PRIVATE_FORMS": "Лични и споделени данни",
703+
"NAV_PRIVATE_FORMS": "Лични данни",
716704
"NAV_PUBLIC_FORMS": "Публични данни",
717705
"CBM_PUBLIC_LIST_TITLE_MAIN": "МОВП",
718706
"CBM_PUBLIC_LIST_TITLE_SECONDARY": "Mониторинг на обикновените видове птици",

‎i18n/en.json‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -698,21 +698,9 @@
698698
"SPECIES_COL_INTERESTING": "Interesting",
699699
"SPECIES_COL_SENSITIVE": "Sensitive",
700700
"WARNING_EXPORT_DISABLED": "Exports of other user's data is not allowed",
701-
"NAV_FRIENDS": "Friends",
702-
"FRIENDS_TITLE": "Friends Management",
703-
"FRIENDS_FIELD_EMAIL_LABEL": "E-mail:",
704-
"FRIENDS_FIELD_EMAIL_PLACEHOLDER": "[email protected]",
705-
"FRIENDS_FIELD_EMAIL_HELP": "Add users by email you want to share your data with. The private records will not be visible",
706-
"FRIENDS_LIST_SHARED_TO": "Users I am sharing my data with",
707-
"FRIENDS_LIST_SHARED_WITH_ME": "Users sharing their data with me",
708-
"FRIENDS_BUTTON_SAVE": "Save",
709-
"FRIENDS_UNSAVED_DATA_ALERT_TITLE": "There are unsaved changes!",
710-
"FRIENDS_UNSAVED_DATA_ALERT_MESSAGE": "There are unsaved changes! Are you sure you want to continue?",
711-
"FRIENDS_SAVE_SUCCESS": "Friends saved successfully",
712-
"FRIENDS_SAVE_ERROR": "Error while saving friends",
713701
"PUBLIC_BIRDS_STATISTIC_TABLE_COL_COUNT_SPECIES": "{{count}} species",
714702
"PUBLIC_BIRDS_STATISTIC_TABLE_COL_COUNT_RECORDS": "{{count}} observations",
715-
"NAV_PRIVATE_FORMS": "My and shared data",
703+
"NAV_PRIVATE_FORMS": "My data",
716704
"NAV_PUBLIC_FORMS": "Public forms",
717705
"CBM_PUBLIC_LIST_TITLE_MAIN": "CBM",
718706
"CBM_PUBLIC_LIST_TITLE_SECONDARY": "Common Birds Monitoring",

‎i18n/mk.json‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -666,18 +666,6 @@
666666
"SPECIES_COL_INTERESTING": "Интересно",
667667
"SPECIES_COL_SENSITIVE": "Осетливо",
668668
"WARNING_EXPORT_DISABLED": "Не е дозволено превземање податоци од други корисници",
669-
"NAV_FRIENDS": "Пријатели",
670-
"FRIENDS_TITLE": "Менаџирање пријатели",
671-
"FRIENDS_FIELD_EMAIL_LABEL": "Електронска пошта",
672-
"FRIENDS_FIELD_EMAIL_PLACEHOLDER": "[email protected]",
673-
"FRIENDS_FIELD_EMAIL_HELP": "Додади корисници преку електронска пошта со кои сакате да ги споделите податоците. Приватните записи нема да бидат видливи",
674-
"FRIENDS_LIST_SHARED_TO": "Корисници со кои ги споделувам податоците",
675-
"FRIENDS_LIST_SHARED_WITH_ME": "Корисници кои ги споделуваат податоците со мене",
676-
"FRIENDS_BUTTON_SAVE": "Зачувај",
677-
"FRIENDS_UNSAVED_DATA_ALERT_TITLE": "Постојат незачувани промени!",
678-
"FRIENDS_UNSAVED_DATA_ALERT_MESSAGE": "Постојат незачувани промени! Дали сте сигурни дека саката да продолжите?",
679-
"FRIENDS_SAVE_SUCCESS": "Пријателите се успешно зачувани",
680-
"FRIENDS_SAVE_ERROR": "Грешка при зачувување пријатели",
681669
"PUBLIC_BIRDS_STATISTIC_TABLE_COL_COUNT_SPECIES": "{{count}} видови",
682670
"PUBLIC_BIRDS_STATISTIC_TABLE_COL_COUNT_RECORDS": "{{count}} набљудувања",
683671
"NAV_PRIVATE_FORMS": "Мои и споделени податоци",

‎i18n/sq.json‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -698,18 +698,6 @@
698698
"SPECIES_COL_INTERESTING": "I veçantë",
699699
"SPECIES_COL_SENSITIVE": "I ndjeshëm",
700700
"WARNING_EXPORT_DISABLED": "Eksportimi i të dhënave të përdoruesve të tjerë nuk lejohet",
701-
"NAV_FRIENDS": "Miqtë",
702-
"FRIENDS_TITLE": "Menaxhimi i \"Miqtë\"",
703-
"FRIENDS_FIELD_EMAIL_LABEL": "E-mail",
704-
"FRIENDS_FIELD_EMAIL_PLACEHOLDER": "[email protected]",
705-
"FRIENDS_FIELD_EMAIL_HELP": "Shto përdorues nëpërmjet emailit me të cilët mund të ndash të dhënat. Të dhënat private nuk do të shfaqen.",
706-
"FRIENDS_LIST_SHARED_TO": "Përdoruesit me të cilët po ndaj të dhënat",
707-
"FRIENDS_LIST_SHARED_WITH_ME": "Përdorues që ndajnë të dhënat me mua",
708-
"FRIENDS_BUTTON_SAVE": "Ruaj",
709-
"FRIENDS_UNSAVED_DATA_ALERT_TITLE": "Ndryshimet nuk janë ruajtur!",
710-
"FRIENDS_UNSAVED_DATA_ALERT_MESSAGE": "Ndryshimet nuk janë ruajtur! Jeni i sigurt që doni të vazhdoni?",
711-
"FRIENDS_SAVE_SUCCESS": "\"Miqtë\" u ruajtën me sukses",
712-
"FRIENDS_SAVE_ERROR": "Problem gjatë ruajtjes \"Miqtë\"",
713701
"PUBLIC_BIRDS_STATISTIC_TABLE_COL_COUNT_SPECIES": "{{numri}} lloji",
714702
"PUBLIC_BIRDS_STATISTIC_TABLE_COL_COUNT_RECORDS": "{{numri}} vrojtimet",
715703
"NAV_PRIVATE_FORMS": "Të dhënat e mia dhe shpërndarja e tyre",

0 commit comments

Comments
 (0)