Skip to content

Use relative urls everywhere. #967

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
May 31, 2022
Merged

Use relative urls everywhere. #967

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
83c32b0
Use relative urls everywhere.
m-ou-se Apr 20, 2022
ea8797c
Remove local web server from readme.
m-ou-se Apr 20, 2022
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
22 changes: 3 additions & 19 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,29 +19,13 @@ To build the site locally:

You could do it in release mode if you'd like, but it's pretty fast in debug.

From there, the generated HTML will be in a `site` directory. You can use
any web server to check it out in your browser:
From there, the generated HTML will be in a `site` directory.
Open `site/index.html` in your web browser to view the site.

```console
> cd site
> python3 -m http.server
> firefox site/index.html
```

The site is now available at <http://0.0.0.0:8000>.

If you need to preview the site from another machine, pass the host's address via `--bind`. For example, if running on 192.168.72.73:

```console
> cd site
> python3 -m http.server --bind 192.168.72.73
```

The site is now available at <http://192.168.72.73:8000>.

(As a short-cut: If you pass `--bind 0.0.0.0`, the server will be reachable at [all of the host's IP addresses][].)

[all of the host's IP addresses]: https://www.howtogeek.com/225487/what-is-the-difference-between-127.0.0.1-and-0.0.0.0/

## Contributing

First of all, thank you!
Expand Down
4 changes: 4 additions & 0 deletions src/blogs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,10 @@ impl Blog {
&self.prefix
}

pub(crate) fn path_back_to_root(&self) -> PathBuf {
self.prefix.components().map(|_| Path::new("../")).collect()
}

pub(crate) fn posts(&self) -> &[Post] {
&self.posts
}
Expand Down
4 changes: 3 additions & 1 deletion src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ impl<'a> Generator<'a> {
.map(|other_blog| {
json!({
"link_text": other_blog.link_text(),
"url": PathBuf::from("/").join(other_blog.prefix()).join("index.html"),
"url": other_blog.prefix().join("index.html"),
})
})
.collect();
Expand All @@ -130,6 +130,7 @@ impl<'a> Generator<'a> {
"parent": "layout",
"blog": blog,
"other_blogs": other_blogs,
"root": blog.path_back_to_root(),
});
self.render_template(blog.prefix().join("index.html"), "index", data)?;
Ok(())
Expand All @@ -152,6 +153,7 @@ impl<'a> Generator<'a> {
"parent": "layout",
"blog": blog,
"post": post,
"root": blog.path_back_to_root().join("../../../"),
});

self.render_template(path.join(filename), &post.layout, data)?;
Expand Down
2 changes: 1 addition & 1 deletion src/styles/fonts.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ $format-names: (
@function urls($filename, $range, $extensions) {
$urls: ();
@each $extension in $extensions {
$url: url('/fonts/#{$extension}/#{$filename}.#{$range}.#{$extension}');
$url: url('../fonts/#{$extension}/#{$filename}.#{$range}.#{$extension}');
$format: format(map-get($format-names, $extension));

$urls: append($urls, $url $format, comma);
Expand Down
14 changes: 7 additions & 7 deletions templates/footer.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@
<div class="four columns mt3 mt0-l">
<h4>Social</h4>
<div class="flex flex-row flex-wrap">
<a href="https://twitter.com/rustlang" target="_blank" rel="noopener" alt="twitter link"><img src="/images/twitter.svg" alt="twitter logo" title="Twitter"/></a>
<a href="https://www.youtube.com/channel/UCaYhcUwRBNscFNUKTjgPFiA" target="_blank" rel="noopener" alt="youtube link"><img style="padding-top: 6px; padding-bottom:6px" src="/images/youtube.svg" alt="youtube logo" title="YouTube"/></a>
<a href="https://discord.gg/rust-lang" target="_blank" rel="noopener" alt="discord link"><img src="/images/discord.svg" alt="discord logo" title="Discord"/></a>
<a href="https://github.com/rust-lang" target="_blank" rel="noopener" alt="github link"><img src="/images/github.svg" alt="github logo" title="GitHub"/></a>
<a href="https://twitter.com/rustlang" target="_blank" rel="noopener" alt="twitter link"><img src="{{root}}images/twitter.svg" alt="twitter logo" title="Twitter"/></a>
<a href="https://www.youtube.com/channel/UCaYhcUwRBNscFNUKTjgPFiA" target="_blank" rel="noopener" alt="youtube link"><img style="padding-top: 6px; padding-bottom:6px" src="{{root}}images/youtube.svg" alt="youtube logo" title="YouTube"/></a>
<a href="https://discord.gg/rust-lang" target="_blank" rel="noopener" alt="discord link"><img src="{{root}}images/discord.svg" alt="discord logo" title="Discord"/></a>
<a href="https://github.com/rust-lang" target="_blank" rel="noopener" alt="github link"><img src="{{root}}images/github.svg" alt="github logo" title="GitHub"/></a>
</div>
<h4 class="mt4 mb3">RSS</h4>
<ul>
<li><a href="/feed.xml">Main Blog</a></li>
<li><a href="/inside-rust/feed.xml">"Inside Rust" Blog</a></li>
<li><a href="{{root}}feed.xml">Main Blog</a></li>
<li><a href="{{root}}inside-rust/feed.xml">"Inside Rust" Blog</a></li>
</ul>
</div>

Expand All @@ -43,4 +43,4 @@
</footer>

<!-- scripts -->
<script src="/scripts/highlight.js"></script>
<script src="{{root}}scripts/highlight.js"></script>
20 changes: 10 additions & 10 deletions templates/headers.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@
<meta property="og:locale" content="en_US" />

<!-- styles -->
<link rel="stylesheet" href="/styles/vendor.css"/>
<link rel="stylesheet" href="/styles/fonts.css"/>
<link rel="stylesheet" href="/styles/app.css"/>
<link rel="stylesheet" href="/styles/highlight.css"/>
<link rel="stylesheet" href="{{root}}styles/vendor.css"/>
<link rel="stylesheet" href="{{root}}styles/fonts.css"/>
<link rel="stylesheet" href="{{root}}styles/app.css"/>
<link rel="stylesheet" href="{{root}}styles/highlight.css"/>

<!-- favicon -->
<link rel="apple-touch-icon" sizes="180x180" href="/images/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="16x16" href="/images/favicon-16x16.png">
<link rel="icon" type="image/png" sizes="32x32" href="/images/favicon-32x32.png">
<link rel="icon" type="image/svg+xml" href="/images/favicon.svg">
<link rel="manifest" href="/images/site.webmanifest">
<link rel="mask-icon" href="/images/safari-pinned-tab.svg" color="#5bbad5">
<link rel="apple-touch-icon" sizes="180x180" href="{{root}}images/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="16x16" href="{{root}}images/favicon-16x16.png">
<link rel="icon" type="image/png" sizes="32x32" href="{{root}}images/favicon-32x32.png">
<link rel="icon" type="image/svg+xml" href="{{root}}images/favicon.svg">
<link rel="manifest" href="{{root}}images/site.webmanifest">
<link rel="mask-icon" href="{{root}}images/safari-pinned-tab.svg" color="#5bbad5">
<meta name="msapplication-TileColor" content="#00aba9">
<meta name="theme-color" content="#ffffff">

Expand Down
4 changes: 2 additions & 2 deletions templates/index.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<p>
<b>See also:</b>
{{#each other_blogs}}
<a href="{{url}}">{{link_text}}</a>
<a href="{{../root}}{{url}}">{{link_text}}</a>
{{/each}}
</p>
</div>
Expand All @@ -28,7 +28,7 @@
</tr>{{/if}}
<tr>
<td class="tr o-60 pr4 pr5-l bn">{{month_name month}}&nbsp;{{day}}</td>
<td class="bn"><a href="/{{../blog.prefix}}{{url}}">{{title}}</a></td>
<td class="bn"><a href="{{url}}">{{title}}</a></td>
</tr>
{{/each}}
</table>
Expand Down
4 changes: 2 additions & 2 deletions templates/nav.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<nav class="flex flex-row justify-center justify-end-l items-center flex-wrap ph2 pl3-ns pr4-ns">
<div class="brand flex-auto w-100 w-auto-l self-start tc tl-l">
<a href="/{{blog.prefix}}">
<img class="v-mid ml0-l" alt="Rust Logo" src="/images/rust-logo-blk.svg">
<a href="{{root}}{{blog.prefix}}">
<img class="v-mid ml0-l" alt="Rust Logo" src="{{root}}images/rust-logo-blk.svg">
<span class="dib ml1 ml0-l">{{blog.title}}</span>
</a>
</div>
Expand Down