From 3387d8b17ccab739617150737291baa4135dc604 Mon Sep 17 00:00:00 2001 From: Ashwini More Date: Tue, 24 Sep 2024 14:24:50 -0400 Subject: [PATCH] Remove FAQs page and update Archived and Documents pages: SITE-4129-30-31 (#132) * Update Archived page to include FAQs and videos and Documents to have GitHub links * Add text - Repositories to Github link * Change formatting on documents page to use cards instead of links * Fix lint errors and warnings * Move archive menu under resources and remove helpful links section * add mail icon to Contact Us link * add text to github repo cards * add mail icon to Contact Us link on archived page * fix position of GO button on doc cards * add mail icon to questions link on fab * update header text on Documents and Archived pages * ui: update contact us icon on communcation FAB * ui: update contact us icon on documentation page and replace bannerbox with typography * ui: change width of DocsCard componet * ui: update format for archive home page * ui: add border & padding to VideoItem. Took out file for now * ui: make SubMenu sticky and format icon to a better position * remove use client directive from site nav resources file --------- Co-authored-by: Ashwini More Co-authored-by: Matthew Stankiewicz --- .../{docs-and-vids => docs}/page.tsx | 0 src/app/(resources)/faqs/page.tsx | 12 - src/components/archived/ArchiveCard.cy.tsx | 8 - src/components/archived/ArchiveCard.tsx | 71 ++-- src/components/archived/ArchiveHome.tsx | 233 ++++++++----- .../{resources => archived}/data/FAQ.json | 17 +- .../{resources => archived}/data/faq.md | 0 src/components/resources/DocsCard.cy.tsx | 8 - src/components/resources/DocsCard.tsx | 65 ++-- src/components/resources/DocsHome.cy.tsx | 8 - src/components/resources/DocsHome.tsx | 321 +++++++++++------- src/components/resources/DocsSubMenu.tsx | 2 +- src/components/resources/FAQCard.tsx | 65 ---- src/components/resources/FAQHome.cy.tsx | 8 - src/components/resources/FAQHome.tsx | 129 ------- src/components/resources/VideoItem.tsx | 21 +- src/components/shared/Ankle.tsx | 25 +- src/components/shared/CommunicationFab.tsx | 4 +- src/components/shared/SubMenu.tsx | 18 +- src/components/shared/nav/nav/Nav.tsx | 3 - .../nav/nav/categories/SiteNavArchived.tsx | 27 -- .../nav/nav/categories/SiteNavResources.tsx | 15 +- 22 files changed, 492 insertions(+), 568 deletions(-) rename src/app/(resources)/{docs-and-vids => docs}/page.tsx (100%) delete mode 100644 src/app/(resources)/faqs/page.tsx delete mode 100644 src/components/archived/ArchiveCard.cy.tsx rename src/components/{resources => archived}/data/FAQ.json (97%) rename src/components/{resources => archived}/data/faq.md (100%) delete mode 100644 src/components/resources/DocsCard.cy.tsx delete mode 100644 src/components/resources/DocsHome.cy.tsx delete mode 100644 src/components/resources/FAQCard.tsx delete mode 100644 src/components/resources/FAQHome.cy.tsx delete mode 100644 src/components/resources/FAQHome.tsx delete mode 100644 src/components/shared/nav/nav/categories/SiteNavArchived.tsx diff --git a/src/app/(resources)/docs-and-vids/page.tsx b/src/app/(resources)/docs/page.tsx similarity index 100% rename from src/app/(resources)/docs-and-vids/page.tsx rename to src/app/(resources)/docs/page.tsx diff --git a/src/app/(resources)/faqs/page.tsx b/src/app/(resources)/faqs/page.tsx deleted file mode 100644 index b3d84e34..00000000 --- a/src/app/(resources)/faqs/page.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import FAQHomeComponent from '@/components/resources/FAQHome' -import CommunicationFab from '@/components/shared/CommunicationFab' -const FAQHome = () => { - return ( - <> - - - - ) -} - -export default FAQHome diff --git a/src/components/archived/ArchiveCard.cy.tsx b/src/components/archived/ArchiveCard.cy.tsx deleted file mode 100644 index 595c50ae..00000000 --- a/src/components/archived/ArchiveCard.cy.tsx +++ /dev/null @@ -1,8 +0,0 @@ -import React from 'react' -import ArchiveCard from './ArchiveCard' - -describe('', () => { - it('renders', () => { - cy.mount() - }) -}) diff --git a/src/components/archived/ArchiveCard.tsx b/src/components/archived/ArchiveCard.tsx index 6d09b137..b767b0ad 100644 --- a/src/components/archived/ArchiveCard.tsx +++ b/src/components/archived/ArchiveCard.tsx @@ -1,36 +1,63 @@ import * as React from 'react' import Card from '@mui/material/Card' -import CardContent from '@mui/material/CardContent' import Typography from '@mui/material/Typography' -import { Button, CardActions } from '@mui/material' -import ArrowForwardIcon from '@mui/icons-material/ArrowForward' +import Divider from '@mui/material/Divider' +import { CardHeader, CardContent, List, ListItem, ListItemText, Box } from '@mui/material' +export interface QAItem { + question: string + answer: string +} -export interface CriteriaCardProps { - cardHeader: string - description: string +interface FAQCardProps { + header: string + items: QAItem[] } -const ArchiveCard = ({ cardHeader, description }: CriteriaCardProps) => { + +const ArchiveCard = ({ header, items }: FAQCardProps) => { return ( - - - {cardHeader} - - - {description} - + + + + + {items.map((item, index) => ( + + + + + + Q: + + + {item.question} + + + + + A: + + + {item.answer.split('\n').map((i, key) => { + return ( + + {i} +
+ + ) + })} + + + + + + ))} + - - - ) } diff --git a/src/components/archived/ArchiveHome.tsx b/src/components/archived/ArchiveHome.tsx index b9539eff..88c046a2 100644 --- a/src/components/archived/ArchiveHome.tsx +++ b/src/components/archived/ArchiveHome.tsx @@ -1,37 +1,42 @@ 'use client' -// MUI Imports -import { Box, Container, Link } from '@mui/material' -import BannerBox from '../shared/BannerBox' -// Global Imports -// Styles +import { Card, CardContent, CardHeader, Container, Typography, Link, Divider } from '@mui/material' +import Box from '@mui/material/Box' +import BannerBox from '@shared/BannerBox' import SubMenu, { menuProps } from '@/components/shared/SubMenu' import palette from '@/styles/palette' -import ArchiveCard from './ArchiveCard' -import ArchiveFilter from './ArchiveFilter' -// Images +import FAQCard from './ArchiveCard' +import faq from './data/FAQ.json' +import VideoItem from '../resources/VideoItem' +import ForwardToInboxOutlinedIcon from '@mui/icons-material/ForwardToInboxOutlined' -const ArchiveHome = () => { +export default function ArchiveHome() { const menuItems: menuProps[] = [ - { heading: 'All', href: '' }, - { heading: 'C-CDA', href: '' }, - { heading: 'Direct', href: '' }, - { heading: 'Edge', href: '' }, - { heading: 'XDM', href: '' }, - { heading: 'Other', href: '' }, - { heading: 'Contact Us', href: '' }, + { heading: 'Overview', href: '#overview' }, + { heading: 'FAQs', href: '#faq' }, + { heading: 'C-CDA', href: '#ccda' }, + { heading: 'Direct', href: '#direct' }, + { heading: 'XDM', href: '#xdm' }, + { heading: 'XDR', href: '#xdr' }, + { heading: 'SMTP', href: '#smtp' }, + { heading: 'Other', href: '#other' }, + { heading: 'Videos', href: '#videos' }, + { + heading: 'Contact Us', + href: 'mailto:edge-test-tool@googlegroups.com', + icon: , + }, ] - function trackMenuItemClick(heading: string) { if (typeof window.gtag === 'function') { - window.gtag('event', 'Click archive sub menu', { + window.gtag('event', 'Click FAQs sub menu', { event_category: 'Navigation', event_label: heading, }) } } + return ( - - {/* Global Header */} +
@@ -39,75 +44,137 @@ const ArchiveHome = () => { } heading={'Archived tools, files and other additional content'} + isTourButton={false} description={ - <> - Unearth a treasure trove of archived resources including tools, files, and more! Please be aware that these - materials are no longer actively maintained. Despite this, they offer valuable insights and historical - context. Dive into our curated collection to explore and discover valuable resources for your projects and - endeavors! - + 'This section contains archived materials, including FAQs and videos. While these items are no longer actively maintained, they may provide useful insights and historical context. Feel free to explore the collection for reference and background information.' } /> - - - - - - - - - - - - - - + + + + + + + + + + + The Frequently Asked Questions (FAQ) section of the SITE website compiles questions and inquiries + we have received in the past. You can search for answers by SITE's features and + functionality. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - +
) } - -export default ArchiveHome diff --git a/src/components/resources/data/FAQ.json b/src/components/archived/data/FAQ.json similarity index 97% rename from src/components/resources/data/FAQ.json rename to src/components/archived/data/FAQ.json index fee6a13a..8aecc761 100644 --- a/src/components/resources/data/FAQ.json +++ b/src/components/archived/data/FAQ.json @@ -2,7 +2,7 @@ "Overview": [ { "question": "What is SITE?", - "answer": "Discover the core concept and purpose behind SITE, and how it can benefit you or your organization." + "answer": "The Standards Implementation & Testing Environment (SITE) is a centralized collection of testing tools and resources designed to assist health IT developers and users in fully evaluating specific technical standards and maximizing the potential of their health IT implementations. SITE includes test tools, sample data, collaboration resources, and useful links." }, { "question": "How do I get started with SITE?", @@ -10,19 +10,11 @@ }, { "question": "What are the key features of SITE?", - "answer": "Explore the various tools, functions, and capabilities that SITE offers to help you achieve your goals." - }, - { - "question": "How can I connect with other users on SITE?", - "answer": "Learn how to build connections, join communities, and engage with fellow SITE users." - }, - { - "question": "Is SITE compatible with mobile devices?", - "answer": "Find out if SITE is accessible on smartphones and tablets, and how to make the most of the mobile experience." + "answer": "SITE includes ONC Certification Tools, General Testing Tools, and Resources. ONC Certification Tools include FHIR resources, C-CDA testing, clinical quality measure testing, electronic prescribing tools, public health reporting testing, and alternative testing. Our General Testing Tools include a suite of general testing tools, including the CPOE Evaluation Tool, IHE Testing Tools, Lantern Project, and the Inferno HL7 FHIR Validator. In addition to this FAQ resource, videos and documentation help enhance your understanding of SITE." }, { "question": "How can I report issues or seek assistance on SITE?", - "answer": "Get information on how to report bugs, seek technical support, or contact our customer service team." + "answer": "Contact us at edge-test-tool@googlegroups.com or access our forum for the latest questions & answers. \nQuestions about the applicability of the initial set of standards, implementation specifications, and certification criteria should be directed to ONC at ONC.Certification@hhs.gov. Questions about the functions and activities of the ONC-ATLs and ONC-ACBs should also be directed to ONC at ONC.Certification@hhs.gov." } ], "Direct": [ @@ -336,5 +328,6 @@ "question": "Does the ETT require the same unique message ID when the message is sent to multiple recipients, or is it acceptable to have different message IDs for each recipient?", "answer": "Message IDs must be unique." } - ] + ], + "Videos": [] } diff --git a/src/components/resources/data/faq.md b/src/components/archived/data/faq.md similarity index 100% rename from src/components/resources/data/faq.md rename to src/components/archived/data/faq.md diff --git a/src/components/resources/DocsCard.cy.tsx b/src/components/resources/DocsCard.cy.tsx deleted file mode 100644 index 3edbf6bd..00000000 --- a/src/components/resources/DocsCard.cy.tsx +++ /dev/null @@ -1,8 +0,0 @@ -import React from 'react' -import DocsCard from './DocsCard' - -describe('', () => { - it('renders', () => { - cy.mount() - }) -}) diff --git a/src/components/resources/DocsCard.tsx b/src/components/resources/DocsCard.tsx index cfdad5ba..34a5f89e 100644 --- a/src/components/resources/DocsCard.tsx +++ b/src/components/resources/DocsCard.tsx @@ -1,36 +1,51 @@ +'use client' import * as React from 'react' import Card from '@mui/material/Card' -import Box from '@mui/material/Box' +import CardContent from '@mui/material/CardContent' import Typography from '@mui/material/Typography' -import Divider from '@mui/material/Divider' +import { Button, CardActions } from '@mui/material' +import ArrowForwardIcon from '@mui/icons-material/ArrowForward' +import Link from 'next/link' -interface DocsCardProps { - header: string - content: React.ReactNode +export interface DocsCardProps { + cardHeader: string + description: string + buttonLink?: string } -const DocsCard: React.FC = ({ header, content }) => { +const DocsCard = ({ cardHeader, description, buttonLink }: DocsCardProps) => { + const isExternalLink: boolean = buttonLink ? buttonLink.startsWith('http') : false + return ( - - - - {header} + + + + {cardHeader} + + + {description} - - {content} - - + + + + + + + ) } diff --git a/src/components/resources/DocsHome.cy.tsx b/src/components/resources/DocsHome.cy.tsx deleted file mode 100644 index a9112c66..00000000 --- a/src/components/resources/DocsHome.cy.tsx +++ /dev/null @@ -1,8 +0,0 @@ -import React from 'react' -import DocsHome from './DocsHome' - -describe('', () => { - it('renders', () => { - cy.mount() - }) -}) diff --git a/src/components/resources/DocsHome.tsx b/src/components/resources/DocsHome.tsx index b9ba5ce9..3e179b3a 100644 --- a/src/components/resources/DocsHome.tsx +++ b/src/components/resources/DocsHome.tsx @@ -1,133 +1,216 @@ -import { Typography, Container, List, ListItemButton } from '@mui/material' -import Box from '@mui/material/Box' +'use client' +import { Box, Container, Link, Typography, Divider } from '@mui/material' +import BannerBox from '../shared/BannerBox' +import SubMenu, { menuProps } from '@/components/shared/SubMenu' +import palette from '@/styles/palette' import DocsCard from './DocsCard' -import BannerBox from '@shared/BannerBox' -import DocsSubMenu from './DocsSubMenu' -import VideoItem from './VideoItem' +import { SxProps, Theme } from '@mui/system' +import { useTheme } from '@mui/material/styles' +import ForwardToInboxOutlinedIcon from '@mui/icons-material/ForwardToInboxOutlined' +import React from 'react' -export default function DocsHome() { +const DocsHome = () => { + const menuItems: menuProps[] = [ + { heading: 'Documents', href: '#documents' }, + { heading: 'GitHub', href: '#github' }, + { + heading: 'Contact Us', + href: 'mailto:edge-test-tool@googlegroups.com', + icon: , + }, + ] + + const theme = useTheme() + const flexibleBox: SxProps = { + display: 'flex', + justifyContent: 'space-between', + gap: '32px', + flexDirection: 'row', + width: '100%', + mb: 4, + [theme.breakpoints.only('lg')]: { + width: '100%', + justifyContent: 'space-between', + gap: '32px', + flexWrap: 'nowrap', + flexDirection: 'row', + }, + [theme.breakpoints.between('lg', 'md')]: { + width: '100%', + justifyContent: 'space-between', + gap: '4px', + flexWrap: 'wrap', + flexDirection: 'row', + }, + [theme.breakpoints.down('md')]: { + width: '100%', + flexDirection: 'row', + flexWrap: 'wrap', + gap: '32px', + }, + } + function trackMenuItemClick(heading: string) { + if (typeof window.gtag === 'function') { + window.gtag('event', 'Click archive sub menu', { + event_category: 'Navigation', + event_label: heading, + }) + } + } return ( -
+ + {/* Global Header */} + Documents + + } + heading={'Documents'} description={ - "In this dedicated area of our website, you'll find a treasure trove of valuable resources designed to enhance your understanding of ONC SITE (Office of the National Coordinator for Health Information Technology - Strategic Interoperability Testing and Evaluation). Whether you're a healthcare professional, a developer, an industry stakeholder, or simply someone interested in the world of health information technology, this section has something for everyone." + <> + Explore a collection of documents and GitHub repositories on this page, designed to enhance your + understanding of the ONC Standards Implementation & Testing Environment (SITE). Whether you're looking + for technical documentation or ready-to-use code, these resources will support your efforts in testing and + implementing health IT standards. + } /> - - - - - - { - "Our document library is a comprehensive repository of whitepapers, research reports, guidelines, and informative articles related to ONC SITE. Whether you're looking to stay up-to-date with the latest regulatory changes, delve into technical specifications, or gain insights into the broader landscape of health IT, you'll find a wealth of knowledge at your fingertips." - } - - - - Access Testing Procedures and Companion Guides - - Local Installation Guide - - Installing using the AMI (Amazon Machine Image) - - - Endpoints for ETT.HealthIT.Gov testing - - -
- } - /> - - - For those who prefer visual learning, our video collection offers an engaging way to absorb - information - -
- - - - - - + + + + + + + + Documents + + + Our document library is a comprehensive repository of whitepapers, research reports, guidelines, and + informative articles related to ONC SITE. Whether you are looking to stay up-to-date with the latest + regulatory changes, delve into technical specifications, or gain insights into the broader landscape of + health IT, you will find a wealth of knowledge at your fingertips. + + + + + + + + + Github + + The following GitHub repositories are part of SITE releases. + - - - - -
- - } - /> + + + + + + + + + + + + + + + + + + + + + + - + ) } + +export default DocsHome diff --git a/src/components/resources/DocsSubMenu.tsx b/src/components/resources/DocsSubMenu.tsx index 9fefdfe1..e0cf82f8 100644 --- a/src/components/resources/DocsSubMenu.tsx +++ b/src/components/resources/DocsSubMenu.tsx @@ -18,7 +18,7 @@ const DocsSubMenu = () => { }} > - + ) diff --git a/src/components/resources/FAQCard.tsx b/src/components/resources/FAQCard.tsx deleted file mode 100644 index a84d5ecd..00000000 --- a/src/components/resources/FAQCard.tsx +++ /dev/null @@ -1,65 +0,0 @@ -import * as React from 'react' -import Card from '@mui/material/Card' -import Typography from '@mui/material/Typography' -import Divider from '@mui/material/Divider' -import { CardHeader, CardContent, List, ListItem, ListItemText, Box } from '@mui/material' -export interface QAItem { - question: string - answer: string -} - -interface FAQCardProps { - header: string - items: QAItem[] -} - -const FAQCard = ({ header, items }: FAQCardProps) => { - return ( - - - - - - {items.map((item, index) => ( - - - - - - Q: - - - {item.question} - - - - - A: - - - {item.answer.split('\n').map((i, key) => { - return ( - - {i} -
- - ) - })} - - - - - - ))} - - - - ) -} - -export default FAQCard diff --git a/src/components/resources/FAQHome.cy.tsx b/src/components/resources/FAQHome.cy.tsx deleted file mode 100644 index eaf28436..00000000 --- a/src/components/resources/FAQHome.cy.tsx +++ /dev/null @@ -1,8 +0,0 @@ -import React from 'react' -import FAQHome from './FAQHome' - -describe('', () => { - it('renders', () => { - cy.mount() - }) -}) diff --git a/src/components/resources/FAQHome.tsx b/src/components/resources/FAQHome.tsx deleted file mode 100644 index f87c989e..00000000 --- a/src/components/resources/FAQHome.tsx +++ /dev/null @@ -1,129 +0,0 @@ -'use client' -import { Card, CardContent, CardHeader, Container, Typography } from '@mui/material' -import Box from '@mui/material/Box' -import BannerBox from '@shared/BannerBox' -import SubMenu, { menuProps } from '@/components/shared/SubMenu' -import FAQCard from './FAQCard' -import faq from './data/FAQ.json' - -export default function FAQHome() { - const menuItems: menuProps[] = [ - { heading: 'Overview', href: '#overview' }, - { heading: 'C-CDA', href: '#ccda' }, - { heading: 'Direct', href: '#direct' }, - { heading: 'XDM', href: '#xdm' }, - { heading: 'XDR', href: '#xdr' }, - { heading: 'SMTP', href: '#smtp' }, - { heading: 'Other', href: '#other' }, - { heading: 'Contact Us', href: '#contact' }, - ] - function trackMenuItemClick(heading: string) { - if (typeof window.gtag === 'function') { - window.gtag('event', 'Click FAQs sub menu', { - event_category: 'Navigation', - event_label: heading, - }) - } - } - - return ( -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A good cheat-sheet resource for XD* metadata is available at: - - http://ihewiki.wustl.edu/wiki/index.php/Notes_on_XDS_Profile. - - - - A helpful guide for navigating the XDR metadata. There are also example files in this directory: - - ftp://ftp.ihe.net/%20TFImplementationMaterial/ITI/examples/XDS.b/ (see - ProvideAndRegisterDocument*) - - - - Here are some examples for XDR: - - http://wiki.ihe.net/index.php/XDS.bImplementation#ExampleProvideandRegisterDocumentSet-btransaction.28withfullmetadata.29 - - - - Provide and register examples. Some examples for XDM: - - {' '} - ftp://ftp.ihe.net/Connectathon/samples/XDM_samples/ - - - - A table showing the difference in optionality between the different XD* metadata is available in - Vol 3 of IHE ITI: - - http://www.ihe.net/uploadedFiles/Documents/ITI/IHE_ITI_TF_Vol3.pdf - - . See table 4.3.1-3: Sending Actor Metadata Attribute Optionality starting on page 109. - - - - - - - - - - - Contact us at edge-test-tool@googlegroups.com - or access our forum for the lastest - questions & answers. - - - Questions about the applicability of the initial set of standards, implementation specifications, - and certification criteria should be directed to ONC at{' '} - ONC.Certification@hhs.gov. Questions about functions - and activities of the ATCBs should be directed to ONC at ONC.Certification@hhs.gov. - - - - - - - -
- ) -} diff --git a/src/components/resources/VideoItem.tsx b/src/components/resources/VideoItem.tsx index cc91a805..56c06cc0 100644 --- a/src/components/resources/VideoItem.tsx +++ b/src/components/resources/VideoItem.tsx @@ -1,4 +1,4 @@ -import { Box } from '@mui/material' +import { Box, Typography } from '@mui/material' import React from 'react' interface VideoItemProps { @@ -28,13 +28,24 @@ const VideoItem: React.FC = ({ fileName, fileDate, fileUrl, show return (
- - {getFileAge(fileDate)} -
+ {fileName} {' '} - {showFileType && (File)} + {showFileType && } + {getFileAge(fileDate)}
) diff --git a/src/components/shared/Ankle.tsx b/src/components/shared/Ankle.tsx index 6715c88b..554bc413 100644 --- a/src/components/shared/Ankle.tsx +++ b/src/components/shared/Ankle.tsx @@ -16,19 +16,11 @@ declare global { } export default function Ankle() { - const ClickFAQAnkle = () => { - if (typeof window.gtag === 'function') { - window.gtag('event', 'Go to FAQs', { - event_category: 'Link', - event_label: 'Go to FAQs thru ankle', - }) - } - } const ClickDocumentationAnkle = () => { if (typeof window.gtag === 'function') { - window.gtag('event', 'Go to Docs & Videos', { + window.gtag('event', 'Go to Docs', { event_category: 'Link', - event_label: 'Go to Docs & Videos thru ankle', + event_label: 'Go to Docs thru ankle', }) } } @@ -44,18 +36,13 @@ export default function Ankle() { - Cant find what your looking for? + Can't find what your looking for? Please checkout our{' '} - - FAQs - - {', '} - - Documentation & Videos - - {', '} + + Documentation + {' '} or{' '} Archived diff --git a/src/components/shared/CommunicationFab.tsx b/src/components/shared/CommunicationFab.tsx index f0fc2947..5fcd1574 100644 --- a/src/components/shared/CommunicationFab.tsx +++ b/src/components/shared/CommunicationFab.tsx @@ -17,13 +17,13 @@ import React, { useEffect, useState } from 'react' import CloseIcon from '@mui/icons-material/Close' import ExitToAppIcon from '@mui/icons-material/ExitToApp' import InfoIcon from '@mui/icons-material/Info' -import MoreVertIcon from '@mui/icons-material/MoreVert' import SecurityIcon from '@mui/icons-material/Security' import LinkButton from './LinkButton' import { fetchReleaseData } from '@/assets/ReleaseService' import palette from '@/styles/palette' import placeholder from '@public/shared/PlaceHolderImageSITE.png' import Image from 'next/image' +import ForwardToInboxOutlinedIcon from '@mui/icons-material/ForwardToInboxOutlined' const drawerWidth = 500 @@ -109,7 +109,7 @@ const CommunicationFab: React.FC = () => { } + icon={} /> diff --git a/src/components/shared/SubMenu.tsx b/src/components/shared/SubMenu.tsx index 986a3f7b..81a1d092 100644 --- a/src/components/shared/SubMenu.tsx +++ b/src/components/shared/SubMenu.tsx @@ -1,6 +1,6 @@ 'use client' import React from 'react' -import { Box, List, ListItemButton, ListItemText } from '@mui/material' +import { Box, List, ListItemButton, ListItemIcon, ListItemText } from '@mui/material' import Link from 'next/link' import { useTheme } from '@mui/material/styles' import palette from '@/styles/palette' @@ -8,29 +8,34 @@ import palette from '@/styles/palette' export type menuProps = { heading: string href: string + icon?: JSX.Element } export interface SubMenuProps { menuItems: menuProps[] onClick: (heading: string) => void } + const SubMenu = ({ menuItems, onClick }: SubMenuProps) => { const theme = useTheme() + return ( - + {menuItems.map((item, index) => ( { }, }} > - + + {item.icon && {item.icon}} ))} diff --git a/src/components/shared/nav/nav/Nav.tsx b/src/components/shared/nav/nav/Nav.tsx index fb8f651d..9104ff2b 100644 --- a/src/components/shared/nav/nav/Nav.tsx +++ b/src/components/shared/nav/nav/Nav.tsx @@ -5,10 +5,8 @@ import { CSSObject, Theme, styled, useTheme } from '@mui/material/styles' import React from 'react' /* Custom Imports */ -import DevTools from '@/components/shared/nav/nav/DevTools' import NavFooter from '@/components/shared/nav/nav/NavFooter' import NavHeader from '@/components/shared/nav/nav/NavHeader' -import SiteNavArchived from '@/components/shared/nav/nav/categories/SiteNavArchived' import SiteNavGeneralTools from '@/components/shared/nav/nav/categories/SiteNavGeneralTools' import SiteNavIndustryTools from '@/components/shared/nav/nav/categories/SiteNavIndustryTools' import SiteNavOncCertTools from '@/components/shared/nav/nav/categories/SiteNavOncCertTools' @@ -99,7 +97,6 @@ export default function SiteNav({ open, handleDrawerClose, handleAuthChange }: S - {/* */} diff --git a/src/components/shared/nav/nav/categories/SiteNavArchived.tsx b/src/components/shared/nav/nav/categories/SiteNavArchived.tsx deleted file mode 100644 index 092ca06f..00000000 --- a/src/components/shared/nav/nav/categories/SiteNavArchived.tsx +++ /dev/null @@ -1,27 +0,0 @@ -import { Divider, ListItemButton, ListItemIcon, ListItemText } from '@mui/material/' -import Link from 'next/link' - -/* Custom Imports */ -import { NAV_PADDING_LEFT_SINGLE_HEADER, NAV_THICKER_DIVIDER } from '@/constants/navConstants' -import palette from '@/styles/palette' -import { ArchiveOutlined } from '@mui/icons-material' - -export default function SiteNavArchived() { - return ( - <> - - - - - - - - - - - ) -} diff --git a/src/components/shared/nav/nav/categories/SiteNavResources.tsx b/src/components/shared/nav/nav/categories/SiteNavResources.tsx index 988668ca..eeea4a3b 100644 --- a/src/components/shared/nav/nav/categories/SiteNavResources.tsx +++ b/src/components/shared/nav/nav/categories/SiteNavResources.tsx @@ -1,5 +1,4 @@ -'use client' -import { ContentCopy, IntegrationInstructionsOutlined, QuestionAnswerOutlined } from '@mui/icons-material' +import { ContentCopy, IntegrationInstructionsOutlined, ArchiveOutlined } from '@mui/icons-material' import { useState } from 'react' /* Custom Imports */ @@ -16,16 +15,16 @@ export default function SiteNavResources() { const items: NavListItemType[] = [ { - text: 'FAQs', + text: 'Documentation', isExternalLink: false, - href: '/faqs', - icon: , + href: '/docs', + icon: , }, { - text: 'Documentation & Videos', + text: 'Archived', isExternalLink: false, - href: '/docs-and-vids', - icon: , + href: '/archived', + icon: , }, ]