diff options
| author | Jokler <jokler@protonmail.com> | 2020-02-22 18:53:13 +0100 |
|---|---|---|
| committer | Jokler <jokler@protonmail.com> | 2020-02-22 23:20:10 +0100 |
| commit | 326cfa543c6263818aad7dec4a869bc8139ec14c (patch) | |
| tree | bc55a0e79107a93bc3e605a0cae32926dc4c52fc | |
| parent | b9edd85baae9ee483a2d403c641801adc585d26d (diff) | |
| download | pokebot-326cfa543c6263818aad7dec4a869bc8139ec14c.tar.gz pokebot-326cfa543c6263818aad7dec4a869bc8139ec14c.zip | |
Move web server related files into a folder
| -rw-r--r-- | askama.toml | 3 | ||||
| -rw-r--r-- | src/web_server.rs | 2 | ||||
| -rw-r--r-- | static/fonts/.gitkeep | 0 | ||||
| -rw-r--r-- | web_server/static/fonts/.gitkeep (renamed from static/.gitkeep) | 0 | ||||
| -rw-r--r-- | web_server/static/style.css (renamed from static/style.css) | 0 | ||||
| -rw-r--r-- | web_server/templates/base.htm (renamed from templates/base.htm) | 0 | ||||
| -rw-r--r-- | web_server/templates/docs/api.htm (renamed from templates/docs/api.htm) | 0 | ||||
| -rw-r--r-- | web_server/templates/index.htm (renamed from templates/index.htm) | 0 | ||||
| -rw-r--r-- | web_server/templates/song.htm (renamed from templates/song.htm) | 0 | ||||
| -rw-r--r-- | web_server/templates/tmtu/index.htm (renamed from templates/tmtu/index.htm) | 0 |
10 files changed, 4 insertions, 1 deletions
diff --git a/askama.toml b/askama.toml new file mode 100644 index 0000000..fceb790 --- /dev/null +++ b/askama.toml @@ -0,0 +1,3 @@ +[general] +# Directories to search for templates, relative to the crate root. +dirs = ["web_server/templates"] diff --git a/src/web_server.rs b/src/web_server.rs index 0097fb1..01233f2 100644 --- a/src/web_server.rs +++ b/src/web_server.rs @@ -44,7 +44,7 @@ pub async fn start(args: WebServerArgs) -> std::io::Result<()> { .service(api::get_bot), ) .service(web::scope("/docs").service(get_api_docs)) - .service(actix_files::Files::new("/static", "static/")) + .service(actix_files::Files::new("/static", "web_server/static/")) }) .bind(args.bind_address)? .run() diff --git a/static/fonts/.gitkeep b/static/fonts/.gitkeep deleted file mode 100644 index e69de29..0000000 --- a/static/fonts/.gitkeep +++ /dev/null diff --git a/static/.gitkeep b/web_server/static/fonts/.gitkeep index e69de29..e69de29 100644 --- a/static/.gitkeep +++ b/web_server/static/fonts/.gitkeep diff --git a/static/style.css b/web_server/static/style.css index 09a985c..09a985c 100644 --- a/static/style.css +++ b/web_server/static/style.css diff --git a/templates/base.htm b/web_server/templates/base.htm index b8b2f49..b8b2f49 100644 --- a/templates/base.htm +++ b/web_server/templates/base.htm diff --git a/templates/docs/api.htm b/web_server/templates/docs/api.htm index a973272..a973272 100644 --- a/templates/docs/api.htm +++ b/web_server/templates/docs/api.htm diff --git a/templates/index.htm b/web_server/templates/index.htm index eed31f3..eed31f3 100644 --- a/templates/index.htm +++ b/web_server/templates/index.htm diff --git a/templates/song.htm b/web_server/templates/song.htm index 072567a..072567a 100644 --- a/templates/song.htm +++ b/web_server/templates/song.htm diff --git a/templates/tmtu/index.htm b/web_server/templates/tmtu/index.htm index 785e653..785e653 100644 --- a/templates/tmtu/index.htm +++ b/web_server/templates/tmtu/index.htm |