accomadesc 0.2.10 → 0.2.12

package/dist/AccoCard.svelte

@@ -3,67 +3,62 @@
   import CalendarAvailable from './CalendarAvailable.svelte';
   import Photo from './Photo.svelte';
   import PricingShort from './PricingShort.svelte';
-  import {
-    isAmenitiesCore,
-    isCalendarAvailable,
-    isPricingShort,
-    type AccoCardContent,
-    type I18nFacade,
-  } from './types.js';
+  import { type AccoCardContent, type I18nFacade } from './types.js';
 
   let {
-    cardContent,
     displayName,
+    coverPhoto,
+    slug,
+    pricing,
+    avail,
+    amenities,
     translateFunc,
     formatFunc,
     formatMoneyFunc,
     formatDateFunc,
   }: AccoCardContent & I18nFacade = $props();
-  let translatedSlug = $derived(
-    translateFunc && cardContent.slug ? translateFunc(cardContent.slug) : '',
-  );
+
+  let translatedSlug = $derived(translateFunc && slug ? translateFunc(slug) : '');
 </script>
 
 <div class="accocard-wrapper">
-  {#if cardContent}
-    <div class="title-with-slug">
-      <h2>{displayName}</h2>
-      {#if cardContent.slug}
-        <div class="slug">{@html translatedSlug}</div>
-      {/if}
-    </div>
-    {#if cardContent.coverPhoto}
-      <div class="photo">
-        <Photo {...cardContent.coverPhoto} {translateFunc} />
-      </div>
-    {/if}
-    {#if cardContent.blocks}
-      {#each cardContent.blocks as b, i}
-        <div class="block-container-{i}">
-          {#if isAmenitiesCore(b)}
-            <AmenitiesCore {...b.content} {formatFunc} {formatMoneyFunc} {formatDateFunc} />
-          {:else if isPricingShort(b)}
-            <PricingShort
-              {...b.content}
-              {translateFunc}
-              {formatFunc}
-              {formatMoneyFunc}
-              {formatDateFunc}
-            />
-          {:else if isCalendarAvailable(b)}
-            <CalendarAvailable
-              {...b.content}
-              {translateFunc}
-              {formatFunc}
-              {formatMoneyFunc}
-              {formatDateFunc}
-            />
-          {:else}
-            <span>Unsupported</span>
-          {/if}
-        </div>
-      {/each}
+  <div class="title-with-slug">
+    <h2>{displayName}</h2>
+    {#if slug}
+      <div class="slug">{@html translatedSlug}</div>
     {/if}
+  </div>
+  {#if coverPhoto}
+    <div class="photo">
+      <Photo {...coverPhoto} {translateFunc} />
+    </div>
+  {/if}
+  {#if amenities}
+    <div class="amenities-container">
+      <AmenitiesCore {...amenities.content} {formatFunc} {formatMoneyFunc} {formatDateFunc} />
+    </div>
+  {/if}
+  {#if pricing}
+    <div class="pricing-container">
+      <PricingShort
+        {...pricing.content}
+        {translateFunc}
+        {formatFunc}
+        {formatMoneyFunc}
+        {formatDateFunc}
+      />
+    </div>
+  {/if}
+  {#if avail}
+    <div class="calendar-container">
+      <CalendarAvailable
+        {...avail.content}
+        {translateFunc}
+        {formatFunc}
+        {formatMoneyFunc}
+        {formatDateFunc}
+      />
+    </div>
   {/if}
 </div>
 
@@ -76,17 +71,17 @@
     grid-area: first-row-line / start-line / fifth-row-line / middle-line;
   }
 
-  .block-container-0 {
+  .amenities-container {
     grid-area: second-row-line / middle-line / third-row-line / end-line;
     position: relative;
   }
 
-  .block-container-1 {
+  .pricing-container {
     grid-area: third-row-line / middle-line / fourth-row-line / end-line;
     position: relative;
   }
 
-  .block-container-2 {
+  .calendar-container {
     grid-area: fourth-row-line / middle-line / fifth-row-line / end-line;
     position: relative;
   }
@@ -140,15 +135,15 @@
       grid-area: first-row-line / start-line / third-row-line / middle-line;
     }
 
-    .block-container-0 {
+    .amenities-container {
       grid-area: second-row-line / middle-line / third-row-line / end-line;
     }
 
-    .block-container-1 {
+    .pricing-container {
       grid-area: third-row-line / start-line / fourth-row-line / middle-line;
     }
 
-    .block-container-2 {
+    .calendar-container {
       grid-area: third-row-line / middle-line / fourth-row-line / end-line;
     }
   }
@@ -169,17 +164,17 @@
       grid-column: 1;
     }
 
-    .block-container-0 {
+    .amenities-container {
       grid-row: auto;
       grid-column: 1;
     }
 
-    .block-container-1 {
+    .pricing-container {
       grid-row: auto;
       grid-column: 1;
     }
 
-    .block-container-2 {
+    .calendar-container {
       grid-row: auto;
       grid-column: 1;
     }

package/dist/ContactForm.svelte

@@ -149,7 +149,7 @@
   form {
     display: flex;
     flex-direction: column;
-    justify-content: stretch;
+    width: 100%;
     gap: 0.5rem;
   }
 

package/dist/index.d.ts

@@ -24,6 +24,6 @@ import Text from './Text.svelte';
 import Weather from './Weather.svelte';
 import PageComponent from './PageComponent.svelte';
 export type { OccuplanTranslations } from './occuplan/state.svelte.ts';
-export type { GridPhoto, LeafletMap as LeafletMapI, LeafletMapContent, Calendar as CalendarI, CalendarContent, CalendarAvailable as CalendarAvailableI, CalendarAvailableContent, CalendarGrid as CalendarGridI, CalendarGridContent, CalendarRows as CalendarRowsI, CalendarRowsContent, Text as TextI, TextContent, Weather as WeatherI, WeatherContent, Photo as PhotoI, PhotoContent, PhotoGallery as PhotoGalleryI, PhotoGalleryContent, Pricing as PricingI, PricingContent, PricingShort as PricingShortI, PricingShortContent, PricingEntry, PricingRange, PricingColumn, StaticRangeDate, StaticPricingRange, AmenitiesCore as AmenitiesCoreI, AmenitiesCoreContent, AccoCard as AccoCardI, AccoCardContent, ContactForm as ContactFormI, ContactFormContent, BookingRequest as BookingRequestI, BookingRequestContent, CardContent, AccoDescription as AccoDescriptionI, AccoDescriptionContent, Section as SectionI, I18nFacade, Block, PageProps, Nav as NavI, FormatSpec, FormatTemplateName, SiteConfig, LangConfig, CookieConfig, SiteFonts, SiteTranslation, FontSpec, Hero, } from './types.js';
+export type { GridPhoto, LeafletMap as LeafletMapI, LeafletMapContent, Calendar as CalendarI, CalendarContent, CalendarAvailable as CalendarAvailableI, CalendarAvailableContent, CalendarGrid as CalendarGridI, CalendarGridContent, CalendarRows as CalendarRowsI, CalendarRowsContent, Text as TextI, TextContent, Weather as WeatherI, WeatherContent, Photo as PhotoI, PhotoContent, PhotoGallery as PhotoGalleryI, PhotoGalleryContent, Pricing as PricingI, PricingContent, PricingShort as PricingShortI, PricingShortContent, PricingEntry, PricingRange, PricingColumn, StaticRangeDate, StaticPricingRange, AmenitiesCore as AmenitiesCoreI, AmenitiesCoreContent, AccoCard as AccoCardI, AccoCardContent, ContactForm as ContactFormI, ContactFormContent, BookingRequest as BookingRequestI, BookingRequestContent, AccoDescription as AccoDescriptionI, AccoDescriptionContent, Section as SectionI, I18nFacade, Block, PageProps, Nav as NavI, FormatSpec, FormatTemplateName, SiteConfig, LangConfig, CookieConfig, SiteFonts, SiteTranslation, FontSpec, Hero, } from './types.js';
 export { PRICING_COLUMNS, BLOCK_KINDS, isAccoCard, isText, isPhoto, isGallery, isLeafletMap, isWeather, isAmenitiesCore, isCalendarAvailable, isCalendar, isCalendarGrid, isCalendarRows, isPricing, isPricingShort, isAccoDescription, isBookingRequest, isContactForm, } from './types.js';
 export { randomID, randomName, Avatar, Button, Icon, Spinner, TextInput, AccoCard, AccoDescription, AmenitiesCore, Calendar, CalendarAvailable, LeafletMap, Photo, PhotoGallery, Pricing, PricingShort, Section, Text, Weather, BookingRequest, ContactForm, CalendarRows, CalendarGrid, Notes, PageComponent, };

package/dist/types.d.ts

@@ -2,6 +2,7 @@ import { type Dinero, type DineroSnapshot } from 'dinero.js';
 import type { FirstMonth, OccuplanTranslations } from './occuplan/state.svelte.js';
 import type { DateTime, MonthNumbers, WeekdayNumbers } from 'luxon';
 import type { CookieType, Translation as CookieTranslation } from 'gdpr-cooco-banner';
+import type { CalendarAvailableI } from './index.ts';
 export type WeekdayLabels = {
     [key in WeekdayNumbers]: string;
 };
@@ -223,13 +224,12 @@ export interface AccoCard {
     content: AccoCardContent;
 }
 export interface AccoCardContent {
-    cardContent: CardContent;
     displayName: string;
-}
-export interface CardContent {
     coverPhoto: PhotoContent;
     slug?: string;
-    blocks: Block[];
+    pricing: PricingShort;
+    avail: CalendarAvailable;
+    amenities: AmenitiesCore;
 }
 export interface AccoDescription {
     id: string;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "accomadesc",
-	"version": "0.2.10",
+	"version": "0.2.12",
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build && npm run package",