Skip to content

Commit 7fac6a1

Browse files
Merge pull request #82 from deanblackborough/update-and-tailwind
Budget design update
2 parents 33371e9 + ddc1255 commit 7fac6a1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+6908
-2307
lines changed

.docker/app/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM php:8.1-apache
1+
FROM php:8.2-apache
22

33
COPY . /var/www/html
44
COPY .docker/app/vhost.conf /etc/apache2/sites-available/000-default.conf

.github/workflows/laravel.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
steps:
1515
- uses: shivammathur/setup-php@15c43e89cdef867065b0213be354c2841860869e
1616
with:
17-
php-version: '8.1'
17+
php-version: '8.2'
1818
- uses: actions/checkout@v3
1919
- name: Copy .env
2020
run: php -r "file_exists('.env') || copy('.env.example', '.env');"
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace App\View\Components\Content\Landing;
6+
7+
use Illuminate\View\Component;
8+
9+
class Feature extends Component
10+
{
11+
public string $title;
12+
13+
public string $description;
14+
15+
public function __construct(string $title, string $description)
16+
{
17+
$this->title = $title;
18+
$this->description = $description;
19+
}
20+
21+
public function render()
22+
{
23+
return <<<'blade'
24+
<div class="border-t border-gray-200 pt-4">
25+
<dt class="font-medium text-lg text-gray-900">{{ $title }}</dt>
26+
<dd class="mt-2 text-sm text-gray-800">{{ $description }}</dd>
27+
</div>
28+
blade;
29+
}
30+
}
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace App\View\Components\Content\Landing;
6+
7+
use Illuminate\View\Component;
8+
9+
class TableHeaderRowDesktop extends Component
10+
{
11+
public string $title;
12+
13+
public function __construct(string $title)
14+
{
15+
$this->title = $title;
16+
}
17+
18+
public function render()
19+
{
20+
return <<<'blade'
21+
<tr>
22+
<th class="bg-gray-100 py-3 pl-6 text-left text-base font-medium text-pinky-800" colspan="3" scope="colgroup">{{ $title }}</th>
23+
</tr>
24+
blade;
25+
}
26+
}
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace App\View\Components\Content\Landing;
6+
7+
use Illuminate\View\Component;
8+
9+
class TableHeaderRowMobile extends Component
10+
{
11+
public string $title;
12+
13+
public function __construct(string $title)
14+
{
15+
$this->title = $title;
16+
}
17+
18+
public function render()
19+
{
20+
return <<<'blade'
21+
<caption class="border-t border-gray-200 bg-gray-50 py-3 px-4 text-left text-sm font-medium text-gray-900">
22+
{{ $title }}
23+
</caption>
24+
<thead>
25+
<tr>
26+
<th class="sr-only" scope="col">Feature</th>
27+
<th class="sr-only" scope="col">Included</th>
28+
</tr>
29+
</thead>
30+
blade;
31+
}
32+
}
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace App\View\Components\Content\Landing;
6+
7+
use Illuminate\View\Component;
8+
9+
class TableRowDesktop extends Component
10+
{
11+
public string $feature;
12+
13+
public string $budget;
14+
15+
public string $budget_pro;
16+
17+
public function __construct(string $feature, string $budget, string $budgetPro)
18+
{
19+
$this->feature = $feature;
20+
$this->budget = $budget;
21+
$this->budget_pro = $budgetPro;
22+
}
23+
24+
public function render()
25+
{
26+
return <<<'blade'
27+
<tr>
28+
<th class="py-5 px-6 text-left text-sm font-normal text-gray-800" scope="row">{{ $feature }}</th>
29+
30+
<td class="py-5 px-6">
31+
<span class="block text-sm text-gray-900">{{ $budget }}</span>
32+
</td>
33+
34+
<td class="py-5 px-6">
35+
<span class="block text-sm text-gray-900">{{ $budget_pro }}</span>
36+
</td>
37+
</tr>
38+
blade;
39+
}
40+
}
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace App\View\Components\Content\Landing;
6+
7+
use Illuminate\View\Component;
8+
9+
class TableRowMobile extends Component
10+
{
11+
public string $feature;
12+
13+
public string $description;
14+
15+
public function __construct(string $feature, string $description)
16+
{
17+
$this->feature = $feature;
18+
$this->description = $description;
19+
}
20+
21+
public function render()
22+
{
23+
return <<<'blade'
24+
<tr class="border-t border-gray-200">
25+
<th class="py-5 px-4 text-left text-sm font-normal text-gray-800" scope="row">{{ $feature }}</th>
26+
<td class="py-5 pr-4">
27+
<span class="block text-sm text-gray-900">{!! $description !!}</span>
28+
</td>
29+
</tr>
30+
blade;
31+
}
32+
}
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace App\View\Components\Helper\Control\Link;
6+
7+
use Illuminate\View\Component;
8+
9+
class Text extends Component
10+
{
11+
public function __construct(
12+
private readonly string $label,
13+
private readonly string $route,
14+
private readonly bool $lockable = false
15+
)
16+
{
17+
}
18+
19+
public function render()
20+
{
21+
return view('components.helper.control.link.text', [
22+
'label' => $this->label,
23+
'route' => $this->route,
24+
'lockable' => $this->lockable
25+
]);
26+
}
27+
}
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace App\View\Components\Layout;
6+
7+
use Illuminate\Support\Facades\Config;
8+
use Illuminate\View\Component;
9+
10+
/**
11+
* @author Dean Blackborough <dean@g3d-development.com>
12+
* @copyright Dean Blackborough (Costs to Expect) 2018-2023
13+
* @license https://github.com/costs-to-expect/budget/blob/main/LICENSE
14+
*/
15+
class Footer extends Component
16+
{
17+
public function __construct()
18+
{
19+
//
20+
}
21+
22+
public function render()
23+
{
24+
$config = Config::get('app.config');
25+
26+
return view(
27+
'components.layout.footer',
28+
[
29+
'version' => $config['version'],
30+
'release_date' => $config['release_date'],
31+
]
32+
);
33+
}
34+
}
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace App\View\Components\Layout;
6+
7+
use Illuminate\View\Component;
8+
9+
class Navbar extends Component
10+
{
11+
public string $active_route;
12+
13+
public function __construct(string $activeRoute)
14+
{
15+
$this->active_route = $activeRoute;
16+
}
17+
18+
public function render()
19+
{
20+
return view(
21+
'components.layout.navbar',
22+
[
23+
'active_route' => $this->active_route,
24+
]
25+
);
26+
}
27+
}

0 commit comments

Comments
 (0)