Skip to content

Commit 1fe35dd

Browse files
alanwhitmorealanwhitmore
authored
Merge pull request #706 from vicky-ftxinfotech/master
Merge 6.x code with the base
2 parents a5af0d8 + 0dce330 commit 1fe35dd

File tree

1,439 files changed

+367529
-72004
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,439 files changed

+367529
-72004
lines changed

‎.babelrc

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"presets": [
3+
["@babel/env", {
4+
"forceAllTransforms": true,
5+
"targets": {
6+
"node": "current"
7+
}
8+
}]
9+
],
10+
"sourceMaps": true
11+
}

‎.editorconfig

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
root = true
2+
3+
[*]
4+
charset = utf-8
5+
end_of_line = lf
6+
insert_final_newline = true
7+
indent_style = space
8+
indent_size = 4
9+
trim_trailing_whitespace = true
10+
11+
[*.md]
12+
trim_trailing_whitespace = false
13+
14+
[*.{yml,yaml}]
15+
indent_size = 2

‎.env.example

100644100755
+67-7
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,34 @@
1-
APP_DEMO=false
2-
APP_NAME="Laravel 6.0 AdminPanel"
1+
APP_READ_ONLY=false
2+
APP_NAME="Laravel Starter"
33
APP_ENV=local
4-
APP_KEY=base64:kt8rOg+0PFKAdbNCNdCaj9dDczGn5Vdax/X51mGy9Ug=
4+
APP_KEY=
55
APP_DEBUG=true
6-
DEBUGBAR_ENABLED=false
76
APP_URL=http://localhost
87
APP_LOCALE=en
98
APP_FALLBACK_LOCALE=en
109
APP_LOCALE_PHP=en_US
1110
APP_TIMEZONE=UTC
1211
LOG_CHANNEL=daily
12+
13+
DEBUGBAR_ENABLED=false
1314
SINGLE_LOGIN=false
1415

16+
IMAGE_NAME=ls-www
17+
PORT_NUMBER=8080
18+
1519
DB_CONNECTION=mysql
1620
DB_HOST=127.0.0.1
1721
DB_PORT=3306
1822
DB_DATABASE=homestead
1923
DB_USERNAME=homestead
2024
DB_PASSWORD=secret
21-
#session driver
25+
2226
BROADCAST_DRIVER=log
2327
CACHE_DRIVER=file
28+
QUEUE_CONNECTION=sync
2429
SESSION_DRIVER=file
2530
SESSION_LIFETIME=120
2631
SESSION_ENCRYPT=false
27-
QUEUE_CONNECTION=sync
2832

2933
REDIS_HOST=127.0.0.1
3034
REDIS_PASSWORD=null
@@ -36,6 +40,8 @@ MAIL_PORT=1025
3640
MAIL_USERNAME=null
3741
MAIL_PASSWORD=null
3842
MAIL_ENCRYPTION=null
43+
MAIL_FROM_ADDRESS=[email protected]
44+
MAIL_FROM_NAME="${APP_NAME}"
3945

4046
AWS_ACCESS_KEY_ID=
4147
AWS_SECRET_ACCESS_KEY=
@@ -48,4 +54,58 @@ PUSHER_APP_SECRET=
4854
PUSHER_APP_CLUSTER=mt1
4955

5056
MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
51-
MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
57+
MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
58+
59+
# Access
60+
ENABLE_REGISTRATION=true
61+
CHANGE_EMAIL=false
62+
PASSWORD_HISTORY=3
63+
PASSWORD_EXPIRES_DAYS=30
64+
65+
# This should be one or the other, or neither
66+
REQUIRES_APPROVAL=false
67+
CONFIRM_EMAIL=true
68+
#//
69+
70+
# Get your credentials at: https://www.google.com/recaptcha/admin
71+
CONTACT_CAPTCHA_STATUS=false
72+
REGISTRATION_CAPTCHA_STATUS=false
73+
LOGIN_CAPTCHA_STATUS=false
74+
75+
INVISIBLE_RECAPTCHA_SITEKEY=
76+
INVISIBLE_RECAPTCHA_SECRETKEY=
77+
INVISIBLE_RECAPTCHA_BADGEHIDE=false
78+
INVISIBLE_RECAPTCHA_DATABADGE='bottomright'
79+
INVISIBLE_RECAPTCHA_TIMEOUT=5
80+
INVISIBLE_RECAPTCHA_DEBUG=false
81+
82+
# Socialite Providers
83+
FACEBOOK_ACTIVE=false
84+
#FACEBOOK_CLIENT_ID=
85+
#FACEBOOK_CLIENT_SECRET=
86+
#FACEBOOK_REDIRECT=${APP_URL}/login/facebook/callback
87+
88+
BITBUCKET_ACTIVE=false
89+
#BITBUCKET_CLIENT_ID=
90+
#BITBUCKET_CLIENT_SECRET=
91+
#BITBUCKET_REDIRECT=${APP_URL}/login/bitbucket/callback
92+
93+
GITHUB_ACTIVE=false
94+
#GITHUB_CLIENT_ID=
95+
#GITHUB_CLIENT_SECRET=
96+
#GITHUB_REDIRECT=${APP_URL}/login/github/callback
97+
98+
GOOGLE_ACTIVE=false
99+
#GOOGLE_CLIENT_ID=
100+
#GOOGLE_CLIENT_SECRET=
101+
#GOOGLE_REDIRECT=${APP_URL}/login/google/callback
102+
103+
LINKEDIN_ACTIVE=false
104+
#LINKEDIN_CLIENT_ID=
105+
#LINKEDIN_CLIENT_SECRET=
106+
#LINKEDIN_REDIRECT=${APP_URL}/login/linkedin/callback
107+
108+
TWITTER_ACTIVE=false
109+
#TWITTER_CLIENT_ID=
110+
#TWITTER_CLIENT_SECRET=
111+
#TWITTER_REDIRECT=${APP_URL}/login/twitter/callback

‎.gitattributes

+17-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
* text=auto
2-
*.css linguist-vendored
3-
*.scss linguist-vendored
4-
*.js linguist-vendored
5-
CHANGELOG.md export-ignore
2+
3+
# Enforce Unix newlines
4+
*.css text eol=lf linguist-vendored
5+
*.html text eol=lf
6+
*.js text eol=lf linguist-vendored
7+
*.json text eol=lf
8+
*.md text eol=lf
9+
*.scss text eol=lf linguist-vendored
10+
*.svg text eol=lf
11+
*.txt text eol=lf
12+
*.xml text eol=lf
13+
*.yml text eol=lf
14+
15+
# Don't diff or textually merge source maps
16+
*.map binary
17+
18+
CHANGELOG.md export-ignore

‎.gitignore

100644100755
+18-24
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,35 @@
11
/node_modules
2-
/public/storage
32
/public/hot
3+
/public/storage
4+
/public/images
45
/storage/*.key
56
/vendor
6-
.idea
7+
/.idea
8+
/.vagrant
9+
/nbproject
710
Homestead.json
811
Homestead.yaml
12+
npm-debug.log
13+
yarn-error.log
914
.env
15+
.env.backup
1016
.DS_Store
1117
Thumbs.db
1218
*.sublime-project
1319
*.sublime-workspace
1420
.project
15-
/nbproject
1621
_ide_helper.php
22+
.phpstorm.meta.php
1723
composer.phar
1824
error.log
25+
output.txt
26+
/.vscode
27+
.php_cs.cache
28+
coverage.xml
29+
/coverage
30+
.phpunit.result.cache
31+
1932
access.log
20-
Todo.rtf
21-
.vagrant
22-
/.vagrant
23-
npm-debug.log
24-
yarn-error.log
25-
phpunit.txt
26-
public/css
27-
public/js/*.js
28-
public/js/plugins
29-
public/js/skins
30-
public/js/themes
31-
public/vendor
32-
public/js/skins/*.js
33+
error.log
3334

34-
composer.lock
35-
public/img/backend/blog_images/*
36-
public/mix-manifest.json
37-
public/access.log
38-
public/error.log
39-
!public/js/jquerysession.min.js
40-
output.txt
41-
.php_cs.cache
35+
/reports

‎.php_cs.dist

+141
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,141 @@
1+
#!/usr/bin/env php
2+
<?php
3+
4+
$rules = [
5+
'array_indentation' => true,
6+
'array_syntax' => ['syntax' => 'short'],
7+
'binary_operator_spaces' => ['default' => 'single_space'],
8+
'blank_line_after_namespace' => true,
9+
'blank_line_after_opening_tag' => true,
10+
'blank_line_before_statement' => [
11+
'statements' => [
12+
'continue', 'declare', 'return', 'throw', 'try', 'do', 'if',
13+
'switch'
14+
]
15+
],
16+
'braces' => true,
17+
'cast_spaces' => ['space' => 'single'],
18+
'class_attributes_separation' => true,
19+
'class_definition' => ['singleLine' => true],
20+
'concat_space' => ['spacing' => 'none'],
21+
'declare_equal_normalize' => ['space' => 'none'],
22+
'elseif' => true,
23+
'encoding' => true,
24+
'full_opening_tag' => true,
25+
'function_declaration' => true,
26+
'function_typehint_space' => true,
27+
'heredoc_to_nowdoc' => true,
28+
'include' => true,
29+
'indentation_type' => true,
30+
'line_ending' => true,
31+
'linebreak_after_opening_tag' => true,
32+
'lowercase_cast' => true,
33+
'lowercase_constants' => true,
34+
'lowercase_keywords' => true,
35+
'magic_constant_casing' => true,
36+
'method_argument_space' => ['on_multiline' => 'ensure_fully_multiline'],
37+
'method_chaining_indentation' => true,
38+
'multiline_whitespace_before_semicolons' => ['strategy' => 'no_multi_line'],
39+
'native_function_casing' => true,
40+
'no_alias_functions' => ['sets' => ['@internal', '@IMAP']], // Risky
41+
'no_blank_lines_after_class_opening' => true,
42+
'no_blank_lines_after_phpdoc' => true,
43+
'no_closing_tag' => true,
44+
'no_empty_comment' => false,
45+
'no_empty_phpdoc' => true,
46+
'no_empty_statement' => true,
47+
'no_extra_blank_lines' => [
48+
'break', 'case', 'continue', 'curly_brace_block', 'default', 'extra',
49+
'parenthesis_brace_block', 'square_brace_block', 'throw',
50+
'use', 'useTrait', 'use_trait'
51+
],
52+
'no_leading_import_slash' => true,
53+
'no_leading_namespace_whitespace' => true,
54+
'no_mixed_echo_print' => ['use' => 'echo'],
55+
'no_multiline_whitespace_around_double_arrow' => true,
56+
'no_php4_constructor' => true,
57+
'no_short_bool_cast' => true,
58+
'no_singleline_whitespace_before_semicolons' => true,
59+
'no_spaces_after_function_name' => true,
60+
'no_spaces_inside_parenthesis' => true,
61+
'no_trailing_comma_in_list_call' => true,
62+
'no_trailing_comma_in_singleline_array' => true,
63+
'no_trailing_whitespace_in_comment' => true,
64+
'no_trailing_whitespace' => true,
65+
'no_unneeded_control_parentheses' => true,
66+
'no_unused_imports' => true,
67+
'no_useless_else' => true,
68+
'no_useless_return' => true,
69+
'no_whitespace_before_comma_in_array' => true,
70+
'no_whitespace_in_blank_line' => true,
71+
'normalize_index_brace' => true,
72+
'not_operator_with_successor_space' => true,
73+
'object_operator_without_whitespace' => true,
74+
'ordered_imports' => ['sortAlgorithm' => 'length'],
75+
'php_unit_strict' => true,
76+
'phpdoc_indent' => true,
77+
'phpdoc_inline_tag' => true,
78+
'phpdoc_no_access' => true,
79+
'phpdoc_no_empty_return' => true,
80+
'phpdoc_no_package' => true,
81+
'phpdoc_no_useless_inheritdoc' => true,
82+
'phpdoc_order' => true,
83+
'phpdoc_scalar' => [
84+
'types' => [
85+
'boolean', 'double', 'integer', 'real', 'str'
86+
]
87+
],
88+
'phpdoc_single_line_var_spacing' => true,
89+
'phpdoc_summary' => true,
90+
'phpdoc_to_comment' => true,
91+
'phpdoc_trim' => true,
92+
'phpdoc_types' => ['groups' => ['simple', 'alias', 'meta']],
93+
'phpdoc_var_without_name' => true,
94+
'psr4' => true,
95+
'self_accessor' => true,
96+
'short_scalar_cast' => true,
97+
'simplified_null_return' => true,
98+
'single_blank_line_at_eof' => true,
99+
'single_blank_line_before_namespace' => true,
100+
'single_class_element_per_statement' => ['const', 'property'],
101+
'single_import_per_statement' => true,
102+
'single_line_after_imports' => true,
103+
'single_line_comment_style' => true, // defaults comment_types => ['asterisk', 'hash']
104+
'single_quote' => true,
105+
'space_after_semicolon' => true,
106+
'standardize_increment' => true,
107+
'standardize_not_equals' => true,
108+
'switch_case_semicolon_to_colon' => true,
109+
'switch_case_space' => true,
110+
'ternary_operator_spaces' => true,
111+
'trailing_comma_in_multiline_array' => true,
112+
'trim_array_spaces' => true,
113+
'unary_operator_spaces' => true,
114+
'visibility_required' => ['property', 'method'],
115+
'whitespace_after_comma_in_array' => true,
116+
// 'align_phpdoc' => true,
117+
// 'concat_without_spaces' => true,
118+
// 'hash_to_slash_comment' => true,
119+
// 'no_unreachable_default_argument_value' => true, // risky
120+
// 'strict_comparison' => true // risky
121+
];
122+
123+
$excludes = [
124+
'bootstrap/cache',
125+
'node_modules',
126+
'storage',
127+
'public',
128+
'docs'
129+
];
130+
131+
$finder = PhpCsFixer\Finder::create()
132+
->exclude($excludes)
133+
->in(__DIR__)
134+
->notName('*.blade.php')
135+
->notName('.phpstorm.meta.php')
136+
->notName('_ide_*.php');
137+
138+
return PhpCsFixer\Config::create()
139+
->setRiskyAllowed(true)
140+
->setRules($rules)
141+
->setFinder($finder);

‎.styleci.yml

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
preset: laravel

0 commit comments

Comments
 (0)