Merge pull request #103 from eltana-org/ordering-updates

Ordering Updates
eltana-org · Aug 4, 2023 · 7619fd4 · 7619fd4
2 parents 9836316 + 10f80f8
commit 7619fd4
Show file tree

Hide file tree

Showing 11 changed files with 107 additions and 90 deletions.
diff --git a/astro.config.mjs b/astro.config.mjs
@@ -21,6 +21,15 @@ export default defineConfig({
   base: SITE.basePathname,
   trailingSlash: SITE.trailingSlash ? 'always' : 'never',
   output: 'static',
+
+  // https://docs.astro.build/en/core-concepts/routing/#redirects
+  redirects: {
+    '/same-day-delivery': {
+      status: 301,
+      destination: '/order',
+    },
+  },
+
   markdown: {
     remarkPlugins: [readingTimeRemarkPlugin],
   },

diff --git a/src/config/components/footer.js b/src/config/components/footer.js
@@ -12,9 +12,9 @@ const footerData = {
       title: 'Order',
       // List of links to be displayed in the section
       links: [
-        { text: 'Catering', href: getPermalink('/order') },
+        { text: 'Order', href: getPermalink('/order') },
+        { text: 'Catering', href: getPermalink('/schedule-order') },
         { text: 'Menu', href: getPermalink('/menu') },
-        { text: 'Same Day Delivery', href: getPermalink('/same-day-delivery') },
       ],
     },
     {

diff --git a/src/config/components/header.js b/src/config/components/header.js
@@ -23,6 +23,14 @@ const headerData = {
     {
       text: 'Pages',
       links: [
+        {
+          text: 'Order',
+          href: getPermalink('/order'),
+        },
+        {
+          text: 'Catering',
+          href: getPermalink('/schedule-order'),
+        },
         {
           text: 'About us',
           href: getPermalink('/about'),
@@ -53,7 +61,7 @@ const headerData = {
       // text to display on the button
       text: 'Order',
       // link to go to when the button is clicked
-      href: getPermalink('/same-day-delivery'),
+      href: getPermalink('/order'),
       // can be 'button', 'primary', or 'ghost'
       type: 'button',
       // HTML rel attribute

diff --git a/src/config/pages/order/call-to-action.js b/src/config/pages/order/call-to-action.js
@@ -10,21 +10,21 @@ const callToAction = {
   enabled: true,
 
   // The title of the call to action component
-  title: 'Looking for Same Day Delivery?',
+  title: 'Looking to Schedule a Delivery or Pick-Up instead?',
 
   // The subtitle of the call to action component (supports HTML)
-  subtitle: `Checkout our same day delivery options through Postmates and Uber Eats.`,
+  subtitle: `Check out our order page to schedule a delivery or pick-up for a later date. We support catering and bulk orders as well!`,
 
   // Button configuration for the call to action component
   button: {
     // If the button should be displayed
     enabled: true,
     // The text of the button
-    text: 'Order Now',
+    text: 'Schedule a Delivery or Pick-Up',
     // The link of the button
-    href: getPermalink('/same-day-delivery'),
+    href: getPermalink('/schedule-order'),
     // The icon to the left of the button text
-    icon: 'tabler:bolt',
+    icon: 'tabler:truck-delivery',
     // HTML target attribute
     target: '_self',
     // HTML rel attribute

diff --git a/src/config/pages/order/hero.js b/src/config/pages/order/hero.js
@@ -9,18 +9,18 @@ const hero = {
   enabled: true,
 
   // Custom CSS padding for the hero element
-  padding: 'pt-12 md:pt-20 pb-10',
+  padding: 'pt-12 md:pt-20 pb-5',
 
   // Hero title with HTML support
   title: {
     enabled: true, // If the title should be enabled or not
-    text: `<span class="font-bold">Groups and Delivery</span>`,
+    text: `<span class="font-bold">Order Online</span>`,
   },
 
   // Hero subtitle with HTML support
   subtitle: {
     enabled: true, // If the subtitle should be enabled or not
-    text: `Schedule a delivery or pick-up order`,
+    text: `Get fresh bagels delivered to your door with same day delivery.`,
   },
 
   // First CTA block
@@ -59,9 +59,9 @@ const hero = {
     // If the image should be enabled or not
     enabled: true,
     // Image source
-    src: import('~/assets/images/bagel-paper.jpg'),
+    src: import('~/assets/images/side-kick-1.jpg'),
     // Image alt text
-    alt: 'bagel on crossword paper',
+    alt: 'Eltana bagels for delivery and paper bag',
   },
 };
 

diff --git a/...nfig/pages/same-day-delivery/locations.js → src/config/pages/order/locations.js b/...nfig/pages/same-day-delivery/locations.js → src/config/pages/order/locations.js
@@ -2,7 +2,7 @@
 
 const locations = {
   // Show or hide the locations component
-  enabled: true,
+  enabled: false,
 
   // Small highlight text at the top of the component
   highlight: `Online`,

diff --git a/...pages/same-day-delivery/call-to-action.js → ...ig/pages/schedule-order/call-to-action.js b/...pages/same-day-delivery/call-to-action.js → ...ig/pages/schedule-order/call-to-action.js
@@ -10,21 +10,21 @@ const callToAction = {
   enabled: true,
 
   // The title of the call to action component
-  title: 'Looking to Schedule a Delivery or Pick-Up?',
+  title: 'Looking for Same Day Delivery?',
 
   // The subtitle of the call to action component (supports HTML)
-  subtitle: `Checkout our order page to schedule a delivery or pick-up for a later date. We support catering and bulk orders as well!`,
+  subtitle: `Check out our same day delivery page.`,
 
   // Button configuration for the call to action component
   button: {
     // If the button should be displayed
     enabled: true,
     // The text of the button
-    text: 'Schedule a Delivery or Pick-Up',
+    text: 'Order Now',
     // The link of the button
     href: getPermalink('/order'),
     // The icon to the left of the button text
-    icon: 'tabler:truck-delivery',
+    icon: 'tabler:bolt',
     // HTML target attribute
     target: '_self',
     // HTML rel attribute

diff --git a/src/config/pages/same-day-delivery/hero.js → src/config/pages/schedule-order/hero.js b/src/config/pages/same-day-delivery/hero.js → src/config/pages/schedule-order/hero.js
@@ -9,18 +9,18 @@ const hero = {
   enabled: true,
 
   // Custom CSS padding for the hero element
-  padding: 'pt-12 md:pt-20 pb-5',
+  padding: 'pt-12 md:pt-20 pb-10',
 
   // Hero title with HTML support
   title: {
     enabled: true, // If the title should be enabled or not
-    text: `<span class="font-bold">Same Day Delivery</span>`,
+    text: `<span class="font-bold">Groups and Scheduled Delivery / Pick-Up</span>`,
   },
 
   // Hero subtitle with HTML support
   subtitle: {
     enabled: true, // If the subtitle should be enabled or not
-    text: `Same day delivery is available from our Stone Way and Capitol Hill locations.`,
+    text: `Schedule a delivery or pick-up order`,
   },
 
   // First CTA block
@@ -59,9 +59,9 @@ const hero = {
     // If the image should be enabled or not
     enabled: true,
     // Image source
-    src: import('~/assets/images/side-kick-1.jpg'),
+    src: import('~/assets/images/bagel-paper.jpg'),
     // Image alt text
-    alt: 'Eltana bagels for delivery and paper bag',
+    alt: 'bagel on crossword paper',
   },
 };
 

diff --git a/...ame-day-delivery/neighborhood-delivery.js → ...s/schedule-order/neighborhood-delivery.js b/...ame-day-delivery/neighborhood-delivery.js → ...s/schedule-order/neighborhood-delivery.js
diff --git a/src/pages/order.astro b/src/pages/order.astro
@@ -1,16 +1,17 @@
 ---
 import { SITE } from '~/config/site/config.js';
 import Layout from '~/layouts/PageLayout.astro';
-import { Picture } from '@astrojs/image/components';
-// import { getPermalink } from '~/utils/permalinks';
+import { getPermalink } from '~/utils/permalinks';
 
 import Hero from '~/components/widgets/Hero.astro';
 import CallToAction from '~/components/widgets/CallToAction.astro';
 import Block from '~/components/widgets/Block.astro';
+import Locations from '~/components/widgets/Locations.jsx';
 
 import hero from '~/config/pages/order/hero';
 import callToAction from '~/config/pages/order/call-to-action';
 import neighborhoodDelivery from '~/config/pages/order/neighborhood-delivery';
+import locations from '~/config/pages/order/locations';
 
 const meta = {
   title: SITE.title,
@@ -55,61 +56,48 @@ const meta = {
 
   <Block
     enabled={true}
-    backgroundCss={null}
-    title={'Place an Order Online'}
-    subtitle={'Schedule a pick-up or delivery'}
+    backgroundCss={'px-10 py-10'}
+    mainDivCss={'mb-10 md:mx-auto text-center md:mb-10 max-w-3xl'}
+    title={'Order Now'}
+    subtitle={'Same day delivery or pick-up'}
     highlight={'Online'}
-    content={'For more information, please call 206-420-1293 between 7AM and 4PM, or email orders@eltana.com. All orders MUST be placed 24 hours in advance.'}
+    content={null}
     image={{
       enabled: false,
       src: null,
       alt: 'eltana online order',
     }}
     callToAction={{
       enabled: true,
-      text: 'Delivery +24hr',
+      text: 'Order',
       href: 'https://order.online/business/eltana-31788/en-US',
       target: '_blank',
       rel: [],
-      icon: 'tabler:truck-delivery',
+      icon: 'tabler:bolt',
     }}
     callToAction2={{
-      enabled: true,
-      text: 'Pick-up +24hr',
-      href: 'https://eltana.formstack.com/forms/order',
-      target: '_blank',
+      enabled: false,
+      text: 'Scheduled +24hr',
+      href: getPermalink('/order'),
+      target: '_self',
       rel: [],
-      icon: 'tabler:briefcase',
+      icon: 'tabler:clock',
     }}
   />
 
-  <Block
-    enabled={true}
-    backgroundCss={'px-10 pt-10'}
-    mainDivCss={'mb-5 md:mx-auto text-center md:mb-5 max-w-3xl'}
-    title={'Catering Menu'}
-    subtitle={`Group Orders and Catering Menu`}
-    highlight={'Menu'}
-    content={null}
-  />
+  <!-- Locations Widget ****************** -->
 
-  <!-- Menu Images -->
-  <section class:list={`py-0`}>
-    <div class="max-w-xl sm:mx-auto lg:max-w-2xl">
-      <Picture
-        class="mx-auto rounded-md w-full"
-        widths={[400, 768, 1024, 2040]}
-        sizes="(max-width: 767px) 400px, (max-width: 1023px) 768px, (max-width: 2039px) 1024px, 2040px"
-        aspectRatio={627 / 874}
-        loading="eager"
-        width={627}
-        height={874}
-        src={import('~/assets/images/groups-menu.jpg')}
-        alt="Eltana Group Ordering Menu"
-        fit={'contain'}
+  {
+    locations && locations.enabled && locations.locations.length > 0 && (
+      <Locations
+        client:only="react"
+        highlight={locations.highlight}
+        title={locations.title}
+        subtitle={locations.subtitle}
+        locations={locations.locations}
       />
-    </div>
-  </section>
+    )
+  }
 
   <!-- CallToAction Widget *********** -->
   {

diff --git a/src/pages/same-day-delivery.astro → src/pages/schedule-order.astro b/src/pages/same-day-delivery.astro → src/pages/schedule-order.astro
@@ -1,17 +1,16 @@
 ---
 import { SITE } from '~/config/site/config.js';
 import Layout from '~/layouts/PageLayout.astro';
-import { getPermalink } from '~/utils/permalinks';
+import { Picture } from '@astrojs/image/components';
+// import { getPermalink } from '~/utils/permalinks';
 
 import Hero from '~/components/widgets/Hero.astro';
 import CallToAction from '~/components/widgets/CallToAction.astro';
 import Block from '~/components/widgets/Block.astro';
-import Locations from '~/components/widgets/Locations.jsx';
 
-import hero from '~/config/pages/same-day-delivery/hero';
-import callToAction from '~/config/pages/same-day-delivery/call-to-action';
-import neighborhoodDelivery from '~/config/pages/same-day-delivery/neighborhood-delivery';
-import locations from '~/config/pages/same-day-delivery/locations';
+import hero from '~/config/pages/schedule-order/hero';
+import callToAction from '~/config/pages/schedule-order/call-to-action';
+import neighborhoodDelivery from '~/config/pages/schedule-order/neighborhood-delivery';
 
 const meta = {
   title: SITE.title,
@@ -56,48 +55,61 @@ const meta = {
 
   <Block
     enabled={true}
-    backgroundCss={'px-10 py-10'}
-    mainDivCss={'mb-10 md:mx-auto text-center md:mb-10 max-w-3xl'}
-    title={'DoorDash'}
-    subtitle={'DoorDash is the preferred method'}
+    backgroundCss={null}
+    title={'Place an Order Online'}
+    subtitle={'Schedule a pick-up or delivery'}
     highlight={'Online'}
-    content={null}
+    content={'For more information, please call 206-420-1293 between 7AM and 4PM, or email orders@eltana.com. All orders MUST be placed 24 hours in advance.'}
     image={{
       enabled: false,
       src: null,
       alt: 'eltana online order',
     }}
     callToAction={{
       enabled: true,
-      text: 'Order',
+      text: 'Delivery +24hr',
       href: 'https://order.online/business/eltana-31788/en-US',
       target: '_blank',
       rel: [],
-      icon: 'tabler:bolt',
+      icon: 'tabler:truck-delivery',
     }}
     callToAction2={{
-      enabled: false,
-      text: 'Scheduled +24hr',
-      href: getPermalink('/order'),
-      target: '_self',
+      enabled: true,
+      text: 'Pick-up +24hr',
+      href: 'https://eltana.formstack.com/forms/order',
+      target: '_blank',
       rel: [],
-      icon: 'tabler:clock',
+      icon: 'tabler:briefcase',
     }}
   />
 
-  <!-- Locations Widget ****************** -->
+  <Block
+    enabled={true}
+    backgroundCss={'px-10 pt-10'}
+    mainDivCss={'mb-5 md:mx-auto text-center md:mb-5 max-w-3xl'}
+    title={'Catering Menu'}
+    subtitle={`Group Orders and Catering Menu`}
+    highlight={'Menu'}
+    content={null}
+  />
 
-  {
-    locations && locations.enabled && locations.locations.length > 0 && (
-      <Locations
-        client:only="react"
-        highlight={locations.highlight}
-        title={locations.title}
-        subtitle={locations.subtitle}
-        locations={locations.locations}
+  <!-- Menu Images -->
+  <section class:list={`py-0`}>
+    <div class="max-w-xl sm:mx-auto lg:max-w-2xl">
+      <Picture
+        class="mx-auto rounded-md w-full"
+        widths={[400, 768, 1024, 2040]}
+        sizes="(max-width: 767px) 400px, (max-width: 1023px) 768px, (max-width: 2039px) 1024px, 2040px"
+        aspectRatio={627 / 874}
+        loading="eager"
+        width={627}
+        height={874}
+        src={import('~/assets/images/groups-menu.jpg')}
+        alt="Eltana Group Ordering Menu"
+        fit={'contain'}
       />
-    )
-  }
+    </div>
+  </section>
 
   <!-- CallToAction Widget *********** -->
   {