Skip to content

Commit

Permalink
Merge branch 'staging'
Browse files Browse the repository at this point in the history
  • Loading branch information
jringeisen committed Feb 10, 2024
2 parents 53ccbca + 9bfb0f4 commit 1420cf6
Show file tree
Hide file tree
Showing 6 changed files with 157 additions and 1 deletion.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
/public/hot
/public/storage
/storage/*.key
/storage/debugbar
/vendor
/bootstrap/ssr
.env
Expand Down
1 change: 1 addition & 0 deletions app/Http/Resources/StudentResource.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ public function toArray(Request $request): array
'name' => $this->name,
'current_streak' => $this->current_streak,
'prompt_questions' => $this->promptQuestions()
->with('promptAnswer')
->whereHas('promptAnswer')
->orderBy('created_at', 'desc')
->paginate(10)
Expand Down
1 change: 1 addition & 0 deletions app/Services/WordCountService.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ public function calculateTotalWordsRead(string $timeframe, mixed $userId = null)
->when($userId, fn ($query) => $query->where('user_id', $userId))
->when(! $userId, fn ($query) => $query->whereHas('user', fn ($query) => $query->where('parent_id', request()->user()->id)))
->filterByTimeframe($timeframe)
->with('promptAnswer')
->whereHas('promptAnswer')
->get()
->reduce(function (int $carry, PromptQuestion $promptQuestion) {
Expand Down
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"tightenco/ziggy": "^1.0"
},
"require-dev": {
"barryvdh/laravel-debugbar": "^3.9",
"fakerphp/faker": "^1.9.1",
"laravel/pint": "^1.0",
"laravel/sail": "^1.18",
Expand Down
152 changes: 151 additions & 1 deletion composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions storage/debugbar/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*
!.gitignore

0 comments on commit 1420cf6

Please sign in to comment.