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

Remove remaining ftn/ paths, no functional changes

Browse Source
This commit is contained in:
Deon George 2023-10-05 22:49:57 +11:00
parent b25e6f432c
commit 654e7bd2aa
10 changed files with 17 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/EchoareaController.php
View File

@ -41,9 +41,4 @@ class EchoareaController extends Controller
return view('echoarea.addedit') return view('echoarea.addedit')
->with('o',$o); ->with('o',$o);
} }
public function home()
{
return view('echoarea.home');
}
} }

5
app/Http/Controllers/FileareaController.php
View File

@ -46,9 +46,4 @@ class FileareaController extends Controller
return view('filearea.addedit') return view('filearea.addedit')
->with('o',$o); ->with('o',$o);
} }
public function home()
{
return view('filearea.home');
}
} }

2
resources/views/domain/addedit.blade.php
View File

@ -104,7 +104,7 @@
@if ($o->nodelist_filename) @if ($o->nodelist_filename)
<div class="col-4"> <div class="col-4">
<label for="name" class="form-label">Nodelist File Area</label> <label for="name" class="form-label">Nodelist File Area</label>
<a href="{{ url('ftn/filearea/addedit',$o->nodelist_filearea_id) }}"> <a href="{{ url('filearea/addedit',$o->nodelist_filearea_id) }}">
<div class="input-group"> <div class="input-group">
<span class="input-group-text"><i class="bi bi bi-collection-fill"></i></span> <span class="input-group-text"><i class="bi bi bi-collection-fill"></i></span>
<input type="text" class="form-control @error('nodelist') is-invalid @enderror" id="nodelist" placeholder="Nodelist" name="nodelist" value="{{ $o->nodelist_filearea->name }}" readonly> <input type="text" class="form-control @error('nodelist') is-invalid @enderror" id="nodelist" placeholder="Nodelist" name="nodelist" value="{{ $o->nodelist_filearea->name }}" readonly>

4
resources/views/domain/view.blade.php
View File

@ -51,7 +51,7 @@
<tbody> <tbody>
@foreach ($o->echoarea_stats()->groupBy('id') as $oo) @foreach ($o->echoarea_stats()->groupBy('id') as $oo)
<tr> <tr>
<td style="width: 15%;"><a href="{{ url('ftn/echoarea/addedit',[($x=$oo->first())->id]) }}">{{ $x->name }}</a></td> <td style="width: 15%;"><a href="{{ url('echoarea/addedit',[($x=$oo->first())->id]) }}">{{ $x->name }}</a></td>
<td>{{ $x->description }}</td> <td>{{ $x->description }}</td>
<td style="width: 15%;">{{ $x->last_message ? $x->last_message->format('Y-m-d H:i') : '-' }}</td> <td style="width: 15%;">{{ $x->last_message ? $x->last_message->format('Y-m-d H:i') : '-' }}</td>
<td>{{ $x->active ? 'Active' : 'Archive' }}</td> <td>{{ $x->active ? 'Active' : 'Archive' }}</td>
@ -90,7 +90,7 @@
<tbody> <tbody>
@foreach ($o->fileareas->sortBy('name') as $oo) @foreach ($o->fileareas->sortBy('name') as $oo)
<tr> <tr>
<td style="width: 15%;"><a href="{{ url('ftn/filearea/addedit',[$oo->id]) }}">{{ $oo->name }}</a></td> <td style="width: 15%;"><a href="{{ url('filearea/addedit',[$oo->id]) }}">{{ $oo->name }}</a></td>
<td>{{ $oo->description }}</td> <td>{{ $oo->description }}</td>
<td style="width: 15%;">-</td> <td style="width: 15%;">-</td>
</tr> </tr>

2
resources/views/echoarea/addedit.blade.php
View File

@ -140,7 +140,7 @@
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
<a href="{{ url('ftn/echoarea') }}" class="btn btn-danger">Cancel</a> <a href="{{ url('echoarea') }}" class="btn btn-danger">Cancel</a>
@can('admin',$o) @can('admin',$o)
<button type="submit" name="submit" class="btn btn-success float-end">@if ($o->exists)Save @else Add @endif</button> <button type="submit" name="submit" class="btn btn-success float-end">@if ($o->exists)Save @else Add @endif</button>
@endcan @endcan

6
resources/views/echoarea/home.blade.php
View File

@ -14,11 +14,11 @@
<div class="row"> <div class="row">
<div class="col-9"> <div class="col-9">
<p>This system is aware of the following echoareas @can('admin',(new \App\Models\Echoarea))(you can <a href="{{ url('ftn/echoarea/addedit') }}">add</a> more)@endcan:</p> <p>This system is aware of the following echoareas @can('admin',(new \App\Models\Echoarea))(you can <a href="{{ url('echoarea/addedit') }}">add</a> more)@endcan:</p>
@if (\App\Models\Echoarea::count() === 0) @if (\App\Models\Echoarea::count() === 0)
@can('admin',(new \App\Models\Echoarea)) @can('admin',(new \App\Models\Echoarea))
<p>There are no echoareas setup, to <a href="{{ url('ftn/echoarea/addedit') }}">set up your first</a>.</p> <p>There are no echoareas setup, to <a href="{{ url('echoarea/addedit') }}">set up your first</a>.</p>
@else @else
<p class="pad">There are no echoareas - you need to ask an admin to create one for you.</p> <p class="pad">There are no echoareas - you need to ask an admin to create one for you.</p>
@endcan @endcan
@ -39,7 +39,7 @@
<tbody> <tbody>
@foreach (\App\Models\Echoarea::orderBy('name')->with(['domain'])->get() as $oo) @foreach (\App\Models\Echoarea::orderBy('name')->with(['domain'])->get() as $oo)
<tr> <tr>
<td><a href="{{ url('ftn/echoarea/addedit',[$oo->id]) }}">{{ $oo->id }}</a></td> <td><a href="{{ url('echoarea/addedit',[$oo->id]) }}">{{ $oo->id }}</a></td>
<td>{{ $oo->name }}</td> <td>{{ $oo->name }}</td>
<td>{{ $oo->description }}</td> <td>{{ $oo->description }}</td>
<td>{{ $oo->active ? 'YES' : 'NO' }}</td> <td>{{ $oo->active ? 'YES' : 'NO' }}</td>

2
resources/views/filearea/addedit.blade.php
View File

@ -141,7 +141,7 @@
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
<a href="{{ url('ftn/filearea') }}" class="btn btn-danger">Cancel</a> <a href="{{ url('filearea') }}" class="btn btn-danger">Cancel</a>
@can('admin',$o) @can('admin',$o)
<button type="submit" name="submit" class="btn btn-success float-end">@if ($o->exists)Save @else Add @endif</button> <button type="submit" name="submit" class="btn btn-success float-end">@if ($o->exists)Save @else Add @endif</button>
@endcan @endcan

6
resources/views/filearea/home.blade.php
View File

@ -14,11 +14,11 @@
<div class="row"> <div class="row">
<div class="col-9"> <div class="col-9">
<p>This system is aware of the following fileareas @can('admin',(new \App\Models\Filearea))(you can <a href="{{ url('ftn/filearea/addedit') }}">add</a> more)@endcan:</p> <p>This system is aware of the following fileareas @can('admin',(new \App\Models\Filearea))(you can <a href="{{ url('filearea/addedit') }}">add</a> more)@endcan:</p>
@if (\App\Models\Filearea::count() === 0) @if (\App\Models\Filearea::count() === 0)
@can('admin',(new \App\Models\Filearea)) @can('admin',(new \App\Models\Filearea))
<p>There are no fileareas setup, to <a href="{{ url('ftn/filearea/addedit') }}">set up your first</a>.</p> <p>There are no fileareas setup, to <a href="{{ url('filearea/addedit') }}">set up your first</a>.</p>
@else @else
<p class="pad">There are no fileareas - you need to ask an admin to create one for you.</p> <p class="pad">There are no fileareas - you need to ask an admin to create one for you.</p>
@endcan @endcan
@ -39,7 +39,7 @@
<tbody> <tbody>
@foreach (\App\Models\Filearea::orderBy('name')->with(['domain'])->get() as $oo) @foreach (\App\Models\Filearea::orderBy('name')->with(['domain'])->get() as $oo)
<tr> <tr>
<td><a href="{{ url('ftn/filearea/addedit',[$oo->id]) }}">{{ $oo->id }}</a></td> <td><a href="{{ url('filearea/addedit',[$oo->id]) }}">{{ $oo->id }}</a></td>
<td>{{ $oo->name }}</td> <td>{{ $oo->name }}</td>
<td>{{ $oo->description }}</td> <td>{{ $oo->description }}</td>
<td>{{ $oo->active ? 'YES' : 'NO' }}</td> <td>{{ $oo->active ? 'YES' : 'NO' }}</td>

4
resources/views/layouts/partials/sidebar.blade.php
View File

@ -28,8 +28,8 @@
<dd><a href="{{ url('domain') }}">Domains</a></dd> <dd><a href="{{ url('domain') }}">Domains</a></dd>
<dd><a href="{{ url('system') }}">Systems</a></dd> <dd><a href="{{ url('system') }}">Systems</a></dd>
<dd><a href="{{ url('zone') }}">Zones</a></dd> <dd><a href="{{ url('zone') }}">Zones</a></dd>
<dd><a href="{{ url('ftn/echoarea') }}">Echoareas</a></dd> <dd><a href="{{ url('echoarea') }}">Echoareas</a></dd>
<dd><a href="{{ url('ftn/filearea') }}">Fileareas</a></dd> <dd><a href="{{ url('filearea') }}">Fileareas</a></dd>
</dl> </dl>
<dl> <dl>

8
routes/web.php
View File

@ -65,11 +65,11 @@ Route::middleware(['auth','verified','activeuser'])->group(function () {
Route::match(['get','post'],'domain/addedit/{o?}',[DomainController::class,'add_edit']) Route::match(['get','post'],'domain/addedit/{o?}',[DomainController::class,'add_edit'])
->where('o','[0-9]+'); ->where('o','[0-9]+');
Route::get('ftn/echoarea',[EchoareaController::class,'home']); Route::view('echoarea','echoarea.home');
Route::match(['get','post'],'ftn/echoarea/addedit/{o?}',[EchoareaController::class,'add_edit']) Route::match(['get','post'],'echoarea/addedit/{o?}',[EchoareaController::class,'add_edit'])
->where('o','[0-9]+'); ->where('o','[0-9]+');
Route::get('ftn/filearea',[FileareaController::class,'home']); Route::view('filearea','filearea.home');
Route::match(['get','post'],'ftn/filearea/addedit/{o?}',[FileareaController::class,'add_edit']) Route::match(['get','post'],'filearea/addedit/{o?}',[FileareaController::class,'add_edit'])
->where('o','[0-9]+'); ->where('o','[0-9]+');
/* SYSTEM PATHS */ /* SYSTEM PATHS */