diff --git a/Modules/CourseFinder/app/Http/Controllers/ProgramController.php b/Modules/CourseFinder/app/Http/Controllers/ProgramController.php index 997c749..5fa8ca6 100644 --- a/Modules/CourseFinder/app/Http/Controllers/ProgramController.php +++ b/Modules/CourseFinder/app/Http/Controllers/ProgramController.php @@ -217,10 +217,7 @@ class ProgramController extends Controller } if ($request->filled('search')) { - $query->where(function ($q) use ($request) { - $q->where('keywords', 'like', "%{$request->search}%") - ->orWhere('title', 'like', "%{$request->search}%"); - }); + $query->where('title', 'like', "%{$request->search}%"); } if ($request->filled('programlevels_id')) { diff --git a/Modules/CourseFinder/app/Services/ProgramService.php b/Modules/CourseFinder/app/Services/ProgramService.php index a7e36fa..0745240 100644 --- a/Modules/CourseFinder/app/Services/ProgramService.php +++ b/Modules/CourseFinder/app/Services/ProgramService.php @@ -23,7 +23,7 @@ class ProgramService if ($request->filled('intake_id')) { $intakeId = $request->intake_id; - $query->whereJsonContains('intake', $intakeId); + $query->whereJsonContains('intakes', $intakeId); } if ($request->filled('status')) { @@ -32,14 +32,13 @@ class ProgramService if ($request->filled('search')) { $search = $request->search; - $query->where('keywords', 'like', "%{$search}%"); + $query->where('title', 'like', "%{$search}%"); } if ($request->filled('location')) { $location = $request->location; $query->where('location', 'like', "%{$location}%"); } - })->latest()->paginate(10)->withQueryString(); } diff --git a/Modules/User/routes/client.php b/Modules/User/routes/client.php index b27a7fc..2360691 100644 --- a/Modules/User/routes/client.php +++ b/Modules/User/routes/client.php @@ -3,14 +3,18 @@ use App\Http\Controllers\WebsiteController; use Illuminate\Support\Facades\Route; use Modules\CCMS\Http\Controllers\EnquiryController; +use Modules\CourseFinder\Http\Controllers\CoopController; +use Modules\CourseFinder\Http\Controllers\ProgramController; +use Modules\CourseFinder\Http\Controllers\ProgramLevelController; Route::get('/', [WebsiteController::class, 'home']); -Route::get('/course-finder', [WebsiteController::class, 'coursefinder']); +Route::get('/course-finder', [WebsiteController::class, 'coursefinder'])->name('program.coursefinder'); Route::get('/resources', [WebsiteController::class, 'resources'])->name('resources'); Route::get('blog/{alias}', [WebsiteController::class, 'blogSingle'])->name('blog.single'); Route::get('service/{alias}', [WebsiteController::class, 'serviceSingle'])->name('service.single'); Route::get('test/{alias}', [WebsiteController::class, 'testSingle'])->name('test.single'); Route::get('destination/{alias}', [WebsiteController::class, 'countrySingle'])->name('country.single'); Route::get('/home/resources', [WebsiteController::class, 'resources']); -Route::get('{parent}/{slug?}', [WebsiteController::class, 'loadPage'])->name('page.load'); +Route::get('getCoursesList', [ProgramController::class, 'getCoursesList'])->name('program.getCoursesList'); Route::post('enquiry', [EnquiryController::class, 'store'])->name('enquiry.store'); +Route::get('{parent}/{slug?}', [WebsiteController::class, 'loadPage'])->name('page.load'); diff --git a/resources/views/client/raffles/pages/course/list.blade.php b/resources/views/client/raffles/pages/course/list.blade.php index 3d09c97..6105a7c 100644 --- a/resources/views/client/raffles/pages/course/list.blade.php +++ b/resources/views/client/raffles/pages/course/list.blade.php @@ -8,7 +8,6 @@ -

{{ $item->title }}

diff --git a/resources/views/client/raffles/pages/coursefinder-single.blade.php b/resources/views/client/raffles/pages/coursefinder-single.blade.php new file mode 100644 index 0000000..ef61604 --- /dev/null +++ b/resources/views/client/raffles/pages/coursefinder-single.blade.php @@ -0,0 +1,261 @@ +@extends('client.raffles.layouts.app') +@section('content') +
+ course finder +
+ +
+ +
+
+ + + + +
+
+
+
+

(STEM) Bachelor of Architecture (BArch)

+
Marywood University (USA)
+
+
+ +
+
+
Course Code
+
BArch
+
+
+
Duration
+
4 Years
+
+
+
Level
+
Bachelor
+
+
+
Annual Fee
+
$41,700
+
+
+
Scholarship
+
Up to $25,000
+
+
+
+ + +
+ +
+

Course Overview

+

The Bachelor of Architecture (BArch) program at Marywood University is a comprehensive 4-year STEM-designated degree that prepares students for professional practice in architecture. This program combines creative design thinking with technical knowledge, sustainability principles, and cutting-edge technology to develop well-rounded architects ready for the challenges of the 21st century.

+
+

Students will engage in hands-on design studios, learn from experienced faculty, and have access to state-of-the-art facilities including digital fabrication labs, 3D printing, and virtual reality design tools. The program emphasizes both theoretical knowledge and practical application, ensuring graduates are prepared for licensure and professional practice.

+
+ + +
+

Entry Requirements

+
+
+
English Language Requirements
+
+
IELTS: 5.5 (5.5)
+
PTE: 48 (48)
+
Duolingo: 90 Overall
+
TOEFL: 70 Overall
+
+
+
+
Academic Requirements
+
+ • High School Diploma or equivalent
+ • Minimum GPA of 3.0
+ • Mathematics and Physics recommended
+ • Portfolio submission required +
+
+
+
Additional Documents
+
+ • Official transcripts
+ • Letters of recommendation (2)
+ • Personal statement
+ • Portfolio of creative work +
+
+
+
Application Deadlines
+
+ • Fall Semester: June 1st
+ • Spring Semester: November 1st
+ • Early Decision: March 15th
+ • Rolling admissions available +
+
+
+
+ + + + +
+

Fees Breakdown

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Fee TypeAmount (USD)Frequency
Tuition Fee$38,500Per Year
Technology Fee$1,200Per Year
Student Activities$800Per Year
Health Services$600Per Year
Library Fee$400Per Year
Application Fee$50One Time
Total Annual Cost$41,700Per Year
+ + +
+ + + + +
+
+
+ + +
+ + + +
+ +@endsection diff --git a/resources/views/client/raffles/pages/coursefinder-template.blade.php b/resources/views/client/raffles/pages/coursefinder-template.blade.php index 0070cfa..4880423 100644 --- a/resources/views/client/raffles/pages/coursefinder-template.blade.php +++ b/resources/views/client/raffles/pages/coursefinder-template.blade.php @@ -14,13 +14,13 @@
- {{ html()->form('GET')->route('program.index')->class(['filter-form', 'filterForm'])->attributes(['id' => 'filter-form'])->open() }} + {{ html()->form('GET')->route('program.coursefinder')->class(['filter-course-form'])->attributes(['id' => 'filter-course-form'])->open() }}

Browse Subjects

- {{ html()->text('search')->value(request('search'))->placeholder('Search Program')->class('form-control px-10 py-10')->style('width: 95%;') }} -
@@ -70,10 +70,9 @@
- - + {{ html()->text('min_score')->class('form-control form-control-sm numeric bg-light text-14 px-5 py-10 w-50percent')->placeholder('Min score') }} + + {{ html()->text('max_score')->class('form-control form-control-sm numeric bg-light text-14 px-5 py-10 w-50percent')->placeholder('Max score') }}
@@ -82,102 +81,122 @@ + class="text-14 px-20 py-10 rounded-10 bg-brand text-white border-0 reset-course-filter">Reset
- {{ html()->form()->close() }} - - -
-

Available Courses

- @forelse ($programs as $item) -
-
-
-
- -
-
- -
-
-

{{ $item->title }}

-
{{ $item->institution?->title }} {{ $item->institution?->country?->title }} -
-
-
Code: - {{ !empty($item->code) ? $item->code : 'N/A' }}
-
Fee: - {{ !empty($item->fee) ? $item->fee : 'N/A' }}
-
Schlorship: - {{ !empty($item->scholarship) ? $item->scholarship : 'N/A' }}
+
+
+
+ @forelse ($programs as $item) +

Available Courses

+
+
+
+
+ +
-
-
Level: - {{ !empty($item->programlevel?->title) ? $item->programlevel?->title : 'N/A' }} -
-
Duration: - {{ !empty($item->year) ? $item->year : 'N/A' }}
- -
PSW: - {{ !empty($item->psw) ? $item->psw : 'N/A' }}
- +
+
+

{{ $item->title }}

+
{{ $item->institution?->title }} {{ $item->institution?->country?->title }} +
+
+
Code: + {{ !empty($item->code) ? $item->code : 'N/A' }}
+
Fee: + {{ !empty($item->fee) ? $item->fee : 'N/A' }}
+
Schlorship: + {{ !empty($item->scholarship) ? $item->scholarship : 'N/A' }} +
+
+ +
+
Level: + {{ !empty($item->programlevel?->title) ? $item->programlevel?->title : 'N/A' }} +
+
Duration: + {{ !empty($item->year) ? $item->year : 'N/A' }}
+ +
PSW: + {{ !empty($item->psw) ? $item->psw : 'N/A' }}
+ +
+ +
+
+
+
+ @foreach ($item->tests as $index => $test) +
{{ $test->title }}: + {{ $test->pivot?->min_score }} + ({{ $test->pivot?->band_score }}) +
+ @endforeach +
+
+
+ +
+
+
+ @if (!empty($item->intakes)) +
Intake:
+ @forelse ($item->intakes as $value) +
+ {{ $intakeOptions[$value] }}
+ + @empty + N/A + @endforelse + @endif +
+
-
-
- @foreach ($item->tests as $index => $test) -
{{ $test->title }}: - {{ $test->pivot?->min_score }} - ({{ $test->pivot?->band_score }}) -
- @endforeach -
- -
-
- -
-
-
- @if (!empty($item->intakes)) -
Intake:
- @forelse ($item->intakes as $value) -
- {{ $intakeOptions[$value] }}
- - @empty - N/A - @endforelse - @endif + @empty +
+
+
+
+

No Course Found !!!

+
+
-
- + @endforelse + {{ $programs->links() }}
- @empty -
-

No Course Found !!!

+ - @endforelse - {{ $programs->links() }} +
@@ -211,102 +230,9 @@
+ {{ html()->form()->close() }} +
@endsection -@push('js') - -@endpush -