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.

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

New gh-pages website #729

Merged
merged 131 commits into from
Oct 18, 2017
Merged

New gh-pages website #729

merged 131 commits into from
Oct 18, 2017

Conversation

matthewma7
Copy link

@matthewma7 matthewma7 commented Aug 7, 2017

This PR supersedes #720 and #721. The other two PR are outdated because of project structure change, now we build the whole website locally then copy to gh-pages branch like before.

This PR creates new scripts for building examples and tutorials for the website, and build the website itself.

fireshot capture 2 - geojs - welcome - http___localhost_4000_geojs_

@matthewma7 matthewma7 force-pushed the new_website branch 2 times, most recently from 46b6819 to 4c211bc Compare September 22, 2017 20:43
@aashish24
Copy link
Member

@matthewma7 @manthey is this ready for review?

@matthewma7
Copy link
Author

@aashish24 Yes, this is ready for review.

@manthey
Copy link
Contributor

manthey commented Oct 9, 2017

Can we pull the vendor part of the the agency theme from an npm package like startbootstrap-agency?

@matthewma7
Copy link
Author

@manthey I think it's not possible to use the npm package anymore. A large amount of code has been removed and refactored. The only thing intact is the name.

## Source: https://github.com/hexojs/hexo/

# Site
title: Hexo
Copy link
Contributor

Choose a reason for hiding this comment

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

Even if this isn't used anywhere, we should probably update it with better information (or at least remove the placeholder data).

@@ -0,0 +1,4 @@
---
Copy link
Contributor

Choose a reason for hiding this comment

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

If the scaffolds directory isn't used, we should remove it. If it has utility, we should document it.

@manthey
Copy link
Contributor

manthey commented Oct 9, 2017

I'd rather not see things like the font-awesome fonts in the repo if we can get them from another location.

filename_case: 0
render_drafts: false
post_asset_folder: false
relative_link: false
Copy link
Contributor

Choose a reason for hiding this comment

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

Can we set this to true? Doing so will also require changing website/themes/agency/layout/layout.ejs (see comment there). By using relative links, you can use any webserver to test the website, not just use haxo server, and, if we deploy to a sample to a proxied container, the website will still work.

<li class="hidden">
<a href="#page-top"></a>
</li>
<% var path = page_url(path); %>
Copy link
Contributor

Choose a reason for hiding this comment

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

If we use relative links, this line needs to be removed, and the following line, instead of testing path === config.root, we can test path === "index.html".

…ite structure; Removes unused files and placeholding fields.
…efore build

Hexo will remove spaces and newlines when rendering a json file,
we need the spaces and newlines for our example, so ask Hexo to
skip rendering json files in example directory.
@matthewma7
Copy link
Author

@manthey I addressed improvements you pointed out. but I wasn't able to use the startbootstrap-agency from npm because that version is based on bootstrap 4 but I am using bootstrap 3.

This PR is ready for review.

Reduce code duplication in the example and tutorial build scripts.  This moves the enumeration, standardization, and sorting of the tutorial and examples to a single location (examples/build-utils.js).
@manthey
Copy link
Contributor

manthey commented Oct 13, 2017

@matthewma7 I pushed a change which automatically generates the example and tutorial lists, plus reduces code duplication in some build files.

@manthey
Copy link
Contributor

manthey commented Oct 13, 2017

Assuming you approve the PR I made, I see one remaining issue I'd like to address on this PR: the "source code" view from the examples has poor styling. Specifically, the PRE blocks shouldn't set the background and border, and the .content blocks shouldn't set the margin and padding.

These are set by the bootstrap styling, which changes the docco styling.

@matthewma7
Copy link
Author

matthewma7 commented Oct 18, 2017

@manthey Turns out the docco files are preprocessed accidentally. Docco outputs full HTML page already. I think we can leave it as that for now.

This is ready for review.

Copy link
Contributor

@manthey manthey left a comment

Choose a reason for hiding this comment

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

Good job, @matthewma7 . If we find anything else, it can be a separate PR.

@matthewma7
Copy link
Author

@manthey Cool, Thanks for the reviewing and improvements for this PR. 😉

@matthewma7 matthewma7 merged commit 4740b5e into master Oct 18, 2017
@matthewma7 matthewma7 deleted the new_website branch October 18, 2017 17:41
@matthewma7 matthewma7 restored the new_website branch October 18, 2017 17:41
@aashish24
Copy link
Member

great job @matthewma7 and @manthey thanks for getting it in master.

@manthey manthey deleted the new_website branch January 22, 2018 13:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants