Skip to content

Commit 52bfbbf

Browse files
committed
Added support for project level FAQ via metadata
1 parent 2efb469 commit 52bfbbf

File tree

4 files changed

+3
-5
lines changed

4 files changed

+3
-5
lines changed

config/constants/dev.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ module.exports = {
5151

5252
TC_CDN_URL: process.env.TC_CDN_URL,
5353

54-
PROJECT_FAQ_CONTENT_ID : process.env.PROJECT_FAQ_CONTENT_ID,
5554
DASHBOARD_FAQ_CONTENT_ID : process.env.DASHBOARD_FAQ_CONTENT_ID,
5655
CONTENTFUL_DELIVERY_KEY : process.env.CONTENTFUL_DELIVERY_KEY,
5756
CONTENTFUL_SPACE_ID : process.env.CONTENTFUL_SPACE_ID

config/constants/master.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ module.exports = {
5151

5252
TC_CDN_URL: process.env.TC_CDN_URL,
5353

54-
PROJECT_FAQ_CONTENT_ID : process.env.PROJECT_FAQ_CONTENT_ID,
5554
DASHBOARD_FAQ_CONTENT_ID : process.env.DASHBOARD_FAQ_CONTENT_ID,
5655
CONTENTFUL_DELIVERY_KEY : process.env.CONTENTFUL_DELIVERY_KEY,
5756
CONTENTFUL_SPACE_ID : process.env.CONTENTFUL_SPACE_ID

src/config/constants.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -990,7 +990,6 @@ export const REPORT_SESSION_LENGTH = 25 * 60 // 25 minutes (5 minutes less than
990990
/**
991991
* Contentful Content Ids
992992
*/
993-
export const PROJECT_FAQ_CONTENT_ID = process.env.PROJECT_FAQ_CONTENT_ID
994993
export const DASHBOARD_FAQ_CONTENT_ID = process.env.DASHBOARD_FAQ_CONTENT_ID
995994
export const CONTENTFUL_DELIVERY_KEY = process.env.CONTENTFUL_DELIVERY_KEY
996995
export const CONTENTFUL_SPACE_ID = process.env.CONTENTFUL_SPACE_ID

src/projects/detail/containers/ProjectFAQContainer.jsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import MediaQuery from 'react-responsive'
33
import Sticky from 'react-stickynode'
44
import { connect } from 'react-redux'
55
import { withRouter } from 'react-router-dom'
6-
import { SCREEN_BREAKPOINT_MD, PROJECT_FEED_TYPE_PRIMARY, PROJECT_FEED_TYPE_MESSAGES, PROJECT_FAQ_CONTENT_ID } from '../../../config/constants'
6+
import { SCREEN_BREAKPOINT_MD, PROJECT_FEED_TYPE_PRIMARY, PROJECT_FEED_TYPE_MESSAGES } from '../../../config/constants'
77
import TwoColsLayout from '../../../components/TwoColsLayout'
88
import FAQContainer from '../../../components/FAQ/FAQContainer'
99
import ProjectInfoContainer from './ProjectInfoContainer'
@@ -15,6 +15,7 @@ class ProjectFAQContainer extends Component {
1515
render() {
1616
const {
1717
project,
18+
projectTemplate,
1819
phases,
1920
currentMemberRole,
2021
isSuperUser,
@@ -61,7 +62,7 @@ class ProjectFAQContainer extends Component {
6162
</MediaQuery>
6263
</TwoColsLayout.Sidebar>
6364
<TwoColsLayout.Content>
64-
<FAQContainer contentKey={PROJECT_FAQ_CONTENT_ID} pageTitle="FAQ About Project" />
65+
<FAQContainer contentKey={projectTemplate.metadata.contentful.projectFaqId} pageTitle="FAQ About Project" />
6566
</TwoColsLayout.Content>
6667
</TwoColsLayout>
6768
)

0 commit comments

Comments
 (0)