Merge branch 'master' of https://github.com/danivideda/sqola

danivideda · Dec 8, 2020 · f10e68f · f10e68f
2 parents d7d002a + f055ab4
commit f10e68f
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
@@ -21,6 +21,6 @@ public function login(Request $request) {
             return back()->with('status', 'Invalid login details');
         }
 
-        return redirect()->route('landing');
+        return redirect()->route('course.ongoing');
     }
 }
diff --git a/resources/views/courses/complete.blade.php b/resources/views/courses/complete.blade.php
@@ -8,7 +8,7 @@
 <h1 class="text-5xl px-5 font-bold text-gray-800 w-full mb-16">My Courses</h1>
 
 <div class="px-20 flex justify-evenly w-full mb-10">
-    <a href="/courses/ongoing" class="text-lg text-gray-500">Ongoing</a>
+    <a href="{{ route('course.ongoing') }}" class="text-lg text-gray-500">Ongoing</a>
     <a href="#" class="text-lg text-blue-500 underline">Complete</a>
 </div>
 
@@ -44,4 +44,4 @@
         <span class="col-span-2 text-gray-600 font-semibold italic text-2xl text-center">Persuasive Text</span>
     </a>
 </div>
-@endsection
+@endsection
diff --git a/resources/views/courses/ongoing.blade.php b/resources/views/courses/ongoing.blade.php
@@ -9,7 +9,7 @@
 
 <div class="px-20 flex justify-evenly w-full mb-10">
     <a href="#" class="text-lg text-blue-500 underline">Ongoing</a>
-    <a href="/courses/complete" class="text-lg text-gray-500">Complete</a>
+    <a href="{{ route('course.complete') }}" class="text-lg text-gray-500">Complete</a>
 </div>
 
 <div class="flex flex-col w-full">
@@ -43,4 +43,4 @@
         <span class="col-span-2 text-gray-600 font-semibold italic text-2xl text-center">Procedure Text</span>
     </a>
 </div>
-@endsection
+@endsection
diff --git a/resources/views/layouts/web.blade.php b/resources/views/layouts/web.blade.php
@@ -10,8 +10,8 @@
     <div class="container mx-auto flex justify-between">
     <ul class="flex items-center">
         <li>
-            <a href="/">
-                <img src="{{asset('img/logo.PNG')}}" alt="Sqola" style="height: 45px;" class="mx-8">
+            <a href="{{ route('register.teacher') }}">
+                <img src="{{ asset('img/logo.PNG') }}" alt="Sqola" style="height: 45px;" class="mx-8">
             </a>
         </li>
         @if (Route::is('landing'))

diff --git a/routes/web.php b/routes/web.php
@@ -34,8 +34,8 @@
 
 Route::middleware('auth.student')->group(function () {
     // Courses
-    Route::get('/courses/ongoing', [CourseController::class, 'indexOngoing'])->name('course.ongoing');
-    Route::get('/courses/complete', [CourseController::class, 'indexComplete'])->name('course.complete');
+    Route::get('/mycourse/ongoing', [CourseController::class, 'indexOngoing'])->name('course.ongoing');
+    Route::get('/mycourse/complete', [CourseController::class, 'indexComplete'])->name('course.complete');
 
     // Categories
     Route::get('/categories/10/fisika', function () {