Skip to content

Commit

Permalink
All all groups link to nearby groups.
Browse files Browse the repository at this point in the history
  • Loading branch information
edwh committed Sep 6, 2021
1 parent c65df6e commit 2207815
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 6 deletions.
7 changes: 3 additions & 4 deletions resources/js/components/DashboardNoGroups.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
<h3>{{ __('dashboard.groups_near_you_header') }}</h3>
<hr />
<DashboardGroup v-for="group in nearbyGroups" :key="'nearbygroup-' + group.idgroups" :group="group" />
<a href="/group/nearby">
{{ __('dashboard.see_all_groups_near_you') }}
</a>
</div>
</div>
<div v-else class="layout mb-2">
Expand Down Expand Up @@ -109,10 +112,6 @@ export default {
background-image: url('/images/no_groups.png');
}
/deep/ .overlay a {
text-decoration: underline;
}
h3 {
font-size: 1rem;
font-weight: bold;
Expand Down
4 changes: 2 additions & 2 deletions resources/js/components/DashboardYourGroups.vue
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,8 @@ h3 {
font-weight: bold;
}
a {
color: unset;
/deep/ a {
color: #0394a6;
text-decoration: underline;
}
Expand Down
1 change: 1 addition & 0 deletions resources/lang/en/dashboard.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
'your_networks' => 'Your networks',
'networks_you_coordinate' => 'View the networks that you coordinate.',
'see_all_groups' => 'see all',
'see_all_groups_near_you' => 'See all groups near you →',
'catch_up' => 'Catch up with your groups by clicking below.',
'your_groups_heading' => 'Your Groups',
'groups_heading' => 'Groups',
Expand Down
3 changes: 3 additions & 0 deletions resources/views/user/profile/calendars.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,17 @@

<div class="input-group input-group-select2 mb-3">
<select class="form-control select2-with-input-group" id="inputGroupSelect02">
@php($first_option=null)
@foreach ($all_group_areas as $area)
@if($loop->first)
@php( $first_option = $area )
@endif
<option value="{{ $area }}">{{ $area }}</option>
@endforeach
</select>
@if ($first_option)
<input type="text" class="form-control" value="{{ url("/calendar/group-area/{$first_option}") }}">
@endif
<div class="input-group-append">
<button class="btn btn-normal-padding btn-primary btn-copy-input-text" type="button">@lang('profile.calendars.copy_link')</button>
</div>
Expand Down

0 comments on commit 2207815

Please sign in to comment.