Merge branch 'master' into 'production'
Master See merge request Romulus21/portal!61
This commit is contained in:
Romain Delanoë
14
composer.lock
generated
14
composer.lock
generated
@@ -2905,16 +2905,16 @@
|
||||
},
|
||||
{
|
||||
"name": "ramsey/uuid",
|
||||
"version": "4.0.1",
|
||||
"version": "4.1.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/ramsey/uuid.git",
|
||||
"reference": "ba8fff1d3abb8bb4d35a135ed22a31c6ef3ede3d"
|
||||
"reference": "988dbefc7878d0a35f12afb4df1f7dd0bd153c43"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/ramsey/uuid/zipball/ba8fff1d3abb8bb4d35a135ed22a31c6ef3ede3d",
|
||||
"reference": "ba8fff1d3abb8bb4d35a135ed22a31c6ef3ede3d",
|
||||
"url": "https://api.github.com/repos/ramsey/uuid/zipball/988dbefc7878d0a35f12afb4df1f7dd0bd153c43",
|
||||
"reference": "988dbefc7878d0a35f12afb4df1f7dd0bd153c43",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -2929,7 +2929,7 @@
|
||||
},
|
||||
"require-dev": {
|
||||
"codeception/aspect-mock": "^3",
|
||||
"dealerdirect/phpcodesniffer-composer-installer": "^0.6.2",
|
||||
"dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7.0",
|
||||
"doctrine/annotations": "^1.8",
|
||||
"goaop/framework": "^2",
|
||||
"mockery/mockery": "^1.3",
|
||||
@@ -2938,8 +2938,8 @@
|
||||
"php-mock/php-mock-mockery": "^1.3",
|
||||
"php-mock/php-mock-phpunit": "^2.5",
|
||||
"php-parallel-lint/php-parallel-lint": "^1.1",
|
||||
"phpbench/phpbench": "^0.17.1",
|
||||
"phpstan/extension-installer": "^1.0",
|
||||
"phpstan/phpdoc-parser": "0.4.3",
|
||||
"phpstan/phpstan": "^0.12",
|
||||
"phpstan/phpstan-mockery": "^0.12",
|
||||
"phpstan/phpstan-phpunit": "^0.12",
|
||||
@@ -2988,7 +2988,7 @@
|
||||
"type": "github"
|
||||
}
|
||||
],
|
||||
"time": "2020-03-29T20:13:32+00:00"
|
||||
"time": "2020-07-28T16:51:01+00:00"
|
||||
},
|
||||
{
|
||||
"name": "swiftmailer/swiftmailer",
|
||||
|
||||
@@ -40,6 +40,6 @@
|
||||
"laravel-mix-svg-vue": "^0.2.6",
|
||||
"markdown-it": "^10.0.0",
|
||||
"markdown-it-checkbox": "^1.1.0",
|
||||
"tailwindcss": "^1.5.2"
|
||||
"tailwindcss": "^1.6.0"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -42,6 +42,7 @@ export default {
|
||||
},
|
||||
data () {
|
||||
return {
|
||||
id: this.toDo.data.to_do_id,
|
||||
edit: false,
|
||||
checked: !!(this.toDo.data.attributes.data.checked_at),
|
||||
}
|
||||
@@ -52,7 +53,6 @@ export default {
|
||||
axios.patch('/api/to-do-lists/' + this.idList + '/to-do/' + this.toDo.data.to_do_id, {name: this.toDo.data.attributes.data.name })
|
||||
.then(() => {
|
||||
this.edit = false
|
||||
//this.toDoList.data.attributes.data.name = this.listName
|
||||
})
|
||||
.catch(errorRes => {
|
||||
console.log('Internal Error, Unable to delete list.' + errorRes)
|
||||
@@ -61,16 +61,22 @@ export default {
|
||||
},
|
||||
watch: {
|
||||
checked: function () {
|
||||
// eslint-disable-next-line no-undef
|
||||
axios.patch('/api/to-do-lists/' + this.idList + '/to-do/' + this.toDo.data.to_do_id + '/check')
|
||||
.then(res => {
|
||||
// this.toDoList.data.attributes.data.to_dos.data[position].data.attributes.data.checked_at = res.data.data.attributes.data.checked_at
|
||||
this.toDo.data.attributes.data.checked_at = res.data.data.attributes.data.checked_at
|
||||
this.checked = !!(res.data.data.attributes.data.checked_at)
|
||||
})
|
||||
.catch(errorRes => {
|
||||
console.log('Internal Error, Unable to delete contact.' + errorRes)
|
||||
})
|
||||
if(event && event.type === 'click') {
|
||||
// eslint-disable-next-line no-undef
|
||||
axios.patch('/api/to-do-lists/' + this.idList + '/to-do/' + this.toDo.data.to_do_id + '/check')
|
||||
.then(res => {
|
||||
this.toDo.data.attributes.data.checked_at = res.data.data.attributes.data.checked_at
|
||||
this.checked = !!(res.data.data.attributes.data.checked_at)
|
||||
})
|
||||
.catch(errorRes => {
|
||||
console.log('Internal Error, Unable to delete contact.' + errorRes)
|
||||
})
|
||||
}
|
||||
},
|
||||
toDo: function () {
|
||||
if(this.checked !== !!(this.toDo.data.attributes.data.checked_at)) {
|
||||
this.checked = !!(this.toDo.data.attributes.data.checked_at)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -43,6 +43,7 @@
|
||||
<svg-vue icon="draggable" class="w-4 block mr-2 cursor-move" />
|
||||
<ToDo :to-do="toDo"
|
||||
:id-list="toDoList.data.to_do_list_id"
|
||||
ref="toDo"
|
||||
class="flex-1 bg-blue" />
|
||||
<span @click="deleteToDo(toDo, index)" class="cursor-pointer ml-2 font-bold edit-icon flex items-center">
|
||||
<svg-vue icon="close" class="w-4" />
|
||||
@@ -87,7 +88,7 @@ export default {
|
||||
this.toDoList = res.data
|
||||
this.loading = false
|
||||
this.listName = res.data.data.attributes.data.name
|
||||
this.reorderList()
|
||||
this.sortList()
|
||||
})
|
||||
.catch(errorRes => {
|
||||
this.loading = false
|
||||
@@ -120,11 +121,14 @@ export default {
|
||||
console.log('Internal Error, Unable to delete contact.' + errorRes)
|
||||
})
|
||||
},
|
||||
reorderList() {
|
||||
sortList() {
|
||||
this.toDoList.data.attributes.data.to_dos.data.sort(function(a, b) {
|
||||
return a.data.attributes.data.order - b.data.attributes.data.order
|
||||
})
|
||||
},
|
||||
reorderList() {
|
||||
this.sortList()
|
||||
},
|
||||
addToDo: function () {
|
||||
if(this.toDoName.length >= 3) {
|
||||
// eslint-disable-next-line no-undef
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
@extends('layouts.app')
|
||||
|
||||
@section('content')
|
||||
<div class="bg-orange-200 mx-auto h-screen flex justify-center items-center">
|
||||
<div class="w-96 m-auto bg-orange-400 rounded p-4 mt-10 shadow-xl">
|
||||
<div class="bg-gray-200 mx-auto h-screen flex justify-center items-center">
|
||||
<div class="w-96 m-auto bg-marine rounded p-4 mt-10 shadow-xl text-white">
|
||||
<div class="text-3xl font-bold text-center mb-4">{{ __('Login') }}</div>
|
||||
<form method="POST" action="{{ route('login') }}">
|
||||
@csrf
|
||||
|
||||
<label for="email" class="mb-2 font-bold uppercase">{{ __('E-Mail') }}</label>
|
||||
<div class="mb-4">
|
||||
<input id="email" type="email" class="w-full border-2 border-orange-500 focus:border-orange-700 rounded p-2 @error('email') is-invalid @enderror" name="email" value="{{ old('email') }}" required autocomplete="email" autofocus>
|
||||
<input id="email" type="email" class="w-full border-2 border-marine-light rounded p-2 @error('email') is-invalid @enderror" name="email" value="{{ old('email') }}" required autocomplete="email" autofocus>
|
||||
@error('email')
|
||||
<span class="invalid-feedback" role="alert">
|
||||
<strong>{{ $message }}</strong>
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
<label for="password" class="mb-2 font-bold uppercase">{{ __('Password') }}</label>
|
||||
<div class="mb-4">
|
||||
<input id="password" type="password" class="w-full border-2 border-orange-500 focus:border-orange-700 rounded p-2 @error('password') is-invalid @enderror" name="password" required autocomplete="current-password">
|
||||
<input id="password" type="password" class="w-full border-2 border-marine-light rounded p-2 @error('password') is-invalid @enderror" name="password" required autocomplete="current-password">
|
||||
|
||||
@error('password')
|
||||
<span class="invalid-feedback" role="alert">
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
@extends('layouts.app')
|
||||
|
||||
@section('content')
|
||||
<div class="auth p-2">
|
||||
<div class="title-page mb-2">{{ __('Reset Password') }}</div>
|
||||
<div class="bg-gray-200 mx-auto h-screen flex justify-center items-center">
|
||||
<div class="w-96 m-auto bg-marine rounded p-4 mt-10 shadow-xl text-white">
|
||||
<div class="text-3xl font-bold text-center mb-4">{{ __('Reset Password') }}</div>
|
||||
|
||||
|
||||
<div class="card-body">
|
||||
@if (session('status'))
|
||||
<div class="alert alert-success p-1 mb-1" role="alert">
|
||||
{{ session('status') }}
|
||||
@@ -15,9 +15,9 @@
|
||||
<form method="POST" action="{{ route('password.email') }}">
|
||||
@csrf
|
||||
|
||||
<label for="email" class="mb-1">{{ __('E-Mail') }}</label>
|
||||
<div class="mb-2">
|
||||
<input id="email" type="email" class="@error('email') is-invalid @enderror" name="email" value="{{ old('email') }}" required autocomplete="email" autofocus>
|
||||
<label for="email" class="mb-2 font-bold uppercase">{{ __('E-Mail') }}</label>
|
||||
<div class="mb-4">
|
||||
<input id="email" type="email" class="w-full border-2 border-marine-light rounded p-2 @error('email') is-invalid @enderror" name="email" value="{{ old('email') }}" required autocomplete="email" autofocus>
|
||||
@error('email')
|
||||
<span class="invalid-feedback" role="alert">
|
||||
<strong>{{ $message }}</strong>
|
||||
@@ -25,13 +25,14 @@
|
||||
@enderror
|
||||
</div>
|
||||
|
||||
<div class="flex-between">
|
||||
<div class="flex justify-center">
|
||||
<button type="submit" class="btn-primary px-3 w-100">
|
||||
{{ __('Send Password Reset Link') }}
|
||||
</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
@endsection
|
||||
|
||||
@@ -1,77 +0,0 @@
|
||||
@extends('layouts.app')
|
||||
|
||||
@section('content')
|
||||
<div class="container">
|
||||
<div class="row justify-content-center">
|
||||
<div class="col-md-8">
|
||||
<div class="card">
|
||||
<div class="card-header">{{ __('Register') }}</div>
|
||||
|
||||
<div class="card-body">
|
||||
<form method="POST" action="{{ route('register') }}">
|
||||
@csrf
|
||||
|
||||
<div class="form-group row">
|
||||
<label for="name" class="col-md-4 col-form-label text-md-right">{{ __('Name') }}</label>
|
||||
|
||||
<div class="col-md-6">
|
||||
<input id="name" type="text" class="form-control @error('name') is-invalid @enderror" name="name" value="{{ old('name') }}" required autocomplete="name" autofocus>
|
||||
|
||||
@error('name')
|
||||
<span class="invalid-feedback" role="alert">
|
||||
<strong>{{ $message }}</strong>
|
||||
</span>
|
||||
@enderror
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group row">
|
||||
<label for="email" class="col-md-4 col-form-label text-md-right">{{ __('E-Mail Address') }}</label>
|
||||
|
||||
<div class="col-md-6">
|
||||
<input id="email" type="email" class="form-control @error('email') is-invalid @enderror" name="email" value="{{ old('email') }}" required autocomplete="email">
|
||||
|
||||
@error('email')
|
||||
<span class="invalid-feedback" role="alert">
|
||||
<strong>{{ $message }}</strong>
|
||||
</span>
|
||||
@enderror
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group row">
|
||||
<label for="password" class="col-md-4 col-form-label text-md-right">{{ __('Password') }}</label>
|
||||
|
||||
<div class="col-md-6">
|
||||
<input id="password" type="password" class="form-control @error('password') is-invalid @enderror" name="password" required autocomplete="new-password">
|
||||
|
||||
@error('password')
|
||||
<span class="invalid-feedback" role="alert">
|
||||
<strong>{{ $message }}</strong>
|
||||
</span>
|
||||
@enderror
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group row">
|
||||
<label for="password-confirm" class="col-md-4 col-form-label text-md-right">{{ __('Confirm Password') }}</label>
|
||||
|
||||
<div class="col-md-6">
|
||||
<input id="password-confirm" type="password" class="form-control" name="password_confirmation" required autocomplete="new-password">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group row mb-0">
|
||||
<div class="col-md-6 offset-md-4">
|
||||
<button type="submit" class="btn btn-primary">
|
||||
{{ __('Register') }}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
Reference in New Issue
Block a user