Merge pull request #373 from LavaLite/develop

Develop

Author: georgemjohn

Diff for: app/Http/Controllers/Litepie/MasterResourceController.php

@@ -38,7 +38,6 @@ public function __construct(MasterRepositoryInterface $master)
      */
     public function index(MasterRequest $request, $type = null)
     {
-
         $pageLimit = $request->input('pageLimit', config('database.pagination.limit'));
         $data = $this->repository
             ->pushFilter(MasterResourceFilter::class)
@@ -57,7 +56,7 @@ public function index(MasterRequest $request, $type = null)
 
         return $this->response->setMetaTitle(trans('master.master.names'))
             ->view($view)
-            ->data(compact('data', 'groups', 'modules', 'form', 'count', 'groups'))
+            ->data(compact('data', 'type', 'groups', 'modules', 'form', 'count'))
             ->output();
     }
 

Diff for: composer.json

@@ -22,6 +22,8 @@
 
     "lavalite/framework": "^8.0",
     "litefront/default": "^1.0",
+    "litefront/user": "^1.0",
+    "litefront/public": "^1.0",
 
     "litecms/block": "^8.0",
     "litecms/blog": "^8.0",

Diff for: config/theme.php

@@ -21,16 +21,16 @@
             'view'   => 'default',
         ],
         'public'  => [
-            'theme'  => 'default',
-            'view'   => 'default',
+            'theme'  => 'public',
+            'view'   => 'public',
         ],
         'user'    => [
-            'theme'  => 'default',
-            'view'   => 'default',
+            'theme'  => 'user',
+            'view'   => 'user',
         ],
         'client'    => [
-            'theme'  => 'default',
-            'view'   => 'default',
+            'theme'  => 'user',
+            'view'   => 'user',
         ],
     ],
 

Diff for: database/migrations/2018_07_25_100001_create_masters_table.php

@@ -20,13 +20,13 @@ public function up()
         Schema::create('masters', function ($table) {
             $table->increments('id');
             $table->integer('parent_id')->nullable();
-            $table->string('type', 255)->nullable();
-            $table->string('name', 255)->nullable();
+            $table->string('type', 50)->nullable();
+            $table->string('name', 50)->nullable();
             $table->string('code', 20)->nullable();
             $table->double('amount', 10, 2)->nullable();
             $table->string('abbr', 50)->nullable();
-            $table->string('description', 255)->nullable();
-            $table->string('icon', 255)->nullable();
+            $table->text('description')->nullable();
+            $table->string('icon', 50)->nullable();
             $table->text('image')->nullable();
             $table->text('images')->nullable();
             $table->text('file')->nullable();

Diff for: packages/.gitignore

@@ -0,0 +1,5 @@
+# Ignore everything
+*
+
+# But not these files...
+!.gitignore

Diff for: public/themes/.gitignore

@@ -1,109 +1,5 @@
-# ignore log files and databases
-*.log
-*.sql
-*.sqlite
+# Ignore everything
+*
 
-# ignore compiled files
-*.com
-*.class
-*.dll
-*.exe
-*.o
-*.so
-
-# ignore packaged files
-*.7z
-*.dmg
-*.gz
-*.iso
-*.jar
-*.rar
-*.tar
-*.zip
-
-# ignore OS generated files
-ehthumbs.db
-Thumbs.db
-.DS_Store
-.DS_Store?
-._*
-.Spotlight-V100
-.Trashes
-
-# ignore Editor files
-*.sublime-project
-*.sublime-workspace
-*.komodoproject
-_ide_helper.php
-/.idea
-/.vscode
-# Eclipse project files
-.buildpath
-.project
-.settings/
-workspace.xml
-
-# Ignore cache
-.cache/
-
-# Ignore user created files :)
-*.bak
-*.orig
-
-# Ignore system files
-.bash_history
-LICENSE_AFL.txt
-LICENSE.html
-LICENSE.txt
-LICENSE_EE*
-RELEASE_NOTES.txt
-.ssh/
-error_log 
-# .htpasswds
-# /.htaccess
-php.ini.sample
-.modgit/
-_vti_bin/
-_vti_cnf/
-_vti_inf.html
-_vti_log/
-_vti_pvt/
-_vti_txt/
-tmp/
-php.ini
-_old/
-# .htpasswds/
-# .htpasswd
-.viminfo
-.profile
-.bashrc
-.bash_logout
-.bash_history
-.modgit/
-.modman/
-pkginfo
-nohup.out
-Homestead.yaml
-Homestead.json
-/.vagrant
-.phpunit.result.cache
-
-#Laravel Specific files
-/vendor
-.env
-.env.backup
-!.env.example
-# /public/.htaccess
-# storage/*
-# !storage/framework/cache/
-# !storage/framework/sessions/
-# !storage/framework/views/
-/storage/*.key
-/node_modules
-/public/hot
-/public/storage
-
-# composer files
-composer.dev.json
-composer.lock
-package-lock.json
+# But not these files...
+!.gitignore