-
Notifications
You must be signed in to change notification settings - Fork 140
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #4071 from appirio-tech/dev
Connect Release 2.11.0
- Loading branch information
Showing
30 changed files
with
896 additions
and
493 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| import { createClient } from 'contentful' | ||
| import { CONTENTFUL_DELIVERY_KEY, CONTENTFUL_SPACE_ID } from '../config/constants' | ||
|
|
||
| export function getClient() { | ||
| return createClient({ | ||
| space: CONTENTFUL_SPACE_ID, | ||
| accessToken: CONTENTFUL_DELIVERY_KEY, | ||
| }) | ||
| } | ||
|
|
||
| export function getEntry(id) { | ||
| const client = getClient() | ||
| return client.getEntry(id, { include: 10 }) | ||
| } |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| import React, { Component } from 'react' | ||
| import FAQItem from './FAQItem' | ||
| import { getEntry } from '../../api/contentful' | ||
| import spinnerWhileLoading from '../../components/LoadingSpinner' | ||
| import './FAQContainer.scss' | ||
|
|
||
|
|
||
| const FAQList = ({ entry }) => ( | ||
| <div styleName="faq-list-container"> | ||
| { | ||
| entry.fields.items.map((item, idx) => { | ||
| return ( | ||
| <FAQItem key={idx} item={item} /> | ||
| )} | ||
| ) | ||
| } | ||
| </div> | ||
| ) | ||
|
|
||
| const EnhancedFAQContainer = spinnerWhileLoading(props => { | ||
| return !props.isLoading | ||
| })(FAQList) | ||
|
|
||
| class FAQContainer extends Component { | ||
| constructor(props) { | ||
| super(props) | ||
| this.state = { | ||
| faqs: null, | ||
| isLoading: true | ||
| } | ||
| } | ||
|
|
||
| componentWillMount() { | ||
| getEntry(this.props.contentKey).then((entry) => { | ||
| this.setState({ faqs: entry, isLoading: false }) | ||
| }) | ||
| } | ||
|
|
||
| render() { | ||
| const { pageTitle } = this.props | ||
| const { faqs, isLoading } = this.state | ||
|
|
||
| return ( | ||
| <div styleName="main"> | ||
| <h1 styleName="title">{pageTitle}</h1> | ||
| <div styleName="content"> | ||
| <EnhancedFAQContainer entry={faqs} isLoading={isLoading} /> | ||
| </div> | ||
| </div> | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| export default FAQContainer |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| @import '~tc-ui/src/styles/tc-includes'; | ||
| @import "../../styles/includes"; | ||
|
|
||
|
|
||
| .faq-list-container { | ||
|
|
||
| } | ||
|
|
||
| .accordion { | ||
| & + & { | ||
| margin-top: 2 * $base-unit; | ||
| } | ||
| } | ||
|
|
||
| .main { | ||
| background-color: $tc-white; | ||
| border-radius: 6px; | ||
| max-width: 960px; | ||
| padding: 35px 35px 20px 35px; | ||
| flex-grow: 1; | ||
| margin: auto; | ||
| margin-top: 20px; | ||
| margin-bottom: 260px; // gives space to show country selection list | ||
|
|
||
| @media screen and (max-width: $screen-md - 1px) { | ||
| padding: 0; | ||
| margin: 0; | ||
| max-width: none; | ||
| margin-bottom: 260px; // gives space to show country selection list in mobile view | ||
| } | ||
| } | ||
|
|
||
| .title { | ||
| font-weight: 400; | ||
| @include roboto-condensed; | ||
| color: $tc-black; | ||
| font-size: 20px; | ||
| line-height: 30px; | ||
| text-align: left; | ||
| text-transform: uppercase; | ||
|
|
||
| @media screen and (max-width: $screen-md - 1px) { | ||
| display: none; | ||
| } | ||
| } | ||
|
|
||
| .content { | ||
| margin-top: 25px; | ||
| @media screen and (max-width: $screen-md - 1px) { | ||
| margin-top: 0; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| import React, { Component } from 'react' | ||
| import cn from 'classnames' | ||
| import { documentToReactComponents } from '@contentful/rich-text-react-renderer' | ||
| import IconX from ' ../../assets/icons/ui-x-mark.svg' | ||
| import IconCarretDown from '../../assets/icons/arrow-6px-carret-down-normal.svg' | ||
| import { CONTENTFUL_NODE_TYPES } from '../../config/constants' | ||
| import './FAQItem.scss' | ||
|
|
||
|
|
||
| class FAQItem extends Component { | ||
| constructor(props) { | ||
| super(props) | ||
| this.state = { isOpen : false } | ||
|
|
||
| this.toggle = this.toggle.bind(this) | ||
| } | ||
|
|
||
| toggle(evt) { | ||
| evt.preventDefault() | ||
|
|
||
| this.setState({ | ||
| isOpen: !this.state.isOpen | ||
| }) | ||
| } | ||
|
|
||
| render() { | ||
| const {item} = this.props | ||
| const {isOpen} = this.state | ||
|
|
||
| const FormattedHyperLink = ({ value, url }) => <a href={url} target="_blank" className="hyperlink-style">{value}</a> | ||
| const options = { | ||
| renderNode: {/* eslint-disable no-unused-vars*/ | ||
| [CONTENTFUL_NODE_TYPES.HYPERLINK]: (node, children) => <FormattedHyperLink value={node.content[0].value} url={node.data.uri}/> | ||
| } | ||
| } | ||
| return ( | ||
| <div styleName={cn('accordion', { 'is-open': isOpen })}> | ||
| <div styleName="header" onClick={this.toggle}> | ||
| <div styleName="title">{item.fields.question}</div> | ||
| <div styleName="toggle"> | ||
| {isOpen ? <IconX styleName="toggle-icon" /> : <IconCarretDown styleName="toggle-icon" />} | ||
| </div> | ||
| </div> | ||
| <div styleName="content">{documentToReactComponents(item.fields.answer, options)}</div> | ||
| </div> | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| export default FAQItem |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| @import '~tc-ui/src/styles/tc-includes'; | ||
|
|
||
| .accordion { | ||
| border: 1px solid $tc-gray-neutral-dark; | ||
| border-radius: 3px; | ||
| padding-left: 5 * $base-unit; | ||
|
|
||
| & + & { | ||
| margin-top: 2 * $base-unit; | ||
| } | ||
| } | ||
|
|
||
|
|
||
| .accordion .header { | ||
| align-items: center; | ||
| cursor: pointer; | ||
| display: flex; | ||
| justify-content: space-between; | ||
| height: 8 * $base-unit; | ||
| padding: 0; | ||
| text-align: left; | ||
| width: 100%; | ||
| } | ||
|
|
||
| .accordion .title { | ||
| @include roboto-bold; | ||
| font-size: $tc-label-md; | ||
| overflow: hidden; | ||
| line-height: 3 * $base-unit; | ||
| text-overflow: ellipsis; | ||
| white-space: nowrap; | ||
| } | ||
|
|
||
| .accordion .value { | ||
| @include roboto; | ||
| color: $tc-gray-80; | ||
| flex: 1 0 auto; | ||
| font-size: $tc-label-lg; | ||
| text-overflow: ellipsis; | ||
| white-space: nowrap; | ||
| width: 0; | ||
| } | ||
|
|
||
| .accordion .toggle { | ||
| align-items: center; | ||
| display: flex; | ||
| justify-content: center; | ||
| height: 36px; | ||
| width: 36px; | ||
| } | ||
|
|
||
| .accordion .toggle-icon { | ||
| height: auto; | ||
| width: 10px; | ||
| } | ||
|
|
||
| .accordion .content { | ||
| display: none; | ||
| color: $tc-gray-70; | ||
| @include roboto; | ||
| font-size: $tc-label-md; | ||
| line-height: 20px; | ||
| text-align: left; | ||
| margin-bottom: 2 * $base-unit; | ||
|
|
||
| a { | ||
| cursor: pointer; | ||
| color: $tc-dark-blue; | ||
| &:hover { | ||
| text-decoration: underline; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| .accordion.is-open .content { | ||
| display: block; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.