From c8e5b5a8afe895abcf9e67e45241dc94105c73e1 Mon Sep 17 00:00:00 2001
From: Edward Hibbert <edward@ehibbert.org.uk>
Date: Wed, 8 Sep 2021 17:40:17 +0100
Subject: [PATCH 1/5] More work on nearby groups.

---
 app/Http/Controllers/GroupController.php      |  7 ++--
 resources/js/components/GroupsPage.vue        |  9 +++++
 resources/js/components/GroupsTable.vue       |  9 ++++-
 resources/lang/en/groups.php                  |  4 ++-
 .../partials/tables/head-groups.blade.php     | 24 -------------
 .../partials/tables/row-groups.blade.php      | 36 -------------------
 6 files changed, 23 insertions(+), 66 deletions(-)
 delete mode 100644 resources/views/partials/tables/head-groups.blade.php
 delete mode 100644 resources/views/partials/tables/row-groups.blade.php

diff --git a/app/Http/Controllers/GroupController.php b/app/Http/Controllers/GroupController.php
index 0169547e2a..5717ecd64f 100644
--- a/app/Http/Controllers/GroupController.php
+++ b/app/Http/Controllers/GroupController.php
@@ -62,13 +62,11 @@ private function indexVariations($tab, $network)
             ->select($group_atts)
             ->get();
 
-        //Make sure we don't show the same groups in nearest to you
-        $your_groups_uniques = $your_groups->pluck('idgroups')->toArray();
-        $groups_near_you = $user->groupsNearby(10);
+        // We pass a high limit to the groups nearby; there is a distance limit which will normally kick in first.
+        $groups_near_you = $user->groupsNearby(1000);
 
         return view('group.index', [
             'your_groups' => $this->expandGroups($your_groups),
-            'your_groups_uniques' => $your_groups_uniques,
             'groups_near_you' => $this->expandGroups($groups_near_you),
             'groups' => $this->expandGroups($groups),
             'your_area' => $user->location,
@@ -830,6 +828,7 @@ private function expandGroups($groups)
                     'networks' => Arr::pluck($group->networks, 'id'),
                     'country' => $group->country,
                     'group_tags' => $group->group_tags()->get()->pluck('id'),
+                    'distance' => $group->distance
                 ];
             }
         }
diff --git a/resources/js/components/GroupsPage.vue b/resources/js/components/GroupsPage.vue
index f97ed5314f..6f3f2a1314 100644
--- a/resources/js/components/GroupsPage.vue
+++ b/resources/js/components/GroupsPage.vue
@@ -43,6 +43,10 @@
           <b class="text-uppercase d-none d-lg-block">{{ __('groups.groups_title2') }}</b>
         </template>
         <div v-if="nearbyGroups && nearbyGroups.length">
+          <p>
+            {{ nearestGroups }}
+            <a href="/profile/edit" class="small">{{ __('groups.nearest_groups_change') }}</a>.
+          </p>
           <GroupsTable
               :groups="nearbyGroups"
               class="mt-3"
@@ -167,6 +171,11 @@ export default {
         return g.nearby
       })
     },
+    nearestGroups() {
+      return this.$lang.get('groups.nearest_groups', {
+        location: this.yourArea
+      })
+    }
   },
   watch: {
     currentTab(newVal) {
diff --git a/resources/js/components/GroupsTable.vue b/resources/js/components/GroupsTable.vue
index 25b6fed596..a86e012320 100644
--- a/resources/js/components/GroupsTable.vue
+++ b/resources/js/components/GroupsTable.vue
@@ -55,7 +55,7 @@
       </template>
       <template slot="cell(location)" slot-scope="data">
         <div class="d-none d-md-block">
-          {{ data.item.location.location }}
+          {{ data.item.location.location }} <span class="text-muted small">{{ distance(data.item.location.distance )}} km</span>
           <br />
           <span class="small text-muted">{{ data.item.location.country }}</span>
         </div>
@@ -308,6 +308,13 @@ export default {
       this.$store.dispatch('groups/unfollow', {
         idgroups: idgroups
       })
+    },
+    distance(dist ) {
+      if (dist < 10) {
+        return Math.round(dist * 10) / 10
+      } else {
+        return Math.round(dist)
+      }
     }
   }
 }
diff --git a/resources/lang/en/groups.php b/resources/lang/en/groups.php
index b0916d2583..421047c174 100644
--- a/resources/lang/en/groups.php
+++ b/resources/lang/en/groups.php
@@ -164,7 +164,9 @@
   'quick_access' => 'Groups you create or follow appear below for quick access.',
   'no_groups_mine' => '<b>If you can\'t see any here yet, why not <a href="/group/nearby">follow your nearest group</a> to hear about their upcoming repair events?</b>',
   'no_groups_nearest_no_location' => '<b><p>You do not currently have a town/city set.  You can set one in <a href="/profile/edit">your profile</a>.</p><p>You can also <a href="/group/all">view all groups</a>.</p></b>',
-  'no_groups_nearest_with_location' => '<b><p>It doesn\'t look like there are any groups listed near you yet.</p><p>Would you like to start or add a group?  Have a look at <a href="https://talk.restarters.net/t/how-to-power-up-community-repair-with-restarters-net/1228/2">our resources</a>.</p></b>',
+  'no_groups_nearest_with_location' => '<p>There are no groups within 50 km of your location. You can <a href="/group/all">see all groups here</a>. Or why not start your own? <a href="https://talk.restarters.net/t/how-to-run-a-repair-event-the-restart-party-kit/324">Learn what running your own repair event involves.</a></p>',
+  'nearest_groups'  => 'These the groups that are with 50 km of :location',
+  'nearest_groups_change' => '(change)',
   'group_count' => 'There is <b>:count group</b>.|There are <b>:count groups</b>.',
   'search_name_placeholder' => 'Search name...',
   'search_location_placeholder' => 'Search location...',
diff --git a/resources/views/partials/tables/head-groups.blade.php b/resources/views/partials/tables/head-groups.blade.php
deleted file mode 100644
index aa7cabf63a..0000000000
--- a/resources/views/partials/tables/head-groups.blade.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<thead>
-  <tr>
-    <th width="42">
-    </th>
-
-    <th width="200" scope="col">
-      @lang('groups.groups_name')
-    </th>
-
-    <th width="200" scope="col">
-      @lang('groups.groups_location')
-    </th>
-
-    <th width="100" scope="col" class="text-center">
-      <label for="label-upcoming_event" class="sort-column @if( $sort_column == 'upcoming_event' ) sort-column-{{{ strtolower($sort_direction) }}} @endif">
-        @lang('groups.groups_upcoming_event')
-      </label>
-    </th>
-
-    <th width="75" scope="col" class="text-center">
-      &nbsp;
-    </th>
-  </tr>
-</thead>
diff --git a/resources/views/partials/tables/row-groups.blade.php b/resources/views/partials/tables/row-groups.blade.php
deleted file mode 100644
index 8c725964d8..0000000000
--- a/resources/views/partials/tables/row-groups.blade.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<tr>
-  <td class="table-cell-icon" colspan="1">
-  @php( $group_image = $group->groupImage )
-  @if( is_object($group_image) && is_object($group_image->image) )
-    <img class="group-icon" src="{{ asset('/uploads/thumbnail_' . $group_image->image->path) }}" alt="{{{ $group->name }}}">
-  @else
-    <img class="group-icon" src="{{ asset('/images/placeholder-avatar.png') }}" alt="{{{ $group->name }}}">
-  @endif
-  </td>
-  <td colspan="1"><a href="/group/view/{{{ $group->idgroups }}}" title="edit group">{{{ $group->name }}}</a></td>
-  <td colspan="1">{{{ $group->getLocation() }}}</td>
-
-  @php ($next_upcoming_event = $group->getNextUpcomingEvent())
-  @if ( is_null($next_upcoming_event) )
-    <td class="">
-      @lang('groups.upcoming_none_planned')
-    </td>
-  @else
-    <td class="">
-        <a href="/party/view/{{ $next_upcoming_event->idevents }}">
-            <div>{{ $next_upcoming_event->getEventDate('D jS M Y') }}</div>
-        </a>
-    </td>
-  @endif
-
-  <td class="text-center" colspan="1">
-    @if ( ! in_array($group->idgroups, $your_groups_uniques) )
-      <a class="btn btn-primary" href="/group/join/{{ $group->idgroups }}" id="join-group">@lang('groups.follow_group')</a>
-    @endif
-  </td>
-  @if(  !is_null($groups) && App\Helpers\Fixometer::hasRole(Auth::user(), 'Administrator'))
-      <td colspan="1">
-          {{ \Carbon\Carbon::parse($group->created_at)->diffForHumans() }}
-      </td>
-  @endif
-</tr>

From 66180f665f00a3c55422d727d43e2ad9d629ebbf Mon Sep 17 00:00:00 2001
From: Edward Hibbert <edward@ehibbert.org.uk>
Date: Wed, 8 Sep 2021 17:45:11 +0100
Subject: [PATCH 2/5] Tweak distance display.

---
 resources/js/components/GroupsTable.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/js/components/GroupsTable.vue b/resources/js/components/GroupsTable.vue
index a86e012320..7cd5360bb7 100644
--- a/resources/js/components/GroupsTable.vue
+++ b/resources/js/components/GroupsTable.vue
@@ -310,7 +310,7 @@ export default {
       })
     },
     distance(dist ) {
-      if (dist < 10) {
+      if (dist < 5) {
         return Math.round(dist * 10) / 10
       } else {
         return Math.round(dist)

From 8a46a1bf1fb251ec3995d818c3ad3ba072eb7634 Mon Sep 17 00:00:00 2001
From: Edward Hibbert <edward@ehibbert.org.uk>
Date: Fri, 10 Sep 2021 12:49:08 +0100
Subject: [PATCH 3/5] Typos.

---
 resources/lang/en/groups.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/en/groups.php b/resources/lang/en/groups.php
index 421047c174..725b20c1ee 100644
--- a/resources/lang/en/groups.php
+++ b/resources/lang/en/groups.php
@@ -165,7 +165,7 @@
   'no_groups_mine' => '<b>If you can\'t see any here yet, why not <a href="/group/nearby">follow your nearest group</a> to hear about their upcoming repair events?</b>',
   'no_groups_nearest_no_location' => '<b><p>You do not currently have a town/city set.  You can set one in <a href="/profile/edit">your profile</a>.</p><p>You can also <a href="/group/all">view all groups</a>.</p></b>',
   'no_groups_nearest_with_location' => '<p>There are no groups within 50 km of your location. You can <a href="/group/all">see all groups here</a>. Or why not start your own? <a href="https://talk.restarters.net/t/how-to-run-a-repair-event-the-restart-party-kit/324">Learn what running your own repair event involves.</a></p>',
-  'nearest_groups'  => 'These the groups that are with 50 km of :location',
+  'nearest_groups'  => 'These are the groups that are within 50 km of :location',
   'nearest_groups_change' => '(change)',
   'group_count' => 'There is <b>:count group</b>.|There are <b>:count groups</b>.',
   'search_name_placeholder' => 'Search name...',

From 0047b486cb6cb1780bfdad674d0c806ba537814d Mon Sep 17 00:00:00 2001
From: Edward Hibbert <edward@ehibbert.org.uk>
Date: Mon, 11 Oct 2021 09:33:30 +0100
Subject: [PATCH 4/5] Testing feedback.

---
 resources/js/components/DashboardYourGroups.vue | 2 +-
 resources/js/components/GroupsTable.vue         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/js/components/DashboardYourGroups.vue b/resources/js/components/DashboardYourGroups.vue
index 005bcc0c84..f942ffdfc0 100644
--- a/resources/js/components/DashboardYourGroups.vue
+++ b/resources/js/components/DashboardYourGroups.vue
@@ -8,7 +8,7 @@
           </div>
           <b-img class="height ml-4" src="/images/group_doodle_ico.svg" />
         </div>
-        <a href="/group/nearby" v-if="newGroups" class="added added-md d-none d-md-block pr-3">
+        <a href="/group/nearby" v-if="newGroups && newGroups.length" class="added added-md d-none d-md-block pr-3">
           <b-img src="/images/arrow-right-doodle-white.svg" />
           {{ translatedNewlyAdded }}
         </a>
diff --git a/resources/js/components/GroupsTable.vue b/resources/js/components/GroupsTable.vue
index 7cd5360bb7..05da412389 100644
--- a/resources/js/components/GroupsTable.vue
+++ b/resources/js/components/GroupsTable.vue
@@ -55,7 +55,7 @@
       </template>
       <template slot="cell(location)" slot-scope="data">
         <div class="d-none d-md-block">
-          {{ data.item.location.location }} <span class="text-muted small">{{ distance(data.item.location.distance )}} km</span>
+          {{ data.item.location.location }} <span class="text-muted small" v-if="data.item.location.distance">{{ distance(data.item.location.distance )}} km</span>
           <br />
           <span class="small text-muted">{{ data.item.location.country }}</span>
         </div>

From 7e5d78eaf9e880a9b5e4414e594fa01ce95e9ae2 Mon Sep 17 00:00:00 2001
From: Edward Hibbert <edward@ehibbert.org.uk>
Date: Fri, 15 Oct 2021 13:10:38 +0100
Subject: [PATCH 5/5] Testing feedback.

---
 resources/js/components/GroupsPage.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/js/components/GroupsPage.vue b/resources/js/components/GroupsPage.vue
index 6f3f2a1314..0c32349896 100644
--- a/resources/js/components/GroupsPage.vue
+++ b/resources/js/components/GroupsPage.vue
@@ -43,7 +43,7 @@
           <b class="text-uppercase d-none d-lg-block">{{ __('groups.groups_title2') }}</b>
         </template>
         <div v-if="nearbyGroups && nearbyGroups.length">
-          <p>
+          <p class="mt-1">
             {{ nearestGroups }}
             <a href="/profile/edit" class="small">{{ __('groups.nearest_groups_change') }}</a>.
           </p>