From a7372fabd979712510c79871535791cd870615c4 Mon Sep 17 00:00:00 2001 From: siddique26 Date: Thu, 7 Nov 2019 19:27:40 +0530 Subject: [PATCH 1/2] Update Fleming content changes --- src/pages/FAQs/content.js | 49 +++++----- src/pages/GetInvolved/Develop/Develop.js | 4 +- src/pages/GetInvolved/GetInvolved.js | 4 +- src/pages/GetInvolved/Invite/Invite.js | 52 ++++------- src/pages/GetInvolved/content.js | 106 ++++++++++------------ src/pages/Roadmap/Releases/Intro/Intro.js | 4 +- src/pages/Roadmap/Releases/Releases.js | 8 -- src/pages/Roadmap/content.js | 47 ++++++---- 8 files changed, 126 insertions(+), 148 deletions(-) diff --git a/src/pages/FAQs/content.js b/src/pages/FAQs/content.js index 4d1113a6..85b4c17d 100644 --- a/src/pages/FAQs/content.js +++ b/src/pages/FAQs/content.js @@ -40,31 +40,7 @@ export default { 'Started in 2006 by Scottish engineer David Irvine, MaidSafe are the core developers of the SAFE Network. It’s a small team comprised of: thinkers, inventors, tinkerers, PHDs, engineers and designers. Although based in Ayr, Scotland, we work remotely with talents from many different cultures and countries, reflecting the users that we serve. Despite this variety, we all share a single mission: providing security and privacy for everyone.', '_[Visit Maidsafe.net](https://maidsafe.net)_' ] - } - ] - }, - { - title: 'Getting Started', - items: [ - { - question: 'What do I need in order to browse the SAFE Network?', - answer: [ - '[Download the SAFE Network App!](https://github.com/maidsafe/safe-network-app/releases)' - ] }, - // { - // question: 'Do I need an account to access the network?', - // answer: [ - // 'While the network is in Alpha then yes, you\'ll need to have an account. See \'How do I create an account?\' below for a step-by-step guide.' - // ] - // }, - // { - // 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 an account on the community forum](https://safenetforum.org/), it takes less than a minute. \n- [Gain basic trust level](https://safenetforum.org/t/trust-level-1-basic-user-requirements/15200). — this requires around an hour reading and interacting as a measure to stop the test network being spammed during the development phase.\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.- 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: [ @@ -81,6 +57,31 @@ export default { } ] }, + // { + // title: 'Getting Started', + // items: [ + // { + // question: 'What do I need in order to browse the SAFE Network?', + // answer: [ + // '[Download the SAFE Network App!](https://github.com/maidsafe/safe-network-app/releases)' + // ] + // }, + // { + // question: 'Do I need an account to access the network?', + // answer: [ + // 'While the network is in Alpha then yes, you\'ll need to have an account. See \'How do I create an account?\' below for a step-by-step guide.' + // ] + // }, + // { + // 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 an account on the community forum](https://safenetforum.org/), it takes less than a minute. \n- [Gain basic trust level](https://safenetforum.org/t/trust-level-1-basic-user-requirements/15200). — this requires around an hour reading and interacting as a measure to stop the test network being spammed during the development phase.\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.- 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.' + // ] + // }, + + // ] + // }, { title: 'How it works', items: [ diff --git a/src/pages/GetInvolved/Develop/Develop.js b/src/pages/GetInvolved/Develop/Develop.js index 1dd2d1f3..928d45a4 100644 --- a/src/pages/GetInvolved/Develop/Develop.js +++ b/src/pages/GetInvolved/Develop/Develop.js @@ -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' @@ -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 ( @@ -44,6 +45,7 @@ const Develop = props => { {coreNetwork.CTA.name} +
diff --git a/src/pages/GetInvolved/GetInvolved.js b/src/pages/GetInvolved/GetInvolved.js index bea7917e..71bb40ef 100644 --- a/src/pages/GetInvolved/GetInvolved.js +++ b/src/pages/GetInvolved/GetInvolved.js @@ -11,9 +11,9 @@ const GetInvolved = () => {
- + - + { /* */}
) diff --git a/src/pages/GetInvolved/Invite/Invite.js b/src/pages/GetInvolved/Invite/Invite.js index 75f78598..8931f73f 100644 --- a/src/pages/GetInvolved/Invite/Invite.js +++ b/src/pages/GetInvolved/Invite/Invite.js @@ -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 }) } @@ -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) { @@ -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; const { activeAccordion } = this.state const platform = detectPlatform() @@ -105,6 +93,22 @@ export default class Invite extends React.Component {
+ { + this.setAccordion(this.ACCORDIONS.CLAIM_INVITE) + }} + onClickPrimaryButton={() => { + openLink(claimInvite.CTA.button.url, true) + }} + /> - { - this.state.showInviteOpts ? ( - { - 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 - }
) diff --git a/src/pages/GetInvolved/content.js b/src/pages/GetInvolved/content.js index dc21574f..e6838ff8 100644 --- a/src/pages/GetInvolved/content.js +++ b/src/pages/GetInvolved/content.js @@ -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', @@ -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', + 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: [ @@ -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)_' - // ] - // }, + } ] }, ], diff --git a/src/pages/Roadmap/Releases/Intro/Intro.js b/src/pages/Roadmap/Releases/Intro/Intro.js index 92266e6f..56f9c4e9 100644 --- a/src/pages/Roadmap/Releases/Intro/Intro.js +++ b/src/pages/Roadmap/Releases/Intro/Intro.js @@ -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' @@ -17,7 +17,7 @@ const Intro = props => {
{overline}

{title}

-

{text}

+ { text.map((para)=>

{parseMDText(para, false)}

) }
{ videoUrl ? ( diff --git a/src/pages/Roadmap/Releases/Releases.js b/src/pages/Roadmap/Releases/Releases.js index c1984a70..99aca379 100644 --- a/src/pages/Roadmap/Releases/Releases.js +++ b/src/pages/Roadmap/Releases/Releases.js @@ -24,14 +24,6 @@ const Releases = props => { videoUrl={release1.videoUrl} videoCaption={release1.videoCaption} /> - - - { - release1.accordion.items.map(accord => ( - - )) - } - Date: Thu, 7 Nov 2019 20:34:03 +0530 Subject: [PATCH 2/2] Section name has been changed and one FAQ added --- src/pages/FAQs/content.js | 8 +++++++- src/pages/GetInvolved/Invite/Invite.js | 26 +++++++++++++------------- src/pages/GetInvolved/content.js | 20 ++++++++++---------- 3 files changed, 30 insertions(+), 24 deletions(-) diff --git a/src/pages/FAQs/content.js b/src/pages/FAQs/content.js index 85b4c17d..7752d514 100644 --- a/src/pages/FAQs/content.js +++ b/src/pages/FAQs/content.js @@ -1,4 +1,4 @@ -export default { + export default { title: 'Frequently Asked Questions', sections: [ { @@ -41,6 +41,12 @@ export default { '_[Visit Maidsafe.net](https://maidsafe.net)_' ] }, + { + question: 'What do I need in order to browse the SAFE Network?', + answer: [ + '[Download the SAFE Network App!](https://github.com/maidsafe/safe-network-app/releases)' + ] + }, { question: 'How do I get involved with The SAFE Network community?', answer: [ diff --git a/src/pages/GetInvolved/Invite/Invite.js b/src/pages/GetInvolved/Invite/Invite.js index 8931f73f..0816d54a 100644 --- a/src/pages/GetInvolved/Invite/Invite.js +++ b/src/pages/GetInvolved/Invite/Invite.js @@ -27,16 +27,16 @@ export default class Invite extends React.Component { } componentWillMount() { const { content } = this.props - const { claimInvite, installBrowser, feedback } = content + const { joinCommunity, installBrowser, feedback } = content this.ACCORDIONS = { - CLAIM_INVITE: claimInvite.id, + JOIN_COMMUNITY: joinCommunity.id, INSTALL_BROWSER: installBrowser.id, FEEDBACK: feedback.id } this.setState({ - activeAccordion: this.ACCORDIONS.CLAIM_INVITE + activeAccordion: this.ACCORDIONS.JOIN_COMMUNITY }) } @@ -70,7 +70,7 @@ export default class Invite extends React.Component { setAccordionBg() { const { activeAccordion } = this.state - if (activeAccordion === this.ACCORDIONS.CLAIM_INVITE) + if (activeAccordion === this.ACCORDIONS.JOIN_COMMUNITY) return 'yellow' if (activeAccordion === this.ACCORDIONS.INSTALL_BROWSER) return 'sky' @@ -78,7 +78,7 @@ export default class Invite extends React.Component { render() { const { content } = this.props - const { claimInvite, title, installBrowser, feedback, modal } = content; + const { joinCommunity, title, installBrowser, feedback, modal } = content; const { activeAccordion } = this.state const platform = detectPlatform() @@ -95,18 +95,18 @@ export default class Invite extends React.Component { { - this.setAccordion(this.ACCORDIONS.CLAIM_INVITE) + this.setAccordion(this.ACCORDIONS.JOIN_COMMUNITY) }} onClickPrimaryButton={() => { - openLink(claimInvite.CTA.button.url, true) + openLink(joinCommunity.CTA.button.url, true) }} />