diff --git a/.env.sample b/.env.sample new file mode 100644 index 0000000..c65c367 --- /dev/null +++ b/.env.sample @@ -0,0 +1,5 @@ +PAYLOAD_SECRET= +MONGODB_URL= +NEXT_PUBLIC_SERVER_URL=http://localhost:3000 + +SOLANA_WALLET_ADDRESS= \ No newline at end of file diff --git a/.gitignore b/.gitignore index 9079492..02ac7f0 100644 --- a/.gitignore +++ b/.gitignore @@ -40,4 +40,4 @@ next-env.d.ts /src/media /.next -/dist +/dist \ No newline at end of file diff --git a/README.md b/README.md index 432c02d..7505135 100644 --- a/README.md +++ b/README.md @@ -1 +1,67 @@ -# Arbour.io \ No newline at end of file +# Harbour.io + +## Overview + +Harbour is a holistic preventive health platform that aims to change how healthcare is done. Instead of expensive hospital bills, pills after pills, and just generally feeling awful, we want to help you stop yourself from falling sick in the first place. We are looking to deliver end-to-end care, spanning telehealth consultations and diagnosis, to day-to-day monitoring of diets and exercise, to give you and your caregivers the insight you need to truly target your self-care. + +## Getting Started + +These instructions will get you a copy of the project up and running on your local machine for development and testing purposes. See deployment for notes on how to deploy the project on a live system. + +### Prerequisites + +Before you begin, ensure you have the following tools installed on your machine: +- [Yarn](https://yarnpkg.com/) - Yarn is a fast, reliable, and secure dependency management tool. + +You can check if you have Node and Yarn installed by running the following commands in your terminal: + +```bash +yarn -v +``` + +### Installation + +First, clone the Harbour repository to your local machine using Git: + +```bash +git clone https://github.com/your-username/harbour.io.git +cd harbour.io +``` + +Install the project dependencies with Yarn: + +```bash +yarn +``` + +### Running the Project + +#### Development Environment + +To run the project in a development environment with hot reloading: + +```bash +yarn dev +``` + +This command will start a local development server. You can now access the Harbour platform by navigating to `http://localhost:3000` in your web browser. + +#### Production Environment + +To run the project in a production environment: + +1. Build the project: + +```bash +yarn build +``` + +This command prepares the project for production by optimizing and minifying the code. + +2. Start the project: + +```bash +yarn start +``` + +This command serves the production build of the app. Ensure your production environment is properly set up to serve the app to your users. \ No newline at end of file diff --git a/package.json b/package.json index d09ba0e..d7fdd58 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "arbour", + "name": "harbour", "version": "0.1.0", "private": true, "main": "dist/server.js", diff --git "a/public/DALL\302\267E 2024-03-31 15.32.04 - Create a wide horizontal image suitable for a hero background on a healthcare website. The scene should depict a welcoming medical environment with a .webp:Zone.Identifier" "b/public/DALL\302\267E 2024-03-31 15.32.04 - Create a wide horizontal image suitable for a hero background on a healthcare website. The scene should depict a welcoming medical environment with a .webp:Zone.Identifier" deleted file mode 100644 index a08c312..0000000 --- "a/public/DALL\302\267E 2024-03-31 15.32.04 - Create a wide horizontal image suitable for a hero background on a healthcare website. The scene should depict a welcoming medical environment with a .webp:Zone.Identifier" +++ /dev/null @@ -1,3 +0,0 @@ -[ZoneTransfer] -ZoneId=3 -HostUrl=https://chat.openai.com/ diff --git a/public/favicon.ico b/public/favicon.ico index d0acf4d..1a6b1c3 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/public/logo.png b/public/logo.png new file mode 100644 index 0000000..f9167f7 Binary files /dev/null and b/public/logo.png differ diff --git a/public/logo.svg b/public/logo.svg new file mode 100644 index 0000000..15c22ed --- /dev/null +++ b/public/logo.svg @@ -0,0 +1,43 @@ + + + + + + + + + + + + diff --git a/public/nav/icons/bestsellers.jpg b/public/nav/icons/bestsellers.jpg index 33aa408..bbd8d7d 100644 Binary files a/public/nav/icons/bestsellers.jpg and b/public/nav/icons/bestsellers.jpg differ diff --git a/public/nav/icons/new.jpg b/public/nav/icons/new.jpg index 4000c40..38dc54a 100644 Binary files a/public/nav/icons/new.jpg and b/public/nav/icons/new.jpg differ diff --git a/public/nav/icons/new.jpg:Zone.Identifier b/public/nav/icons/new.jpg:Zone.Identifier new file mode 100644 index 0000000..e69de29 diff --git a/public/nav/icons/picks.jpg b/public/nav/icons/picks.jpg index f28e917..e58708e 100644 Binary files a/public/nav/icons/picks.jpg and b/public/nav/icons/picks.jpg differ diff --git a/public/nav/ui-kits/blue.jpg b/public/nav/ui-kits/blue.jpg index 03cf07e..d7237c6 100644 Binary files a/public/nav/ui-kits/blue.jpg and b/public/nav/ui-kits/blue.jpg differ diff --git a/public/nav/ui-kits/mixed.jpg b/public/nav/ui-kits/mixed.jpg index c5c6060..5d22406 100644 Binary files a/public/nav/ui-kits/mixed.jpg and b/public/nav/ui-kits/mixed.jpg differ diff --git a/public/nav/ui-kits/purple.jpg b/public/nav/ui-kits/purple.jpg index 3d73647..4968714 100644 Binary files a/public/nav/ui-kits/purple.jpg and b/public/nav/ui-kits/purple.jpg differ diff --git a/public/thumbnail.jpg b/public/thumbnail.jpg deleted file mode 100644 index 47cc2e8..0000000 Binary files a/public/thumbnail.jpg and /dev/null differ diff --git a/public/thumbnail.png b/public/thumbnail.png new file mode 100644 index 0000000..f7055b3 Binary files /dev/null and b/public/thumbnail.png differ diff --git a/src/app/page.tsx b/src/app/page.tsx index 5a56bda..ab3dbc2 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -39,13 +39,7 @@ export default function Home() { medicine and food.

- Welcome to Arbour.io ⚓ Every medicine and food product listed on - our platform goes through a rigorous quality assurance process to - ensure that you receive only the best. We believe in providing a - seamless and secure experience for both buyers and sellers, making - it easy to find and purchase the products you need. Join our - community today and discover a world of high-quality medicine and - food options. + Welcome to Harbour.io ⚓. A holistic preventive health platform that aims to change how healthcare is done. Instead of expensive hospital bills, pills after pills, and just generally feeling awful, we want to help you stop yourself from falling sick in the first place. We are looking to deliver end-to-end care, spanning telehealth consultations and diagnosis, to day-to-day monitoring of diets and exercise, to give you and your caregivers the insight you need to truly target your self-care.

diff --git a/src/app/thank-you/page.tsx b/src/app/thank-you/page.tsx index a7ce9f8..9c64dbb 100644 --- a/src/app/thank-you/page.tsx +++ b/src/app/thank-you/page.tsx @@ -108,9 +108,9 @@ const ThankYouPage = async ({ value === product.category )?.label - const downloadUrl = ( - product.product_files as ProductFile - ).url as string + // const downloadUrl = ( + // product.product_files as ProductFile + // ).url as string const { image } = product.images[0] diff --git a/src/collections/Orders.ts b/src/collections/Orders.ts index 4214e76..320157c 100644 --- a/src/collections/Orders.ts +++ b/src/collections/Orders.ts @@ -15,7 +15,7 @@ export const Orders: CollectionConfig = { admin: { useAsTitle: 'Your Orders', description: - 'A summary of all your orders on Arbour.io .', + 'A summary of all your orders on Harbour.io .', }, access: { read: yourOwn, @@ -33,9 +33,6 @@ export const Orders: CollectionConfig = { create: () => false, update: () => false, }, - admin: { - hidden: true, - }, required: true, }, { @@ -54,8 +51,10 @@ export const Orders: CollectionConfig = { { name: 'user', type: 'relationship', - admin: { - hidden: true, + access: { + read: ({ req }) => req.user.role === 'admin', + create: () => false, + update: () => false, }, relationTo: 'users', required: true, diff --git a/src/collections/Products/Products.ts b/src/collections/Products/Products.ts index 8e00bb0..4ba06a9 100644 --- a/src/collections/Products/Products.ts +++ b/src/collections/Products/Products.ts @@ -1,189 +1,189 @@ import { - AfterChangeHook, - BeforeChangeHook, -} from 'payload/dist/collections/config/types' -import { PRODUCT_CATEGORIES } from '../../config' -import { Access, CollectionConfig } from 'payload/types' -import { Product, User } from '../../payload-types' - - -const addUser: BeforeChangeHook = async ({ - req, - data, -}) => { - const user = req.user - - return { ...data, user: user.id } -} - -const syncUser: AfterChangeHook = async ({ - req, - doc, -}) => { - const fullUser = await req.payload.findByID({ - collection: 'users', - id: req.user.id, - }) - - if (fullUser && typeof fullUser === 'object') { - const { products } = fullUser - - const allIDs = [ - ...(products?.map((product) => - typeof product === 'object' ? product.id : product - ) || []), - ] - - const createdProductIDs = allIDs.filter( - (id, index) => allIDs.indexOf(id) === index - ) - - const dataToUpdate = [...createdProductIDs, doc.id] - - await req.payload.update({ - collection: 'users', - id: fullUser.id, - data: { - products: dataToUpdate, - }, - }) + AfterChangeHook, + BeforeChangeHook, + } from 'payload/dist/collections/config/types' + import { PRODUCT_CATEGORIES } from '../../config' + import { Access, CollectionConfig } from 'payload/types' + import { Product, User } from '../../payload-types' + + + const addUser: BeforeChangeHook = async ({ + req, + data, + }) => { + const user = req.user + + return { ...data, user: user.id } } -} - -const isAdminOrHasAccess = - (): Access => - ({ req: { user: _user } }) => { - const user = _user as User | undefined - - if (!user) return false - if (user.role === 'admin') return true - - const userProductIDs = (user.products || []).reduce< - Array - >((acc, product) => { - if (!product) return acc - if (typeof product === 'string') { - acc.push(product) - } else { - acc.push(product.id) - } - - return acc - }, []) - - return { - id: { - in: userProductIDs, - }, - } + + const syncUser: AfterChangeHook = async ({ + req, + doc, + }) => { + const fullUser = await req.payload.findByID({ + collection: 'users', + id: req.user.id, + }) + + if (fullUser && typeof fullUser === 'object') { + const { products } = fullUser + + const allIDs = [ + ...(products?.map((product) => + typeof product === 'object' ? product.id : product + ) || []), + ] + + const createdProductIDs = allIDs.filter( + (id, index) => allIDs.indexOf(id) === index + ) + + const dataToUpdate = [...createdProductIDs, doc.id] + + await req.payload.update({ + collection: 'users', + id: fullUser.id, + data: { + products: dataToUpdate, + }, + }) + } } - -export const Products: CollectionConfig = { - slug: 'products', - admin: { - useAsTitle: 'name', - }, - access: { - read: isAdminOrHasAccess(), - update: isAdminOrHasAccess(), - delete: isAdminOrHasAccess(), - }, - hooks: { - afterChange: [syncUser], - beforeChange: [ - addUser, - ], - }, - fields: [ - { - name: 'user', - type: 'relationship', - relationTo: 'users', - required: true, - hasMany: false, - admin: { - condition: () => false, - }, - }, - { - name: 'name', - label: 'Name', - type: 'text', - required: true, - }, - { - name: 'description', - type: 'richText', - label: 'Product details', - }, - { - name: 'price', - label: 'Price in SOL', - min: 0, - type: 'number', - required: true, - }, - { - name: 'category', - label: 'Category', - type: 'select', - options: PRODUCT_CATEGORIES.map( - ({ label, value }) => ({ label, value }) - ), - required: true, - }, - { - name: 'product_files', - label: 'Product file(s)', - type: 'relationship', - required: true, - relationTo: 'product_files', - hasMany: false, - }, - { - name: 'approvedForSale', - label: 'Product Status', - type: 'select', - defaultValue: 'pending', - access: { - create: ({ req }) => req.user.role === 'admin', - read: ({ req }) => req.user.role === 'admin', - update: ({ req }) => req.user.role === 'admin', - }, - options: [ - { - label: 'Pending verification', - value: 'pending', - }, - { - label: 'Approved', - value: 'approved', - }, - { - label: 'Denied', - value: 'denied', - }, - ], - }, - { - name: 'images', - type: 'array', - label: 'Product images', - minRows: 1, - maxRows: 4, - required: true, - labels: { - singular: 'Image', - plural: 'Images', - }, - fields: [ - { - name: 'image', - type: 'upload', - relationTo: 'media', - required: true, - }, - ], - }, - ], -} \ No newline at end of file + + const isAdminOrHasAccess = + (): Access => + ({ req: { user: _user } }) => { + const user = _user as User | undefined + + if (!user) return false + if (user.role === 'admin') return true + + const userProductIDs = (user.products || []).reduce< + Array + >((acc, product) => { + if (!product) return acc + if (typeof product === 'string') { + acc.push(product) + } else { + acc.push(product.id) + } + + return acc + }, []) + + return { + id: { + in: userProductIDs, + }, + } + } + + export const Products: CollectionConfig = { + slug: 'products', + admin: { + useAsTitle: 'name', + }, + access: { + read: isAdminOrHasAccess(), + update: isAdminOrHasAccess(), + delete: isAdminOrHasAccess(), + }, + hooks: { + afterChange: [syncUser], + beforeChange: [ + addUser, + ], + }, + fields: [ + { + name: 'user', + type: 'relationship', + relationTo: 'users', + required: true, + hasMany: false, + admin: { + condition: () => false, + }, + }, + { + name: 'name', + label: 'Name', + type: 'text', + required: true, + }, + { + name: 'description', + type: 'richText', + label: 'Product details', + }, + { + name: 'price', + label: 'Price in SOL', + min: 0, + type: 'number', + required: true, + }, + { + name: 'category', + label: 'Category', + type: 'select', + options: PRODUCT_CATEGORIES.map( + ({ label, value }) => ({ label, value }) + ), + required: true, + }, + // { + // name: 'product_files', + // label: 'Product file(s)', + // type: 'relationship', + // required: false, + // relationTo: 'product_files', + // hasMany: false, + // }, + { + name: 'approvedForSale', + label: 'Product Status', + type: 'select', + defaultValue: 'pending', + access: { + create: ({ req }) => req.user.role === 'admin', + read: ({ req }) => req.user.role === 'admin', + update: ({ req }) => req.user.role === 'admin', + }, + options: [ + { + label: 'Pending verification', + value: 'pending', + }, + { + label: 'Approved', + value: 'approved', + }, + { + label: 'Denied', + value: 'denied', + }, + ], + }, + { + name: 'images', + type: 'array', + label: 'Product images', + minRows: 1, + maxRows: 4, + required: true, + labels: { + singular: 'Image', + plural: 'Images', + }, + fields: [ + { + name: 'image', + type: 'upload', + relationTo: 'media', + required: true, + }, + ], + }, + ], + } \ No newline at end of file diff --git a/src/collections/Users.ts b/src/collections/Users.ts index cf51f2f..d90d6f0 100644 --- a/src/collections/Users.ts +++ b/src/collections/Users.ts @@ -21,7 +21,7 @@ export const Users: CollectionConfig = { }, admin: { hidden: ({ user }) => user.role !== 'admin', - defaultColumns: ['id'], + defaultColumns: ['email'], }, fields: [ { diff --git a/src/components/Footer.tsx b/src/components/Footer.tsx index 0459f33..8897137 100644 --- a/src/components/Footer.tsx +++ b/src/components/Footer.tsx @@ -4,6 +4,7 @@ import { usePathname } from 'next/navigation' import MaxWidthWrapper from './MaxWidthWrapper' import { Icons } from './Icons' import Link from 'next/link' +import { Icon, Icon_svg } from './Logo' const Footer = () => { const pathname = usePathname() @@ -19,7 +20,8 @@ const Footer = () => { {pathsToMinimize.includes(pathname) ? null : (
- + {/* */} +
)} @@ -57,7 +59,7 @@ const Footer = () => {

- © {new Date().getFullYear()} Arbour.io, All Rights + © {new Date().getFullYear()} Harbour.io, All Rights Reserved.

diff --git a/src/components/Logo.tsx b/src/components/Logo.tsx new file mode 100644 index 0000000..f0fe1ff --- /dev/null +++ b/src/components/Logo.tsx @@ -0,0 +1,66 @@ +import React from 'react'; +import './logo.scss'; +import Image from 'next/image'; + +export const Logo = () => ( +
+ Harbour Logo +
+); + +export const Icon = () => ( +
+ Harbour Logo +
+); + +import { LucideProps } from "lucide-react"; + +export const Icon_svg = { + logo: (props: LucideProps) => ( + + + + + + + + + + + ), +}; diff --git a/src/components/Navbar.tsx b/src/components/Navbar.tsx index 28845eb..0005905 100644 --- a/src/components/Navbar.tsx +++ b/src/components/Navbar.tsx @@ -1,6 +1,7 @@ import Link from 'next/link' import MaxWidthWrapper from './MaxWidthWrapper' import { Icons } from './Icons' +import { Icon_svg } from './Logo' import NavItems from './NavItems' import { buttonVariants } from './ui/button' import Cart from './Cart' @@ -24,7 +25,7 @@ const Navbar = async () => {
- +
diff --git a/src/components/logo.scss b/src/components/logo.scss new file mode 100644 index 0000000..a0d66a9 --- /dev/null +++ b/src/components/logo.scss @@ -0,0 +1,17 @@ +.logo { + img { + max-height: 200px; + margin: auto; + } + + h1 { + margin: 3rem auto; + text-align: center; + } + } + +.icon { + img { + max-height: 50px; + } +} \ No newline at end of file diff --git a/src/lib/utils.ts b/src/lib/utils.ts index 09af1b9..cbf8c14 100644 --- a/src/lib/utils.ts +++ b/src/lib/utils.ts @@ -24,8 +24,8 @@ export function formatPrice( } export function constructMetadata({ - title = 'Arbour.io', - description = 'Arbour.io - Your marketplace for high-quality medicine and food.', + title = 'Harbour.io', + description = 'Harbour.io - Your marketplace for high-quality medicine and food.', image = '/thumbnail.png', icons = '/favicon.ico', noIndex = false, @@ -53,10 +53,10 @@ export function constructMetadata({ title, description, images: [image], - creator: '@arbour_io', + creator: '@MY_safe_Harbour', }, icons, - metadataBase: new URL('https://arbour.io.railway.app'), + metadataBase: new URL('https://arbour-io.onrender.com/'), ...(noIndex && { robots: { index: false, diff --git a/src/next-utils.ts b/src/next-utils.ts index 59ba78f..40a9366 100644 --- a/src/next-utils.ts +++ b/src/next-utils.ts @@ -5,11 +5,6 @@ const PORT = Number(process.env.PORT) || 3000 export const nextApp = next({ dev: process.env.NODE_ENV !== "production", port: PORT, - // conf: { - // images: { - // domains: ['localhost', 'https://arbour-io.onrender.com'] - // } - // } }) export const nextHandler = nextApp.getRequestHandler() \ No newline at end of file diff --git a/src/payload.config.ts b/src/payload.config.ts index f1b8bc8..9e3b935 100644 --- a/src/payload.config.ts +++ b/src/payload.config.ts @@ -9,6 +9,7 @@ import { Products } from './collections/Products/Products' import { Media } from './collections/Media' import { ProductFiles } from './collections/ProductFile' import { Orders } from './collections/Orders' +import { Logo, Icon, Icon_svg } from './components/Logo' dotenv.config({ path: path.resolve(__dirname, '../.env'), @@ -17,7 +18,6 @@ dotenv.config({ export default buildConfig({ serverURL: process.env.NEXT_PUBLIC_SERVER_URL || '', collections: [Users, Products, Media, ProductFiles, Orders], - // collections: [Users], routes: { admin: '/dashboard', }, @@ -25,10 +25,16 @@ export default buildConfig({ user: 'users', bundler: webpackBundler(), meta: { - titleSuffix: '- Arbour.io', + titleSuffix: '- Harbour.io', favicon: '/favicon.ico', ogImage: '/thumbnail.jpg', }, + components: { + graphics: { + Logo, + Icon: Icon, + }, + } }, rateLimit: { max: 2000,