Skip to content

Commit eb1a0f2

Browse files
committed
🎉 Feature: Change to Vite and Vue3
1 parent f79d60b commit eb1a0f2

File tree

202 files changed

+8424
-24321
lines changed

Some content is hidden

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

202 files changed

+8424
-24321
lines changed

.editorconfig

+3
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,6 @@ trim_trailing_whitespace = false
1313

1414
[*.{yml,yaml}]
1515
indent_size = 2
16+
17+
[docker-compose.yml]
18+
indent_size = 4

.env.example

+11-4
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ DEBUGBAR_ENABLED=false
66
APP_URL=http://localhost
77

88
LOG_CHANNEL=stack
9+
LOG_DEPRECATIONS_CHANNEL=null
910
LOG_LEVEL=debug
1011

1112
DB_CONNECTION=mysql
@@ -43,15 +44,23 @@ AWS_ACCESS_KEY_ID=
4344
AWS_SECRET_ACCESS_KEY=
4445
AWS_DEFAULT_REGION=us-east-1
4546
AWS_BUCKET=
47+
AWS_USE_PATH_STYLE_ENDPOINT=false
4648

4749
PUSHER_APP_ID=
4850
PUSHER_APP_KEY=
4951
PUSHER_APP_SECRET=
5052
PUSHER_APP_CLUSTER=mt1
53+
PUSHER_HOST=
54+
PUSHER_PORT=443
55+
PUSHER_SCHEME=https
5156

52-
MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
53-
MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
57+
VITE_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
58+
VITE_PUSHER_HOST="${PUSHER_HOST}"
59+
VITE_PUSHER_PORT="${PUSHER_PORT}"
60+
VITE_PUSHER_SCHEME="${PUSHER_SCHEME}"
61+
VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
5462

63+
GEOLOCATION_DRIVER=maxmind_database
5564
MAXMIND_USER_ID=180998
5665
MAXMIND_LICENSE_KEY=zeeptwsThtpVQslN
5766

@@ -83,6 +92,4 @@ DISCORD_REDIRECT_URI=http://minetrax.live/auth/discord/callback
8392
SETTINGS_CACHE_ENABLED=false
8493
RANDOM_USER_AVATARS=true
8594

86-
GEOLOCATION_DRIVER=maxmind_database
87-
8895
APP_LOCALE=en

.eslintrc.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ module.exports = {
77
},
88
'extends': [
99
'eslint:recommended',
10-
'plugin:vue/recommended'
10+
'plugin:vue/vue3-recommended'
1111
],
1212
'parserOptions': {
1313
'ecmaVersion': 13,

.gitattributes

+9-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
* text=auto
2-
*.css linguist-vendored
3-
*.scss linguist-vendored
4-
*.js linguist-vendored
2+
3+
*.blade.php diff=html
4+
*.css diff=css
5+
*.html diff=html
6+
*.md diff=markdown
7+
*.php diff=php
8+
9+
/.github export-ignore
510
CHANGELOG.md export-ignore
11+
.styleci.yml export-ignore

.gitignore

+4
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,7 @@ _ide_helper_models.php
1919
/public/js/app.js
2020
/public/mix-manifest.json
2121
/public/js/app.js.LICENSE.txt
22+
/.vscode
23+
auth.json
24+
/public/build
25+
/bootstrap/ssr

app/Models/CustomPage.php

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ class CustomPage extends BaseModel
1212
protected $casts = [
1313
'is_visible' => 'boolean',
1414
'is_in_navbar' => 'boolean',
15+
'is_redirect' => 'boolean',
1516
];
1617

1718
public function scopeVisible($query)

artisan

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ define('LARAVEL_START', microtime(true));
1111
| Composer provides a convenient, automatically generated class loader
1212
| for our application. We just need to utilize it! We'll require it
1313
| into the script here so that we do not have to worry about the
14-
| loading of any our classes "manually". Feels great to relax.
14+
| loading of any of our classes manually. It's great to relax.
1515
|
1616
*/
1717

composer.json

+35-30
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,10 @@
1818
"clue/socket-raw": "^1.6",
1919
"cybercog/laravel-love": "^8.9",
2020
"geoip2/geoip2": "^2.12",
21-
"guzzlehttp/guzzle": "^7.4",
22-
"inertiajs/inertia-laravel": "^v0.6.3",
2321
"intervention/imagecache": "^2.5",
2422
"laravel/framework": "^9.21",
25-
"laravel/jetstream": "^2.10",
26-
"laravel/sanctum": "^2.15",
2723
"laravel/socialite": "^5.5",
2824
"laravel/telescope": "^4.9",
29-
"laravel/tinker": "^2.7",
3025
"league/commonmark": "^2.3",
3126
"league/flysystem-aws-s3-v3": "~3.0",
3227
"league/flysystem-ftp": "^3.0",
@@ -44,35 +39,30 @@
4439
"spirit55555/php-minecraft": "^1.3",
4540
"symfony/yaml": "^6.1",
4641
"tanmuhittin/laravel-google-translate": "^2.1",
47-
"tightenco/ziggy": "^1.4",
4842
"torann/geoip": "^3.0",
4943
"xpaw/php-minecraft-query": "^4.0",
50-
"xpaw/php-source-query-class": "^2.1"
44+
"xpaw/php-source-query-class": "^2.1",
45+
"guzzlehttp/guzzle": "^7.4",
46+
"inertiajs/inertia-laravel": "^0.5.2",
47+
"laravel/jetstream": "^2.10",
48+
"laravel/sanctum": "^2.14.1",
49+
"laravel/tinker": "^2.7",
50+
"tightenco/ziggy": "^1.0"
5151
},
5252
"require-dev": {
5353
"barryvdh/laravel-debugbar": "^3.7",
5454
"barryvdh/laravel-ide-helper": "^2.9",
5555
"brianium/paratest": "^6.6",
56-
"spatie/laravel-ignition": "^1.0",
56+
"nunomaduro/phpinsights": "dev-master",
5757
"fakerphp/faker": "^1.9.1",
58+
"laravel/pint": "^1.0",
5859
"laravel/sail": "^1.0.1",
59-
"mockery/mockery": "^1.4.2",
60+
"mockery/mockery": "^1.4.4",
6061
"nunomaduro/collision": "^6.1",
61-
"nunomaduro/phpinsights": "dev-master",
62-
"phpunit/phpunit": "^9.3.3"
63-
},
64-
"config": {
65-
"optimize-autoloader": true,
66-
"preferred-install": "dist",
67-
"sort-packages": true,
68-
"allow-plugins": {
69-
"dealerdirect/phpcodesniffer-composer-installer": true
70-
}
71-
},
72-
"extra": {
73-
"laravel": {
74-
"dont-discover": []
75-
}
62+
"pestphp/pest": "^1.16",
63+
"pestphp/pest-plugin-laravel": "^1.1",
64+
"phpunit/phpunit": "^9.5.10",
65+
"spatie/laravel-ignition": "^1.0"
7666
},
7767
"autoload": {
7868
"psr-4": {
@@ -86,21 +76,36 @@
8676
"Tests\\": "tests/"
8777
}
8878
},
89-
"minimum-stability": "dev",
90-
"prefer-stable": true,
9179
"scripts": {
9280
"post-autoload-dump": [
9381
"Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
9482
"@php artisan package:discover --ansi"
9583
],
84+
"post-update-cmd": [
85+
"@php artisan vendor:publish --tag=laravel-assets --ansi --force",
86+
"@php artisan telescope:publish --ansi"
87+
],
9688
"post-root-package-install": [
9789
"@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
9890
],
9991
"post-create-project-cmd": [
10092
"@php artisan key:generate --ansi"
101-
],
102-
"post-update-cmd": [
103-
"@php artisan telescope:publish --ansi"
10493
]
105-
}
94+
},
95+
"extra": {
96+
"laravel": {
97+
"dont-discover": []
98+
}
99+
},
100+
"config": {
101+
"optimize-autoloader": true,
102+
"preferred-install": "dist",
103+
"sort-packages": true,
104+
"allow-plugins": {
105+
"dealerdirect/phpcodesniffer-composer-installer": true,
106+
"pestphp/pest-plugin": true
107+
}
108+
},
109+
"minimum-stability": "dev",
110+
"prefer-stable": true
106111
}

0 commit comments

Comments
 (0)