Skip to content

Commit

Permalink
Merge pull request #69 from dsbilling/redesign
Browse files Browse the repository at this point in the history
  • Loading branch information
dsbilling authored Dec 9, 2023
2 parents 3f6917f + e778e9e commit 4c3ce55
Show file tree
Hide file tree
Showing 15 changed files with 1,639 additions and 1,228 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/laravel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
fail-fast: false
matrix:
operating-system: [ubuntu-latest]
php-versions: [8.1]
php-versions: [8.2]
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/BlogController.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class BlogController extends Controller
public function index()
{
seo()->title('Blog - '.config('app.name'));
$posts = Post::where('published_at', '<=', now())->where('draft', false)->orderByDesc('published_at')->paginate(6);
$posts = Post::where('published_at', '<=', now())->where('draft', false)->orderByDesc('published_at')->paginate(10);

return view('blog.index', ['posts' => $posts]);
}
Expand Down
6 changes: 3 additions & 3 deletions app/Http/Controllers/HomeController.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ class HomeController extends Controller
*/
public function index()
{
$posts = Post::where('published_at', '<=', now())->where('draft', false)->orderByDesc('published_at')->take(4)->get();
$poststotalcount = Post::where('published_at', '<=', now())->where('draft', false)->count();
$posts = Post::where('published_at', '<=', now())->where('draft', false)->orderByDesc('published_at')->take(3)->get();
$experiences = Experience::where('type', 'full-time')->orderByRaw('-ended_at ASC')->orderby('started_at', 'DESC')->take(5)->get();

return view('home', compact('posts', 'poststotalcount'));
return view('home', compact('posts', 'experiences'));
}

/**
Expand Down
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@
"sort-packages": true,
"allow-plugins": {
"composer/package-versions-deprecated": true,
"pestphp/pest-plugin": true
"pestphp/pest-plugin": true,
"php-http/discovery": true
}
},
"minimum-stability": "dev",
Expand Down
Loading

0 comments on commit 4c3ce55

Please sign in to comment.