Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
mlantz committed Aug 20, 2024
2 parents 321c13d + f1ef3c8 commit 243cdc8
Show file tree
Hide file tree
Showing 28 changed files with 5,444 additions and 16,628 deletions.
4 changes: 2 additions & 2 deletions .env.docker
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ PUSHER_APP_KEY=beda029944f4b5d0809b
PUSHER_APP_SECRET=89286a9097669f0c48ff
PUSHER_APP_CLUSTER=mt1

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

PLAN_MONTHLY=plan_FgRNFn5SPrDG6g
PLAN_YEARLY=plan_Gb9YKx6eWjjApR
Expand Down
4 changes: 2 additions & 2 deletions .env.dusk.local
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ PUSHER_APP_KEY=
PUSHER_APP_SECRET=
PUSHER_APP_CLUSTER=mt1

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

STRIPE_KEY=
STRIPE_SECRET=
Expand Down
4 changes: 2 additions & 2 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ PUSHER_APP_KEY=
PUSHER_APP_SECRET=
PUSHER_APP_CLUSTER=mt1

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

HONEYPOT_NAME=my_email
SANCTUM_STATEFUL_DOMAINS="localhost,127.0.0.1,127.0.0.1:8000,::1"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ jobs:

- name: checkbranchname
id: checkbranch
run: echo "::set-output name=BRANCHNAME::${GITHUB_REF##*/}"
run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT

# - name: Deploy to Laravel Forge
# if: steps.checkbranch.outputs.BRANCHNAME == 'develop'
# run: curl ${{ secrets.FORGE_DEPLOYMENT_WEBHOOK }}
# if: steps.checkbranch.outputs.branch == 'main'
# run: curl ${{ secrets.FORGE_DEPLOYMENT_SECRET }}
2 changes: 1 addition & 1 deletion .phpunit.cache/test-results

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).
----

## [v2.20.0] - 2024-08-20

### Changed
- Migrated to Vite

## [v2.19.2] - 2024-05-14

### Fixed
Expand Down
3 changes: 3 additions & 0 deletions app/Http/Controllers/Api/UsersController.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ public function update(ApiUserUpdateRequest $request)
/**
* Delete the user profile.
*
* Completely deletes the user account.
* Will output an email notification of the deleted account.
*
* @return \Illuminate\Http\JsonResponse
*/
public function destroy()
Expand Down
Loading

0 comments on commit 243cdc8

Please sign in to comment.