Mark free concerts as free and make it more clear that they are free

mandaljazz · Jun 7, 2024 · 7920b67 · 7920b67
1 parent 3be5e51
commit 7920b67
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 19 deletions.
diff --git a/src/components/InfoBox.astro b/src/components/InfoBox.astro
@@ -2,7 +2,7 @@
 import { Icon } from "astro-icon";
 ---
 
-<div class="rounded-lg p-4 bg-blue/50 bg-grainy flex flex-row gap-2 w-fit text-md">
+<div class="rounded-lg p-4 bg-pink bg-grainy flex flex-row gap-2 w-fit text-md">
   <span
     ><Icon
       class="icon group-hover:-translate-y-0.5 transition-transform"

diff --git a/src/layouts/ArtistLayout.astro b/src/layouts/ArtistLayout.astro
@@ -13,7 +13,6 @@ import IconAndLabel from "../components/IconAndLabel.astro";
 import InfoBox from "../components/InfoBox.astro";
 import ImageAndLabel from "../components/ImageAndLabel.astro";
 import BuyTicketsButton from "../components/BuyTicketsButton.astro";
-import { randomHandSrc } from "../utils/images";
 import ImageWithBlurredBackground from "../components/ImageWithBlurredBackground.astro";
 
 const {
@@ -171,13 +170,6 @@ const image = imageType ? `${id}.${imageType}` : `${id}.jpg`;
           </article>
         </div>
         <div class="col-span-1 flex flex-col gap-y-8">
-          {
-            spotifyUrl && (
-              <div class="flex-1">
-                <Spotify src={spotifyUrl} iframeClass="lg:h-full" />
-              </div>
-            )
-          }
           {
             isFree && !requiresFreeTicket && (
               <InfoBox>Konserten er gratis!</InfoBox>
@@ -221,6 +213,13 @@ const image = imageType ? `${id}.${imageType}` : `${id}.jpg`;
               )
             }
           </div>
+          {
+            spotifyUrl && (
+              <div class="flex-1">
+                <Spotify src={spotifyUrl} iframeClass="lg:h-full" />
+              </div>
+            )
+          }
         </div>
       </div>
       {youtubeUrl && <YouTube src={youtubeUrl} />}

diff --git a/src/pages/artist/riti-ritimo-13.mdx b/src/pages/artist/riti-ritimo-13.mdx
@@ -13,8 +13,8 @@ concertStartAt: 2024-06-29T13:00
 sponsoredByBergesenstiftelsen: false # true hvis logoen til Bergesenstiftelsen skal vises, false hvis ikke
 hideFromProgram: false # true hvis den skal skjules fra programsiden, false hvis den skal vises
 hideFromArtistList: true # true hvis den skal skjules fra forsiden, false hvis den skal vises
-isFree: false # true hvis den er gratis, false hvis ikke
-requiresFreeTicket: false # true hvis konserten er gratis, men krever gratisbillett
+isFree: true # true hvis den er gratis, false hvis ikke
+requiresFreeTicket: true # true hvis konserten er gratis, men krever gratisbillett
 isPlaceholder: false
 order: 10
 ---

diff --git a/src/pages/artist/riti-ritimo.mdx b/src/pages/artist/riti-ritimo.mdx
@@ -13,8 +13,8 @@ concertStartAt: 2024-06-29T11:00
 sponsoredByBergesenstiftelsen: false # true hvis logoen til Bergesenstiftelsen skal vises, false hvis ikke
 hideFromProgram: false # true hvis den skal skjules fra programsiden, false hvis den skal vises
 hideFromArtistList: false # true hvis den skal skjules fra forsiden, false hvis den skal vises
-isFree: false # true hvis den er gratis, false hvis ikke
-requiresFreeTicket: false # true hvis konserten er gratis, men krever gratisbillett
+isFree: true # true hvis den er gratis, false hvis ikke
+requiresFreeTicket: true # true hvis konserten er gratis, men krever gratisbillett
 isPlaceholder: false
 order: 8
 ---

diff --git a/src/pages/artist/swingit.mdx b/src/pages/artist/swingit.mdx
@@ -14,7 +14,7 @@ youtubeUrl: https://www.youtube.com/watch?v=Fm_95Jcq6wU
 sponsoredByBergesenstiftelsen: false # true hvis logoen til Bergesenstiftelsen skal vises, false hvis ikke
 hideFromProgram: false # true hvis den skal skjules fra programsiden, false hvis den skal vises
 hideFromArtistList: false # true hvis den skal skjules fra forsiden, false hvis den skal vises
-isFree: false # true hvis den er gratis, false hvis ikke
+isFree: true # true hvis den er gratis, false hvis ikke
 requiresFreeTicket: false # true hvis konserten er gratis, men krever gratisbillett
 isPlaceholder: false
 order: 9

diff --git a/src/pages/program.astro b/src/pages/program.astro
@@ -14,16 +14,19 @@ const tbaArtists = [
     title: "Jazzlaugs gebursdag m/M. Rexen solo",
     venue: "Bakgården",
     concertStartAt: "2024-06-27T18:00",
+    isFree: true,
   },
   {
     title: "Nachspiel",
     venue: "Dynamitten",
     concertStartAt: "2024-06-27T23:59",
+    isFree: true,
   },
   {
     title: "Jazzparade (med SNUS)",
     venue: "Gierts Karis Plass",
     concertStartAt: "2024-06-29T13:30",
+    isFree: true,
   },
 ];
 
@@ -80,6 +83,7 @@ const concertsGroupedByDay = Object.entries(
                         concertStartAt,
                         hideFromProgram,
                         isPlaceholder,
+                        isFree,
                       },
                     }) => {
                       const image = imageType
@@ -91,7 +95,7 @@ const concertsGroupedByDay = Object.entries(
                       }
 
                       return (
-                        <div class="grid grid-cols-4 gap-y-1 col-span-4">
+                        <div class="grid grid-cols-4 gap-y-1 gap-2 col-span-4">
                           <div class="col-span-4 flex flex-row gap-2 md:col-span-2 text-xl md:text-lg">
                             {id ? (
                               <img
@@ -100,15 +104,25 @@ const concertsGroupedByDay = Object.entries(
                                 class="w-8 h-8 rounded-lg object-cover"
                               />
                             ) : null}
-                            <p class="truncate">
+                            <div class="flex flex-row gap-2 items-start">
                               {id && !isPlaceholder ? (
-                                <Link href={`/artist/${id}`} title={title}>
+                                <Link
+                                  class="truncate"
+                                  href={`/artist/${id}`}
+                                  title={title}
+                                >
                                   {shortTitle || title}
                                 </Link>
                               ) : (
-                                title
+                                <div title={title}>{title}</div>
                               )}
-                            </p>
+
+                              {isFree && (
+                                <div class="bg-pink -rotate-6 text-xs mt-1 px-1 rounded">
+                                  Gratis!
+                                </div>
+                              )}
+                            </div>
                           </div>
                           <div class="col-span-3 md:col-span-1">{venue}</div>
                           <div class="">{formatTime(concertStartAt)}</div>