diff --git a/.idea/php.xml b/.idea/php.xml index f391061c..cf8c9734 100644 --- a/.idea/php.xml +++ b/.idea/php.xml @@ -121,7 +121,6 @@ - diff --git a/composer.lock b/composer.lock index be9bbae3..a8463f7f 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": "40d89dc8080251603c43814d3be8abf2", + "content-hash": "f657a54ce87b561f6f413f836cbd20a3", "packages": [ { "name": "composer/semver", @@ -2087,56 +2087,6 @@ ], "time": "2017-10-19T19:58:43+00:00" }, - { - "name": "nabeel/laravel-installer", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/nabeelio/LaravelInstaller.git", - "reference": "0a5877b5550b0f8b35ed354331f1250747c9c223" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/nabeelio/LaravelInstaller/zipball/0a5877b5550b0f8b35ed354331f1250747c9c223", - "reference": "0a5877b5550b0f8b35ed354331f1250747c9c223", - "shasum": "" - }, - "require": { - "php": ">=7.0.0" - }, - "type": "library", - "extra": { - "laravel": { - "providers": [ - "RachidLaasri\\LaravelInstaller\\Providers\\LaravelInstallerServiceProvider" - ] - } - }, - "autoload": { - "psr-4": { - "RachidLaasri\\LaravelInstaller\\": "src/" - }, - "files": [ - "src/Helpers/functions.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Rachid Laasri", - "email": "rashidlaasri@gmail.com" - }, - { - "name": "Jeremy Kenedy", - "email": "jeremykenedy@gmail.com" - } - ], - "description": "Laravel web installer", - "time": "2017-12-04T21:21:14+00:00" - }, { "name": "nabeel/vacentral", "version": "dev-master", @@ -7183,7 +7133,6 @@ "infyomlabs/adminlte-templates": 20, "zizaco/entrust": 20, "makinacorpus/php-bloom": 20, - "nabeel/laravel-installer": 20, "nabeel/vacentral": 20 }, "prefer-stable": false, diff --git a/modules/Installer/Http/Controllers/AdminController.php b/modules/Installer/Http/Controllers/AdminController.php deleted file mode 100644 index 4c7bdf91..00000000 --- a/modules/Installer/Http/Controllers/AdminController.php +++ /dev/null @@ -1,63 +0,0 @@ - - - - Add New - -@endsection -@section('content') -
-

Admin Scaffold!

-
-

This view is loaded from module: {!! config('installer.name') !!}

-
-
-@endsection diff --git a/modules/Installer/Resources/views/app.blade.php b/modules/Installer/Resources/views/app.blade.php new file mode 100644 index 00000000..83a865fd --- /dev/null +++ b/modules/Installer/Resources/views/app.blade.php @@ -0,0 +1,72 @@ + + + + + + + + + phpvms installer + + + + + + + + + + @yield('css') + + + + + + +
+
+
+
+ @yield('content') +
+
+
+ + + + + + + + + + + +@yield('scripts') + + + diff --git a/modules/Installer/Resources/views/index.blade.php b/modules/Installer/Resources/views/index.blade.php index c246ec06..366679b6 100644 --- a/modules/Installer/Resources/views/index.blade.php +++ b/modules/Installer/Resources/views/index.blade.php @@ -1,9 +1,6 @@ -@extends('installer::layouts.frontend') +@extends('installer::app') @section('content') -

Hello World

- -

- This view is loaded from module: {!! config('installer.name') !!} -

+

phpvms installer

+

This view is loaded from module: {!! config('installer.name') !!}

@endsection diff --git a/modules/Installer/Resources/views/layouts/admin.blade.php b/modules/Installer/Resources/views/layouts/admin.blade.php deleted file mode 100644 index 421bbe11..00000000 --- a/modules/Installer/Resources/views/layouts/admin.blade.php +++ /dev/null @@ -1,5 +0,0 @@ -{{-- -You probably don't want to edit anything here. Just make -sure to extend this in your views. It will pass the content section through ---}} -@extends('admin.app') diff --git a/modules/Installer/Resources/views/layouts/frontend.blade.php b/modules/Installer/Resources/views/layouts/frontend.blade.php deleted file mode 100644 index 9340e4f9..00000000 --- a/modules/Installer/Resources/views/layouts/frontend.blade.php +++ /dev/null @@ -1,5 +0,0 @@ -{{-- -You probably don't want to edit anything here. Just make -sure to extend this in your views. It will pass the content section through ---}} -@extends('layouts.' . config('phpvms.skin') . '.app') diff --git a/phpvms.iml b/phpvms.iml index 8b7db6af..f31004d4 100644 --- a/phpvms.iml +++ b/phpvms.iml @@ -42,7 +42,6 @@ - @@ -145,7 +144,6 @@ - @@ -243,7 +241,6 @@ - diff --git a/resources/views/layouts/default/app.blade.php b/resources/views/layouts/default/app.blade.php index 909529c1..fe5d7d3d 100644 --- a/resources/views/layouts/default/app.blade.php +++ b/resources/views/layouts/default/app.blade.php @@ -127,7 +127,7 @@ -
+