Skip to content

T
todo
Commit 59163a6d by Krokovics Máté
Options

:update: Changing some text, and make some hotfix

parent 707f5b5a
Showing with 29 additions and 24 deletions
app/Http/Controllers/FilesController.php
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
namespace App\Http\Controllers; namespace App\Http\Controllers;
use App\File; use App\File;
use Illuminate\Support\Facades\Storage;
class FilesController extends Controller class FilesController extends Controller
{ {
...@@ -15,6 +16,7 @@ class FilesController extends Controller ...@@ -15,6 +16,7 @@ class FilesController extends Controller
public function delete($id) public function delete($id)
{ {
$file = File::where('id', '=', $id)->first(); $file = File::where('id', '=', $id)->first();
Storage::delete('public/' . $file->path . '/' . $file->name);
if ($file->delete()) { if ($file->delete()) {
return redirect()->route('taskView', $file->task_id)->with(['success' => 'Sikeres fájl törlés törlés!']); return redirect()->route('taskView', $file->task_id)->with(['success' => 'Sikeres fájl törlés törlés!']);
......
app/Http/Controllers/TasksController.php
...@@ -7,6 +7,7 @@ use App\Task; ...@@ -7,6 +7,7 @@ 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; use Illuminate\Support\Facades\Cookie;
use Illuminate\Support\Facades\Storage;
class TasksController extends Controller class TasksController extends Controller
{ {
...@@ -196,6 +197,7 @@ class TasksController extends Controller ...@@ -196,6 +197,7 @@ class TasksController extends Controller
if (!empty($task->files)) { if (!empty($task->files)) {
foreach ($task->files as $file) { foreach ($task->files as $file) {
$file->delete(); $file->delete();
Storage::delete('public/' . $file->path . '/' . $file->name);
} }
} }
......
resources/views/auth/login.blade.php
...@@ -5,14 +5,14 @@ ...@@ -5,14 +5,14 @@
<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">{{ __('Login') }}</div> <div class="card-header">{{ __('Belépés') }}</div>
<div class="card-body"> <div class="card-body">
<form method="POST" action="{{ route('login') }}" aria-label="{{ __('Login') }}"> <form method="POST" action="{{ route('login') }}" aria-label="{{ __('Belépés') }}">
@csrf @csrf
<div class="form-group row"> <div class="form-group row">
<label for="email" class="col-sm-4 col-form-label text-md-right">{{ __('E-Mail Address') }}</label> <label for="email" class="col-sm-4 col-form-label text-md-right">{{ __('E-mail cím') }}</label>
<div class="col-md-6"> <div class="col-md-6">
<input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ old('email') }}" required autofocus> <input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ old('email') }}" required autofocus>
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
</div> </div>
<div class="form-group row"> <div class="form-group row">
<label for="password" class="col-md-4 col-form-label text-md-right">{{ __('Password') }}</label> <label for="password" class="col-md-4 col-form-label text-md-right">{{ __('Jelszó') }}</label>
<div class="col-md-6"> <div class="col-md-6">
<input id="password" type="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" name="password" required> <input id="password" type="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" name="password" required>
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
<input class="form-check-input" type="checkbox" name="remember" id="remember" {{ old('remember') ? 'checked' : '' }}> <input class="form-check-input" type="checkbox" name="remember" id="remember" {{ old('remember') ? 'checked' : '' }}>
<label class="form-check-label" for="remember"> <label class="form-check-label" for="remember">
{{ __('Remember Me') }} {{ __('Emlékezz rám') }}
</label> </label>
</div> </div>
</div> </div>
...@@ -54,11 +54,11 @@ ...@@ -54,11 +54,11 @@
<div class="form-group row mb-0"> <div class="form-group row mb-0">
<div class="col-md-8 offset-md-4"> <div class="col-md-8 offset-md-4">
<button type="submit" class="btn btn-primary"> <button type="submit" class="btn btn-primary">
{{ __('Login') }} {{ __('Belépés') }}
</button> </button>
<a class="btn btn-link" href="{{ route('password.request') }}"> <a class="btn btn-link" href="{{ route('password.request') }}">
{{ __('Forgot Your Password?') }} {{ __('Elfelejtetted a jelszavad?') }}
</a> </a>
</div> </div>
</div> </div>
......
resources/views/auth/passwords/email.blade.php
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<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">{{ __('Reset Password') }}</div> <div class="card-header">{{ __('Elfelejtett jelszó') }}</div>
<div class="card-body"> <div class="card-body">
@if (session('status')) @if (session('status'))
...@@ -14,11 +14,11 @@ ...@@ -14,11 +14,11 @@
</div> </div>
@endif @endif
<form method="POST" action="{{ route('password.email') }}" aria-label="{{ __('Reset Password') }}"> <form method="POST" action="{{ route('password.email') }}" aria-label="{{ __('Elfelejtett jelszó') }}">
@csrf @csrf
<div class="form-group row"> <div class="form-group row">
<label for="email" class="col-md-4 col-form-label text-md-right">{{ __('E-Mail Address') }}</label> <label for="email" class="col-md-4 col-form-label text-md-right">{{ __('E-mail cím') }}</label>
<div class="col-md-6"> <div class="col-md-6">
<input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ old('email') }}" required> <input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ old('email') }}" required>
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
<div class="form-group row mb-0"> <div class="form-group row mb-0">
<div class="col-md-6 offset-md-4"> <div class="col-md-6 offset-md-4">
<button type="submit" class="btn btn-primary"> <button type="submit" class="btn btn-primary">
{{ __('Send Password Reset Link') }} {{ __('Jelszó változtató link küldése') }}
</button> </button>
</div> </div>
</div> </div>
......
resources/views/auth/passwords/reset.blade.php
...@@ -5,16 +5,16 @@ ...@@ -5,16 +5,16 @@
<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">{{ __('Reset Password') }}</div> <div class="card-header">{{ __('Jelszó változtatás') }}</div>
<div class="card-body"> <div class="card-body">
<form method="POST" action="{{ route('password.request') }}" aria-label="{{ __('Reset Password') }}"> <form method="POST" action="{{ route('password.request') }}" aria-label="{{ __('Jelszó változtatás') }}">
@csrf @csrf
<input type="hidden" name="token" value="{{ $token }}"> <input type="hidden" name="token" value="{{ $token }}">
<div class="form-group row"> <div class="form-group row">
<label for="email" class="col-md-4 col-form-label text-md-right">{{ __('E-Mail Address') }}</label> <label for="email" class="col-md-4 col-form-label text-md-right">{{ __('E-mail cím') }}</label>
<div class="col-md-6"> <div class="col-md-6">
<input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ $email ?? old('email') }}" required autofocus> <input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ $email ?? old('email') }}" required autofocus>
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
</div> </div>
<div class="form-group row"> <div class="form-group row">
<label for="password" class="col-md-4 col-form-label text-md-right">{{ __('Password') }}</label> <label for="password" class="col-md-4 col-form-label text-md-right">{{ __('Jelszó') }}</label>
<div class="col-md-6"> <div class="col-md-6">
<input id="password" type="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" name="password" required> <input id="password" type="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" name="password" required>
...@@ -42,7 +42,8 @@ ...@@ -42,7 +42,8 @@
</div> </div>
<div class="form-group row"> <div class="form-group row">
<label for="password-confirm" class="col-md-4 col-form-label text-md-right">{{ __('Confirm Password') }}</label> <label for="password-confirm" class="col-md-4 col-form-label text-md-right">{{ __('Jelszó
mégegyszer') }}</label>
<div class="col-md-6"> <div class="col-md-6">
<input id="password-confirm" type="password" class="form-control" name="password_confirmation" required> <input id="password-confirm" type="password" class="form-control" name="password_confirmation" required>
...@@ -52,7 +53,7 @@ ...@@ -52,7 +53,7 @@
<div class="form-group row mb-0"> <div class="form-group row mb-0">
<div class="col-md-6 offset-md-4"> <div class="col-md-6 offset-md-4">
<button type="submit" class="btn btn-primary"> <button type="submit" class="btn btn-primary">
{{ __('Reset Password') }} {{ __('Jelszó megváltoztatása') }}
</button> </button>
</div> </div>
</div> </div>
......
resources/views/auth/register.blade.php
...@@ -5,14 +5,14 @@ ...@@ -5,14 +5,14 @@
<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">{{ __('Register') }}</div> <div class="card-header">{{ __('Regisztráció') }}</div>
<div class="card-body"> <div class="card-body">
<form method="POST" action="{{ route('register') }}" aria-label="{{ __('Register') }}"> <form method="POST" action="{{ route('register') }}" aria-label="{{ __('Regisztráció') }}">
@csrf @csrf
<div class="form-group row"> <div class="form-group row">
<label for="name" class="col-md-4 col-form-label text-md-right">{{ __('Name') }}</label> <label for="name" class="col-md-4 col-form-label text-md-right">{{ __('Név') }}</label>
<div class="col-md-6"> <div class="col-md-6">
<input id="name" type="text" class="form-control{{ $errors->has('name') ? ' is-invalid' : '' }}" name="name" value="{{ old('name') }}" required autofocus> <input id="name" type="text" class="form-control{{ $errors->has('name') ? ' is-invalid' : '' }}" name="name" value="{{ old('name') }}" required autofocus>
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
</div> </div>
<div class="form-group row"> <div class="form-group row">
<label for="email" class="col-md-4 col-form-label text-md-right">{{ __('E-Mail Address') }}</label> <label for="email" class="col-md-4 col-form-label text-md-right">{{ __('E-mail cím') }}</label>
<div class="col-md-6"> <div class="col-md-6">
<input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ old('email') }}" required> <input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ old('email') }}" required>
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
</div> </div>
<div class="form-group row"> <div class="form-group row">
<label for="password" class="col-md-4 col-form-label text-md-right">{{ __('Password') }}</label> <label for="password" class="col-md-4 col-form-label text-md-right">{{ __('Jelszó') }}</label>
<div class="col-md-6"> <div class="col-md-6">
<input id="password" type="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" name="password" required> <input id="password" type="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" name="password" required>
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
</div> </div>
<div class="form-group row"> <div class="form-group row">
<label for="password-confirm" class="col-md-4 col-form-label text-md-right">{{ __('Confirm Password') }}</label> <label for="password-confirm" class="col-md-4 col-form-label text-md-right">{{ __('Jelszó mégegyszer') }}</label>
<div class="col-md-6"> <div class="col-md-6">
<input id="password-confirm" type="password" class="form-control" name="password_confirmation" required> <input id="password-confirm" type="password" class="form-control" name="password_confirmation" required>
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
<div class="form-group row mb-0"> <div class="form-group row mb-0">
<div class="col-md-6 offset-md-4"> <div class="col-md-6 offset-md-4">
<button type="submit" class="btn btn-primary"> <button type="submit" class="btn btn-primary">
{{ __('Register') }} {{ __('Regisztráció') }}
</button> </button>
</div> </div>
</div> </div>
......
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