Skip to content

Commit

Permalink
Merge pull request #53 from he4rt/v2/main
Browse files Browse the repository at this point in the history
feat(v2): release the krakennnnnnnnnnn
  • Loading branch information
DanielHe4rt authored Mar 16, 2023
2 parents b2d5816 + 6ca3aad commit 879528a
Show file tree
Hide file tree
Showing 532 changed files with 14,688 additions and 14,599 deletions.
7 changes: 5 additions & 2 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,16 @@ root = true
[*]
charset = utf-8
end_of_line = lf
insert_final_newline = true
indent_style = space
indent_size = 4
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true

[*.md]
trim_trailing_whitespace = false

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

[docker-compose.yml]
indent_size = 4
67 changes: 52 additions & 15 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,31 +1,68 @@
APP_NAME=Lumen
APP_NAME=Laravel
APP_ENV=local
APP_KEY=
APP_DEBUG=true
APP_URL=http://localhost
APP_TIMEZONE=UTC
APP_DISCORD_WEBHOOK_URL=https://discord.com/api/webhooks/1043988813803962548/39T04t_36glaHqfUD_pSpB0plMR0D5oqxvou4lH0FOOXVHsLcVIK6lMih7XNfmvkvcZJ

LOG_CHANNEL=stack
LOG_SLACK_WEBHOOK_URL=
LOG_DEPRECATIONS_CHANNEL=null
LOG_LEVEL=debug

DB_CONNECTION=mysql
DB_HOST=127.0.0.1
DB_HOST=mysql
DB_PORT=3306
DB_DATABASE=homestead
DB_USERNAME=homestead
DB_PASSWORD=secret

DB_DATABASE=he4rt
DB_USERNAME=root
DB_PASSWORD=root

BROADCAST_DRIVER=log
CACHE_DRIVER=file
FILESYSTEM_DISK=local
QUEUE_CONNECTION=sync
SESSION_DRIVER=file
SESSION_LIFETIME=120

MEMCACHED_HOST=127.0.0.1

REDIS_HOST=127.0.0.1
REDIS_PASSWORD=null
REDIS_PORT=6379

CACHE_DRIVER=redis
QUEUE_CONNECTION=sync
MAIL_MAILER=smtp
MAIL_HOST=mailhog
MAIL_PORT=1025
MAIL_USERNAME=null
MAIL_PASSWORD=null
MAIL_ENCRYPTION=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_HOST=
PUSHER_PORT=443
PUSHER_SCHEME=https
PUSHER_APP_CLUSTER=mt1

VITE_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
VITE_PUSHER_HOST="${PUSHER_HOST}"
VITE_PUSHER_PORT="${PUSHER_PORT}"
VITE_PUSHER_SCHEME="${PUSHER_SCHEME}"
VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"

HE4RT_DISCORD_BOT_KEY=123
HE4RT_DISCORD_LEVELUP_CHANNEL=123
SEASON_ID=
HE4RT_DISCORD_BOT_KEY=
HE4RT_DISCORD_LEVELUP_CHANNEL=
HE4RT_DISCORD_GUILD=

DISCORD_CLIENT_ID=
DISCORD_CLIENT_SECRET=
DISCORD_REDIRECT_URI=
DB_TEST_DATABASE="dev_he4rtbot"
DB_TEST_USERNAME="root"
DB_TEST_PASSWORD="root"
68 changes: 68 additions & 0 deletions .env.pipeline
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
APP_NAME=Laravel
APP_ENV=local
APP_KEY=
APP_DEBUG=true
APP_URL=http://localhost

LOG_CHANNEL=stack
LOG_DEPRECATIONS_CHANNEL=null
LOG_LEVEL=debug

DB_CONNECTION=testing
DB_HOST=127.0.0.1
DB_PORT=3306

DB_DATABASE=he4rt
DB_USERNAME=root
DB_PASSWORD=root

BROADCAST_DRIVER=log
CACHE_DRIVER=file
FILESYSTEM_DISK=local
QUEUE_CONNECTION=sync
SESSION_DRIVER=file
SESSION_LIFETIME=120

MEMCACHED_HOST=127.0.0.1

REDIS_HOST=127.0.0.1
REDIS_PASSWORD=null
REDIS_PORT=6379

MAIL_MAILER=smtp
MAIL_HOST=mailhog
MAIL_PORT=1025
MAIL_USERNAME=null
MAIL_PASSWORD=null
MAIL_ENCRYPTION=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_HOST=
PUSHER_PORT=443
PUSHER_SCHEME=https
PUSHER_APP_CLUSTER=mt1

VITE_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
VITE_PUSHER_HOST="${PUSHER_HOST}"
VITE_PUSHER_PORT="${PUSHER_PORT}"
VITE_PUSHER_SCHEME="${PUSHER_SCHEME}"
VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"

SEASON_ID=
HE4RT_DISCORD_BOT_KEY=
HE4RT_DISCORD_LEVELUP_CHANNEL=
HE4RT_DISCORD_GUILD=

DB_TEST_DATABASE="dev_he4rtbot"
DB_TEST_USERNAME="root"
DB_TEST_PASSWORD="root"
25 changes: 0 additions & 25 deletions .env.testing

This file was deleted.

66 changes: 66 additions & 0 deletions .env.testing.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
APP_NAME=Laravel
APP_ENV=local
APP_KEY=base64:5SvutJ5rILwgZ1C0G64OTFaiwQs5GGz19i7g1p6EbiY=
APP_DEBUG=true
APP_URL=http://localhost

LOG_CHANNEL=stack
LOG_DEPRECATIONS_CHANNEL=null
LOG_LEVEL=debug

DB_CONNECTION=testing
DB_HOST=mysql
DB_PORT=3306
DB_DATABASE=dev_he4rtbot
DB_USERNAME=root
DB_PASSWORD=root

BROADCAST_DRIVER=log
CACHE_DRIVER=file
FILESYSTEM_DISK=local
QUEUE_CONNECTION=sync
SESSION_DRIVER=file
SESSION_LIFETIME=120

MEMCACHED_HOST=127.0.0.1

REDIS_HOST=127.0.0.1
REDIS_PASSWORD=null
REDIS_PORT=6379

MAIL_MAILER=smtp
MAIL_HOST=mailhog
MAIL_PORT=1025
MAIL_USERNAME=null
MAIL_PASSWORD=null
MAIL_ENCRYPTION=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_HOST=
PUSHER_PORT=443
PUSHER_SCHEME=https
PUSHER_APP_CLUSTER=mt1

VITE_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
VITE_PUSHER_HOST="${PUSHER_HOST}"
VITE_PUSHER_PORT="${PUSHER_PORT}"
VITE_PUSHER_SCHEME="${PUSHER_SCHEME}"
VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"

SEASON_ID=2
BOT_SECRET=he4rt
HE4RT_DISCORD_BOT_KEY=
HE4RT_DISCORD_LEVELUP_CHANNEL=
HE4RT_DISCORD_GUILD=

REDIS_URL=127.0.0.1
11 changes: 11 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
* text=auto

*.blade.php diff=html
*.css diff=css
*.html diff=html
*.md diff=markdown
*.php diff=php

/.github export-ignore
CHANGELOG.md export-ignore
.styleci.yml export-ignore
4 changes: 0 additions & 4 deletions .github/logo.png:Zone.Identifier

This file was deleted.

25 changes: 17 additions & 8 deletions .github/workflows/laravel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,15 @@ name: Testing Lumen with MySQL
on: [ push ]
jobs:
lumen:
name: Lumen (PHP ${{ matrix.php-versions }})
name: Laravel (PHP ${{ matrix.php-versions }})
runs-on: ubuntu-latest
env:
DB_DATABASE: lumen
DB_DATABASE: dev_he4rtbot
DB_USERNAME: root
DB_PASSWORD: password
DB_PASSWORD: root
DB_TEST_DATABASE: dev_he4rtbot
DB_TEST_USERNAME: root
DB_TEST_PASSWORD: root
BROADCAST_DRIVER: log
CACHE_DRIVER: redis
QUEUE_CONNECTION: redis
Expand All @@ -20,8 +23,8 @@ jobs:
image: mysql:latest
env:
MYSQL_ALLOW_EMPTY_PASSWORD: false
MYSQL_ROOT_PASSWORD: password
MYSQL_DATABASE: lumen
MYSQL_ROOT_PASSWORD: root
MYSQL_DATABASE: dev_he4rtbot
ports:
- 3306/tcp
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
Expand All @@ -34,7 +37,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php-versions: [ '7.4' ]
php-versions: [ '8.1' ]
steps:
- name: Checkout
uses: actions/checkout@v3
Expand Down Expand Up @@ -70,19 +73,25 @@ jobs:
composer install --no-progress --prefer-dist --optimize-autoloader
composer require predis/predis illuminate/redis
- name: Prepare the application
run: php -r "file_exists('.env') || copy('.env.example', '.env');"
run: php -r "file_exists('.env') || copy('.env.pipeline', '.env');"

- name: Register Redis as service provider
run: sed -i '$i\$app->register(Illuminate\\Redis\\RedisServiceProvider::class);' bootstrap/app.php

- name: Run Migration
run: php artisan migrate -v
run: php artisan migrate --database=testing -v
env:
DB_HOST: "127.0.0.1"
DB_TEST_DATABASE: "dev_he4rtbot"
DB_DATABASE: "dev_he4rtbot"
DB_PORT: ${{ job.services.mysql.ports['3306'] }}
REDIS_PORT: ${{ job.services.redis.ports['6379'] }}

- name: Test with phpunit
run: vendor/bin/phpunit --coverage-text
env:
DB_HOST: "127.0.0.1"
DB_TEST_DATABASE: "dev_he4rtbot"
DB_DATABASE: "dev_he4rtbot"
DB_PORT: ${{ job.services.mysql.ports['3306'] }}
REDIS_PORT: ${{ job.services.redis.ports['6379'] }}
21 changes: 16 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,20 @@
/node_modules
/public/build
/public/hot
/public/storage
/storage/*.key
/vendor
/.idea
Homestead.json
Homestead.yaml
.env
.env.testing
.env.backup
.env.production
.phpunit.result.cache
/.scribe
/public/docs
Homestead.json
Homestead.yaml
auth.json
npm-debug.log
yarn-error.log
/.fleet
/.idea
/.vscode
/.idea/
Loading

0 comments on commit 879528a

Please sign in to comment.