Skip to content

Commit 243cdc8

Browse files
committed
Merge branch 'develop'
2 parents 321c13d + f1ef3c8 commit 243cdc8

28 files changed

+5444
-16628
lines changed

Diff for: .env.docker

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ PUSHER_APP_KEY=beda029944f4b5d0809b
4343
PUSHER_APP_SECRET=89286a9097669f0c48ff
4444
PUSHER_APP_CLUSTER=mt1
4545

46-
MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
47-
MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
46+
VITE_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
47+
VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
4848

4949
PLAN_MONTHLY=plan_FgRNFn5SPrDG6g
5050
PLAN_YEARLY=plan_Gb9YKx6eWjjApR

Diff for: .env.dusk.local

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ PUSHER_APP_KEY=
4040
PUSHER_APP_SECRET=
4141
PUSHER_APP_CLUSTER=mt1
4242

43-
MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
44-
MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
43+
VITE_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
44+
VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
4545

4646
STRIPE_KEY=
4747
STRIPE_SECRET=

Diff for: .env.example

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ PUSHER_APP_KEY=
4242
PUSHER_APP_SECRET=
4343
PUSHER_APP_CLUSTER=mt1
4444

45-
MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
46-
MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
45+
VITE_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
46+
VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
4747

4848
HONEYPOT_NAME=my_email
4949
SANCTUM_STATEFUL_DOMAINS="localhost,127.0.0.1,127.0.0.1:8000,::1"

Diff for: .github/workflows/tests.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ jobs:
4545

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

5050
# - name: Deploy to Laravel Forge
51-
# if: steps.checkbranch.outputs.BRANCHNAME == 'develop'
52-
# run: curl ${{ secrets.FORGE_DEPLOYMENT_WEBHOOK }}
51+
# if: steps.checkbranch.outputs.branch == 'main'
52+
# run: curl ${{ secrets.FORGE_DEPLOYMENT_SECRET }}

Diff for: .phpunit.cache/test-results

+1-1
Large diffs are not rendered by default.

Diff for: CHANGELOG.md

+5
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@ All notable changes to this project will be documented in this file.
33
This project adheres to [Semantic Versioning](http://semver.org/).
44
----
55

6+
## [v2.20.0] - 2024-08-20
7+
8+
### Changed
9+
- Migrated to Vite
10+
611
## [v2.19.2] - 2024-05-14
712

813
### Fixed

Diff for: app/Http/Controllers/Api/UsersController.php

+3
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ public function update(ApiUserUpdateRequest $request)
4949
/**
5050
* Delete the user profile.
5151
*
52+
* Completely deletes the user account.
53+
* Will output an email notification of the deleted account.
54+
*
5255
* @return \Illuminate\Http\JsonResponse
5356
*/
5457
public function destroy()

0 commit comments

Comments
 (0)