Skip to content

T
todo
Commit 08c19f04 by Krokovics Máté
Options

:update: I think it's complete

parent cdb8058a
Showing with 373 additions and 266 deletions
app/File.php 100644 → 100755
File mode changed from 100644 to 100755
app/Http/Controllers/Controller.php
...@@ -3,14 +3,21 @@ ...@@ -3,14 +3,21 @@
namespace App\Http\Controllers; namespace App\Http\Controllers;
use Illuminate\Foundation\Bus\DispatchesJobs; use Illuminate\Foundation\Bus\DispatchesJobs;
use Illuminate\Http\Request;
use Illuminate\Routing\Controller as BaseController; use Illuminate\Routing\Controller as BaseController;
use Illuminate\Foundation\Validation\ValidatesRequests; use Illuminate\Foundation\Validation\ValidatesRequests;
use Illuminate\Foundation\Auth\Access\AuthorizesRequests; use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
use Illuminate\Support\Carbon;
class Controller extends BaseController class Controller extends BaseController
{ {
use AuthorizesRequests, DispatchesJobs, ValidatesRequests; use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
public function __construct()
{
Carbon::setLocale(config('app.locale'));;
}
/** /**
* Patch data to model data if has matching data * Patch data to model data if has matching data
* *
......
app/Http/Controllers/FilesController.php 0 → 100644
<?php
namespace App\Http\Controllers;
use App\File;
class FilesController extends Controller
{
public function delete($id)
{
$file = File::where('id', '=', $id)->first();
if ($file->delete()) {
return redirect()->route('taskView', $file->task_id)->with(['success' => 'Sikeres fájl törlés törlés!']);
}
}
}
\ No newline at end of file
app/Http/Controllers/TasksController.php 100644 → 100755
<?php <?php
use App\Http\Controllers\Controller; namespace App\Http\Controllers;
use App\File;
use App\Task; use App\Task;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Cookie;
class TasksController extends Controller class TasksController extends Controller
{ {
public function list() public function list(Request $request)
{ {
$tasks = Task::all()->orderBy('done', 'ASC')->orderBy('created_at', 'DESC'); $query = $request->get('q');
$doneHidden = Cookie::get('done_hidden');
$tasks = Task::orderBy('done', 'ASC')->orderBy('done_date', 'DESC')->orderBy('created_at', 'DESC');
if($doneHidden) {
$tasks = $tasks->where('done', '=', 0);
}
if(!empty($query)){
$tasks = $tasks->where('title', 'LIKE', '%'.$query.'%')->orWhere('description', 'LIKE', '%'.$query.'%');
}
$tasks = $tasks->get();
return view('tasks.list')->with(compact('tasks')); return view('tasks.list')->with(compact('tasks'));
} }
public function view($id)
{
$task = Task::where('id', '=', $id)->with(['creator'])->first();
return view('tasks.view')->with(compact('task'));
}
public function create() public function create()
{ {
return view('tasks.create'); return view('tasks.create');
...@@ -24,27 +46,41 @@ class TasksController extends Controller ...@@ -24,27 +46,41 @@ class TasksController extends Controller
$this->validate($request, [ $this->validate($request, [
'title' => 'min:5|max:250|required', 'title' => 'min:5|max:250|required',
'description' => 'min:5|required', 'description' => 'min:5|required',
'time' => 'required',
'files.*' => 'nullable|mimes:pdf,xml,jpg|max:5120', 'files.*' => 'nullable|mimes:pdf,xml,jpg|max:5120',
]); ]);
$task = new Task(); $task = new Task;
$task->user_id = Auth::id(); $task->creator_id = Auth::id();
$task->title = $request->get('title'); $task->title = $request->get('title');
$task->description = $request->get('description'); $task->description = $request->get('description');
$task->time = $request->get('time');
$files = $request->get('files');
dd($files);
foreach ($files as $file){
$task->save();
if ($request->hasFile('files')) {
$files = $request->file('files');
foreach ($files as $file) {
$uploadFile = $file->getClientOriginalName();
$uploadFileName = pathinfo($uploadFile, PATHINFO_FILENAME);
$uploadFileExt = $file->getClientOriginalExtension();
$uploadFileToStore = $uploadFileName . '_' . mt_rand(1000, 9999) . time() . '.' . $uploadFileExt;
$path = $file->storeAs('public/upload/' . $task->id, $uploadFileToStore);
$uploadFile = new File();
$uploadFile->task_id = $task->id;
$uploadFile->name = $uploadFileToStore;
$uploadFile->path = 'upload/' . $task->id;
$uploadFile->data = json_encode($file->getFileInfo());
$uploadFile->ext = $uploadFileExt;
$errors = [];
if (!$uploadFile->save()) {
$errors[] = $uploadFile->id;
}
}
} }
if($task->save()){ return redirect()->route('taskView', $task->id)->with(['success' => 'Sikeres feladat felvétel']);
return redirect()->route('taskView', $task->id)->with(['success' => 'Sikeres feladat felvétel']);
}
} }
public function edit($id) public function edit($id)
...@@ -59,40 +95,77 @@ class TasksController extends Controller ...@@ -59,40 +95,77 @@ class TasksController extends Controller
$this->validate($request, [ $this->validate($request, [
'title' => 'min:5|max:250|required', 'title' => 'min:5|max:250|required',
'description' => 'min:5|required', 'description' => 'min:5|required',
'time' => 'required',
'files.*' => 'nullable|mimes:pdf,xml,jpg|max:5120', 'files.*' => 'nullable|mimes:pdf,xml,jpg|max:5120',
]); ]);
$task = Task::where('id', '=', $request->get('task_id'))->first(); $task = Task::where('id', '=', $request->get('task_id'))->first();
$task = $this->_patchEntity($task, $request); $task = $this->_patchEntity($task, $request);
if($task->save()){ $task->save();
return redirect()->route('tasks.update')->with(['success' => 'Sikeres feladat szerkesztés']);
if ($request->hasFile('files')) {
$files = $request->file('files');
foreach ($files as $file) {
$uploadFile = $file->getClientOriginalName();
$uploadFileName = pathinfo($uploadFile, PATHINFO_FILENAME);
$uploadFileExt = $file->getClientOriginalExtension();
$uploadFileToStore = $uploadFileName . '_' . mt_rand(1000, 9999) . time() . '.' . $uploadFileExt;
$path = $file->storeAs('public/upload/' . $task->id, $uploadFileToStore);
$uploadFile = new File();
$uploadFile->task_id = $task->id;
$uploadFile->name = $uploadFileToStore;
$uploadFile->path = 'upload/' . $task->id;
$uploadFile->data = json_encode($file->getFileInfo());
$uploadFile->ext = $uploadFileExt;
$errors = [];
if (!$uploadFile->save()) {
$errors[] = $uploadFile->id;
}
}
} }
return redirect()->route('taskView', $task->id)->with(['success' => 'Sikeres feladat szerkesztés']);
} }
public function close($id) public function close($id)
{ {
$task = Task::where('id', '=', $id)->first(); $task = Task::where('id', '=', $id)->first();
if($task->done == 0){ $task->done = 1;
$task->done = 1; $task->done_date = now();
$msg = 'Sikeres feladat lezárás';
} else {
$task->done = 0;
$msg = 'Sikeres feladat újranyitás';
}
if($task->save()){ if ($task->save()) {
return redirect()->back()->with(['success' => $msg]); return redirect()->back()->with(['success' => 'Sikeres feladat lezárás']);
} }
} }
public function delete($id) public function delete($id)
{ {
$task = Task::where('id', '=', $id); $task = Task::where('id', '=', $id)->first();
if($task->delete()){
return redirect()->back()->with(['success' => 'Sikeres feladat törlés!']); if (!empty($task->files)) {
foreach ($task->files as $file) {
$file->delete();
}
}
if ($task->delete()) {
return redirect()->route('taskList')->with(['success' => 'Sikeres feladat törlés!']);
} }
} }
public function hide(){
$hidden = Cookie::get('done_hidden');
if($hidden){
Cookie::queue('done_hidden', false, 60*24*7);
} else {
Cookie::queue('done_hidden', true, 60*24*7);
}
return redirect()->back();
}
} }
\ No newline at end of file
app/Task.php 100644 → 100755
File mode changed from 100644 to 100755
config/app.php
...@@ -78,7 +78,7 @@ return [ ...@@ -78,7 +78,7 @@ return [
| |
*/ */
'locale' => 'en', 'locale' => 'hu',
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
...@@ -91,7 +91,7 @@ return [ ...@@ -91,7 +91,7 @@ return [
| |
*/ */
'fallback_locale' => 'en', 'fallback_locale' => 'hu',
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
...@@ -211,7 +211,7 @@ return [ ...@@ -211,7 +211,7 @@ return [
'View' => Illuminate\Support\Facades\View::class, 'View' => Illuminate\Support\Facades\View::class,
'Form' => Collective\Html\FormFacade::class, 'Form' => Collective\Html\FormFacade::class,
'Html' => Collective\Html\HtmlFacade::class, 'Html' => Collective\Html\HtmlFacade::class,
'Carbon' => Illuminate\Support\Carbon::class,
], ],
]; ];
database/migrations/2018_08_10_115532_create_tasks_table.php 100644 → 100755
...@@ -17,9 +17,9 @@ class CreateTasksTable extends Migration ...@@ -17,9 +17,9 @@ class CreateTasksTable extends Migration
$table->increments('id'); $table->increments('id');
$table->unsignedInteger('creator_id'); $table->unsignedInteger('creator_id');
$table->foreign('creator_id')->references('id')->on('users'); $table->foreign('creator_id')->references('id')->on('users');
$table->timestamp('done_date')->nullable();
$table->string('title', 250); $table->string('title', 250);
$table->text('description'); $table->text('description');
$table->timestamp('time');
$table->integer('done')->default(0); $table->integer('done')->default(0);
$table->timestamps(); $table->timestamps();
}); });
......
database/migrations/2018_08_10_120053_create_files_table.php 100644 → 100755
...@@ -17,8 +17,9 @@ class CreateFilesTable extends Migration ...@@ -17,8 +17,9 @@ class CreateFilesTable extends Migration
$table->increments('id'); $table->increments('id');
$table->unsignedInteger('task_id'); $table->unsignedInteger('task_id');
$table->foreign('task_id')->references('id')->on('tasks'); $table->foreign('task_id')->references('id')->on('tasks');
$table->string('name', 255); $table->string('name', 250);
$table->string('ext', 4); $table->string('ext', 4);
$table->string('path', 500);
$table->json('data'); $table->json('data');
$table->timestamps(); $table->timestamps();
}); });
......
database/seeds/TasksTableSeeder.php 100644 → 100755
...@@ -13,18 +13,36 @@ class TasksTableSeeder extends Seeder ...@@ -13,18 +13,36 @@ class TasksTableSeeder extends Seeder
{ {
DB::table('tasks')->insert([ DB::table('tasks')->insert([
'creator_id' => 1, 'creator_id' => 1,
'title' => 'Teszt nem kész feladat', 'title' => 'Teszt kész feladat',
'description' => ' Donec in consectetur sem, vel sagittis risus. Cras commodo suscipit ex at rutrum. Ut eleifend mi nibh, vitae dapibus erat auctor non. Sed at arcu est. Cras nec auctor nulla, ac mattis nisi. Nunc fermentum commodo sem, a commodo mi sollicitudin at. Nam tempor dapibus neque, non laoreet mi blandit quis. Praesent semper diam hendrerit, bibendum nunc nec, luctus ligula. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aliquam vitae iaculis arcu, vel venenatis neque. Nullam gravida sodales neque, vitae accumsan nibh egestas vitae.', 'description' => ' Donec in consectetur sem, vel sagittis risus. Cras commodo suscipit ex at rutrum. Ut eleifend mi nibh, vitae dapibus erat auctor non. Sed at arcu est. Cras nec auctor nulla, ac mattis nisi. Nunc fermentum commodo sem, a commodo mi sollicitudin at. Nam tempor dapibus neque, non laoreet mi blandit quis. Praesent semper diam hendrerit, bibendum nunc nec, luctus ligula. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aliquam vitae iaculis arcu, vel venenatis neque. Nullam gravida sodales neque, vitae accumsan nibh egestas vitae.',
'time' => '2018-08-05 11:00:00', 'created_at' => '2018-08-01 09:15:00',
'done' => 1,
'done_date' => '2018-08-07 10:15:00'
]);
DB::table('tasks')->insert([
'creator_id' => 1,
'title' => 'Teszt nem kész feladat 2',
'description' => ' Donec in consectetur sem, vel sagittis risus. Cras commodo suscipit ex at rutrum. Ut eleifend mi nibh, vitae dapibus erat auctor non. Sed at arcu est. Cras nec auctor nulla, ac mattis nisi. Nunc fermentum commodo accumsan nibh egestas vitae.',
'created_at' => '2018-08-02 09:18:00',
'done' => 0, 'done' => 0,
]); ]);
DB::table('tasks')->insert([ DB::table('tasks')->insert([
'creator_id' => 1, 'creator_id' => 1,
'title' => 'Ez már egy kész teszt feladat', 'title' => 'Nem kész teszt feladat',
'description' => 'Ut sit amet egestas neque, et scelerisque est. Sed convallis elementum elit, in blandit enim tristique id. Fusce faucibus interdum elit, eu varius eros tincidunt at. Quisque vehicula at sem sit amet tristique. Curabitur posuere eu mauris vitae elementum. Proin dapibus scelerisque sem eget porta. Donec malesuada feugiat dolor, sit amet vestibulum mauris placerat id. Donec fringilla sem eu lacus imperdiet volutpat suscipit at sem. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Cras lacinia, dui in convallis placerat, leo massa cursus libero, at congue elit nulla at leo. Sed mollis viverra lacus, vitae porttitor justo varius non. Nam euismod et lectus id consequat. Vestibulum dapibus nec dui et molestie. ', 'description' => 'Ut sit amet egestas neque, et scelerisque est. Sed convallis elementum elit, in blandit enim tristique id. Fusce faucibus interdum elit, eu varius eros tincidunt at. Quisque vehicula at sem sit amet tristique. Curabitur posuere eu mauris vitae elementum. Proin dapibus scelerisque sem eget porta. Donec malesuada feugiat dolor, sit amet vestibulum mauris placerat id. Donec fringilla sem eu lacus imperdiet volutpat suscipit at sem. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Cras lacinia, dui in convallis placerat, leo massa cursus libero, at congue elit nulla at leo. Sed mollis viverra lacus, vitae porttitor justo varius non. Nam euismod et lectus id consequat. Vestibulum dapibus nec dui et molestie. ',
'time' => '2018-08-31 15:30:00', 'created_at' => '2018-08-14 09:15:00',
'done' => 0, 'done' => 0,
]); ]);
DB::table('tasks')->insert([
'creator_id' => 1,
'title' => 'Kész feladat ami mostanába lett kész',
'description' => 'Ut sit amet egestas neque, et scelerisque est. Sed convallis elementum elit, in blandit enim tristique id. Fusce faucibus interdum elit, eu varius eros tincidunt at. Quisque vehicula at sem sit amet tristique. Curabitur posuere eu mauris vitae elementum. Proin dapibus scelerisque sem eget porta. Donec malesuada feugiat dolor, sit amet vestibulum mauris placerat id. Donec fringilla sem eu lacus imperdiet volutpat suscipit at sem. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Cras lacinia, dui in convallis placerat, leo massa cursus libero, at congue elit nulla at leo. Sed mollis viverra lacus, vitae porttitor justo varius non. Nam euismod et lectus id consequat. Vestibulum dapibus nec dui et molestie. ',
'created_at' => '2018-08-08 14:34:00',
'done' => 1,
'done_date' => '2018-08-06 15:23:00'
]);
} }
} }
database/seeds/UsersTableSeeder.php 100644 → 100755
File mode changed from 100644 to 100755
resources/views/layouts/app.blade.php → resources/views/_layouts/app.blade.php
...@@ -22,54 +22,7 @@ ...@@ -22,54 +22,7 @@
</head> </head>
<body> <body>
<div id="app"> <div id="app">
<nav class="navbar navbar-expand-md navbar-light navbar-laravel"> @include('_widgets.menu')
<div class="container">
<a class="navbar-brand" href="{{ url('/') }}">
{{ config('app.name', 'Laravel') }}
</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="{{ __('Toggle navigation') }}">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<!-- Left Side Of Navbar -->
<ul class="navbar-nav mr-auto">
</ul>
<!-- Right Side Of Navbar -->
<ul class="navbar-nav ml-auto">
<!-- Authentication Links -->
@guest
<li class="nav-item">
<a class="nav-link" href="{{ route('login') }}">{{ __('Login') }}</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{{ route('register') }}">{{ __('Register') }}</a>
</li>
@else
<li class="nav-item dropdown">
<a id="navbarDropdown" class="nav-link dropdown-toggle" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" v-pre>
{{ Auth::user()->name }} <span class="caret"></span>
</a>
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
<a class="dropdown-item" href="{{ route('logout') }}"
onclick="event.preventDefault();
document.getElementById('logout-form').submit();">
{{ __('Logout') }}
</a>
<form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
@csrf
</form>
</div>
</li>
@endguest
</ul>
</div>
</div>
</nav>
<main class="py-4"> <main class="py-4">
@yield('content') @yield('content')
......
resources/views/_widgets/footer.blade.php deleted 100755 → 0
<footer class="footer">
<div class="container">
<a href="{{url('/adatvedelem')}}">Adatvédelmi nyilatkozat</a> |
<a href="{{url('/kapcsolat')}}">Kapcsolat</a>
</div>
</footer>
\ No newline at end of file
resources/views/_widgets/menu.blade.php
<nav class="navbar navbar-expand-lg navbar-light bg-light mb-2"> <nav class="navbar navbar-expand-md navbar-light navbar-laravel">
<div class="container"> <div class="container">
<a class="navbar-brand" href="{{ url('/') }}"> <a class="navbar-brand" href="{{ url('/home') }}">
MT<span class="text-success">OSzSz</span> {{ config('app.name', 'Laravel') }}
</a> </a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent"
aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation"> aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="{{ __('Mutasd a menüt') }}">
<span class="navbar-toggler-icon"></span> <span class="navbar-toggler-icon"></span>
</button> </button>
<div class="collapse navbar-collapse justify-content-end" id="navbarSupportedContent"> <div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav"> <ul class="navbar-nav mr-auto">
<li class="nav-item"><a href="{{url('/conferences')}}" class="nav-link">Konferenciák</a></li>
<li class="nav-item"><a href="{{url('/forum')}}" class="nav-link">Fórum</a></li> </ul>
<li class="nav-item"><a href="{{url('/articles')}}" class="nav-link">Hírek</a></li> <ul class="navbar-nav ml-auto">
@if (Auth::guest()) @guest
<li class="nav-item"><a href="{{ route('login') }}" class="nav-link text-success">Belépés</a></li> <li class="nav-item">
<li class="nav-item"><a href="{{ route('register') }}" class="nav-link text-success">Regisztráció</a></li> <a class="nav-link" href="{{ route('login') }}">{{ __('Belépés') }}</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{{ route('register') }}">{{ __('Regisztráció') }}</a>
</li>
@else @else
<li class="nav-item">
<a class="nav-link" href="{{ route('taskList') }}">{{ __('Feladatok') }}</a>
</li>
<li class="nav-item dropdown"> <li class="nav-item dropdown">
<a href="#" class="nav-link dropdown-toggle" id="navbarDropdownMenuLink" data-toggle="dropdown" <a id="navbarDropdown" class="nav-link dropdown-toggle" href="#" role="button" data-toggle="dropdown"
aria-haspopup="true" aria-expanded="false"> aria-haspopup="true" aria-expanded="false" v-pre>
{{ Auth::user()->name }} {{ Auth::user()->name }} <span class="caret"></span>
</a> </a>
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdownMenuLink">
<a href="{{route('profileShow', Auth::user()->id)}}" class="dropdown-item"> <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
Profilom <a class="dropdown-item" href="{{ route('logout') }}"
</a> onclick="event.preventDefault();
<a href="{{route('messageReceived')}}" class="dropdown-item"> document.getElementById('logout-form').submit();">
Privát üzeneteim {{ __('Kilépés') }}
</a>
<a href="{{ route('logout') }}" class="dropdown-item text-danger"
onclick="event.preventDefault();document.getElementById('logout-form').submit();">
Kilépés
</a> </a>
<form id="logout-form" action="{{ route('logout') }}" method="POST"
style="display: none;"> <form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
{{ csrf_field() }} @csrf
</form> </form>
</div> </div>
</li> </li>
@endif @endguest
</ul> </ul>
</div> </div>
</div> </div>
......
resources/views/_widgets/message-menu.blade.php deleted 100644 → 0
<div class="nav flex-column nav-pills" id="v-pills-tab" role="tablist" aria-orientation="vertical">
<a class="btn btn-success btn-block write" href="{{route('messageWrite')}}">Üzentírás</a>
<a class="nav-link active" href="{{route('messageReceived')}}">Beérkező</a>
<a class="nav-link" href="{{route('messageSent')}}">Elküldött</a>
<a class="nav-link" href="{{route('messageDeleted')}}">Törölt</a>
</div>
\ No newline at end of file
resources/views/_widgets/paginator.blade.php deleted 100755 → 0
<?php
// config
$link_limit = 7;
if (!empty(Request::only('q'))) $paginator->appends(Request::only('q'));
?>
<nav>
@if ($paginator->lastPage() > 1)
<ul class="pagination">
<li class="page-item {{ ($paginator->currentPage() == 1) ? ' disabled' : '' }}">
<a class="page-link" href="{{ $paginator->url(1) }}">First</a>
</li>
@for ($i = 1; $i <= $paginator->lastPage(); $i++)
<?php
$half_total_links = floor($link_limit / 2);
$from = $paginator->currentPage() - $half_total_links;
$to = $paginator->currentPage() + $half_total_links;
if ($paginator->currentPage() < $half_total_links) {
$to += $half_total_links - $paginator->currentPage();
}
if ($paginator->lastPage() - $paginator->currentPage() < $half_total_links) {
$from -= $half_total_links - ($paginator->lastPage() - $paginator->currentPage()) - 1;
}
?>
@if ($from < $i && $i < $to)
<li class="page-item {{ ($paginator->currentPage() == $i) ? ' active' : '' }}">
<a class="page-link" href="{{ $paginator->url($i) }}">{{ $i }}</a>
</li>
@endif
@endfor
<li class="page-item {{ ($paginator->currentPage() == $paginator->lastPage()) ? ' disabled' : '' }}">
<a class="page-link" href="{{ $paginator->url($paginator->lastPage()) }}">Last</a>
</li>
</ul>
@endif
</nav>
\ No newline at end of file
resources/views/_widgets/postlink.blade.php
<?php <?php
$post_id = uniqid() . '_' . md5(mt_rand()); $post_id = uniqid() . '_' . md5(mt_rand());
$submit_options = array_merge($submit['options'], ['onclick' => 'if (confirm("' . $submit['confirm'] . '")) { document.post_' . $post_id . '.submit(); } event.returnValue = false; return false;']) $submit_options = $submit['options'];
if (!empty($submit['confirm'])) {
$submit_options = array_merge($submit_options, ['onclick' => 'if (confirm("' . $submit['confirm'] . '")) { document
.post_' . $post_id . '.submit(); } event.returnValue = false; return false;']);
} else {
$submit_options = array_merge($submit_options, ['onclick' => 'document.post_' . $post_id . '.submit(); event.returnValue =
false; return false;']);
}
?> ?>
{!! Form::open(['action' => $action, 'method' => 'POST', 'class' => 'd-inline', 'name' => 'post_'.$post_id]) !!} {!! Form::open(['action' => $action, 'method' => 'POST', 'class' => 'd-inline', 'name' => 'post_'.$post_id]) !!}
{{Form::hidden('_method', $method)}} {{Form::hidden('_method', $method)}}
......
resources/views/auth/login.blade.php
@extends('layouts.app') @extends('_layouts.app')
@section('content') @section('content')
<div class="container"> <div class="container">
......
resources/views/auth/passwords/email.blade.php
@extends('layouts.app') @extends('_layouts.app')
@section('content') @section('content')
<div class="container"> <div class="container">
......
resources/views/auth/passwords/reset.blade.php
@extends('layouts.app') @extends('_layouts.app')
@section('content') @section('content')
<div class="container"> <div class="container">
......
resources/views/auth/register.blade.php
@extends('layouts.app') @extends('_layouts.app')
@section('content') @section('content')
<div class="container"> <div class="container">
......
resources/views/home.blade.php
@extends('layouts.app') @extends('_layouts.app')
@section('content') @section('content')
<div class="container"> <div class="container">
<div class="row justify-content-center"> <div class="row justify-content-center">
<div class="col-md-8"> <div class="col-md-8">
<div class="card"> <div class="card">
<div class="card-header">Dashboard</div> <div class="card-header">Belépett felület</div>
<div class="card-body"> <div class="card-body">
@if (session('status')) @if (session('status'))
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</div> </div>
@endif @endif
You are logged in! Bevagy lépve!
</div> </div>
</div> </div>
</div> </div>
......
resources/views/tasks/create.blade.php 100644 → 100755
@extends('layouts.app') @extends('_layouts.app')
@section('content') @section('content')
<div class="container"> <div class="container">
<table id="mytable" class="table table-striped"> <h2>{{__('Új feladat létrehozása')}}</h2>
<thead> @include('_widgets.messages')
<tr> {!! Form::open(['action' => ['TasksController@store'], 'method' => 'POST', 'enctype' => 'multipart/form-data']) !!}
<th>First Name</th> <div class="row form-group align-items-center">
<th>Last Name</th> <div class="col-sm-5 col-xs-6 text">{{__('Cím')}}</div>
<th>Address</th> <div class="col-sm-7 col-xs-6 ">
<th>Email</th> <input type="text" name="title" class="form-control">
<th>Contact</th> </div>
<th colspan="2"></th> </div>
</tr> <div class="row form-group align-items-center">
</thead> <div class="col-sm-5 col-xs-6 text">Leírás:</div>
<tbody> <div class="col-sm-7 col-xs-6 ">
@foreach($tasks as $task) <textarea name="description" class="form-control" rows="3"></textarea>
<tr> </div>
<td>{{$task->title}}</td> </div>
<td>{{$task->time}}</td> <div class="form-group">
<td>{{$task->created_at}}</td> {{Form::file('files[]', ['multiple' => true])}}
<td> </div>
<p data-placement="top" data-toggle="tooltip" title="Edit"> {{Form::hidden('_method', 'POST')}}
<a href="{{route('taskView', $task-id)}}">Megtekintés</a> <div class="text-center">
<a href="{{route('taskEdit', $task->id)}}"></a> {{Form::submit('Mentés', ['class' => 'btn btn-success'])}}
<button class="btn btn-primary btn-xs" data-title="Edit" data-toggle="modal" data-target="#edit"><span </div>
class="glyphicon glyphicon-pencil"></span></button> {!! Form::close() !!}
</p>
</td>
</tr>
@endforeach
</tbody>
</table>
</div> </div>
@endsection @endsection
resources/views/tasks/edit.blade.php 100644 → 100755
@extends('layouts.app') @extends('_layouts.app')
@section('content') @section('content')
<div class="container"> <div class="container">
<div class="row justify-content-center"> <h2>{{__('Feladat szerkesztése')}}</h2>
<div class="col-md-8"> @include('_widgets.messages')
<div class="card"> {!! Form::open(['action' => ['TasksController@update'], 'method' => 'POST', 'enctype' => 'multipart/form-data']) !!}
<div class="card-header">Dashboard</div> {{ Form::hidden('task_id', $task->id) }}
<div class="row form-group align-items-center">
<div class="card-body"> <div class="col-sm-5 col-xs-6 text">{{__('Cím')}}</div>
@if (session('status')) <div class="col-sm-7 col-xs-6 ">
<div class="alert alert-success" role="alert"> <input type="text" name="title" value="{{$task->title}}" class="form-control">
{{ session('status') }} </div>
</div> </div>
@endif <div class="row form-group align-items-center">
<div class="col-sm-5 col-xs-6 text">Leírás:</div>
You are logged in! <div class="col-sm-7 col-xs-6 ">
</div> <textarea name="description" class="form-control" rows="3">{{$task->description}}</textarea>
</div>
</div> </div>
</div> </div>
<div class="form-group">
{{Form::file('files[]', ['multiple' => true])}}
@if(!$task->files->isEmpty())
<h4 class="mt-4 mb-2">{{__('Eddig feltöltött fájlok')}}</h4>
<ul class="list-group">
@foreach($task->files as $file)
<li class="list-group-item">{{$file->name}}</li>
@endforeach
</ul>
@endif
</div>
{{Form::hidden('_method', 'PUT')}}
<div class="text-center">
{{Form::submit('Mentés', ['class' => 'btn btn-success'])}}
</div>
{!! Form::close() !!}
</div> </div>
@endsection @endsection
resources/views/tasks/list.blade.php 100644 → 100755
@extends('layouts.app') @extends('_layouts.app')
@section('content') @section('content')
<div class="container"> <div class="container">
<table id="mytable" class="table table-striped"> <div class="text-right">
<a href="{{route('taskCreate')}}" class="btn btn-primary mb-2">{{__('Új feladat')}}</a>
</div>
<div class="row">
<div class="col-sm-12">
<a href="{{route('taskHide')}}" class="btn btn-outline-info">Lezártak mutatása / elrejtése</a>
</div>
</div>
@include('_widgets.search')
<table id="mytable" class="table table-sm">
<thead> <thead>
<tr> <tr>
<th>First Name</th> <th>{{ __('Cím') }}</th>
<th>Last Name</th> <th colspan="2">{{ __('Létrehozva')}}</th>
<th>Address</th> <th colspan="2">{{ __('Lezárva')}}</th>
<th>Email</th> <th></th>
<th>Contact</th>
<th colspan="2"></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@foreach($tasks as $task) @foreach($tasks as $task)
<tr> <tr class="{{$task->done ? 'table-success' : ''}}">
<td>{{$task->title}}</td> <td class="align-middle">{{$task->title}}</td>
<td>{{$task->time}}</td> <td class="align-middle">{{Carbon::parse($task->created_at)->diffForHumans()}}</td>
<td>{{$task->created_at}}</td> <td class="align-middle">{{$task->created_at}}</td>
<td> <td class="align-middle">{{$task->done ? Carbon::parse($task->done_date)->diffForHumans() : '-'}}</td>
<p data-placement="top" data-toggle="tooltip" title="Edit"> <td class="align-middle">{{$task->done_date}}</td>
<a href="{{route('taskView', $task-id)}}">Megtekintés</a> <td class="text-right align-middle">
<a href="{{route('taskEdit', $task->id)}}"></a> <a href="{{route('taskView', $task->id)}}"
<button class="btn btn-primary btn-xs" data-title="Edit" data-toggle="modal" data-target="#edit"><span class="btn btn-sm btn-outline-primary">{{__('Megtekintés')}}</a>
class="glyphicon glyphicon-pencil"></span></button> <a href="{{route('taskEdit', $task->id)}}"
</p> class="btn btn-sm btn-outline-warning">{{__('Szerkesztés')}}</a>
</td> </td>
</tr> </tr>
@endforeach @endforeach
......
resources/views/tasks/view.blade.php 100644 → 100755
@extends('layouts.app') @extends('_layouts.app')
@section('content') @section('content')
<div class="container"> <div class="container">
<div class="row justify-content-center"> <div class="card {{ $task->done ? 'border-success' : '' }}">
<div class="col-md-8"> <div class="card-header bg-success text-white">
<div class="card"> <h2>{{$task->title}}</h2>
<div class="card-header">Dashboard</div> </div>
<div class="card-body">
<div class="card-body"> <div class="row">
@if (session('status')) <div class="col-sm-6">
<div class="alert alert-success" role="alert"> @include('_widgets.postlink', [
{{ session('status') }} 'action' => ['TasksController@delete', $task->id],
</div> 'method' => 'DELETE',
'submit' => [
'label' => 'Törlés',
'confirm' => 'Biztos hogy törlöd a taskot? (A művelet nem visszavonható!)',
'options' => ['class' => 'btn btn-sm btn-danger']
]
])
<a href="{{route('taskEdit', $task->id)}}" class="btn btn-sm btn-warning">{{__('Szerkesztés')}}</a>
</div>
<div class="col-sm-6 text-right">
@if($task->done == 0)
@include('_widgets.postlink', [
'action' => ['TasksController@close', $task->id],
'method' => 'PATCH',
'submit' => [
'label' => __('Kész'),
'options' => ['class' => 'btn btn-lg btn-outline-info']
]
])
@else
<h3>Lezárva!</h3>
@endif @endif
You are logged in!
</div> </div>
</div> </div>
<div class="row">
<div class="col-sm-3"><strong>Cím:</strong></div>
<div class="col-sm-9">{{$task->title}}</div>
</div>
<div class="row">
<div class="col-sm-3"><strong>Leírás:</strong></div>
<div class="col-sm-9">{{$task->description}}</div>
</div>
<div class="row">
<div class="col-sm-3"><strong>Létrehozva:</strong></div>
<div class="col-sm-9">{{$task->created_at}}</div>
</div>
<div class="row">
<div class="col-sm-3"><strong>Létrehozó:</strong></div>
<div class="col-sm-9">{{$task->creator->name}}</div>
</div>
@if(!$task->files->isEmpty())
<h3 class="mt-3 mb-2">Csatolt Fájlok</h3>
<ul class="list-group">
@foreach($task->files as $file)
<li class="list-group-item">
<div class="row">
<div class="col-sm-8">{{$file->name}}</div>
<div class="col-sm-4 text-right">
@include('_widgets.postlink', [
'action' => ['FilesController@delete', $file->id],
'method' => 'DELETE',
'submit' => [
'label' => 'Törlés',
'confirm' => 'Biztos hogy törlöd a fájlt? (A művelet nem visszavonható!)',
'options' => ['class' => 'btn btn-sm btn-danger']
]
])
<a href="{{url('/storage/'.$file->path.'/'.$file->name)}}" download class="btn
btn-sm
btn-primary">{{ __('Letöltés') }}</a>
</div>
</div>
</li>
@endforeach
</ul>
@endif
</div> </div>
</div> </div>
</div> </div>
......
resources/views/welcome.blade.php
...@@ -69,25 +69,21 @@ ...@@ -69,25 +69,21 @@
@if (Route::has('login')) @if (Route::has('login'))
<div class="top-right links"> <div class="top-right links">
@auth @auth
<a href="{{ url('/home') }}">Home</a> <a href="{{ url('/home') }}">Főoldal</a>
@else @else
<a href="{{ route('login') }}">Login</a> <a href="{{ route('login') }}">Belépés</a>
<a href="{{ route('register') }}">Register</a> <a href="{{ route('register') }}">Regisztráció</a>
@endauth @endauth
</div> </div>
@endif @endif
<div class="content"> <div class="content">
<div class="title m-b-md"> <div class="title m-b-md">
Laravel TO-DO Alkalmazás
</div> </div>
<div class="links"> <div class="links">
<a href="https://laravel.com/docs">Documentation</a>
<a href="https://laracasts.com">Laracasts</a>
<a href="https://laravel-news.com">News</a>
<a href="https://forge.laravel.com">Forge</a>
<a href="https://github.com/laravel/laravel">GitHub</a>
</div> </div>
</div> </div>
</div> </div>
......
routes/web.php
...@@ -21,9 +21,12 @@ Route::get('/home', 'HomeController@index')->name('home'); ...@@ -21,9 +21,12 @@ Route::get('/home', 'HomeController@index')->name('home');
Route::get('/tasks', 'TasksController@list')->name('taskList')->middleware('auth'); Route::get('/tasks', 'TasksController@list')->name('taskList')->middleware('auth');
Route::get('/task/create', 'TasksController@create')->name('taskCreate')->middleware('auth'); Route::get('/task/create', 'TasksController@create')->name('taskCreate')->middleware('auth');
Route::post('/task/store', 'TasksController@strore')->name('taskStore')->middleware('auth'); Route::post('/task/store', 'TasksController@store')->name('taskStore')->middleware('auth');
Route::get('/task/edit/{id}', 'TasksController@edit')->name('taskEdit')->middleware('auth'); Route::get('/task/edit/{id}', 'TasksController@edit')->name('taskEdit')->middleware('auth');
Route::put('/task/update', 'TasksController@update')->name('taskUpdate')->middleware('auth'); Route::put('/task/update', 'TasksController@update')->name('taskUpdate')->middleware('auth');
Route::patch('/task/change-status/{id}', 'TasksController@changeStatus')->name('taskChangeStatus')->middleware('auth'); Route::patch('/task/close/{id}', 'TasksController@close')->name('taskClose')->middleware('auth');
Route::delete('/task/delete/{id}', 'TasksController@delete')->name('taskdelete')->middleware('auth'); Route::delete('/task/delete/{id}', 'TasksController@delete')->name('taskdelete')->middleware('auth');
Route::get('/task/{id}', 'TasksController@view')->name('tasksiew')->middleware('auth'); Route::get('/task/hide', 'TasksController@hide')->name('taskHide')->middleware('auth');
\ No newline at end of file Route::get('/task/{id}', 'TasksController@view')->name('taskView')->middleware('auth');
Route::delete('/file/delete/{id}', 'FilesController@delete')->name('fileDelete')->middleware('auth');
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment