Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/npm_and_yarn/types/lodash-4.17.10
Browse files Browse the repository at this point in the history
  • Loading branch information
mreed101 authored Oct 8, 2024
2 parents eb33ebb + 2217160 commit ab19433
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 7 deletions.
3 changes: 3 additions & 0 deletions envs/.env.dev
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,7 @@ NEXT_PUBLIC_GOOGLE_TAG_MANAGER_PREVIEW=env-423

# Feature flags for enabling content types. These should only be added when you are preparing to go to prod and are testing on dev.
# It is better to test these from the CMS backend for dev than here.
FEATURE_NEXT_BUILD_CONTENT_EVENT_LISTING=true
FEATURE_NEXT_BUILD_CONTENT_EVENT=true


2 changes: 1 addition & 1 deletion next-sitemap.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const sitemapConfig = {
// relative paths to exclude
exclude: [],

generateRobotsTxt: true, // (optional)
generateRobotsTxt: false, // (optional)

// todo: migrate to server side sitemap to include last edited date from content for lastmod
// will need to update static-path-resources to optionally include that field when requested
Expand Down
14 changes: 8 additions & 6 deletions src/templates/layouts/event/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -303,12 +303,14 @@ export const Event = ({

{formattedDates.length > 5 && (
<div className="vads-u-display--flex vads-u-flex-direction--row vads-u-justify-content--flex-end vads-u-width--full medium-screen:vads-u-width--auto">
<va-button
id="show-all-recurring-events"
secondary
text="Show all times"
onClick={handleAllEventsToggle}
/>
{!showAllEvents && (
<va-button
id="show-all-recurring-events"
secondary
text="Show all times"
onClick={handleAllEventsToggle}
/>
)}
</div>
)}
</va-accordion-item>
Expand Down

0 comments on commit ab19433

Please sign in to comment.