Skip to content

GitLab

Commit 6aa44d51 authored by carlos's avatar carlos
Browse files

somente os projetos vinculados ao proponente

parent 39c3da76
Show whitespace changes
Inline Side-by-side
composer.lock
View file @ 6aa44d51
......@@ -292,16 +292,16 @@
},
{
"name": "fideloper/proxy",
"version": "4.3.0",
"version": "4.4.0",
"source": {
"type": "git",
"url": "https://github.com/fideloper/TrustedProxy.git",
"reference": "ec38ad69ee378a1eec04fb0e417a97cfaf7ed11a"
"reference": "9beebf48a1c344ed67c1d36bb1b8709db7c3c1a8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/fideloper/TrustedProxy/zipball/ec38ad69ee378a1eec04fb0e417a97cfaf7ed11a",
"reference": "ec38ad69ee378a1eec04fb0e417a97cfaf7ed11a",
"url": "https://api.github.com/repos/fideloper/TrustedProxy/zipball/9beebf48a1c344ed67c1d36bb1b8709db7c3c1a8",
"reference": "9beebf48a1c344ed67c1d36bb1b8709db7c3c1a8",
"shasum": ""
},
"require": {
......@@ -342,7 +342,7 @@
"proxy",
"trusted proxy"
],
"time": "2020-02-22T01:51:47+00:00"
"time": "2020-06-23T01:36:47+00:00"
},
{
"name": "geekcom/validator-docs",
......@@ -586,16 +586,16 @@
},
{
"name": "laravel/framework",
"version": "v6.18.20",
"version": "v6.18.22",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "2862a9857533853bb2851bac39d65e3bfb8ba6cd"
"reference": "95f33151375bb2e4747b871854c8becc23502901"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/2862a9857533853bb2851bac39d65e3bfb8ba6cd",
"reference": "2862a9857533853bb2851bac39d65e3bfb8ba6cd",
"url": "https://api.github.com/repos/laravel/framework/zipball/95f33151375bb2e4747b871854c8becc23502901",
"reference": "95f33151375bb2e4747b871854c8becc23502901",
"shasum": ""
},
"require": {
......@@ -730,7 +730,7 @@
"framework",
"laravel"
],
"time": "2020-06-16T13:21:33+00:00"
"time": "2020-06-24T13:08:51+00:00"
},
{
"name": "laravel/tinker",
......@@ -852,21 +852,21 @@
},
{
"name": "league/commonmark",
"version": "1.4.3",
"version": "1.5.0",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/commonmark.git",
"reference": "412639f7cfbc0b31ad2455b2fe965095f66ae505"
"reference": "fc33ca12575e98e57cdce7d5f38b2ca5335714b3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/thephpleague/commonmark/zipball/412639f7cfbc0b31ad2455b2fe965095f66ae505",
"reference": "412639f7cfbc0b31ad2455b2fe965095f66ae505",
"url": "https://api.github.com/repos/thephpleague/commonmark/zipball/fc33ca12575e98e57cdce7d5f38b2ca5335714b3",
"reference": "fc33ca12575e98e57cdce7d5f38b2ca5335714b3",
"shasum": ""
},
"require": {
"ext-mbstring": "*",
"php": "^7.1"
"php": "^7.1 || ^8.0"
},
"conflict": {
"scrutinizer/ocular": "1.7.*"
......@@ -888,11 +888,6 @@
"bin/commonmark"
],
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.4-dev"
}
},
"autoload": {
"psr-4": {
"League\\CommonMark\\": "src"
......@@ -922,7 +917,7 @@
"md",
"parser"
],
"time": "2020-05-04T22:15:21+00:00"
"time": "2020-06-21T20:50:13+00:00"
},
{
"name": "league/flysystem",
......@@ -2462,16 +2457,16 @@
},
{
"name": "symfony/polyfill-ctype",
"version": "v1.17.0",
"version": "v1.17.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
"reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9"
"reference": "2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e94c8b1bbe2bc77507a1056cdb06451c75b427f9",
"reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9",
"url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d",
"reference": "2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d",
"shasum": ""
},
"require": {
......@@ -2484,6 +2479,10 @@
"extra": {
"branch-alias": {
"dev-master": "1.17-dev"
},
"thanks": {
"name": "symfony/polyfill",
"url": "https://github.com/symfony/polyfill"
}
},
"autoload": {
......@@ -2516,20 +2515,20 @@
"polyfill",
"portable"
],
"time": "2020-05-12T16:14:59+00:00"
"time": "2020-06-06T08:46:27+00:00"
},
{
"name": "symfony/polyfill-iconv",
"version": "v1.17.0",
"version": "v1.17.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-iconv.git",
"reference": "c4de7601eefbf25f9d47190abe07f79fe0a27424"
"reference": "ba6c9c18db36235b859cc29b8372d1c01298c035"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/c4de7601eefbf25f9d47190abe07f79fe0a27424",
"reference": "c4de7601eefbf25f9d47190abe07f79fe0a27424",
"url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/ba6c9c18db36235b859cc29b8372d1c01298c035",
"reference": "ba6c9c18db36235b859cc29b8372d1c01298c035",
"shasum": ""
},
"require": {
......@@ -2542,6 +2541,10 @@
"extra": {
"branch-alias": {
"dev-master": "1.17-dev"
},
"thanks": {
"name": "symfony/polyfill",
"url": "https://github.com/symfony/polyfill"
}
},
"autoload": {
......@@ -2575,20 +2578,20 @@
"portable",
"shim"
],
"time": "2020-05-12T16:47:27+00:00"
"time": "2020-06-06T08:46:27+00:00"
},
{
"name": "symfony/polyfill-intl-idn",
"version": "v1.17.0",
"version": "v1.17.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-idn.git",
"reference": "3bff59ea7047e925be6b7f2059d60af31bb46d6a"
"reference": "a57f8161502549a742a63c09f0a604997bf47027"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/3bff59ea7047e925be6b7f2059d60af31bb46d6a",
"reference": "3bff59ea7047e925be6b7f2059d60af31bb46d6a",
"url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/a57f8161502549a742a63c09f0a604997bf47027",
"reference": "a57f8161502549a742a63c09f0a604997bf47027",
"shasum": ""
},
"require": {
......@@ -2603,6 +2606,10 @@
"extra": {
"branch-alias": {
"dev-master": "1.17-dev"
},
"thanks": {
"name": "symfony/polyfill",
"url": "https://github.com/symfony/polyfill"
}
},
"autoload": {
......@@ -2637,20 +2644,20 @@
"portable",
"shim"
],
"time": "2020-05-12T16:47:27+00:00"
"time": "2020-06-06T08:46:27+00:00"
},
{
"name": "symfony/polyfill-mbstring",
"version": "v1.17.0",
"version": "v1.17.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
"reference": "fa79b11539418b02fc5e1897267673ba2c19419c"
"reference": "7110338d81ce1cbc3e273136e4574663627037a7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fa79b11539418b02fc5e1897267673ba2c19419c",
"reference": "fa79b11539418b02fc5e1897267673ba2c19419c",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7110338d81ce1cbc3e273136e4574663627037a7",
"reference": "7110338d81ce1cbc3e273136e4574663627037a7",
"shasum": ""
},
"require": {
......@@ -2663,6 +2670,10 @@
"extra": {
"branch-alias": {
"dev-master": "1.17-dev"
},
"thanks": {
"name": "symfony/polyfill",
"url": "https://github.com/symfony/polyfill"
}
},
"autoload": {
......@@ -2696,7 +2707,7 @@
"portable",
"shim"
],
"time": "2020-05-12T16:47:27+00:00"
"time": "2020-06-06T08:46:27+00:00"
},
{
"name": "symfony/polyfill-php72",
......@@ -2755,16 +2766,16 @@
},
{
"name": "symfony/polyfill-php73",
"version": "v1.17.0",
"version": "v1.17.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php73.git",
"reference": "a760d8964ff79ab9bf057613a5808284ec852ccc"
"reference": "fa0837fe02d617d31fbb25f990655861bb27bd1a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/a760d8964ff79ab9bf057613a5808284ec852ccc",
"reference": "a760d8964ff79ab9bf057613a5808284ec852ccc",
"url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fa0837fe02d617d31fbb25f990655861bb27bd1a",
"reference": "fa0837fe02d617d31fbb25f990655861bb27bd1a",
"shasum": ""
},
"require": {
......@@ -2774,6 +2785,10 @@
"extra": {
"branch-alias": {
"dev-master": "1.17-dev"
},
"thanks": {
"name": "symfony/polyfill",
"url": "https://github.com/symfony/polyfill"
}
},
"autoload": {
......@@ -2809,20 +2824,20 @@
"portable",
"shim"
],
"time": "2020-05-12T16:47:27+00:00"
"time": "2020-06-06T08:46:27+00:00"
},
{
"name": "symfony/polyfill-php80",
"version": "v1.17.0",
"version": "v1.17.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php80.git",
"reference": "5e30b2799bc1ad68f7feb62b60a73743589438dd"
"reference": "4a5b6bba3259902e386eb80dd1956181ee90b5b2"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/5e30b2799bc1ad68f7feb62b60a73743589438dd",
"reference": "5e30b2799bc1ad68f7feb62b60a73743589438dd",
"url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/4a5b6bba3259902e386eb80dd1956181ee90b5b2",
"reference": "4a5b6bba3259902e386eb80dd1956181ee90b5b2",
"shasum": ""
},
"require": {
......@@ -2832,6 +2847,10 @@
"extra": {
"branch-alias": {
"dev-master": "1.17-dev"
},
"thanks": {
"name": "symfony/polyfill",
"url": "https://github.com/symfony/polyfill"
}
},
"autoload": {
......@@ -2871,7 +2890,7 @@
"portable",
"shim"
],
"time": "2020-05-12T16:47:27+00:00"
"time": "2020-06-06T08:46:27+00:00"
},
{
"name": "symfony/process",
......@@ -4240,16 +4259,16 @@
},
{
"name": "phpdocumentor/type-resolver",
"version": "1.1.0",
"version": "1.2.0",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/TypeResolver.git",
"reference": "7462d5f123dfc080dfdf26897032a6513644fc95"
"reference": "30441f2752e493c639526b215ed81d54f369d693"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/7462d5f123dfc080dfdf26897032a6513644fc95",
"reference": "7462d5f123dfc080dfdf26897032a6513644fc95",
"url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/30441f2752e493c639526b215ed81d54f369d693",
"reference": "30441f2752e493c639526b215ed81d54f369d693",
"shasum": ""
},
"require": {
......@@ -4263,7 +4282,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.x-dev"
"dev-1.x": "1.x-dev"
}
},
"autoload": {
......@@ -4282,7 +4301,7 @@
}
],
"description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
"time": "2020-02-18T18:59:58+00:00"
"time": "2020-06-19T20:22:09+00:00"
},
{
"name": "phpspec/prophecy",
......@@ -4601,16 +4620,16 @@
},
{
"name": "phpunit/phpunit",
"version": "8.5.6",
"version": "8.5.8",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "3f9c4079d1407cd84c51c02c6ad1df6ec2ed1348"
"reference": "34c18baa6a44f1d1fbf0338907139e9dce95b997"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3f9c4079d1407cd84c51c02c6ad1df6ec2ed1348",
"reference": "3f9c4079d1407cd84c51c02c6ad1df6ec2ed1348",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/34c18baa6a44f1d1fbf0338907139e9dce95b997",
"reference": "34c18baa6a44f1d1fbf0338907139e9dce95b997",
"shasum": ""
},
"require": {
......@@ -4680,7 +4699,7 @@
"testing",
"xunit"
],
"time": "2020-06-15T10:45:47+00:00"
"time": "2020-06-22T07:06:58+00:00"
},
{
"name": "scrivo/highlight.php",
......
resources/views/layouts/app.blade.php
View file @ 6aa44d51
......@@ -21,6 +21,63 @@
<link href="{{ asset('css/app.css') }}" rel="stylesheet">
<link href="{{ asset('css/layout.css') }}" rel="stylesheet">
{{-- <style>
.rodape{
background-color:rgb(0, 140, 255);;
/* height: 90vh; */
padding:100px;
color: white;
}
.rodape .social{
width: 30px;
margin: 10px;
transition: 0.5s;
}
.rodape .social:hover{
width: 35px;
transition: 0.5s;
}
.rodape .sobre a{
margin-bottom: 10px;
color: white;
}
.rodape a{
color:white;
}
.rodape .coluna h3{
margin-bottom:20px;
}
.rodape .social-network{
margin-top:20px;
}
@media screen and (max-width: 576px) {
.rodape .coluna{
margin-bottom:30px;
}
.rodape .social{
width:20px;
}
.curved{
height: 100vh;
}
.curved p{
font-size: 1rem;
text-align: justify;
padding: 10px;
/* margin-bottom: 5%; */
}
.modulos{
margin-top: 150px;
}
.info-modulo-body{
height: 260px;
overflow-y: auto;
}
}
</style> --}}
</head>
<body>
......@@ -196,5 +253,98 @@
</div>
</div>
</div>
{{-- <div class="rodape" style="color: white;">
<div class="row justify-content-center">
<div class="col-sm-3 coluna">
<div class="row justify-content-center">
<small>Desenvolvidor por:</small>
</div>
<div class="row justify-content-center">
<a href="http://www.lmts.uag.ufrpe.br/br" name="lmts">
<img src="{{asset('img/lmts.png')}}" style="margin:20px 0 20px 0">
</a>
</div>
<div class="row justify-content-center" style="text-align:center">
Laboratório Multidisciplinar de<br>
Tecnologias Sociais
</div>
<div class="row justify-content-center" style="margin-top:20px; text-align:center">
<small>
Avenida Bom Pastor, s/n.º<br>
Bairro Boa Vista - CEP:<br>
55292-270 - Garanhuns - PE
</small>
</div>
</div>
<div class="col-sm-3 coluna">
<div class="row justify-content-center">
<h3>LMTS</h3>
</div>
<div class="row sobre justify-content-center">
<a href="http://www.lmts.uag.ufrpe.br/br/content/apresenta%C3%A7%C3%A3o">Quem Somos</a>
</div>
<div class="row sobre justify-content-center">
<a href="http://www.lmts.uag.ufrpe.br/br/content/equipe">Equipe</a>
</div>
<div class="row sobre justify-content-center">
<a href="http://www.lmts.uag.ufrpe.br/br/noticias">Notícias</a>
</div>
<div class="row sobre justify-content-center">
<a href="http://www.lmts.uag.ufrpe.br/br/content/projetos">Projetos</a>
</div>
<div class="row social-network justify-content-center">
<h6>Siga-nos nas Redes Sociais</h6>
</div>
<div class="row justify-content-center">
<div class="social">
<a href="https://www.facebook.com/LMTSUFAPE/">
<img src="{{asset('img/icons/facebook-square-brands.svg')}}" alt="">
</a>
</div>
<div class="social">
<a href="https://www.instagram.com/lmts_ufape/">
<img src="{{asset('img/icons/instagram-brands.svg')}}" alt="">
</a>
</div>
<div class="social">
<a href="https://twitter.com/lmtsufape">
<img src="{{asset('img/icons/twitter-brands.svg')}}" alt="">
</a>
</div>
<div class="social">
<a href="https://br.linkedin.com/in/lmts-ufrpe-0b25b9196?trk=people-guest_people_search-card">
<img src="{{asset('img/icons/linkedin-brands.svg')}}" alt="">
</a>
</div>
</div>
</div>
<div class="col-sm-3 coluna">
<div class="row justify-content-center">
<h3>CONTATO</h3>
</div>
<div class="row justify-content-center">
<a href="mailto:lmts@ufrpe.br">lmts@ufrpe.br</a>
</div>
</div>
<div class="col-sm-3 coluna ">
<div class="row justify-content-center">
<h3>APOIO</h3>
</div>
<div class="row justify-content-center">
<a href="http://ww3.uag.ufrpe.br/">
<img style="width:77px" src="{{asset('img/logoUfape.svg')}}" alt="">
</a>
</div>
<div class="row justify-content-center">
Universidade Federal Rural<br>
do Agreste de Pernambuco
</div>
</div>
</div>
</div> --}}
</body>
</html>
\ No newline at end of file
resources/views/projeto/index.blade.php
View file @ 6aa44d51
......@@ -47,7 +47,7 @@
</thead>
<tbody>
@foreach ($projetos as $projeto)
@if ($projeto->status != 'Rascunho')
@if ($projeto->status != 'Rascunho' && $projeto->proponente_id === Auth()->user()->proponentes->id)
<tr>
<td>
{{ $projeto->titulo }}
......@@ -76,17 +76,10 @@
<a href="" class="dropdown-item" style="text-align: center">
Resultado
</a> --}}
@if($projeto->status == 'Submetido')
<!-- Button trigger modal -->
<button type="button" class="dropdown-item"data-toggle="modal" data-target="#modal{{$projeto->id}}">
Excluir projeto
</button>
@endif
</div>
</div>
</td>
......
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