Skip to content

Commit

Permalink
Merge aee7f4d into 3aee90a
Browse files Browse the repository at this point in the history
  • Loading branch information
richardcrng committed May 16, 2019
2 parents 3aee90a + aee7f4d commit 02282f2
Show file tree
Hide file tree
Showing 11 changed files with 47 additions and 41 deletions.
2 changes: 1 addition & 1 deletion docs/create/defaults.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ These are [spread into the `create` object](typeSpecific.md) depending on the `i
- [`create.asObject`](asObject/README.md#createasobject)
- [`create.asString`](asString/README.md#createasstring)

### Custom`
### Custom

It is also possible to add [custom action creators](../customReducers.md) by passing in a `customReducers` argument to [`reduxLeaves`](../README.md).

Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

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

19 changes: 3 additions & 16 deletions website/core/Footer.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class Footer extends React.Component {
/>
)}
</a>
<div>
{/* <div>
<h5>Docs</h5>
<a href={this.docUrl('doc1.html', this.props.language)}>
Getting Started (or other categories)
Expand Down Expand Up @@ -69,7 +69,7 @@ class Footer extends React.Component {
<div>
<h5>More</h5>
<a href={`${this.props.config.baseUrl}blog`}>Blog</a>
<a href="https://github.com/">GitHub</a>
<a href="https://github.com/richardcrng/redux-leaves">GitHub</a>
<a
className="github-button"
href={this.props.config.repoUrl}
Expand All @@ -80,21 +80,8 @@ class Footer extends React.Component {
aria-label="Star this project on GitHub">
Star
</a>
</div>
</div> */}
</section>

<a
href="https://opensource.facebook.com/"
target="_blank"
rel="noreferrer noopener"
className="fbOpenSource">
<img
src={`${this.props.config.baseUrl}img/oss_logo.png`}
alt="Facebook Open Source"
width="170"
height="45"
/>
</a>
<section className="copyright">{this.props.config.copyright}</section>
</footer>
);
Expand Down
4 changes: 2 additions & 2 deletions website/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"localized-strings": {
"next": "Next",
"previous": "Previous",
"tagline": "Manage every leaf of your state tree",
"tagline": "Write one. Reduce anywhere.",
"docs": {
"create/asArray/array-creators": {
"title": "Array Action Creators",
Expand Down Expand Up @@ -78,7 +78,7 @@
},
"links": {
"Overview": "Overview",
"Demo": "Demo",
"Sandbox": "Sandbox",
"Docs": "Docs",
"GitHub": "GitHub"
},
Expand Down
45 changes: 31 additions & 14 deletions website/pages/en/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,13 @@ class HomeSplash extends React.Component {

return (
<SplashContainer>
<Logo img_src={`${baseUrl}img/docusaurus.svg`} />
<Logo img_src={`${baseUrl}img/Icon.png`} />
<div className="inner">
<ProjectTitle siteConfig={siteConfig} />
<PromoSection>
<Button href="#try">Try It Out</Button>
<Button href={docUrl('doc1.html')}>Example Link</Button>
<Button href={docUrl('doc2.html')}>Example Link 2</Button>
<Button href={docUrl('intro/overview')}>Overview</Button>
<Button href="https://codesandbox.io/s/reduxleaves-iwc4f">Sandbox</Button>
<Button href="https://github.com/richardcrng/redux-leaves">GitHub</Button>
</PromoSection>
</div>
</SplashContainer>
Expand All @@ -77,13 +77,18 @@ class HomeSplash extends React.Component {
class Index extends React.Component {
render() {
const {config: siteConfig, language = ''} = this.props;
const {baseUrl} = siteConfig;
const {baseUrl, docsUrl} = siteConfig;
const docsPart = `${docsUrl ? `${docsUrl}/` : ''}`;
const langPart = `${language ? `${language}/` : ''}`;
const docUrl = doc => `${baseUrl}${docsPart}${langPart}${doc}`;

const Block = props => (
<Container
padding={['bottom', 'top']}
id={props.id}
background={props.background}>
background={props.background}
docUrl={docUrl}
>
<GridBlock
align="center"
contents={props.children}
Expand Down Expand Up @@ -145,16 +150,28 @@ class Index extends React.Component {
<Block layout="fourColumn">
{[
{
content: 'This is the content of my feature',
image: `${baseUrl}img/docusaurus.svg`,
title: 'Write once.',
content: 'Tired of writing repetitive reducer logic for different slices of state? With Redux-Leaves, you can <b>define reducer logic for an arbitrary leaf</b>.',
image: `${baseUrl}img/code.png`,
imageAlign: 'top',
title: 'Feature One',
},
{
content: 'The content of my second feature',
image: `${baseUrl}img/docusaurus.svg`,
title: 'Reduce anywhere.',
content: 'Redux-Leaves makes that reducer logic instantly available to you for any leaf of your state shape, through <b>an intuitive action creator API</b>.',
image: `${baseUrl}img/hierarchy.png`,
imageAlign: 'top',
},
{
title: 'No boilerplate.',
content: 'No more need to write action creators. Redux-Leaves <b>writes your action creators for you</b> based on the reducer logic that you supply.',
image: `${baseUrl}img/ban.svg`,
imageAlign: 'top',
},
{
title: 'Quick setup.',
content: `It takes <a href=${docUrl('intro/demo')}>just 30 seconds</a> to get up and running with Redux-Leaves.`,
image: `${baseUrl}img/ban.svg`,
imageAlign: 'top',
title: 'Feature Two',
},
]}
</Block>
Expand Down Expand Up @@ -194,11 +211,11 @@ class Index extends React.Component {
<HomeSplash siteConfig={siteConfig} language={language} />
<div className="mainContainer">
<Features />
<FeatureCallout />
{/* <FeatureCallout />
<LearnHow />
<TryOut />
<Description />
<Showcase />
<Showcase /> */}
</div>
</div>
);
Expand Down
14 changes: 7 additions & 7 deletions website/siteConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ const siteConfig = {

// For no header links in the top nav bar -> headerLinks: [],
headerLinks: [
{doc: 'intro/overview', label: 'Overview'},
{doc: 'intro/demo', label: 'Demo'},
{doc: 'redux-leaves', label: 'Docs'},
{href: "https://github.com/richardcrng/redux-leaves", label: 'GitHub'}
{ doc: 'intro/overview', label: 'Overview' },
{ href: 'https://codesandbox.io/s/reduxleaves-iwc4f', label: 'Sandbox', external: true },
{ doc: 'redux-leaves', label: 'Docs' },
{ href: "https://github.com/richardcrng/redux-leaves", label: 'GitHub', external: true }
],

// If you have users set above, you add it here:
Expand All @@ -54,8 +54,8 @@ const siteConfig = {

/* Colors for website */
colors: {
primaryColor: '#9c5f94',
secondaryColor: '#6d4267',
primaryColor: '#348334',
secondaryColor: '#4c9f27',
},

/* Custom fonts for website */
Expand Down Expand Up @@ -104,7 +104,7 @@ const siteConfig = {

// You may provide arbitrary config keys to be used as needed by your
// template. For example, if you need your repo's URL...
// repoUrl: 'https://github.com/facebook/test-site',
repoUrl: 'https://github.com/richardcrng/redux-leaves',
};

module.exports = siteConfig;
Binary file added website/static/img/Icon.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions website/static/img/ban.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added website/static/img/code.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added website/static/img/fast.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added website/static/img/hierarchy.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 02282f2

Please sign in to comment.