back buttons

resources/views/livewire/book-case/comment-book-case.blade.php

@@ -1,13 +1,8 @@
 <div class="bg-21gray flex flex-col h-screen justify-between">
+    <livewire:frontend.header :country="$country"/>
     {{-- MAIN --}}
     <section class="w-full mb-12">
         <div class="max-w-screen-2xl mx-auto px-2 sm:px-10">
-            <div class="flex items-center justify-end space-x-2 my-6">
-                <x-button primary onclick="history.back()">
-                    <i class="fa fa-thin fa-arrow-left"></i>
-                    Zurück zur Übersicht
-                </x-button>
-            </div>
 
             <div class="grid grid-cols-1 gap-4 sm:grid-cols-2">
 

resources/views/livewire/frontend/header.blade.php

@@ -3,95 +3,111 @@
         <div class="max-w-screen-2xl mx-auto px-2 sm:px-10">
             <div
                 class="relative sm:sticky sm:top-0 bg-21gray z-10 flex flex-col flex-wrap items-center justify-between py-7 mx-auto md:flex-row max-w-screen-2xl space-y-4">
-                <div class="relative flex flex-col md:flex-row">
+                <div>
-                    <a href="{{ route('welcome', ['c' => $c, 'l' => $l]) }}"
+                    <div class="relative flex flex-col md:flex-row">
-                       class="flex items-center mb-5 font-medium text-gray-900 lg:w-auto lg:items-center lg:justify-center md:mb-0">
+                        <a href="{{ route('welcome', ['c' => $c, 'l' => $l]) }}"
-                        <img src="{{ asset('img/einundzwanzig-horizontal-inverted.svg') }}">
+                           class="flex items-center mb-5 font-medium text-gray-900 lg:w-auto lg:items-center lg:justify-center md:mb-0">
-                    </a>
+                            <img src="{{ asset('img/einundzwanzig-horizontal-inverted.svg') }}">
-                    <nav
-                        class="flex flex-wrap items-center mb-5 text-lg md:mb-0 md:pl-8 md:ml-8 md:border-l md:border-gray-800">
-
-                        <a href="{{ route('welcome', ['c' => $c]) }}"
-                           class="text-gray-400 mr-5 font-medium leading-6 hover:text-gray-300">
-                            {{ __('Back to the overview') }}
                         </a>
+                        <nav
+                            class="flex flex-wrap items-center mb-5 text-lg md:mb-0 md:pl-8 md:ml-8 md:border-l md:border-gray-800">
 
-                        @if(str(request()->route()->getName())->contains('school.'))
+                            @if(!str(request()->route()->getName())->contains('.view'))
-                            <a href="{{ route('school.table.city', ['country' => $c, '#table']) }}"
+                                <a href="{{ route('welcome', ['c' => $c]) }}"
-                               class="{{ request()->routeIs('school.table.city') ? 'text-amber-500 underline' : 'text-gray-400' }} mr-5 font-medium leading-6 hover:text-gray-300">
+                                   class="text-gray-400 mr-5 font-medium leading-6 hover:text-gray-300">
-                                {{ __('Cities') }}
+                                    {{ __('Back to the overview') }}
-                            </a>
+                                </a>
-                            <a href="{{ route('school.table.lecturer', ['country' => $c, '#table']) }}"
+                            @elseif(str(request()->route()->getName())->contains('article.view'))
-                               class="{{ request()->routeIs('school.table.lecturer') ? 'text-amber-500 underline' : 'text-gray-400' }} mr-5 font-medium leading-6 hover:text-gray-300">
+                                <a href="{{ route('article.overview') }}"
-                                {{ __('Lecturers') }}
+                                   class="text-gray-400 mr-5 font-medium leading-6 hover:text-gray-300">
-                            </a>
+                                    {{ __('Back to the overview') }}
-                            <a href="{{ route('school.table.venue', ['country' => $c, '#table']) }}"
+                                </a>
-                               class="{{ request()->routeIs('school.table.venue') ? 'text-amber-500 underline' : 'text-gray-400' }} mr-5 font-medium leading-6 hover:text-gray-300">
+                            @elseif(str(request()->route()->getName())->contains('libraryItem.view'))
-                                {{ __('Venues') }}
+                                <a href="{{ route('library.table.libraryItems', ['country' => $country]) }}"
-                            </a>
+                                   class="text-gray-400 mr-5 font-medium leading-6 hover:text-gray-300">
-                            <a href="{{ route('school.table.course', ['country' => $c, '#table']) }}"
+                                    {{ __('Back to the overview') }}
-                               class="{{ request()->routeIs('school.table.course') ? 'text-amber-500 underline' : 'text-gray-400' }} mr-5 font-medium leading-6 hover:text-gray-300">
-                                {{ __('Courses') }}
-                            </a>
-                            <a href="{{ route('school.table.event', ['country' => $c, '#table']) }}"
-                               class="{{ request()->routeIs('school.table.event') ? 'text-amber-500 underline' : 'text-gray-400' }} mr-5 font-medium leading-6 hover:text-gray-300">
-                                {{ __('Events') }}
-                            </a>
-                        @endif
-                        @if(str(request()->route()->getName())->contains('library.'))
-                            <a href="{{ route('library.table.libraryItems', ['country' => $c]) }}"
-                               class="{{ request()->routeIs('library.table.libraryItems') ? 'text-amber-500 underline' : 'text-gray-400' }} mr-5 font-medium leading-6 hover:text-gray-300">
-                                {{ __('Library') }}
-                            </a>
-                            @if(auth()->user()?->is_lecturer)
-                                <a href="{{ route('library.table.lecturer', ['country' => $c]) }}"
-                                   class="{{ request()->routeIs('library.table.lecturer') ? 'text-amber-500 underline' : 'text-gray-400' }} mr-5 font-medium leading-6 hover:text-gray-300">
-                                    {{ __('Library for lecturers') }}
                                 </a>
                             @endif
-                        @endif
-                        @if(str(request()->route()->getName())->contains('bookCases.'))
-                            <a href="{{ route('bookCases.table.city', ['country' => $c]) }}"
-                               class="{{ request()->routeIs('bookCases.table.city') ? 'text-amber-500 underline' : 'text-gray-400' }} mr-5 font-medium leading-6 hover:text-gray-300">
-                                {{ __('City search') }}
-                            </a>
-                            <a href="{{ route('bookCases.table.bookcases', ['country' => $c]) }}"
-                               class="{{ request()->routeIs('bookCases.table.bookcases') ? 'text-amber-500 underline' : 'text-gray-400' }} mr-5 font-medium leading-6 hover:text-gray-300">
-                                {{ __('Bookcases') }}
-                            </a>
-                            <a href="https://openbookcase.de/" target="_blank"
-                               class="text-gray-400 mr-5 font-medium leading-6 hover:text-gray-300">
-                                {{ __('Submit new book case') }}
-                            </a>
-                        @endif
-                        @if(str(request()->route()->getName())->contains('meetup.'))
-                            <a href="{{ route('meetup.world', ['country' => $c]) }}"
-                               class="{{ request()->routeIs('meetup.world') ? 'text-amber-500 underline' : 'text-gray-400' }} mr-5 font-medium leading-6 hover:text-gray-300">
-                                {{ __('World map') }}
-                            </a>
-                            <a href="{{ route('meetup.table.meetup', ['country' => $c]) }}"
-                               class="{{ request()->routeIs('meetup.table.meetup') ? 'text-amber-500 underline' : 'text-gray-400' }} mr-5 font-medium leading-6 hover:text-gray-300">
-                                {{ __('Meetups') }}
-                            </a>
-                            <a href="{{ route('meetup.table.meetupEvent', ['country' => $c]) }}"
-                               class="{{ request()->routeIs('meetup.table.meetupEvent') ? 'text-amber-500 underline' : 'text-gray-400' }} mr-5 font-medium leading-6 hover:text-gray-300">
-                                {{ __('Meetup dates') }}
-                            </a>
-                        @endif
-                        @if(str(request()->route()->getName())->contains('bitcoinEvent.'))
-                            <a href="{{ route('bitcoinEvent.table.bitcoinEvent', ['country' => $c]) }}"
-                               class="{{ request()->routeIs('bitcoinEvent.table.bitcoinEvent') ? 'text-amber-500 underline' : 'text-gray-400' }} mr-5 font-medium leading-6 hover:text-gray-300">
-                                {{ __('Events') }}
-                            </a>
-                        @endif
-                        <a href="{{ route('bookCases.highScoreTable', ['country' => $c]) }}"
-                           class="{{ request()->routeIs('bookCases.highScoreTable') ? 'text-amber-500 underline' : 'text-gray-400' }} mr-5 font-medium leading-6 hover:text-gray-300">
-                            {{ __('Highscore Table') }}
-                        </a>
 
-                    </nav>
+                            @if(str(request()->route()->getName())->contains('school.'))
+                                <a href="{{ route('school.table.city', ['country' => $c, '#table']) }}"
+                                   class="{{ request()->routeIs('school.table.city') ? 'text-amber-500 underline' : 'text-gray-400' }} mr-5 font-medium leading-6 hover:text-gray-300">
+                                    {{ __('Cities') }}
+                                </a>
+                                <a href="{{ route('school.table.lecturer', ['country' => $c, '#table']) }}"
+                                   class="{{ request()->routeIs('school.table.lecturer') ? 'text-amber-500 underline' : 'text-gray-400' }} mr-5 font-medium leading-6 hover:text-gray-300">
+                                    {{ __('Lecturers') }}
+                                </a>
+                                <a href="{{ route('school.table.venue', ['country' => $c, '#table']) }}"
+                                   class="{{ request()->routeIs('school.table.venue') ? 'text-amber-500 underline' : 'text-gray-400' }} mr-5 font-medium leading-6 hover:text-gray-300">
+                                    {{ __('Venues') }}
+                                </a>
+                                <a href="{{ route('school.table.course', ['country' => $c, '#table']) }}"
+                                   class="{{ request()->routeIs('school.table.course') ? 'text-amber-500 underline' : 'text-gray-400' }} mr-5 font-medium leading-6 hover:text-gray-300">
+                                    {{ __('Courses') }}
+                                </a>
+                                <a href="{{ route('school.table.event', ['country' => $c, '#table']) }}"
+                                   class="{{ request()->routeIs('school.table.event') ? 'text-amber-500 underline' : 'text-gray-400' }} mr-5 font-medium leading-6 hover:text-gray-300">
+                                    {{ __('Events') }}
+                                </a>
+                            @endif
+                            @if(str(request()->route()->getName())->contains('library.'))
+                                <a href="{{ route('library.table.libraryItems', ['country' => $c]) }}"
+                                   class="{{ request()->routeIs('library.table.libraryItems') ? 'text-amber-500 underline' : 'text-gray-400' }} mr-5 font-medium leading-6 hover:text-gray-300">
+                                    {{ __('Library') }}
+                                </a>
+                                @if(auth()->user()?->is_lecturer)
+                                    <a href="{{ route('library.table.lecturer', ['country' => $c]) }}"
+                                       class="{{ request()->routeIs('library.table.lecturer') ? 'text-amber-500 underline' : 'text-gray-400' }} mr-5 font-medium leading-6 hover:text-gray-300">
+                                        {{ __('Library for lecturers') }}
+                                    </a>
+                                @endif
+                            @endif
+                            @if(str(request()->route()->getName())->contains('bookCases.'))
+                                <a href="{{ route('bookCases.table.city', ['country' => $c]) }}"
+                                   class="{{ request()->routeIs('bookCases.table.city') ? 'text-amber-500 underline' : 'text-gray-400' }} mr-5 font-medium leading-6 hover:text-gray-300">
+                                    {{ __('City search') }}
+                                </a>
+                                <a href="{{ route('bookCases.table.bookcases', ['country' => $c]) }}"
+                                   class="{{ request()->routeIs('bookCases.table.bookcases') ? 'text-amber-500 underline' : 'text-gray-400' }} mr-5 font-medium leading-6 hover:text-gray-300">
+                                    {{ __('Bookcases') }}
+                                </a>
+                                <a href="https://openbookcase.de/" target="_blank"
+                                   class="text-gray-400 mr-5 font-medium leading-6 hover:text-gray-300">
+                                    {{ __('Submit new book case') }}
+                                </a>
+                            @endif
+                            @if(str(request()->route()->getName())->contains('meetup.'))
+                                <a href="{{ route('meetup.world', ['country' => $c]) }}"
+                                   class="{{ request()->routeIs('meetup.world') ? 'text-amber-500 underline' : 'text-gray-400' }} mr-5 font-medium leading-6 hover:text-gray-300">
+                                    {{ __('World map') }}
+                                </a>
+                                <a href="{{ route('meetup.table.meetup', ['country' => $c]) }}"
+                                   class="{{ request()->routeIs('meetup.table.meetup') ? 'text-amber-500 underline' : 'text-gray-400' }} mr-5 font-medium leading-6 hover:text-gray-300">
+                                    {{ __('Meetups') }}
+                                </a>
+                                <a href="{{ route('meetup.table.meetupEvent', ['country' => $c]) }}"
+                                   class="{{ request()->routeIs('meetup.table.meetupEvent') ? 'text-amber-500 underline' : 'text-gray-400' }} mr-5 font-medium leading-6 hover:text-gray-300">
+                                    {{ __('Meetup dates') }}
+                                </a>
+                            @endif
+                            @if(str(request()->route()->getName())->contains('bitcoinEvent.'))
+                                <a href="{{ route('bitcoinEvent.table.bitcoinEvent', ['country' => $c]) }}"
+                                   class="{{ request()->routeIs('bitcoinEvent.table.bitcoinEvent') ? 'text-amber-500 underline' : 'text-gray-400' }} mr-5 font-medium leading-6 hover:text-gray-300">
+                                    {{ __('Events') }}
+                                </a>
+                            @endif
+                            @if(auth()->check())
+                                <a href="{{ route('bookCases.highScoreTable', ['country' => $c]) }}"
+                                   class="{{ request()->routeIs('bookCases.highScoreTable') ? 'text-amber-500 underline' : 'text-gray-400' }} mr-5 font-medium leading-6 hover:text-gray-300">
+                                    {{ __('Highscore Table') }}
+                                </a>
+                            @endif
+
+                        </nav>
+                    </div>
                 </div>
-                <div class="max-w-sm text-lg text-gray-200 flex flex-row space-x-2">
+                <div class="flex space-x-2 justify-end w-full items-end">
                     <x-native-select
                         label="{{ __('Change country') }}"
                         wire:model="c"
@@ -109,22 +125,15 @@
                         option-label="name"
                         option-value="language"
                     />
-                </div>
+                    @auth
-
+                        <div></div>
-                @auth
+                    @else
-                    <div></div>
-                @else
-                    <div class="inline-flex items-center ml-5 my-2 text-lg space-x-6 lg:justify-end">
                         <x-button href="{{ route('auth.ln') }}">
                             <i class="fa-thin fa-sign-in"></i>
                             {{ __('Login') }}
                         </x-button>
-                        {{--<a href="{{ route('auth.ln') }}"
+                    @endauth
-                           class="text-xs sm:text-base inline-flex items-center justify-center px-4 py-2 font-medium leading-6 text-gray-200 hover:text-white whitespace-no-wrap bg-gray-800 border border-transparent rounded shadow-sm hover:bg-gray-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-gray-800">
+                </div>
-                            {{ __('Registration') }}
-                        </a>--}}
-                    </div>
-                @endauth
             </div>
         </div>
     </section>

resources/views/livewire/frontend/welcome.blade.php

@@ -11,7 +11,7 @@
                 <p class="max-w-sm text-lg text-gray-200">
                     {{ __('A Bitcoin community for all.') }}
                 </p>
-                <div class="max-w-sm text-lg text-gray-200 space-x-2 flex flex-row">
+                <div class="max-w-sm text-lg text-gray-200 space-y-2 sm:space-y-0 sm:space-x-2 flex flex-col sm:flex-row items-start sm:items-end">
                     <x-native-select
                         label="{{ __('Change country') }}"
                         wire:model="c"
@@ -28,6 +28,12 @@
                         option-label="name"
                         option-value="language"
                     />
+                    <div class="py-2 sm:py-0">
+                        <x-button secondary href="{{ route('auth.ln') }}">
+                            <i class="fa-thin fa-sign-in"></i>
+                            {{ __('Login') }}
+                        </x-button>
+                    </div>
                 </div>
             </div>
             <div class="grid w-full grid-cols-1 gap-8 sm:grid-cols-2 md:grid-cols-3 xl:grid-cols-4">

resources/views/livewire/meetup/landing-page.blade.php

@@ -1,4 +1,5 @@
 <div class="bg-21gray flex flex-col h-screen justify-between">
+    <livewire:frontend.header :country="null"/>
     {{-- MAIN --}}
     <section class="w-full mb-12 mt-8">
         <div class="max-w-screen-2xl mx-auto px-2 sm:px-10 space-y-4 flex flex-col sm:flex-row">
@@ -128,13 +129,6 @@
                 @endforeach
             </ul>
 
-            <div class="p-4 w-full flex justify-end">
-                <x-button :href="route('meetup.table.meetup', ['country' => $meetup->city->country->code])" primary lg class="whitespace-nowrap">
-                    <i class="fa fa-thin fa-arrow-left mr-2"></i>
-                    {{ __('Back') }}
-                </x-button>
-            </div>
-
             <div class="w-full mt-8">
 
                 @php
@@ -200,13 +194,6 @@
                     <div x-ref="calendar"></div>
                 </div>
 
-                <div class="p-4 w-full flex justify-end">
-                    <x-button :href="route('meetup.table.meetup', ['country' => $meetup->city->country->code])" primary lg class="whitespace-nowrap">
-                        <i class="fa fa-thin fa-arrow-left mr-2"></i>
-                        {{ __('Back') }}
-                    </x-button>
-                </div>
-
             </div>
 
         </div>

resources/views/livewire/news/article-overview.blade.php

@@ -1,4 +1,5 @@
 <div class="bg-21gray flex flex-col h-screen justify-between">
+    <livewire:frontend.header :country="null"/>
     <div class="relative bg-21gray px-6 pt-16 pb-20 lg:px-8 lg:pt-24 lg:pb-28">
         <div class="absolute inset-0">
             <div class="h-1/3 bg-21gray sm:h-2/3"></div>

resources/views/livewire/news/intern-article-view.blade.php

@@ -1,22 +1,8 @@
 <div class="bg-21gray flex flex-col h-screen justify-between">
     @googlefonts('article')
+    {{-- HEADER --}}
+    <livewire:frontend.header :country="null"/>
     <div class="bg-21gray font-article">
-        <div class="mx-auto max-w-screen-2xl py-4 px-6 lg:px-8 overflow-hidden">
-            <div class="flex items-center justify-end">
-                @if($libraryItem->type === 'markdown_article')
-                    <x-button lg :href="route('article.overview')">
-                        <i class="fa-thin fa-arrow-left"></i>
-                        {{ __('Back to overview') }}
-                    </x-button>
-                @else
-                    <x-button lg :href="route('library.table.libraryItems', ['country' => 'de'])">
-                        <i class="fa-thin fa-arrow-left"></i>
-                        {{ __('Back to overview') }}
-                    </x-button>
-                @endif
-            </div>
-        </div>
-
         <div class="relative mx-auto max-w-screen-2xl py-4 px-6 lg:px-8 overflow-hidden">
             <div class="absolute top-0 bottom-0 left-3/4 hidden w-screen bg-21gray lg:block"></div>
             <div class="mx-auto max-w-prose text-base lg:grid lg:max-w-none lg:grid-cols-2 lg:gap-8">