From 1fe46ca39ffdf1552ccf48f602e638712c7c8d14 Mon Sep 17 00:00:00 2001 From: alexx Date: Tue, 27 Feb 2024 19:41:14 -0600 Subject: [PATCH] basic chgs 2 use 4 food delivery instead of product shipping; remove menu --- package.json | 2 +- src/app/[countryCode]/(checkout)/layout.tsx | 2 +- .../account/@dashboard/addresses/page.tsx | 4 +- .../(main)/account/@dashboard/orders/page.tsx | 3 +- .../account/@dashboard/profile/page.tsx | 2 +- .../(main)/account/@login/page.tsx | 2 +- .../(main)/categories/[...category]/page.tsx | 2 +- .../(main)/collections/[handle]/page.tsx | 2 +- src/app/[countryCode]/(main)/page.tsx | 4 +- .../(main)/products/[handle]/page.tsx | 4 +- src/app/[countryCode]/(main)/store/page.tsx | 4 +- .../account/components/register/index.tsx | 8 +- .../account/templates/account-layout.tsx | 14 --- .../checkout/components/addresses/index.tsx | 4 +- .../checkout/components/review/index.tsx | 6 +- .../common/components/cart-totals/index.tsx | 2 +- src/modules/home/components/hero/index.tsx | 12 +-- .../components/country-select/index.tsx | 2 +- .../layout/components/side-menu/index.tsx | 102 ------------------ src/modules/layout/templates/footer/index.tsx | 18 ++-- src/modules/layout/templates/nav/index.tsx | 10 +- src/modules/order/components/help/index.tsx | 7 +- .../order/components/order-summary/index.tsx | 2 +- .../components/shipping-details/index.tsx | 2 +- .../components/product-tabs/index.tsx | 50 ++------- src/modules/store/templates/index.tsx | 2 +- 26 files changed, 57 insertions(+), 215 deletions(-) delete mode 100644 src/modules/layout/components/side-menu/index.tsx diff --git a/package.json b/package.json index ca6bd3e..d8c4f4a 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "1.0.3", "private": true, "author": "Kasper Fabricius Kristensen & Victor Gerbrands (https://www.medusajs.com)", - "description": "Next.js Starter to be used with Medusa server", + "description": "Next.js Storefront for Medusa, built from nextjs-starter-medusa", "keywords": [ "medusa-storefront" ], diff --git a/src/app/[countryCode]/(checkout)/layout.tsx b/src/app/[countryCode]/(checkout)/layout.tsx index 5172097..0ed3d4d 100644 --- a/src/app/[countryCode]/(checkout)/layout.tsx +++ b/src/app/[countryCode]/(checkout)/layout.tsx @@ -27,7 +27,7 @@ export default function CheckoutLayout({ href="/" className="txt-compact-xlarge-plus text-ui-fg-subtle hover:text-ui-fg-base uppercase" > - Medusa Store + Space City Sustenance
diff --git a/src/app/[countryCode]/(main)/account/@dashboard/addresses/page.tsx b/src/app/[countryCode]/(main)/account/@dashboard/addresses/page.tsx index 61862d6..c208262 100644 --- a/src/app/[countryCode]/(main)/account/@dashboard/addresses/page.tsx +++ b/src/app/[countryCode]/(main)/account/@dashboard/addresses/page.tsx @@ -25,9 +25,9 @@ export default async function Addresses() { return (
-

Shipping Addresses

+

Delivery Addresses

- View and update your shipping addresses, you can add as many as you + View and update your delivery addresses, you can add as many as you like. Saving your addresses will make them available during checkout.

diff --git a/src/app/[countryCode]/(main)/account/@dashboard/orders/page.tsx b/src/app/[countryCode]/(main)/account/@dashboard/orders/page.tsx index 63e18eb..0b93865 100644 --- a/src/app/[countryCode]/(main)/account/@dashboard/orders/page.tsx +++ b/src/app/[countryCode]/(main)/account/@dashboard/orders/page.tsx @@ -21,8 +21,7 @@ export default async function Orders() {

Orders

- View your previous orders and their status. You can also create - returns or exchanges for your orders if needed. + View your previous orders and their status.

diff --git a/src/app/[countryCode]/(main)/account/@dashboard/profile/page.tsx b/src/app/[countryCode]/(main)/account/@dashboard/profile/page.tsx index 7402992..b5f4dd7 100644 --- a/src/app/[countryCode]/(main)/account/@dashboard/profile/page.tsx +++ b/src/app/[countryCode]/(main)/account/@dashboard/profile/page.tsx @@ -11,7 +11,7 @@ import { notFound } from "next/navigation" export const metadata: Metadata = { title: "Profile", - description: "View and edit your Medusa Store profile.", + description: "View and edit your profile.", } export default async function Profile() { diff --git a/src/app/[countryCode]/(main)/account/@login/page.tsx b/src/app/[countryCode]/(main)/account/@login/page.tsx index 848e212..ac092bd 100644 --- a/src/app/[countryCode]/(main)/account/@login/page.tsx +++ b/src/app/[countryCode]/(main)/account/@login/page.tsx @@ -4,7 +4,7 @@ import LoginTemplate from "@modules/account/templates/login-template" export const metadata: Metadata = { title: "Sign in", - description: "Sign in to your Medusa Store account.", + description: "Sign in to Space City Sustenance.", } export default function Login() { diff --git a/src/app/[countryCode]/(main)/categories/[...category]/page.tsx b/src/app/[countryCode]/(main)/categories/[...category]/page.tsx index 74fd658..f74e83d 100644 --- a/src/app/[countryCode]/(main)/categories/[...category]/page.tsx +++ b/src/app/[countryCode]/(main)/categories/[...category]/page.tsx @@ -53,7 +53,7 @@ export async function generateMetadata({ params }: Props): Promise { `${title} category.` return { - title: `${title} | Medusa Store`, + title: `${title} | Space City Sustenance`, description, alternates: { canonical: `${params.category.join("/")}`, diff --git a/src/app/[countryCode]/(main)/collections/[handle]/page.tsx b/src/app/[countryCode]/(main)/collections/[handle]/page.tsx index 8d29729..8a146a9 100644 --- a/src/app/[countryCode]/(main)/collections/[handle]/page.tsx +++ b/src/app/[countryCode]/(main)/collections/[handle]/page.tsx @@ -52,7 +52,7 @@ export async function generateMetadata({ params }: Props): Promise { } const metadata = { - title: `${collection.title} | Medusa Store`, + title: `${collection.title} | Space City Sustenance`, description: `${collection.title} collection`, } as Metadata diff --git a/src/app/[countryCode]/(main)/page.tsx b/src/app/[countryCode]/(main)/page.tsx index 1724fb1..7141288 100644 --- a/src/app/[countryCode]/(main)/page.tsx +++ b/src/app/[countryCode]/(main)/page.tsx @@ -8,9 +8,9 @@ import { ProductCollectionWithPreviews } from "types/global" import { cache } from "react" export const metadata: Metadata = { - title: "Medusa Next.js Starter Template", + title: "Space City Sustenance", description: - "A performant frontend ecommerce starter template with Next.js 14 and Medusa.", + "Vegan food deliveries 2 se htx", } const getCollectionsWithProducts = cache( diff --git a/src/app/[countryCode]/(main)/products/[handle]/page.tsx b/src/app/[countryCode]/(main)/products/[handle]/page.tsx index 459fff3..57b7b91 100644 --- a/src/app/[countryCode]/(main)/products/[handle]/page.tsx +++ b/src/app/[countryCode]/(main)/products/[handle]/page.tsx @@ -58,10 +58,10 @@ export async function generateMetadata({ params }: Props): Promise { } return { - title: `${product.title} | Medusa Store`, + title: `${product.title} | Space City Sustenance`, description: `${product.title}`, openGraph: { - title: `${product.title} | Medusa Store`, + title: `${product.title} | Space City Sustenance`, description: `${product.title}`, images: product.thumbnail ? [product.thumbnail] : [], }, diff --git a/src/app/[countryCode]/(main)/store/page.tsx b/src/app/[countryCode]/(main)/store/page.tsx index 753ba05..0154add 100644 --- a/src/app/[countryCode]/(main)/store/page.tsx +++ b/src/app/[countryCode]/(main)/store/page.tsx @@ -4,8 +4,8 @@ import { SortOptions } from "@modules/store/components/refinement-list/sort-prod import StoreTemplate from "@modules/store/templates" export const metadata: Metadata = { - title: "Store", - description: "Explore all of our products.", + title: "Menu", + description: "Explore our dishes.", } type Params = { diff --git a/src/modules/account/components/register/index.tsx b/src/modules/account/components/register/index.tsx index 14e744e..87e6602 100644 --- a/src/modules/account/components/register/index.tsx +++ b/src/modules/account/components/register/index.tsx @@ -19,11 +19,11 @@ const Register = ({ setCurrentView }: Props) => { return (

- Become a Medusa Store Member + Create an account

- Create your Medusa Store Member profile, and get access to an enhanced - shopping experience. + Create your Space City Sustenance account, and start ordering delicious + vegan meals!!

@@ -57,7 +57,7 @@ const Register = ({ setCurrentView }: Props) => {
- By creating an account, you agree to Medusa Store's{" "} + By creating an account, you agree to Space City Sustenance's{" "} = ({
{customer && }
{children}
-
-
-

Got questions?

- - You can find frequently asked questions and answers on our - customer service page. - -
-
- - Customer Service - -
-
) diff --git a/src/modules/checkout/components/addresses/index.tsx b/src/modules/checkout/components/addresses/index.tsx index 7528af9..0cfdd58 100644 --- a/src/modules/checkout/components/addresses/index.tsx +++ b/src/modules/checkout/components/addresses/index.tsx @@ -56,7 +56,7 @@ const Addresses = ({ level="h2" className="flex flex-row text-3xl-regular gap-x-2 items-baseline" > - Shipping Address + Delivery Address {!isOpen && } {!isOpen && cart?.shipping_address && ( @@ -105,7 +105,7 @@ const Addresses = ({
- Shipping Address + Delivery Address {cart.shipping_address.first_name}{" "} diff --git a/src/modules/checkout/components/review/index.tsx b/src/modules/checkout/components/review/index.tsx index b4676c8..8a14ceb 100644 --- a/src/modules/checkout/components/review/index.tsx +++ b/src/modules/checkout/components/review/index.tsx @@ -41,9 +41,9 @@ const Review = ({
By clicking the Place Order button, you confirm that you have - read, understand and accept our Terms of Use, Terms of Sale and - Returns Policy and acknowledge that you have read Medusa - Store's Privacy Policy. + read, understand and accept our Terms of Use & Terms of Sale + and acknowledge that you have read Space City + Sustenance's Privacy Policy.
diff --git a/src/modules/common/components/cart-totals/index.tsx b/src/modules/common/components/cart-totals/index.tsx index 17444b1..522f02f 100644 --- a/src/modules/common/components/cart-totals/index.tsx +++ b/src/modules/common/components/cart-totals/index.tsx @@ -57,7 +57,7 @@ const CartTotals: React.FC = ({ data }) => {
)}
- Shipping + Delivery {getAmount(shipping_total)}
diff --git a/src/modules/home/components/hero/index.tsx b/src/modules/home/components/hero/index.tsx index ab55c1f..77ad24d 100644 --- a/src/modules/home/components/hero/index.tsx +++ b/src/modules/home/components/hero/index.tsx @@ -10,22 +10,18 @@ const Hero = () => { level="h1" className="text-3xl leading-10 text-ui-fg-base font-normal" > - Ecommerce Starter Template + Phenomenal Vegan Food - Powered by Medusa and Next.js + Delivered to SE Hou - +
diff --git a/src/modules/layout/components/country-select/index.tsx b/src/modules/layout/components/country-select/index.tsx index 807f533..b8bf674 100644 --- a/src/modules/layout/components/country-select/index.tsx +++ b/src/modules/layout/components/country-select/index.tsx @@ -66,7 +66,7 @@ const CountrySelect = ({ toggleState, regions }: CountrySelectProps) => { >
- Shipping to: + Delivering to: {current && ( { - const toggleState = useToggleState() - - return ( -
-
- - {({ open, close }) => ( - <> -
- - Menu - -
- - - -
-
- -
-
    - {Object.entries(SideMenuItems).map(([name, href]) => { - return ( -
  • - - {name} - -
    • - ) - })} -
-
-
- {regions && ( - - )} - -
- - © {new Date().getFullYear()} Medusa Store. All rights - reserved. - -
-
- - - - )} - -
-
- ) -} - -export default SideMenu diff --git a/src/modules/layout/templates/footer/index.tsx b/src/modules/layout/templates/footer/index.tsx index 4f2b686..c36e493 100644 --- a/src/modules/layout/templates/footer/index.tsx +++ b/src/modules/layout/templates/footer/index.tsx @@ -18,7 +18,7 @@ export default async function Footer() { href="/" className="txt-compact-xlarge-plus text-ui-fg-subtle hover:text-ui-fg-base uppercase" > - Medusa Store + Space City Sustenance
@@ -102,36 +102,36 @@ export default async function Footer() {
)}
- Medusa + Social @@ -140,7 +140,7 @@ export default async function Footer() {
- © {new Date().getFullYear()} Medusa Store. All rights reserved. + © {new Date().getFullYear()} Space City Sustenance. All rights reserved.
diff --git a/src/modules/layout/templates/nav/index.tsx b/src/modules/layout/templates/nav/index.tsx index a4ccb61..6a6b711 100644 --- a/src/modules/layout/templates/nav/index.tsx +++ b/src/modules/layout/templates/nav/index.tsx @@ -4,7 +4,6 @@ import { Suspense } from "react" import { listRegions } from "@lib/data" import LocalizedClientLink from "@modules/common/components/localized-client-link" import CartButton from "@modules/layout/components/cart-button" -import SideMenu from "@modules/layout/components/side-menu" export default async function Nav() { const regions = await listRegions().then((regions) => regions) @@ -15,7 +14,12 @@ export default async function Nav() {
diff --git a/src/modules/order/components/help/index.tsx b/src/modules/order/components/help/index.tsx index 45106d0..f9b9a75 100644 --- a/src/modules/order/components/help/index.tsx +++ b/src/modules/order/components/help/index.tsx @@ -6,16 +6,11 @@ const Help = () => { return (
Need help? -
+
  • Contact
    • -
  • - - Returns & Exchanges - -
diff --git a/src/modules/order/components/order-summary/index.tsx b/src/modules/order/components/order-summary/index.tsx index 8513a8d..80992fe 100644 --- a/src/modules/order/components/order-summary/index.tsx +++ b/src/modules/order/components/order-summary/index.tsx @@ -36,7 +36,7 @@ const OrderSummary = ({ order }: OrderSummaryProps) => {
)}
- Shipping + Delivery {getAmount(order.shipping_total)}
diff --git a/src/modules/order/components/shipping-details/index.tsx b/src/modules/order/components/shipping-details/index.tsx index eda824e..9c64e55 100644 --- a/src/modules/order/components/shipping-details/index.tsx +++ b/src/modules/order/components/shipping-details/index.tsx @@ -17,7 +17,7 @@ const ShippingDetails = ({ order }: ShippingDetailsProps) => {
- Shipping Address + Delivery Address {order.shipping_address.first_name}{" "} diff --git a/src/modules/products/components/product-tabs/index.tsx b/src/modules/products/components/product-tabs/index.tsx index 7a53621..657045b 100644 --- a/src/modules/products/components/product-tabs/index.tsx +++ b/src/modules/products/components/product-tabs/index.tsx @@ -19,7 +19,7 @@ const ProductTabs = ({ product }: ProductTabsProps) => { component: , }, { - label: "Shipping & Returns", + label: "Delivery", component: , }, ] @@ -48,16 +48,8 @@ const ProductInfoTab = ({ product }: ProductTabsProps) => {
- Material -

{product.material ? product.material : "-"}

-
-
- Country of origin -

{product.origin_country ? product.origin_country : "-"}

-
-
- Type -

{product.type ? product.type.value : "-"}

+ Calories +

{product.calories ? product.calories : "idk"}

@@ -65,14 +57,6 @@ const ProductInfoTab = ({ product }: ProductTabsProps) => { Weight

{product.weight ? `${product.weight} g` : "-"}

-
- Dimensions -

- {product.length && product.width && product.height - ? `${product.length}L x ${product.width}W x ${product.height}H` - : "-"} -

-
{product.tags?.length ? ( @@ -91,31 +75,11 @@ const ShippingInfoTab = () => {
- Fast delivery + Speedy delivery

- Your package will arrive in 3-5 business days at your pick up - location or in the comfort of your home. -

-
-
-
- -
- Simple exchanges -

- Is the fit not quite right? No worries - we'll exchange your - product for a new one. -

-
-
-
- -
- Easy returns -

- Just return your product and we'll refund your money. No - questions asked – we'll do our best to make sure your return - is hassle-free. + Your food will arrive at the soonest possible point between + 11am-3pm. We dispatch orders based on position in queue, grouping + nearby deliveries together.

diff --git a/src/modules/store/templates/index.tsx b/src/modules/store/templates/index.tsx index 0112bf8..91b4e20 100644 --- a/src/modules/store/templates/index.tsx +++ b/src/modules/store/templates/index.tsx @@ -22,7 +22,7 @@ const StoreTemplate = ({
-

All products

+

All plates

}>