diff --git a/snippets/back_to_home.html b/snippets/back_to_home.html deleted file mode 100644 index 605c874..0000000 --- a/snippets/back_to_home.html +++ /dev/null @@ -1 +0,0 @@ -

Sorry! This room is already full. Maybe try another one?

diff --git a/src/main.rs b/src/main.rs index a20b552..f333a03 100644 --- a/src/main.rs +++ b/src/main.rs @@ -23,7 +23,7 @@ struct Args { // Port number for server #[clap(short, long, default_value_t = 8000)] port: u16, - #[clap(short, long, default_value = "localhost")] + #[clap(short, long, default_value = "http://127.0.0.1:8000")] base_url: String, } @@ -39,6 +39,8 @@ fn rocket() -> _ { #[get("/?")] async fn index(mut roomname: String) -> Template { + // remove whitespace from roomname + roomname = roomname.split_whitespace().collect(); // generate roomname if there is none yet if roomname.chars().count() == 0 { roomname = names::get_random_name().await; @@ -70,7 +72,7 @@ async fn index(mut roomname: String) -> Template { } } -#[get("/room?&")] -async fn room(roomname: &str, token: usize) -> String{ +#[get("/room?&&")] +async fn room(roomname: &str, token: usize, player1: bool) -> String{ "hey gamer".to_string() } diff --git a/src/rooms.rs b/src/rooms.rs index e4621ee..c42203b 100644 --- a/src/rooms.rs +++ b/src/rooms.rs @@ -8,10 +8,12 @@ pub struct Room { impl Room { pub fn new() -> Room { - let random: usize = thread_rng().gen(); + // generate room token + let tok: usize = thread_rng().gen(); + // flip coin to see who starts Room { full: false, - token: random, + token: tok, } } } diff --git a/src/templates.rs b/src/templates.rs index c9c2f10..fe13e81 100644 --- a/src/templates.rs +++ b/src/templates.rs @@ -2,8 +2,6 @@ use std::collections::HashMap; use rocket_dyn_templates::Template; use clap::Parser; - - lazy_static! { static ref ARGS: Args = Args::parse(); } @@ -11,7 +9,7 @@ lazy_static! { #[derive(Parser, Debug)] #[clap(about, version, author)] struct Args { - #[clap(short, long, default_value = "localhost")] + #[clap(short, long, default_value = "http://127.0.0.1:8000")] base_url: String, } @@ -21,13 +19,13 @@ pub fn get_back_to_home(roomname: &str) -> Template { pub fn join_new_room(roomname: &str, token: usize) -> Template { let message = format!("your room is \"{}\"! copy your link and send it to a friend to let them join", roomname); - let link_url = link_url_from(roomname, token); + let link_url = link_url_from(roomname, token, true); join_template_from(&message, "let me in!", &link_url, "url_button", roomname) } pub fn join_room(roomname: &str, token: usize) -> Template { let message = format!("your room is \"{}\"! someone is already waiting in this room!", roomname); - let link_url = link_url_from(roomname, token); + let link_url = link_url_from(roomname, token, false); join_template_from(&message, "let me in!", &link_url, "hidden", roomname) } @@ -42,6 +40,6 @@ fn join_template_from(message: &str, link: &str, link_url: &str, hide_url_button Template::render("join", context) } -fn link_url_from(roomname: &str, token: usize) -> String{ - format!("./room?roomname={}&token={}", roomname, token) +fn link_url_from(roomname: &str, token: usize, player1: bool) -> String{ + format!("./room?roomname={}&token={}&player1={}", roomname, token, player1) } diff --git a/static/script.js b/static/script.js index 2c953c5..d65ea62 100644 --- a/static/script.js +++ b/static/script.js @@ -2,8 +2,10 @@ function copyURI(evt) { evt.preventDefault(); navigator.clipboard.writeText(evt.target.getAttribute('href')).then(() => { /* clipboard successfully set */ + document.getElementById("urlForCopy").innerHTML = "copied"; }, () => { /* clipboard write failed */ + document.getElementById("urlForCopy").innerHTML = "failed to copy :\("; }); } diff --git a/static/style.css b/static/style.css index 5dd81dc..65cc374 100644 --- a/static/style.css +++ b/static/style.css @@ -7,6 +7,11 @@ --accent1: #accce4; } +* { + margin: 0; + padding: 0; + } + body, html { color: var(--text); @@ -19,8 +24,10 @@ html { justify-content: center; width: 100%; height: 100%; + size: 100%; margin: 0; padding: 0; + scrollbar-color: var(--accent1); } ::selection { @@ -45,12 +52,12 @@ footer { overflow: visible; left: 0; display: flex; - height: 10%; bottom: 0; width: 100%; - font-size: 3em; + font-size: 16pt; justify-content: center; align-items: center; + height: 10%; } .contentdiv { @@ -58,8 +65,9 @@ footer { flex-direction: column; align-items: center; align-self: center; - height: 90%; + min-height: 90%; justify-content: center; + width: 100%; } button, @@ -68,8 +76,8 @@ a, p { line-height: 1.84em; border-radius: 0.48em; - font-size: 32pt; - margin: 0.5em; + font-size: 24pt; + margin-top: 0.5em; text-align: center; font-family: "Sen", sans-serif; line-break: anywhere; @@ -79,10 +87,10 @@ a, button, input { outline: none; - padding: 2%; background-color: var(--background); color: var(--text); border: 0.12em solid var(--text); + width: 90%; } input { diff --git a/templates/join.html.hbs b/templates/join.html.hbs index e6ecb08..1eb1c2a 100644 --- a/templates/join.html.hbs +++ b/templates/join.html.hbs @@ -16,6 +16,7 @@

{{message}}