ZJ/nidobyte - Change E4OBIIUBGNDXK577XK573TLN4DYLS32GJGXY6J7TOWFHESTEZZNAC

templates: Fix navigation mocks Cleans up the directory structure for templates and fixes the navigation bugs in the applications too. Includes a context! macro which is lifted from upstream, but is currently unreleased. When rocket_dyn_templates is updates, it could be DRY'ed out.

Created by zj on September 22, 2021

E4OBIIUBGNDXK577XK573TLN4DYLS32GJGXY6J7TOWFHESTEZZNAC

Dependencies

In channels

main

Change contents

File deletion: sign_in.html.tera

BF:BFD[3.21] → [3.22:63]

BF:BFD[3.63] → [3.64:64]

B:BD[3.64] → [3.65:103]

B:BD[3.103] → [4.0:49]

∅:D[4.49] → [3.152:735]

B:BD[3.152] → [3.152:735]

B:BD[3.735] → [4.50:121]

∅:D[4.121] → [3.806:845]

B:BD[3.806] → [3.806:845]

{% extends "base" %}
{% block body %}
<div style="width:50%;" class="container-fluid">
    <form action="./sign_in" method="post">
        <div class="mb-3 row">
            <label for="user_name" class="col-sm-2 col-form-label">Username</label>
            <div class="col-sm-10">
                <input type="text" class="form-control" name="user_name" required>
            </div>
        </div>
        <div class="mb-3 row">
            <label for="password" class="col-sm-2 col-form-label">Password </label>
            <div class="col-sm-10">
                <input type="password" class="form-control" name="password" required>
            </div>
        </div>
        <button class="btn btn-primary" type="submit">Sign in</button>
    </form>
</div>
{% endblock body %}

File deletion: new_user.html.tera

BF:BFD[3.21] → [3.846:888]

BF:BFD[3.888] → [3.889:889]

B:BD[3.889] → [3.890:1925]

{% extends "base" %}
{% block body %}
<div style="width:30%;" class="container-fluid">
    <form action="/users" method="post">
        <div class="mb-3 row">
            <label for="user_name" class="col-sm-2 col-form-label">Username</label>
            <div class="col-sm-10">
                <input type="text" class="form-control" name="user_name" required>
            </div>
        </div>
        <div class="mb-3 row">
            <label for="email" class="col-sm-2 col-form-label">Email</label>
            <div class="col-sm-10">
                <input type="email" class="form-control" name="email" required>
            </div>
        </div>
        <div class="mb-3 row">
            <label for="password" class="col-sm-2 col-form-label">Password </label>
            <div class="col-sm-10">
                <input type="password" class="form-control" name="password" required>
            </div>
        </div>
        <button class="btn btn-primary" type="submit">Sign up</button>
    </form>
</div>
{% endblock body %}

File addition: users (d--x------)
[3.21]

File addition: sign_in.html.tera (----------)

[0.17]

{% extends "base" %}
{% block body %}
<div style="width:50%;" class="container-fluid">
    <form action="./sign_in" method="post">
        <div class="mb-3 row">
            <label for="user_name" class="col-sm-2 col-form-label">Username</label>
            <div class="col-sm-10">
                <input type="text" class="form-control" name="user_name" required>
            </div>
        </div>
        <div class="mb-3 row">
            <label for="password" class="col-sm-2 col-form-label">Password </label>
            <div class="col-sm-10">
                <input type="password" class="form-control" name="password" required>
            </div>
        </div>
        <button class="btn btn-primary" type="submit">Sign in</button>
    </form>
</div>
{% endblock body %}

File addition: new.html.tera (----------)

[0.17]

{% extends "base" %}
{% block body %}
<div style="width:30%;" class="container-fluid">
    <form action="/users" method="post">
        <div class="mb-3 row">
            <label for="user_name" class="col-sm-2 col-form-label">Username</label>
            <div class="col-sm-10">
                <input type="text" class="form-control" name="user_name" required>
            </div>
        </div>
        <div class="mb-3 row">
            <label for="email" class="col-sm-2 col-form-label">Email</label>
            <div class="col-sm-10">
                <input type="email" class="form-control" name="email" required>
            </div>
        </div>
        <div class="mb-3 row">
            <label for="password" class="col-sm-2 col-form-label">Password </label>
            <div class="col-sm-10">
                <input type="password" class="form-control" name="password" required>
            </div>
        </div>
        <button class="btn btn-primary" type="submit">Sign up</button>
    </form>
</div>
{% endblock body %}

Deletion in templates/nav.html.tera at line 10 [4.160]

B:BD[4.756] → [4.756:1000]

          </li>
          <li class="nav-item">
            <a class="nav-link" href="#">Link</a>
          </li>
          <li class="nav-item">
            <a class="nav-link disabled" href="#" tabindex="-1" aria-disabled="true">Disabled</a>

Insertion in templates/nav.html.tera at line 11 [4.160]
[4.1016]
[4.1016]
```
	  {% if current_user %}
```

Replacement in templates/nav.html.tera at line 13 [4.160]

B:BD[4.1057] → [4.1057:1187]

            <a class="nav-link dropdown-toggle" href="#" id="dropdown08" data-bs-toggle="dropdown" aria-expanded="false">User</a>

[4.1057]

[4.1187]

		  <a class="nav-link dropdown-toggle" href="#" id="dropdown08" data-bs-toggle="dropdown" aria-expanded="false">{{ current_user.name }}</a>

Deletion in templates/nav.html.tera at line 15 [4.160]

B:BD[4.1255] → [4.1255:1415]

              <li><a class="dropdown-item" href="/users/sign_in">Sign in</a></li>
              <li><a class="dropdown-item" href="/users/new">Sign up</a></li>

Insertion in templates/nav.html.tera at line 18 [4.160]

[4.1533]

	  {% else %}
            <li class="nav-item"><a class="nav-link" href="/users/new">Sign up</a></li>
            <li class="nav-item"><a class="nav-link" href="/users/sign_in">Sign in</a></li>
	  {% endif %}

Replacement in templates/landing.html.tera at line 3 [4.1622]

B:BD[4.1661] → [4.1661:1681]

<p>Hello world!</p>

[4.1661]

[4.1681]


<div class="px-4 py-5 my-5 text-center">
<!---  <img class="d-block mx-auto mb-4" src="/docs/5.1/assets/brand/bootstrap-logo.svg" alt="" width="72" height="57"> ---!>
    <h1 class="display-5 fw-bold">Nidobyte</h1>
    <div class="col-lg-6 mx-auto">
    <p class="lead mb-4">Open source hosting for Pijul repositories to collaborate on code. </p>
      <div class="d-grid gap-2 d-sm-flex justify-content-sm-center">
        <a class="btn btn-primary btn-lg ps-4 gap-3" href="/users/sign_up" role="button">Sign up</a>
	<a class="btn btn-outline-secondary btn-lg px-4" href="/projects/explore">Projects</a>
      </div>
    </div>
</div>

Insertion in src/main.rs at line 26 [6.212]

[5.882]

[6.388]

}
/// this macro is lifted from the upstream unreleased code.
#[macro_export]
macro_rules! context {
    ($($key:ident $(: $value:expr)?),*$(,)?) => {{
        use rocket::serde::ser::{Serialize, Serializer, SerializeMap};
        use ::std::fmt::{Debug, Formatter};
        #[allow(non_camel_case_types)]
        struct ContextMacroCtxObject<$($key: Serialize),*> {
            $($key: $key),*
        }
        #[allow(non_camel_case_types)]
        impl<$($key: Serialize),*> Serialize for ContextMacroCtxObject<$($key),*> {
            fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
                where S: Serializer,
            {
                let mut map = serializer.serialize_map(None)?;
                $(map.serialize_entry(stringify!($key), &self.$key)?;)*
                map.end()
            }
        }
        #[allow(non_camel_case_types)]
        impl<$($key: Debug + Serialize),*> Debug for ContextMacroCtxObject<$($key),*> {
            fn fmt(&self, f: &mut Formatter<'_>) -> ::std::fmt::Result {
                f.debug_struct("context!")
                    $(.field(stringify!($key), &self.$key))*
                    .finish()
            }
        }
        ContextMacroCtxObject {
            $($key $(: $value)?),*
        }
    }};

Replacement in src/controllers/users.rs at line 40 [2.33]

B:BD[2.1183] → [2.1183:1237]

    Template::render("new_user", &Context::default())

[2.1183]

[2.1237]

    Template::render("users/new", &Context::default())

Replacement in src/controllers/users.rs at line 96 [2.33]

B:BD[2.2709] → [2.2709:2762]

    Template::render("sign_in", &Context::default())

[2.2709]

[2.2762]

    Template::render("users/sign_in", &Context::default())

Replacement in src/controllers/root.rs at line 5 [7.118]
B:BD[7.202] → [7.202:214]
```
#[get("/")]
```
[7.202]
[7.214]
```
#[get("/", rank = 2)]
```
Insertion in src/controllers/projects.rs at line 2 [8.36]
[8.68]
[8.68]
```
use crate::models::projects;
```
Replacement in src/controllers/projects.rs at line 7 [8.36]
B:BD[8.162] → [8.162:202]
```
    form::{self, Context, Error, Form},
```
[8.162]
[8.202]
```
    form::{self, Error, Form},
```

Replacement in src/controllers/projects.rs at line 14 [8.36]

B:BD[8.317] → [8.317:409]

fn new(_user: User) -> Template {
    Template::render("projects/new", &Context::default())

[8.317]

[8.409]

fn new(user: User) -> Template {
    Template::render(
        "projects/new",
        crate::context! {
            current_user: user,
        },
    )

Deletion in src/controllers/projects.rs at line 42 [8.36]
B:BD[8.862] → [8.862:892]
```
use crate::models::projects;
```

Insertion in src/controllers/projects.rs at line 58 [8.36]

[8.1391]

/*
async fn show(
    db: &State<Database>,
    repoman: &State<RepoMan>,

Insertion in src/controllers/projects.rs at line 63 [8.36]
[8.1392]
[8.1392]
```
    }
*/
```