bbs/clrghouz
1
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Change rendering of user's home, taking into account systems that have been marked inactive
All checks were successful
Create Docker Image / Build Docker Image (x86_64) (push) Successful in 35s
Details
Create Docker Image / Build Docker Image (arm64) (push) Successful in 1m30s
Details
Create Docker Image / Final Docker Image Manifest (push) Successful in 10s
Details

Browse Source
This commit is contained in:
Deon George 2024-12-02 19:57:39 +11:00
parent 09a0139839
commit 37549a90b7
2 changed files with 63 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Models/User.php
View File

@ -81,6 +81,7 @@ class User extends Authenticatable implements MustVerifyEmail
->join('systems',['systems.id'=>'addresses.system_id']) ->join('systems',['systems.id'=>'addresses.system_id'])
->join('system_user',['system_user.system_id'=>'systems.id']) ->join('system_user',['system_user.system_id'=>'systems.id'])
->where('system_user.user_id',$this->id) ->where('system_user.user_id',$this->id)
->where('systems.active',TRUE)
->ActiveFTN() ->ActiveFTN()
->FTN() ->FTN()
->get(); ->get();

120
resources/views/dashboard.blade.php
View File

@ -22,66 +22,67 @@ $user->load(['systems.akas.zone.domain.echoareas','systems.akas.echoareas']);
<div class="row pt-2"> <div class="row pt-2">
<div class="col-12"> <div class="col-12">
<h2>Hub Details for your nets</h2> @if(($x=$user
->addresses()
->diff(our_address())
->filter(fn($item)=>($item->point_id === 0) && ($item->zone->domain->isManaged())))->count())
<h2>Hub Details for your nets</h2>
<div class="accordion" id="accordion_details"> <div class="accordion" id="accordion_details">
@foreach($user @foreach($x->groupBy('zone.domain.name') as $list)
->addresses() <!-- {{ $x=$list->first()->domain->name }} -->
->diff(our_address()) <div class="accordion-item">
->filter(fn($item)=>($item->point_id === 0) && ($item->zone->domain->isManaged())) <h3 class="accordion-header">
->groupBy('zone.domain.name') as $list) <span @class(['accordion-button','collapsed'=>$loop->index]) id="hd_{{ $x }}" data-bs-toggle="collapse" data-bs-target="#collapse_{{ $x }}" aria-expanded="true" aria-controls="collapse_{{ $x }}">{{ $x }}</span>
<!-- {{ $x=$list->first()->domain->name }} --> </h3>
<div class="accordion-item">
<h3 class="accordion-header">
<span @class(['accordion-button','collapsed'=>$loop->index]) id="hd_{{ $x }}" data-bs-toggle="collapse" data-bs-target="#collapse_{{ $x }}" aria-expanded="true" aria-controls="collapse_{{ $x }}">{{ $x }}</span>
</h3>
<div id="collapse_{{ $x }}" class="accordion-collapse {{ ($loop->index) ? 'collapse' : 'show' }}" aria-labelledby="{{ $x }}" data-bs-parent="#accordion_details"> <div id="collapse_{{ $x }}" class="accordion-collapse {{ ($loop->index) ? 'collapse' : 'show' }}" aria-labelledby="{{ $x }}" data-bs-parent="#accordion_details">
<div class="accordion-body"> <div class="accordion-body">
<p>For your addresses in this domain: <strong class="highlight">{!! $list->pluck('ftn')->join('</strong>, <strong class="highlight">') !!}</strong>, you'll need to use the following details:</p> <p>For your addresses in this domain: <strong class="highlight">{!! $list->pluck('ftn')->join('</strong>, <strong class="highlight">') !!}</strong>, you'll need to use the following details:</p>
<br> <br>
<table class="table monotable"> <table class="table monotable">
<tbody> <tbody>
<tr> <tr>
<td> <td>
Hub FTN Address Hub FTN Address
</td> </td>
<th> <th>
<span style="color: cyan;">{{ our_address($list->first())->ftn4d }}</span> <span style="color: cyan;">{{ our_address($list->first())->ftn4d }}</span>
</th> </th>
</tr> </tr>
<tr> <tr>
<td> <td>
Hub FTN Domain Hub FTN Domain
</td> </td>
<th> <th>
<span style="color: cyan;">{{ $x }}</span> <span style="color: cyan;">{{ $x }}</span>
</th> </th>
</tr> </tr>
<tr> <tr>
<td> <td>
Hub Internet Address Hub Internet Address
</td> </td>
<th> <th>
<span style="color: cyan;">{{ our_hostname($list->first()) }}</span> <span style="color: cyan;">{{ our_hostname($list->first()) }}</span>
</th> </th>
</tr> </tr>
<tr> <tr>
<td> <td>
Hub Internet Ports Hub Internet Ports
</td> </td>
<td> <td>
BINKP: <span style="color: cyan;">{{ $setup->binkp_port }}</span> MD5 Mode: <span style="color: cyan;">{{$setup->optionGet(Binkp::F_MD,'binkp_options') ? 'YES' : 'NO' }}</span><br> BINKP: <span style="color: cyan;">{{ $setup->binkp_port }}</span> MD5 Mode: <span style="color: cyan;">{{$setup->optionGet(Binkp::F_MD,'binkp_options') ? 'YES' : 'NO' }}</span><br>
EMSI: <span style="color: cyan;">{{ $setup->emsi_port }}</span> Protocol: <span style="color: cyan;">Zmodem</span><br> EMSI: <span style="color: cyan;">{{ $setup->emsi_port }}</span> Protocol: <span style="color: cyan;">Zmodem</span><br>
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div>
</div> </div>
</div> </div>
</div> @endforeach
@endforeach </div>
</div> @endif
</div> </div>
</div> </div>
</div> </div>
@ -119,8 +120,9 @@ $user->load(['systems.akas.zone.domain.echoareas','systems.akas.echoareas']);
<h3>Active and Available Echos</h3> <h3>Active and Available Echos</h3>
<table class="table monotable"> <table class="table monotable">
<tbody> <tbody>
@foreach (($dl=$user @forelse(($dl=$user
->systems ->systems
->where('active',TRUE)
->pluck('akas')->flatten() ->pluck('akas')->flatten()
->pluck('zone.domain') ->pluck('zone.domain')
->unique() ->unique()
@ -137,7 +139,9 @@ $user->load(['systems.akas.zone.domain.echoareas','systems.akas.echoareas']);
@endforeach @endforeach
</td> </td>
</tr> </tr>
@endforeach @empty
<p>We share no active FTN addresses, so there are no Echos available</p>
@endforelse
</tbody> </tbody>
</table> </table>
</div> </div>