forge-joniko/ldc-supportweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into trunk

Browse source
This commit is contained in:
Vincent BRIDIER 2022-04-20 09:26:13 +02:00
commit 943d0cbeb4
No known key found for this signature in database
GPG key ID: 8571BFA20420D512
3 changed files with 22 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/Http/Controllers/UserController.php
View file

@ -34,6 +34,11 @@ class UserController extends Controller
$model->sendMailConfirm();
}
public function passwordReset()
{
return view('users.passwordReset');
}
public function passwordResetSubmit()
{
/** @var \App\Models\User */

21
resources/js/components/ScheduleComponent.vue
View file

@ -699,19 +699,22 @@ table.schedules_table {
.dynCell{
position: relative;
z-index: -1;
&:hover {
z-index: initial;
}
&.day {
//position: relative;
&:hover .btn {
opacity: 1;
}
&:hover .cellsizer{
height: 150px;
padding-left: 2rem;
height: 140px;
padding-top: 2rem;
position: absolute;
width: 200%;
left: -50%;
top: -50%;
z-index: 20;
border: 1px solid;
}
$buttonBgColor: #4d4d4d;
@ -772,18 +775,18 @@ table.schedules_table {
color: darken($color: #fff, $amount: 5);
}
&:nth-last-child(2) {
top: 2.1rem;
top: 0.1rem;
right: inherit;
left: 0.1rem;
left: 2.1rem;
}
&:nth-last-child(3) {
right: inherit;
top: 4.1rem;
left: 0.1rem;
top: 0.1rem;
left: 4.1rem;
}
&:nth-last-child(1) {
top: calc(150px - 2rem);
right: 0.1rem;
top: 0.1rem;
left: calc(100% - 1.9rem);
}
}
}

11
routes/web.php
View file

@ -31,11 +31,11 @@ Route::middleware(['throttle:credentials'])->group(function () {
'logout' => true,
'register' => false,
'reset' => true,
// for resetting passwords
// for resetting passwords
'confirm' => true,
// for additional password confirmations
// for additional password confirmations
'verify' => false,
// for email verification
// for email verification
]);
});
@ -50,9 +50,8 @@ Route::get('/ping', function () {
Route::middleware(['auth'])->group(function () {
// Logged user actions
Route::view('/users/change-password', 'users.passwordReset')->name('users.passwordReset');
Route::post('/users/change-password', [UserController::class, 'passwordResetSubmit'])
->name('users.passwordResetSubmit');
Route::get('/users/change-password', [UserController::class, 'passwordReset'])->name('users.passwordReset');
Route::post('/users/change-password', [UserController::class, 'passwordResetSubmit'])->name('users.passwordResetSubmit');
Route::get('/users/stats', [UserController::class, 'stats'])->name('users.stats');
// Ticket