Separate packages for core lib and server

CharlesTaylor7 · Nov 29, 2024 · 8908b41 · 8908b41
1 parent f28dc55
commit 8908b41
Show file tree

Hide file tree

Showing 86 changed files with 6,084 additions and 91 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,50 +1,7 @@
-[package]
-name = "citadels"
-edition = "2021"
-default-run = "citadels"
-version = "0.7.1"
-
-[[bin]]
-name = "citadels"
-path = "src/main.rs" 
-
-[dependencies]
-askama = { version = "0.12.1", default-features = false }
-axum = { version = "0.7.2", features = ["ws","macros"], default-features = true }
-axum-extra = { version = "0.9.0", features = ["cookie-private"], default-features = false }
-futures = { version = "0.3.30", default-features = false }
-http = { version = "1.0.0", default-features = false }
-rand = { version = "0.8.5", default-features = false }
-tokio = { version = "1.35.1", features = ["macros", "rt-multi-thread"] }
-tokio-stream = { version = "0.1.14", default-features = false }
-tower = "0.4.13"
-tower-http = { version = "0.5.0", features = ["fs", "trace"] }
-log = "0.4.20"
-env_logger = { version = "0.10.1", features = ["color"] }
-rand_xoshiro = "0.6.0"
-rand_core = { version = "0.6.4", features = ["getrandom"] }
-serde = { version = "1.0.195", features = ["derive", "rc"] }
-serde_json = "1.0.111"
-time = "0.3.31"
-dotenv = { version = "0.15.0", optional = true }
-axum-core = "0.4.3"
-serde_with = "3.5.0"
-tracing = { version = "0.1.40", default-features = false }
-macros = { path = "./macros"}
-reqwest = { version = "0.12.4", features = ["json"], default-features = false }
-anyhow = { version = "1.0.83", default-features = true }
-maud = { version = "0.26.0", features = ["axum"], default-features = false}
-arcstr = { version = "1.2.0", features = ["serde"], default-features = false }
-uuid = { version = "1.8.0", features = ["v4"] }
-thiserror = "1.0.61"
-
-[features]
-dev = []
-dotenv = ["dep:dotenv"]
-
-# https://old.reddit.com/r/rust/comments/gvrgca/this_is_a_neat_trick_for_getting_good_runtime/
-[profile.dev.package."*"]
-opt-level = 3
-
-[profile.dev]
-opt-level = 0
+[workspace]
+resolver = "2"
+members = [
+  "citadels_server", 
+  "citadels",
+  "macros"
+]
diff --git a/Dockerfile b/Dockerfile
@@ -24,6 +24,6 @@ RUN cargo build --release --bin citadels
 
 FROM alpine AS runtime
 WORKDIR /app
-COPY --from=builder /app/target/release/citadels /usr/local/bin
+COPY --from=builder /app/target/release/citadels_server /usr/local/bin
 COPY public/ public/
-ENTRYPOINT ["/usr/local/bin/citadels"]
+ENTRYPOINT ["/usr/local/bin/citadels_server"]
diff --git a/citadels/Cargo.toml b/citadels/Cargo.toml
@@ -0,0 +1,32 @@
+[package]
+name = "citadels"
+edition = "2021"
+
+
+[dependencies]
+rand = { version = "0.8.5" }
+log = "0.4.20"
+env_logger = { version = "0.10.1", features = ["color"] }
+rand_xoshiro = "0.6.0"
+
+rand_core = { version = "0.6.4", features = ["getrandom"] }
+serde = { version = "1.0.195", features = ["derive", "rc"] }
+serde_json = "1.0.111"
+time = "0.3.31"
+dotenv = { version = "0.15.0", optional = true }
+serde_with = "3.5.0"
+tracing = { version = "0.1.40", default-features = false }
+macros = { path = "../macros"}
+reqwest = { version = "0.12.4", features = ["json"], default-features = false }
+anyhow = { version = "1.0.83", default-features = true }
+maud = { version = "0.26.0", features = ["axum"], default-features = false}
+arcstr = { version = "1.2.0", features = ["serde"], default-features = false }
+uuid = { version = "1.8.0", features = ["v4"] }
+thiserror = "1.0.61"
+
+[features]
+dev = []
+dotenv = ["dep:dotenv"]
+
+[profile.dev]
+opt-level = 0
diff --git a/src/actions.rs → citadels/src/actions.rs b/src/actions.rs → citadels/src/actions.rs
diff --git a/src/actions/deserializer.rs → citadels/src/actions/deserializer.rs b/src/actions/deserializer.rs → citadels/src/actions/deserializer.rs
diff --git a/src/data/characters.rs → citadels/src/data/characters.rs b/src/data/characters.rs → citadels/src/data/characters.rs
diff --git a/src/data/mod.rs → citadels/src/data/mod.rs b/src/data/mod.rs → citadels/src/data/mod.rs
diff --git a/src/districts.rs → citadels/src/districts.rs b/src/districts.rs → citadels/src/districts.rs
diff --git a/src/game.rs → citadels/src/game.rs b/src/game.rs → citadels/src/game.rs
diff --git a/src/game_actions.rs → citadels/src/game_actions.rs b/src/game_actions.rs → citadels/src/game_actions.rs
diff --git a/src/lib.rs → citadels/src/lib.rs b/src/lib.rs → citadels/src/lib.rs
@@ -7,10 +7,7 @@ pub mod game;
 pub mod game_actions;
 pub mod lobby;
 pub mod logger;
-pub mod markup;
 pub mod museum;
 pub mod random;
 pub mod roles;
-pub mod server;
-pub mod templates;
 pub mod types;
diff --git a/src/lobby.rs → citadels/src/lobby.rs b/src/lobby.rs → citadels/src/lobby.rs
diff --git a/src/logger.rs → citadels/src/logger.rs b/src/logger.rs → citadels/src/logger.rs
diff --git a/src/museum.rs → citadels/src/museum.rs b/src/museum.rs → citadels/src/museum.rs
@@ -35,14 +35,12 @@ impl Museum {
         if self.cards.len() > self.artifacts.len() {
             let mut artifacts = Museum::ARTIFACTS;
             artifacts.shuffle(&mut rand::thread_rng());
-            for artifact in artifacts {
-                self.artifacts.push(artifact);
-            }
+            self.artifacts.extend(artifacts);
         }
     }
 
     const ARTIFACTS: [&'static str; 19] = [
-        "⚱️", "🏺", "🖼️", "🗿", "🏛️", "⛲", "🕰️", "🦴", "🦾", "⚰️", "🚀", "🦖", "🦣", "🦤", "🦕", "💎",
-        "🪩", "🔱", "🧋",
+        "⚱️", "🏺", "🖼️", "🗿", "🏛️", "⛲", "🕰️", "🦴", "🦾", "⚰️", "🚀", "🦖", "🦣", "🦤", "🦕",
+        "💎", "🪩", "🔱", "🧋",
     ];
 }
diff --git a/src/random.rs → citadels/src/random.rs b/src/random.rs → citadels/src/random.rs
diff --git a/src/roles.rs → citadels/src/roles.rs b/src/roles.rs → citadels/src/roles.rs
diff --git a/src/types.rs → citadels/src/types.rs b/src/types.rs → citadels/src/types.rs
diff --git a/citadels_server/Cargo.toml b/citadels_server/Cargo.toml
@@ -0,0 +1,46 @@
+[package]
+name = "citadels_server"
+edition = "2021"
+
+
+[dependencies]
+citadels = { path = "../citadels/" }
+askama = { version = "0.12.1", default-features = false }
+axum = { version = "0.7.2", features = ["ws","macros"], default-features = true }
+axum-extra = { version = "0.9.0", features = ["cookie-private"], default-features = false }
+futures = { version = "0.3.30", default-features = false }
+http = { version = "1.0.0", default-features = false }
+rand = { version = "0.8.5", default-features = false }
+tokio = { version = "1.35.1", features = ["macros", "rt-multi-thread"] }
+tokio-stream = { version = "0.1.14", default-features = false }
+tower = "0.4.13"
+tower-http = { version = "0.5.0", features = ["fs", "trace"] }
+log = "0.4.20"
+env_logger = { version = "0.10.1", features = ["color"] }
+rand_xoshiro = "0.6.0"
+rand_core = { version = "0.6.4", features = ["getrandom"] }
+serde = { version = "1.0.195", features = ["derive", "rc"] }
+serde_json = "1.0.111"
+time = "0.3.31"
+dotenv = { version = "0.15.0", optional = true }
+axum-core = "0.4.3"
+serde_with = "3.5.0"
+tracing = { version = "0.1.40", default-features = false }
+macros = { path = "../macros"}
+reqwest = { version = "0.12.4", features = ["json"], default-features = false }
+anyhow = { version = "1.0.83", default-features = true }
+maud = { version = "0.26.0", features = ["axum"], default-features = false}
+arcstr = { version = "1.2.0", features = ["serde"], default-features = false }
+uuid = { version = "1.8.0", features = ["v4"] }
+thiserror = "1.0.61"
+
+[features]
+dev = []
+dotenv = ["dep:dotenv"]
+
+# https://old.reddit.com/r/rust/comments/gvrgca/this_is_a_neat_trick_for_getting_good_runtime/
+[profile.dev.package."*"]
+opt-level = 3
+
+[profile.dev]
+opt-level = 0
diff --git a/citadels_server/src/lib.rs b/citadels_server/src/lib.rs
@@ -0,0 +1,3 @@
+pub mod markup;
+pub mod server;
+pub mod templates;
diff --git a/src/main.rs → citadels_server/src/main.rs b/src/main.rs → citadels_server/src/main.rs
@@ -1,4 +1,4 @@
-use citadels::server::routes::get_router;
+use citadels_server::server::routes::get_router;
 
 #[tokio::main]
 async fn main() {

diff --git a/src/markup/base.rs → citadels_server/src/markup/base.rs b/src/markup/base.rs → citadels_server/src/markup/base.rs
diff --git a/src/markup/mod.rs → citadels_server/src/markup/mod.rs b/src/markup/mod.rs → citadels_server/src/markup/mod.rs
diff --git a/src/server/mod.rs → citadels_server/src/server/mod.rs b/src/server/mod.rs → citadels_server/src/server/mod.rs
diff --git a/src/server/routes.rs → citadels_server/src/server/routes.rs b/src/server/routes.rs → citadels_server/src/server/routes.rs
@@ -1,22 +1,22 @@
-use crate::actions::{ActionSubmission, ActionTag};
-use crate::districts::DistrictName;
-use crate::game::Game;
-use crate::lobby::{ConfigOption, Lobby};
-use crate::roles::{Rank, RoleName};
 use crate::server::state::AppState;
 use crate::templates::game::menu::*;
 use crate::templates::game::menus::*;
 use crate::templates::game::*;
 use crate::templates::lobby::*;
 use crate::templates::*;
-use crate::types::{Marker, PlayerName};
 use askama::Template;
 use axum::extract::{Json, Path, State};
 use axum::response::{ErrorResponse, Html, Redirect, Response, Result};
 use axum::routing::{get, post};
 use axum::Router;
 use axum::{extract::ws::WebSocketUpgrade, response::IntoResponse};
 use axum_extra::extract::{cookie::Cookie, PrivateCookieJar};
+use citadels::actions::{ActionSubmission, ActionTag};
+use citadels::districts::DistrictName;
+use citadels::game::Game;
+use citadels::lobby::{ConfigOption, Lobby};
+use citadels::roles::{Rank, RoleName};
+use citadels::types::{Marker, PlayerName};
 use http::StatusCode;
 use rand_core::SeedableRng;
 use serde::Deserialize;

diff --git a/src/server/state.rs → citadels_server/src/server/state.rs b/src/server/state.rs → citadels_server/src/server/state.rs
@@ -1,7 +1,7 @@
 use crate::server::ws;
-use crate::{game::Game, lobby::Lobby};
 use axum::extract::FromRef;
 use axum_extra::extract::cookie;
+use citadels::{game::Game, lobby::Lobby};
 use std::sync::{Arc, Mutex};
 
 #[derive(Clone)]

diff --git a/src/server/ws.rs → citadels_server/src/server/ws.rs b/src/server/ws.rs → citadels_server/src/server/ws.rs
diff --git a/src/templates.rs → citadels_server/src/templates.rs b/src/templates.rs → citadels_server/src/templates.rs
@@ -4,12 +4,12 @@ pub mod lobby;
 
 use std::borrow::Cow;
 
-use crate::districts::DistrictName;
-use crate::game::{CityDistrict, Game};
-use crate::roles::{Rank, RoleName};
-use crate::types::CardSuit;
 use askama::Template;
 use axum::response::Html;
+use citadels::districts::DistrictName;
+use citadels::game::{CityDistrict, Game};
+use citadels::roles::{Rank, RoleName};
+use citadels::types::CardSuit;
 
 #[derive(Eq, PartialEq, Clone, Copy, Debug)]
 pub enum GamePhase {

diff --git a/src/templates/filters.rs → citadels_server/src/templates/filters.rs b/src/templates/filters.rs → citadels_server/src/templates/filters.rs
@@ -1,5 +1,5 @@
-use crate::actions::ActionTag;
-use crate::types::CardSuit;
+use citadels::actions::ActionTag;
+use citadels::types::CardSuit;
 use std::borrow::Cow;
 use std::fmt::Debug;
 

diff --git a/src/templates/game.rs → citadels_server/src/templates/game.rs b/src/templates/game.rs → citadels_server/src/templates/game.rs
@@ -1,16 +1,16 @@
 pub mod menu;
 pub mod menus;
 
-use crate::actions::ActionTag;
-use crate::game::{Game, GameRole, Player, PlayerIndex, Turn};
-use crate::roles::RoleName;
 use crate::templates::game::menu::{MenuTemplate, MenuView};
 use crate::templates::MyTemplate;
 use crate::templates::{filters, DAISY_THEMES};
 use crate::templates::{DistrictTemplate, RoleTemplate};
-use crate::types::Marker;
 use askama::Template;
 use axum::response::Html;
+use citadels::actions::ActionTag;
+use citadels::game::{Game, GameRole, Player, PlayerIndex, Turn};
+use citadels::roles::RoleName;
+use citadels::types::Marker;
 use std::borrow::{Borrow, Cow};
 
 #[derive(Template)]

diff --git a/src/templates/game/menu.rs → citadels_server/src/templates/game/menu.rs b/src/templates/game/menu.rs → citadels_server/src/templates/game/menu.rs
@@ -1,11 +1,11 @@
 use super::{get_myself, GameContext};
-use crate::actions::ActionTag;
-use crate::game::{Call, Draft, Followup, ForcedToGatherReason, Game, Player, Turn};
-use crate::roles::{Rank, RoleName};
 use crate::templates::filters;
 use crate::templates::game::menus::{BuildMenu, EmperorMenu};
 use crate::templates::{DistrictTemplate, RoleTemplate};
 use askama::Template;
+use citadels::actions::ActionTag;
+use citadels::game::{Call, Draft, Followup, ForcedToGatherReason, Game, Player, Turn};
+use citadels::roles::{Rank, RoleName};
 use std::borrow::{Borrow, Cow};
 
 #[derive(Template)]

diff --git a/src/templates/game/menus.rs → citadels_server/src/templates/game/menus.rs b/src/templates/game/menus.rs → citadels_server/src/templates/game/menus.rs
@@ -1,11 +1,11 @@
-use crate::actions::ActionTag;
-use crate::districts::DistrictName;
-use crate::game::{self, Followup, Game, Player};
-use crate::roles::RoleName;
 use crate::templates::{filters, DistrictTemplate, RoleTemplate};
-use crate::types::CardSuit;
-use crate::types::Marker;
 use askama::Template;
+use citadels::actions::ActionTag;
+use citadels::districts::DistrictName;
+use citadels::game::{self, Followup, Game, Player};
+use citadels::roles::RoleName;
+use citadels::types::CardSuit;
+use citadels::types::Marker;
 
 use std::borrow::{Borrow, Cow};
 

diff --git a/src/templates/lobby.rs → citadels_server/src/templates/lobby.rs b/src/templates/lobby.rs → citadels_server/src/templates/lobby.rs
@@ -1,12 +1,12 @@
 use crate::templates::filters;
 use crate::templates::{DistrictTemplate, RoleTemplate};
-use crate::{
+use askama::Template;
+use citadels::{
     data::characters::ROLES,
     districts::{DistrictName, UNIQUE},
     lobby::{ConfigOption, Player},
     roles::{Rank, RoleName},
 };
-use askama::Template;
 use std::collections::{HashMap, HashSet};
 
 #[derive(Template)]

diff --git a/templates/base.html → citadels_server/templates/base.html b/templates/base.html → citadels_server/templates/base.html
diff --git a/templates/button/cancel.html → citadels_server/templates/button/cancel.html b/templates/button/cancel.html → citadels_server/templates/button/cancel.html
diff --git a/templates/district/square-cropped.html → ...er/templates/district/square-cropped.html b/templates/district/square-cropped.html → ...er/templates/district/square-cropped.html
diff --git a/templates/game/action.html → citadels_server/templates/game/action.html b/templates/game/action.html → citadels_server/templates/game/action.html
diff --git a/templates/game/buttons.html → citadels_server/templates/game/buttons.html b/templates/game/buttons.html → citadels_server/templates/game/buttons.html
diff --git a/templates/game/city.html → citadels_server/templates/game/city.html b/templates/game/city.html → citadels_server/templates/game/city.html
diff --git a/templates/game/end.html → citadels_server/templates/game/end.html b/templates/game/end.html → citadels_server/templates/game/end.html
diff --git a/templates/game/hand.html → citadels_server/templates/game/hand.html b/templates/game/hand.html → citadels_server/templates/game/hand.html
diff --git a/templates/game/index.html → citadels_server/templates/game/index.html b/templates/game/index.html → citadels_server/templates/game/index.html
diff --git a/templates/game/markers/blackmail.html → ...ver/templates/game/markers/blackmail.html b/templates/game/markers/blackmail.html → ...ver/templates/game/markers/blackmail.html
diff --git a/templates/game/markers/warrant.html → ...erver/templates/game/markers/warrant.html b/templates/game/markers/warrant.html → ...erver/templates/game/markers/warrant.html
diff --git a/templates/game/menu.html → citadels_server/templates/game/menu.html b/templates/game/menu.html → citadels_server/templates/game/menu.html
diff --git a/...s/game/menus/abbot-collect-resources.html → ...s/game/menus/abbot-collect-resources.html b/...s/game/menus/abbot-collect-resources.html → ...s/game/menus/abbot-collect-resources.html
diff --git a/...ates/game/menus/abbot-take-from-rich.html → ...ates/game/menus/abbot-take-from-rich.html b/...ates/game/menus/abbot-take-from-rich.html → ...ates/game/menus/abbot-take-from-rich.html
diff --git a/templates/game/menus/armory.html → ...s_server/templates/game/menus/armory.html b/templates/game/menus/armory.html → ...s_server/templates/game/menus/armory.html
diff --git a/templates/game/menus/beautify.html → ...server/templates/game/menus/beautify.html b/templates/game/menus/beautify.html → ...server/templates/game/menus/beautify.html
diff --git a/templates/game/menus/build.html → ...ls_server/templates/game/menus/build.html b/templates/game/menus/build.html → ...ls_server/templates/game/menus/build.html
diff --git a/templates/game/menus/cardinal.html → ...server/templates/game/menus/cardinal.html b/templates/game/menus/cardinal.html → ...server/templates/game/menus/cardinal.html
diff --git a/templates/game/menus/diplomat.html → ...server/templates/game/menus/diplomat.html b/templates/game/menus/diplomat.html → ...server/templates/game/menus/diplomat.html
diff --git a/templates/game/menus/emperor.html → ..._server/templates/game/menus/emperor.html b/templates/game/menus/emperor.html → ..._server/templates/game/menus/emperor.html
diff --git a/templates/game/menus/laboratory.html → ...rver/templates/game/menus/laboratory.html b/templates/game/menus/laboratory.html → ...rver/templates/game/menus/laboratory.html
diff --git a/templates/game/menus/magic-swap-deck.html → ...templates/game/menus/magic-swap-deck.html b/templates/game/menus/magic-swap-deck.html → ...templates/game/menus/magic-swap-deck.html
diff --git a/templates/game/menus/magic-swap-player.html → ...mplates/game/menus/magic-swap-player.html b/templates/game/menus/magic-swap-player.html → ...mplates/game/menus/magic-swap-player.html
diff --git a/templates/game/menus/magic.html → ...ls_server/templates/game/menus/magic.html b/templates/game/menus/magic.html → ...ls_server/templates/game/menus/magic.html
diff --git a/templates/game/menus/marshal.html → ..._server/templates/game/menus/marshal.html b/templates/game/menus/marshal.html → ..._server/templates/game/menus/marshal.html
diff --git a/templates/game/menus/museum.html → ...s_server/templates/game/menus/museum.html b/templates/game/menus/museum.html → ...s_server/templates/game/menus/museum.html
diff --git a/templates/game/menus/navigator.html → ...erver/templates/game/menus/navigator.html b/templates/game/menus/navigator.html → ...erver/templates/game/menus/navigator.html
diff --git a/templates/game/menus/necropolis.html → ...rver/templates/game/menus/necropolis.html b/templates/game/menus/necropolis.html → ...rver/templates/game/menus/necropolis.html
diff --git a/templates/game/menus/reveal-warrant.html → .../templates/game/menus/reveal-warrant.html b/templates/game/menus/reveal-warrant.html → .../templates/game/menus/reveal-warrant.html
diff --git a/templates/game/menus/select-district.html → ...templates/game/menus/select-district.html b/templates/game/menus/select-district.html → ...templates/game/menus/select-district.html
diff --git a/templates/game/menus/select-role.html → ...ver/templates/game/menus/select-role.html b/templates/game/menus/select-role.html → ...ver/templates/game/menus/select-role.html
diff --git a/templates/game/menus/send-blackmail.html → .../templates/game/menus/send-blackmail.html b/templates/game/menus/send-blackmail.html → .../templates/game/menus/send-blackmail.html
diff --git a/templates/game/menus/send-warrants.html → ...r/templates/game/menus/send-warrants.html b/templates/game/menus/send-warrants.html → ...r/templates/game/menus/send-warrants.html
diff --git a/templates/game/menus/spy.html → ...dels_server/templates/game/menus/spy.html b/templates/game/menus/spy.html → ...dels_server/templates/game/menus/spy.html
diff --git a/templates/game/menus/thieves_den.html → ...ver/templates/game/menus/thieves_den.html b/templates/game/menus/thieves_den.html → ...ver/templates/game/menus/thieves_den.html
diff --git a/templates/game/menus/warlord.html → ..._server/templates/game/menus/warlord.html b/templates/game/menus/warlord.html → ..._server/templates/game/menus/warlord.html
diff --git a/templates/game/menus/wizard-pick.html → ...ver/templates/game/menus/wizard-pick.html b/templates/game/menus/wizard-pick.html → ...ver/templates/game/menus/wizard-pick.html
diff --git a/templates/game/menus/wizard.html → ...s_server/templates/game/menus/wizard.html b/templates/game/menus/wizard.html → ...s_server/templates/game/menus/wizard.html
diff --git a/templates/game/misc.html → citadels_server/templates/game/misc.html b/templates/game/misc.html → citadels_server/templates/game/misc.html
diff --git a/templates/game/modal.html → citadels_server/templates/game/modal.html b/templates/game/modal.html → citadels_server/templates/game/modal.html
diff --git a/templates/game/my-roles.html → citadels_server/templates/game/my-roles.html b/templates/game/my-roles.html → citadels_server/templates/game/my-roles.html
diff --git a/templates/game/my-stash.html → citadels_server/templates/game/my-stash.html b/templates/game/my-stash.html → citadels_server/templates/game/my-stash.html
diff --git a/templates/game/player-summary.html → ...server/templates/game/player-summary.html b/templates/game/player-summary.html → ...server/templates/game/player-summary.html
diff --git a/templates/game/players.html → citadels_server/templates/game/players.html b/templates/game/players.html → citadels_server/templates/game/players.html
diff --git a/templates/game/role-card.html → ...dels_server/templates/game/role-card.html b/templates/game/role-card.html → ...dels_server/templates/game/role-card.html
diff --git a/templates/game/roles.html → citadels_server/templates/game/roles.html b/templates/game/roles.html → citadels_server/templates/game/roles.html
diff --git a/templates/lobby/config/base.html → ...s_server/templates/lobby/config/base.html b/templates/lobby/config/base.html → ...s_server/templates/lobby/config/base.html
diff --git a/templates/lobby/config/districts.html → ...ver/templates/lobby/config/districts.html b/templates/lobby/config/districts.html → ...ver/templates/lobby/config/districts.html
diff --git a/templates/lobby/config/roles.html → ..._server/templates/lobby/config/roles.html b/templates/lobby/config/roles.html → ..._server/templates/lobby/config/roles.html
diff --git a/templates/lobby/index.html → citadels_server/templates/lobby/index.html b/templates/lobby/index.html → citadels_server/templates/lobby/index.html
diff --git a/templates/lobby/players.html → citadels_server/templates/lobby/players.html b/templates/lobby/players.html → citadels_server/templates/lobby/players.html
diff --git a/templates/theme-dropdown.html → ...dels_server/templates/theme-dropdown.html b/templates/theme-dropdown.html → ...dels_server/templates/theme-dropdown.html
diff --git a/public/styles/index.css b/public/styles/index.css