From 00cd7fa1b1d828f5a83962f0552cb7eb2d13c930 Mon Sep 17 00:00:00 2001 From: prototypa Date: Sun, 4 Sep 2022 03:21:44 -0400 Subject: [PATCH] Refactor components structure --- src/components/atoms/ExtraMetaTags.astro | 2 + src/components/atoms/Fonts.astro | 7 +++ src/components/{widgets => atoms}/Logo.astro | 0 .../{widgets => atoms}/Pagination.astro | 0 .../PostTags.astro => atoms/Tags.astro} | 0 src/components/core/MetaTags.astro | 9 ++-- src/components/core/ToggleMenu.astro | 28 ++++++++++++ src/components/core/ToggleTheme.astro | 15 +++++++ .../{BasicCTA.astro => CallToAction.astro} | 2 +- .../{BasicFeatures.astro => Features.astro} | 0 ...{TwoColsFeatures.astro => Features2.astro} | 2 +- .../{StepsFeatures.astro => Features3.astro} | 3 +- src/components/widgets/Footer.astro | 10 ++--- src/components/widgets/Header.astro | 43 +++---------------- src/components/widgets/Hero.astro | 2 +- .../widgets/{StepsLeft.astro => Steps.astro} | 0 .../widgets/{ => blog}/HighlightedPosts.astro | 0 .../{BlogList.astro => blog/List.astro} | 4 +- .../ListItem.astro} | 2 +- .../{BlogPost.astro => blog/SinglePost.astro} | 3 +- src/pages/[...blog]/[...page].astro | 4 +- src/pages/[...blog]/[slug].astro | 4 +- .../[category]/[...page].astro | 4 +- src/pages/[...tags]/[tag]/[...page].astro | 4 +- src/pages/index.astro | 22 +++++----- 25 files changed, 97 insertions(+), 73 deletions(-) create mode 100644 src/components/atoms/ExtraMetaTags.astro create mode 100644 src/components/atoms/Fonts.astro rename src/components/{widgets => atoms}/Logo.astro (100%) rename src/components/{widgets => atoms}/Pagination.astro (100%) rename src/components/{widgets/PostTags.astro => atoms/Tags.astro} (100%) create mode 100644 src/components/core/ToggleMenu.astro create mode 100644 src/components/core/ToggleTheme.astro rename src/components/widgets/{BasicCTA.astro => CallToAction.astro} (90%) rename src/components/widgets/{BasicFeatures.astro => Features.astro} (100%) rename src/components/widgets/{TwoColsFeatures.astro => Features2.astro} (99%) rename src/components/widgets/{StepsFeatures.astro => Features3.astro} (98%) rename src/components/widgets/{StepsLeft.astro => Steps.astro} (100%) rename src/components/widgets/{ => blog}/HighlightedPosts.astro (100%) rename src/components/widgets/{BlogList.astro => blog/List.astro} (56%) rename src/components/widgets/{BlogListItem.astro => blog/ListItem.astro} (96%) rename src/components/widgets/{BlogPost.astro => blog/SinglePost.astro} (96%) diff --git a/src/components/atoms/ExtraMetaTags.astro b/src/components/atoms/ExtraMetaTags.astro new file mode 100644 index 0000000..a845151 --- /dev/null +++ b/src/components/atoms/ExtraMetaTags.astro @@ -0,0 +1,2 @@ +--- +--- diff --git a/src/components/atoms/Fonts.astro b/src/components/atoms/Fonts.astro new file mode 100644 index 0000000..ecaabbd --- /dev/null +++ b/src/components/atoms/Fonts.astro @@ -0,0 +1,7 @@ +--- +--- + + + + + diff --git a/src/components/widgets/Logo.astro b/src/components/atoms/Logo.astro similarity index 100% rename from src/components/widgets/Logo.astro rename to src/components/atoms/Logo.astro diff --git a/src/components/widgets/Pagination.astro b/src/components/atoms/Pagination.astro similarity index 100% rename from src/components/widgets/Pagination.astro rename to src/components/atoms/Pagination.astro diff --git a/src/components/widgets/PostTags.astro b/src/components/atoms/Tags.astro similarity index 100% rename from src/components/widgets/PostTags.astro rename to src/components/atoms/Tags.astro diff --git a/src/components/core/MetaTags.astro b/src/components/core/MetaTags.astro index bcd8dd2..33cabf1 100644 --- a/src/components/core/MetaTags.astro +++ b/src/components/core/MetaTags.astro @@ -6,6 +6,8 @@ import GoogleAnalytics from "~/components/core/GoogleAnalytics.astro"; import defaultImageSrc from "~/assets/images/default.png"; import { SITE } from "~/config.mjs"; +import Fonts from "../atoms/Fonts.astro"; +import ExtraMetaTags from "../atoms/ExtraMetaTags.astro"; const { src: defaultImage } = await getImage({ src: defaultImageSrc, @@ -59,13 +61,12 @@ const image = {image && } - - - - + {SITE.googleSiteVerificationId && } {SITE.googleAnalyticsId && } + + diff --git a/src/components/core/ToggleMenu.astro b/src/components/core/ToggleMenu.astro new file mode 100644 index 0000000..486a522 --- /dev/null +++ b/src/components/core/ToggleMenu.astro @@ -0,0 +1,28 @@ +--- +import { Icon } from "astro-icon"; + +const { + label = "Toggle Menu", + class: + className = "ml-1.5 text-gray-500 dark:text-gray-400 hover:bg-gray-100 dark:hover:bg-gray-800 focus:outline-none focus:ring-4 focus:ring-gray-200 dark:focus:ring-gray-700 rounded-lg text-sm p-2.5 inline-flex items-center transition", + iconClass = "w-6 h-6", + iconName = "tabler:menu", +} = Astro.props; +--- + + + + diff --git a/src/components/core/ToggleTheme.astro b/src/components/core/ToggleTheme.astro new file mode 100644 index 0000000..a6680f4 --- /dev/null +++ b/src/components/core/ToggleTheme.astro @@ -0,0 +1,15 @@ +--- +import { Icon } from "astro-icon"; + +const { + label = "Toggle between Dark and Light mode", + class: + className = "text-gray-500 dark:text-gray-400 hover:bg-gray-100 dark:hover:bg-gray-700 focus:outline-none focus:ring-4 focus:ring-gray-200 dark:focus:ring-gray-700 rounded-lg text-sm p-2.5 inline-flex items-center", + iconClass = "w-6 h-6", + iconName = "tabler:sun", +} = Astro.props; +--- + + diff --git a/src/components/widgets/BasicCTA.astro b/src/components/widgets/CallToAction.astro similarity index 90% rename from src/components/widgets/BasicCTA.astro rename to src/components/widgets/CallToAction.astro index 29648de..0eaee3f 100644 --- a/src/components/widgets/BasicCTA.astro +++ b/src/components/widgets/CallToAction.astro @@ -23,7 +23,7 @@ const {} = Astro.props; target="_blank" rel="noopener" > -