Feat/remove friends

client/scripts/configs/states.js

@@ -26,9 +26,9 @@ app.config(/* @ngInject */function ($locationProvider, $stateProvider, $urlRoute
   // Use $stateProvider to configure your states.
   $stateProvider
 
-  /// ///////
-  // Home //
-  /// ///////
+    /// ///////
+    // Home //
+    /// ///////
     .state('home', {
       url: '/',
       templateUrl: '/views/home.html',
@@ -295,20 +295,6 @@ app.config(/* @ngInject */function ($locationProvider, $stateProvider, $urlRoute
       }
     })
 
-    /// ////////
-    // User Friends Management //
-    /// ////////
-    .state('auth.users.friends', {
-      url: '/friends',
-      views: {
-        'content@auth': {
-          templateUrl: '/views/users/friends.html',
-          controller: 'FriendsController',
-          controllerAs: '$ctrl'
-        }
-      }
-    })
-
     /// ////////
     // Monitorings //
     /// ////////
@@ -340,9 +326,9 @@ app.config(/* @ngInject */function ($locationProvider, $stateProvider, $urlRoute
   angular.forEach(forms, function (formDef, formName) {
     $stateProvider
 
-    /// ////////
-    // Monitoring List public //
-    /// ////////
+      /// ////////
+      // Monitoring List public //
+      /// ////////
       .state('auth.monitoring.public.' + formName, {
         url: '/' + formName + '?' + (formDef || []).filters.join('&'),
         views: {
@@ -460,9 +446,9 @@ app.config(/* @ngInject */function ($locationProvider, $stateProvider, $urlRoute
   })
   $stateProvider
 
-  /// ////////
-  // Zones //
-  /// ////////
+    /// ////////
+    // Zones //
+    /// ////////
     .state('auth.zones', {
       url: '/zones?status&{location:int}&{owner:int}&zone',
       views: {

client/scripts/controllers/MonitoringController.js

@@ -57,12 +57,6 @@ require('../app').controller('MonitoringController', /* @ngInject */function ($s
         if (!controller.filter.user) {
           controller.filter.user = user.getIdentity().id
         }
-        $q.resolve(db.users.$promise || db.users).then(function (users) {
-          // if he has sharers
-          if (Object.keys(users).length > 1) {
-            controller.canFilterByUser = true
-          }
-        })
       }
       break
   }

client/scripts/models/user.js

@@ -2,17 +2,13 @@
  * Created by groupsky on 12.11.15.
  */
 
-var angular = require('angular')
-var md5 = require('blueimp-md5')
+const angular = require('angular')
+const md5 = require('blueimp-md5')
 
 require('../app').factory('User', /* @ngInject */function ($resource, $translate, BANNER_BASE_URL, ENDPOINT_URL) {
-  var User = $resource(ENDPOINT_URL + '/user/:id', {
+  const User = $resource(ENDPOINT_URL + '/user/:id', {
     id: '@id'
   }, {
-    // api methods
-    getSharers: { method: 'GET', url: ENDPOINT_URL + '/user/:id/sharers', isArray: true, cache: true },
-    getSharees: { method: 'GET', url: ENDPOINT_URL + '/user/:id/sharees', isArray: true },
-    saveSharees: { method: 'POST', url: ENDPOINT_URL + '/user/:id/sharees', isArray: true }
   })
 
   // methods

client/views/layout.html

@@ -8,13 +8,12 @@
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
-        <span ng-if="main.navbarCollapsed && $root.localCount > 0"
-              class="badge">{{$root.localCount}}</span>
+        <span ng-if="main.navbarCollapsed && $root.localCount > 0" class="badge">{{$root.localCount}}</span>
       </button>
       <a class="navbar-brand" ui-sref="auth.dashboard">
         <translate>SITE_NAME</translate>
         <span ng-if="::main.SW" style="margin-left: 0.25em; font-size: 50%; vertical-align: middle;"
-              ng-style="{color: isOnline ? '#8BC34A' : '#F44336'}">
+          ng-style="{color: isOnline ? '#8BC34A' : '#F44336'}">
           <i class="fa fa-circle"></i>
         </span>
         <span ng-if="::$user.isAdmin() || $user.isOrgAdmin()" class="text-danger">ADMIN</span>
@@ -25,16 +24,14 @@
     <nav class="navbar-collapse" uib-collapse="main.navbarCollapsed">
       <ul class="nav navbar-top-links navbar-right">
         <li class="dropdown" uib-dropdown>
-          <a href role="button" id="user-dropdown" type="button" class="dropdown-toggle"
-             uib-dropdown-toggle>
+          <a href role="button" id="user-dropdown" type="button" class="dropdown-toggle" uib-dropdown-toggle>
             <translate translate-values="::{userName: $user.getIdentity().firstName}">
               NAV_HELLO
             </translate>
             <span class="caret"></span>
           </a>
           <ul uib-dropdown-menu aria-labelledby="user-dropdown">
             <li>
-              <a href ui-sref="auth.users.friends" translate>NAV_FRIENDS</a>
               <a href ui-sref="auth.users.detail({id: $user.getIdentity().id})" translate>NAV_PROFILE</a>
               <a href ui-sref="auth.users.changepw" translate>NAV_CHANGE_PASSWORD</a>
             </li>
@@ -95,4 +92,4 @@
   </footer>
 
 </div>
-<!-- /#wrapper -->
+<!-- /#wrapper -->

i18n/bg.json

@@ -698,21 +698,9 @@
     "SPECIES_COL_INTERESTING": "Интересен",
     "SPECIES_COL_SENSITIVE": "Чувствителен",
     "WARNING_EXPORT_DISABLED": "Експортът на данни от други потребители не е разрешен",
-    "NAV_FRIENDS": "Приятели",
-    "FRIENDS_TITLE": "Модул за управление на приятели",
-    "FRIENDS_FIELD_EMAIL_LABEL": "E-mail:",
-    "FRIENDS_FIELD_EMAIL_PLACEHOLDER": "mail@smartbirds.org",
-    "FRIENDS_FIELD_EMAIL_HELP": "Добавете e-mail на потребители, с който искате да споделите данните си. Чувствителните записи няма да бъдат видими.",
-    "FRIENDS_LIST_SHARED_TO": "Потребителите, с които съм споделил моите данни",
-    "FRIENDS_LIST_SHARED_WITH_ME": "Потребителите, които са споделили данни с мен",
-    "FRIENDS_BUTTON_SAVE": "Запази",
-    "FRIENDS_UNSAVED_DATA_ALERT_TITLE": "Има незаписани промени!",
-    "FRIENDS_UNSAVED_DATA_ALERT_MESSAGE": "Имате незаписани промени. Сигурни ли сте, че искате да продължите?",
-    "FRIENDS_SAVE_SUCCESS": "Приятелите са успешно добавени",
-    "FRIENDS_SAVE_ERROR": "Грешка при добавяне на приятели",
     "PUBLIC_BIRDS_STATISTIC_TABLE_COL_COUNT_SPECIES": "{{count}} вида",
     "PUBLIC_BIRDS_STATISTIC_TABLE_COL_COUNT_RECORDS": "{{count}} записа",
-    "NAV_PRIVATE_FORMS": "Лични и споделени данни",
+    "NAV_PRIVATE_FORMS": "Лични данни",
     "NAV_PUBLIC_FORMS": "Публични данни",
     "CBM_PUBLIC_LIST_TITLE_MAIN": "МОВП",
     "CBM_PUBLIC_LIST_TITLE_SECONDARY": "Mониторинг на обикновените видове птици",

i18n/en.json

@@ -698,21 +698,9 @@
     "SPECIES_COL_INTERESTING": "Interesting",
     "SPECIES_COL_SENSITIVE": "Sensitive",
     "WARNING_EXPORT_DISABLED": "Exports of other user's data is not allowed",
-    "NAV_FRIENDS": "Friends",
-    "FRIENDS_TITLE": "Friends Management",
-    "FRIENDS_FIELD_EMAIL_LABEL": "E-mail:",
-    "FRIENDS_FIELD_EMAIL_PLACEHOLDER": "mail@smartbirds.org",
-    "FRIENDS_FIELD_EMAIL_HELP": "Add users by email you want to share your data with. The private records will not be visible",
-    "FRIENDS_LIST_SHARED_TO": "Users I am sharing my data with",
-    "FRIENDS_LIST_SHARED_WITH_ME": "Users sharing their data with me",
-    "FRIENDS_BUTTON_SAVE": "Save",
-    "FRIENDS_UNSAVED_DATA_ALERT_TITLE": "There are unsaved changes!",
-    "FRIENDS_UNSAVED_DATA_ALERT_MESSAGE": "There are unsaved changes! Are you sure you want to continue?",
-    "FRIENDS_SAVE_SUCCESS": "Friends saved successfully",
-    "FRIENDS_SAVE_ERROR": "Error while saving friends",
     "PUBLIC_BIRDS_STATISTIC_TABLE_COL_COUNT_SPECIES": "{{count}} species",
     "PUBLIC_BIRDS_STATISTIC_TABLE_COL_COUNT_RECORDS": "{{count}} observations",
-    "NAV_PRIVATE_FORMS": "My and shared data",
+    "NAV_PRIVATE_FORMS": "My data",
     "NAV_PUBLIC_FORMS": "Public forms",
     "CBM_PUBLIC_LIST_TITLE_MAIN": "CBM",
     "CBM_PUBLIC_LIST_TITLE_SECONDARY": "Common Birds Monitoring",

i18n/mk.json

@@ -666,18 +666,6 @@
     "SPECIES_COL_INTERESTING": "Интересно",
     "SPECIES_COL_SENSITIVE": "Осетливо",
     "WARNING_EXPORT_DISABLED": "Не е дозволено превземање податоци од други корисници",
-    "NAV_FRIENDS": "Пријатели",
-    "FRIENDS_TITLE": "Менаџирање пријатели",
-    "FRIENDS_FIELD_EMAIL_LABEL": "Електронска пошта",
-    "FRIENDS_FIELD_EMAIL_PLACEHOLDER": "mail@smartbirds.org",
-    "FRIENDS_FIELD_EMAIL_HELP": "Додади корисници преку електронска пошта со кои сакате да ги споделите податоците. Приватните записи нема да бидат видливи",
-    "FRIENDS_LIST_SHARED_TO": "Корисници со кои ги споделувам податоците",
-    "FRIENDS_LIST_SHARED_WITH_ME": "Корисници кои ги споделуваат податоците со мене",
-    "FRIENDS_BUTTON_SAVE": "Зачувај",
-    "FRIENDS_UNSAVED_DATA_ALERT_TITLE": "Постојат незачувани промени!",
-    "FRIENDS_UNSAVED_DATA_ALERT_MESSAGE": "Постојат незачувани промени! Дали сте сигурни дека саката да продолжите?",
-    "FRIENDS_SAVE_SUCCESS": "Пријателите се успешно зачувани",
-    "FRIENDS_SAVE_ERROR": "Грешка при зачувување пријатели",
     "PUBLIC_BIRDS_STATISTIC_TABLE_COL_COUNT_SPECIES": "{{count}}  видови",
     "PUBLIC_BIRDS_STATISTIC_TABLE_COL_COUNT_RECORDS": "{{count}} набљудувања",
     "NAV_PRIVATE_FORMS": "Мои и споделени податоци",

i18n/sq.json

@@ -698,18 +698,6 @@
     "SPECIES_COL_INTERESTING": "I veçantë",
     "SPECIES_COL_SENSITIVE": "I ndjeshëm",
     "WARNING_EXPORT_DISABLED": "Eksportimi i të dhënave të përdoruesve të tjerë nuk lejohet",
-    "NAV_FRIENDS": "Miqtë",
-    "FRIENDS_TITLE": "Menaxhimi i \"Miqtë\"",
-    "FRIENDS_FIELD_EMAIL_LABEL": "E-mail",
-    "FRIENDS_FIELD_EMAIL_PLACEHOLDER": "mail@smartbirds.org",
-    "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.",
-    "FRIENDS_LIST_SHARED_TO": "Përdoruesit me të cilët po ndaj të dhënat",
-    "FRIENDS_LIST_SHARED_WITH_ME": "Përdorues që ndajnë të dhënat me mua",
-    "FRIENDS_BUTTON_SAVE": "Ruaj",
-    "FRIENDS_UNSAVED_DATA_ALERT_TITLE": "Ndryshimet nuk janë ruajtur!",
-    "FRIENDS_UNSAVED_DATA_ALERT_MESSAGE": "Ndryshimet nuk janë ruajtur! Jeni i sigurt që doni të vazhdoni?",
-    "FRIENDS_SAVE_SUCCESS": "\"Miqtë\" u ruajtën me sukses",
-    "FRIENDS_SAVE_ERROR": "Problem gjatë ruajtjes  \"Miqtë\"",
     "PUBLIC_BIRDS_STATISTIC_TABLE_COL_COUNT_SPECIES": "{{numri}} lloji",
     "PUBLIC_BIRDS_STATISTIC_TABLE_COL_COUNT_RECORDS": "{{numri}} vrojtimet",
     "NAV_PRIVATE_FORMS": "Të dhënat e mia dhe shpërndarja e tyre",