diff --git a/backend/package.json b/backend/package.json index a575861..e4d5e4a 100644 --- a/backend/package.json +++ b/backend/package.json @@ -11,7 +11,7 @@ "sqlite3": "5.1.6" }, "devDependencies": { - "nodemon": "2.0.22", + "nodemon": "3.0.1", "uuid": "9.0.0" } } diff --git a/backend/pnpm-lock.yaml b/backend/pnpm-lock.yaml index 48e4842..1b4f044 100644 --- a/backend/pnpm-lock.yaml +++ b/backend/pnpm-lock.yaml @@ -14,8 +14,8 @@ dependencies: devDependencies: nodemon: - specifier: 2.0.22 - version: 2.0.22 + specifier: 3.0.1 + version: 3.0.1 uuid: specifier: 9.0.0 version: 9.0.0 @@ -5554,7 +5554,6 @@ packages: engines: {node: '>=10'} dependencies: yallist: 4.0.0 - dev: false /luxon@3.3.0: resolution: {integrity: sha512-An0UCfG/rSiqtAIiBPO0Y9/zAnHUZxAMiCpTd5h2smgsj7GGmcenvrvww2cqNA8/4A5ZrD1gJpHN2mIHZQF+Mg==} @@ -6044,9 +6043,9 @@ packages: engines: {node: '>=6.0.0'} dev: false - /nodemon@2.0.22: - resolution: {integrity: sha512-B8YqaKMmyuCO7BowF1Z1/mkPqLk6cs/l63Ojtd6otKjMx47Dq1utxfRxcavH1I7VSaL8n5BUaoutadnsX3AAVQ==} - engines: {node: '>=8.10.0'} + /nodemon@3.0.1: + resolution: {integrity: sha512-g9AZ7HmkhQkqXkRc20w+ZfQ73cHLbE8hnPbtaFbFtCumZsjyMhKk9LajQ07U5Ux28lvFjZ5X7HvWR1xzU8jHVw==} + engines: {node: '>=10'} hasBin: true dependencies: chokidar: 3.5.3 @@ -6054,8 +6053,8 @@ packages: ignore-by-default: 1.0.1 minimatch: 3.1.2 pstree.remy: 1.1.8 - semver: 5.7.1 - simple-update-notifier: 1.1.0 + semver: 7.5.4 + simple-update-notifier: 2.0.0 supports-color: 5.5.0 touch: 3.1.0 undefsafe: 2.0.5 @@ -7431,21 +7430,11 @@ packages: resolution: {integrity: sha512-6aU+Rwsezw7VR8/nyvKTx8QpWH9FrcYiXXlqC4z5d5XQBDRqtbfsRjnwGyqbi3gddNtWHuEk9OANUotL26qKUw==} dev: false - /semver@5.7.1: - resolution: {integrity: sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==} - hasBin: true - dev: true - /semver@6.3.0: resolution: {integrity: sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==} hasBin: true dev: false - /semver@7.0.0: - resolution: {integrity: sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==} - hasBin: true - dev: true - /semver@7.5.1: resolution: {integrity: sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==} engines: {node: '>=10'} @@ -7462,6 +7451,14 @@ packages: lru-cache: 6.0.0 dev: false + /semver@7.5.4: + resolution: {integrity: sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==} + engines: {node: '>=10'} + hasBin: true + dependencies: + lru-cache: 6.0.0 + dev: true + /send@0.18.0: resolution: {integrity: sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==} engines: {node: '>= 0.8.0'} @@ -7566,11 +7563,11 @@ packages: is-arrayish: 0.3.2 dev: false - /simple-update-notifier@1.1.0: - resolution: {integrity: sha512-VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg==} - engines: {node: '>=8.10.0'} + /simple-update-notifier@2.0.0: + resolution: {integrity: sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==} + engines: {node: '>=10'} dependencies: - semver: 7.0.0 + semver: 7.5.4 dev: true /slash@4.0.0: @@ -8494,7 +8491,6 @@ packages: /yallist@4.0.0: resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==} - dev: false /yaml@1.10.2: resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==} diff --git a/frontend/components/footer.js b/frontend/components/footer.js index 10e0563..09dbd17 100644 --- a/frontend/components/footer.js +++ b/frontend/components/footer.js @@ -1,29 +1,28 @@ import { Link } from '@chakra-ui/next-js' -import { Box, Flex, Stack, useColorModeValue } from '@chakra-ui/react' +import { Box, Flex, Stack, Text, useColorModeValue } from '@chakra-ui/react' -export default function Footer({ siteName }) { +export default function Footer({ menu, globals }) { return ( - <> - - - - - - + + + + {globals.copyright} + + ) } -const FooterMenu = () => { +const FooterMenu = ({ items }) => { const linkColor = useColorModeValue('gray.600', 'gray.200') const linkHoverColor = useColorModeValue('gray.800', 'white') return ( - {NAV_ITEMS.map((navItem) => ( + {items.map((navItem) => ( { ) } - -const NAV_ITEMS = [ - { - label: 'Vendors', - href: '/vendors', - }, - { - label: 'About Us', - href: '/about-us', - }, -] diff --git a/frontend/components/header.js b/frontend/components/header.js index 5835e84..81f7b41 100644 --- a/frontend/components/header.js +++ b/frontend/components/header.js @@ -2,15 +2,16 @@ import { MoonIcon, SunIcon } from '@chakra-ui/icons' import { Box, Button, Flex, Heading, Spacer, Stack, useColorMode, useColorModeValue } from '@chakra-ui/react' import { Link } from '@chakra-ui/next-js' -export default function Header({ siteName }) { +export default function Header({ menu, globals }) { const { colorMode, toggleColorMode } = useColorMode() + return ( <> - {siteName} + {globals.site_name} - + @@ -24,17 +25,17 @@ export default function Header({ siteName }) { ) } -const MainMenu = () => { +const MainMenu = ({ items }) => { const linkColor = useColorModeValue('gray.600', 'gray.200') const linkHoverColor = useColorModeValue('gray.800', 'white') return ( - {NAV_ITEMS.map((navItem) => ( + {items.map((navItem) => ( { ) } - -const NAV_ITEMS = [ - { - label: 'Vendors', - href: '/vendors', - }, - { - label: 'About Us', - href: '/about-us', - }, -] diff --git a/frontend/components/layout.js b/frontend/components/layout.js index 3ea0493..d24fa17 100644 --- a/frontend/components/layout.js +++ b/frontend/components/layout.js @@ -1,13 +1,13 @@ -import { Container } from '@chakra-ui/react' +import { Container, Box } from '@chakra-ui/react' import Footer from '~/components/footer' import Header from '~/components/header' -export default function Layout({ children }) { +export default function Layout({ globals, menus, children }) { return ( -
-
{children}
-