From 86d28aafd6fd71bbafd742a2794c8baef70910b9 Mon Sep 17 00:00:00 2001 From: Nabeel Shahzad Date: Sun, 8 Apr 2018 20:51:27 -0500 Subject: [PATCH] added a few columns for scheduling, styling in admin --- ...2017_06_17_214650_create_flight_tables.php | 5 +- public/assets/admin/css/vendor.css | 35 +++- public/assets/admin/css/vendor.min.css | 35 +++- public/mix-manifest.json | 4 +- resources/sass/admin/paper-dashboard.scss | 3 +- resources/sass/admin/paper/_cards.scss | 2 +- .../sass/admin/paper/_form-container.scss | 21 ++ resources/sass/admin/paper/_variables.scss | 8 +- .../views/admin/flights/fields.blade.php | 196 ++++++++++-------- .../layouts/default/downloads/index.blade.php | 24 ++- .../layouts/default/flights/index.blade.php | 2 +- .../layouts/default/pireps/index.blade.php | 2 +- .../layouts/default/users/index.blade.php | 6 +- .../default/widgets/live_map.blade.php | 4 +- 14 files changed, 219 insertions(+), 128 deletions(-) create mode 100644 resources/sass/admin/paper/_form-container.scss diff --git a/app/Database/migrations/2017_06_17_214650_create_flight_tables.php b/app/Database/migrations/2017_06_17_214650_create_flight_tables.php index 0fc2a272..d052ae3a 100644 --- a/app/Database/migrations/2017_06_17_214650_create_flight_tables.php +++ b/app/Database/migrations/2017_06_17_214650_create_flight_tables.php @@ -24,13 +24,16 @@ class CreateFlightTables extends Migration $table->string('alt_airport_id', 5)->nullable(); $table->string('dpt_time', 10)->nullable(); $table->string('arr_time', 10)->nullable(); - $table->unsignedTinyInteger('days')->nullable(); $table->unsignedInteger('level')->nullable()->default(0); $table->unsignedDecimal('distance')->nullable()->default(0.0); $table->unsignedInteger('flight_time')->nullable(); $table->char('flight_type', 1)->default(FlightType::SCHED_PAX); $table->text('route')->nullable(); $table->text('notes')->nullable(); + $table->boolean('scheduled')->default(false)->nullable(); + $table->unsignedTinyInteger('days')->nullable(); + $table->date('start_date')->nullable(); + $table->date('end_date')->nullable(); $table->boolean('has_bid')->default(false); $table->boolean('active')->default(true); $table->timestamps(); diff --git a/public/assets/admin/css/vendor.css b/public/assets/admin/css/vendor.css index dd7de6af..e1b6aaae 100644 --- a/public/assets/admin/css/vendor.css +++ b/public/assets/admin/css/vendor.css @@ -13258,7 +13258,7 @@ input { } .form-control + .form-control-feedback { - border-radius: 6px; + border-radius: 3px; font-size: 14px; margin-top: -7px; position: absolute; @@ -13294,7 +13294,7 @@ input { .input-group-addon { background-color: #fffcf5; border: medium none; - border-radius: 4px; + border-radius: 2px; } .has-success .input-group-addon, @@ -13434,7 +13434,7 @@ textarea.form-control { .alert[data-notify="container"] { padding: 10px 10px 10px 20px; - border-radius: 4px; + border-radius: 2px; } .alert.alert-with-icon { @@ -14125,7 +14125,7 @@ textarea.form-control { -webkit-box-shadow: 0 2px 2px rgba(204, 197, 185, 0.5); box-shadow: 0 2px 2px rgba(204, 197, 185, 0.5); background-color: #FFFFFF; - color: #252422; + color: #2c2c2c; margin-bottom: 20px; position: relative; z-index: 1; @@ -14189,7 +14189,6 @@ textarea.form-control { .card label { font-size: 14px; font-weight: 400; - color: #9A9A9A; text-transform: capitalize; margin-bottom: 0px; } @@ -14209,7 +14208,7 @@ textarea.form-control { .card .title { margin: 0; - color: #252422; + color: #2c2c2c; font-weight: 300; } @@ -14286,7 +14285,7 @@ textarea.form-control { } .card .alert { - border-radius: 4px; + border-radius: 2px; position: relative; } @@ -16069,6 +16068,28 @@ fieldset[disabled] .card .btn-neutral.active { } } +.form-container { + border: 0; + border-radius: 2px; + display: inline-block; + position: relative; + overflow: hidden; + width: 100%; + margin-bottom: 20px; + font-weight: bold; + text-transform: uppercase; +} + +.form-container h6 { + font-size: 15px; + padding: 7px; + background-color: rgba(222, 222, 222, 0.3); +} + +.form-container .form-container-body { + padding: 8px; +} + /* * Licensing: http://www.pixeden.com/icon-fonts/stroke-7-icon-font-set */ diff --git a/public/assets/admin/css/vendor.min.css b/public/assets/admin/css/vendor.min.css index af7c92fd..315b6574 100644 --- a/public/assets/admin/css/vendor.min.css +++ b/public/assets/admin/css/vendor.min.css @@ -1379,7 +1379,7 @@ input { } .form-control + .form-control-feedback { - border-radius: 6px; + border-radius: 3px; font-size: 14px; margin-top: -7px; position: absolute; @@ -1415,7 +1415,7 @@ input { .input-group-addon { background-color: #fffcf5; border: medium none; - border-radius: 4px; + border-radius: 2px; } .has-success .input-group-addon, @@ -1555,7 +1555,7 @@ textarea.form-control { .alert[data-notify="container"] { padding: 10px 10px 10px 20px; - border-radius: 4px; + border-radius: 2px; } .alert.alert-with-icon { @@ -2246,7 +2246,7 @@ textarea.form-control { -webkit-box-shadow: 0 2px 2px rgba(204, 197, 185, 0.5); box-shadow: 0 2px 2px rgba(204, 197, 185, 0.5); background-color: #FFFFFF; - color: #252422; + color: #2c2c2c; margin-bottom: 20px; position: relative; z-index: 1; @@ -2310,7 +2310,6 @@ textarea.form-control { .card label { font-size: 14px; font-weight: 400; - color: #9A9A9A; text-transform: capitalize; margin-bottom: 0px; } @@ -2330,7 +2329,7 @@ textarea.form-control { .card .title { margin: 0; - color: #252422; + color: #2c2c2c; font-weight: 300; } @@ -2407,7 +2406,7 @@ textarea.form-control { } .card .alert { - border-radius: 4px; + border-radius: 2px; position: relative; } @@ -4190,6 +4189,28 @@ fieldset[disabled] .card .btn-neutral.active { } } +.form-container { + border: 0; + border-radius: 2px; + display: inline-block; + position: relative; + overflow: hidden; + width: 100%; + margin-bottom: 20px; + font-weight: bold; + text-transform: uppercase; +} + +.form-container h6 { + font-size: 15px; + padding: 7px; + background-color: rgba(222, 222, 222, 0.3); +} + +.form-container .form-container-body { + padding: 8px; +} + /* * Licensing: http://www.pixeden.com/icon-fonts/stroke-7-icon-font-set */ diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 7c093130..eba2a06f 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,7 +1,7 @@ { "/assets/frontend/js/app.js": "/assets/frontend/js/app.js?id=3d5b0dff38050f6b5e0b", "/assets/frontend/css/now-ui-kit.css": "/assets/frontend/css/now-ui-kit.css?id=a64d6e004c25bd2720b2", - "/assets/admin/css/vendor.min.css": "/assets/admin/css/vendor.min.css?id=a11d81c6bf8d7a548c86", + "/assets/admin/css/vendor.min.css": "/assets/admin/css/vendor.min.css?id=61da6b300cd04cca6799", "/assets/admin/js/app.js": "/assets/admin/js/app.js?id=926a7c24ec36533523e3", "/assets/installer/js/app.js": "/assets/installer/js/app.js?id=c65781eda730445d666e", "/assets/fonts/glyphicons-halflings-regular.woff2": "/assets/fonts/glyphicons-halflings-regular.woff2?id=b5b5055c6d812c0f9f0d", @@ -9,7 +9,7 @@ "/assets/admin/img/clear.png": "/assets/admin/img/clear.png?id=0e92f4c3efc6988a3c96", "/assets/admin/img/loading.gif": "/assets/admin/img/loading.gif?id=90a4b76b4f11558691f6", "/assets/global/js/jquery.js": "/assets/global/js/jquery.js?id=6a07da9fae934baf3f74", - "/assets/admin/css/vendor.css": "/assets/admin/css/vendor.css?id=d996fcb13fe42a360434", + "/assets/admin/css/vendor.css": "/assets/admin/css/vendor.css?id=7453fe9b5675cd1d759c", "/assets/admin/js/vendor.js": "/assets/admin/js/vendor.js?id=aa7db4bedfe23409f625", "/assets/admin/css/blue.png": "/assets/admin/css/blue.png?id=753a3c0dec86d3a38d9c", "/assets/admin/css/blue@2x.png": "/assets/admin/css/blue@2x.png?id=97da23d47b838cbd4bef", diff --git a/resources/sass/admin/paper-dashboard.scss b/resources/sass/admin/paper-dashboard.scss index 1c800612..ba21a27e 100755 --- a/resources/sass/admin/paper-dashboard.scss +++ b/resources/sass/admin/paper-dashboard.scss @@ -34,12 +34,11 @@ @import "paper/navbars"; @import "paper/footers"; -// Fancy Stuff - @import "paper/dropdown"; @import "paper/cards"; @import "paper/chartist"; @import "paper/responsive"; +@import "paper/form-container"; $pe-7s-font-path: "../../fonts" !default; @import "../../../node_modules/pe7-icon/dist/scss/pe-icon-7-stroke"; diff --git a/resources/sass/admin/paper/_cards.scss b/resources/sass/admin/paper/_cards.scss index 5cb7f6e8..b6740fcd 100644 --- a/resources/sass/admin/paper/_cards.scss +++ b/resources/sass/admin/paper/_cards.scss @@ -61,7 +61,7 @@ label{ font-size: $font-size-base; font-weight: $font-weight-normal; - color: $dark-gray; + //color: $dark-gray; text-transform: capitalize; margin-bottom: 0px; i{ diff --git a/resources/sass/admin/paper/_form-container.scss b/resources/sass/admin/paper/_form-container.scss new file mode 100644 index 00000000..6df28e6f --- /dev/null +++ b/resources/sass/admin/paper/_form-container.scss @@ -0,0 +1,21 @@ +.form-container { + border: 0; + border-radius: 2px; + display: inline-block; + position: relative; + overflow: hidden; + width: 100%; + margin-bottom: 20px; + font-weight: bold; + text-transform: uppercase; + + h6 { + font-size: 15px; + padding: 7px; + background-color: rgba(222, 222, 222, 0.3); + } + + .form-container-body { + padding: 8px; + } +} diff --git a/resources/sass/admin/paper/_variables.scss b/resources/sass/admin/paper/_variables.scss index 764636fc..b0798f77 100644 --- a/resources/sass/admin/paper/_variables.scss +++ b/resources/sass/admin/paper/_variables.scss @@ -149,9 +149,9 @@ $margin-bottom: 0 0 10px 0 !default; $border: 1px solid !default; $border-radius-extra-small: 0.125rem !default; $border-radius-tiny: 0.1875rem !default; -$border-radius-small: 3px !default; -$border-radius-base: 4px !default; -$border-radius-large: 6px !default; +$border-radius-small: 0.1875px !default; +$border-radius-base: 2px !default; +$border-radius-large: 3px !default; $border-radius-extreme: 6px !default; $border-radius-large-top: $border-radius-large $border-radius-large 0 0 !default; @@ -276,7 +276,7 @@ $sidebar-width: calc(100% - 260px) !default; $medium-dark-gray: #AAAAAA !default; //variables used in cards -$card-black-color: #252422 !default; +$card-black-color: #2c2c2c !default; $card-muted-color: #ccc5b9 !default; diff --git a/resources/views/admin/flights/fields.blade.php b/resources/views/admin/flights/fields.blade.php index 00148e6d..e7db2885 100644 --- a/resources/views/admin/flights/fields.blade.php +++ b/resources/views/admin/flights/fields.blade.php @@ -1,98 +1,122 @@
-
- {{ Form::label('airline_id', 'Airline:') }} * - {{ Form::select('airline_id', $airlines, null , ['class' => 'form-control select2']) }} -

{{ $errors->first('airline_id') }}

-
+
+
+
+  Flight Information +
+
+
+
+ {{ Form::label('airline_id', 'Airline:') }} * + {{ Form::select('airline_id', $airlines, null , ['class' => 'form-control select2']) }} +

{{ $errors->first('airline_id') }}

+
- -
- {{ Form::label('flight_number', 'Flight Number:') }} * - {{ Form::text('flight_number', null, ['class' => 'form-control']) }} -

{{ $errors->first('flight_number') }}

-
+ +
+ {{ Form::label('flight_number', 'Flight Number:') }} * + {{ Form::text('flight_number', null, ['class' => 'form-control']) }} +

{{ $errors->first('flight_number') }}

+
- -
- {{ Form::label('route_code', 'Route Code:') }} - {{ Form::text('route_code', null, ['class'=>'form-control', 'placeholder'=>'optional']) }} -

{{ $errors->first('route_code') }}

-
+ +
+ {{ Form::label('route_code', 'Route Code:') }} + {{ Form::text('route_code', null, ['class'=>'form-control', 'placeholder'=>'optional']) }} +

{{ $errors->first('route_code') }}

+
- -
- {{ Form::label('route_leg', 'Route Leg:') }} - {{ Form::text('route_leg', null, ['class'=>'form-control', 'placeholder'=>'optional']) }} -

{{ $errors->first('route_leg') }}

+ +
+ {{ Form::label('route_leg', 'Route Leg:') }} + {{ Form::text('route_leg', null, ['class'=>'form-control', 'placeholder'=>'optional']) }} +

{{ $errors->first('route_leg') }}

+
+
+
+
-
- - {{ Form::label('days[]', 'Monday') }} - {{ Form::checkbox( - 'days[]', - \App\Models\Enums\Days::MONDAY, - in_mask($days, \App\Models\Enums\Days::MONDAY), - ['class' => 'form-control icheck'] - ) }} - - - {{ Form::label('days[]', 'Tuesday') }} - {{ Form::checkbox( - 'days[]', - \App\Models\Enums\Days::TUESDAY, - in_mask($days, \App\Models\Enums\Days::TUESDAY), - ['class' => 'form-control icheck'] - ) }} - - - {{ Form::label('days[]', 'Wednesday') }} - {{ Form::checkbox( - 'days[]', - \App\Models\Enums\Days::WEDNESDAY, - in_mask($days, \App\Models\Enums\Days::WEDNESDAY), - ['class' => 'form-control icheck'] - ) }} - - - {{ Form::label('days[]', 'Thursday') }} - {{ Form::checkbox( - 'days[]', - \App\Models\Enums\Days::THURSDAY, - in_mask($days, \App\Models\Enums\Days::THURSDAY), - ['class' => 'form-control icheck'] - ) }} - - - {{ Form::label('days[]', 'Friday') }} - {{ Form::checkbox( - 'days[]', - \App\Models\Enums\Days::FRIDAY, - in_mask($days, \App\Models\Enums\Days::FRIDAY), - ['class' => 'form-control icheck'] - ) }} - - - {{ Form::label('days[]', 'Saturday') }} - {{ Form::checkbox( - 'days[]', - \App\Models\Enums\Days::SATURDAY, - in_mask($days, \App\Models\Enums\Days::SATURDAY), - ['class' => 'form-control icheck'] - ) }} - - - {{ Form::label('days[]', 'Sunday') }} - {{ Form::checkbox( - 'days[]', - \App\Models\Enums\Days::SUNDAY, - in_mask($days, \App\Models\Enums\Days::SUNDAY), - ['class' => 'form-control icheck'] - ) }} - +
+
+
+  Scheduling +
+
+
+
+ + {{ Form::label('days[]', 'Monday') }} + {{ Form::checkbox( + 'days[]', + \App\Models\Enums\Days::MONDAY, + in_mask($days, \App\Models\Enums\Days::MONDAY), + ['class' => 'form-control icheck'] + ) }} + + + {{ Form::label('days[]', 'Tuesday') }} + {{ Form::checkbox( + 'days[]', + \App\Models\Enums\Days::TUESDAY, + in_mask($days, \App\Models\Enums\Days::TUESDAY), + ['class' => 'form-control icheck'] + ) }} + + + {{ Form::label('days[]', 'Wednesday') }} + {{ Form::checkbox( + 'days[]', + \App\Models\Enums\Days::WEDNESDAY, + in_mask($days, \App\Models\Enums\Days::WEDNESDAY), + ['class' => 'form-control icheck'] + ) }} + + + {{ Form::label('days[]', 'Thursday') }} + {{ Form::checkbox( + 'days[]', + \App\Models\Enums\Days::THURSDAY, + in_mask($days, \App\Models\Enums\Days::THURSDAY), + ['class' => 'form-control icheck'] + ) }} + + + {{ Form::label('days[]', 'Friday') }} + {{ Form::checkbox( + 'days[]', + \App\Models\Enums\Days::FRIDAY, + in_mask($days, \App\Models\Enums\Days::FRIDAY), + ['class' => 'form-control icheck'] + ) }} + + + {{ Form::label('days[]', 'Saturday') }} + {{ Form::checkbox( + 'days[]', + \App\Models\Enums\Days::SATURDAY, + in_mask($days, \App\Models\Enums\Days::SATURDAY), + ['class' => 'form-control icheck'] + ) }} + + + {{ Form::label('days[]', 'Sunday') }} + {{ Form::checkbox( + 'days[]', + \App\Models\Enums\Days::SUNDAY, + in_mask($days, \App\Models\Enums\Days::SUNDAY), + ['class' => 'form-control icheck'] + ) }} + +
+
+
+
diff --git a/resources/views/layouts/default/downloads/index.blade.php b/resources/views/layouts/default/downloads/index.blade.php index 3b00a15d..c9d80026 100644 --- a/resources/views/layouts/default/downloads/index.blade.php +++ b/resources/views/layouts/default/downloads/index.blade.php @@ -5,19 +5,23 @@ @include('flash::message')
-

Downloads

+

Downloads

- @foreach($grouped_files as $group => $files) -
-
-

{{ $group }}

-
+ @if(!$grouped_files || \count($grouped_files) === 0) +
There are no downloads!
+ @else + @foreach($grouped_files as $group => $files) +
+
+

{{ $group }}

+
-
- @include('downloads.table', ['files' => $files]) +
+ @include('downloads.table', ['files' => $files]) +
-
- @endforeach + @endforeach + @endif @endsection diff --git a/resources/views/layouts/default/flights/index.blade.php b/resources/views/layouts/default/flights/index.blade.php index 775a30a6..373f2605 100644 --- a/resources/views/layouts/default/flights/index.blade.php +++ b/resources/views/layouts/default/flights/index.blade.php @@ -5,7 +5,7 @@
@include('flash::message')
-

{{ $title ?? 'Flights' }}

+

{{ $title ?? 'Flights' }}

@include('flights.table')
diff --git a/resources/views/layouts/default/pireps/index.blade.php b/resources/views/layouts/default/pireps/index.blade.php index 388aece9..5ad0a0a1 100644 --- a/resources/views/layouts/default/pireps/index.blade.php +++ b/resources/views/layouts/default/pireps/index.blade.php @@ -9,7 +9,7 @@ style="margin-top: -10px;margin-bottom: 5px" href="{{ route('frontend.pireps.create') }}">File New PIREP
-

pilot reports

+

Pilot Reports

@include('flash::message') @include('pireps.table')
diff --git a/resources/views/layouts/default/users/index.blade.php b/resources/views/layouts/default/users/index.blade.php index a8813418..3eecbdb3 100644 --- a/resources/views/layouts/default/users/index.blade.php +++ b/resources/views/layouts/default/users/index.blade.php @@ -4,13 +4,13 @@ @section('content')
-

pilots

- @include("users.table") +

Pilots

+ @include('users.table')
- {{ $users->links("pagination.default") }} + {{ $users->links('pagination.default') }}
@endsection diff --git a/resources/views/layouts/default/widgets/live_map.blade.php b/resources/views/layouts/default/widgets/live_map.blade.php index aae1481b..5a257d2e 100644 --- a/resources/views/layouts/default/widgets/live_map.blade.php +++ b/resources/views/layouts/default/widgets/live_map.blade.php @@ -1,6 +1,5 @@
-

Current Flights

@@ -11,9 +10,8 @@
-

flights

@if(!filled($pireps)) -
There are no flights
+
There are no flights
@endif @foreach($pireps as $pirep)