Skip to content

Commit

Permalink
Merge branch 'develop' into seo-home-change
Browse files Browse the repository at this point in the history
  • Loading branch information
allella authored Sep 13, 2023
2 parents 25bd77b + 7f03805 commit 59b741d
Show file tree
Hide file tree
Showing 51 changed files with 4,069 additions and 2,345 deletions.
18 changes: 16 additions & 2 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -153,12 +153,26 @@
"doc",
"content"
]
},
{
"login": "irby",
"name": "Matthew H. Irby",
"avatar_url": "https://avatars.githubusercontent.com/u/10983811?v=4",
"profile": "https://irby.io/",
"contributions": [
"code",
"review",
"bug",
"test"
]
}
],
"contributorsPerLine": 7,
"projectName": "hackgreenville-com",
"projectOwner": "codeforgreenville",
"projectOwner": "hackgvl",
"repoType": "github",
"repoHost": "https://github.com",
"skipCi": true
"skipCi": true,
"commitType": "docs",
"commitConvention": "angular"
}
48 changes: 48 additions & 0 deletions .env.ci
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
APP_NAME=HackGreenville
APP_ENV=local
APP_KEY=base64:yKCXZDC0GPzDQ0GmXrG2RY4Q010/t494Auq/yCUXVpA=
APP_DEBUG=true
FORCE_SSL=false

DB_CONNECTION=mysql
DB_HOST=mysql
DB_PORT=3306
DB_DATABASE=hackgreenville
DB_USERNAME=hackgreenville
DB_PASSWORD=test

BROADCAST_DRIVER=log
CACHE_DRIVER=file
SESSION_DRIVER=file
SESSION_LIFETIME=120
QUEUE_DRIVER=sync

REDIS_HOST=hackgreenville-redis
REDIS_PASSWORD=null
REDIS_PORT=6379

MAIL_DRIVER=smtp
MAIL_HOST=smtp.mailtrap.io
MAIL_PORT=2525
MAIL_USERNAME=null
MAIL_PASSWORD=null
MAIL_ENCRYPTION=null

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}"

TZ='America/New_York'

EVENTS_API_DOMAIN='https://events.openupstate.org'
ORGS_API_DOMAIN='https://data.openupstate.org'

GOOGLE_TAG_MANAGER=

HCAPTCHA_SITEKEY=
HCAPTCHA_SECRET=
SLACK_CONTACT_WEBHOOK=
4 changes: 3 additions & 1 deletion .env.docker
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@ APP_DEBUG=true
APP_URL=http://localhost
# APP_PORT=80

FORCE_SSL=false

LOG_CHANNEL=stack
WWWGROUP=1337
LARAVEL_SAIL=1
PHP_RUNTIME=8.0
PHP_RUNTIME=8.1
# PHP_RUNTIME=7.4

DB_CONNECTION=mysql
Expand Down
4 changes: 3 additions & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ APP_NAME=HackGreenville
APP_ENV=local
APP_KEY=
APP_DEBUG=true
APP_URL=http://localhost
APP_URL=http://localhost:8000

FORCE_SSL=false

LOG_CHANNEL=stack

Expand Down
2 changes: 2 additions & 0 deletions .env.testing
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ APP_KEY=base64:yKCXZDC0GPzDQ0GmXrG2RY4Q010/t494Auq/yCUXVpA=
APP_DEBUG=true
APP_URL=http://localhost

FORCE_SSL=false

LOG_CHANNEL=stack

DB_CONNECTION=sqlite
Expand Down
46 changes: 46 additions & 0 deletions .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
name: Run unit tests

on:
pull_request:
branches:
- master
- develop
paths:
- 'app/**'
- 'bootstrap/**'
- 'config/**'
- 'database/**'
- 'public/**'
- 'resources/**'
- 'routes/**'
- 'storage/**'
- 'style-guide/**'
- 'tests/**'

jobs:
tests:
runs-on: ubuntu-latest
container: lorisleiva/laravel-docker:8.1
services:
mysql:
image: mysql:8.0
env:
MYSQL_DATABASE: hackgreenville
MYSQL_USER: hackgreenville
MYSQL_ROOT_PASSWORD: test
MYSQL_PASSWORD: test
MYSQL_ALLOW_EMPTY_PASSWORD: yes
ports:
- 3306:3306
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3

steps:
- uses: actions/checkout@v2
- name: install dependencies
run: composer install
- name: copy environment variables to .env
run: cp .env.ci .env
- name: migrate database
run: php artisan migrate --seed
- name: run tests
run: php artisan test
1 change: 1 addition & 0 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
nodejs 18.5.0
php 8.2.4
yarn 1.22.19
2 changes: 1 addition & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Code of Conduct

Please play nice. We follow this ["Code of Conduct"](https://codeforgreenville.org/about/code-of-conduct).
Please play nice. We follow this ["Code of Conduct"](https://hackgreenville.com/join-slack).
Loading

0 comments on commit 59b741d

Please sign in to comment.