Merge pull request #706 from vicky-ftxinfotech/master

Merge 6.x code with the base

.babelrc

@@ -0,0 +1,11 @@
+{
+    "presets": [
+        ["@babel/env", {
+            "forceAllTransforms": true,
+            "targets": {
+                "node": "current"
+            }
+        }]
+    ],
+    "sourceMaps": true
+}

.editorconfig

@@ -0,0 +1,15 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.{yml,yaml}]
+indent_size = 2

.env.example

@@ -1,30 +1,34 @@
-APP_DEMO=false
-APP_NAME="Laravel 6.0 AdminPanel"
+APP_READ_ONLY=false
+APP_NAME="Laravel Starter"
 APP_ENV=local
-APP_KEY=base64:kt8rOg+0PFKAdbNCNdCaj9dDczGn5Vdax/X51mGy9Ug=
+APP_KEY=
 APP_DEBUG=true
-DEBUGBAR_ENABLED=false
 APP_URL=http://localhost
 APP_LOCALE=en
 APP_FALLBACK_LOCALE=en
 APP_LOCALE_PHP=en_US
 APP_TIMEZONE=UTC
 LOG_CHANNEL=daily
+
+DEBUGBAR_ENABLED=false
 SINGLE_LOGIN=false
 
+IMAGE_NAME=ls-www
+PORT_NUMBER=8080
+
 DB_CONNECTION=mysql
 DB_HOST=127.0.0.1
 DB_PORT=3306
 DB_DATABASE=homestead
 DB_USERNAME=homestead
 DB_PASSWORD=secret
-#session driver
+
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
+QUEUE_CONNECTION=sync
 SESSION_DRIVER=file
 SESSION_LIFETIME=120
 SESSION_ENCRYPT=false
-QUEUE_CONNECTION=sync
 
 REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=null
@@ -36,6 +40,8 @@ MAIL_PORT=1025
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
+MAIL_FROM_ADDRESS=[email protected]
+MAIL_FROM_NAME="${APP_NAME}"
 
 AWS_ACCESS_KEY_ID=
 AWS_SECRET_ACCESS_KEY=
@@ -48,4 +54,58 @@ PUSHER_APP_SECRET=
 PUSHER_APP_CLUSTER=mt1
 
 MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
-MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
+MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
+
+# Access
+ENABLE_REGISTRATION=true
+CHANGE_EMAIL=false
+PASSWORD_HISTORY=3
+PASSWORD_EXPIRES_DAYS=30
+
+# This should be one or the other, or neither
+REQUIRES_APPROVAL=false
+CONFIRM_EMAIL=true
+#//
+
+# Get your credentials at: https://www.google.com/recaptcha/admin
+CONTACT_CAPTCHA_STATUS=false
+REGISTRATION_CAPTCHA_STATUS=false
+LOGIN_CAPTCHA_STATUS=false
+
+INVISIBLE_RECAPTCHA_SITEKEY=
+INVISIBLE_RECAPTCHA_SECRETKEY=
+INVISIBLE_RECAPTCHA_BADGEHIDE=false
+INVISIBLE_RECAPTCHA_DATABADGE='bottomright'
+INVISIBLE_RECAPTCHA_TIMEOUT=5
+INVISIBLE_RECAPTCHA_DEBUG=false
+
+# Socialite Providers
+FACEBOOK_ACTIVE=false
+#FACEBOOK_CLIENT_ID=
+#FACEBOOK_CLIENT_SECRET=
+#FACEBOOK_REDIRECT=${APP_URL}/login/facebook/callback
+
+BITBUCKET_ACTIVE=false
+#BITBUCKET_CLIENT_ID=
+#BITBUCKET_CLIENT_SECRET=
+#BITBUCKET_REDIRECT=${APP_URL}/login/bitbucket/callback
+
+GITHUB_ACTIVE=false
+#GITHUB_CLIENT_ID=
+#GITHUB_CLIENT_SECRET=
+#GITHUB_REDIRECT=${APP_URL}/login/github/callback
+
+GOOGLE_ACTIVE=false
+#GOOGLE_CLIENT_ID=
+#GOOGLE_CLIENT_SECRET=
+#GOOGLE_REDIRECT=${APP_URL}/login/google/callback
+
+LINKEDIN_ACTIVE=false
+#LINKEDIN_CLIENT_ID=
+#LINKEDIN_CLIENT_SECRET=
+#LINKEDIN_REDIRECT=${APP_URL}/login/linkedin/callback
+
+TWITTER_ACTIVE=false
+#TWITTER_CLIENT_ID=
+#TWITTER_CLIENT_SECRET=
+#TWITTER_REDIRECT=${APP_URL}/login/twitter/callback

.gitattributes

@@ -1,5 +1,18 @@
 * text=auto
-*.css linguist-vendored
-*.scss linguist-vendored
-*.js linguist-vendored
-CHANGELOG.md export-ignore
+
+# Enforce Unix newlines
+*.css   text eol=lf linguist-vendored
+*.html  text eol=lf
+*.js    text eol=lf linguist-vendored
+*.json  text eol=lf
+*.md    text eol=lf
+*.scss  text eol=lf linguist-vendored
+*.svg   text eol=lf
+*.txt   text eol=lf
+*.xml   text eol=lf
+*.yml   text eol=lf
+
+# Don't diff or textually merge source maps
+*.map   binary
+
+CHANGELOG.md export-ignore

.gitignore

@@ -1,41 +1,35 @@
 /node_modules
-/public/storage
 /public/hot
+/public/storage
+/public/images
 /storage/*.key
 /vendor
-.idea
+/.idea
+/.vagrant
+/nbproject
 Homestead.json
 Homestead.yaml
+npm-debug.log
+yarn-error.log
 .env
+.env.backup
 .DS_Store
 Thumbs.db
 *.sublime-project
 *.sublime-workspace
 .project
-/nbproject
 _ide_helper.php
+.phpstorm.meta.php
 composer.phar
 error.log
+output.txt
+/.vscode
+.php_cs.cache
+coverage.xml
+/coverage
+.phpunit.result.cache
+
 access.log
-Todo.rtf
-.vagrant
-/.vagrant
-npm-debug.log
-yarn-error.log
-phpunit.txt
-public/css
-public/js/*.js
-public/js/plugins
-public/js/skins
-public/js/themes
-public/vendor
-public/js/skins/*.js
+error.log
 
-composer.lock
-public/img/backend/blog_images/*
-public/mix-manifest.json
-public/access.log
-public/error.log
-!public/js/jquerysession.min.js
-output.txt
-.php_cs.cache
+/reports

.php_cs.dist

@@ -0,0 +1,141 @@
+#!/usr/bin/env php
+<?php
+
+$rules = [
+    'array_indentation' => true,
+    'array_syntax' => ['syntax' => 'short'],
+    'binary_operator_spaces' => ['default' => 'single_space'],
+    'blank_line_after_namespace' => true,
+    'blank_line_after_opening_tag' => true,
+    'blank_line_before_statement' => [
+        'statements' => [
+            'continue', 'declare', 'return', 'throw', 'try', 'do', 'if',
+            'switch'
+        ]
+    ],
+    'braces' => true,
+    'cast_spaces' => ['space' => 'single'],
+    'class_attributes_separation' => true,
+    'class_definition' => ['singleLine' => true],
+    'concat_space' => ['spacing' => 'none'],
+    'declare_equal_normalize' => ['space' => 'none'],
+    'elseif' => true,
+    'encoding' => true,
+    'full_opening_tag' => true,
+    'function_declaration' => true,
+    'function_typehint_space' => true,
+    'heredoc_to_nowdoc' => true,
+    'include' => true,
+    'indentation_type' => true,
+    'line_ending' => true,
+    'linebreak_after_opening_tag' => true,
+    'lowercase_cast' => true,
+    'lowercase_constants' => true,
+    'lowercase_keywords' => true,
+    'magic_constant_casing' => true,
+    'method_argument_space' => ['on_multiline' => 'ensure_fully_multiline'],
+    'method_chaining_indentation' => true,
+    'multiline_whitespace_before_semicolons' => ['strategy' => 'no_multi_line'],
+    'native_function_casing' => true,
+    'no_alias_functions' => ['sets' => ['@internal', '@IMAP']], // Risky
+    'no_blank_lines_after_class_opening' => true,
+    'no_blank_lines_after_phpdoc' => true,
+    'no_closing_tag' => true,
+    'no_empty_comment' => false,
+    'no_empty_phpdoc' => true,
+    'no_empty_statement' => true,
+    'no_extra_blank_lines' => [
+        'break', 'case', 'continue', 'curly_brace_block', 'default', 'extra',
+        'parenthesis_brace_block', 'square_brace_block', 'throw',
+        'use', 'useTrait', 'use_trait'
+    ],
+    'no_leading_import_slash' => true,
+    'no_leading_namespace_whitespace' => true,
+    'no_mixed_echo_print' => ['use' => 'echo'],
+    'no_multiline_whitespace_around_double_arrow' => true,
+    'no_php4_constructor' => true,
+    'no_short_bool_cast' => true,
+    'no_singleline_whitespace_before_semicolons' => true,
+    'no_spaces_after_function_name' => true,
+    'no_spaces_inside_parenthesis' => true,
+    'no_trailing_comma_in_list_call' => true,
+    'no_trailing_comma_in_singleline_array' => true,
+    'no_trailing_whitespace_in_comment' => true,
+    'no_trailing_whitespace' => true,
+    'no_unneeded_control_parentheses' => true,
+    'no_unused_imports' => true,
+    'no_useless_else' => true,
+    'no_useless_return' => true,
+    'no_whitespace_before_comma_in_array' => true,
+    'no_whitespace_in_blank_line' => true,
+    'normalize_index_brace' => true,
+    'not_operator_with_successor_space' => true,
+    'object_operator_without_whitespace' => true,
+    'ordered_imports' => ['sortAlgorithm' => 'length'],
+    'php_unit_strict' => true,
+    'phpdoc_indent' => true,
+    'phpdoc_inline_tag' => true,
+    'phpdoc_no_access' => true,
+    'phpdoc_no_empty_return' => true,
+    'phpdoc_no_package' => true,
+    'phpdoc_no_useless_inheritdoc' => true,
+    'phpdoc_order' => true,
+    'phpdoc_scalar' => [
+        'types' => [
+            'boolean', 'double', 'integer', 'real', 'str'
+        ]
+    ],
+    'phpdoc_single_line_var_spacing' => true,
+    'phpdoc_summary' => true,
+    'phpdoc_to_comment' => true,
+    'phpdoc_trim' => true,
+    'phpdoc_types' => ['groups' => ['simple', 'alias', 'meta']],
+    'phpdoc_var_without_name' => true,
+    'psr4' => true,
+    'self_accessor' => true,
+    'short_scalar_cast' => true,
+    'simplified_null_return' => true,
+    'single_blank_line_at_eof' => true,
+    'single_blank_line_before_namespace' => true,
+    'single_class_element_per_statement' => ['const', 'property'],
+    'single_import_per_statement' => true,
+    'single_line_after_imports' => true,
+    'single_line_comment_style' => true, // defaults comment_types => ['asterisk', 'hash']
+    'single_quote' => true,
+    'space_after_semicolon' => true,
+    'standardize_increment' => true,
+    'standardize_not_equals' => true,
+    'switch_case_semicolon_to_colon' => true,
+    'switch_case_space' => true,
+    'ternary_operator_spaces' => true,
+    'trailing_comma_in_multiline_array' => true,
+    'trim_array_spaces' => true,
+    'unary_operator_spaces' => true,
+    'visibility_required' => ['property', 'method'],
+    'whitespace_after_comma_in_array' => true,
+    // 'align_phpdoc' => true,
+    // 'concat_without_spaces' => true,
+    // 'hash_to_slash_comment' => true,
+    // 'no_unreachable_default_argument_value' => true, // risky
+    // 'strict_comparison' => true // risky
+];
+
+$excludes = [
+    'bootstrap/cache',
+    'node_modules',
+    'storage',
+    'public',
+    'docs'
+];
+
+$finder = PhpCsFixer\Finder::create()
+    ->exclude($excludes)
+    ->in(__DIR__)
+    ->notName('*.blade.php')
+    ->notName('.phpstorm.meta.php')
+    ->notName('_ide_*.php');
+
+return PhpCsFixer\Config::create()
+    ->setRiskyAllowed(true)
+    ->setRules($rules)
+    ->setFinder($finder);

.styleci.yml

@@ -0,0 +1 @@
+preset: laravel