Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

패키지&설정 수정 #9

Merged
merged 8 commits into from
Oct 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 50 additions & 20 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,33 +1,27 @@
# Application
APP_NAME=Laravel
APP_ENV=local
APP_KEY=
APP_DEBUG=true
APP_URL=http://localhost
APP_WEB_URL=http://localhost:3000

LOG_CHANNEL=stack
# Log
LOG_CHANNEL=daily
#LOG_CHANNEL=stack
LOG_DEPRECATIONS_CHANNEL=null
LOG_LEVEL=debug
LOG_SLACK_WEBHOOK_URL=

# Database
DB_CONNECTION=mysql
DB_HOST=127.0.0.1
DB_PORT=3306
DB_DATABASE=laravel
DB_USERNAME=root
DB_PASSWORD=

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
DB_PASSWORD=password

# Mail
MAIL_MAILER=smtp
MAIL_HOST=mailpit
MAIL_PORT=1025
Expand All @@ -37,12 +31,23 @@ 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
# Cache
CACHE_DRIVER=file
QUEUE_CONNECTION=sync
#CACHE_DRIVER=redis
#QUEUE_CONNECTION=redis
REDIS_HOST=127.0.0.1
REDIS_PASSWORD=null
REDIS_PORT=6379
MEMCACHED_HOST=127.0.0.1

# Session
SESSION_DRIVER=file
SESSION_LIFETIME=120

# Broadcast
BROADCAST_DRIVER=log
#BROADCAST_DRIVER=pusher
PUSHER_APP_ID=
PUSHER_APP_KEY=
PUSHER_APP_SECRET=
Expand All @@ -51,9 +56,34 @@ PUSHER_PORT=443
PUSHER_SCHEME=https
PUSHER_APP_CLUSTER=mt1

# File System
FILESYSTEM_DISK=local
#FILESYSTEM_DISK=s3
AWS_ACCESS_KEY_ID=
AWS_SECRET_ACCESS_KEY=
AWS_DEFAULT_REGION=ap-northeast-2
AWS_BUCKET=
AWS_URL=https://s3.amazonaws.com
AWS_ENDPOINT=http://minio:9000
AWS_USE_PATH_STYLE_ENDPOINT=false

# Laravel Sail
APP_PORT=80
SAIL_XDEBUG_MODE=develop,debug
SAIL_XDEBUG_CONFIG="client_host=<host-ip-address>"
WWWUSER="www-data"
WWWGROUP=1000

# Laravel Vite
VITE_APP_NAME="${APP_NAME}"
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}"

# Kakao Login
KAKAO_CLIENT_ID=
KAKAO_CLIENT_SECRET=
KAKAO_REDIRECT_URI=
KAKAO_ADMIN_KEY=
8 changes: 8 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
## 작업 내용
<!-- 작업한 내용과 영향을 받는 범위 등 -->
- 이슈 : [ISSUE-00](https://kimchanhyung98.atlassian.net/browse/ISSUE-00)
- 요약
- 요약

## 특이 사항
<!-- 미완료된 작업 혹은 의논이 필요한 사항 등 -->
24 changes: 24 additions & 0 deletions .github/workflows/pint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Pint (PHP Linting)
# https://laravel.com/docs/10.x/pint

on:
pull_request:
branches:
- main
- develop
# - 'other-branch'

jobs:
phplint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: "laravel-pint"
uses: aglipanci/laravel-pint-action@2.0.0
with:
preset: laravel
verboseMode: true
testMode: true
# configPath: "vendor/my-company/coding-style/pint.json"
pintVersion: 1.8.0
onlyDirty: true
31 changes: 26 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,37 @@
/public/hot
/public/storage
/storage/*.key
/storage/clockwork
/vendor
.env
.env.backup
.env.production
.phpunit.result.cache
Homestead.json
Homestead.yaml
docker-compose.override.yml
auth.json
npm-debug.log
yarn-error.log
*.log
*.sql

# Environment
.env
.env.testing
.env.backup
.env.production
.env.development

# IDE
/.fleet
/.idea
/.vscode
.project
.classpath
.c9/
*.launch
.settings/
*.sublime-workspace

# etc
.DS_Store
.DS_Store?
.Trashes
ehthumbs.db
Thumbs.db
10 changes: 9 additions & 1 deletion app/Providers/EventServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
use Illuminate\Auth\Events\Registered;
use Illuminate\Auth\Listeners\SendEmailVerificationNotification;
use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
use Illuminate\Support\Facades\Event;
use SocialiteProviders\Apple\AppleExtendSocialite;
use SocialiteProviders\Kakao\KakaoExtendSocialite;
use SocialiteProviders\Manager\SocialiteWasCalled;

class EventServiceProvider extends ServiceProvider
{
Expand All @@ -18,6 +20,12 @@ class EventServiceProvider extends ServiceProvider
Registered::class => [
SendEmailVerificationNotification::class,
],

SocialiteWasCalled::class => [
// ... other providers
AppleExtendSocialite::class.'@handle',
KakaoExtendSocialite::class.'@handle',
],
];

/**
Expand Down
30 changes: 26 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,36 @@
"name": "laravel/laravel",
"type": "project",
"description": "The skeleton application for the Laravel framework.",
"keywords": ["laravel", "framework"],
"keywords": [
"laravel",
"framework"
],
"license": "MIT",
"require": {
"php": "^8.2",
"doctrine/dbal": "^3.7",
"guzzlehttp/guzzle": "^7.2",
"laravel/framework": "^10.10",
"laravel/sanctum": "^3.2",
"laravel/tinker": "^2.8"
"laravel/sanctum": "^3.3",
"laravel/socialite": "^5.9",
"laravel/tinker": "^2.8",
"league/flysystem-aws-s3-v3": "^3.16",
"predis/predis": "^2.2",
"socialiteproviders/apple": "^5.6",
"socialiteproviders/kakao": "^4.2"
},
"require-dev": {
"beyondcode/laravel-query-detector": "^1.7",
"fakerphp/faker": "^1.9.1",
"laravel/pint": "^1.0",
"laravel/sail": "^1.18",
"mockery/mockery": "^1.4.4",
"nunomaduro/collision": "^7.0",
"phpunit/phpunit": "^10.1",
"spatie/laravel-ignition": "^2.0"
"psalm/plugin-laravel": "^2.8",
"roave/security-advisories": "dev-latest",
"spatie/laravel-ignition": "^2.0",
"zircote/swagger-php": "^4.7"
},
"autoload": {
"psr-4": {
Expand All @@ -45,6 +58,15 @@
],
"post-create-project-cmd": [
"@php artisan key:generate --ansi"
],
"salm": [
"./vendor/bin/psalm"
],
"swagger": [
"./vendor/bin/openapi app -o openapi.yaml -b swagger-config.php"
],
"pint": [
"./vendor/bin/pint --preset laravel"
]
},
"extra": {
Expand Down
Loading
Loading