Move submitter to its own page and prefill fields if possible

Author: emonadeo

.gitignore

@@ -1,11 +1,17 @@
+temp/
 **/target/
 .env
 .secret
 .idea
 .vscode
+.DS_Store
 
 # random stuff I have because of enabling eslint in vscode
 node_modules
 eslint.config.mjs
 package-lock.json
-package.json
+package.json
+
+# Local Postgres data and scripts
+pg_data/
+pg_log

pointercrate-demonlist-api/src/lib.rs

@@ -97,7 +97,8 @@ pub fn setup(rocket: Rocket<Build>) -> Rocket<Build> {
                 pages::nation_stats_viewer,
                 pages::demon_page,
                 pages::demon_permalink,
-                pages::heatmap_css
+                pages::heatmap_css,
+                pages::submit_record,
             ],
         )
 }

pointercrate-demonlist-api/src/pages.rs

@@ -9,7 +9,7 @@ use pointercrate_core_api::{
     error::Result,
     response::{Page, Response2},
 };
-use pointercrate_demonlist::player::claim::PlayerClaim;
+use pointercrate_demonlist::player::{claim::PlayerClaim, DatabasePlayer};
 use pointercrate_demonlist::player::{FullPlayer, Player};
 use pointercrate_demonlist::{
     demon::{audit::audit_log_for_demon, current_list, list_at, FullDemon, MinimalDemon},
@@ -22,6 +22,7 @@ use pointercrate_demonlist_pages::{
     demon_page::{DemonMovement, DemonPage},
     overview::OverviewPage,
     statsviewer::individual::IndividualStatsViewer,
+    submit_record::SubmitRecordPage,
 };
 use pointercrate_integrate::gd::GeometryDashConnector;
 use pointercrate_user::auth::NonMutating;
@@ -32,10 +33,9 @@ use rocket::{futures::StreamExt, http::CookieJar};
 use sqlx::PgConnection;
 
 #[localized]
-#[rocket::get("/?<timemachine>&<submitter>")]
+#[rocket::get("/?<timemachine>")]
 pub async fn overview(
-    pool: &State<PointercratePool>, timemachine: Option<bool>, submitter: Option<bool>, cookies: &CookieJar<'_>,
-    auth: Option<Auth<NonMutating>>,
+    pool: &State<PointercratePool>, timemachine: Option<bool>, cookies: &CookieJar<'_>, auth: Option<Auth<NonMutating>>,
 ) -> Result<Page> {
     // A few months before pointercrate first went live - definitely the oldest data we have
     let beginning_of_time = NaiveDate::from_ymd_opt(2017, 1, 4).unwrap().and_hms_opt(0, 0, 0).unwrap();
@@ -44,6 +44,8 @@ pub async fn overview(
 
     let demonlist = current_list(&mut connection).await?;
 
+    dbg!(&demonlist);
+
     let mut specified_when = cookies
         .get("when")
         .and_then(|cookie| DateTime::<FixedOffset>::parse_from_rfc3339(cookie.value()).ok());
@@ -84,7 +86,6 @@ pub async fn overview(
         },
         demonlist,
         time_machine: tardis,
-        submitter_initially_visible: submitter.unwrap_or(false),
         claimed_player: match auth {
             Some(auth) => claimed_full_player(auth.user.user(), &mut connection).await,
             None => None,
@@ -236,3 +237,22 @@ fn make_css_rule(code: &str, score: f64, highest_score: f64) -> String {
         0xe0 as f64 + (0xc6 - 0xe0) as f64 * (score / highest_score),
     )
 }
+
+#[localized]
+#[rocket::get("/submit-record?<demon>")]
+pub async fn submit_record(pool: &State<PointercratePool>, demon: Option<usize>, auth: Option<Auth<NonMutating>>) -> Result<Page> {
+    let mut connection = pool.connection().await?;
+
+    let demons = current_list(&mut connection).await?;
+
+    let claimed_player = match auth {
+        Some(auth) => DatabasePlayer::by_user(auth.user.user().id, &mut connection).await.unwrap_or(None),
+        None => None,
+    };
+
+    Ok(Page::new(SubmitRecordPage {
+        demons,
+        initial_demon: demon,
+        initial_holder: claimed_player,
+    }))
+}

pointercrate-demonlist-pages/src/account/demons.rs

@@ -303,6 +303,7 @@ fn change_verifier_dialog() -> Markup {
         &tr("demon-verifier-dialog.info"),
         &tr("demon-verifier-dialog.submit"),
         "verifier",
+        &None,
     )
 }
 
@@ -314,6 +315,7 @@ fn change_publisher_dialog() -> Markup {
         &tr("demon-publisher-dialog.info"),
         &tr("demon-publisher-dialog.submit"),
         "publisher",
+        &None,
     )
 }
 
@@ -325,6 +327,7 @@ fn add_creator_dialog() -> Markup {
         &tr("demon-creator-dialog.info"),
         &tr("demon-creator-dialog.submit"),
         "creator",
+        &None,
     )
 }
 
@@ -370,13 +373,13 @@ fn demon_submitter() -> Markup {
                     span.form-input.flex.col data-type = "dropdown" {
                         label{(tr("demon-add-form.verifier-field")) }
                         br;
-                        (player_selection_dropdown("demon-add-verifier", "/api/v1/players/", "name", "verifier"))
+                        (player_selection_dropdown("demon-add-verifier", "/api/v1/players/", "name", "verifier", &None))
                         p.error {}
                     }
                     span.form-input.flex.col data-type = "dropdown" {
                         label {(tr("demon-add-form.publisher-field")) }
                         br;
-                        (player_selection_dropdown("demon-add-publisher", "/api/v1/players/", "name", "publisher"))
+                        (player_selection_dropdown("demon-add-publisher", "/api/v1/players/", "name", "publisher", &None))
                         p.error {}
                     }
                     span.form-input.flex.col #demon-add-video {

pointercrate-demonlist-pages/src/account/records.rs

@@ -1,6 +1,6 @@
-use crate::components::{
-    demon_dropdown, player_selection_dialog,
-    submitter::{submit_panel, RecordSubmitter},
+use crate::{
+    components::{demon_dropdown, player_selection_dialog},
+    submit_record::submit_record_panel,
 };
 use maud::{html, Markup, PreEscaped};
 use pointercrate_core::{error::PointercrateError, localization::tr, permission::PermissionsManager, trp};
@@ -10,6 +10,7 @@ use pointercrate_core_pages::{
 };
 use pointercrate_demonlist::{
     demon::{current_list, Demon},
+    player::DatabasePlayer,
     LIST_HELPER,
 };
 use pointercrate_user::auth::{AuthenticatedUser, NonMutating};
@@ -59,7 +60,6 @@ impl AccountPageTab for RecordsPage {
 
         html! {
             div.left {
-                (RecordSubmitter::new(false, &demons[..]))
                 (record_manager(&demons[..]))
                 (note_adder())
                 div.panel.fade #record-notes-container style = "display:none" {
@@ -74,7 +74,7 @@ impl AccountPageTab for RecordsPage {
                 (status_selector())
                 (record_selector())
                 (player_selector())
-                (submit_panel())
+                (submit_record_panel(None))
             }
             (change_progress_dialog())
             (change_video_dialog())
@@ -386,6 +386,7 @@ fn change_holder_dialog() -> Markup {
         &tr("record-holder-dialog.info"),
         &tr("record-holder-dialog.submit"),
         "player",
+        &None,
     )
 }
 
@@ -401,7 +402,7 @@ fn change_demon_dialog(demons: &[Demon]) -> Markup {
                     p {
                         (tr("record-videolink-dialog.info"))
                     }
-                    (demon_dropdown("edit-demon-record", demons.iter()))
+                    (demon_dropdown("edit-demon-record", demons, None))
                 }
             }
         }

pointercrate-demonlist-pages/src/components/mod.rs

@@ -5,15 +5,19 @@ use pointercrate_core::{localization::tr, trp};
 use pointercrate_demonlist::demon::Demon;
 use pointercrate_demonlist::player::DatabasePlayer;
 
-pub mod submitter;
 pub mod team;
 pub mod time_machine;
 
-pub fn demon_dropdown<'a>(dropdown_id: &str, demons: impl Iterator<Item = &'a Demon>) -> Markup {
+pub fn demon_dropdown(dropdown_id: &str, demons: &[Demon], initial_demon: Option<usize>) -> Markup {
+    let initial_demon_name: &str = match initial_demon {
+        Some(position) => demons.get(position - 1).map_or("", |demon| &demon.base.name),
+        None => "",
+    };
+
     html! {
         div.dropdown-menu.js-search #(dropdown_id) {
             div {
-                input type = "text" name = "demon" required="" autocomplete="off";
+                input type = "text" name = "demon" required="" autocomplete="off" value=(initial_demon_name);
             }
             div.menu {
                ul {
@@ -26,11 +30,17 @@ pub fn demon_dropdown<'a>(dropdown_id: &str, demons: impl Iterator<Item = &'a De
     }
 }
 
-pub fn player_selection_dropdown(dropdown_id: &str, endpoint: &str, field: &str, form_field: &str) -> Markup {
+pub fn player_selection_dropdown(
+    dropdown_id: &str, endpoint: &str, field: &str, form_field: &str, initial_player: &Option<DatabasePlayer>,
+) -> Markup {
+    let initial_player_name: &str = match initial_player {
+        Some(player) => &player.name,
+        None => "",
+    };
     html! {
         div.dropdown-menu #(dropdown_id) data-endpoint = (endpoint) data-field = (field) {
             div {
-                input type = "text" name = (form_field) required="" autocomplete="off" placeholder = (tr("record-submission.holder-input-placeholder"));
+                input type = "text" name = (form_field) required="" autocomplete="off" placeholder = (tr("record-submission.holder-input-placeholder")) value = (initial_player_name);
             }
             div.menu {
                 // dynamically populated once the user starts typing
@@ -42,6 +52,7 @@ pub fn player_selection_dropdown(dropdown_id: &str, endpoint: &str, field: &str,
 
 pub fn player_selection_dialog(
     dialog_id: &str, dropdown_id: &str, headline: &str, description: &str, button_text: &str, form_field: &str,
+    initial_player: &Option<DatabasePlayer>,
 ) -> Markup {
     html! {
         div.overlay.closable {
@@ -55,7 +66,7 @@ pub fn player_selection_dialog(
                         (description)
                     }
                     span.form-input.flex.col data-type = "dropdown" {
-                        (player_selection_dropdown(dropdown_id, "/api/v1/players/", "name", form_field))
+                        (player_selection_dropdown(dropdown_id, "/api/v1/players/", "name", form_field, initial_player))
                         p.error {}
                     }
                     input.button.blue.hover type = "submit" style = "margin: 15px auto 0px;" value = (button_text);