Skip to content

Commit

Permalink
Merge pull request #36 from Justintime50/laravel11
Browse files Browse the repository at this point in the history
Laravel11
  • Loading branch information
Justintime50 authored May 4, 2024
2 parents 46d3a6f + 14b07eb commit 952cf12
Show file tree
Hide file tree
Showing 57 changed files with 2,243 additions and 4,104 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: extractions/setup-just@v1
- uses: extractions/setup-just@v2
- uses: shivammathur/setup-php@v2
with:
php-version: '8.3'
Expand All @@ -21,13 +21,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: extractions/setup-just@v1
- uses: extractions/setup-just@v2
- uses: shivammathur/setup-php@v2
with:
php-version: '8.3'
- uses: actions/setup-node@v4
with:
node-version: '20'
node-version: '22'
- name: Lint project
run: |
cd src
Expand All @@ -36,7 +36,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: extractions/setup-just@v1
- uses: extractions/setup-just@v2
- uses: shivammathur/setup-php@v2
with:
php-version: '8.3'
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ vendor

# Laravel
src/storage/images/
database.sqlite
4 changes: 1 addition & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@ RUN if [ ! -z "$PROD" ]; then \
composer install -q --no-ansi --no-interaction --no-scripts --no-plugins --no-progress --prefer-dist --optimize-autoloader --no-dev \
&& npm install -s --omit=dev \
&& npm run build \
&& php artisan config:cache \
&& php artisan route:cache \
&& php artisan view:cache; \
&& php artisan optimize; \
# Setup dev env
else \
composer install \
Expand Down
2 changes: 1 addition & 1 deletion docker-compose-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ services:
replicas: 2
mem_limit: '512m'
healthcheck:
test: ['CMD', 'curl', '--silent', '--output', '/dev/null', '--show-error', '--fail', 'http://localhost']
test: ['CMD', 'curl', '--silent', '--output', '/dev/null', '--show-error', '--fail', 'http://localhost/up']
start_period: 10s
start_interval: 1s
interval: 30s
Expand Down
63 changes: 39 additions & 24 deletions src/.env-example
Original file line number Diff line number Diff line change
Expand Up @@ -2,48 +2,63 @@ APP_NAME="Justin Hammond"
APP_ENV=local
APP_KEY=
APP_DEBUG=true
APP_TIMEZONE=UTC
APP_URL=http://localhost

LOG_CHANNEL=daily
APP_LOCALE=en
APP_FALLBACK_LOCALE=en
APP_FAKER_LOCALE=en_US

APP_MAINTENANCE_DRIVER=file
APP_MAINTENANCE_STORE=database

BCRYPT_ROUNDS=12

LOG_CHANNEL=stack
LOG_STACK=single
LOG_DEPRECATIONS_CHANNEL=null
LOG_LEVEL=debug

DB_CONNECTION=mysql
DB_HOST=127.0.0.1
DB_PORT=3306
DB_DATABASE=src
DB_USERNAME=root
DB_PASSWORD=

BROADCAST_DRIVER=log
CACHE_DRIVER=file
QUEUE_CONNECTION=sync
SESSION_DRIVER=file
DB_CONNECTION=sqlite
# DB_HOST=127.0.0.1
# DB_PORT=3306
DB_DATABASE=/var/www/html/storage/database/database.sqlite
# DB_USERNAME=root
# DB_PASSWORD=

SESSION_DRIVER=database
SESSION_LIFETIME=120
SESSION_ENCRYPT=false
SESSION_PATH=/
SESSION_DOMAIN=null

BROADCAST_CONNECTION=log
FILESYSTEM_DISK=local
QUEUE_CONNECTION=database

CACHE_STORE=array
CACHE_PREFIX=

MEMCACHED_HOST=127.0.0.1

REDIS_CLIENT=phpredis
REDIS_HOST=127.0.0.1
REDIS_PASSWORD=null
REDIS_PORT=6379

MAIL_MAILER=smtp
MAIL_HOST=smtp.mailtrap.io
MAIL_MAILER=log
MAIL_HOST=127.0.0.1
MAIL_PORT=2525
MAIL_USERNAME=null
MAIL_PASSWORD=null
MAIL_ENCRYPTION=null
MAIL_FROM_ADDRESS=null
MAIL_FROM_ADDRESS="hello@example.com"
MAIL_FROM_NAME="${APP_NAME}"

AWS_ACCESS_KEY_ID=
AWS_SECRET_ACCESS_KEY=
AWS_DEFAULT_REGION=us-east-1
AWS_BUCKET=
AWS_USE_PATH_STYLE_ENDPOINT=false

PUSHER_APP_ID=
PUSHER_APP_KEY=
PUSHER_APP_SECRET=
PUSHER_APP_CLUSTER=mt1

VITE_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"

SENTRY_LARAVEL_DSN=
VITE_APP_NAME="${APP_NAME}"
41 changes: 0 additions & 41 deletions src/app/Console/Kernel.php

This file was deleted.

53 changes: 0 additions & 53 deletions src/app/Exceptions/Handler.php

This file was deleted.

10 changes: 1 addition & 9 deletions src/app/Http/Controllers/Controller.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,6 @@

namespace App\Http\Controllers;

use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
use Illuminate\Foundation\Bus\DispatchesJobs;
use Illuminate\Foundation\Validation\ValidatesRequests;
use Illuminate\Routing\Controller as BaseController;

class Controller extends BaseController
abstract class Controller
{
use AuthorizesRequests;
use DispatchesJobs;
use ValidatesRequests;
}
67 changes: 0 additions & 67 deletions src/app/Http/Kernel.php

This file was deleted.

21 changes: 0 additions & 21 deletions src/app/Http/Middleware/Authenticate.php

This file was deleted.

17 changes: 0 additions & 17 deletions src/app/Http/Middleware/EncryptCookies.php

This file was deleted.

17 changes: 0 additions & 17 deletions src/app/Http/Middleware/PreventRequestsDuringMaintenance.php

This file was deleted.

Loading

0 comments on commit 952cf12

Please sign in to comment.