Skip to content

Commit 19feef1

Browse files
gaetan-hexadoggaetan-hexadog
authored
Merge pull request #47 from hexadog/develop
Develop
2 parents 4ed9d14 + 93f9da8 commit 19feef1

File tree

22 files changed

+613
-1129
lines changed

22 files changed

+613
-1129
lines changed

‎composer.lock‎

Lines changed: 138 additions & 138 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎resources/stubs/_folder-structure/.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
node_modules/
2+
vendor/
3+
.DS_Store
4+
*.cache

‎resources/stubs/_folder-structure/resources/views/layouts/app.blade.php‎

Lines changed: 40 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,42 @@
11
<!DOCTYPE html>
22
<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
3-
<head>
4-
<meta charset="utf-8">
5-
<meta name="viewport" content="width=device-width, initial-scale=1">
6-
<meta name="csrf-token" content="{{ csrf_token() }}">
7-
8-
<title>{{ config('app.name', 'Laravel') }}</title>
9-
10-
<!-- Fonts -->
11-
<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Nunito:wght@400;600;700&display=swap">
12-
13-
<!-- Styles -->
14-
<link rel="stylesheet" href="{{ theme_asset('css/app.css') }}">
15-
16-
<!-- Scripts -->
17-
<script src="https://cdn.jsdelivr.net/gh/alpinejs/[email protected]/dist/alpine.js" defer></script>
18-
</head>
19-
<body class="font-sans antialiased">
20-
<div class="min-h-screen bg-gray-100">
21-
22-
<!-- Page Heading -->
23-
@isset($header)
24-
<header class="bg-white shadow">
25-
<div class="max-w-7xl mx-auto py-6 px-4 sm:px-6 lg:px-8">
26-
{{ $header }}
27-
</div>
28-
</header>
29-
@endisset
30-
31-
<!-- Page Content -->
32-
<main>
33-
{{ $slot }}
34-
</main>
35-
</div>
36-
37-
@stack('modals')
38-
</body>
39-
</html>
3+
4+
<head>
5+
<meta charset="utf-8">
6+
<meta name="viewport" content="width=device-width, initial-scale=1">
7+
<meta name="csrf-token" content="{{ csrf_token() }}">
8+
9+
@pagetitle
10+
11+
<!-- Fonts -->
12+
<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Nunito:wght@400;600;700&display=swap">
13+
14+
<!-- Styles -->
15+
<link rel="stylesheet" href="{{ theme_asset('css/app.css') }}">
16+
17+
<!-- Scripts -->
18+
<script src="https://cdn.jsdelivr.net/gh/alpinejs/[email protected]/dist/alpine.js" defer></script>
19+
</head>
20+
21+
<body class="font-sans antialiased">
22+
<div class="min-h-screen bg-gray-100">
23+
24+
<!-- Page Heading -->
25+
@isset($header)
26+
<header class="bg-white shadow">
27+
<div class="max-w-7xl mx-auto py-6 px-4 sm:px-6 lg:px-8">
28+
{{ $header }}
29+
</div>
30+
</header>
31+
@endisset
32+
33+
<!-- Page Content -->
34+
<main>
35+
{{ $slot }}
36+
</main>
37+
</div>
38+
39+
@stack('modals')
40+
</body>
41+
42+
</html>

‎resources/stubs/_folder-structure/resources/views/layouts/guest.blade.php‎

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,27 @@
11
<!DOCTYPE html>
22
<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
3-
<head>
4-
<meta charset="utf-8">
5-
<meta name="viewport" content="width=device-width, initial-scale=1">
6-
<meta name="csrf-token" content="{{ csrf_token() }}">
73

8-
<title>{{ config('app.name', 'Laravel') }}</title>
4+
<head>
5+
<meta charset="utf-8">
6+
<meta name="viewport" content="width=device-width, initial-scale=1">
7+
<meta name="csrf-token" content="{{ csrf_token() }}">
98

10-
<!-- Fonts -->
11-
<link href="https://fonts.googleapis.com/css?family=Nunito:400,600,700" rel="stylesheet">
9+
@pagetitle
1210

13-
<!-- Styles -->
14-
<link rel="stylesheet" href="{{ theme_asset('css/app.css') }}">
11+
<!-- Fonts -->
12+
<link href="https://fonts.googleapis.com/css?family=Nunito:400,600,700" rel="stylesheet">
1513

16-
<!-- Scripts -->
17-
<script src="https://cdn.jsdelivr.net/gh/alpinejs/[email protected]/dist/alpine.js" defer></script>
18-
</head>
19-
<body>
20-
<div class="font-sans text-gray-900 antialiased">
21-
{{ $slot }}
22-
</div>
23-
</body>
24-
</html>
14+
<!-- Styles -->
15+
<link rel="stylesheet" href="{{ theme_asset('css/app.css') }}">
16+
17+
<!-- Scripts -->
18+
<script src="https://cdn.jsdelivr.net/gh/alpinejs/[email protected]/dist/alpine.js" defer></script>
19+
</head>
20+
21+
<body>
22+
<div class="font-sans text-gray-900 antialiased">
23+
{{ $slot }}
24+
</div>
25+
</body>
26+
27+
</html>

‎resources/views/components/script.blade.php‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
<script
2-
@if(!is_null($source))
3-
src="{{ $source }}"
4-
@endif
5-
{{ $attributes }}
6-
>
7-
@isset($slot)
8-
{{ $slot }}
9-
@endisset
1+
<script @if(!is_null($source)) src="{{ $source }}" @endif {{ $attributes }}>
2+
{{ $slot }}
103
</script>

‎resources/views/components/style.blade.php‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
@if(!is_null($source))
2-
<link
3-
rel="stylesheet"
4-
href="{{ $source }}"
5-
{{ $attributes }}
6-
>
2+
<link rel="stylesheet" href="{{ $source }}" {{ $attributes }}>
73
@else
84
<style>
9-
@isset($slot)
10-
{{ $slot }}
11-
@endisset
5+
{{ $slot }}
126
</style>
137
@endif

‎src/Components/Image.php‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
namespace Hexadog\ThemesManager\Components;
44

5+
use Hexadog\ThemesManager\Facades\ThemesManager;
56
use Illuminate\View\Component;
6-
use ThemesManager;
77

88
class Image extends Component
99
{
@@ -16,15 +16,10 @@ class Image extends Component
1616

1717
/**
1818
* Create the component instance.
19-
*
20-
* @param string $type
21-
* @param string $message
22-
* @param mixed $src
23-
* @param mixed $absolutePath
2419
*/
25-
public function __construct($src, $absolutePath = true)
20+
public function __construct(string $src, bool $absolute = true)
2621
{
27-
$this->source = ThemesManager::asset($src, $absolutePath);
22+
$this->source = ThemesManager::asset($src, $absolute);
2823
}
2924

3025
/**

‎src/Components/Script.php‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
namespace Hexadog\ThemesManager\Components;
44

5+
use Hexadog\ThemesManager\Facades\ThemesManager;
56
use Illuminate\View\Component;
6-
use ThemesManager;
77

88
class Script extends Component
99
{
@@ -16,16 +16,11 @@ class Script extends Component
1616

1717
/**
1818
* Create the component instance.
19-
*
20-
* @param string $type
21-
* @param string $message
22-
* @param null|mixed $src
23-
* @param mixed $absolutePath
2419
*/
25-
public function __construct($src = null, $absolutePath = true)
20+
public function __construct(string $src = null, bool $absolute = true)
2621
{
2722
if (!is_null($src)) {
28-
$this->source = ThemesManager::asset($src, $absolutePath);
23+
$this->source = ThemesManager::asset($src, $absolute);
2924
} else {
3025
$this->source = null;
3126
}

‎src/Components/Style.php‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
namespace Hexadog\ThemesManager\Components;
44

5+
use Hexadog\ThemesManager\Facades\ThemesManager;
56
use Illuminate\View\Component;
6-
use ThemesManager;
77

88
class Style extends Component
99
{
@@ -16,16 +16,11 @@ class Style extends Component
1616

1717
/**
1818
* Create the component instance.
19-
*
20-
* @param string $type
21-
* @param string $message
22-
* @param mixed $src
23-
* @param mixed $absolutePath
2419
*/
25-
public function __construct($src, $absolutePath = true)
20+
public function __construct(string $src, bool $absolute = true)
2621
{
2722
if (!is_null($src)) {
28-
$this->source = ThemesManager::asset($src, $absolutePath);
23+
$this->source = ThemesManager::asset($src, $absolute);
2924
} else {
3025
$this->source = null;
3126
}

‎src/Console/Commands/ActivateTheme.php‎

Lines changed: 0 additions & 49 deletions
This file was deleted.

0 commit comments

Comments
 (0)