Merge branch 'develop'
This commit is contained in:
Daniel Ternyak
commit
ccdd6e4550
|
|
@ -1,5 +1,5 @@
|
|||
<p style="margin: 0;">
|
||||
Your proposal has been approved for public discussion and community feedback on ZF Grants. The Zcash Foundation reviews open grant applications on an ongoing basis, and may request additional revisions based on open feedback before making a final funding determination.
|
||||
Your proposal has been approved for public discussion and community feedback on ZF Grants. The Zcash Foundation reviews open grant applications on an ongoing basis, and may request additional revisions based on open feedback before making a final funding determination. Please <a href="https://forum.zcashcommunity.com/c/Grants/Applications/">post your proposal to the Zcash Forums</a> for community feedback!
|
||||
</p>
|
||||
|
||||
{% if args.admin_note %}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
Your proposal has been approved for public discussion and community feedback on ZF Grants. The Zcash Foundation reviews open grant applications on an ongoing basis, and may request additional revisions based on open feedback before making a final funding determination.
|
||||
Your proposal has been approved for public discussion and community feedback on ZF Grants. The Zcash Foundation reviews open grant applications on an ongoing basis, and may request additional revisions based on open feedback before making a final funding determination. Please post your proposal to the Zcash Forums (https://forum.zcashcommunity.com/c/Grants/Applications) for community feedback!
|
||||
|
||||
|
||||
{% if args.admin_note %}
|
||||
|
|
|
|||
|
|
@ -31,7 +31,14 @@ const Footer: React.SFC<WithNamespaces> = ({ t }) => (
|
|||
className="Footer-main-links-link"
|
||||
target="_blank"
|
||||
>
|
||||
About
|
||||
About Zcash Foundation
|
||||
</a>
|
||||
<a
|
||||
href="https://zcashomg.org/"
|
||||
className="Footer-main-links-link"
|
||||
target="_blank"
|
||||
>
|
||||
About Zcash Open Major Grants (ZOMG)
|
||||
</a>
|
||||
<Link to="/contact" className="Footer-main-links-link">
|
||||
Contact
|
||||
|
|
@ -51,6 +58,14 @@ const Footer: React.SFC<WithNamespaces> = ({ t }) => (
|
|||
<a className="Footer-social-link" href="https://zfnd.org/" target="_blank">
|
||||
Zcash Foundation <Icon type="home" />
|
||||
</a>
|
||||
<a
|
||||
className="Footer-social-link"
|
||||
href="https://twitter.com/zcashomg"
|
||||
target="_blank"
|
||||
rel="noopener nofollow"
|
||||
>
|
||||
@zcashomg <Icon type="twitter" />
|
||||
</a>
|
||||
<a
|
||||
className="Footer-social-link"
|
||||
href="https://twitter.com/zcashfoundation"
|
||||
|
|
|
|||
|
|
@ -52,16 +52,19 @@ class Header extends React.Component<Props, State> {
|
|||
render() {
|
||||
const {isTransparent, ccrDrafts, proposalDrafts, hasCheckedUser} = this.props;
|
||||
const {isDrawerOpen} = this.state;
|
||||
const showBanner = false;
|
||||
|
||||
return (
|
||||
<div>
|
||||
<Banner badgeName={"NOTE"}
|
||||
body={
|
||||
<p>The Zcash Foundation is not currently accepting any new grants; we are awaiting the
|
||||
formation of the Major Grant Review Committee to help guide our future grant strategy.
|
||||
For
|
||||
more information, please email <a
|
||||
href={"mailto:contact@zfnd.org"}>contact@zfnd.org</a></p>}/>
|
||||
{showBanner &&
|
||||
<Banner
|
||||
badgeName={"NOTE"}
|
||||
body={
|
||||
<p>The Zcash Foundation is not currently accepting any new grants; we are
|
||||
awaiting the formation of the Major Grant Review Committee to help guide our future
|
||||
grant strategy. For more information, please email
|
||||
<a href={"mailto:contact@zfnd.org"}>contact@zfnd.org</a></p>}/>
|
||||
}
|
||||
<div
|
||||
className={classnames({
|
||||
Header: true,
|
||||
|
|
@ -98,7 +101,7 @@ class Header extends React.Component<Props, State> {
|
|||
{Array.isArray(proposalDrafts) && proposalDrafts.length > 0 ? (
|
||||
<Button>My Proposals</Button>
|
||||
) : (
|
||||
null // <Button>Start a Proposal</Button>
|
||||
<Button>Start a Proposal</Button>
|
||||
)}
|
||||
</Link>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -9,19 +9,19 @@ import './Guide.less';
|
|||
const HomeGuide: React.SFC<WithNamespaces> = ({ t }) => {
|
||||
const items = [
|
||||
{
|
||||
text: t('home.guide.submit'),
|
||||
text: <p>Individuals and teams submit proposals against requests from the community or the Zcash Foundation or <a href="https://zcashomg.org/">Zcash Open Major Grants (ZOMG)</a>, or submit one of their own ideas</p>,
|
||||
icon: <SubmitIcon />,
|
||||
},
|
||||
{
|
||||
text: t('home.guide.review'),
|
||||
text: <p>The proposal is reviewed by the Zcash Foundation or <a href="https://zcashomg.org/">Zcash Open Major Grants (ZOMG)</a>, after which the proposal may be accepted with or without funding. In cases where the proposal is accepted without funding, the community may donate directly when the team has set a tip address.</p>,
|
||||
icon: <ReviewIcon />,
|
||||
},
|
||||
{
|
||||
text: t('home.guide.community'),
|
||||
text: <p>The proposal is then opened up to the community to discuss, provide feedback, and optionally donate to the team</p>,
|
||||
icon: <CommunityIcon />,
|
||||
},
|
||||
{
|
||||
text: t('home.guide.complete'),
|
||||
text: <p>The proposal creator(s) post updates with their progress, and if having received a bounty, are paid out as they reach project milestones</p>,
|
||||
icon: <CompleteIcon />,
|
||||
},
|
||||
];
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ const HomeIntro: React.SFC<Props> = ({ t, authUser }) => (
|
|||
<div className="HomeIntro">
|
||||
<div className="HomeIntro-content">
|
||||
<h1 className="HomeIntro-content-title">{t('home.intro.title')}</h1>
|
||||
<p className="HomeIntro-content-subtitle">{t('home.intro.subtitle')}</p>
|
||||
<p className="HomeIntro-content-subtitle">Development, research, and community growth. Help us build a better Zcash by creating a proposal or requesting an improvement to Zcash Foundation or <a href="http://zcashomg.org/" target={"_blank"}>Zcash Open Major Grants (ZOMG)</a></p>
|
||||
<div className="HomeIntro-content-buttons">
|
||||
{authUser ? (
|
||||
<Link className="HomeIntro-content-buttons-button is-primary" to="/proposals">
|
||||
|
|
|
|||
|
|
@ -11,12 +11,13 @@ import './style.less';
|
|||
class Home extends React.Component<WithNamespaces> {
|
||||
render() {
|
||||
const { t } = this.props;
|
||||
const showRequests = false;
|
||||
return (
|
||||
<div className="Home">
|
||||
<HeaderDetails title={t('home.title')} description={t('home.description')} />
|
||||
<Intro />
|
||||
<Latest />
|
||||
<Requests />
|
||||
{ showRequests && <Requests />}
|
||||
<Guide />
|
||||
<Actions />
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
Reach out to [contact@zfnd.org](mailto:contact@zfnd.org) for user support and general inquiries.
|
||||
|
||||
The Zcash Foundation can provide feedback on grant ideas, but we encourage you to start with conversations on the [Zcash Community Forum](https://forum.zcashcommunity.com/c/community-collaboration) or the [Zcash Community Chat](https://chat.zcashcommunity.com/channel/the-zcash-foundation).
|
||||
The Zcash Foundation can provide feedback on grant ideas, but we encourage you to start with conversations on the [Zcash Community Forum](https://forum.zcashcommunity.com/c/community-collaboration) or the [Zcash Community Chat](https://chat.zcashcommunity.com/channel/the-zcash-foundation). Have a question about Zcash Open Major Grants (ZOMG)? [Post it to the forums](https://forum.zcashcommunity.com/c/Grants/33).
|
||||
|
||||
**Security or privacy issues should be sent to contact@zfnd.org _and_ contact@grant.io to alert the development team immediately.** If you discover a software bug or vulnerability on ZF Grants, please follow the [Responsible Disclosure Policy](https://github.com/ZcashFoundation/zcash-grant-system/blob/develop/DISCLOSURE.md).
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue