diff --git a/Makefile b/Makefile
index 0b289df4..a9b989a5 100644
--- a/Makefile
+++ b/Makefile
@@ -12,9 +12,19 @@ build:
composer install
install:
+ echo ""
+
+db:
+ sqlite3 tmp/database.sqlite ""
+ php artisan migrate
+
+reset-db:
+ rm tmp/database.sqlite
+ make db
schema:
- php artisan infyom:scaffold Airlines --fieldsFile=database/schema/airlines.json
+ #php artisan infyom:scaffold Airlines --fieldsFile=database/schema/airlines.json
+ echo ""
docker:
@mkdir -p $(CURR_PATH)/tmp/mysql
@@ -32,3 +42,5 @@ docker-clean:
-docker rm -rf phpvms
-rm core/local.config.php
-rm -rf tmp/mysql
+
+.PHONY: all build install db reset-db schema docker docker-clean
diff --git a/app/Http/Controllers/Admin/AdminBaseController.php b/app/Http/Controllers/Admin/AdminBaseController.php
new file mode 100644
index 00000000..01427cb3
--- /dev/null
+++ b/app/Http/Controllers/Admin/AdminBaseController.php
@@ -0,0 +1,23 @@
+airlinesRepository = $airlinesRepo;
+ }
+
+ /**
+ * Display a listing of the Airlines.
+ */
+ public function index(Request $request)
+ {
+ $this->airlinesRepository->pushCriteria(new RequestCriteria($request));
+ $airlines = $this->airlinesRepository->all();
+
+ return view('admin.airlines.index')
+ ->with('airlines', $airlines);
+ }
+
+ /**
+ * Show the form for creating a new Airlines.
+ */
+ public function create()
+ {
+ return view('admin.airlines.create');
+ }
+
+ /**
+ * Store a newly created Airlines in storage.
+ */
+ public function store(CreateAirlinesRequest $request)
+ {
+ $input = $request->all();
+
+ $airlines = $this->airlinesRepository->create($input);
+
+ Flash::success('Airlines saved successfully.');
+
+ return redirect(route('airlines.index'));
+ }
+
+ /**
+ * Display the specified Airlines.
+ *
+ * @param int $id
+ *
+ * @return Response
+ */
+ public function show($id)
+ {
+ $airlines = $this->airlinesRepository->findWithoutFail($id);
+
+ if (empty($airlines)) {
+ Flash::error('Airlines not found');
+
+ return redirect(route('airlines.index'));
+ }
+
+ return view('admin.airlines.show')->with('airlines', $airlines);
+ }
+
+ /**
+ * Show the form for editing the specified Airlines.
+ *
+ * @param int $id
+ *
+ * @return Response
+ */
+ public function edit($id)
+ {
+ $airlines = $this->airlinesRepository->findWithoutFail($id);
+
+ if (empty($airlines)) {
+ Flash::error('Airlines not found');
+
+ return redirect(route('airlines.index'));
+ }
+
+ return view('admin.airlines.edit')->with('airlines', $airlines);
+ }
+
+ /**
+ * Update the specified Airlines in storage.
+ *
+ * @param int $id
+ * @param UpdateAirlinesRequest $request
+ *
+ * @return Response
+ */
+ public function update($id, UpdateAirlinesRequest $request)
+ {
+ $airlines = $this->airlinesRepository->findWithoutFail($id);
+
+ if (empty($airlines)) {
+ Flash::error('Airlines not found');
+
+ return redirect(route('airlines.index'));
+ }
+
+ $airlines = $this->airlinesRepository->update($request->all(), $id);
+
+ Flash::success('Airlines updated successfully.');
+
+ return redirect(route('airlines.index'));
+ }
+
+ /**
+ * Remove the specified Airlines from storage.
+ *
+ * @param int $id
+ *
+ * @return Response
+ */
+ public function destroy($id)
+ {
+ $airlines = $this->airlinesRepository->findWithoutFail($id);
+
+ if (empty($airlines)) {
+ Flash::error('Airlines not found');
+
+ return redirect(route('airlines.index'));
+ }
+
+ $this->airlinesRepository->delete($id);
+
+ Flash::success('Airlines deleted successfully.');
+
+ return redirect(route('airlines.index'));
+ }
+}
diff --git a/app/Http/Requests/CreateAirlinesRequest.php b/app/Http/Requests/CreateAirlinesRequest.php
new file mode 100644
index 00000000..19c2d73e
--- /dev/null
+++ b/app/Http/Requests/CreateAirlinesRequest.php
@@ -0,0 +1,30 @@
+ 'string',
+ 'name' => 'string',
+ 'enabled' => 'boolean'
+ ];
+
+ /**
+ * Validation rules
+ *
+ * @var array
+ */
+ public static $rules = [
+ 'code' => 'required|max:3',
+ 'name' => 'required',
+ ];
+
+
+}
diff --git a/app/Repositories/AirlinesRepository.php b/app/Repositories/AirlinesRepository.php
new file mode 100644
index 00000000..5f7488e0
--- /dev/null
+++ b/app/Repositories/AirlinesRepository.php
@@ -0,0 +1,25 @@
+ [
'driver' => 'sqlite',
- 'database' => env('DB_DATABASE', database_path('tmp/database.sqlite')),
+ 'database' => env('DB_DATABASE', base_path('tmp/database.sqlite')),
'prefix' => '',
],
- 'mysql' => [
+ /*'mysql' => [
'driver' => 'mysql',
'host' => env('DB_HOST', 'localhost'),
'port' => env('DB_PORT', '3306'),
@@ -64,7 +64,7 @@ return [
'prefix' => '',
'strict' => true,
'engine' => null,
- ],
+ ],*/
],
diff --git a/config/infyom/laravel_generator.php b/config/infyom/laravel_generator.php
index 62a3ade4..99d7ac25 100644
--- a/config/infyom/laravel_generator.php
+++ b/config/infyom/laravel_generator.php
@@ -46,7 +46,7 @@ return [
'prefixes' => [
- 'route' => '', // using admin will create route('admin.?.index') type routes
+ 'route' => 'admin', // using admin will create route('admin.?.index') type routes
'path' => '',
'view' => 'admin',
'public' => 'admin',
diff --git a/database/migrations/0000_create_users_table.php b/database/migrations/2017_06_08_0000_create_users_table.php
similarity index 53%
rename from database/migrations/0000_create_users_table.php
rename to database/migrations/2017_06_08_0000_create_users_table.php
index 62573a83..79a63f9f 100755
--- a/database/migrations/0000_create_users_table.php
+++ b/database/migrations/2017_06_08_0000_create_users_table.php
@@ -15,21 +15,20 @@ class CreateUsersTable extends Migration
{
Schema::create('users', function (Blueprint $table) {
$table->increments('id');
- $table->string('first_name');
- $table->string('last_name');
+ $table->string('name');
+ $table->string('first_name')->nullable();
+ $table->string('last_name')->nullable();
$table->string('email')->unique();
$table->string('password');
- $table->string('code');
- $table->string('location');
- $table->string('hub');
- $table->unsignedBigInteger('flights');
- $table->float('hours');
- $table->float('pay');
- $table->boolean('confirmed');
- $table->boolean('retired');
- $table->dateTime('last_pirep');
- $table->dateTime('created_at');
- $table->dateTime('updated_at');
+ $table->string('code')->nullable();
+ $table->string('location')->nullable();
+ $table->string('hub')->nullable();
+ $table->unsignedBigInteger('flights')->nullable();
+ $table->float('hours')->nullable();
+ $table->float('pay')->nullable();
+ $table->boolean('confirmed')->nullable();
+ $table->boolean('retired')->nullable();
+ $table->dateTime('last_pirep')->nullable();
$table->rememberToken();
$table->timestamps();
});
diff --git a/database/migrations/0001_create_password_resets_table.php b/database/migrations/2017_06_08_0001_create_password_resets_table.php
similarity index 100%
rename from database/migrations/0001_create_password_resets_table.php
rename to database/migrations/2017_06_08_0001_create_password_resets_table.php
diff --git a/database/migrations/2017_06_08_191703_create_airlines_table.php b/database/migrations/2017_06_08_191703_create_airlines_table.php
new file mode 100644
index 00000000..71d9ed35
--- /dev/null
+++ b/database/migrations/2017_06_08_191703_create_airlines_table.php
@@ -0,0 +1,35 @@
+increments('id');
+ $table->string('code');
+ $table->string('name');
+ $table->boolean('enabled');
+ $table->timestamps();
+ $table->softDeletes();
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::drop('airlines');
+ }
+}
diff --git a/resources/views/admin/airlines/create.blade.php b/resources/views/admin/airlines/create.blade.php
new file mode 100644
index 00000000..b747130e
--- /dev/null
+++ b/resources/views/admin/airlines/create.blade.php
@@ -0,0 +1,24 @@
+@extends('layouts.admin.app')
+
+@section('content')
+
+ Airlines
+
+
{!! $airlines->id !!}
+{!! $airlines->code !!}
+{!! $airlines->name !!}
+{!! $airlines->enabled !!}
+{!! $airlines->created_at !!}
+{!! $airlines->updated_at !!}
+| Code | +Name | +Enabled | +Action | + + + @foreach($airlines as $airlines) +
|---|---|---|---|
| {!! $airlines->code !!} | +{!! $airlines->name !!} | +{!! $airlines->enabled !!} | ++ {!! Form::open(['route' => ['airlines.destroy', $airlines->id], 'method' => 'delete']) !!} + + {!! Form::close() !!} + | +
InfyOm
+phpVMS Admin
@else{{ Auth::user()->name}}
@endif @@ -33,9 +33,9 @@ - \ No newline at end of file + diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 215a9103..43e8e83d 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -2,7 +2,7 @@ -