This is an automated email from the ASF dual-hosted git repository. juzhiyuan pushed a commit to branch feat-docusaurus in repository https://gitbox.apache.org/repos/asf/apisix-website.git
commit 5474ff0ec5d30c23aa1f59d6fd1b4bb7a3c13335 Author: juzhiyuan <[email protected]> AuthorDate: Sat Aug 22 11:05:03 2020 +0800 feat: update Footer --- website/core/Footer.js | 40 +++++++++-------- website/siteConfig.js | 68 +++++++++++++---------------- website/static/img/asf_logo_wide_small.png | Bin 0 -> 32278 bytes website/static/img/logo.png | Bin 0 -> 85376 bytes 4 files changed, 53 insertions(+), 55 deletions(-) diff --git a/website/core/Footer.js b/website/core/Footer.js index 90d0f6e..b1c3058 100644 --- a/website/core/Footer.js +++ b/website/core/Footer.js @@ -30,27 +30,25 @@ class Footer extends React.Component { )} </a> <div> - <h5>Docs</h5> - <a href={this.docUrl('doc1.html')}> - Getting Started (or other categories) - </a> - <a href={this.docUrl('doc2.html')}>Guides (or other categories)</a> - <a href={this.docUrl('doc3.html')}> - API Reference (or other categories) - </a> + <h5>ASF</h5> + <a href="https://www.apache.org/security/";>Security</a> + <a href="https://www.apache.org/";>Foundation</a> + <a href="https://www.apache.org/licenses/";>LICENSES</a> + {/* <a href="https://apachecon.com/?ref=apisix.apache.org";>ApacheCon</a> + <a href="https://www.apache.org/foundation/sponsorship.html";>Sponsorship</a> + <a href="https://www.apache.org/foundation/thanks.html";>Thanks</a> */} </div> <div> <h5>Community</h5> <a href={`${this.props.config.baseUrl}users`}>User Showcase</a> <a - href="https://stackoverflow.com/questions/tagged/"; + href="https://github.com/apache/apisix/issues"; target="_blank" rel="noreferrer noopener"> - Stack Overflow + Issues </a> - <a href="https://discordapp.com/";>Project Chat</a> <a - href="https://twitter.com/"; + href="https://twitter.com/ApacheAPISIX"; target="_blank" rel="noreferrer noopener"> Twitter @@ -96,15 +94,21 @@ class Footer extends React.Component { </section> <a - href="https://opensource.facebook.com/"; + href="https://www.apache.org/"; target="_blank" rel="noreferrer noopener" - className="fbOpenSource"> + style={{ + display: 'block', + margin: '1em auto', + opacity: 0.8, + transition: 'opacity 0.15s ease-in-out', + textAlign: 'center' + }} + > <img - src={`${this.props.config.baseUrl}img/oss_logo.png`} - alt="Facebook Open Source" - width="170" - height="45" + src={`${this.props.config.baseUrl}img/asf_logo_wide_small.png`} + alt="Apache Software Foundation" + style={{width: 370, height: 64}} /> </a> <section className="copyright">{this.props.config.copyright}</section> diff --git a/website/siteConfig.js b/website/siteConfig.js index b6cdeb4..9bc8aef 100644 --- a/website/siteConfig.js +++ b/website/siteConfig.js @@ -11,51 +11,45 @@ // List of projects/orgs using your project for the users page. const users = [ { - caption: 'User1', + caption: "User1", // You will need to prepend the image path with your baseUrl // if it is not '/', like: '/test-site/img/image.jpg'. - image: '/img/undraw_open_source.svg', - infoLink: 'https://www.facebook.com', + image: "/img/undraw_open_source.svg", + infoLink: "https://www.facebook.com";, pinned: true, }, ]; const siteConfig = { - title: 'Test Site', // Title for your website. - tagline: 'A website for testing', - url: 'https://your-docusaurus-test-site.com', // Your website URL - baseUrl: '/', // Base URL for your project */ - // For github.io type URLs, you would set the url and baseUrl like: - // url: 'https://facebook.github.io', - // baseUrl: '/test-site/', - - // Used for publishing and more - projectName: 'test-site', - organizationName: 'facebook', - // For top-level user or org sites, the organization is still the same. - // e.g., for the https://JoelMarcey.github.io site, it would be set like... - // organizationName: 'JoelMarcey' - - // For no header links in the top nav bar -> headerLinks: [], + title: "Apache APISIX", + tagline: "The Cloud-Native API Gateway", + url: "https://apisix.apache.org/";, + baseUrl: "/", + projectName: "apisix-website", + organizationName: "Apache", headerLinks: [ - {doc: 'doc1', label: 'Docs'}, - {doc: 'doc4', label: 'API'}, - {page: 'help', label: 'Help'}, - {blog: true, label: 'Blog'}, + { doc: "doc1", label: "Docs" }, + { doc: "doc4", label: "GitHub" }, + { doc: "doc4", label: "Events" }, + { blog: true, label: "Blog" }, + { page: "help", label: "Downloads" }, + { page: "help", label: "Team" }, + { doc: "doc4", label: "Links" }, + { page: "help", label: "Help" }, ], // If you have users set above, you add it here: users, /* path to images for header/footer */ - headerIcon: 'img/favicon.ico', - footerIcon: 'img/favicon.ico', - favicon: 'img/favicon.ico', + headerIcon: "img/logo.png", + footerIcon: false, + favicon: "img/logo.png", /* Colors for website */ colors: { - primaryColor: '#a30328', - secondaryColor: '#72021c', + primaryColor: "#a30328", + secondaryColor: "#72021c", }, /* Custom fonts for website */ @@ -73,38 +67,38 @@ const siteConfig = { */ // This copyright info is used in /core/Footer.js and blog RSS/Atom feeds. - copyright: `Copyright © ${new Date().getFullYear()} Your Name or Your Company Name`, + copyright: 'Copyright © 2019-2020 The Apache Software Foundation. Apache APISIX, and its feather logo are trademarks of The Apache Software Foundation.', highlight: { // Highlight.js theme to use for syntax highlighting in code blocks. - theme: 'default', + theme: "default", }, // Add custom scripts here that would be placed in <script> tags. - scripts: ['https://buttons.github.io/buttons.js'], + scripts: ["https://buttons.github.io/buttons.js";], // On page navigation for the current documentation page. - onPageNav: 'separate', + onPageNav: "separate", // No .html extensions for paths. cleanUrl: true, // Open Graph and Twitter card images. - ogImage: 'img/undraw_online.svg', - twitterImage: 'img/undraw_tweetstorm.svg', + ogImage: "img/undraw_online.svg", + twitterImage: "img/undraw_tweetstorm.svg", // For sites with a sizable amount of content, set collapsible to true. // Expand/collapse the links and subcategories under categories. // docsSideNavCollapsible: true, // Show documentation's last contributor's name. - // enableUpdateBy: true, + enableUpdateBy: true, // Show documentation's last update time. - // enableUpdateTime: true, + enableUpdateTime: true, // 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/apache/apisix', }; module.exports = siteConfig; diff --git a/website/static/img/asf_logo_wide_small.png b/website/static/img/asf_logo_wide_small.png new file mode 100644 index 0000000..865de17 Binary files /dev/null and b/website/static/img/asf_logo_wide_small.png differ diff --git a/website/static/img/logo.png b/website/static/img/logo.png new file mode 100644 index 0000000..381ab08 Binary files /dev/null and b/website/static/img/logo.png differ
