Skip to content

Commit

Permalink
Merge staging into master
Browse files Browse the repository at this point in the history
  • Loading branch information
Wirewraith committed Dec 10, 2024
2 parents 84f2c03 + b7f858e commit 385b7af
Show file tree
Hide file tree
Showing 202 changed files with 31,037 additions and 4,455 deletions.
37 changes: 37 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
// https://aka.ms/devcontainer.json
{
"name": "Goonhub",
"dockerComposeFile": [
"../docker-compose.yml"
],
"service": "laravel.test",
"workspaceFolder": "/var/www/html",
"customizations": {
"vscode": {
"extensions": [
"mikestead.dotenv",
"amiralizadeh9480.laravel-extra-intellisense",
"ryannaddy.laravel-artisan",
"onecentlin.laravel5-snippets",
"onecentlin.laravel-blade",
"Vue.volar",
"EditorConfig.EditorConfig",
"dbaeumer.vscode-eslint",
"christian-kohler.npm-intellisense",
"bmewburn.vscode-intelephense-client",
"esbenp.prettier-vscode",
"georgykurian.laravel-ide-helper",
"open-southeners.laravel-pint",
"eamodio.gitlens",
"oven.bun-vscode"
],
"settings": {}
}
},
"remoteUser": "sail",
"initializeCommand": "sh .devcontainer/init.sh",
"postCreateCommand": "chown -R 1000:1000 /var/www/html 2>/dev/null || true && composer install && bun install"
// "forwardPorts": [],
// "runServices": [],
// "shutdownAction": "none",
}
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ trim_trailing_whitespace = true
[*.md]
trim_trailing_whitespace = false

[*.{yml,yaml}]
[*.{yml,yaml,json}]
indent_size = 2

[docker-compose.yml]
Expand Down
6 changes: 5 additions & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ APP_ENV=local
APP_KEY=
APP_DEBUG=true
APP_URL=http://localhost
API_URL=http://api.localhost

LOG_CHANNEL=stack
LOG_DEPRECATIONS_CHANNEL=null
Expand All @@ -16,7 +17,7 @@ DB_USERNAME=sail
DB_PASSWORD=password

BROADCAST_DRIVER=log
CACHE_DRIVER=memcached
CACHE_DRIVER=redis
FILESYSTEM_DISK=local
QUEUE_CONNECTION=database
SESSION_DRIVER=database
Expand Down Expand Up @@ -58,3 +59,6 @@ VITE_PUSHER_SCHEME="${PUSHER_SCHEME}"
VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"

INCLUDE_FRONTEND=true

WWWGROUP=1000
WWWUSER=1000
33 changes: 33 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: Fix Code Style

on: [push]

jobs:
lint:
runs-on: ubuntu-latest
strategy:
fail-fast: true
matrix:
php: [8.3]

steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
extensions: json, dom, curl, libxml, mbstring
coverage: none

- name: Install Pint
run: composer global require laravel/pint

- name: Run Pint
run: pint

- name: Commit linted files
uses: stefanzweifel/git-auto-commit-action@v5
with:
commit_message: "Fixes coding style"
216 changes: 0 additions & 216 deletions .php-cs-fixer.dist.php

This file was deleted.

42 changes: 42 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"version": "0.2.0",
"configurations": [
{
"type": "bun",
"internalConsoleOptions": "openOnSessionStart",
"request": "launch",
"name": "Serve Frontend",
"program": "dev",
"cwd": "${workspaceFolder}",
"stopOnEntry": false
},
{
"type": "bun",
"internalConsoleOptions": "neverOpen",
"request": "launch",
"name": "Debug File",
"program": "${file}",
"cwd": "${workspaceFolder}",
"stopOnEntry": false,
"watchMode": false
},
{
"type": "bun",
"internalConsoleOptions": "neverOpen",
"request": "launch",
"name": "Run File",
"program": "${file}",
"cwd": "${workspaceFolder}",
"noDebug": true,
"watchMode": false
},
{
"type": "bun",
"internalConsoleOptions": "neverOpen",
"request": "attach",
"name": "Attach Bun",
"url": "ws://localhost:6499/",
"stopOnEntry": false
}
]
}
21 changes: 14 additions & 7 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
{
"artisan.docker.enabled": true,
"artisan.docker.command": "./vendor/bin/sail",
"editor.rulers": [100],
"[php]": {
"editor.defaultFormatter": "junstyle.php-cs-fixer"
},
"php-cs-fixer.allowRisky": true
"editor.rulers": [
100
],
"[php]": {
"editor.defaultFormatter": "open-southeners.laravel-pint"
},
"intelephense.codeLens.implementations.enable": true,
"intelephense.codeLens.overrides.enable": true,
"intelephense.codeLens.parent.enable": true,
"intelephense.codeLens.references.enable": true,
"intelephense.codeLens.usages.enable": true,
"intelephense.format.enable": false,
"editor.formatOnSave": true,
"laravel-pint.enable": true
}
Loading

0 comments on commit 385b7af

Please sign in to comment.