Skip to content

feat: homepage optimizations and unified admin navigation #190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
trtajim merged 4 commits into from
Aug 27, 2026
Merged

feat: homepage optimizations and unified admin navigation #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fceb906
refactor(home): relocate FAQ to guide with pagination and make blog c…
trtajim Aug 27, 2026
5aea2a7
feat(subjects): add english_name, custom slug support, and bilingual …
trtajim Aug 27, 2026
6444b1f
fix(admin): unify deterministic hierarchical navigation, replace full…
trtajim Aug 27, 2026
55894cd
style: fix eslint unused imports and formatting
trtajim Aug 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 18 additions & 9 deletions app/Http/Controllers/Admin/NodeController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,21 +62,30 @@ public function create(Subject $subject, Request $request)
->firstOrFail();
}

$prev = url()->previous();
$redirect = (! empty($prev) && ! str_contains($prev, '/create') && ! str_contains($prev, '/edit'))
? $prev
: route('admin.nodes.index', ['subject' => $subject->slug]);

return Inertia::render('admin/NodeCreateOrEdit', [
'subject' => $subject,
'parent' => $parent,
'redirect' => url()->previous(),
'redirect' => $redirect,
]);
}

public function edit(Node $node)
{
$prev = url()->previous();
$redirect = (! empty($prev) && ! str_contains($prev, '/create') && ! str_contains($prev, '/edit'))
? $prev
: route('admin.nodes.index', ['subject' => $node->subject->slug]);

return Inertia::render('admin/NodeCreateOrEdit', [
'subject' => $node->subject,
'node' => $node,
'parent' => $node->parent,
'redirect' => url()->previous(),
'redirect' => $redirect,
]);
}

Expand Down Expand Up @@ -118,7 +127,9 @@ public function store(StoreNodeRequest $request, Subject $subject)
'sort_order' => $validated['sort_order'] ?? 0,
]);

$redirect = $validated['redirect'] ? $validated['redirect'] : explode('/create', url()->previous())[0];
$redirect = (! empty($validated['redirect']) && ! str_contains($validated['redirect'], '/create') && ! str_contains($validated['redirect'], '/edit'))
? $validated['redirect']
: route('admin.nodes.index', ['subject' => $subject->slug]);

return redirect($redirect)->with('success', 'Node created successfully.');
}
Expand Down Expand Up @@ -151,12 +162,8 @@ public function update(UpdateNodeRequest $request, Subject $subject, Node $node)

$slug = Str::slug($rawSlug);

$parentId = array_key_exists('parent_id', $validated)
? $validated['parent_id']
: $node->parent_id;

$exists = Node::where('subject_id', $subject->id)
->where('parent_id', $parentId)
->where('parent_id', $node->parent_id)
->where('slug', $slug)
->where('id', '!=', $node->id)
->exists();
Expand All @@ -176,7 +183,9 @@ public function update(UpdateNodeRequest $request, Subject $subject, Node $node)

$node->save();

$redirect = $validated['redirect'] ?? explode('/edit', url()->previous())[0];
$redirect = (! empty($validated['redirect']) && ! str_contains($validated['redirect'], '/create') && ! str_contains($validated['redirect'], '/edit'))
? $validated['redirect']
: route('admin.nodes.index', ['subject' => $subject->slug]);

return redirect($redirect)->with('success', 'Node updated successfully.');
}
Expand Down
50 changes: 42 additions & 8 deletions app/Http/Controllers/Admin/ResourceController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,13 @@ public function create(Request $request)
{
$node = Node::findOrFail($request->node_id);

$prev = url()->previous();
$redirect = (! empty($prev) && ! str_contains($prev, '/create') && ! str_contains($prev, '/edit') && ! str_contains($prev, '/resources/'))
? $prev
: '/admin/subjects';

return Inertia::render('admin/ResourceCreateOrEdit', [
'redirect' => url()->previous(),
'redirect' => $redirect,
'node' => $node,
]);
}
Expand All @@ -32,8 +37,13 @@ public function edit(Resource $resource)
{
$node = $resource->node;

$prev = url()->previous();
$redirect = (! empty($prev) && ! str_contains($prev, '/create') && ! str_contains($prev, '/edit') && ! str_contains($prev, '/resources/'))
? $prev
: '/admin/subjects';

return Inertia::render('admin/ResourceCreateOrEdit', [
'redirect' => url()->previous(),
'redirect' => $redirect,
'node' => $node,
'resource' => $resource,
]);
Expand All @@ -51,7 +61,9 @@ public function store(StoreResourceRequest $request)

Resource::create($validated);

$redirect = $validated['redirect'] ?? explode('/resources', url()->previous())[0];
$redirect = (! empty($validated['redirect']) && ! str_contains($validated['redirect'], '/create') && ! str_contains($validated['redirect'], '/edit'))
? $validated['redirect']
: '/admin/subjects';

return redirect($redirect)->with('success', 'Resource created successfully.');
}
Expand All @@ -74,7 +86,9 @@ public function update(UpdateResourceRequest $request, Resource $resource)

$resource->update($validated);

$redirect = $validated['redirect'] ?? '/admin/subjects';
$redirect = (! empty($validated['redirect']) && ! str_contains($validated['redirect'], '/create') && ! str_contains($validated['redirect'], '/edit'))
? $validated['redirect']
: '/admin/subjects';

return redirect($redirect)
->with('success', 'Resource updated successfully.');
Expand All @@ -93,7 +107,13 @@ public function destroy(Resource $resource)

public function createBulkImages(Request $request)
{
$redirect = $request->input('redirect', url()->previous());
$redirect = $request->input('redirect');
if (empty($redirect) || str_contains($redirect, '/create') || str_contains($redirect, '/edit')) {
$prev = url()->previous();
$redirect = (! empty($prev) && ! str_contains($prev, '/create') && ! str_contains($prev, '/edit'))
? $prev
: '/admin/subjects';
}
$node = Node::findOrFail($request->node_id);

return Inertia::render('admin/resources/BulkImageCreate', [
Expand All @@ -118,12 +138,22 @@ public function storeBulkImages(BulkImageStoreRequest $request)
}
});

return redirect($validated['redirect'])->with('success', 'Bulk images uploaded successfully.');
$redirect = (! empty($validated['redirect']) && ! str_contains($validated['redirect'], '/create') && ! str_contains($validated['redirect'], '/edit'))
? $validated['redirect']
: '/admin/subjects';

return redirect($redirect)->with('success', 'Bulk images uploaded successfully.');
}

public function createBulkVideos(Request $request)
{
$redirect = $request->input('redirect', url()->previous());
$redirect = $request->input('redirect');
if (empty($redirect) || str_contains($redirect, '/create') || str_contains($redirect, '/edit')) {
$prev = url()->previous();
$redirect = (! empty($prev) && ! str_contains($prev, '/create') && ! str_contains($prev, '/edit'))
? $prev
: '/admin/subjects';
}
$node = Node::findOrFail($request->node_id);

return Inertia::render('admin/resources/BulkVideoCreate', [
Expand Down Expand Up @@ -220,6 +250,10 @@ public function storeBulkVideos(BulkVideoStoreRequest $request)
}
});

return redirect($validated['redirect'])->with('success', 'Bulk Videos uploaded successfully.');
$redirect = (! empty($validated['redirect']) && ! str_contains($validated['redirect'], '/create') && ! str_contains($validated['redirect'], '/edit'))
? $validated['redirect']
: '/admin/subjects';

return redirect($redirect)->with('success', 'Bulk Videos uploaded successfully.');
}
}
9 changes: 7 additions & 2 deletions app/Http/Requests/Subject/StoreSubjectRequest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,12 @@ public function authorize(): bool

protected function prepareForValidation(): void
{
$slug = $this->filled('slug')
? Str::slug($this->slug)
: Str::slug($this->course.'-'.($this->english_name ?: $this->name));

$this->merge([
'slug' => Str::slug($this->course.'-'.$this->name),
'slug' => $slug,
]);
}

Expand All @@ -32,7 +36,8 @@ public function rules(): array
{
return [
'name' => ['required', 'string', 'max:100', 'min:3', 'unique:subjects,name'],
'slug' => ['required', 'string', 'unique:subjects,slug'],
'english_name' => ['nullable', 'string', 'max:100'],
'slug' => ['required', 'string', 'max:100', 'unique:subjects,slug'],
'tailwind_format' => ['required', 'string', 'max:100'],
'icon' => ['required', 'string', 'max:50'],
'sort_order' => ['required', 'integer'],
Expand Down
13 changes: 12 additions & 1 deletion app/Http/Requests/Subject/UpdateSubjectRequest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Str;
use Illuminate\Validation\Rule;

class UpdateSubjectRequest extends FormRequest
Expand All @@ -16,6 +17,15 @@ public function authorize(): bool
return true;
}

protected function prepareForValidation(): void
{
if ($this->filled('slug')) {
$this->merge([
'slug' => Str::slug($this->slug),
]);
}
}

/**
* Get the validation rules that apply to the request.
*
Expand All @@ -27,10 +37,11 @@ public function rules(): array

return [
'name' => ['sometimes', 'string', 'max:100', 'min:3', Rule::unique('subjects', 'name')->ignore($subject->id)],
'english_name' => ['nullable', 'string', 'max:100'],
'tailwind_format' => ['sometimes', 'string', 'max:100'],
'icon' => ['sometimes', 'string', 'max:50'],
'sort_order' => ['sometimes', 'integer'],
'slug' => ['sometimes', 'string'],
'slug' => ['sometimes', 'string', 'max:100', Rule::unique('subjects', 'slug')->ignore($subject->id)],
'course' => ['sometimes', 'string', 'in:ssc,hsc'],
];
}
Expand Down
28 changes: 28 additions & 0 deletions database/migrations/2026_08_27_062836_add_english_name_to_subjects_table.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?php

use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

return new class extends Migration
{
/**
* Run the migrations.
*/
public function up(): void
{
Schema::table('subjects', function (Blueprint $table) {
$table->string('english_name', 100)->nullable()->after('name');
});
}

/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::table('subjects', function (Blueprint $table) {
$table->dropColumn('english_name');
});
}
};
Loading