Skip to content

main/production #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
StanBarrows merged 3 commits into from
Apr 10, 2025
Merged

main/production #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d6d222d
wip
StanBarrows Apr 10, 2025
df690d8
wip
StanBarrows Apr 10, 2025
45c7ddb
wip
StanBarrows Apr 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/Http/Controllers/Services/ServicesShowController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ public function __invoke(string $locale, Service $service): View
'name' => $service->name,
'teaser' => $service->teaser,
'content' => Str::of($service->content)->markdown(),
'tags' => $service->tags,
]);
}
}
2 changes: 1 addition & 1 deletion lang/de_CH/components.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
effizienter macht.',
'buttons' => [
'discover_now' => 'Jetzt entdecken',
'more' => 'Mehr über DocuWare,',
'more' => 'Mehr über DocuWare',
],
],
],
Expand Down
5 changes: 2 additions & 3 deletions resources/views/app/contact/index.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,9 @@ classAttributes="block"/>
<p>Haupstrasse 91</p>
<p>CH-4455 Zunzgen</p>
</address>
<x-a-badge href="https://www.google.com/maps/place/Hauptstrasse+91,+4455+Zunzgen,+Schweiz"
label="{{ __('Google Maps') }}" class-attributes="mt-1" target="_blank" rel="noopener noreferrer">
<x-a-badge href="https://www.google.com/maps/place/Hauptstrasse+91,+4455+Zunzgen,+Schweiz" label="{{ __('Google Maps') }}" class-attributes="mt-1" target="_blank" rel="noopener noreferrer">
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
stroke="currentColor" class="mr-1 size-3">
stroke="currentColor" class="ml-1 size-3">
<path stroke-linecap="round" stroke-linejoin="round"
d="M13.5 6H5.25A2.25 2.25 0 0 0 3 8.25v10.5A2.25 2.25 0 0 0 5.25 21h10.5A2.25 2.25 0 0 0 18 18.75V10.5m-10.5 6L21 3m0 0h-5.25M21 3v5.25"/>
</svg>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/app/legal/imprint/index.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<x-a-badge href="https://zefix.ch/de/search/entity/list/firm/1598166" label="{{ __('Zefix') }}"
class-attributes="mt-1" target="_blank" rel="noopener noreferrer">
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
stroke="currentColor" class="mr-1 size-3">
stroke="currentColor" class="ml-1 size-3">
<path stroke-linecap="round" stroke-linejoin="round"
d="M13.5 6H5.25A2.25 2.25 0 0 0 3 8.25v10.5A2.25 2.25 0 0 0 5.25 21h10.5A2.25 2.25 0 0 0 18 18.75V10.5m-10.5 6L21 3m0 0h-5.25M21 3v5.25"/>
</svg>
Expand Down
1 change: 0 additions & 1 deletion resources/views/app/products/show.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,4 @@
<x-docuware-showme/>
@endif


</x-app-layout>
4 changes: 4 additions & 0 deletions resources/views/app/services/show.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,8 @@
<x-content :content="$content"/>
</x-section>

@if(in_array('DocuWare', $tags))
<x-docuware-showme/>
@endif

</x-app-layout>
2 changes: 1 addition & 1 deletion resources/views/components/a-badge.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

<a target="{{ $target }}" href="{{ $href }}" title="{{ $title ?? $label }}"
class="{{ $classAttributes }} inline-flex items-center rounded-md bg-gray-400/10 px-2 py-1 text-sm font-medium text-gray-400 hover:bg-gray-400/20 hover:text-black hover:font-semibold ring-1 ring-gray-400/20 ring-inset cursor-pointer">
{{ $slot }}
{{ $label }}
{{ $slot }}
</a>