Skip to content

Commit

Permalink
Merge pull request #8 from khasyah-fr/master
Browse files Browse the repository at this point in the history
Subject matter and task page
  • Loading branch information
danivideda authored Dec 2, 2020
2 parents bcb90a7 + a4a6833 commit 3c1178a
Show file tree
Hide file tree
Showing 16 changed files with 201 additions and 191 deletions.
44 changes: 44 additions & 0 deletions resources/views/layouts/class.blade.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
@extends('layouts.app')

@section('content')

<nav class="py-6 bg-white border-b-4 border-gray-300">
<div class="container mx-auto flex justify-between">
<ul class="flex items-center">
<li>
<a href="/" class="text-gray-400 hover:text-black">
Back to Class
</a>
</li>
</ul>
<ul class="flex items-center">
@if (auth('student')->check())
<li>
<a href="/" class="p-3 mr-4 text-base text-black">{{ auth('student')->user()->name }}</a>
</li>
<li>
<form action="/" method="post" class="inline p-3 text-white bg-red-500 rounded hover:bg-red-700">
@csrf
<button type="submit">Logout</button>
</form>
</li>
@elseif (auth('teacher')->check())
<li>
<a href="/" class="p-3 mr-4 text-base text-black">{{ auth('teacher')->user()->name }}</a>
</li>
<li>
<form action="/" method="post" class="inline p-3 text-white bg-red-500 rounded hover:bg-red-700">
@csrf
<button type="submit">Logout</button>
</form>
</li>
@endif
</ul>
</div>
</nav>

<div class="container w-full mx-auto">
@yield('maincontent')
</div>

@endsection
2 changes: 1 addition & 1 deletion resources/views/layouts/teachercourse.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</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>
<a href="#">{{ auth()->guard('teacher')->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>
Expand Down
14 changes: 14 additions & 0 deletions resources/views/student/class/subjectmatter.blade.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
@extends('layouts.class')

@section('maincontent')

<div class="flex flex-col container w-4/6 mx-auto my-4 py-8 px-16 border-4 border-gray-100">
<h1 class="text-4xl font-bold mx-auto mb-12">Test</h1>
<iframe class="mx-auto mb-16" width="720" height="405" src="https://www.youtube.com/embed/gGGPTskb7c8">
</iframe>
<div class="mx-auto" style="width: 720px;">
<p class="text-xl">Lorem ipsum dolor sit amet</p>
</div>
</div>

@endsection
46 changes: 46 additions & 0 deletions resources/views/student/class/task.blade.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
@extends('layouts.class')

@section('maincontent')

<div class="flex flex-col container w-5/6 mx-auto my-4 py-8 px-16 border-2 border-gray-100 gap-4">
<div class="text-center">
<h1 class="text-2xl bg-gray-50 font-bold mx-auto py-4">Task1</h1>
</div>
<div class="flex flex-row gap-4">
<div class="bg-gray-50 w-1/3 h-full">
<div class="mx-auto text-center w-1/2 py-2">
<h1 class="text-base py-1 bg-blue-500 text-white rounded-lg">Question List</h1>
</div>
<div class="px-3 py-3" style="display: grid; grid-template-columns: repeat(5, 1fr); grid-template-rows: repeat(2, 1fr); grid-column-gap: 12px; grid-row-gap: 12px;">
<div class="text-center bg-blue-500 p-2 rounded-md text-white" style="grid-area: 1 / 1 / 2 / 2;">
<h1 class="text-sm font-bold">1</h1>
</div>
</div>
</div>
<div class="bg-gray-50 w-2/3">
<div class="mx-auto py-4 px-6">
<h1 class="text-xl font-bold">Question:</h1>
</div>
<div class="mx-auto px-6">
<p class="text-base mb-4">Task Test 123</p>
<form action="" method="POST">
@csrf
<div class="mb-4">
<textarea name="answer" id="answer" cols="70" rows="10" class="bg-gray-50 border-2 border-gray-300 py-4 px-4 rounded-lg @error('answer') border-red-500 @enderror" value="{{ old('answer') }}">
</textarea>
@error('answer')
<div class="text-red-500 mt-2 text-base">
{{ $message }}
</div>
@enderror
</div>
<div class="flex justify-end mr-6">
<button type="submit" class="bg-green-500 text-white px-4 py-3 rounded font-medium w-24 hover:bg-green-600">Finish</button>
</div>
</form>
</div>
</div>
</div>
</div>

@endsection
31 changes: 6 additions & 25 deletions resources/views/student/course/assignment.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
<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>
<h1 class="text-xl text-black text-left mb-4">Pemrograman</h1>
<h1 class="text-sm text-blacktext-left">Melati</h1>
<p class="text-sm text-left">SMAN 8 Jogja</p>
</div>
<div class="xl:w-3/5 overflow-y-hidden rounded-lg">
<img class="w-full rounded-lg" src="{{asset('img/logo.PNG')}}">
Expand All @@ -34,31 +34,12 @@
<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 class="bg-white w-9/12 mx-auto my-6 rounded flex border-2 hover:border-gray-600">
<h1 class="text-black text-base w-9/12 px-4 py-4">Task1</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>
</div>
@endsection
29 changes: 7 additions & 22 deletions resources/views/student/course/review.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
<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>
<h1 class="text-xl text-black text-left mb-4">Pemrograman</h1>
<h1 class="text-sm text-blacktext-left">Melati</h1>
<p class="text-sm text-left">SMAN 8 Jogja</p>
</div>
<div class="xl:w-3/5 overflow-y-hidden rounded-lg">
<img class="w-full rounded-lg" src="{{asset('img/logo.PNG')}}">
Expand All @@ -34,25 +34,10 @@
<div class="my-4 text-black text-xl font-bold mx-auto w-9/12">
<h1>Review :</h1>
</div>

<a href="#">
<div class="bg-white w-9/12 mx-auto my-6 rounded flex">
<h1 class="text-black text-base w-11/12 px-4 py-4">Lorem ipsum dolor sit amet consectetur.</h1>
<h1 class="text-black text-small italic font-bold w-1/12 bg-gray-200 px-4 py-4">78</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-11/12 px-4 py-4">Lorem ipsum dolor sit amet consectetur.</h1>
<h1 class="text-black text-small italic font-bold w-1/12 bg-gray-200 px-4 py-4">82</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-11/12 px-4 py-4">Lorem ipsum dolor sit amet consectetur.</h1>
<h1 class="text-black text-small italic font-bold w-1/12 bg-gray-200 px-4 py-4">91</h1>
</div>
</a>
<div class="bg-white w-9/12 mx-auto my-6 rounded flex border-2 hover:border-gray-300">
<h1 class="text-black text-base w-11/12 px-4 py-4">Task1</h1>
<h1 class="text-black text-small italic font-bold w-1/12 bg-gray-200 px-4 py-4">00</h1>
</div>
</div>
</div>
@endsection
25 changes: 5 additions & 20 deletions resources/views/student/course/subjectmatter.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
<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>
<h1 class="text-xl text-black text-left mb-4">Pemrograman</h1>
<h1 class="text-sm text-blacktext-left">Melati</h1>
<p class="text-sm text-left">SMAN 8 Jogja</p>
</div>
<div class="xl:w-3/5 overflow-y-hidden rounded-lg">
<img class="w-full rounded-lg" src="{{asset('img/logo.PNG')}}">
Expand All @@ -36,25 +36,10 @@
</div>

<a href="#">
<div class="bg-white w-9/12 mx-auto px-4 py-4 my-6 rounded">
<h1 class="text-black text-base italic">Basics of Digital Image and their applications</h1>
<div class="bg-white w-9/12 mx-auto px-4 py-4 my-6 rounded border-2 hover:border-gray-600">
<h1 class="text-black text-base italic">Test</h1>
</div>
</a>
<a href="#">
<div class="bg-white w-9/12 mx-auto px-4 py-4 my-6 rounded">
<h1 class="text-black text-base italic">Pixel-Based Image Processing</h1>
</div>
</a>
<a href="#">
<div class="bg-white w-9/12 mx-auto px-4 py-4 my-6 rounded">
<h1 class="text-black text-base italic">Image Enhancement using Filtering</h1>
</div>
</a>
<a href="#">
<div class="bg-white w-9/12 mx-auto px-4 py-4 my-6 rounded">
<h1 class="text-black text-base italic">Morphological Processing and Feature Extraction</h1>
</div>
</a>
</div>
</div>
@endsection
34 changes: 4 additions & 30 deletions resources/views/student/home/dashboard.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,37 +7,11 @@
</div>
<div class="container w-full">
<a href="#">
<div class="flex flex-wrap flex-col md:flex-row items-center bg-white my-8 w-9/12 mx-auto rounded-lg">
<div class="flex flex-wrap flex-col md:flex-row items-center bg-white my-8 w-9/12 mx-auto rounded-lg border-2 hover:border-gray-600">
<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>
</a>

<a href="#">
<div class="flex flex-wrap flex-col md:flex-row items-center bg-white my-8 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">Pengembangan Perangkat Lunak</h1>
<h1 class="text-sm text-blacktext-left">Azhari SN, MT</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>
</a>

<a href="#">
<div class="flex flex-wrap flex-col md:flex-row items-center bg-white my-8 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">Serverless Architecture</h1>
<h1 class="text-sm text-blacktext-left">Giri Kuncoro</h1>
<p class="text-sm text-left">CNCF Ambassador</p>
<h1 class="text-xl text-black text-left mb-4">Pemrograman</h1>
<h1 class="text-sm text-blacktext-left">Melati</h1>
<p class="text-sm text-left">SMAN 8 Jogja</p>
</div>
<div class="xl:w-3/5 overflow-y-hidden rounded-lg">
<img class="w-full rounded-lg" src="{{asset('img/logo.PNG')}}">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@extends('layouts.studentcourse')
@extends('layouts.teachercourse')

@section('nav')
<div class="text-center my-2 border-r-2 border-blue-500">
Expand Down
4 changes: 0 additions & 4 deletions resources/views/teacher/class/createtask.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,6 @@ class="bg-gray-100 border-2 border-blue-400 mt-4 py-4 px-4 rounded-lg @error('es
</div>
@enderror
</div>

<div>
<label for="deadline" class="tracking-wide text-gray text-base font-bold pb-4">Deadline :</label>
</div>

<div>
<button type="submit" class="bg-green-400 text-white px-4 py-3 rounded font-medium w-20 hover:bg-green-500">Create</button>
Expand Down
45 changes: 45 additions & 0 deletions resources/views/teacher/class/inputtask.blade.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
@extends('layouts.class')

@section('maincontent')

<div class="flex flex-col container w-5/6 mx-auto my-4 py-8 px-16 border-2 border-gray-100 gap-4">
<div class="text-center">
<h1 class="text-2xl bg-gray-50 font-bold mx-auto py-4">Task1</h1>
</div>
<div class="flex flex-row gap-4">
<div class="bg-gray-50 w-1/3 h-full">
<div class="mx-auto text-center w-1/2 py-2">
<h1 class="text-base py-1 bg-blue-500 text-white rounded-lg">Question List</h1>
</div>
<div class="px-3 py-3" style="display: grid; grid-template-columns: repeat(5, 1fr); grid-template-rows: repeat(2, 1fr); grid-column-gap: 12px; grid-row-gap: 12px;">
<div class="text-center bg-blue-500 p-2 rounded-md text-white" style="grid-area: 1 / 1 / 2 / 2;">
<h1 class="text-sm font-bold">1</h1>
</div>
</div>
</div>
<div class="bg-gray-50 w-2/3">
<div class="mx-auto py-4 px-6">
<h1 class="text-xl font-bold">Input the question:</h1>
</div>
<div class="mx-auto px-6">
<form action="" method="POST">
@csrf
<div class="mb-4">
<textarea name="question" id="question" cols="70" rows="10" class="bg-gray-50 border-2 border-gray-300 py-4 px-4 rounded-lg @error('question') border-red-500 @enderror" value="{{ old('question') }}">
</textarea>
@error('question')
<div class="text-red-500 mt-2 text-base">
{{ $message }}
</div>
@enderror
</div>
<div class="flex justify-end mr-6">
<button type="submit" class="bg-green-500 text-white px-4 py-3 rounded font-medium w-24 hover:bg-green-600">Finish</button>
</div>
</form>
</div>
</div>
</div>
</div>

@endsection
Loading

0 comments on commit 3c1178a

Please sign in to comment.