FGFS-4.1/phpvms
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Design and file upload issues (#399)

Browse Source 
* Fix some styling issues/edit button on PIREP overview page

* Fix validation for file/url upload

* Formatting
This commit is contained in:
Nabeel S
2019-09-16 15:17:51 -04:00
committed by GitHub
parent aedb1f22b6
commit 6e9dcf8a31
20 changed files with 249 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Admin/FileController.php
+12 -6
View File
@@ -6,7 +6,6 @@ use App\Contracts\Controller;
use App\Models\File;
use App\Services\FileService;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Input;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Validator;
use Illuminate\Validation\Rule;
@@ -53,18 +52,20 @@ class FileController extends Controller
[
'file_name' => 'required',
'file_description' => 'nullable',
'file' => [
'file' => 'nullable|file',
'url' => 'nullable|url',
/*'file' => [
Rule::requiredIf(function () {
return !request()->filled('url');
return request()->filled('url') === false;
}),
'file',
],
'url' => [
Rule::requiredIf(function () {
return !request()->hasFile('file');
return request()->hasFile('file') === false;
}),
'url',
],
],*/
],
[
'file.required' => 'File or URL are required',
@@ -76,7 +77,12 @@ class FileController extends Controller
return redirect()
->back()
->withErrors($validator)
->withInput(Input::all());
->withInput($request->all());
}
if (!$request->hasFile('file') && !$request->filled('url')) {
$validator->errors()->add('url', 'A URL or file must be uploaded!');
return redirect()->back()->withErrors($validator)->withInput($request->all());
}
Log::info('Uploading files', $attrs);
composer.json
+2 -2
View File
@@ -20,6 +20,7 @@
"arrilot/laravel-widgets": "~3.13.0",
"doctrine/dbal": "~2.9.2",
"elcobvg/laravel-opcache": "~0.4",
"facade/ignition": "^1.6",
"guzzlehttp/guzzle": "~6.3.3",
"hashids/hashids": "^2.0.0",
"igaster/laravel-theme": "^2.0",
@@ -48,8 +49,7 @@
"symfony/polyfill-iconv": "~1.12",
"theiconic/php-ga-measurement-protocol": "2.7.*",
"tivie/php-os-detector": "~1.1.0",
"webpatser/laravel-uuid": "~3.0",
"facade/ignition": "^1.6"
"webpatser/laravel-uuid": "~3.0"
},
"require-dev": {
"barryvdh/laravel-debugbar": "^3.0",
composer.lock
Generated
+22 -22
View File
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "36efcc47f7cb692d56b1fe62108d86a1",
"content-hash": "60c8d4678763253ee0fa8711dce01cfb",
"packages": [
{
"name": "akaunting/money",
@@ -1489,16 +1489,16 @@
},
{
"name": "facade/ignition",
"version": "1.6.4",
"version": "1.6.5",
"source": {
"type": "git",
"url": "https://github.com/facade/ignition.git",
"reference": "43b825a2f77805d1d5495c64eecd272b05ab0e33"
"reference": "97244f6d511332f3574acab8242c09ddcfda892b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/facade/ignition/zipball/43b825a2f77805d1d5495c64eecd272b05ab0e33",
"reference": "43b825a2f77805d1d5495c64eecd272b05ab0e33",
"url": "https://api.github.com/repos/facade/ignition/zipball/97244f6d511332f3574acab8242c09ddcfda892b",
"reference": "97244f6d511332f3574acab8242c09ddcfda892b",
"shasum": ""
},
"require": {
@@ -1553,7 +1553,7 @@
"laravel",
"page"
],
"time": "2019-09-13T07:41:17+00:00"
"time": "2019-09-13T13:38:04+00:00"
},
{
"name": "facade/ignition-contracts",
@@ -4279,16 +4279,16 @@
},
{
"name": "santigarcor/laratrust",
"version": "5.2.3",
"version": "5.2.4",
"source": {
"type": "git",
"url": "https://github.com/santigarcor/laratrust.git",
"reference": "ee06bbb21c18b9262f174eaa1337bc1344a4b0f0"
"reference": "43d2354b149485731a9214014baf3421a6a56b9a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/santigarcor/laratrust/zipball/ee06bbb21c18b9262f174eaa1337bc1344a4b0f0",
"reference": "ee06bbb21c18b9262f174eaa1337bc1344a4b0f0",
"url": "https://api.github.com/repos/santigarcor/laratrust/zipball/43d2354b149485731a9214014baf3421a6a56b9a",
"reference": "43d2354b149485731a9214014baf3421a6a56b9a",
"shasum": ""
},
"require": {
@@ -4340,7 +4340,7 @@
"rbac",
"roles"
],
"time": "2019-09-03T14:11:14+00:00"
"time": "2019-09-16T15:50:06+00:00"
},
{
"name": "scrivo/highlight.php",
@@ -8432,16 +8432,16 @@
},
{
"name": "phpunit/phpunit",
"version": "8.3.4",
"version": "8.3.5",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "e31cce0cf4499c0ccdbbb211a3280d36ab341e36"
"reference": "302faed7059fde575cf3403a78c730c5e3a62750"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/e31cce0cf4499c0ccdbbb211a3280d36ab341e36",
"reference": "e31cce0cf4499c0ccdbbb211a3280d36ab341e36",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/302faed7059fde575cf3403a78c730c5e3a62750",
"reference": "302faed7059fde575cf3403a78c730c5e3a62750",
"shasum": ""
},
"require": {
@@ -8464,7 +8464,7 @@
"sebastian/comparator": "^3.0.2",
"sebastian/diff": "^3.0.2",
"sebastian/environment": "^4.2.2",
"sebastian/exporter": "^3.1.0",
"sebastian/exporter": "^3.1.1",
"sebastian/global-state": "^3.0.0",
"sebastian/object-enumerator": "^3.0.3",
"sebastian/resource-operations": "^2.0.1",
@@ -8511,7 +8511,7 @@
"testing",
"xunit"
],
"time": "2019-08-11T06:56:55+00:00"
"time": "2019-09-14T09:12:03+00:00"
},
{
"name": "sebastian/code-unit-reverse-lookup",
@@ -8733,16 +8733,16 @@
},
{
"name": "sebastian/exporter",
"version": "3.1.1",
"version": "3.1.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/exporter.git",
"reference": "06a9a5947f47b3029d76118eb5c22802e5869687"
"reference": "68609e1261d215ea5b21b7987539cbfbe156ec3e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/06a9a5947f47b3029d76118eb5c22802e5869687",
"reference": "06a9a5947f47b3029d76118eb5c22802e5869687",
"url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/68609e1261d215ea5b21b7987539cbfbe156ec3e",
"reference": "68609e1261d215ea5b21b7987539cbfbe156ec3e",
"shasum": ""
},
"require": {
@@ -8796,7 +8796,7 @@
"export",
"exporter"
],
"time": "2019-08-11T12:43:14+00:00"
"time": "2019-09-14T09:02:43+00:00"
},
{
"name": "sebastian/global-state",
public/assets/admin/js/app.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
public/assets/frontend/css/now-ui-kit.css
+1 -1
View File
File diff suppressed because one or more lines are too long
public/assets/frontend/css/now-ui-kit.css.map
+1 -1
View File
File diff suppressed because one or more lines are too long
public/assets/frontend/js/app.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
public/assets/installer/css/vendor.css
+1 -1
View File
File diff suppressed because one or more lines are too long
public/assets/installer/js/app.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
public/mix-manifest.json
+6 -6
View File
@@ -1,14 +1,14 @@
{
"/assets/frontend/js/app.js": "/assets/frontend/js/app.js?id=88270e919809fead277c",
"/assets/frontend/css/now-ui-kit.css": "/assets/frontend/css/now-ui-kit.css?id=b2dd2a0a882054cad3d5",
"/assets/frontend/css/now-ui-kit.css": "/assets/frontend/css/now-ui-kit.css?id=b5787f0d0877f2b14e37",
"/assets/admin/css/vendor.min.css": "/assets/admin/css/vendor.min.css?id=9f24c5e6612e74065901",
"/assets/frontend/js/app.js.map": "/assets/frontend/js/app.js.map?id=c714055cc7132853c1d6",
"/assets/frontend/css/now-ui-kit.css.map": "/assets/frontend/css/now-ui-kit.css.map?id=6399f2da87c32423e68b",
"/assets/frontend/js/app.js.map": "/assets/frontend/js/app.js.map?id=8d8dd87c204912b948d8",
"/assets/frontend/css/now-ui-kit.css.map": "/assets/frontend/css/now-ui-kit.css.map?id=cb1b608aa71187b21c09",
"/assets/admin/css/vendor.min.css.map": "/assets/admin/css/vendor.min.css.map?id=c266c31652dea865307c",
"/assets/admin/js/app.js": "/assets/admin/js/app.js?id=cd8b03d3b7bd54e960ca",
"/assets/admin/js/app.js.map": "/assets/admin/js/app.js.map?id=6d4305f02e7e757e1666",
"/assets/admin/js/app.js.map": "/assets/admin/js/app.js.map?id=27b5a1474145c1c3bc18",
"/assets/installer/js/app.js": "/assets/installer/js/app.js?id=7eb8b66dce0064082abc",
"/assets/installer/js/app.js.map": "/assets/installer/js/app.js.map?id=8d818e1a57d346adf7b3",
"/assets/installer/js/app.js.map": "/assets/installer/js/app.js.map?id=fd03a7d60e4cfd02a2c0",
"/assets/fonts/glyphicons-halflings-regular.woff2": "/assets/fonts/glyphicons-halflings-regular.woff2?id=349344e92fb16221dd56",
"/assets/admin/fonts/glyphicons-halflings-regular.woff2": "/assets/admin/fonts/glyphicons-halflings-regular.woff2?id=349344e92fb16221dd56",
"/assets/admin/img/clear.png": "/assets/admin/img/clear.png?id=63b3af84650a0145d61a",
@@ -19,7 +19,7 @@
"/assets/frontend/js/vendor.js": "/assets/frontend/js/vendor.js?id=7b2f95d32e095b2bbbfa",
"/assets/admin/css/vendor.css": "/assets/admin/css/vendor.css?id=3faf0c4cbfe14c8b99cf",
"/assets/admin/js/vendor.js": "/assets/admin/js/vendor.js?id=ad2f530d0b8e9bd6b6d3",
"/assets/installer/css/vendor.css": "/assets/installer/css/vendor.css?id=80d2f4f3cc9799d85e47",
"/assets/installer/css/vendor.css": "/assets/installer/css/vendor.css?id=9ddcf58750fc5b40bd6c",
"/assets/installer/js/vendor.js": "/assets/installer/js/vendor.js?id=1b8dba4c184ce249e7fe",
"/assets/global/js/vendor.js": "/assets/global/js/vendor.js?id=666b04d3b318da723aff",
"/assets/global/css/vendor.css": "/assets/global/css/vendor.css?id=89afa5863f07a984ffeb"
resources/sass/now-ui/now-ui-kit/_phpvms.scss
+7
View File
@@ -34,3 +34,10 @@
}
}
}
/*
* This color falls through from bootstrap which defaults it to transparent
*/
.form-control {
background-color: $white-bg;
}
resources/views/admin/common/file_upload.blade.php
+2
View File
@@ -61,6 +61,8 @@ Pass in:
])
}}
{{ Form::token() }}
<span class="required">*</span>
{{ Form::text('file_name', null, ['class' => 'form-control', 'placeholder' => 'Name']) }}
{{ Form::text('file_description', null, ['class' => 'form-control', 'placeholder' => 'Description']) }}
resources/views/layouts/default/app.blade.php
-4
View File
@@ -34,18 +34,14 @@
<body>
<!-- Navbar -->
<nav class="navbar navbar-expand-lg " style="background: #067ec1;">
<div class="container" style="width: 85%!important;">
<div class="navbar-translate">
<p class="navbar-brand text-white" data-placement="bottom" target="_blank">
<a href="{{ url('/') }}">
<img src="{{ public_asset('/assets/img/logo_blue_bg.svg') }}" width="135px" style=""/>
</a>
</p>
</div>
<div class="collapse navbar-collapse justify-content-end" id="navigation">
@include('nav')
</div>
</div>
</nav>
<!-- End Navbar -->
<div id="top_anchor" class="clearfix" style="height: 25px;"></div>
resources/views/layouts/default/auth/login.blade.php
+2 -2
View File
@@ -1,10 +1,10 @@
@extends('auth.layout')
@extends('auth.login_layout')
@section('title', __('common.login'))
@section('content')
<div class="col-md-4 ml-auto mr-auto content-center">
<div class="card card-login card-plain">
{{ Form::open(['url' => url('/login'), 'method' => 'post']) }}
{{ Form::open(['url' => url('/login'), 'method' => 'post', 'class' => 'form']) }}
<div class="header header-primary text-center">
<div class="logo-container" style="width: 320px;">
<img src="{{ public_asset('/assets/frontend/img/logo.svg') }}" width="320" height="320"
resources/views/layouts/default/auth/layout.blade.php → resources/views/layouts/default/auth/login_layout.blade.php
View File
resources/views/layouts/default/dashboard/index.blade.php
+8 -8
View File
@@ -9,7 +9,7 @@
<div class="row">
<div class="col-sm-3">
<div class="card card-primary text-white dashboard-box">
<div class="card-block text-center">
<div class="card-body text-center">
<div class="icon-background">
<i class="fas fa-plane icon"></i>
</div>
@@ -21,7 +21,7 @@
<div class="col-sm-3">
<div class="card card-primary text-white dashboard-box">
<div class="card-block text-center">
<div class="card-body text-center">
<div class="icon-background">
<i class="far fa-clock icon"></i>
</div>
@@ -32,7 +32,7 @@
</div>
<div class="col-sm-3">
<div class="card card-primary text-white dashboard-box">
<div class="card-block text-center">
<div class="card-body text-center">
<div class="icon-background"> {{--110px font-size--}}
<i class="fas fa-money-bill-alt icon"></i>
</div>
@@ -44,7 +44,7 @@
<div class="col-sm-3">
<div class="card card-primary text-white dashboard-box">
<div class="card-block text-center">
<div class="card-body text-center">
<div class="icon-background">
<i class="fas fa-map-marker icon"></i>
</div>
@@ -65,7 +65,7 @@
@lang('dashboard.yourlastreport')
</div>
@if($last_pirep === null)
<div class="card-block" style="text-align:center;">
<div class="card-body" style="text-align:center;">
@lang('dashboard.noreportsyet') <a href="{{ route('frontend.pireps.create') }}">@lang('dashboard.fileonenow')</a>
</div>
@else
@@ -83,7 +83,7 @@
<div class="nav nav-tabs" role="tablist" style="background: #067ec1; color: #FFF;">
@lang('dashboard.weatherat', ['ICAO' => $current_airport])
</div>
<div class="card-block">
<div class="card-body">
<!-- Tab panes -->
<div class="tab-content">
{{ Widget::Weather(['icao' => $current_airport]) }}
@@ -95,7 +95,7 @@
<div class="nav nav-tabs" role="tablist" style="background: #067ec1; color: #FFF;">
@lang('dashboard.recentreports')
</div>
<div class="card-block">
<div class="card-body">
<!-- Tab panes -->
<div class="tab-content">
{{ Widget::latestPireps(['count' => 5]) }}
@@ -107,7 +107,7 @@
<div class="nav nav-tabs" role="tablist" style="background: #067ec1; color: #FFF;">
@lang('common.newestpilots')
</div>
<div class="card-block">
<div class="card-body">
<!-- Tab panes -->
<div class="tab-content">
{{ Widget::latestPilots(['count' => 5]) }}
resources/views/layouts/default/nav.blade.php
+4
View File
@@ -1,3 +1,5 @@
<div class="nav-tabs-navigation">
<div class="nav-tabs-wrapper">
<ul class="navbar-nav align-middle">
@if(Auth::check())
<li class="nav-item">
@@ -105,3 +107,5 @@
@endif
</ul>
</div>
</div>
resources/views/layouts/default/pireps/table.blade.php
+9 -4
View File
@@ -1,6 +1,5 @@
{{--@each('pireps.pirep_card', $pireps, 'pirep')--}}
<table class="table table-condensed table-hover">
<div class="table-responsive">
<table class="table table-sm table-hover table-striped">
<thead>
<tr>
<th>{{ trans_choice('common.flight', 1) }}</th>
@@ -58,7 +57,12 @@
</td>
<td>
@if(!$pirep->read_only)
<a href="{{ route('frontend.pireps.edit', [$pirep->id]) }}">@lang('common.edit')</a>
<a href="{{ route('frontend.pireps.edit', [$pirep->id]) }}"
class="btn btn-info btn-sm"
style="z-index: 9999"
title="@lang('common.edit')">
edit
</a>
@endif
</td>
</tr>
@@ -66,3 +70,4 @@
</tbody>
</table>
</div>
resources/views/layouts/default/widgets/latest_news.blade.php
+1 -1
View File
@@ -2,7 +2,7 @@
@lang('widgets.latestnews.news')
</div>
<div class="card border-blue-bottom">
<div class="card-block" style="min-height: 0px">
<div class="card-body" style="min-height: 0px">
@if($news->count() === 0)
<div class="text-center text-muted" style="padding: 30px;">
@lang('widgets.latestnews.nonewsfound')
webpack.mix.js
+2 -1
View File
@@ -27,7 +27,8 @@ function copyAssets()
function buildFrontendAssets()
{
mix.sass('resources/sass/now-ui/now-ui-kit.scss', 'public/assets/frontend/css/now-ui-kit.css');
mix.sass('resources/sass/now-ui/now-ui-kit.scss', 'public/assets/frontend/css/now-ui-kit.css')
.sourceMaps();
mix.scripts([
'node_modules/moment/moment.js',