Skip to content

GitLab

Commit ef05180e authored by Gabriel-31415's avatar Gabriel-31415
Browse files

Merge branch 'carlos' of https://github.com/lmts-ufape/submeta into fixbugs 

mergedcarlos
parents 383491dd fff61dab
Show whitespace changes
Inline Side-by-side
composer.lock
View file @ ef05180e
...@@ -292,16 +292,16 @@ ...@@ -292,16 +292,16 @@
}, },
{ {
"name": "fideloper/proxy", "name": "fideloper/proxy",
"version": "4.3.0", "version": "4.4.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/fideloper/TrustedProxy.git", "url": "https://github.com/fideloper/TrustedProxy.git",
"reference": "ec38ad69ee378a1eec04fb0e417a97cfaf7ed11a" "reference": "9beebf48a1c344ed67c1d36bb1b8709db7c3c1a8"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/fideloper/TrustedProxy/zipball/ec38ad69ee378a1eec04fb0e417a97cfaf7ed11a", "url": "https://api.github.com/repos/fideloper/TrustedProxy/zipball/9beebf48a1c344ed67c1d36bb1b8709db7c3c1a8",
"reference": "ec38ad69ee378a1eec04fb0e417a97cfaf7ed11a", "reference": "9beebf48a1c344ed67c1d36bb1b8709db7c3c1a8",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -342,7 +342,7 @@ ...@@ -342,7 +342,7 @@
"proxy", "proxy",
"trusted proxy" "trusted proxy"
], ],
"time": "2020-02-22T01:51:47+00:00" "time": "2020-06-23T01:36:47+00:00"
}, },
{ {
"name": "geekcom/validator-docs", "name": "geekcom/validator-docs",
...@@ -586,16 +586,16 @@ ...@@ -586,16 +586,16 @@
}, },
{ {
"name": "laravel/framework", "name": "laravel/framework",
"version": "v6.18.20", "version": "v6.18.22",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/laravel/framework.git", "url": "https://github.com/laravel/framework.git",
"reference": "2862a9857533853bb2851bac39d65e3bfb8ba6cd" "reference": "95f33151375bb2e4747b871854c8becc23502901"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/2862a9857533853bb2851bac39d65e3bfb8ba6cd", "url": "https://api.github.com/repos/laravel/framework/zipball/95f33151375bb2e4747b871854c8becc23502901",
"reference": "2862a9857533853bb2851bac39d65e3bfb8ba6cd", "reference": "95f33151375bb2e4747b871854c8becc23502901",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -730,7 +730,7 @@ ...@@ -730,7 +730,7 @@
"framework", "framework",
"laravel" "laravel"
], ],
"time": "2020-06-16T13:21:33+00:00" "time": "2020-06-24T13:08:51+00:00"
}, },
{ {
"name": "laravel/tinker", "name": "laravel/tinker",
...@@ -852,21 +852,21 @@ ...@@ -852,21 +852,21 @@
}, },
{ {
"name": "league/commonmark", "name": "league/commonmark",
"version": "1.4.3", "version": "1.5.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/thephpleague/commonmark.git", "url": "https://github.com/thephpleague/commonmark.git",
"reference": "412639f7cfbc0b31ad2455b2fe965095f66ae505" "reference": "fc33ca12575e98e57cdce7d5f38b2ca5335714b3"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/thephpleague/commonmark/zipball/412639f7cfbc0b31ad2455b2fe965095f66ae505", "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/fc33ca12575e98e57cdce7d5f38b2ca5335714b3",
"reference": "412639f7cfbc0b31ad2455b2fe965095f66ae505", "reference": "fc33ca12575e98e57cdce7d5f38b2ca5335714b3",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"ext-mbstring": "*", "ext-mbstring": "*",
"php": "^7.1" "php": "^7.1 || ^8.0"
}, },
"conflict": { "conflict": {
"scrutinizer/ocular": "1.7.*" "scrutinizer/ocular": "1.7.*"
...@@ -888,11 +888,6 @@ ...@@ -888,11 +888,6 @@
"bin/commonmark" "bin/commonmark"
], ],
"type": "library", "type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.4-dev"
}
},
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"League\\CommonMark\\": "src" "League\\CommonMark\\": "src"
...@@ -922,7 +917,7 @@ ...@@ -922,7 +917,7 @@
"md", "md",
"parser" "parser"
], ],
"time": "2020-05-04T22:15:21+00:00" "time": "2020-06-21T20:50:13+00:00"
}, },
{ {
"name": "league/flysystem", "name": "league/flysystem",
...@@ -2462,16 +2457,16 @@ ...@@ -2462,16 +2457,16 @@
}, },
{ {
"name": "symfony/polyfill-ctype", "name": "symfony/polyfill-ctype",
"version": "v1.17.0", "version": "v1.17.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git", "url": "https://github.com/symfony/polyfill-ctype.git",
"reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9" "reference": "2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e94c8b1bbe2bc77507a1056cdb06451c75b427f9", "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d",
"reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9", "reference": "2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2484,6 +2479,10 @@ ...@@ -2484,6 +2479,10 @@
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.17-dev" "dev-master": "1.17-dev"
},
"thanks": {
"name": "symfony/polyfill",
"url": "https://github.com/symfony/polyfill"
} }
}, },
"autoload": { "autoload": {
...@@ -2516,20 +2515,20 @@ ...@@ -2516,20 +2515,20 @@
"polyfill", "polyfill",
"portable" "portable"
], ],
"time": "2020-05-12T16:14:59+00:00" "time": "2020-06-06T08:46:27+00:00"
}, },
{ {
"name": "symfony/polyfill-iconv", "name": "symfony/polyfill-iconv",
"version": "v1.17.0", "version": "v1.17.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-iconv.git", "url": "https://github.com/symfony/polyfill-iconv.git",
"reference": "c4de7601eefbf25f9d47190abe07f79fe0a27424" "reference": "ba6c9c18db36235b859cc29b8372d1c01298c035"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/c4de7601eefbf25f9d47190abe07f79fe0a27424", "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/ba6c9c18db36235b859cc29b8372d1c01298c035",
"reference": "c4de7601eefbf25f9d47190abe07f79fe0a27424", "reference": "ba6c9c18db36235b859cc29b8372d1c01298c035",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2542,6 +2541,10 @@ ...@@ -2542,6 +2541,10 @@
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.17-dev" "dev-master": "1.17-dev"
},
"thanks": {
"name": "symfony/polyfill",
"url": "https://github.com/symfony/polyfill"
} }
}, },
"autoload": { "autoload": {
...@@ -2575,20 +2578,20 @@ ...@@ -2575,20 +2578,20 @@
"portable", "portable",
"shim" "shim"
], ],
"time": "2020-05-12T16:47:27+00:00" "time": "2020-06-06T08:46:27+00:00"
}, },
{ {
"name": "symfony/polyfill-intl-idn", "name": "symfony/polyfill-intl-idn",
"version": "v1.17.0", "version": "v1.17.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-intl-idn.git", "url": "https://github.com/symfony/polyfill-intl-idn.git",
"reference": "3bff59ea7047e925be6b7f2059d60af31bb46d6a" "reference": "a57f8161502549a742a63c09f0a604997bf47027"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/3bff59ea7047e925be6b7f2059d60af31bb46d6a", "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/a57f8161502549a742a63c09f0a604997bf47027",
"reference": "3bff59ea7047e925be6b7f2059d60af31bb46d6a", "reference": "a57f8161502549a742a63c09f0a604997bf47027",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2603,6 +2606,10 @@ ...@@ -2603,6 +2606,10 @@
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.17-dev" "dev-master": "1.17-dev"
},
"thanks": {
"name": "symfony/polyfill",
"url": "https://github.com/symfony/polyfill"
} }
}, },
"autoload": { "autoload": {
...@@ -2637,20 +2644,20 @@ ...@@ -2637,20 +2644,20 @@
"portable", "portable",
"shim" "shim"
], ],
"time": "2020-05-12T16:47:27+00:00" "time": "2020-06-06T08:46:27+00:00"
}, },
{ {
"name": "symfony/polyfill-mbstring", "name": "symfony/polyfill-mbstring",
"version": "v1.17.0", "version": "v1.17.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git", "url": "https://github.com/symfony/polyfill-mbstring.git",
"reference": "fa79b11539418b02fc5e1897267673ba2c19419c" "reference": "7110338d81ce1cbc3e273136e4574663627037a7"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fa79b11539418b02fc5e1897267673ba2c19419c", "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7110338d81ce1cbc3e273136e4574663627037a7",
"reference": "fa79b11539418b02fc5e1897267673ba2c19419c", "reference": "7110338d81ce1cbc3e273136e4574663627037a7",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2663,6 +2670,10 @@ ...@@ -2663,6 +2670,10 @@
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.17-dev" "dev-master": "1.17-dev"
},
"thanks": {
"name": "symfony/polyfill",
"url": "https://github.com/symfony/polyfill"
} }
}, },
"autoload": { "autoload": {
...@@ -2696,7 +2707,7 @@ ...@@ -2696,7 +2707,7 @@
"portable", "portable",
"shim" "shim"
], ],
"time": "2020-05-12T16:47:27+00:00" "time": "2020-06-06T08:46:27+00:00"
}, },
{ {
"name": "symfony/polyfill-php72", "name": "symfony/polyfill-php72",
...@@ -2755,16 +2766,16 @@ ...@@ -2755,16 +2766,16 @@
}, },
{ {
"name": "symfony/polyfill-php73", "name": "symfony/polyfill-php73",
"version": "v1.17.0", "version": "v1.17.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-php73.git", "url": "https://github.com/symfony/polyfill-php73.git",
"reference": "a760d8964ff79ab9bf057613a5808284ec852ccc" "reference": "fa0837fe02d617d31fbb25f990655861bb27bd1a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/a760d8964ff79ab9bf057613a5808284ec852ccc", "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fa0837fe02d617d31fbb25f990655861bb27bd1a",
"reference": "a760d8964ff79ab9bf057613a5808284ec852ccc", "reference": "fa0837fe02d617d31fbb25f990655861bb27bd1a",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2774,6 +2785,10 @@ ...@@ -2774,6 +2785,10 @@
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.17-dev" "dev-master": "1.17-dev"
},
"thanks": {
"name": "symfony/polyfill",
"url": "https://github.com/symfony/polyfill"
} }
}, },
"autoload": { "autoload": {
...@@ -2809,20 +2824,20 @@ ...@@ -2809,20 +2824,20 @@
"portable", "portable",
"shim" "shim"
], ],
"time": "2020-05-12T16:47:27+00:00" "time": "2020-06-06T08:46:27+00:00"
}, },
{ {
"name": "symfony/polyfill-php80", "name": "symfony/polyfill-php80",
"version": "v1.17.0", "version": "v1.17.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-php80.git", "url": "https://github.com/symfony/polyfill-php80.git",
"reference": "5e30b2799bc1ad68f7feb62b60a73743589438dd" "reference": "4a5b6bba3259902e386eb80dd1956181ee90b5b2"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/5e30b2799bc1ad68f7feb62b60a73743589438dd", "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/4a5b6bba3259902e386eb80dd1956181ee90b5b2",
"reference": "5e30b2799bc1ad68f7feb62b60a73743589438dd", "reference": "4a5b6bba3259902e386eb80dd1956181ee90b5b2",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2832,6 +2847,10 @@ ...@@ -2832,6 +2847,10 @@
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.17-dev" "dev-master": "1.17-dev"
},
"thanks": {
"name": "symfony/polyfill",
"url": "https://github.com/symfony/polyfill"
} }
}, },
"autoload": { "autoload": {
...@@ -2871,7 +2890,7 @@ ...@@ -2871,7 +2890,7 @@
"portable", "portable",
"shim" "shim"
], ],
"time": "2020-05-12T16:47:27+00:00" "time": "2020-06-06T08:46:27+00:00"
}, },
{ {
"name": "symfony/process", "name": "symfony/process",
...@@ -4240,16 +4259,16 @@ ...@@ -4240,16 +4259,16 @@
}, },
{ {
"name": "phpdocumentor/type-resolver", "name": "phpdocumentor/type-resolver",
"version": "1.1.0", "version": "1.2.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpDocumentor/TypeResolver.git", "url": "https://github.com/phpDocumentor/TypeResolver.git",
"reference": "7462d5f123dfc080dfdf26897032a6513644fc95" "reference": "30441f2752e493c639526b215ed81d54f369d693"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/7462d5f123dfc080dfdf26897032a6513644fc95", "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/30441f2752e493c639526b215ed81d54f369d693",
"reference": "7462d5f123dfc080dfdf26897032a6513644fc95", "reference": "30441f2752e493c639526b215ed81d54f369d693",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -4263,7 +4282,7 @@ ...@@ -4263,7 +4282,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.x-dev" "dev-1.x": "1.x-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -4282,7 +4301,7 @@ ...@@ -4282,7 +4301,7 @@
} }
], ],
"description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "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", "name": "phpspec/prophecy",
...@@ -4601,16 +4620,16 @@ ...@@ -4601,16 +4620,16 @@
}, },
{ {
"name": "phpunit/phpunit", "name": "phpunit/phpunit",
"version": "8.5.6", "version": "8.5.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git", "url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "3f9c4079d1407cd84c51c02c6ad1df6ec2ed1348" "reference": "34c18baa6a44f1d1fbf0338907139e9dce95b997"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3f9c4079d1407cd84c51c02c6ad1df6ec2ed1348", "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/34c18baa6a44f1d1fbf0338907139e9dce95b997",
"reference": "3f9c4079d1407cd84c51c02c6ad1df6ec2ed1348", "reference": "34c18baa6a44f1d1fbf0338907139e9dce95b997",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -4680,7 +4699,7 @@ ...@@ -4680,7 +4699,7 @@
"testing", "testing",
"xunit" "xunit"
], ],
"time": "2020-06-15T10:45:47+00:00" "time": "2020-06-22T07:06:58+00:00"
}, },
{ {
"name": "scrivo/highlight.php", "name": "scrivo/highlight.php",
......
public/img/icons/local_logo.svg 0 → 100644
View file @ ef05180e
<svg xmlns="http://www.w3.org/2000/svg" width="20.594" height="27.459" viewBox="0 0 20.594 27.459">
<path id="Icon_awesome-map-marker-alt" data-name="Icon awesome-map-marker-alt" d="M9.239,26.9C1.446,15.608,0,14.449,0,10.3a10.3,10.3,0,0,1,20.594,0c0,4.152-1.446,5.311-9.239,16.608a1.288,1.288,0,0,1-2.116,0ZM10.3,14.587a4.29,4.29,0,1,0-4.29-4.29A4.29,4.29,0,0,0,10.3,14.587Z" fill="#fff"/>
</svg>
resources/views/evento/submeterTrabalho.blade.php
View file @ ef05180e
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
</div> </div>
<div class="col-sm-4"> <div class="col-sm-4">
<label for="area" class="col-form-label">{{ __('Área*:') }}</label> <label for="area" class="col-form-label">{{ __('Área*:') }}</label>
<input type="hidden" id="oldArea" value="{{ old('area') }}"></input> <input type="hidden" id="oldArea" value="{{ old('area') }}">
<select class="form-control @error('area') is-invalid @enderror" id="area" name="area" onchange="subareas()"> <select class="form-control @error('area') is-invalid @enderror" id="area" name="area" onchange="subareas()">
<option value="" disabled selected hidden>-- Área --</option> <option value="" disabled selected hidden>-- Área --</option>
{{-- @foreach($areas as $area) {{-- @foreach($areas as $area)
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
</div> </div>
<div class="col-sm-4"> <div class="col-sm-4">
<label for="subArea" class="col-form-label">{{ __('Sub Área*:') }}</label> <label for="subArea" class="col-form-label">{{ __('Sub Área*:') }}</label>
<input type="hidden" id="oldSubArea" value="{{ old('subArea') }}"></input> <input type="hidden" id="oldSubArea" value="{{ old('subArea') }}">
<select class="form-control @error('subArea') is-invalid @enderror" id="subArea" name="subArea"> <select class="form-control @error('subArea') is-invalid @enderror" id="subArea" name="subArea">
<option value="" disabled selected hidden>-- Sub Área --</option> <option value="" disabled selected hidden>-- Sub Área --</option>
{{-- @foreach($subAreas as $subArea) {{-- @foreach($subAreas as $subArea)
...@@ -226,7 +226,7 @@ ...@@ -226,7 +226,7 @@
<div class="custom-file"> <div class="custom-file">
<input type="file" class="custom-file-input @error('anexoPlanilha') is-invalid @enderror" id="anexoPlanilha" aria-describedby="anexoPlanilhaDescribe" name="anexoPlanilha" onchange="exibirAnexoTemp(this)"> <input type="file" class="custom-file-input @error('anexoPlanilha') is-invalid @enderror" id="anexoPlanilha" aria-describedby="anexoPlanilhaDescribe" name="anexoPlanilha" onchange="exibirAnexoTemp(this)">
<label class="custom-file-label" id="custom-file-label" for="anexoPlanilha">O arquivo deve ser no formato PDF ou XLS de até 2mb.</label> <label class="custom-file-label" id="custom-file-label" for="anexoPlanilha">O arquivo deve ser no formato PDF, XLS ou XLSX de até 2mb.</label>
</div> </div>
</div> </div>
@error('anexoPlanilha') @error('anexoPlanilha')
...@@ -396,7 +396,7 @@ ...@@ -396,7 +396,7 @@
@endfor @endfor
@endif @endif
</div> </div>
<input type="hidden" name="countParticipante" id="countParticipante" value="{{ old('countParticipante') != null ? old('countParticipante') : 1}}"></input> <input type="hidden" name="countParticipante" id="countParticipante" value="{{ old('countParticipante') != null ? old('countParticipante') : 1}}">
<a href="#" class="btn btn-primary" id="addCoautor" style="width:100%;margin-top:10px">Participantes +</a> <a href="#" class="btn btn-primary" id="addCoautor" style="width:100%;margin-top:10px">Participantes +</a>
</div> </div>
</div> </div>
......
resources/views/layouts/app.blade.php
View file @ ef05180e
...@@ -21,6 +21,67 @@ ...@@ -21,6 +21,67 @@
<link href="{{ asset('css/app.css') }}" rel="stylesheet"> <link href="{{ asset('css/app.css') }}" rel="stylesheet">
<link href="{{ asset('css/layout.css') }}" rel="stylesheet"> <link href="{{ asset('css/layout.css') }}" rel="stylesheet">
<style>
.styleRodape {
background-color: rgb(0, 140, 255);;
text-align: center;
}
.styleRodape_Imagem_ufape {
padding-top: 1.5rem;
padding-bottom: 1rem;
text-align: center;
}
.styleRodape_Imagem_lmts {
padding-top: 3rem;
padding-bottom: 2rem;
text-align: center;
}
.styleRodape_Texto {
font-size: 13px;
color: white;
text-align: center;
}
.styleRodape_Texto_Titulo {
padding-top: 1rem;
padding-bottom: 1rem;
color: white;
}
.styleRodape_Texto_Conteudo_MapaDoSite {
color: white;
font-size: 13px;
padding-top: 0.4rem;
}
.styleRodape_container {
padding-bottom: 0.1rem;
text-align: left;
}
.styleRodape_Texto_Contato {
font-size: 14px;
}
.styleRodape_linha_left {
border-left: solid;
color: white;
margin-top: 0.5rem;
padding-bottom: 1rem;
margin-left: 0.5rem;
height: 100%;
}
.styleRodape_linha_top {
border-top: solid;
color: white;
margin: 0.5rem;
}
</style>
</head> </head>
<body> <body>
...@@ -172,26 +233,78 @@ ...@@ -172,26 +233,78 @@
<script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js" integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous"></script> <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js" integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/js/bootstrap.min.js" integrity="sha384-OgVRvuATP1z7JjHLkuOU7Xw704+h835Lr+6QL9UvYjZE3Ipu6Tp75j7Bh/kR0JKI" crossorigin="anonymous"></script> <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/js/bootstrap.min.js" integrity="sha384-OgVRvuATP1z7JjHLkuOU7Xw704+h835Lr+6QL9UvYjZE3Ipu6Tp75j7Bh/kR0JKI" crossorigin="anonymous"></script>
<div class="rodape"> <div class="styleRodape">
<div class="container"> <div class="container">
<div class="container-fluid"> <div class="row justify-content-center">
<div class="row">
<a href="http://ww3.uag.ufrpe.br/" target="_blank" style="color: white;">
<div class="col-sm-2"> <div class="col-sm-2">
<img class="logo-ufape" src="{{ asset('img/logoUfape.svg') }}"/> <div class="row justify-content-center">
<div class="col-sm-12 styleRodape_Imagem_ufape">
<a href="http://ww3.uag.ufrpe.br/" target="_blank"><img src="{{ asset('img/logoUfape.svg') }}" alt="Logo" width="40px;"></a>
</div> </div>
<div class="col-sm-4 format-text"> <div class="col-sm-12 styleRodape_Texto">
<a href="http://ww3.uag.ufrpe.br/" target="_blank" style="color: white; font-size: 15px; position: relative; top: 30%; left: 0px;">Universidade Federal <br> do Agreste de Pernambuco</a> <a href="http://ww3.uag.ufrpe.br/" target="_blank" style="color: white; font-weight: normal;">Universidade Federal do Agreste de Pernambuco</a>
</div> </div>
</a> </div>
<a href="http://lmts.uag.ufrpe.br/" target="_blank" style="color: white;"> </div>
<div class="col-sm-3">
<div class="row justify-content-center">
<div class="col-sm-12 styleRodape_Imagem_lmts">
<a target="_blank" href="http://lmts.uag.ufrpe.br/"><img src="{{ asset('img/lmts.png') }}" alt="Logo" width="125px;"></a>
</div>
<div class="col-sm-12 styleRodape_Texto">
<a target="_blank" href="http://lmts.uag.ufrpe.br/" style="color: white; font-weight: normal;">Laboratório Multidisciplinar de Tecnologias Sociais</a>
</div>
</div>
</div>
<!--<div class="col-sm-2" align="center">
<div class="row justify-content-center" >
<div class="styleRodape_linha_left">
<div class="col-sm-12 styleRodape_Texto_Titulo">Mapa do site</div>
<div class="col-sm-12 styleRodape_Texto_Conteudo_MapaDoSite">Quem Somos</div>
<div class="col-sm-12 styleRodape_Texto_Conteudo_MapaDoSite">Equipe</div>
<div class="col-sm-12 styleRodape_Texto_Conteudo_MapaDoSite">Notícia</div>
<div class="col-sm-12 styleRodape_Texto_Conteudo_MapaDoSite">Projetos</div>
</div>
</div>
</div>-->
<div class="col-sm-2"> <div class="col-sm-2">
<img class="logo-lmts" src="{{ asset('img/lmts.png') }}"/> <div class="row justify-content-center" style="height: 170px;">
<div class="styleRodape_linha_left">
<div class="col-sm-12 styleRodape_Texto_Titulo">Contato
</div> </div>
<div class="col-sm-4 format-text"> <div class="col-sm-12 styleRodape_container">
<a href="http://lmts.uag.ufrpe.br/" target="_blank" style="color: white; font-size: 15px; position: relative; top: 30%; left: 0px;">Laboratório Multidisciplinar <br> de Tecnologias Sociais</a> <div class="row">
<div class="col">
<img src="{{ asset('img/icons/instagram-brands.svg') }}" alt="Logo" width="20px;">
<a href="https://www.instagram.com/lmts_ufape/" target="_blank" class="styleRodape_Texto_Contato" style="color: white; font-weight: normal;">@lmts_ufape</a>
</div> </div>
</a> </div>
</div>
<div class="col-sm-12 styleRodape_container">
<div class="row justify-content-center">
<div class="col">
<img src="{{ asset('img/icons/facebook-square-brands.svg') }}" alt="Logo" width="20px;">
<a href="https://www.facebook.com/LMTSUFAPE/" target="_blank" class="styleRodape_Texto_Contato" style="color: white; font-weight: normal;">@LMTSUFAPE</a>
</div>
</div>
</div>
<div class="col-sm-12 styleRodape_container">
<div class="row">
<div class="col">
<span>lmts@ufrpe.br</span>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="row justify-content-center styleRodape_container styleRodape_linha_top">
<div class="btg-group">
<img src="{{ asset('img/icons/local_logo.svg') }}" alt="Logo" width="10px;">
<a class="styleRodape_Texto" style="padding: 0.5rem; color: white; font-weight: normal;">Avenida Bom Pastor. s/nº Bairro Boa Vista - CEP 55292-270 - Garanhuns - PE</a>
</div> </div>
</div> </div>
</div> </div>
......
resources/views/projeto/editar.blade.php
View file @ ef05180e
...@@ -215,7 +215,7 @@ ...@@ -215,7 +215,7 @@
<div class="custom-file"> <div class="custom-file">
<input type="file" class="custom-file-input @error('anexoPlanilha') is-invalid @enderror" id="anexoPlanilha" aria-describedby="anexoPlanilhaDescribe" name="anexoPlanilha"> <input type="file" class="custom-file-input @error('anexoPlanilha') is-invalid @enderror" id="anexoPlanilha" aria-describedby="anexoPlanilhaDescribe" name="anexoPlanilha">
<label class="custom-file-label" id="custom-file-label" for="anexoPlanilha">O arquivo deve ser no formato PDF de até 2mb.</label> <label class="custom-file-label" id="custom-file-label" for="anexoPlanilha">O arquivo deve ser no formato PDF, XLS ou XLSX de até 2mb.</label>
</div> </div>
</div> </div>
@error('anexoPlanilha') @error('anexoPlanilha')
......
resources/views/projeto/index.blade.php
View file @ ef05180e
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
</thead> </thead>
<tbody> <tbody>
@foreach ($projetos as $projeto) @foreach ($projetos as $projeto)
@if ($projeto->status != 'Rascunho') @if ($projeto->status != 'Rascunho' && $projeto->proponente_id === Auth()->user()->proponentes->id)
<tr> <tr>
<td> <td>
{{ $projeto->titulo }} {{ $projeto->titulo }}
...@@ -76,17 +76,10 @@ ...@@ -76,17 +76,10 @@
<a href="" class="dropdown-item" style="text-align: center"> <a href="" class="dropdown-item" style="text-align: center">
Resultado Resultado
</a> --}} </a> --}}
@if($projeto->status == 'Submetido')
<!-- Button trigger modal --> <!-- Button trigger modal -->
<button type="button" class="dropdown-item"data-toggle="modal" data-target="#modal{{$projeto->id}}"> <button type="button" class="dropdown-item" data-toggle="modal" data-target="#modal{{$projeto->id}}" style="text-align: center">
Excluir projeto Excluir projeto
</button> </button>
@endif
</div> </div>
</div> </div>
</td> </td>
......
resources/views/proponente/projetos.blade.php
View file @ ef05180e
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
</thead> </thead>
<tbody> <tbody>
@foreach ($projetos as $projeto) @foreach ($projetos as $projeto)
@if ($projeto->status != 'Rascunho')
<tr> <tr>
<td> <td>
{{ $projeto->titulo }} {{ $projeto->titulo }}
...@@ -71,6 +72,7 @@ ...@@ -71,6 +72,7 @@
</div> </div>
</td> </td>
</tr> </tr>
@endif
<!-- Modal --> <!-- Modal -->
<div class="modal fade" id="modal{{$projeto->id}}" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true"> <div class="modal fade" id="modal{{$projeto->id}}" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog"> <div class="modal-dialog">
......
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