From 668869608a30bfda7ab46b4ebe07a4ab4899c47c Mon Sep 17 00:00:00 2001
From: G2-Games <ke0bhogsg@gmail.com>
Date: Thu, 24 Oct 2024 09:43:28 -0500
Subject: [PATCH] Moved web stuff to web folder

---
 src/main.rs                     | 8 ++++----
 {src/static => web}/favicon.svg | 0
 {src/static => web}/main.css    | 0
 {src/static => web}/request.js  | 0
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename {src/static => web}/favicon.svg (100%)
 rename {src/static => web}/main.css (100%)
 rename {src/static => web}/request.js (100%)

diff --git a/src/main.rs b/src/main.rs
index 947428f..b3b2b53 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -8,7 +8,7 @@ use chrono::{DateTime, TimeDelta, Utc};
 use database::{clean_loop, Database, MochiFile};
 use log::info;
 use rocket::{
-    config, data::{Limits, ToByteUnit}, form::Form, fs::{FileServer, Options, TempFile}, get, http::{ContentType, RawStr}, post, response::{content::{RawCss, RawJavaScript}, status::NotFound, Redirect}, routes, serde::{json::Json, Serialize}, tokio::{self, fs::File, io::AsyncReadExt}, Config, FromForm, State
+    data::{Limits, ToByteUnit}, form::Form, fs::{FileServer, Options, TempFile}, get, http::{ContentType, RawStr}, post, response::{content::{RawCss, RawJavaScript}, status::NotFound, Redirect}, routes, serde::{json::Json, Serialize}, tokio::{self, fs::File, io::AsyncReadExt}, Config, FromForm, State
 };
 use settings::Settings;
 use strings::{parse_time_string, to_pretty_time};
@@ -31,18 +31,18 @@ fn head(page_title: &str) -> Markup {
 /// Stylesheet
 #[get("/main.css")]
 fn stylesheet() -> RawCss<&'static str> {
-    RawCss(include_str!("static/main.css"))
+    RawCss(include_str!("../web/main.css"))
 }
 
 /// Upload handler javascript
 #[get("/request.js")]
 fn form_handler_js() -> RawJavaScript<&'static str> {
-    RawJavaScript(include_str!("static/request.js"))
+    RawJavaScript(include_str!("../web/request.js"))
 }
 
 #[get("/favicon.svg")]
 fn favicon() -> (ContentType, &'static str) {
-    (ContentType::SVG, include_str!("static/favicon.svg"))
+    (ContentType::SVG, include_str!("../web/favicon.svg"))
 }
 
 #[get("/")]
diff --git a/src/static/favicon.svg b/web/favicon.svg
similarity index 100%
rename from src/static/favicon.svg
rename to web/favicon.svg
diff --git a/src/static/main.css b/web/main.css
similarity index 100%
rename from src/static/main.css
rename to web/main.css
diff --git a/src/static/request.js b/web/request.js
similarity index 100%
rename from src/static/request.js
rename to web/request.js