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

Site refactor #52

Merged
merged 52 commits into from
Jun 24, 2017
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
30fa35d
Move html to content
olizilla Jun 12, 2017
93bb728
Fix head.html partial
olizilla Jun 12, 2017
f539b31
Browserify the JS.
olizilla Jun 12, 2017
5fc4750
Pull src JS to top level. Fix html script links
olizilla Jun 13, 2017
ad38972
Modularise the JS
olizilla Jun 13, 2017
4e59cc8
Add generated js to .gitignore
olizilla Jun 13, 2017
d962edf
Pull the topbar into a partial
olizilla Jun 13, 2017
5d21980
Merge pull request #1 from tableflip/browserify
olizilla Jun 13, 2017
5f95647
Merge pull request #3 from tableflip/topbar-partial
olizilla Jun 13, 2017
56ff92f
Pulls implementation table into partial
olizilla Jun 13, 2017
48f5635
WIP Builds impls html from data
olizilla Jun 14, 2017
d83b79f
Impls page works as before, with content created at build time.
olizilla Jun 14, 2017
df5ee56
Fix homepage animation
olizilla Jun 14, 2017
2e2e4c2
Remove debug code
olizilla Jun 14, 2017
963d50c
Merge pull request #4 from tableflip/data-driven-impls
olizilla Jun 14, 2017
fe26e56
Refactor bundles.json
olizilla Jun 14, 2017
8f4bc30
Data driven bundles page
olizilla Jun 15, 2017
1d07ffb
Merge pull request #5 from tableflip/data-driven-bundles
olizilla Jun 15, 2017
f940f09
Fix line endings in .less files
olizilla Jun 15, 2017
305b59f
Remove generated css
olizilla Jun 15, 2017
6af1ff4
Fix less imports. Add `build:css` target
olizilla Jun 15, 2017
4f9645f
Merge pull request #6 from tableflip/css-build-process
olizilla Jun 15, 2017
ed3f95d
Port impls section on homepage to hugo
olizilla Jun 15, 2017
bc7a76d
Merge pull request #7 from tableflip/fix-impls-on-homepage
olizilla Jun 15, 2017
990e505
WIP on converting splash to css
olizilla Jun 15, 2017
f890e34
WIP
olizilla Jun 15, 2017
3c5e2a7
WIP on splash... it lives!
olizilla Jun 16, 2017
11df3d1
Staggared fadez
olizilla Jun 16, 2017
02d90ea
WIP on headline animation
olizilla Jun 19, 2017
a278814
Use new css only splash animation.
olizilla Jun 19, 2017
09af244
Remove splash impl research notes
olizilla Jun 19, 2017
c490005
Merge pull request #8 from tableflip/splash
olizilla Jun 19, 2017
c186a77
Pull in contributors data at build time
olizilla Jun 20, 2017
dca419e
Fix pause on hover. Remove unused less.
olizilla Jun 20, 2017
8e3bb00
WIP on build process
olizilla Jun 20, 2017
3b9e9a0
Remove unused css, add onerror handler for missing images
olizilla Jun 20, 2017
fdaa741
Merge pull request #9 from tableflip/contributors
olizilla Jun 20, 2017
992a86f
Add minify steps
olizilla Jun 21, 2017
9d2aec9
build step to create prod site
olizilla Jun 21, 2017
e653237
Merge remote-tracking branch 'origin/move-content' into build-process
olizilla Jun 21, 2017
5fffc3b
Fix peer-routing.svg casing
olizilla Jun 21, 2017
8f097ec
Makefile based dev is GO!
olizilla Jun 21, 2017
cbd9c1c
Merge remote-tracking branch 'origin/move-content' into build-process
olizilla Jun 21, 2017
7d1a31a
make dev-stop sounds better
olizilla Jun 21, 2017
1b116e0
Pull README up to spec
olizilla Jun 21, 2017
1c2a6de
Add versions dir
olizilla Jun 21, 2017
eec7cf9
Merge pull request #10 from tableflip/build-process
olizilla Jun 21, 2017
33daf62
Fix publish-to-domain to use dnslink script
olizilla Jun 22, 2017
a35b96b
Require DOMAIN as explicit arg
olizilla Jun 22, 2017
d9ca2a4
Merge pull request #11 from tableflip/dnslink
olizilla Jun 22, 2017
68b36ad
Speed up contributor image loading
olizilla Jun 22, 2017
d7a5894
Decrease contributor loading delay to 50ms
olizilla Jun 22, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# EditorConfig - http://EditorConfig.org

root = true

[*]
charset = utf-8
end_of_line = lf
insert_final_newline = true
indent_style = space
indent_size = 2

[Makefile]
indent_style = tab
26 changes: 0 additions & 26 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,28 +1,2 @@
# Logs
logs
*.log

# Runtime data
pids
*.pid
*.seed

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage

# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# node-waf configuration
.lock-wscript

# Compiled binary addons (http://nodejs.org/api/addons.html)
build/Release

# Dependency directory
# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
node_modules
public/
44 changes: 22 additions & 22 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
# [libp2p-website](libp2p.io)
## Implementations & Bundles
JSON arrays to update implementation & bundle status can be found in `/static/js/data`
## Development
```sh
> hugo serve
# ...
Web Server is available at //localhost:1313/
```
## Publish
```sh
> hugo
# ..
> ipfs add -r public
```
# [libp2p-website](libp2p.io)

## Implementations & Bundles

JSON arrays to update implementation & bundle status can be found in `/static/js/data`
Copy link
Member

Choose a reason for hiding this comment

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

Documentation needs to be updated as in "how to update the JSON arrays and what are they containing"

Copy link
Contributor Author

Choose a reason for hiding this comment

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

👍 the README will be fixed up to comply with the README spec, but I'll tackle that last once everything is in place.


## Development

```sh
> hugo serve
# ...
Web Server is available at //localhost:1313/
```

## Publish

```sh
> hugo
# ..

> ipfs add -r public
Copy link
Member

Choose a reason for hiding this comment

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

Should also explain how to use the DNS simple publish script

@lgierth can we create a test account for tableflip? A simple account with a random domain will do, then all we need is to change the target and API token.

Copy link

Choose a reason for hiding this comment

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

My crappy dnslink script is here: https://github.com/ipfs/infrastructure/blob/master/scripts/dnslink.sh

It needs bash, curl, jq (all in homebrew), and you call it like this DNSIMPLE_TOKEN=<token> ./dnslink.sh <domain> <hash>

```
1 change: 1 addition & 0 deletions config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ copyright = "libp2p - All rights reserved."
canonifyurls = true
relativeURLs = true
baseURL = ""
googleAnalytics = "UA-96910779-2"
72 changes: 72 additions & 0 deletions content/bundles.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
<!DOCTYPE html>
<html lang="en">
<head>
{{ partial "head.html" . }}
<link rel="stylesheet" type="text/css" href="/css/bundles.css">
<title>Bundles - libp2p</title>
</head>
<body>
<header>
<div class="wrap">
<a class="logo static" href="/">
<img width="60" height="72" src="/img/logo_small.png" alt="">
<b>lib</b>p2p</a>
<a href='#' class='bars'><i class="fa fa-bars" aria-hidden="true"></i></a>
<a href='#' class="close"><i class="fa fa-times" aria-hidden="true"></i></a>
<nav>
<ul>
<li><a href="/implementations">Implementations</a></li>
<li><a href="/bundles" class="active">Bundles</a></li>
<li><a href="/media">Media</a></li>
<li><a href="https://github.com/libp2p" target="_blank">Github</a></li>
<li><a href="https://github.com/libp2p/specs" target="_blank">Specifications</a></li>
</ul>
</nav>
</div>
</header>

<main>
<article class="center bundles">
<header>
<h2>Bundles.</h2>
</header>
<div class="wrap">
<p> libp2p provides ready-to-use bundles for different use cases and different languages. You can use these
to get all the functionality in one package, instead of including and bundling the different modules
yourself. See it as a quickstart.</p>
<div class="links">
<div class="active-link">
<div class="copy-block"></div>
<i class="fa fa-angle-down" aria-hidden="true"></i>
</div>
<div class="columns">
<div class="column col1"></div>
<div class="column col2"></div>
<div class="column col3"></div>
<div class="column col4"></div>
</div>
</div>
</div>
<div class="triangle white"></div>
</article>

<article class="center bundles-info">
<div class="wrap">

<!--<section class="coming-soon"></section>-->

</div>
<div class="triangle grey"></div>
</article>

</main>
Copy link
Member

Choose a reason for hiding this comment

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

Only the main should be in body. Anything that is template/design should go into a partials/template folder.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I will be pulling much more into partials.

When building pages I find it most useful to be able to compose the page out of templates, rather than override things from a layout. A layout either ends up encoding some assumptions, that some pages may not want, or is so thin that it's hardly worth making the dev fit 2 files in there head to guess what the resulting page will be.


{{ partial "footer.html" . }}

<script type="text/javascript" src="/js/lib/jquery-2.1.1.min.js"></script>
<script type="text/javascript" src="/js/data/bundles_data.js"></script>
<script type="text/javascript" src="/js/bundles.js"></script>
<script type="text/javascript" src="/js/common.js"></script>

</body>
</html>
8 changes: 0 additions & 8 deletions content/bundles.md

This file was deleted.

Loading