Unverified Commit 00200618 authored by José Rômulo's avatar José Rômulo Committed by GitHub
Browse files

Merge branch 'lmts-ufape:master' into master

parents 7dee742b f6de406d
...@@ -1117,16 +1117,16 @@ ...@@ -1117,16 +1117,16 @@
}, },
{ {
"name": "laravel/framework", "name": "laravel/framework",
"version": "v6.20.29", "version": "v6.20.30",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/laravel/framework.git", "url": "https://github.com/laravel/framework.git",
"reference": "00fa9c04aed10d68481f5757b89da0e6798f53b3" "reference": "a6402599a517b2f15f4ada6b3b20df33a5895e1e"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/00fa9c04aed10d68481f5757b89da0e6798f53b3", "url": "https://api.github.com/repos/laravel/framework/zipball/a6402599a517b2f15f4ada6b3b20df33a5895e1e",
"reference": "00fa9c04aed10d68481f5757b89da0e6798f53b3", "reference": "a6402599a517b2f15f4ada6b3b20df33a5895e1e",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -1266,7 +1266,7 @@ ...@@ -1266,7 +1266,7 @@
"issues": "https://github.com/laravel/framework/issues", "issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework" "source": "https://github.com/laravel/framework"
}, },
"time": "2021-06-22T13:41:06+00:00" "time": "2021-07-06T14:06:00+00:00"
}, },
{ {
"name": "laravel/tinker", "name": "laravel/tinker",
...@@ -6400,16 +6400,16 @@ ...@@ -6400,16 +6400,16 @@
}, },
{ {
"name": "scrivo/highlight.php", "name": "scrivo/highlight.php",
"version": "v9.18.1.6", "version": "v9.18.1.7",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/scrivo/highlight.php.git", "url": "https://github.com/scrivo/highlight.php.git",
"reference": "44a3d4136edb5ad8551590bf90f437db80b2d466" "reference": "05996fcc61e97978d76ca7d1ac14b65e7cd26f91"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/scrivo/highlight.php/zipball/44a3d4136edb5ad8551590bf90f437db80b2d466", "url": "https://api.github.com/repos/scrivo/highlight.php/zipball/05996fcc61e97978d76ca7d1ac14b65e7cd26f91",
"reference": "44a3d4136edb5ad8551590bf90f437db80b2d466", "reference": "05996fcc61e97978d76ca7d1ac14b65e7cd26f91",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -6472,7 +6472,7 @@ ...@@ -6472,7 +6472,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2020-12-22T19:20:29+00:00" "time": "2021-07-09T00:30:39+00:00"
}, },
{ {
"name": "sebastian/code-unit-reverse-lookup", "name": "sebastian/code-unit-reverse-lookup",
......
...@@ -35,23 +35,28 @@ ...@@ -35,23 +35,28 @@
<img src="{{asset('img/icons/ellipsis-v-solid.svg')}}" style="width:8px"> <img src="{{asset('img/icons/ellipsis-v-solid.svg')}}" style="width:8px">
</a> </a>
<div class="dropdown-menu"> <div class="dropdown-menu">
<a href="{{ route('evento.visualizar',['id'=>$evento->id]) }}" class="dropdown-item"> <a href="{{ route('evento.editar', ['id' => $evento->id]) }}" class="dropdown-item text-center">
<img src="{{asset('img/icons/eye-regular.svg')}}" class="icon-card" alt=""> Editar Edital
Detalhes
</a> </a>
<a href="{{ route('evento.editar', ['id' => $evento->id]) }}" class="dropdown-item"> <hr class="dropdown-hr">
<img src="{{asset('img/icons/edit-regular.svg')}}" class="icon-card" alt=""> <a href="{{route('admin.atribuir', ['evento_id' => $evento->id])}}" class="dropdown-item text-center">
Editar Atribuir Avaliadores
</a> </a>
<form method="POST" action="{{route('evento.deletar',$evento->id)}}"> <hr class="dropdown-hr">
{{ csrf_field() }} <a href="{{route('admin.pareceres', ['evento_id' => $evento->id])}}" class="dropdown-item text-center">
{{ method_field('DELETE') }} Visualizar Pareceres
<button type="submit" class="dropdown-item"> </a>
<img src="{{asset('img/icons/trash-alt-regular.svg')}}" class="icon-card" alt=""> <hr class="dropdown-hr">
Deletar <a href="{{route('admin.analisar', ['evento_id' => $evento->id])}}" class="dropdown-item text-center">
Analisar projetos
</a>
<hr class="dropdown-hr">
<!-- Button trigger modal -->
<button type="button" class="dropdown-item dropdown-item-delete text-center" data-toggle="modal" data-target="#exampleModal{{ $evento->id }}">
<img src="{{asset('img/icons/logo_lixeira.png')}}" alt=""> Deletar
</button> </button>
</form>
</div> </div>
</div> </div>
</td> </td>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</p> </p>
</div> </div>
<br> <br>
<div class="row position-text"> {{-- <div class="row position-text">
<div class="alert alert-danger" role="alert"> <div class="alert alert-danger" role="alert">
<p> <p>
<strong>INFORME</strong> <strong>INFORME</strong>
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
Não serão aceitas propostas submetidas após este prazo. Não serão aceitas propostas submetidas após este prazo.
</p> </p>
</div> </div>
</div> </div> --}}
</div> </div>
<br> <br>
<div class="col-sm-6" style=" position: relative; top: 50px; padding: 25px;"> <div class="col-sm-6" style=" position: relative; top: 50px; padding: 25px;">
......
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