Merge pull request #393 from LavaLite/develop

Develop

Author: georgemjohn

Diff for: .gitignore

@@ -1,19 +1,109 @@
-/.phpunit.cache
-/node_modules
-/public/build
-/public/hot
-/public/storage
-/storage/*.key
+# ignore log files and databases
+*.log
+*.sql
+*.sqlite
+
+# 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.production
-Homestead.json
-Homestead.yaml
-auth.json
-npm-debug.log
-yarn-error.log
-.phpunit.result.cache
-/.fleet
-/.idea
-/.vscode
+!.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

Diff for: composer.json

@@ -16,11 +16,14 @@
         "laravel/socialite": "~5.1",
         "laravel/tinker": "^2.8",
         "laravel/ui": "^4.2",
-        "lavalite/framework": "dev-develop",
+        "lavalite/framework": "^10.0",
         "league/fractal": "^0.20.1",
         "litecms/block": "^10.0",
         "litecms/contact": "^10.0",
-        "litecms/page": "^10.0"
+        "litecms/page": "^10.0",
+        "litefront/default": "^2.0",
+        "litefront/user": "^2.0",
+        "litefront/public": "^2.0"
     },
     "require-dev": {
         "fakerphp/faker": "^1.9.1",
@@ -43,16 +46,6 @@
             "Tests\\": "tests/"
         }
     },
-    "repositories": [
-        {
-            "type": "path",
-            "url": "packages/lavalite/*"
-        },
-        {
-            "type": "path",
-            "url": "packages/litecms/*"
-        }
-    ],
     "scripts": {
         "post-autoload-dump": [
             "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",