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.

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

Jump to bottom

attempt at deploying on shuttle.rs #2

Closed
wants to merge 16 commits into from
Closed

attempt at deploying on shuttle.rs #2

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
e7125e3
default to loading events over http
alsuren Apr 13, 2022
6a851f8
split into lib and main
alsuren Apr 13, 2022
afea5d3
extract setup_app() helper
alsuren Apr 13, 2022
a1495c6
support running under axum
alsuren Apr 13, 2022
709a4c2
mention that this is blocked on an upstream shuttle PR
alsuren Apr 13, 2022
5b8bc7a
try specifying a version
alsuren Apr 13, 2022
97f429f
impl Service myself
alsuren Apr 15, 2022
3eea0be
cdylib
alsuren Apr 15, 2022
244d32a
delete main.rs for now
alsuren Apr 15, 2022
8449b24
more logging
alsuren Apr 15, 2022
2a2dad6
dbg errors, because the shuttle unveil service docker thingie doesn't…
alsuren Apr 15, 2022
efce433
don't try to look for config file
alsuren Apr 15, 2022
2155861
serve css using include_str!()
alsuren Apr 15, 2022
e3d5bc8
Revert "delete main.rs for now"
alsuren Apr 15, 2022
bef8646
also lib
alsuren Apr 15, 2022
dad4d05
delete unused code
alsuren Apr 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 10 additions & 6 deletions src/lib.rs
View file
Open in desktop
Expand Up @@ -23,12 +23,12 @@ mod model;
use crate::{
config::Config,
controllers::{bands, callers, cities, index, organisations, reload},
errors::internal_error,
importers::{balfolknl, folkbalbende, webfeet},
model::events::Events,
};
use axum::{
routing::{get, get_service, post},
http::header,
routing::{get, post},
Extension, Router,
};
use eyre::Report;
Expand Down Expand Up @@ -107,10 +107,14 @@ pub async fn setup_app(config: &Config) -> Result<Router, Report> {
.route("/cities", get(cities::cities))
.route("/organisations", get(organisations::organisations))
.route("/reload", post(reload::reload))
.nest(
"/stylesheets",
get_service(ServeDir::new(config.public_dir.join("stylesheets")))
.handle_error(internal_error),
.route(
"/stylesheets/main.css",
get(|| async {
(
[(header::CONTENT_TYPE, "text/css")],
include_str!("../public/stylesheets/main.css"),
Copy link
Author

Choose a reason for hiding this comment

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

I discussed this with Andrew - edit-compile-serve iteration times on axum are pretty slow, so his previous get_service(ServeDir::new(config.public_dir.join("stylesheets"))) approach is super valuable if you want to iterate quickly on your CSS.

)
}),
)
.layer(Extension(events));

Expand Down