Merge pull request #5 from khasyah-fr/master

Todo: Quiz and Task page for student and teacher
danivideda · Dec 1, 2020 · 00ff857 · 00ff857
2 parents 323fbc8 + 14e9460
commit 00ff857
Show file tree

Hide file tree

Showing 21 changed files with 587 additions and 231 deletions.
diff --git a/app/Http/Controllers/StudentController.php b/app/Http/Controllers/StudentController.php
@@ -7,6 +7,6 @@
 class StudentController extends Controller
 {
     public function index() {
-        return view('student.dashboard');
+        return view('student.home.dashboard');
     }
 }
diff --git a/app/Http/Controllers/TeacherController.php b/app/Http/Controllers/TeacherController.php
@@ -7,6 +7,6 @@
 class TeacherController extends Controller
 {
     public function index() {
-        return view('teacher.dashboard');
+        return view('teacher.home.dashboard');
     }
 }
diff --git a/resources/views/layouts/studentcourse.blade.php b/resources/views/layouts/studentcourse.blade.php
@@ -0,0 +1,29 @@
+@extends('layouts.app')
+
+@section('content')
+
+<div class="grid" style="grid-template-columns: 1fr 4fr 1fr;">
+    <div class="h-screen bg-white pt-6">
+        <div class="mb-12">
+            <img src="{{asset('img/logo.PNG')}}" alt="Klass" style="height: 55px;" class="mx-auto">
+        </div>
+
+        @yield('nav')
+
+    </div>
+    <div class="bg-gray-100 pt-7">
+
+        @yield('maincontent')
+
+    </div>
+    <div class="h-screen bg-white pt-6">
+        <div class="mb-6 text-black text-base text-center">
+                <a href="#">{{ auth()->guard('student')->user()->name }}</a>
+                <button class="px-1 pb-1 bg-red-500 text-white rounded hover:bg-red-600 ml-6">
+                    <a href="#" class="text-xs">Logout</a>
+                </button>
+        </div>
+    </div>
+</div>
+
+@endsection
diff --git a/resources/views/layouts/studenthome.blade.php b/resources/views/layouts/studenthome.blade.php
@@ -0,0 +1,36 @@
+@extends('layouts.app')
+
+@section('content')
+
+<div class="grid" style="grid-template-columns: 1fr 4fr 1fr;">
+    <div class="h-screen bg-white pt-6">
+        <div class="mb-6">
+            <img src="{{asset('img/logo.PNG')}}" alt="Klass" style="height: 55px;" class="mx-auto">
+        </div>
+        <div class="text-center mb-8">
+            <button class="py-1 px-9 bg-blue-500 text-white rounded hover:bg-blue-700">
+                <a href="#">Join a class</a>
+            </button>
+        </div>
+        <div class="text-center border-r-2 border-blue-500">
+            <button class="py-1 px-9 bg-white text-black rounded">
+                <a href="#" class="text-sm">My Class</a>
+            </button>
+        </div>
+    </div>
+
+    <div class="bg-gray-100 pt-7">
+        @yield('maincontent')
+    </div>
+
+    <div class="h-screen bg-white pt-6">
+        <div class="mb-6 text-black text-base text-center">
+                <a href="#">{{ auth()->guard('student')->user()->name }}</a>
+                <button class="px-1 pb-1 bg-red-500 text-white rounded hover:bg-red-600 ml-6">
+                    <a href="#" class="text-xs">Logout</a>
+                </button>
+        </div>
+    </div>
+</div>
+
+@endsection
diff --git a/resources/views/layouts/teachercourse.blade.php b/resources/views/layouts/teachercourse.blade.php
@@ -0,0 +1,29 @@
+@extends('layouts.app')
+
+@section('content')
+
+<div class="grid" style="grid-template-columns: 1fr 4fr 1fr;">
+    <div class="h-screen bg-white pt-6">
+        <div class="mb-12">
+            <img src="{{asset('img/logo.PNG')}}" alt="Klass" style="height: 55px;" class="mx-auto">
+        </div>
+
+        @yield('nav')
+
+    </div>
+    <div class="bg-gray-100 pt-7">
+
+        @yield('maincontent')
+
+    </div>
+    <div class="h-screen bg-white pt-6">
+        <div class="mb-6 text-black text-base text-center">
+                <a href="#">{{ auth()->guard('student')->user()->name }}</a>
+                <button class="px-1 pb-1 bg-red-500 text-white rounded hover:bg-red-600 ml-6">
+                    <a href="#" class="text-xs">Logout</a>
+                </button>
+        </div>
+    </div>
+</div>
+
+@endsection
diff --git a/resources/views/layouts/teacherhome.blade.php b/resources/views/layouts/teacherhome.blade.php
@@ -0,0 +1,36 @@
+@extends('layouts.app')
+
+@section('content')
+
+<div class="grid" style="grid-template-columns: 1fr 4fr 1fr;">
+    <div class="h-screen bg-white pt-6">
+        <div class="mb-6">
+            <img src="{{asset('img/logo.PNG')}}" alt="Klass" style="height: 55px;" class="mx-auto">
+        </div>
+        <div class="text-center mb-8">
+            <button class="py-1 px-9 bg-blue-500 text-white rounded hover:bg-blue-700">
+                <a href="#">Create a class</a>
+            </button>
+        </div>
+        <div class="text-center border-r-2 border-blue-500">
+            <button class="py-1 px-9 bg-white text-black rounded">
+                <a href="#" class="text-sm">My Class</a>
+            </button>
+        </div>
+    </div>
+
+    <div class="bg-gray-100 pt-7">
+        @yield('maincontent')
+    </div>
+
+    <div class="h-screen bg-white pt-6">
+        <div class="mb-6 text-black text-base text-center">
+                <a href="#">{{ auth()->guard('student')->user()->name }}</a>
+                <button class="px-1 pb-1 bg-red-500 text-white rounded hover:bg-red-600 ml-6">
+                    <a href="#" class="text-xs">Logout</a>
+                </button>
+        </div>
+    </div>
+</div>
+
+@endsection
diff --git a/resources/views/student/course/assignment.blade.php b/resources/views/student/course/assignment.blade.php
@@ -1,12 +1,6 @@
-@extends('layouts.app')
+@extends('layouts.studentcourse')
 
-@section('content')
-
-<div class="grid" style="grid-template-columns: 1fr 4fr 1fr;">
-    <div class="h-screen bg-white pt-6">
-        <div class="mb-12">
-            <img src="{{asset('img/logo.PNG')}}" alt="Klass" style="height: 55px;" class="mx-auto">
-        </div>
+@section('nav')
         <div class="text-center my-2">
             <button class="py-1 px-9 bg-white text-gray-300 rounded">
                 <a href="#" class="text-sm">Subject Matter</a>
@@ -22,59 +16,49 @@
                 <a href="#" class="text-sm">Review</a>
             </button>
         </div>
-    </div>
-    <div class="bg-gray-100 pt-7">
-        <div class="container">
-            <div class="flex flex-wrap flex-col md:flex-row items-center bg-white mt-2 mb-10 w-9/12 mx-auto rounded-lg">
-                <div class="flex flex-col xl:w-2/5 overflow-y-hidden lg:items-start pl-4">
-                    <h1 class="text-xl text-black text-left mb-4">Pengolahan Citra Digital</h1>
-                    <h1 class="text-sm text-blacktext-left">Wahyono, Ph.D</h1>
-                    <p class="text-sm text-left">Universitas Gadjah Mada</p>
-                </div>
-                <div class="xl:w-3/5 overflow-y-hidden rounded-lg">
-                    <img class="w-full rounded-lg" src="{{asset('img/logo.PNG')}}">
-                </div>
+@endsection
+
+@section('maincontent')
+    <div class="container">
+        <div class="flex flex-wrap flex-col md:flex-row items-center bg-white mt-2 mb-10 w-9/12 mx-auto rounded-lg">
+            <div class="flex flex-col xl:w-2/5 overflow-y-hidden lg:items-start pl-4">
+                <h1 class="text-xl text-black text-left mb-4">Pengolahan Citra Digital</h1>
+                <h1 class="text-sm text-blacktext-left">Wahyono, Ph.D</h1>
+                <p class="text-sm text-left">Universitas Gadjah Mada</p>
+            </div>
+            <div class="xl:w-3/5 overflow-y-hidden rounded-lg">
+                <img class="w-full rounded-lg" src="{{asset('img/logo.PNG')}}">
+            </div>
+        </div>
+        <div class="container w-full">
+            <div class="my-4 text-black text-xl font-bold mx-auto w-9/12">
+                <h1>Assignment :</h1>
             </div>
-            <div class="container w-full">
-                <div class="my-4 text-black text-xl font-bold mx-auto w-9/12">
-                    <h1>Assignment :</h1>
-                </div>
 
+            <a href="#">
+                <div class="bg-white w-9/12 mx-auto my-6 rounded flex">
+                    <h1 class="text-black text-base w-9/12 px-4 py-4">Assignment: Pixel-Based Image Enhancement</h1>
+                    <h1 class="text-black text-small italic font-bold w-3/12 bg-blue-200 px-4 py-4">Reviewed</h1>
+                </div> 
+            </a>
+            <a href="#">
+                <div class="bg-white w-9/12 mx-auto my-6 rounded flex">
+                    <h1 class="text-black text-base w-9/12 px-4 py-4">Lorem, ipsum dolor sit amet consectetur adipisicing.</h1>
+                    <h1 class="text-black text-small italic font-bold w-3/12 bg-green-200 px-4 py-4">Submitted</h1>
+                    </div> 
+                </a>
                 <a href="#">
-                   <div class="bg-white w-9/12 mx-auto my-6 rounded flex">
-                       <h1 class="text-black text-base w-9/12 px-4 py-4">Assignment: Pixel-Based Image Enhancement</h1>
-                       <h1 class="text-black text-small italic font-bold w-3/12 bg-blue-200 px-4 py-4">Reviewed</h1>
+                <div class="bg-white w-9/12 mx-auto my-6 rounded flex">
+                    <h1 class="text-black text-base w-9/12 px-4 py-4">Lorem ipsum dolor sit amet consectetur.</h1>
+                    <h1 class="text-black text-small italic font-bold w-3/12 bg-gray-200 px-4 py-4">Available</h1>
                     </div> 
                 </a>
                 <a href="#">
-                    <div class="bg-white w-9/12 mx-auto my-6 rounded flex">
-                        <h1 class="text-black text-base w-9/12 px-4 py-4">Lorem, ipsum dolor sit amet consectetur adipisicing.</h1>
-                        <h1 class="text-black text-small italic font-bold w-3/12 bg-green-200 px-4 py-4">Submitted</h1>
-                     </div> 
-                 </a>
-                 <a href="#">
-                    <div class="bg-white w-9/12 mx-auto my-6 rounded flex">
-                        <h1 class="text-black text-base w-9/12 px-4 py-4">Lorem ipsum dolor sit amet consectetur.</h1>
-                        <h1 class="text-black text-small italic font-bold w-3/12 bg-gray-200 px-4 py-4">Available</h1>
-                     </div> 
-                 </a>
-                 <a href="#">
-                    <div class="bg-white w-9/12 mx-auto my-6 rounded flex">
-                        <h1 class="text-black text-base w-9/12 px-4 py-4">Lorem ipsum dolor sit amet consectetur.</h1>
-                        <h1 class="text-black text-small italic font-bold w-3/12 bg-red-200 px-4 py-4">Late</h1>
-                     </div> 
-                 </a>
+                <div class="bg-white w-9/12 mx-auto my-6 rounded flex">
+                    <h1 class="text-black text-base w-9/12 px-4 py-4">Lorem ipsum dolor sit amet consectetur.</h1>
+                    <h1 class="text-black text-small italic font-bold w-3/12 bg-red-200 px-4 py-4">Late</h1>
+                    </div> 
+                </a>
             </div>
         </div>
-    </div>
-    <div class="h-screen bg-white pt-6">
-        <div class="mb-6 text-black text-base text-center">
-                <a href="#">{{ auth()->guard('student')->user()->name }}</a>
-                <button class="px-1 pb-1 bg-red-500 text-white rounded hover:bg-red-600 ml-6">
-                    <a href="#" class="text-xs">Logout</a>
-                </button>
-        </div>
-    </div>
-</div>
-
 @endsection
diff --git a/resources/views/student/course/review.blade.php b/resources/views/student/course/review.blade.php
@@ -1,12 +1,6 @@
-@extends('layouts.app')
+@extends('layouts.studentcourse')
 
-@section('content')
-
-<div class="grid" style="grid-template-columns: 1fr 4fr 1fr;">
-    <div class="h-screen bg-white pt-6">
-        <div class="mb-12">
-            <img src="{{asset('img/logo.PNG')}}" alt="Klass" style="height: 55px;" class="mx-auto">
-        </div>
+@section('nav')
         <div class="text-center my-2">
             <button class="py-1 px-9 bg-white text-gray-300 rounded">
                 <a href="#" class="text-sm">Subject Matter</a>
@@ -22,8 +16,9 @@
                 <a href="#" class="text-sm">Review</a>
             </button>
         </div>
-    </div>
-    <div class="bg-gray-100 pt-7">
+@endsection
+
+@section('maincontent')
         <div class="container">
             <div class="flex flex-wrap flex-col md:flex-row items-center bg-white mt-2 mb-10 w-9/12 mx-auto rounded-lg">
                 <div class="flex flex-col xl:w-2/5 overflow-y-hidden lg:items-start pl-4">
@@ -60,15 +55,4 @@
                  </a>
             </div>
         </div>
-    </div>
-    <div class="h-screen bg-white pt-6">
-        <div class="mb-6 text-black text-base text-center">
-                <a href="#">{{ auth()->guard('student')->user()->name }}</a>
-                <button class="px-1 pb-1 bg-red-500 text-white rounded hover:bg-red-600 ml-6">
-                    <a href="#" class="text-xs">Logout</a>
-                </button>
-        </div>
-    </div>
-</div>
-
 @endsection
diff --git a/resources/views/student/course/subjectmatter.blade.php b/resources/views/student/course/subjectmatter.blade.php
@@ -1,12 +1,6 @@
-@extends('layouts.app')
+@extends('layouts.studentcourse')
 
-@section('content')
-
-<div class="grid" style="grid-template-columns: 1fr 4fr 1fr;">
-    <div class="h-screen bg-white pt-6">
-        <div class="mb-12">
-            <img src="{{asset('img/logo.PNG')}}" alt="Klass" style="height: 55px;" class="mx-auto">
-        </div>
+@section('nav')
         <div class="text-center my-2 border-r-2 border-blue-500">
             <button class="py-1 px-9 bg-white text-black rounded">
                 <a href="#" class="text-sm">Subject Matter</a>
@@ -22,8 +16,9 @@
                 <a href="#" class="text-sm">Review</a>
             </button>
         </div>
-    </div>
-    <div class="bg-gray-100 pt-7">
+@endsection
+
+@section('maincontent')
         <div class="container">
             <div class="flex flex-wrap flex-col md:flex-row items-center bg-white mt-2 mb-10 w-9/12 mx-auto rounded-lg">
                 <div class="flex flex-col xl:w-2/5 overflow-y-hidden lg:items-start pl-4">
@@ -62,15 +57,4 @@
                  </a>
             </div>
         </div>
-    </div>
-    <div class="h-screen bg-white pt-6">
-        <div class="mb-6 text-black text-base text-center">
-                <a href="#">{{ auth()->guard('student')->user()->name }}</a>
-                <button class="px-1 pb-1 bg-red-500 text-white rounded hover:bg-red-600 ml-6">
-                    <a href="#" class="text-xs">Logout</a>
-                </button>
-        </div>
-    </div>
-</div>
-
 @endsection
diff --git a/resources/views/student/dashboard.blade.php → ...es/views/student/home/dashboard.blade.php b/resources/views/student/dashboard.blade.php → ...es/views/student/home/dashboard.blade.php
@@ -1,24 +1,6 @@
-@extends('layouts.app')
+@extends('layouts.studenthome')
 
-@section('content')
-
-<div class="grid" style="grid-template-columns: 1fr 4fr 1fr;">
-    <div class="h-screen bg-white pt-6">
-        <div class="mb-6">
-            <img src="{{asset('img/logo.PNG')}}" alt="Klass" style="height: 55px;" class="mx-auto">
-        </div>
-        <div class="text-center mb-8">
-            <button class="py-1 px-9 bg-blue-500 text-white rounded hover:bg-blue-700">
-                <a href="#">Join a class</a>
-            </button>
-        </div>
-        <div class="text-center border-r-2 border-blue-500">
-            <button class="py-1 px-9 bg-white text-black rounded">
-                <a href="#" class="text-sm">My Class</a>
-            </button>
-        </div>
-    </div>
-    <div class="bg-gray-100 pt-7">
+@section('maincontent')
         <div class="container">
             <div class="mb-12 text-black text-4xl font-bold">
                 <h1 class="pl-12">My Class</h1>
@@ -64,15 +46,4 @@
                 </a>
             </div>
         </div>
-    </div>
-    <div class="h-screen bg-white pt-6">
-        <div class="mb-6 text-black text-base text-center">
-                <a href="#">{{ auth()->guard('student')->user()->name }}</a>
-                <button class="px-1 pb-1 bg-red-500 text-white rounded hover:bg-red-600 ml-6">
-                    <a href="#" class="text-xs">Logout</a>
-                </button>
-        </div>
-    </div>
-</div>
-
 @endsection