From 9e7462a77d6f466a413e6a25a40ea4d8ea409245 Mon Sep 17 00:00:00 2001 From: prototypa Date: Wed, 16 Aug 2023 00:42:35 -0400 Subject: [PATCH 01/11] Better layout when no image --- src/components/ui/Timeline.astro | 2 +- src/components/widgets/Steps.astro | 67 ++++++++++++++++-------------- 2 files changed, 37 insertions(+), 32 deletions(-) diff --git a/src/components/ui/Timeline.astro b/src/components/ui/Timeline.astro index bb25330..b393b50 100644 --- a/src/components/ui/Timeline.astro +++ b/src/components/ui/Timeline.astro @@ -49,7 +49,7 @@ const { )}
diff --git a/src/components/widgets/Steps.astro b/src/components/widgets/Steps.astro index fde8052..ecc6291 100644 --- a/src/components/widgets/Steps.astro +++ b/src/components/widgets/Steps.astro @@ -1,54 +1,59 @@ --- -import WidgetWrapper from "~/components/ui/WidgetWrapper.astro"; -import Timeline from "~/components/ui/Timeline.astro"; -import Headline from "~/components/ui/Headline.astro"; +import WidgetWrapper from '~/components/ui/WidgetWrapper.astro'; +import Timeline from '~/components/ui/Timeline.astro'; +import Headline from '~/components/ui/Headline.astro'; import Image from '~/components/common/Image.astro'; -import type { Steps } from "~/types"; +import type { Steps } from '~/types'; const { - title = await Astro.slots.render("title"), - subtitle = await Astro.slots.render("subtitle"), - tagline = await Astro.slots.render("tagline"), + title = await Astro.slots.render('title'), + subtitle = await Astro.slots.render('subtitle'), + tagline = await Astro.slots.render('tagline'), items = [], - image = await Astro.slots.render("image"), + image = await Astro.slots.render('image'), isReversed = false, id, isDark = false, classes = {}, - bg = await Astro.slots.render("bg"), + bg = await Astro.slots.render('bg'), } = Astro.props as Steps; --- - -
-
+ +
+
-
- { - image && - (typeof image === 'string' ? ( - + { + image && ( +
+ {(typeof image === 'string' ? ( + ) : ( - {image?.alt - )) - } -
+ {image?.alt + ))} +
+ ) + }
From d4b5a0f54e2fe06ef4be40e4115e24c29f86ef0f Mon Sep 17 00:00:00 2001 From: prototypa Date: Wed, 16 Aug 2023 00:43:08 -0400 Subject: [PATCH 02/11] Add defaultIcon to Features --- src/types.d.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/types.d.ts b/src/types.d.ts index 81e78c1..7e1e02e 100644 --- a/src/types.d.ts +++ b/src/types.d.ts @@ -239,6 +239,7 @@ export interface Features extends Headline, Widget { video?: Video; items: Array; columns: number; + defaultIcon?: string; callToAction1?: CallToAction; callToAction2?: CallToAction; isReversed?: boolean; From a56761213b5db6eeb0a38c645a0d4fc4f51c67db Mon Sep 17 00:00:00 2001 From: prototypa Date: Wed, 16 Aug 2023 00:43:36 -0400 Subject: [PATCH 03/11] Add defaultIcon to Features --- src/components/widgets/Features.astro | 3 +++ src/components/widgets/Features2.astro | 2 ++ src/components/widgets/Features3.astro | 2 ++ 3 files changed, 7 insertions(+) diff --git a/src/components/widgets/Features.astro b/src/components/widgets/Features.astro index 46d9bc0..fd0f64d 100644 --- a/src/components/widgets/Features.astro +++ b/src/components/widgets/Features.astro @@ -11,6 +11,8 @@ const { items = [], columns = 2, + defaultIcon, + id, isDark = false, classes = {}, @@ -33,6 +35,7 @@ const { Date: Wed, 16 Aug 2023 00:43:59 -0400 Subject: [PATCH 04/11] Fix Steps and add Latest Posts --- src/pages/homes/personal.astro | 39 ++++++++++++---------------------- 1 file changed, 14 insertions(+), 25 deletions(-) diff --git a/src/pages/homes/personal.astro b/src/pages/homes/personal.astro index 0c66b55..b03afda 100644 --- a/src/pages/homes/personal.astro +++ b/src/pages/homes/personal.astro @@ -8,6 +8,7 @@ import CallToAction from '~/components/widgets/CallToAction.astro'; import Features3 from '~/components/widgets/Features3.astro'; import Testimonials from '~/components/widgets/Testimonials.astro'; import Steps from '~/components/widgets/Steps.astro'; +import BlogLatestPosts from '~/components/widgets/BlogLatestPosts.astro'; const metadata = { title: 'Personal Homepage Demo', @@ -15,6 +16,7 @@ const metadata = { --- +
@@ -99,7 +96,6 @@ const metadata = { @@ -135,10 +128,7 @@ const metadata = { icon: 'tabler:school', }, ]} - image={{ - src: 'https://images.unsplash.com/photo-1557672172-298e090bd0f1?ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D&auto=format&fit=crop&w=774&q=80', - alt: 'Steps image', - }} + classes={{ container: 'max-w-3xl' }} /> @@ -147,51 +137,43 @@ const metadata = { title="Skills" subtitle="Discover the proficiencies that allow me to bring imagination to life through design." columns={3} + defaultIcon="tabler:point-filled" items={[ { title: 'Graphic design', description: 'Proficient in crafting visually appealing designs that convey messages effectively.', - icon: 'tabler:point-filled', }, { title: 'Branding and identity', description: 'Skilled at developing cohesive brand identities, including logos and brand guidelines.', - icon: 'tabler:point-filled', }, { title: 'User-centered design', description: 'Experienced in creating user-friendly interfaces and optimizing user experiences.', - icon: 'tabler:point-filled', }, { title: 'Adobe Creative Suite', description: 'Skilled in using Photoshop, Illustrator, and InDesign to create and edit visual elements.', - icon: 'tabler:point-filled', }, { title: 'Typography', description: 'Adept in selecting and manipulating typefaces to enhance design aesthetics.', - icon: 'tabler:point-filled', }, { title: 'Color theory', description: 'Proficient in using color to evoke emotions and enhance visual harmony.', - icon: 'tabler:point-filled', }, { title: 'Print and digital design', description: 'Knowledgeable in designing for both print materials and digital platforms.', - icon: 'tabler:point-filled', }, { title: 'Attention to detail', description: 'Diligent in maintaining precision and quality in all design work.', - icon: 'tabler:point-filled', }, { title: 'Adaptability', description: 'Quick to adapt to new design trends, technologies, and client preferences.', - icon: 'tabler:point-filled', }, ]} /> @@ -367,4 +349,11 @@ const metadata = { href: '/', }} /> + + + + +
+ + From d27e473f54e0f5841f7efd1af368e96f711c88cb Mon Sep 17 00:00:00 2001 From: prototypa Date: Wed, 16 Aug 2023 03:02:42 -0400 Subject: [PATCH 05/11] Start filling the content of the landing pages demos. --- src/pages/landing/click-through.astro | 23 +++++++++++----- src/pages/landing/lead-generation.astro | 27 +++++++++++++------ src/pages/landing/pre-launch.astro | 27 +++++++++++++------ src/pages/landing/product.astro | 29 +++++++++++++------- src/pages/landing/sales.astro | 25 ++++++++++++----- src/pages/landing/squeeze.astro | 25 ----------------- src/pages/landing/subscription.astro | 36 +++++++++++++++++++++++++ 7 files changed, 129 insertions(+), 63 deletions(-) delete mode 100644 src/pages/landing/squeeze.astro create mode 100644 src/pages/landing/subscription.astro diff --git a/src/pages/landing/click-through.astro b/src/pages/landing/click-through.astro index bb302e7..e8f518d 100644 --- a/src/pages/landing/click-through.astro +++ b/src/pages/landing/click-through.astro @@ -2,6 +2,7 @@ import Layout from '~/layouts/LandingLayout.astro'; import Hero2 from '~/components/widgets/Hero2.astro'; +import CallToAction from "~/components/widgets/CallToAction.astro" const metadata = { title: 'Click-through Landing Page Demo', @@ -12,14 +13,24 @@ const metadata = { + + diff --git a/src/pages/landing/lead-generation.astro b/src/pages/landing/lead-generation.astro index 4f06f04..851b015 100644 --- a/src/pages/landing/lead-generation.astro +++ b/src/pages/landing/lead-generation.astro @@ -1,7 +1,8 @@ --- import Layout from '~/layouts/LandingLayout.astro'; -import Hero2 from '~/components/widgets/Hero2.astro'; +import Hero from '~/components/widgets/Hero.astro'; +import CallToAction from '~/components/widgets/CallToAction.astro'; const metadata = { title: 'Lead Generation Landing Page Demo', @@ -11,15 +12,25 @@ const metadata = { - + + diff --git a/src/pages/landing/pre-launch.astro b/src/pages/landing/pre-launch.astro index d3dc09f..4376c28 100644 --- a/src/pages/landing/pre-launch.astro +++ b/src/pages/landing/pre-launch.astro @@ -2,9 +2,10 @@ import Layout from '~/layouts/LandingLayout.astro'; import Hero2 from '~/components/widgets/Hero2.astro'; +import CallToAction from '~/components/widgets/CallToAction.astro'; const metadata = { - title: 'Coming Soon Landing Page', + title: 'Pre-Launch Landing Page', }; --- @@ -12,14 +13,24 @@ const metadata = { + + diff --git a/src/pages/landing/product.astro b/src/pages/landing/product.astro index 4a0ca4b..dfa0c73 100644 --- a/src/pages/landing/product.astro +++ b/src/pages/landing/product.astro @@ -1,7 +1,8 @@ --- import Layout from '~/layouts/LandingLayout.astro'; -import Hero2 from '~/components/widgets/Hero2.astro'; +import Hero from '~/components/widgets/Hero.astro'; +import CallToAction from '~/components/widgets/CallToAction.astro'; const metadata = { title: 'Product Details Landing Page Demo', @@ -11,15 +12,25 @@ const metadata = { - + + diff --git a/src/pages/landing/sales.astro b/src/pages/landing/sales.astro index f2e2257..4bce13a 100644 --- a/src/pages/landing/sales.astro +++ b/src/pages/landing/sales.astro @@ -2,6 +2,7 @@ import Layout from '~/layouts/LandingLayout.astro'; import Hero2 from '~/components/widgets/Hero2.astro'; +import CallToAction from '~/components/widgets/CallToAction.astro'; const metadata = { title: 'Sales Landing Page Demo', @@ -12,14 +13,24 @@ const metadata = { + + diff --git a/src/pages/landing/squeeze.astro b/src/pages/landing/squeeze.astro deleted file mode 100644 index 1c6807f..0000000 --- a/src/pages/landing/squeeze.astro +++ /dev/null @@ -1,25 +0,0 @@ ---- -import Layout from '~/layouts/LandingLayout.astro'; - -import Hero2 from '~/components/widgets/Hero2.astro'; - -const metadata = { - title: 'Squeeze Landing Page Demo', -}; ---- - - - - - - diff --git a/src/pages/landing/subscription.astro b/src/pages/landing/subscription.astro new file mode 100644 index 0000000..1a1f264 --- /dev/null +++ b/src/pages/landing/subscription.astro @@ -0,0 +1,36 @@ +--- +import Layout from '~/layouts/LandingLayout.astro'; + +import Hero2 from '~/components/widgets/Hero2.astro'; +import CallToAction from '~/components/widgets/CallToAction.astro'; + +const metadata = { + title: 'Subscription Landing Page Demo', +}; +--- + + + + + + + + From 058ccb373176e465a53f865c6042d4c29eb36bca Mon Sep 17 00:00:00 2001 From: prototypa Date: Wed, 16 Aug 2023 03:05:21 -0400 Subject: [PATCH 06/11] Remove Squeeze Landing, add Subscription Landing --- src/navigation.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/navigation.js b/src/navigation.js index 61722df..7249ca8 100644 --- a/src/navigation.js +++ b/src/navigation.js @@ -71,10 +71,6 @@ export const headerData = { text: 'Click-Through', href: getPermalink('/landing/click-through'), }, - { - text: 'Squeeze', - href: getPermalink('/landing/squeeze'), - }, { text: 'Product Details (or Services)', href: getPermalink('/landing/product'), @@ -83,6 +79,10 @@ export const headerData = { text: 'Coming Soon or Pre-Launch', href: getPermalink('/landing/pre-launch'), }, + { + text: 'Subscription', + href: getPermalink('/landing/subscription'), + }, ], }, { From 7643983d626a63897afe7020b9dbbecc331e6f83 Mon Sep 17 00:00:00 2001 From: prototypa Date: Wed, 16 Aug 2023 03:30:31 -0400 Subject: [PATCH 07/11] Create new HeroText widget --- src/components/widgets/HeroText.astro | 80 +++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 src/components/widgets/HeroText.astro diff --git a/src/components/widgets/HeroText.astro b/src/components/widgets/HeroText.astro new file mode 100644 index 0000000..570869c --- /dev/null +++ b/src/components/widgets/HeroText.astro @@ -0,0 +1,80 @@ +--- +import { Icon } from 'astro-icon/components'; + +const { + title = await Astro.slots.render('title'), + subtitle = await Astro.slots.render('subtitle'), + tagline, + content = await Astro.slots.render('content'), + callToAction = await Astro.slots.render('callToAction'), + callToAction2 = await Astro.slots.render('callToAction2'), +} = Astro.props; +--- + +
+ +
+
+
+
+ {tagline && ( +

+ )} + { + title && ( +

+ ) + } +
+ {subtitle &&

} +

+ { + callToAction && ( +
+ {typeof callToAction === 'string' ? ( + + ) : ( + + {callToAction?.icon && ( + <> + + + )} + {callToAction?.text} + + )} +
+ ) + } + { + callToAction2 && ( +
+ {typeof callToAction2 === 'string' ? ( + + ) : ( + + {callToAction2?.icon && ( + <> + +   + + )} + {callToAction2.text} + + )} +
+ ) + } +
+
+ {content && } +

+
+
+
From b10129dcccf53c41a70521ef4e6ec354008c4ce0 Mon Sep 17 00:00:00 2001 From: prototypa Date: Wed, 16 Aug 2023 03:30:59 -0400 Subject: [PATCH 08/11] Add HeroText widget for H1 --- src/pages/contact.astro | 46 +++++++---------------------------------- 1 file changed, 8 insertions(+), 38 deletions(-) diff --git a/src/pages/contact.astro b/src/pages/contact.astro index 8d5eca7..0ba894f 100644 --- a/src/pages/contact.astro +++ b/src/pages/contact.astro @@ -1,7 +1,7 @@ --- import Layout from '~/layouts/PageLayout.astro'; +import HeroText from '~/components/widgets/HeroText.astro'; import ContactUs from '~/components/widgets/Contact.astro'; -import FAQs from '~/components/widgets/FAQs.astro'; import Features2 from '~/components/widgets/Features2.astro'; const metadata = { @@ -10,6 +10,13 @@ const metadata = { --- + + + + - - - - From c427070a1a7c6bfb5b1a7a86cc8c7b461ee4b739 Mon Sep 17 00:00:00 2001 From: prototypa Date: Wed, 16 Aug 2023 03:31:17 -0400 Subject: [PATCH 09/11] Add HeroText widget for H1 --- src/pages/pricing.astro | 86 +++++++++++++++++++++++------------------ 1 file changed, 48 insertions(+), 38 deletions(-) diff --git a/src/pages/pricing.astro b/src/pages/pricing.astro index 2a6f817..a36d6ad 100644 --- a/src/pages/pricing.astro +++ b/src/pages/pricing.astro @@ -1,5 +1,6 @@ --- import Layout from '~/layouts/PageLayout.astro'; +import HeroText from '~/components/widgets/HeroText.astro'; import Prices from '~/components/widgets/Pricing.astro'; import FAQs from '~/components/widgets/FAQs.astro'; import Steps from '~/components/widgets/Steps.astro'; @@ -12,6 +13,14 @@ const metadata = { --- + + + + - + -