From 8600a09a08a9cb79cb0a9029c5b5f41045ffa429 Mon Sep 17 00:00:00 2001 From: Mariia <705283@student.inholland.nl> Date: Sun, 7 Apr 2024 04:08:34 +0200 Subject: [PATCH 1/5] jazz responsive --- app/pages/jazz/artist/main.blade.php | 4 + app/pages/jazz/overview/artists.blade.php | 15 +++ app/pages/jazz/overview/header.blade.php | 13 +++ app/pages/jazz/overview/main.blade.php | 129 +++------------------ app/pages/jazz/overview/passes.blade.php | 20 ++++ app/pages/jazz/overview/schedule.blade.php | 30 +++++ app/pages/jazz/overview/venue.blade.php | 17 +++ app/public/css/jazzStyles.css | 26 ++--- 8 files changed, 124 insertions(+), 130 deletions(-) create mode 100644 app/pages/jazz/overview/passes.blade.php create mode 100644 app/pages/jazz/overview/schedule.blade.php diff --git a/app/pages/jazz/artist/main.blade.php b/app/pages/jazz/artist/main.blade.php index 71eca13..bf3333a 100644 --- a/app/pages/jazz/artist/main.blade.php +++ b/app/pages/jazz/artist/main.blade.php @@ -13,6 +13,7 @@ +@include('main.navbar')
@if ($artist->HeaderImg) @@ -159,5 +160,8 @@ class="object-contain max-h-80 mx-auto"/>
@endforeach + +@include('main.footer') + diff --git a/app/pages/jazz/overview/artists.blade.php b/app/pages/jazz/overview/artists.blade.php index e69de29..06da96b 100644 --- a/app/pages/jazz/overview/artists.blade.php +++ b/app/pages/jazz/overview/artists.blade.php @@ -0,0 +1,15 @@ +
+
+ @foreach ($eventDay['performances'] as $performance) + @if ($artist = $performance->Artist) + +

+ {{ $artist->Name }} +

+ {{ $artist->Name }} +
FIND OUT MORE
+ + @endif + @endforeach +
+
\ No newline at end of file diff --git a/app/pages/jazz/overview/header.blade.php b/app/pages/jazz/overview/header.blade.php index e69de29..e6e8931 100644 --- a/app/pages/jazz/overview/header.blade.php +++ b/app/pages/jazz/overview/header.blade.php @@ -0,0 +1,13 @@ +
+ {{ $festivalEvent->getFestivalEventName() }} +
+

+ {{ $festivalEvent->getFestivalEventName() }} +

+

+ {{ date('j F', strtotime($festivalEvent->getStartDate())) }} - + {{ date('j F', strtotime($festivalEvent->getEndDate())) }} +

+
+
+ diff --git a/app/pages/jazz/overview/main.blade.php b/app/pages/jazz/overview/main.blade.php index 2ceba69..76321bb 100644 --- a/app/pages/jazz/overview/main.blade.php +++ b/app/pages/jazz/overview/main.blade.php @@ -5,7 +5,6 @@ {{ $festivalEvent->getFestivalEventName() }} - @@ -14,134 +13,34 @@ @include('main.navbar') - -
- {{ $festivalEvent->getFestivalEventName() }} -
-

- {{ $festivalEvent->getFestivalEventName() }} -

-

- {{ date('j F', strtotime($festivalEvent->getStartDate())) }} - - {{ date('j F', strtotime($festivalEvent->getEndDate())) }} -

-
-
-
-

+@include('jazz.overview.header') + +

+

{{ $festivalEvent->getDescription() }}

-
-
-

+ +
+

{{ $festivalEvent->getTitle() }}

- @foreach ($eventDays as $dayNumber => $eventDay) - -
-

- DAY {{ $dayNumber + 1 }} - - {{ date('l, F jS', strtotime($eventDay['day']->Date)) }} 📍 - - {{ $eventDay['day']->Venue->Name }} - - {{ $eventDay['day']->Venue->Name }}
- {{ $eventDay['day']->Venue->Address }}
- {{ $eventDay['day']->Venue->ContactDetails }} - @if (!empty($eventDay['day']->Note)) - {{ $eventDay['day']->Note }} - @endif - - -

-
+ @include('jazz.overview.venue') - -
- Jazz Day Image - - - @foreach ($eventDay['performances'] as $index => $performance) -
-
-

- {{ $performance->Artist->Name }} -
{{ date('H:i', strtotime($performance->StartDateTime)) }} - - {{ date('H:i', strtotime($performance->EndDateTime)) }} - @if (!empty($performance->Details)) - | {{ $performance->Details }} - @endif - @if ($performance->Price != '0.00') - - € {{ number_format($performance->Price, 2) }} - @else - - Free! - @endif -

- @if ($performance->Price != '0.00') - @if ($performance->AvailableTickets > 0) - - Buy Tickets! - @else - - @endif - @endif -
-
- @endforeach - - - @php $passesStartOffset = count($eventDay['performances']) * 80 + 40; @endphp - @foreach ($eventDay['passes'] as $index => $pass) -
-
-

- {{ $pass->Note }}
- Price: €{{ number_format($pass->Price, 2) }}
-

- @if($pass->AvailableTickets > 0) - - Buy Jazz Pass! - - @else - - @endif -
-
- @endforeach - +
+ @include('jazz.overview.schedule') + @include('jazz.overview.passes')
- -
-
- @foreach ($eventDay['performances'] as $performance) - @if ($artist = $performance->Artist) - -

- {{ $artist->Name }} -

- {{ $artist->Name }} -
FIND OUT MORE
- - @endif - @endforeach -
-
- + @include('jazz.overview.artists') + @endforeach @include('main.footer') diff --git a/app/pages/jazz/overview/passes.blade.php b/app/pages/jazz/overview/passes.blade.php new file mode 100644 index 0000000..9ff8c55 --- /dev/null +++ b/app/pages/jazz/overview/passes.blade.php @@ -0,0 +1,20 @@ +@php $passesStartOffset = count($eventDay['performances']) * 80 + 40; @endphp +@foreach ($eventDay['passes'] as $index => $pass) +
+
+

+ {{ $pass->Note }}
+ Price: €{{ number_format($pass->Price, 2) }}
+

+ @if($pass->AvailableTickets > 0) + + Buy Jazz Pass! + + @else + + @endif +
+
+@endforeach \ No newline at end of file diff --git a/app/pages/jazz/overview/schedule.blade.php b/app/pages/jazz/overview/schedule.blade.php new file mode 100644 index 0000000..66402a9 --- /dev/null +++ b/app/pages/jazz/overview/schedule.blade.php @@ -0,0 +1,30 @@ +@foreach ($eventDay['performances'] as $index => $performance) +
+
+

+ {{ $performance->Artist->Name }} +
{{ date('H:i', strtotime($performance->StartDateTime)) }} + - {{ date('H:i', strtotime($performance->EndDateTime)) }} + @if (!empty($performance->Details)) + | {{ $performance->Details }} + @endif + @if ($performance->Price != '0.00') + - € {{ number_format($performance->Price, 2) }} + @else + - Free! + @endif +

+ @if ($performance->Price != '0.00') + @if ($performance->AvailableTickets > 0) + + Buy Tickets! + + @else + + @endif + @endif +
+
+@endforeach diff --git a/app/pages/jazz/overview/venue.blade.php b/app/pages/jazz/overview/venue.blade.php index e69de29..79b7e79 100644 --- a/app/pages/jazz/overview/venue.blade.php +++ b/app/pages/jazz/overview/venue.blade.php @@ -0,0 +1,17 @@ +
+

+ DAY {{ $dayNumber + 1 }} - + {{ date('l, F jS', strtotime($eventDay['day']->Date)) }} 📍 + + {{ $eventDay['day']->Venue->Name }} + + {{ $eventDay['day']->Venue->Name }}
+ {{ $eventDay['day']->Venue->Address }}
+ {{ $eventDay['day']->Venue->ContactDetails }} + @if (!empty($eventDay['day']->Note)) + {{ $eventDay['day']->Note }} + @endif + + +

+
\ No newline at end of file diff --git a/app/public/css/jazzStyles.css b/app/public/css/jazzStyles.css index beb53d5..30506f9 100644 --- a/app/public/css/jazzStyles.css +++ b/app/public/css/jazzStyles.css @@ -26,28 +26,22 @@ opacity: 1; } +.artist-card:hover .artist-image { + filter: brightness(50%); +} + +.artist-card:hover .overlay { + opacity: 1; +} + .artist-card { overflow: hidden; background-color: #b92090; position: relative; - /* This ensures the overlay is positioned relative to the artist-card */ } .artist-image { display: block; - max-width: 100%; - height: auto; - width: auto; - max-height: 200px; - object-fit: cover; -} - -.artist-card:hover .artist-image { - filter: brightness(50%); -} - -.artist-card:hover .overlay { - opacity: 1; } .overlay { @@ -61,4 +55,6 @@ font-size: 1.5rem; font-weight: bold; pointer-events: none; -} \ No newline at end of file +} + + From f4900d55e7e170a4497425085aa5225f7dec939d Mon Sep 17 00:00:00 2001 From: Mariia <705283@student.inholland.nl> Date: Sun, 7 Apr 2024 04:09:10 +0200 Subject: [PATCH 2/5] nav bar responsive but sticky doesnt work --- app/pages/main/mainpage_head.blade.php | 9 ++++++ app/pages/main/navbar.blade.php | 43 +++++++++++++++----------- 2 files changed, 34 insertions(+), 18 deletions(-) diff --git a/app/pages/main/mainpage_head.blade.php b/app/pages/main/mainpage_head.blade.php index a32490f..75296a5 100644 --- a/app/pages/main/mainpage_head.blade.php +++ b/app/pages/main/mainpage_head.blade.php @@ -6,6 +6,15 @@ + diff --git a/app/pages/main/navbar.blade.php b/app/pages/main/navbar.blade.php index f5f592e..de2e5fd 100644 --- a/app/pages/main/navbar.blade.php +++ b/app/pages/main/navbar.blade.php @@ -1,20 +1,27 @@ -