+
+ {#each visiblePhotos as { id, image, title }, index (id)}
+
+
+
+ {/each}
+
+
+
+
+
+
+
+
- {/each}
-
+
+
{currentPhoto.title}
-
-
-
-
-
-
-
{currentPhoto.title}
-
-
-
-
-
-
-
-
+ {#if isFullscreen}
+
-
- {/if}
+ {/if}
+
\ No newline at end of file
diff --git a/src/routes/about/+page.server.ts b/src/routes/(site)/about/+page.server.ts
similarity index 100%
rename from src/routes/about/+page.server.ts
rename to src/routes/(site)/about/+page.server.ts
diff --git a/src/routes/(site)/about/+page.svelte b/src/routes/(site)/about/+page.svelte
new file mode 100644
index 0000000..7700770
--- /dev/null
+++ b/src/routes/(site)/about/+page.svelte
@@ -0,0 +1,402 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{about.intro_title}
+
+ {@html about.intro_heading}
+
+
+
+ {@html about.intro_text}
+
+
+
+
+
+ {about.intro_firstphoto_caption}
+ in
+
+ })
+ Naarm Australia (Melbourne)
+
+
+
+
+
{about.creation_title}
+
+ {@html about.creation_heading}
+
+
+
+ {@html about.creation_text}
+
+
+
+
+
+
+ {about.creation_portrait_caption}
+
+
+
+
+
+
+
{about.present_title}
+
+
+
+ {@html about.present_heading}
+
+
+
+
{about.present_conclusion}
+
+
+
+
+ {/if}
+
+
+
+
+
+
+ {#each about.process_steps as { text, image, video_mp4, video_webm }, index}
+ {#if index === currentStep}
+
+ {/if}
+ {/each}
+
+
+
+ {#each photos as { image: { id }, title }, index}
+
+ {/each}
+
+
+
{about.contact_title}
+
+ {#each about.contact_blocks as { title, text, link, button }}
+
+
{title}
+
+ {@html text}
+
+
+
+ {/each}
+
+
\ No newline at end of file
diff --git a/src/routes/api/data/+server.ts b/src/routes/(site)/api/data/+server.ts
similarity index 100%
rename from src/routes/api/data/+server.ts
rename to src/routes/(site)/api/data/+server.ts
diff --git a/src/routes/credits/+page.server.ts b/src/routes/(site)/credits/+page.server.ts
similarity index 100%
rename from src/routes/credits/+page.server.ts
rename to src/routes/(site)/credits/+page.server.ts
diff --git a/src/routes/(site)/credits/+page.svelte b/src/routes/(site)/credits/+page.svelte
new file mode 100644
index 0000000..795ba92
--- /dev/null
+++ b/src/routes/(site)/credits/+page.svelte
@@ -0,0 +1,149 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {#each data.credits.list as { title, credits }}
+
+
{title}
+
+ {#each credits as { name, role, website }}
+ -
+
+ -
+ {#if website}
+
+ {:else}
+
{name}
+ {/if}
+
+ -
+ {role}
+
+
+
+ {/each}
+
+
+ {/each}
+
+
+
Photography
+
+ {#each credit as { name, website, location }}
+ -
+
+ -
+ {#if website}
+
+ {:else}
+
{name}
+ {/if}
+
+ -
+
+
+
+
+ {/each}
+
+
+
\ No newline at end of file
diff --git a/src/routes/(site)/feed/products.xml/+server.ts b/src/routes/(site)/feed/products.xml/+server.ts
new file mode 100644
index 0000000..0b3eca6
--- /dev/null
+++ b/src/routes/(site)/feed/products.xml/+server.ts
@@ -0,0 +1,94 @@
+import { error } from '@sveltejs/kit'
+import type { RequestHandler } from './$types'
+import { fetchSwell } from '$utils/functions/shopServer'
+import { fetchAPI, getAssetUrlKey } from '$utils/api'
+
+const gCategories = [
+ {
+ id: '61851d83cd16416c78a8e5ef',
+ type: 'Posters, Prints, & Visual Artwork',
+ value: 'Home & Garden > Decor > Artwork > Posters, Prints, & Visual Artwork'
+ }
+]
+
+export const GET: RequestHandler = async ({ url, setHeaders }) => {
+ try {
+ const products = []
+
+ // Get products from Swell API
+ const shopProducts: any = await fetchSwell(`/products`)
+
+ // Get products from site API
+ const siteProducts = await fetchAPI(`query {
+ products: product (filter: { status: { _eq: "published" }}) {
+ location { slug }
+ name
+ description
+ details
+ product_id
+ photos_product {
+ directus_files_id { id }
+ }
+ }
+ }`)
+
+ if (shopProducts && siteProducts) {
+ const { data } = siteProducts
+
+ // Loop through shop products
+ shopProducts.results.forEach((product: any) => {
+ // Find matching product from site to platform
+ const siteProduct = data.products.find((p: any) => p.product_id === product.id)
+ const category = gCategories.find(p => p.id === product.category_index.id[0])
+
+ products.push({
+ id: product.id,
+ name: `${product.name} - Poster`,
+ slug: siteProduct.location.slug,
+ description: siteProduct.description,
+ price: product.price,
+ images: siteProduct.photos_product.map(({ directus_files_id: { id }}: any) => getAssetUrlKey(id, `product-large-jpg`)),
+ gCategory: category.value,
+ gType: category.type,
+ })
+ })
+ }
+
+ const sitemap = render(url.origin, products)
+
+ setHeaders({
+ 'Content-Type': 'application/xml',
+ 'Cache-Control': 'max-age=0, s-max-age=600',
+ })
+
+ return new Response(sitemap)
+ } catch (err) {
+ throw error(500, err.message)
+ }
+}
+
+const render = (origin: string, products: any[]) => {
+ return `
+
+
+ ${products.map((product) => `-
+ ${product.id}
+ ${product.name}
+ ${product.description}
+ ${product.gType}
+ ${product.gCategory}
+ ${origin}/shop/poster-${product.slug}
+ ${product.images[0]}
+ New
+ In Stock
+ ${product.price} EUR
+ Houses Of
+ FALSE
+ ${product.images.slice(1).map((image: any) => `
+ ${image}
+ `).join('')}
+
+ `).join('')}
+
+`
+}
\ No newline at end of file
diff --git a/src/routes/(site)/locations/+page.server.ts b/src/routes/(site)/locations/+page.server.ts
new file mode 100644
index 0000000..f97107a
--- /dev/null
+++ b/src/routes/(site)/locations/+page.server.ts
@@ -0,0 +1,8 @@
+import type { Actions } from './$types'
+import subscribe from '$utils/forms/subscribe'
+
+
+export const actions: Actions = {
+ // Form newsletter subscription
+ subscribe,
+}
\ No newline at end of file
diff --git a/src/routes/locations/+page.svelte b/src/routes/(site)/locations/+page.svelte
similarity index 64%
rename from src/routes/locations/+page.svelte
rename to src/routes/(site)/locations/+page.svelte
index f6027d3..1eae1e6 100644
--- a/src/routes/locations/+page.svelte
+++ b/src/routes/(site)/locations/+page.svelte
@@ -1,5 +1,5 @@
+
+
+
+
+
+
+
+
+
+
+ {#each legal.terms as { title, text }, index}
+
+ {index + 1}. {title}
+
+ {@html text}
+
+
+ {/each}
+
+
+
\ No newline at end of file
diff --git a/src/routes/+error.svelte b/src/routes/+error.svelte
index e6a3043..52e1188 100644
--- a/src/routes/+error.svelte
+++ b/src/routes/+error.svelte
@@ -34,49 +34,52 @@
title="{errors[$page.status].title} – Houses Of"
/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
\ No newline at end of file
diff --git a/src/routes/+layout.server.ts b/src/routes/+layout.server.ts
index 0701f1c..21f3820 100644
--- a/src/routes/+layout.server.ts
+++ b/src/routes/+layout.server.ts
@@ -1,10 +1,10 @@
import { error } from '@sveltejs/kit'
-import type { PageServerLoad } from './$types'
+import type { LayoutServerLoad } from './$types'
import { fetchAPI } from '$utils/api'
import { PUBLIC_PREVIEW_COUNT } from '$env/static/public'
-export const load: PageServerLoad = async () => {
+export const load: LayoutServerLoad = async () => {
try {
const res = await fetchAPI(`query {
locations: location (filter: { status: { _eq: "published" }}) {
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 578e6b9..b1f8d3d 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -2,14 +2,13 @@
import '../style/global.scss'
import { browser } from '$app/environment'
- import { navigating, page } from '$app/stores'
+ import { page } from '$app/stores'
import { beforeNavigate } from '$app/navigation'
+ import { PUBLIC_ANALYTICS_DOMAIN } from '$env/static/public'
import type { PageData } from './$types'
import { onMount, setContext } from 'svelte'
import { pageLoading, previousPage } from '$utils/stores'
- import { DURATION } from '$utils/contants'
import '$utils/polyfills'
- import { PUBLIC_ANALYTICS_KEY, PUBLIC_ANALYTICS_URL } from '$env/static/public'
// Components
import SVGSprite from '$components/SVGSprite.svelte'
import SmoothScroll from '$components/SmoothScroll.svelte'
@@ -44,17 +43,9 @@
$previousPage = from.url.pathname
})
- // Define page loading from navigating store
- navigating.subscribe((store: any) => {
- if (store) {
- $pageLoading = true
+ // Define page loading
+ $: browser && document.body.classList.toggle('is-loading', $pageLoading)
- // Turn page loading when changing page
- setTimeout(() => {
- $pageLoading = false
- }, DURATION.PAGE_IN * 1.25)
- }
- })
onMount(() => {
// Avoid FOUC
@@ -65,6 +56,8 @@
+
+
{#each fonts as font}
{/each}
@@ -79,16 +72,9 @@
{/if}
-{#if $pageLoading}
-
-{/if}
-
{#if browser}
-
+
{/if}
\ No newline at end of file
diff --git a/src/routes/+page.server.ts b/src/routes/+page.server.ts
index 2ce88a9..a3e904a 100644
--- a/src/routes/+page.server.ts
+++ b/src/routes/+page.server.ts
@@ -1,8 +1,13 @@
import { error } from '@sveltejs/kit'
-import type { PageServerLoad } from './$types'
+import type { Actions, PageServerLoad } from './$types'
import { fetchAPI } from '$utils/api'
import { getRandomItems } from '$utils/functions'
+import subscribe from '$utils/forms/subscribe'
+
+/**
+ * Page Data
+ */
export const load: PageServerLoad = async ({ setHeaders }) => {
try {
// Get total of published photos
@@ -52,4 +57,13 @@ export const load: PageServerLoad = async ({ setHeaders }) => {
} catch (err) {
throw error(500, err.message)
}
+}
+
+
+/**
+ * Form Data
+ */
+export const actions: Actions = {
+ // Form newsletter subscription
+ subscribe,
}
\ No newline at end of file
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 52c8c37..8eba6d9 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -3,11 +3,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
{about.intro_title}
-
- {@html about.intro_heading}
-
-
-
- {@html about.intro_text}
-
-
-
-
-
- {about.intro_firstphoto_caption}
- in
-
-
- Naarm Australia (Melbourne)
-
-
-
-
-
{about.creation_title}
-
- {@html about.creation_heading}
-
-
-
- {@html about.creation_text}
-
-
-
-
-
-
- {about.creation_portrait_caption}
-
-
-
-
-
-
-
{about.present_title}
-
-
-
- {@html about.present_heading}
-
-
-
-
{about.present_conclusion}
-
-
-
-
- {/if}
-
-
-
-
-
-
- {#each about.process_steps as { text, image, video_mp4, video_webm }, index}
-
- {/each}
-
-
-
- {#each photos as { image: { id }, title }, index}
-
- {/each}
-
-
-
{about.contact_title}
-
- {#each about.contact_blocks as { title, text, link, button }}
-
-
{title}
-
- {@html text}
-
-
-
- {/each}
-
-
- {#each credits.list as { title, credits }}
-
-
{title}
-
- {#each credits as { name, role, website }}
- -
-
- -
- {#if website}
-
- {:else}
-
{name}
- {/if}
-
- -
- {role}
-
-
-
- {/each}
-
-
- {/each}
-
-
-
Photography
-
- {#each credit as { name, website, location }}
- -
-
- -
- {#if website}
-
- {:else}
-
{name}
- {/if}
-
- -
-
-
-
-
- {/each}
-
-
-
- {#each legal.terms as { title, text }, index}
-
- {index + 1}. {title}
-
- {@html text}
-
-
- {/each}
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/components/Metas.svelte b/src/components/Metas.svelte
index d3ba8f1..4a20e3a 100644
--- a/src/components/Metas.svelte
+++ b/src/components/Metas.svelte
@@ -18,10 +18,15 @@
+
+ {#if description}
+
+ {/if}
{#if image}
+
{/if}
{#if url}
diff --git a/src/components/PageTransition.svelte b/src/components/PageTransition.svelte
index 3db93c2..9fbe958 100644
--- a/src/components/PageTransition.svelte
+++ b/src/components/PageTransition.svelte
@@ -1,18 +1,33 @@
-