From 7e82a76cfb27c23f928cae8fbbffbd8b0de2894c Mon Sep 17 00:00:00 2001
From: Fathul Irfaan Abdillah <abdillahfathu@gmail.com>
Date: Sat, 5 Aug 2023 17:27:53 +0700
Subject: [PATCH 1/2] fix import declaration conflicts

---
 src/components/navbar/dropdown.astro |  6 +++---
 src/pages/pricing.astro              | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/components/navbar/dropdown.astro b/src/components/navbar/dropdown.astro
index b743a38..f25a8e1 100644
--- a/src/components/navbar/dropdown.astro
+++ b/src/components/navbar/dropdown.astro
@@ -1,10 +1,10 @@
 ---
-import { Dropdown, DropdownItems } from "astro-navbar";
+import { Dropdown as DropdownContainer, DropdownItems } from "astro-navbar";
 const { title, lastItem, children } = Astro.props;
 ---
 
 <li class="relative">
-  <Dropdown class="group">
+  <DropdownContainer class="group">
     <button
       class="flex items-center gap-1 w-full lg:w-auto lg:px-3 py-2 text-gray-600 hover:text-gray-900">
       <span>{title}</span>
@@ -43,5 +43,5 @@ const { title, lastItem, children } = Astro.props;
         </div>
       </div>
     </DropdownItems>
-  </Dropdown>
+  </DropdownContainer>
 </li>
diff --git a/src/pages/pricing.astro b/src/pages/pricing.astro
index 14f7cab..e37fdf4 100644
--- a/src/pages/pricing.astro
+++ b/src/pages/pricing.astro
@@ -2,7 +2,7 @@
 import Layout from "@layouts/Layout.astro";
 import Container from "@components/container.astro";
 import Sectionhead from "@components/sectionhead.astro";
-import Pricing from "@components/pricing.astro";
+import PricingCard from "@components/pricing.astro";
 
 const pricing = [
   {
@@ -68,13 +68,13 @@ const pricing = [
   <Container>
     <Sectionhead>
       <Fragment slot="title">Pricing</Fragment>
-      <Fragment slot="desc"
-        >Simple & Predictable pricing. No Surprises.</Fragment
-      >
+      <Fragment slot="desc">
+        Simple & Predictable pricing. No Surprises.
+      </Fragment>
     </Sectionhead>
 
     <div class="grid md:grid-cols-3 gap-10 mx-auto max-w-screen-lg mt-12">
-      {pricing.map((item) => <Pricing plan={item} />)}
+      {pricing.map((item) => <PricingCard plan={item} />)}
     </div>
   </Container>
 </Layout>

From 84b2b46cc546b4956adcbad43928798d53e698af Mon Sep 17 00:00:00 2001
From: Fathul Irfaan Abdillah <abdillahfathu@gmail.com>
Date: Sat, 5 Aug 2023 17:30:04 +0700
Subject: [PATCH 2/2] remove unused imports

---
 src/layouts/BlogLayout.astro | 1 -
 src/pages/404.astro          | 6 +-----
 src/pages/contact.astro      | 7 +++----
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/layouts/BlogLayout.astro b/src/layouts/BlogLayout.astro
index cd0f7bf..bd221a9 100644
--- a/src/layouts/BlogLayout.astro
+++ b/src/layouts/BlogLayout.astro
@@ -1,7 +1,6 @@
 ---
 import Container from "@components/container.astro";
 import { getFormattedDate } from "@utils/all";
-import { log } from "astro/dist/core/logger/core";
 import Layout from "./Layout.astro";
 
 const { frontmatter } = Astro.props;
diff --git a/src/pages/404.astro b/src/pages/404.astro
index 54275f8..c19c35e 100644
--- a/src/pages/404.astro
+++ b/src/pages/404.astro
@@ -1,10 +1,6 @@
 ---
-import { Icon } from "astro-icon";
-import Layout from "@layouts/Layout.astro";
 import Container from "@components/container.astro";
-import Sectionhead from "@components/sectionhead.astro";
-import Button from "@components/ui/button.astro";
-import Contactform from "@components/contactform.astro";
+import Layout from "@layouts/Layout.astro";
 ---
 
 <Layout title="404 Not Found">
diff --git a/src/pages/contact.astro b/src/pages/contact.astro
index 5c9baab..dde0c7b 100644
--- a/src/pages/contact.astro
+++ b/src/pages/contact.astro
@@ -1,10 +1,9 @@
 ---
-import { Icon } from "astro-icon";
-import Layout from "@layouts/Layout.astro";
+import Contactform from "@components/contactform.astro";
 import Container from "@components/container.astro";
 import Sectionhead from "@components/sectionhead.astro";
-import Button from "@components/ui/button.astro";
-import Contactform from "@components/contactform.astro";
+import Layout from "@layouts/Layout.astro";
+import { Icon } from "astro-icon";
 ---
 
 <Layout title="Contact">