diff --git a/webserver/src/routes/api/pastes/post.rs b/webserver/src/routes/api/pastes/post.rs index 67538bdd..a5951375 100644 --- a/webserver/src/routes/api/pastes/post.rs +++ b/webserver/src/routes/api/pastes/post.rs @@ -61,7 +61,7 @@ fn post(info: InfoResult, user: OptionalUser, conn: DbConn) -> RouteResult paste.commit("Anonymous", "none", "create paste")?, } - // TODO: eventually replace this all with a GET /pastes/?full=true backend call + // TODO: eventually replace this all with a GET /p/?full=true backend call let files: Vec = files .into_iter() .map(|x| OutputFile::new(x.id(), Some(x.name()), x.highlight_language(), None)) diff --git a/webserver/src/routes/web/pastes/delete.rs b/webserver/src/routes/web/pastes/delete.rs index 9e86b397..6d7bd9e6 100644 --- a/webserver/src/routes/web/pastes/delete.rs +++ b/webserver/src/routes/web/pastes/delete.rs @@ -18,7 +18,7 @@ use uuid::Uuid; use std::str::FromStr; -#[delete("/pastes//", format = "application/x-www-form-urlencoded", data = "")] +#[delete("/p//", format = "application/x-www-form-urlencoded", data = "")] fn delete(deletion: Form, username: String, id: PasteId, user: OptionalWebUser, mut sess: Session, conn: DbConn) -> Result { let deletion = deletion.into_inner(); diff --git a/webserver/src/routes/web/pastes/files/raw.rs b/webserver/src/routes/web/pastes/files/raw.rs index f11763c8..0a43a5f1 100644 --- a/webserver/src/routes/web/pastes/files/raw.rs +++ b/webserver/src/routes/web/pastes/files/raw.rs @@ -31,7 +31,7 @@ impl<'r> Responder<'r> for As { } -#[get("/pastes///files//raw")] +#[get("/p///files//raw")] fn get(username: String, paste_id: PasteId, file_id: FileId, user: OptionalWebUser, conn: DbConn) -> Result { let paste: DbPaste = match paste_id.get(&conn)? { Some(p) => p, diff --git a/webserver/src/routes/web/pastes/get.rs b/webserver/src/routes/web/pastes/get.rs index a0abc330..e65a5d5b 100644 --- a/webserver/src/routes/web/pastes/get.rs +++ b/webserver/src/routes/web/pastes/get.rs @@ -69,16 +69,16 @@ fn id(id: PasteId, user: OptionalWebUser, conn: DbConn) -> Result { &username, PATH_SEGMENT_ENCODE_SET, ); - Ok(Rst::Redirect(Redirect::to(&format!("/pastes/{}/{}", owner, id)))) + Ok(Rst::Redirect(Redirect::to(&format!("/p/{}/{}", owner, id)))) } #[get("//", rank = 10)] fn username_id(username: String, id: PasteId) -> Redirect { let username = utf8_percent_encode(&username, PATH_SEGMENT_ENCODE_SET); - Redirect::to(&format!("/pastes/{}/{}", username, id)) + Redirect::to(&format!("/p/{}/{}", username, id)) } -#[get("/pastes//")] +#[get("/p//")] fn users_username_id(username: String, id: PasteId, config: State, user: OptionalWebUser, mut sess: Session, conn: DbConn) -> Result { let paste: DbPaste = match id.get(&conn)? { Some(p) => p, @@ -156,7 +156,7 @@ fn users_username_id(username: String, id: PasteId, config: State, user: Ok(Rst::Template(Template::render("paste/index", ctx))) } -#[get("/pastes///edit")] +#[get("/p///edit")] fn edit(username: String, id: PasteId, config: State, user: OptionalWebUser, mut sess: Session, conn: DbConn) -> Result { let user = match user.into_inner() { Some(u) => u, diff --git a/webserver/src/routes/web/pastes/patch.rs b/webserver/src/routes/web/pastes/patch.rs index d537f6c8..a98431c2 100644 --- a/webserver/src/routes/web/pastes/patch.rs +++ b/webserver/src/routes/web/pastes/patch.rs @@ -67,7 +67,7 @@ fn check_paste(paste: &PasteUpdate, files: &[MultiFile]) -> result::Result<(), S Ok(()) } -#[patch("/pastes//", format = "application/x-www-form-urlencoded", data = "")] +#[patch("/p//", format = "application/x-www-form-urlencoded", data = "")] fn patch(update: LenientForm, username: String, paste_id: PasteId, user: OptionalWebUser, mut sess: Session, conn: DbConn) -> Result { let update = update.into_inner(); sess.set_form(&update); @@ -243,7 +243,7 @@ fn patch(update: LenientForm, username: String, paste_id: PasteId, sess.take_form(); let username = utf8_percent_encode(&username, PATH_SEGMENT_ENCODE_SET); - Ok(Rst::Redirect(Redirect::to(&format!("/pastes/{}/{}", username, paste_id.simple())))) + Ok(Rst::Redirect(Redirect::to(&format!("/p/{}/{}", username, paste_id.simple())))) } #[derive(Debug, FromForm, Serialize)] diff --git a/webserver/src/routes/web/pastes/post.rs b/webserver/src/routes/web/pastes/post.rs index badd6680..3ccdacf9 100644 --- a/webserver/src/routes/web/pastes/post.rs +++ b/webserver/src/routes/web/pastes/post.rs @@ -111,7 +111,7 @@ fn post(paste: Form, user: OptionalWebUser, mut sess: Session, conn sess.take_form(); let username = utf8_percent_encode(username, PATH_SEGMENT_ENCODE_SET); - Ok(Redirect::to(&format!("/pastes/{}/{}", username, paste.id().simple()))) + Ok(Redirect::to(&format!("/p/{}/{}", username, paste.id().simple()))) } #[derive(Debug, FromForm, Serialize)] diff --git a/webserver/src/routes/web/pastes/revisions.rs b/webserver/src/routes/web/pastes/revisions.rs index f418671c..49160efd 100644 --- a/webserver/src/routes/web/pastes/revisions.rs +++ b/webserver/src/routes/web/pastes/revisions.rs @@ -19,7 +19,7 @@ use rocket_contrib::Template; use std::result; -#[get("/pastes///revisions")] +#[get("/p///revisions")] fn get(username: String, id: PasteId, config: State, user: OptionalWebUser, mut sess: Session, conn: DbConn) -> Result { let paste: DbPaste = match id.get(&conn)? { Some(p) => p, diff --git a/webserver/src/routes/web/users/get.rs b/webserver/src/routes/web/users/get.rs index 78c24edf..e2a05cc2 100644 --- a/webserver/src/routes/web/users/get.rs +++ b/webserver/src/routes/web/users/get.rs @@ -19,12 +19,12 @@ use rocket_contrib::Template; use std::fs::File; use std::io::Read; -#[get("/users/")] +#[get("/u/")] fn get(username: String, config: State, user: OptionalWebUser, sess: Session, conn: DbConn) -> Result { _get(1, username, config, user, sess, conn) } -#[get("/users/?")] +#[get("/u/?")] fn get_page(username: String, params: PageParams, config: State, user: OptionalWebUser, sess: Session, conn: DbConn) -> Result { _get(params.page, username, config, user, sess, conn) } diff --git a/webserver/web/templates/base.html.tera b/webserver/web/templates/base.html.tera index f38a231d..a0488640 100644 --- a/webserver/web/templates/base.html.tera +++ b/webserver/web/templates/base.html.tera @@ -75,7 +75,7 @@ {% if user %} {{ user.name }} + href="/u/{{ user.username | urlencode(safe="") }}">{{ user.name }} {% else %} Log in {% endif %} diff --git a/webserver/web/templates/paste/edit.html.tera b/webserver/web/templates/paste/edit.html.tera index b97b85f9..bf495f26 100644 --- a/webserver/web/templates/paste/edit.html.tera +++ b/webserver/web/templates/paste/edit.html.tera @@ -76,8 +76,8 @@ Edit untitled paste
@@ -86,7 +86,7 @@ Edit untitled paste {% endblock header %} {% block main %} -
+
diff --git a/webserver/web/templates/paste/index.html.tera b/webserver/web/templates/paste/index.html.tera index a87e58ff..c22190f3 100644 --- a/webserver/web/templates/paste/index.html.tera +++ b/webserver/web/templates/paste/index.html.tera @@ -57,7 +57,7 @@ untitled paste
{% if is_owner %}
- + @@ -101,8 +101,8 @@ untitled paste
@@ -113,7 +113,7 @@ untitled paste {% block main %} {% if not paste.author or is_owner %} {% endif %}
- Raw + Raw {% endif %} {% if file.content.format == "text" %} diff --git a/webserver/web/templates/paste/revisions.html.tera b/webserver/web/templates/paste/revisions.html.tera index da5187f0..e8f01b7b 100644 --- a/webserver/web/templates/paste/revisions.html.tera +++ b/webserver/web/templates/paste/revisions.html.tera @@ -58,7 +58,7 @@ untitled paste
{% if is_owner %}
- + @@ -101,8 +101,8 @@ untitled paste
diff --git a/webserver/web/templates/user/index.html.tera b/webserver/web/templates/user/index.html.tera index da9807d7..a3aa93f3 100644 --- a/webserver/web/templates/user/index.html.tera +++ b/webserver/web/templates/user/index.html.tera @@ -61,12 +61,12 @@ {% if page == 1 %} Previous {% else %} - Previous + Previous {% endif %} {% if page == last_page %} Next {% else %} - Next + Next {% endif %} @@ -81,7 +81,7 @@

- + {% if paste.name %} {{ paste.name }} {% else %} @@ -123,12 +123,12 @@ {% if page == 1 %} Previous {% else %} - Previous + Previous {% endif %} {% if page == last_page %} Next {% else %} - Next + Next {% endif %} {% endif %}