fix
All checks were successful
deploy to production / deploy (push) Successful in 35s

This commit is contained in:
2023-09-08 14:00:13 +00:00
parent 11062fc0fb
commit 1b8e5fed12
2 changed files with 54 additions and 51 deletions

View File

@@ -64,54 +64,55 @@
{#if row.subTitle} {#if row.subTitle}
<h3 class="subheading">{row.subTitle}</h3> <h3 class="subheading">{row.subTitle}</h3>
{/if} {/if}
<div {#if row?.columns?.length}
class="row" <div
class:twoToThree="{row.twoToThree}" class="row"
class:normalWrap="{row.flexWrapNormal}" class:twoToThree="{row.twoToThree}"
class:dominant="{row.columns.some((col) => col.contentType == 'iconCycleCircle')}" class:normalWrap="{row.flexWrapNormal}"
> class:dominant="{row.columns.some((col) => col.contentType == 'iconCycleCircle')}"
{#each row?.columns as col} >
<div class="col" class:dominant="{col.contentType == 'iconCycleCircle'}"> {#each row?.columns as col}
{#if col?.contentType == "text"} <div class="col" class:dominant="{col.contentType == 'iconCycleCircle'}">
<Text text="{col?.text}" /> {#if col?.contentType == "text"}
{:else if col?.contentType == "textLink"} <Text text="{col?.text}" />
<TextLink {:else if col?.contentType == "textLink"}
description="{col?.textLink?.text}" <TextLink
path="{Object.values($pages)?.find((o) => o.id == col.textLink.link)?.path || '/'}" description="{col?.textLink?.text}"
bright="{bright}" path="{Object.values($pages)?.find((o) => o.id == col.textLink.link)?.path || '/'}"
/> bright="{bright}"
{:else if col.contentType == "image"} />
<Image image="{col?.image}" col="{col}" pageId="{pageId}" /> {:else if col.contentType == "image"}
{:else if col.contentType == "iconBlocks"} <Image image="{col?.image}" col="{col}" pageId="{pageId}" />
<IconBlock pageId="{pageId}" col="{col}" /> {:else if col.contentType == "iconBlocks"}
{:else if col.contentType == "pageLinkBlocks"} <IconBlock pageId="{pageId}" col="{col}" />
<PageLinkBlocks col="{col}" /> {:else if col.contentType == "pageLinkBlocks"}
{:else if col.contentType == "networkEvents"} <PageLinkBlocks col="{col}" />
<Events col="{col}" pageId="{pageId}" /> {:else if col.contentType == "networkEvents"}
{:else if col.contentType == "publications"} <Events col="{col}" pageId="{pageId}" />
<Publications col="{col}" pageId="{pageId}" /> {:else if col.contentType == "publications"}
{:else if col.contentType == "topDown"} <Publications col="{col}" pageId="{pageId}" />
<TopDown col="{col}" /> {:else if col.contentType == "topDown"}
{:else if col.contentType == "infoBoard"} <TopDown col="{col}" />
<InfoBoard col="{col}" pageId="{pageId}" /> {:else if col.contentType == "infoBoard"}
{:else if col.contentType == "nestedCard"} <InfoBoard col="{col}" pageId="{pageId}" />
<NestedCard col="{col}" /> {:else if col.contentType == "nestedCard"}
{:else if col.contentType == "boxlist"} <NestedCard col="{col}" />
<Boxlist col="{col}" /> {:else if col.contentType == "boxlist"}
{:else if col.contentType == "extendableBoxes"} <Boxlist col="{col}" />
<ExtendableBox col="{col}" /> {:else if col.contentType == "extendableBoxes"}
{:else if col.contentType == "personPreview"} <ExtendableBox col="{col}" />
<Persons col="{col}" pageId="{pageId}" /> {:else if col.contentType == "personPreview"}
{:else if col.contentType == "iconCycleCircle"} <Persons col="{col}" pageId="{pageId}" />
<IconCycleCircle col="{col}" pageId="{pageId}" /> {:else if col.contentType == "iconCycleCircle"}
{:else if col.contentType == "iconCycleSquare"} <IconCycleCircle col="{col}" pageId="{pageId}" />
<IconCycleBox col="{col}" pageId="{pageId}" /> {:else if col.contentType == "iconCycleSquare"}
{:else if col.contentType == "worldCard"} <IconCycleBox col="{col}" pageId="{pageId}" />
<WorldCard col="{col}" pageId="{pageId}" /> {:else if col.contentType == "worldCard"}
{/if} <WorldCard col="{col}" pageId="{pageId}" />
</div> {/if}
{/each} </div>
</div> {/each}
</div>{/if}
{/if} {/if}
<style lang="less"> <style lang="less">

View File

@@ -39,6 +39,7 @@
initPage() initPage()
} }
} }
$: console.log(page?.rows, "==rows")
</script> </script>
<div class="rows" class:HP="{path == '/'}"> <div class="rows" class:HP="{path == '/'}">
@@ -48,9 +49,10 @@
<div <div
class="row" class="row"
id="row-{i}" id="row-{i}"
style="{path == '/' && i == page.rows.length - 1 ? 'padding-bottom: 300px;' : ''} {row.noBottomMargin style="{path == '/' && i == page.rows.length - 1 ? 'padding-bottom: 300px;' : ''} {row.row
? 'margin-bottom: 0px;' .noBottomMargin
: ''} {row.noTopMargin ? 'margin-top: 0px;' : ''}" ? 'margin-bottom: 0px; padding-bottom: 0px;'
: ''} {row.row.noTopMargin ? 'margin-top: 0px; padding-top: 0px;' : ''}"
> >
{#if row.row.backgroundImage} {#if row.row.backgroundImage}
<div class="background-image"> <div class="background-image">