Skip to content

Commit 08097f0

Browse files
authored
Merge pull request #14 from themeselection/dev
Merge dev branch into main branch
2 parents ec9c8b0 + feb524b commit 08097f0

File tree

226 files changed

+30786
-20388
lines changed

Some content is hidden

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

226 files changed

+30786
-20388
lines changed

.env

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@ APP_NAME=Laravel
22
APP_ENV=local
33
APP_KEY=base64:mln1keRjYJYz06TPXJg8SZhJ7JN+oToy08vrPQhoq78=
44
APP_DEBUG=true
5-
APP_TIMEZONE=UTC
65
APP_URL=http://localhost
76

87
APP_LOCALE=en
98
APP_FALLBACK_LOCALE=en
109
APP_FAKER_LOCALE=en_US
1110

1211
APP_MAINTENANCE_DRIVER=file
13-
APP_MAINTENANCE_STORE=database
12+
# APP_MAINTENANCE_STORE=database
13+
14+
PHP_CLI_SERVER_WORKERS=4
1415

1516
BCRYPT_ROUNDS=12
1617

@@ -37,7 +38,7 @@ FILESYSTEM_DISK=local
3738
QUEUE_CONNECTION=database
3839

3940
CACHE_STORE=database
40-
CACHE_PREFIX=
41+
# CACHE_PREFIX=
4142

4243
MEMCACHED_HOST=127.0.0.1
4344

@@ -47,11 +48,11 @@ REDIS_PASSWORD=null
4748
REDIS_PORT=6379
4849

4950
MAIL_MAILER=log
51+
MAIL_SCHEME=null
5052
MAIL_HOST=127.0.0.1
5153
MAIL_PORT=2525
5254
MAIL_USERNAME=null
5355
MAIL_PASSWORD=null
54-
MAIL_ENCRYPTION=null
5556
MAIL_FROM_ADDRESS="hello@example.com"
5657
MAIL_FROM_NAME="${APP_NAME}"
5758

.env.example

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@ APP_NAME=Laravel
22
APP_ENV=local
33
APP_KEY=
44
APP_DEBUG=true
5-
APP_TIMEZONE=UTC
65
APP_URL=http://localhost
76

87
APP_LOCALE=en
98
APP_FALLBACK_LOCALE=en
109
APP_FAKER_LOCALE=en_US
1110

1211
APP_MAINTENANCE_DRIVER=file
13-
APP_MAINTENANCE_STORE=database
12+
# APP_MAINTENANCE_STORE=database
13+
14+
PHP_CLI_SERVER_WORKERS=4
1415

1516
BCRYPT_ROUNDS=12
1617

@@ -37,7 +38,7 @@ FILESYSTEM_DISK=local
3738
QUEUE_CONNECTION=database
3839

3940
CACHE_STORE=database
40-
CACHE_PREFIX=
41+
# CACHE_PREFIX=
4142

4243
MEMCACHED_HOST=127.0.0.1
4344

@@ -47,11 +48,11 @@ REDIS_PASSWORD=null
4748
REDIS_PORT=6379
4849

4950
MAIL_MAILER=log
51+
MAIL_SCHEME=null
5052
MAIL_HOST=127.0.0.1
5153
MAIL_PORT=2525
5254
MAIL_USERNAME=null
5355
MAIL_PASSWORD=null
54-
MAIL_ENCRYPTION=null
5556
MAIL_FROM_ADDRESS="hello@example.com"
5657
MAIL_FROM_NAME="${APP_NAME}"
5758

.stylelintignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
dist
2+
node_modules
3+
build
4+
_temp/

.stylelintrc.json

Lines changed: 133 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,133 @@
1+
{
2+
"extends": [
3+
"stylelint-config-standard-scss",
4+
"stylelint-config-idiomatic-order",
5+
"@stylistic/stylelint-config"
6+
],
7+
"plugins": [
8+
"stylelint-use-logical-spec",
9+
"@stylistic/stylelint-plugin"
10+
],
11+
"rules": {
12+
"alpha-value-notation": null,
13+
"at-rule-empty-line-before": null,
14+
"block-no-empty": null,
15+
"color-function-notation": null,
16+
"color-named": "never",
17+
"custom-property-empty-line-before": null,
18+
"custom-property-pattern": null,
19+
"declaration-block-no-redundant-longhand-properties": null,
20+
"declaration-empty-line-before": null,
21+
"declaration-no-important": null,
22+
"font-family-no-missing-generic-family-keyword": [
23+
true,
24+
{
25+
"ignoreFontFamilies": [
26+
"boxicons",
27+
"tabler-icons",
28+
"remix-icons"
29+
]
30+
}
31+
],
32+
"font-weight-notation": [
33+
"numeric",
34+
{
35+
"ignore": [
36+
"relative"
37+
]
38+
}
39+
],
40+
"function-url-no-scheme-relative": true,
41+
"liberty/use-logical-spec": true,
42+
"media-feature-range-notation": null,
43+
"media-query-no-invalid": null,
44+
"no-descending-specificity": null,
45+
"no-invalid-double-slash-comments": true,
46+
"no-invalid-position-at-import-rule": null,
47+
"number-max-precision": null,
48+
"rule-empty-line-before": null,
49+
"selector-class-pattern": null,
50+
"selector-id-pattern": null,
51+
"selector-max-attribute": 2,
52+
"selector-max-id": 1,
53+
"selector-max-specificity": null,
54+
"selector-not-notation": null,
55+
"scss/at-extend-no-missing-placeholder": null,
56+
"scss/at-function-named-arguments": "never",
57+
"scss/at-if-closing-brace-newline-after": null,
58+
"scss/at-if-closing-brace-space-after": null,
59+
"scss/at-if-no-null": null,
60+
"scss/at-mixin-pattern": null,
61+
"scss/at-mixin-argumentless-call-parentheses": "always",
62+
"scss/at-rule-conditional-no-parentheses": null,
63+
"scss/comment-no-empty": null,
64+
"scss/dimension-no-non-numeric-values": true,
65+
"scss/dollar-variable-empty-line-before": null,
66+
"scss/dollar-variable-pattern": null,
67+
"scss/double-slash-comment-empty-line-before": null,
68+
"scss/double-slash-comment-whitespace-inside": null,
69+
"scss/function-quote-no-quoted-strings-inside": null,
70+
"scss/media-feature-value-dollar-variable": null,
71+
"scss/no-global-function-names": null,
72+
"@stylistic/at-rule-name-space-after": "always",
73+
"@stylistic/at-rule-semicolon-space-before": "never",
74+
"@stylistic/block-closing-brace-empty-line-before": null,
75+
"@stylistic/block-closing-brace-newline-after": [
76+
"always",
77+
{
78+
"ignoreAtRules": [
79+
"if",
80+
"else"
81+
]
82+
}
83+
],
84+
"@stylistic/block-opening-brace-space-before": null,
85+
"@stylistic/declaration-block-semicolon-newline-before": "never-multi-line",
86+
"@stylistic/indentation": 2,
87+
"@stylistic/max-empty-lines": 2,
88+
"@stylistic/max-line-length": [
89+
220,
90+
{
91+
"ignore": "comments"
92+
}
93+
],
94+
"@stylistic/no-eol-whitespace": true,
95+
"@stylistic/number-leading-zero": "never",
96+
"@stylistic/selector-list-comma-newline-before": "never-multi-line",
97+
"@stylistic/selector-list-comma-space-after": "always-single-line",
98+
"@stylistic/selector-list-comma-space-before": "never-single-line",
99+
"@stylistic/unicode-bom": "never"
100+
},
101+
"overrides": [
102+
{
103+
"files": [
104+
"**/_bootstrap-extended/**/*.scss"
105+
],
106+
"rules": {
107+
"declaration-property-value-disallowed-list": {
108+
"border": "none",
109+
"outline": "none"
110+
},
111+
"function-disallowed-list": [
112+
"lighten",
113+
"darken"
114+
],
115+
"property-disallowed-list": [
116+
"border-radius",
117+
"border-top-left-radius",
118+
"border-top-right-radius",
119+
"border-bottom-right-radius",
120+
"border-bottom-left-radius",
121+
"transition"
122+
],
123+
"scss/dollar-variable-default": [
124+
true,
125+
{
126+
"ignore": "local"
127+
}
128+
],
129+
"scss/selector-no-union-class-name": true
130+
}
131+
}
132+
]
133+
}

.vscode/extensions.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,6 @@
1010
"mrmlnc.vscode-scss",
1111
"gamunu.vscode-yarn",
1212
"zignd.html-css-class-completion",
13+
"shufo.vscode-blade-formatter"
1314
]
14-
}
15+
}

.vscode/settings.json

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
{
22
"editor.wordWrap": "off",
3+
"editor.tabSize": 2,
34
"editor.formatOnSave": true,
5+
"editor.codeActionsOnSave": {
6+
"source.fixAll": "explicit"
7+
},
48
"files.trimFinalNewlines": true,
5-
"diffEditor.ignoreTrimWhitespace": false,
9+
"diffEditor.ignoreTrimWhitespace": true,
610
"cSpell.language": "en",
711
"search.exclude": {
812
"**/node_modules": true,
@@ -11,6 +15,8 @@
1115
"*.min.js": true,
1216
"*.min.css": true
1317
},
18+
"blade.format.enable": true,
19+
"bladeFormatter.format.indentSize": 2,
1420
// JS
1521
"javascript.updateImportsOnFileMove.enabled": "always",
1622
// JSON
@@ -33,9 +39,11 @@
3339
"[markdown]": {
3440
"editor.defaultFormatter": "esbenp.prettier-vscode"
3541
},
36-
"[scss]": {
37-
"editor.defaultFormatter": "esbenp.prettier-vscode"
38-
},
42+
// Extension: Stylelint
43+
"stylelint.packageManager": "pnpm",
44+
"stylelint.validate": [
45+
"scss"
46+
],
3947
"[css]": {
4048
"editor.defaultFormatter": "esbenp.prettier-vscode"
4149
},
@@ -45,12 +53,8 @@
4553
// Extension: ESLint
4654
"eslint.packageManager": "yarn",
4755
"eslint.format.enable": true,
48-
// "eslint.workingDirectories": [
49-
// "src",
50-
// "dev"
51-
// ],
5256
"eslint.options": {
53-
"configFile": ".eslintrc.json"
57+
"overrideConfigFile": ".eslintrc.json"
5458
},
5559
"eslint.validate": [
5660
"vue",
@@ -62,4 +66,7 @@
6266
],
6367
// Extension: npm
6468
"npm.packageManager": "yarn",
69+
"[blade]": {
70+
"editor.defaultFormatter": "shufo.vscode-blade-formatter"
71+
}
6572
}

0 commit comments

Comments
 (0)