From 5ea7e26e20c21a295eed0624a3c22d2583832d94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fe=CC=81lix=20Pe=CC=81ault?= Date: Thu, 8 Sep 2022 23:57:04 +0200 Subject: [PATCH] =?UTF-8?q?[wip]=20=E2=9C=A8=20Rework=20About=20page=20lay?= =?UTF-8?q?out=20(desktop)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/routes/about/+page.server.ts | 23 ++++++--- src/routes/about/+page.svelte | 82 +++++++++++++++++--------------- src/style/pages/_about.scss | 62 ++++++++++++++++-------- 3 files changed, 101 insertions(+), 66 deletions(-) diff --git a/src/routes/about/+page.server.ts b/src/routes/about/+page.server.ts index 7b062d4..da44fcd 100644 --- a/src/routes/about/+page.server.ts +++ b/src/routes/about/+page.server.ts @@ -19,10 +19,11 @@ export const load: PageServerLoad = async () => { about { description + intro_title + intro_heading + intro_text intro_firstphoto { id, title } intro_firstphoto_caption - intro_portraits { id, title } - intro_text intro_firstlocation { slug name @@ -30,12 +31,21 @@ export const load: PageServerLoad = async () => { flag { id, title } slug } - illustration_desktop { id } - illustration_desktop_2x { id } - illustration_mobile { id } } - purpose_text + creation_title + creation_heading + creation_text + creation_portrait { id, title } + creation_portrait_caption + + present_image { id, title } + present_title + present_heading + present_text + present_conclusion + + image_showcase { id, title } process_title process_subtitle @@ -51,7 +61,6 @@ export const load: PageServerLoad = async () => { video_mp4 { id } video_webm { id } } - process_intention contact_title contact_blocks diff --git a/src/routes/about/+page.svelte b/src/routes/about/+page.svelte index 447d04c..64bb350 100644 --- a/src/routes/about/+page.svelte +++ b/src/routes/about/+page.svelte @@ -35,14 +35,6 @@ ? [0, 2, 5, 7, 9, 12, 17, 20, 22, 26, 30, 32, 34] : [1, 4, 5, 7, 11, 14, 17, 20, 24, 27, 30, 33, 34, 36, 40, 43] - const introText = about.intro_text - .replace('', - ` - ${about.intro_firstlocation.country.flag.title} - - `) - .replace('', '') - onMount(() => { /** @@ -133,11 +125,13 @@
-

Meet the makers

-

We are a French and Australian couple that found each other through our mutual passion for travel, photography and design.

+

{about.intro_title}

+
+ {@html about.intro_heading} +
-

With a strong desire to create, we’re award winning in our own fields with Félix as a Digital Designer and Art Director and Shelby as a Front-End Developer.

+ {@html about.intro_text}
@@ -167,25 +161,28 @@ -

The creation of Houses Of

-

Often separated on different sides of the world, we started a photography project of collecting charismatic houses from the places we visited together.

+

{about.creation_title}

+
+ {@html about.creation_heading} +
-

A few years later and reunited in the South of France, this little collection has evolved into a rather large passion project along with the success of our web launch back in 2020.

+ {@html about.creation_text}
{about.intro_portraits.title}
- Whatever I want + {about.creation_portrait_caption}
@@ -195,38 +192,47 @@
{about.intro_portraits.title} -

Where are we now

+

{about.present_title}

-

Since then we've been travelling more and adding new locations to the Houses Of site, however we always wanted to create something more tangible for the travel and design lovers like us.

+

{about.present_text}

-

We decided to use our expertise to create the Houses Of graphic posters, for those wanting to bring art into their homes, but are unsatisfied with typical tourism prints.

-
-

We hope that you will join us on this journey and that our art can also spark memories in your own home.

+
+ {@html about.present_heading} +
+
+

{about.present_conclusion}

- - {about.intro_portraits.title}
+ {#if about.image_showcase} +
+ {about.image_showcase.title} +
+ {/if} +