diff --git a/.babelrc b/.babelrc
new file mode 100644
index 00000000..57ed033c
--- /dev/null
+++ b/.babelrc
@@ -0,0 +1,3 @@
+{
+ "plugins": ["syntax-dynamic-import"]
+ }
\ No newline at end of file
diff --git a/.eslintrc b/.eslintrc
new file mode 100644
index 00000000..695b75d3
--- /dev/null
+++ b/.eslintrc
@@ -0,0 +1,15 @@
+{
+ "root": true,
+ "parserOptions": {
+ "parser": "babel-eslint",
+ "ecmaVersion": 2017,
+ "sourceType": "module"
+ },
+ "extends": [
+ "plugin:vue/recommended",
+ "@vue/standard"
+ ],
+ "rules": {
+ "vue/max-attributes-per-line": "off"
+ }
+ }
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..92c35721
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,17 @@
+/node_modules
+/public/hot
+/public/storage
+/public/js
+/public/css
+/storage/*.key
+/vendor
+/.idea
+/.vscode
+/.vagrant
+/data
+Homestead.json
+Homestead.yaml
+npm-debug.log
+yarn-error.log
+.env
+
diff --git a/.idea/exchange.iml b/.idea/exchange.iml
index 8cabe2c6..7a22b912 100644
--- a/.idea/exchange.iml
+++ b/.idea/exchange.iml
@@ -5,80 +5,10 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/.idea/php.xml b/.idea/php.xml
index 2a91fded..c6c02dbb 100644
--- a/.idea/php.xml
+++ b/.idea/php.xml
@@ -2,77 +2,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 361cd48f..1ccf99ca 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,18 +2,6794 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -26,11 +6802,11 @@
$PROJECT_DIR$/composer.json
-
-
+
+
-
+
@@ -39,10 +6815,55 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -51,8 +6872,8 @@
-
-
+
+
@@ -72,6 +6893,7 @@
appse
str
+ <<<
$PROJECT_DIR$/bootstrap
@@ -94,15 +6916,12 @@
-
-
-
@@ -118,6 +6937,11 @@
+
+
+
+
+
@@ -129,83 +6953,12 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -243,19 +6996,13 @@
-
+
-
-
-
-
-
-
-
+
@@ -326,12 +7073,13 @@
-
+
+
-
+
@@ -346,7 +7094,7 @@
-
+
@@ -370,8 +7118,6 @@
-
-
@@ -463,20 +7209,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -519,13 +7251,6 @@
-
-
-
-
-
-
-
@@ -605,14 +7330,14 @@
-
-
+
+
-
+
@@ -626,7 +7351,7 @@
-
+
@@ -634,5 +7359,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.rnd b/.rnd
new file mode 100644
index 00000000..e42370c8
Binary files /dev/null and b/.rnd differ
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 00000000..2d5c4091
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,59 @@
+# Changelog
+
+## 4.1.0 - 2018-03-14
+
+- Upgrade to Laravel 5.6
+- Update npm dependencies
+- Enabled Mix [esModule](https://github.com/JeffreyWay/laravel-mix/pull/1526#issuecomment-373044182) by default
+- Lint with eslint-plugin-vue and eslint-config-standard
+
+## 4.0.0 - 2018-01-23
+
+- Brought back the `layout` property in pages that was removed in 3.0. By default it's set to `default` (`~/layouts/default.vue`).
+
+## 3.0.1 - 2018-01-22
+
+- Removed middleware from routes, since they don't work when you press the back button. Now you have to use the `middleware` property in pages.
+
+## 3.0.0 - 2018-01-22
+
+- Removed `layout` property from pages in favor of explicit layout components
+- Improved middleware system, you can either define it on a route or directly on a component
+- Reorganized components
+- Change jwt token ttl to one day
+- Fixed hot module replacement
+
+## 2.2.1 - 2018-01-19
+
+- Upgrade to Bootstrap 4
+
+## 2.2.0 - 2018-01-16
+
+- Added dynamic import for pages
+- Added locale with dynamic import
+- Import shakable fontawesome module
+
+## 2.1.0 - 2018-01-10
+
+- Simplifyd password reset
+- Upgrade to Bootstrap 4 beta3
+- Added oauth with popup window
+
+## 2.0.0 - 2017-12-19
+
+- Added support for Socialite
+- Added dropdown to select the locale
+- Added route middleware
+- Added Font Awesome 5 icons
+- Added user profile photo in navbar
+- Added Chinese and Spanish translations
+- Upgrade to Bootstrap 4 beta2
+- Fixed router scroll behaviour
+- Namespaced store modules
+- Published project to Packagist
+
+## 1.0.0 - 2017-09-02
+
+- Upgrade to Laravel 5.5.
+- Upgrade to Bootstrap 4 beta1.
+- Rework routing and guards.
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 00000000..74d27249
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,9 @@
+FROM php:7
+RUN apt-get update -y && apt-get install -y openssl zip unzip git zlib1g-dev
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+RUN docker-php-ext-install pdo pdo_mysql zip
+WORKDIR /app
+COPY . /app
+RUN composer install
+CMD php artisan serve --host=0.0.0.0 --port=8000
+EXPOSE 8000
diff --git a/vendor/phpdocumentor/reflection-common/LICENSE b/LICENSE
similarity index 94%
rename from vendor/phpdocumentor/reflection-common/LICENSE
rename to LICENSE
index ed6926c1..8143e0ab 100644
--- a/vendor/phpdocumentor/reflection-common/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
-The MIT License (MIT)
+MIT License
-Copyright (c) 2015 phpDocumentor
+Copyright (c) 2017 Cretu Eusebiu
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
@@ -19,4 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Console/stubs/exception-render.stub b/app/Exceptions/EmailTakenException.php
similarity index 64%
rename from vendor/laravel/framework/src/Illuminate/Foundation/Console/stubs/exception-render.stub
rename to app/Exceptions/EmailTakenException.php
index 0fde3d9d..8047511c 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Console/stubs/exception-render.stub
+++ b/app/Exceptions/EmailTakenException.php
@@ -1,10 +1,10 @@
view('oauth.emailTaken', [], 400);
}
}
diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php
index 6a247fef..87fe6780 100644
--- a/app/Http/Controllers/Auth/ForgotPasswordController.php
+++ b/app/Http/Controllers/Auth/ForgotPasswordController.php
@@ -2,22 +2,12 @@
namespace App\Http\Controllers\Auth;
+use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
class ForgotPasswordController extends Controller
{
- /*
- |--------------------------------------------------------------------------
- | Password Reset Controller
- |--------------------------------------------------------------------------
- |
- | This controller is responsible for handling password reset emails and
- | includes a trait which assists in sending these notifications from
- | your application to your users. Feel free to explore this trait.
- |
- */
-
use SendsPasswordResetEmails;
/**
@@ -29,4 +19,27 @@ class ForgotPasswordController extends Controller
{
$this->middleware('guest');
}
+
+ /**
+ * Get the response for a successful password reset link.
+ *
+ * @param string $response
+ * @return \Illuminate\Http\RedirectResponse
+ */
+ protected function sendResetLinkResponse($response)
+ {
+ return ['status' => trans($response)];
+ }
+
+ /**
+ * Get the response for a failed password reset link.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @param string $response
+ * @return \Illuminate\Http\RedirectResponse
+ */
+ protected function sendResetLinkFailedResponse(Request $request, $response)
+ {
+ return response()->json(['email' => trans($response)], 400);
+ }
}
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index b2ea669a..dda593be 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -2,31 +2,14 @@
namespace App\Http\Controllers\Auth;
+use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\AuthenticatesUsers;
class LoginController extends Controller
{
- /*
- |--------------------------------------------------------------------------
- | Login Controller
- |--------------------------------------------------------------------------
- |
- | This controller handles authenticating users for the application and
- | redirecting them to your home screen. The controller uses a trait
- | to conveniently provide its functionality to your applications.
- |
- */
-
use AuthenticatesUsers;
- /**
- * Where to redirect users after login.
- *
- * @var string
- */
- protected $redirectTo = '/home';
-
/**
* Create a new controller instance.
*
@@ -36,4 +19,54 @@ class LoginController extends Controller
{
$this->middleware('guest')->except('logout');
}
+
+ /**
+ * Attempt to log the user into the application.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @return bool
+ */
+ protected function attemptLogin(Request $request)
+ {
+ $token = $this->guard()->attempt($this->credentials($request));
+
+ if ($token) {
+ $this->guard()->setToken($token);
+
+ return true;
+ }
+
+ return false;
+ }
+
+ /**
+ * Send the response after the user was authenticated.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @return \Illuminate\Http\Response
+ */
+ protected function sendLoginResponse(Request $request)
+ {
+ $this->clearLoginAttempts($request);
+
+ $token = (string) $this->guard()->getToken();
+ $expiration = $this->guard()->getPayload()->get('exp');
+
+ return [
+ 'token' => $token,
+ 'token_type' => 'bearer',
+ 'expires_in' => $expiration - time(),
+ ];
+ }
+
+ /**
+ * Log the user out of the application.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @return \Illuminate\Http\Response
+ */
+ public function logout(Request $request)
+ {
+ $this->guard()->logout();
+ }
}
diff --git a/app/Http/Controllers/Auth/OAuthController.php b/app/Http/Controllers/Auth/OAuthController.php
new file mode 100644
index 00000000..1064c9f5
--- /dev/null
+++ b/app/Http/Controllers/Auth/OAuthController.php
@@ -0,0 +1,111 @@
+ route('oauth.callback', 'github'),
+ ]);
+ }
+
+ /**
+ * Redirect the user to the provider authentication page.
+ *
+ * @param string $provider
+ * @return \Illuminate\Http\RedirectResponse
+ */
+ public function redirectToProvider($provider)
+ {
+ return [
+ 'url' => Socialite::driver($provider)->stateless()->redirect()->getTargetUrl(),
+ ];
+ }
+
+ /**
+ * Obtain the user information from the provider.
+ *
+ * @param string $driver
+ * @return \Illuminate\Http\Response
+ */
+ public function handleProviderCallback($provider)
+ {
+ $user = Socialite::driver($provider)->stateless()->user();
+ $user = $this->findOrCreateUser($provider, $user);
+
+ $this->guard()->setToken(
+ $token = $this->guard()->login($user)
+ );
+
+ return view('oauth/callback', [
+ 'token' => $token,
+ 'token_type' => 'bearer',
+ 'expires_in' => $this->guard()->getPayload()->get('exp') - time(),
+ ]);
+ }
+
+ /**
+ * @param string $provider
+ * @param \Laravel\Socialite\Contracts\User $sUser
+ * @return \App\User|false
+ */
+ protected function findOrCreateUser($provider, $user)
+ {
+ $oauthProvider = OAuthProvider::where('provider', $provider)
+ ->where('provider_user_id', $user->getId())
+ ->first();
+
+ if ($oauthProvider) {
+ $oauthProvider->update([
+ 'access_token' => $user->token,
+ 'refresh_token' => $user->refreshToken,
+ ]);
+
+ return $oauthProvider->user;
+ }
+
+ if (User::where('email', $user->getEmail())->exists()) {
+ throw new EmailTakenException;
+ }
+
+ return $this->createUser($provider, $user);
+ }
+
+ /**
+ * @param string $provider
+ * @param \Laravel\Socialite\Contracts\User $sUser
+ * @return \App\User
+ */
+ protected function createUser($provider, $sUser)
+ {
+ $user = User::create([
+ 'name' => $sUser->getName(),
+ 'email' => $sUser->getEmail(),
+ ]);
+
+ $user->oauthProviders()->create([
+ 'provider' => $provider,
+ 'provider_user_id' => $sUser->getId(),
+ 'access_token' => $sUser->token,
+ 'refresh_token' => $sUser->refreshToken,
+ ]);
+
+ return $user;
+ }
+}
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index e749c077..b3c1d95f 100644
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -3,33 +3,15 @@
namespace App\Http\Controllers\Auth;
use App\User;
+use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
-use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Validator;
use Illuminate\Foundation\Auth\RegistersUsers;
class RegisterController extends Controller
{
- /*
- |--------------------------------------------------------------------------
- | Register Controller
- |--------------------------------------------------------------------------
- |
- | This controller handles the registration of new users as well as their
- | validation and creation. By default this controller uses a trait to
- | provide this functionality without requiring any additional code.
- |
- */
-
use RegistersUsers;
- /**
- * Where to redirect users after registration.
- *
- * @var string
- */
- protected $redirectTo = '/home';
-
/**
* Create a new controller instance.
*
@@ -40,6 +22,18 @@ class RegisterController extends Controller
$this->middleware('guest');
}
+ /**
+ * The user has been registered.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @param mixed $user
+ * @return mixed
+ */
+ protected function registered(Request $request, $user)
+ {
+ return $user;
+ }
+
/**
* Get a validator for an incoming registration request.
*
@@ -49,9 +43,9 @@ class RegisterController extends Controller
protected function validator(array $data)
{
return Validator::make($data, [
- 'name' => 'required|string|max:255',
- 'email' => 'required|string|email|max:255|unique:users',
- 'password' => 'required|string|min:6|confirmed',
+ 'name' => 'required|max:255',
+ 'email' => 'required|email|max:255|unique:users',
+ 'password' => 'required|min:6|confirmed',
]);
}
@@ -59,14 +53,14 @@ class RegisterController extends Controller
* Create a new user instance after a valid registration.
*
* @param array $data
- * @return \App\User
+ * @return User
*/
protected function create(array $data)
{
return User::create([
'name' => $data['name'],
'email' => $data['email'],
- 'password' => Hash::make($data['password']),
+ 'password' => bcrypt($data['password']),
]);
}
}
diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php
index cf726eec..bf039683 100644
--- a/app/Http/Controllers/Auth/ResetPasswordController.php
+++ b/app/Http/Controllers/Auth/ResetPasswordController.php
@@ -2,31 +2,14 @@
namespace App\Http\Controllers\Auth;
+use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\ResetsPasswords;
class ResetPasswordController extends Controller
{
- /*
- |--------------------------------------------------------------------------
- | Password Reset Controller
- |--------------------------------------------------------------------------
- |
- | This controller is responsible for handling password reset requests
- | and uses a simple trait to include this behavior. You're free to
- | explore this trait and override any methods you wish to tweak.
- |
- */
-
use ResetsPasswords;
- /**
- * Where to redirect users after resetting their password.
- *
- * @var string
- */
- protected $redirectTo = '/home';
-
/**
* Create a new controller instance.
*
@@ -36,4 +19,27 @@ class ResetPasswordController extends Controller
{
$this->middleware('guest');
}
+
+ /**
+ * Get the response for a successful password reset.
+ *
+ * @param string $response
+ * @return \Illuminate\Http\RedirectResponse
+ */
+ protected function sendResetResponse($response)
+ {
+ return ['status' => trans($response)];
+ }
+
+ /**
+ * Get the response for a failed password reset.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @param string $response
+ * @return \Illuminate\Http\RedirectResponse
+ */
+ protected function sendResetFailedResponse(Request $request, $response)
+ {
+ return response()->json(['email' => trans($response)], 400);
+ }
}
diff --git a/app/Http/Controllers/Settings/PasswordController.php b/app/Http/Controllers/Settings/PasswordController.php
new file mode 100644
index 00000000..39ab4bf8
--- /dev/null
+++ b/app/Http/Controllers/Settings/PasswordController.php
@@ -0,0 +1,26 @@
+validate($request, [
+ 'password' => 'required|confirmed|min:6',
+ ]);
+
+ $request->user()->update([
+ 'password' => bcrypt($request->password),
+ ]);
+ }
+}
diff --git a/app/Http/Controllers/Settings/ProfileController.php b/app/Http/Controllers/Settings/ProfileController.php
new file mode 100644
index 00000000..73c9d3f7
--- /dev/null
+++ b/app/Http/Controllers/Settings/ProfileController.php
@@ -0,0 +1,27 @@
+user();
+
+ $this->validate($request, [
+ 'name' => 'required',
+ 'email' => 'required|email|unique:users,email,'.$user->id,
+ ]);
+
+ return tap($user)->update($request->only('name', 'email'));
+ }
+}
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index 3439540c..da7a7f5c 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -19,6 +19,7 @@ class Kernel extends HttpKernel
\App\Http\Middleware\TrimStrings::class,
\Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
\App\Http\Middleware\TrustProxies::class,
+ \App\Http\Middleware\SetLocale::class,
];
/**
@@ -28,12 +29,12 @@ class Kernel extends HttpKernel
*/
protected $middlewareGroups = [
'web' => [
- \App\Http\Middleware\EncryptCookies::class,
- \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
- \Illuminate\Session\Middleware\StartSession::class,
+ // \App\Http\Middleware\EncryptCookies::class,
+ // \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
+ // \Illuminate\Session\Middleware\StartSession::class,
// \Illuminate\Session\Middleware\AuthenticateSession::class,
- \Illuminate\View\Middleware\ShareErrorsFromSession::class,
- \App\Http\Middleware\VerifyCsrfToken::class,
+ // \Illuminate\View\Middleware\ShareErrorsFromSession::class,
+ // \App\Http\Middleware\VerifyCsrfToken::class,
\Illuminate\Routing\Middleware\SubstituteBindings::class,
],
@@ -54,10 +55,11 @@ class Kernel extends HttpKernel
'auth' => \Illuminate\Auth\Middleware\Authenticate::class,
'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
- 'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
'can' => \Illuminate\Auth\Middleware\Authorize::class,
'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
- 'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
+ 'ability' => 'App\Http\Middleware\TokenEntrustAbility',
+ 'role' => \Zizaco\Entrust\Middleware\EntrustRole::class,
+ 'permission' => \Zizaco\Entrust\Middleware\EntrustPermission::class,
];
}
diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php
index e4cec9c8..a4c49a71 100644
--- a/app/Http/Middleware/RedirectIfAuthenticated.php
+++ b/app/Http/Middleware/RedirectIfAuthenticated.php
@@ -18,7 +18,7 @@ class RedirectIfAuthenticated
public function handle($request, Closure $next, $guard = null)
{
if (Auth::guard($guard)->check()) {
- return redirect('/home');
+ return response()->json(['error' => 'Already authenticated.'], 400);
}
return $next($request);
diff --git a/app/Http/Middleware/SetLocale.php b/app/Http/Middleware/SetLocale.php
new file mode 100644
index 00000000..7ca03a22
--- /dev/null
+++ b/app/Http/Middleware/SetLocale.php
@@ -0,0 +1,49 @@
+parseLocale($request)) {
+ app()->setLocale($locale);
+ }
+
+ return $next($request);
+ }
+
+ /**
+ * @param \Illuminate\Http\Request $request
+ * @return string|null
+ */
+ protected function parseLocale($request)
+ {
+ $locales = config('app.locales');
+
+ $locale = $request->server('HTTP_ACCEPT_LANGUAGE');
+ $locale = substr($locale, 0, strpos($locale, ',') ?: strlen($locale));
+
+ if (array_key_exists($locale, $locales)) {
+ return $locale;
+ }
+
+ if (array_key_exists($locale, $locales)) {
+ return $locale;
+ }
+
+ $locale = substr($locale, 0, 2);
+ if (array_key_exists($locale, $locales)) {
+ return $locale;
+ }
+ }
+}
diff --git a/app/Http/Middleware/TokenEntrustAbility.php b/app/Http/Middleware/TokenEntrustAbility.php
new file mode 100644
index 00000000..da6c0696
--- /dev/null
+++ b/app/Http/Middleware/TokenEntrustAbility.php
@@ -0,0 +1,39 @@
+auth->setRequest($request)->getToken()) {
+ return $this->respond('tymon.jwt.absent', 'token_not_provided', 400);
+ }
+
+ try {
+ $user = $this->auth->authenticate($token);
+ } catch (TokenExpiredException $e) {
+ return $this->respond('tymon.jwt.expired', 'token_expired', $e->getStatusCode(), [$e]);
+ } catch (JWTException $e) {
+ return $this->respond('tymon.jwt.invalid', 'token_invalid', $e->getStatusCode(), [$e]);
+ }
+
+ if (! $user) {
+ return $this->respond('tymon.jwt.user_not_found', 'user_not_found', 404);
+ }
+
+ if (!$request->user()->ability(explode('|', $roles), explode('|', $permissions), array('validate_all' => $validateAll))) {
+ return $this->respond('tymon.jwt.invalid', 'token_invalid', 401, 'Unauthorized');
+ }
+
+ $this->events->fire('tymon.jwt.valid', $user);
+
+ return $next($request);
+ }
+}
\ No newline at end of file
diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php
index 3ce02144..6a0a1a44 100644
--- a/app/Http/Middleware/TrustProxies.php
+++ b/app/Http/Middleware/TrustProxies.php
@@ -15,9 +15,9 @@ class TrustProxies extends Middleware
protected $proxies;
/**
- * The headers that should be used to detect proxies.
+ * The current proxy header mappings.
*
- * @var string
+ * @var array
*/
protected $headers = Request::HEADER_X_FORWARDED_ALL;
}
diff --git a/app/Notifications/ResetPassword.php b/app/Notifications/ResetPassword.php
new file mode 100644
index 00000000..92148e20
--- /dev/null
+++ b/app/Notifications/ResetPassword.php
@@ -0,0 +1,23 @@
+line('You are receiving this email because we received a password reset request for your account.')
+ ->action('Reset Password', url(config('app.url').'/password/reset/'.$this->token).'?email='.urlencode($notifiable->email))
+ ->line('If you did not request a password reset, no further action is required.');
+ }
+}
diff --git a/app/OAuthProvider.php b/app/OAuthProvider.php
new file mode 100644
index 00000000..cccd2830
--- /dev/null
+++ b/app/OAuthProvider.php
@@ -0,0 +1,39 @@
+belongsTo(User::class);
+ }
+}
diff --git a/app/Permission.php b/app/Permission.php
new file mode 100644
index 00000000..6e0bf631
--- /dev/null
+++ b/app/Permission.php
@@ -0,0 +1,7 @@
+app->runningUnitTests()) {
+ Schema::defaultStringLength(191);
+ }
+ */
Schema::defaultStringLength(191);
}
@@ -24,6 +31,8 @@ class AppServiceProvider extends ServiceProvider
*/
public function register()
{
- //
+ if ($this->app->environment('local', 'testing')) {
+ $this->app->register(DuskServiceProvider::class);
+ }
}
}
diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
index 9784b1a3..9e68caa6 100644
--- a/app/Providers/AuthServiceProvider.php
+++ b/app/Providers/AuthServiceProvider.php
@@ -2,7 +2,6 @@
namespace App\Providers;
-use Illuminate\Support\Facades\Gate;
use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
class AuthServiceProvider extends ServiceProvider
diff --git a/app/Role.php b/app/Role.php
new file mode 100644
index 00000000..5054ac09
--- /dev/null
+++ b/app/Role.php
@@ -0,0 +1,7 @@
+email)).'.jpg?s=200&d=mm';
+ }
+
+ /**
+ * Get the role attribute.
+ *
+ * @return string
+ */
+ public function getRoleAttribute()
+ {
+ return $this->roles->first()->name;
+ }
+
+ /**
+ * Get the oauth providers.
+ *
+ * @return \Illuminate\Database\Eloquent\Relations\HasMany
+ */
+ public function oauthProviders()
+ {
+ return $this->hasMany(OAuthProvider::class);
+ }
+
+ /**
+ * Send the password reset notification.
+ *
+ * @param string $token
+ * @return void
+ */
+ public function sendPasswordResetNotification($token)
+ {
+ $this->notify(new ResetPasswordNotification($token));
+ }
+
+ /**
+ * @return int
+ */
+ public function getJWTIdentifier()
+ {
+ return $this->getKey();
+ }
+
+ /**
+ * @return array
+ */
+ public function getJWTCustomClaims()
+ {
+ return [];
+ }
+
}
diff --git a/composer.json b/composer.json
index 62c7d029..879902b8 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
{
- "name": "laravel/laravel",
- "description": "The Laravel Framework.",
- "keywords": ["framework", "laravel"],
+ "name": "cretueusebiu/laravel-vue-spa",
+ "description": "A Laravel-Vue SPA starter project template.",
+ "keywords": ["spa", "laravel", "vue"],
"license": "MIT",
"type": "project",
"require": {
@@ -9,12 +9,16 @@
"fideloper/proxy": "^4.0",
"intervention/image": "^2.4",
"laravel/framework": "5.6.*",
- "laravel/tinker": "^1.0",
+ "laravel/socialite": "^3.0",
+ "laravel/tinker": "~1.0",
+ "tymon/jwt-auth": "^1.0.0-rc.2",
+ "zizaco/entrust": "dev-master",
"laravelcollective/html": "^5.6"
},
"require-dev": {
"filp/whoops": "^2.0",
"fzaninotto/faker": "^1.4",
+ "laravel/dusk": "^3.0",
"mockery/mockery": "^1.0",
"nunomaduro/collision": "^2.0",
"phpunit/phpunit": "^7.0"
@@ -36,6 +40,7 @@
"extra": {
"laravel": {
"dont-discover": [
+ "laravel/dusk"
]
}
},
@@ -43,19 +48,18 @@
"post-root-package-install": [
"@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
],
- "post-create-project-cmd": [
- "@php artisan key:generate"
- ],
"post-autoload-dump": [
"Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
"@php artisan package:discover"
+ ],
+ "post-create-project-cmd": [
+ "@php artisan key:generate",
+ "@php artisan jwt:secret --force"
]
},
"config": {
"preferred-install": "dist",
"sort-packages": true,
"optimize-autoloader": true
- },
- "minimum-stability": "dev",
- "prefer-stable": true
+ }
}
diff --git a/composer.lock b/composer.lock
index c23fb1d0..f8e05bc5 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "af9f2913cec16c1fb32c6cda9b46b351",
+ "content-hash": "bbcc333ace48de3a56664e9bf1182b6d",
"packages": [
{
"name": "dnoegel/php-xdg-base-dir",
@@ -367,6 +367,7 @@
"time": "2018-02-07T20:20:57+00:00"
},
{
+<<<<<<< HEAD
"name": "guzzlehttp/psr7",
"version": "1.4.2",
"source": {
@@ -389,6 +390,91 @@
},
"require-dev": {
"phpunit/phpunit": "~4.0"
+=======
+ "name": "guzzlehttp/guzzle",
+ "version": "6.3.3",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/guzzle/guzzle.git",
+ "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/guzzle/guzzle/zipball/407b0cb880ace85c9b63c5f9551db498cb2d50ba",
+ "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba",
+ "shasum": ""
+ },
+ "require": {
+ "guzzlehttp/promises": "^1.0",
+ "guzzlehttp/psr7": "^1.4",
+ "php": ">=5.5"
+ },
+ "require-dev": {
+ "ext-curl": "*",
+ "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0",
+ "psr/log": "^1.0"
+ },
+ "suggest": {
+ "psr/log": "Required for using the Log middleware"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "6.3-dev"
+ }
+ },
+ "autoload": {
+ "files": [
+ "src/functions_include.php"
+ ],
+ "psr-4": {
+ "GuzzleHttp\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Michael Dowling",
+ "email": "mtdowling@gmail.com",
+ "homepage": "https://github.com/mtdowling"
+ }
+ ],
+ "description": "Guzzle is a PHP HTTP client library",
+ "homepage": "http://guzzlephp.org/",
+ "keywords": [
+ "client",
+ "curl",
+ "framework",
+ "http",
+ "http client",
+ "rest",
+ "web service"
+ ],
+ "time": "2018-04-22T15:46:56+00:00"
+ },
+ {
+ "name": "guzzlehttp/promises",
+ "version": "v1.3.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/guzzle/promises.git",
+ "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/guzzle/promises/zipball/a59da6cf61d80060647ff4d3eb2c03a2bc694646",
+ "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.5.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.0"
+>>>>>>> 4278419aaa489ca2ba12cdcdffdfc53e549ed1f1
},
"type": "library",
"extra": {
@@ -398,7 +484,11 @@
},
"autoload": {
"psr-4": {
+<<<<<<< HEAD
"GuzzleHttp\\Psr7\\": "src/"
+=======
+ "GuzzleHttp\\Promise\\": "src/"
+>>>>>>> 4278419aaa489ca2ba12cdcdffdfc53e549ed1f1
},
"files": [
"src/functions_include.php"
@@ -413,6 +503,7 @@
"name": "Michael Dowling",
"email": "mtdowling@gmail.com",
"homepage": "https://github.com/mtdowling"
+<<<<<<< HEAD
},
{
"name": "Tobias Schultze",
@@ -458,10 +549,44 @@
"ext-gd": "to use GD library based image processing.",
"ext-imagick": "to use Imagick based image processing.",
"intervention/imagecache": "Caching extension for the Intervention Image library"
+=======
+ }
+ ],
+ "description": "Guzzle promises library",
+ "keywords": [
+ "promise"
+ ],
+ "time": "2016-12-20T10:07:11+00:00"
+ },
+ {
+ "name": "guzzlehttp/psr7",
+ "version": "1.4.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/guzzle/psr7.git",
+ "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/guzzle/psr7/zipball/f5b8a8512e2b58b0071a7280e39f14f72e05d87c",
+ "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.4.0",
+ "psr/http-message": "~1.0"
+ },
+ "provide": {
+ "psr/http-message-implementation": "1.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "~4.0"
+>>>>>>> 4278419aaa489ca2ba12cdcdffdfc53e549ed1f1
},
"type": "library",
"extra": {
"branch-alias": {
+<<<<<<< HEAD
"dev-master": "2.3-dev"
},
"laravel": {
@@ -471,12 +596,23 @@
"aliases": {
"Image": "Intervention\\Image\\Facades\\Image"
}
+=======
+ "dev-master": "1.4-dev"
+>>>>>>> 4278419aaa489ca2ba12cdcdffdfc53e549ed1f1
}
},
"autoload": {
"psr-4": {
+<<<<<<< HEAD
"Intervention\\Image\\": "src/Intervention/Image"
}
+=======
+ "GuzzleHttp\\Psr7\\": "src/"
+ },
+ "files": [
+ "src/functions_include.php"
+ ]
+>>>>>>> 4278419aaa489ca2ba12cdcdffdfc53e549ed1f1
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -484,6 +620,7 @@
],
"authors": [
{
+<<<<<<< HEAD
"name": "Oliver Vogel",
"email": "oliver@olivervogel.com",
"homepage": "http://olivervogel.com/"
@@ -500,6 +637,28 @@
"watermark"
],
"time": "2017-09-21T16:29:17+00:00"
+=======
+ "name": "Michael Dowling",
+ "email": "mtdowling@gmail.com",
+ "homepage": "https://github.com/mtdowling"
+ },
+ {
+ "name": "Tobias Schultze",
+ "homepage": "https://github.com/Tobion"
+ }
+ ],
+ "description": "PSR-7 message implementation that also provides common utility methods",
+ "keywords": [
+ "http",
+ "message",
+ "request",
+ "response",
+ "stream",
+ "uri",
+ "url"
+ ],
+ "time": "2017-03-20T17:10:46+00:00"
+>>>>>>> 4278419aaa489ca2ba12cdcdffdfc53e549ed1f1
},
{
"name": "jakub-onderka/php-console-color",
@@ -590,16 +749,16 @@
},
{
"name": "laravel/framework",
- "version": "v5.6.16",
+ "version": "v5.6.20",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
- "reference": "fcdbc791bc3e113ada38ab0a1147141fb9ec2b16"
+ "reference": "3c11e7acc6ad14dd86e2f9e4bf3230010c3e611c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/framework/zipball/fcdbc791bc3e113ada38ab0a1147141fb9ec2b16",
- "reference": "fcdbc791bc3e113ada38ab0a1147141fb9ec2b16",
+ "url": "https://api.github.com/repos/laravel/framework/zipball/3c11e7acc6ad14dd86e2f9e4bf3230010c3e611c",
+ "reference": "3c11e7acc6ad14dd86e2f9e4bf3230010c3e611c",
"shasum": ""
},
"require": {
@@ -610,7 +769,7 @@
"ext-openssl": "*",
"league/flysystem": "^1.0.8",
"monolog/monolog": "~1.12",
- "nesbot/carbon": "^1.24.1",
+ "nesbot/carbon": "1.25.*",
"php": "^7.1.3",
"psr/container": "~1.0",
"psr/simple-cache": "^1.0",
@@ -725,20 +884,82 @@
"framework",
"laravel"
],
- "time": "2018-04-09T16:07:04+00:00"
+ "time": "2018-05-02T15:22:18+00:00"
},
{
- "name": "laravel/tinker",
- "version": "v1.0.5",
+ "name": "laravel/socialite",
+ "version": "v3.0.9",
"source": {
"type": "git",
- "url": "https://github.com/laravel/tinker.git",
- "reference": "94f6daf2131508cebd11cd6f8632ba586d7ecc41"
+ "url": "https://github.com/laravel/socialite.git",
+ "reference": "fc1c8d415699e502f3e61cbc61e3250d5bd942eb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/tinker/zipball/94f6daf2131508cebd11cd6f8632ba586d7ecc41",
- "reference": "94f6daf2131508cebd11cd6f8632ba586d7ecc41",
+ "url": "https://api.github.com/repos/laravel/socialite/zipball/fc1c8d415699e502f3e61cbc61e3250d5bd942eb",
+ "reference": "fc1c8d415699e502f3e61cbc61e3250d5bd942eb",
+ "shasum": ""
+ },
+ "require": {
+ "guzzlehttp/guzzle": "~6.0",
+ "illuminate/contracts": "~5.4",
+ "illuminate/http": "~5.4",
+ "illuminate/support": "~5.4",
+ "league/oauth1-client": "~1.0",
+ "php": ">=5.4.0"
+ },
+ "require-dev": {
+ "mockery/mockery": "~0.9",
+ "phpunit/phpunit": "~4.0|~5.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "3.0-dev"
+ },
+ "laravel": {
+ "providers": [
+ "Laravel\\Socialite\\SocialiteServiceProvider"
+ ],
+ "aliases": {
+ "Socialite": "Laravel\\Socialite\\Facades\\Socialite"
+ }
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Laravel\\Socialite\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Taylor Otwell",
+ "email": "taylor@laravel.com"
+ }
+ ],
+ "description": "Laravel wrapper around OAuth 1 & OAuth 2 libraries.",
+ "keywords": [
+ "laravel",
+ "oauth"
+ ],
+ "time": "2017-11-06T16:02:48+00:00"
+ },
+ {
+ "name": "laravel/tinker",
+ "version": "v1.0.6",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/laravel/tinker.git",
+ "reference": "b22fe905fcefdffae76b011e27c7ac09e07e052b"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/laravel/tinker/zipball/b22fe905fcefdffae76b011e27c7ac09e07e052b",
+ "reference": "b22fe905fcefdffae76b011e27c7ac09e07e052b",
"shasum": ""
},
"require": {
@@ -746,7 +967,7 @@
"illuminate/contracts": "~5.1",
"illuminate/support": "~5.1",
"php": ">=5.5.9",
- "psy/psysh": "0.7.*|0.8.*",
+ "psy/psysh": "0.7.*|0.8.*|0.9.*",
"symfony/var-dumper": "~3.0|~4.0"
},
"require-dev": {
@@ -788,7 +1009,65 @@
"laravel",
"psysh"
],
- "time": "2018-03-06T17:34:36+00:00"
+ "time": "2018-04-16T12:10:37+00:00"
+ },
+ {
+ "name": "lcobucci/jwt",
+ "version": "3.2.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/lcobucci/jwt.git",
+ "reference": "0b5930be73582369e10c4d4bb7a12bac927a203c"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/lcobucci/jwt/zipball/0b5930be73582369e10c4d4bb7a12bac927a203c",
+ "reference": "0b5930be73582369e10c4d4bb7a12bac927a203c",
+ "shasum": ""
+ },
+ "require": {
+ "ext-openssl": "*",
+ "php": ">=5.5"
+ },
+ "require-dev": {
+ "mdanter/ecc": "~0.3.1",
+ "mikey179/vfsstream": "~1.5",
+ "phpmd/phpmd": "~2.2",
+ "phpunit/php-invoker": "~1.1",
+ "phpunit/phpunit": "~4.5",
+ "squizlabs/php_codesniffer": "~2.3"
+ },
+ "suggest": {
+ "mdanter/ecc": "Required to use Elliptic Curves based algorithms."
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "3.1-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Lcobucci\\JWT\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "LuÃs Otávio Cobucci Oblonczyk",
+ "email": "lcobucci@gmail.com",
+ "role": "developer"
+ }
+ ],
+ "description": "A simple library to work with JSON Web Token and JSON Web Signature",
+ "keywords": [
+ "JWS",
+ "jwt"
+ ],
+ "time": "2017-09-01T08:23:26+00:00"
},
{
"name": "laravelcollective/html",
@@ -942,6 +1221,69 @@
],
"time": "2018-04-06T09:58:14+00:00"
},
+ {
+ "name": "league/oauth1-client",
+ "version": "1.7.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/thephpleague/oauth1-client.git",
+ "reference": "fca5f160650cb74d23fc11aa570dd61f86dcf647"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/thephpleague/oauth1-client/zipball/fca5f160650cb74d23fc11aa570dd61f86dcf647",
+ "reference": "fca5f160650cb74d23fc11aa570dd61f86dcf647",
+ "shasum": ""
+ },
+ "require": {
+ "guzzlehttp/guzzle": "^6.0",
+ "php": ">=5.5.0"
+ },
+ "require-dev": {
+ "mockery/mockery": "^0.9",
+ "phpunit/phpunit": "^4.0",
+ "squizlabs/php_codesniffer": "^2.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "League\\OAuth1\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Ben Corlett",
+ "email": "bencorlett@me.com",
+ "homepage": "http://www.webcomm.com.au",
+ "role": "Developer"
+ }
+ ],
+ "description": "OAuth 1.0 Client Library",
+ "keywords": [
+ "Authentication",
+ "SSO",
+ "authorization",
+ "bitbucket",
+ "identity",
+ "idp",
+ "oauth",
+ "oauth1",
+ "single sign on",
+ "trello",
+ "tumblr",
+ "twitter"
+ ],
+ "time": "2016-08-17T00:36:58+00:00"
+ },
{
"name": "monolog/monolog",
"version": "1.23.0",
@@ -1020,6 +1362,69 @@
],
"time": "2017-06-19T01:22:40+00:00"
},
+ {
+ "name": "namshi/jose",
+ "version": "7.2.3",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/namshi/jose.git",
+ "reference": "89a24d7eb3040e285dd5925fcad992378b82bcff"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/namshi/jose/zipball/89a24d7eb3040e285dd5925fcad992378b82bcff",
+ "reference": "89a24d7eb3040e285dd5925fcad992378b82bcff",
+ "shasum": ""
+ },
+ "require": {
+ "ext-date": "*",
+ "ext-hash": "*",
+ "ext-json": "*",
+ "ext-pcre": "*",
+ "ext-spl": "*",
+ "php": ">=5.5",
+ "symfony/polyfill-php56": "^1.0"
+ },
+ "require-dev": {
+ "phpseclib/phpseclib": "^2.0",
+ "phpunit/phpunit": "^4.5|^5.0",
+ "satooshi/php-coveralls": "^1.0"
+ },
+ "suggest": {
+ "ext-openssl": "Allows to use OpenSSL as crypto engine.",
+ "phpseclib/phpseclib": "Allows to use Phpseclib as crypto engine, use version ^2.0."
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "Namshi\\JOSE\\": "src/Namshi/JOSE/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Alessandro Nadalin",
+ "email": "alessandro.nadalin@gmail.com"
+ },
+ {
+ "name": "Alessandro Cinelli (cirpo)",
+ "email": "alessandro.cinelli@gmail.com"
+ }
+ ],
+ "description": "JSON Object Signing and Encryption library for PHP.",
+ "keywords": [
+ "JSON Web Signature",
+ "JSON Web Token",
+ "JWS",
+ "json",
+ "jwt",
+ "token"
+ ],
+ "time": "2016-12-05T07:27:31+00:00"
+ },
{
"name": "nesbot/carbon",
"version": "1.25.0",
@@ -1075,24 +1480,24 @@
},
{
"name": "nikic/php-parser",
- "version": "v3.1.5",
+ "version": "v4.0.1",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "bb87e28e7d7b8d9a7fda231d37457c9210faf6ce"
+ "reference": "e4a54fa90a5cd8e8dd3fb4099942681731c5cdd3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/bb87e28e7d7b8d9a7fda231d37457c9210faf6ce",
- "reference": "bb87e28e7d7b8d9a7fda231d37457c9210faf6ce",
+ "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/e4a54fa90a5cd8e8dd3fb4099942681731c5cdd3",
+ "reference": "e4a54fa90a5cd8e8dd3fb4099942681731c5cdd3",
"shasum": ""
},
"require": {
"ext-tokenizer": "*",
- "php": ">=5.5"
+ "php": ">=7.0"
},
"require-dev": {
- "phpunit/phpunit": "~4.0|~5.0"
+ "phpunit/phpunit": "^6.5 || ^7.0"
},
"bin": [
"bin/php-parse"
@@ -1100,7 +1505,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.0-dev"
+ "dev-master": "4.0-dev"
}
},
"autoload": {
@@ -1122,7 +1527,7 @@
"parser",
"php"
],
- "time": "2018-02-28T20:30:58+00:00"
+ "time": "2018-03-25T17:35:16+00:00"
},
{
"name": "paragonie/random_compat",
@@ -1271,6 +1676,56 @@
],
"time": "2016-08-06T14:39:51+00:00"
},
+ {
+ "name": "psr/http-message",
+ "version": "1.0.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/php-fig/http-message.git",
+ "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
+ "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Psr\\Http\\Message\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "PHP-FIG",
+ "homepage": "http://www.php-fig.org/"
+ }
+ ],
+ "description": "Common interface for HTTP messages",
+ "homepage": "https://github.com/php-fig/http-message",
+ "keywords": [
+ "http",
+ "http-message",
+ "psr",
+ "psr-7",
+ "request",
+ "response"
+ ],
+ "time": "2016-08-06T14:39:51+00:00"
+ },
{
"name": "psr/log",
"version": "1.0.2",
@@ -1368,29 +1823,29 @@
},
{
"name": "psy/psysh",
- "version": "v0.8.18",
+ "version": "v0.9.3",
"source": {
"type": "git",
"url": "https://github.com/bobthecow/psysh.git",
- "reference": "5357b1cffc8fb375d6a9e3c86d5c82dd38a40834"
+ "reference": "79c280013cf0b30fa23f3ba8bd3649218075adf4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/bobthecow/psysh/zipball/5357b1cffc8fb375d6a9e3c86d5c82dd38a40834",
- "reference": "5357b1cffc8fb375d6a9e3c86d5c82dd38a40834",
+ "url": "https://api.github.com/repos/bobthecow/psysh/zipball/79c280013cf0b30fa23f3ba8bd3649218075adf4",
+ "reference": "79c280013cf0b30fa23f3ba8bd3649218075adf4",
"shasum": ""
},
"require": {
"dnoegel/php-xdg-base-dir": "0.1",
"jakub-onderka/php-console-highlighter": "0.3.*",
- "nikic/php-parser": "~1.3|~2.0|~3.0",
- "php": ">=5.3.9",
+ "nikic/php-parser": "~1.3|~2.0|~3.0|~4.0",
+ "php": ">=5.4.0",
"symfony/console": "~2.3.10|^2.4.2|~3.0|~4.0",
"symfony/var-dumper": "~2.7|~3.0|~4.0"
},
"require-dev": {
- "hoa/console": "~3.16|~1.14",
- "phpunit/phpunit": "^4.8.35|^5.4.3",
+ "hoa/console": "~2.15|~3.16",
+ "phpunit/phpunit": "~4.8.35|~5.0|~6.0|~7.0",
"symfony/finder": "~2.1|~3.0|~4.0"
},
"suggest": {
@@ -1406,15 +1861,15 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-develop": "0.8.x-dev"
+ "dev-develop": "0.9.x-dev"
}
},
"autoload": {
"files": [
- "src/Psy/functions.php"
+ "src/functions.php"
],
"psr-4": {
- "Psy\\": "src/Psy/"
+ "Psy\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -1436,7 +1891,7 @@
"interactive",
"shell"
],
- "time": "2018-04-02T05:41:44+00:00"
+ "time": "2018-04-18T12:32:50+00:00"
},
{
"name": "ramsey/uuid",
@@ -1575,16 +2030,16 @@
},
{
"name": "symfony/console",
- "version": "v4.0.8",
+ "version": "v4.0.9",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "aad9a6fe47319f22748fd764f52d3a7ca6fa6b64"
+ "reference": "3e820bc2c520a87ca209ad8fa961c97f42e0b4ae"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/aad9a6fe47319f22748fd764f52d3a7ca6fa6b64",
- "reference": "aad9a6fe47319f22748fd764f52d3a7ca6fa6b64",
+ "url": "https://api.github.com/repos/symfony/console/zipball/3e820bc2c520a87ca209ad8fa961c97f42e0b4ae",
+ "reference": "3e820bc2c520a87ca209ad8fa961c97f42e0b4ae",
"shasum": ""
},
"require": {
@@ -1604,7 +2059,7 @@
"symfony/process": "~3.4|~4.0"
},
"suggest": {
- "psr/log": "For using the console logger",
+ "psr/log-implementation": "For using the console logger",
"symfony/event-dispatcher": "",
"symfony/lock": "",
"symfony/process": ""
@@ -1639,11 +2094,11 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
- "time": "2018-04-03T05:24:00+00:00"
+ "time": "2018-04-30T01:23:47+00:00"
},
{
"name": "symfony/css-selector",
- "version": "v4.0.8",
+ "version": "v4.0.9",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
@@ -1696,16 +2151,16 @@
},
{
"name": "symfony/debug",
- "version": "v4.0.8",
+ "version": "v4.0.9",
"source": {
"type": "git",
"url": "https://github.com/symfony/debug.git",
- "reference": "5961d02d48828671f5d8a7805e06579d692f6ede"
+ "reference": "e1d57cdb357e5b10f5fdacbb0b86689c0a435e6e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/debug/zipball/5961d02d48828671f5d8a7805e06579d692f6ede",
- "reference": "5961d02d48828671f5d8a7805e06579d692f6ede",
+ "url": "https://api.github.com/repos/symfony/debug/zipball/e1d57cdb357e5b10f5fdacbb0b86689c0a435e6e",
+ "reference": "e1d57cdb357e5b10f5fdacbb0b86689c0a435e6e",
"shasum": ""
},
"require": {
@@ -1748,11 +2203,11 @@
],
"description": "Symfony Debug Component",
"homepage": "https://symfony.com",
- "time": "2018-04-03T05:24:00+00:00"
+ "time": "2018-04-30T16:59:37+00:00"
},
{
"name": "symfony/event-dispatcher",
- "version": "v4.0.8",
+ "version": "v4.0.9",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
@@ -1815,7 +2270,7 @@
},
{
"name": "symfony/finder",
- "version": "v4.0.8",
+ "version": "v4.0.9",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
@@ -1864,16 +2319,16 @@
},
{
"name": "symfony/http-foundation",
- "version": "v4.0.8",
+ "version": "v4.0.9",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
- "reference": "d0864a82e5891ab61d31eecbaa48bed5a09b8e6c"
+ "reference": "014487772c22d893168e5d628a13e882009fea29"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-foundation/zipball/d0864a82e5891ab61d31eecbaa48bed5a09b8e6c",
- "reference": "d0864a82e5891ab61d31eecbaa48bed5a09b8e6c",
+ "url": "https://api.github.com/repos/symfony/http-foundation/zipball/014487772c22d893168e5d628a13e882009fea29",
+ "reference": "014487772c22d893168e5d628a13e882009fea29",
"shasum": ""
},
"require": {
@@ -1913,20 +2368,20 @@
],
"description": "Symfony HttpFoundation Component",
"homepage": "https://symfony.com",
- "time": "2018-04-03T05:24:00+00:00"
+ "time": "2018-04-30T01:05:59+00:00"
},
{
"name": "symfony/http-kernel",
- "version": "v4.0.8",
+ "version": "v4.0.9",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
- "reference": "6dd620d96d64456075536ffe3c6c4658dd689021"
+ "reference": "8333264b6de323ea27a08627d5396aa564fb9c25"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-kernel/zipball/6dd620d96d64456075536ffe3c6c4658dd689021",
- "reference": "6dd620d96d64456075536ffe3c6c4658dd689021",
+ "url": "https://api.github.com/repos/symfony/http-kernel/zipball/8333264b6de323ea27a08627d5396aa564fb9c25",
+ "reference": "8333264b6de323ea27a08627d5396aa564fb9c25",
"shasum": ""
},
"require": {
@@ -1999,20 +2454,20 @@
],
"description": "Symfony HttpKernel Component",
"homepage": "https://symfony.com",
- "time": "2018-04-06T16:25:03+00:00"
+ "time": "2018-04-30T19:45:57+00:00"
},
{
"name": "symfony/polyfill-mbstring",
- "version": "v1.7.0",
+ "version": "v1.8.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
- "reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b"
+ "reference": "3296adf6a6454a050679cde90f95350ad604b171"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/78be803ce01e55d3491c1397cf1c64beb9c1b63b",
- "reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b",
+ "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/3296adf6a6454a050679cde90f95350ad604b171",
+ "reference": "3296adf6a6454a050679cde90f95350ad604b171",
"shasum": ""
},
"require": {
@@ -2024,7 +2479,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.7-dev"
+ "dev-master": "1.8-dev"
}
},
"autoload": {
@@ -2058,20 +2513,76 @@
"portable",
"shim"
],
- "time": "2018-01-30T19:27:44+00:00"
+ "time": "2018-04-26T10:06:28+00:00"
},
{
- "name": "symfony/polyfill-php72",
- "version": "v1.7.0",
+ "name": "symfony/polyfill-php56",
+ "version": "v1.8.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/polyfill-php72.git",
- "reference": "8eca20c8a369e069d4f4c2ac9895144112867422"
+ "url": "https://github.com/symfony/polyfill-php56.git",
+ "reference": "af98553c84912459db3f636329567809d639a8f6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/8eca20c8a369e069d4f4c2ac9895144112867422",
- "reference": "8eca20c8a369e069d4f4c2ac9895144112867422",
+ "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/af98553c84912459db3f636329567809d639a8f6",
+ "reference": "af98553c84912459db3f636329567809d639a8f6",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3",
+ "symfony/polyfill-util": "~1.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.8-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": "2018-04-26T10:06:28+00:00"
+ },
+ {
+ "name": "symfony/polyfill-php72",
+ "version": "v1.8.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/polyfill-php72.git",
+ "reference": "a4576e282d782ad82397f3e4ec1df8e0f0cafb46"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/a4576e282d782ad82397f3e4ec1df8e0f0cafb46",
+ "reference": "a4576e282d782ad82397f3e4ec1df8e0f0cafb46",
"shasum": ""
},
"require": {
@@ -2080,7 +2591,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.7-dev"
+ "dev-master": "1.8-dev"
}
},
"autoload": {
@@ -2113,11 +2624,63 @@
"portable",
"shim"
],
- "time": "2018-01-31T17:43:24+00:00"
+ "time": "2018-04-26T10:06:28+00:00"
+ },
+ {
+ "name": "symfony/polyfill-util",
+ "version": "v1.8.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/polyfill-util.git",
+ "reference": "1a5ad95d9436cbff3296034fe9f8d586dce3fb3a"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/1a5ad95d9436cbff3296034fe9f8d586dce3fb3a",
+ "reference": "1a5ad95d9436cbff3296034fe9f8d586dce3fb3a",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.8-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": "2018-04-26T10:06:28+00:00"
},
{
"name": "symfony/process",
- "version": "v4.0.8",
+ "version": "v4.0.9",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
@@ -2166,16 +2729,16 @@
},
{
"name": "symfony/routing",
- "version": "v4.0.8",
+ "version": "v4.0.9",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
- "reference": "0663036dd57dbfd4e9ff29f75bbd5dd3253ebe71"
+ "reference": "1dfbfdf060bbc80da8dedc062050052e694cd027"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/routing/zipball/0663036dd57dbfd4e9ff29f75bbd5dd3253ebe71",
- "reference": "0663036dd57dbfd4e9ff29f75bbd5dd3253ebe71",
+ "url": "https://api.github.com/repos/symfony/routing/zipball/1dfbfdf060bbc80da8dedc062050052e694cd027",
+ "reference": "1dfbfdf060bbc80da8dedc062050052e694cd027",
"shasum": ""
},
"require": {
@@ -2240,20 +2803,20 @@
"uri",
"url"
],
- "time": "2018-04-04T13:50:32+00:00"
+ "time": "2018-04-20T06:20:23+00:00"
},
{
"name": "symfony/translation",
- "version": "v4.0.8",
+ "version": "v4.0.9",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
- "reference": "e20a9b7f9f62cb33a11638b345c248e7d510c938"
+ "reference": "ad3abf08eb3450491d8d76513100ef58194cd13e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/translation/zipball/e20a9b7f9f62cb33a11638b345c248e7d510c938",
- "reference": "e20a9b7f9f62cb33a11638b345c248e7d510c938",
+ "url": "https://api.github.com/repos/symfony/translation/zipball/ad3abf08eb3450491d8d76513100ef58194cd13e",
+ "reference": "ad3abf08eb3450491d8d76513100ef58194cd13e",
"shasum": ""
},
"require": {
@@ -2274,7 +2837,7 @@
"symfony/yaml": "~3.4|~4.0"
},
"suggest": {
- "psr/log": "To use logging capability in translator",
+ "psr/log-implementation": "To use logging capability in translator",
"symfony/config": "",
"symfony/yaml": ""
},
@@ -2308,20 +2871,20 @@
],
"description": "Symfony Translation Component",
"homepage": "https://symfony.com",
- "time": "2018-02-22T10:50:29+00:00"
+ "time": "2018-04-30T01:23:47+00:00"
},
{
"name": "symfony/var-dumper",
- "version": "v4.0.8",
+ "version": "v4.0.9",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
- "reference": "e1b4d008100f4d203cc38b0d793ad6252d8d8af0"
+ "reference": "3c34cf3f4bbac9e003d9325225e9ef1a49180a18"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/var-dumper/zipball/e1b4d008100f4d203cc38b0d793ad6252d8d8af0",
- "reference": "e1b4d008100f4d203cc38b0d793ad6252d8d8af0",
+ "url": "https://api.github.com/repos/symfony/var-dumper/zipball/3c34cf3f4bbac9e003d9325225e9ef1a49180a18",
+ "reference": "3c34cf3f4bbac9e003d9325225e9ef1a49180a18",
"shasum": ""
},
"require": {
@@ -2377,7 +2940,7 @@
"debug",
"dump"
],
- "time": "2018-04-04T05:10:37+00:00"
+ "time": "2018-04-26T16:12:06+00:00"
},
{
"name": "tijsverkoyen/css-to-inline-styles",
@@ -2426,6 +2989,81 @@
"homepage": "https://github.com/tijsverkoyen/CssToInlineStyles",
"time": "2017-11-27T11:13:29+00:00"
},
+ {
+ "name": "tymon/jwt-auth",
+ "version": "1.0.0-rc.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/tymondesigns/jwt-auth.git",
+ "reference": "d5220f6a84cbb8300f6f2f0f20aa908d072b4e4b"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/tymondesigns/jwt-auth/zipball/d5220f6a84cbb8300f6f2f0f20aa908d072b4e4b",
+ "reference": "d5220f6a84cbb8300f6f2f0f20aa908d072b4e4b",
+ "shasum": ""
+ },
+ "require": {
+ "illuminate/auth": "5.1.* || 5.2.* || 5.3.* || 5.4.* || 5.5.* || 5.6.*",
+ "illuminate/contracts": "5.1.* || 5.2.* || 5.3.* || 5.4.* || 5.5.* || 5.6.*",
+ "illuminate/http": "5.1.* || 5.2.* || 5.3.* || 5.4.* || 5.5.* || 5.6.*",
+ "illuminate/support": "5.1.* || 5.2.* || 5.3.* || 5.4.* || 5.5.* || 5.6.*",
+ "lcobucci/jwt": "^3.2",
+ "namshi/jose": "^7.0",
+ "nesbot/carbon": "^1.0",
+ "php": "^5.5.9 || ^7.0"
+ },
+ "require-dev": {
+ "cartalyst/sentinel": "2.0.*",
+ "illuminate/console": "5.1.* || 5.2.* || 5.3.* || 5.4.* || 5.5.* || 5.6.*",
+ "illuminate/database": "5.1.* || 5.2.* || 5.3.* || 5.4.* || 5.5.* || 5.6.*",
+ "illuminate/routing": "5.1.* || 5.2.* || 5.3.* || 5.4.* || 5.5.* || 5.6.*",
+ "mockery/mockery": ">=0.9.9",
+ "phpunit/phpunit": "~4.8 || ~6.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-develop": "1.0-dev"
+ },
+ "laravel": {
+ "aliases": {
+ "JWTAuth": "Tymon\\JWTAuth\\Facades\\JWTAuth",
+ "JWTFactory": "Tymon\\JWTAuth\\Facades\\JWTFactory"
+ },
+ "providers": [
+ "Tymon\\JWTAuth\\Providers\\LaravelServiceProvider"
+ ]
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Tymon\\JWTAuth\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Sean Tymon",
+ "email": "tymon148@gmail.com",
+ "homepage": "https://tymon.xyz",
+ "role": "Developer"
+ }
+ ],
+ "description": "JSON Web Token Authentication for Laravel and Lumen",
+ "homepage": "https://github.com/tymondesigns/jwt-auth",
+ "keywords": [
+ "Authentication",
+ "JSON Web Token",
+ "auth",
+ "jwt",
+ "laravel"
+ ],
+ "time": "2018-02-07T20:55:14+00:00"
+ },
{
"name": "vlucas/phpdotenv",
"version": "v2.4.0",
@@ -2475,6 +3113,84 @@
"environment"
],
"time": "2016-09-01T10:05:43+00:00"
+ },
+ {
+ "name": "zizaco/entrust",
+ "version": "dev-master",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/Zizaco/entrust.git",
+ "reference": "ba9241426f9c518982d868e2cbac381a9581d802"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/Zizaco/entrust/zipball/ba9241426f9c518982d868e2cbac381a9581d802",
+ "reference": "ba9241426f9c518982d868e2cbac381a9581d802",
+ "shasum": ""
+ },
+ "require": {
+ "illuminate/cache": "~5.0",
+ "illuminate/console": "~5.0",
+ "illuminate/support": "~5.0",
+ "php": ">=5.5.0"
+ },
+ "require-dev": {
+ "illuminate/database": "~5.0",
+ "mockery/mockery": "dev-master",
+ "phpunit/phpunit": "~4.1",
+ "sami/sami": "dev-master"
+ },
+ "type": "library",
+ "extra": {
+ "laravel": {
+ "providers": [
+ "Zizaco\\Entrust\\EntrustServiceProvider"
+ ],
+ "aliases": {
+ "Entrust": "Zizaco\\Entrust\\EntrustFacade"
+ }
+ }
+ },
+ "autoload": {
+ "classmap": [
+ "src/commands"
+ ],
+ "psr-4": {
+ "Zizaco\\Entrust\\": "src/Entrust/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Andrew Elkins",
+ "homepage": "http://andrewelkins.com"
+ },
+ {
+ "name": "Zizaco Zizuini",
+ "email": "zizaco@gmail.com"
+ },
+ {
+ "name": "Ben Batschelet",
+ "homepage": "http://github.com/bbatsche"
+ },
+ {
+ "name": "Michele Angioni",
+ "email": "michele.angioni@gmail.com"
+ }
+ ],
+ "description": "This package provides a flexible way to add Role-based Permissions to Laravel",
+ "keywords": [
+ "acl",
+ "auth",
+ "illuminate",
+ "laravel",
+ "permission",
+ "roles"
+ ],
+ "time": "2017-11-13T23:46:19+00:00"
}
],
"packages-dev": [
@@ -2532,6 +3248,61 @@
],
"time": "2017-07-22T11:58:36+00:00"
},
+ {
+ "name": "facebook/webdriver",
+ "version": "1.5.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/facebook/php-webdriver.git",
+ "reference": "86b5ca2f67173c9d34340845dd690149c886a605"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/facebook/php-webdriver/zipball/86b5ca2f67173c9d34340845dd690149c886a605",
+ "reference": "86b5ca2f67173c9d34340845dd690149c886a605",
+ "shasum": ""
+ },
+ "require": {
+ "ext-curl": "*",
+ "ext-zip": "*",
+ "php": "^5.6 || ~7.0",
+ "symfony/process": "^2.8 || ^3.1 || ^4.0"
+ },
+ "require-dev": {
+ "friendsofphp/php-cs-fixer": "^2.0",
+ "guzzle/guzzle": "^3.4.1",
+ "php-coveralls/php-coveralls": "^1.0.2",
+ "php-mock/php-mock-phpunit": "^1.1",
+ "phpunit/phpunit": "^5.7",
+ "sebastian/environment": "^1.3.4 || ^2.0 || ^3.0",
+ "squizlabs/php_codesniffer": "^2.6",
+ "symfony/var-dumper": "^3.3 || ^4.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-community": "1.5-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Facebook\\WebDriver\\": "lib/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "Apache-2.0"
+ ],
+ "description": "A PHP client for Selenium WebDriver",
+ "homepage": "https://github.com/facebook/php-webdriver",
+ "keywords": [
+ "facebook",
+ "php",
+ "selenium",
+ "webdriver"
+ ],
+ "time": "2017-11-15T11:08:09+00:00"
+ },
{
"name": "filp/whoops",
"version": "2.1.14",
@@ -2691,6 +3462,67 @@
],
"time": "2016-01-20T08:20:44+00:00"
},
+ {
+ "name": "laravel/dusk",
+ "version": "v3.0.8",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/laravel/dusk.git",
+ "reference": "c6201427e63b869b0c1ee83d91c1d1958b71968e"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/laravel/dusk/zipball/c6201427e63b869b0c1ee83d91c1d1958b71968e",
+ "reference": "c6201427e63b869b0c1ee83d91c1d1958b71968e",
+ "shasum": ""
+ },
+ "require": {
+ "facebook/webdriver": "~1.0",
+ "illuminate/console": "~5.6",
+ "illuminate/support": "~5.6",
+ "nesbot/carbon": "~1.20",
+ "php": ">=7.1.0",
+ "symfony/console": "~4.0",
+ "symfony/process": "~4.0"
+ },
+ "require-dev": {
+ "mockery/mockery": "~1.0",
+ "phpunit/phpunit": "~7.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "4.0-dev"
+ },
+ "laravel": {
+ "providers": [
+ "Laravel\\Dusk\\DuskServiceProvider"
+ ]
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Laravel\\Dusk\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Taylor Otwell",
+ "email": "taylor@laravel.com"
+ }
+ ],
+ "description": "Laravel Dusk provides simple end-to-end testing and browser automation.",
+ "keywords": [
+ "laravel",
+ "testing",
+ "webdriver"
+ ],
+ "time": "2018-04-29T19:15:23+00:00"
+ },
{
"name": "mockery/mockery",
"version": "1.0",
@@ -2730,7 +3562,7 @@
],
"authors": [
{
- "name": "Padraic Brady",
+ "name": "Pádraic Brady",
"email": "padraic.brady@gmail.com",
"homepage": "http://blog.astrumfutura.com"
},
@@ -3119,23 +3951,23 @@
},
{
"name": "phpspec/prophecy",
- "version": "1.7.5",
+ "version": "1.7.6",
"source": {
"type": "git",
"url": "https://github.com/phpspec/prophecy.git",
- "reference": "dfd6be44111a7c41c2e884a336cc4f461b3b2401"
+ "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpspec/prophecy/zipball/dfd6be44111a7c41c2e884a336cc4f461b3b2401",
- "reference": "dfd6be44111a7c41c2e884a336cc4f461b3b2401",
+ "url": "https://api.github.com/repos/phpspec/prophecy/zipball/33a7e3c4fda54e912ff6338c48823bd5c0f0b712",
+ "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712",
"shasum": ""
},
"require": {
"doctrine/instantiator": "^1.0.2",
"php": "^5.3|^7.0",
"phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0",
- "sebastian/comparator": "^1.1|^2.0",
+ "sebastian/comparator": "^1.1|^2.0|^3.0",
"sebastian/recursion-context": "^1.0|^2.0|^3.0"
},
"require-dev": {
@@ -3178,20 +4010,20 @@
"spy",
"stub"
],
- "time": "2018-02-19T10:16:54+00:00"
+ "time": "2018-04-18T13:57:24+00:00"
},
{
"name": "phpunit/php-code-coverage",
- "version": "6.0.3",
+ "version": "6.0.4",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
- "reference": "774a82c0c5da4c1c7701790c262035d235ab7856"
+ "reference": "52187754b0eed0b8159f62a6fa30073327e8c2ca"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/774a82c0c5da4c1c7701790c262035d235ab7856",
- "reference": "774a82c0c5da4c1c7701790c262035d235ab7856",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/52187754b0eed0b8159f62a6fa30073327e8c2ca",
+ "reference": "52187754b0eed0b8159f62a6fa30073327e8c2ca",
"shasum": ""
},
"require": {
@@ -3241,7 +4073,7 @@
"testing",
"xunit"
],
- "time": "2018-04-06T15:39:20+00:00"
+ "time": "2018-04-29T14:59:09+00:00"
},
{
"name": "phpunit/php-file-iterator",
@@ -3431,16 +4263,16 @@
},
{
"name": "phpunit/phpunit",
- "version": "7.1.3",
+ "version": "7.1.5",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "a7834993ddbf4b0ed2c3b2dc1f3b1d093ef910a9"
+ "reference": "ca64dba53b88aba6af32aebc6b388068db95c435"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a7834993ddbf4b0ed2c3b2dc1f3b1d093ef910a9",
- "reference": "a7834993ddbf4b0ed2c3b2dc1f3b1d093ef910a9",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/ca64dba53b88aba6af32aebc6b388068db95c435",
+ "reference": "ca64dba53b88aba6af32aebc6b388068db95c435",
"shasum": ""
},
"require": {
@@ -3459,7 +4291,7 @@
"phpunit/php-text-template": "^1.2.1",
"phpunit/php-timer": "^2.0",
"phpunit/phpunit-mock-objects": "^6.1.1",
- "sebastian/comparator": "^2.1",
+ "sebastian/comparator": "^3.0",
"sebastian/diff": "^3.0",
"sebastian/environment": "^3.1",
"sebastian/exporter": "^3.1",
@@ -3507,7 +4339,7 @@
"testing",
"xunit"
],
- "time": "2018-04-13T02:28:50+00:00"
+ "time": "2018-04-29T15:09:19+00:00"
},
{
"name": "phpunit/phpunit-mock-objects",
@@ -3612,30 +4444,30 @@
},
{
"name": "sebastian/comparator",
- "version": "2.1.3",
+ "version": "3.0.0",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/comparator.git",
- "reference": "34369daee48eafb2651bea869b4b15d75ccc35f9"
+ "reference": "ed5fd2281113729f1ebcc64d101ad66028aeb3d5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/34369daee48eafb2651bea869b4b15d75ccc35f9",
- "reference": "34369daee48eafb2651bea869b4b15d75ccc35f9",
+ "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/ed5fd2281113729f1ebcc64d101ad66028aeb3d5",
+ "reference": "ed5fd2281113729f1ebcc64d101ad66028aeb3d5",
"shasum": ""
},
"require": {
- "php": "^7.0",
- "sebastian/diff": "^2.0 || ^3.0",
+ "php": "^7.1",
+ "sebastian/diff": "^3.0",
"sebastian/exporter": "^3.1"
},
"require-dev": {
- "phpunit/phpunit": "^6.4"
+ "phpunit/phpunit": "^7.1"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.1.x-dev"
+ "dev-master": "3.0-dev"
}
},
"autoload": {
@@ -3672,7 +4504,7 @@
"compare",
"equality"
],
- "time": "2018-02-01T13:46:46+00:00"
+ "time": "2018-04-18T13:33:00+00:00"
},
{
"name": "sebastian/diff",
@@ -4220,9 +5052,12 @@
}
],
"aliases": [],
- "minimum-stability": "dev",
- "stability-flags": [],
- "prefer-stable": true,
+ "minimum-stability": "stable",
+ "stability-flags": {
+ "tymon/jwt-auth": 5,
+ "zizaco/entrust": 20
+ },
+ "prefer-stable": false,
"prefer-lowest": false,
"platform": {
"php": "^7.1.3"
diff --git a/config/app.php b/config/app.php
index 3bc18e7d..9d2e4b07 100644
--- a/config/app.php
+++ b/config/app.php
@@ -80,6 +80,12 @@ return [
'locale' => 'en',
+ 'locales' => [
+ 'en' => 'EN',
+ 'zh-CN' => '䏿–‡',
+ 'es' => 'ES',
+ ],
+
/*
|--------------------------------------------------------------------------
| Application Fallback Locale
@@ -152,6 +158,8 @@ return [
* Package Service Providers...
*/
+ Zizaco\Entrust\EntrustServiceProvider::class,
+
/*
* Application Service Providers...
*/
@@ -210,6 +218,7 @@ return [
'Validator' => Illuminate\Support\Facades\Validator::class,
'View' => Illuminate\Support\Facades\View::class,
'Html' => Collective\Html\HtmlFacade::class,
+ 'Entrust' => Zizaco\Entrust\EntrustFacade::class,
],
];
diff --git a/config/auth.php b/config/auth.php
index 78175010..270586ba 100644
--- a/config/auth.php
+++ b/config/auth.php
@@ -14,7 +14,7 @@ return [
*/
'defaults' => [
- 'guard' => 'web',
+ 'guard' => 'api',
'passwords' => 'users',
],
@@ -42,7 +42,7 @@ return [
],
'api' => [
- 'driver' => 'token',
+ 'driver' => 'jwt',
'provider' => 'users',
],
],
@@ -68,6 +68,7 @@ return [
'users' => [
'driver' => 'eloquent',
'model' => App\User::class,
+ 'table' => 'users',
],
// 'users' => [
diff --git a/config/broadcasting.php b/config/broadcasting.php
index 3ca45eaa..5eecd2b2 100644
--- a/config/broadcasting.php
+++ b/config/broadcasting.php
@@ -36,8 +36,7 @@ return [
'secret' => env('PUSHER_APP_SECRET'),
'app_id' => env('PUSHER_APP_ID'),
'options' => [
- 'cluster' => env('PUSHER_APP_CLUSTER'),
- 'encrypted' => true,
+ //
],
],
diff --git a/config/cache.php b/config/cache.php
index fa12e5e4..e87f0320 100644
--- a/config/cache.php
+++ b/config/cache.php
@@ -86,9 +86,6 @@ return [
|
*/
- 'prefix' => env(
- 'CACHE_PREFIX',
- str_slug(env('APP_NAME', 'laravel'), '_').'_cache'
- ),
+ 'prefix' => 'laravel',
];
diff --git a/config/entrust.php b/config/entrust.php
new file mode 100644
index 00000000..2a995b62
--- /dev/null
+++ b/config/entrust.php
@@ -0,0 +1,92 @@
+ 'App\Role',
+
+ /*
+ |--------------------------------------------------------------------------
+ | Entrust Roles Table
+ |--------------------------------------------------------------------------
+ |
+ | This is the roles table used by Entrust to save roles to the database.
+ |
+ */
+ 'roles_table' => 'roles',
+
+ /*
+ |--------------------------------------------------------------------------
+ | Entrust Permission Model
+ |--------------------------------------------------------------------------
+ |
+ | This is the Permission model used by Entrust to create correct relations.
+ | Update the permission if it is in a different namespace.
+ |
+ */
+ 'permission' => 'App\Permission',
+
+ /*
+ |--------------------------------------------------------------------------
+ | Entrust Permissions Table
+ |--------------------------------------------------------------------------
+ |
+ | This is the permissions table used by Entrust to save permissions to the
+ | database.
+ |
+ */
+ 'permissions_table' => 'permissions',
+
+ /*
+ |--------------------------------------------------------------------------
+ | Entrust permission_role Table
+ |--------------------------------------------------------------------------
+ |
+ | This is the permission_role table used by Entrust to save relationship
+ | between permissions and roles to the database.
+ |
+ */
+ 'permission_role_table' => 'permission_role',
+
+ /*
+ |--------------------------------------------------------------------------
+ | Entrust role_user Table
+ |--------------------------------------------------------------------------
+ |
+ | This is the role_user table used by Entrust to save assigned roles to the
+ | database.
+ |
+ */
+ 'role_user_table' => 'role_user',
+
+ /*
+ |--------------------------------------------------------------------------
+ | User Foreign key on Entrust's role_user Table (Pivot)
+ |--------------------------------------------------------------------------
+ */
+ 'user_foreign_key' => 'user_id',
+
+ /*
+ |--------------------------------------------------------------------------
+ | Role Foreign key on Entrust's role_user Table (Pivot)
+ |--------------------------------------------------------------------------
+ */
+ 'role_foreign_key' => 'role_id',
+
+];
diff --git a/config/filesystems.php b/config/filesystems.php
index 77fa5ded..4544f60c 100644
--- a/config/filesystems.php
+++ b/config/filesystems.php
@@ -37,7 +37,7 @@ return [
| may even configure multiple disks of the same driver. Defaults have
| been setup for each driver as an example of the required options.
|
- | Supported Drivers: "local", "ftp", "sftp", "s3", "rackspace"
+ | Supported Drivers: "local", "ftp", "s3", "rackspace"
|
*/
@@ -57,11 +57,10 @@ return [
's3' => [
'driver' => 's3',
- 'key' => env('AWS_ACCESS_KEY_ID'),
- 'secret' => env('AWS_SECRET_ACCESS_KEY'),
- 'region' => env('AWS_DEFAULT_REGION'),
+ 'key' => env('AWS_KEY'),
+ 'secret' => env('AWS_SECRET'),
+ 'region' => env('AWS_REGION'),
'bucket' => env('AWS_BUCKET'),
- 'url' => env('AWS_URL'),
],
],
diff --git a/config/jwt.php b/config/jwt.php
new file mode 100644
index 00000000..c4ea92db
--- /dev/null
+++ b/config/jwt.php
@@ -0,0 +1,303 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+return [
+
+ /*
+ |--------------------------------------------------------------------------
+ | JWT Authentication Secret
+ |--------------------------------------------------------------------------
+ |
+ | Don't forget to set this in your .env file, as it will be used to sign
+ | your tokens. A helper command is provided for this:
+ | `php artisan jwt:secret`
+ |
+ | Note: This will be used for Symmetric algorithms only (HMAC),
+ | since RSA and ECDSA use a private/public key combo (See below).
+ |
+ */
+
+ 'secret' => env('JWT_SECRET'),
+
+ /*
+ |--------------------------------------------------------------------------
+ | JWT Authentication Keys
+ |--------------------------------------------------------------------------
+ |
+ | The algorithm you are using, will determine whether your tokens are
+ | signed with a random string (defined in `JWT_SECRET`) or using the
+ | following public & private keys.
+ |
+ | Symmetric Algorithms:
+ | HS256, HS384 & HS512 will use `JWT_SECRET`.
+ |
+ | Asymmetric Algorithms:
+ | RS256, RS384 & RS512 / ES256, ES384 & ES512 will use the keys below.
+ |
+ */
+
+ 'keys' => [
+
+ /*
+ |--------------------------------------------------------------------------
+ | Public Key
+ |--------------------------------------------------------------------------
+ |
+ | A path or resource to your public key.
+ |
+ | E.g. 'file://path/to/public/key'
+ |
+ */
+
+ 'public' => env('JWT_PUBLIC_KEY'),
+
+ /*
+ |--------------------------------------------------------------------------
+ | Private Key
+ |--------------------------------------------------------------------------
+ |
+ | A path or resource to your private key.
+ |
+ | E.g. 'file://path/to/private/key'
+ |
+ */
+
+ 'private' => env('JWT_PRIVATE_KEY'),
+
+ /*
+ |--------------------------------------------------------------------------
+ | Passphrase
+ |--------------------------------------------------------------------------
+ |
+ | The passphrase for your private key. Can be null if none set.
+ |
+ */
+
+ 'passphrase' => env('JWT_PASSPHRASE'),
+
+ ],
+
+ /*
+ |--------------------------------------------------------------------------
+ | JWT time to live
+ |--------------------------------------------------------------------------
+ |
+ | Specify the length of time (in minutes) that the token will be valid for.
+ | Defaults to 1 hour.
+ |
+ | You can also set this to null, to yield a never expiring token.
+ | Some people may want this behaviour for e.g. a mobile app.
+ | This is not particularly recommended, so make sure you have appropriate
+ | systems in place to revoke the token if necessary.
+ |
+ */
+
+ 'ttl' => env('JWT_TTL', 60),
+
+ /*
+ |--------------------------------------------------------------------------
+ | Refresh time to live
+ |--------------------------------------------------------------------------
+ |
+ | Specify the length of time (in minutes) that the token can be refreshed
+ | within. I.E. The user can refresh their token within a 2 week window of
+ | the original token being created until they must re-authenticate.
+ | Defaults to 2 weeks.
+ |
+ | You can also set this to null, to yield an infinite refresh time.
+ | Some may want this instead of never expiring tokens for e.g. a mobile app.
+ | This is not particularly recommended, so make sure you have appropriate
+ | systems in place to revoke the token if necessary.
+ |
+ */
+
+ 'refresh_ttl' => env('JWT_REFRESH_TTL', 20160),
+
+ /*
+ |--------------------------------------------------------------------------
+ | JWT hashing algorithm
+ |--------------------------------------------------------------------------
+ |
+ | Specify the hashing algorithm that will be used to sign the token.
+ |
+ | See here: https://github.com/namshi/jose/tree/master/src/Namshi/JOSE/Signer/OpenSSL
+ | for possible values.
+ |
+ */
+
+ 'algo' => env('JWT_ALGO', 'HS256'),
+
+ /*
+ |--------------------------------------------------------------------------
+ | Required Claims
+ |--------------------------------------------------------------------------
+ |
+ | Specify the required claims that must exist in any token.
+ | A TokenInvalidException will be thrown if any of these claims are not
+ | present in the payload.
+ |
+ */
+
+ 'required_claims' => [
+ 'iss',
+ 'iat',
+ 'exp',
+ 'nbf',
+ 'sub',
+ 'jti',
+ ],
+
+ /*
+ |--------------------------------------------------------------------------
+ | Persistent Claims
+ |--------------------------------------------------------------------------
+ |
+ | Specify the claim keys to be persisted when refreshing a token.
+ | `sub` and `iat` will automatically be persisted, in
+ | addition to the these claims.
+ |
+ | Note: If a claim does not exist then it will be ignored.
+ |
+ */
+
+ 'persistent_claims' => [
+ // 'foo',
+ // 'bar',
+ ],
+
+ /*
+ |--------------------------------------------------------------------------
+ | Lock Subject
+ |--------------------------------------------------------------------------
+ |
+ | This will determine whether a `prv` claim is automatically added to
+ | the token. The purpose of this is to ensure that if you have multiple
+ | authentication models e.g. `App\User` & `App\OtherPerson`, then we
+ | should prevent one authentication request from impersonating another,
+ | if 2 tokens happen to have the same id across the 2 different models.
+ |
+ | Under specific circumstances, you may want to disable this behaviour
+ | e.g. if you only have one authentication model, then you would save
+ | a little on token size.
+ |
+ */
+
+ 'lock_subject' => true,
+
+ /*
+ |--------------------------------------------------------------------------
+ | Leeway
+ |--------------------------------------------------------------------------
+ |
+ | This property gives the jwt timestamp claims some "leeway".
+ | Meaning that if you have any unavoidable slight clock skew on
+ | any of your servers then this will afford you some level of cushioning.
+ |
+ | This applies to the claims `iat`, `nbf` and `exp`.
+ |
+ | Specify in seconds - only if you know you need it.
+ |
+ */
+
+ 'leeway' => env('JWT_LEEWAY', 0),
+
+ /*
+ |--------------------------------------------------------------------------
+ | Blacklist Enabled
+ |--------------------------------------------------------------------------
+ |
+ | In order to invalidate tokens, you must have the blacklist enabled.
+ | If you do not want or need this functionality, then set this to false.
+ |
+ */
+
+ 'blacklist_enabled' => env('JWT_BLACKLIST_ENABLED', true),
+
+ /*
+ | -------------------------------------------------------------------------
+ | Blacklist Grace Period
+ | -------------------------------------------------------------------------
+ |
+ | When multiple concurrent requests are made with the same JWT,
+ | it is possible that some of them fail, due to token regeneration
+ | on every request.
+ |
+ | Set grace period in seconds to prevent parallel request failure.
+ |
+ */
+
+ 'blacklist_grace_period' => env('JWT_BLACKLIST_GRACE_PERIOD', 0),
+
+ /*
+ |--------------------------------------------------------------------------
+ | Cookies encryption
+ |--------------------------------------------------------------------------
+ |
+ | By default Laravel encrypt cookies for security reason.
+ | If you decide to not decrypt cookies, you will have to configure Laravel
+ | to not encrypt your cookie token by adding its name into the $except
+ | array available in the middleware "EncryptCookies" provided by Laravel.
+ | see https://laravel.com/docs/master/responses#cookies-and-encryption
+ | for details.
+ |
+ | Set it to true if you want to decrypt cookies.
+ |
+ */
+
+ 'decrypt_cookies' => false,
+
+ /*
+ |--------------------------------------------------------------------------
+ | Providers
+ |--------------------------------------------------------------------------
+ |
+ | Specify the various providers used throughout the package.
+ |
+ */
+
+ 'providers' => [
+
+ /*
+ |--------------------------------------------------------------------------
+ | JWT Provider
+ |--------------------------------------------------------------------------
+ |
+ | Specify the provider that is used to create and decode the tokens.
+ |
+ */
+
+ 'jwt' => Tymon\JWTAuth\Providers\JWT\Lcobucci::class,
+
+ /*
+ |--------------------------------------------------------------------------
+ | Authentication Provider
+ |--------------------------------------------------------------------------
+ |
+ | Specify the provider that is used to authenticate users.
+ |
+ */
+
+ 'auth' => Tymon\JWTAuth\Providers\Auth\Illuminate::class,
+
+ /*
+ |--------------------------------------------------------------------------
+ | Storage Provider
+ |--------------------------------------------------------------------------
+ |
+ | Specify the provider that is used to store tokens in the blacklist.
+ |
+ */
+
+ 'storage' => Tymon\JWTAuth\Providers\Storage\Illuminate::class,
+
+ ],
+
+];
diff --git a/config/queue.php b/config/queue.php
index 391304f3..4d83ebd0 100644
--- a/config/queue.php
+++ b/config/queue.php
@@ -4,12 +4,14 @@ return [
/*
|--------------------------------------------------------------------------
- | Default Queue Connection Name
+ | Default Queue Driver
|--------------------------------------------------------------------------
|
| Laravel's queue API supports an assortment of back-ends via a single
| API, giving you convenient access to each back-end using the same
- | syntax for every one. Here you may define a default connection.
+ | syntax for each one. Here you may set the default queue driver.
+ |
+ | Supported: "sync", "database", "beanstalkd", "sqs", "redis", "null"
|
*/
@@ -24,8 +26,6 @@ return [
| is used by your application. A default configuration has been added
| for each back-end shipped with Laravel. You are free to add more.
|
- | Drivers: "sync", "database", "beanstalkd", "sqs", "redis", "null"
- |
*/
'connections' => [
@@ -50,11 +50,11 @@ return [
'sqs' => [
'driver' => 'sqs',
- 'key' => env('SQS_KEY', 'your-public-key'),
- 'secret' => env('SQS_SECRET', 'your-secret-key'),
- 'prefix' => env('SQS_PREFIX', 'https://sqs.us-east-1.amazonaws.com/your-account-id'),
- 'queue' => env('SQS_QUEUE', 'your-queue-name'),
- 'region' => env('SQS_REGION', 'us-east-1'),
+ 'key' => 'your-public-key',
+ 'secret' => 'your-secret-key',
+ 'prefix' => 'https://sqs.us-east-1.amazonaws.com/your-account-id',
+ 'queue' => 'your-queue-name',
+ 'region' => 'us-east-1',
],
'redis' => [
@@ -62,7 +62,6 @@ return [
'connection' => 'default',
'queue' => 'default',
'retry_after' => 90,
- 'block_for' => null,
],
],
diff --git a/config/services.php b/config/services.php
index 4460f0ec..07c8a125 100644
--- a/config/services.php
+++ b/config/services.php
@@ -35,4 +35,9 @@ return [
'secret' => env('STRIPE_SECRET'),
],
+ 'github' => [
+ 'client_id' => env('GITHUB_CLIENT_ID'),
+ 'client_secret' => env('GITHUB_CLIENT_SECRET'),
+ ],
+
];
diff --git a/config/session.php b/config/session.php
index 736fb3c7..71ad0ed1 100644
--- a/config/session.php
+++ b/config/session.php
@@ -29,7 +29,7 @@ return [
|
*/
- 'lifetime' => env('SESSION_LIFETIME', 120),
+ 'lifetime' => 120,
'expire_on_close' => false,
diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php
index facf2337..061d75a2 100644
--- a/database/factories/UserFactory.php
+++ b/database/factories/UserFactory.php
@@ -14,10 +14,12 @@ use Faker\Generator as Faker;
*/
$factory->define(App\User::class, function (Faker $faker) {
+ static $password;
+
return [
'name' => $faker->name,
'email' => $faker->unique()->safeEmail,
- 'password' => '$2y$10$TKh8H1.PfQx37YgCzwiKb.KjNyWgaHb9cbcoQgdIVFlYg7B77UdFm', // secret
+ 'password' => $password ?: $password = bcrypt('secret'),
'remember_token' => str_random(10),
];
});
diff --git a/database/migrations/2017_12_07_122845_create_oauth_providers_table.php b/database/migrations/2017_12_07_122845_create_oauth_providers_table.php
new file mode 100644
index 00000000..c9421f3e
--- /dev/null
+++ b/database/migrations/2017_12_07_122845_create_oauth_providers_table.php
@@ -0,0 +1,41 @@
+increments('id');
+ $table->integer('user_id')->unsigned();
+ $table->string('provider');
+ $table->string('provider_user_id')->index();
+ $table->string('access_token')->nullable();
+ $table->string('refresh_token')->nullable();
+ $table->timestamps();
+
+ $table->foreign('user_id')
+ ->references('id')
+ ->on('users')
+ ->onDelete('cascade');
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::dropIfExists('oauth_providers');
+ }
+}
diff --git a/database/migrations/2018_05_07_080525_entrust_setup_tables.php b/database/migrations/2018_05_07_080525_entrust_setup_tables.php
new file mode 100644
index 00000000..6b910bb1
--- /dev/null
+++ b/database/migrations/2018_05_07_080525_entrust_setup_tables.php
@@ -0,0 +1,75 @@
+increments('id');
+ $table->string('name')->unique();
+ $table->string('display_name')->nullable();
+ $table->string('description')->nullable();
+ $table->timestamps();
+ });
+
+ // Create table for associating roles to users (Many-to-Many)
+ Schema::create('role_user', function (Blueprint $table) {
+ $table->integer('user_id')->unsigned();
+ $table->integer('role_id')->unsigned();
+
+ $table->foreign('user_id')->references('id')->on('users')
+ ->onUpdate('cascade')->onDelete('cascade');
+ $table->foreign('role_id')->references('id')->on('roles')
+ ->onUpdate('cascade')->onDelete('cascade');
+
+ $table->primary(['user_id', 'role_id']);
+ });
+
+ // Create table for storing permissions
+ Schema::create('permissions', function (Blueprint $table) {
+ $table->increments('id');
+ $table->string('name')->unique();
+ $table->string('display_name')->nullable();
+ $table->string('description')->nullable();
+ $table->timestamps();
+ });
+
+ // Create table for associating permissions to roles (Many-to-Many)
+ Schema::create('permission_role', function (Blueprint $table) {
+ $table->integer('permission_id')->unsigned();
+ $table->integer('role_id')->unsigned();
+
+ $table->foreign('permission_id')->references('id')->on('permissions')
+ ->onUpdate('cascade')->onDelete('cascade');
+ $table->foreign('role_id')->references('id')->on('roles')
+ ->onUpdate('cascade')->onDelete('cascade');
+
+ $table->primary(['permission_id', 'role_id']);
+ });
+
+ DB::commit();
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::drop('permission_role');
+ Schema::drop('permissions');
+ Schema::drop('role_user');
+ Schema::drop('roles');
+ }
+}
diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php
index e119db62..ea90e732 100644
--- a/database/seeds/DatabaseSeeder.php
+++ b/database/seeds/DatabaseSeeder.php
@@ -11,6 +11,9 @@ class DatabaseSeeder extends Seeder
*/
public function run()
{
- // $this->call(UsersTableSeeder::class);
+ $this->call(UsersTableSeeder::class);
+ $this->call(RolesAndPermissionsSeeder::class);
+
+
}
}
diff --git a/database/seeds/RolesAndPermissionsSeeder.php b/database/seeds/RolesAndPermissionsSeeder.php
new file mode 100644
index 00000000..dfcc6ab5
--- /dev/null
+++ b/database/seeds/RolesAndPermissionsSeeder.php
@@ -0,0 +1,189 @@
+ php artisan db:seed --class=RolesAndPermissionsSeeder
+|
+| https://github.com/thomasfw/RolesAndPermissionsSeeder
+|
+|--------------------------------------------------------------------------
+| Make sure you update the namespaces for your User & Entrust models
+|--------------------------------------------------------------------------
+*/
+use App\User as User;
+use App\Role as Role;
+use App\Permission as Permission;
+use Illuminate\Database\Seeder;
+use Illuminate\Database\Eloquent\Model;
+class RolesAndPermissionsSeeder extends Seeder {
+ protected $roles = [
+
+ 'admin' => [
+ ],
+
+ 'member' => [
+ ],
+
+
+
+ ];
+
+
+ protected $permissions = [
+
+ // Add your Permissions here
+
+ ];
+
+
+ /**
+ * Roles
+ *
+ * @return array()
+ */
+ public function roles()
+ {
+ return $this->roles;
+ }
+
+ /**
+ * Permissions
+ *
+ * @param $name
+ * @return array()
+ */
+ public function permissions($name = '')
+ {
+ $single = (array_key_exists($name,$this->permissions) ? array($name =>$this->permissions[$name]) : false );
+ return ($name ? $single : $this->permissions);
+ }
+
+
+ /**
+ * Run the Seeder
+ *
+ * @return void
+ */
+ public function run()
+ {
+ DB::table(Config::get('entrust.permissions_table'))->delete();
+
+ foreach ($this->roles() as $key => $val) {
+ $this->command->info(" ");
+ $this->command->info('Creating/updating the \''.$key.'\' role');
+ $this->command->info('-----------------------------------------');
+ $val['name'] = $key;
+ $this->reset($val);
+ }
+ $this->cleanup();
+ }
+
+
+ /**
+ * Reset Role, Permissions & Users
+ *
+ * @param $role
+ * @return void
+ */
+ public function reset($role)
+ {
+ $commandBullet = ' -> ';
+
+ // The Old Role
+ $originalRole = Role::where('name',$role['name'])->first();
+ if($originalRole) Role::where('id',$originalRole->id)->update(['name' => $role['name'].'__remove']);
+
+ // The New Role
+ $newRole = new Role();
+ $newRole->name = $role['name'];
+ if(isset($role['display_name'])) $newRole->display_name = $role['display_name']; // optional
+ if(isset($role['description'])) $newRole->description = $role['description']; // optional
+ $newRole->save();
+ $this->command->info($commandBullet."Created $role[name] role");
+
+ // Set the Permissions (if they exist)
+ $pcount = 0;
+ if(!empty($role['permissions']))
+ {
+ foreach ($role['permissions'] as $permission_name) {
+
+ $permission = $this->permissions($permission_name);
+ if($permission === false || (!$permission_name)) {
+ $this->command->error($commandBullet."Failed to attach permission '$permission_name'. It does not exist");
+ continue;
+ }
+
+ $newPermission = \Permission::where('name',$permission_name)->first();
+ if (!$newPermission) {
+ $newPermission = new Permission();
+ $newPermission->name = key($permission);
+ if(isset($permission['display_name'])) $newPermission->display_name = $permission['display_name']; // optional
+ if(isset($permission['description'])) $newPermission->description = $permission['description']; // optional
+ $newPermission->save();
+ }
+ $newRole->attachPermission($newPermission);
+ $pcount++;
+ }
+ }
+ $this->command->info($commandBullet."Attached $pcount permissions to $role[name] role");
+
+ // Update old records
+ if ($originalRole)
+ {
+ $userCount = 0;
+ $RoleUsers = DB::table(Config::get('entrust.role_user_table'))->where('role_id',$originalRole->id)->get();
+ foreach ($RoleUsers as $user) {
+ $u = User::where('id',$user->user_id)->first();
+ $u->attachRole($newRole);
+ $userCount++;
+ }
+ $this->command->info($commandBullet."Updated role attachment for $userCount users");
+
+ Role::where('id',$originalRole->id)->delete(); // will also remove old role_user records
+ $this->command->info($commandBullet."Removed the original $role[name] role");
+ }
+ }
+
+
+ /**
+ * Cleanup()
+ * Remove any roles & permissions that have been removed
+ * @return void
+ */
+ public function cleanup()
+ {
+ $commandBullet = ' -> ';
+ $this->command->info(" ");
+ $this->command->info('Cleaning up roles & permissions:');
+ $this->command->info('--------------------------------');
+
+ $storedRoles = Role::all();
+ if(!empty($storedRoles)) {
+ $definedRoles = $this->roles();
+ foreach ($storedRoles as $role) {
+ if ( !array_key_exists($role->name,$definedRoles) ) {
+ Role::where('name',$role->name)->delete();
+ $this->command->info($commandBullet.'The \''.$role->name.'\' role was removed');
+ }
+ }
+ }
+ $storedPerms = DB::table(Config::get('entrust.permissions_table'))->get();
+ if(!empty($storedPerms)) {
+ $definedPerms = $this->permissions();
+ foreach ($storedPerms as $perm) {
+ if ( !array_key_exists($perm->name,$definedPerms) ) {
+ DB::table(Config::get('entrust.permissions_table'))->where('name',$perm->name)->delete();
+ $this->command->info($commandBullet.'The \''.$perm->name.'\' permission was removed');
+ }
+ }
+ }
+ $this->command->info($commandBullet.'Done');
+ $this->command->info(" ");
+ }
+
+}
\ No newline at end of file
diff --git a/database/seeds/UsersTableSeeder.php b/database/seeds/UsersTableSeeder.php
new file mode 100644
index 00000000..3d6a73d9
--- /dev/null
+++ b/database/seeds/UsersTableSeeder.php
@@ -0,0 +1,31 @@
+delete();
+
+ $users = array(
+ ['name' => 'Ryan Chenkie', 'email' => 'ryanchenkie@gmail.com', 'password' => Hash::make('secret')],
+ ['name' => 'Chris Sevilleja', 'email' => 'chris@scotch.io', 'password' => Hash::make('secret')],
+ ['name' => 'Holly Lloyd', 'email' => 'holly@scotch.io', 'password' => Hash::make('secret')],
+ ['name' => 'Adnan Kukic', 'email' => 'adnan@scotch.io', 'password' => Hash::make('secret')],
+ );
+
+ foreach ($users as $user)
+ {
+ User::create($user);
+ }
+
+
+ }
+}
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 00000000..1def6b57
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,42 @@
+version: '2'
+services:
+ app:
+ build: .
+ ports:
+ - "8000:8000"
+ volumes:
+ - .:/app
+ env_file: .env
+ working_dir: /app
+ command: bash -c 'php artisan migrate && php artisan serve --host 0.0.0.0'
+ depends_on:
+ - mysql
+ links:
+ - mysql
+ mysql:
+ build:
+ context: ./docker/mysql
+ args:
+ - MYSQL_VERSION=5.6
+ environment:
+ - MYSQL_DATABASE=default
+ - MYSQL_USER=default
+ - MYSQL_PASSWORD=secret
+ - MYSQL_ROOT_PASSWORD=root
+ - TZ=UTC
+ volumes:
+ - ./data/mysql:/var/lib/mysql
+ - ./docker/mysql/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
+ ports:
+ - "3306:3306"
+
+ phpmyadmin:
+ depends_on:
+ - mysql
+ image: phpmyadmin/phpmyadmin
+ restart: always
+ ports:
+ - 8090:80
+ environment:
+ PMA_HOST: mysql
+ MYSQL_ROOT_PASSWORD: root
\ No newline at end of file
diff --git a/laradock/mysql/Dockerfile b/docker/mysql/Dockerfile
similarity index 100%
rename from laradock/mysql/Dockerfile
rename to docker/mysql/Dockerfile
diff --git a/laradock/mariadb/docker-entrypoint-initdb.d/.gitignore b/docker/mysql/docker-entrypoint-initdb.d/.gitignore
similarity index 100%
rename from laradock/mariadb/docker-entrypoint-initdb.d/.gitignore
rename to docker/mysql/docker-entrypoint-initdb.d/.gitignore
diff --git a/laradock/mysql/docker-entrypoint-initdb.d/createdb.sql.example b/docker/mysql/docker-entrypoint-initdb.d/createdb.sql.example
similarity index 100%
rename from laradock/mysql/docker-entrypoint-initdb.d/createdb.sql.example
rename to docker/mysql/docker-entrypoint-initdb.d/createdb.sql.example
diff --git a/laradock/mysql/my.cnf b/docker/mysql/my.cnf
similarity index 100%
rename from laradock/mysql/my.cnf
rename to docker/mysql/my.cnf
diff --git a/laradock/.editorconfig b/laradock/.editorconfig
deleted file mode 100644
index 9a397cfc..00000000
--- a/laradock/.editorconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-root = true
-
-[*]
-end_of_line = lf
-insert_final_newline = true
-
-[*]
-charset = utf-8
-
-[{Dockerfile,docker-compose.yml}]
-indent_style = space
-indent_size = 2
diff --git a/laradock/.github/CODE_OF_CONDUCT.md b/laradock/.github/CODE_OF_CONDUCT.md
deleted file mode 100644
index 8359c58e..00000000
--- a/laradock/.github/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1,46 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at mahmoud@zalt.me. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/
diff --git a/laradock/.github/CONTRIBUTING.md b/laradock/.github/CONTRIBUTING.md
deleted file mode 100644
index 7d5865b0..00000000
--- a/laradock/.github/CONTRIBUTING.md
+++ /dev/null
@@ -1,3 +0,0 @@
-### First off, thanks for taking the time to contribute!
-
-For the contribution guide [click here](http://laradock.io/contributing/).
diff --git a/laradock/.github/ISSUE_TEMPLATE.md b/laradock/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index eff16ef7..00000000
--- a/laradock/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,23 +0,0 @@
-### Info:
-- Docker version (`$ docker --version`):
-- Laradock commit (`$ git rev-parse HEAD`):
-- System info (Mac, PC, Linux):
-- System info disto/version:
-
-### Issue:
-
-_____
-
-### Expected behavior:
-
-_____
-
-### Reproduce:
-
-_____
-
-### Relevant Code:
-
-```
-// place a code sample here
-```
diff --git a/laradock/.github/PULL_REQUEST_TEMPLATE.md b/laradock/.github/PULL_REQUEST_TEMPLATE.md
deleted file mode 100644
index 9160f018..00000000
--- a/laradock/.github/PULL_REQUEST_TEMPLATE.md
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-##### I completed the 3 steps below:
-
-- [] I've read the [Contribution Guide](http://laradock.io/contributing).
-- [] I've updated the **documentation**. (refer to [this](http://laradock.io/contributing/#update-the-documentation-site) for how to do so).
-- [] I enjoyed my time contributing and making developer's life easier :)
diff --git a/laradock/.github/README-zh.md b/laradock/.github/README-zh.md
deleted file mode 100644
index e50794b7..00000000
--- a/laradock/.github/README-zh.md
+++ /dev/null
@@ -1,817 +0,0 @@
-# Laradock
-
-[](http://zalt.me)
-
-[](https://gitter.im/Laradock/laradock?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
-
-Laradock èƒ½å¤Ÿå¸®ä½ åœ¨ **Docker** 上快速æå»º **Laravel** 应用。
-
-å°±åƒ Laravel Homestead ä¸€æ ·ï¼Œä½†æ˜¯ Docker 替æ¢äº† Vagrant。
-
-> 先在使用 Laradock,然åŽå†å¦ä¹ 它们。
-
-## 目录
-- [Intro](#Intro)
- - [Features](#features)
- - [Supported Software's](#Supported-Containers)
- - [What is Docker](#what-is-docker)
- - [What is Laravel](#what-is-laravel)
- - [Why Docker not Vagrant](#why-docker-not-vagrant)
- - [Laradock VS Homestead](#laradock-vs-homestead)
-- [Demo Video](#Demo)
-- [Requirements](#Requirements)
-- [Installation](#Installation)
-- [Usage](#Usage)
-- [Documentation](#Documentation)
- - [Docker](#Docker)
- - [List current running Containers](#List-current-running-Containers)
- - [Close all running Containers](#Close-all-running-Containers)
- - [Delete all existing Containers](#Delete-all-existing-Containers)
- - [Enter a Container (SSH into a running Container)](#Enter-Container)
- - [Edit default container configuration](#Edit-Container)
- - [Edit a Docker Image](#Edit-a-Docker-Image)
- - [Build/Re-build Containers](#Build-Re-build-Containers)
- - [Add more Software's (Docker Images)](#Add-Docker-Images)
- - [View the Log files](#View-the-Log-files)
- - [Laravel](#Laravel):
- - [Install Laravel from a Docker Container](#Install-Laravel)
- - [Run Artisan Commands](#Run-Artisan-Commands)
- - [Use Redis](#Use-Redis)
- - [Use Mongo](#Use-Mongo)
- - [PHP](#PHP)
- - [Install PHP Extensions](#Install-PHP-Extensions)
- - [Change the PHP-FPM Version](#Change-the-PHP-FPM-Version)
- - [Change the PHP-CLI Version](#Change-the-PHP-CLI-Version)
- - [Install xDebug](#Install-xDebug)
- - [Misc](#Misc)
- - [Use custom Domain](#Use-custom-Domain)
- - [Enable Global Composer Build Install](#Enable-Global-Composer-Build-Install)
- - [Install Prestissimo](#Install-Prestissimo)
- - [Install Node + NVM](#Install-Node)
- - [Debugging](#debugging)
- - [Upgrading Laradock](#upgrading-laradock)
-- [Help & Questions](#Help)
-
-
-
-## 介ç»
-
-Laradock 努力简化创建开å‘环境过程。
-它包å«é¢„包装 Docker 镜åƒï¼Œæä¾›ä½ 一个美妙的开å‘环境而ä¸éœ€è¦å®‰è£… PHP, NGINX, MySQL å’Œå…¶ä»–ä»»ä½•è½¯ä»¶åœ¨ä½ æœ¬åœ°æœºå™¨ä¸Šã€‚
-
-**使用概览:**
-
-让我们了解使用它安装 `NGINX`, `PHP`, `Composer`, `MySQL` å’Œ `Redis`,然åŽè¿è¡Œ `Laravel`
-
-1. å°† Laradock æ”¾åˆ°ä½ çš„ Laravel 项目ä¸ï¼š
-```bash
-git clone https://github.com/laradock/laradock.git
-```
-
-2. 进入 Laradock 目录
- ```bash
-cp env-example .env
-```
-
-3. è¿è¡Œè¿™äº›å®¹å™¨ã€‚
-```bash
-docker-compose up -d nginx mysql redis
-```
-
-4. æ‰“å¼€ä½ çš„Laravel 项目的 `.env` 文件,然åŽè®¾ç½® `mysql` çš„ `DB_HOST` å’Œ `redis` çš„`REDIS_HOST`。
-
-5. 打开æµè§ˆå™¨ï¼Œè®¿é—® localhost:
-
-
-### 特点
-
-- 在 PHP 版本:7.0,5.6.5.5...之ä¸å¯ä»¥ç®€å•切æ¢ã€‚
-- å¯é€‰æ‹©ä½ 最喜欢的数æ®åº“引擎,比如:MySQL, Postgres, MariaDB...
-- å¯è¿è¡Œè‡ªå·±çš„软件组åˆï¼Œæ¯”如:Memcached, HHVM, Beanstalkd...
-- 所有软件è¿è¡Œåœ¨ä¸åŒçš„容器之ä¸ï¼Œæ¯”如:PHP-FPM, NGINX, PHP-CLI...
-- 通过简å•的编写 `Dockerfile` 容易定制任何容器。
-- 所有镜åƒç»§æ‰¿è‡ªä¸€ä¸ªå®˜æ–¹åŸºç¡€é•œåƒï¼ˆTrusted base Images)
-- å¯é¢„é…ç½®Laravelçš„Nginx环境
-- 容易应用容器ä¸çš„é…ç½® é…置文件(`Dockerfile`)
-- 最新的 Docker Compose 版本(`docker-compose`)
-- 所有的都是å¯è§†åŒ–å’Œå¯ç¼–辑的
-- å¿«é€Ÿçš„é•œåƒæž„建
-- æ¯å‘¨éƒ½ä¼šæœ‰æ›´æ–°...
-
-
-### 支æŒçš„软件 (容器)
-
-- **æ•°æ®åº“引擎:**
- - MySQL
- - PostgreSQL
- - MariaDB
- - MongoDB
- - Neo4j
-- **缓å˜å¼•擎:**
- - Redis
- - Memcached
-- **PHP æœåС噍:**
- - NGINX
- - Apache2
- - Caddy
-- **PHP 编译工具:**
- - PHP-FPM
- - HHVM
-- **消æ¯é˜Ÿåˆ—系统:**
- - Beanstalkd (+ Beanstalkd Console)
-- **工具:**
- - Workspace (PHP7-CLI, Composer, Git, Node, Gulp, SQLite, Vim, Nano, cURL...)
-
->å¦‚æžœä½ æ‰¾ä¸åˆ°ä½ 需è¦çš„è½¯ä»¶ï¼Œæž„å»ºå®ƒç„¶åŽæŠŠå®ƒæ·»åŠ åˆ°è¿™ä¸ªåˆ—è¡¨ã€‚ä½ çš„è´¡çŒ®æ˜¯å—æ¬¢è¿Žçš„。
-
-
-### Docker 是什么?
-
-[Docker](https://www.docker.com) 是一个开æºé¡¹ç›®,自动化部署应用程åºè½¯ä»¶çš„容器,在 Linux, Mac OS and Windows æä¾›ä¸€ä¸ªé¢å¤–的抽象层和自动化的[æ“作系统级的虚拟化](https://en.wikipedia.org/wiki/Operating-system-level_virtualization)
-
-
-### Laravel 是什么?
-
-é¢ï¼Œè¿™å¾ˆè®¤çœŸçš„!!!
-
-
-### 为什么使用 Docker è€Œä¸æ˜¯ Vagrant!?
-
-[Vagrant](https://www.vagrantup.com) 构建虚拟机需è¦å‡ 分钟然而 Docker 构建虚拟容器åªéœ€è¦å‡ 秒钟。
-è€Œä¸æ˜¯æä¾›ä¸€ä¸ªå®Œæ•´çš„虚拟机,å°±åƒä½ 用 Vagrant, Docker 为您æä¾›**è½»é‡çº§**虚拟容器,共享相åŒçš„å†…æ ¸å’Œå…许安全执行独立的进程。
-
-除了速度, Docker æä¾›å¤§é‡çš„ Vagrant æ— æ³•å®žçŽ°çš„åŠŸèƒ½ã€‚
-
-最é‡è¦çš„æ˜¯ Docker å¯ä»¥è¿è¡Œåœ¨å¼€å‘和生产(相åŒçŽ¯å¢ƒæ— å¤„ä¸åœ¨)。Vagrant 是专为开å‘,(æ‰€ä»¥åœ¨ç”Ÿäº§çŽ¯å¢ƒä½ å¿…é¡»æ¯ä¸€æ¬¡é‡å»ºæ‚¨çš„æœåŠ¡å™¨)。
-
-
-### Laradock Homestead 对比
-
-Laradock and [Homestead](https://laravel.com/docs/master/homestead) ç»™ä½ ä¸€ä¸ªå®Œæ•´çš„è™šæ‹Ÿå¼€å‘环境。(ä¸éœ€è¦å®‰è£…å’Œé…ç½®è½¯ä»¶åœ¨ä½ è‡ªå·±çš„æ¯ä¸€ä¸ªæ“作系统)。
-
-Homestead 是一个工具,ä¸ºä½ æŽ§åˆ¶è™šæ‹Ÿæœº(使用 Homestead 特殊命令)。Vagrant å¯ä»¥ç®¡ç†ä½ 的管ç†è™šå®¹å™¨ã€‚
-
-è¿è¡Œä¸€ä¸ªè™šæ‹Ÿå®¹å™¨æ¯”è¿è¡Œä¸€æ•´ä¸ªè™šæ‹Ÿæœºå¿«å¤šäº† **Laradock 比 Homestead 快多了**
-
-
-## 演示视频
-还有什么比**演示视频**好:
-
-- Laradock [v4.0](https://www.youtube.com/watch?v=TQii1jDa96Y)
-- Laradock [v2.2](https://www.youtube.com/watch?v=-DamFMczwDA)
-- Laradock [v0.3](https://www.youtube.com/watch?v=jGkyO6Is_aI)
-- Laradock [v0.1](https://www.youtube.com/watch?v=3YQsHe6oF80)
-
-
-## ä¾èµ–
-
-- [Git](https://git-scm.com/downloads)
-- [Docker](https://www.docker.com/products/docker/)
-
-
-## 安装
-
-1 - 克隆 `Laradock` 仓库:
-
-**A)** å¦‚æžœä½ å·²ç»æœ‰ä¸€ä¸ª Laravel 项目,克隆这个仓库在到 `Laravel` æ ¹ç›®å½•
-
-```bash
-git submodule add https://github.com/laradock/laradock.git
-```
-
->å¦‚æžœä½ ä¸æ˜¯ä½¿ç”¨ Git ç®¡ç† Laravel 项目,您å¯ä»¥ä½¿ç”¨ `git clone` è€Œä¸æ˜¯ `git submodule`。
-
-**B)** å¦‚æžœä½ æ²¡æœ‰ä¸€ä¸ª Laravel 项目,ä½ æƒ³ Docker 安装 Laravel,克隆这个æºåœ¨æ‚¨çš„æœºå™¨ä»»ä½•地方上:
-
-```bash
-git clone https://github.com/laradock/laradock.git
-```
-
-
-## 使用
-
-**请在开始之å‰é˜…读:**
-å¦‚æžœä½ æ£åœ¨ä½¿ç”¨ **Docker Toolbox** (VM),选择以下任何一个方法:
-- 更新到 Docker [Native](https://www.docker.com/products/docker) Mac/Windows 版本 (建议). 查看 [Upgrading Laradock](#upgrading-laradock)
-- 使用 Laradock v3.* (访问 `Laradock-ToolBox` [分支](https://github.com/laradock/laradock/tree/Laradock-ToolBox)).
-如果您使用的是 **Docker Native**(Mac / Windows 版本)甚至是 Linux 版本,通常å¯ä»¥ç»§ç»é˜…读这个文档,Laradock v4 ä»¥ä¸Šç‰ˆæœ¬å°†ä»…æ”¯æŒ **Docker Native**。
-
-1 - è¿è¡Œå®¹å™¨: *(在è¿è¡Œ `docker-compose` 命令之å‰ï¼Œç¡®è®¤ä½ 在 `laradock` 目录ä¸*
-
-**例å:** è¿è¡Œ NGINX å’Œ MySQL:
-
-```bash
-docker-compose up -d nginx mysql
-```
-ä½ å¯ä»¥ä»Žä»¥ä¸‹åˆ—è¡¨é€‰æ‹©ä½ è‡ªå·±çš„å®¹å™¨ç»„åˆï¼š
-
-`nginx`, `hhvm`, `php-fpm`, `mysql`, `redis`, `postgres`, `mariadb`, `neo4j`, `mongo`, `apache2`, `caddy`, `memcached`, `beanstalkd`, `beanstalkd-console`, `workspace`.
-
-**说明**: `workspace` å’Œ `php-fpm` å°†è¿è¡Œåœ¨å¤§éƒ¨åˆ†å®žä¾‹ä¸, 所以ä¸éœ€è¦åœ¨ `up` 命令ä¸åŠ ä¸Šå®ƒä»¬.
-
-2 - 进入 Workspace 容器, æ‰§è¡Œåƒ (Artisan, Composer, PHPUnit, Gulp, ...)ç‰å‘½ä»¤
-
-```bash
-docker-compose exec workspace bash
-```
-
-å¢žåŠ `--user=laradock` (例如 `docker-compose exec --user=laradock workspace bash`) 作为您的主机的用户创建的文件. (ä½ å¯ä»¥ä»Ž `docker-compose.yml`修改 PUID (User id) å’Œ PGID (group id) 值 ).
-
-3 - 编辑 Laravel çš„é…ç½®.
-
-å¦‚æžœä½ è¿˜æ²¡æœ‰å®‰è£… Laravel 项目,请查看 [How to Install Laravel in a Docker Container](#Install-Laravel).
-
-打开 Laravel çš„ `.env` 文件 ç„¶åŽ é…ç½® ä½ çš„ `mysql` çš„ `DB_HOST`:
-
-```env
-DB_HOST=mysql
-```
-
-4 - 打开æµè§ˆå™¨è®¿é—® localhost (`http://localhost/`).
-
-**调试**: å¦‚æžœä½ ç¢°åˆ°ä»»ä½•é—®é¢˜ï¼Œè¯·æŸ¥çœ‹ [调试](#debugging) ç« èŠ‚
-å¦‚æžœä½ éœ€è¦ç‰¹åˆ«æ”¯æŒï¼Œè¯·è”系我,更多细节在[帮助 & 问题](#Help)ç« èŠ‚
-
-
-## 文档
-
-
-### [Docker]
-
-
-### 列出æ£åœ¨è¿è¡Œçš„容器
-```bash
-docker ps
-```
-
-ä½ ä¹Ÿå¯ä»¥ä½¿ç”¨ä»¥ä¸‹å‘½ä»¤æŸ¥çœ‹æŸé¡¹ç›®çš„容器
-```bash
-docker-compose ps
-```
-
-
-### 关闿‰€æœ‰å®¹å™¨
-```bash
-docker-compose stop
-```
-
-åœæ¢æŸä¸ªå®¹å™¨:
-
-```bash
-docker-compose stop {容器åç§°}
-```
-
-
-### åˆ é™¤æ‰€æœ‰å®¹å™¨
-```bash
-docker-compose down
-```
-
-å°å¿ƒè¿™ä¸ªå‘½ä»¤,å› ä¸ºå®ƒä¹Ÿä¼šåˆ é™¤ä½ çš„æ•°æ®å®¹å™¨ã€‚(å¦‚æžœä½ æƒ³ä¿ç•™ä½ 的数æ®ä½ 应该在上述命令åŽåˆ—出容器åç§°åˆ é™¤æ¯ä¸ªå®¹å™¨æœ¬èº«):*
-
-
-### 进入容器 (通过 SSH 进入一个è¿è¡Œä¸çš„容器)
-
-1 - 首先使用 `docker ps` 命令查看æ£åœ¨è¿è¡Œçš„容器
-
-2 - 进入æŸä¸ªå®¹å™¨ä½¿ç”¨:
-
-```bash
-docker-compose exec {container-name} bash
-```
-
-*例如: 进入 MySQL 容器*
-
-```bash
-docker-compose exec mysql bash
-```
-
-3 - 退出容器, 键入 `exit`.
-
-
-
-### 编辑默认容器é…ç½®
-打开 `docker-compose.yml` ç„¶åŽ æŒ‰ç…§ä½ æƒ³çš„ä¿®æ”¹.
-
-例如:
-
-修改 MySQL æ•°æ®åº“åç§°:
-
-```yml
- environment:
- MYSQL_DATABASE: laradock
-```
-
-修改 Redis 默认端å£ä¸º 1111:
-
-```yml
- ports:
- - "1111:6379"
-```
-
-
-### 编辑 Docker 镜åƒ
-
-1 - æ‰¾åˆ°ä½ æƒ³ä¿®æ”¹çš„é•œåƒçš„ `Dockerfile` ,
-
-例如: `mysql` 在 `mysql/Dockerfile`.
-
-2 - æŒ‰ä½ æ‰€è¦çš„编辑文件.
-
-3 - 釿–°æž„建容器:
-
-```bash
-docker-compose build mysql
-```
-
-更多信æ¯åœ¨å®¹å™¨é‡å»ºä¸[点击这里](#Build-Re-build-Containers).
-
-
-### 建立/é‡å»ºå®¹å™¨
-
-å¦‚æžœä½ åšä»»ä½•æ”¹å˜ `Dockerfile` ç¡®ä¿ä½ è¿è¡Œè¿™ä¸ªå‘½ä»¤,å¯ä»¥è®©æ‰€æœ‰ä¿®æ”¹æ›´æ”¹ç”Ÿæ•ˆ:
-
-```bash
-docker-compose build
-```
-
-é€‰æ‹©ä½ å¯ä»¥æŒ‡å®šå“ªä¸ªå®¹å™¨é‡å»º(è€Œä¸æ˜¯é‡å»ºæ‰€æœ‰çš„容器):
-
-```bash
-docker-compose build {container-name}
-```
-
-å¦‚æžœä½ æƒ³é‡å»ºæ•´ä¸ªå®¹å™¨ï¼Œä½ å¯èƒ½éœ€è¦ä½¿ç”¨ `--no-cache` 选项 (`docker-compose build --no-cache {container-name}`).
-
-
-### å¢žåŠ æ›´å¤šè½¯ä»¶ (Docker 镜åƒ)
-
-ä¸ºäº†å¢žåŠ é•œåƒï¼ˆè½¯ä»¶ï¼‰, 编辑 `docker-compose.yml` æ·»åŠ å®¹å™¨ç»†èŠ‚ï¼Œ ä½ éœ€è¦ç†Ÿæ‚‰ [docker compose æ–‡ä»¶è¯æ³•](https://docs.docker.com/compose/compose-file/).
-
-
-### 查看日志文件
-Nginx的日志在 `logs/nginx` 目录
-
-ç„¶åŽæŸ¥çœ‹å…¶å®ƒå®¹å™¨æ—¥å¿—(MySQL, PHP-FPM,...) ä½ å¯ä»¥è¿è¡Œ:
-
-```bash
-docker logs {container-name}
-```
-
-
-### [Laravel]
-
-
-### 从 Docker 镜åƒå®‰è£… Laravel
-
-1 - é¦–å…ˆä½ éœ€è¦è¿›å…¥ Workspace 容器.
-
-2 - 安装 Laravel.
-
-例如 使用 Composer
-
-```bash
-composer create-project laravel/laravel my-cool-app "5.2.*"
-```
-
-> 我们建议使用 `composer create-project` æ›¿æ¢ Laravel 安装器去安装 Laravel.
-
-关于更多 Laravel 安装内容请 [点击这儿](https://laravel.com/docs/master#installing-laravel).
-
-
-3 - 编辑 `docker-compose.yml` æ˜ å°„æ–°çš„åº”ç”¨ç›®å½•:
-系统默认 Laradock å‡å®š Laravel 应用在 laradock 的父级目录ä¸
-
-æ›´æ–° Laravel 应用在 `my-cool-app` 目录ä¸, 我们需è¦ç”¨ `../my-cool-app/:/var/www`æ›¿æ¢ `../:/var/www` , 如下:
-
-```yaml
- application:
- build: ./application
- volumes:
- - ../my-cool-app/:/var/www
-```
-
-4 - 进入目录下继ç»å·¥ä½œ..
-
-```bash
-cd my-cool-app
-```
-
-5 - 回到 Laradock 安装æ¥éª¤,看看如何编辑 `.env` 的文件。
-
-
-### è¿è¡Œ Artisan 命令
-
-ä½ å¯ä»¥ä»Ž Workspace 容器è¿è¡Œ artisan 命令和其他终端命令
-
-1 - 确认 Workspace 容器已ç»è¿è¡Œ.
-
-```bash
-docker-compose up -d workspace // ..and all your other containers
-```
-
-2 - 找到 Workspace 容器åç§°:
-
-```bash
-docker-compose ps
-```
-
-3 - 进入 Workspace 容器:
-
-```bash
-docker-compose exec workspace bash
-```
-
-å¢žåŠ `--user=laradock` (例如 `docker-compose exec --user=laradock workspace bash`) 作为您的主机的用户创建的文件.
-
-4 - è¿è¡Œä»»ä½•ä½ æƒ³çš„ :)
-
-```bash
-php artisan
-```
-```bash
-composer update
-```
-```bash
-phpunit
-```
-
-
-### 使用 Redis
-1 - 首先务必用 `docker-compose up` 命令è¿è¡Œ (`redis`) 容器.
-
-```bash
-docker-compose up -d redis
-```
-
-2 - æ‰“å¼€ä½ çš„Laravelçš„ `.env` 文件 ç„¶åŽ é…ç½® `redis` çš„ `REDIS_HOST`
-
-```env
-REDIS_HOST=redis
-```
-
-å¦‚æžœåœ¨ä½ çš„ `.env` 文件没有找到 `REDIS_HOST` å˜é‡ã€‚打开数æ®åº“é…置文件 `config/database.php` ç„¶åŽç”¨ `redis` 替æ¢é»˜è®¤ IP `127.0.0.1`,例如:
-
-
-```php
-'redis' => [
- 'cluster' => false,
- 'default' => [
- 'host' => 'redis',
- 'port' => 6379,
- 'database' => 0,
- ],
-],
-```
-
-3 - å¯ç”¨ Redis ç¼“å˜æˆ–è€…å¼€å¯ Session 管ç†ä¹Ÿåœ¨ `.env` 文件ä¸ç”¨ `redis` 替æ¢é»˜è®¤ `file` 设置 `CACHE_DRIVER` å’Œ `SESSION_DRIVER`
-
-```env
-CACHE_DRIVER=redis
-SESSION_DRIVER=redis
-```
-
-4 - 最好务必通过 Composer 安装 `predis/predis` 包 `(~1.0)`:
-
-```bash
-composer require predis/predis:^1.0
-```
-
-5 - ä½ å¯ä»¥ç”¨ä»¥ä¸‹ä»£ç 在 Laravel 䏿‰‹åŠ¨æµ‹è¯•ï¼š
-
-```php
-\Cache::store('redis')->put('Laradock', 'Awesome', 10);
-```
-
-
-### 使用 Mongo
-
-1 - 首先在 Workspace å’Œ PHP-FPM 容器ä¸å®‰è£… `mongo`:
-
- a) 打开 `docker-compose.yml` 文件
- b) 在 Workspace 容噍䏿‰¾åˆ° `INSTALL_MONGO` 选项:
- c) 设置为 `true`
- d) 在 PHP-FPM 容噍䏿‰¾åˆ° `INSTALL_MONGO`
- e) 设置为 `true`
-
-相关é…置项如下:
-
-```yml
- workspace:
- build:
- context: ./workspace
- args:
- - INSTALL_MONGO=true
- ...
- php-fpm:
- build:
- context: ./php-fpm
- args:
- - INSTALL_MONGO=true
- ...
-```
-
-2 - é‡å»º `Workspaceã€PHP-FPM` 容器
-
-```bash
-docker-compose build workspace php-fpm
-```
-
-3 - 使用 `docker-compose up` 命令è¿è¡Œ MongoDB 容器 (`mongo`)
-
-```bash
-docker-compose up -d mongo
-```
-
-4 - 在 `config/database.php` æ–‡ä»¶æ·»åŠ MongoDB çš„é…置项:
-
-```php
-'connections' => [
-
- 'mongodb' => [
- 'driver' => 'mongodb',
- 'host' => env('DB_HOST', 'localhost'),
- 'port' => env('DB_PORT', 27017),
- 'database' => env('DB_DATABASE', 'database'),
- 'username' => '',
- 'password' => '',
- 'options' => [
- 'database' => '',
- ]
- ],
-
- // ...
-
-],
-```
-
-5 - 打开 Laravel çš„ `.env` æ–‡ä»¶ç„¶åŽæ›´æ–°ä»¥ä¸‹å—段:
-
-- 设置 `DB_HOST` 为 `mongo` 的主机 IP.
-- 设置 `DB_PORT` 为 `27017`.
-- 设置 `DB_DATABASE` 为 `database`.
-
-
-6 - 最åŽåŠ¡å¿…é€šè¿‡ Composer 安装 `jenssegers/mongodb` åŒ…ï¼Œæ·»åŠ æœåŠ¡æä¾›è€…(Laravel Service Provider)
-
-
-```bash
-composer require jenssegers/mongodb
-```
-
-更多细节内容 [点击这儿](https://github.com/jenssegers/laravel-mongodb#installation).
-
-7 - 测试:
-
-- é¦–å…ˆè®©ä½ çš„æ¨¡åž‹ç»§æ‰¿ Mongo çš„ Eloquent Model. 查看 [文档](https://github.com/jenssegers/laravel-mongodb#eloquent).
-- 进入 Workspace 容器.
-- è¿ç§»æ•°æ®åº“ `php artisan migrate`.
-
-
-### [PHP]
-
-
-### 安装 PHP 拓展
-
-安装 PHP 扩展之å‰,ä½ å¿…é¡»å†³å®šä½ æ˜¯å¦éœ€è¦ `FPM` 或 `CLI`,å› ä¸ºä»–ä»¬å®‰è£…åœ¨ä¸åŒçš„容器上,å¦‚æžœä½ éœ€è¦ä¸¤è€…,则必须编辑两个容器。
-
-PHP-FPM 拓展务必安装在 `php-fpm/Dockerfile-XX`. *(ç”¨ä½ PHP ç‰ˆæœ¬å·æ›¿æ¢ XX)*.
-
-PHP-CLI 拓展应该安装到 `workspace/Dockerfile`.
-
-
-### 修改 PHP-FPM 版本
-默认è¿è¡Œ **PHP-FPM 7.0** 版本.
-
->PHP-FPM è´Ÿè´£æœåŠ¡ä½ çš„åº”ç”¨ä»£ç ,å¦‚æžœä½ æ˜¯è®¡åˆ’è¿è¡Œæ‚¨çš„应用程åºåœ¨ä¸åŒ PHP-FPM 版本上,则ä¸éœ€è¦æ›´æ”¹ PHP-CLI 版本。
-
-#### A) 切æ¢ç‰ˆæœ¬ PHP `7.0` 到 PHP `5.6`
-
-1 - 打开 `docker-compose.yml`。
-
-2 - 在PHP容器的 `Dockerfile-70` 文件。
-
-3 - 修改版本å·, 用 `Dockerfile-56` æ›¿æ¢ `Dockerfile-70` , 例如:
-
-```txt
-php-fpm:
- build:
- context: ./php-fpm
- dockerfile: Dockerfile-70
-```
-
-4 - 最åŽé‡å»ºPHP容器
-
-```bash
-docker-compose build php
-```
-
-> 更多关于PHP基础镜åƒ, 请访问 [PHP Docker官方镜åƒ](https://hub.docker.com/_/php/).
-
-
-#### B) 切æ¢ç‰ˆæœ¬ PHP `7.0` 或 `5.6` 到 PHP `5.5`
-我们已ä¸åœ¨æœ¬åœ°æ”¯æŒ PHP5.5ï¼Œä½†æ˜¯ä½ æŒ‰ç…§ä»¥ä¸‹æ¥éª¤èŽ·å–:
-
-1 - 克隆 `https://github.com/laradock/php-fpm`.
-
-2 - é‡å‘½å `Dockerfile-56` 为 `Dockerfile-55`.
-
-3 - 编辑文件 `FROM php:5.6-fpm` 为 `FROM php:5.5-fpm`.
-
-4 - 从 `Dockerfile-55` 构建镜åƒ.
-
-5 - 打开 `docker-compose.yml` 文件.
-
-6 - å°† `php-fpm` 指å‘ä½ çš„ `Dockerfile-55` 文件.
-
-
-
-### 修改 PHP-CLI 版本
-默认è¿è¡Œ **PHP-CLI 7.0** 版本
-
->说明: PHP-CLI åªç”¨äºŽæ‰§è¡Œ Artisan å’Œ Composer å‘½ä»¤ï¼Œä¸æœåŠ¡äºŽä½ çš„åº”ç”¨ä»£ç ,这是 PHP-FPM 的工作,所以编辑 PHP-CLI çš„ç‰ˆæœ¬ä¸æ˜¯å¾ˆé‡è¦ã€‚
-PHP-CLI 安装在 Workspace å®¹å™¨ï¼Œæ”¹å˜ PHP-CLI ç‰ˆæœ¬ä½ éœ€è¦ç¼–辑 `workspace/Dockerfile`.
-çŽ°åœ¨ä½ å¿…é¡»æ‰‹åŠ¨ä¿®æ”¹ PHP-FPM çš„ `Dockerfile` 或者创建一个新的。 (å¯ä»¥è€ƒè™‘贡献功能).
-
-
-### 安装 xDebug
-
-1 - 首先在 Workspace 和 PHP-FPM 容器安装 `xDebug`:
-
- a) 打开 `docker-compose.yml` 文件
- b) 在 Workspace 容噍䏿‰¾åˆ° `INSTALL_XDEBUG` 选项
- c) 改为 `true`
- d) 在 PHP-FPM 容噍䏿‰¾åˆ° `INSTALL_XDEBUG ` 选项
- e) 改为 `true`
-
-例如:
-
-```yml
- workspace:
- build:
- context: ./workspace
- args:
- - INSTALL_XDEBUG=true
- ...
- php-fpm:
- build:
- context: ./php-fpm
- args:
- - INSTALL_XDEBUG=true
- ...
-```
-
-2 - é‡å»ºå®¹å™¨ `docker-compose build workspace php-fpm`
-
-
-### [Misc]
-
-
-### 使用自定义域å (æ›¿æ¢ Docker çš„ IP)
-
-å‡å®šä½ çš„è‡ªå®šä¹‰åŸŸåæ˜¯ `laravel.test`
-
-1 - 打开 `/etc/hosts` æ–‡ä»¶æ·»åŠ ä»¥ä¸‹å†…å®¹ï¼Œæ˜ å°„ä½ çš„ localhost åœ°å€ `127.0.0.1` 为 `laravel.test` 域å
-```bash
-127.0.0.1 laravel.test
-```
-
-2 - æ‰“å¼€ä½ çš„æµè§ˆå™¨è®¿é—® `{http://laravel.test}`
-
-ä½ å¯ä»¥åœ¨ nginx é…置文件自定义æœåС噍åç§°,如下:
-
-```conf
-server_name laravel.test;
-```
-
-
-### 安装全局 Composer 命令
-
-为å¯ç”¨å…¨å±€ Composer Install 在容器构建ä¸å…è®¸ä½ å®‰è£… composer çš„ä¾èµ–ï¼Œç„¶åŽæž„建完æˆåŽå°±æ˜¯å¯ç”¨çš„。
-
-1 - 打开 `docker-compose.yml` 文件
-
-2 - 在 Workspace 容器找到 `COMPOSER_GLOBAL_INSTALL` 选项并设置为 `true`
-
-例如:
-
-```yml
- workspace:
- build:
- context: ./workspace
- args:
- - COMPOSER_GLOBAL_INSTALL=true
- ...
-```
-3 - çŽ°åœ¨ç‰¹ä»·ä½ çš„ä¾èµ–关系到 `workspace/composer.json`
-
-4 - é‡å»º Workspace 容器 `docker-compose build workspace`
-
-
-### 安装 Prestissimo
-
-[Prestissimo](https://github.com/hirak/prestissimo) 是一个平行安装功能的 composer æ’件。
-
-1 - 在安装期间,使全局 Composer Install æ£åœ¨è¿è¡Œ:
-
- 点击这个 [å¯ç”¨å…¨å±€ Composer 构建安装](#Enable-Global-Composer-Build-Install) ç„¶åŽç»§ç»æ¥éª¤1ã€2.
-
-2 - æ·»åŠ prestissimo ä¾èµ–到 Composer:
-
-a - 现在打开 `workspace/composer.json` 文件
-
-b - æ·»åŠ `"hirak/prestissimo": "^0.3"` ä¾èµ–
-
-c - é‡å»º Workspace 容器 `docker-compose build workspace`
-
-
-
-### 安装 Node + NVM
-
-在 Workspace 容器安装 NVM 和 NodeJS
-
-1 - 打开 `docker-compose.yml` 文件
-
-2 - 在 Workspace 容器找到 `INSTALL_NODE` 选项设为 `true`
-
-例如:
-
-```yml
- workspace:
- build:
- context: ./workspace
- args:
- - INSTALL_NODE=true
- ...
-```
-
-3 - é‡å»ºå®¹å™¨ `docker-compose build workspace`
-
-
-### Debugging
-
-*è¿™é‡Œæ˜¯ä½ å¯èƒ½é¢ä¸´çš„常è§é—®é¢˜åˆ—表,以åŠå¯èƒ½çš„解决方案.*
-
-#### çœ‹åˆ°ç©ºç™½é¡µè€Œä¸æ˜¯ Laravel 的欢迎页é¢!
-
-在 Laravel æ ¹ç›®å½•ï¼Œè¿è¡Œä¸‹åˆ—命令:
-
-```bash
-sudo chmod -R 777 storage bootstrap/cache
-```
-
-#### 看到 "Welcome to nginx" è€Œä¸æ˜¯ Laravel 应用!
-
-在æµè§ˆå™¨ä½¿ç”¨ `http://127.0.0.1` æ›¿æ¢ `http://localhost`.
-
-#### çœ‹åˆ°åŒ…å« `address already in use` 的错误
-
-ç¡®ä¿ä½ 想è¿è¡Œçš„æœåŠ¡ç«¯å£(80, 3306, etc.)䏿˜¯å·²ç»è¢«å…¶ä»–程åºä½¿ç”¨ï¼Œä¾‹å¦‚ `apache`/`httpd` æœåŠ¡æˆ–å…¶ä»–å®‰è£…çš„å¼€å‘工具
-
-
-### Laradock å‡çº§
-
-
-从 Docker Toolbox (VirtualBox) 移动到 Docker Native (for Mac/Windows),需è¦ä»Ž Laradock v3.* å‡çº§åˆ° v4.*:
-
-1. åœæ¢ Docker 虚拟机 `docker-machine stop {default}`
-2. 安装 Docker [Mac](https://docs.docker.com/docker-for-mac/) 或 [Windows](https://docs.docker.com/docker-for-windows/).
-3. å‡çº§ Laradock 到 `v4.*.*` (`git pull origin master`)
-4. åƒä¹‹å‰ä¸€æ ·ä½¿ç”¨ Laradock: `docker-compose up -d nginx mysql`.
-
-**说明:** å¦‚æžœä½ é¢ä¸´ä»»ä½•上é¢çš„问题的最åŽä¸€æ¥:é‡å»ºä½ 所有的容器
-```bash
-docker-compose build --no-cache
-```
-"è¦å‘Šï¼šå®¹å™¨æ•°æ®å¯èƒ½ä¼šä¸¢å¤±!"
-
-
-## 贡献
-这个å°é¡¹ç›®æ˜¯ç”±ä¸€ä¸ªæœ‰ä¸€ä¸ªå…¨èŒå·¥ä½œå’Œå¾ˆå¤šçš„èŒè´£çš„人建立的,æ‰€ä»¥å¦‚æžœä½ å–œæ¬¢è¿™ä¸ªé¡¹ç›®,并且å‘现它需è¦ä¸€ä¸ª bug ä¿®å¤æˆ–æ”¯æŒæˆ–新软件或å‡çº§ä»»ä½•容器,或其他任何. . ä½ æ˜¯éžå¸¸æ¬¢è¿Žï¼Œæ¬¢è¿Žæ¯«ä¸ä¸çŠ¹è±«åœ°è´¡çŒ®å§:)
-
-#### 阅读我们的 [贡献说明](https://github.com/laradock/laradock/blob/master/CONTRIBUTING.md)
-
-
-## 帮助 & 问题
-
-从èŠå¤©å®¤ [Gitter](https://gitter.im/Laradock/laradock) 社区获å–帮助和支æŒ.
-
-ä½ ä¹Ÿå¯ä»¥æ‰“å¼€ Github 上的 [issue](https://github.com/laradock/laradock/issues) (å°†è¢«è´´ä¸Šé—®é¢˜å’Œç”æ¡ˆ) 或与大家讨论 [Gitter](https://gitter.im/Laradock/laradock).
-
-Docker 或 Laravel çš„ç‰¹åˆ«å¸®åŠ©ï¼Œä½ å¯ä»¥åœ¨ [Codementor.io](https://www.codementor.io/mahmoudz) 上直接和项目创始人在线沟通
-
-## 关于作者
-
-**创始人:**
-
-- [Mahmoud Zalt](https://github.com/Mahmoudz) (Twitter [@Mahmoud_Zalt](https://twitter.com/Mahmoud_Zalt))
-
-**优秀的人:**
-
-- [Contributors](https://github.com/laradock/laradock/graphs/contributors)
-- [Supporters](https://github.com/laradock/laradock/issues?utf8=%E2%9C%93&q=)
-
-
-## 许å¯è¯
-
-[MIT License](https://github.com/laradock/laradock/blob/master/LICENSE) (MIT)
diff --git a/laradock/.github/README.md b/laradock/.github/README.md
deleted file mode 100644
index 948ec93e..00000000
--- a/laradock/.github/README.md
+++ /dev/null
@@ -1,92 +0,0 @@
-
-
-
-
-A Docker PHP development environment that facilitates running PHP Apps on Docker
-
-
-
-
-
-
-
-
-
-
-Use Docker First And Learn About It Later
-
-
-
-
-
-
----
-
-
-
-
-
-
-
-
-## Sponsors
-
-Support this project by becoming a sponsor.
-
-Your logo will show up on the [github repository](https://github.com/laradock/laradock/) index page and the [documentation](http://laradock.io/) main page, with a link to your website. [[Become a sponsor](https://opencollective.com/laradock#sponsor)]
-
-
-
-
-
-
-
-
-
-
-
-
-
-## Contributors
-
-#### Core contributors:
-- [Mahmoud Zalt](https://github.com/Mahmoudz) @mahmoudz | [Twitter](https://twitter.com/Mahmoud_Zalt) | [Site](http://zalt.me)
-- [Bo-Yi Wu](https://github.com/appleboy) @appleboy | [Twitter](https://twitter.com/appleboy)
-- [Philippe Trépanier](https://github.com/philtrep) @philtrep
-- [Mike Erickson](https://github.com/mikeerickson) @mikeerickson
-- [Dwi Fahni Denni](https://github.com/zeroc0d3) @zeroc0d3
-- [Thor Erik](https://github.com/thorerik) @thorerik
-- [Winfried van Loon](https://github.com/winfried-van-loon) @winfried-van-loon
-- [TJ Miller](https://github.com/sixlive) @sixlive
-- [Yu-Lung Shao (Allen)](https://github.com/bestlong) @bestlong
-- [Milan Urukalo](https://github.com/urukalo) @urukalo
-- [Vince Chu](https://github.com/vwchu) @vwchu
-- [Huadong Zuo](https://github.com/zuohuadong) @zuohuadong
-- Join us, by submitting 20 useful PR's.
-
-#### Awesome contributors:
-
-
-
-
-## Donations
-
-> Help keeping the project development going, by [contributing](http://laradock.io/contributing) or donating a little.
-> Thanks in advance.
-
-Donate directly via [Paypal](https://www.paypal.me/mzalt)
-
-[](https://www.paypal.me/mzalt)
-
-or become a backer on [Open Collective](https://opencollective.com/laradock#backer)
-
-
-
-or show your support via [Beerpay](https://beerpay.io/laradock/laradock)
-
-[](https://beerpay.io/laradock/laradock)
-
-
-## License
-
-[MIT License](https://github.com/laradock/laradock/blob/master/LICENSE)
diff --git a/laradock/.gitignore b/laradock/.gitignore
deleted file mode 100644
index 890c25c1..00000000
--- a/laradock/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.idea
-/logs
-/data
-.env
-/.project
-.docker-sync
-/jenkins/jenkins_home
diff --git a/laradock/.gitlab-ci.yml b/laradock/.gitlab-ci.yml
deleted file mode 100644
index 41f37b9b..00000000
--- a/laradock/.gitlab-ci.yml
+++ /dev/null
@@ -1,62 +0,0 @@
-# image: docker:latest
-# services:
-# - docker:dind
-image: jonaskello/docker-and-compose:1.12.1-1.8.0
-services:
- - docker:1.12.1-dind
-
-before_script:
- - docker info
- - docker-compose version
- - cp env-example .env
- - sed -i -- "s/=false/=true/g" .env
- - cat .env
- - env | sort
-
-build:5.6:php-fpm:
- variables:
- PHP_VERSION: "5.6"
- script:
- - docker-compose build php-fpm
-
-build:7.0:php-fpm:
- variables:
- PHP_VERSION: "7.0"
- script:
- - docker-compose build php-fpm
-
-build:7.1:php-fpm:
- variables:
- PHP_VERSION: "7.1"
- script:
- - docker-compose build php-fpm
-
-build:7.2:php-fpm:
- variables:
- PHP_VERSION: "7.2"
- script:
- - docker-compose build php-fpm
-
-build:5.6:workspace:
- variables:
- PHP_VERSION: "5.6"
- script:
- - docker-compose build workspace
-
-build:7.0:workspace:
- variables:
- PHP_VERSION: "7.0"
- script:
- - docker-compose build workspace
-
-build:7.1:workspace:
- variables:
- PHP_VERSION: "7.1"
- script:
- - docker-compose build workspace
-
-build:7.2:workspace:
- variables:
- PHP_VERSION: "7.2"
- script:
- - docker-compose build workspace
diff --git a/laradock/.travis.yml b/laradock/.travis.yml
deleted file mode 100644
index 53e43cea..00000000
--- a/laradock/.travis.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-language: bash
-sudo: required
-services:
- - docker
-
-env:
- matrix:
- - HUGO_VERSION=0.20.2
-
- - PHP_VERSION=5.6 BUILD_SERVICE=workspace
- - PHP_VERSION=7.0 BUILD_SERVICE=workspace
- - PHP_VERSION=7.1 BUILD_SERVICE=workspace
- - PHP_VERSION=7.2 BUILD_SERVICE=workspace
-
- - PHP_VERSION=5.6 BUILD_SERVICE=php-fpm
- - PHP_VERSION=7.0 BUILD_SERVICE=php-fpm
- - PHP_VERSION=7.1 BUILD_SERVICE=php-fpm
- - PHP_VERSION=7.2 BUILD_SERVICE=php-fpm
-
- - PHP_VERSION=hhvm BUILD_SERVICE=hhvm
-
- # - PHP_VERSION=5.6 BUILD_SERVICE=php-worker
- - PHP_VERSION=7.0 BUILD_SERVICE=php-worker
- - PHP_VERSION=7.1 BUILD_SERVICE=php-worker
- - PHP_VERSION=7.2 BUILD_SERVICE=php-worker
-
- - PHP_VERSION=NA BUILD_SERVICE=solr
- - PHP_VERSION=NA BUILD_SERVICE="mssql rethinkdb aerospike"
- - PHP_VERSION=NA BUILD_SERVICE="blackfire minio percona nginx caddy apache2 mysql mariadb postgres postgres-postgis neo4j mongo redis"
- - PHP_VERSION=NA BUILD_SERVICE="adminer phpmyadmin pgadmin"
- - PHP_VERSION=NA BUILD_SERVICE="memcached beanstalkd beanstalkd-console rabbitmq elasticsearch certbot mailhog maildev selenium jenkins proxy proxy2 haproxy"
- - PHP_VERSION=NA BUILD_SERVICE="kibana grafana laravel-echo-server"
- # - PHP_VERSION=NA BUILD_SERVICE="aws"
-
-# Installing a newer Docker version
-before_install:
- - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
- - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
- - sudo apt-get update
- - sudo apt-get -y install docker-ce
- - docker version
-
-script: ./travis-build.sh
-
-deploy:
- provider: pages
- skip_cleanup: true
- local_dir: docs
- github_token: $GITHUB_TOKEN
- on:
- branch: master
- condition: -n "${HUGO_VERSION}"
-
-notifications:
- email: false
diff --git a/laradock/DOCUMENTATION/config.toml b/laradock/DOCUMENTATION/config.toml
deleted file mode 100644
index 74e4fa0c..00000000
--- a/laradock/DOCUMENTATION/config.toml
+++ /dev/null
@@ -1,97 +0,0 @@
-baseurl = "http://laradock.io/"
-languageCode = "en-us"
-publishDir = "../docs"
-title = "Laradock"
-theme = "hugo-material-docs"
-metadataformat = "yaml"
-canonifyurls = true
-uglyurls = true
-# Enable Google Analytics by entering your tracking id
-googleAnalytics = "UA-37514928-9"
-
-[params]
- # General information
- author = "Mahmoud Zalt"
- description = "Full PHP development environment for Docker."
- copyright = ""
-
- # Repository
- provider = ""
- repo_url = ""
-
- version = ""
- logo = "images/logo.png"
- favicon = ""
-
- permalink = "#"
-
- # Custom assets
- custom_css = []
- custom_js = []
-
- # Syntax highlighting theme
- highlight_css = ""
-
- [params.palette]
- primary = "deep-purple"
- accent = "purple"
-
- [params.font]
- text = "Doctarine"
- code = "Source Code Pro"
-
-[social]
- twitter = ""
- github = "laradock/laradock"
- email = ""
-
-# ------- MENU START -----------------------------------------
-
-[[menu.main]]
- name = "Introduction"
- url = "introduction/"
- weight = 1
-
-[[menu.main]]
- name = "Getting Started"
- url = "getting-started/"
- weight = 2
-
-[[menu.main]]
- name = "Documentation"
- url = "documentation/"
- weight = 3
-
-[[menu.main]]
- name = "Guides"
- url = "guides/"
- weight = 4
-
-[[menu.main]]
- name = "Help & Questions"
- url = "help/"
- weight = 5
-
-[[menu.main]]
- name = "Related Projects"
- url = "related-projects/"
- weight = 6
-
-[[menu.main]]
- name = "Contributing"
- url = "contributing/"
- weight = 7
-
-[[menu.main]]
- name = "License"
- url = "license/"
- weight = 8
-
-# ------- MENU END -----------------------------------------
-
-[blackfriday]
- smartypants = true
- fractions = true
- smartDashes = true
- plainIDAnchors = true
-
diff --git a/laradock/DOCUMENTATION/content/contributing/index.md b/laradock/DOCUMENTATION/content/contributing/index.md
deleted file mode 100644
index 94adc472..00000000
--- a/laradock/DOCUMENTATION/content/contributing/index.md
+++ /dev/null
@@ -1,207 +0,0 @@
----
-title: Contributing
-type: index
-weight: 7
----
-
-
-## Have a Question
-
-If you have questions about how to use Laradock, please direct your questions to the discussion on [Gitter](https://gitter.im/Laradock/laradock). If you believe your question could help others, then consider opening an [Issue](https://github.com/laradock/laradock/issues) (it will be labeled as `Question`) And you can still seek help on Gitter for it.
-
-
-
-## Found an Issue
-
-If you have an issue or you found a typo in the documentation, you can help us by
-opening an [Issue](https://github.com/laradock/laradock/issues).
-
-**Steps to do before opening an Issue:**
-
-1. Before you submit your issue search the archive, maybe your question was already answered couple hours ago (search in the closed Issues as well).
-
-2. Decide if the Issue belongs to this project or to [Docker](https://github.com/docker) itself! or even the tool you are using such as Nginx or MongoDB...
-
-If your issue appears to be a bug, and hasn't been reported, then open a new issue.
-
-*This helps us maximize the effort we can spend fixing issues and adding new
-features, by not reporting duplicate issues.*
-
-
-
-## Want a Feature
-You can request a new feature by submitting an [Issue](https://github.com/laradock/laradock/issues) (it will be labeled as `Feature Suggestion`). If you would like to implement a new feature then consider submitting a Pull Request yourself.
-
-
-
-
-## Update the Documentation (Site)
-
-Laradock uses [Hugo](https://gohugo.io/) as website generator tool, with the [Material Docs theme](http://themes.gohugo.io/theme/material-docs/). You might need to check their docs quickly.
-
-Go the `DOCUMENTATION/content` and search for the markdown file you want to edit
-
-Note: Every folder represents a section in the sidebar "Menu". And every page and sidebar has a `weight` number to show it's position in the site.
-
-To update the sidebar or add a new section to it, you can edit this `DOCUMENTATION/config.toml` toml file.
-
-> The site will be auto-generated in the `docs/` folder by [Travis CI](https://travis-ci.org/laradock/laradock/).
-
-
-
-### Host the documentation locally
-
-1. Install [Hugo](https://gohugo.io/) on your machine.
-2. Edit the `DOCUMENTATION/content`.
-3. Delete the `/docs` folder from the root.
-4. After you finish the editing, go to `DOCUMENTATION/` and run the `hugo` command to generate the HTML docs (inside a new `/docs` folder).
-
-
-
-
-## Support new Software (Add new Container)
-
-* Fork the repo and clone the code.
-
-* Create folder as the software name (example: `mysql` - `nginx`).
-
-* Add your `Dockerfile` in the folder "you may add additional files as well".
-
-* Add the software to the `docker-compose.yml` file.
-
-* Make sure you follow the same code/comments style.
-
-* Add the environment variables to the `env-example` if you have any.
-
-* **MOST IMPORTANTLY** updated the `Documentation`, add as much information.
-
-* Submit a Pull Request, to the `master` branch.
-
-
-
-## Edit supported Software (Edit a Container)
-
-* Fork the repo and clone the code.
-
-* Open the software (container) folder (example: `mysql` - `nginx`).
-
-* Edit the files.
-
-* Make sure to update the `Documentation` in case you made any changes.
-
-* Submit a Pull Request, to the `master` branch.
-
-
-
-
-## Edit Base Image
-
-* Open any dockerfile, copy the base image name (example: `FROM phusion/baseimage:latest`).
-
-* Search for the image in the [Docker Hub](https://hub.docker.com/search/) and find the source..
-
-*Most of the image in Laradock are offical images, these projects live in other repositories and maintainer by other orgnizations.*
-
-**Note:** Laradock has two base images for (`Workspace` and `php-fpm`, mainly made to speed up the build time on your machine.
-
-* Find the dockerfiles, edit them and submit a Pull Request.
-
-* When updating a Laradock base image (`Workspace` or `php-fpm`), ask a project maintainer "Admin" to build a new image after your PR is merged.
-
-**Note:** after the base image is updated, every dockerfile that uses that image, needs to update his base image tag to get the updated code.
-
-
-
-
-
-
-
-
-
-
-
-
-
-## Submit Pull Request Instructions
-
-### 1. Before Submitting a Pull Request (PR)
-
-Always Test everything and make sure its working:
-
-- Pull the latest updates (or fork of you don’t have permission)
-- Before editing anything:
- - Test building the container (docker-compose build --no-cache container-name) build with no cache first.
- - Test running the container with some other containers in real app and see of everything is working fine.
-- Now edit the container (edit section by section and test rebuilding the container after every edited section)
- - Testing building the container (docker-compose build container-name) with no errors.
- - Test it in a real App if possible.
-
-
-### 2. Submitting a PR
-Consider the following guidelines:
-
-* Search [GitHub](https://github.com/laradock/laradock/pulls) for an open or closed Pull Request that relates to your submission. You don't want to duplicate efforts.
-
-* Make your changes in a new git branch:
-
- ```shell
- git checkout -b my-fix-branch master
- ```
-* Commit your changes using a descriptive commit message.
-
-* Push your branch to GitHub:
-
- ```shell
- git push origin my-fix-branch
- ```
-
-* In GitHub, send a pull request to `laradock:master`.
-* If we suggest changes then:
- * Make the required updates.
- * Commit your changes to your branch (e.g. `my-fix-branch`).
- * Push the changes to your GitHub repository (this will update your Pull Request).
-
-> If the PR gets too outdated we may ask you to rebase and force push to update the PR:
-
-```shell
-git rebase master -i
-git push origin my-fix-branch -f
-```
-
-*WARNING. Squashing or reverting commits and forced push thereafter may remove GitHub comments on code that were previously made by you and others in your commits.*
-
-
-### 3. After your PR is merged
-
-After your pull request is merged, you can safely delete your branch and pull the changes from the main (upstream) repository:
-
-* Delete the remote branch on GitHub either through the GitHub web UI or your local shell as follows:
-
- ```shell
- git push origin --delete my-fix-branch
- ```
-
-* Check out the master branch:
-
- ```shell
- git checkout master -f
- ```
-
-* Delete the local branch:
-
- ```shell
- git branch -D my-fix-branch
- ```
-
-* Update your master with the latest upstream version:
-
- ```shell
- git pull --ff upstream master
- ```
-
-
-
-
-
-
-#### Happy Coding :)
diff --git a/laradock/DOCUMENTATION/content/documentation/index.md b/laradock/DOCUMENTATION/content/documentation/index.md
deleted file mode 100644
index dabde4f0..00000000
--- a/laradock/DOCUMENTATION/content/documentation/index.md
+++ /dev/null
@@ -1,1740 +0,0 @@
----
-title: Documentation
-type: index
-weight: 3
----
-
-
-
-
-
-## List current running Containers
-```bash
-docker ps
-```
-You can also use the following command if you want to see only this project containers:
-
-```bash
-docker-compose ps
-```
-
-
-
-
-
-
-
-
-## Close all running Containers
-```bash
-docker-compose stop
-```
-
-To stop single container do:
-
-```bash
-docker-compose stop {container-name}
-```
-
-
-
-
-
-
-
-
-## Delete all existing Containers
-```bash
-docker-compose down
-```
-
-
-
-
-
-
-
-
-## Enter a Container (run commands in a running Container)
-
-1 - First list the current running containers with `docker ps`
-
-2 - Enter any container using:
-
-```bash
-docker-compose exec {container-name} bash
-```
-
-*Example: enter MySQL container*
-
-```bash
-docker-compose exec mysql bash
-```
-
-*Example: enter to MySQL prompt within MySQL container*
-
-```bash
-docker-compose exec mysql mysql -u homestead -psecret
-```
-
-3 - To exit a container, type `exit`.
-
-
-
-
-
-
-
-
-## Edit default container configuration
-Open the `docker-compose.yml` and change anything you want.
-
-Examples:
-
-Change MySQL Database Name:
-
-```yml
- environment:
- MYSQL_DATABASE: laradock
- ...
-```
-
-Change Redis default port to 1111:
-
-```yml
- ports:
- - "1111:6379"
- ...
-```
-
-
-
-
-
-
-
-
-## Edit a Docker Image
-
-1 - Find the `Dockerfile` of the image you want to edit,
-
-example for `mysql` it will be `mysql/Dockerfile`.
-
-2 - Edit the file the way you want.
-
-3 - Re-build the container:
-
-```bash
-docker-compose build mysql
-```
-More info on Containers rebuilding [here](#Build-Re-build-Containers).
-
-
-
-
-
-
-
-
-## Build/Re-build Containers
-
-If you do any change to any `Dockerfile` make sure you run this command, for the changes to take effect:
-
-```bash
-docker-compose build
-```
-Optionally you can specify which container to rebuild (instead of rebuilding all the containers):
-
-```bash
-docker-compose build {container-name}
-```
-
-You might use the `--no-cache` option if you want full rebuilding (`docker-compose build --no-cache {container-name}`).
-
-
-
-
-
-
-
-## Add more Software (Docker Images)
-
-To add an image (software), just edit the `docker-compose.yml` and add your container details, to do so you need to be familiar with the [docker compose file syntax](https://docs.docker.com/compose/compose-file/).
-
-
-
-
-
-
-
-
-## View the Log files
-The NGINX Log file is stored in the `logs/nginx` directory.
-
-However to view the logs of all the other containers (MySQL, PHP-FPM,...) you can run this:
-
-```bash
-docker-compose logs {container-name}
-```
-
-```bash
-docker-compose logs -f {container-name}
-```
-
-More [options](https://docs.docker.com/compose/reference/logs/)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-## Install PHP Extensions
-
-Before installing PHP extensions, you have to decide whether you need for the `FPM` or `CLI` because each lives on a different container, if you need it for both you have to edit both containers.
-
-The PHP-FPM extensions should be installed in `php-fpm/Dockerfile-XX`. *(replace XX with your default PHP version number)*.
-
-The PHP-CLI extensions should be installed in `workspace/Dockerfile`.
-
-
-
-
-
-
-
-
-## Change the (PHP-FPM) Version
-By default the latest stable PHP versin is configured to run.
-
->The PHP-FPM is responsible of serving your application code, you don't have to change the PHP-CLI version if you are planning to run your application on different PHP-FPM version.
-
-
-### A) Switch from PHP `7.2` to PHP `5.6`
-
-1 - Open the `.env`.
-
-2 - Search for `PHP_VERSION`.
-
-3 - Set the desired version number:
-
-```dotenv
-PHP_VERSION=5.6
-```
-
-4 - Finally rebuild the image
-
-```bash
-docker-compose build php-fpm
-```
-
-> For more details about the PHP base image, visit the [official PHP docker images](https://hub.docker.com/_/php/).
-
-
-
-
-
-
-## Change the PHP-CLI Version
-By default **PHP-CLI 7.0** is running.
-
->Note: it's not very essential to edit the PHP-CLI version. The PHP-CLI is only used for the Artisan Commands & Composer. It doesn't serve your Application code, this is the PHP-FPM job.
-
-The PHP-CLI is installed in the Workspace container. To change the PHP-CLI version you need to simply change the `PHP_VERSION` in te .env file as follow:
-
-1 - Open the `.env`.
-
-2 - Search for `PHP_VERSION`.
-
-3 - Set the desired version number:
-
-```dotenv
-PHP_VERSION=7.2
-```
-
-4 - Finally rebuild the image
-
-```bash
-docker-compose build workspace
-```
-
-
-
-
-
-
-## Install xDebug
-
-1 - First install `xDebug` in the Workspace and the PHP-FPM Containers:
-
-a) open the `docker-compose.yml` file
-
-b) search for the `INSTALL_XDEBUG` argument under the Workspace Container
-
-c) set it to `true`
-
-d) search for the `INSTALL_XDEBUG` argument under the PHP-FPM Container
-
-e) set it to `true`
-
-It should be like this:
-
-```yml
- workspace:
- build:
- context: ./workspace
- args:
- - INSTALL_XDEBUG=true
- ...
- php-fpm:
- build:
- context: ./php-fpm
- args:
- - INSTALL_XDEBUG=true
- ...
-```
-
-2 - Open `laradock/workspace/xdebug.ini` and `laradock/php-fpm/xdebug.ini` and enable at least the following configurations:
-
-```
-xdebug.remote_autostart=1
-xdebug.remote_enable=1
-xdebug.remote_connect_back=1
-```
-
-3 - Re-build the containers `docker-compose build workspace php-fpm`
-
-For information on how to configure xDebug with your IDE and work it out, check this [Repository](https://github.com/LarryEitel/laravel-laradock-phpstorm) or follow up on the next section if you use linux and PhpStorm.
-
-
-
-## Setup remote debugging for PhpStorm on Linux
-
- - Make sure you have followed the steps above in the [Install Xdebug section](http://laradock.io/documentation/#install-xdebug).
-
- - Make sure Xdebug accepts connections and listens on port 9000. (Should be default configuration).
-
-.
-
- - Create a server with name `laradock` (matches **PHP_IDE_CONFIG** key in environment file) and make sure to map project root path with server correctly.
-
-.
-
- - Start listening for debug connections, place a breakpoint and you are good to go !
-
-
-
-
-## Start/Stop xDebug:
-
-By installing xDebug, you are enabling it to run on startup by default.
-
-To control the behavior of xDebug (in the `php-fpm` Container), you can run the following commands from the Laradock root folder, (at the same prompt where you run docker-compose):
-
-- Stop xDebug from running by default: `.php-fpm/xdebug stop`.
-- Start xDebug by default: `.php-fpm/xdebug start`.
-- See the status: `.php-fpm/xdebug status`.
-
-Note: If `.php-fpm/xdebug` doesn't execute and gives `Permission Denied` error the problem can be that file `xdebug` doesn't have execution access. This can be fixed by running `chmod` command with desired access permissions.
-
-
-
-
-
-
-
-
-## Install Deployer (Deployment tool for PHP)
-
-1 - Open the `docker-compose.yml` file
-
-2 - Search for the `INSTALL_DEPLOYER` argument under the Workspace Container
-
-3 - Set it to `true`
-
-
-It should be like this:
-
-```yml
- workspace:
- build:
- context: ./workspace
- args:
- - INSTALL_DEPLOYER=true
- ...
-```
-
-4 - Re-build the containers `docker-compose build workspace`
-
-[**Deployer Documentation Here**](https://deployer.org/docs)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-## Prepare Laradock for Production
-
-It's recommended for production to create a custom `docker-compose.yml` file. For that reason, Laradock is shipped with `production-docker-compose.yml` which should contain only the containers you are planning to run on production (usage example: `docker-compose -f production-docker-compose.yml up -d nginx mysql redis ...`).
-
-Note: The Database (MySQL/MariaDB/...) ports should not be forwarded on production, because Docker will automatically publish the port on the host, which is quite insecure, unless specifically told not to. So make sure to remove these lines:
-
-```
-ports:
- - "3306:3306"
-```
-
-To learn more about how Docker publishes ports, please read [this excellent post on the subject](https://fralef.me/docker-and-iptables.html).
-
-
-
-
-
-
-
-
-## Setup Laravel and Docker on Digital Ocean
-
-### [Full Guide Here](https://github.com/laradock/laradock/blob/master/_guides/digital_ocean.md)
-
-
-
-
-
-
-
-## Use Jenkins
-
-1) Boot the container `docker-compose up -d jenkins`. To enter the container type `docker-compose exec jenkins bash`.
-
-2) Go to `http://localhost:8090/` (if you didn't chanhed your default port mapping)
-
-3) Authenticate from the web app.
-
-- Default username is `admin`.
-- Default password is `docker-compose exec jenkins cat /var/jenkins_home/secrets/initialAdminPassword`.
-
-(To enter container as root type `docker-compose exec --user root jenkins bash`).
-
-4) Install some plugins.
-
-5) Create your first Admin user, or continue as Admin.
-
-Note: to add user go to `http://localhost:8090/securityRealm/addUser` and to restart it from the web app visit `http://localhost:8090/restart`.
-
-You may wanna change the default security configuration, so go to `http://localhost:8090/configureSecurity/` under Authorization and choosing "Anyone can do anything" or "Project-based Matrix Authorization Strategy" or anything else.
-
-
-
-
-
-
-
-
-## Install Laravel from a Docker Container
-
-1 - First you need to enter the Workspace Container.
-
-2 - Install Laravel.
-
-Example using Composer
-
-```bash
-composer create-project laravel/laravel my-cool-app "5.2.*"
-```
-
-> We recommend using `composer create-project` instead of the Laravel installer, to install Laravel.
-
-For more about the Laravel installation click [here](https://laravel.com/docs/master#installing-laravel).
-
-
-3 - Edit `.env` to Map the new application path:
-
-By default, Laradock assumes the Laravel application is living in the parent directory of the laradock folder.
-
-Since the new Laravel application is in the `my-cool-app` folder, we need to replace `../:/var/www` with `../my-cool-app/:/var/www`, as follow:
-
-```dotenv
- APP_CODE_PATH_HOST=../my-cool-app/
-```
-4 - Go to that folder and start working..
-
-```bash
-cd my-cool-app
-```
-
-5 - Go back to the Laradock installation steps to see how to edit the `.env` file.
-
-
-
-
-
-
-
-
-## Run Artisan Commands
-
-You can run artisan commands and many other Terminal commands from the Workspace container.
-
-1 - Make sure you have the workspace container running.
-
-```bash
-docker-compose up -d workspace // ..and all your other containers
-```
-
-2 - Find the Workspace container name:
-
-```bash
-docker-compose ps
-```
-
-3 - Enter the Workspace container:
-
-```bash
-docker-compose exec workspace bash
-```
-
-Add `--user=laradock` (example `docker-compose exec --user=laradock workspace bash`) to have files created as your host's user.
-
-
-4 - Run anything you want :)
-
-```bash
-php artisan
-```
-```bash
-Composer update
-```
-```bash
-phpunit
-```
-
-
-
-
-
-
-
-
-## Run Laravel Queue Worker
-
-1 - First add `php-worker` container. It will be similar as like PHP-FPM Container.
-
-a) open the `docker-compose.yml` file
-
-b) add a new service container by simply copy-paste this section below PHP-FPM container
-
-```yaml
- php-worker:
- build:
- context: ./php-worker
- args:
- - INSTALL_PGSQL=${PHP_WORKER_INSTALL_PGSQL} #Optionally install PGSQL PHP drivers
- volumes_from:
- - applications
- depends_on:
- - workspace
- extra_hosts:
- - "dockerhost:${DOCKER_HOST_IP}"
- networks:
- - backend
-```
-2 - Start everything up
-
-```bash
-docker-compose up -d php-worker
-```
-
-
-
-
-
-
-
-## Use Redis
-
-1 - First make sure you run the Redis Container (`redis`) with the `docker-compose up` command.
-
-```bash
-docker-compose up -d redis
-```
-
-> To execute redis commands, enter the redis container first `docker-compose exec redis bash` then enter the `redis-cli`.
-
-2 - Open your Laravel's `.env` file and set the `REDIS_HOST` to `redis`
-
-```env
-REDIS_HOST=redis
-```
-
-If you're using Laravel, and you don't find the `REDIS_HOST` variable in your `.env` file. Go to the database configuration file `config/database.php` and replace the default `127.0.0.1` IP with `redis` for Redis like this:
-
-```php
-'redis' => [
- 'cluster' => false,
- 'default' => [
- 'host' => 'redis',
- 'port' => 6379,
- 'database' => 0,
- ],
-],
-```
-
-3 - To enable Redis Caching and/or for Sessions Management. Also from the `.env` file set `CACHE_DRIVER` and `SESSION_DRIVER` to `redis` instead of the default `file`.
-
-```env
-CACHE_DRIVER=redis
-SESSION_DRIVER=redis
-```
-
-4 - Finally make sure you have the `predis/predis` package `(~1.0)` installed via Composer:
-
-```bash
-composer require predis/predis:^1.0
-```
-
-5 - You can manually test it from Laravel with this code:
-
-```php
-\Cache::store('redis')->put('Laradock', 'Awesome', 10);
-```
-
-
-
-
-
-
-
-
-## Use Mongo
-
-1 - First install `mongo` in the Workspace and the PHP-FPM Containers:
-
-a) open the `docker-compose.yml` file
-
-b) search for the `INSTALL_MONGO` argument under the Workspace Container
-
-c) set it to `true`
-
-d) search for the `INSTALL_MONGO` argument under the PHP-FPM Container
-
-e) set it to `true`
-
-It should be like this:
-
-```yml
- workspace:
- build:
- context: ./workspace
- args:
- - INSTALL_MONGO=true
- ...
- php-fpm:
- build:
- context: ./php-fpm
- args:
- - INSTALL_MONGO=true
- ...
-```
-
-2 - Re-build the containers `docker-compose build workspace php-fpm`
-
-
-
-3 - Run the MongoDB Container (`mongo`) with the `docker-compose up` command.
-
-```bash
-docker-compose up -d mongo
-```
-
-
-4 - Add the MongoDB configurations to the `config/database.php` configuration file:
-
-```php
-'connections' => [
-
- 'mongodb' => [
- 'driver' => 'mongodb',
- 'host' => env('DB_HOST', 'localhost'),
- 'port' => env('DB_PORT', 27017),
- 'database' => env('DB_DATABASE', 'database'),
- 'username' => '',
- 'password' => '',
- 'options' => [
- 'database' => '',
- ]
- ],
-
- // ...
-
-],
-```
-
-5 - Open your Laravel's `.env` file and update the following variables:
-
-- set the `DB_HOST` to your `mongo`.
-- set the `DB_PORT` to `27017`.
-- set the `DB_DATABASE` to `database`.
-
-
-6 - Finally make sure you have the `jenssegers/mongodb` package installed via Composer and its Service Provider is added.
-
-```bash
-composer require jenssegers/mongodb
-```
-More details about this [here](https://github.com/jenssegers/laravel-mongodb#installation).
-
-7 - Test it:
-
-- First let your Models extend from the Mongo Eloquent Model. Check the [documentation](https://github.com/jenssegers/laravel-mongodb#eloquent).
-- Enter the Workspace Container.
-- Migrate the Database `php artisan migrate`.
-
-
-
-
-
-
-
-
-## Use PhpMyAdmin
-
-1 - Run the phpMyAdmin Container (`phpmyadmin`) with the `docker-compose up` command. Example:
-
-```bash
-# use with mysql
-docker-compose up -d mysql phpmyadmin
-
-# use with mariadb
-docker-compose up -d mariadb phpmyadmin
-```
-
-*Note: To use with MariaDB, open `.env` and set `PMA_DB_ENGINE=mysql` to `PMA_DB_ENGINE=mariadb`.*
-
-2 - Open your browser and visit the localhost on port **8080**: `http://localhost:8080`
-
-
-
-
-
-
-
-
-## Use Adminer
-
-1 - Run the Adminer Container (`adminer`) with the `docker-compose up` command. Example:
-
-```bash
-docker-compose up -d adminer
-```
-
-2 - Open your browser and visit the localhost on port **8080**: `http://localhost:8080`
-
-**Note:** We've locked Adminer to version 4.3.0 as at the time of writing [it contained a major bug](https://sourceforge.net/p/adminer/bugs-and-features/548/) preventing PostgreSQL users from logging in. If that bug is fixed (or if you're not using PostgreSQL) feel free to set Adminer to the latest version within [the Dockerfile](https://github.com/laradock/laradock/blob/master/adminer/Dockerfile#L1): `FROM adminer:latest`
-
-
-
-
-
-
-
-## Use PgAdmin
-
-1 - Run the pgAdmin Container (`pgadmin`) with the `docker-compose up` command. Example:
-
-```bash
-docker-compose up -d postgres pgadmin
-```
-
-2 - Open your browser and visit the localhost on port **5050**: `http://localhost:5050`
-
-
-
-
-
-
-
-
-## Use Beanstalkd
-
-1 - Run the Beanstalkd Container:
-
-```bash
-docker-compose up -d beanstalkd
-```
-
-2 - Configure Laravel to connect to that container by editing the `config/queue.php` config file.
-
-a. first set `beanstalkd` as default queue driver
-b. set the queue host to beanstalkd : `QUEUE_HOST=beanstalkd`
-
-*beanstalkd is now available on default port `11300`.*
-
-3 - Require the dependency package [pda/pheanstalk](https://github.com/pda/pheanstalk) using composer.
-
-
-Optionally you can use the Beanstalkd Console Container to manage your Queues from a web interface.
-
-1 - Run the Beanstalkd Console Container:
-
-```bash
-docker-compose up -d beanstalkd-console
-```
-
-2 - Open your browser and visit `http://localhost:2080/`
-
-_Note: You can customize the port on which beanstalkd console is listening by changing `BEANSTALKD_CONSOLE_HOST_PORT` in `.env`. The default value is *2080*._
-
-3 - Add the server
-
-- Host: beanstalkd
-- Port: 11300
-
-4 - Done.
-
-
-
-
-
-
-
-
-## Use ElasticSearch
-
-1 - Run the ElasticSearch Container (`elasticsearch`) with the `docker-compose up` command:
-
-```bash
-docker-compose up -d elasticsearch
-```
-
-2 - Open your browser and visit the localhost on port **9200**: `http://localhost:9200`
-
-> The default username is `user` and the default password is `changeme`.
-
-### Install ElasticSearch Plugin
-
-1 - Install an ElasticSearch plugin.
-
-```bash
-docker-compose exec elasticsearch /usr/share/elasticsearch/bin/plugin install {plugin-name}
-```
-
-2 - Restart elasticsearch container
-
-```bash
-docker-compose restart elasticsearch
-```
-
-
-
-
-
-
-
-
-## Use Selenium
-
-1 - Run the Selenium Container (`selenium`) with the `docker-compose up` command. Example:
-
-```bash
-docker-compose up -d selenium
-```
-
-2 - Open your browser and visit the localhost on port **4444** at the following URL: `http://localhost:4444/wd/hub`
-
-
-
-
-
-
-
-
-## Use RethinkDB
-
-The RethinkDB is an open-source Database for Real-time Web ([RethinkDB](https://rethinkdb.com/)).
-A package ([Laravel RethinkDB](https://github.com/duxet/laravel-rethinkdb)) is being developed and was released a version for Laravel 5.2 (experimental).
-
-1 - Run the RethinkDB Container (`rethinkdb`) with the `docker-compose up` command.
-
-```bash
-docker-compose up -d rethinkdb
-```
-
-2 - Access the RethinkDB Administration Console [http://localhost:8090/#tables](http://localhost:8090/#tables) for create a database called `database`.
-
-3 - Add the RethinkDB configurations to the `config/database.php` configuration file:
-
-```php
-'connections' => [
-
- 'rethinkdb' => [
- 'name' => 'rethinkdb',
- 'driver' => 'rethinkdb',
- 'host' => env('DB_HOST', 'rethinkdb'),
- 'port' => env('DB_PORT', 28015),
- 'database' => env('DB_DATABASE', 'test'),
- ]
-
- // ...
-
-],
-```
-
-4 - Open your Laravel's `.env` file and update the following variables:
-
-- set the `DB_CONNECTION` to your `rethinkdb`.
-- set the `DB_HOST` to `rethinkdb`.
-- set the `DB_PORT` to `28015`.
-- set the `DB_DATABASE` to `database`.
-
-
-
-
-## Use Minio
-
-1 - Configure Minio:
- - On the workspace container, change `INSTALL_MC` to true to get the client
- - Set `MINIO_ACCESS_KEY` and `MINIO_ACCESS_SECRET` if you wish to set proper keys
-
-2 - Run the Minio Container (`minio`) with the `docker-compose up` command. Example:
-
-```bash
-docker-compose up -d minio
-```
-
-3 - Open your browser and visit the localhost on port **9000** at the following URL: `http://localhost:9000`
-
-4 - Create a bucket either through the webui or using the mc client:
- ```bash
- mc mb minio/bucket
- ```
-
-5 - When configuring your other clients use the following details:
- ```
- S3_HOST=http://minio
- S3_KEY=access
- S3_SECRET=secretkey
- S3_REGION=us-east-1
- S3_BUCKET=bucket
- ```
-
-
-
-
-
-## Use AWS
-
-1 - Configure AWS:
- - make sure to add your SSH keys in aws/ssh_keys folder
-
-2 - Run the Aws Container (`aws`) with the `docker-compose up` command. Example:
-
-```bash
-docker-compose up -d aws
-```
-
-3 - Access the aws container with `docker-compose exec aws bash`
-
-4 - To start using eb cli inside the container, initiaze your project first by doing 'eb init'. Read the [aws eb cli](http://docs.aws.amazon.com/elasticbeanstalk/latest/dg/eb-cli3-configuration.html) docs for more details.
-
-
-
-
-
-## Use Grafana
-
-1 - Configure Grafana: Change Port using `GRAFANA_PORT` if you wish to. Default is port 3000.
-
-2 - Run the Grafana Container (`grafana`) with the `docker-compose up`command:
-
-```bash
-docker-compose up -d grafana
-```
-
-3 - Open your browser and visit the localhost on port **3000** at the following URL: `http://localhost:3000`
-
-4 - Login using the credentials User = `admin` Passwort = `admin`. Change the password in the webinterface if you want to.
-
-
-
-
-
-
-
-
-
-
-
-
-
-## Install CodeIgniter
-
-To install CodeIgniter 3 on Laradock all you have to do is the following simple steps:
-
-1 - Open the `docker-compose.yml` file.
-
-2 - Change `CODEIGNITER=false` to `CODEIGNITER=true`.
-
-3 - Re-build your PHP-FPM Container `docker-compose build php-fpm`.
-
-
-
-## Install Symfony
-
-1 - Open the `.env` file and set `WORKSPACE_INSTALL_SYMFONY` to `true`.
-
-2 - Run `docker-compose build workspace`, after the step above.
-
-3 - The NGINX sites include a default config file for your Symfony project `symfony.conf.example`, so edit it and make sure the `root` is pointing to your project `web` directory.
-
-4 - Run `docker-compose restart` if the container was already running, before the step above.
-
-5 - Visit `symfony.test`
-
-
-
-## Miscellaneous
-
-
-
-
-
-
-
-
-## Change the timezone
-
-To change the timezone for the `workspace` container, modify the `TZ` build argument in the Docker Compose file to one in the [TZ database](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones).
-
-For example, if I want the timezone to be `New York`:
-
-```yml
- workspace:
- build:
- context: ./workspace
- args:
- - TZ=America/New_York
- ...
-```
-
-We also recommend [setting the timezone in Laravel](http://www.camroncade.com/managing-timezones-with-laravel/).
-
-
-
-
-
-
-
-
-## Adding cron jobs
-
-You can add your cron jobs to `workspace/crontab/root` after the `php artisan` line.
-
-```
-* * * * * php /var/www/artisan schedule:run >> /dev/null 2>&1
-
-# Custom cron
-* * * * * root echo "Every Minute" > /var/log/cron.log 2>&1
-```
-
-Make sure you [change the timezone](#Change-the-timezone) if you don't want to use the default (UTC).
-
-
-
-
-
-
-
-
-## Access workspace via ssh
-
-You can access the `workspace` container through `localhost:2222` by setting the `INSTALL_WORKSPACE_SSH` build argument to `true`.
-
-To change the default forwarded port for ssh:
-
-```yml
- workspace:
- ports:
- - "2222:22" # Edit this line
- ...
-```
-
-Then login using:
-
-```bash
-ssh -o PasswordAuthentication=no \
- -o StrictHostKeyChecking=no \
- -o UserKnownHostsFile=/dev/null \
- -p 2222 \
- -i workspace/insecure_id_rsa \
- laradock@localhost
-```
-
-To login as root, replace laradock@locahost with root@localhost.
-
-
-
-## Change the (MySQL) Version
-By default **MySQL 8.0** is running.
-
-MySQL 8.0 is a development release. You may prefer to use the latest stable version, or an even older release. If you wish, you can change the MySQL image that is used.
-
-Open up your .env file and set the `MYSQL_VERSION` variable to the version you would like to install.
-
-```
-MYSQL_VERSION=5.7
-```
-
-Available versions are: 5.5, 5.6, 5.7, 8.0, or latest. See https://store.docker.com/images/mysql for more information.
-
-
-
-
-
-
-
-
-## MySQL access from host
-
-You can forward the MySQL/MariaDB port to your host by making sure these lines are added to the `mysql` or `mariadb` section of the `docker-compose.yml` or in your [environment specific Compose](https://docs.docker.com/compose/extends/) file.
-
-```
-ports:
- - "3306:3306"
-```
-
-
-
-
-
-
-
-
-## MySQL root access
-
-The default username and password for the root MySQL user are `root` and `root `.
-
-1 - Enter the MySQL container: `docker-compose exec mysql bash`.
-
-2 - Enter mysql: `mysql -uroot -proot` for non root access use `mysql -uhomestead -psecret`.
-
-3 - See all users: `SELECT User FROM mysql.user;`
-
-4 - Run any commands `show databases`, `show tables`, `select * from.....`.
-
-
-
-
-
-
-
-## Create Multiple Databases (MySQL)
-
-Create `createdb.sql` from `mysql/docker-entrypoint-initdb.d/createdb.sql.example` in `mysql/docker-entrypoint-initdb.d/*` and add your SQL syntax as follow:
-
-```sql
-CREATE DATABASE IF NOT EXISTS `your_db_1` COLLATE 'utf8_general_ci' ;
-GRANT ALL ON `your_db_1`.* TO 'mysql_user'@'%' ;
-```
-
-
-
-
-
-
-## Change MySQL port
-
-Modify the `mysql/my.cnf` file to set your port number, `1234` is used as an example.
-
-```
-[mysqld]
-port=1234
-```
-
-If you need MySQL access from your host, do not forget to change the internal port number (`"3306:3306"` -> `"3306:1234"`) in the docker-compose configuration file.
-
-
-
-
-
-
-
-
-## Use custom Domain (instead of the Docker IP)
-
-Assuming your custom domain is `laravel.test`
-
-1 - Open your `/etc/hosts` file and map your localhost address `127.0.0.1` to the `laravel.test` domain, by adding the following:
-
-```bash
-127.0.0.1 laravel.test
-```
-
-2 - Open your browser and visit `{http://laravel.test}`
-
-
-Optionally you can define the server name in the NGINX configuration file, like this:
-
-```conf
-server_name laravel.test;
-```
-
-
-
-
-
-
-
-
-## Enable Global Composer Build Install
-
-Enabling Global Composer Install during the build for the container allows you to get your composer requirements installed and available in the container after the build is done.
-
-1 - Open the `docker-compose.yml` file
-
-2 - Search for the `COMPOSER_GLOBAL_INSTALL` argument under the Workspace Container and set it to `true`
-
-It should be like this:
-
-```yml
- workspace:
- build:
- context: ./workspace
- args:
- - COMPOSER_GLOBAL_INSTALL=true
- ...
-```
-3 - Now add your dependencies to `workspace/composer.json`
-
-4 - Re-build the Workspace Container `docker-compose build workspace`
-
-
-
-
-
-
-
-
-## Install Prestissimo
-
-[Prestissimo](https://github.com/hirak/prestissimo) is a plugin for composer which enables parallel install functionality.
-
-1 - Enable Running Global Composer Install during the Build:
-
-Click on this [Enable Global Composer Build Install](#Enable-Global-Composer-Build-Install) and do steps 1 and 2 only then continue here.
-
-2 - Add prestissimo as requirement in Composer:
-
-a - Now open the `workspace/composer.json` file
-
-b - Add `"hirak/prestissimo": "^0.3"` as requirement
-
-c - Re-build the Workspace Container `docker-compose build workspace`
-
-
-
-
-
-
-
-
-## Install Node + NVM
-
-To install NVM and NodeJS in the Workspace container
-
-1 - Open the `docker-compose.yml` file
-
-2 - Search for the `INSTALL_NODE` argument under the Workspace Container and set it to `true`
-
-It should be like this:
-
-```yml
- workspace:
- build:
- context: ./workspace
- args:
- - INSTALL_NODE=true
- ...
-```
-
-3 - Re-build the container `docker-compose build workspace`
-
-
-
-
-
-
-
-
-## Install Node + YARN
-
-Yarn is a new package manager for JavaScript. It is so faster than npm, which you can find [here](http://yarnpkg.com/en/compare).To install NodeJS and [Yarn](https://yarnpkg.com/) in the Workspace container:
-
-1 - Open the `docker-compose.yml` file
-
-2 - Search for the `INSTALL_NODE` and `INSTALL_YARN` argument under the Workspace Container and set it to `true`
-
-It should be like this:
-
-```yml
- workspace:
- build:
- context: ./workspace
- args:
- - INSTALL_NODE=true
- - INSTALL_YARN=true
- ...
-```
-
-3 - Re-build the container `docker-compose build workspace`
-
-
-
-
-
-
-
-
-## Install Linuxbrew
-
-Linuxbrew is a package manager for Linux. It is the Linux version of MacOS Homebrew and can be found [here](http://linuxbrew.sh). To install Linuxbrew in the Workspace container:
-
-1 - Open the `docker-compose.yml` file
-
-2 - Search for the `INSTALL_LINUXBREW` argument under the Workspace Container and set it to `true`
-
-It should be like this:
-
-```yml
- workspace:
- build:
- context: ./workspace
- args:
- - INSTALL_LINUXBREW=true
- ...
-```
-
-3 - Re-build the container `docker-compose build workspace`
-
-
-
-
-
-
-
-
-## Common Terminal Aliases
-When you start your docker container, Laradock will copy the `aliases.sh` file located in the `laradock/workspace` directory and add sourcing to the container `~/.bashrc` file.
-
-You are free to modify the `aliases.sh` as you see fit, adding your own aliases (or function macros) to suit your requirements.
-
-
-
-
-
-
-
-## Install Aerospike extension
-
-1 - First install `aerospike` in the Workspace and the PHP-FPM Containers:
-
-a) open the `docker-compose.yml` file
-
-b) search for the `INSTALL_AEROSPIKE` argument under the Workspace Container
-
-c) set it to `true`
-
-d) search for the `INSTALL_AEROSPIKE` argument under the PHP-FPM Container
-
-e) set it to `true`
-
-It should be like this:
-
-```yml
- workspace:
- build:
- context: ./workspace
- args:
- - INSTALL_AEROSPIKE=true
- ...
- php-fpm:
- build:
- context: ./php-fpm
- args:
- - INSTALL_AEROSPIKE=true
- ...
-```
-
-2 - Re-build the containers `docker-compose build workspace php-fpm`
-
-
-
-
-
-
-
-
-## Install Laravel Envoy (Envoy Task Runner)
-
-1 - Open the `docker-compose.yml` file
-
-2 - Search for the `INSTALL_LARAVEL_ENVOY` argument under the Workspace Container
-
-3 - Set it to `true`
-
-
-It should be like this:
-
-```yml
- workspace:
- build:
- context: ./workspace
- args:
- - INSTALL_LARAVEL_ENVOY=true
- ...
-```
-
-4 - Re-build the containers `docker-compose build workspace`
-
-[**Laravel Envoy Documentation Here**](https://laravel.com/docs/5.3/envoy)
-
-
-
-
-
-
-
-
-
-## PHPStorm Debugging Guide
-Remote debug Laravel web and phpunit tests.
-
-[**Debugging Guide Here**](https://github.com/laradock/laradock/blob/master/_guides/phpstorm.md)
-
-
-
-
-
-
-
-
-
-## Keep track of your Laradock changes
-
-1. Fork the Laradock repository.
-2. Use that fork as a submodule.
-3. Commit all your changes to your fork.
-4. Pull new stuff from the main repository from time to time.
-
-
-
-
-
-
-
-
-
-## Upgrading Laradock
-
-Moving from Docker Toolbox (VirtualBox) to Docker Native (for Mac/Windows). Requires upgrading Laradock from v3.* to v4.*:
-
-1. Stop the docker VM `docker-machine stop {default}`
-2. Install Docker for [Mac](https://docs.docker.com/docker-for-mac/) or [Windows](https://docs.docker.com/docker-for-windows/).
-3. Upgrade Laradock to `v4.*.*` (`git pull origin master`)
-4. Use Laradock as you used to do: `docker-compose up -d nginx mysql`.
-
-**Note:** If you face any problem with the last step above: rebuild all your containers
-`docker-compose build --no-cache`
-"Warning Containers Data might be lost!"
-
-
-
-
-
-
-
-
-
-
-
-## Improve speed on MacOS
-
-Docker on the Mac [is slow](https://github.com/docker/for-mac/issues/77), at the time of writing. Especially for larger projects, this can be a problem. The problem is [older than March 2016](https://forums.docker.com/t/file-access-in-mounted-volumes-extremely-slow-cpu-bound/8076) - as it's a such a long-running issue, we're including it in the docs here.
-
-So since sharing code into Docker containers with osxfs have very poor performance compared to Linux. Likely there are some workarounds:
-
-
-
-### Workaround A: using dinghy
-
-[Dinghy](https://github.com/codekitchen/dinghy) creates its own VM using docker-machine, it will not modify your existing docker-machine VMs.
-
-Quick Setup giude, (we recommend you check their docs)
-
-1) `brew tap codekitchen/dinghy`
-
-2) `brew install dinghy`
-
-3) `dinghy create --provider virtualbox` (must have virtualbox installed, but they support other providers if you prefer)
-
-4) after the above command is done it will display some env variables, copy them to the bash profile or zsh or.. (this will instruct docker to use the server running inside the VM)
-
-5) `docker-compose up ...`
-
-
-
-
-
-### Workaround B: using d4m-nfs
-
-You can use the d4m-nfs solution in 2 ways, one is using the Laradock built it integration, and the other is using the tool separatly. Below is show case of both methods:
-
-
-### B.1: using the built in d4m-nfs integration
-
-In simple terms, docker-sync creates a docker container with a copy of all the application files that can be accessed very quickly from the other containers.
-On the other hand, docker-sync runs a process on the host machine that continuously tracks and updates files changes from the host to this intermediate container.
-
-Out of the box, it comes pre-configured for OS X, but using it on Windows is very easy to set-up by modifying the `DOCKER_SYNC_STRATEGY` on the `.env`
-
-#### Usage
-
-Laradock comes with `sync.sh`, an optional bash script, that automates installing, running and stopping docker-sync. Note that to run the bash script you may need to change the permissions `chmod 755 sync.sh`
-
-1) Configure your Laradock environment as you would normally do and test your application to make sure that your sites are running correctly.
-
-2) Make sure to set `DOCKER_SYNC_STRATEGY` on the `.env`. Read the [syncing strategies](https://github.com/EugenMayer/docker-sync/wiki/8.-Strategies) for details.
-```
-# osx: 'native_osx' (default)
-# windows: 'unison'
-# linux: docker-sync not required
-
-DOCKER_SYNC_STRATEGY=native_osx
-```
-
-3) set `APP_CODE_PATH_CONTAINER=/var/www` to `APP_CODE_PATH_CONTAINER=/var/www:nocopy` in the .env file
-
-4) Install the docker-sync gem on the host-machine:
-```bash
-./sync.sh install
-```
-5) Start docker-sync and the Laradock environment.
-Specify the services you want to run, as you would normally do with `docker-compose up`
-```bash
-./sync.sh up nginx mysql
-```
-Please note that the first time docker-sync runs, it will copy all the files to the intermediate container and that may take a very long time (15min+).
-6) To stop the environment and docker-sync do:
-```bash
-./sync.sh down
-```
-
-#### Setting up Aliases (optional)
-
-You may create bash profile aliases to avoid having to remember and type these commands for everyday development.
-Add the following lines to your `~/.bash_profile`:
-
-```bash
-alias devup="cd /PATH_TO_LARADOCK/laradock; ./sync.sh up nginx mysql" #add your services
-alias devbash="cd /PATH_TO_LARADOCK/laradock; ./sync.sh bash"
-alias devdown="cd /PATH_TO_LARADOCK/laradock; ./sync.sh down"
-```
-
-Now from any location on your machine, you can simply run `devup`, `devbash` and `devdown`.
-
-
-#### Additional Commands
-
-Opening bash on the workspace container (to run artisan for example):
- ```bash
- ./sync.sh bash
- ```
-Manually triggering the synchronization of the files:
-```bash
-./sync.sh sync
-```
-Removing and cleaning up the files and the docker-sync container. Use only if you want to rebuild or remove docker-sync completely. The files on the host will be kept untouched.
-```bash
-./sync.sh clean
-```
-
-
-#### Additional Notes
-
-- You may run laradock with or without docker-sync at any time using with the same `.env` and `docker-compose.yml`, because the configuration is overridden automatically when docker-sync is used.
-- You may inspect the `sync.sh` script to learn each of the commands and even add custom ones.
-- If a container cannot access the files on docker-sync, you may need to set a user on the Dockerfile of that container with an id of 1000 (this is the UID that nginx and php-fpm have configured on laradock). Alternatively, you may change the permissions to 777, but this is **not** recommended.
-
-Visit the [docker-sync documentation](https://github.com/EugenMayer/docker-sync/wiki) for more details.
-
-
-
-
-
-
-
-
-
-
-### B.2: using the d4m-nfs tool
-
-[D4m-nfs](https://github.com/IFSight/d4m-nfs) automatically mount NFS volume instead of osxfs one.
-
-1) Update the Docker [File Sharing] preferences:
-
-Click on the Docker Icon > Preferences > (remove everything form the list except `/tmp`).
-
-2) Restart Docker.
-
-3) Clone the [d4m-nfs](https://github.com/IFSight/d4m-nfs) repository to your `home` directory.
-
-```bash
-git clone https://github.com/IFSight/d4m-nfs ~/d4m-nfs
-```
-
-4) Create (or edit) the file `~/d4m-nfs/etc/d4m-nfs-mounts.txt`, and write the follwing configuration in it:
-
-```txt
-/Users:/Users
-```
-
-5) Create (or edit) the file `/etc/exports`, make sure it exists and is empty. (There may be collisions if you come from Vagrant or if you already executed the `d4m-nfs.sh` script before).
-
-
-6) Run the `d4m-nfs.sh` script (might need Sudo):
-
-```bash
-~/d4m-nfs/d4m-nfs.sh
-```
-
-That's it! Run your containers.. Example:
-
-```bash
-docker-compose up ...
-```
-
-*Note: If you faced any errors, try restarting Docker, and make sure you have no spaces in the `d4m-nfs-mounts.txt` file, and your `/etc/exports` file is clear.*
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-## Common Problems
-
-*Here's a list of the common problems you might face, and the possible solutions.*
-
-
-
-
-
-
-
-
-## I see a blank (white) page instead of the Laravel 'Welcome' page!
-
-Run the following command from the Laravel root directory:
-
-```bash
-sudo chmod -R 777 storage bootstrap/cache
-```
-
-
-
-
-
-
-## I see "Welcome to nginx" instead of the Laravel App!
-
-Use `http://127.0.0.1` instead of `http://localhost` in your browser.
-
-
-
-
-
-
-## I see an error message containing `address already in use` or `port is already allocated`
-
-Make sure the ports for the services that you are trying to run (22, 80, 443, 3306, etc.) are not being used already by other programs on the host, such as a built in `apache`/`httpd` service or other development tools you have installed.
-
-
-
-
-
-
-## I get NGINX error 404 Not Found on Windows.
-
-1. Go to docker Settings on your Windows machine.
-2. Click on the `Shared Drives` tab and check the drive that contains your project files.
-3. Enter your windows username and password.
-4. Go to the `reset` tab and click restart docker.
-
-
-
-
-
-
-## The time in my services does not match the current time
-
-1. Make sure you've [changed the timezone](#Change-the-timezone).
-2. Stop and rebuild the containers (`docker-compose up -d --build `)
-
-
-
-
-
-
-## I get MySQL connection refused
-
-This error sometimes happens because your Laravel application isn't running on the container localhost IP (Which is 127.0.0.1). Steps to fix it:
-
-* Option A
- 1. Check your running Laravel application IP by dumping `Request::ip()` variable using `dd(Request::ip())` anywhere on your application. The result is the IP of your Laravel container.
- 2. Change the `DB_HOST` variable on env with the IP that you received from previous step.
-* Option B
- 1. Change the `DB_HOST` value to the same name as the MySQL docker container. The Laradock docker-compose file currently has this as `mysql`
-
-## I get stuck when building nginx on `fetch http://mirrors.aliyun.com/alpine/v3.5/main/x86_64/APKINDEX.tar.gz`
-
-As stated on [#749](https://github.com/laradock/laradock/issues/749#issuecomment-293296687), removing the line `RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/' /etc/apk/repositories` from `nginx/Dockerfile` solves the problem.
-
-## Custom composer repo packagist url and npm registry url
-
-In China, the origin source of composer and npm is very slow. You can add `WORKSPACE_NPM_REGISTRY` and `WORKSPACE_COMPOSER_REPO_PACKAGIST` config in `.env` to use your custom source.
-
-Example:
-```bash
-WORKSPACE_NPM_REGISTRY=https://registry.npm.taobao.org
-WORKSPACE_COMPOSER_REPO_PACKAGIST=https://packagist.phpcomposer.com
-```
diff --git a/laradock/DOCUMENTATION/content/getting-started/index.md b/laradock/DOCUMENTATION/content/getting-started/index.md
deleted file mode 100644
index 2e7ea123..00000000
--- a/laradock/DOCUMENTATION/content/getting-started/index.md
+++ /dev/null
@@ -1,217 +0,0 @@
----
-title: Getting Started
-type: index
-weight: 2
----
-
-## Requirements
-
-- [Git](https://git-scm.com/downloads)
-- [Docker](https://www.docker.com/products/docker/) `>= 1.12`
-
-
-
-
-
-
-
-## Installation
-
-Choose the setup the best suits your needs.
-
-- [A) Setup for Single Project](#A)
- - [A.1) Already have a PHP project](#A1)
- - [A.2) Don't have a PHP project yet](#A2)
-- [B) Setup for Multiple Projects](#B)
-
-
-
-### A) Setup for Single Project
-> (Follow these steps if you want a separate Docker environment for each project)
-
-
-
-### A.1) Already have a PHP project:
-
-1 - Clone laradock on your project root directory:
-
-```bash
-git submodule add https://github.com/Laradock/laradock.git
-```
-
-Note: If you are not using Git yet for your project, you can use `git clone` instead of `git submodule `.
-
-*To keep track of your Laradock changes, between your projects and also keep Laradock updated [check these docs](/documentation/#keep-track-of-your-laradock-changes)*
-
-
-Your folder structure should look like this:
-
-```
-+ project-a
- + laradock-a
-+ project-b
- + laradock-b
-```
-
-*(It's important to rename the laradock folders to unique name in each project, if you want to run laradock per project).*
-
-> **Now jump to the [Usage](#Usage) section.**
-
-
-### A.2) Don't have a PHP project yet:
-
-1 - Clone this repository anywhere on your machine:
-
-```bash
-git clone https://github.com/laradock/laradock.git
-```
-
-Your folder structure should look like this:
-
-```
-+ laradock
-+ project-z
-```
-
-2 - Edit your web server sites configuration.
-
-We'll need to do step 1 of the [Usage](#Usage) section now to make this happen.
-
-```
-cp env-example .env
-```
-
-At the top, change the `APPLICATION` variable to your project path.
-
-```
-APPLICATION=../project-z/
-```
-
-Make sure to replace `project-z` with your project folder name.
-
-> **Now jump to the [Usage](#Usage) section.**
-
-
-
-### B) Setup for Multiple Projects:
-> (Follow these steps if you want a single Docker environment for all your project)
-
-1 - Clone this repository anywhere on your machine (similar to [Steps A.2. from above](#A2)):
-
-```bash
-git clone https://github.com/laradock/laradock.git
-```
-
-Your folder structure should look like this:
-
-```
-+ laradock
-+ project-1
-+ project-2
-```
-
-2 - Go to `nginx/sites` and create config files to point to different project directory when visiting different domains.
-
-Laradock by default includes `app.conf.example`, `laravel.conf.example` and `symfony.conf.example` as working samples.
-
-3 - change the default names `*.conf`:
-
-You can rename the config files, project folders and domains as you like, just make sure the `root` in the config files, is pointing to the correct project folder name.
-
-4 - Add the domains to the **hosts** files.
-
-```
-127.0.0.1 project-1.test
-127.0.0.1 project-2.test
-...
-```
-If you use Chrome 63 or above for development, don't use `.dev`. [Why?](https://laravel-news.com/chrome-63-now-forces-dev-domains-https). Instead use `.localhost`, `.invalid`, `.test`, or `.example`.
-
-> **Now jump to the [Usage](#Usage) section.**
-
-
-
-
-
-
-
-
-## Usage
-
-**Read Before starting:**
-
-If you are using **Docker Toolbox** (VM), do one of the following:
-
-- Upgrade to Docker [Native](https://www.docker.com/products/docker) for Mac/Windows (Recommended). Check out [Upgrading Laradock](/documentation/#upgrading-laradock)
-- Use Laradock v3.\*. Visit the [Laradock-ToolBox](https://github.com/laradock/laradock/tree/Laradock-ToolBox) branch. *(outdated)*
-
-
-
-We recommend using a Docker version which is newer than 1.13.
-
-
-
->**Warning:** If you used an older version of Laradock it's highly recommended to rebuild the containers you need to use [see how you rebuild a container](#Build-Re-build-Containers) in order to prevent as much errors as possible.
-
-
-
-1 - Enter the laradock folder and copy `env-example` to `.env`
-
-```shell
-cp env-example .env
-```
-
-You can edit the `.env` file to choose which software's you want to be installed in your environment. You can always refer to the `docker-compose.yml` file to see how those variables are been used.
-
-Depending on the host's operating system you may need to change the value given to `COMPOSE_FILE`. When you are running Laradock on Mac OS the correct file separator to use is `:`. When running Laradock from a Windows environment multiple files must be separated with `;`.
-
-2 - Build the enviroment and run it using `docker-compose`
-
-In this example we'll see how to run NGINX (web server) and MySQL (database engine) to host a PHP Web Scripts:
-
-```bash
-docker-compose up -d nginx mysql
-```
-
-**Note**: The web servers `nginx`, `apache`.. all depend on `php-fpm`, means if you just run, them they will automatically run the `php-fpm` for you, so no need to specify them in the `up` command. If you don't see them running then you may need run them as follow: `docker-compose up -d nginx php-fpm mysql...`.
-
-
-You can select your own combination of containers from [this list](http://laradock.io/introduction/#supported-software-images).
-
-*(Please note that sometimes we forget to update the docs, so check the `docker-compose.yml` file to see an updated list of all available containers).*
-
-
-
-3 - Enter the Workspace container, to execute commands like (Artisan, Composer, PHPUnit, Gulp, ...)
-
-```bash
-docker-compose exec workspace bash
-```
-
-*Alternatively, for Windows PowerShell users: execute the following command to enter any running container:*
-
-```bash
-docker exec -it {workspace-container-id} bash
-```
-
-**Note:** You can add `--user=laradock` to have files created as your host's user. Example:
-
-```shell
-docker-compose exec --user=laradock workspace bash
-```
-
-*You can change the PUID (User id) and PGID (group id) variables from the `.env` file)*
-
-
-4 - Update your project configurations to use the database host
-
-Open your PHP project's `.env` file or whichever configuration file you are reading from, and set the database host `DB_HOST` to `mysql`:
-
-```env
-DB_HOST=mysql
-```
-
-*If you want to install Laravel as PHP project, see [How to Install Laravel in a Docker Container](#Install-Laravel).*
-
-
-5 - Open your browser and visit your localhost address `http://localhost/`. If you followed the multiple projects setup, you can visit `http://project-1.test/` and `http://project-2.test/`.
diff --git a/laradock/DOCUMENTATION/content/guides/index.md b/laradock/DOCUMENTATION/content/guides/index.md
deleted file mode 100644
index 3cf1f38a..00000000
--- a/laradock/DOCUMENTATION/content/guides/index.md
+++ /dev/null
@@ -1,885 +0,0 @@
----
-title: Guides
-type: index
-weight: 4
----
-
-
-
-* [Production Setup on Digital Ocean](#Digital-Ocean)
-* [PHPStorm XDebug Setup](#PHPStorm-Debugging)
-* [Running Laravel Dusk Test](#Laravel-Dusk)
-
-
-
-
-# Production Setup on Digital Ocean
-
-## Install Docker
-
-- Visit [DigitalOcean](https://cloud.digitalocean.com/login) and login.
-- Click the `Create Droplet` button.
-- Open the `One-click apps` tab.
-- Select Docker with your preferred version.
-- Continue creating the droplet as you normally would.
-- If needed, check your e-mail for the droplet root password.
-
-## SSH to your Server
-
-Find the IP address of the droplet in the DigitalOcean interface. Use it to connect to the server.
-
-```
-ssh root@ipaddress
-```
-
-You may be prompted for a password. Type the one you found within your e-mailbox. It'll then ask you to change the password.
-
-You can now check if Docker is available:
-
-```
-$root@server:~# docker
-```
-
-## Set Up Your Laravel Project
-
-```
-$root@server:~# apt-get install git
-$root@server:~# git clone https://github.com/laravel/laravel
-$root@server:~# cd laravel
-$root@server:~/laravel/ git submodule add https://github.com/Laradock/laradock.git
-$root@server:~/laravel/ cd laradock
-```
-
-## Install docker-compose command
-
-```
-$root@server:~/laravel/laradock# curl -L https://github.com/docker/compose/releases/download/1.8.0/run.sh > /usr/local/bin/docker-compose
-$root@server:~/chmod +x /usr/local/bin/docker-compose
-```
-## Enter the laradock folder and rename env-example to .env.
-```
-$root@server:~/laravel/laradock# cp env-example .env
-```
-
-## Create Your Laradock Containers
-
-```
-$root@server:~/laravel/laradock# docker-compose up -d nginx mysql
-```
-
-Note that more containers are available, find them in the [docs](http://laradock.io/introduction/#supported-software-containers) or the `docker-compose.yml` file.
-
-## Go to Your Workspace
-
-```
-docker-compose exec workspace bash
-```
-
-## Install and configure Laravel
-
-Let's install Laravel's dependencies, add the `.env` file, generate the key and give proper permissions to the cache folder.
-
-```
-$ root@workspace:/var/www# composer install
-$ root@workspace:/var/www# cp .env.example .env
-$ root@workspace:/var/www# php artisan key:generate
-$ root@workspace:/var/www# exit
-$root@server:~/laravel/laradock# cd ..
-$root@server:~/laravel# sudo chmod -R 777 storage bootstrap/cache
-```
-
-You can then view your Laravel site by visiting the IP address of your server in your browser. For example:
-
-```
-http://192.168.1.1
-```
-
-It should show you the Laravel default welcome page.
-
-However, we want it to show up using your custom domain name, as well.
-
-## Using Your Own Domain Name
-
-Login to your DNS provider, such as Godaddy, Namecheap.
-
-Point the Custom Domain Name Server to:
-
-```
-ns1.digitalocean.com
-ns2.digitalocean.com
-ns3.digitalocean.com
-```
-
-Within DigitalOcean, you'll need to change some settings, too.
-
-Visit: https://cloud.digitalocean.com/networking/domains
-
-Add your domain name and choose the server IP you'd provision earlier.
-
-## Serving Site With NGINX (HTTP ONLY)
-
-Go back to command line.
-
-```
-$root@server:~/laravel/laradock# cd nginx
-$root@server:~/laravel/laradock/nginx# vim laravel.conf
-```
-
-Remove `default_server`
-
-```
- listen 80 default_server;
- listen [::]:80 default_server ipv6only=on;
-```
-
-And add `server_name` (your custom domain)
-
-```
- listen 80;
- listen [::]:80 ipv6only=on;
- server_name yourdomain.com;
-```
-
-## Rebuild Your Nginx
-
-```
-$root@server:~/laravel/laradock# docker-compose down
-$root@server:~/laravel/laradock# docker-compose build nginx
-```
-
-## Re Run Your Containers MYSQL and NGINX
-
-```
-$root@server:~/laravel/laradock/nginx# docker-compose up -d nginx mysql
-```
-
-**View Your Site with HTTP ONLY (http://yourdomain.com)**
-
-## Run Site on SSL with Let's Encrypt Certificate
-
-**Note: You need to Use Caddy here Instead of Nginx**
-
-To go Caddy Folders and Edit CaddyFile
-
-```
-$root@server:~/laravel/laradock# cd caddy
-$root@server:~/laravel/laradock/caddy# vim Caddyfile
-```
-
-Remove 0.0.0.0:80
-
-```
-0.0.0.0:80
-root /var/www/public
-```
-
-and replace with your https://yourdomain.com
-
-```
-https://yourdomain.com
-root /var/www/public
-```
-
-uncomment tls
-
-```
-#tls self-signed
-```
-
-and replace self-signed with your email address
-
-```
-tls serverbreaker@gmai.com
-```
-
-This is needed Prior to Creating Let's Encypt
-
-## Run Your Caddy Container without the -d flag and Generate SSL with Let's Encrypt
-
-```
-$root@server:~/laravel/laradock/caddy# docker-compose up caddy
-```
-
-You'll be prompt here to enter your email... you may enter it or not
-
-```
-Attaching to laradock_mysql_1, laradock_caddy_1
-caddy_1 | Activating privacy features...
-caddy_1 | Your sites will be served over HTTPS automatically using Let's Encrypt.
-caddy_1 | By continuing, you agree to the Let's Encrypt Subscriber Agreement at:
-caddy_1 | https://letsencrypt.org/documents/LE-SA-v1.0.1-July-27-2015.pdf
-caddy_1 | Activating privacy features... done.
-caddy_1 | https://yourdomain.com
-caddy_1 | http://yourdomain.com
-```
-
-After it finishes, press `Ctrl` + `C` to exit.
-
-## Stop All Containers and ReRun Caddy and Other Containers on Background
-
-```
-$root@server:~/laravel/laradock/caddy# docker-compose down
-$root@server:~/laravel/laradock/caddy# docker-compose up -d mysql caddy
-```
-
-View your Site in the Browser Securely Using HTTPS (https://yourdomain.com)
-
-**Note that Certificate will be Automatically Renew By Caddy**
-
->References:
->
-- [https://www.digitalocean.com/community/tutorials/how-to-install-and-use-docker-on-ubuntu-16-04](https://www.digitalocean.com/community/tutorials/how-to-install-and-use-docker-on-ubuntu-16-04)
-- [https://www.digitalocean.com/products/one-click-apps/docker/](https://www.digitalocean.com/products/one-click-apps/docker/)
-- [https://docs.docker.com/engine/installation/linux/ubuntulinux/](https://docs.docker.com/engine/installation/linux/ubuntulinux/)
-- [https://docs.docker.com/compose/install/](https://docs.docker.com/compose/install/)
-- [https://caddyserver.com/docs/automatic-https](https://caddyserver.com/docs/automatic-https)
-- [https://caddyserver.com/docs/tls](https://caddyserver.com/docs/tls)
-- [https://caddyserver.com/docs/caddyfile](https://caddyserver.com/docs/caddyfile)
-
-
-
-
-
-
-
-
-
-
-
-
-# PHPStorm XDebug Setup
-
-- [Intro](#Intro)
-- [Installation](#Installation)
- - [Customize laradock/docker-compose.yml](#CustomizeDockerCompose)
- - [Clean House](#InstallCleanHouse)
- - [Laradock Dial Tone](#InstallLaradockDialTone)
- - [hosts](#AddToHosts)
- - [Firewall](#FireWall)
- - [Enable xDebug on php-fpm](#enablePhpXdebug)
- - [PHPStorm Settings](#InstallPHPStorm)
- - [Configs](#InstallPHPStormConfigs)
-- [Usage](#Usage)
- - [Laravel](#UsageLaravel)
- - [Run ExampleTest](#UsagePHPStormRunExampleTest)
- - [Debug ExampleTest](#UsagePHPStormDebugExampleTest)
- - [Debug Web Site](#UsagePHPStormDebugSite)
-- [SSH into workspace](#SSHintoWorkspace)
- - [KiTTY](#InstallKiTTY)
-
-
-## Intro
-
-Wiring up [Laravel](https://laravel.com/), [Laradock](https://github.com/Laradock/laradock) [Laravel+Docker] and [PHPStorm](https://www.jetbrains.com/phpstorm/) to play nice together complete with remote xdebug'ing as icing on top! Although this guide is based on `PHPStorm Windows`,
-you should be able to adjust accordingly. This guide was written based on Docker for Windows Native.
-
-
-## Installation
-
-- This guide assumes the following:
- - you have already installed and are familiar with Laravel, Laradock and PHPStorm.
- - you have installed Laravel as a parent of `laradock`. This guide assumes `/c/_dk/laravel`.
-
-
-## hosts
-- Add `laravel` to your hosts file located on Windows 10 at `C:\Windows\System32\drivers\etc\hosts`. It should be set to the IP of your running container. Mine is: `10.0.75.2`
-On Windows you can find it by opening Windows `Hyper-V Manager`.
- - 
-
-- [Hosts File Editor](https://github.com/scottlerch/HostsFileEditor) makes it easy to change your hosts file.
- - Set `laravel` to your docker host IP. See [Example](images/photos/SimpleHostsEditor/AddHost_laravel.png).
-
-
-
-## Firewall
-Your PHPStorm will need to be able to receive a connection from PHP xdebug either your running workspace or php-fpm containers on port 9000. This means that your Windows Firewall should either enable connections from the Application PHPStorm OR the port.
-
-- It is important to note that if the Application PHPStorm is NOT enabled in the firewall, you will not be able to recreate a rule to override that.
-- Also be aware that if you are installing/upgrade different versions of PHPStorm, you MAY have orphaned references to PHPStorm in your Firewall! You may decide to remove orphaned references however in either case, make sure that they are set to receive public TCP traffic.
-
-### Edit laradock/docker-compose.yml
-Set the following variables:
-```
-### Workspace Utilities Container ###############
-
- workspace:
- build:
- context: ./workspace
- args:
- - INSTALL_XDEBUG=true
- - INSTALL_WORKSPACE_SSH=true
- ...
-
-
-### PHP-FPM Container #####################
-
- php-fpm:
- build:
- context: ./php-fpm
- args:
- - INSTALL_XDEBUG=true
- ...
-
-```
-
-### Edit xdebug.ini files
-- `laradock/workspace/xdebug.ini`
-- `laradock/php-fpm/xdebug.ini`
-
-Set the following variables:
-
-```
-xdebug.remote_autostart=1
-xdebug.remote_enable=1
-xdebug.remote_connect_back=1
-xdebug.cli_color=1
-```
-
-
-
-### Need to clean house first?
-
-Make sure you are starting with a clean state. For example, do you have other Laradock containers and images?
-Here are a few things I use to clean things up.
-
-- Delete all containers using `grep laradock_` on the names, see: [Remove all containers based on docker image name](https://linuxconfig.org/remove-all-containners-based-on-docker-image-name).
-
-`docker ps -a | awk '{ print $1,$2 }' | grep laradock_ | awk '{print $1}' | xargs -I {} docker rm {}`
-
-- Delete all images containing `laradock`.
-
-`docker images | awk '{print $1,$2,$3}' | grep laradock_ | awk '{print $3}' | xargs -I {} docker rmi {}`
-**Note:** This will only delete images that were built with `Laradock`, **NOT** `laradock/*` which are pulled down by `Laradock` such as `laradock/workspace`, etc.
-**Note:** Some may fail with:
-`Error response from daemon: conflict: unable to delete 3f38eaed93df (cannot be forced) - image has dependent child images`
-
-- I added this to my `.bashrc` to remove orphaned images.
-
-```
-dclean() {
- processes=`docker ps -q -f status=exited`
- if [ -n "$processes" ]; then
- docker rm $processes
- fi
-
- images=`docker images -q -f dangling=true`
- if [ -n "$images" ]; then
- docker rmi $images
- fi
-}
-```
-
-- If you frequently switch configurations for Laradock, you may find that adding the following and added to your `.bashrc` or equivalent useful:
-
-```
-# remove laravel* containers
-# remove laravel_* images
-dcleanlaradockfunction()
-{
- echo 'Removing ALL containers associated with laradock'
- docker ps -a | awk '{ print $1,$2 }' | grep laradock | awk '{print $1}' | xargs -I {} docker rm {}
-
- # remove ALL images associated with laradock_
- # does NOT delete laradock/* which are hub images
- echo 'Removing ALL images associated with laradock_'
- docker images | awk '{print $1,$2,$3}' | grep laradock_ | awk '{print $3}' | xargs -I {} docker rmi {}
-
- echo 'Listing all laradock docker hub images...'
- docker images | grep laradock
-
- echo 'dcleanlaradock completed'
-}
-# associate the above function with an alias
-# so can recall/lookup by typing 'alias'
-alias dcleanlaradock=dcleanlaradockfunction
-```
-
-
-## Let's get a dial-tone with Laravel
-
-```
-# barebones at this point
-docker-compose up -d nginx mysql
-
-# run
-docker-compose ps
-
-# Should see:
- Name Command State Ports
------------------------------------------------------------------------------------------------------------
-laradock_mysql_1 docker-entrypoint.sh mysqld Up 0.0.0.0:3306->3306/tcp
-laradock_nginx_1 nginx Up 0.0.0.0:443->443/tcp, 0.0.0.0:80->80/tcp
-laradock_php-fpm_1 php-fpm Up 9000/tcp
-laradock_volumes_data_1 true Exit 0
-laradock_volumes_source_1 true Exit 0
-laradock_workspace_1 /sbin/my_init Up 0.0.0.0:2222->22/tcp
-```
-
-
-## Enable xDebug on php-fpm
-
-In a host terminal sitting in the laradock folder, run: `.php-fpm/xdebug status`
-You should see something like the following:
-
-```
-xDebug status
-laradock_php-fpm_1
-PHP 7.0.9 (cli) (built: Aug 10 2016 19:45:48) ( NTS )
-Copyright (c) 1997-2016 The PHP Group
-Zend Engine v3.0.0, Copyright (c) 1998-2016 Zend Technologies
- with Xdebug v2.4.1, Copyright (c) 2002-2016, by Derick Rethans
-```
-
-Other commands include `.php-fpm/xdebug start | stop`.
-
-If you have enabled `xdebug=true` in `docker-compose.yml/php-fpm`, `xdebug` will already be running when
-`php-fpm` is started and listening for debug info on port 9000.
-
-
-
-## PHPStorm Settings
-
-- Here are some settings that are known to work:
- - `Settings/BuildDeploymentConnection`
- - 
-
- - `Settings/BuildDeploymentConnectionMappings`
- - 
-
- - `Settings/BuildDeploymentDebugger`
- - 
-
- - `Settings/EditRunConfigurationRemoteWebDebug`
- - 
-
- - `Settings/EditRunConfigurationRemoteExampleTestDebug`
- - 
-
- - `Settings/LangsPHPDebug`
- - 
-
- - `Settings/LangsPHPInterpreters`
- - 
-
- - `Settings/LangsPHPPHPUnit`
- - 
-
- - `Settings/LangsPHPServers`
- - 
-
- - `RemoteHost`
- To switch on this view, go to: `Menu/Tools/Deployment/Browse Remote Host`.
- - 
-
- - `RemoteWebDebug`
- - 
-
- - `EditRunConfigurationRemoteWebDebug`
- Go to: `Menu/Run/Edit Configurations`.
- - 
-
- - `EditRunConfigurationRemoteExampleTestDebug`
- Go to: `Menu/Run/Edit Configurations`.
- - 
-
- - `WindowsFirewallAllowedApps`
- Go to: `Control Panel\All Control Panel Items\Windows Firewall\Allowed apps`.
- - 
-
- - `hosts`
- Edit: `C:\Windows\System32\drivers\etc\hosts`.
- - 
-
- - [Enable xDebug on php-fpm](#enablePhpXdebug)
-
-
-
-
-## Usage
-
-
-### Run ExampleTest
-- right-click on `tests/ExampleTest.php`
- - Select: `Run 'ExampleTest.php'` or `Ctrl+Shift+F10`.
- - Should pass!! You just ran a remote test via SSH!
-
-
-### Debug ExampleTest
-- Open to edit: `tests/ExampleTest.php`
-- Add a BreakPoint on line 16: `$this->visit('/')`
-- right-click on `tests/ExampleTest.php`
- - Select: `Debug 'ExampleTest.php'`.
- - Should have stopped at the BreakPoint!! You are now debugging locally against a remote Laravel project via SSH!
- - 
-
-
-
-### Debug WebSite
-- In case xDebug is disabled, from the `laradock` folder run:
-`.php-fpm/xdebug start`.
- - To switch xdebug off, run:
-`.php-fpm/xdebug stop`
-
-- Start Remote Debugging
- - 
-
-- Open to edit: `bootstrap/app.php`
-- Add a BreakPoint on line 14: `$app = new Illuminate\Foundation\Application(`
-- Reload [Laravel Site](http://laravel/)
- - Should have stopped at the BreakPoint!! You are now debugging locally against a remote Laravel project via SSH!
- - 
-
-
-
-## Let's shell into workspace
-Assuming that you are in laradock folder, type:
-`ssh -i workspace/insecure_id_rsa -p2222 root@laravel`
-**Cha Ching!!!!**
-- `workspace/insecure_id_rsa.ppk` may become corrupted. In which case:
- - fire up `puttygen`
- - import `workspace/insecure_id_rsa`
- - save private key to `workspace/insecure_id_rsa.ppk`
-
-
-
-### KiTTY
-[Kitty](http://www.9bis.net/kitty/) KiTTY is a fork from version 0.67 of PuTTY.
-
-- Here are some settings that are working for me:
- - 
- - 
- - 
- - 
- - 
- - 
- - 
- - 
- - 
-
-
-
-
-
-
-
-
-# Running Laravel Dusk Tests
-
-- [Option 1: Without Selenium](#option1-dusk)
-- [Option 2: With Selenium](#option2-dusk)
-
-
-## Option 1: Without Selenium
-
-- [Intro](#option1-dusk-intro)
-- [Workspace Setup](#option1-workspace-setup)
-- [Application Setup](#option1-application-setup)
-- [Choose Chrome Driver Version (Optional)](#option1-choose-chrome-driver-version)
-- [Run Dusk Tests](#option1-run-dusk-tests)
-
-
-### Intro
-
-This is a guide to run Dusk tests in your `workspace` container with headless
-google-chrome and chromedriver. It has been tested with Laravel 5.4 and 5.5.
-
-
-### Workspace Setup
-
-Update your .env with following entries:
-
-```
-...
-# Install Laravel installer bin to setup demo app
-WORKSPACE_INSTALL_LARAVEL_INSTALLER=true
-...
-# Install all the necessary dependencies for running Dusk tests
-WORKSPACE_INSTALL_DUSK_DEPS=true
-...
-```
-
-Then run below to build your workspace.
-
-```
-docker-compose build workspace
-```
-
-
-### Application Setup
-
-Run a `workspace` container and you will be inside the container at `/var/www` directory.
-
-```
-docker-compose run workspace bash
-
-/var/www#> _
-```
-
-Create new Laravel application named `dusk-test` and install Laravel Dusk package.
-
-```
-/var/www> laravel new dusk-test
-/var/www> cd dusk-test
-/var/www/dusk-test> composer require --dev laravel/dusk
-/var/www/dusk-test> php artisan dusk:install
-```
-
-Create `.env.dusk.local` by copying from `.env` file.
-
-```
-/var/www/dusk-test> cp .env .env.dusk.local
-```
-
-Update the `APP_URL` entry in `.env.dusk.local` to local Laravel server.
-
-```
-APP_URL=http://localhost:8000
-```
-
-You will need to run chromedriver with `headless` and `no-sandbox` flag. In Laravel Dusk 2.x it is
-already set `headless` so you just need to add `no-sandbox` flag. If you on previous version 1.x,
-you will need to update your `DustTestCase#driver` as shown below.
-
-
-```
-addArguments([
- '--disable-gpu',
- '--headless',
- '--no-sandbox'
- ]);
-
- return RemoteWebDriver::create(
- 'http://localhost:9515', DesiredCapabilities::chrome()->setCapability(
- ChromeOptions::CAPABILITY, $options
- )
- );
- }
-}
-```
-
-
-### Choose Chrome Driver Version (Optional)
-
-You could choose to use either:
-
-1. Chrome Driver shipped with Laravel Dusk. (Default)
-2. Chrome Driver installed in `workspace` container. (Required tweak on DuskTestCase class)
-
-For Laravel 2.x, you need to update `DuskTestCase#prepare` method if you wish to go with option #2.
-
-```
-
-setPrefix('chromedriver')
- ->getProcess()
- ->setEnv(static::chromeEnvironment());
- }
-
- ...
-}
-```
-
-
-### Run Dusk Tests
-
-Run local server in `workspace` container and run Dusk tests.
-
-```
-# alias to run Laravel server in the background (php artisan serve --quiet &)
-/var/www/dusk-test> serve
-# alias to run Dusk tests (php artisan dusk)
-/var/www/dusk-test> dusk
-
-PHPUnit 6.4.0 by Sebastian Bergmann and contributors.
-
-. 1 / 1 (100%)
-
-Time: 837 ms, Memory: 6.00MB
-```
-
-
-## Option 2: With Selenium
-
-- [Intro](#dusk-intro)
-- [DNS Setup](#dns-setup)
-- [Docker Compose Setup](#docker-compose)
-- [Laravel Dusk Setup](#laravel-dusk-setup)
-- [Running Laravel Dusk Tests](#running-tests)
-
-
-### Intro
-Setting up Laravel Dusk tests to run with Laradock appears be something that
-eludes most Laradock users. This guide is designed to show you how to wire them
-up to work together. This guide is written with macOS and Linux in mind. As such,
-it's only been tested on macOS. Feel free to create pull requests to update the guide
-for Windows-specific instructions.
-
-This guide assumes you know how to use a DNS forwarder such as `dnsmasq` or are comfortable
-with editing the `/etc/hosts` file for one-off DNS changes.
-
-
-### DNS Setup
-According to RFC-2606, only four TLDs are reserved for local testing[^1]:
-
-- `.test`
-- `.example`
-- `.invalid`
-- `.localhost`
-
-A common TLD used for local development is `.dev`, but newer versions of Google
-Chrome (such as the one bundled with the Selenium Docker image), will fail to
-resolve that DNS as there will appear to be a name collision.
-
-The recommended extension is `.test` for your Laravel web apps because you're
-running tests. Using a DNS forwarder such as `dnsmasq` or by editing the `/etc/hosts`
-file, configure the host to point to `localhost`.
-
-For example, in your `/etc/hosts` file:
-```
-##
-# Host Database
-#
-# localhost is used to configure the loopback interface
-# when the system is booting. Do not change this entry.
-##
-127.0.0.1 localhost
-255.255.255.255 broadcasthost
-::1 localhost
-127.0.0.1 myapp.test
-```
-
-This will ensure that when navigating to `myapp.test`, it will route the
-request to `127.0.0.1` which will be handled by Nginx in Laradock.
-
-
-### Docker Compose setup
-In order to make the Selenium container talk to the Nginx container appropriately,
-the `docker-compose.yml` needs to be edited to accommodate this. Make the following
-changes:
-
-```yaml
-...
-selenium:
- ...
- depends_on:
- - nginx
- links:
- - nginx:
-```
-
-This allows network communication between the Nginx and Selenium containers
-and it also ensures that when starting the Selenium container, the Nginx
-container starts up first unless it's already running. This allows
-the Selenium container to make requests to the Nginx container, which is
-necessary for running Dusk tests. These changes also link the `nginx` environment
-variable to the domain you wired up in your hosts file.
-
-
-### Laravel Dusk Setup
-
-In order to make Laravel Dusk make the proper request to the Selenium container,
-you have to edit the `DuskTestCase.php` file that's provided on the initial
-installation of Laravel Dusk. The change you have to make deals with the URL the
-Remote Web Driver attempts to use to set up the Selenium session.
-
-One recommendation for this is to add a separate config option in your `.env.dusk.local`
-so it's still possible to run your Dusk tests locally should you want to.
-
-#### .env.dusk.local
-```
-...
-USE_SELENIUM=true
-```
-
-#### DuskTestCase.php
-```php
-abstract class DuskTestCase extends BaseTestCase
-{
-...
- protected function driver()
- {
- if (env('USE_SELENIUM', 'false') == 'true') {
- return RemoteWebDriver::create(
- 'http://selenium:4444/wd/hub', DesiredCapabilities::chrome()
- );
- } else {
- return RemoteWebDriver::create(
- 'http://localhost:9515', DesiredCapabilities::chrome()
- );
- }
- }
-}
-```
-
-
-### Running Laravel Dusk Tests
-
-Now that you have everything set up, to run your Dusk tests, you have to SSH
-into the workspace container as you normally would:
-```docker-compose exec --user=laradock workspace bash```
-
-Once inside, you can change directory to your application and run:
-
-```php artisan dusk```
-
-One way to make this easier from your project is to create a helper script. Here's one such example:
-```bash
-#!/usr/bin/env sh
-
-LARADOCK_HOME="path/to/laradock"
-
-pushd ${LARADOCK_HOME}
-
-docker-compose exec --user=laradock workspace bash -c "cd my-project && php artisan dusk && exit"
-```
-
-This invokes the Dusk command from inside the workspace container but when the script completes
-execution, it returns your session to your project directory.
-
-[^1]: [Don't Use .dev for Development](https://iyware.com/dont-use-dev-for-development/)
diff --git a/laradock/DOCUMENTATION/content/help/index.md b/laradock/DOCUMENTATION/content/help/index.md
deleted file mode 100644
index 3f2342de..00000000
--- a/laradock/DOCUMENTATION/content/help/index.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-title: Help & Questions
-type: index
-weight: 5
----
-
-Join the chat room on [Gitter](https://gitter.im/Laradock/laradock) and get help and support from the community.
-
-You can as well can open an [issue](https://github.com/laradock/laradock/issues) on Github (will be labeled as Question) and discuss it with people on [Gitter](https://gitter.im/Laradock/laradock).
diff --git a/laradock/DOCUMENTATION/content/introduction/index.md b/laradock/DOCUMENTATION/content/introduction/index.md
deleted file mode 100644
index bff7fef5..00000000
--- a/laradock/DOCUMENTATION/content/introduction/index.md
+++ /dev/null
@@ -1,214 +0,0 @@
----
-title: Introduction
-type: index
-weight: 1
----
-
-
-
-
-A full PHP development environment for Docker.
-
-Includes pre-packaged Docker Images, all pre-configured to provide a wonderful PHP development environment.
-
-Laradock is well known in the Laravel community, as the project started with single focus on running Laravel projects on Docker. Later and due to the large adoption from the PHP community, it started supporting other PHP projects like Symfony, CodeIgniter, WordPress, Drupal...
-
-
-
-
-## Quick Overview
-
-Let's see how easy it is to install `NGINX`, `PHP`, `Composer`, `MySQL`, `Redis` and `Beanstalkd`:
-
-1 - Clone Laradock inside your PHP project:
-
-```shell
-git clone https://github.com/Laradock/laradock.git
-```
-
-2 - Enter the laradock folder and rename `env-example` to `.env`.
-
-```shell
-cp env-example .env
-```
-
-3 - Run your containers:
-
-```shell
-docker-compose up -d nginx mysql phpmyadmin redis workspace
-```
-
-4 - Open your project's `.env` file and set the following:
-
-```shell
-DB_HOST=mysql
-REDIS_HOST=redis
-QUEUE_HOST=beanstalkd
-```
-
-5 - Open your browser and visit localhost: `http://localhost`.
-
-```shell
-That's it! enjoy :)
-```
-
-
-
-
-
-## Features
-
-- Easy switch between PHP versions: 7.2, 7.1, 5.6...
-- Choose your favorite database engine: MySQL, Postgres, MariaDB...
-- Run your own combination of software: Memcached, HHVM, Beanstalkd...
-- Every software runs on a separate container: PHP-FPM, NGINX, PHP-CLI...
-- Easy to customize any container, with simple edit to the `Dockerfile`.
-- All Images extends from an official base Image. (Trusted base Images).
-- Pre-configured NGINX to host any code at your root directory.
-- Can use Laradock per project, or single Laradock for all projects.
-- Easy to install/remove software's in Containers using environment variables.
-- Clean and well structured Dockerfiles (`Dockerfile`).
-- Latest version of the Docker Compose file (`docker-compose`).
-- Everything is visible and editable.
-- Fast Images Builds.
-- More to come every week..
-
-
-
-
-
-## Supported Software (Images)
-
-In adhering to the separation of concerns principle as promoted by Docker, Laradock runs each software on its own Container.
-You can turn On/Off as many instances of as any container without worrying about the configurations, everything works like a charm.
-
-- **Database Engines:**
-MySQL - MariaDB - Percona - MongoDB - Neo4j - RethinkDB - MSSQL - PostgreSQL - Postgres-PostGIS.
-- **Database Management:**
-PhpMyAdmin - Adminer - PgAdmin
-- **Cache Engines:**
-Redis - Memcached - Aerospike
-- **PHP Servers:**
-NGINX - Apache2 - Caddy
-- **PHP Compilers:**
-PHP FPM - HHVM
-- **Message Queueing:**
-Beanstalkd - RabbitMQ - PHP Worker
-- **Queueing Management:**
-Beanstalkd Console - RabbitMQ Console
-- **Random Tools:**
-HAProxy - Certbot - Blackfire - Selenium - Jenkins - ElasticSearch - Kibana - Grafana - Mailhog - MailDev - Minio - Varnish - Swoole - Laravel Echo...
-
-Laradock introduces the **Workspace** Image, as a development environment.
-It contains a rich set of helpful tools, all pre-configured to work and integrate with almost any combination of Containers and tools you may choose.
-
-**Workspace Image Tools**
-PHP CLI - Composer - Git - Linuxbrew - Node - V8JS - Gulp - SQLite - xDebug - Envoy - Deployer - Vim - Yarn - SOAP - Drush...
-
-You can choose, which tools to install in your workspace container and other containers, from the `.env` file.
-
-
-> If you modify `docker-compose.yml`, `.env` or any `dockerfile` file, you must re-build your containers, to see those effects in the running instance.
-
-
-
-If you can't find your Software in the list, build it yourself and submit it. Contributions are welcomed :)
-
-
-
-## Sponsors
-
-
-
-
-
-Support this project by becoming a sponsor.
-
-Your logo will show up on the [github repository](https://github.com/laradock/laradock/) index page and the [documentation](http://laradock.io/) main page, with a link to your website. [[Become a sponsor](https://opencollective.com/laradock#sponsor)]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-## What is Docker?
-
-[Docker](https://www.docker.com) is an open platform for developing, shipping, and running applications.
-Docker enables you to separate your applications from your infrastructure so you can deliver software quickly.
-With Docker, you can manage your infrastructure in the same ways you manage your applications.
-By taking advantage of Docker’s methodologies for shipping, testing, and deploying code quickly, you can significantly reduce the delay between writing code and running it in production.
-
-
-
-
-
-
-## Why Docker not Vagrant!?
-
-[Vagrant](https://www.vagrantup.com) creates Virtual Machines in minutes while Docker creates Virtual Containers in seconds.
-
-Instead of providing a full Virtual Machines, like you get with Vagrant, Docker provides you **lightweight** Virtual Containers, that share the same kernel and allow to safely execute independent processes.
-
-In addition to the speed, Docker gives tons of features that cannot be achieved with Vagrant.
-
-Most importantly Docker can run on Development and on Production (same environment everywhere). While Vagrant is designed for Development only, (so you have to re-provision your server on Production every time).
-
-
-
-
-
-
-
-## Demo Video
-
-What's better than a **Demo Video**:
-
-- Laradock v5.* (should be next!)
-- Laradock [v4.*](https://www.youtube.com/watch?v=TQii1jDa96Y)
-- Laradock [v2.*](https://www.youtube.com/watch?v=-DamFMczwDA)
-- Laradock [v0.3](https://www.youtube.com/watch?v=jGkyO6Is_aI)
-- Laradock [v0.1](https://www.youtube.com/watch?v=3YQsHe6oF80)
-
-
-
-
-
-
-
-
-## Chat with us
-
-You are welcome to join our chat room on Gitter.
-
-[](https://gitter.im/Laradock/laradock?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
-
-
-
-
-
-
-## Donations
-
-> Help keeping the project development going, by [contributing](http://laradock.io/contributing) or donating a little.
-> Thanks in advance.
-
-Donate directly via [Paypal](https://www.paypal.me/mzalt)
-
-[](https://www.paypal.me/mzalt)
-
-or become a backer on [Open Collective](https://opencollective.com/laradock#backer)
-
-
-
-or show your support via [Beerpay](https://beerpay.io/laradock/laradock)
-
-[](https://beerpay.io/laradock/laradock)
diff --git a/laradock/DOCUMENTATION/content/license/index.md b/laradock/DOCUMENTATION/content/license/index.md
deleted file mode 100644
index 795d4c89..00000000
--- a/laradock/DOCUMENTATION/content/license/index.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-title: License
-type: index
-weight: 8
----
-
-[MIT License](https://github.com/laradock/laradock/blob/master/LICENSE) (MIT)
diff --git a/laradock/DOCUMENTATION/content/related-projects/index.md b/laradock/DOCUMENTATION/content/related-projects/index.md
deleted file mode 100644
index bc37d9b5..00000000
--- a/laradock/DOCUMENTATION/content/related-projects/index.md
+++ /dev/null
@@ -1,19 +0,0 @@
----
-title: Related Projects
-type: index
-weight: 6
----
-
-Laradock related projects:
-
-* [Laradock CLI](https://github.com/lorinlee/laradock-cli) by [LorinLee](https://github.com/lorinlee)
-* [Laradock Env](https://github.com/bagart/laradock_env) by [BAGArt](https://github.com/bagart)
-* [Klaradock](https://github.com/poyhsiao/Klaradock) by [Kim Hsiao](https://github.com/poyhsiao)
-* [Ansible Laradock Kubernetes](https://github.com/sifat-rahim/ansible-laradock-kubernetes) by [Sifat Rahim](https://github.com/sifat-rahim)
-These Docker Compose projects have piqued our interest:
-* [MageDock](https://github.com/ojhaujjwal/magedock) by [Ujjwal Ojha](https://github.com/ojhaujjwal)
-* [RubyDev-Dock](https://github.com/scudelletti/rubydev-dock) by [Diogo Scudelletti](https://github.com/scudelletti)
-* [NoDock](https://github.com/Osedea/nodock) by [Osedea](https://github.com/Osedea)
-* [Dockery](https://github.com/taufek/dockery) by [Taufek](https://github.com/Taufek)
-
-If you want your project listed here, please open an issue.
diff --git a/laradock/DOCUMENTATION/static/CNAME b/laradock/DOCUMENTATION/static/CNAME
deleted file mode 100644
index df75fb6b..00000000
--- a/laradock/DOCUMENTATION/static/CNAME
+++ /dev/null
@@ -1 +0,0 @@
-laradock.io
\ No newline at end of file
diff --git a/laradock/DOCUMENTATION/themes/hugo-material-docs/CHANGELOG.md b/laradock/DOCUMENTATION/themes/hugo-material-docs/CHANGELOG.md
deleted file mode 100644
index 04cec42d..00000000
--- a/laradock/DOCUMENTATION/themes/hugo-material-docs/CHANGELOG.md
+++ /dev/null
@@ -1,29 +0,0 @@
-# Changelog
-
-
-### 11th May 2016
-
-#### Add templates for section lists
-
-Sections such as www.example.com/foo/ will now be rendered with a list of all pages that are part of this section. The list shows the pages' title and a summary of their content.
-
-[Show me the diff](https://github.com/digitalcraftsman/hugo-material-docs/commit/1f8393a8d4ce1b8ee3fc7d87be05895c12810494)
-
-### 22nd March 2016
-
-#### Changing setup for Google Analytics
-
-Formerly, the tracking id for Google Analytics was set like below:
-
-```toml
-[params]
- google_analytics = ["UA-XXXXXXXX-X", "auto"]
-```
-
-Now the theme uses Hugo's own Google Analytics config option. The variable moved outside the scope of `params` and the setup requires only the tracking id as a string:
-
-```toml
-googleAnalytics = "UA-XXXXXXXX-X"
-```
-
-[Show me the diff](https://github.com/digitalcraftsman/hugo-material-docs/commit/fa10c8eef935932426d46b662a51f29a5e0d48e2)
\ No newline at end of file
diff --git a/laradock/DOCUMENTATION/themes/hugo-material-docs/LICENSE.md b/laradock/DOCUMENTATION/themes/hugo-material-docs/LICENSE.md
deleted file mode 100644
index 1a5879b3..00000000
--- a/laradock/DOCUMENTATION/themes/hugo-material-docs/LICENSE.md
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (c) 2016 Digitalcraftsman
-Copyright (c) 2016 Martin Donath
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-IN THE SOFTWARE.
\ No newline at end of file
diff --git a/laradock/DOCUMENTATION/themes/hugo-material-docs/README.md b/laradock/DOCUMENTATION/themes/hugo-material-docs/README.md
deleted file mode 100644
index efcc807d..00000000
--- a/laradock/DOCUMENTATION/themes/hugo-material-docs/README.md
+++ /dev/null
@@ -1,40 +0,0 @@
-# Material Docs
-
-A material design theme for [Hugo](https://gohugo.io).
-
-[](https://digitalcraftsman.github.io/hugo-material-docs/)
-
-## Quick start
-
-Install with `git`:
-
-
- git clone https://github.com/digitalcraftsman/hugo-material-docs.git themes/hugo-material-docs
-
-
-Next, take a look in the `exampleSite` folder at. This directory contains an example config file and the content for the demo. It serves as an example setup for your documentation.
-
-Copy at least the `config.toml` in the root directory of your website. Overwrite the existing config file if necessary.
-
-Hugo includes a development server, so you can view your changes as you go -
-very handy. Spin it up with the following command:
-
-``` sh
-hugo server
-```
-
-Now you can go to [localhost:1313](http://localhost:1313) and the Material
-theme should be visible. For detailed installation instructions visit the [demo](http://themes.gohugo.io/theme/material-docs/).
-
-Noteworthy changes of this theme are listed in the [changelog](https://github.com/digitalcraftsman/hugo-material-docs/blob/master/CHANGELOG.md).
-
-## Acknowledgements
-
-A big thank you to [Martin Donath](https://github.com/squidfunk). He created the original [Material theme](https://github.com/squidfunk/mkdocs-material) for Hugo's companion [MkDocs](http://www.mkdocs.org/). This port wouldn't be possible without him.
-
-Furthermore, thanks to [Steve Francia](https://gihub.com/spf13) for creating Hugo and the [awesome community](https://github.com/spf13/hugo/graphs/contributors) around the project.
-
-## License
-
-The theme is released under the MIT license. Read the [license](https://github.com/digitalcraftsman/hugo-material-docs/blob/master/LICENSE.md) for more information.
-
diff --git a/laradock/DOCUMENTATION/themes/hugo-material-docs/archetypes/default.md b/laradock/DOCUMENTATION/themes/hugo-material-docs/archetypes/default.md
deleted file mode 100644
index a49ba484..00000000
--- a/laradock/DOCUMENTATION/themes/hugo-material-docs/archetypes/default.md
+++ /dev/null
@@ -1,2 +0,0 @@
----
----
\ No newline at end of file
diff --git a/laradock/DOCUMENTATION/themes/hugo-material-docs/layouts/404.html b/laradock/DOCUMENTATION/themes/hugo-material-docs/layouts/404.html
deleted file mode 100644
index e69de29b..00000000
diff --git a/laradock/DOCUMENTATION/themes/hugo-material-docs/layouts/_default/__list.html b/laradock/DOCUMENTATION/themes/hugo-material-docs/layouts/_default/__list.html
deleted file mode 100644
index 54c2b783..00000000
--- a/laradock/DOCUMENTATION/themes/hugo-material-docs/layouts/_default/__list.html
+++ /dev/null
@@ -1,57 +0,0 @@
-{{ partial "head" . }}
-
-
-
-
-
-
-
-
-
-
-
- {{ partial "drawer" . }}
-
-
-
-
-
Pages in {{ .Title | singularize }}
-
- {{ range .Data.Pages }}
-
- {{ .Title }}
-
-
-
- {{ printf "%s" .Summary | markdownify }}
-
-
- {{ end }}
-
-
-
-
-
-
-
-
-{{ partial "footer_js" . }}
diff --git a/laradock/DOCUMENTATION/themes/hugo-material-docs/layouts/_default/single.html b/laradock/DOCUMENTATION/themes/hugo-material-docs/layouts/_default/single.html
deleted file mode 100644
index af662ad5..00000000
--- a/laradock/DOCUMENTATION/themes/hugo-material-docs/layouts/_default/single.html
+++ /dev/null
@@ -1,71 +0,0 @@
-{{ partial "head" . }}
-
-{{ if (eq (trim .Site.Params.provider " " | lower) "github") | and (isset .Site.Params "repo_url") }}
- {{ $repo_id := replace .Site.Params.repo_url "https://github.com/" ""}}
- {{ .Scratch.Set "repo_id" $repo_id }}
-{{ end }}
-
-
-
-
-
-
-
-
-
-
-
- {{ partial "drawer" . }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
{{ .Title }} {{ if .IsDraft }} (Draft){{ end }}
-
- {{ .Content }}
-
-
-
-
-
-
-
-
-
-
-{{ partial "footer_js" . }}
diff --git a/laradock/DOCUMENTATION/themes/hugo-material-docs/layouts/index.html b/laradock/DOCUMENTATION/themes/hugo-material-docs/layouts/index.html
deleted file mode 100644
index f76e458e..00000000
--- a/laradock/DOCUMENTATION/themes/hugo-material-docs/layouts/index.html
+++ /dev/null
@@ -1,75 +0,0 @@
-{{ partial "head" . }}
-
-{{ if (eq (trim .Site.Params.provider " " | lower) "github") | and (isset .Site.Params "repo_url") }}
- {{ $repo_id := replace .Site.Params.repo_url "https://github.com/" ""}}
- {{ .Scratch.Set "repo_id" $repo_id }}
-{{ end }}
-
-
-
-
-
-
-
-
-
-
-
- {{ partial "drawer" . }}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ range where .Site.Pages "Type" "index" }}
-
{{ .Title }} {{ if .IsDraft }} (Draft){{ end }}
-
- {{ .Content }}
- {{ end }}
-
-
-
-
-
-
-
-
-
-
-{{ partial "footer_js" . }}
diff --git a/laradock/DOCUMENTATION/themes/hugo-material-docs/layouts/partials/drawer.html b/laradock/DOCUMENTATION/themes/hugo-material-docs/layouts/partials/drawer.html
deleted file mode 100644
index 62e6fa2c..00000000
--- a/laradock/DOCUMENTATION/themes/hugo-material-docs/layouts/partials/drawer.html
+++ /dev/null
@@ -1,101 +0,0 @@
-
diff --git a/laradock/DOCUMENTATION/themes/hugo-material-docs/layouts/partials/footer.html b/laradock/DOCUMENTATION/themes/hugo-material-docs/layouts/partials/footer.html
deleted file mode 100644
index c0017542..00000000
--- a/laradock/DOCUMENTATION/themes/hugo-material-docs/layouts/partials/footer.html
+++ /dev/null
@@ -1,74 +0,0 @@
-{{ if .IsPage }}
-{{ if .Prev | or .Next }}
-
-{{ end }}
-{{ end }}
-
-{{ if .IsHome }}
-{{ if gt (len .Site.Pages) 2 }}
-
-{{ end }}
-{{ end }}
diff --git a/laradock/DOCUMENTATION/themes/hugo-material-docs/layouts/partials/footer_js.html b/laradock/DOCUMENTATION/themes/hugo-material-docs/layouts/partials/footer_js.html
deleted file mode 100644
index 8b0b55e8..00000000
--- a/laradock/DOCUMENTATION/themes/hugo-material-docs/layouts/partials/footer_js.html
+++ /dev/null
@@ -1,91 +0,0 @@
-
-
-
- {{ range .Site.Params.custom_js }}
-
- {{ end }}
-
-
-
- {{ with .Site.GoogleAnalytics }}
-
- {{ end }}
-
-
-
-