diff --git a/.gitignore b/.gitignore index 1ce2cdc4..26ef46a5 100644 --- a/.gitignore +++ b/.gitignore @@ -38,6 +38,8 @@ tmp/ .idea/**/dynamic.xml .idea/**/uiDesigner.xml +phpvms_next.iml + # Gradle: .idea/**/gradle.xml .idea/**/libraries diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml new file mode 100644 index 00000000..c4c95431 --- /dev/null +++ b/.idea/codeStyleSettings.xml @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations/AircraftTest.xml b/.idea/runConfigurations/AircraftTest.xml new file mode 100644 index 00000000..7742e8a1 --- /dev/null +++ b/.idea/runConfigurations/AircraftTest.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/xtextAutoBuilderState.xml b/.idea/xtextAutoBuilderState.xml new file mode 100644 index 00000000..f8f33682 --- /dev/null +++ b/.idea/xtextAutoBuilderState.xml @@ -0,0 +1,8 @@ + + + + xtend;xtext + rO0ABXNyADtvcmcuZWNsaXBzZS54dGV4dC5yZXNvdXJjZS5pbXBsLkNodW5rZWRSZXNvdXJjZURlc2NyaXB0aW9uc4nX+GBmyGixDAAAeHB3BAAAAAB4 + rO0ABXNyABFqYXZhLnV0aWwuSGFzaE1hcAUH2sHDFmDRAwACRgAKbG9hZEZhY3RvckkACXRocmVzaG9sZHhwP0AAAAAAAAx3CAAAABAAAAAAeA== + + \ No newline at end of file diff --git a/Makefile b/Makefile index 421ca18b..0ba982c6 100644 --- a/Makefile +++ b/Makefile @@ -17,11 +17,13 @@ build: install: db echo "" -reset: - -@rm database/testing.sqlite +clean: @php artisan optimize @php artisan route:clear @php artisan config:clear + @rm -f database/testing.sqlite + +reset: clean @sqlite3 database/testing.sqlite "" @php artisan migrate:refresh --seed --seeder DevelopmentSeeder diff --git a/app/Http/Controllers/Admin/SettingsController.php b/app/Http/Controllers/Admin/SettingsController.php new file mode 100644 index 00000000..d664d09e --- /dev/null +++ b/app/Http/Controllers/Admin/SettingsController.php @@ -0,0 +1,41 @@ +view('admins.settings.index')->with('items', Setting::all()); + } + + /** + * Update the specified setting in storage. + * + * @param Setting $setting + * @param Request $request + * @return Response + */ + public function update(Setting $setting, Request $request) + { + $this->validate($request, Setting::$rules, Setting::$messages); + + $this->updateEntry($setting, $request->all()); + + return redirect("/admin/settings"); + } + +} diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index c4379642..a1133a4e 100755 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -33,5 +33,9 @@ class AppServiceProvider extends ServiceProvider $this->app->bind('App\Services\AircraftFareService', function($app) { return new \App\Services\AircraftFareService(); }); + + if (in_array($this->app->environment(), ['local', 'dev', 'unittest'])) { + $this->app->register(\Bpocallaghan\Generators\GeneratorsServiceProvider::class); + } } } diff --git a/composer.json b/composer.json index 59930500..8e3218a5 100755 --- a/composer.json +++ b/composer.json @@ -8,6 +8,7 @@ "php": ">=7.0", "laravel/framework": "5.4.*", "barryvdh/laravel-ide-helper": "^2.1", + "yajra/laravel-datatables-oracle": "~6.0", "infyomlabs/laravel-generator": "dev-master", "laravelcollective/html": "5.4.x", "infyomlabs/adminlte-templates": "5.3.x-dev", @@ -28,7 +29,8 @@ "phpunit/phpunit": "~5.7", "symfony/css-selector": "3.1.*", "symfony/dom-crawler": "3.1.*", - "laravel/homestead": "^5.4" + "laravel/homestead": "^5.4", + "bpocallaghan/generators": "^4.0" }, "autoload": { "classmap": [ diff --git a/composer.lock b/composer.lock index 796ec15b..799b3ecd 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "9ec497716dbe3bf2627251c5534c5c3c", + "content-hash": "aceb14d1910187737873cd904aec5630", "packages": [ { "name": "anlutro/l4-settings", @@ -637,6 +637,67 @@ ], "time": "2014-09-09T13:34:57+00:00" }, + { + "name": "dompdf/dompdf", + "version": "v0.7.0", + "source": { + "type": "git", + "url": "https://github.com/dompdf/dompdf.git", + "reference": "5c98652b1a5beb7e3cc8ec35419b2828dd63ab14" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/dompdf/dompdf/zipball/5c98652b1a5beb7e3cc8ec35419b2828dd63ab14", + "reference": "5c98652b1a5beb7e3cc8ec35419b2828dd63ab14", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-gd": "*", + "ext-mbstring": "*", + "phenx/php-font-lib": "0.4.*", + "phenx/php-svg-lib": "0.1.*", + "php": ">=5.3.0" + }, + "require-dev": { + "phpunit/phpunit": "3.7.*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-develop": "0.7-dev" + } + }, + "autoload": { + "psr-4": { + "Dompdf\\": "src/" + }, + "classmap": [ + "lib/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "LGPL-2.1" + ], + "authors": [ + { + "name": "Fabien Ménager", + "email": "fabien.menager@gmail.com" + }, + { + "name": "Brian Sweeney", + "email": "eclecticgeek@gmail.com" + }, + { + "name": "Gabriel Bull", + "email": "me@gabrielbull.com" + } + ], + "description": "DOMPDF is a CSS 2.1 compliant HTML to PDF converter", + "homepage": "https://github.com/dompdf/dompdf", + "time": "2016-05-11T00:36:29+00:00" + }, { "name": "egeloen/http-adapter", "version": "0.8.0", @@ -846,7 +907,7 @@ "laravel", "templates" ], - "time": "2017-05-20 10:43:37" + "time": "2017-05-20T10:43:37+00:00" }, { "name": "infyomlabs/laravel-generator", @@ -901,7 +962,7 @@ "test", "view" ], - "time": "2016-08-18 14:19:50" + "time": "2016-08-18T14:19:50+00:00" }, { "name": "infyomlabs/swagger-generator", @@ -938,7 +999,65 @@ "swagger", "templates" ], - "time": "2016-02-14 10:41:03" + "time": "2016-02-14T10:41:03+00:00" + }, + { + "name": "jeremeamia/SuperClosure", + "version": "2.3.0", + "source": { + "type": "git", + "url": "https://github.com/jeremeamia/super_closure.git", + "reference": "443c3df3207f176a1b41576ee2a66968a507b3db" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/jeremeamia/super_closure/zipball/443c3df3207f176a1b41576ee2a66968a507b3db", + "reference": "443c3df3207f176a1b41576ee2a66968a507b3db", + "shasum": "" + }, + "require": { + "nikic/php-parser": "^1.2|^2.0|^3.0", + "php": ">=5.4", + "symfony/polyfill-php56": "^1.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.0|^5.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.3-dev" + } + }, + "autoload": { + "psr-4": { + "SuperClosure\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jeremy Lindblom", + "email": "jeremeamia@gmail.com", + "homepage": "https://github.com/jeremeamia", + "role": "Developer" + } + ], + "description": "Serialize Closure objects, including their context and binding", + "homepage": "https://github.com/jeremeamia/super_closure", + "keywords": [ + "closure", + "function", + "lambda", + "parser", + "serializable", + "serialize", + "tokenizer" + ], + "time": "2016-12-07T09:37:55+00:00" }, { "name": "jlapp/swaggervel", @@ -983,7 +1102,7 @@ "laravel", "swagger" ], - "time": "2016-01-25 15:38:17" + "time": "2016-01-25T15:38:17+00:00" }, { "name": "laracasts/flash", @@ -1294,6 +1413,70 @@ ], "time": "2017-04-28T10:15:08+00:00" }, + { + "name": "league/fractal", + "version": "0.16.0", + "source": { + "type": "git", + "url": "https://github.com/thephpleague/fractal.git", + "reference": "d0445305e308d9207430680acfd580557b679ddc" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/thephpleague/fractal/zipball/d0445305e308d9207430680acfd580557b679ddc", + "reference": "d0445305e308d9207430680acfd580557b679ddc", + "shasum": "" + }, + "require": { + "php": ">=5.4" + }, + "require-dev": { + "doctrine/orm": "^2.5", + "illuminate/contracts": "~5.0", + "mockery/mockery": "~0.9", + "pagerfanta/pagerfanta": "~1.0.0", + "phpunit/phpunit": "~4.0", + "squizlabs/php_codesniffer": "~1.5", + "zendframework/zend-paginator": "~2.3" + }, + "suggest": { + "illuminate/pagination": "The Illuminate Pagination component.", + "pagerfanta/pagerfanta": "Pagerfanta Paginator", + "zendframework/zend-paginator": "Zend Framework Paginator" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "0.13-dev" + } + }, + "autoload": { + "psr-4": { + "League\\Fractal\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Phil Sturgeon", + "email": "me@philsturgeon.uk", + "homepage": "http://philsturgeon.uk/", + "role": "Developer" + } + ], + "description": "Handle the output of complex data structures ready for API output.", + "homepage": "http://fractal.thephpleague.com/", + "keywords": [ + "api", + "json", + "league", + "rest" + ], + "time": "2017-03-12T01:28:43+00:00" + }, { "name": "league/geotools", "version": "0.7.0", @@ -1368,6 +1551,74 @@ ], "time": "2016-02-03T16:31:33+00:00" }, + { + "name": "maatwebsite/excel", + "version": "2.1.17", + "source": { + "type": "git", + "url": "https://github.com/Maatwebsite/Laravel-Excel.git", + "reference": "14d5abf8e20563c80dd074fd7c8cf1c05bf51f1d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Maatwebsite/Laravel-Excel/zipball/14d5abf8e20563c80dd074fd7c8cf1c05bf51f1d", + "reference": "14d5abf8e20563c80dd074fd7c8cf1c05bf51f1d", + "shasum": "" + }, + "require": { + "illuminate/cache": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*", + "illuminate/config": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*", + "illuminate/filesystem": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*", + "illuminate/support": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*", + "jeremeamia/superclosure": "^2.3", + "nesbot/carbon": "~1.0", + "php": ">=5.5", + "phpoffice/phpexcel": "1.8.*", + "tijsverkoyen/css-to-inline-styles": "~2.0" + }, + "require-dev": { + "mockery/mockery": "~0.9", + "orchestra/testbench": "3.1.*", + "phpseclib/phpseclib": "~1.0", + "phpunit/phpunit": "~4.0" + }, + "suggest": { + "illuminate/http": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*", + "illuminate/queue": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*", + "illuminate/routing": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*", + "illuminate/view": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/Maatwebsite/Excel" + ], + "psr-0": { + "Maatwebsite\\Excel\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "LGPL" + ], + "authors": [ + { + "name": "Maatwebsite.nl", + "email": "patrick@maatwebsite.nl" + } + ], + "description": "An eloquent way of importing and exporting Excel and CSV in Laravel 4 with the power of PHPExcel", + "keywords": [ + "PHPExcel", + "batch", + "csv", + "excel", + "export", + "import", + "laravel" + ], + "time": "2017-04-04T18:28:12+00:00" + }, { "name": "monolog/monolog", "version": "1.23.0", @@ -1543,6 +1794,57 @@ ], "time": "2017-01-16T07:55:07+00:00" }, + { + "name": "nikic/php-parser", + "version": "v3.0.5", + "source": { + "type": "git", + "url": "https://github.com/nikic/PHP-Parser.git", + "reference": "2b9e2f71b722f7c53918ab0c25f7646c2013f17d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/2b9e2f71b722f7c53918ab0c25f7646c2013f17d", + "reference": "2b9e2f71b722f7c53918ab0c25f7646c2013f17d", + "shasum": "" + }, + "require": { + "ext-tokenizer": "*", + "php": ">=5.5" + }, + "require-dev": { + "phpunit/phpunit": "~4.0|~5.0" + }, + "bin": [ + "bin/php-parse" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "psr-4": { + "PhpParser\\": "lib/PhpParser" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Nikita Popov" + } + ], + "description": "A PHP parser written in PHP", + "keywords": [ + "parser", + "php" + ], + "time": "2017-03-05T18:23:57+00:00" + }, { "name": "paragonie/random_compat", "version": "v2.0.10", @@ -1591,6 +1893,131 @@ ], "time": "2017-03-13T16:27:32+00:00" }, + { + "name": "phenx/php-font-lib", + "version": "0.4", + "source": { + "type": "git", + "url": "https://github.com/PhenX/php-font-lib.git", + "reference": "b8af0cacdc3cbf1e41a586fcb78f506f4121a088" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PhenX/php-font-lib/zipball/b8af0cacdc3cbf1e41a586fcb78f506f4121a088", + "reference": "b8af0cacdc3cbf1e41a586fcb78f506f4121a088", + "shasum": "" + }, + "type": "library", + "autoload": { + "psr-0": { + "FontLib\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "LGPL-3.0" + ], + "authors": [ + { + "name": "Fabien Ménager", + "email": "fabien.menager@gmail.com" + } + ], + "description": "A library to read, parse, export and make subsets of different types of font files.", + "homepage": "https://github.com/PhenX/php-font-lib", + "time": "2015-05-06T20:02:39+00:00" + }, + { + "name": "phenx/php-svg-lib", + "version": "0.1", + "source": { + "type": "git", + "url": "https://github.com/PhenX/php-svg-lib.git", + "reference": "b419766515b3426c6da74b0e29e93d71c4f17099" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PhenX/php-svg-lib/zipball/b419766515b3426c6da74b0e29e93d71c4f17099", + "reference": "b419766515b3426c6da74b0e29e93d71c4f17099", + "shasum": "" + }, + "type": "library", + "autoload": { + "psr-0": { + "Svg\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "LGPL-3.0" + ], + "authors": [ + { + "name": "Fabien Ménager", + "email": "fabien.menager@gmail.com" + } + ], + "description": "A library to read, parse and export to PDF SVG files.", + "homepage": "https://github.com/PhenX/php-svg-lib", + "time": "2015-05-06T18:49:49+00:00" + }, + { + "name": "phpoffice/phpexcel", + "version": "1.8.1", + "source": { + "type": "git", + "url": "https://github.com/PHPOffice/PHPExcel.git", + "reference": "372c7cbb695a6f6f1e62649381aeaa37e7e70b32" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PHPOffice/PHPExcel/zipball/372c7cbb695a6f6f1e62649381aeaa37e7e70b32", + "reference": "372c7cbb695a6f6f1e62649381aeaa37e7e70b32", + "shasum": "" + }, + "require": { + "ext-xml": "*", + "ext-xmlwriter": "*", + "php": ">=5.2.0" + }, + "type": "library", + "autoload": { + "psr-0": { + "PHPExcel": "Classes/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "LGPL" + ], + "authors": [ + { + "name": "Maarten Balliauw", + "homepage": "http://blog.maartenballiauw.be" + }, + { + "name": "Mark Baker" + }, + { + "name": "Franck Lefevre", + "homepage": "http://blog.rootslabs.net" + }, + { + "name": "Erik Tilt" + } + ], + "description": "PHPExcel - OpenXML - Read, Create and Write Spreadsheet documents in PHP - Spreadsheet engine", + "homepage": "http://phpexcel.codeplex.com", + "keywords": [ + "OpenXML", + "excel", + "php", + "spreadsheet", + "xls", + "xlsx" + ], + "time": "2015-05-01T07:00:55+00:00" + }, { "name": "prettus/l5-repository", "version": "2.6.18", @@ -2721,6 +3148,62 @@ ], "time": "2017-06-09T14:24:12+00:00" }, + { + "name": "symfony/polyfill-php56", + "version": "v1.4.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php56.git", + "reference": "bc0b7d6cb36b10cfabb170a3e359944a95174929" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/bc0b7d6cb36b10cfabb170a3e359944a95174929", + "reference": "bc0b7d6cb36b10cfabb170a3e359944a95174929", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "symfony/polyfill-util": "~1.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.4-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Php56\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 5.6+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "time": "2017-06-09T08:25:21+00:00" + }, { "name": "symfony/polyfill-php70", "version": "v1.4.0", @@ -2780,6 +3263,58 @@ ], "time": "2017-06-09T14:24:12+00:00" }, + { + "name": "symfony/polyfill-util", + "version": "v1.4.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-util.git", + "reference": "ebccbde4aad410f6438d86d7d261c6b4d2b9a51d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/ebccbde4aad410f6438d86d7d261c6b4d2b9a51d", + "reference": "ebccbde4aad410f6438d86d7d261c6b4d2b9a51d", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.4-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Util\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony utilities for portability of PHP codes", + "homepage": "https://symfony.com", + "keywords": [ + "compat", + "compatibility", + "polyfill", + "shim" + ], + "time": "2017-06-09T08:25:21+00:00" + }, { "name": "symfony/process", "version": "v3.3.2", @@ -3459,6 +3994,66 @@ ], "time": "2015-12-06T20:17:20+00:00" }, + { + "name": "yajra/laravel-datatables-oracle", + "version": "v6.24.1", + "source": { + "type": "git", + "url": "https://github.com/yajra/laravel-datatables.git", + "reference": "593a9205c7d9816d2d8b639ca08000ae5c5f378c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/yajra/laravel-datatables/zipball/593a9205c7d9816d2d8b639ca08000ae5c5f378c", + "reference": "593a9205c7d9816d2d8b639ca08000ae5c5f378c", + "shasum": "" + }, + "require": { + "dompdf/dompdf": "^0.7", + "illuminate/database": "~5.0", + "illuminate/filesystem": "~5.0", + "illuminate/http": "~5.0", + "illuminate/support": "~5.0", + "illuminate/view": "~5.0", + "laravelcollective/html": "~5.0", + "league/fractal": "~0.14", + "maatwebsite/excel": "^2.0", + "php": ">=5.5.9" + }, + "require-dev": { + "mockery/mockery": "~0.9", + "phpunit/phpunit": "~4.0" + }, + "suggest": { + "barryvdh/laravel-snappy": "Allows exporting of dataTable to PDF using the print view." + }, + "type": "library", + "autoload": { + "psr-4": { + "Yajra\\Datatables\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Arjay Angeles", + "email": "aqangeles@gmail.com" + } + ], + "description": "jQuery DataTables API for Laravel 4|5", + "keywords": [ + "datatable", + "datatables", + "datatables jquery plugin", + "laravel", + "laravel4", + "laravel5" + ], + "time": "2017-01-24T02:46:52+00:00" + }, { "name": "zendframework/zend-diactoros", "version": "1.4.0", @@ -3639,10 +4234,50 @@ "permission", "roles" ], - "time": "2016-12-29 06:25:06" + "time": "2016-12-29T06:25:06+00:00" } ], "packages-dev": [ + { + "name": "bpocallaghan/generators", + "version": "4.0.9", + "source": { + "type": "git", + "url": "https://github.com/bpocallaghan/generators.git", + "reference": "53b7e42bcda2409996bb611e3893335d42509830" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/bpocallaghan/generators/zipball/53b7e42bcda2409996bb611e3893335d42509830", + "reference": "53b7e42bcda2409996bb611e3893335d42509830", + "shasum": "" + }, + "require": { + "php": ">=5.4.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Bpocallaghan\\Generators\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Ben-Piet O'Callaghan", + "email": "bpocallaghan@gmail.com" + } + ], + "description": "Custom Laravel 5 File Generators with config and publishable stubs.", + "keywords": [ + "generators", + "laravel" + ], + "time": "2017-05-15T11:04:00+00:00" + }, { "name": "doctrine/instantiator", "version": "1.0.5", @@ -3697,67 +4332,6 @@ ], "time": "2015-06-14T21:17:01+00:00" }, - { - "name": "dompdf/dompdf", - "version": "v0.7.0", - "source": { - "type": "git", - "url": "https://github.com/dompdf/dompdf.git", - "reference": "5c98652b1a5beb7e3cc8ec35419b2828dd63ab14" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/dompdf/dompdf/zipball/5c98652b1a5beb7e3cc8ec35419b2828dd63ab14", - "reference": "5c98652b1a5beb7e3cc8ec35419b2828dd63ab14", - "shasum": "" - }, - "require": { - "ext-dom": "*", - "ext-gd": "*", - "ext-mbstring": "*", - "phenx/php-font-lib": "0.4.*", - "phenx/php-svg-lib": "0.1.*", - "php": ">=5.3.0" - }, - "require-dev": { - "phpunit/phpunit": "3.7.*" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-develop": "0.7-dev" - } - }, - "autoload": { - "psr-4": { - "Dompdf\\": "src/" - }, - "classmap": [ - "lib/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "LGPL-2.1" - ], - "authors": [ - { - "name": "Fabien Ménager", - "email": "fabien.menager@gmail.com" - }, - { - "name": "Brian Sweeney", - "email": "eclecticgeek@gmail.com" - }, - { - "name": "Gabriel Bull", - "email": "me@gabrielbull.com" - } - ], - "description": "DOMPDF is a CSS 2.1 compliant HTML to PDF converter", - "homepage": "https://github.com/dompdf/dompdf", - "time": "2016-05-11T00:36:29+00:00" - }, { "name": "fzaninotto/faker", "version": "v1.6.0", @@ -3851,64 +4425,6 @@ ], "time": "2015-05-11T14:41:42+00:00" }, - { - "name": "jeremeamia/SuperClosure", - "version": "2.3.0", - "source": { - "type": "git", - "url": "https://github.com/jeremeamia/super_closure.git", - "reference": "443c3df3207f176a1b41576ee2a66968a507b3db" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/jeremeamia/super_closure/zipball/443c3df3207f176a1b41576ee2a66968a507b3db", - "reference": "443c3df3207f176a1b41576ee2a66968a507b3db", - "shasum": "" - }, - "require": { - "nikic/php-parser": "^1.2|^2.0|^3.0", - "php": ">=5.4", - "symfony/polyfill-php56": "^1.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.0|^5.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.3-dev" - } - }, - "autoload": { - "psr-4": { - "SuperClosure\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jeremy Lindblom", - "email": "jeremeamia@gmail.com", - "homepage": "https://github.com/jeremeamia", - "role": "Developer" - } - ], - "description": "Serialize Closure objects, including their context and binding", - "homepage": "https://github.com/jeremeamia/super_closure", - "keywords": [ - "closure", - "function", - "lambda", - "parser", - "serializable", - "serialize", - "tokenizer" - ], - "time": "2016-12-07T09:37:55+00:00" - }, { "name": "laravel/homestead", "version": "v5.4.0", @@ -3959,138 +4475,6 @@ "description": "A virtual machine for web artisans.", "time": "2017-06-09T13:53:37+00:00" }, - { - "name": "league/fractal", - "version": "0.16.0", - "source": { - "type": "git", - "url": "https://github.com/thephpleague/fractal.git", - "reference": "d0445305e308d9207430680acfd580557b679ddc" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/thephpleague/fractal/zipball/d0445305e308d9207430680acfd580557b679ddc", - "reference": "d0445305e308d9207430680acfd580557b679ddc", - "shasum": "" - }, - "require": { - "php": ">=5.4" - }, - "require-dev": { - "doctrine/orm": "^2.5", - "illuminate/contracts": "~5.0", - "mockery/mockery": "~0.9", - "pagerfanta/pagerfanta": "~1.0.0", - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "~1.5", - "zendframework/zend-paginator": "~2.3" - }, - "suggest": { - "illuminate/pagination": "The Illuminate Pagination component.", - "pagerfanta/pagerfanta": "Pagerfanta Paginator", - "zendframework/zend-paginator": "Zend Framework Paginator" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "0.13-dev" - } - }, - "autoload": { - "psr-4": { - "League\\Fractal\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Phil Sturgeon", - "email": "me@philsturgeon.uk", - "homepage": "http://philsturgeon.uk/", - "role": "Developer" - } - ], - "description": "Handle the output of complex data structures ready for API output.", - "homepage": "http://fractal.thephpleague.com/", - "keywords": [ - "api", - "json", - "league", - "rest" - ], - "time": "2017-03-12T01:28:43+00:00" - }, - { - "name": "maatwebsite/excel", - "version": "2.1.17", - "source": { - "type": "git", - "url": "https://github.com/Maatwebsite/Laravel-Excel.git", - "reference": "14d5abf8e20563c80dd074fd7c8cf1c05bf51f1d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Maatwebsite/Laravel-Excel/zipball/14d5abf8e20563c80dd074fd7c8cf1c05bf51f1d", - "reference": "14d5abf8e20563c80dd074fd7c8cf1c05bf51f1d", - "shasum": "" - }, - "require": { - "illuminate/cache": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*", - "illuminate/config": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*", - "illuminate/filesystem": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*", - "illuminate/support": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*", - "jeremeamia/superclosure": "^2.3", - "nesbot/carbon": "~1.0", - "php": ">=5.5", - "phpoffice/phpexcel": "1.8.*", - "tijsverkoyen/css-to-inline-styles": "~2.0" - }, - "require-dev": { - "mockery/mockery": "~0.9", - "orchestra/testbench": "3.1.*", - "phpseclib/phpseclib": "~1.0", - "phpunit/phpunit": "~4.0" - }, - "suggest": { - "illuminate/http": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*", - "illuminate/queue": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*", - "illuminate/routing": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*", - "illuminate/view": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*" - }, - "type": "library", - "autoload": { - "classmap": [ - "src/Maatwebsite/Excel" - ], - "psr-0": { - "Maatwebsite\\Excel\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "LGPL" - ], - "authors": [ - { - "name": "Maatwebsite.nl", - "email": "patrick@maatwebsite.nl" - } - ], - "description": "An eloquent way of importing and exporting Excel and CSV in Laravel 4 with the power of PHPExcel", - "keywords": [ - "PHPExcel", - "batch", - "csv", - "excel", - "export", - "import", - "laravel" - ], - "time": "2017-04-04T18:28:12+00:00" - }, { "name": "mockery/mockery", "version": "0.9.9", @@ -4198,125 +4582,6 @@ ], "time": "2017-04-12T18:52:22+00:00" }, - { - "name": "nikic/php-parser", - "version": "v3.0.5", - "source": { - "type": "git", - "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "2b9e2f71b722f7c53918ab0c25f7646c2013f17d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/2b9e2f71b722f7c53918ab0c25f7646c2013f17d", - "reference": "2b9e2f71b722f7c53918ab0c25f7646c2013f17d", - "shasum": "" - }, - "require": { - "ext-tokenizer": "*", - "php": ">=5.5" - }, - "require-dev": { - "phpunit/phpunit": "~4.0|~5.0" - }, - "bin": [ - "bin/php-parse" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0-dev" - } - }, - "autoload": { - "psr-4": { - "PhpParser\\": "lib/PhpParser" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Nikita Popov" - } - ], - "description": "A PHP parser written in PHP", - "keywords": [ - "parser", - "php" - ], - "time": "2017-03-05T18:23:57+00:00" - }, - { - "name": "phenx/php-font-lib", - "version": "0.4", - "source": { - "type": "git", - "url": "https://github.com/PhenX/php-font-lib.git", - "reference": "b8af0cacdc3cbf1e41a586fcb78f506f4121a088" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/PhenX/php-font-lib/zipball/b8af0cacdc3cbf1e41a586fcb78f506f4121a088", - "reference": "b8af0cacdc3cbf1e41a586fcb78f506f4121a088", - "shasum": "" - }, - "type": "library", - "autoload": { - "psr-0": { - "FontLib\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "LGPL-3.0" - ], - "authors": [ - { - "name": "Fabien Ménager", - "email": "fabien.menager@gmail.com" - } - ], - "description": "A library to read, parse, export and make subsets of different types of font files.", - "homepage": "https://github.com/PhenX/php-font-lib", - "time": "2015-05-06T20:02:39+00:00" - }, - { - "name": "phenx/php-svg-lib", - "version": "0.1", - "source": { - "type": "git", - "url": "https://github.com/PhenX/php-svg-lib.git", - "reference": "b419766515b3426c6da74b0e29e93d71c4f17099" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/PhenX/php-svg-lib/zipball/b419766515b3426c6da74b0e29e93d71c4f17099", - "reference": "b419766515b3426c6da74b0e29e93d71c4f17099", - "shasum": "" - }, - "type": "library", - "autoload": { - "psr-0": { - "Svg\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "LGPL-3.0" - ], - "authors": [ - { - "name": "Fabien Ménager", - "email": "fabien.menager@gmail.com" - } - ], - "description": "A library to read, parse and export to PDF SVG files.", - "homepage": "https://github.com/PhenX/php-svg-lib", - "time": "2015-05-06T18:49:49+00:00" - }, { "name": "phpdocumentor/reflection-common", "version": "1.0", @@ -4463,63 +4728,6 @@ ], "time": "2016-11-25T06:54:22+00:00" }, - { - "name": "phpoffice/phpexcel", - "version": "1.8.1", - "source": { - "type": "git", - "url": "https://github.com/PHPOffice/PHPExcel.git", - "reference": "372c7cbb695a6f6f1e62649381aeaa37e7e70b32" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/PHPOffice/PHPExcel/zipball/372c7cbb695a6f6f1e62649381aeaa37e7e70b32", - "reference": "372c7cbb695a6f6f1e62649381aeaa37e7e70b32", - "shasum": "" - }, - "require": { - "ext-xml": "*", - "ext-xmlwriter": "*", - "php": ">=5.2.0" - }, - "type": "library", - "autoload": { - "psr-0": { - "PHPExcel": "Classes/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "LGPL" - ], - "authors": [ - { - "name": "Maarten Balliauw", - "homepage": "http://blog.maartenballiauw.be" - }, - { - "name": "Mark Baker" - }, - { - "name": "Franck Lefevre", - "homepage": "http://blog.rootslabs.net" - }, - { - "name": "Erik Tilt" - } - ], - "description": "PHPExcel - OpenXML - Read, Create and Write Spreadsheet documents in PHP - Spreadsheet engine", - "homepage": "http://phpexcel.codeplex.com", - "keywords": [ - "OpenXML", - "excel", - "php", - "spreadsheet", - "xls", - "xlsx" - ], - "time": "2015-05-01T07:00:55+00:00" - }, { "name": "phpspec/prophecy", "version": "v1.7.0", @@ -5486,114 +5694,6 @@ "homepage": "https://github.com/sebastianbergmann/version", "time": "2016-10-03T07:35:21+00:00" }, - { - "name": "symfony/polyfill-php56", - "version": "v1.4.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php56.git", - "reference": "bc0b7d6cb36b10cfabb170a3e359944a95174929" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/bc0b7d6cb36b10cfabb170a3e359944a95174929", - "reference": "bc0b7d6cb36b10cfabb170a3e359944a95174929", - "shasum": "" - }, - "require": { - "php": ">=5.3.3", - "symfony/polyfill-util": "~1.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.4-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php56\\": "" - }, - "files": [ - "bootstrap.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 5.6+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "time": "2017-06-09T08:25:21+00:00" - }, - { - "name": "symfony/polyfill-util", - "version": "v1.4.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-util.git", - "reference": "ebccbde4aad410f6438d86d7d261c6b4d2b9a51d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/ebccbde4aad410f6438d86d7d261c6b4d2b9a51d", - "reference": "ebccbde4aad410f6438d86d7d261c6b4d2b9a51d", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.4-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Util\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony utilities for portability of PHP codes", - "homepage": "https://symfony.com", - "keywords": [ - "compat", - "compatibility", - "polyfill", - "shim" - ], - "time": "2017-06-09T08:25:21+00:00" - }, { "name": "webmozart/assert", "version": "1.2.0", @@ -5643,66 +5743,6 @@ "validate" ], "time": "2016-11-23T20:04:58+00:00" - }, - { - "name": "yajra/laravel-datatables-oracle", - "version": "v6.24.1", - "source": { - "type": "git", - "url": "https://github.com/yajra/laravel-datatables.git", - "reference": "593a9205c7d9816d2d8b639ca08000ae5c5f378c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/yajra/laravel-datatables/zipball/593a9205c7d9816d2d8b639ca08000ae5c5f378c", - "reference": "593a9205c7d9816d2d8b639ca08000ae5c5f378c", - "shasum": "" - }, - "require": { - "dompdf/dompdf": "^0.7", - "illuminate/database": "~5.0", - "illuminate/filesystem": "~5.0", - "illuminate/http": "~5.0", - "illuminate/support": "~5.0", - "illuminate/view": "~5.0", - "laravelcollective/html": "~5.0", - "league/fractal": "~0.14", - "maatwebsite/excel": "^2.0", - "php": ">=5.5.9" - }, - "require-dev": { - "mockery/mockery": "~0.9", - "phpunit/phpunit": "~4.0" - }, - "suggest": { - "barryvdh/laravel-snappy": "Allows exporting of dataTable to PDF using the print view." - }, - "type": "library", - "autoload": { - "psr-4": { - "Yajra\\Datatables\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Arjay Angeles", - "email": "aqangeles@gmail.com" - } - ], - "description": "jQuery DataTables API for Laravel 4|5", - "keywords": [ - "datatable", - "datatables", - "datatables jquery plugin", - "laravel", - "laravel4", - "laravel5" - ], - "time": "2017-01-24T02:46:52+00:00" } ], "aliases": [], diff --git a/phpvms.iml b/phpvms.iml index 139f82d1..89de5f16 100644 --- a/phpvms.iml +++ b/phpvms.iml @@ -2,7 +2,20 @@ - + + + + + + + + + + + + + + @@ -15,5 +28,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/resources/views/admin/settings/index.blade.php b/resources/views/admin/settings/index.blade.php new file mode 100644 index 00000000..7727affa --- /dev/null +++ b/resources/views/admin/settings/index.blade.php @@ -0,0 +1,23 @@ +@extends('admin.app') + +@section('content') +
+

Settings

+ {{--

+ Add New +

--}} +
+
+
+ + @include('flash::message') + +
+
+
+ @include('admin.settings.table') +
+
+
+@endsection + diff --git a/resources/views/admin/settings/table.blade.php b/resources/views/admin/settings/table.blade.php new file mode 100644 index 00000000..4a7766e5 --- /dev/null +++ b/resources/views/admin/settings/table.blade.php @@ -0,0 +1,14 @@ + + + + + + +@foreach($settings as $s) + + + + +@endforeach + +
NameValue
{!! $s->key !!}{!! $s->value !!}
diff --git a/routes/web.php b/routes/web.php index 993464ac..ad105afd 100755 --- a/routes/web.php +++ b/routes/web.php @@ -5,8 +5,7 @@ Route::get('/home', 'HomeController@index'); Route::group([ - 'namespace' => 'Frontend', - 'as' => 'frontend.', + 'namespace' => 'Frontend', 'prefix' => 'frontend', 'as' => 'frontend.', 'middleware' => ['role:admin|user'], ], function () { Route::resource('dashboard', 'DashboardController'); @@ -19,9 +18,7 @@ Auth::routes(); */ Route::group([ - 'namespace' => 'Admin', - 'prefix' => 'admin', - 'as' => 'admin.', + 'namespace' => 'Admin', 'prefix' => 'admin', 'as' => 'admin.', 'middleware' => ['role:admin'], ], function () { Route::resource('airports', 'AirportController'); @@ -29,16 +26,19 @@ Route::group([ Route::resource('aircraftclasses', 'AircraftClassController'); Route::resource('fares', 'FareController'); + # aircraft and fare associations Route::resource('aircraft', 'AircraftController'); - Route::match(['get', 'post', 'put', 'delete'], - 'aircraft/{id}/fares', - 'AircraftController@fares'); + Route::match(['get', 'post', 'put', 'delete'], 'aircraft/{id}/fares', 'AircraftController@fares'); + # flights and aircraft associations Route::resource('flights', 'FlightController'); - Route::match(['get', 'post', 'put', 'delete'], - 'flights/{id}/aircraft', - 'FlightController@aircraft'); + Route::match(['get', 'post', 'put', 'delete'], 'flights/{id}/aircraft', 'FlightController@aircraft'); + # view/update settings + Route::match(['get'], 'settings', 'SettingsController@index'); + Route::match(['post', 'put'], 'settings', 'SettingsController@update'); + + # defaults Route::get('', ['uses' => 'DashboardController@index']); Route::get('/', ['uses' => 'DashboardController@index']); Route::get('/dashboard', ['uses' => 'DashboardController@index','name' => 'dashboard']);