diff --git a/app/Http/Controllers/DomainController.php b/app/Http/Controllers/DomainController.php
index 64a9a4f..2dea990 100644
--- a/app/Http/Controllers/DomainController.php
+++ b/app/Http/Controllers/DomainController.php
@@ -3,7 +3,6 @@
namespace App\Http\Controllers;
use Illuminate\Support\Collection;
-use Illuminate\Http\Request;
use App\Http\Requests\DomainRequest;
use App\Models\{Address,Domain,Zone};
@@ -95,9 +94,4 @@ class DomainController extends Controller
return ['id'=>$item->region_id,'value'=>sprintf('%s %s',$item->ftn_3d,$item->system->location)];
});
}
-
- public function home()
- {
- return view('domain.home');
- }
-}
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 95fd856..10e17a0 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -45,11 +45,6 @@ class UserController extends Controller
->with('user',$user);
}
- public function home()
- {
- return view('user.home');
- }
-
public function link(Request $request)
{
if ($request->post()) {
@@ -84,4 +79,4 @@ class UserController extends Controller
{
return view('user/system/register');
}
-}
+}
\ No newline at end of file
diff --git a/resources/views/domain/addedit.blade.php b/resources/views/domain/addedit.blade.php
index ad18071..8f37093 100644
--- a/resources/views/domain/addedit.blade.php
+++ b/resources/views/domain/addedit.blade.php
@@ -141,7 +141,7 @@
-
Cancel
+
Cancel
@can('admin',$o)
@if ($o->exists)Save @else Add @endif
@endcan
diff --git a/resources/views/domain/home.blade.php b/resources/views/domain/home.blade.php
index 660df4e..93cbb02 100644
--- a/resources/views/domain/home.blade.php
+++ b/resources/views/domain/home.blade.php
@@ -10,7 +10,7 @@
In FTN network addresses, a domain is the 5th dimension and used when a system supports 5D addressing, ie: zone:net/node.point@domain .
Domains are used with zones to uniquely identify a FTN network.
Some legacy Fidonet software is not 5D aware and may behave unexpectedly when a domain is used
-
This system is aware of the following domains @can('admin',(new \App\Models\Domain))(you can add more)@endcan:
+
This system is aware of the following domains @can('admin',(new \App\Models\Domain))(you can add more)@endcan:
@@ -18,7 +18,7 @@
@if (\App\Models\Domain::count() === 0)
@can('admin',(new \App\Models\Domain))
-
There are no domains setup, to set up your first .
+
There are no domains setup, to set up your first .
@else
There are no domains - you need to ask an admin to create one for you.
@endcan
@@ -37,7 +37,7 @@
@foreach (\App\Models\Domain::orderBy('name')->with(['zones'])->get() as $oo)
- {{ $oo->id }}
+ {{ $oo->id }}
{{ $oo->name }}
{{ $oo->active ? 'YES' : 'NO' }}
{{ $oo->dnsdomain }}
diff --git a/resources/views/echoarea/addedit.blade.php b/resources/views/echoarea/addedit.blade.php
index 23d4de7..96f575f 100644
--- a/resources/views/echoarea/addedit.blade.php
+++ b/resources/views/echoarea/addedit.blade.php
@@ -31,7 +31,7 @@
A domain is required.
@enderror
- Add a NEW Domain
+ Add a NEW Domain
diff --git a/resources/views/filearea/addedit.blade.php b/resources/views/filearea/addedit.blade.php
index be8780c..af98864 100644
--- a/resources/views/filearea/addedit.blade.php
+++ b/resources/views/filearea/addedit.blade.php
@@ -32,7 +32,7 @@
A domain is required.
@enderror
- Add a NEW Domain
+ Add a NEW Domain
diff --git a/resources/views/layouts/partials/sidebar.blade.php b/resources/views/layouts/partials/sidebar.blade.php
index 3d36713..7aa33d9 100644
--- a/resources/views/layouts/partials/sidebar.blade.php
+++ b/resources/views/layouts/partials/sidebar.blade.php
@@ -25,7 +25,7 @@
@if ($user->isZC())
Network Admin
- Domains
+ Domains
Systems
Zones
Echoareas
diff --git a/resources/views/setup.blade.php b/resources/views/setup.blade.php
index ea7fb69..988ab43 100644
--- a/resources/views/setup.blade.php
+++ b/resources/views/setup.blade.php
@@ -275,7 +275,7 @@ use App\Classes\Protocol\{Binkp,EMSI,DNS};
diff --git a/resources/views/system/form-address.blade.php b/resources/views/system/form-address.blade.php
index 95d0252..ae54d78 100644
--- a/resources/views/system/form-address.blade.php
+++ b/resources/views/system/form-address.blade.php
@@ -249,7 +249,7 @@
if (! $('#node-address').hasClass('d-none'))
$('#node-address').addClass('d-none');
- $.get('{{ url('regions') }}'+'/'+this.value,function(data) {
+ $.get('{{ url('domain/api/regions') }}'+'/'+this.value,function(data) {
$('#region_id').append(' ');
$('#region_id').append('No Region ');
$('#region_id').append('New Region ');
@@ -339,7 +339,7 @@
$('#host_id').children().remove();
var that = this;
- $.get('{{ url('hosts') }}'+'/'+$('#zone_id').val()+'/'+this.value,function(data) {
+ $.get('{{ url('domain/api/hosts') }}'+'/'+$('#zone_id').val()+'/'+this.value,function(data) {
$('#host_id').append(' ');
if (that.value !== '0')
$('#host_id').append('No Host ');
@@ -411,7 +411,7 @@
$('#hub_id').prop('disabled',true);
$('#hub_id').children().remove();
- $.get('{{ url('hubs') }}'+'/'+$('#zone_id').val()+'/'+this.value,function(data) {
+ $.get('{{ url('domain/api/hubs') }}'+'/'+$('#zone_id').val()+'/'+this.value,function(data) {
$('#hub_id').append('No Hub ');
data.forEach(function(item) {
diff --git a/resources/views/system/moveaddr.blade.php b/resources/views/system/moveaddr.blade.php
index d086741..b5f973a 100644
--- a/resources/views/system/moveaddr.blade.php
+++ b/resources/views/system/moveaddr.blade.php
@@ -87,7 +87,7 @@ Move Address
diff --git a/resources/views/zone/addedit.blade.php b/resources/views/zone/addedit.blade.php
index aa70a34..2b700be 100644
--- a/resources/views/zone/addedit.blade.php
+++ b/resources/views/zone/addedit.blade.php
@@ -46,7 +46,7 @@
A domain is required.
@enderror
-
Add a NEW Domain
+
Add a NEW Domain
diff --git a/routes/web.php b/routes/web.php
index 07dadf7..510b01b 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -53,10 +53,18 @@ Route::get('search',[HomeController::class,'search']);
Route::middleware(['auth','verified','activeuser'])->group(function () {
Route::get('dashboard',[UserController::class,'dashboard']);
-
- Route::get('ftn/domain',[DomainController::class,'home']);
- Route::match(['get','post'],'ftn/domain/addedit/{o?}',[DomainController::class,'add_edit'])
+ /* DOMAIN PATHS */
+ Route::view('domain','domain.home');
+ Route::get('domain/api/hosts/{o}/{region}',[DomainController::class,'api_hosts'])
+ ->where('o','[0-9]+')
+ ->where('region','[0-9]+');
+ Route::get('domain/api/hubs/{o}/{host}',[DomainController::class,'api_hubs'])
->where('o','[0-9]+');
+ Route::get('domain/api/regions/{o}',[DomainController::class,'api_regions'])
+ ->where('o','[0-9]+');
+ Route::match(['get','post'],'domain/addedit/{o?}',[DomainController::class,'add_edit'])
+ ->where('o','[0-9]+');
+
Route::get('ftn/echoarea',[EchoareaController::class,'home']);
Route::match(['get','post'],'ftn/echoarea/addedit/{o?}',[EchoareaController::class,'add_edit'])
->where('o','[0-9]+');
@@ -108,18 +116,11 @@ Route::middleware(['auth','verified','activeuser'])->group(function () {
->where('o','[0-9]+')
->where('date','[0-9:\-@]+');
- Route::get('hosts/{o}/{region}',[DomainController::class,'api_hosts'])
- ->where('o','[0-9]+')
- ->where('region','[0-9]+');
- Route::get('hubs/{o}/{host}',[DomainController::class,'api_hubs'])
- ->where('o','[0-9]+');
Route::match(['get','post'],'link',[UserController::class,'link']);
Route::post('packet/contents/{o}/{packet}',[HomeController::class,'packet_contents'])
->where('o','[0-9]+')
->where('packet','[0-9a-z]+');
Route::get('permissions',[HomeController::class,'permissions']);
- Route::get('regions/{o}',[DomainController::class,'api_regions'])
- ->where('o','[0-9]+');
Route::match(['get','post'],'user/system/register',[SystemController::class,'register']);
Route::match(['post'],'user/system/link',[SystemController::class,'system_link']);
@@ -136,8 +137,8 @@ Route::middleware(['auth','can:admin'])->group(function () {
Route::match(['get','post'],'address/merge/{id}',[SystemController::class,'address_merge']);
Route::get('echomail/view/{o}',[EchomailController::class,'view']);
Route::get('netmail/view/{o}',[NetmailController::class,'view']);
- Route::get('user/list',[UserController::class,'home']);
Route::match(['get','post'],'setup',[HomeController::class,'setup']);
Route::match(['get','post'],'user/addedit/{o?}',[UserController::class,'add_edit'])
->where('o','[0-9]+');
+ Route::view('user/list','user.home');
});
\ No newline at end of file
diff --git a/tests/Feature/SiteAdminTest.php b/tests/Feature/SiteAdminTest.php
index 8702bb1..372be4c 100644
--- a/tests/Feature/SiteAdminTest.php
+++ b/tests/Feature/SiteAdminTest.php
@@ -21,7 +21,7 @@ class SiteAdminTest extends TestCase
$this->get('about')
->assertOk();
- $this->get('ftn/domain')
+ $this->get('domain')
->assertRedirect('login');
$this->get('zone')
->assertRedirect('login');
@@ -52,7 +52,7 @@ class SiteAdminTest extends TestCase
// Use model in tests...
$this->actingAs($user);
- $this->get('ftn/domain')
+ $this->get('domain')
->assertRedirect('email/verify');
$this->get('zone')
->assertRedirect('email/verify');