public/style.css

@@ -54,10 +54,6 @@ a {
     color: #a6e3a1;
 }
 
-.dim {
-    color: #a6adc8;
-}
-
 .fancy-button {
     outline: 0;
     border: none;
@@ -72,105 +68,3 @@ a {
 
     transition: 0.1s background-color;
 }
-
-.fancy-button:hover {
-    background-color: #bad4fc;
-}
-
-.inline-post {
-    display: inline;
-}
-
-.inline-post-button {
-    display: inline;
-    background: none;
-    outline: none;
-    border: none;
-    color: inherit;
-    font-size: inherit;
-    font-weight: inherit;
-    text-decoration: underline;
-    cursor: pointer;
-    padding: 0;
-}
-
-.greeting ::selection {
-    background-color: #11111b;
-    color: #cdd6f4;
-}
-
-.greeting {
-    background-color: #89b4fa;
-    color: #11111b;
-    border-radius: 1.5em;
-    padding: 1em;
-
-    display: flex;
-    flex-direction: row;
-    gap: 1rem;
-}
-
-.greeting-l {
-    flex: 0 0 auto;
-    max-width: 100%;
-    width: auto;
-    height: 100%;
-    max-height: 3rem;
-    object-fit: contain;
-    display: block;
-}
-
-.greeting-r {
-    flex: 1 1 0px;
-    min-width: 0;
-
-    display: flex;
-    flex-direction: column;
-    justify-content: space-between;
-}
-
-.greeting-top {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    justify-content: space-between;
-}
-
-.greeting-top-left {
-    font-size: 1.4rem;
-}
-
-.greeting-stats {
-    display: flex;
-    flex-direction: row;
-    align-items: stretch;
-    gap: 0.5ex;
-}
-
-.greeting-stats img {
-    width: auto;
-    height: 1em;
-}
-
-.greeting a {
-    color: #11111b;
-}
-
-
-.header {
-    height: 96px;
-    max-width: 600px;
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    width: 100%;
-}
-
-.header>.greeting {
-    flex: 1 1 0px;
-}
-
-.favicon {
-    margin: auto;
-    display: block;
-}

readme.md

@@ -40,6 +40,3 @@ i've run out of ideas.
 - authentication caching (ip? redis?)
 - use log instead of println
 - make a proper rank system (reuploading, uploading music, rating, etc.)
-- user icons in the account management + settings (gdicon.oat.zone? selfhost?)
-- account settings page
-- better web design

src/helpers/templates.rs

@@ -1,18 +1,19 @@
-use rocket::http::CookieJar;
+macro_rules! auth {
-
+    ($cookies: expr) => {
-pub fn authenticate(cookies: &CookieJar<'_>) -> Result<(String, i32, i32), &'static str> {
+        match $cookies.get_private("blackmail_data") {
-    match cookies.get_private("blackmail_data") {
+            Some(cookie_val) => {
-        Some(cookie) => {
+                let parts = cookie_val.value().split(":").collect::<Vec<&str>>();
-            let parts = cookie.value().split(":").collect::<Vec<&str>>();
 
                 let username = parts[0].to_string();
                 let account_id = parts[1].parse::<i32>().expect("account id is not an integer! this should NOT happen!");
                 let user_id = parts[2].parse::<i32>().expect("user id is not an integer! this should NOT happen!");
             
-            return Ok((username, account_id, user_id))
+                (true, Some(username), Some(account_id), Some(user_id))
             }
             None => {
-            return Err("authentication failed")
+                (false, None, None, None)
             }
         }
     }
+}
+pub(crate) use auth;

src/main.rs

@@ -58,9 +58,7 @@ fn rocket() -> _ {
             template_endpoints::login::post_login,
             template_endpoints::login::get_login,
 
-            template_endpoints::account_management::account_management,
+            template_endpoints::logout::logout,
-            
-            template_endpoints::logout::logout
         ])
         // assets
         .mount("/", routes![

src/template_endpoints.rs

@@ -1,4 +1,3 @@
-pub mod account_management;
 pub mod index;
 pub mod login;
 pub mod logout;

src/template_endpoints/account_management.rs

@@ -1,40 +0,0 @@
-use rocket::response::Redirect;
-
-use rocket_dyn_templates::{Template, context};
-
-use rocket::http::CookieJar;
-
-use diesel::prelude::*;
-
-use crate::db;
-
-#[get("/accounts")]
-pub fn account_management(cookies: &CookieJar<'_>) -> Result<Template, Redirect> {
-    let connection = &mut db::establish_connection_pg();
-
-    let logged_in = crate::helpers::templates::authenticate(cookies);
-
-    match logged_in {
-        Ok((username_val, account_id_val, user_id_val)) => {
-            use crate::schema::users::dsl::*;
-            use crate::models::User;
-    
-            let result = users
-                .filter(id.eq(user_id_val))
-                .get_result::<User, >(connection)
-                .expect("couldnt find user with user id from account");
-    
-            return Ok(Template::render("account_management", context! {
-                username: username_val,
-                stars: result.stars,
-                diamonds: result.diamonds,
-                coins: result.coins,
-                user_coins: result.user_coins,
-                demons: result.demons
-            }));
-        },
-        Err(_) => {
-            return Err(Redirect::to("/login"));
-        }
-    }
-}

src/template_endpoints/index.rs

@@ -7,7 +7,7 @@ pub fn index() -> Template {
     let silly_strings: Vec<&str> = vec![
         "the trianges consume",
         "geomtry das",
-        "now with no ACE!",
+        "now with no RCE!",
         "the best gdps",
         "better than topala",
         "better than robtop",
@@ -17,21 +17,7 @@ pub fn index() -> Template {
         "kagepro",
         "wowaka is peak music",
         "you have been warned: dyno jun",
-        "listen to jin",
+        "listen to jin"
-        "GIVEUP!GIVEUP!GIVEUP!GIVEUP!GIVEUP!GIVEUP!LOVE!LOVE!GIVEUP!GIVEUP!GIVEUP!GIVEUP!GIVEUP!GIVEUP!",
-        "cross site scripting is a myth",
-        "VITAL STATE: Deceased - abducted by Pikmin",
-        "geometry dash for the 3ds",
-        "trans rights",
-        "how many maggots eat burger?",
-        "who would win: the rust borrow checker or rotting flesh",
-        "your system has run out of application memory",
-        "unsafe { std::ptr::null_mut::<i32>().write(42) }",
-        "-1",
-        "[REDACTED]",
-        "chrome jop jop?",
-        "pikmin 4",
-        "italian apk downloader"
     ];
 
     let mut rng = rand::thread_rng();

src/template_endpoints/login.rs

@@ -20,7 +20,7 @@ pub struct FormLogin {
 }
 
 #[post("/login", data = "<input>")]
-pub fn post_login(cookies: &CookieJar<'_>, input: Form<FormLogin>) -> Template {
+pub fn post_login(jar: &CookieJar<'_>, input: Form<FormLogin>) -> Template {
     let connection = &mut db::establish_connection_pg();
 
     use crate::schema::accounts::dsl::*;
@@ -34,7 +34,7 @@ pub fn post_login(cookies: &CookieJar<'_>, input: Form<FormLogin>) -> Template {
         Ok(account_id_username_val) => {
             match helpers::accounts::auth(account_id_username_val.0, Some(input.password.clone()), None, None) {
                 Ok(account_id_user_id_val) => {
-                    cookies.add_private(Cookie::build(
+                    jar.add_private(Cookie::build(
                         "blackmail_data", 
                         format!("{}:{}:{}", account_id_username_val.1, account_id_user_id_val.0, account_id_user_id_val.1))
                     .path("/")
@@ -65,14 +65,11 @@ pub fn post_login(cookies: &CookieJar<'_>, input: Form<FormLogin>) -> Template {
 
 #[get("/login")]
 pub fn get_login(cookies: &CookieJar<'_>) -> Result<Redirect, Template> {
-    let logged_in = crate::helpers::templates::authenticate(cookies);
+    let (logged_in, _username, _account_id, _user_id) = crate::helpers::templates::auth!(cookies);
 
-    match logged_in {
+    if logged_in {
-        Ok(_) => {
+        Ok(Redirect::to("/"))
-            return Ok(Redirect::to("/"))
+    } else {
-        },
-        Err(_) => {
         Err(Template::render("login", context! { }))
     }
 }
-}

src/template_endpoints/logout.rs

@@ -3,7 +3,9 @@ use rocket::response::Redirect;
 
 #[post("/accounts/logout")]
 pub fn logout(jar: &CookieJar<'_>) -> Redirect {
-    jar.remove_private(Cookie::named("blackmail_data"));
+    jar.remove_private(Cookie::named("username"));
+    jar.remove_private(Cookie::named("account_id"));
+    jar.remove_private(Cookie::named("user_id"));
 
     Redirect::to("/")
 }

templates/account_management.html.hbs

@@ -1,49 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="UTF-8" />
-    <link rel="icon" type="image/png" href="/favicon.png" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <link rel="stylesheet" href="/style.css" />
-    <title>Home</title>
-</head>
-
-<body style="display: flex; align-items: center; gap: 1.5em; flex-direction: column">
-    <h1 style="display: flex; align-items: center; gap: 1em">
-        <a href="/"><img src="/favicon.png" width="64" height="auto"></a>
-        Account Management
-    </h1>
-    <div class="header">
-        <div class="greeting">
-            <img src="/assets/icons/gd/demon.png" title="{{ username }}" class="greeting-l">
-            <div class="greeting-r">
-                <div class="greeting-top">
-                    <div class="greeting-top-left">
-                        hai, <b>{{ username }}</b>!
-                    </div>
-                    <div class="greeting-stats">
-                        {{ stars }} <img src="/assets/icons/gd/star.png"> {{ diamonds }} <img src="/assets/icons/gd/diamond.png"> {{ coins }} <img src="/assets/icons/gd/coin.png"> {{ user_coins }} <img src="/assets/icons/gd/silvercoin.png"> {{ demons }} <img src="/assets/icons/gd/demon.png">
-                    </div>
-                </div>
-                <div class="greeting-bottom">
-                    <a href="/accounts/settings">Settings</a> &middot;
-                    <form action="/accounts/logout" method="post" class="inline-post">
-                        <button type="submit" class="inline-post-button">
-                            Log out
-                        </button>
-                    </form>
-                </div>
-            </div>
-        </div>
-    </div>
-    <div class="block">
-        lorem ipsum sur dolor amet or something. i'll put stuff here later LOL
-        <br><br>
-        anyway how has ur day been
-        <br><br>
-        the demon should be your user icon haha, ill get 2 that latr :3 (gonna be next update i think)
-    </div>
-</body>
-
-</html>

templates/index.html.hbs

@@ -11,7 +11,7 @@
 
 <body style="display: flex; align-items: center; gap: 1.5em; flex-direction: column">
     <h1 style="display: flex; align-items: center; gap: 1em">
-        <a href="/"><img src="/favicon.png" width="64" height="auto"></a>
+        <img src="/favicon.png" width="64" height="auto">
         gdps-server
     </h1>
     <div class="block">
@@ -24,11 +24,10 @@
             <el>
                 <li>The <a href="https://git.reidlab.online/reidlab/gdps-server">Git repository</a></li>
                 <li><a href="/tools/reupload">Level reuploading</a></li>
-                <li><a href="/accounts">Account stuff</a></li>
             </el>
         </p>
     </div>
-    <div style="max-width: 400px; font-style: italic; text-align: center" class="dim">
+    <div class="dim">
         {{ silly_string }}
     </div>
 </body>

templates/login.html.hbs

@@ -34,7 +34,7 @@
 
 <body>
     <form method="post">
-        <a href="/"><img src="/favicon.png" width="64" height="auto"></a>
+        <img src="/favicon.png" width="64" height="auto">
         <br>
         <label for="username">Username</label>
         <input type="text" id="username" name="username" minlength="3" maxlength="20" required />