Jengamon/noteboek - Change DJF3AQJNNKWGV7XTOFOHK4YUSQF5YEDAVMXATVMT6RU6DWP2ETYQC

fix some stuff, add some stuff

Created by Jengamon on February 1, 2024

DJF3AQJNNKWGV7XTOFOHK4YUSQF5YEDAVMXATVMT6RU6DWP2ETYQC

Dependencies

In channels

main

Change contents

Replacement in server/src/user.rs at line 1 [3.32]

B:BD[3.32] → [3.33:64]

use std::collections::HashSet;

[3.32]

[3.64]

use std::{ascii::AsciiExt, collections::HashSet, str::FromStr};

Replacement in server/src/user.rs at line 53 [3.32]

B:BD[3.1475] → [2.277:380]

        let ulid: Ulid = match Ulid::from_string(&self.id.id.to_raw()) {
            Ok(ulid) => ulid,

[3.1475]

[2.380]

        let uuid: uuid::Uuid = match uuid::Uuid::from_str(&self.id.id.to_raw()) {
            Ok(uuid) => uuid,

Insertion in server/src/user.rs at line 57 [3.32]
[2.434]
[2.434]
```
        let ulid: Ulid = uuid.into();
```

Replacement in server/src/user.rs at line 106 [3.32]

B:BD[3.2611] → [3.2611:2653]

            .bind(("email", creds.email))

[3.2611]

[3.2653]

            .bind(("email", creds.email.to_ascii_lowercase()))

Deletion in server/src/main.rs at line 80 [4.431]
B:BD[4.2332] → [4.2332:2387]
```
        .route("/", get(|| async { "Hello, world!" }))
```

Replacement in server/src/main.rs at line 84 [4.431]

B:BD[4.2621] → [4.2621:2697]

    let listener = tokio::net::TcpListener::bind("127.0.0.1:42068").await?;

[4.2621]

[4.2697]

    let listener = tokio::net::TcpListener::bind("127.0.0.1:3000").await?;

Replacement in server/src/auth.rs at line 56 [3.5984]

B:BD[2.858] → [2.858:890]

            email: value.email,

[2.858]

[2.890]

            email: value.email.to_ascii_lowercase(),

Replacement in server/src/auth.rs at line 124 [3.5984]

B:BD[3.9128] → [3.9128:9180]

        Ok(_) => Redirect::to("/").into_response(),

[3.9128]

[3.9180]

        Ok(_) => StatusCode::NO_CONTENT.into_response(),

Insertion in frontend/src/app.rs at line 2 [4.6404]
[2.1470]
[2.1470]
```
mod orthography;
mod phonemes;
mod phonotactics;
```
Insertion in frontend/src/app.rs at line 6 [4.6404]
[2.1471]
[4.6405]
```
use std::rc::Rc;
use heck::ToUpperCamelCase;
```

Insertion in frontend/src/app.rs at line 15 [4.6404]

[3.15519]

[4.6667]

use wasm_bindgen_futures::JsFuture;
use web_sys::Response;
use crate::app::error::{ApiError, ErrorCode};

Replacement in frontend/src/app.rs at line 52 [4.6404]

B:BD[4.7787] → [4.7787:7938]

        view! {
            <li>
                <A href="demo" active_class="active">
                    Demo
                </A>
            </li>

[4.7787]

[4.7938]

        mview! {
            li {
                A href="demo" active_class="active" {
                    "Demo"
                }
            }
            li {
                A href="phonemes" active_class="active" {
                    "Phonemes"
                }
            }
            li {
                A href="orthography" active_class="active" {
                    "Orthography"
                }
            }
            li {
                A href="phonotactics" active_class="active" {
                    "Phonotactics"
                }
            }

Replacement in frontend/src/app.rs at line 80 [4.6404]

B:BD[4.8088] → [4.8088:8162]

                    button tabindex={0} class="btn btn-ghost lg:hidden" {

[4.8088]

[4.8162]

                    div role="button" tabindex=0 class="btn btn-ghost lg:hidden" {

Replacement in frontend/src/app.rs at line 83 [4.6404]

B:BD[4.8229] → [4.8229:8356]

                    ul tabindex={0} class="menu menu-sm dropdown-content mt-3 z-[1] p-2 shadow bg-base-200 rounded-box w-52" {

[4.8229]

[4.8356]

                    ul tabindex=0 class="menu menu-sm dropdown-content mt-3 z-[1] p-2 shadow bg-base-200 rounded-box w-52" {

Replacement in frontend/src/app.rs at line 94 [4.6404]

B:BD[4.8701] → [4.8701:8738]

            div class="navbar-end" {

[4.8701]

[4.8738]

            div class="navbar-end space-x-4" {
                LoginAvatar;

Insertion in frontend/src/app.rs at line 102 [4.6404]

[3.15553]

[2.1472]

fn extract_user_tag(name: &str) -> String {
    if name.len() > 2 {
        let capital_chars: Vec<_> = name.chars().filter(|c| c.is_uppercase()).collect();
        if !capital_chars.is_empty() {
            capital_chars[..2].into_iter().flat_map(|c| c.to_uppercase()).collect()
        } else {
            name[..2].chars().into_iter().collect::<String>().to_upper_camel_case()
        }
    } else {
        name.to_uppercase()
    }
}
#[component]
fn LoginAvatar() -> impl IntoView {
    let user_status = expect_context::<UserStatusResource>().0;
    let user_tag = move || {
        user_status.with(|status| match status {
            None => "Un".to_string(),
            Some(Ok(status)) => match status {
                UserStatus::Anonymous => "Un".to_string(),
                UserStatus::LoggedIn { username, .. } => extract_user_tag(&username),
            },
            Some(Err(e)) => "><".to_string(),
        })
    };
    mview! {
        div class="dropdown dropdown-end" {
            div role="button" tabindex=0 class="btn btn-ghost btn-circle avatar placeholder" {
                div class="bg-neutral text-neutral-content rounded-full w-42 p-2" {
                    span class="text-3xl font-display" { [user_tag] }
                }
            }
            ul tabindex=0 class="mt-3 z-[1] p-2 shadow menu menu-sm dropdown-content bg-base-200 rounded-box w-52" {
                li { p { "apple"}}
            }
        }
    }
}

Deletion in frontend/src/app.rs at line 151 [4.6404]

B:BD[3.15717] → [3.15717:16021]

#[derive(Clone, Copy, Debug, PartialEq)]
struct CredentialsState {
    email: RwSignal<String>,
    password: RwSignal<String>,
}
impl Default for CredentialsState {
    fn default() -> Self {
        Self { email: create_rw_signal("".to_string()), password: create_rw_signal("".to_string()) }
    }
}

Insertion in frontend/src/app.rs at line 164 [4.6404]

[2.1695]

[3.16695]

}
async fn logout() -> Result<gloo_net::http::Response, gloo_net::Error> {
    Ok(gloo_net::http::Request::get("/api/v1/logout").send().await?)
}
async fn parse_api_error(resp: Response) -> Option<ApiError> {
    match resp.json().map::<JsFuture, _>(|jf| jf.into()) {
        Ok(future) => {
            let Ok(promised) = future.await else {
                return Some(ApiError {
                    code: ErrorCode::JsReadError,
                    message: "failed to execute JS future".to_string(),
                });
            };
            match serde_wasm_bindgen::from_value(promised) {
                Ok(err) => Some(err),
                Err(e) => Some(ApiError {
                    code: ErrorCode::JsReadError,
                    message: format!("failed to parse API error in response: {e}"),
                }),
            }
        }
        Err(_) => None,
    }

Replacement in frontend/src/app.rs at line 194 [4.6404]
B:BD[3.16745] → [2.1696:1734]
```
    #[derive(Clone, Copy, PartialEq)]
```
[3.16745]
[2.1734]
```
    #[derive(Clone, Copy, PartialEq, Debug)]
```
Insertion in frontend/src/app.rs at line 199 [4.6404]
[2.1796]
[2.1796]

Replacement in frontend/src/app.rs at line 214 [4.6404]

B:BD[2.2060] → [2.2060:2268]

            let resp_parsed: Result<(), error::ApiError> = resp.json().await.map_err(|err| {
                error::ApiError { code: error::ErrorCode::JsReadError, message: err.to_string() }
            })?;

[2.2060]

[2.2268]

            if resp.ok() {
                set_mode.set(LoginViewMode::Login);
                Ok(())
            } else {
                Err(match resp.json::<ApiError>().await {
                    Ok(err) => err,
                    Err(err) => error::ApiError {
                        code: error::ErrorCode::JsReadError,
                        message: err.to_string(),
                    },
                })
            }
        }
    });
    let login_form_error = create_action(|resp| parse_api_error(Clone::clone(resp)));
    let login_form_has_error = move || {
        let val = login_form_error.value().get();
        !login_form_error.pending().get() && val.as_ref().is_some_and(|inner| inner.is_some())
    };
    let signup_has_error = move || {
        (!signup.pending().get()).then(|| signup.value().get()).flatten().and_then(|res| res.err())
    };
    // TODO Find a way to genericise
    let log_out = create_action(|_: &()| async move {
        let resp = logout().await.map_err(|err| error::ApiError {
            code: error::ErrorCode::JsSendError,
            message: err.to_string(),
        })?;

Replacement in frontend/src/app.rs at line 243 [4.6404]

B:BD[2.2269] → [2.2269:2293]

            resp_parsed

[2.2269]

[3.17390]

        let resp_parsed: Result<(), error::ApiError> = resp.json().await.map_err(|err| {
            error::ApiError { code: error::ErrorCode::JsReadError, message: err.to_string() }
        })?;
        resp_parsed
    });
    let _ = create_effect(move |_| {
        if log_out.value().get().is_some_and(|r| r.is_ok()) || mode.get() == LoginViewMode::Login {
            user_status.refetch()

Replacement in frontend/src/app.rs at line 256 [4.6404]

B:BD[2.2325] → [2.2325:2633]

        if user_status.with(|user| {
            user.as_ref().is_some_and(|status| {
                status.as_ref().is_ok_and(|status| status == &UserStatus::Anonymous)
            })
        }) {
            mview! {
            Form action="/api/v1/login" method="POST" class="join join-vertical my-2" {

[2.2325]

[2.2633]

        mview! {
            [user_status.with(|status| match status {
                None => "Loading...".into_view(),
                Some(Ok(UserStatus::Anonymous)) => mview! {
                    Form action="/api/v1/login" method="POST" class="join join-vertical my-2" on-response={
                        Rc::new(move |resp: &Response| {
                            if resp.ok() {
                                user_status.refetch()
                            } else {
                                login_form_error.dispatch(Clone::clone(resp));
                            }
                        })
                    }
                    {
                        label for="email" class="label" {
                            span class="label-text" { "Email" }
                        }
                        // Remember for Tailwind to detect our classes, either use class="<class names>" or `class: <class name> ={signal}` (first space is required, second is optional)
                        input type="email" id="email" name="email" class="input input-bordered w-full max-w-xs" class: input-error={login_form_has_error};
                        label for="password" class="label" {
                            span class="label-text" { "Password" }
                        }
                        input type="password" id="password" name="password" class="input input-bordered w-full max-w-xs" class: input-error={login_form_has_error};
                        button type="submit" {
                            "Login"
                        }
                    }
                }.into_view(),
                Some(Ok(UserStatus::LoggedIn { username, code })) => {
                    let display_name = format!("{username}#{code}");
                    mview! {
                        div class="flex items-center justify-between w-full max-w-xs" {
                            f["Logged in as {display_name}"]
                            button class="btn" on:click={move |_| log_out.dispatch(())} {
                                "Sign Out"
                            }
                        }
                    }.into_view()
                },
                Some(Err(e)) => {
                    let e = format!("{e}");
                    mview! {
                        div class="" { f["Error retrieving user status: {e}"]}
                    }.into_view()
                }
            })]
        }.into_view()
    };
    let signup_view = move || {
        mview! {
            Form action="" method="POST" class="join join-vertical my-2" {
                label for="username" class="label" {
                    span class="label-text" { "Username" }
                }
                input type="username" name="username" id="username" prop:value=[username.get()] class="input input-bordered w-full max-w-xs" on:input={move |ev| set_username.set(event_target_value(&ev))}
                    class :input-error=[signup_has_error().is_some()];

Replacement in frontend/src/app.rs at line 316 [4.6404]

B:BD[2.2757] → [2.2757:2862]

                input type="email" id="email" name="email" class="input input-bordered w-full max-w-xs";

[2.2757]

[2.2862]

                input type="email" name="email" id="email" prop:value=[email.get()] class="input input-bordered w-full max-w-xs" on:input={move |ev| set_email.set(event_target_value(&ev))}
                    class :input-error=[signup_has_error().is_some()];

Replacement in frontend/src/app.rs at line 321 [4.6404]

B:BD[2.2992] → [2.2992:3234]

∅:D[2.3234] → [3.18190:18214]

B:BD[3.18190] → [3.18190:18214]

B:BD[3.18214] → [2.3235:3843]

                input type="password" id="password" name="password" class="input input-bordered w-full max-w-xs";
                button type="submit" on:submit={move |_| user_status.refetch()} {
                    "Login"
                }
            }
        }
        .into_view()
        } else {
            mview! {}.into_view()
        }
    };
    let signup_view = move || {
        mview! {
            Form action="" method="POST" {
                input type="username" name="username" prop:value=[username.get()] on:input={move |ev| set_username.set(event_target_value(&ev))};
                input type="email" name="email" prop:value=[email.get()] on:input={move |ev| set_email.set(event_target_value(&ev))};
                input type="password" name="password" prop:value=[password.get()] on:input={move |ev| set_password.set(event_target_value(&ev))};

[2.2992]

[2.3843]

                input type="password" id="password" name="password" prop:value=[password.get()] class="input input-bordered w-full max-w-xs" on:input={move |ev| set_password.set(event_target_value(&ev))}
                    class :input-error=[signup_has_error().is_some()];

Deletion in frontend/src/app.rs at line 330 [4.6404]
B:BD[4.8784] → [2.4099:4149]
```
            p { f["{:?}", signup.value().get()] }
```

Replacement in frontend/src/app.rs at line 334 [4.6404]

B:BD[2.4192] → [2.4192:4839]

        div class="text-center" {
            [user_status.with(|user| match user {
                Some(Ok(status)) => match status {
                    UserStatus::Anonymous => "not logged in".to_string(),
                    UserStatus::LoggedIn { username, code } => format!("logged in as {username}#{code}")
                }.into_view(),
                Some(Err(e)) =>{
                    let e = format!("{}", e);
                    mview! {
                        div class="text-error bg-slate-500" { [e.clone()] }
                    }.into_view()
                },
                None => "Loading...".into_view()
            })]

[2.4192]

[4.8784]

        div class="form-control max-w-xs" {
            label class="label cursor-pointer" {
                span class="label-text" { f["{:?}", mode.get()] }
                input type="checkbox" class="toggle" prop:checked=[mode.get() == LoginViewMode::Signup] on:input={move |ev| if event_target_checked(&ev) {
                    set_mode.set(LoginViewMode::Signup)
                } else {
                    set_mode.set(LoginViewMode::Login)
                }};
            }

Insertion in frontend/src/app.rs at line 396 [4.6404]

[3.19449]

[4.9968]

                    Route path="phonotactics" view=[phonotactics::PhonotacticsView];
                    Route path="phonemes" view=[phonemes::PhonemesView];
                    Route path="orthography" view=[orthography::OrthographyView];

File addition: phonotactics.rs (----------)

[2.4997]

use leptos::*;
use leptos_mview::mview;
#[component]
pub fn PhonotacticsView() -> impl IntoView {
    mview! {
        div class="prose" {
            p { "TODO" }
        }
    }
}

File addition: phonemes.rs (----------)

[2.4997]

use leptos::*;
use leptos_mview::mview;
#[component]
pub fn PhonemesView() -> impl IntoView {
    mview! {
        div class="prose" {
            p { "TODO" }
        }
    }
}

File addition: orthography.rs (----------)

[2.4997]

use leptos::*;
use leptos_mview::mview;
#[component]
pub fn OrthographyView() -> impl IntoView {
    mview! {
        div class="prose" {
            p { "TODO" }
        }
    }
}

Insertion in frontend/src/app/error.rs at line 14 [2.5032]
[2.5318]
[2.5318]
```
    CouldNotCreateUser,
    DbError,
```

Insertion in frontend/src/app/error.rs at line 24 [2.5032]

[2.5645]

            Self::CouldNotCreateUser => write!(f, "could not create user"),
            Self::DbError => write!(f, "database error"),

Replacement in frontend/src/app/error.rs at line 30 [2.5032]
B:BD[2.5664] → [2.5664:5701]
```
#[derive(Deserialize, Clone, Debug)]
```
[2.5664]
[2.5701]
```
#[derive(Deserialize, Clone, Debug, PartialEq)]
```
Replacement in frontend/Trunk.toml at line 24 [5.24181306]
B:BD[4.10480] → [4.10480:10516]
```
backend = "http://localhost:42068/"
```
[4.10480]
```
backend = "http://localhost:3000/"
```
Insertion in frontend/Cargo.toml at line 12 [5.24181606]
[3.19488]
[5.24181819]
```
heck = "0.4.1"
```
Insertion in frontend/Cargo.toml at line 21 [5.24181606]
[3.19544]
[4.10695]
```
serde-wasm-bindgen = "0.6.3"
```
Insertion in frontend/Cargo.toml at line 26 [5.24181606]
[4.10896]
[4.10896]
```
wasm-bindgen-futures = "0.4.40"
```
Insertion in Cargo.lock at line 1147 [5.24182157]
[3.19967]
[4.33527]
```
 "heck",
```
Insertion in Cargo.lock at line 1157 [5.24182157]
[3.19978]
[4.33613]
```
 "serde-wasm-bindgen 0.6.3",
```
Insertion in Cargo.lock at line 1162 [5.24182157]
[4.33685]
[5.24190818]
```
 "wasm-bindgen-futures",
```

fix some stuff, add some stuff

Dependencies

In channels

Change contents

Replacement in server/src/user.rs at line 1 [3.32]

Replacement in server/src/user.rs at line 53 [3.32]

Insertion in server/src/user.rs at line 57 [3.32]

Replacement in server/src/user.rs at line 106 [3.32]

Deletion in server/src/main.rs at line 80 [4.431]

Replacement in server/src/main.rs at line 84 [4.431]

Replacement in server/src/auth.rs at line 56 [3.5984]

Replacement in server/src/auth.rs at line 124 [3.5984]

Insertion in frontend/src/app.rs at line 2 [4.6404]

Insertion in frontend/src/app.rs at line 6 [4.6404]

Insertion in frontend/src/app.rs at line 15 [4.6404]

Replacement in frontend/src/app.rs at line 52 [4.6404]

Replacement in frontend/src/app.rs at line 80 [4.6404]

Replacement in frontend/src/app.rs at line 83 [4.6404]

Replacement in frontend/src/app.rs at line 94 [4.6404]

Insertion in frontend/src/app.rs at line 102 [4.6404]

Deletion in frontend/src/app.rs at line 151 [4.6404]

Insertion in frontend/src/app.rs at line 164 [4.6404]

Replacement in frontend/src/app.rs at line 194 [4.6404]

Insertion in frontend/src/app.rs at line 199 [4.6404]

Replacement in frontend/src/app.rs at line 214 [4.6404]

Replacement in frontend/src/app.rs at line 243 [4.6404]

Replacement in frontend/src/app.rs at line 256 [4.6404]

Replacement in frontend/src/app.rs at line 316 [4.6404]

Replacement in frontend/src/app.rs at line 321 [4.6404]

Deletion in frontend/src/app.rs at line 330 [4.6404]

Replacement in frontend/src/app.rs at line 334 [4.6404]

Insertion in frontend/src/app.rs at line 396 [4.6404]

File addition: phonotactics.rs (----------)

File addition: phonemes.rs (----------)

File addition: orthography.rs (----------)

Insertion in frontend/src/app/error.rs at line 14 [2.5032]

Insertion in frontend/src/app/error.rs at line 24 [2.5032]

Replacement in frontend/src/app/error.rs at line 30 [2.5032]

Replacement in frontend/Trunk.toml at line 24 [5.24181306]

Insertion in frontend/Cargo.toml at line 12 [5.24181606]

Insertion in frontend/Cargo.toml at line 21 [5.24181606]

Insertion in frontend/Cargo.toml at line 26 [5.24181606]

Insertion in Cargo.lock at line 1147 [5.24182157]

Insertion in Cargo.lock at line 1157 [5.24182157]

Insertion in Cargo.lock at line 1162 [5.24182157]