From 443dca28415c34a4956d497e6d73a61110d36fa4 Mon Sep 17 00:00:00 2001 From: Edward Shen Date: Fri, 3 May 2019 01:25:56 -0400 Subject: [PATCH] moved templates into own dir --- Dockerfile | 1 + src/main.rs | 6 +++--- {config/templates => templates}/index.html | 0 3 files changed, 4 insertions(+), 3 deletions(-) rename {config/templates => templates}/index.html (100%) diff --git a/Dockerfile b/Dockerfile index 27b5468..3675938 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,6 +20,7 @@ WORKDIR /app COPY --from=builder /app/target/release/endstat /app COPY ./config /app/config +COPY ./templates /app/templates RUN mv /app/config/endstat_conf.example.ron /app/config/endstat_conf.ron EXPOSE 8080 diff --git a/src/main.rs b/src/main.rs index 1f98822..4d9bf78 100644 --- a/src/main.rs +++ b/src/main.rs @@ -14,10 +14,10 @@ extern crate ring; mod config; mod handlers; -mod updater; mod results; +mod updater; -use self::{config::*, handlers::*, updater::*, results::QueryResults}; +use self::{config::*, handlers::*, results::QueryResults, updater::*}; use actix::System; use actix_web::{middleware::Logger, web::resource, App, HttpServer}; use ron::de::from_str; @@ -51,7 +51,7 @@ fn main() { let clone_state = Arc::clone(&state); HttpServer::new(move || { - let tera = compile_templates!("./config/templates/**/*"); + let tera = compile_templates!("./templates/**/*"); let state = Arc::clone(&state); App::new() diff --git a/config/templates/index.html b/templates/index.html similarity index 100% rename from config/templates/index.html rename to templates/index.html