Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Fleming content changes #1

Merged
merged 2 commits into from
Nov 7, 2019
Merged

Update Fleming content changes #1

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a7372fa
Update Fleming content changes
siddique26 Nov 7, 2019
561b001
Section name has been changed and one FAQ added
siddique26 Nov 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 25 additions & 24 deletions src/pages/FAQs/content.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion src/pages/GetInvolved/Develop/Develop.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import UnderlinedLink from 'components/UnderlinedLink'
import TextSnippet from 'components/TextSnippet'
import { prefixClassName, openLink } from 'src/utils'
import BGVideo from 'components/BGVideo'
import Invite from '../Invite'

import waveThin1 from 'src/assets/videos/wave_1_thin.mp4'
import waveThin1Web from 'src/assets/videos/wave_1_thin.webm'
Expand All @@ -15,7 +16,7 @@ const baseClassName = 'GetInvolvedDevelop'
const cn = prefixClassName(baseClassName)

const Develop = props => {
const { content } = props
const { content, invite } = props
const { trySafeNet, startDevelop, joinForum, coreNetwork } = content

return (
Expand Down Expand Up @@ -44,6 +45,7 @@ const Develop = props => {
<UnderlinedLink url={coreNetwork.CTA.url}>{coreNetwork.CTA.name}</UnderlinedLink>
</div>
</div>
<Invite content={invite} />
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lets rename this component too be relevant too

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't know how and which are files to change, as style file is named invite.sass

<div className={cn('video')}>
<BGVideo src={waveThin1} webmSrc={waveThin1Web} height={'10px'} />
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/pages/GetInvolved/GetInvolved.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ const GetInvolved = () => {
<section className="GetInvolved">
<div className="GetInvolved__wrap">
<Banner title={content.title} desc={content.pageDesc} />
<Develop content={content.develop} />
<Develop content={content.develop} invite={content.invite}/>
<Engage content={content.engage} />
<FAQs content={content.faqs} />
{ /* <FAQs content={content.faqs} /> */}
</div>
</section>
)
Expand Down
52 changes: 20 additions & 32 deletions src/pages/GetInvolved/Invite/Invite.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,16 @@ export default class Invite extends React.Component {
}
componentWillMount() {
const { content } = this.props
const { installBrowser, feedback } = content
const { claimInvite, installBrowser, feedback } = content

this.ACCORDIONS = {
CLAIM_INVITE: claimInvite.id,
INSTALL_BROWSER: installBrowser.id,
FEEDBACK: feedback.id
}

this.setState({
activeAccordion: this.ACCORDIONS.INSTALL_BROWSER
activeAccordion: this.ACCORDIONS.CLAIM_INVITE
})
}

Expand All @@ -58,9 +59,6 @@ export default class Invite extends React.Component {
if (Object.values(this.ACCORDIONS).indexOf(newHash) !== -1) {
this.setAccordion(newHash)
}
if (this.state.showInviteOpts) {
this.toggleInviteModal()
}
}

setAccordion(activeAccordion) {
Expand All @@ -78,19 +76,9 @@ export default class Invite extends React.Component {
return 'sky'
}

toggleInviteModal(state = false) {
lockBodyScroll(state)
if (state) {
setLocationHash('')
}
this.setState({
showInviteOpts: state
})
}

render() {
const { content } = this.props
const { title, installBrowser, feedback, modal } = content
const { claimInvite, title, installBrowser, feedback, modal } = content;
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lets update this naming.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

okay. changes to joinCommunity

const { activeAccordion } = this.state

const platform = detectPlatform()
Expand All @@ -105,6 +93,22 @@ export default class Invite extends React.Component {
<div className={baseClassName}>
<div className={cn('wrap')}>
<Accordion className="underlineLink-bright-onYellow" bgColor={this.setAccordionBg()}>
<AccordionItem
overline={title}
active={activeAccordion === this.ACCORDIONS.CLAIM_INVITE}
id={claimInvite.id}
title={claimInvite.title}
text={claimInvite.para}
ctaButton={claimInvite.CTA.button}
ctaButtonType="primary"
ctaLink= {claimInvite.CTA.link}
onClick={() => {
this.setAccordion(this.ACCORDIONS.CLAIM_INVITE)
}}
onClickPrimaryButton={() => {
openLink(claimInvite.CTA.button.url, true)
}}
/>
<AccordionItem
overline={title}
active={activeAccordion === this.ACCORDIONS.INSTALL_BROWSER}
Expand Down Expand Up @@ -138,22 +142,6 @@ export default class Invite extends React.Component {
}}
/>
</Accordion>
{
this.state.showInviteOpts ? (
<InviteModal
content={modal}
onClickClose={() => {
this.toggleInviteModal()
}}
onInviteRequest={() => {
openLink(`mailto:${CONSTANT.inviteRequest.to}?subject=${encodeURIComponent(CONSTANT.inviteRequest.subject)}&body=${encodeURIComponent(CONSTANT.inviteRequest.body)}`)
}}
onJoinForum={() => {
openLink(CONSTANT.links.forum, true)
}}
/>
) : null
}
</div>
</div>
)
Expand Down
106 changes: 47 additions & 59 deletions src/pages/GetInvolved/content.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ export default {
startDevelop: {
title: 'Start Developing on SAFE',
para: [
'The SAFE Network is a platform for creating decentralised apps. It is secure, privacy focussed, has a built-in revenue stream, and next to no infrastructure costs.',
'If you want to get started building a SAFE DApp, you’ll find all the tools you need on our DevHub; such as key concepts, APIs and documentation.'
'SAFE will change how we’ll interact with the web and our own data. A leap as big as this requires continuous testing and feedback from the people who it is designed for—and that’s where you can help.',
'Download the SAFE Browser to browse the Network, or why not join the community and be one of many that provide feedback, contribute to code and essentially, help shape the Network.'
],
CTA: {
name: 'Visit the DevHub',
Expand Down Expand Up @@ -59,59 +59,55 @@ export default {
title: 'Stay Up-to-date'
}
},
// invite: {
// title: 'Get Started',
// installBrowser: {
// id: 'installBrowser',
// title: 'Install the SAFE Browser',
// para: 'Grab the latest SAFE Browser to browser the Safe Network.',
// CTA: {
// button: {
// name: 'Download for',
// url: '/'
// },
// link: {
// name: 'More Options',
// url: CONSTANT.downloadApps.browser.others
// }
// }
// },
// feedback: {
// id: 'feedback',
// title: 'Feedback & Contribute',
// para: 'Building the SAFE Network is a team effort. You can help out by making suggestions, reporting bugs, or contributing code.',
// CTA: {
// button: {
// name: 'Join Community',
// url: 'https://safenetforum.org'
// }
// }
// }
// },
invite: {
title: 'Get Started',
claimInvite: {
id: 'claimInvite',
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

here too 🙇

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay

title: 'GET STARTED',
para: 'Join the community Download the CLI and get the tools you need to interact with the SAFE Network.',
CTA: {
button: {
name: 'Download CLI',
url: 'https://github.com/maidsafe/safe-api#download'
},
link: {
name: 'Learn more',
url: 'https://github.com/maidsafe/safe-api'
}
}
},
installBrowser: {
id: 'installBrowser',
title: 'Install the SAFE Browser',
para: 'Grab the latest SAFE Browser to start browsing the Network today!”',
CTA: {
button: {
name: 'Download for',
url: '/'
},
link: {
name: 'More Options',
url: CONSTANT.downloadApps.browser.others
}
}
},
feedback: {
id: 'feedback',
title: 'Feedback & Contribute',
para: 'Building the SAFE Network is a team effort. You can help out by making suggestions, reporting bugs, or contributing code.',
CTA: {
button: {
name: 'Join Community',
url: 'https://safenetforum.org'
}
}
}
},
faqs: {
sections: [
{
title: 'Getting Started: Frequently Asked Questions',
items: [
{
question: 'What do I need in order to browse the SAFE Network?',
answer: [
`You'll need to download the Safe Network App to get started.`
]
},
{
question: 'Do I need an account to access the network?',
answer: [
`To browse the network, no account is needed.`
]
},
// {
// question: 'How do I create an account?',
// answer: [
// 'Here’s a step-by-step Guide:',
// `* [Download](https://github.com/maidsafe/safe_browser/releases) and Install the SAFE Browser. \n* [Register on the forum](https://safenetforum.org/), it takes less than a minute. \n* Gain basic trust level—this requires around an hour reading and interacting. This is a measure to stop the test network being spammed during development. \n* Open the SAFE browser. \n* Click ‘Create Account’ at the bottom of the screen. \n* In the next screen select ‘Claim An Invitation’. \n* Login to the forum within the SAFE Browser, the setup process will prompt you to do this if you have not already done so. \n* Select the The Shared Vault Network. \n* The installer will now provide you with your invitation code. Please note: it is important that your current and registered IPs match, if they do not, click to update. \n* Copy the invite code at the bottom of the screen and paste this back into the field that asks for an ‘Invitation Token’ in the SAFE Browser. \n* You will now be asked to create an Account Secret and Password. Please make sure you keep these safe as only you will ever have access to your credentials. There is no central record of these credentials anywhere within the system and without them you will not be able to access your data. \n* Congratulations! You are now ready to not just browse the SAFE Network, but upload your own data, create websites and use some of the demo apps being worked on by the community.`
// ]
// },
{
question: 'How do I get involved with The SAFE Network community?',
answer: [
Expand All @@ -125,15 +121,7 @@ export default {
'The [SAFE Network Community](https://safenetforum.org) is the place to head to for all questions on the Network.',
'_[Visit the Forum](https://safenetforum.org/)_'
]
},
// {
// question: 'Why do I need an invite?',
// answer: [
// 'You require an invitation token while the Network is in the alpha development phase as a temporary measure to stop the network being spammed. There will be no invitation required when the full SAFE Network is live.',
// 'To claim an invitation token:',
// '- Log in to the [Forum](https://safenetforum.org/) using your normal browser and gain [basic trust level 1](https://safenetforum.org/t/trust-level-1-basic-user-requirements/15200).\n- Visit [https://invite.maidsafe.net](https://invite.maidsafe.net).\n- Click on the SAFE Network logo\n- Select ‘Alpha 2’\n- Set (or update) your registered IP\n- Copy and paste the invitation token into the Invitation field on the Authenticator _(this step is only required when creating an account to begin with)_'
// ]
// },
}
]
},
],
Expand Down
4 changes: 2 additions & 2 deletions src/pages/Roadmap/Releases/Intro/Intro.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react'

import Video from '../../Video'
import { prefixClassName } from 'src/utils'
import { prefixClassName, genRandomKey, parseMDText } from 'src/utils'

import './intro.sass'

Expand All @@ -17,7 +17,7 @@ const Intro = props => {
<div className="overline">{overline}</div>
<h2 className={cn('title')}>{title}</h2>
<div className={cn('para')}>
<p>{text}</p>
{ text.map((para)=> <p key={genRandomKey()} >{parseMDText(para, false)}</p>) }
</div>
{
videoUrl ? (
Expand Down
8 changes: 0 additions & 8 deletions src/pages/Roadmap/Releases/Releases.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,6 @@ const Releases = props => {
videoUrl={release1.videoUrl}
videoCaption={release1.videoCaption}
/>
<AccordionStatus />
<Accordion header={release1.accordion.header}>
{
release1.accordion.items.map(accord => (
<AccordionItem key={genRandomKey()} content={accord} />
))
}
</Accordion>
<Intro
overline={release2.overline}
title={release2.title}
Expand Down
Loading