Skip to content

Commit

Permalink
update code to address code review comments
Browse files Browse the repository at this point in the history
  • Loading branch information
weiwang-gsa committed Jul 6, 2023
1 parent 9890d91 commit 8952fee
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 16 deletions.
2 changes: 1 addition & 1 deletion src/content/faq/cardholder.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ order: 2
---
import Accordion from '../../components/Accordion.astro';

# Cardholder FAQ
# {frontmatter.title}

<Accordion question="Whom should I contact for help with my account?" expand="true">
Account holders should reach out to their Agency/Organization Program Coordinator (A/OPC), who will be able to answer most account-related questions.
Expand Down
2 changes: 1 addition & 1 deletion src/content/faq/government-shutdown.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ order: 5
---
import Accordion from '../../components/Accordion.astro';

# Government Shutdown FAQ
# {frontmatter.title}
## Account Holders
<Accordion question="Can I use my GSA SmartPay account during a government-wide shutdown?" heading_level="h3" expand="true">
It depends. Account holders are advised to check with your agency regarding the continued use of GSA SmartPay accounts due to a lapse in funding during a shutdown. You may not be authorized to use your accounts if your agency determines such use does not relate to excepted or exempted activities.
Expand Down
2 changes: 1 addition & 1 deletion src/content/faq/merchants.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ order: 4
import Accordion from '../../components/Accordion.astro';


# Merchant FAQ
# {frontmatter.title}

<Accordion question="Do I have to accept GSA SmartPay® accounts?" expand="true">
Merchants that wish to obtain a GSA Multiple Award Schedule (MAS) contract to do business with the government are required to accept GSA SmartPay payment solutions as a method of payment for [micro-purchases](https://www.gsa.gov/buy-through-us/purchasing-programs/gsa-multiple-award-schedule/schedule-buyers/purchase-card-holders).
Expand Down
2 changes: 1 addition & 1 deletion src/content/faq/program-coordinator.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ order: 3
---
import Accordion from '../../components/Accordion.astro';

# Agency/Organization Program Coordinators (A/OPCs) FAQ
# {frontmatter.title}

<Accordion question="How do I connect with other A/OPCs to share ideas and best practices?" expand="true">
There are several ways to actively participate within the community:
Expand Down
2 changes: 1 addition & 1 deletion src/content/faq/state-tax.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ order: 1
---
import Accordion from '../../components/Accordion.astro';

# State Tax FAQ
# {frontmatter.title}
## Travel
State sales tax exemption applies primarily to hotels and car rentals and usually does not apply to meals and incidentals.

Expand Down
2 changes: 1 addition & 1 deletion src/pages/faq/[slug].astro
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ const { Content, headings } = await entry.render();
</div>
</PageLayout>
<script >
import {handleAccordionSearch, increaseHeadingLevels} from "../../assets/js/faqHelper.js"
import {handleAccordionSearch} from "../../assets/js/faqHelper.js"
handleAccordionSearch();
</script>
14 changes: 4 additions & 10 deletions src/pages/faq/index.astro
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,14 @@ import PageLayout from '../../layouts/PageLayout.astro';
import SideNav from '../../components/SinglePageSideNav.astro'
import { getCollection} from 'astro:content';
const pages = await getCollection('faq');
//console.log(pages)
pages.sort((a, b) => (a.data.order) - b.data.order)
const content_components = pages.map(async entry => (
{...entry, Content: (await entry.render()).Content}
{...entry, ...(await entry.render())}
))
const entries = await Promise.all(content_components)
// const sidebar_entries =[{id:'index.astro', slug:'./', data:{title: 'Frequently Asked Questions'}}]
const headings = [{ slug: 'state-tax-faq', text:"State Tax FAQ"},
{slug:'cardholder-faq',text:'Cardholder FAQ'},
{slug: 'agencyorganization-program-coordinators-aopcs-faq', text:"A/OPCs FAQ"},
{slug:'merchant-faq',text:'Merchant FAQ'},
{slug:'government-shutdown-faq',text:'Government Shutdown FAQ'},
]
const headings = entries.map(entry => entry.headings[0])
---
<PageLayout title="Frequent Asked Questions">
<SideNav
Expand Down

0 comments on commit 8952fee

Please sign in to comment.