diff --git a/app/Http/Controllers/SettingController.php b/app/Http/Controllers/SettingController.php
index b12b0e3ce..3d1c184cd 100644
--- a/app/Http/Controllers/SettingController.php
+++ b/app/Http/Controllers/SettingController.php
@@ -9,11 +9,10 @@ use Illuminate\Http\Request;
class SettingController extends Controller
{
- protected $imageRepo;
+ protected ImageRepo $imageRepo;
+
+ protected array $settingCategories = ['features', 'customization', 'registration'];
- /**
- * SettingController constructor.
- */
public function __construct(ImageRepo $imageRepo)
{
$this->imageRepo = $imageRepo;
@@ -22,15 +21,17 @@ class SettingController extends Controller
/**
* Display a listing of the settings.
*/
- public function index()
+ public function index(string $category)
{
+ $this->ensureCategoryExists($category);
$this->checkPermission('settings-manage');
$this->setPageTitle(trans('settings.settings'));
// Get application version
$version = trim(file_get_contents(base_path('version')));
- return view('settings.index', [
+ return view('settings.' . $category, [
+ 'category' => $category,
'version' => $version,
'guestUser' => User::getDefault(),
]);
@@ -39,8 +40,9 @@ class SettingController extends Controller
/**
* Update the specified settings in storage.
*/
- public function update(Request $request)
+ public function update(Request $request, string $category)
{
+ $this->ensureCategoryExists($category);
$this->preventAccessInDemoMode();
$this->checkPermission('settings-manage');
$this->validate($request, [
@@ -57,7 +59,7 @@ class SettingController extends Controller
}
// Update logo image if set
- if ($request->hasFile('app_logo')) {
+ if ($category === 'customization' && $request->hasFile('app_logo')) {
$logoFile = $request->file('app_logo');
$this->imageRepo->destroyByType('system');
$image = $this->imageRepo->saveNew($logoFile, 'system', 0, null, 86);
@@ -65,16 +67,21 @@ class SettingController extends Controller
}
// Clear logo image if requested
- if ($request->get('app_logo_reset', null)) {
+ if ($category === 'customization' && $request->get('app_logo_reset', null)) {
$this->imageRepo->destroyByType('system');
setting()->remove('app-logo');
}
- $section = $request->get('section', '');
- $this->logActivity(ActivityType::SETTINGS_UPDATE, $section);
+ $this->logActivity(ActivityType::SETTINGS_UPDATE, $category);
$this->showSuccessNotification(trans('settings.settings_save_success'));
- $redirectLocation = '/settings#' . $section;
- return redirect(rtrim($redirectLocation, '#'));
+ return redirect("/settings/${category}");
+ }
+
+ protected function ensureCategoryExists(string $category): void
+ {
+ if (!in_array($category, $this->settingCategories)) {
+ abort(404);
+ }
}
}
diff --git a/resources/icons/palette.svg b/resources/icons/palette.svg
new file mode 100644
index 000000000..114386302
--- /dev/null
+++ b/resources/icons/palette.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12,2C6.49,2,2,6.49,2,12s4.49,10,10,10c1.38,0,2.5-1.12,2.5-2.5c0-0.61-0.23-1.2-0.64-1.67c-0.08-0.1-0.13-0.21-0.13-0.33 c0-0.28,0.22-0.5,0.5-0.5H16c3.31,0,6-2.69,6-6C22,6.04,17.51,2,12,2z M17.5,13c-0.83,0-1.5-0.67-1.5-1.5c0-0.83,0.67-1.5,1.5-1.5 s1.5,0.67,1.5,1.5C19,12.33,18.33,13,17.5,13z M14.5,9C13.67,9,13,8.33,13,7.5C13,6.67,13.67,6,14.5,6S16,6.67,16,7.5 C16,8.33,15.33,9,14.5,9z M5,11.5C5,10.67,5.67,10,6.5,10S8,10.67,8,11.5C8,12.33,7.33,13,6.5,13S5,12.33,5,11.5z M11,7.5 C11,8.33,10.33,9,9.5,9S8,8.33,8,7.5C8,6.67,8.67,6,9.5,6S11,6.67,11,7.5z"/></svg>
\ No newline at end of file
diff --git a/resources/lang/en/settings.php b/resources/lang/en/settings.php
index bfe99c98f..3adefc2eb 100755
--- a/resources/lang/en/settings.php
+++ b/resources/lang/en/settings.php
@@ -10,6 +10,8 @@ return [
'settings' => 'Settings',
'settings_save' => 'Save Settings',
'settings_save_success' => 'Settings saved',
+ 'system_version' => 'System Version',
+ 'categories' => 'Categories',
// App Settings
'app_customization' => 'Customization',
diff --git a/resources/sass/_layout.scss b/resources/sass/_layout.scss
index 69882d40d..b1c80cb53 100644
--- a/resources/sass/_layout.scss
+++ b/resources/sass/_layout.scss
@@ -8,6 +8,9 @@
margin-inline-end: auto;
padding-inline-start: $-m;
padding-inline-end: $-m;
+ &.medium {
+ max-width: 1100px;
+ }
&.small {
max-width: 840px;
}
diff --git a/resources/sass/_lists.scss b/resources/sass/_lists.scss
index 8febdcffc..9cff52972 100644
--- a/resources/sass/_lists.scss
+++ b/resources/sass/_lists.scss
@@ -677,11 +677,21 @@ ul.pagination {
padding: $-s;
}
a:not(.active) {
- @include lightDark(color, #444, #666);
+ @include lightDark(color, #444, #888);
}
a:hover {
@include lightDark(background-color, rgba(0, 0, 0, 0.05), rgba(255, 255, 255, 0.05));
- border-radius: 3px;
+ border-radius: 4px;
text-decoration: none;
}
+ &.in-sidebar {
+ a {
+ display: block;
+ margin-bottom: $-xs;
+ }
+ a.active {
+ border-radius: 4px;
+ @include lightDark(background-color, rgba(0, 0, 0, 0.05), rgba(255, 255, 255, 0.05));
+ }
+ }
}
diff --git a/resources/views/settings/audit.blade.php b/resources/views/settings/audit.blade.php
index 48e46a59d..ca5dba527 100644
--- a/resources/views/settings/audit.blade.php
+++ b/resources/views/settings/audit.blade.php
@@ -3,11 +3,7 @@
@section('body')
<div class="container">
- <div class="grid left-focus v-center no-row-gap">
- <div class="py-m">
- @include('settings.parts.navbar', ['selected' => 'audit'])
- </div>
- </div>
+ @include('settings.parts.navbar', ['selected' => 'audit'])
<div class="card content-wrap auto-height">
<h1 class="list-heading">{{ trans('settings.audit') }}</h1>
diff --git a/resources/views/settings/customization.blade.php b/resources/views/settings/customization.blade.php
new file mode 100644
index 000000000..5c6841be2
--- /dev/null
+++ b/resources/views/settings/customization.blade.php
@@ -0,0 +1,137 @@
+@extends('settings.layout')
+
+@section('card')
+ <h1 id="customization" class="list-heading">{{ trans('settings.app_customization') }}</h2>
+ <form action="{{ url("/settings/customization") }}" method="POST" enctype="multipart/form-data">
+ {!! csrf_field() !!}
+ <input type="hidden" name="section" value="customization">
+
+ <div class="setting-list">
+
+ <div class="grid half gap-xl">
+ <div>
+ <label for="setting-app-name" class="setting-list-label">{{ trans('settings.app_name') }}</label>
+ <p class="small">{{ trans('settings.app_name_desc') }}</p>
+ </div>
+ <div class="pt-xs">
+ <input type="text" value="{{ setting('app-name', 'BookStack') }}" name="setting-app-name" id="setting-app-name">
+ @include('form.toggle-switch', [
+ 'name' => 'setting-app-name-header',
+ 'value' => setting('app-name-header'),
+ 'label' => trans('settings.app_name_header'),
+ ])
+ </div>
+ </div>
+
+ <div class="grid half gap-xl">
+ <div>
+ <label class="setting-list-label">{{ trans('settings.app_editor') }}</label>
+ <p class="small">{{ trans('settings.app_editor_desc') }}</p>
+ </div>
+ <div class="pt-xs">
+ <select name="setting-app-editor" id="setting-app-editor">
+ <option @if(setting('app-editor') === 'wysiwyg') selected @endif value="wysiwyg">WYSIWYG</option>
+ <option @if(setting('app-editor') === 'markdown') selected @endif value="markdown">Markdown</option>
+ </select>
+ </div>
+ </div>
+
+ <div class="grid half gap-xl">
+ <div>
+ <label class="setting-list-label">{{ trans('settings.app_logo') }}</label>
+ <p class="small">{!! trans('settings.app_logo_desc') !!}</p>
+ </div>
+ <div class="pt-xs">
+ @include('form.image-picker', [
+ 'removeName' => 'setting-app-logo',
+ 'removeValue' => 'none',
+ 'defaultImage' => url('/logo.png'),
+ 'currentImage' => setting('app-logo'),
+ 'name' => 'app_logo',
+ 'imageClass' => 'logo-image',
+ ])
+ </div>
+ </div>
+
+ <!-- Primary Color -->
+ <div class="grid half gap-xl">
+ <div>
+ <label class="setting-list-label">{{ trans('settings.app_primary_color') }}</label>
+ <p class="small">{!! trans('settings.app_primary_color_desc') !!}</p>
+ </div>
+ <div setting-app-color-picker class="text-m-right pt-xs">
+ <input type="color" data-default="#206ea7" data-current="{{ setting('app-color') }}" value="{{ setting('app-color') }}" name="setting-app-color" id="setting-app-color" placeholder="#206ea7">
+ <input type="hidden" value="{{ setting('app-color-light') }}" name="setting-app-color-light" id="setting-app-color-light">
+ <div class="pr-s">
+ <button type="button" class="text-button text-muted mt-s" setting-app-color-picker-default>{{ trans('common.default') }}</button>
+ <span class="sep">|</span>
+ <button type="button" class="text-button text-muted mt-s" setting-app-color-picker-reset>{{ trans('common.reset') }}</button>
+ </div>
+
+ </div>
+ </div>
+
+ <!-- Entity Color -->
+ <div class="pb-l">
+ <div>
+ <label class="setting-list-label">{{ trans('settings.content_colors') }}</label>
+ <p class="small">{!! trans('settings.content_colors_desc') !!}</p>
+ </div>
+ <div class="grid half pt-m">
+ <div>
+ @include('settings.parts.setting-entity-color-picker', ['type' => 'bookshelf'])
+ @include('settings.parts.setting-entity-color-picker', ['type' => 'book'])
+ @include('settings.parts.setting-entity-color-picker', ['type' => 'chapter'])
+ </div>
+ <div>
+ @include('settings.parts.setting-entity-color-picker', ['type' => 'page'])
+ @include('settings.parts.setting-entity-color-picker', ['type' => 'page-draft'])
+ </div>
+ </div>
+ </div>
+
+ <div homepage-control id="homepage-control" class="grid half gap-xl">
+ <div>
+ <label for="setting-app-homepage" class="setting-list-label">{{ trans('settings.app_homepage') }}</label>
+ <p class="small">{{ trans('settings.app_homepage_desc') }}</p>
+ </div>
+ <div class="pt-xs">
+ <select name="setting-app-homepage-type" id="setting-app-homepage-type">
+ <option @if(setting('app-homepage-type') === 'default') selected @endif value="default">{{ trans('common.default') }}</option>
+ <option @if(setting('app-homepage-type') === 'books') selected @endif value="books">{{ trans('entities.books') }}</option>
+ <option @if(setting('app-homepage-type') === 'bookshelves') selected @endif value="bookshelves">{{ trans('entities.shelves') }}</option>
+ <option @if(setting('app-homepage-type') === 'page') selected @endif value="page">{{ trans('entities.pages_specific') }}</option>
+ </select>
+
+ <div page-picker-container style="display: none;" class="mt-m">
+ @include('settings.parts.page-picker', ['name' => 'setting-app-homepage', 'placeholder' => trans('settings.app_homepage_select'), 'value' => setting('app-homepage')])
+ </div>
+ </div>
+ </div>
+
+ <div>
+ <label for="setting-app-privacy-link" class="setting-list-label">{{ trans('settings.app_footer_links') }}</label>
+ <p class="small mb-m">{{ trans('settings.app_footer_links_desc') }}</p>
+ @include('settings.parts.footer-links', ['name' => 'setting-app-footer-links', 'value' => setting('app-footer-links', [])])
+ </div>
+
+
+ <div>
+ <label for="setting-app-custom-head" class="setting-list-label">{{ trans('settings.app_custom_html') }}</label>
+ <p class="small">{{ trans('settings.app_custom_html_desc') }}</p>
+ <textarea name="setting-app-custom-head" id="setting-app-custom-head" class="simple-code-input mt-m">{{ setting('app-custom-head', '') }}</textarea>
+ <p class="small text-right">{{ trans('settings.app_custom_html_disabled_notice') }}</p>
+ </div>
+
+
+ </div>
+
+ <div class="form-group text-right">
+ <button type="submit" class="button">{{ trans('settings.settings_save') }}</button>
+ </div>
+ </form>
+@endsection
+
+@section('after-content')
+ @include('entities.selector-popup', ['entityTypes' => 'page'])
+@endsection
diff --git a/resources/views/settings/features.blade.php b/resources/views/settings/features.blade.php
new file mode 100644
index 000000000..5935e21f5
--- /dev/null
+++ b/resources/views/settings/features.blade.php
@@ -0,0 +1,66 @@
+@extends('settings.layout')
+
+@section('card')
+ <h1 id="features" class="list-heading">{{ trans('settings.app_features_security') }}</h1>
+ <form action="{{ url("/settings/features") }}" method="POST">
+ {!! csrf_field() !!}
+ <input type="hidden" name="section" value="features">
+
+ <div class="setting-list">
+
+
+ <div class="grid half gap-xl">
+ <div>
+ <label for="setting-app-public" class="setting-list-label">{{ trans('settings.app_public_access') }}</label>
+ <p class="small">{!! trans('settings.app_public_access_desc') !!}</p>
+ @if(userCan('users-manage'))
+ <p class="small mb-none">
+ <a href="{{ url($guestUser->getEditUrl()) }}">{!! trans('settings.app_public_access_desc_guest') !!}</a>
+ </p>
+ @endif
+ </div>
+ <div>
+ @include('form.toggle-switch', [
+ 'name' => 'setting-app-public',
+ 'value' => setting('app-public'),
+ 'label' => trans('settings.app_public_access_toggle'),
+ ])
+ </div>
+ </div>
+
+ <div class="grid half gap-xl">
+ <div>
+ <label class="setting-list-label">{{ trans('settings.app_secure_images') }}</label>
+ <p class="small">{{ trans('settings.app_secure_images_desc') }}</p>
+ </div>
+ <div>
+ @include('form.toggle-switch', [
+ 'name' => 'setting-app-secure-images',
+ 'value' => setting('app-secure-images'),
+ 'label' => trans('settings.app_secure_images_toggle'),
+ ])
+ </div>
+ </div>
+
+ <div class="grid half gap-xl">
+ <div>
+ <label class="setting-list-label">{{ trans('settings.app_disable_comments') }}</label>
+ <p class="small">{!! trans('settings.app_disable_comments_desc') !!}</p>
+ </div>
+ <div>
+ @include('form.toggle-switch', [
+ 'name' => 'setting-app-disable-comments',
+ 'value' => setting('app-disable-comments'),
+ 'label' => trans('settings.app_disable_comments_toggle'),
+ ])
+ </div>
+ </div>
+
+
+ </div>
+
+ <div class="form-group text-right">
+ <button type="submit" class="button">{{ trans('settings.settings_save') }}</button>
+ </div>
+ </form>
+@endsection
\ No newline at end of file
diff --git a/resources/views/settings/index.blade.php b/resources/views/settings/index.blade.php
deleted file mode 100644
index 8b5615658..000000000
--- a/resources/views/settings/index.blade.php
+++ /dev/null
@@ -1,278 +0,0 @@
-@extends('layouts.simple')
-
-@section('body')
- <div class="container small">
-
- @include('settings.parts.navbar-with-version', ['selected' => 'settings'])
-
- <div class="card content-wrap auto-height">
- <h2 id="features" class="list-heading">{{ trans('settings.app_features_security') }}</h2>
- <form action="{{ url("/settings") }}" method="POST">
- {!! csrf_field() !!}
- <input type="hidden" name="section" value="features">
-
- <div class="setting-list">
-
-
- <div class="grid half gap-xl">
- <div>
- <label for="setting-app-public" class="setting-list-label">{{ trans('settings.app_public_access') }}</label>
- <p class="small">{!! trans('settings.app_public_access_desc') !!}</p>
- @if(userCan('users-manage'))
- <p class="small mb-none">
- <a href="{{ url($guestUser->getEditUrl()) }}">{!! trans('settings.app_public_access_desc_guest') !!}</a>
- </p>
- @endif
- </div>
- <div>
- @include('form.toggle-switch', [
- 'name' => 'setting-app-public',
- 'value' => setting('app-public'),
- 'label' => trans('settings.app_public_access_toggle'),
- ])
- </div>
- </div>
-
- <div class="grid half gap-xl">
- <div>
- <label class="setting-list-label">{{ trans('settings.app_secure_images') }}</label>
- <p class="small">{{ trans('settings.app_secure_images_desc') }}</p>
- </div>
- <div>
- @include('form.toggle-switch', [
- 'name' => 'setting-app-secure-images',
- 'value' => setting('app-secure-images'),
- 'label' => trans('settings.app_secure_images_toggle'),
- ])
- </div>
- </div>
-
- <div class="grid half gap-xl">
- <div>
- <label class="setting-list-label">{{ trans('settings.app_disable_comments') }}</label>
- <p class="small">{!! trans('settings.app_disable_comments_desc') !!}</p>
- </div>
- <div>
- @include('form.toggle-switch', [
- 'name' => 'setting-app-disable-comments',
- 'value' => setting('app-disable-comments'),
- 'label' => trans('settings.app_disable_comments_toggle'),
- ])
- </div>
- </div>
-
-
- </div>
-
- <div class="form-group text-right">
- <button type="submit" class="button">{{ trans('settings.settings_save') }}</button>
- </div>
- </form>
- </div>
-
- <div class="card content-wrap auto-height">
- <h2 id="customization" class="list-heading">{{ trans('settings.app_customization') }}</h2>
- <form action="{{ url("/settings") }}" method="POST" enctype="multipart/form-data">
- {!! csrf_field() !!}
- <input type="hidden" name="section" value="customization">
-
- <div class="setting-list">
-
- <div class="grid half gap-xl">
- <div>
- <label for="setting-app-name" class="setting-list-label">{{ trans('settings.app_name') }}</label>
- <p class="small">{{ trans('settings.app_name_desc') }}</p>
- </div>
- <div class="pt-xs">
- <input type="text" value="{{ setting('app-name', 'BookStack') }}" name="setting-app-name" id="setting-app-name">
- @include('form.toggle-switch', [
- 'name' => 'setting-app-name-header',
- 'value' => setting('app-name-header'),
- 'label' => trans('settings.app_name_header'),
- ])
- </div>
- </div>
-
- <div class="grid half gap-xl">
- <div>
- <label class="setting-list-label">{{ trans('settings.app_editor') }}</label>
- <p class="small">{{ trans('settings.app_editor_desc') }}</p>
- </div>
- <div class="pt-xs">
- <select name="setting-app-editor" id="setting-app-editor">
- <option @if(setting('app-editor') === 'wysiwyg') selected @endif value="wysiwyg">WYSIWYG</option>
- <option @if(setting('app-editor') === 'markdown') selected @endif value="markdown">Markdown</option>
- </select>
- </div>
- </div>
-
- <div class="grid half gap-xl">
- <div>
- <label class="setting-list-label">{{ trans('settings.app_logo') }}</label>
- <p class="small">{!! trans('settings.app_logo_desc') !!}</p>
- </div>
- <div class="pt-xs">
- @include('form.image-picker', [
- 'removeName' => 'setting-app-logo',
- 'removeValue' => 'none',
- 'defaultImage' => url('/logo.png'),
- 'currentImage' => setting('app-logo'),
- 'name' => 'app_logo',
- 'imageClass' => 'logo-image',
- ])
- </div>
- </div>
-
- <!-- Primary Color -->
- <div class="grid half gap-xl">
- <div>
- <label class="setting-list-label">{{ trans('settings.app_primary_color') }}</label>
- <p class="small">{!! trans('settings.app_primary_color_desc') !!}</p>
- </div>
- <div setting-app-color-picker class="text-m-right pt-xs">
- <input type="color" data-default="#206ea7" data-current="{{ setting('app-color') }}" value="{{ setting('app-color') }}" name="setting-app-color" id="setting-app-color" placeholder="#206ea7">
- <input type="hidden" value="{{ setting('app-color-light') }}" name="setting-app-color-light" id="setting-app-color-light">
- <div class="pr-s">
- <button type="button" class="text-button text-muted mt-s" setting-app-color-picker-default>{{ trans('common.default') }}</button>
- <span class="sep">|</span>
- <button type="button" class="text-button text-muted mt-s" setting-app-color-picker-reset>{{ trans('common.reset') }}</button>
- </div>
-
- </div>
- </div>
-
- <!-- Entity Color -->
- <div class="pb-l">
- <div>
- <label class="setting-list-label">{{ trans('settings.content_colors') }}</label>
- <p class="small">{!! trans('settings.content_colors_desc') !!}</p>
- </div>
- <div class="grid half pt-m">
- <div>
- @include('settings.parts.setting-entity-color-picker', ['type' => 'bookshelf'])
- @include('settings.parts.setting-entity-color-picker', ['type' => 'book'])
- @include('settings.parts.setting-entity-color-picker', ['type' => 'chapter'])
- </div>
- <div>
- @include('settings.parts.setting-entity-color-picker', ['type' => 'page'])
- @include('settings.parts.setting-entity-color-picker', ['type' => 'page-draft'])
- </div>
- </div>
- </div>
-
- <div homepage-control id="homepage-control" class="grid half gap-xl">
- <div>
- <label for="setting-app-homepage" class="setting-list-label">{{ trans('settings.app_homepage') }}</label>
- <p class="small">{{ trans('settings.app_homepage_desc') }}</p>
- </div>
- <div class="pt-xs">
- <select name="setting-app-homepage-type" id="setting-app-homepage-type">
- <option @if(setting('app-homepage-type') === 'default') selected @endif value="default">{{ trans('common.default') }}</option>
- <option @if(setting('app-homepage-type') === 'books') selected @endif value="books">{{ trans('entities.books') }}</option>
- <option @if(setting('app-homepage-type') === 'bookshelves') selected @endif value="bookshelves">{{ trans('entities.shelves') }}</option>
- <option @if(setting('app-homepage-type') === 'page') selected @endif value="page">{{ trans('entities.pages_specific') }}</option>
- </select>
-
- <div page-picker-container style="display: none;" class="mt-m">
- @include('settings.parts.page-picker', ['name' => 'setting-app-homepage', 'placeholder' => trans('settings.app_homepage_select'), 'value' => setting('app-homepage')])
- </div>
- </div>
- </div>
-
- <div>
- <label for="setting-app-privacy-link" class="setting-list-label">{{ trans('settings.app_footer_links') }}</label>
- <p class="small mb-m">{{ trans('settings.app_footer_links_desc') }}</p>
- @include('settings.parts.footer-links', ['name' => 'setting-app-footer-links', 'value' => setting('app-footer-links', [])])
- </div>
-
-
- <div>
- <label for="setting-app-custom-head" class="setting-list-label">{{ trans('settings.app_custom_html') }}</label>
- <p class="small">{{ trans('settings.app_custom_html_desc') }}</p>
- <textarea name="setting-app-custom-head" id="setting-app-custom-head" class="simple-code-input mt-m">{{ setting('app-custom-head', '') }}</textarea>
- <p class="small text-right">{{ trans('settings.app_custom_html_disabled_notice') }}</p>
- </div>
-
-
- </div>
-
- <div class="form-group text-right">
- <button type="submit" class="button">{{ trans('settings.settings_save') }}</button>
- </div>
- </form>
- </div>
-
- <div class="card content-wrap auto-height">
- <h2 id="registration" class="list-heading">{{ trans('settings.reg_settings') }}</h2>
- <form action="{{ url("/settings") }}" method="POST">
- {!! csrf_field() !!}
- <input type="hidden" name="section" value="registration">
-
- <div class="setting-list">
- <div class="grid half gap-xl">
- <div>
- <label class="setting-list-label">{{ trans('settings.reg_enable') }}</label>
- <p class="small">{!! trans('settings.reg_enable_desc') !!}</p>
- </div>
- <div>
- @include('form.toggle-switch', [
- 'name' => 'setting-registration-enabled',
- 'value' => setting('registration-enabled'),
- 'label' => trans('settings.reg_enable_toggle')
- ])
-
- @if(in_array(config('auth.method'), ['ldap', 'saml2', 'oidc']))
- <div class="text-warn text-small mb-l">{{ trans('settings.reg_enable_external_warning') }}</div>
- @endif
-
- <label for="setting-registration-role">{{ trans('settings.reg_default_role') }}</label>
- <select id="setting-registration-role" name="setting-registration-role" @if($errors->has('setting-registration-role')) class="neg" @endif>
- <option value="0" @if(intval(setting('registration-role', '0')) === 0) selected @endif>-- {{ trans('common.none') }} --</option>
- @foreach(\BookStack\Auth\Role::all() as $role)
- <option value="{{$role->id}}"
- data-system-role-name="{{ $role->system_name ?? '' }}"
- @if(intval(setting('registration-role', '0')) === $role->id) selected @endif
- >
- {{ $role->display_name }}
- </option>
- @endforeach
- </select>
- </div>
- </div>
-
- <div class="grid half gap-xl">
- <div>
- <label for="setting-registration-restrict" class="setting-list-label">{{ trans('settings.reg_confirm_restrict_domain') }}</label>
- <p class="small">{!! trans('settings.reg_confirm_restrict_domain_desc') !!}</p>
- </div>
- <div class="pt-xs">
- <input type="text" id="setting-registration-restrict" name="setting-registration-restrict" placeholder="{{ trans('settings.reg_confirm_restrict_domain_placeholder') }}" value="{{ setting('registration-restrict', '') }}">
- </div>
- </div>
-
- <div class="grid half gap-xl">
- <div>
- <label class="setting-list-label">{{ trans('settings.reg_email_confirmation') }}</label>
- <p class="small">{{ trans('settings.reg_confirm_email_desc') }}</p>
- </div>
- <div>
- @include('form.toggle-switch', [
- 'name' => 'setting-registration-confirmation',
- 'value' => setting('registration-confirmation'),
- 'label' => trans('settings.reg_email_confirmation_toggle')
- ])
- </div>
- </div>
-
- </div>
-
- <div class="form-group text-right">
- <button type="submit" class="button">{{ trans('settings.settings_save') }}</button>
- </div>
- </form>
- </div>
-
- </div>
-
- @include('entities.selector-popup', ['entityTypes' => 'page'])
-@stop
diff --git a/resources/views/settings/layout.blade.php b/resources/views/settings/layout.blade.php
new file mode 100644
index 000000000..e2410895e
--- /dev/null
+++ b/resources/views/settings/layout.blade.php
@@ -0,0 +1,37 @@
+@extends('layouts.simple')
+
+@section('body')
+ <div class="container medium">
+
+ @include('settings.parts.navbar', ['selected' => 'settings'])
+
+ <div class="grid gap-xxl right-focus">
+
+ <div>
+ <h5>{{ trans('settings.categories') }}</h5>
+ <nav class="active-link-list in-sidebar">
+ <a href="{{ url('/settings/features') }}" class="{{ $category === 'features' ? 'active' : '' }}">@icon('star') Features & Security</a>
+ <a href="{{ url('/settings/customization') }}" class="{{ $category === 'customization' ? 'active' : '' }}">@icon('palette') Customization</a>
+ <a href="{{ url('/settings/registration') }}" class="{{ $category === 'registration' ? 'active' : '' }}">@icon('lock') Registration</a>
+ </nav>
+
+ <h5 class="mt-xl">{{ trans('settings.system_version') }}</h5>
+ <div class="py-xs">
+ <a target="_blank" rel="noopener noreferrer" href="https://github.com/BookStackApp/BookStack/releases">
+ BookStack @if(strpos($version, 'v') !== 0) version @endif {{ $version }}
+ </a>
+ </div>
+ </div>
+
+ <div>
+ <div class="card content-wrap auto-height">
+ @yield('card')
+ </div>
+ </div>
+
+ </div>
+
+ </div>
+
+ @yield('after-content')
+@stop
diff --git a/resources/views/settings/maintenance.blade.php b/resources/views/settings/maintenance.blade.php
index ea94413f2..a2a9ebc81 100644
--- a/resources/views/settings/maintenance.blade.php
+++ b/resources/views/settings/maintenance.blade.php
@@ -3,7 +3,7 @@
@section('body')
<div class="container small">
- @include('settings.parts.navbar-with-version', ['selected' => 'maintenance'])
+ @include('settings.parts.navbar', ['selected' => 'maintenance'])
<div class="card content-wrap auto-height pb-xl">
<h2 class="list-heading">{{ trans('settings.recycle_bin') }}</h2>
diff --git a/resources/views/settings/parts/navbar-with-version.blade.php b/resources/views/settings/parts/navbar-with-version.blade.php
deleted file mode 100644
index bec41146b..000000000
--- a/resources/views/settings/parts/navbar-with-version.blade.php
+++ /dev/null
@@ -1,17 +0,0 @@
-{{--
-$selected - String name of the selected tab
-$version - Version of bookstack to display
---}}
-<div class="flex-container-row v-center wrap">
- <div class="py-m flex fit-content">
- @include('settings.parts.navbar', ['selected' => $selected])
- </div>
-</div>
-<div class="px-s">
- <hr class="darker m-none">
-</div>
-<div class="py-l px-m flex fit-content">
- <a target="_blank" rel="noopener noreferrer" href="https://github.com/BookStackApp/BookStack/releases">
- BookStack @if(strpos($version, 'v') !== 0) version @endif {{ $version }}
- </a>
-</div>
\ No newline at end of file
diff --git a/resources/views/settings/parts/navbar.blade.php b/resources/views/settings/parts/navbar.blade.php
index f2fad378c..e229f5e65 100644
--- a/resources/views/settings/parts/navbar.blade.php
+++ b/resources/views/settings/parts/navbar.blade.php
@@ -1,5 +1,5 @@
-<nav class="active-link-list">
+<nav class="active-link-list py-m flex-container-row justify-center wrap">
@if(userCan('settings-manage'))
<a href="{{ url('/settings') }}" @if($selected == 'settings') class="active" @endif>@icon('settings'){{ trans('settings.settings') }}</a>
<a href="{{ url('/settings/maintenance') }}" @if($selected == 'maintenance') class="active" @endif>@icon('spanner'){{ trans('settings.maint') }}</a>
diff --git a/resources/views/settings/recycle-bin/destroy.blade.php b/resources/views/settings/recycle-bin/destroy.blade.php
index ab6034984..fffa961bf 100644
--- a/resources/views/settings/recycle-bin/destroy.blade.php
+++ b/resources/views/settings/recycle-bin/destroy.blade.php
@@ -3,9 +3,7 @@
@section('body')
<div class="container small">
- <div class="py-m">
- @include('settings.parts.navbar', ['selected' => 'maintenance'])
- </div>
+ @include('settings.parts.navbar', ['selected' => 'maintenance'])
<div class="card content-wrap auto-height">
<h2 class="list-heading">{{ trans('settings.recycle_bin_permanently_delete') }}</h2>
diff --git a/resources/views/settings/recycle-bin/index.blade.php b/resources/views/settings/recycle-bin/index.blade.php
index b31bf02e5..5f2ec333f 100644
--- a/resources/views/settings/recycle-bin/index.blade.php
+++ b/resources/views/settings/recycle-bin/index.blade.php
@@ -3,9 +3,7 @@
@section('body')
<div class="container">
- <div class="py-m">
- @include('settings.parts.navbar', ['selected' => 'maintenance'])
- </div>
+ @include('settings.parts.navbar', ['selected' => 'maintenance'])
<div class="card content-wrap auto-height">
<h2 class="list-heading">{{ trans('settings.recycle_bin') }}</h2>
diff --git a/resources/views/settings/recycle-bin/restore.blade.php b/resources/views/settings/recycle-bin/restore.blade.php
index 5268bf067..7811245b7 100644
--- a/resources/views/settings/recycle-bin/restore.blade.php
+++ b/resources/views/settings/recycle-bin/restore.blade.php
@@ -3,9 +3,7 @@
@section('body')
<div class="container small">
- <div class="py-m">
- @include('settings.parts.navbar', ['selected' => 'maintenance'])
- </div>
+ @include('settings.parts.navbar', ['selected' => 'maintenance'])
<div class="card content-wrap auto-height">
<h2 class="list-heading">{{ trans('settings.recycle_bin_restore') }}</h2>
diff --git a/resources/views/settings/registration.blade.php b/resources/views/settings/registration.blade.php
new file mode 100644
index 000000000..721839b9b
--- /dev/null
+++ b/resources/views/settings/registration.blade.php
@@ -0,0 +1,71 @@
+@extends('settings.layout')
+
+@section('card')
+ <h1 id="registration" class="list-heading">{{ trans('settings.reg_settings') }}</h2>
+ <form action="{{ url("/settings/registration") }}" method="POST">
+ {!! csrf_field() !!}
+ <input type="hidden" name="section" value="registration">
+
+ <div class="setting-list">
+ <div class="grid half gap-xl">
+ <div>
+ <label class="setting-list-label">{{ trans('settings.reg_enable') }}</label>
+ <p class="small">{!! trans('settings.reg_enable_desc') !!}</p>
+ </div>
+ <div>
+ @include('form.toggle-switch', [
+ 'name' => 'setting-registration-enabled',
+ 'value' => setting('registration-enabled'),
+ 'label' => trans('settings.reg_enable_toggle')
+ ])
+
+ @if(in_array(config('auth.method'), ['ldap', 'saml2', 'oidc']))
+ <div class="text-warn text-small mb-l">{{ trans('settings.reg_enable_external_warning') }}</div>
+ @endif
+
+ <label for="setting-registration-role">{{ trans('settings.reg_default_role') }}</label>
+ <select id="setting-registration-role" name="setting-registration-role" @if($errors->has('setting-registration-role')) class="neg" @endif>
+ <option value="0" @if(intval(setting('registration-role', '0')) === 0) selected @endif>-- {{ trans('common.none') }} --</option>
+ @foreach(\BookStack\Auth\Role::all() as $role)
+ <option value="{{$role->id}}"
+ data-system-role-name="{{ $role->system_name ?? '' }}"
+ @if(intval(setting('registration-role', '0')) === $role->id) selected @endif
+ >
+ {{ $role->display_name }}
+ </option>
+ @endforeach
+ </select>
+ </div>
+ </div>
+
+ <div class="grid half gap-xl">
+ <div>
+ <label for="setting-registration-restrict" class="setting-list-label">{{ trans('settings.reg_confirm_restrict_domain') }}</label>
+ <p class="small">{!! trans('settings.reg_confirm_restrict_domain_desc') !!}</p>
+ </div>
+ <div class="pt-xs">
+ <input type="text" id="setting-registration-restrict" name="setting-registration-restrict" placeholder="{{ trans('settings.reg_confirm_restrict_domain_placeholder') }}" value="{{ setting('registration-restrict', '') }}">
+ </div>
+ </div>
+
+ <div class="grid half gap-xl">
+ <div>
+ <label class="setting-list-label">{{ trans('settings.reg_email_confirmation') }}</label>
+ <p class="small">{{ trans('settings.reg_confirm_email_desc') }}</p>
+ </div>
+ <div>
+ @include('form.toggle-switch', [
+ 'name' => 'setting-registration-confirmation',
+ 'value' => setting('registration-confirmation'),
+ 'label' => trans('settings.reg_email_confirmation_toggle')
+ ])
+ </div>
+ </div>
+
+ </div>
+
+ <div class="form-group text-right">
+ <button type="submit" class="button">{{ trans('settings.settings_save') }}</button>
+ </div>
+ </form>
+@endsection
\ No newline at end of file
diff --git a/resources/views/settings/roles/create.blade.php b/resources/views/settings/roles/create.blade.php
index 72afc60a8..487f3a5c2 100644
--- a/resources/views/settings/roles/create.blade.php
+++ b/resources/views/settings/roles/create.blade.php
@@ -4,9 +4,7 @@
<div class="container small">
- <div class="py-m">
- @include('settings.parts.navbar', ['selected' => 'roles'])
- </div>
+ @include('settings.parts.navbar', ['selected' => 'roles'])
<div class="card content-wrap">
<h1 class="list-heading">{{ trans('settings.role_create') }}</h1>
diff --git a/resources/views/settings/roles/delete.blade.php b/resources/views/settings/roles/delete.blade.php
index 52362461d..f36b4cc50 100644
--- a/resources/views/settings/roles/delete.blade.php
+++ b/resources/views/settings/roles/delete.blade.php
@@ -3,9 +3,7 @@
@section('body')
<div class="container small">
- <div class="py-m">
- @include('settings.parts.navbar', ['selected' => 'roles'])
- </div>
+ @include('settings.parts.navbar', ['selected' => 'roles'])
<div class="card content-wrap auto-height">
<h1 class="list-heading"> {{ trans('settings.role_delete') }}</h1>
diff --git a/resources/views/settings/roles/edit.blade.php b/resources/views/settings/roles/edit.blade.php
index dda8db39d..bd1dbb763 100644
--- a/resources/views/settings/roles/edit.blade.php
+++ b/resources/views/settings/roles/edit.blade.php
@@ -3,9 +3,7 @@
@section('body')
<div class="container small">
- <div class="py-m">
- @include('settings.parts.navbar', ['selected' => 'roles'])
- </div>
+ @include('settings.parts.navbar', ['selected' => 'roles'])
<div class="card content-wrap">
<h1 class="list-heading">{{ trans('settings.role_edit') }}</h1>
diff --git a/resources/views/settings/roles/index.blade.php b/resources/views/settings/roles/index.blade.php
index 6c2996787..4c3b5625a 100644
--- a/resources/views/settings/roles/index.blade.php
+++ b/resources/views/settings/roles/index.blade.php
@@ -4,9 +4,7 @@
<div class="container small">
- <div class="py-m">
- @include('settings.parts.navbar', ['selected' => 'roles'])
- </div>
+ @include('settings.parts.navbar', ['selected' => 'roles'])
<div class="card content-wrap auto-height">
diff --git a/resources/views/settings/webhooks/create.blade.php b/resources/views/settings/webhooks/create.blade.php
index f7a99c725..f0aeaca36 100644
--- a/resources/views/settings/webhooks/create.blade.php
+++ b/resources/views/settings/webhooks/create.blade.php
@@ -4,9 +4,7 @@
<div class="container small">
- <div class="py-m">
- @include('settings.parts.navbar', ['selected' => 'webhooks'])
- </div>
+ @include('settings.parts.navbar', ['selected' => 'webhooks'])
<div class="card content-wrap auto-height">
<h1 class="list-heading">{{ trans('settings.webhooks_create') }}</h1>
diff --git a/resources/views/settings/webhooks/delete.blade.php b/resources/views/settings/webhooks/delete.blade.php
index 65560f65f..dd81fd143 100644
--- a/resources/views/settings/webhooks/delete.blade.php
+++ b/resources/views/settings/webhooks/delete.blade.php
@@ -3,9 +3,7 @@
@section('body')
<div class="container small">
- <div class="py-m">
- @include('settings.parts.navbar', ['selected' => 'webhooks'])
- </div>
+ @include('settings.parts.navbar', ['selected' => 'webhooks'])
<div class="card content-wrap auto-height">
<h1 class="list-heading"> {{ trans('settings.webhooks_delete') }}</h1>
diff --git a/resources/views/settings/webhooks/edit.blade.php b/resources/views/settings/webhooks/edit.blade.php
index 27f3070ca..680fc1207 100644
--- a/resources/views/settings/webhooks/edit.blade.php
+++ b/resources/views/settings/webhooks/edit.blade.php
@@ -3,9 +3,7 @@
@section('body')
<div class="container small">
- <div class="py-m">
- @include('settings.parts.navbar', ['selected' => 'webhooks'])
- </div>
+ @include('settings.parts.navbar', ['selected' => 'webhooks'])
<div class="card content-wrap auto-height">
<h1 class="list-heading">{{ trans('settings.webhooks_edit') }}</h1>
diff --git a/resources/views/settings/webhooks/index.blade.php b/resources/views/settings/webhooks/index.blade.php
index 296bbd7ed..bbe58453f 100644
--- a/resources/views/settings/webhooks/index.blade.php
+++ b/resources/views/settings/webhooks/index.blade.php
@@ -4,9 +4,7 @@
<div class="container small">
- <div class="py-m">
- @include('settings.parts.navbar', ['selected' => 'webhooks'])
- </div>
+ @include('settings.parts.navbar', ['selected' => 'webhooks'])
<div class="card content-wrap auto-height">
diff --git a/resources/views/users/create.blade.php b/resources/views/users/create.blade.php
index 7015b162a..540d7bd6a 100644
--- a/resources/views/users/create.blade.php
+++ b/resources/views/users/create.blade.php
@@ -4,9 +4,7 @@
<div class="container small">
- <div class="py-m">
- @include('settings.parts.navbar', ['selected' => 'users'])
- </div>
+ @include('settings.parts.navbar', ['selected' => 'users'])
<main class="card content-wrap">
<h1 class="list-heading">{{ trans('settings.users_add_new') }}</h1>
diff --git a/resources/views/users/delete.blade.php b/resources/views/users/delete.blade.php
index 490e9d6c5..9ee5d4c05 100644
--- a/resources/views/users/delete.blade.php
+++ b/resources/views/users/delete.blade.php
@@ -3,9 +3,7 @@
@section('body')
<div class="container small">
- <div class="py-m">
- @include('settings.parts.navbar', ['selected' => 'users'])
- </div>
+ @include('settings.parts.navbar', ['selected' => 'users'])
<div class="card content-wrap auto-height">
<h1 class="list-heading">{{ trans('settings.users_delete') }}</h1>
diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index 41e64dbb9..4e31e785d 100644
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -3,9 +3,7 @@
@section('body')
<div class="container small">
- <div class="py-m">
- @include('settings.parts.navbar', ['selected' => 'users'])
- </div>
+ @include('settings.parts.navbar', ['selected' => 'users'])
<section class="card content-wrap">
<h1 class="list-heading">{{ $user->id === user()->id ? trans('settings.users_edit_profile') : trans('settings.users_edit') }}</h1>
diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php
index 6c79169ca..953a12900 100644
--- a/resources/views/users/index.blade.php
+++ b/resources/views/users/index.blade.php
@@ -3,9 +3,7 @@
@section('body')
<div class="container small">
- <div class="py-m">
- @include('settings.parts.navbar', ['selected' => 'users'])
- </div>
+ @include('settings.parts.navbar', ['selected' => 'users'])
<main class="card content-wrap">
diff --git a/resources/views/users/profile.blade.php b/resources/views/users/profile.blade.php
index b59c80ec6..a8be8a4c1 100644
--- a/resources/views/users/profile.blade.php
+++ b/resources/views/users/profile.blade.php
@@ -2,7 +2,7 @@
@section('body')
- <div class="container pt-xl">
+ <div class="container medium pt-xl">
<div class="grid right-focus reverse-collapse">
diff --git a/routes/web.php b/routes/web.php
index ad4fb9067..223d97c66 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -207,10 +207,6 @@ Route::middleware('auth')->group(function () {
Route::get('/', [HomeController::class, 'index']);
Route::get('/home', [HomeController::class, 'index']);
- // Settings
- Route::get('/settings', [SettingController::class, 'index'])->name('settings');
- Route::post('/settings', [SettingController::class, 'update']);
-
// Maintenance
Route::get('/settings/maintenance', [MaintenanceController::class, 'index']);
Route::delete('/settings/maintenance/cleanup-images', [MaintenanceController::class, 'cleanupImages']);
@@ -267,6 +263,11 @@ Route::middleware('auth')->group(function () {
Route::put('/settings/webhooks/{id}', [WebhookController::class, 'update']);
Route::get('/settings/webhooks/{id}/delete', [WebhookController::class, 'delete']);
Route::delete('/settings/webhooks/{id}', [WebhookController::class, 'destroy']);
+
+ // Settings
+ Route::redirect('/settings', '/settings/features')->name('settings');
+ Route::get('/settings/{category}', [SettingController::class, 'index']);
+ Route::post('/settings/{category}', [SettingController::class, 'update']);
});
// MFA routes
diff --git a/tests/Auth/AuthTest.php b/tests/Auth/AuthTest.php
index fd953021d..0ab6d0e8c 100644
--- a/tests/Auth/AuthTest.php
+++ b/tests/Auth/AuthTest.php
@@ -202,7 +202,7 @@ class AuthTest extends TestCase
{
$this->assertFalse(setting('registration-role'));
- $resp = $this->asAdmin()->get('/settings');
+ $resp = $this->asAdmin()->get('/settings/registration');
$resp->assertElementContains('select[name="setting-registration-role"] option[value="0"][selected]', '-- None --');
}
diff --git a/tests/Permissions/RolesTest.php b/tests/Permissions/RolesTest.php
index f69b5603c..fe2139e59 100644
--- a/tests/Permissions/RolesTest.php
+++ b/tests/Permissions/RolesTest.php
@@ -27,7 +27,7 @@ class RolesTest extends TestCase
public function test_admin_can_see_settings()
{
- $this->asAdmin()->get('/settings')->assertSee('Settings');
+ $this->asAdmin()->get('/settings/features')->assertSee('Settings');
}
public function test_cannot_delete_admin_role()
@@ -58,7 +58,7 @@ class RolesTest extends TestCase
$testRoleUpdateName = 'An Super Updated role';
// Creation
- $resp = $this->asAdmin()->get('/settings');
+ $resp = $this->asAdmin()->get('/settings/features');
$resp->assertElementContains('a[href="' . url('/settings/roles') . '"]', 'Roles');
$resp = $this->get('/settings/roles');
@@ -247,13 +247,13 @@ class RolesTest extends TestCase
public function test_settings_manage_permission()
{
- $this->actingAs($this->user)->get('/settings')->assertRedirect('/');
+ $this->actingAs($this->user)->get('/settings/features')->assertRedirect('/');
$this->giveUserPermissions($this->user, ['settings-manage']);
- $this->get('/settings')->assertOk();
+ $this->get('/settings/features')->assertOk();
- $resp = $this->post('/settings', []);
- $resp->assertRedirect('/settings');
- $resp = $this->get('/settings');
+ $resp = $this->post('/settings/features', []);
+ $resp->assertRedirect('/settings/features');
+ $resp = $this->get('/settings/features');
$resp->assertSee('Settings saved');
}
@@ -762,7 +762,7 @@ class RolesTest extends TestCase
public function test_public_role_visible_in_default_role_setting()
{
- $this->asAdmin()->get('/settings')
+ $this->asAdmin()->get('/settings/registration')
->assertElementExists('[data-system-role-name="admin"]')
->assertElementExists('[data-system-role-name="public"]');
}
diff --git a/tests/Settings/FooterLinksTest.php b/tests/Settings/FooterLinksTest.php
index f1b5d4294..4b822ba4c 100644
--- a/tests/Settings/FooterLinksTest.php
+++ b/tests/Settings/FooterLinksTest.php
@@ -8,13 +8,13 @@ class FooterLinksTest extends TestCase
{
public function test_saving_setting()
{
- $resp = $this->asAdmin()->post('/settings', [
+ $resp = $this->asAdmin()->post('/settings/customization', [
'setting-app-footer-links' => [
['label' => 'My custom link 1', 'url' => 'https://example.com/1'],
['label' => 'My custom link 2', 'url' => 'https://example.com/2'],
],
]);
- $resp->assertRedirect('/settings');
+ $resp->assertRedirect('/settings/customization');
$result = setting('app-footer-links');
$this->assertIsArray($result);
@@ -30,7 +30,7 @@ class FooterLinksTest extends TestCase
['label' => 'Another Link', 'url' => 'https://example.com/link-b'],
]]);
- $resp = $this->asAdmin()->get('/settings');
+ $resp = $this->asAdmin()->get('/settings/customization');
$resp->assertSee('value="My custom link"', false);
$resp->assertSee('value="Another Link"', false);
$resp->assertSee('value="https://example.com/link-a"', false);
diff --git a/tests/Settings/SettingsTest.php b/tests/Settings/SettingsTest.php
new file mode 100644
index 000000000..5d8c36996
--- /dev/null
+++ b/tests/Settings/SettingsTest.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace Tests\Settings;
+
+use Tests\TestCase;
+
+class SettingsTest extends TestCase
+{
+ public function test_settings_endpoint_redirects_to_settings_view()
+ {
+ $resp = $this->asAdmin()->get('/settings');
+
+ $resp->assertRedirect('/settings/features');
+ }
+
+ public function test_settings_category_links_work_as_expected()
+ {
+ $this->asAdmin();
+ $categories = [
+ 'features' => 'Features & Security',
+ 'customization' => 'Customization',
+ 'registration' => 'Registration',
+ ];
+
+ foreach ($categories as $category => $title) {
+ $resp = $this->get("/settings/{$category}");
+ $resp->assertElementContains('h1', $title);
+ $resp->assertElementExists("form[action$=\"/settings/{$category}\"]");
+ }
+ }
+
+ public function test_not_found_setting_category_throws_404()
+ {
+ $resp = $this->asAdmin()->get('/settings/biscuits');
+
+ $resp->assertStatus(404);
+ $resp->assertSee('Page Not Found');
+ }
+}
\ No newline at end of file
diff --git a/tests/Uploads/ImageTest.php b/tests/Uploads/ImageTest.php
index 32f79e9e0..01754d2de 100644
--- a/tests/Uploads/ImageTest.php
+++ b/tests/Uploads/ImageTest.php
@@ -314,8 +314,8 @@ class ImageTest extends TestCase
$galleryFile = $this->getTestImage('my-system-test-upload.png');
$expectedPath = public_path('uploads/images/system/' . date('Y-m') . '/my-system-test-upload.png');
- $upload = $this->call('POST', '/settings', [], [], ['app_logo' => $galleryFile], []);
- $upload->assertRedirect('/settings');
+ $upload = $this->call('POST', '/settings/customization', [], [], ['app_logo' => $galleryFile], []);
+ $upload->assertRedirect('/settings/customization');
$this->assertTrue(file_exists($expectedPath), 'Uploaded image not found at path: ' . $expectedPath);